866 files changed, 8023 insertions, 52229 deletions

diff --git a/.gitignore b/.gitignore
index a232295b99ac..27c3e839b54e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 #
 .*
 *.o
+*.o.*
 *.a
 *.s
 *.ko
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt
index 805db4b2cba6..cc7a8c39fb6f 100644
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
@@ -26,7 +26,7 @@ Part Ia - Using large dma-coherent buffers
 
 void *
 dma_alloc_coherent(struct device *dev, size_t size,
-                             dma_addr_t *dma_handle, int flag)
+                             dma_addr_t *dma_handle, gfp_t flag)
 void *
 pci_alloc_consistent(struct pci_dev *dev, size_t size,
                              dma_addr_t *dma_handle)
@@ -38,7 +38,7 @@ to make sure to flush the processor's write buffers before telling
 devices to read that memory.)
 
 This routine allocates a region of <size> bytes of consistent memory.
-it also returns a <dma_handle> which may be cast to an unsigned
+It also returns a <dma_handle> which may be cast to an unsigned
 integer the same width as the bus and used as the physical address
 base of the region.
 
@@ -52,21 +52,21 @@ The simplest way to do that is to use the dma_pool calls (see below).
 
 The flag parameter (dma_alloc_coherent only) allows the caller to
 specify the GFP_ flags (see kmalloc) for the allocation (the
-implementation may chose to ignore flags that affect the location of
+implementation may choose to ignore flags that affect the location of
 the returned memory, like GFP_DMA).  For pci_alloc_consistent, you
 must assume GFP_ATOMIC behaviour.
 
 void
-dma_free_coherent(struct device *dev, size_t size, void *cpu_addr
+dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
                            dma_addr_t dma_handle)
 void
-pci_free_consistent(struct pci_dev *dev, size_t size, void *cpu_addr
+pci_free_consistent(struct pci_dev *dev, size_t size, void *cpu_addr,
                            dma_addr_t dma_handle)
 
 Free the region of consistent memory you previously allocated.  dev,
 size and dma_handle must all be the same as those passed into the
 consistent allocate.  cpu_addr must be the virtual address returned by
-the consistent allocate
+the consistent allocate.
 
 
 Part Ib - Using small dma-coherent buffers
@@ -77,9 +77,9 @@ To get this part of the dma_ API, you must #include <linux/dmapool.h>
 Many drivers need lots of small dma-coherent memory regions for DMA
 descriptors or I/O buffers.  Rather than allocating in units of a page
 or more using dma_alloc_coherent(), you can use DMA pools.  These work
-much like a struct kmem_cache, except that they use the dma-coherent allocator
+much like a struct kmem_cache, except that they use the dma-coherent allocator,
 not __get_free_pages().  Also, they understand common hardware constraints
-for alignment, like queue heads needing to be aligned on N byte boundaries.
+for alignment, like queue heads needing to be aligned on N-byte boundaries.
 
 
         struct dma_pool *
@@ -102,15 +102,15 @@ crossing restrictions, pass 0 for alloc; passing 4096 says memory allocated
 from this pool must not cross 4KByte boundaries.
 
 
-        void *dma_pool_alloc(struct dma_pool *pool, int gfp_flags,
+        void *dma_pool_alloc(struct dma_pool *pool, gfp_t gfp_flags,
                         dma_addr_t *dma_handle);
 
-        void *pci_pool_alloc(struct pci_pool *pool, int gfp_flags,
+        void *pci_pool_alloc(struct pci_pool *pool, gfp_t gfp_flags,
                         dma_addr_t *dma_handle);
 
 This allocates memory from the pool; the returned memory will meet the size
 and alignment requirements specified at creation time.  Pass GFP_ATOMIC to
-prevent blocking, or if it's permitted (not in_interrupt, not holding SMP locks)
+prevent blocking, or if it's permitted (not in_interrupt, not holding SMP locks),
 pass GFP_KERNEL to allow blocking.  Like dma_alloc_coherent(), this returns
 two values:  an address usable by the cpu, and the dma address usable by the
 pool's device.
@@ -123,7 +123,7 @@ pool's device.
                         dma_addr_t addr);
 
 This puts memory back into the pool.  The pool is what was passed to
-the pool allocation routine; the cpu and dma addresses are what
+the pool allocation routine; the cpu (vaddr) and dma addresses are what
 were returned when that routine allocated the memory being freed.
 
 
@@ -209,18 +209,18 @@ Notes:  Not all memory regions in a machine can be mapped by this
 API.  Further, regions that appear to be physically contiguous in
 kernel virtual space may not be contiguous as physical memory.  Since
 this API does not provide any scatter/gather capability, it will fail
-if the user tries to map a non physically contiguous piece of memory.
+if the user tries to map a non-physically contiguous piece of memory.
 For this reason, it is recommended that memory mapped by this API be
-obtained only from sources which guarantee to be physically contiguous
+obtained only from sources which guarantee it to be physically contiguous
 (like kmalloc).
 
 Further, the physical address of the memory must be within the
 dma_mask of the device (the dma_mask represents a bit mask of the
-addressable region for the device.  i.e. if the physical address of
+addressable region for the device.  I.e., if the physical address of
 the memory anded with the dma_mask is still equal to the physical
 address, then the device can perform DMA to the memory).  In order to
 ensure that the memory allocated by kmalloc is within the dma_mask,
-the driver may specify various platform dependent flags to restrict
+the driver may specify various platform-dependent flags to restrict
 the physical memory range of the allocation (e.g. on x86, GFP_DMA
 guarantees to be within the first 16Mb of available physical memory,
 as required by ISA devices).
@@ -244,14 +244,14 @@ are guaranteed also to be cache line boundaries).
 
 DMA_TO_DEVICE synchronisation must be done after the last modification
 of the memory region by the software and before it is handed off to
-the driver.  Once this primitive is used.  Memory covered by this
-primitive should be treated as read only by the device.  If the device
+the driver.  Once this primitive is used, memory covered by this
+primitive should be treated as read-only by the device.  If the device
 may write to it at any point, it should be DMA_BIDIRECTIONAL (see
 below).
 
 DMA_FROM_DEVICE synchronisation must be done before the driver
 accesses data that may be changed by the device.  This memory should
-be treated as read only by the driver.  If the driver needs to write
+be treated as read-only by the driver.  If the driver needs to write
 to it at any point, it should be DMA_BIDIRECTIONAL (see below).
 
 DMA_BIDIRECTIONAL requires special handling: it means that the driver
@@ -261,7 +261,7 @@ you must always sync bidirectional memory twice: once before the
 memory is handed off to the device (to make sure all memory changes
 are flushed from the processor) and once before the data may be
 accessed after being used by the device (to make sure any processor
-cache lines are updated with data that the device may have changed.
+cache lines are updated with data that the device may have changed).
 
 void
 dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
@@ -302,8 +302,8 @@ pci_dma_mapping_error(dma_addr_t dma_addr)
 
 In some circumstances dma_map_single and dma_map_page will fail to create
 a mapping. A driver can check for these errors by testing the returned
-dma address with dma_mapping_error(). A non zero return value means the mapping
-could not be created and the driver should take appropriate action (eg
+dma address with dma_mapping_error(). A non-zero return value means the mapping
+could not be created and the driver should take appropriate action (e.g.
 reduce current DMA mapping usage or delay and try again later).
 
         int
@@ -315,7 +315,7 @@ reduce current DMA mapping usage or delay and try again later).
 
 Maps a scatter gather list from the block layer.
 
-Returns: the number of physical segments mapped (this may be shorted
+Returns: the number of physical segments mapped (this may be shorter
 than <nents> passed in if the block layer determines that some
 elements of the scatter/gather list are physically adjacent and thus
 may be mapped with a single entry).
@@ -357,7 +357,7 @@ accessed sg->address and sg->length as shown above.
         pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sg,
                 int nents, int direction)
 
-unmap the previously mapped scatter/gather list.  All the parameters
+Unmap the previously mapped scatter/gather list.  All the parameters
 must be the same as those and passed in to the scatter/gather mapping
 API.
 
@@ -377,7 +377,7 @@ void
 pci_dma_sync_sg(struct pci_dev *hwdev, struct scatterlist *sg,
                        int nelems, int direction)
 
-synchronise a single contiguous or scatter/gather mapping.  All the
+Synchronise a single contiguous or scatter/gather mapping.  All the
 parameters must be the same as those passed into the single mapping
 API.
 
@@ -406,7 +406,7 @@ API at all.
 
 void *
 dma_alloc_noncoherent(struct device *dev, size_t size,
-                               dma_addr_t *dma_handle, int flag)
+                               dma_addr_t *dma_handle, gfp_t flag)
 
 Identical to dma_alloc_coherent() except that the platform will
 choose to return either consistent or non-consistent memory as it sees
@@ -426,34 +426,34 @@ void
 dma_free_noncoherent(struct device *dev, size_t size, void *cpu_addr,
                               dma_addr_t dma_handle)
 
-free memory allocated by the nonconsistent API.  All parameters must
+Free memory allocated by the nonconsistent API.  All parameters must
 be identical to those passed in (and returned by
 dma_alloc_noncoherent()).
 
 int
 dma_is_consistent(struct device *dev, dma_addr_t dma_handle)
 
-returns true if the device dev is performing consistent DMA on the memory
+Returns true if the device dev is performing consistent DMA on the memory
 area pointed to by the dma_handle.
 
 int
 dma_get_cache_alignment(void)
 
-returns the processor cache alignment.  This is the absolute minimum
+Returns the processor cache alignment.  This is the absolute minimum
 alignment *and* width that you must observe when either mapping
 memory or doing partial flushes.
 
 Notes: This API may return a number *larger* than the actual cache
 line, but it will guarantee that one or more cache lines fit exactly
 into the width returned by this call.  It will also always be a power
-of two for easy alignment
+of two for easy alignment.
 
 void
 dma_sync_single_range(struct device *dev, dma_addr_t dma_handle,
                       unsigned long offset, size_t size,
                       enum dma_data_direction direction)
 
-does a partial sync.  starting at offset and continuing for size.  You
+Does a partial sync, starting at offset and continuing for size.  You
 must be careful to observe the cache alignment and width when doing
 anything like this.  You must also be extra careful about accessing
 memory you intend to sync partially.
@@ -472,21 +472,20 @@ dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
                             dma_addr_t device_addr, size_t size, int
                             flags)
 
-
 Declare region of memory to be handed out by dma_alloc_coherent when
 it's asked for coherent memory for this device.
 
 bus_addr is the physical address to which the memory is currently
 assigned in the bus responding region (this will be used by the
-platform to perform the mapping)
+platform to perform the mapping).
 
 device_addr is the physical address the device needs to be programmed
 with actually to address this memory (this will be handed out as the
-dma_addr_t in dma_alloc_coherent())
+dma_addr_t in dma_alloc_coherent()).
 
 size is the size of the area (must be multiples of PAGE_SIZE).
 
-flags can be or'd together and are
+flags can be or'd together and are:
 
 DMA_MEMORY_MAP - request that the memory returned from
 dma_alloc_coherent() be directly writable.
@@ -494,7 +493,7 @@ dma_alloc_coherent() be directly writable.
 DMA_MEMORY_IO - request that the memory returned from
 dma_alloc_coherent() be addressable using read/write/memcpy_toio etc.
 
-One or both of these flags must be present
+One or both of these flags must be present.
 
 DMA_MEMORY_INCLUDES_CHILDREN - make the declared memory be allocated by
 dma_alloc_coherent of any child devices of this one (for memory residing
@@ -528,7 +527,7 @@ dma_release_declared_memory(struct device *dev)
 Remove the memory region previously declared from the system.  This
 API performs *no* in-use checking for this region and will return
 unconditionally having removed all the required structures.  It is the
-drivers job to ensure that no parts of this memory region are
+driver's job to ensure that no parts of this memory region are
 currently in use.
 
 void *
@@ -538,12 +537,10 @@ dma_mark_declared_memory_occupied(struct device *dev,
 This is used to occupy specific regions of the declared space
 (dma_alloc_coherent() will hand out the first free region it finds).
 
-device_addr is the *device* address of the region requested
+device_addr is the *device* address of the region requested.
 
-size is the size (and should be a page sized multiple).
+size is the size (and should be a page-sized multiple).
 
 The return value will be either a pointer to the processor virtual
 address of the memory, or an error (via PTR_ERR()) if any part of the
 region is occupied.
-
-
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index ec7c498b69fc..b886f52a9aac 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -380,7 +380,6 @@ X!Edrivers/base/interface.c
 !Edrivers/base/bus.c
      </sect1>
      <sect1><title>Device Drivers Power Management</title>
-!Edrivers/base/power/main.c
 !Edrivers/base/power/resume.c
 !Edrivers/base/power/suspend.c
      </sect1>
@@ -398,12 +397,12 @@ X!Edrivers/acpi/pci_bind.c
 -->
      </sect1>
      <sect1><title>Device drivers PnP support</title>
-!Edrivers/pnp/core.c
+!Idrivers/pnp/core.c
 <!-- No correct structured comments
 X!Edrivers/pnp/system.c
  -->
 !Edrivers/pnp/card.c
-!Edrivers/pnp/driver.c
+!Idrivers/pnp/driver.c
 !Edrivers/pnp/manager.c
 !Edrivers/pnp/support.c
      </sect1>
@@ -709,7 +708,6 @@ X!Idrivers/video/console/fonts.c
         kernel, without continually transferring them between the kernel
         and user space.
   </para>
-!Iinclude/linux/splice.h
 !Ffs/splice.c
   </chapter>
 
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index 595a5ea4c690..7b9551fc6fe3 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -18,6 +18,7 @@
 *.moc
 *.mod.c
 *.o
+*.o.*
 *.orig
 *.out
 *.pdf
@@ -163,6 +164,8 @@ raid6tables.c
 relocs
 series
 setup
+setup.bin
+setup.elf
 sim710_d.h*
 sImage
 sm_tbl*
diff --git a/Documentation/filesystems/hfsplus.txt b/Documentation/filesystems/hfsplus.txt
new file mode 100644
index 000000000000..af1628a1061c
--- /dev/null
+++ b/Documentation/filesystems/hfsplus.txt
@@ -0,0 +1,59 @@
+
+Macintosh HFSPlus Filesystem for Linux
+======================================
+
+HFSPlus is a filesystem first introduced in MacOS 8.1.
+HFSPlus has several extensions to HFS, including 32-bit allocation
+blocks, 255-character unicode filenames, and file sizes of 2^63 bytes.
+
+
+Mount options
+=============
+
+When mounting an HFSPlus filesystem, the following options are accepted:
+
+  creator=cccc, type=cccc
+        Specifies the creator/type values as shown by the MacOS finder
+        used for creating new files.  Default values: '????'.
+
+  uid=n, gid=n
+        Specifies the user/group that owns all files on the filesystem
+        that have uninitialized permissions structures.
+        Default:  user/group id of the mounting process.
+
+  umask=n
+        Specifies the umask (in octal) used for files and directories
+        that have uninitialized permissions structures.
+        Default:  umask of the mounting process.
+
+  session=n
+        Select the CDROM session to mount as HFSPlus filesystem.  Defaults to
+        leaving that decision to the CDROM driver.  This option will fail
+        with anything but a CDROM as underlying devices.
+
+  part=n
+        Select partition number n from the devices.  This option only makes
+        sense for CDROMs because they can't be partitioned under Linux.
+        For disk devices the generic partition parsing code does this
+        for us.  Defaults to not parsing the partition table at all.
+
+  decompose
+        Decompose file name characters.
+
+  nodecompose
+        Do not decompose file name characters.
+
+  force
+        Used to force write access to volumes that are marked as journalled
+        or locked.  Use at your own risk.
+
+  nls=cccc
+        Encoding to use when presenting file names.
+
+
+References
+==========
+
+kernel source:          <file:fs/hfsplus>
+
+Apple Technote 1150     http://developer.apple.com/technotes/tn/tn1150.html
diff --git a/Documentation/hpet.txt b/Documentation/hpet.txt
index b7a3dc38dd52..6ad52d9dad6c 100644
--- a/Documentation/hpet.txt
+++ b/Documentation/hpet.txt
@@ -5,7 +5,7 @@ for the 8254 and Real Time Clock (RTC) periodic timer functionality.
 Each HPET can have up to 32 timers.  It is possible to configure the
 first two timers as legacy replacements for 8254 and RTC periodic timers.
 A specification done by Intel and Microsoft can be found at
-<http://www.intel.com/hardwaredesign/hpetspec.htm>.
+<http://www.intel.com/technology/architecture/hpetspec.htm>.
 
 The driver supports detection of HPET driver allocation and initialization
 of the HPET before the driver module_init routine is called.  This enables
diff --git a/Documentation/hwmon/adm1031 b/Documentation/hwmon/adm1031
index 130a38382b98..be92a77da1d5 100644
--- a/Documentation/hwmon/adm1031
+++ b/Documentation/hwmon/adm1031
@@ -6,13 +6,13 @@ Supported chips:
     Prefix: 'adm1030'
     Addresses scanned: I2C 0x2c to 0x2e
     Datasheet: Publicly available at the Analog Devices website
-               http://products.analog.com/products/info.asp?product=ADM1030
+               http://www.analog.com/en/prod/0%2C2877%2CADM1030%2C00.html
 
   * Analog Devices ADM1031
     Prefix: 'adm1031'
     Addresses scanned: I2C 0x2c to 0x2e
     Datasheet: Publicly available at the Analog Devices website
-               http://products.analog.com/products/info.asp?product=ADM1031
+               http://www.analog.com/en/prod/0%2C2877%2CADM1031%2C00.html
 
 Authors:
         Alexandre d'Alton <alex@alexdalton.org>
diff --git a/Documentation/hwmon/thmc50 b/Documentation/hwmon/thmc50
new file mode 100644
index 000000000000..9639ca93d559
--- /dev/null
+++ b/Documentation/hwmon/thmc50
@@ -0,0 +1,74 @@
+Kernel driver thmc50
+=====================
+
+Supported chips:
+  * Analog Devices ADM1022
+    Prefix: 'adm1022'
+    Addresses scanned: I2C 0x2c - 0x2e
+    Datasheet: http://www.analog.com/en/prod/0,2877,ADM1022,00.html
+  * Texas Instruments THMC50
+    Prefix: 'thmc50'
+    Addresses scanned: I2C 0x2c - 0x2e
+    Datasheet: http://focus.ti.com/docs/prod/folders/print/thmc50.html
+
+Author: Krzysztof Helt <krzysztof.h1@wp.pl>
+
+This driver was derived from the 2.4 kernel thmc50.c source file.
+
+Credits:
+  thmc50.c (2.4 kernel):
+        Frodo Looijaard <frodol@dds.nl>
+        Philip Edelbrock <phil@netroedge.com>
+
+Module Parameters
+-----------------
+
+* adm1022_temp3: short array
+  List of adapter,address pairs to force chips into ADM1022 mode with
+  second remote temperature. This does not work for original THMC50 chips.
+
+Description
+-----------
+
+The THMC50 implements: an internal temperature sensor, support for an
+external diode-type temperature sensor (compatible w/ the diode sensor inside
+many processors), and a controllable fan/analog_out DAC. For the temperature
+sensors, limits can be set through the appropriate Overtemperature Shutdown
+register and Hysteresis register. Each value can be set and read to half-degree
+accuracy.  An alarm is issued (usually to a connected LM78) when the
+temperature gets higher then the Overtemperature Shutdown value; it stays on
+until the temperature falls below the Hysteresis value. All temperatures are in
+degrees Celsius, and are guaranteed within a range of -55 to +125 degrees.
+
+The THMC50 only updates its values each 1.5 seconds; reading it more often
+will do no harm, but will return 'old' values.
+
+The THMC50 is usually used in combination with LM78-like chips, to measure
+the temperature of the processor(s).
+
+The ADM1022 works the same as THMC50 but it is faster (5 Hz instead of
+1 Hz for THMC50). It can be also put in a new mode to handle additional
+remote temperature sensor. The driver use the mode set by BIOS by default.
+
+In case the BIOS is broken and the mode is set incorrectly, you can force
+the mode with additional remote temperature with adm1022_temp3 parameter.
+A typical symptom of wrong setting is a fan forced to full speed.
+
+Driver Features
+---------------
+
+The driver provides up to three temperatures:
+
+temp1           -- internal
+temp2           -- remote
+temp3           -- 2nd remote only for ADM1022
+
+pwm1            -- fan speed (0 = stop, 255 = full)
+pwm1_mode       -- always 0 (DC mode)
+
+The value of 0 for pwm1 also forces FAN_OFF signal from the chip,
+so it stops fans even if the value 0 into the ANALOG_OUT register does not.
+
+The driver was tested on Compaq AP550 with two ADM1022 chips (one works
+in the temp3 mode), five temperature readings and two fans.
+
diff --git a/Documentation/ja_JP/HOWTO b/Documentation/ja_JP/HOWTO
index b2446a090870..9f08dab1e75b 100644
--- a/Documentation/ja_JP/HOWTO
+++ b/Documentation/ja_JP/HOWTO
@@ -1,23 +1,24 @@
-NOTE:
-This is Japanese translated version of "Documentation/HOWTO".
-This one is maintained by Tsugikazu Shibata <tshibata@ab.jp.nec.com>
-and JF Project team <www.linux.or.jp/JF>.
-If you find difference with original file or problem in translation,
-please contact maintainer of this file or JF project.
-
-Please also note that purpose of this file is easier to read for non
-English natives and not to be intended to fork. So, if you have any
-comments or updates of this file, please try to update Original(English)
-file at first.
-
-Last Updated: 2007/06/04
+NOTE:
+This is a version of Documentation/HOWTO translated into Japanese.
+This document is maintained by Tsugikazu Shibata <tshibata@ab.jp.nec.com>
+and the JF Project team <www.linux.or.jp/JF>.
+If you find any difference between this document and the original file
+or a problem with the translation,
+please contact the maintainer of this file or JF project.
+
+Please also note that the purpose of this file is to be easier to read
+for non English (read: Japanese) speakers and is not intended as a
+fork. So if you have any comments or updates for this file, please try
+to update the original English file first.
+
+Last Updated: 2007/07/18
 ==================================
 �れ��
-linux-2.6.21/Documentation/HOWTO
+linux-2.6.22/Documentation/HOWTO
 �和訳��。
 
 翻訳団体： JF プロジェクト < http://www.linux.or.jp/JF/ >
-翻訳日： 2007/06/04
+翻訳日： 2007/07/16
 翻訳者： Tsugikazu Shibata <tshibata at ab dot jp dot nec dot com>
 校正者： �倉�ん <nbh--mats at nifty dot com>
          �林 雅典�ん (Masanori Kobayasi) <zap03216 at nifty dot ne dot jp>
@@ -52,6 +53,7 @@ Linux カーãƒ�ル開発コミュニティã�¨å…±ã�«æ´»å‹•ã�™ã‚‹ã‚„り方を学ã�
 �����コミュニティ���今��������る������由�一部も
 説明�よ��試�����。
 
+
 カー�ル� 少��アーキテク�ャ�存部分�アセンブリ言語�書�れ��る
 以外�大部分� C 言語�書�れ����。C言語をよ��解���る���カー
 �ル開発者��必���。アーキテク�ャ���低レベル部分�開発を�る�
@@ -141,6 +143,7 @@ Linux カーãƒ�ルソースツリーã�¯å¹…広ã�„範囲ã�®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã‚’å�
      �れら�ルール�従���������を�証�る�����り��ん
      � (����パッ��内容�スタイル����精査を��る��)�
      ルール�従���れ�間�������������ょ�。
+
      ��他�パッ�を作る方法�����よ����記述�-
 
         "The Perfect Patch"
@@ -360,44 +363,42 @@ linux-kernel メーリングリストã�§å�Žé›†ã�•ã‚Œã�Ÿå¤šæ•°ã�®ãƒ‘ッãƒ�ã�¨å�Œæ
 
   git ツリー-
     - Kbuild �開発ツリー�Sam Ravnborg <sam@ravnborg.org>
-        kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git
+        git.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git
 
     - ACPI �開発ツリー� Len Brown <len.brown@intel.com>
-        kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
+        git.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
 
     - Block �開発ツリー�Jens Axboe <axboe@suse.de>
-        kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git
+        git.kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git
 
     - DRM �開発ツリー�Dave Airlie <airlied@linux.ie>
-        kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git
+        git.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git
 
     - ia64 �開発ツリー�Tony Luck <tony.luck@intel.com>
-        kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
-
-    - ieee1394 �開発ツリー�Jody McIntyre <scjody@modernduck.com>
-        kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394.git
+        git.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
 
     - infiniband, Roland Dreier <rolandd@cisco.com>
-        kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
+        git.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
 
     - libata, Jeff Garzik <jgarzik@pobox.com>
-        kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
+        git.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
 
     - �ットワークドライ�, Jeff Garzik <jgarzik@pobox.com>
-        kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
+        git.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
 
     - pcmcia, Dominik Brodowski <linux@dominikbrodowski.net>
-        kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
+        git.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
 
     - SCSI, James Bottomley <James.Bottomley@SteelEye.com>
-        kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
-
-  ��他� git カー�ルツリー� http://kernel.org/git �一覧表��り�
-  �。
+        git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
 
   quilt ツリー-
     - USB, PCI ドライ�コア� I2C, Greg Kroah-Hartman <gregkh@suse.de>
         kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+    - x86-64 � i386 �仲間 Andi Kleen <ak@suse.de>
+
+  ��他�カー�ルツリー� http://git.kernel.org/ � MAINTAINERS ファ
+  イル�一覧表��り��。
 
 �グレ�ート
 -------------
@@ -508,6 +509,7 @@ MAINTAINERS ファイルã�«ãƒªã‚¹ãƒˆã�Œã�‚ã‚Šã�¾ã�™ã�®ã�§å�‚ç…§ã�—ã�¦ã��ã� ã�•ã�
 �ん*。��自分�パッ��対��指摘�れ��題を全�修正�����れ�
 �����。
 
+
 カー�ルコミュニティ��業組織����
 -----------------------------------------------------------------
 
@@ -577,6 +579,7 @@ Linux カーãƒ�ルコミュニティã�¯ã€�一度ã�«å¤§é‡�ã�®ã‚³ãƒ¼ãƒ‰ã�®å¡Šã‚’å–
    ���500行�パッ���正����をレビュー�る��数時間��る�も
    �れ��ん(時間�パッ��サイズ���より指数関数�比例����り�
    �)
+
    ���パッ��何�������デ�ッグも��も簡���り��。パッ
    �を1個1個�り除������も大��パッ�を当��後�(���何��
    ������後�)解剖�る��比�れ���も簡���。
@@ -591,6 +594,7 @@ Linux カーãƒ�ルコミュニティã�¯ã€�一度ã�«å¤§é‡�ã�®ã‚³ãƒ¼ãƒ‰ã�®å¡Šã‚’å–
         �。先生�簡潔�最高�解を������。良�生徒��れを知��
         �り����最終解���中間作業を�出�る���決������
         �"
+
         カー�ル開発�も�れ�����。メンテナー��レビューア���
         �題を解決�る解�背後��る�考プロセスを���������ん。
         彼ら��純���や��解決方法を������。
diff --git a/Documentation/ja_JP/stable_api_nonsense.txt b/Documentation/ja_JP/stable_api_nonsense.txt
index b3f2b27f0881..7653b5cbfed2 100644
--- a/Documentation/ja_JP/stable_api_nonsense.txt
+++ b/Documentation/ja_JP/stable_api_nonsense.txt
@@ -1,17 +1,17 @@
 NOTE:
-This is a Japanese translated version of
-"Documentation/stable_api_nonsense.txt".
-This one is maintained by
-IKEDA, Munehiro <m-ikeda@ds.jp.nec.com>
-and JF Project team <http://www.linux.or.jp/JF/>.
-If you find difference with original file or problem in translation,
+This is a version of Documentation/stable_api_nonsense.txt into Japanese.
+This document is maintained by IKEDA, Munehiro <m-ikeda@ds.jp.nec.com>
+and the JF Project team <http://www.linux.or.jp/JF/>.
+If you find any difference between this document and the original file
+or a problem with the translation,
 please contact the maintainer of this file or JF project.
 
-Please also note that purpose of this file is easier to read for non
-English natives and not to be intended to fork. So, if you have any
-comments or updates of this file, please try to update
-Original(English) file at first.
+Please also note that the purpose of this file is to be easier to read
+for non English (read: Japanese) speakers and is not intended as a
+fork. So if you have any comments or updates of this file, please try
+to update the original English file first.
 
+Last Updated: 2007/07/18
 ==================================
 �れ��
 linux-2.6.22-rc4/Documentation/stable_api_nonsense.txt �和訳
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 1156653338fe..efdb42fd3fb8 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -41,7 +41,6 @@ parameter is applicable:
         EIDE    EIDE/ATAPI support is enabled.
         FB      The frame buffer device is enabled.
         HW      Appropriate hardware is enabled.
-        IA-32   IA-32 aka i386 architecture is enabled.
         IA-64   IA-64 architecture is enabled.
         IOSCHED More than one I/O scheduler is enabled.
         IP_PNP  IP DHCP, BOOTP, or RARP is enabled.
@@ -58,14 +57,14 @@ parameter is applicable:
         MDA     MDA console support is enabled.
         MOUSE   Appropriate mouse support is enabled.
         MSI     Message Signaled Interrupts (PCI).
-        MTD     MTD support is enabled.
+        MTD     MTD (Memory Technology Device) support is enabled.
         NET     Appropriate network support is enabled.
         NUMA    NUMA support is enabled.
         GENERIC_TIME The generic timeofday code is enabled.
         NFS     Appropriate NFS support is enabled.
         OSS     OSS sound support is enabled.
-        PV_OPS  A paravirtualized kernel
-        PARIDE  The ParIDE subsystem is enabled.
+        PV_OPS  A paravirtualized kernel is enabled.
+        PARIDE  The ParIDE (parallel port IDE) subsystem is enabled.
         PARISC  The PA-RISC architecture is enabled.
         PCI     PCI bus support is enabled.
         PCMCIA  The PCMCIA subsystem is enabled.
@@ -92,6 +91,7 @@ parameter is applicable:
         VT      Virtual terminal support is enabled.
         WDT     Watchdog support is enabled.
         XT      IBM PC/XT MFM hard disk support is enabled.
+        X86-32  X86-32, aka i386 architecture is enabled.
         X86-64  X86-64 architecture is enabled.
                         More X86-64 boot options can be found in
                         Documentation/x86_64/boot-options.txt .
@@ -123,10 +123,6 @@ and is between 256 and 4096 characters. It is defined in the file
 ./include/asm/setup.h as COMMAND_LINE_SIZE.
 
 
-        53c7xx=         [HW,SCSI] Amiga SCSI controllers
-                        See header of drivers/scsi/53c7xx.c.
-                        See also Documentation/scsi/ncr53c7xx.txt.
-
         acpi=           [HW,ACPI,X86-64,i386]
                         Advanced Configuration and Power Interface
                         Format: { force | off | ht | strict | noirq }
@@ -223,7 +219,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
         acpi_fake_ecdt  [HW,ACPI] Workaround failure due to BIOS lacking ECDT
 
-        acpi_pm_good    [IA-32,X86-64]
+        acpi_pm_good    [X86-32,X86-64]
                         Override the pmtimer bug detection: force the kernel
                         to assume that this machine's pmtimer latches its value
                         and always returns good values.
@@ -286,7 +282,8 @@ and is between 256 and 4096 characters. It is defined in the file
                         not play well with APC CPU idle - disable it if you have
                         APC and your system crashes randomly.
 
-        apic=           [APIC,i386] Change the output verbosity whilst booting
+        apic=           [APIC,i386] Advanced Programmable Interrupt Controller
+                        Change the output verbosity whilst booting
                         Format: { quiet (default) | verbose | debug }
                         Change the amount of debugging information output
                         when initialising the APIC and IO-APIC components.
@@ -360,7 +357,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
         c101=           [NET] Moxa C101 synchronous serial card
 
-        cachesize=      [BUGS=IA-32] Override level 2 CPU cache size detection.
+        cachesize=      [BUGS=X86-32] Override level 2 CPU cache size detection.
                         Sometimes CPU hardware bugs make them report the cache
                         size incorrectly. The kernel will attempt work arounds
                         to fix known problems, but for some CPUs it is not
@@ -379,7 +376,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         Value can be changed at runtime via
                                 /selinux/checkreqprot.
 
-        clock=          [BUGS=IA-32, HW] gettimeofday clocksource override.
+        clock=          [BUGS=X86-32, HW] gettimeofday clocksource override.
                         [Deprecated]
                         Forces specified clocksource (if available) to be used
                         when calculating gettimeofday(). If specified
@@ -397,7 +394,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         [ARM] imx_timer1,OSTS,netx_timer,mpu_timer2,
                                 pxa_timer,timer3,32k_counter,timer0_1
                         [AVR32] avr32
-                        [IA-32] pit,hpet,tsc,vmi-timer;
+                        [X86-32] pit,hpet,tsc,vmi-timer;
                                 scx200_hrt on Geode; cyclone on IBM x440
                         [MIPS] MIPS
                         [PARISC] cr16
@@ -417,7 +414,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         over the 8254 in addition to over the IO-APIC. The
                         kernel tries to set a sensible default.
 
-        hpet=           [IA-32,HPET] option to disable HPET and use PIT.
+        hpet=           [X86-32,HPET] option to disable HPET and use PIT.
                         Format: disable
 
         com20020=       [HW,NET] ARCnet - COM20020 chipset
@@ -554,7 +551,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
         dtc3181e=       [HW,SCSI]
 
-        earlyprintk=    [IA-32,X86-64,SH]
+        earlyprintk=    [X86-32,X86-64,SH]
                         earlyprintk=vga
                         earlyprintk=serial[,ttySn[,baudrate]]
 
@@ -592,7 +589,7 @@ and is between 256 and 4096 characters. It is defined in the file
         eisa_irq_edge=  [PARISC,HW]
                         See header of drivers/parisc/eisa.c.
 
-        elanfreq=       [IA-32]
+        elanfreq=       [X86-32]
                         See comment before function elanfreq_setup() in
                         arch/i386/kernel/cpu/cpufreq/elanfreq.c.
 
@@ -601,7 +598,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         See Documentation/block/as-iosched.txt and
                         Documentation/block/deadline-iosched.txt for details.
 
-        elfcorehdr=     [IA-32, X86_64]
+        elfcorehdr=     [X86-32, X86_64]
                         Specifies physical address of start of kernel core
                         image elf header. Generally kexec loader will
                         pass this option to capture kernel.
@@ -683,7 +680,7 @@ and is between 256 and 4096 characters. It is defined in the file
         hisax=          [HW,ISDN]
                         See Documentation/isdn/README.HiSax.
 
-        hugepages=      [HW,IA-32,IA-64] Maximal number of HugeTLB pages.
+        hugepages=      [HW,X86-32,IA-64] Maximal number of HugeTLB pages.
 
         i8042.direct    [HW] Put keyboard port into non-translated mode
         i8042.dumbkbd   [HW] Pretend that controller can only read data from
@@ -775,7 +772,8 @@ and is between 256 and 4096 characters. It is defined in the file
                         See Documentation/nfsroot.txt.
 
         ip2=            [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards
-                        See comment before ip2_setup() in drivers/char/ip2.c.
+                        See comment before ip2_setup() in
+                        drivers/char/ip2/ip2base.c.
 
         ips=            [HW,SCSI] Adaptec / IBM ServeRAID controller
                         See header of drivers/scsi/ips.c.
@@ -824,7 +822,7 @@ and is between 256 and 4096 characters. It is defined in the file
         js=             [HW,JOY] Analog joystick
                         See Documentation/input/joystick.txt.
 
-        kernelcore=nn[KMG]      [KNL,IA-32,IA-64,PPC,X86-64] This parameter
+        kernelcore=nn[KMG]      [KNL,X86-32,IA-64,PPC,X86-64] This parameter
                         specifies the amount of memory usable by the kernel
                         for non-movable allocations.  The requested amount is
                         spread evenly throughout all nodes in the system. The
@@ -840,7 +838,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         use the HighMem zone if it exists, and the Normal
                         zone if it does not.
 
-        movablecore=nn[KMG]     [KNL,IA-32,IA-64,PPC,X86-64] This parameter
+        movablecore=nn[KMG]     [KNL,X86-32,IA-64,PPC,X86-64] This parameter
                         is similar to kernelcore except it specifies the
                         amount of memory used for migratable allocations.
                         If both kernelcore and movablecore is specified,
@@ -852,28 +850,20 @@ and is between 256 and 4096 characters. It is defined in the file
 
         keepinitrd      [HW,ARM]
 
-        kstack=N        [IA-32,X86-64] Print N words from the kernel stack
+        kstack=N        [X86-32,X86-64] Print N words from the kernel stack
                         in oops dumps.
 
         l2cr=           [PPC]
 
-        lapic           [IA-32,APIC] Enable the local APIC even if BIOS
+        lapic           [X86-32,APIC] Enable the local APIC even if BIOS
                         disabled it.
 
-        lapic_timer_c2_ok       [IA-32,x86-64,APIC] trust the local apic timer in
+        lapic_timer_c2_ok       [X86-32,x86-64,APIC] trust the local apic timer in
                         C2 power state.
 
         lasi=           [HW,SCSI] PARISC LASI driver for the 53c700 chip
                         Format: addr:<io>,irq:<irq>
 
-        legacy_serial.force [HW,IA-32,X86-64]
-                        Probe for COM ports at legacy addresses even
-                        if PNPBIOS or ACPI should describe them.  This
-                        is for working around firmware defects.
-
-        llsc*=          [IA64] See function print_params() in
-                        arch/ia64/sn/kernel/llsc4.c.
-
         load_ramdisk=   [RAM] List of ramdisks to load from floppy
                         See Documentation/ramdisk.txt.
 
@@ -979,11 +969,11 @@ and is between 256 and 4096 characters. It is defined in the file
                         [SCSI] Maximum number of LUNs received.
                         Should be between 1 and 16384.
 
-        mca-pentium     [BUGS=IA-32]
+        mca-pentium     [BUGS=X86-32]
 
         mcatest=        [IA-64]
 
-        mce             [IA-32] Machine Check Exception
+        mce             [X86-32] Machine Check Exception
 
         md=             [HW] RAID subsystems devices and level
                         See Documentation/md.txt.
@@ -995,14 +985,14 @@ and is between 256 and 4096 characters. It is defined in the file
         mem=nn[KMG]     [KNL,BOOT] Force usage of a specific amount of memory
                         Amount of memory to be used when the kernel is not able
                         to see the whole system memory or for test.
-                        [IA-32] Use together with memmap= to avoid physical
+                        [X86-32] Use together with memmap= to avoid physical
                         address space collisions. Without memmap= PCI devices
                         could be placed at addresses belonging to unused RAM.
 
-        mem=nopentium   [BUGS=IA-32] Disable usage of 4MB pages for kernel
+        mem=nopentium   [BUGS=X86-32] Disable usage of 4MB pages for kernel
                         memory.
 
-        memmap=exactmap [KNL,IA-32,X86_64] Enable setting of an exact
+        memmap=exactmap [KNL,X86-32,X86_64] Enable setting of an exact
                         E820 memory map, as specified by the user.
                         Such memmap=exactmap lines can be constructed based on
                         BIOS output or other requirements. See the memmap=nn@ss
@@ -1046,7 +1036,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         <name>,<region-number>[,<base>,<size>,<buswidth>,<altbuswidth>]
 
         mtdparts=       [MTD]
-                        See drivers/mtd/cmdline.c.
+                        See drivers/mtd/cmdlinepart.c.
 
         mtouchusb.raw_coordinates=
                         [HW] Make the MicroTouch USB driver use raw coordinates
@@ -1088,9 +1078,9 @@ and is between 256 and 4096 characters. It is defined in the file
                         [NFS] set the maximum lifetime for idmapper cache
                         entries.
 
-        nmi_watchdog=   [KNL,BUGS=IA-32] Debugging features for SMP kernels
+        nmi_watchdog=   [KNL,BUGS=X86-32] Debugging features for SMP kernels
 
-        no387           [BUGS=IA-32] Tells the kernel to use the 387 maths
+        no387           [BUGS=X86-32] Tells the kernel to use the 387 maths
                         emulation library even if a 387 maths coprocessor
                         is present.
 
@@ -1121,17 +1111,17 @@ and is between 256 and 4096 characters. It is defined in the file
 
         noexec          [IA-64]
 
-        noexec          [IA-32,X86-64]
+        noexec          [X86-32,X86-64]
                         noexec=on: enable non-executable mappings (default)
                         noexec=off: disable nn-executable mappings
 
-        nofxsr          [BUGS=IA-32] Disables x86 floating point extended
+        nofxsr          [BUGS=X86-32] Disables x86 floating point extended
                         register save and restore. The kernel will only save
                         legacy floating-point registers on task switch.
 
         nohlt           [BUGS=ARM]
 
-        no-hlt          [BUGS=IA-32] Tells the kernel that the hlt
+        no-hlt          [BUGS=X86-32] Tells the kernel that the hlt
                         instruction doesn't work correctly and not to
                         use it.
 
@@ -1146,12 +1136,12 @@ and is between 256 and 4096 characters. It is defined in the file
                         Valid arguments: on, off
                         Default: on
 
-        noirqbalance    [IA-32,SMP,KNL] Disable kernel irq balancing
+        noirqbalance    [X86-32,SMP,KNL] Disable kernel irq balancing
 
-        noirqdebug      [IA-32] Disables the code which attempts to detect and
+        noirqdebug      [X86-32] Disables the code which attempts to detect and
                         disable unhandled interrupt sources.
 
-        no_timer_check  [IA-32,X86_64,APIC] Disables the code which tests for
+        no_timer_check  [X86-32,X86_64,APIC] Disables the code which tests for
                         broken timer IRQ sources.
 
         noisapnp        [ISAPNP] Disables ISA PnP code.
@@ -1163,20 +1153,20 @@ and is between 256 and 4096 characters. It is defined in the file
 
         nojitter        [IA64] Disables jitter checking for ITC timers.
 
-        nolapic         [IA-32,APIC] Do not enable or use the local APIC.
+        nolapic         [X86-32,APIC] Do not enable or use the local APIC.
 
-        nolapic_timer   [IA-32,APIC] Do not use the local APIC timer.
+        nolapic_timer   [X86-32,APIC] Do not use the local APIC timer.
 
         noltlbs         [PPC] Do not use large page/tlb entries for kernel
                         lowmem mapping on PPC40x.
 
         nomca           [IA-64] Disable machine check abort handling
 
-        nomce           [IA-32] Machine Check Exception
+        nomce           [X86-32] Machine Check Exception
 
-        noreplace-paravirt      [IA-32,PV_OPS] Don't patch paravirt_ops
+        noreplace-paravirt      [X86-32,PV_OPS] Don't patch paravirt_ops
 
-        noreplace-smp   [IA-32,SMP] Don't replace SMP instructions
+        noreplace-smp   [X86-32,SMP] Don't replace SMP instructions
                         with UP alternatives
 
         noresidual      [PPC] Don't use residual data on PReP machines.
@@ -1190,7 +1180,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
         nosbagart       [IA-64]
 
-        nosep           [BUGS=IA-32] Disables x86 SYSENTER/SYSEXIT support.
+        nosep           [BUGS=X86-32] Disables x86 SYSENTER/SYSEXIT support.
 
         nosmp           [SMP] Tells an SMP kernel to act as a UP kernel.
 
@@ -1198,7 +1188,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
         nosync          [HW,M68K] Disables sync negotiation for all devices.
 
-        notsc           [BUGS=IA-32] Disable Time Stamp Counter
+        notsc           [BUGS=X86-32] Disable Time Stamp Counter
 
         nousb           [USB] Disable the USB subsystem
 
@@ -1271,28 +1261,28 @@ and is between 256 and 4096 characters. It is defined in the file
                         See also Documentation/paride.txt.
 
         pci=option[,option...]  [PCI] various PCI subsystem options:
-                off             [IA-32] don't probe for the PCI bus
-                bios            [IA-32] force use of PCI BIOS, don't access
+                off             [X86-32] don't probe for the PCI bus
+                bios            [X86-32] force use of PCI BIOS, don't access
                                 the hardware directly. Use this if your machine
                                 has a non-standard PCI host bridge.
-                nobios          [IA-32] disallow use of PCI BIOS, only direct
+                nobios          [X86-32] disallow use of PCI BIOS, only direct
                                 hardware access methods are allowed. Use this
                                 if you experience crashes upon bootup and you
                                 suspect they are caused by the BIOS.
-                conf1           [IA-32] Force use of PCI Configuration
+                conf1           [X86-32] Force use of PCI Configuration
                                 Mechanism 1.
-                conf2           [IA-32] Force use of PCI Configuration
+                conf2           [X86-32] Force use of PCI Configuration
                                 Mechanism 2.
-                nommconf        [IA-32,X86_64] Disable use of MMCONFIG for PCI
+                nommconf        [X86-32,X86_64] Disable use of MMCONFIG for PCI
                                 Configuration
                 nomsi           [MSI] If the PCI_MSI kernel config parameter is
                                 enabled, this kernel boot option can be used to
                                 disable the use of MSI interrupts system-wide.
-                nosort          [IA-32] Don't sort PCI devices according to
+                nosort          [X86-32] Don't sort PCI devices according to
                                 order given by the PCI BIOS. This sorting is
                                 done to get a device order compatible with
                                 older kernels.
-                biosirq         [IA-32] Use PCI BIOS calls to get the interrupt
+                biosirq         [X86-32] Use PCI BIOS calls to get the interrupt
                                 routing table. These calls are known to be buggy
                                 on several machines and they hang the machine
                                 when used, but on other computers it's the only
@@ -1300,32 +1290,32 @@ and is between 256 and 4096 characters. It is defined in the file
                                 this option if the kernel is unable to allocate
                                 IRQs or discover secondary PCI buses on your
                                 motherboard.
-                rom             [IA-32] Assign address space to expansion ROMs.
+                rom             [X86-32] Assign address space to expansion ROMs.
                                 Use with caution as certain devices share
                                 address decoders between ROMs and other
                                 resources.
-                irqmask=0xMMMM  [IA-32] Set a bit mask of IRQs allowed to be
+                irqmask=0xMMMM  [X86-32] Set a bit mask of IRQs allowed to be
                                 assigned automatically to PCI devices. You can
                                 make the kernel exclude IRQs of your ISA cards
                                 this way.
-                pirqaddr=0xAAAAA        [IA-32] Specify the physical address
+                pirqaddr=0xAAAAA        [X86-32] Specify the physical address
                                 of the PIRQ table (normally generated
                                 by the BIOS) if it is outside the
                                 F0000h-100000h range.
-                lastbus=N       [IA-32] Scan all buses thru bus #N. Can be
+                lastbus=N       [X86-32] Scan all buses thru bus #N. Can be
                                 useful if the kernel is unable to find your
                                 secondary buses and you want to tell it
                                 explicitly which ones they are.
-                assign-busses   [IA-32] Always assign all PCI bus
+                assign-busses   [X86-32] Always assign all PCI bus
                                 numbers ourselves, overriding
                                 whatever the firmware may have done.
-                usepirqmask     [IA-32] Honor the possible IRQ mask stored
+                usepirqmask     [X86-32] Honor the possible IRQ mask stored
                                 in the BIOS $PIR table. This is needed on
                                 some systems with broken BIOSes, notably
                                 some HP Pavilion N5400 and Omnibook XE3
                                 notebooks. This will have no effect if ACPI
                                 IRQ routing is enabled.
-                noacpi          [IA-32] Do not use ACPI for IRQ routing
+                noacpi          [X86-32] Do not use ACPI for IRQ routing
                                 or for PCI scanning.
                 routeirq        Do IRQ routing for all PCI devices.
                                 This is normally done in pci_enable_device(),
@@ -1474,13 +1464,13 @@ and is between 256 and 4096 characters. It is defined in the file
                         Run specified binary instead of /init from the ramdisk,
                         used for early userspace startup. See initrd.
 
-        reboot=         [BUGS=IA-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
+        reboot=         [BUGS=X86-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
                         Format: <reboot_mode>[,<reboot_mode2>[,...]]
                         See arch/*/kernel/reboot.c or arch/*/kernel/process.c                   
 
         reserve=        [KNL,BUGS] Force the kernel to ignore some iomem area
 
-        reservetop=     [IA-32]
+        reservetop=     [X86-32]
                         Format: nn[KMG]
                         Reserves a hole at the top of the kernel virtual
                         address space.
@@ -1571,7 +1561,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         Value can be changed at runtime via
                         /selinux/compat_net.
 
-        serialnumber    [BUGS=IA-32]
+        serialnumber    [BUGS=X86-32]
 
         sg_def_reserved_size=   [SCSI]
 
@@ -1624,7 +1614,7 @@ and is between 256 and 4096 characters. It is defined in the file
         smart2=         [HW]
                         Format: <io1>[,<io2>[,...,<io8>]]
 
-        smp-alt-once    [IA-32,SMP] On a hotplug CPU system, only
+        smp-alt-once    [X86-32,SMP] On a hotplug CPU system, only
                         attempt to substitute SMP alternatives once at boot.
 
         smsc-ircc2.nopnp        [HW] Don't use PNP to discover SMC devices
@@ -1889,7 +1879,7 @@ and is between 256 and 4096 characters. It is defined in the file
         usbhid.mousepoll=
                         [USBHID] The interval which mice are to be polled at.
 
-        vdso=           [IA-32,SH,x86-64]
+        vdso=           [X86-32,SH,x86-64]
                         vdso=2: enable compat VDSO (default with COMPAT_VDSO)
                         vdso=1: enable VDSO (default)
                         vdso=0: disable VDSO mapping
@@ -1900,7 +1890,7 @@ and is between 256 and 4096 characters. It is defined in the file
         video=          [FB] Frame buffer configuration
                         See Documentation/fb/modedb.txt.
 
-        vga=            [BOOT,IA-32] Select a particular video mode
+        vga=            [BOOT,X86-32] Select a particular video mode
                         See Documentation/i386/boot.txt and
                         Documentation/svga.txt.
                         Use vga=ask for menu.
diff --git a/Documentation/keys.txt b/Documentation/keys.txt
index 81d9aa097298..947d57d53453 100644
--- a/Documentation/keys.txt
+++ b/Documentation/keys.txt
@@ -859,9 +859,8 @@ payload contents" for more information.
         void unregister_key_type(struct key_type *type);
 
 
-Under some circumstances, it may be desirable to desirable to deal with a
-bundle of keys.  The facility provides access to the keyring type for managing
-such a bundle:
+Under some circumstances, it may be desirable to deal with a bundle of keys.
+The facility provides access to the keyring type for managing such a bundle:
 
         struct key_type key_type_keyring;
 
diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt
index e44855513b3d..8ee49ee7c963 100644
--- a/Documentation/kobject.txt
+++ b/Documentation/kobject.txt
@@ -27,7 +27,6 @@ in detail, and briefly here:
 - kobjects      a simple object.
 - kset          a set of objects of a certain type.
 - ktype         a set of helpers for objects of a common type. 
-- subsystem     a controlling object for a number of ksets.
 
 
 The kobject infrastructure maintains a close relationship with the
@@ -54,13 +53,15 @@ embedded in larger data structures and replace fields they duplicate.
 1.2 Definition
 
 struct kobject {
+        const char              * k_name;
         char                    name[KOBJ_NAME_LEN];
-        atomic_t                refcount;
+        struct kref             kref;
         struct list_head        entry;
         struct kobject          * parent;
         struct kset             * kset;
         struct kobj_type        * ktype;
-        struct dentry           * dentry;
+        struct sysfs_dirent     * sd;
+        wait_queue_head_t       poll;
 };
 
 void kobject_init(struct kobject *);
@@ -137,8 +138,7 @@ If a kobject does not have a parent when it is registered, its parent
 becomes its dominant kset. 
 
 If a kobject does not have a parent nor a dominant kset, its directory
-is created at the top-level of the sysfs partition. This should only
-happen for kobjects that are embedded in a struct subsystem. 
+is created at the top-level of the sysfs partition.
 
 
 
@@ -150,10 +150,10 @@ A kset is a set of kobjects that are embedded in the same type.
 
 
 struct kset {
-        struct subsystem        * subsys;
         struct kobj_type        * ktype;
         struct list_head        list;
         struct kobject          kobj;
+        struct kset_uevent_ops  * uevent_ops;
 };
 
 
@@ -169,8 +169,7 @@ struct kobject * kset_find_obj(struct kset *, char *);
 
 
 The type that the kobjects are embedded in is described by the ktype
-pointer. The subsystem that the kobject belongs to is pointed to by the
-subsys pointer. 
+pointer.
 
 A kset contains a kobject itself, meaning that it may be registered in
 the kobject hierarchy and exported via sysfs. More importantly, the
@@ -209,6 +208,58 @@ the hierarchy.
 kset_find_obj() may be used to locate a kobject with a particular
 name. The kobject, if found, is returned. 
 
+There are also some helper functions which names point to the formerly
+existing "struct subsystem", whose functions have been taken over by
+ksets.
+
+
+decl_subsys(name,type,uevent_ops)
+
+Declares a kset named '<name>_subsys' of type <type> with
+uevent_ops <uevent_ops>. For example,
+
+decl_subsys(devices, &ktype_device, &device_uevent_ops);
+
+is equivalent to doing:
+
+struct kset devices_subsys = {
+     .kobj = {
+           .name = "devices",
+     },
+     .ktype = &ktype_devices,
+     .uevent_ops = &device_uevent_ops,
+};
+
+
+The objects that are registered with a subsystem that use the
+subsystem's default list must have their kset ptr set properly. These
+objects may have embedded kobjects or ksets. The
+following helpers make setting the kset easier:
+
+
+kobj_set_kset_s(obj,subsys)
+
+- Assumes that obj->kobj exists, and is a struct kobject.
+- Sets the kset of that kobject to the kset <subsys>.
+
+
+kset_set_kset_s(obj,subsys)
+
+- Assumes that obj->kset exists, and is a struct kset.
+- Sets the kset of the embedded kobject to the kset <subsys>.
+
+subsys_set_kset(obj,subsys)
+
+- Assumes obj->subsys exists, and is a struct subsystem.
+- Sets obj->subsys.kset.kobj.kset to the subsystem's embedded kset.
+
+void subsystem_init(struct kset *s);
+int subsystem_register(struct kset *s);
+void subsystem_unregister(struct kset *s);
+struct kset *subsys_get(struct kset *s);
+void kset_put(struct kset *s);
+
+These are just wrappers around the respective kset_* functions.
 
 2.3 sysfs
 
@@ -254,114 +305,3 @@ Instances of struct kobj_type are not registered; only referenced by
 the kset. A kobj_type may be referenced by an arbitrary number of
 ksets, as there may be disparate sets of identical objects. 
 
-
-
-4. subsystems
-
-4.1 Description
-
-A subsystem represents a significant entity of code that maintains an
-arbitrary number of sets of objects of various types. Since the number
-of ksets and the type of objects they contain are variable, a
-generic representation of a subsystem is minimal. 
-
-
-struct subsystem {
-        struct kset             kset;
-        struct rw_semaphore     rwsem;
-};
-
-int subsystem_register(struct subsystem *);
-void subsystem_unregister(struct subsystem *);
-
-struct subsystem * subsys_get(struct subsystem * s);
-void subsys_put(struct subsystem * s);
-
-
-A subsystem contains an embedded kset so:
-
-- It can be represented in the object hierarchy via the kset's
-  embedded kobject. 
-
-- It can maintain a default list of objects of one type. 
-
-Additional ksets may attach to the subsystem simply by referencing the
-subsystem before they are registered. (This one-way reference means
-that there is no way to determine the ksets that are attached to the
-subsystem.) 
-
-All ksets that are attached to a subsystem share the subsystem's R/W
-semaphore. 
-
-
-4.2 subsystem Programming Interface.
-
-The subsystem programming interface is simple and does not offer the
-flexibility that the kset and kobject programming interfaces do. They
-may be registered and unregistered, as well as reference counted. Each
-call forwards the calls to their embedded ksets (which forward the
-calls to their embedded kobjects).
-
-
-4.3 Helpers
-
-A number of macros are available to make dealing with subsystems and
-their embedded objects easier. 
-
-
-decl_subsys(name,type)
-
-Declares a subsystem named '<name>_subsys', with an embedded kset of
-type <type>. For example, 
-
-decl_subsys(devices,&ktype_devices);
-
-is equivalent to doing:
-
-struct subsystem device_subsys = {
-       .kset = {
-             .kobj = {
-                   .name = "devices",
-             },
-             .ktype = &ktype_devices,
-        }
-}; 
-
-
-The objects that are registered with a subsystem that use the
-subsystem's default list must have their kset ptr set properly. These
-objects may have embedded kobjects, ksets, or other subsystems. The
-following helpers make setting the kset easier: 
-
-
-kobj_set_kset_s(obj,subsys)
-
-- Assumes that obj->kobj exists, and is a struct kobject. 
-- Sets the kset of that kobject to the subsystem's embedded kset.
-
-
-kset_set_kset_s(obj,subsys)
-
-- Assumes that obj->kset exists, and is a struct kset.
-- Sets the kset of the embedded kobject to the subsystem's 
-  embedded kset. 
-
-subsys_set_kset(obj,subsys)
-
-- Assumes obj->subsys exists, and is a struct subsystem.
-- Sets obj->subsys.kset.kobj.kset to the subsystem's embedded kset.
-
-
-4.4 sysfs
-
-subsystems are represented in sysfs via their embedded kobjects. They
-follow the same rules as previously mentioned with no exceptions. They
-typically receive a top-level directory in sysfs, except when their
-embedded kobject is part of another kset, or the parent of the
-embedded kobject is explicitly set. 
-
-Note that the subsystem's embedded kset must be 'attached' to the
-subsystem itself in order to use its rwsem. This is done after
-kset_add() has been called. (Not before, because kset_add() uses its
-subsystem for a default parent if it doesn't already have one).
-
diff --git a/Documentation/spi/spidev_test.c b/Documentation/spi/spidev_test.c
new file mode 100644
index 000000000000..218e86215297
--- /dev/null
+++ b/Documentation/spi/spidev_test.c
@@ -0,0 +1,202 @@
+/*
+ * SPI testing utility (using spidev driver)
+ *
+ * Copyright (c) 2007  MontaVista Software, Inc.
+ * Copyright (c) 2007  Anton Vorontsov <avorontsov@ru.mvista.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.
+ *
+ * Cross-compile with cross-gcc -I/path/to/cross-kernel/include
+ */
+
+#include <stdint.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <linux/types.h>
+#include <linux/spi/spidev.h>
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
+static void pabort(const char *s)
+{
+        perror(s);
+        abort();
+}
+
+static char *device = "/dev/spidev1.1";
+static uint8_t mode;
+static uint8_t bits = 8;
+static uint32_t speed = 500000;
+static uint16_t delay;
+
+static void transfer(int fd)
+{
+        int ret;
+        uint8_t tx[] = {
+                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+                0x40, 0x00, 0x00, 0x00, 0x00, 0x95,
+                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+                0xDE, 0xAD, 0xBE, 0xEF, 0xBA, 0xAD,
+                0xF0, 0x0D,
+        };
+        uint8_t rx[ARRAY_SIZE(tx)] = {0, };
+        struct spi_ioc_transfer tr = {
+                .tx_buf = (unsigned long)tx,
+                .rx_buf = (unsigned long)rx,
+                .len = ARRAY_SIZE(tx),
+                .delay_usecs = delay,
+                .speed_hz = speed,
+                .bits_per_word = bits,
+        };
+
+        ret = ioctl(fd, SPI_IOC_MESSAGE(1), &tr);
+        if (ret == 1)
+                pabort("can't send spi message");
+
+        for (ret = 0; ret < ARRAY_SIZE(tx); ret++) {
+                if (!(ret % 6))
+                        puts("");
+                printf("%.2X ", rx[ret]);
+        }
+        puts("");
+}
+
+void print_usage(char *prog)
+{
+        printf("Usage: %s [-DsbdlHOLC3]\n", prog);
+        puts("  -D --device   device to use (default /dev/spidev1.1)\n"
+             "  -s --speed    max speed (Hz)\n"
+             "  -d --delay    delay (usec)\n"
+             "  -b --bpw      bits per word \n"
+             "  -l --loop     loopback\n"
+             "  -H --cpha     clock phase\n"
+             "  -O --cpol     clock polarity\n"
+             "  -L --lsb      least significant bit first\n"
+             "  -C --cs-high  chip select active high\n"
+             "  -3 --3wire    SI/SO signals shared\n");
+        exit(1);
+}
+
+void parse_opts(int argc, char *argv[])
+{
+        while (1) {
+                static struct option lopts[] = {
+                        { "device",  1, 0, 'D' },
+                        { "speed",   1, 0, 's' },
+                        { "delay",   1, 0, 'd' },
+                        { "bpw",     1, 0, 'b' },
+                        { "loop",    0, 0, 'l' },
+                        { "cpha",    0, 0, 'H' },
+                        { "cpol",    0, 0, 'O' },
+                        { "lsb",     0, 0, 'L' },
+                        { "cs-high", 0, 0, 'C' },
+                        { "3wire",   0, 0, '3' },
+                        { NULL, 0, 0, 0 },
+                };
+                int c;
+
+                c = getopt_long(argc, argv, "D:s:d:b:lHOLC3", lopts, NULL);
+
+                if (c == -1)
+                        break;
+
+                switch (c) {
+                case 'D':
+                        device = optarg;
+                        break;
+                case 's':
+                        speed = atoi(optarg);
+                        break;
+                case 'd':
+                        delay = atoi(optarg);
+                        break;
+                case 'b':
+                        bits = atoi(optarg);
+                        break;
+                case 'l':
+                        mode |= SPI_LOOP;
+                        break;
+                case 'H':
+                        mode |= SPI_CPHA;
+                        break;
+                case 'O':
+                        mode |= SPI_CPOL;
+                        break;
+                case 'L':
+                        mode |= SPI_LSB_FIRST;
+                        break;
+                case 'C':
+                        mode |= SPI_CS_HIGH;
+                        break;
+                case '3':
+                        mode |= SPI_3WIRE;
+                        break;
+                default:
+                        print_usage(argv[0]);
+                        break;
+                }
+        }
+}
+
+int main(int argc, char *argv[])
+{
+        int ret = 0;
+        int fd;
+
+        parse_opts(argc, argv);
+
+        fd = open(device, O_RDWR);
+        if (fd < 0)
+                pabort("can't open device");
+
+        /*
+         * spi mode
+         */
+        ret = ioctl(fd, SPI_IOC_WR_MODE, &mode);
+        if (ret == -1)
+                pabort("can't set spi mode");
+
+        ret = ioctl(fd, SPI_IOC_RD_MODE, &mode);
+        if (ret == -1)
+                pabort("can't get spi mode");
+
+        /*
+         * bits per word
+         */
+        ret = ioctl(fd, SPI_IOC_WR_BITS_PER_WORD, &bits);
+        if (ret == -1)
+                pabort("can't set bits per word");
+
+        ret = ioctl(fd, SPI_IOC_RD_BITS_PER_WORD, &bits);
+        if (ret == -1)
+                pabort("can't get bits per word");
+
+        /*
+         * max speed hz
+         */
+        ret = ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed);
+        if (ret == -1)
+                pabort("can't set max speed hz");
+
+        ret = ioctl(fd, SPI_IOC_RD_MAX_SPEED_HZ, &speed);
+        if (ret == -1)
+                pabort("can't get max speed hz");
+
+        printf("spi mode: %d\n", mode);
+        printf("bits per word: %d\n", bits);
+        printf("max speed: %d Hz (%d KHz)\n", speed, speed/1000);
+
+        transfer(fd);
+
+        close(fd);
+
+        return ret;
+}
diff --git a/Documentation/stable_api_nonsense.txt b/Documentation/stable_api_nonsense.txt
index a2afca3b2bab..847b342b7b20 100644
--- a/Documentation/stable_api_nonsense.txt
+++ b/Documentation/stable_api_nonsense.txt
@@ -10,7 +10,7 @@ kernel to userspace interfaces.  The kernel to userspace interface is
 the one that application programs use, the syscall interface.  That
 interface is _very_ stable over time, and will not break.  I have old
 programs that were built on a pre 0.9something kernel that still work
-just fine on the latest 2.6 kernel release.  This interface is the one
+just fine on the latest 2.6 kernel release.  That interface is the one
 that users and application programmers can count on being stable.
 
 
diff --git a/Documentation/sysfs-rules.txt b/Documentation/sysfs-rules.txt
index 42861bb0bc9b..80ef562160bb 100644
--- a/Documentation/sysfs-rules.txt
+++ b/Documentation/sysfs-rules.txt
@@ -1,19 +1,18 @@
 Rules on how to access information in the Linux kernel sysfs
 
-The kernel exported sysfs exports internal kernel implementation-details
+The kernel-exported sysfs exports internal kernel implementation details
 and depends on internal kernel structures and layout. It is agreed upon
 by the kernel developers that the Linux kernel does not provide a stable
 internal API. As sysfs is a direct export of kernel internal
-structures, the sysfs interface can not provide a stable interface eighter,
+structures, the sysfs interface cannot provide a stable interface either;
 it may always change along with internal kernel changes.
 
 To minimize the risk of breaking users of sysfs, which are in most cases
 low-level userspace applications, with a new kernel release, the users
-of sysfs must follow some rules to use an as abstract-as-possible way to
+of sysfs must follow some rules to use an as-abstract-as-possible way to
 access this filesystem. The current udev and HAL programs already
 implement this and users are encouraged to plug, if possible, into the
-abstractions these programs provide instead of accessing sysfs
-directly.
+abstractions these programs provide instead of accessing sysfs directly.
 
 But if you really do want or need to access sysfs directly, please follow
 the following rules and then your programs should work with future
@@ -25,22 +24,22 @@ versions of the sysfs interface.
   implementation details in its own API. Therefore it is not better than
   reading directories and opening the files yourself.
   Also, it is not actively maintained, in the sense of reflecting the
-  current kernel-development. The goal of providing a stable interface
-  to sysfs has failed, it causes more problems, than it solves. It
+  current kernel development. The goal of providing a stable interface
+  to sysfs has failed; it causes more problems than it solves. It
   violates many of the rules in this document.
 
 - sysfs is always at /sys
   Parsing /proc/mounts is a waste of time. Other mount points are a
   system configuration bug you should not try to solve. For test cases,
   possibly support a SYSFS_PATH environment variable to overwrite the
-  applications behavior, but never try to search for sysfs. Never try
+  application's behavior, but never try to search for sysfs. Never try
   to mount it, if you are not an early boot script.
 
 - devices are only "devices"
   There is no such thing like class-, bus-, physical devices,
   interfaces, and such that you can rely on in userspace. Everything is
   just simply a "device". Class-, bus-, physical, ... types are just
-  kernel implementation details, which should not be expected by
+  kernel implementation details which should not be expected by
   applications that look for devices in sysfs.
 
   The properties of a device are:
@@ -48,11 +47,11 @@ versions of the sysfs interface.
       - identical to the DEVPATH value in the event sent from the kernel
         at device creation and removal
       - the unique key to the device at that point in time
-      - the kernels path to the device-directory without the leading
+      - the kernel's path to the device directory without the leading
         /sys, and always starting with with a slash
       - all elements of a devpath must be real directories. Symlinks
         pointing to /sys/devices must always be resolved to their real
-        target, and the target path must be used to access the device.
+        target and the target path must be used to access the device.
         That way the devpath to the device matches the devpath of the
         kernel used at event time.
       - using or exposing symlink values as elements in a devpath string
@@ -73,17 +72,17 @@ versions of the sysfs interface.
         link
       - it is retrieved by reading the "driver"-link and using only the
         last element of the target path
-      - devices which do not have "driver"-link, just do not have a
-        driver; copying the driver value in a child device context, is a
+      - devices which do not have "driver"-link just do not have a
+        driver; copying the driver value in a child device context is a
         bug in the application
 
     o attributes
-      - the files in the device directory or files below a subdirectories
+      - the files in the device directory or files below subdirectories
         of the same device directory
       - accessing attributes reached by a symlink pointing to another device,
         like the "device"-link, is a bug in the application
 
-  Everything else is just a kernel driver-core implementation detail,
+  Everything else is just a kernel driver-core implementation detail
   that should not be assumed to be stable across kernel releases.
 
 - Properties of parent devices never belong into a child device.
@@ -91,25 +90,25 @@ versions of the sysfs interface.
   context properties. If the device 'eth0' or 'sda' does not have a
   "driver"-link, then this device does not have a driver. Its value is empty.
   Never copy any property of the parent-device into a child-device. Parent
-  device-properties may change dynamically without any notice to the
+  device properties may change dynamically without any notice to the
   child device.
 
-- Hierarchy in a single device-tree
+- Hierarchy in a single device tree
   There is only one valid place in sysfs where hierarchy can be examined
   and this is below: /sys/devices.
-  It is planned, that all device directories will end up in the tree
+  It is planned that all device directories will end up in the tree
   below this directory.
 
 - Classification by subsystem
   There are currently three places for classification of devices:
   /sys/block, /sys/class and /sys/bus. It is planned that these will
-  not contain any device-directories themselves, but only flat lists of
+  not contain any device directories themselves, but only flat lists of
   symlinks pointing to the unified /sys/devices tree.
   All three places have completely different rules on how to access
   device information. It is planned to merge all three
-  classification-directories into one place at /sys/subsystem,
-  following the layout of the bus-directories. All buses and
-  classes, including the converted block-subsystem, will show up
+  classification directories into one place at /sys/subsystem,
+  following the layout of the bus directories. All buses and
+  classes, including the converted block subsystem, will show up
   there.
   The devices belonging to a subsystem will create a symlink in the
   "devices" directory at /sys/subsystem/<name>/devices.
@@ -121,38 +120,38 @@ versions of the sysfs interface.
   subsystem name.
 
   Assuming /sys/class/<subsystem> and /sys/bus/<subsystem>, or
-  /sys/block and /sys/class/block are not interchangeable, is a bug in
+  /sys/block and /sys/class/block are not interchangeable is a bug in
   the application.
 
 - Block
-  The converted block-subsystem at /sys/class/block, or
+  The converted block subsystem at /sys/class/block or
   /sys/subsystem/block will contain the links for disks and partitions
-  at the same level, never in a hierarchy. Assuming the block-subsytem to
-  contain only disks and not partition-devices in the same flat list is
+  at the same level, never in a hierarchy. Assuming the block subsytem to
+  contain only disks and not partition devices in the same flat list is
   a bug in the application.
 
 - "device"-link and <subsystem>:<kernel name>-links
   Never depend on the "device"-link. The "device"-link is a workaround
-  for the old layout, where class-devices are not created in
-  /sys/devices/ like the bus-devices. If the link-resolving of a
-  device-directory does not end in /sys/devices/, you can use the
+  for the old layout, where class devices are not created in
+  /sys/devices/ like the bus devices. If the link-resolving of a
+  device directory does not end in /sys/devices/, you can use the
   "device"-link to find the parent devices in /sys/devices/. That is the
-  single valid use of the "device"-link, it must never appear in any
+  single valid use of the "device"-link; it must never appear in any
   path as an element. Assuming the existence of the "device"-link for
   a device in /sys/devices/ is a bug in the application.
   Accessing /sys/class/net/eth0/device is a bug in the application.
 
   Never depend on the class-specific links back to the /sys/class
   directory.  These links are also a workaround for the design mistake
-  that class-devices are not created in /sys/devices. If a device
+  that class devices are not created in /sys/devices. If a device
   directory does not contain directories for child devices, these links
   may be used to find the child devices in /sys/class. That is the single
-  valid use of these links, they must never appear in any path as an
+  valid use of these links; they must never appear in any path as an
   element. Assuming the existence of these links for devices which are
-  real child device directories in the /sys/devices tree, is a bug in
+  real child device directories in the /sys/devices tree is a bug in
   the application.
 
-  It is planned to remove all these links when when all class-device
+  It is planned to remove all these links when all class device
   directories live in /sys/devices.
 
 - Position of devices along device chain can change.
@@ -161,6 +160,5 @@ versions of the sysfs interface.
   the chain. You must always request the parent device you are looking for
   by its subsystem value. You need to walk up the chain until you find
   the device that matches the expected subsystem. Depending on a specific
-  position of a parent device, or exposing relative paths, using "../" to
-  access the chain of parents, is a bug in the application.
-
+  position of a parent device or exposing relative paths using "../" to
+  access the chain of parents is a bug in the application.
diff --git a/MAINTAINERS b/MAINTAINERS
index babd00b0c65c..1e15a0edc313 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -387,21 +387,6 @@ P:	Jaya Kumar
 M:      jayalk@intworks.biz
 S:      Maintained
 
-ARM26 ARCHITECTURE
-P:      Ian Molton
-M:      spyro@f2s.com
-S:      Maintained
-
-ARM26/ARCHIMEDES
-P:      Ian Molton
-M:      spyro@f2s.com
-S:      Maintained
-
-ARM26/A5000
-P:      John Appleby
-M:      john@dnsworld.co.uk
-S:      Maintained
-
 ARM MFM AND FLOPPY DRIVERS
 P:      Ian Molton
 M:      spyro@f2s.com
@@ -771,6 +756,14 @@ L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
 W:      http://blackfin.uclinux.org
 S:      Supported
 
+BLACKFIN WATCHDOG DRIVER
+P:      Mike Frysinger
+M:      michael.frysinger@analog.com
+M:      vapier.adi@gmail.com
+L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+W:      http://blackfin.uclinux.org
+S:      Supported
+
 BAYCOM/HDLCDRV DRIVERS FOR AX.25
 P:      Thomas Sailer
 M:      t.sailer@alumni.ethz.ch
@@ -2171,6 +2164,8 @@ W:	http://www.kerneljanitors.org/
 S:      Maintained
 
 KERNEL NFSD
+P:      J. Bruce Fields
+M:      bfields@fieldses.org
 P:      Neil Brown
 M:      neilb@suse.de
 L:      nfs@lists.sourceforge.net
@@ -3674,11 +3669,9 @@ W:	http://www.auk.cx/tms380tr/
 S:      Maintained
 
 TULIP NETWORK DRIVER
-P:      Valerie Henson
-M:      val@nmt.edu
 L:      tulip-users@lists.sourceforge.net
 W:      http://sourceforge.net/projects/tulip/
-S:      Maintained
+S:      Orphan
 
 TUN/TAP driver
 P:      Maxim Krasnyansky
diff --git a/arch/alpha/boot/Makefile b/arch/alpha/boot/Makefile
index e1ae14cd2b4e..cd143887380a 100644
--- a/arch/alpha/boot/Makefile
+++ b/arch/alpha/boot/Makefile
@@ -104,7 +104,7 @@ OBJ_bootlx   := $(obj)/head.o $(obj)/main.o
 OBJ_bootph   := $(obj)/head.o $(obj)/bootp.o
 OBJ_bootpzh  := $(obj)/head.o $(obj)/bootpz.o $(obj)/misc.o
 
-$(obj)/bootloader: $(obj)/bootloader.lds $(OBJ_bootlx) FORCE
+$(obj)/bootloader: $(obj)/bootloader.lds $(OBJ_bootlx) $(LIBS_Y) FORCE
         $(call if_changed,ld)
 
 $(obj)/bootpheader: $(obj)/bootloader.lds $(OBJ_bootph) $(LIBS_Y) FORCE
diff --git a/arch/alpha/boot/main.c b/arch/alpha/boot/main.c
index 90ed55b662a8..89f3be071ae5 100644
--- a/arch/alpha/boot/main.c
+++ b/arch/alpha/boot/main.c
@@ -132,7 +132,7 @@ static inline long load(long dev, unsigned long addr, unsigned long count)
         if (result)
                 srm_printk("Boot file specification (%s) not implemented\n",
                        bootfile);
-        return callback_read(dev, count, addr, boot_size/512 + 1);
+        return callback_read(dev, count, (void *)addr, boot_size/512 + 1);
 }
 
 /*
diff --git a/arch/alpha/boot/tools/mkbb.c b/arch/alpha/boot/tools/mkbb.c
index 632a7fd6d7dc..1185778e6a1e 100644
--- a/arch/alpha/boot/tools/mkbb.c
+++ b/arch/alpha/boot/tools/mkbb.c
@@ -11,6 +11,7 @@
 
 #include <fcntl.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <stdio.h>
 
 /* Minimal definition of disklabel, so we don't have to include
@@ -114,7 +115,7 @@ int main(int argc, char ** argv)
     nread = read(fd, &bootloader_image, sizeof(bootblock));
     if(nread != sizeof(bootblock)) {
         perror("lxboot read");
-        fprintf(stderr, "expected %d, got %d\n", sizeof(bootblock), nread);
+        fprintf(stderr, "expected %zd, got %d\n", sizeof(bootblock), nread);
         exit(0);
     }
 
@@ -122,7 +123,7 @@ int main(int argc, char ** argv)
     nread = read(dev, &bootblock_from_disk, sizeof(bootblock));
     if(nread != sizeof(bootblock)) {
         perror("bootblock read");
-        fprintf(stderr, "expected %d, got %d\n", sizeof(bootblock), nread);
+        fprintf(stderr, "expected %zd, got %d\n", sizeof(bootblock), nread);
         exit(0);
     }
 
diff --git a/arch/alpha/boot/tools/objstrip.c b/arch/alpha/boot/tools/objstrip.c
index 96154e768a20..ef1838230291 100644
--- a/arch/alpha/boot/tools/objstrip.c
+++ b/arch/alpha/boot/tools/objstrip.c
@@ -144,7 +144,7 @@ main (int argc, char *argv[])
 #ifdef __ELF__
     elf = (struct elfhdr *) buf;
 
-    if (elf->e_ident[0] == 0x7f && strncmp(elf->e_ident + 1, "ELF", 3) == 0) {
+    if (elf->e_ident[0] == 0x7f && strncmp((char *)elf->e_ident + 1, "ELF", 3) == 0) {
         if (elf->e_type != ET_EXEC) {
             fprintf(stderr, "%s: %s is not an ELF executable\n",
                     prog_name, inname);
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 550f4907d613..5e6da47779a4 100644
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -267,8 +267,7 @@ callback_init(void * kernel_end)
 /*
  * paging_init() sets up the memory map.
  */
-void
-paging_init(void)
+void __init paging_init(void)
 {
         unsigned long zones_size[MAX_NR_ZONES] = {0, };
         unsigned long dma_pfn, high_pfn;
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c8569e862c6b..d6145298a325 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -991,8 +991,6 @@ source "drivers/pnp/Kconfig"
 
 source "drivers/block/Kconfig"
 
-source "drivers/acorn/block/Kconfig"
-
 if PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX \
         || ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \
         || ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index c589dc3ecd1a..33e6cc2ffd3b 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -46,7 +46,7 @@ fast_work_pending:
 work_pending:
         tst     r1, #_TIF_NEED_RESCHED
         bne     work_resched
-        tst     r1, #_TIF_NOTIFY_RESUME | _TIF_SIGPENDING
+        tst     r1, #_TIF_SIGPENDING
         beq     no_work_pending
         mov     r0, sp                          @ 'regs'
         mov     r2, why                         @ 'syscall'
diff --git a/arch/arm/nwfpe/Makefile b/arch/arm/nwfpe/Makefile
index ed7b26bf73f5..b29178c0414e 100644
--- a/arch/arm/nwfpe/Makefile
+++ b/arch/arm/nwfpe/Makefile
@@ -9,5 +9,4 @@ nwfpe-y				+= fpa11.o fpa11_cpdo.o fpa11_cpdt.o \
                                    softfloat.o single_cpdo.o double_cpdo.o
 
 nwfpe-$(CONFIG_FPE_NWFPE_XP)    += extended_cpdo.o
-nwfpe-$(CONFIG_CPU_26)          += entry26.o
 nwfpe-$(CONFIG_CPU_32)          += entry.o
diff --git a/arch/arm/nwfpe/entry26.S b/arch/arm/nwfpe/entry26.S
deleted file mode 100644
index 3e6fb5d21d64..000000000000
--- a/arch/arm/nwfpe/entry26.S
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.COM, 1998
-    (c) Philip Blundell 1998-1999
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <asm/asm-offsets.h>
-
-/* This is the kernel's entry point into the floating point emulator.
-It is called from the kernel with code similar to this:
-
-        mov     fp, #0
-        teqp    pc, #PSR_I_BIT | SVC_MODE
-        ldr     r4, .LC2
-        ldr     pc, [r4]                @ Call FP module USR entry point
-
-The kernel expects the emulator to return via one of two possible
-points of return it passes to the emulator.  The emulator, if
-successful in its emulation, jumps to ret_from_exception and the
-kernel takes care of returning control from the trap to the user code.
-If the emulator is unable to emulate the instruction, it returns to
-fpundefinstr and the kernel halts the user program with a core dump.
-
-This routine does four things:
-
-1) It saves SP into a variable called userRegisters.  The kernel has
-created a struct pt_regs on the stack and saved the user registers
-into it.  See /usr/include/asm/proc/ptrace.h for details.  The
-emulator code uses userRegisters as the base of an array of words from
-which the contents of the registers can be extracted.
-
-2) It locates the FP emulator work area within the TSS structure and
-points `fpa11' to it.
-
-3) It calls EmulateAll to emulate a floating point instruction.
-EmulateAll returns 1 if the emulation was successful, or 0 if not.
-
-4) If an instruction has been emulated successfully, it looks ahead at
-the next instruction.  If it is a floating point instruction, it
-executes the instruction, without returning to user space.  In this
-way it repeatedly looks ahead and executes floating point instructions
-until it encounters a non floating point instruction, at which time it
-returns via _fpreturn.
-
-This is done to reduce the effect of the trap overhead on each
-floating point instructions.  GCC attempts to group floating point
-instructions to allow the emulator to spread the cost of the trap over
-several floating point instructions.  */
-
-        .globl  nwfpe_enter
-nwfpe_enter:
-        mov     sl, sp
-        ldr     r5, [sp, #60]           @ get contents of PC
-        bic     r5, r5, #0xfc000003
-        ldr     r0, [r5, #-4]           @ get actual instruction into r0
-        bl      EmulateAll              @ emulate the instruction
-1:      cmp     r0, #0                  @ was emulation successful
-        beq     fpundefinstr            @ no, return failure
-
-next:
-.Lx1:   ldrt    r6, [r5], #4            @ get the next instruction and
-                                        @ increment PC
-
-        and     r2, r6, #0x0F000000     @ test for FP insns
-        teq     r2, #0x0C000000
-        teqne   r2, #0x0D000000
-        teqne   r2, #0x0E000000
-        bne     ret_from_exception      @ return ok if not a fp insn
-
-        ldr     r9, [sp, #60]           @ get new condition codes
-        and     r9, r9, #0xfc000003
-        orr     r7, r5, r9
-        str     r7, [sp, #60]           @ update PC copy in regs
-
-        mov     r0, r6                  @ save a copy
-        mov     r1, r9                  @ fetch the condition codes
-        bl      checkCondition          @ check the condition
-        cmp     r0, #0                  @ r0 = 0 ==> condition failed
-
-        @ if condition code failed to match, next insn
-        beq     next                    @ get the next instruction;
-
-        mov     r0, r6                  @ prepare for EmulateAll()
-        adr     lr, 1b
-        orr     lr, lr, #3
-        b       EmulateAll              @ if r0 != 0, goto EmulateAll
-
-.Lret:  b       ret_from_exception      @ let the user eat segfaults
-        
-        @ We need to be prepared for the instruction at .Lx1 to fault.
-        @ Emit the appropriate exception gunk to fix things up.
-        .section __ex_table,"a"
-        .align  3
-        .long   .Lx1
-        ldr     lr, [lr, $(.Lret - .Lx1)/4]
-        .previous
diff --git a/arch/arm26/ACKNOWLEDGEMENTS b/arch/arm26/ACKNOWLEDGEMENTS
deleted file mode 100644
index 0a17a45110e7..000000000000
--- a/arch/arm26/ACKNOWLEDGEMENTS
+++ /dev/null
@@ -1,29 +0,0 @@
-The work in this architecture (ARM26) is that of a great many people.
-
-This is what has happened:
-
-I [Ian Molton] have been trying to repair the ARM26 architecture support, but it has become an impossible task whilst it is still merged with the ARM32 (arch/arm) code. The ARM26 code is too different to be sensible to keep with the ARM32 code now, and Russell King really doesnt have the time to maintain the ARM26 code. Add to that that most ARM32 developers dont know about or care about ARM26 when writing patches, and you have a reall mess.
-
-As a result, I've split it off into a new architecture of its own. I've named it arm26 since these CPUs have only a 26 bit address space, unlike the other ARMs.
-
-The upheaval in moving around so many source files and chopping out vasty ammounts of cruft was enormous, and the copyright of many files is sometimes unclear. Because of this, I am writing this, in order that no-one is left out / misaccredited / blamed for any of the code.
-
-People I KNOW have made major contributions to the code:
-
-David Alan Gilbert (former maintainer of ARM26 bits)
-Philip Blundell
-Russell King
-Keith Owens
-
-also thanks to Nicholas Pitre for hints, and for the basis or our XIP support.
-
-Currently maintaing the code are
-
-Ian Molton (Maintainer / Archimedes)
-John Appleby (kernel / A5K)
-
-If anyone has a problem with attributions in header files / source files, please do contact me to straighten things out.
-
-Ian Molton (aka spyro)  -  ARM26 maintainer
-spyro@f2s.com
-
diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig
deleted file mode 100644
index 9044f33299f7..000000000000
--- a/arch/arm26/Kconfig
+++ /dev/null
@@ -1,253 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Linux Kernel Configuration"
-
-config ARM
-        bool
-        default y
-
-config ARM26
-        bool
-        default y
-
-config MMU
-        bool
-        default y
-
-config NO_DMA
-        def_bool y
-
-config ARCH_ACORN
-        bool
-        default y
-
-config CPU_26
-        bool
-        default y
-
-config FIQ
-        bool
-        default y
-
-# 9 = 512 pages 8 = 256 pages 7 = 128 pages
-config FORCE_MAX_ZONEORDER
-        int
-        default 9
-
-config RWSEM_GENERIC_SPINLOCK
-        bool
-        default y
-
-config RWSEM_XCHGADD_ALGORITHM
-        bool
-
-config ARCH_HAS_ILOG2_U32
-        bool
-        default n
-
-config ARCH_HAS_ILOG2_U64
-        bool
-        default n
-
-config GENERIC_HWEIGHT
-        bool
-        default y
-
-config GENERIC_CALIBRATE_DELAY
-        bool
-        default y
-
-config ZONE_DMA
-        bool
-        default y
-
-config GENERIC_ISA_DMA
-        bool
-
-config ARCH_MAY_HAVE_PC_FDC
-        bool
-
-source "init/Kconfig"
-
-
-menu "System Type"
-
-choice
-        prompt "Archimedes/A5000 Implementations"
-
-config ARCH_ARC
-        bool "Archimedes"
-        help
-          Say Y to support the Acorn Archimedes.
-
-          The Acorn Archimedes was an personal computer based on an 8MHz ARM2
-          processor, released in 1987.  It supported up to 16MB of RAM in
-          later models and floppy, harddisc, ethernet etc.
-
-config ARCH_A5K
-        bool "A5000"
-        select ARCH_MAY_HAVE_PC_FDC
-        help
-          Say Y here to support the Acorn A5000.
-
-          Linux can support the
-          internal IDE disk and CD-ROM interface, serial and parallel port,
-          and the floppy drive.  Note that on some A5000s the floppy is
-          plugged into the wrong socket on the motherboard.
-
-config PAGESIZE_16
-        bool "2MB physical memory (broken)"
-        help
-          Say Y here if your Archimedes or A5000 system has only 2MB of
-          memory, otherwise say N.  The resulting kernel will not run on a
-          machine with 4MB of memory.
-endchoice
-endmenu
-
-config ISA_DMA_API
-        bool
-        default y
-
-menu "General setup"
-
-# Compressed boot loader in ROM.  Yes, we really want to ask about
-# TEXT and BSS so we preserve their values in the config files.
-config ZBOOT_ROM
-        bool "Compressed boot loader in ROM/flash"
-        help
-          Say Y here if you intend to execute your compressed kernel image (zImage)
-          directly from ROM or flash.  If unsure, say N.
-
-config ZBOOT_ROM_TEXT
-        depends on ZBOOT_ROM
-        hex "Compressed ROM boot loader base address"
-        default "0"
-        help
-          The base address for zImage.  Unless you have special requirements, you
-          should not change this value.
-
-config ZBOOT_ROM_BSS
-        depends on ZBOOT_ROM
-        hex "Compressed ROM boot loader BSS address"
-        default "0"
-        help
-          The base address of 64KiB of read/write memory, which must be available
-          while the decompressor is running.  Unless you have special requirements,
-          you should not change this value.
-
-config XIP_KERNEL
-        bool "Execute In Place (XIP) kernel image"
-        help
-          Select this option to create a kernel that can be programmed into
-          the OS ROMs.
-
-comment "At least one math emulation must be selected"
-
-config FPE_NWFPE
-        tristate "NWFPE math emulation"
-        ---help---
-          Say Y to include the NWFPE floating point emulator in the kernel.
-          This is necessary to run most binaries. Linux does not currently
-          support floating point hardware so you need to say Y here even if
-          your machine has an FPA or floating point co-processor module.
-
-          It is also possible to say M to build the emulator as a module
-          (nwfpe) or indeed to leave it out altogether. However, unless you
-          know what you are doing this can easily render your machine
-          unbootable. Saying Y is the safe option.
-
-          You may say N here if you are going to load the Acorn FPEmulator
-          early in the bootup.
-
-source "fs/Kconfig.binfmt"
-
-config PREEMPT
-        bool "Preemptible Kernel (EXPERIMENTAL)"
-        depends on CPU_32 && EXPERIMENTAL
-        help
-          This option reduces the latency of the kernel when reacting to
-          real-time or interactive events by allowing a low priority process to
-          be preempted even if it is in kernel mode executing a system call.
-          This allows applications to run more reliably even when the system is
-          under load.
-
-          Say Y here if you are building a kernel for a desktop, embedded
-          or real-time system.  Say N if you are unsure.
-
-config ARTHUR
-        tristate "RISC OS personality"
-        depends on CPU_32
-        help
-          Say Y here to include the kernel code necessary if you want to run
-          Acorn RISC OS/Arthur binaries under Linux. This code is still very
-          experimental; if this sounds frightening, say N and sleep in peace.
-          You can also say M here to compile this support as a module (which
-          will be called arthur).
-
-config CMDLINE
-        string "Default kernel command string"
-        default ""
-        help
-          On some architectures (EBSA110 and CATS), there is currently no way
-          for the boot loader to pass arguments to the kernel. For these
-          architectures, you should supply some command-line options at build
-          time by entering them here. As a minimum, you should specify the
-          memory size and the root device (e.g., mem=64M root=/dev/nfs).
-
-source "mm/Kconfig"
-
-endmenu
-
-source "net/Kconfig"
-
-source "drivers/base/Kconfig"
-
-source "drivers/parport/Kconfig"
-
-source "drivers/pnp/Kconfig"
-
-source "drivers/block/Kconfig"
-
-source "drivers/md/Kconfig"
-
-source "drivers/net/Kconfig"
-
-source "drivers/ide/Kconfig"
-
-source "drivers/scsi/Kconfig"
-
-source "drivers/isdn/Kconfig"
-
-#
-# input before char - char/joystick depends on it. As does USB.
-#
-source "drivers/input/Kconfig"
-
-source "drivers/char/Kconfig"
-
-source "drivers/media/Kconfig"
-
-source "fs/Kconfig"
-
-source "drivers/video/Kconfig"
-
-if ARCH_ACORN
-
-source "sound/Kconfig"
-
-endif
-
-source "drivers/misc/Kconfig"
-
-source "drivers/usb/Kconfig"
-
-source "arch/arm26/Kconfig.debug"
-
-source "security/Kconfig"
-
-source "crypto/Kconfig"
-
-source "lib/Kconfig"
diff --git a/arch/arm26/Kconfig.debug b/arch/arm26/Kconfig.debug
deleted file mode 100644
index 611fc86503fc..000000000000
--- a/arch/arm26/Kconfig.debug
+++ /dev/null
@@ -1,50 +0,0 @@
-menu "Kernel hacking"
-
-source "lib/Kconfig.debug"
-
-# RMK wants arm kernels compiled with frame pointers so hardwire this to y.
-# If you know what you are doing and are willing to live without stack
-# traces, you can get a slightly smaller kernel by setting this option to
-# n, but then RMK will have to kill you ;).
-config FRAME_POINTER
-        bool
-        default y
-        help
-          If you say N here, the resulting kernel will be slightly smaller and
-          faster. However, when a problem occurs with the kernel, the
-          information that is reported is severely limited. Most people
-          should say Y here.
-
-config DEBUG_USER
-        bool "Verbose user fault messages"
-        help
-          When a user program crashes due to an exception, the kernel can
-          print a brief message explaining what the problem was. This is
-          sometimes helpful for debugging but serves no purpose on a
-          production system. Most people should say N here.
-
-config DEBUG_WAITQ
-        bool "Wait queue debugging"
-        depends on DEBUG_KERNEL
-
-config DEBUG_ERRORS
-        bool "Verbose kernel error messages"
-        depends on DEBUG_KERNEL
-        help
-          This option controls verbose debugging information which can be
-          printed when the kernel detects an internal error. This debugging
-          information is useful to kernel hackers when tracking down problems,
-          but mostly meaningless to other people. It's safe to say Y unless
-          you are concerned with the code size or don't want to see these
-          messages.
-
-# These options are only for real kernel hackers who want to get their hands dirty.
-config DEBUG_LL
-        bool "Kernel low-level debugging functions"
-        depends on DEBUG_KERNEL
-        help
-          Say Y here to include definitions of printascii, printchar, printhex
-          in the kernel.  This is helpful if you are debugging code that
-          executes before the console is initialized.
-
-endmenu
diff --git a/arch/arm26/Makefile b/arch/arm26/Makefile
deleted file mode 100644
index fe91eda98a94..000000000000
--- a/arch/arm26/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# arch/arm26/Makefile
-#
-# This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies.
-#
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
-# Copyright (C) 1995-2001 by Russell King
-# Copyright (c) 2004 Ian Molton
-
-LDFLAGS_vmlinux :=-p -X
-CPPFLAGS_vmlinux.lds = -DTEXTADDR=$(TEXTADDR) -DDATAADDR=$(DATAADDR)
-OBJCOPYFLAGS    :=-O binary -R .note -R .comment -S
-GZFLAGS         :=-9
-
-ifeq ($(CONFIG_FRAME_POINTER),y)
-CFLAGS          +=-fno-omit-frame-pointer -mno-sched-prolog
-endif
-
-CFLAGS_BOOT     :=-mapcs-26 -mcpu=arm3 -msoft-float -Uarm
-CFLAGS          +=-mapcs-26 -mcpu=arm3 -msoft-float -Uarm
-AFLAGS          +=-mapcs-26 -mcpu=arm3 -msoft-float
-
-ifeq ($(CONFIG_XIP_KERNEL),y)
-  TEXTADDR       := 0x03880000
-  DATAADDR       := 0x02080000
-else
-  TEXTADDR       := 0x02080000
-  DATAADDR       := .
-endif
-
-head-y          := arch/arm26/kernel/head.o arch/arm26/kernel/init_task.o
-
-ifeq ($(incdir-y),)
-incdir-y :=
-endif
-INCDIR   :=
-  
-export  MACHINE TEXTADDR GZFLAGS CFLAGS_BOOT
-
-# If we have a machine-specific directory, then include it in the build.
-core-y                          += arch/arm26/kernel/ arch/arm26/mm/ arch/arm26/machine/
-core-$(CONFIG_FPE_NWFPE)        += arch/arm26/nwfpe/
-
-libs-y                          += arch/arm26/lib/
-
-# Default target when executing plain make
-all: zImage
-
-boot := arch/arm26/boot
-
-PHONY += maketools FORCE
-maketools: FORCE
-
-
-# Convert bzImage to zImage
-bzImage: vmlinux
-        $(Q)$(MAKE) $(build)=$(boot) $(boot)/zImage
-
-zImage Image bootpImage xipImage: vmlinux
-        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
-
-zinstall install: vmlinux
-        $(Q)$(MAKE) $(build)=$(boot) $@
-
-# We use MRPROPER_FILES and CLEAN_FILES now
-archclean:
-        $(Q)$(MAKE) $(clean)=$(boot)
-
-# My testing targets (that short circuit a few dependencies)
-zImg:;  $(Q)$(MAKE) $(build)=$(boot) $(boot)/zImage
-Img:;   $(Q)$(MAKE) $(build)=$(boot) $(boot)/Image
-bp:;    $(Q)$(MAKE) $(build)=$(boot) $(boot)/bootpImage
-i:;     $(Q)$(MAKE) $(build)=$(boot) install
-zi:;    $(Q)$(MAKE) $(build)=$(boot) zinstall
-
-#
-# Configuration targets.  Use these to select a
-# configuration for your architecture
-%_config:
-        @( \
-        CFG=$(@:_config=); \
-        if [ -f arch/arm26/def-configs/$$CFG ]; then \
-          [ -f .config ] && mv -f .config .config.old; \
-          cp arch/arm26/def-configs/$$CFG .config; \
-          echo "*** Default configuration for $$CFG installed"; \
-          echo "*** Next, you may run 'make oldconfig'"; \
-        else \
-          echo "$$CFG does not exist"; \
-        fi; \
-        )
-
-define archhelp
-  echo  '* zImage        - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
-  echo  '  Image         - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'
-  echo  '  bootpImage    - Combined zImage and initial RAM disk' 
-  echo  '  xipImage      - eXecute In Place capable image for ROM use (arch/$(ARCH)/boot/xipImage)'
-  echo  '  initrd        - Create an initial image'
-  echo  '  install       - Install uncompressed kernel'
-  echo  '  zinstall      - Install compressed kernel'
-  echo  '                  Install using (your) ~/bin/installkernel or'
-  echo  '                  (distribution) /sbin/installkernel or'
-  echo  '                  install to $$(INSTALL_PATH) and run lilo'
-endef
diff --git a/arch/arm26/boot/Makefile b/arch/arm26/boot/Makefile
deleted file mode 100644
index 68acb7b0d47f..000000000000
--- a/arch/arm26/boot/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# arch/arm26/boot/Makefile
-#
-# This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies.
-#
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
-# Copyright (C) 1995-2002 Russell King
-#
-
-# Note: the following conditions must always be true:
-#   ZRELADDR == virt_to_phys(TEXTADDR)
-#   PARAMS_PHYS must be with 4MB of ZRELADDR
-#   INITRD_PHYS must be in RAM
-
-   zreladdr-y           := 0x02080000 
-params_phys-y           := 0x0207c000
-initrd_phys-y           := 0x02180000
-
-ZRELADDR    := 0x02080000
-ZTEXTADDR   := 0x0207c000
-PARAMS_PHYS := $(params_phys-y)
-INITRD_PHYS := 0x02180000
-
-# We now have a PIC decompressor implementation.  Decompressors running
-# from RAM should not define ZTEXTADDR.  Decompressors running directly
-# from ROM or Flash must define ZTEXTADDR (preferably via the config)
-# FIXME: Previous assignment to ztextaddr-y is lost here. See SHARK
-ifeq ($(CONFIG_ZBOOT_ROM),y)
-ZTEXTADDR       := $(CONFIG_ZBOOT_ROM_TEXT)
-ZBSSADDR        := $(CONFIG_ZBOOT_ROM_BSS)
-else
-ZTEXTADDR       := 0
-ZBSSADDR        := ALIGN(4)
-endif
-
-export  ZTEXTADDR ZBSSADDR ZRELADDR INITRD_PHYS PARAMS_PHYS
-
-targets := Image zImage bootpImage xipImage
-
-$(obj)/Image: vmlinux FORCE
-        $(call if_changed,objcopy)
-        @echo '  Kernel: $@ is ready'
-
-$(obj)/zImage:  $(obj)/compressed/vmlinux FORCE
-        $(call if_changed,objcopy)
-        @echo '  Kernel: $@ is ready'
-
-$(obj)/compressed/vmlinux: vmlinux FORCE
-        $(Q)$(MAKE) $(build)=$(obj)/compressed $@
-
-ifeq ($(CONFIG_XIP_KERNEL),y)
-$(obj)/xipImage: vmlinux FORCE
-#       $(OBJCOPY) -S -O binary -R .data -R .comment vmlinux vmlinux-text.bin
-# FIXME - where has .pci_fixup crept in from?
-        $(OBJCOPY) -S -O binary -R .data -R .pci_fixup -R .comment vmlinux vmlinux-text.bin
-        $(OBJCOPY) -S -O binary -R .init -R .text -R __ex_table -R .pci_fixup -R __ksymtab -R __ksymtab_gpl -R __kcrctab -R __kcrctab_gpl -R __param -R .comment vmlinux vmlinux-data.bin
-        cat vmlinux-text.bin vmlinux-data.bin > $@
-        $(RM) -f vmlinux-text.bin vmlinux-data.bin
-        @echo '  Kernel: $@ is ready'
-endif
-
-PHONY += initrd
-initrd:
-        @test "$(INITRD_PHYS)" != "" || \
-        (echo This machine does not support INITRD; exit -1)
-        @test "$(INITRD)" != "" || \
-        (echo You must specify INITRD; exit -1)
-
-install: $(obj)/Image
-        $(CONFIG_SHELL) $(obj)/install.sh \
-        $(KERNELRELEASE) \
-        $(obj)/Image System.map "$(INSTALL_PATH)"
-
-zinstall: $(obj)/zImage
-        $(CONFIG_SHELL) $(obj)/install.sh \
-        $(KERNELRELEASE) \
-        $(obj)/zImage System.map "$(INSTALL_PATH)"
-
-subdir-     := compressed
diff --git a/arch/arm26/boot/compressed/Makefile b/arch/arm26/boot/compressed/Makefile
deleted file mode 100644
index b1d9ddebbe74..000000000000
--- a/arch/arm26/boot/compressed/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# linux/arch/arm26/boot/compressed/Makefile
-#
-# create a compressed vmlinuz image from the original vmlinux
-#
-# Note! ZTEXTADDR, ZBSSADDR and ZRELADDR are now exported
-# from arch/arm26/boot/Makefile
-#
-
-HEAD    = head.o
-OBJS    = misc.o
-FONTC   = drivers/video/console/font_acorn_8x8.c
-
-OBJS            += ll_char_wr.o font.o
-CFLAGS_misc.o   := -DPARAMS_PHYS=$(PARAMS_PHYS)
-
-targets       := vmlinux vmlinux.lds piggy piggy.gz piggy.o font.o head.o $(OBJS)
-
-SEDFLAGS        = s/TEXT_START/$(ZTEXTADDR)/;s/LOAD_ADDR/$(ZRELADDR)/;s/BSS_START/$(ZBSSADDR)/
-
-EXTRA_CFLAGS  := $(CFLAGS_BOOT) -fpic
-EXTRA_AFLAGS  := -traditional
-
-LDFLAGS_vmlinux := -p -X \
-        $(shell $(CC) $(CFLAGS)) -T
-
-$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \
-                $(addprefix $(obj)/, $(OBJS)) FORCE
-        $(call if_changed,ld)
-        @:
-
-
-$(obj)/piggy: vmlinux FORCE
-        $(call if_changed,objcopy)
-
-$(obj)/piggy.gz: $(obj)/piggy FORCE
-        $(call if_changed,gzip)
-
-LDFLAGS_piggy.o := -r -b binary
-$(obj)/piggy.o:  $(obj)/piggy.gz FORCE
-        $(call if_changed,ld)
-
-$(obj)/font.o: $(FONTC)
-        $(CC) $(CFLAGS) -Dstatic= -c $(FONTC) -o $(obj)/font.o
-
-$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in Makefile arch/arm26/boot/Makefile .config
-        @sed "$(SEDFLAGS)" < $< > $@
-
-$(obj)/misc.o: $(obj)/misc.c $(obj)/uncompress.h lib/inflate.c
-
diff --git a/arch/arm26/boot/compressed/head.S b/arch/arm26/boot/compressed/head.S
deleted file mode 100644
index 2a2cda36d83b..000000000000
--- a/arch/arm26/boot/compressed/head.S
+++ /dev/null
@@ -1,516 +0,0 @@
-/*
- *  linux/arch/arm26/boot/compressed/head.S
- *
- *  Copyright (C) 1996-2002 Russell King
- *
- * 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/linkage.h>
-
-/*
- * Debugging stuff
- *
- * Note that these macros must not contain any code which is not
- * 100% relocatable.  Any attempt to do so will result in a crash.
- * Please select one of the following when turning on debugging.
- */
-
-                .macro  kputc,val
-                mov     r0, \val
-                bl      putc
-                .endm
-
-                .macro  kphex,val,len
-                mov     r0, \val
-                mov     r1, #\len
-                bl      phex
-                .endm
-
-                .macro  debug_reloc_start
-                .endm
-
-                .macro  debug_reloc_end
-                .endm
-
-                .section ".start", #alloc, #execinstr
-/*
- * sort out different calling conventions
- */
-                .align
-start:
-                .type   start,#function
-                .rept   8
-                mov     r0, r0
-                .endr
-
-                b       1f
-                .word   0x016f2818              @ Magic numbers to help the loader
-                .word   start                   @ absolute load/run zImage address
-                .word   _edata                  @ zImage end address
-1:              mov     r7, r1                  @ save architecture ID
-                mov     r8, #0                  @ save r0
-                teqp    pc, #0x0c000003         @ turn off interrupts
-
-                .text
-                adr     r0, LC0
-                ldmia   r0, {r1, r2, r3, r4, r5, r6, ip, sp}
-                subs    r0, r0, r1              @ calculate the delta offset
-
-                teq     r0, #0                  @ if delta is zero, we're
-                beq     not_relocated           @ running at the address we
-                                                @ were linked at.
-
-                add     r2, r2, r0              @ different address, so we
-                add     r3, r3, r0              @ need to fix up various
-                add     r5, r5, r0              @ pointers.
-                add     r6, r6, r0
-                add     ip, ip, r0
-                add     sp, sp, r0
-
-1:              ldr     r1, [r6, #0]            @ relocate entries in the GOT
-                add     r1, r1, r0              @ table.  This fixes up the
-                str     r1, [r6], #4            @ C references.
-                cmp     r6, ip
-                blo     1b
-
-not_relocated:  mov     r0, #0
-1:              str     r0, [r2], #4            @ clear bss
-                str     r0, [r2], #4
-                str     r0, [r2], #4
-                str     r0, [r2], #4
-                cmp     r2, r3
-                blo     1b
-
-                bl      cache_on
-
-                mov     r1, sp                  @ malloc space above stack
-                add     r2, sp, #0x10000        @ 64k max
-
-/*
- * Check to see if we will overwrite ourselves.
- *   r4 = final kernel address
- *   r5 = start of this image
- *   r2 = end of malloc space (and therefore this image)
- * We basically want:
- *   r4 >= r2 -> OK
- *   r4 + image length <= r5 -> OK
- */
-                cmp     r4, r2
-                bhs     wont_overwrite
-                add     r0, r4, #4096*1024      @ 4MB largest kernel size
-                cmp     r0, r5
-                bls     wont_overwrite
-
-                mov     r5, r2                  @ decompress after malloc space
-                mov     r0, r5
-                mov     r3, r7
-                bl      decompress_kernel
-
-                add     r0, r0, #127
-                bic     r0, r0, #127            @ align the kernel length
-/*
- * r0     = decompressed kernel length
- * r1-r3  = unused
- * r4     = kernel execution address
- * r5     = decompressed kernel start
- * r6     = processor ID
- * r7     = architecture ID
- * r8-r14 = unused
- */
-                add     r1, r5, r0              @ end of decompressed kernel
-                adr     r2, reloc_start
-                ldr     r3, LC1
-                add     r3, r2, r3
-1:              ldmia   r2!, {r8 - r13}         @ copy relocation code
-                stmia   r1!, {r8 - r13}
-                ldmia   r2!, {r8 - r13}
-                stmia   r1!, {r8 - r13}
-                cmp     r2, r3
-                blo     1b
-
-                bl      cache_clean_flush
-                add     pc, r5, r0              @ call relocation code
-
-/*
- * We're not in danger of overwriting ourselves.  Do this the simple way.
- *
- * r4     = kernel execution address
- * r7     = architecture ID
- */
-wont_overwrite: mov     r0, r4
-                mov     r3, r7
-                bl      decompress_kernel
-                b       call_kernel
-
-                .type   LC0, #object
-LC0:            .word   LC0                     @ r1
-                .word   __bss_start             @ r2
-                .word   _end                    @ r3
-                .word   _load_addr              @ r4
-                .word   _start                  @ r5
-                .word   _got_start              @ r6
-                .word   _got_end                @ ip
-                .word   user_stack+4096         @ sp
-LC1:            .word   reloc_end - reloc_start
-                .size   LC0, . - LC0
-
-/*
- * Turn on the cache.  We need to setup some page tables so that we
- * can have both the I and D caches on.
- *
- * We place the page tables 16k down from the kernel execution address,
- * and we hope that nothing else is using it.  If we're using it, we
- * will go pop!
- *
- * On entry,
- *  r4 = kernel execution address
- *  r6 = processor ID
- *  r7 = architecture number
- *  r8 = run-time address of "start"
- * On exit,
- *  r1, r2, r3, r8, r9, r12 corrupted
- * This routine must preserve:
- *  r4, r5, r6, r7
- */
-                .align  5
-cache_on:       mov     r3, #8                  @ cache_on function
-                b       call_cache_fn
-
-__setup_mmu:    sub     r3, r4, #16384          @ Page directory size
-                bic     r3, r3, #0xff           @ Align the pointer
-                bic     r3, r3, #0x3f00
-/*
- * Initialise the page tables, turning on the cacheable and bufferable
- * bits for the RAM area only.
- */
-                mov     r0, r3
-                mov     r8, r0, lsr #18
-                mov     r8, r8, lsl #18         @ start of RAM
-                add     r9, r8, #0x10000000     @ a reasonable RAM size
-                mov     r1, #0x12
-                orr     r1, r1, #3 << 10
-                add     r2, r3, #16384
-1:              cmp     r1, r8                  @ if virt > start of RAM
-                orrhs   r1, r1, #0x0c           @ set cacheable, bufferable
-                cmp     r1, r9                  @ if virt > end of RAM
-                bichs   r1, r1, #0x0c           @ clear cacheable, bufferable
-                str     r1, [r0], #4            @ 1:1 mapping
-                add     r1, r1, #1048576
-                teq     r0, r2
-                bne     1b
-/*
- * If ever we are running from Flash, then we surely want the cache
- * to be enabled also for our execution instance...  We map 2MB of it
- * so there is no map overlap problem for up to 1 MB compressed kernel.
- * If the execution is in RAM then we would only be duplicating the above.
- */
-                mov     r1, #0x1e
-                orr     r1, r1, #3 << 10
-                mov     r2, pc, lsr #20
-                orr     r1, r1, r2, lsl #20
-                add     r0, r3, r2, lsl #2
-                str     r1, [r0], #4
-                add     r1, r1, #1048576
-                str     r1, [r0]
-                mov     pc, lr
-
-__armv4_cache_on:
-                mov     r12, lr
-                bl      __setup_mmu
-                mov     r0, #0
-                mcr     p15, 0, r0, c7, c10, 4  @ drain write buffer
-                mcr     p15, 0, r0, c8, c7, 0   @ flush I,D TLBs
-                mrc     p15, 0, r0, c1, c0, 0   @ read control reg
-                orr     r0, r0, #0x1000         @ I-cache enable
-                orr     r0, r0, #0x0030
-                b       __common_cache_on
-
-__arm6_cache_on:
-                mov     r12, lr
-                bl      __setup_mmu
-                mov     r0, #0
-                mcr     p15, 0, r0, c7, c0, 0   @ invalidate whole cache v3
-                mcr     p15, 0, r0, c5, c0, 0   @ invalidate whole TLB v3
-                mov     r0, #0x30
-__common_cache_on:
-#ifndef DEBUG
-                orr     r0, r0, #0x000d         @ Write buffer, mmu
-#endif
-                mov     r1, #-1
-                mcr     p15, 0, r3, c2, c0, 0   @ load page table pointer
-                mcr     p15, 0, r1, c3, c0, 0   @ load domain access control
-                mcr     p15, 0, r0, c1, c0, 0   @ load control register
-                mov     pc, r12
-
-/*
- * All code following this line is relocatable.  It is relocated by
- * the above code to the end of the decompressed kernel image and
- * executed there.  During this time, we have no stacks.
- *
- * r0     = decompressed kernel length
- * r1-r3  = unused
- * r4     = kernel execution address
- * r5     = decompressed kernel start
- * r6     = processor ID
- * r7     = architecture ID
- * r8-r14 = unused
- */
-                .align  5
-reloc_start:    add     r8, r5, r0
-                debug_reloc_start
-                mov     r1, r4
-1:
-                .rept   4
-                ldmia   r5!, {r0, r2, r3, r9 - r13}     @ relocate kernel
-                stmia   r1!, {r0, r2, r3, r9 - r13}
-                .endr
-
-                cmp     r5, r8
-                blo     1b
-                debug_reloc_end
-
-call_kernel:    bl      cache_clean_flush
-                bl      cache_off
-                mov     r0, #0
-                mov     r1, r7                  @ restore architecture number
-                mov     pc, r4                  @ call kernel
-
-/*
- * Here follow the relocatable cache support functions for the
- * various processors.  This is a generic hook for locating an
- * entry and jumping to an instruction at the specified offset
- * from the start of the block.  Please note this is all position
- * independent code.
- *
- *  r1  = corrupted
- *  r2  = corrupted
- *  r3  = block offset
- *  r6  = corrupted
- *  r12 = corrupted
- */
-
-call_cache_fn:  adr     r12, proc_types
-                mrc     p15, 0, r6, c0, c0      @ get processor ID
-1:              ldr     r1, [r12, #0]           @ get value
-                ldr     r2, [r12, #4]           @ get mask
-                eor     r1, r1, r6              @ (real ^ match)
-                tst     r1, r2                  @       & mask
-                addeq   pc, r12, r3             @ call cache function
-                add     r12, r12, #4*5
-                b       1b
-
-/*
- * Table for cache operations.  This is basically:
- *   - CPU ID match
- *   - CPU ID mask
- *   - 'cache on' method instruction
- *   - 'cache off' method instruction
- *   - 'cache flush' method instruction
- *
- * We match an entry using: ((real_id ^ match) & mask) == 0
- *
- * Writethrough caches generally only need 'on' and 'off'
- * methods.  Writeback caches _must_ have the flush method
- * defined.
- */
-                .type   proc_types,#object
-proc_types:
-                .word   0x41560600              @ ARM6/610
-                .word   0xffffffe0
-                b       __arm6_cache_off        @ works, but slow
-                b       __arm6_cache_off
-                mov     pc, lr
-@               b       __arm6_cache_on         @ untested
-@               b       __arm6_cache_off
-@               b       __armv3_cache_flush
-
-                .word   0x41007000              @ ARM7/710
-                .word   0xfff8fe00
-                b       __arm7_cache_off
-                b       __arm7_cache_off
-                mov     pc, lr
-
-                .word   0x41807200              @ ARM720T (writethrough)
-                .word   0xffffff00
-                b       __armv4_cache_on
-                b       __armv4_cache_off
-                mov     pc, lr
-
-                .word   0x41129200              @ ARM920T
-                .word   0xff00fff0
-                b       __armv4_cache_on
-                b       __armv4_cache_off
-                b       __armv4_cache_flush
-
-                .word   0x4401a100              @ sa110 / sa1100
-                .word   0xffffffe0
-                b       __armv4_cache_on
-                b       __armv4_cache_off
-                b       __armv4_cache_flush
-
-                .word   0x6901b110              @ sa1110
-                .word   0xfffffff0
-                b       __armv4_cache_on
-                b       __armv4_cache_off
-                b       __armv4_cache_flush
-
-                .word   0x69050000              @ xscale
-                .word   0xffff0000
-                b       __armv4_cache_on
-                b       __armv4_cache_off
-                b       __armv4_cache_flush
-
-                .word   0                       @ unrecognised type
-                .word   0
-                mov     pc, lr
-                mov     pc, lr
-                mov     pc, lr
-
-                .size   proc_types, . - proc_types
-
-/*
- * Turn off the Cache and MMU.  ARMv3 does not support
- * reading the control register, but ARMv4 does.
- *
- * On entry,  r6 = processor ID
- * On exit,   r0, r1, r2, r3, r12 corrupted
- * This routine must preserve: r4, r6, r7
- */
-                .align  5
-cache_off:      mov     r3, #12                 @ cache_off function
-                b       call_cache_fn
-
-__armv4_cache_off:
-                mrc     p15, 0, r0, c1, c0
-                bic     r0, r0, #0x000d
-                mcr     p15, 0, r0, c1, c0      @ turn MMU and cache off
-                mov     r0, #0
-                mcr     p15, 0, r0, c7, c7      @ invalidate whole cache v4
-                mcr     p15, 0, r0, c8, c7      @ invalidate whole TLB v4
-                mov     pc, lr
-
-__arm6_cache_off:
-                mov     r0, #0x00000030         @ ARM6 control reg.
-                b       __armv3_cache_off
-
-__arm7_cache_off:
-                mov     r0, #0x00000070         @ ARM7 control reg.
-                b       __armv3_cache_off
-
-__armv3_cache_off:
-                mcr     p15, 0, r0, c1, c0, 0   @ turn MMU and cache off
-                mov     r0, #0
-                mcr     p15, 0, r0, c7, c0, 0   @ invalidate whole cache v3
-                mcr     p15, 0, r0, c5, c0, 0   @ invalidate whole TLB v3
-                mov     pc, lr
-
-/*
- * Clean and flush the cache to maintain consistency.
- *
- * On entry,
- *  r6 = processor ID
- * On exit,
- *  r1, r2, r3, r12 corrupted
- * This routine must preserve:
- *  r0, r4, r5, r6, r7
- */
-                .align  5
-cache_clean_flush:
-                mov     r3, #16
-                b       call_cache_fn
-
-__armv4_cache_flush:
-                bic     r1, pc, #31
-                add     r2, r1, #65536          @ 2x the largest dcache size
-1:              ldr     r12, [r1], #32          @ s/w flush D cache
-                teq     r1, r2
-                bne     1b
-
-                mcr     p15, 0, r1, c7, c7, 0   @ flush I cache
-                mcr     p15, 0, r1, c7, c10, 4  @ drain WB
-                mov     pc, lr
-
-__armv3_cache_flush:
-                mov     r1, #0
-                mcr     p15, 0, r0, c7, c0, 0   @ invalidate whole cache v3
-                mov     pc, lr
-
-/*
- * Various debugging routines for printing hex characters and
- * memory, which again must be relocatable.
- */
-#ifdef DEBUG
-                .type   phexbuf,#object
-phexbuf:        .space  12
-                .size   phexbuf, . - phexbuf
-
-phex:           adr     r3, phexbuf
-                mov     r2, #0
-                strb    r2, [r3, r1]
-1:              subs    r1, r1, #1
-                movmi   r0, r3
-                bmi     puts
-                and     r2, r0, #15
-                mov     r0, r0, lsr #4
-                cmp     r2, #10
-                addge   r2, r2, #7
-                add     r2, r2, #'0'
-                strb    r2, [r3, r1]
-                b       1b
-
-puts:           loadsp  r3
-1:              ldrb    r2, [r0], #1
-                teq     r2, #0
-                moveq   pc, lr
-2:              writeb  r2
-                mov     r1, #0x00020000
-3:              subs    r1, r1, #1
-                bne     3b
-                teq     r2, #'\n'
-                moveq   r2, #'\r'
-                beq     2b
-                teq     r0, #0
-                bne     1b
-                mov     pc, lr
-putc:
-                mov     r2, r0
-                mov     r0, #0
-                loadsp  r3
-                b       2b
-
-memdump:        mov     r12, r0
-                mov     r10, lr
-                mov     r11, #0
-2:              mov     r0, r11, lsl #2
-                add     r0, r0, r12
-                mov     r1, #8
-                bl      phex
-                mov     r0, #':'
-                bl      putc
-1:              mov     r0, #' '
-                bl      putc
-                ldr     r0, [r12, r11, lsl #2]
-                mov     r1, #8
-                bl      phex
-                and     r0, r11, #7
-                teq     r0, #3
-                moveq   r0, #' '
-                bleq    putc
-                and     r0, r11, #7
-                add     r11, r11, #1
-                teq     r0, #7
-                bne     1b
-                mov     r0, #'\n'
-                bl      putc
-                cmp     r11, #64
-                blt     2b
-                mov     pc, r10
-#endif
-
-reloc_end:
-
-                .align
-                .section ".stack", "aw"
-user_stack:     .space  4096
diff --git a/arch/arm26/boot/compressed/ll_char_wr.S b/arch/arm26/boot/compressed/ll_char_wr.S
deleted file mode 100644
index f024c3ebdfa5..000000000000
--- a/arch/arm26/boot/compressed/ll_char_wr.S
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- *  linux/arch/arm26/lib/ll_char_wr.S
- *
- *  Copyright (C) 1995, 1996 Russell King.
- *
- * 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.
- *
- *  Speedups & 1bpp code (C) 1996 Philip Blundell & Russell King.
- *
- *  10-04-96    RMK     Various cleanups & reduced register usage.
- *  08-04-98    RMK     Shifts re-ordered
- */
-
-@ Regs: [] = corruptible
-@       {} = used
-@       () = do not use
-
-#include <linux/linkage.h>
-#include <asm/assembler.h>
-                .text
-
-#define BOLD            0x01
-#define ITALIC          0x02
-#define UNDERLINE       0x04
-#define FLASH           0x08
-#define INVERSE         0x10
-
-LC0:            .word   bytes_per_char_h
-                .word   video_size_row
-                .word   acorndata_8x8
-                .word   con_charconvtable
-
-ENTRY(ll_write_char)
-                stmfd   sp!, {r4 - r7, lr}
-@
-@ Smashable regs: {r0 - r3}, [r4 - r7], (r8 - fp), [ip], (sp), [lr], (pc)
-@
-                eor     ip, r1, #UNDERLINE << 9
-/*
- * calculate colours
- */
-                tst     r1, #INVERSE << 9
-                moveq   r2, r1, lsr #16
-                moveq   r3, r1, lsr #24
-                movne   r2, r1, lsr #24
-                movne   r3, r1, lsr #16
-                and     r3, r3, #255
-                and     r2, r2, #255
-/*
- * calculate offset into character table
- */
-                mov     r1, r1, lsl #23
-                mov     r1, r1, lsr #20
-/*
- * calculate offset required for each row [maybe I should make this an argument to this fn.
- * Have to see what the register usage is like in the calling routines.
- */
-                adr     r4, LC0
-                ldmia   r4, {r4, r5, r6, lr}
-                ldr     r4, [r4]
-                ldr     r5, [r5]
-/*
- * Go to resolution-dependent routine...
- */
-                cmp     r4, #4
-                blt     Lrow1bpp
-                eor     r2, r3, r2                      @ Create eor mask to change colour from bg
-                orr     r3, r3, r3, lsl #8              @ to fg.
-                orr     r3, r3, r3, lsl #16
-                add     r0, r0, r5, lsl #3              @ Move to bottom of character
-                add     r1, r1, #7
-                ldrb    r7, [r6, r1]
-                tst     ip, #UNDERLINE << 9
-                eoreq   r7, r7, #255
-                teq     r4, #8
-                beq     Lrow8bpplp
-@
-@ Smashable regs: {r0 - r3}, [r4], {r5 - r7}, (r8 - fp), [ip], (sp), {lr}, (pc)
-@
-                orr     r3, r3, r3, lsl #4
-Lrow4bpplp:     ldr     r7, [lr, r7, lsl #2]
-                mul     r7, r2, r7
-                tst     r1, #7                          @ avoid using r7 directly after
-                eor     ip, r3, r7
-                str     ip, [r0, -r5]!
-                LOADREGS(eqfd, sp!, {r4 - r7, pc})
-                sub     r1, r1, #1
-                ldrb    r7, [r6, r1]
-                ldr     r7, [lr, r7, lsl #2]
-                mul     r7, r2, r7
-                tst     r1, #7                          @ avoid using r7 directly after
-                eor     ip, r3, r7
-                str     ip, [r0, -r5]!
-                subne   r1, r1, #1
-                ldrneb  r7, [r6, r1]
-                bne     Lrow4bpplp
-                LOADREGS(fd, sp!, {r4 - r7, pc})
-
-@
-@ Smashable regs: {r0 - r3}, [r4], {r5 - r7}, (r8 - fp), [ip], (sp), {lr}, (pc)
-@
-Lrow8bpplp:     mov     ip, r7, lsr #4
-                ldr     ip, [lr, ip, lsl #2]
-                mul     r4, r2, ip
-                and     ip, r7, #15                     @ avoid r4
-                ldr     ip, [lr, ip, lsl #2]            @ avoid r4
-                mul     ip, r2, ip                      @ avoid r4
-                eor     r4, r3, r4                      @ avoid ip
-                tst     r1, #7                          @ avoid ip
-                sub     r0, r0, r5                      @ avoid ip
-                eor     ip, r3, ip
-                stmia   r0, {r4, ip}
-                LOADREGS(eqfd, sp!, {r4 - r7, pc})
-                sub     r1, r1, #1
-                ldrb    r7, [r6, r1]
-                mov     ip, r7, lsr #4
-                ldr     ip, [lr, ip, lsl #2]
-                mul     r4, r2, ip
-                and     ip, r7, #15                     @ avoid r4
-                ldr     ip, [lr, ip, lsl #2]            @ avoid r4
-                mul     ip, r2, ip                      @ avoid r4
-                eor     r4, r3, r4                      @ avoid ip
-                tst     r1, #7                          @ avoid ip
-                sub     r0, r0, r5                      @ avoid ip
-                eor     ip, r3, ip
-                stmia   r0, {r4, ip}
-                subne   r1, r1, #1
-                ldrneb  r7, [r6, r1]
-                bne     Lrow8bpplp
-                LOADREGS(fd, sp!, {r4 - r7, pc})
-
-@
-@ Smashable regs: {r0 - r3}, [r4], {r5, r6}, [r7], (r8 - fp), [ip], (sp), [lr], (pc)
-@
-Lrow1bpp:       add     r6, r6, r1
-                ldmia   r6, {r4, r7}
-                tst     ip, #INVERSE << 9
-                mvnne   r4, r4
-                mvnne   r7, r7
-                strb    r4, [r0], r5
-                mov     r4, r4, lsr #8
-                strb    r4, [r0], r5
-                mov     r4, r4, lsr #8
-                strb    r4, [r0], r5
-                mov     r4, r4, lsr #8
-                strb    r4, [r0], r5
-                strb    r7, [r0], r5
-                mov     r7, r7, lsr #8
-                strb    r7, [r0], r5
-                mov     r7, r7, lsr #8
-                strb    r7, [r0], r5
-                mov     r7, r7, lsr #8
-                tst     ip, #UNDERLINE << 9
-                mvneq   r7, r7
-                strb    r7, [r0], r5
-                LOADREGS(fd, sp!, {r4 - r7, pc})
-
-                .bss
-ENTRY(con_charconvtable)
-                .space  1024
diff --git a/arch/arm26/boot/compressed/misc.c b/arch/arm26/boot/compressed/misc.c
deleted file mode 100644
index 0714d19c5776..000000000000
--- a/arch/arm26/boot/compressed/misc.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * misc.c
- * 
- * This is a collection of several routines from gzip-1.0.3 
- * adapted for Linux.
- *
- * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
- *
- * Modified for ARM Linux by Russell King
- *
- * Nicolas Pitre <nico@visuaide.com>  1999/04/14 :
- *  For this code to run directly from Flash, all constant variables must
- *  be marked with 'const' and all other variables initialized at run-time 
- *  only.  This way all non constant variables will end up in the bss segment,
- *  which should point to addresses in RAM and cleared to 0 on start.
- *  This allows for a much quicker boot time.
- */
-
-unsigned int __machine_arch_type;
-
-#include <linux/kernel.h>
-
-#include <asm/uaccess.h>
-#include "uncompress.h"
-
-#ifdef STANDALONE_DEBUG
-#define puts printf
-#endif
-
-#define __ptr_t void *
-
-/*
- * Optimised C version of memzero for the ARM.
- */
-void __memzero (__ptr_t s, size_t n)
-{
-        union { void *vp; unsigned long *ulp; unsigned char *ucp; } u;
-        int i;
-
-        u.vp = s;
-
-        for (i = n >> 5; i > 0; i--) {
-                *u.ulp++ = 0;
-                *u.ulp++ = 0;
-                *u.ulp++ = 0;
-                *u.ulp++ = 0;
-                *u.ulp++ = 0;
-                *u.ulp++ = 0;
-                *u.ulp++ = 0;
-                *u.ulp++ = 0;
-        }
-
-        if (n & 1 << 4) {
-                *u.ulp++ = 0;
-                *u.ulp++ = 0;
-                *u.ulp++ = 0;
-                *u.ulp++ = 0;
-        }
-
-        if (n & 1 << 3) {
-                *u.ulp++ = 0;
-                *u.ulp++ = 0;
-        }
-
-        if (n & 1 << 2)
-                *u.ulp++ = 0;
-
-        if (n & 1 << 1) {
-                *u.ucp++ = 0;
-                *u.ucp++ = 0;
-        }
-
-        if (n & 1)
-                *u.ucp++ = 0;
-}
-
-static inline __ptr_t memcpy(__ptr_t __dest, __const __ptr_t __src,
-                            size_t __n)
-{
-        int i = 0;
-        unsigned char *d = (unsigned char *)__dest, *s = (unsigned char *)__src;
-
-        for (i = __n >> 3; i > 0; i--) {
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-        }
-
-        if (__n & 1 << 2) {
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-        }
-
-        if (__n & 1 << 1) {
-                *d++ = *s++;
-                *d++ = *s++;
-        }
-
-        if (__n & 1)
-                *d++ = *s++;
-
-        return __dest;
-}
-
-/*
- * gzip delarations
- */
-#define OF(args)  args
-#define STATIC static
-
-typedef unsigned char  uch;
-typedef unsigned short ush;
-typedef unsigned long  ulg;
-
-#define WSIZE 0x8000            /* Window size must be at least 32k, */
-                                /* and a power of two */
-
-static uch *inbuf;              /* input buffer */
-static uch window[WSIZE];       /* Sliding window buffer */
-
-static unsigned insize;         /* valid bytes in inbuf */
-static unsigned inptr;          /* index of next byte to be processed in inbuf */
-static unsigned outcnt;         /* bytes in output buffer */
-
-/* gzip flag byte */
-#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
-#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */
-#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
-#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
-#define COMMENT      0x10 /* bit 4 set: file comment present */
-#define ENCRYPTED    0x20 /* bit 5 set: file is encrypted */
-#define RESERVED     0xC0 /* bit 6,7:   reserved */
-
-#define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf())
-
-/* Diagnostic functions */
-#ifdef DEBUG
-#  define Assert(cond,msg) {if(!(cond)) error(msg);}
-#  define Trace(x) fprintf x
-#  define Tracev(x) {if (verbose) fprintf x ;}
-#  define Tracevv(x) {if (verbose>1) fprintf x ;}
-#  define Tracec(c,x) {if (verbose && (c)) fprintf x ;}
-#  define Tracecv(c,x) {if (verbose>1 && (c)) fprintf x ;}
-#else
-#  define Assert(cond,msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
-#endif
-
-static int  fill_inbuf(void);
-static void flush_window(void);
-static void error(char *m);
-static void gzip_mark(void **);
-static void gzip_release(void **);
-
-extern char input_data[];
-extern char input_data_end[];
-
-static uch *output_data;
-static ulg output_ptr;
-static ulg bytes_out;
-
-static void *malloc(int size);
-static void free(void *where);
-static void error(char *m);
-static void gzip_mark(void **);
-static void gzip_release(void **);
-
-static void puts(const char *);
-
-extern int end;
-static ulg free_mem_ptr;
-static ulg free_mem_ptr_end;
-
-#define HEAP_SIZE 0x3000
-
-#include "../../../../lib/inflate.c"
-
-#ifndef STANDALONE_DEBUG
-static void *malloc(int size)
-{
-        void *p;
-
-        if (size <0) error("Malloc error");
-        if (free_mem_ptr <= 0) error("Memory error");
-
-        free_mem_ptr = (free_mem_ptr + 3) & ~3; /* Align */
-
-        p = (void *)free_mem_ptr;
-        free_mem_ptr += size;
-
-        if (free_mem_ptr >= free_mem_ptr_end)
-                error("Out of memory");
-        return p;
-}
-
-static void free(void *where)
-{ /* gzip_mark & gzip_release do the free */
-}
-
-static void gzip_mark(void **ptr)
-{
-        arch_decomp_wdog();
-        *ptr = (void *) free_mem_ptr;
-}
-
-static void gzip_release(void **ptr)
-{
-        arch_decomp_wdog();
-        free_mem_ptr = (long) *ptr;
-}
-#else
-static void gzip_mark(void **ptr)
-{
-}
-
-static void gzip_release(void **ptr)
-{
-}
-#endif
-
-/* ===========================================================================
- * Fill the input buffer. This is called only when the buffer is empty
- * and at least one byte is really needed.
- */
-int fill_inbuf(void)
-{
-        if (insize != 0)
-                error("ran out of input data");
-
-        inbuf = input_data;
-        insize = &input_data_end[0] - &input_data[0];
-
-        inptr = 1;
-        return inbuf[0];
-}
-
-/* ===========================================================================
- * Write the output window window[0..outcnt-1] and update crc and bytes_out.
- * (Used for the decompressed data only.)
- */
-void flush_window(void)
-{
-        ulg c = crc;
-        unsigned n;
-        uch *in, *out, ch;
-
-        in = window;
-        out = &output_data[output_ptr];
-        for (n = 0; n < outcnt; n++) {
-                ch = *out++ = *in++;
-                c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);
-        }
-        crc = c;
-        bytes_out += (ulg)outcnt;
-        output_ptr += (ulg)outcnt;
-        outcnt = 0;
-        puts(".");
-}
-
-static void error(char *x)
-{
-        int ptr;
-
-        puts("\n\n");
-        puts(x);
-        puts("\n\n -- System halted");
-
-        while(1);       /* Halt */
-}
-
-#ifndef STANDALONE_DEBUG
-
-ulg
-decompress_kernel(ulg output_start, ulg free_mem_ptr_p, ulg free_mem_ptr_end_p,
-                  int arch_id)
-{
-        output_data             = (uch *)output_start;  /* Points to kernel start */
-        free_mem_ptr            = free_mem_ptr_p;
-        free_mem_ptr_end        = free_mem_ptr_end_p;
-        __machine_arch_type     = arch_id;
-
-        arch_decomp_setup();
-
-        makecrc();
-        puts("Uncompressing Linux...");
-        gunzip();
-        puts(" done, booting the kernel.\n");
-        return output_ptr;
-}
-#else
-
-char output_buffer[1500*1024];
-
-int main()
-{
-        output_data = output_buffer;
-
-        makecrc();
-        puts("Uncompressing Linux...");
-        gunzip();
-        puts("done.\n");
-        return 0;
-}
-#endif
-        
diff --git a/arch/arm26/boot/compressed/uncompress.h b/arch/arm26/boot/compressed/uncompress.h
deleted file mode 100644
index 66d9b938a7a4..000000000000
--- a/arch/arm26/boot/compressed/uncompress.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *
- *  Copyright (C) 1996 Russell King
- *
- * 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.
- */
-#define VIDMEM ((char *)0x02000000)
- 
-int video_num_columns, video_num_lines, video_size_row;
-int white, bytes_per_char_h;
-extern unsigned long con_charconvtable[256];
-
-struct param_struct {
-        unsigned long page_size;
-        unsigned long nr_pages;
-        unsigned long ramdisk_size;
-        unsigned long mountrootrdonly;
-        unsigned long rootdev;
-        unsigned long video_num_cols;
-        unsigned long video_num_rows;
-        unsigned long video_x;
-        unsigned long video_y;
-        unsigned long memc_control_reg;
-        unsigned char sounddefault;
-        unsigned char adfsdrives;
-        unsigned char bytes_per_char_h;
-        unsigned char bytes_per_char_v;
-        unsigned long unused[256/4-11];
-};
-
-static struct param_struct *params = (struct param_struct *)0x0207c000;
- 
-/*
- * This does not append a newline
- */
-static void puts(const char *s)
-{
-        extern void ll_write_char(char *, unsigned long);
-        int x,y;
-        unsigned char c;
-        char *ptr;
-
-        x = params->video_x;
-        y = params->video_y;
-
-        while ( ( c = *(unsigned char *)s++ ) != '\0' ) {
-                if ( c == '\n' ) {
-                        x = 0;
-                        if ( ++y >= video_num_lines ) {
-                                y--;
-                        }
-                } else {
-                        ptr = VIDMEM + ((y*video_num_columns*params->bytes_per_char_v+x)*bytes_per_char_h);
-                        ll_write_char(ptr, c|(white<<16));
-                        if ( ++x >= video_num_columns ) {
-                                x = 0;
-                                if ( ++y >= video_num_lines ) {
-                                        y--;
-                                }
-                        }
-                }
-        }
-
-        params->video_x = x;
-        params->video_y = y;
-}
-
-static void error(char *x);
-
-/*
- * Setup for decompression
- */
-static void arch_decomp_setup(void)
-{
-        int i;
-        
-        video_num_lines = params->video_num_rows;
-        video_num_columns = params->video_num_cols;
-        bytes_per_char_h = params->bytes_per_char_h;
-        video_size_row = video_num_columns * bytes_per_char_h;
-        if (bytes_per_char_h == 4)
-                for (i = 0; i < 256; i++)
-                        con_charconvtable[i] =
-                                (i & 128 ? 1 << 0  : 0) |
-                                (i & 64  ? 1 << 4  : 0) |
-                                (i & 32  ? 1 << 8  : 0) |
-                                (i & 16  ? 1 << 12 : 0) |
-                                (i & 8   ? 1 << 16 : 0) |
-                                (i & 4   ? 1 << 20 : 0) |
-                                (i & 2   ? 1 << 24 : 0) |
-                                (i & 1   ? 1 << 28 : 0);
-        else
-                for (i = 0; i < 16; i++)
-                        con_charconvtable[i] =
-                                (i & 8   ? 1 << 0  : 0) |
-                                (i & 4   ? 1 << 8  : 0) |
-                                (i & 2   ? 1 << 16 : 0) |
-                                (i & 1   ? 1 << 24 : 0);
-
-        white = bytes_per_char_h == 8 ? 0xfc : 7;
-
-        if (params->nr_pages * params->page_size < 4096*1024) error("<4M of mem\n");
-}
-
-/*
- * nothing to do
- */
-#define arch_decomp_wdog()
diff --git a/arch/arm26/boot/compressed/vmlinux.lds.in b/arch/arm26/boot/compressed/vmlinux.lds.in
deleted file mode 100644
index 86d821d5ab70..000000000000
--- a/arch/arm26/boot/compressed/vmlinux.lds.in
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  linux/arch/arm26/boot/compressed/vmlinux.lds.in
- *
- *  Copyright (C) 2000 Russell King
- *
- * 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.
- */
-OUTPUT_ARCH(arm)
-ENTRY(_start)
-SECTIONS
-{
-  . = LOAD_ADDR;
-  _load_addr = .;
-
-  . = TEXT_START;
-  _text = .;
-
-  .text : {
-    _start = .;
-    *(.start)
-    *(.text)
-    *(.fixup)
-    *(.gnu.warning)
-    *(.rodata)
-    *(.rodata.*)
-    *(.glue_7)
-    *(.glue_7t)
-    input_data = .;
-    arch/arm26/boot/compressed/piggy.o
-    input_data_end = .;
-    . = ALIGN(4);
-  }
-
-  _etext = .;
-
-  _got_start = .;
-  .got                  : { *(.got) }
-  _got_end = .;
-  .got.plt              : { *(.got.plt) }
-  .data                 : { *(.data) }
-  _edata = .;
-
-  . = BSS_START;
-  __bss_start = .;
-  .bss                  : { *(.bss) }
-  _end = .;
-
-  .stack (NOLOAD)       : { *(.stack) }
-
-  .stab 0               : { *(.stab) }
-  .stabstr 0            : { *(.stabstr) }
-  .stab.excl 0          : { *(.stab.excl) }
-  .stab.exclstr 0       : { *(.stab.exclstr) }
-  .stab.index 0         : { *(.stab.index) }
-  .stab.indexstr 0      : { *(.stab.indexstr) }
-  .comment 0            : { *(.comment) }
-}
-
diff --git a/arch/arm26/boot/install.sh b/arch/arm26/boot/install.sh
deleted file mode 100644
index 8a8399b26cf7..000000000000
--- a/arch/arm26/boot/install.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-# arch/arm26/boot/install.sh
-#
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
-# Copyright (C) 1995 by Linus Torvalds
-#
-# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
-# Adapted from code in arch/i386/boot/install.sh by Russell King
-# Stolen from arm32 by Ian Molton
-#
-# "make install" script for arm architecture
-#
-# Arguments:
-#   $1 - kernel version
-#   $2 - kernel image file
-#   $3 - kernel map file
-#   $4 - default install path (blank if root directory)
-#
-
-# User may have a custom install script
-
-if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then
-  exec /sbin/${CROSS_COMPILE}installkernel "$@"
-fi
-
-if [ "$2" = "zImage" ]; then
-# Compressed install
-  echo "Installing compressed kernel"
-  if [ -f $4/vmlinuz-$1 ]; then
-    mv $4/vmlinuz-$1 $4/vmlinuz.old
-  fi
-
-  if [ -f $4/System.map-$1 ]; then
-    mv $4/System.map-$1 $4/System.old
-  fi
-
-  cat $2 > $4/vmlinuz-$1
-  cp $3 $4/System.map-$1
-else
-# Normal install
-  echo "Installing normal kernel"
-  if [ -f $4/vmlinux-$1 ]; then
-    mv $4/vmlinux-$1 $4/vmlinux.old
-  fi
-
-  if [ -f $4/System.map ]; then
-    mv $4/System.map $4/System.old
-  fi
-
-  cat $2 > $4/vmlinux-$1
-  cp $3 $4/System.map
-fi
-
-if [ -x /sbin/loadmap ]; then
-  /sbin/loadmap --rdev /dev/ima
-else
-  echo "You have to install it yourself"
-fi
diff --git a/arch/arm26/defconfig b/arch/arm26/defconfig
deleted file mode 100644
index 2b7d44bf49bf..000000000000
--- a/arch/arm26/defconfig
+++ /dev/null
@@ -1,361 +0,0 @@
-#
-# Automatically generated by make menuconfig: don't edit
-#
-CONFIG_ARM=y
-# CONFIG_EISA is not set
-# CONFIG_SBUS is not set
-# CONFIG_MCA is not set
-CONFIG_UID16=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_GENERIC_BUST_SPINLOCK is not set
-# CONFIG_GENERIC_ISA_DMA is not set
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-
-#
-# General setup
-#
-# CONFIG_NET is not set
-# CONFIG_SYSVIPC is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_SYSCTL is not set
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
-
-#
-# System Type
-#
-CONFIG_ARCH_ARC=y
-# CONFIG_ARCH_A5K is not set
-CONFIG_ARCH_ACORN=y
-# CONFIG_CPU_32 is not set
-CONFIG_CPU_26=y
-# CONFIG_PAGESIZE_16 is not set
-
-#
-# General setup
-#
-CONFIG_FIQ=y
-# CONFIG_ZBOOT_ROM is not set
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_FPE_NWFPE=y
-CONFIG_KCORE_ELF=y
-# CONFIG_KCORE_AOUT is not set
-# CONFIG_BINFMT_AOUT is not set
-# CONFIG_BINFMT_ELF is not set
-# CONFIG_BINFMT_MISC is not set
-CONFIG_CMDLINE=""
-# CONFIG_ALIGNMENT_TRAP is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play configuration
-#
-# CONFIG_PNP is not set
-# CONFIG_ISAPNP is not set
-# CONFIG_PNPBIOS is not set
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_PARIDE is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_CISS_SCSI_TAPE is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-# CONFIG_BLK_DEV_MD is not set
-# CONFIG_MD_LINEAR is not set
-# CONFIG_MD_RAID0 is not set
-# CONFIG_MD_RAID1 is not set
-# CONFIG_MD_RAID5 is not set
-# CONFIG_MD_MULTIPATH is not set
-# CONFIG_BLK_DEV_LVM is not set
-
-#
-# Acorn-specific block devices
-#
-# CONFIG_BLK_DEV_FD1772 is not set
-# CONFIG_BLK_DEV_MFM is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI support
-#
-# CONFIG_SCSI is not set
-
-#
-# ISDN subsystem
-#
-
-#
-# Input device support
-#
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_KEYBDEV is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_TSLIBDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
-# CONFIG_GAMEPORT_NS558 is not set
-# CONFIG_GAMEPORT_L4 is not set
-# CONFIG_GAMEPORT_EMU10K1 is not set
-# CONFIG_GAMEPORT_VORTEX is not set
-# CONFIG_GAMEPORT_FM801 is not set
-# CONFIG_GAMEPORT_CS461x is not set
-# CONFIG_SERIO is not set
-# CONFIG_SERIO_I8042 is not set
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_CT82C710 is not set
-# CONFIG_SERIO_PARKBD is not set
-# CONFIG_SERIO_ACORN is not set
-
-#
-# Character devices
-#
-# CONFIG_VT is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-# CONFIG_SERIAL_8250_CONSOLE is not set
-# CONFIG_SERIAL_8250_CS is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_SHARE_IRQ is not set
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-# CONFIG_SERIAL_8250_MULTIPORT is not set
-# CONFIG_SERIAL_8250_RSA is not set
-# CONFIG_ATOMWIDE_SERIAL is not set
-# CONFIG_DUALSP_SERIAL is not set
-# CONFIG_SERIAL_AMBA is not set
-# CONFIG_SERIAL_AMBA_CONSOLE is not set
-# CONFIG_SERIAL_CLPS711X is not set
-# CONFIG_SERIAL_CLPS711X_CONSOLE is not set
-# CONFIG_SERIAL_CLPS711X_OLD_NAME is not set
-# CONFIG_SERIAL_21285 is not set
-# CONFIG_SERIAL_21285_OLD is not set
-# CONFIG_SERIAL_21285_CONSOLE is not set
-# CONFIG_SERIAL_UART00 is not set
-# CONFIG_SERIAL_UART00_CONSOLE is not set
-# CONFIG_SERIAL_SA1100 is not set
-# CONFIG_SERIAL_SA1100_CONSOLE is not set
-# CONFIG_UNIX98_PTYS is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_ALGOPCF=y
-# CONFIG_I2C_ELEKTOR is not set
-CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_PROC is not set
-
-#
-# L3 serial bus support
-#
-# CONFIG_L3 is not set
-# CONFIG_L3_ALGOBIT is not set
-# CONFIG_L3_BIT_SA1100_GPIO is not set
-# CONFIG_L3_SA1111 is not set
-# CONFIG_BIT_SA1100_GPIO is not set
-
-#
-# Mice
-#
-# CONFIG_BUSMOUSE is not set
-# CONFIG_PSMOUSE is not set
-# CONFIG_QIC02_TAPE is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_NVRAM is not set
-# CONFIG_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_FTAPE is not set
-# CONFIG_AGP is not set
-# CONFIG_DRM is not set
-# CONFIG_RAW_DRIVER is not set
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# File systems
-#
-# CONFIG_QUOTA is not set
-# CONFIG_QFMT_V1 is not set
-# CONFIG_QFMT_V2 is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADFS_FS_RW is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
-# CONFIG_JBD_DEBUG is not set
-# CONFIG_FAT_FS is not set
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_TMPFS is not set
-CONFIG_RAMFS=y
-# CONFIG_ISO9660_FS is not set
-# CONFIG_JOLIET is not set
-# CONFIG_ZISOFS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_HPFS_FS is not set
-CONFIG_PROC_FS=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVFS_MOUNT is not set
-# CONFIG_DEVFS_DEBUG is not set
-# CONFIG_DEVPTS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX4FS_RW is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_EXT2_FS=y
-# CONFIG_SYSV_FS is not set
-# CONFIG_UDF_FS is not set
-# CONFIG_UDF_RW is not set
-# CONFIG_UFS_FS is not set
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_NCPFS_NLS is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_ZISOFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_ACORN_PARTITION=y
-# CONFIG_ACORN_PARTITION_EESOX is not set
-# CONFIG_ACORN_PARTITION_ICS is not set
-CONFIG_ACORN_PARTITION_ADFS=y
-# CONFIG_ACORN_PARTITION_POWERTEC is not set
-CONFIG_ACORN_PARTITION_RISCIX=y
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MSDOS_PARTITION is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_SMB_NLS is not set
-# CONFIG_NLS is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# Multimedia Capabilities Port drivers
-#
-# CONFIG_MCP is not set
-# CONFIG_MCP_SA1100 is not set
-# CONFIG_MCP_UCB1200 is not set
-# CONFIG_MCP_UCB1200_AUDIO is not set
-# CONFIG_MCP_UCB1200_TS is not set
-
-#
-# Console Switches
-#
-# CONFIG_SWITCHES is not set
-# CONFIG_SWITCHES_SA1100 is not set
-# CONFIG_SWITCHES_UCB1X00 is not set
-
-#
-# USB support
-#
-# CONFIG_USB is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_NO_FRAME_POINTER is not set
-CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_SLAB=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_WAITQ=y
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_ERRORS=y
-CONFIG_DEBUG_LL=y
-
-#
-# Security options
-#
-CONFIG_SECURITY_CAPABILITIES=y
-
-#
-# Library routines
-#
-CONFIG_CRC32=y
-# CONFIG_ZLIB_INFLATE is not set
-# CONFIG_ZLIB_DEFLATE is not set
diff --git a/arch/arm26/kernel/Makefile b/arch/arm26/kernel/Makefile
deleted file mode 100644
index ee9fb49fdb78..000000000000
--- a/arch/arm26/kernel/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-# Object file lists.
-
-AFLAGS_head.o           := -DTEXTADDR=$(TEXTADDR)
-
-obj-y           := compat.o dma.o entry.o irq.o process.o ptrace.o       \
-                   semaphore.o setup.o signal.o sys_arm.o time.o traps.o \
-                   ecard.o dma.o ecard.o fiq.o time.o
-
-extra-y         := head.o init_task.o vmlinux.lds
-
-obj-$(CONFIG_FIQ)               += fiq.o
-obj-$(CONFIG_MODULES)           += armksyms.o
-
diff --git a/arch/arm26/kernel/armksyms.c b/arch/arm26/kernel/armksyms.c
deleted file mode 100644
index fe1e3ceed7cb..000000000000
--- a/arch/arm26/kernel/armksyms.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/armksyms.c
- *
- *  Copyright (C) 2003 Ian Molton
- *
- * 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>
-#include <linux/module.h>
-#include <linux/user.h>
-#include <linux/string.h>
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/mman.h>
-#include <linux/delay.h>
-#include <linux/in6.h>
-#include <linux/interrupt.h>
-#include <linux/pm.h>
-#include <linux/tty.h>
-#include <linux/vt_kern.h>
-#include <linux/syscalls.h>
-
-#include <asm/byteorder.h>
-#include <asm/elf.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/processor.h>
-#include <asm/semaphore.h>
-#include <asm/system.h>
-#include <asm/uaccess.h>
-#include <asm/checksum.h>
-#include <asm/mach-types.h>
-
-extern int dump_fpu(struct pt_regs *, struct user_fp_struct *);
-extern void inswb(unsigned int port, void *to, int len);
-extern void outswb(unsigned int port, const void *to, int len);
-
-extern void __bad_xchg(volatile void *ptr, int size);
-
-/*
- * libgcc functions - functions that are used internally by the
- * compiler...  (prototypes are not correct though, but that
- * doesn't really matter since they're not versioned).
- */
-extern void __ashldi3(void);
-extern void __ashrdi3(void);
-extern void __divsi3(void);
-extern void __lshrdi3(void);
-extern void __modsi3(void);
-extern void __muldi3(void);
-extern void __ucmpdi2(void);
-extern void __udivdi3(void);
-extern void __umoddi3(void);
-extern void __udivmoddi4(void);
-extern void __udivsi3(void);
-extern void __umodsi3(void);
-extern void abort(void);
-
-extern void ret_from_exception(void);
-extern void fpundefinstr(void);
-extern void fp_enter(void);
-
-/*
- * This has a special calling convention; it doesn't
- * modify any of the usual registers, except for LR.
- * FIXME - we used to use our own local version - looks to be in kernel/softirq now
- */
-//extern void __do_softirq(void);
-
-#define EXPORT_SYMBOL_ALIAS(sym,orig)           \
- const char __kstrtab_##sym[]                   \
-  __attribute__((section(".kstrtab"))) =        \
-    __MODULE_STRING(sym);                       \
- const struct module_symbol __ksymtab_##sym     \
-  __attribute__((section("__ksymtab"))) =       \
-    { (unsigned long)&orig, __kstrtab_##sym };
-
-/*
- * floating point math emulator support.
- * These symbols will never change their calling convention...
- */
-EXPORT_SYMBOL_ALIAS(kern_fp_enter,fp_enter);
-EXPORT_SYMBOL_ALIAS(fp_printk,printk);
-EXPORT_SYMBOL_ALIAS(fp_send_sig,send_sig);
-
-EXPORT_SYMBOL(fpundefinstr);
-EXPORT_SYMBOL(ret_from_exception);
-
-#ifdef CONFIG_VT
-EXPORT_SYMBOL(kd_mksound);
-#endif
-
-//EXPORT_SYMBOL(__do_softirq);
-
-        /* platform dependent support */
-EXPORT_SYMBOL(dump_thread);
-EXPORT_SYMBOL(dump_fpu);
-EXPORT_SYMBOL(udelay);
-EXPORT_SYMBOL(kernel_thread);
-EXPORT_SYMBOL(system_rev);
-EXPORT_SYMBOL(system_serial_low);
-EXPORT_SYMBOL(system_serial_high);
-#ifdef CONFIG_DEBUG_BUGVERBOSE
-EXPORT_SYMBOL(__bug);
-#endif
-EXPORT_SYMBOL(__bad_xchg);
-EXPORT_SYMBOL(__readwrite_bug);
-EXPORT_SYMBOL(set_irq_type);
-EXPORT_SYMBOL(pm_idle);
-EXPORT_SYMBOL(pm_power_off);
-
-        /* processor dependencies */
-EXPORT_SYMBOL(__machine_arch_type);
-
-        /* networking */
-EXPORT_SYMBOL(csum_partial_copy_nocheck);
-EXPORT_SYMBOL(__csum_ipv6_magic);
-
-        /* io */
-#ifndef __raw_readsb
-EXPORT_SYMBOL(__raw_readsb);
-#endif
-#ifndef __raw_readsw
-EXPORT_SYMBOL(__raw_readsw);
-#endif
-#ifndef __raw_readsl
-EXPORT_SYMBOL(__raw_readsl);
-#endif
-#ifndef __raw_writesb
-EXPORT_SYMBOL(__raw_writesb);
-#endif
-#ifndef __raw_writesw
-EXPORT_SYMBOL(__raw_writesw);
-#endif
-#ifndef __raw_writesl
-EXPORT_SYMBOL(__raw_writesl);
-#endif
-
-        /* string / mem functions */
-EXPORT_SYMBOL(strcpy);
-EXPORT_SYMBOL(strncpy);
-EXPORT_SYMBOL(strcat);
-EXPORT_SYMBOL(strncat);
-EXPORT_SYMBOL(strcmp);
-EXPORT_SYMBOL(strncmp);
-EXPORT_SYMBOL(strchr);
-EXPORT_SYMBOL(strlen);
-EXPORT_SYMBOL(strnlen);
-EXPORT_SYMBOL(strrchr);
-EXPORT_SYMBOL(strstr);
-EXPORT_SYMBOL(memset);
-EXPORT_SYMBOL(memcpy);
-EXPORT_SYMBOL(memmove);
-EXPORT_SYMBOL(memcmp);
-EXPORT_SYMBOL(memscan);
-EXPORT_SYMBOL(__memzero);
-
-        /* user mem (segment) */
-EXPORT_SYMBOL(uaccess_kernel);
-EXPORT_SYMBOL(uaccess_user);
-
-EXPORT_SYMBOL(__get_user_1);
-EXPORT_SYMBOL(__get_user_2);
-EXPORT_SYMBOL(__get_user_4);
-EXPORT_SYMBOL(__get_user_8);
-
-EXPORT_SYMBOL(__put_user_1);
-EXPORT_SYMBOL(__put_user_2);
-EXPORT_SYMBOL(__put_user_4);
-EXPORT_SYMBOL(__put_user_8);
-
-        /* gcc lib functions */
-EXPORT_SYMBOL(__ashldi3);
-EXPORT_SYMBOL(__ashrdi3);
-EXPORT_SYMBOL(__divsi3);
-EXPORT_SYMBOL(__lshrdi3);
-EXPORT_SYMBOL(__modsi3);
-EXPORT_SYMBOL(__muldi3);
-EXPORT_SYMBOL(__ucmpdi2);
-EXPORT_SYMBOL(__udivdi3);
-EXPORT_SYMBOL(__umoddi3);
-EXPORT_SYMBOL(__udivmoddi4);
-EXPORT_SYMBOL(__udivsi3);
-EXPORT_SYMBOL(__umodsi3);
-
-        /* bitops */
-EXPORT_SYMBOL(_set_bit_le);
-EXPORT_SYMBOL(_test_and_set_bit_le);
-EXPORT_SYMBOL(_clear_bit_le);
-EXPORT_SYMBOL(_test_and_clear_bit_le);
-EXPORT_SYMBOL(_change_bit_le);
-EXPORT_SYMBOL(_test_and_change_bit_le);
-EXPORT_SYMBOL(_find_first_zero_bit_le);
-EXPORT_SYMBOL(_find_next_zero_bit_le);
-
-        /* elf */
-EXPORT_SYMBOL(elf_platform);
-EXPORT_SYMBOL(elf_hwcap);
-
-#ifdef CONFIG_PREEMPT
-EXPORT_SYMBOL(kernel_flag);
-#endif
diff --git a/arch/arm26/kernel/asm-offsets.c b/arch/arm26/kernel/asm-offsets.c
deleted file mode 100644
index 76d9d7d489a8..000000000000
--- a/arch/arm26/kernel/asm-offsets.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 1995-2001 Russell King
- *               2001-2002 Keith Owens
- *               2003      Ian Molton
- *     
- * Generate definitions needed by assembly language modules.
- * This code generates raw asm output which is post-processed to extract
- * and format the required data.
- *
- * 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/sched.h>
-#include <linux/mm.h>
-
-#include <asm/pgtable.h>
-#include <asm/uaccess.h>
-
-/*
- * Make sure that the compiler and target are compatible.
- */
-#if defined(__APCS_32__) && defined(CONFIG_CPU_26)
-#error Sorry, your compiler targets APCS-32 but this kernel requires APCS-26
-#endif
-
-/* Use marker if you need to separate the values later */
-
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
-int main(void)
-{
-  DEFINE(TSK_ACTIVE_MM,         offsetof(struct task_struct, active_mm));
-  BLANK();
-  DEFINE(VMA_VM_MM,             offsetof(struct vm_area_struct, vm_mm));
-  DEFINE(VMA_VM_FLAGS,          offsetof(struct vm_area_struct, vm_flags));
-  BLANK();
-  DEFINE(VM_EXEC,               VM_EXEC);
-  BLANK();
-  BLANK();
-  DEFINE(PAGE_PRESENT,          _PAGE_PRESENT);
-  DEFINE(PAGE_READONLY,         _PAGE_READONLY);
-  DEFINE(PAGE_NOT_USER,         _PAGE_NOT_USER);
-  DEFINE(PAGE_OLD,              _PAGE_OLD);
-  DEFINE(PAGE_CLEAN,            _PAGE_CLEAN);
-  BLANK();
-  DEFINE(PAGE_SZ,               PAGE_SIZE);
-  BLANK();
-  DEFINE(SYS_ERROR0,            0x9f0000);
-  return 0; 
-}
diff --git a/arch/arm26/kernel/calls.S b/arch/arm26/kernel/calls.S
deleted file mode 100644
index e3d276827c84..000000000000
--- a/arch/arm26/kernel/calls.S
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/calls.S
- *
- *  Copyright (C) 2003 Ian Molton
- *
- * 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.
- *
- *  FIXME
- *  This file is included twice in entry.S which may not be necessary
- */
-
-//FIXME - clearly NR_syscalls is never defined here
-
-#ifndef NR_syscalls
-#define NR_syscalls 256
-#else
-
-__syscall_start:
-/* 0 */         .long   sys_ni_syscall
-                .long   sys_exit
-                .long   sys_fork_wrapper
-                .long   sys_read
-                .long   sys_write
-/* 5 */         .long   sys_open
-                .long   sys_close
-                .long   sys_ni_syscall          /* was sys_waitpid */
-                .long   sys_creat
-                .long   sys_link
-/* 10 */        .long   sys_unlink
-                .long   sys_execve_wrapper
-                .long   sys_chdir
-                .long   sys_time                /* used by libc4 */
-                .long   sys_mknod
-/* 15 */        .long   sys_chmod
-                .long   sys_lchown16
-                .long   sys_ni_syscall          /* was sys_break */
-                .long   sys_ni_syscall          /* was sys_stat */
-                .long   sys_lseek
-/* 20 */        .long   sys_getpid
-                .long   sys_mount
-                .long   sys_oldumount           /* used by libc4 */
-                .long   sys_setuid16
-                .long   sys_getuid16
-/* 25 */        .long   sys_stime
-                .long   sys_ptrace
-                .long   sys_alarm               /* used by libc4 */
-                .long   sys_ni_syscall          /* was sys_fstat */
-                .long   sys_pause
-/* 30 */        .long   sys_utime               /* used by libc4 */
-                .long   sys_ni_syscall          /* was sys_stty */
-                .long   sys_ni_syscall          /* was sys_getty */
-                .long   sys_access
-                .long   sys_nice
-/* 35 */        .long   sys_ni_syscall          /* was sys_ftime */
-                .long   sys_sync
-                .long   sys_kill
-                .long   sys_rename
-                .long   sys_mkdir
-/* 40 */        .long   sys_rmdir
-                .long   sys_dup
-                .long   sys_pipe
-                .long   sys_times
-                .long   sys_ni_syscall          /* was sys_prof */
-/* 45 */        .long   sys_brk
-                .long   sys_setgid16
-                .long   sys_getgid16
-                .long   sys_ni_syscall          /* was sys_signal */
-                .long   sys_geteuid16
-/* 50 */        .long   sys_getegid16
-                .long   sys_acct
-                .long   sys_umount
-                .long   sys_ni_syscall          /* was sys_lock */
-                .long   sys_ioctl
-/* 55 */        .long   sys_fcntl
-                .long   sys_ni_syscall          /* was sys_mpx */
-                .long   sys_setpgid
-                .long   sys_ni_syscall          /* was sys_ulimit */
-                .long   sys_ni_syscall          /* was sys_olduname */
-/* 60 */        .long   sys_umask
-                .long   sys_chroot
-                .long   sys_ustat
-                .long   sys_dup2
-                .long   sys_getppid
-/* 65 */        .long   sys_getpgrp
-                .long   sys_setsid
-                .long   sys_sigaction
-                .long   sys_ni_syscall          /* was sys_sgetmask */
-                .long   sys_ni_syscall          /* was sys_ssetmask */
-/* 70 */        .long   sys_setreuid16
-                .long   sys_setregid16
-                .long   sys_sigsuspend_wrapper
-                .long   sys_sigpending
-                .long   sys_sethostname
-/* 75 */        .long   sys_setrlimit
-                .long   sys_old_getrlimit       /* used by libc4 */
-                .long   sys_getrusage
-                .long   sys_gettimeofday
-                .long   sys_settimeofday
-/* 80 */        .long   sys_getgroups16
-                .long   sys_setgroups16
-                .long   old_select              /* used by libc4 */
-                .long   sys_symlink
-                .long   sys_ni_syscall          /* was sys_lstat */
-/* 85 */        .long   sys_readlink
-                .long   sys_uselib
-                .long   sys_swapon
-                .long   sys_reboot
-                .long   old_readdir             /* used by libc4 */
-/* 90 */        .long   old_mmap                /* used by libc4 */
-                .long   sys_munmap
-                .long   sys_truncate
-                .long   sys_ftruncate
-                .long   sys_fchmod
-/* 95 */        .long   sys_fchown16
-                .long   sys_getpriority
-                .long   sys_setpriority
-                .long   sys_ni_syscall          /* was sys_profil */
-                .long   sys_statfs
-/* 100 */       .long   sys_fstatfs
-                .long   sys_ni_syscall
-                .long   sys_socketcall
-                .long   sys_syslog
-                .long   sys_setitimer
-/* 105 */       .long   sys_getitimer
-                .long   sys_newstat
-                .long   sys_newlstat
-                .long   sys_newfstat
-                .long   sys_ni_syscall          /* was sys_uname */
-/* 110 */       .long   sys_ni_syscall          /* was sys_iopl */
-                .long   sys_vhangup
-                .long   sys_ni_syscall
-                .long   sys_syscall             /* call a syscall */
-                .long   sys_wait4
-/* 115 */       .long   sys_swapoff
-                .long   sys_sysinfo
-                .long   sys_ipc
-                .long   sys_fsync
-                .long   sys_sigreturn_wrapper
-/* 120 */       .long   sys_clone_wapper
-                .long   sys_setdomainname
-                .long   sys_newuname
-                .long   sys_ni_syscall
-                .long   sys_adjtimex
-/* 125 */       .long   sys_mprotect
-                .long   sys_sigprocmask
-                .long   sys_ni_syscall  /* WAS: sys_create_module */
-                .long   sys_init_module
-                .long   sys_delete_module
-/* 130 */       .long   sys_ni_syscall  /* WAS: sys_get_kernel_syms */
-                .long   sys_quotactl
-                .long   sys_getpgid
-                .long   sys_fchdir
-                .long   sys_bdflush
-/* 135 */       .long   sys_sysfs
-                .long   sys_personality
-                .long   sys_ni_syscall          /* .long        _sys_afs_syscall */
-                .long   sys_setfsuid16
-                .long   sys_setfsgid16
-/* 140 */       .long   sys_llseek
-                .long   sys_getdents
-                .long   sys_select
-                .long   sys_flock
-                .long   sys_msync
-/* 145 */       .long   sys_readv
-                .long   sys_writev
-                .long   sys_getsid
-                .long   sys_fdatasync
-                .long   sys_sysctl
-/* 150 */       .long   sys_mlock
-                .long   sys_munlock
-                .long   sys_mlockall
-                .long   sys_munlockall
-                .long   sys_sched_setparam
-/* 155 */       .long   sys_sched_getparam
-                .long   sys_sched_setscheduler
-                .long   sys_sched_getscheduler
-                .long   sys_sched_yield
-                .long   sys_sched_get_priority_max
-/* 160 */       .long   sys_sched_get_priority_min
-                .long   sys_sched_rr_get_interval
-                .long   sys_nanosleep
-                .long   sys_arm_mremap
-                .long   sys_setresuid16
-/* 165 */       .long   sys_getresuid16
-                .long   sys_ni_syscall
-                .long   sys_ni_syscall /* WAS: sys_query_module */
-                .long   sys_poll
-                .long   sys_nfsservctl
-/* 170 */       .long   sys_setresgid16
-                .long   sys_getresgid16
-                .long   sys_prctl
-                .long   sys_rt_sigreturn_wrapper
-                .long   sys_rt_sigaction
-/* 175 */       .long   sys_rt_sigprocmask
-                .long   sys_rt_sigpending
-                .long   sys_rt_sigtimedwait
-                .long   sys_rt_sigqueueinfo
-                .long   sys_rt_sigsuspend_wrapper
-/* 180 */       .long   sys_pread64
-                .long   sys_pwrite64
-                .long   sys_chown16
-                .long   sys_getcwd
-                .long   sys_capget
-/* 185 */       .long   sys_capset
-                .long   sys_sigaltstack_wrapper
-                .long   sys_sendfile
-                .long   sys_ni_syscall
-                .long   sys_ni_syscall
-/* 190 */       .long   sys_vfork_wrapper
-                .long   sys_getrlimit
-                .long   sys_mmap2
-                .long   sys_truncate64
-                .long   sys_ftruncate64
-/* 195 */       .long   sys_stat64
-                .long   sys_lstat64
-                .long   sys_fstat64
-                .long   sys_lchown
-                .long   sys_getuid
-/* 200 */       .long   sys_getgid
-                .long   sys_geteuid
-                .long   sys_getegid
-                .long   sys_setreuid
-                .long   sys_setregid
-/* 205 */       .long   sys_getgroups
-                .long   sys_setgroups
-                .long   sys_fchown
-                .long   sys_setresuid
-                .long   sys_getresuid
-/* 210 */       .long   sys_setresgid
-                .long   sys_getresgid
-                .long   sys_chown
-                .long   sys_setuid
-                .long   sys_setgid
-/* 215 */       .long   sys_setfsuid
-                .long   sys_setfsgid
-                .long   sys_getdents64
-                .long   sys_pivot_root
-                .long   sys_mincore
-/* 220 */       .long   sys_madvise
-                .long   sys_fcntl64
-                .long   sys_ni_syscall /* TUX */
-                .long   sys_ni_syscall /* WAS: sys_security */
-                .long   sys_gettid
-/* 225 */       .long   sys_readahead
-                .long   sys_setxattr
-                .long   sys_lsetxattr
-                .long   sys_fsetxattr
-                .long   sys_getxattr
-/* 230 */       .long   sys_lgetxattr
-                .long   sys_fgetxattr
-                .long   sys_listxattr
-                .long   sys_llistxattr
-                .long   sys_flistxattr
-/* 235 */       .long   sys_removexattr
-                .long   sys_lremovexattr
-                .long   sys_fremovexattr
-                .long   sys_tkill
-__syscall_end:
-
-                .rept   NR_syscalls - (__syscall_end - __syscall_start) / 4
-                        .long   sys_ni_syscall
-                .endr
-#endif
diff --git a/arch/arm26/kernel/compat.c b/arch/arm26/kernel/compat.c
deleted file mode 100644
index 21e966ff0aa7..000000000000
--- a/arch/arm26/kernel/compat.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/compat.c
- *
- *  Copyright (C) 2001 Russell King
- *                2003 Ian Molton
- *
- * 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.
- *
- * We keep the old params compatibility cruft in one place (here)
- * so we don't end up with lots of mess around other places.
- *
- * NOTE:
- *  The old struct param_struct is deprecated, but it will be kept in
- *  the kernel for 5 years from now (2001). This will allow boot loaders
- *  to convert to the new struct tag way.
- */
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/init.h>
-
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/page.h>
-
-//#include <asm/arch.h>
-//#include <asm/mach/irq.h>
-
-/*
- * Usage:
- *  - do not go blindly adding fields, add them at the end
- *  - when adding fields, don't rely on the address until
- *    a patch from me has been released
- *  - unused fields should be zero (for future expansion)
- *  - this structure is relatively short-lived - only
- *    guaranteed to contain useful data in setup_arch()
- *
- * This is the old deprecated way to pass parameters to the kernel
- */
-struct param_struct {
-    union {
-        struct {
-            unsigned long page_size;            /*  0 */
-            unsigned long nr_pages;             /*  4 */
-            unsigned long ramdisk_size;         /*  8 */
-            unsigned long flags;                /* 12 */
-#define FLAG_READONLY   1
-#define FLAG_RDLOAD     4
-#define FLAG_RDPROMPT   8
-            unsigned long rootdev;              /* 16 */
-            unsigned long video_num_cols;       /* 20 */
-            unsigned long video_num_rows;       /* 24 */
-            unsigned long video_x;              /* 28 */
-            unsigned long video_y;              /* 32 */
-            unsigned long memc_control_reg;     /* 36 */
-            unsigned char sounddefault;         /* 40 */
-            unsigned char adfsdrives;           /* 41 */
-            unsigned char bytes_per_char_h;     /* 42 */
-            unsigned char bytes_per_char_v;     /* 43 */
-            unsigned long pages_in_bank[4];     /* 44 */
-            unsigned long pages_in_vram;        /* 60 */
-            unsigned long initrd_start;         /* 64 */
-            unsigned long initrd_size;          /* 68 */
-            unsigned long rd_start;             /* 72 */
-            unsigned long system_rev;           /* 76 */
-            unsigned long system_serial_low;    /* 80 */
-            unsigned long system_serial_high;   /* 84 */
-            unsigned long mem_fclk_21285;       /* 88 */
-        } s;
-        char unused[256];
-    } u1;
-    union {
-        char paths[8][128];
-        struct {
-            unsigned long magic;
-            char n[1024 - sizeof(unsigned long)];
-        } s;
-    } u2;
-    char commandline[COMMAND_LINE_SIZE];
-};
-
-static struct tag * __init memtag(struct tag *tag, unsigned long start, unsigned long size)
-{
-        tag = tag_next(tag);
-        tag->hdr.tag = ATAG_MEM;
-        tag->hdr.size = tag_size(tag_mem32);
-        tag->u.mem.size = size;
-        tag->u.mem.start = start;
-
-        return tag;
-}
-
-static void __init build_tag_list(struct param_struct *params, void *taglist)
-{
-        struct tag *tag = taglist;
-
-        if (params->u1.s.page_size != PAGE_SIZE) {
-                printk(KERN_WARNING "Warning: bad configuration page, "
-                       "trying to continue\n");
-                return;
-        }
-
-        printk(KERN_DEBUG "Converting old-style param struct to taglist\n");
-
-        tag->hdr.tag  = ATAG_CORE;
-        tag->hdr.size = tag_size(tag_core);
-        tag->u.core.flags = params->u1.s.flags & FLAG_READONLY;
-        tag->u.core.pagesize = params->u1.s.page_size;
-        tag->u.core.rootdev = params->u1.s.rootdev;
-
-        tag = tag_next(tag);
-        tag->hdr.tag = ATAG_RAMDISK;
-        tag->hdr.size = tag_size(tag_ramdisk);
-        tag->u.ramdisk.flags = (params->u1.s.flags & FLAG_RDLOAD ? 1 : 0) |
-                               (params->u1.s.flags & FLAG_RDPROMPT ? 2 : 0);
-        tag->u.ramdisk.size  = params->u1.s.ramdisk_size;
-        tag->u.ramdisk.start = params->u1.s.rd_start;
-
-        tag = tag_next(tag);
-        tag->hdr.tag = ATAG_INITRD;
-        tag->hdr.size = tag_size(tag_initrd);
-        tag->u.initrd.start = params->u1.s.initrd_start;
-        tag->u.initrd.size  = params->u1.s.initrd_size;
-
-        tag = tag_next(tag);
-        tag->hdr.tag = ATAG_SERIAL;
-        tag->hdr.size = tag_size(tag_serialnr);
-        tag->u.serialnr.low = params->u1.s.system_serial_low;
-        tag->u.serialnr.high = params->u1.s.system_serial_high;
-
-        tag = tag_next(tag);
-        tag->hdr.tag = ATAG_REVISION;
-        tag->hdr.size = tag_size(tag_revision);
-        tag->u.revision.rev = params->u1.s.system_rev;
-
-        tag = memtag(tag, PHYS_OFFSET, params->u1.s.nr_pages * PAGE_SIZE);
-
-        tag = tag_next(tag);
-        tag->hdr.tag = ATAG_ACORN;
-        tag->hdr.size = tag_size(tag_acorn);
-        tag->u.acorn.memc_control_reg = params->u1.s.memc_control_reg;
-        tag->u.acorn.vram_pages       = params->u1.s.pages_in_vram;
-        tag->u.acorn.sounddefault     = params->u1.s.sounddefault;
-        tag->u.acorn.adfsdrives       = params->u1.s.adfsdrives;
-
-        tag = tag_next(tag);
-        tag->hdr.tag = ATAG_CMDLINE;
-        tag->hdr.size = (strlen(params->commandline) + 3 +
-                         sizeof(struct tag_header)) >> 2;
-        strcpy(tag->u.cmdline.cmdline, params->commandline);
-
-        tag = tag_next(tag);
-        tag->hdr.tag = ATAG_NONE;
-        tag->hdr.size = 0;
-
-        memmove(params, taglist, ((int)tag) - ((int)taglist) +
-                                 sizeof(struct tag_header));
-}
-
-void __init convert_to_tag_list(struct tag *tags)
-{
-        struct param_struct *params = (struct param_struct *)tags;
-        build_tag_list(params, &params->u2);
-}
-
-void __init squash_mem_tags(struct tag *tag)
-{
-        for (; tag->hdr.size; tag = tag_next(tag))
-                if (tag->hdr.tag == ATAG_MEM)
-                        tag->hdr.tag = ATAG_NONE;
-}
diff --git a/arch/arm26/kernel/dma.c b/arch/arm26/kernel/dma.c
deleted file mode 100644
index 80b5a774d905..000000000000
--- a/arch/arm26/kernel/dma.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/dma.c
- *
- *  Copyright (C) 1995-2000 Russell King
- *                2003      Ian Molton
- *
- * 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.
- *
- *  Front-end to the DMA handling.  This handles the allocation/freeing
- *  of DMA channels, and provides a unified interface to the machines
- *  DMA facilities.
- */
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/mman.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-#include <linux/errno.h>
-
-#include <asm/dma.h>
-
-DEFINE_SPINLOCK(dma_spin_lock);
-
-static dma_t dma_chan[MAX_DMA_CHANNELS];
-
-/*
- * Get dma list for /proc/dma
- */
-int get_dma_list(char *buf)
-{
-        dma_t *dma;
-        char *p = buf;
-        int i;
-
-        for (i = 0, dma = dma_chan; i < MAX_DMA_CHANNELS; i++, dma++)
-                if (dma->lock)
-                        p += sprintf(p, "%2d: %14s %s\n", i,
-                                     dma->d_ops->type, dma->device_id);
-
-        return p - buf;
-}
-
-/*
- * Request DMA channel
- *
- * On certain platforms, we have to allocate an interrupt as well...
- */
-int request_dma(dmach_t channel, const char *device_id)
-{
-        dma_t *dma = dma_chan + channel;
-        int ret;
-
-        if (channel >= MAX_DMA_CHANNELS || !dma->d_ops)
-                goto bad_dma;
-
-        if (xchg(&dma->lock, 1) != 0)
-                goto busy;
-
-        dma->device_id = device_id;
-        dma->active    = 0;
-        dma->invalid   = 1;
-
-        ret = 0;
-        if (dma->d_ops->request)
-                ret = dma->d_ops->request(channel, dma);
-
-        if (ret)
-                xchg(&dma->lock, 0);
-
-        return ret;
-
-bad_dma:
-        printk(KERN_ERR "dma: trying to allocate DMA%d\n", channel);
-        return -EINVAL;
-
-busy:
-        return -EBUSY;
-}
-
-/*
- * Free DMA channel
- *
- * On certain platforms, we have to free interrupt as well...
- */
-void free_dma(dmach_t channel)
-{
-        dma_t *dma = dma_chan + channel;
-
-        if (channel >= MAX_DMA_CHANNELS || !dma->d_ops)
-                goto bad_dma;
-
-        if (dma->active) {
-                printk(KERN_ERR "dma%d: freeing active DMA\n", channel);
-                dma->d_ops->disable(channel, dma);
-                dma->active = 0;
-        }
-
-        if (xchg(&dma->lock, 0) != 0) {
-                if (dma->d_ops->free)
-                        dma->d_ops->free(channel, dma);
-                return;
-        }
-
-        printk(KERN_ERR "dma%d: trying to free free DMA\n", channel);
-        return;
-
-bad_dma:
-        printk(KERN_ERR "dma: trying to free DMA%d\n", channel);
-}
-
-/* Set DMA Scatter-Gather list
- */
-void set_dma_sg (dmach_t channel, struct scatterlist *sg, int nr_sg)
-{
-        dma_t *dma = dma_chan + channel;
-
-        if (dma->active)
-                printk(KERN_ERR "dma%d: altering DMA SG while "
-                       "DMA active\n", channel);
-
-        dma->sg = sg;
-        dma->sgcount = nr_sg;
-        dma->using_sg = 1;
-        dma->invalid = 1;
-}
-
-/* Set DMA address
- *
- * Copy address to the structure, and set the invalid bit
- */
-void set_dma_addr (dmach_t channel, unsigned long physaddr)
-{
-        dma_t *dma = dma_chan + channel;
-
-        if (dma->active)
-                printk(KERN_ERR "dma%d: altering DMA address while "
-                       "DMA active\n", channel);
-
-        dma->sg = &dma->buf;
-        dma->sgcount = 1;
-        dma->buf.__address = (char *)physaddr;//FIXME - not pretty
-        dma->using_sg = 0;
-        dma->invalid = 1;
-}
-
-/* Set DMA byte count
- *
- * Copy address to the structure, and set the invalid bit
- */
-void set_dma_count (dmach_t channel, unsigned long count)
-{
-        dma_t *dma = dma_chan + channel;
-
-        if (dma->active)
-                printk(KERN_ERR "dma%d: altering DMA count while "
-                       "DMA active\n", channel);
-
-        dma->sg = &dma->buf;
-        dma->sgcount = 1;
-        dma->buf.length = count;
-        dma->using_sg = 0;
-        dma->invalid = 1;
-}
-
-/* Set DMA direction mode
- */
-void set_dma_mode (dmach_t channel, dmamode_t mode)
-{
-        dma_t *dma = dma_chan + channel;
-
-        if (dma->active)
-                printk(KERN_ERR "dma%d: altering DMA mode while "
-                       "DMA active\n", channel);
-
-        dma->dma_mode = mode;
-        dma->invalid = 1;
-}
-
-/* Enable DMA channel
- */
-void enable_dma (dmach_t channel)
-{
-        dma_t *dma = dma_chan + channel;
-
-        if (!dma->lock)
-                goto free_dma;
-
-        if (dma->active == 0) {
-                dma->active = 1;
-                dma->d_ops->enable(channel, dma);
-        }
-        return;
-
-free_dma:
-        printk(KERN_ERR "dma%d: trying to enable free DMA\n", channel);
-        BUG();
-}
-
-/* Disable DMA channel
- */
-void disable_dma (dmach_t channel)
-{
-        dma_t *dma = dma_chan + channel;
-
-        if (!dma->lock)
-                goto free_dma;
-
-        if (dma->active == 1) {
-                dma->active = 0;
-                dma->d_ops->disable(channel, dma);
-        }
-        return;
-
-free_dma:
-        printk(KERN_ERR "dma%d: trying to disable free DMA\n", channel);
-        BUG();
-}
-
-/*
- * Is the specified DMA channel active?
- */
-int dma_channel_active(dmach_t channel)
-{
-        return dma_chan[channel].active;
-}
-
-void set_dma_page(dmach_t channel, char pagenr)
-{
-        printk(KERN_ERR "dma%d: trying to set_dma_page\n", channel);
-}
-
-void set_dma_speed(dmach_t channel, int cycle_ns)
-{
-        dma_t *dma = dma_chan + channel;
-        int ret = 0;
-
-        if (dma->d_ops->setspeed)
-                ret = dma->d_ops->setspeed(channel, dma, cycle_ns);
-        dma->speed = ret;
-}
-
-int get_dma_residue(dmach_t channel)
-{
-        dma_t *dma = dma_chan + channel;
-        int ret = 0;
-
-        if (dma->d_ops->residue)
-                ret = dma->d_ops->residue(channel, dma);
-
-        return ret;
-}
-
-void __init init_dma(void)
-{
-        arch_dma_init(dma_chan);
-}
-
-EXPORT_SYMBOL(request_dma);
-EXPORT_SYMBOL(free_dma);
-EXPORT_SYMBOL(enable_dma);
-EXPORT_SYMBOL(disable_dma);
-EXPORT_SYMBOL(set_dma_addr);
-EXPORT_SYMBOL(set_dma_count);
-EXPORT_SYMBOL(set_dma_mode);
-EXPORT_SYMBOL(set_dma_page);
-EXPORT_SYMBOL(get_dma_residue);
-EXPORT_SYMBOL(set_dma_sg);
-EXPORT_SYMBOL(set_dma_speed);
-
-EXPORT_SYMBOL(dma_spin_lock);
diff --git a/arch/arm26/kernel/ecard.c b/arch/arm26/kernel/ecard.c
deleted file mode 100644
index e2bcefc91cc3..000000000000
--- a/arch/arm26/kernel/ecard.c
+++ /dev/null
@@ -1,847 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/ecard.c
- *
- *  Copyright 1995-2001 Russell King
- *  Copyright 2003 Ian Molton
- *
- * 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.
- *
- *  Find all installed expansion cards, and handle interrupts from them.
- *
- *  Created from information from Acorns RiscOS3 PRMs
- *  15-Jun-2003 IM      Modified from ARM32 (RiscPC capable) version
- *  10-Jan-1999 RMK     Run loaders in a simulated RISC OS environment.
- *  06-May-1997 RMK     Added blacklist for cards whose loader doesn't work.
- *  12-Sep-1997 RMK     Created new handling of interrupt enables/disables
- *                      - cards can now register their own routine to control
- *                      interrupts (recommended).
- *  29-Sep-1997 RMK     Expansion card interrupt hardware not being re-enabled
- *                      on reset from Linux. (Caused cards not to respond
- *                      under RiscOS without hard reset).
- *
- */
-#define ECARD_C
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/reboot.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/proc_fs.h>
-#include <linux/device.h>
-#include <linux/init.h>
-
-#include <asm/dma.h>
-#include <asm/ecard.h>
-#include <asm/hardware.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/mmu_context.h>
-#include <asm/irqchip.h>
-#include <asm/tlbflush.h>
-
-enum req {
-        req_readbytes,
-        req_reset
-};
-
-struct ecard_request {
-        enum req        req;
-        ecard_t         *ec;
-        unsigned int    address;
-        unsigned int    length;
-        unsigned int    use_loader;
-        void            *buffer;
-};
-
-struct expcard_blacklist {
-        unsigned short   manufacturer;
-        unsigned short   product;
-        const char      *type;
-};
-
-static ecard_t *cards;
-static ecard_t *slot_to_expcard[MAX_ECARDS];
-static unsigned int ectcr;
-
-/* List of descriptions of cards which don't have an extended
- * identification, or chunk directories containing a description.
- */
-static struct expcard_blacklist __initdata blacklist[] = {
-        { MANU_ACORN, PROD_ACORN_ETHER1, "Acorn Ether1" }
-};
-
-asmlinkage extern int
-ecard_loader_reset(volatile unsigned char *pa, loader_t loader);
-asmlinkage extern int
-ecard_loader_read(int off, volatile unsigned char *pa, loader_t loader);
-
-static const struct ecard_id *
-ecard_match_device(const struct ecard_id *ids, struct expansion_card *ec);
-
-static inline unsigned short
-ecard_getu16(unsigned char *v)
-{
-        return v[0] | v[1] << 8;
-}
-
-static inline signed long
-ecard_gets24(unsigned char *v)
-{
-        return v[0] | v[1] << 8 | v[2] << 16 | ((v[2] & 0x80) ? 0xff000000 : 0);
-}
-
-static inline ecard_t *
-slot_to_ecard(unsigned int slot)
-{
-        return slot < MAX_ECARDS ? slot_to_expcard[slot] : NULL;
-}
-
-/* ===================== Expansion card daemon ======================== */
-/*
- * Since the loader programs on the expansion cards need to be run
- * in a specific environment, create a separate task with this
- * environment up, and pass requests to this task as and when we
- * need to.
- *
- * This should allow 99% of loaders to be called from Linux.
- *
- * From a security standpoint, we trust the card vendors.  This
- * may be a misplaced trust.
- */
-#define BUS_ADDR(x) ((((unsigned long)(x)) << 2) + IO_BASE)
-#define POD_INT_ADDR(x) ((volatile unsigned char *)\
-                         ((BUS_ADDR((x)) - IO_BASE) + IO_START))
-
-static inline void ecard_task_reset(struct ecard_request *req)
-{
-        struct expansion_card *ec = req->ec;
-        if (ec->loader)
-                ecard_loader_reset(POD_INT_ADDR(ec->podaddr), ec->loader);
-}
-
-static void
-ecard_task_readbytes(struct ecard_request *req)
-{
-        unsigned char *buf = (unsigned char *)req->buffer;
-        volatile unsigned char *base_addr =
-                (volatile unsigned char *)POD_INT_ADDR(req->ec->podaddr);
-        unsigned int len = req->length;
-        unsigned int off = req->address;
-
-        if (!req->use_loader || !req->ec->loader) {
-                off *= 4;
-                while (len--) {
-                        *buf++ = base_addr[off];
-                        off += 4;
-                }
-        } else {
-                while(len--) {
-                        /*
-                         * The following is required by some
-                         * expansion card loader programs.
-                         */
-                        *(unsigned long *)0x108 = 0;
-                        *buf++ = ecard_loader_read(off++, base_addr,
-                                                   req->ec->loader);
-                }
-        }
-}
-
-static void ecard_do_request(struct ecard_request *req)
-{
-        switch (req->req) {
-        case req_readbytes:
-                ecard_task_readbytes(req);
-                break;
-
-        case req_reset:
-                ecard_task_reset(req);
-                break;
-        }
-}
-
-/*
- * On 26-bit processors, we don't need the kcardd thread to access the
- * expansion card loaders.  We do it directly.
- */
-#define ecard_call(req) ecard_do_request(req)
-
-/* ======================= Mid-level card control ===================== */
-
-static void
-ecard_readbytes(void *addr, ecard_t *ec, int off, int len, int useld)
-{
-        struct ecard_request req;
-
-        req.req         = req_readbytes;
-        req.ec          = ec;
-        req.address     = off;
-        req.length      = len;
-        req.use_loader  = useld;
-        req.buffer      = addr;
-
-        ecard_call(&req);
-}
-
-int ecard_readchunk(struct in_chunk_dir *cd, ecard_t *ec, int id, int num)
-{
-        struct ex_chunk_dir excd;
-        int index = 16;
-        int useld = 0;
-
-        if (!ec->cid.cd)
-                return 0;
-
-        while(1) {
-                ecard_readbytes(&excd, ec, index, 8, useld);
-                index += 8;
-                if (c_id(&excd) == 0) {
-                        if (!useld && ec->loader) {
-                                useld = 1;
-                                index = 0;
-                                continue;
-                        }
-                        return 0;
-                }
-                if (c_id(&excd) == 0xf0) { /* link */
-                        index = c_start(&excd);
-                        continue;
-                }
-                if (c_id(&excd) == 0x80) { /* loader */
-                        if (!ec->loader) {
-                                ec->loader = kmalloc(c_len(&excd),
-                                                               GFP_KERNEL);
-                                if (ec->loader)
-                                        ecard_readbytes(ec->loader, ec,
-                                                        (int)c_start(&excd),
-                                                        c_len(&excd), useld);
-                                else
-                                        return 0;
-                        }
-                        continue;
-                }
-                if (c_id(&excd) == id && num-- == 0)
-                        break;
-        }
-
-        if (c_id(&excd) & 0x80) {
-                switch (c_id(&excd) & 0x70) {
-                case 0x70:
-                        ecard_readbytes((unsigned char *)excd.d.string, ec,
-                                        (int)c_start(&excd), c_len(&excd),
-                                        useld);
-                        break;
-                case 0x00:
-                        break;
-                }
-        }
-        cd->start_offset = c_start(&excd);
-        memcpy(cd->d.string, excd.d.string, 256);
-        return 1;
-}
-
-/* ======================= Interrupt control ============================ */
-
-static void ecard_def_irq_enable(ecard_t *ec, int irqnr)
-{
-}
-
-static void ecard_def_irq_disable(ecard_t *ec, int irqnr)
-{
-}
-
-static int ecard_def_irq_pending(ecard_t *ec)
-{
-        return !ec->irqmask || ec->irqaddr[0] & ec->irqmask;
-}
-
-static void ecard_def_fiq_enable(ecard_t *ec, int fiqnr)
-{
-        panic("ecard_def_fiq_enable called - impossible");
-}
-
-static void ecard_def_fiq_disable(ecard_t *ec, int fiqnr)
-{
-        panic("ecard_def_fiq_disable called - impossible");
-}
-
-static int ecard_def_fiq_pending(ecard_t *ec)
-{
-        return !ec->fiqmask || ec->fiqaddr[0] & ec->fiqmask;
-}
-
-static expansioncard_ops_t ecard_default_ops = {
-        ecard_def_irq_enable,
-        ecard_def_irq_disable,
-        ecard_def_irq_pending,
-        ecard_def_fiq_enable,
-        ecard_def_fiq_disable,
-        ecard_def_fiq_pending
-};
-
-/*
- * Enable and disable interrupts from expansion cards.
- * (interrupts are disabled for these functions).
- *
- * They are not meant to be called directly, but via enable/disable_irq.
- */
-static void ecard_irq_unmask(unsigned int irqnr)
-{
-        ecard_t *ec = slot_to_ecard(irqnr - 32);
-
-        if (ec) {
-                if (!ec->ops)
-                        ec->ops = &ecard_default_ops;
-
-                if (ec->claimed && ec->ops->irqenable)
-                        ec->ops->irqenable(ec, irqnr);
-                else
-                        printk(KERN_ERR "ecard: rejecting request to "
-                                "enable IRQs for %d\n", irqnr);
-        }
-}
-
-static void ecard_irq_mask(unsigned int irqnr)
-{
-        ecard_t *ec = slot_to_ecard(irqnr - 32);
-
-        if (ec) {
-                if (!ec->ops)
-                        ec->ops = &ecard_default_ops;
-
-                if (ec->ops && ec->ops->irqdisable)
-                        ec->ops->irqdisable(ec, irqnr);
-        }
-}
-
-static struct irqchip ecard_chip = {
-        .ack    = ecard_irq_mask,
-        .mask   = ecard_irq_mask,
-        .unmask = ecard_irq_unmask,
-};
-
-void ecard_enablefiq(unsigned int fiqnr)
-{
-        ecard_t *ec = slot_to_ecard(fiqnr);
-
-        if (ec) {
-                if (!ec->ops)
-                        ec->ops = &ecard_default_ops;
-
-                if (ec->claimed && ec->ops->fiqenable)
-                        ec->ops->fiqenable(ec, fiqnr);
-                else
-                        printk(KERN_ERR "ecard: rejecting request to "
-                                "enable FIQs for %d\n", fiqnr);
-        }
-}
-
-void ecard_disablefiq(unsigned int fiqnr)
-{
-        ecard_t *ec = slot_to_ecard(fiqnr);
-
-        if (ec) {
-                if (!ec->ops)
-                        ec->ops = &ecard_default_ops;
-
-                if (ec->ops->fiqdisable)
-                        ec->ops->fiqdisable(ec, fiqnr);
-        }
-}
-
-static void
-ecard_dump_irq_state(ecard_t *ec)
-{
-        printk("  %d: %sclaimed, ",
-               ec->slot_no,
-               ec->claimed ? "" : "not ");
-
-        if (ec->ops && ec->ops->irqpending &&
-            ec->ops != &ecard_default_ops)
-                printk("irq %spending\n",
-                       ec->ops->irqpending(ec) ? "" : "not ");
-        else
-                printk("irqaddr %p, mask = %02X, status = %02X\n",
-                       ec->irqaddr, ec->irqmask, *ec->irqaddr);
-}
-
-static void ecard_check_lockup(struct irqdesc *desc)
-{
-        static int last, lockup;
-        ecard_t *ec;
-
-        /*
-         * If the timer interrupt has not run since the last million
-         * unrecognised expansion card interrupts, then there is
-         * something seriously wrong.  Disable the expansion card
-         * interrupts so at least we can continue.
-         *
-         * Maybe we ought to start a timer to re-enable them some time
-         * later?
-         */
-        if (last == jiffies) {
-                lockup += 1;
-                if (lockup > 1000000) {
-                        printk(KERN_ERR "\nInterrupt lockup detected - "
-                               "disabling all expansion card interrupts\n");
-
-                        desc->chip->mask(IRQ_EXPANSIONCARD);
-
-                        printk("Expansion card IRQ state:\n");
-
-                        for (ec = cards; ec; ec = ec->next)
-                                ecard_dump_irq_state(ec);
-                }
-        } else
-                lockup = 0;
-
-        /*
-         * If we did not recognise the source of this interrupt,
-         * warn the user, but don't flood the user with these messages.
-         */
-        if (!last || time_after(jiffies, (unsigned long)(last + 5*HZ))) {
-                last = jiffies;
-                printk(KERN_WARNING "Unrecognised interrupt from backplane\n");
-        }
-}
-
-static void
-ecard_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
-{
-        ecard_t *ec;
-        int called = 0;
-
-        desc->chip->mask(irq);
-        for (ec = cards; ec; ec = ec->next) {
-                int pending;
-
-                if (!ec->claimed || ec->irq == NO_IRQ)
-                        continue;
-
-                if (ec->ops && ec->ops->irqpending)
-                        pending = ec->ops->irqpending(ec);
-                else
-                        pending = ecard_default_ops.irqpending(ec);
-
-                if (pending) {
-                        struct irqdesc *d = irq_desc + ec->irq;
-                        d->handle(ec->irq, d, regs);
-                        called ++;
-                }
-        }
-        desc->chip->unmask(irq);
-
-        if (called == 0)
-                ecard_check_lockup(desc);
-}
-
-#define ecard_irqexp_handler NULL
-#define ecard_probeirqhw() (0)
-
-unsigned int ecard_address(ecard_t *ec, card_type_t type, card_speed_t speed)
-{
-        unsigned long address = 0;
-        int slot = ec->slot_no;
-
-        ectcr &= ~(1 << slot);
-
-        switch (type) {
-        case ECARD_MEMC:
-                address = IO_EC_MEMC_BASE + (slot << 12);
-                break;
-
-        case ECARD_IOC:
-                address = IO_EC_IOC_BASE + (slot << 12) + (speed << 17);
-                break;
-
-        default:
-                break;
-        }
-
-        return address;
-}
-
-static int ecard_prints(char *buffer, ecard_t *ec)
-{
-        char *start = buffer;
-
-        buffer += sprintf(buffer, "  %d: ", ec->slot_no);
-
-        if (ec->cid.id == 0) {
-                struct in_chunk_dir incd;
-
-                buffer += sprintf(buffer, "[%04X:%04X] ",
-                        ec->cid.manufacturer, ec->cid.product);
-
-                if (!ec->card_desc && ec->cid.cd &&
-                    ecard_readchunk(&incd, ec, 0xf5, 0)) {
-                        ec->card_desc = kmalloc(strlen(incd.d.string)+1, GFP_KERNEL);
-
-                        if (ec->card_desc)
-                                strcpy((char *)ec->card_desc, incd.d.string);
-                }
-
-                buffer += sprintf(buffer, "%s\n", ec->card_desc ? ec->card_desc : "*unknown*");
-        } else
-                buffer += sprintf(buffer, "Simple card %d\n", ec->cid.id);
-
-        return buffer - start;
-}
-
-static int get_ecard_dev_info(char *buf, char **start, off_t pos, int count)
-{
-        ecard_t *ec = cards;
-        off_t at = 0;
-        int len, cnt;
-
-        cnt = 0;
-        while (ec && count > cnt) {
-                len = ecard_prints(buf, ec);
-                at += len;
-                if (at >= pos) {
-                        if (!*start) {
-                                *start = buf + (pos - (at - len));
-                                cnt = at - pos;
-                        } else
-                                cnt += len;
-                        buf += len;
-                }
-                ec = ec->next;
-        }
-        return (count > cnt) ? cnt : count;
-}
-
-static struct proc_dir_entry *proc_bus_ecard_dir = NULL;
-
-static void ecard_proc_init(void)
-{
-        proc_bus_ecard_dir = proc_mkdir("ecard", proc_bus);
-        create_proc_info_entry("devices", 0, proc_bus_ecard_dir,
-                get_ecard_dev_info);
-}
-
-#define ec_set_resource(ec,nr,st,sz,flg)                        \
-        do {                                                    \
-                (ec)->resource[nr].name = ec->dev.bus_id;       \
-                (ec)->resource[nr].start = st;                  \
-                (ec)->resource[nr].end = (st) + (sz) - 1;       \
-                (ec)->resource[nr].flags = flg;                 \
-        } while (0)
-
-static void __init ecard_init_resources(struct expansion_card *ec)
-{
-        unsigned long base = PODSLOT_IOC0_BASE;
-        unsigned int slot = ec->slot_no;
-        int i;
-
-        ec_set_resource(ec, ECARD_RES_MEMC,
-                        PODSLOT_MEMC_BASE + (slot << 14),
-                        PODSLOT_MEMC_SIZE, IORESOURCE_MEM);
-
-        for (i = 0; i < ECARD_RES_IOCSYNC - ECARD_RES_IOCSLOW; i++) {
-                ec_set_resource(ec, i + ECARD_RES_IOCSLOW,
-                                base + (slot << 14) + (i << 19),
-                                PODSLOT_IOC_SIZE, IORESOURCE_MEM);
-        }
-
-        for (i = 0; i < ECARD_NUM_RESOURCES; i++) {
-                if (ec->resource[i].start &&
-                    request_resource(&iomem_resource, &ec->resource[i])) {
-                        printk(KERN_ERR "%s: resource(s) not available\n",
-                                ec->dev.bus_id);
-                        ec->resource[i].end -= ec->resource[i].start;
-                        ec->resource[i].start = 0;
-                }
-        }
-}
-
-static ssize_t ecard_show_irq(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct expansion_card *ec = ECARD_DEV(dev);
-        return sprintf(buf, "%u\n", ec->irq);
-}
-
-static ssize_t ecard_show_vendor(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct expansion_card *ec = ECARD_DEV(dev);
-        return sprintf(buf, "%u\n", ec->cid.manufacturer);
-}
-
-static ssize_t ecard_show_device(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct expansion_card *ec = ECARD_DEV(dev);
-        return sprintf(buf, "%u\n", ec->cid.product);
-}
-
-static ssize_t ecard_show_dma(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct expansion_card *ec = ECARD_DEV(dev);
-        return sprintf(buf, "%u\n", ec->dma);
-}
-
-static ssize_t ecard_show_resources(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct expansion_card *ec = ECARD_DEV(dev);
-        char *str = buf;
-        int i;
-
-        for (i = 0; i < ECARD_NUM_RESOURCES; i++)
-                str += sprintf(str, "%08lx %08lx %08lx\n",
-                                ec->resource[i].start,
-                                ec->resource[i].end,
-                                ec->resource[i].flags);
-
-        return str - buf;
-}
-
-static DEVICE_ATTR(irq, S_IRUGO, ecard_show_irq, NULL);
-static DEVICE_ATTR(vendor, S_IRUGO, ecard_show_vendor, NULL);
-static DEVICE_ATTR(device, S_IRUGO, ecard_show_device, NULL);
-static DEVICE_ATTR(dma, S_IRUGO, ecard_show_dma, NULL);
-static DEVICE_ATTR(resource, S_IRUGO, ecard_show_resources, NULL);
-
-/*
- * Probe for an expansion card.
- *
- * If bit 1 of the first byte of the card is set, then the
- * card does not exist.
- */
-static int __init
-ecard_probe(int slot, card_type_t type)
-{
-        ecard_t **ecp;
-        ecard_t *ec;
-        struct ex_ecid cid;
-        int i, rc = -ENOMEM;
-
-        ec = kzalloc(sizeof(ecard_t), GFP_KERNEL);
-        if (!ec)
-                goto nomem;
-
-        ec->slot_no     = slot;
-        ec->type        = type;
-        ec->irq         = NO_IRQ;
-        ec->fiq         = NO_IRQ;
-        ec->dma         = NO_DMA;
-        ec->card_desc   = NULL;
-        ec->ops         = &ecard_default_ops;
-
-        rc = -ENODEV;
-        if ((ec->podaddr = ecard_address(ec, type, ECARD_SYNC)) == 0)
-                goto nodev;
-
-        cid.r_zero = 1;
-        ecard_readbytes(&cid, ec, 0, 16, 0);
-        if (cid.r_zero)
-                goto nodev;
-
-        ec->cid.id      = cid.r_id;
-        ec->cid.cd      = cid.r_cd;
-        ec->cid.is      = cid.r_is;
-        ec->cid.w       = cid.r_w;
-        ec->cid.manufacturer = ecard_getu16(cid.r_manu);
-        ec->cid.product = ecard_getu16(cid.r_prod);
-        ec->cid.country = cid.r_country;
-        ec->cid.irqmask = cid.r_irqmask;
-        ec->cid.irqoff  = ecard_gets24(cid.r_irqoff);
-        ec->cid.fiqmask = cid.r_fiqmask;
-        ec->cid.fiqoff  = ecard_gets24(cid.r_fiqoff);
-        ec->fiqaddr     =
-        ec->irqaddr     = (unsigned char *)ioaddr(ec->podaddr);
-
-        if (ec->cid.is) {
-                ec->irqmask = ec->cid.irqmask;
-                ec->irqaddr += ec->cid.irqoff;
-                ec->fiqmask = ec->cid.fiqmask;
-                ec->fiqaddr += ec->cid.fiqoff;
-        } else {
-                ec->irqmask = 1;
-                ec->fiqmask = 4;
-        }
-
-        for (i = 0; i < ARRAY_SIZE(blacklist); i++)
-                if (blacklist[i].manufacturer == ec->cid.manufacturer &&
-                    blacklist[i].product == ec->cid.product) {
-                        ec->card_desc = blacklist[i].type;
-                        break;
-                }
-
-        snprintf(ec->dev.bus_id, sizeof(ec->dev.bus_id), "ecard%d", slot);
-        ec->dev.parent = NULL;
-        ec->dev.bus    = &ecard_bus_type;
-        ec->dev.dma_mask = &ec->dma_mask;
-        ec->dma_mask = (u64)0xffffffff;
-
-        ecard_init_resources(ec);
-
-        /*
-         * hook the interrupt handlers
-         */
-        ec->irq = 32 + slot;
-        set_irq_chip(ec->irq, &ecard_chip);
-        set_irq_handler(ec->irq, do_level_IRQ);
-        set_irq_flags(ec->irq, IRQF_VALID);
-
-        for (ecp = &cards; *ecp; ecp = &(*ecp)->next);
-
-        *ecp = ec;
-        slot_to_expcard[slot] = ec;
-
-        device_register(&ec->dev);
-        device_create_file(&ec->dev, &dev_attr_dma);
-        device_create_file(&ec->dev, &dev_attr_irq);
-        device_create_file(&ec->dev, &dev_attr_resource);
-        device_create_file(&ec->dev, &dev_attr_vendor);
-        device_create_file(&ec->dev, &dev_attr_device); 
-
-        return 0;
-
-nodev:
-        kfree(ec);
-nomem:
-        return rc;
-}
-
-/*
- * Initialise the expansion card system.
- * Locate all hardware - interrupt management and
- * actual cards.
- */
-static int __init ecard_init(void)
-{
-        int slot, irqhw;
-
-        printk("Probing expansion cards\n");
-
-        for (slot = 0; slot < MAX_ECARDS; slot ++) {
-                ecard_probe(slot, ECARD_IOC);
-        }
-
-        irqhw = ecard_probeirqhw();
-
-        set_irq_chained_handler(IRQ_EXPANSIONCARD,
-                                irqhw ? ecard_irqexp_handler : ecard_irq_handler);
-
-        ecard_proc_init();
-
-        return 0;
-}
-
-subsys_initcall(ecard_init);
-
-/*
- *      ECARD "bus"
- */
-static const struct ecard_id *
-ecard_match_device(const struct ecard_id *ids, struct expansion_card *ec)
-{
-        int i;
-
-        for (i = 0; ids[i].manufacturer != 65535; i++)
-                if (ec->cid.manufacturer == ids[i].manufacturer &&
-                    ec->cid.product == ids[i].product)
-                        return ids + i;
-
-        return NULL;
-}
-
-static int ecard_drv_probe(struct device *dev)
-{
-        struct expansion_card *ec = ECARD_DEV(dev);
-        struct ecard_driver *drv = ECARD_DRV(dev->driver);
-        const struct ecard_id *id;
-        int ret;
-
-        id = ecard_match_device(drv->id_table, ec);
-
-        ecard_claim(ec);
-        ret = drv->probe(ec, id);
-        if (ret)
-                ecard_release(ec);
-        return ret;
-}
-
-static int ecard_drv_remove(struct device *dev)
-{
-        struct expansion_card *ec = ECARD_DEV(dev);
-        struct ecard_driver *drv = ECARD_DRV(dev->driver);
-
-        drv->remove(ec);
-        ecard_release(ec);
-
-        return 0;
-}
-
-/*
- * Before rebooting, we must make sure that the expansion card is in a
- * sensible state, so it can be re-detected.  This means that the first
- * page of the ROM must be visible.  We call the expansion cards reset
- * handler, if any.
- */
-static void ecard_drv_shutdown(struct device *dev)
-{
-        struct expansion_card *ec = ECARD_DEV(dev);
-        struct ecard_driver *drv = ECARD_DRV(dev->driver);
-        struct ecard_request req;
-
-        if (drv->shutdown)
-                drv->shutdown(ec);
-        ecard_release(ec);
-        req.req = req_reset;
-        req.ec = ec;
-        ecard_call(&req);
-}
-
-int ecard_register_driver(struct ecard_driver *drv)
-{
-        drv->drv.bus = &ecard_bus_type;
-        drv->drv.probe = ecard_drv_probe;
-        drv->drv.remove = ecard_drv_remove;
-        drv->drv.shutdown = ecard_drv_shutdown;
-
-        return driver_register(&drv->drv);
-}
-
-void ecard_remove_driver(struct ecard_driver *drv)
-{
-        driver_unregister(&drv->drv);
-}
-
-static int ecard_match(struct device *_dev, struct device_driver *_drv)
-{
-        struct expansion_card *ec = ECARD_DEV(_dev);
-        struct ecard_driver *drv = ECARD_DRV(_drv);
-        int ret;
-
-        if (drv->id_table) {
-                ret = ecard_match_device(drv->id_table, ec) != NULL;
-        } else {
-                ret = ec->cid.id == drv->id;
-        }
-
-        return ret;
-}
-
-struct bus_type ecard_bus_type = {
-        .name   = "ecard",
-        .match  = ecard_match,
-};
-
-static int ecard_bus_init(void)
-{
-        return bus_register(&ecard_bus_type);
-}
-
-postcore_initcall(ecard_bus_init);
-
-EXPORT_SYMBOL(ecard_readchunk);
-EXPORT_SYMBOL(ecard_address);
-EXPORT_SYMBOL(ecard_register_driver);
-EXPORT_SYMBOL(ecard_remove_driver);
-EXPORT_SYMBOL(ecard_bus_type);
diff --git a/arch/arm26/kernel/entry.S b/arch/arm26/kernel/entry.S
deleted file mode 100644
index 91496cc687b1..000000000000
--- a/arch/arm26/kernel/entry.S
+++ /dev/null
@@ -1,951 +0,0 @@
-/* arch/arm26/kernel/entry.S
- * 
- * Assembled from chunks of code in arch/arm
- *
- * Copyright (C) 2003 Ian Molton
- * Based on the work of RMK.
- *
- */
-
-#include <linux/linkage.h>
-
-#include <asm/assembler.h>
-#include <asm/asm-offsets.h>
-#include <asm/errno.h>
-#include <asm/hardware.h>
-#include <asm/sysirq.h>
-#include <asm/thread_info.h>
-#include <asm/page.h>
-#include <asm/ptrace.h>
-
-        .macro  zero_fp
-#ifndef CONFIG_NO_FRAME_POINTER
-        mov     fp, #0
-#endif
-        .endm
-
-        .text
-
-@ Bad Abort numbers
-@ -----------------
-@
-#define BAD_PREFETCH    0
-#define BAD_DATA        1
-#define BAD_ADDREXCPTN  2
-#define BAD_IRQ         3
-#define BAD_UNDEFINSTR  4
-
-@ OS version number used in SWIs
-@  RISC OS is 0
-@  RISC iX is 8
-@
-#define OS_NUMBER       9
-#define ARMSWI_OFFSET   0x000f0000
-
-@
-@ Stack format (ensured by USER_* and SVC_*)
-@ PSR and PC are comined on arm26
-@
-
-#define S_OFF           8
-
-#define S_OLD_R0        64
-#define S_PC            60
-#define S_LR            56
-#define S_SP            52
-#define S_IP            48
-#define S_FP            44
-#define S_R10           40
-#define S_R9            36
-#define S_R8            32
-#define S_R7            28
-#define S_R6            24
-#define S_R5            20
-#define S_R4            16
-#define S_R3            12
-#define S_R2            8
-#define S_R1            4
-#define S_R0            0
-
-        .macro  save_user_regs
-        str     r0, [sp, #-4]!   @ Store SVC r0
-        str     lr, [sp, #-4]!   @ Store user mode PC
-        sub     sp, sp, #15*4
-        stmia   sp, {r0 - lr}^   @ Store the other user-mode regs
-        mov     r0, r0
-        .endm
-
-        .macro  slow_restore_user_regs
-        ldmia   sp, {r0 - lr}^   @ restore the user regs not including PC
-        mov     r0, r0
-        ldr     lr, [sp, #15*4]  @ get user PC
-        add     sp, sp, #15*4+8  @ free stack
-        movs    pc, lr           @ return
-        .endm
-
-        .macro  fast_restore_user_regs
-        add     sp, sp, #S_OFF
-        ldmib   sp, {r1 - lr}^
-        mov     r0, r0
-        ldr     lr, [sp, #15*4]
-        add     sp, sp, #15*4+8
-        movs    pc, lr
-        .endm
-
-        .macro  save_svc_regs
-        str     sp, [sp, #-16]!
-        str     lr, [sp, #8]
-        str     lr, [sp, #4]
-        stmfd   sp!, {r0 - r12}
-        mov     r0, #-1
-        str     r0, [sp, #S_OLD_R0]
-        zero_fp
-        .endm
-
-        .macro  save_svc_regs_irq
-        str     sp, [sp, #-16]!
-        str     lr, [sp, #4]
-        ldr     lr, .LCirq
-        ldr     lr, [lr]
-        str     lr, [sp, #8]
-        stmfd   sp!, {r0 - r12}
-        mov     r0, #-1
-        str     r0, [sp, #S_OLD_R0]
-        zero_fp
-        .endm
-
-        .macro  restore_svc_regs
-                ldmfd   sp, {r0 - pc}^
-        .endm
-
-        .macro  mask_pc, rd, rm
-        bic     \rd, \rm, #PCMASK
-        .endm
-
-        .macro  disable_irqs, temp
-        mov     \temp, pc
-        orr     \temp, \temp, #PSR_I_BIT
-        teqp    \temp, #0
-        .endm
-
-        .macro  enable_irqs, temp
-        mov     \temp, pc
-        and     \temp, \temp, #~PSR_I_BIT
-        teqp    \temp, #0
-        .endm
-
-        .macro  initialise_traps_extra
-        .endm
-
-        .macro  get_thread_info, rd
-        mov     \rd, sp, lsr #13
-        mov     \rd, \rd, lsl #13
-        .endm
-
-/*
- * These are the registers used in the syscall handler, and allow us to
- * have in theory up to 7 arguments to a function - r0 to r6.
- *
- * Note that tbl == why is intentional.
- *
- * We must set at least "tsk" and "why" when calling ret_with_reschedule.
- */
-scno    .req    r7              @ syscall number
-tbl     .req    r8              @ syscall table pointer
-why     .req    r8              @ Linux syscall (!= 0)
-tsk     .req    r9              @ current thread_info
-
-/*
- * Get the system call number.
- */
-        .macro  get_scno
-        mask_pc lr, lr
-        ldr     scno, [lr, #-4]         @ get SWI instruction
-        .endm
-/*
- *  -----------------------------------------------------------------------
- */
-
-/* 
- * We rely on the fact that R0 is at the bottom of the stack (due to
- * slow/fast restore user regs).
- */
-#if S_R0 != 0
-#error "Please fix"
-#endif
-
-/*
- * This is the fast syscall return path.  We do as little as
- * possible here, and this includes saving r0 back into the SVC
- * stack.
- */
-ret_fast_syscall:
-        disable_irqs r1                         @ disable interrupts
-        ldr     r1, [tsk, #TI_FLAGS]
-        tst     r1, #_TIF_WORK_MASK
-        bne     fast_work_pending
-        fast_restore_user_regs
-
-/*
- * Ok, we need to do extra processing, enter the slow path.
- */
-fast_work_pending:
-        str     r0, [sp, #S_R0+S_OFF]!          @ returned r0
-work_pending:
-        tst     r1, #_TIF_NEED_RESCHED
-        bne     work_resched
-        tst     r1, #_TIF_NOTIFY_RESUME | _TIF_SIGPENDING
-        beq     no_work_pending
-        mov     r0, sp                          @ 'regs'
-        mov     r2, why                         @ 'syscall'
-        bl      do_notify_resume
-        disable_irqs r1                         @ disable interrupts
-        b       no_work_pending
-
-work_resched:
-        bl      schedule
-/*
- * "slow" syscall return path.  "why" tells us if this was a real syscall.
- */
-ENTRY(ret_to_user)
-ret_slow_syscall:
-        disable_irqs r1                         @ disable interrupts
-        ldr     r1, [tsk, #TI_FLAGS]
-        tst     r1, #_TIF_WORK_MASK
-        bne     work_pending
-no_work_pending:
-        slow_restore_user_regs
-
-/*
- * This is how we return from a fork.
- */
-ENTRY(ret_from_fork)
-        bl      schedule_tail
-        get_thread_info tsk
-        ldr     r1, [tsk, #TI_FLAGS]            @ check for syscall tracing
-        mov     why, #1
-        tst     r1, #_TIF_SYSCALL_TRACE         @ are we tracing syscalls?
-        beq     ret_slow_syscall
-        mov     r1, sp
-        mov     r0, #1                          @ trace exit [IP = 1]
-        bl      syscall_trace
-        b       ret_slow_syscall
-        
-// FIXME - is this strictly necessary?
-#include "calls.S"
-
-/*=============================================================================
- * SWI handler
- *-----------------------------------------------------------------------------
- */
-
-        .align  5
-ENTRY(vector_swi)
-        save_user_regs
-        zero_fp
-        get_scno
-
-        enable_irqs ip
-
-        str     r4, [sp, #-S_OFF]!              @ push fifth arg
-
-        get_thread_info tsk
-        ldr     ip, [tsk, #TI_FLAGS]            @ check for syscall tracing
-        bic     scno, scno, #0xff000000         @ mask off SWI op-code
-        eor     scno, scno, #OS_NUMBER << 20    @ check OS number
-        adr     tbl, sys_call_table             @ load syscall table pointer
-        tst     ip, #_TIF_SYSCALL_TRACE         @ are we tracing syscalls?
-        bne     __sys_trace
-
-        adral   lr, ret_fast_syscall            @ set return address
-        orral   lr, lr, #PSR_I_BIT | MODE_SVC26 @ Force SVC mode on return
-        cmp     scno, #NR_syscalls              @ check upper syscall limit
-        ldrcc   pc, [tbl, scno, lsl #2]         @ call sys_* routine
-
-        add     r1, sp, #S_OFF
-2:      mov     why, #0                         @ no longer a real syscall
-        cmp     scno, #ARMSWI_OFFSET
-        eor     r0, scno, #OS_NUMBER << 20      @ put OS number back
-        bcs     arm_syscall     
-        b       sys_ni_syscall                  @ not private func
-
-        /*
-         * This is the really slow path.  We're going to be doing
-         * context switches, and waiting for our parent to respond.
-         */
-__sys_trace:
-        add     r1, sp, #S_OFF
-        mov     r0, #0                          @ trace entry [IP = 0]
-        bl      syscall_trace
-
-        adral   lr, __sys_trace_return          @ set return address
-        orral   lr, lr, #PSR_I_BIT | MODE_SVC26 @ Force SVC mode on return
-        add     r1, sp, #S_R0 + S_OFF           @ pointer to regs
-        cmp     scno, #NR_syscalls              @ check upper syscall limit
-        ldmccia r1, {r0 - r3}                   @ have to reload r0 - r3
-        ldrcc   pc, [tbl, scno, lsl #2]         @ call sys_* routine
-        b       2b
-
-__sys_trace_return:
-        str     r0, [sp, #S_R0 + S_OFF]!        @ save returned r0
-        mov     r1, sp
-        mov     r0, #1                          @ trace exit [IP = 1]
-        bl      syscall_trace
-        b       ret_slow_syscall
-
-        .align  5
-
-        .type   sys_call_table, #object
-ENTRY(sys_call_table)
-#include "calls.S"
-
-/*============================================================================
- * Special system call wrappers
- */
-@ r0 = syscall number
-@ r5 = syscall table
-                .type   sys_syscall, #function
-sys_syscall:
-                eor     scno, r0, #OS_NUMBER << 20
-                cmp     scno, #NR_syscalls      @ check range
-                stmleia sp, {r5, r6}            @ shuffle args
-                movle   r0, r1
-                movle   r1, r2
-                movle   r2, r3
-                movle   r3, r4
-                ldrle   pc, [tbl, scno, lsl #2]
-                b       sys_ni_syscall
-
-sys_fork_wrapper:
-                add     r0, sp, #S_OFF
-                b       sys_fork
-
-sys_vfork_wrapper:
-                add     r0, sp, #S_OFF
-                b       sys_vfork
-
-sys_execve_wrapper:
-                add     r3, sp, #S_OFF
-                b       sys_execve
-
-sys_clone_wapper:
-                add     r2, sp, #S_OFF
-                b       sys_clone
-
-sys_sigsuspend_wrapper:
-                add     r3, sp, #S_OFF
-                b       sys_sigsuspend
-
-sys_rt_sigsuspend_wrapper:
-                add     r2, sp, #S_OFF
-                b       sys_rt_sigsuspend
-
-sys_sigreturn_wrapper:
-                add     r0, sp, #S_OFF
-                b       sys_sigreturn
-
-sys_rt_sigreturn_wrapper:
-                add     r0, sp, #S_OFF
-                b       sys_rt_sigreturn
-
-sys_sigaltstack_wrapper:
-                ldr     r2, [sp, #S_OFF + S_SP]
-                b       do_sigaltstack
-
-/*
- * Note: off_4k (r5) is always units of 4K.  If we can't do the requested
- * offset, we return EINVAL.  FIXME - this lost some stuff from arm32 to
- * ifdefs. check it out.
- */
-sys_mmap2:
-                tst     r5, #((1 << (PAGE_SHIFT - 12)) - 1)
-                moveq   r5, r5, lsr #PAGE_SHIFT - 12
-                streq   r5, [sp, #4]
-                beq     do_mmap2
-                mov     r0, #-EINVAL
-                RETINSTR(mov,pc, lr)
-
-/*
- *  Design issues:
- *   - We have several modes that each vector can be called from,
- *     each with its own set of registers.  On entry to any vector,
- *     we *must* save the registers used in *that* mode.
- *
- *   - This code must be as fast as possible.
- *
- *  There are a few restrictions on the vectors:
- *   - the SWI vector cannot be called from *any* non-user mode
- *
- *   - the FP emulator is *never* called from *any* non-user mode undefined
- *     instruction.
- *
- */
-
-                .text
-
-                .macro handle_irq
-1:              mov     r4, #IOC_BASE
-                ldrb    r6, [r4, #0x24]            @ get high priority first
-                adr     r5, irq_prio_h
-                teq     r6, #0
-                ldreqb  r6, [r4, #0x14]            @ get low priority
-                adreq   r5, irq_prio_l
-
-                teq     r6, #0                     @ If an IRQ happened...
-                ldrneb  r0, [r5, r6]               @ get IRQ number
-                movne   r1, sp                     @ get struct pt_regs
-                adrne   lr, 1b                     @ Set return address to 1b
-                orrne   lr, lr, #PSR_I_BIT | MODE_SVC26  @ (and force SVC mode)
-                bne     asm_do_IRQ                 @ process IRQ (if asserted)
-                .endm
-
-
-/*
- * Interrupt table (incorporates priority)
- */
-                .macro  irq_prio_table
-irq_prio_l:     .byte    0, 0, 1, 0, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3
-                .byte    4, 0, 1, 0, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3
-                .byte    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5
-                .byte    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5
-                .byte    6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 3, 3, 3, 3, 3
-                .byte    6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 3, 3, 3, 3, 3
-                .byte    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5
-                .byte    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5
-                .byte    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
-                .byte    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
-                .byte    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
-                .byte    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
-                .byte    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
-                .byte    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
-                .byte    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
-                .byte    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
-irq_prio_h:     .byte    0, 8, 9, 8,10,10,10,10,11,11,11,11,10,10,10,10
-                .byte   12, 8, 9, 8,10,10,10,10,11,11,11,11,10,10,10,10
-                .byte   13,13,13,13,10,10,10,10,11,11,11,11,10,10,10,10
-                .byte   13,13,13,13,10,10,10,10,11,11,11,11,10,10,10,10
-                .byte   14,14,14,14,10,10,10,10,11,11,11,11,10,10,10,10
-                .byte   14,14,14,14,10,10,10,10,11,11,11,11,10,10,10,10
-                .byte   13,13,13,13,10,10,10,10,11,11,11,11,10,10,10,10
-                .byte   13,13,13,13,10,10,10,10,11,11,11,11,10,10,10,10
-                .byte   15,15,15,15,10,10,10,10,11,11,11,11,10,10,10,10
-                .byte   15,15,15,15,10,10,10,10,11,11,11,11,10,10,10,10
-                .byte   13,13,13,13,10,10,10,10,11,11,11,11,10,10,10,10
-                .byte   13,13,13,13,10,10,10,10,11,11,11,11,10,10,10,10
-                .byte   15,15,15,15,10,10,10,10,11,11,11,11,10,10,10,10
-                .byte   15,15,15,15,10,10,10,10,11,11,11,11,10,10,10,10
-                .byte   13,13,13,13,10,10,10,10,11,11,11,11,10,10,10,10
-                .byte   13,13,13,13,10,10,10,10,11,11,11,11,10,10,10,10
-                .endm
-
-#if 1
-/*
- * Uncomment these if you wish to get more debugging into about data aborts.
- * FIXME - I bet we can find a way to encode these and keep performance.
- */
-#define FAULT_CODE_LDRSTRPOST   0x80
-#define FAULT_CODE_LDRSTRPRE    0x40
-#define FAULT_CODE_LDRSTRREG    0x20
-#define FAULT_CODE_LDMSTM       0x10
-#define FAULT_CODE_LDCSTC       0x08
-#endif
-#define FAULT_CODE_PREFETCH     0x04
-#define FAULT_CODE_WRITE        0x02
-#define FAULT_CODE_FORCECOW     0x01
-
-/*=============================================================================
- * Undefined FIQs
- *-----------------------------------------------------------------------------
- */
-_unexp_fiq:     ldr     sp, .LCfiq
-                mov     r12, #IOC_BASE
-                strb    r12, [r12, #0x38]       @ Disable FIQ register
-                teqp    pc, #PSR_I_BIT | PSR_F_BIT | MODE_SVC26
-                mov     r0, r0
-                stmfd   sp!, {r0 - r3, ip, lr}
-                adr     r0, Lfiqmsg
-                bl      printk
-                ldmfd   sp!, {r0 - r3, ip, lr}
-                teqp    pc, #PSR_I_BIT | PSR_F_BIT | MODE_FIQ26
-                mov     r0, r0
-                movs    pc, lr
-
-Lfiqmsg:        .ascii  "*** Unexpected FIQ\n\0"
-                .align
-
-.LCfiq:         .word   __temp_fiq
-.LCirq:         .word   __temp_irq
-
-/*=============================================================================
- * Undefined instruction handler
- *-----------------------------------------------------------------------------
- * Handles floating point instructions
- */
-vector_undefinstr:
-                tst     lr, #MODE_SVC26          @ did we come from a non-user mode?
-                bne     __und_svc                @ yes - deal with it.
-/* Otherwise, fall through for the user-space (common) case. */
-                save_user_regs
-                zero_fp                                 @ zero frame pointer
-                teqp    pc, #PSR_I_BIT | MODE_SVC26     @ disable IRQs
-.Lbug_undef:
-                ldr     r4, .LC2
-                ldr     pc, [r4]         @ Call FP module entry point
-/* FIXME - should we trap for a null pointer here? */
-
-/* The SVC mode case */
-__und_svc:      save_svc_regs                           @ Non-user mode
-                mask_pc r0, lr
-                and     r2, lr, #3
-                sub     r0, r0, #4
-                mov     r1, sp
-                bl      do_undefinstr
-                restore_svc_regs
-
-/* We get here if the FP emulator doesnt handle the undef instr.
- * If the insn WAS handled, the emulator jumps to ret_from_exception by itself/
- */
-                .globl  fpundefinstr 
-fpundefinstr:
-                mov     r0, lr
-                mov     r1, sp
-                teqp    pc, #MODE_SVC26
-                bl      do_undefinstr
-                b       ret_from_exception              @ Normal FP exit
-
-#if defined CONFIG_FPE_NWFPE || defined CONFIG_FPE_FASTFPE
-                /* The FPE is always present */
-                .equ    fpe_not_present, 0
-#else
-/* We get here if an undefined instruction happens and the floating
- * point emulator is not present.  If the offending instruction was
- * a WFS, we just perform a normal return as if we had emulated the
- * operation.  This is a hack to allow some basic userland binaries
- * to run so that the emulator module proper can be loaded. --philb
- * FIXME - probably a broken useless hack...
- */
-fpe_not_present:
-                adr     r10, wfs_mask_data
-                ldmia   r10, {r4, r5, r6, r7, r8}
-                ldr     r10, [sp, #S_PC]                @ Load PC
-                sub     r10, r10, #4
-                mask_pc r10, r10
-                ldrt    r10, [r10]                      @ get instruction
-                and     r5, r10, r5
-                teq     r5, r4                          @ Is it WFS?
-                beq     ret_from_exception
-                and     r5, r10, r8
-                teq     r5, r6                          @ Is it LDF/STF on sp or fp?
-                teqne   r5, r7
-                bne     fpundefinstr
-                tst     r10, #0x00200000                @ Does it have WB
-                beq     ret_from_exception
-                and     r4, r10, #255                   @ get offset
-                and     r6, r10, #0x000f0000
-                tst     r10, #0x00800000                @ +/-
-                ldr     r5, [sp, r6, lsr #14]           @ Load reg
-                rsbeq   r4, r4, #0
-                add     r5, r5, r4, lsl #2
-                str     r5, [sp, r6, lsr #14]           @ Save reg
-                b       ret_from_exception
-
-wfs_mask_data:  .word   0x0e200110                      @ WFS/RFS
-                .word   0x0fef0fff
-                .word   0x0d0d0100                      @ LDF [sp]/STF [sp]
-                .word   0x0d0b0100                      @ LDF [fp]/STF [fp]
-                .word   0x0f0f0f00
-#endif
-
-.LC2:           .word   fp_enter
-
-/*=============================================================================
- * Prefetch abort handler
- *-----------------------------------------------------------------------------
- */
-#define DEBUG_UNDEF
-/* remember: lr = USR pc */
-vector_prefetch:
-                sub     lr, lr, #4
-                tst     lr, #MODE_SVC26
-                bne     __pabt_invalid
-                save_user_regs
-                teqp    pc, #MODE_SVC26         @ Enable IRQs...
-                mask_pc r0, lr                  @ Address of abort
-                mov     r1, sp                  @ Tasks registers
-                bl      do_PrefetchAbort
-                teq     r0, #0                  @ If non-zero, we believe this abort..
-                bne     ret_from_exception
-#ifdef DEBUG_UNDEF
-                adr     r0, t
-                bl      printk
-#endif
-                ldr     lr, [sp,#S_PC]          @ FIXME program to test this on.  I think its
-                b       .Lbug_undef             @ broken at the moment though!)
-
-__pabt_invalid: save_svc_regs
-                mov     r0, sp                  @ Prefetch aborts are definitely *not*
-                mov     r1, #BAD_PREFETCH       @ allowed in non-user modes.  We cant
-                and     r2, lr, #3              @ recover from this problem.
-                b       bad_mode
-
-#ifdef DEBUG_UNDEF
-t:              .ascii "*** undef ***\r\n\0"
-                .align
-#endif
-
-/*=============================================================================
- * Address exception handler
- *-----------------------------------------------------------------------------
- * These aren't too critical.
- * (they're not supposed to happen).
- * In order to debug the reason for address exceptions in non-user modes,
- * we have to obtain all the registers so that we can see what's going on.
- */
-
-vector_addrexcptn:
-                sub     lr, lr, #8
-                tst     lr, #3
-                bne     Laddrexcptn_not_user
-                save_user_regs
-                teq     pc, #MODE_SVC26
-                mask_pc r0, lr                  @ Point to instruction
-                mov     r1, sp                  @ Point to registers
-                mov     r2, #0x400
-                mov     lr, pc
-                bl      do_excpt
-                b       ret_from_exception
-
-Laddrexcptn_not_user:
-                save_svc_regs
-                and     r2, lr, #3
-                teq     r2, #3
-                bne     Laddrexcptn_illegal_mode
-                teqp    pc, #MODE_SVC26
-                mask_pc r0, lr
-                mov     r1, sp
-                orr     r2, r2, #0x400
-                bl      do_excpt
-                ldmia   sp, {r0 - lr}           @ I cant remember the reason I changed this...
-                add     sp, sp, #15*4
-                movs    pc, lr
-
-Laddrexcptn_illegal_mode:
-                mov     r0, sp
-                str     lr, [sp, #-4]!
-                orr     r1, r2, #PSR_I_BIT | PSR_F_BIT
-                teqp    r1, #0                  @ change into mode (wont be user mode)
-                mov     r0, r0
-                mov     r1, r8                  @ Any register from r8 - r14 can be banked
-                mov     r2, r9
-                mov     r3, r10
-                mov     r4, r11
-                mov     r5, r12
-                mov     r6, r13
-                mov     r7, r14
-                teqp    pc, #PSR_F_BIT | MODE_SVC26 @ back to svc
-                mov     r0, r0
-                stmfd   sp!, {r1-r7}
-                ldmia   r0, {r0-r7}
-                stmfd   sp!, {r0-r7}
-                mov     r0, sp
-                mov     r1, #BAD_ADDREXCPTN
-                b       bad_mode
-
-/*=============================================================================
- * Interrupt (IRQ) handler
- *-----------------------------------------------------------------------------
- * Note: if the IRQ was taken whilst in user mode, then *no* kernel routine
- * is running, so do not have to save svc lr.
- *
- * Entered in IRQ mode.
- */
-
-vector_IRQ:     ldr     sp, .LCirq         @ Setup some temporary stack
-                sub     lr, lr, #4
-                str     lr, [sp]           @ push return address
-
-                tst     lr, #3
-                bne     __irq_non_usr
-
-__irq_usr:      teqp    pc, #PSR_I_BIT | MODE_SVC26     @ Enter SVC mode
-                mov     r0, r0
-
-                ldr     lr, .LCirq
-                ldr     lr, [lr]           @ Restore lr for jump back to USR
-
-                save_user_regs
-
-                handle_irq
-
-                mov     why, #0
-                get_thread_info tsk
-                b       ret_to_user
-
-@ Place the IRQ priority table here so that the handle_irq macros above
-@ and below here can access it.
-
-                irq_prio_table
-
-__irq_non_usr:  teqp    pc, #PSR_I_BIT | MODE_SVC26     @ Enter SVC mode
-                mov     r0, r0
-
-                save_svc_regs_irq
-
-                and     r2, lr, #3
-                teq     r2, #3
-                bne     __irq_invalid                @ IRQ not from SVC mode
-
-                handle_irq
-
-                restore_svc_regs
-
-__irq_invalid:  mov     r0, sp
-                mov     r1, #BAD_IRQ
-                b       bad_mode
-
-/*=============================================================================
- * Data abort handler code
- *-----------------------------------------------------------------------------
- *
- * This handles both exceptions from user and SVC modes, computes the address
- *  range of the problem, and does any correction that is required.  It then
- *  calls the kernel data abort routine.
- *
- * This is where I wish that the ARM would tell you which address aborted.
- */
-
-vector_data:    sub     lr, lr, #8              @ Correct lr
-                tst     lr, #3
-                bne     Ldata_not_user
-                save_user_regs
-                teqp    pc, #MODE_SVC26
-                mask_pc r0, lr
-                bl      Ldata_do
-                b       ret_from_exception
-
-Ldata_not_user:
-                save_svc_regs
-                and     r2, lr, #3
-                teq     r2, #3
-                bne     Ldata_illegal_mode
-                tst     lr, #PSR_I_BIT
-                teqeqp  pc, #MODE_SVC26
-                mask_pc r0, lr
-                bl      Ldata_do
-                restore_svc_regs
-
-Ldata_illegal_mode:
-                mov     r0, sp
-                mov     r1, #BAD_DATA
-                b       bad_mode
-
-Ldata_do:       mov     r3, sp
-                ldr     r4, [r0]                @ Get instruction
-                mov     r2, #0
-                tst     r4, #1 << 20            @ Check to see if it is a write instruction
-                orreq   r2, r2, #FAULT_CODE_WRITE @ Indicate write instruction
-                mov     r1, r4, lsr #22         @ Now branch to the relevent processing routine
-                and     r1, r1, #15 << 2
-                add     pc, pc, r1
-                movs    pc, lr
-                b       Ldata_unknown
-                b       Ldata_unknown
-                b       Ldata_unknown
-                b       Ldata_unknown
-                b       Ldata_ldrstr_post       @ ldr   rd, [rn], #m
-                b       Ldata_ldrstr_numindex   @ ldr   rd, [rn, #m]    @ RegVal
-                b       Ldata_ldrstr_post       @ ldr   rd, [rn], rm
-                b       Ldata_ldrstr_regindex   @ ldr   rd, [rn, rm]
-                b       Ldata_ldmstm            @ ldm*a rn, <rlist>
-                b       Ldata_ldmstm            @ ldm*b rn, <rlist>
-                b       Ldata_unknown
-                b       Ldata_unknown
-                b       Ldata_ldrstr_post       @ ldc   rd, [rn], #m    @ Same as ldr   rd, [rn], #m
-                b       Ldata_ldcstc_pre        @ ldc   rd, [rn, #m]
-                b       Ldata_unknown
-Ldata_unknown:  @ Part of jumptable
-                mov     r0, r1
-                mov     r1, r4
-                mov     r2, r3
-                b       baddataabort
-
-Ldata_ldrstr_post:
-                mov     r0, r4, lsr #14         @ Get Rn
-                and     r0, r0, #15 << 2        @ Mask out reg.
-                teq     r0, #15 << 2
-                ldr     r0, [r3, r0]            @ Get register
-                biceq   r0, r0, #PCMASK
-                mov     r1, r0
-#ifdef FAULT_CODE_LDRSTRPOST
-                orr     r2, r2, #FAULT_CODE_LDRSTRPOST
-#endif
-                b       do_DataAbort
-
-Ldata_ldrstr_numindex:
-                mov     r0, r4, lsr #14         @ Get Rn
-                and     r0, r0, #15 << 2        @ Mask out reg.
-                teq     r0, #15 << 2
-                ldr     r0, [r3, r0]            @ Get register
-                mov     r1, r4, lsl #20
-                biceq   r0, r0, #PCMASK
-                tst     r4, #1 << 23
-                addne   r0, r0, r1, lsr #20
-                subeq   r0, r0, r1, lsr #20
-                mov     r1, r0
-#ifdef FAULT_CODE_LDRSTRPRE
-                orr     r2, r2, #FAULT_CODE_LDRSTRPRE
-#endif
-                b       do_DataAbort
-
-Ldata_ldrstr_regindex:
-                mov     r0, r4, lsr #14         @ Get Rn
-                and     r0, r0, #15 << 2        @ Mask out reg.
-                teq     r0, #15 << 2
-                ldr     r0, [r3, r0]            @ Get register
-                and     r7, r4, #15
-                biceq   r0, r0, #PCMASK
-                teq     r7, #15                 @ Check for PC
-                ldr     r7, [r3, r7, lsl #2]    @ Get Rm
-                and     r8, r4, #0x60           @ Get shift types
-                biceq   r7, r7, #PCMASK
-                mov     r9, r4, lsr #7          @ Get shift amount
-                and     r9, r9, #31
-                teq     r8, #0
-                moveq   r7, r7, lsl r9
-                teq     r8, #0x20               @ LSR shift
-                moveq   r7, r7, lsr r9
-                teq     r8, #0x40               @ ASR shift
-                moveq   r7, r7, asr r9
-                teq     r8, #0x60               @ ROR shift
-                moveq   r7, r7, ror r9
-                tst     r4, #1 << 23
-                addne   r0, r0, r7
-                subeq   r0, r0, r7              @ Apply correction
-                mov     r1, r0
-#ifdef FAULT_CODE_LDRSTRREG
-                orr     r2, r2, #FAULT_CODE_LDRSTRREG
-#endif
-                b       do_DataAbort
-
-Ldata_ldmstm:
-                mov     r7, #0x11
-                orr     r7, r7, r7, lsl #8
-                and     r0, r4, r7
-                and     r1, r4, r7, lsl #1
-                add     r0, r0, r1, lsr #1
-                and     r1, r4, r7, lsl #2
-                add     r0, r0, r1, lsr #2
-                and     r1, r4, r7, lsl #3
-                add     r0, r0, r1, lsr #3
-                add     r0, r0, r0, lsr #8
-                add     r0, r0, r0, lsr #4
-                and     r7, r0, #15             @ r7 = no. of registers to transfer.
-                mov     r5, r4, lsr #14         @ Get Rn
-                and     r5, r5, #15 << 2
-                ldr     r0, [r3, r5]            @ Get reg
-                eor     r6, r4, r4, lsl #2
-                tst     r6, #1 << 23            @ Check inc/dec ^ writeback
-                rsbeq   r7, r7, #0
-                add     r7, r0, r7, lsl #2      @ Do correction (signed)
-                subne   r1, r7, #1
-                subeq   r1, r0, #1
-                moveq   r0, r7
-                tst     r4, #1 << 21            @ Check writeback
-                strne   r7, [r3, r5]
-                eor     r6, r4, r4, lsl #1
-                tst     r6, #1 << 24            @ Check Pre/Post ^ inc/dec
-                addeq   r0, r0, #4
-                addeq   r1, r1, #4
-                teq     r5, #15*4               @ CHECK FOR PC
-                biceq   r1, r1, #PCMASK
-                biceq   r0, r0, #PCMASK
-#ifdef FAULT_CODE_LDMSTM
-                orr     r2, r2, #FAULT_CODE_LDMSTM
-#endif
-                b       do_DataAbort
-
-Ldata_ldcstc_pre:
-                mov     r0, r4, lsr #14         @ Get Rn
-                and     r0, r0, #15 << 2        @ Mask out reg.
-                teq     r0, #15 << 2
-                ldr     r0, [r3, r0]            @ Get register
-                mov     r1, r4, lsl #24         @ Get offset
-                biceq   r0, r0, #PCMASK
-                tst     r4, #1 << 23
-                addne   r0, r0, r1, lsr #24
-                subeq   r0, r0, r1, lsr #24
-                mov     r1, r0
-#ifdef FAULT_CODE_LDCSTC
-                orr     r2, r2, #FAULT_CODE_LDCSTC
-#endif
-                b       do_DataAbort
-
-
-/*
- * This is the return code to user mode for abort handlers
- */
-ENTRY(ret_from_exception)
-                get_thread_info tsk
-                mov     why, #0
-                b       ret_to_user
-
-                .data
-ENTRY(fp_enter)
-                .word   fpe_not_present
-                .text
-/*
- * Register switch for older 26-bit only ARMs
- */
-ENTRY(__switch_to)
-                add     r0, r0, #TI_CPU_SAVE
-                stmia   r0, {r4 - sl, fp, sp, lr}
-                add     r1, r1, #TI_CPU_SAVE
-                ldmia   r1, {r4 - sl, fp, sp, pc}^
-
-/*
- *=============================================================================
- *              Low-level interface code
- *-----------------------------------------------------------------------------
- *              Trap initialisation
- *-----------------------------------------------------------------------------
- *
- * Note - FIQ code has changed.  The default is a couple of words in 0x1c, 0x20
- * that call _unexp_fiq.  Nowever, we now copy the FIQ routine to 0x1c (removes
- * some excess cycles).
- *
- * What we need to put into 0-0x1c are branches to branch to the kernel.
- */
-
-                .section ".init.text",#alloc,#execinstr
-
-.Ljump_addresses:
-                swi     SYS_ERROR0
-                .word   vector_undefinstr       - 12
-                .word   vector_swi              - 16
-                .word   vector_prefetch         - 20
-                .word   vector_data             - 24
-                .word   vector_addrexcptn       - 28
-                .word   vector_IRQ              - 32
-                .word   _unexp_fiq              - 36
-                b       . + 8
-/*
- * initialise the trap system
- */
-ENTRY(__trap_init)
-                stmfd   sp!, {r4 - r7, lr}
-                adr     r1, .Ljump_addresses
-                ldmia   r1, {r1 - r7, ip, lr}
-                orr     r2, lr, r2, lsr #2
-                orr     r3, lr, r3, lsr #2
-                orr     r4, lr, r4, lsr #2
-                orr     r5, lr, r5, lsr #2
-                orr     r6, lr, r6, lsr #2
-                orr     r7, lr, r7, lsr #2
-                orr     ip, lr, ip, lsr #2
-                mov     r0, #0
-                stmia   r0, {r1 - r7, ip}
-                ldmfd   sp!, {r4 - r7, pc}^
-
-                .bss
-__temp_irq:     .space  4                               @ saved lr_irq
-__temp_fiq:     .space  128
diff --git a/arch/arm26/kernel/fiq.c b/arch/arm26/kernel/fiq.c
deleted file mode 100644
index c4776c96be6b..000000000000
--- a/arch/arm26/kernel/fiq.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/fiq.c
- *
- *  Copyright (C) 1998 Russell King
- *  Copyright (C) 1998, 1999 Phil Blundell
- *  Copyright (C) 2003 Ian Molton
- *
- *  FIQ support written by Philip Blundell <philb@gnu.org>, 1998.
- *
- *  FIQ support re-written by Russell King to be more generic
- *
- * We now properly support a method by which the FIQ handlers can
- * be stacked onto the vector.  We still do not support sharing
- * the FIQ vector itself.
- *
- * Operation is as follows:
- *  1. Owner A claims FIQ:
- *     - default_fiq relinquishes control.
- *  2. Owner A:
- *     - inserts code.
- *     - sets any registers,
- *     - enables FIQ.
- *  3. Owner B claims FIQ:
- *     - if owner A has a relinquish function.
- *       - disable FIQs.
- *       - saves any registers.
- *       - returns zero.
- *  4. Owner B:
- *     - inserts code.
- *     - sets any registers,
- *     - enables FIQ.
- *  5. Owner B releases FIQ:
- *     - Owner A is asked to reacquire FIQ:
- *       - inserts code.
- *       - restores saved registers.
- *       - enables FIQ.
- *  6. Goto 3
- */
-#include <linux/module.h>
-#include <linux/mm.h>
-#include <linux/mman.h>
-#include <linux/init.h>
-#include <linux/seq_file.h>
-
-#include <asm/fiq.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/pgalloc.h>
-#include <asm/system.h>
-#include <asm/uaccess.h>
-
-#define FIQ_VECTOR (vectors_base() + 0x1c)
-
-static unsigned long no_fiq_insn;
-
-#define unprotect_page_0()
-#define protect_page_0()
-
-/* Default reacquire function
- * - we always relinquish FIQ control
- * - we always reacquire FIQ control
- */
-static int fiq_def_op(void *ref, int relinquish)
-{
-        if (!relinquish) {
-                unprotect_page_0();
-                *(unsigned long *)FIQ_VECTOR = no_fiq_insn;
-                protect_page_0();
-        }
-
-        return 0;
-}
-
-static struct fiq_handler default_owner = {
-        .name   = "default",
-        .fiq_op = fiq_def_op,
-};
-
-static struct fiq_handler *current_fiq = &default_owner;
-
-int show_fiq_list(struct seq_file *p, void *v)
-{
-        if (current_fiq != &default_owner)
-                seq_printf(p, "FIQ:              %s\n", current_fiq->name);
-
-        return 0;
-}
-
-void set_fiq_handler(void *start, unsigned int length)
-{
-        unprotect_page_0();
-
-        memcpy((void *)FIQ_VECTOR, start, length);
-
-        protect_page_0();
-}
-
-/*
- * Taking an interrupt in FIQ mode is death, so both these functions
- * disable irqs for the duration. 
- */
-void set_fiq_regs(struct pt_regs *regs)
-{
-        register unsigned long tmp, tmp2;
-        __asm__ volatile (
-        "mov    %0, pc                                  \n"
-        "bic    %1, %0, #0x3                            \n"
-        "orr    %1, %1, %3                              \n"
-        "teqp   %1, #0          @ select FIQ mode       \n"
-        "mov    r0, r0                                  \n"
-        "ldmia  %2, {r8 - r14}                          \n"
-        "teqp   %0, #0          @ return to SVC mode    \n"
-        "mov    r0, r0                                  "
-        : "=&r" (tmp), "=&r" (tmp2)
-        : "r" (&regs->ARM_r8), "I" (PSR_I_BIT | PSR_F_BIT | MODE_FIQ26)
-        /* These registers aren't modified by the above code in a way
-           visible to the compiler, but we mark them as clobbers anyway
-           so that GCC won't put any of the input or output operands in
-           them.  */
-        : "r8", "r9", "r10", "r11", "r12", "r13", "r14");
-}
-
-void get_fiq_regs(struct pt_regs *regs)
-{
-        register unsigned long tmp, tmp2;
-        __asm__ volatile (
-        "mov    %0, pc                                  \n"
-        "bic    %1, %0, #0x3                            \n"
-        "orr    %1, %1, %3                              \n"
-        "teqp   %1, #0          @ select FIQ mode       \n"
-        "mov    r0, r0                                  \n"
-        "stmia  %2, {r8 - r14}                          \n"
-        "teqp   %0, #0          @ return to SVC mode    \n"
-        "mov    r0, r0                                  "
-        : "=&r" (tmp), "=&r" (tmp2)
-        : "r" (&regs->ARM_r8), "I" (PSR_I_BIT | PSR_F_BIT | MODE_FIQ26)
-        /* These registers aren't modified by the above code in a way
-           visible to the compiler, but we mark them as clobbers anyway
-           so that GCC won't put any of the input or output operands in
-           them.  */
-        : "r8", "r9", "r10", "r11", "r12", "r13", "r14");
-}
-
-int claim_fiq(struct fiq_handler *f)
-{
-        int ret = 0;
-
-        if (current_fiq) {
-                ret = -EBUSY;
-
-                if (current_fiq->fiq_op != NULL)
-                        ret = current_fiq->fiq_op(current_fiq->dev_id, 1);
-        }
-
-        if (!ret) {
-                f->next = current_fiq;
-                current_fiq = f;
-        }
-
-        return ret;
-}
-
-void release_fiq(struct fiq_handler *f)
-{
-        if (current_fiq != f) {
-                printk(KERN_ERR "%s FIQ trying to release %s FIQ\n",
-                       f->name, current_fiq->name);
-#ifdef CONFIG_DEBUG_ERRORS
-                __backtrace();
-#endif
-                return;
-        }
-
-        do
-                current_fiq = current_fiq->next;
-        while (current_fiq->fiq_op(current_fiq->dev_id, 0));
-}
-
-void enable_fiq(int fiq)
-{
-        enable_irq(fiq + FIQ_START);
-}
-
-void disable_fiq(int fiq)
-{
-        disable_irq(fiq + FIQ_START);
-}
-
-EXPORT_SYMBOL(set_fiq_handler);
-EXPORT_SYMBOL(set_fiq_regs);
-EXPORT_SYMBOL(get_fiq_regs);
-EXPORT_SYMBOL(claim_fiq);
-EXPORT_SYMBOL(release_fiq);
-EXPORT_SYMBOL(enable_fiq);
-EXPORT_SYMBOL(disable_fiq);
-
-void __init init_FIQ(void)
-{
-        no_fiq_insn = *(unsigned long *)FIQ_VECTOR;
-        set_fs(get_fs());
-}
diff --git a/arch/arm26/kernel/head.S b/arch/arm26/kernel/head.S
deleted file mode 100644
index 93575e0e58fe..000000000000
--- a/arch/arm26/kernel/head.S
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/head.S
- *
- *  Copyright (C) 1994-2000 Russell King
- *  Copyright (C) 2003 Ian Molton
- *
- * 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.
- *
- *  26-bit kernel startup code
- */
-#include <linux/linkage.h>
-#include <asm/mach-types.h>
-
-                .globl  swapper_pg_dir
-                .equ    swapper_pg_dir, 0x0207d000
-
-/*
- * Entry point.
- */
-                .section ".init.text",#alloc,#execinstr
-ENTRY(stext)
-
-__entry:
-                cmp     pc, #0x02000000
-                ldrlt   pc, LC0                 @ if 0x01800000, call at 0x02080000
-                teq     r0, #0                  @ Check for old calling method
-                blne    oldparams               @ Move page if old
-
-                adr     r0, LC0
-                ldmib   r0, {r2-r5, sp}         @ Setup stack (and fetch other values)
-
-                mov     r0, #0                  @ Clear BSS
-1:              cmp     r2, r3
-                strcc   r0, [r2], #4
-                bcc     1b
-
-                bl      detect_proc_type
-                str     r0, [r4]
-                bl      detect_arch_type
-                str     r0, [r5]
-
-#ifdef CONFIG_XIP_KERNEL
-               ldr     r3, ETEXT                       @ data section copy
-               ldr     r4, SDATA
-               ldr     r5, EDATA
-1:
-               ldr     r6, [r3], #4
-               str     r6, [r4], #4
-               cmp     r4, r5
-               blt     1b
-#endif
-                mov     fp, #0
-                b       start_kernel
-
-LC0:            .word   _stext
-                .word   __bss_start             @ r2
-                .word   _end                    @ r3
-                .word   processor_id            @ r4
-                .word   __machine_arch_type     @ r5
-                .word   init_thread_union+8192  @ sp
-#ifdef CONFIG_XIP_KERNEL
-ETEXT:          .word   _endtext
-SDATA:          .word   _sdata
-EDATA:          .word   __bss_start
-#endif
-
-arm2_id:        .long   0x41560200  @ ARM2 and 250 dont have a CPUID
-arm250_id:      .long   0x41560250  @ So we create some after probing for them
-                .align
-
-oldparams:      mov     r4, #0x02000000
-                add     r3, r4, #0x00080000
-                add     r4, r4, #0x0007c000
-1:              ldmia   r0!, {r5 - r12}
-                stmia   r4!, {r5 - r12}
-                cmp     r4, r3
-                blt     1b
-                mov     pc, lr
-
-/*
- * We need some way to automatically detect the difference between
- * these two machines.  Unfortunately, it is not possible to detect
- * the presence of the SuperIO chip, because that will hang the old
- * Archimedes machines solid.
- */
-/* DAG: Outdated, these have been combined !!!!!!! */
-detect_arch_type:
-#if defined(CONFIG_ARCH_ARC)
-                mov     r0, #MACH_TYPE_ARCHIMEDES
-#elif defined(CONFIG_ARCH_A5K)
-                mov     r0, #MACH_TYPE_A5K
-#endif
-                mov     pc, lr
-
-detect_proc_type:
-                mov     ip, lr
-                mov     r2, #0xea000000         @ Point undef instr to continuation
-                adr     r0, continue - 12
-                orr     r0, r2, r0, lsr #2
-                mov     r1, #0
-                str     r0, [r1, #4]
-                ldr     r0, arm2_id
-                swp     r2, r2, [r1]            @ check for swp (ARM2 cant)
-                ldr     r0, arm250_id
-                mrc     15, 0, r3, c0, c0       @ check for CP#15 (ARM250 cant)
-                mov     r0, r3
-continue:       mov     r2, #0xeb000000         @ Make undef vector loop
-                sub     r2, r2, #2
-                str     r2, [r1, #4]
-                mov     pc, ip
diff --git a/arch/arm26/kernel/init_task.c b/arch/arm26/kernel/init_task.c
deleted file mode 100644
index 4191565b889b..000000000000
--- a/arch/arm26/kernel/init_task.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/init_task.c
- *
- * Copyright (C) 2003 Ian Molton
- *
- */
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/sched.h>
-#include <linux/init.h>
-#include <linux/init_task.h>
-#include <linux/mqueue.h>
-
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-
-static struct fs_struct init_fs = INIT_FS;
-static struct files_struct init_files = INIT_FILES;
-static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
-static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
-struct mm_struct init_mm = INIT_MM(init_mm);
-
-EXPORT_SYMBOL(init_mm);
-
-/*
- * Initial thread structure.
- *
- * We need to make sure that this is 8192-byte aligned due to the
- * way process stacks are handled. This is done by making sure
- * the linker maps this in the .text segment right after head.S,
- * and making the linker scripts ensure the proper alignment.
- *
- * FIXME - should this be 32K alignment on arm26?
- *
- * The things we do for performance...
- */
-union thread_union init_thread_union
-        __attribute__((__section__(".init.task"))) =
-                { INIT_THREAD_INFO(init_task) };
-
-/*
- * Initial task structure.
- *
- * All other task structs will be allocated on slabs in fork.c
- */
-struct task_struct init_task = INIT_TASK(init_task);
-
-EXPORT_SYMBOL(init_task);
diff --git a/arch/arm26/kernel/irq.c b/arch/arm26/kernel/irq.c
deleted file mode 100644
index 2ffe695b062e..000000000000
--- a/arch/arm26/kernel/irq.c
+++ /dev/null
@@ -1,722 +0,0 @@
-/*
- *  linux/arch/arm/kernel/irq.c
- *
- *  Copyright (C) 1992 Linus Torvalds
- *  Modifications for ARM processor Copyright (C) 1995-2000 Russell King.
- *  'Borrowed' for ARM26 and (C) 2003 Ian Molton.
- *
- * 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 file contains the code used by various IRQ handling routines:
- *  asking for different IRQ's should be done through these routines
- *  instead of just grabbing them. Thus setups with different IRQ numbers
- *  shouldn't result in any weird surprises, and installing new handlers
- *  should be easier.
- *
- *  IRQ's are in fact implemented a bit like signal handlers for the kernel.
- *  Naturally it's not a 1:1 relation, but there are similarities.
- */
-#include <linux/module.h>
-#include <linux/ptrace.h>
-#include <linux/kernel_stat.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/slab.h>
-#include <linux/random.h>
-#include <linux/smp.h>
-#include <linux/init.h>
-#include <linux/seq_file.h>
-#include <linux/errno.h>
-
-#include <asm/irq.h>
-#include <asm/system.h>
-#include <asm/irqchip.h>
-
-//FIXME - this ought to be in a header IMO
-void __init arc_init_irq(void);
-
-/*
- * Maximum IRQ count.  Currently, this is arbitary.  However, it should
- * not be set too low to prevent false triggering.  Conversely, if it
- * is set too high, then you could miss a stuck IRQ.
- *
- * FIXME Maybe we ought to set a timer and re-enable the IRQ at a later time?
- */
-#define MAX_IRQ_CNT     100000
-
-static volatile unsigned long irq_err_count;
-static DEFINE_SPINLOCK(irq_controller_lock);
-
-struct irqdesc irq_desc[NR_IRQS];
-
-/*
- * Dummy mask/unmask handler
- */
-void dummy_mask_unmask_irq(unsigned int irq)
-{
-}
-
-void do_bad_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
-{
-        irq_err_count += 1;
-        printk(KERN_ERR "IRQ: spurious interrupt %d\n", irq);
-}
-
-static struct irqchip bad_chip = {
-        .ack    = dummy_mask_unmask_irq,
-        .mask   = dummy_mask_unmask_irq,
-        .unmask = dummy_mask_unmask_irq,
-};
-
-static struct irqdesc bad_irq_desc = {
-        .chip   = &bad_chip,
-        .handle = do_bad_IRQ,
-        .depth  = 1,
-};
-
-/**
- *      disable_irq - disable an irq and wait for completion
- *      @irq: Interrupt to disable
- *
- *      Disable the selected interrupt line.  We do this lazily.
- *
- *      This function may be called from IRQ context.
- */
-void disable_irq(unsigned int irq)
-{
-        struct irqdesc *desc = irq_desc + irq;
-        unsigned long flags;
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        if (!desc->depth++)
-                desc->enabled = 0;
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-}
-EXPORT_SYMBOL(disable_irq);
-
-void disable_irq_nosync(unsigned int irq) __attribute__((alias("disable_irq")));
-
-EXPORT_SYMBOL(disable_irq_nosync);
-
-/**
- *      enable_irq - enable interrupt handling on an irq
- *      @irq: Interrupt to enable
- *
- *      Re-enables the processing of interrupts on this IRQ line.
- *      Note that this may call the interrupt handler, so you may
- *      get unexpected results if you hold IRQs disabled.
- *
- *      This function may be called from IRQ context.
- */
-void enable_irq(unsigned int irq)
-{
-        struct irqdesc *desc = irq_desc + irq;
-        unsigned long flags;
-        int pending = 0;
-
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        if (unlikely(!desc->depth)) {
-                printk("enable_irq(%u) unbalanced from %p\n", irq,
-                        __builtin_return_address(0)); //FIXME bum addresses reported - why?
-        } else if (!--desc->depth) {
-                desc->probing = 0;
-                desc->enabled = 1;
-                desc->chip->unmask(irq);
-                pending = desc->pending;
-                desc->pending = 0;
-                /*
-                 * If the interrupt was waiting to be processed,
-                 * retrigger it.
-                 */
-                if (pending)
-                        desc->chip->rerun(irq);
-        }
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-}
-EXPORT_SYMBOL(enable_irq);
-
-int show_interrupts(struct seq_file *p, void *v)
-{
-        int i = *(loff_t *) v;
-        struct irqaction * action;
-
-        if (i < NR_IRQS) {
-                action = irq_desc[i].action;
-                if (!action)
-                        goto out;
-                seq_printf(p, "%3d: %10u ", i, kstat_irqs(i));
-                seq_printf(p, "  %s", action->name);
-                for (action = action->next; action; action = action->next) {
-                        seq_printf(p, ", %s", action->name);
-                }
-                seq_putc(p, '\n');
-        } else if (i == NR_IRQS) {
-                show_fiq_list(p, v);
-                seq_printf(p, "Err: %10lu\n", irq_err_count);
-        }
-out:
-        return 0;
-}
-
-/*
- * IRQ lock detection.
- *
- * Hopefully, this should get us out of a few locked situations.
- * However, it may take a while for this to happen, since we need
- * a large number if IRQs to appear in the same jiffie with the
- * same instruction pointer (or within 2 instructions).
- */
-static int check_irq_lock(struct irqdesc *desc, int irq, struct pt_regs *regs)
-{
-        unsigned long instr_ptr = instruction_pointer(regs);
-
-        if (desc->lck_jif == jiffies &&
-            desc->lck_pc >= instr_ptr && desc->lck_pc < instr_ptr + 8) {
-                desc->lck_cnt += 1;
-
-                if (desc->lck_cnt > MAX_IRQ_CNT) {
-                        printk(KERN_ERR "IRQ LOCK: IRQ%d is locking the system, disabled\n", irq);
-                        return 1;
-                }
-        } else {
-                desc->lck_cnt = 0;
-                desc->lck_pc  = instruction_pointer(regs);
-                desc->lck_jif = jiffies;
-        }
-        return 0;
-}
-
-static void
-__do_irq(unsigned int irq, struct irqaction *action, struct pt_regs *regs)
-{
-        unsigned int status;
-        int ret;
-
-        spin_unlock(&irq_controller_lock);
-        if (!(action->flags & IRQF_DISABLED))
-                local_irq_enable();
-
-        status = 0;
-        do {
-                ret = action->handler(irq, action->dev_id, regs);
-                if (ret == IRQ_HANDLED)
-                        status |= action->flags;
-                action = action->next;
-        } while (action);
-
-        if (status & IRQF_SAMPLE_RANDOM)
-                add_interrupt_randomness(irq);
-
-        spin_lock_irq(&irq_controller_lock);
-}
-
-/*
- * This is for software-decoded IRQs.  The caller is expected to
- * handle the ack, clear, mask and unmask issues.
- */
-void
-do_simple_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
-{
-        struct irqaction *action;
-        const int cpu = smp_processor_id();
-
-        desc->triggered = 1;
-
-        kstat_cpu(cpu).irqs[irq]++;
-
-        action = desc->action;
-        if (action)
-                __do_irq(irq, desc->action, regs);
-}
-
-/*
- * Most edge-triggered IRQ implementations seem to take a broken
- * approach to this.  Hence the complexity.
- */
-void
-do_edge_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
-{
-        const int cpu = smp_processor_id();
-
-        desc->triggered = 1;
-
-        /*
-         * If we're currently running this IRQ, or its disabled,
-         * we shouldn't process the IRQ.  Instead, turn on the
-         * hardware masks.
-         */
-        if (unlikely(desc->running || !desc->enabled))
-                goto running;
-
-        /*
-         * Acknowledge and clear the IRQ, but don't mask it.
-         */
-        desc->chip->ack(irq);
-
-        /*
-         * Mark the IRQ currently in progress.
-         */
-        desc->running = 1;
-
-        kstat_cpu(cpu).irqs[irq]++;
-
-        do {
-                struct irqaction *action;
-
-                action = desc->action;
-                if (!action)
-                        break;
-
-                if (desc->pending && desc->enabled) {
-                        desc->pending = 0;
-                        desc->chip->unmask(irq);
-                }
-
-                __do_irq(irq, action, regs);
-        } while (desc->pending);
-
-        desc->running = 0;
-
-        /*
-         * If we were disabled or freed, shut down the handler.
-         */
-        if (likely(desc->action && !check_irq_lock(desc, irq, regs)))
-                return;
-
- running:
-        /*
-         * We got another IRQ while this one was masked or
-         * currently running.  Delay it.
-         */
-        desc->pending = 1;
-        desc->chip->mask(irq);
-        desc->chip->ack(irq);
-}
-
-/*
- * Level-based IRQ handler.  Nice and simple.
- */
-void
-do_level_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
-{
-        struct irqaction *action;
-        const int cpu = smp_processor_id();
-
-        desc->triggered = 1;
-
-        /*
-         * Acknowledge, clear _AND_ disable the interrupt.
-         */
-        desc->chip->ack(irq);
-
-        if (likely(desc->enabled)) {
-                kstat_cpu(cpu).irqs[irq]++;
-
-                /*
-                 * Return with this interrupt masked if no action
-                 */
-                action = desc->action;
-                if (action) {
-                        __do_irq(irq, desc->action, regs);
-
-                        if (likely(desc->enabled &&
-                                   !check_irq_lock(desc, irq, regs)))
-                                desc->chip->unmask(irq);
-                }
-        }
-}
-
-/*
- * do_IRQ handles all hardware IRQ's.  Decoded IRQs should not
- * come via this function.  Instead, they should provide their
- * own 'handler'
- */
-asmlinkage void asm_do_IRQ(int irq, struct pt_regs *regs)
-{
-        struct irqdesc *desc = irq_desc + irq;
-
-        /*
-         * Some hardware gives randomly wrong interrupts.  Rather
-         * than crashing, do something sensible.
-         */
-        if (irq >= NR_IRQS)
-                desc = &bad_irq_desc;
-
-        irq_enter();
-        spin_lock(&irq_controller_lock);
-        desc->handle(irq, desc, regs);
-        spin_unlock(&irq_controller_lock);
-        irq_exit();
-}
-
-void __set_irq_handler(unsigned int irq, irq_handler_t handle, int is_chained)
-{
-        struct irqdesc *desc;
-        unsigned long flags;
-
-        if (irq >= NR_IRQS) {
-                printk(KERN_ERR "Trying to install handler for IRQ%d\n", irq);
-                return;
-        }
-
-        if (handle == NULL)
-                handle = do_bad_IRQ;
-
-        desc = irq_desc + irq;
-
-        if (is_chained && desc->chip == &bad_chip)
-                printk(KERN_WARNING "Trying to install chained handler for IRQ%d\n", irq);
-
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        if (handle == do_bad_IRQ) {
-                desc->chip->mask(irq);
-                desc->chip->ack(irq);
-                desc->depth = 1;
-                desc->enabled = 0;
-        }
-        desc->handle = handle;
-        if (handle != do_bad_IRQ && is_chained) {
-                desc->valid = 0;
-                desc->probe_ok = 0;
-                desc->depth = 0;
-                desc->chip->unmask(irq);
-        }
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-}
-
-void set_irq_chip(unsigned int irq, struct irqchip *chip)
-{
-        struct irqdesc *desc;
-        unsigned long flags;
-
-        if (irq >= NR_IRQS) {
-                printk(KERN_ERR "Trying to install chip for IRQ%d\n", irq);
-                return;
-        }
-
-        if (chip == NULL)
-                chip = &bad_chip;
-
-        desc = irq_desc + irq;
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        desc->chip = chip;
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-}
-
-int set_irq_type(unsigned int irq, unsigned int type)
-{
-        struct irqdesc *desc;
-        unsigned long flags;
-        int ret = -ENXIO;
-
-        if (irq >= NR_IRQS) {
-                printk(KERN_ERR "Trying to set irq type for IRQ%d\n", irq);
-                return -ENODEV;
-        }
-
-        desc = irq_desc + irq;
-        if (desc->chip->type) {
-                spin_lock_irqsave(&irq_controller_lock, flags);
-                ret = desc->chip->type(irq, type);
-                spin_unlock_irqrestore(&irq_controller_lock, flags);
-        }
-
-        return ret;
-}
-
-void set_irq_flags(unsigned int irq, unsigned int iflags)
-{
-        struct irqdesc *desc;
-        unsigned long flags;
-
-        if (irq >= NR_IRQS) {
-                printk(KERN_ERR "Trying to set irq flags for IRQ%d\n", irq);
-                return;
-        }
-
-        desc = irq_desc + irq;
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        desc->valid = (iflags & IRQF_VALID) != 0;
-        desc->probe_ok = (iflags & IRQF_PROBE) != 0;
-        desc->noautoenable = (iflags & IRQF_NOAUTOEN) != 0;
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-}
-
-int setup_irq(unsigned int irq, struct irqaction *new)
-{
-        int shared = 0;
-        struct irqaction *old, **p;
-        unsigned long flags;
-        struct irqdesc *desc;
-
-        /*
-         * Some drivers like serial.c use request_irq() heavily,
-         * so we have to be careful not to interfere with a
-         * running system.
-         */
-        if (new->flags & IRQF_SAMPLE_RANDOM) {
-                /*
-                 * This function might sleep, we want to call it first,
-                 * outside of the atomic block.
-                 * Yes, this might clear the entropy pool if the wrong
-                 * driver is attempted to be loaded, without actually
-                 * installing a new handler, but is this really a problem,
-                 * only the sysadmin is able to do this.
-                 */
-                rand_initialize_irq(irq);
-        }
-
-        /*
-         * The following block of code has to be executed atomically
-         */
-        desc = irq_desc + irq;
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        p = &desc->action;
-        if ((old = *p) != NULL) {
-                /* Can't share interrupts unless both agree to */
-                if (!(old->flags & new->flags & IRQF_SHARED)) {
-                        spin_unlock_irqrestore(&irq_controller_lock, flags);
-                        return -EBUSY;
-                }
-
-                /* add new interrupt at end of irq queue */
-                do {
-                        p = &old->next;
-                        old = *p;
-                } while (old);
-                shared = 1;
-        }
-
-        *p = new;
-
-        if (!shared) {
-                desc->probing = 0;
-                desc->running = 0;
-                desc->pending = 0;
-                desc->depth = 1;
-                if (!desc->noautoenable) {
-                        desc->depth = 0;
-                        desc->enabled = 1;
-                        desc->chip->unmask(irq);
-                }
-        }
-
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-        return 0;
-}
-
-/**
- *      request_irq - allocate an interrupt line
- *      @irq: Interrupt line to allocate
- *      @handler: Function to be called when the IRQ occurs
- *      @irqflags: Interrupt type flags
- *      @devname: An ascii name for the claiming device
- *      @dev_id: A cookie passed back to the handler function
- *
- *      This call allocates interrupt resources and enables the
- *      interrupt line and IRQ handling. From the point this
- *      call is made your handler function may be invoked. Since
- *      your handler function must clear any interrupt the board
- *      raises, you must take care both to initialise your hardware
- *      and to set up the interrupt handler in the right order.
- *
- *      Dev_id must be globally unique. Normally the address of the
- *      device data structure is used as the cookie. Since the handler
- *      receives this value it makes sense to use it.
- *
- *      If your interrupt is shared you must pass a non NULL dev_id
- *      as this is required when freeing the interrupt.
- *
- *      Flags:
- *
- *      IRQF_SHARED             Interrupt is shared
- *
- *      IRQF_DISABLED   Disable local interrupts while processing
- *
- *      IRQF_SAMPLE_RANDOM      The interrupt can be used for entropy
- *
- */
-
-//FIXME - handler used to return void - whats the significance of the change?
-int request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *),
-                 unsigned long irq_flags, const char * devname, void *dev_id)
-{
-        unsigned long retval;
-        struct irqaction *action;
-
-        if (irq >= NR_IRQS || !irq_desc[irq].valid || !handler ||
-            (irq_flags & IRQF_SHARED && !dev_id))
-                return -EINVAL;
-
-        action = kmalloc(sizeof(struct irqaction), GFP_KERNEL);
-        if (!action)
-                return -ENOMEM;
-
-        action->handler = handler;
-        action->flags = irq_flags;
-        cpus_clear(action->mask);
-        action->name = devname;
-        action->next = NULL;
-        action->dev_id = dev_id;
-
-        retval = setup_irq(irq, action);
-
-        if (retval)
-                kfree(action);
-        return retval;
-}
-
-EXPORT_SYMBOL(request_irq);
-
-/**
- *      free_irq - free an interrupt
- *      @irq: Interrupt line to free
- *      @dev_id: Device identity to free
- *
- *      Remove an interrupt handler. The handler is removed and if the
- *      interrupt line is no longer in use by any driver it is disabled.
- *      On a shared IRQ the caller must ensure the interrupt is disabled
- *      on the card it drives before calling this function.
- *
- *      This function may be called from interrupt context.
- */
-void free_irq(unsigned int irq, void *dev_id)
-{
-        struct irqaction * action, **p;
-        unsigned long flags;
-
-        if (irq >= NR_IRQS || !irq_desc[irq].valid) {
-                printk(KERN_ERR "Trying to free IRQ%d\n",irq);
-#ifdef CONFIG_DEBUG_ERRORS
-                __backtrace();
-#endif
-                return;
-        }
-
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        for (p = &irq_desc[irq].action; (action = *p) != NULL; p = &action->next) {
-                if (action->dev_id != dev_id)
-                        continue;
-
-                /* Found it - now free it */
-                *p = action->next;
-                kfree(action);
-                goto out;
-        }
-        printk(KERN_ERR "Trying to free free IRQ%d\n",irq);
-#ifdef CONFIG_DEBUG_ERRORS
-        __backtrace();
-#endif
-out:
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-}
-
-EXPORT_SYMBOL(free_irq);
-
-/* Start the interrupt probing.  Unlike other architectures,
- * we don't return a mask of interrupts from probe_irq_on,
- * but return the number of interrupts enabled for the probe.
- * The interrupts which have been enabled for probing is
- * instead recorded in the irq_desc structure.
- */
-unsigned long probe_irq_on(void)
-{
-        unsigned int i, irqs = 0;
-        unsigned long delay;
-
-        /*
-         * first snaffle up any unassigned but
-         * probe-able interrupts
-         */
-        spin_lock_irq(&irq_controller_lock);
-        for (i = 0; i < NR_IRQS; i++) {
-                if (!irq_desc[i].probe_ok || irq_desc[i].action)
-                        continue;
-
-                irq_desc[i].probing = 1;
-                irq_desc[i].triggered = 0;
-                if (irq_desc[i].chip->type)
-                        irq_desc[i].chip->type(i, IRQT_PROBE);
-                irq_desc[i].chip->unmask(i);
-                irqs += 1;
-        }
-        spin_unlock_irq(&irq_controller_lock);
-
-        /*
-         * wait for spurious interrupts to mask themselves out again
-         */
-        for (delay = jiffies + HZ/10; time_before(jiffies, delay); )
-                /* min 100ms delay */;
-
-        /*
-         * now filter out any obviously spurious interrupts
-         */
-        spin_lock_irq(&irq_controller_lock);
-        for (i = 0; i < NR_IRQS; i++) {
-                if (irq_desc[i].probing && irq_desc[i].triggered) {
-                        irq_desc[i].probing = 0;
-                        irqs -= 1;
-                }
-        }
-        spin_unlock_irq(&irq_controller_lock);
-
-        return irqs;
-}
-
-EXPORT_SYMBOL(probe_irq_on);
-
-/*
- * Possible return values:
- *  >= 0 - interrupt number
- *    -1 - no interrupt/many interrupts
- */
-int probe_irq_off(unsigned long irqs)
-{
-        unsigned int i;
-        int irq_found = NO_IRQ;
-
-        /*
-         * look at the interrupts, and find exactly one
-         * that we were probing has been triggered
-         */
-        spin_lock_irq(&irq_controller_lock);
-        for (i = 0; i < NR_IRQS; i++) {
-                if (irq_desc[i].probing &&
-                    irq_desc[i].triggered) {
-                        if (irq_found != NO_IRQ) {
-                                irq_found = NO_IRQ;
-                                goto out;
-                        }
-                        irq_found = i;
-                }
-        }
-
-        if (irq_found == -1)
-                irq_found = NO_IRQ;
-out:
-        spin_unlock_irq(&irq_controller_lock);
-
-        return irq_found;
-}
-
-EXPORT_SYMBOL(probe_irq_off);
-
-void __init init_irq_proc(void)
-{
-}
-
-void __init init_IRQ(void)
-{
-        struct irqdesc *desc;
-        extern void init_dma(void);
-        int irq;
-
-        for (irq = 0, desc = irq_desc; irq < NR_IRQS; irq++, desc++)
-                *desc = bad_irq_desc;
-
-        arc_init_irq();
-        init_dma();
-}
diff --git a/arch/arm26/kernel/process.c b/arch/arm26/kernel/process.c
deleted file mode 100644
index dcd81e62ff4e..000000000000
--- a/arch/arm26/kernel/process.c
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/process.c
- *
- *  Copyright (C) 2003 Ian Molton - adapted for ARM26
- *  Copyright (C) 1996-2000 Russell King - Converted to ARM.
- *  Origional Copyright (C) 1995  Linus Torvalds
- *
- * 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 <stdarg.h>
-
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/stddef.h>
-#include <linux/unistd.h>
-#include <linux/ptrace.h>
-#include <linux/slab.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/delay.h>
-#include <linux/reboot.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/leds.h>
-#include <asm/processor.h>
-#include <asm/uaccess.h>
-
-extern const char *processor_modes[];
-extern void setup_mm_for_reboot(char mode);
-
-static volatile int hlt_counter;
-
-void disable_hlt(void)
-{
-        hlt_counter++;
-}
-
-EXPORT_SYMBOL(disable_hlt);
-
-void enable_hlt(void)
-{
-        hlt_counter--;
-}
-
-EXPORT_SYMBOL(enable_hlt);
-
-static int __init nohlt_setup(char *__unused)
-{
-        hlt_counter = 1;
-        return 1;
-}
-
-static int __init hlt_setup(char *__unused)
-{
-        hlt_counter = 0;
-        return 1;
-}
-
-__setup("nohlt", nohlt_setup);
-__setup("hlt", hlt_setup);
-
-/*
- * This is our default idle handler.  We need to disable
- * interrupts here to ensure we don't miss a wakeup call.
- */
-void cpu_idle(void)
-{
-        /* endless idle loop with no priority at all */
-        while (1) {
-                while (!need_resched())
-                        cpu_relax();
-                preempt_enable_no_resched();
-                schedule();
-                preempt_disable();
-        }
-}
-
-static char reboot_mode = 'h';
-
-int __init reboot_setup(char *str)
-{
-        reboot_mode = str[0];
-        return 1;
-}
-
-__setup("reboot=", reboot_setup);
-
-/* ARM26 cant do these but we still need to define them. */
-void machine_halt(void)
-{
-}
-void machine_power_off(void)
-{
-}
-
-void machine_restart(char * __unused)
-{
-        /*
-         * Clean and disable cache, and turn off interrupts
-         */
-        cpu_proc_fin();
-
-        /*
-         * Tell the mm system that we are going to reboot -
-         * we may need it to insert some 1:1 mappings so that
-         * soft boot works.
-         */
-        setup_mm_for_reboot(reboot_mode);
-
-        /*
-         * copy branch instruction to reset location and call it
-         */
-
-        *(unsigned long *)0 = *(unsigned long *)0x03800000;
-        ((void(*)(void))0)();
-
-        /*
-         * Whoops - the architecture was unable to reboot.
-         * Tell the user! Should never happen...
-         */
-        mdelay(1000);
-        printk("Reboot failed -- System halted\n");
-        while (1);
-}
-
-void show_regs(struct pt_regs * regs)
-{
-        unsigned long flags;
-
-        flags = condition_codes(regs);
-
-        printk("pc : [<%08lx>]    lr : [<%08lx>]    %s\n"
-               "sp : %08lx  ip : %08lx  fp : %08lx\n",
-                instruction_pointer(regs),
-                regs->ARM_lr, print_tainted(), regs->ARM_sp,
-                regs->ARM_ip, regs->ARM_fp);
-        printk("r10: %08lx  r9 : %08lx  r8 : %08lx\n",
-                regs->ARM_r10, regs->ARM_r9,
-                regs->ARM_r8);
-        printk("r7 : %08lx  r6 : %08lx  r5 : %08lx  r4 : %08lx\n",
-                regs->ARM_r7, regs->ARM_r6,
-                regs->ARM_r5, regs->ARM_r4);
-        printk("r3 : %08lx  r2 : %08lx  r1 : %08lx  r0 : %08lx\n",
-                regs->ARM_r3, regs->ARM_r2,
-                regs->ARM_r1, regs->ARM_r0);
-        printk("Flags: %c%c%c%c",
-                flags & PSR_N_BIT ? 'N' : 'n',
-                flags & PSR_Z_BIT ? 'Z' : 'z',
-                flags & PSR_C_BIT ? 'C' : 'c',
-                flags & PSR_V_BIT ? 'V' : 'v');
-        printk("  IRQs o%s  FIQs o%s  Mode %s  Segment %s\n",
-                interrupts_enabled(regs) ? "n" : "ff",
-                fast_interrupts_enabled(regs) ? "n" : "ff",
-                processor_modes[processor_mode(regs)],
-                get_fs() == get_ds() ? "kernel" : "user");
-}
-
-void show_fpregs(struct user_fp *regs)
-{
-        int i;
-
-        for (i = 0; i < 8; i++) {
-                unsigned long *p;
-                char type;
-
-                p = (unsigned long *)(regs->fpregs + i);
-
-                switch (regs->ftype[i]) {
-                        case 1: type = 'f'; break;
-                        case 2: type = 'd'; break;
-                        case 3: type = 'e'; break;
-                        default: type = '?'; break;
-                }
-                if (regs->init_flag)
-                        type = '?';
-
-                printk("  f%d(%c): %08lx %08lx %08lx%c",
-                        i, type, p[0], p[1], p[2], i & 1 ? '\n' : ' ');
-        }
-                        
-
-        printk("FPSR: %08lx FPCR: %08lx\n",
-                (unsigned long)regs->fpsr,
-                (unsigned long)regs->fpcr);
-}
-
-/*
- * Task structure and kernel stack allocation.
- */
-static unsigned long *thread_info_head;
-static unsigned int nr_thread_info;
-
-extern unsigned long get_page_8k(int priority);
-extern void free_page_8k(unsigned long page);
-
-// FIXME - is this valid?
-#define EXTRA_TASK_STRUCT       0
-#define ll_alloc_task_struct()  ((struct thread_info *)get_page_8k(GFP_KERNEL))
-#define ll_free_task_struct(p)  free_page_8k((unsigned long)(p))
-
-//FIXME - do we use *task param below looks like we dont, which is ok?
-//FIXME - if EXTRA_TASK_STRUCT is zero we can optimise the below away permanently. *IF* its supposed to be zero.
-struct thread_info *alloc_thread_info(struct task_struct *task)
-{
-        struct thread_info *thread = NULL;
-
-        if (EXTRA_TASK_STRUCT) {
-                unsigned long *p = thread_info_head;
-
-                if (p) {
-                        thread_info_head = (unsigned long *)p[0];
-                        nr_thread_info -= 1;
-                }
-                thread = (struct thread_info *)p;
-        }
-
-        if (!thread)
-                thread = ll_alloc_task_struct();
-
-#ifdef CONFIG_MAGIC_SYSRQ
-        /*
-         * The stack must be cleared if you want SYSRQ-T to
-         * give sensible stack usage information
-         */
-        if (thread) {
-                char *p = (char *)thread;
-                memzero(p+KERNEL_STACK_SIZE, KERNEL_STACK_SIZE);
-        }
-#endif
-        return thread;
-}
-
-void free_thread_info(struct thread_info *thread)
-{
-        if (EXTRA_TASK_STRUCT && nr_thread_info < EXTRA_TASK_STRUCT) {
-                unsigned long *p = (unsigned long *)thread;
-                p[0] = (unsigned long)thread_info_head;
-                thread_info_head = p;
-                nr_thread_info += 1;
-        } else
-                ll_free_task_struct(thread);
-}
-
-/*
- * Free current thread data structures etc..
- */
-void exit_thread(void)
-{
-}
-
-void flush_thread(void)
-{
-        struct thread_info *thread = current_thread_info();
-        struct task_struct *tsk = current;
-
-        memset(&tsk->thread.debug, 0, sizeof(struct debug_info));
-        memset(&thread->fpstate, 0, sizeof(union fp_state));
-
-        clear_used_math();
-}
-
-void release_thread(struct task_struct *dead_task)
-{
-}
-
-asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
-
-int
-copy_thread(int nr, unsigned long clone_flags, unsigned long stack_start,
-            unsigned long unused, struct task_struct *p, struct pt_regs *regs)
-{
-        struct thread_info *thread = task_thread_info(p);
-        struct pt_regs *childregs = task_pt_regs(p);
-
-        *childregs = *regs;
-        childregs->ARM_r0 = 0;
-        childregs->ARM_sp = stack_start;
-
-        memset(&thread->cpu_context, 0, sizeof(struct cpu_context_save));
-        thread->cpu_context.sp = (unsigned long)childregs;
-        thread->cpu_context.pc = (unsigned long)ret_from_fork | MODE_SVC26 | PSR_I_BIT;
-
-        return 0;
-}
-
-/*
- * fill in the fpe structure for a core dump...
- */
-int dump_fpu (struct pt_regs *regs, struct user_fp *fp)
-{
-        struct thread_info *thread = current_thread_info();
-        int used_math = !!used_math();
-
-        if (used_math)
-                memcpy(fp, &thread->fpstate.soft, sizeof (*fp));
-
-        return used_math;
-}
-
-/*
- * fill in the user structure for a core dump..
- */
-void dump_thread(struct pt_regs * regs, struct user * dump)
-{
-        struct task_struct *tsk = current;
-
-        dump->magic = CMAGIC;
-        dump->start_code = tsk->mm->start_code;
-        dump->start_stack = regs->ARM_sp & ~(PAGE_SIZE - 1);
-
-        dump->u_tsize = (tsk->mm->end_code - tsk->mm->start_code) >> PAGE_SHIFT;
-        dump->u_dsize = (tsk->mm->brk - tsk->mm->start_data + PAGE_SIZE - 1) >> PAGE_SHIFT;
-        dump->u_ssize = 0;
-
-        dump->u_debugreg[0] = tsk->thread.debug.bp[0].address;
-        dump->u_debugreg[1] = tsk->thread.debug.bp[1].address;
-        dump->u_debugreg[2] = tsk->thread.debug.bp[0].insn;
-        dump->u_debugreg[3] = tsk->thread.debug.bp[1].insn;
-        dump->u_debugreg[4] = tsk->thread.debug.nsaved;
-
-        if (dump->start_stack < 0x04000000)
-                dump->u_ssize = (0x04000000 - dump->start_stack) >> PAGE_SHIFT;
-
-        dump->regs = *regs;
-        dump->u_fpvalid = dump_fpu (regs, &dump->u_fp);
-}
-
-/*
- * Shuffle the argument into the correct register before calling the
- * thread function.  r1 is the thread argument, r2 is the pointer to
- * the thread function, and r3 points to the exit function.
- * FIXME - make sure this is right - the older code used to zero fp
- * and cause the parent to call sys_exit (do_exit in this version)
- */
-extern void kernel_thread_helper(void);
-
-asm(    ".section .text\n"
-"       .align\n"
-"       .type   kernel_thread_helper, #function\n"
-"kernel_thread_helper:\n"
-"       mov     r0, r1\n"
-"       mov     lr, r3\n"
-"       mov     pc, r2\n"
-"       .size   kernel_thread_helper, . - kernel_thread_helper\n"
-"       .previous");
-
-/*
- * Create a kernel thread.
- */
-pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
-{
-        struct pt_regs regs;
-
-        memset(&regs, 0, sizeof(regs));
-
-        regs.ARM_r1 = (unsigned long)arg;
-        regs.ARM_r2 = (unsigned long)fn;
-        regs.ARM_r3 = (unsigned long)do_exit;
-        regs.ARM_pc = (unsigned long)kernel_thread_helper | MODE_SVC26;
-
-        return do_fork(flags|CLONE_VM|CLONE_UNTRACED, 0, &regs, 0, NULL, NULL);
-}
-EXPORT_SYMBOL(kernel_thread);
-
-
-unsigned long get_wchan(struct task_struct *p)
-{
-        unsigned long fp, lr;
-        unsigned long stack_page;
-        int count = 0;
-        if (!p || p == current || p->state == TASK_RUNNING)
-                return 0;
-
-        stack_page = 4096 + (unsigned long)p;
-        fp = thread_saved_fp(p);
-        do {
-                if (fp < stack_page || fp > 4092+stack_page)
-                        return 0;
-                lr = pc_pointer (((unsigned long *)fp)[-1]);
-                if (!in_sched_functions(lr))
-                        return lr;
-                fp = *(unsigned long *) (fp - 12);
-        } while (count ++ < 16);
-        return 0;
-}
diff --git a/arch/arm26/kernel/ptrace.c b/arch/arm26/kernel/ptrace.c
deleted file mode 100644
index 0fefb86970c6..000000000000
--- a/arch/arm26/kernel/ptrace.c
+++ /dev/null
@@ -1,670 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/ptrace.c
- *
- *  By Ross Biro 1/23/92
- * edited by Linus Torvalds
- * ARM modifications Copyright (C) 2000 Russell King
- *
- * 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/sched.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/ptrace.h>
-#include <linux/user.h>
-#include <linux/security.h>
-#include <linux/signal.h>
-
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-#include <asm/system.h>
-//#include <asm/processor.h>
-
-#include "ptrace.h"
-
-#define REG_PC  15
-#define REG_PSR 15
-/*
- * does not yet catch signals sent when the child dies.
- * in exit.c or in signal.c.
- */
-
-/*
- * Breakpoint SWI instruction: SWI &9F0001
- */
-#define BREAKINST_ARM   0xef9f0001
-
-/*
- * this routine will get a word off of the processes privileged stack.
- * the offset is how far from the base addr as stored in the THREAD.
- * this routine assumes that all the privileged stacks are in our
- * data space.
- */
-static inline long get_user_reg(struct task_struct *task, int offset)
-{
-        return task_pt_regs(task)->uregs[offset];
-}
-
-/*
- * this routine will put a word on the processes privileged stack.
- * the offset is how far from the base addr as stored in the THREAD.
- * this routine assumes that all the privileged stacks are in our
- * data space.
- */
-static inline int
-put_user_reg(struct task_struct *task, int offset, long data)
-{
-        struct pt_regs newregs, *regs = task_pt_regs(task);
-        int ret = -EINVAL;
-
-        newregs = *regs;
-        newregs.uregs[offset] = data;
-
-        if (valid_user_regs(&newregs)) {
-                regs->uregs[offset] = data;
-                ret = 0;
-        }
-
-        return ret;
-}
-
-static inline int
-read_u32(struct task_struct *task, unsigned long addr, u32 *res)
-{
-        int ret;
-
-        ret = access_process_vm(task, addr, res, sizeof(*res), 0);
-
-        return ret == sizeof(*res) ? 0 : -EIO;
-}
-
-static inline int
-read_instr(struct task_struct *task, unsigned long addr, u32 *res)
-{
-        int ret;
-        u32 val;
-        ret = access_process_vm(task, addr & ~3, &val, sizeof(val), 0);
-        ret = ret == sizeof(val) ? 0 : -EIO;
-        *res = val;
-        return ret;
-}
-
-/*
- * Get value of register `rn' (in the instruction)
- */
-static unsigned long
-ptrace_getrn(struct task_struct *child, unsigned long insn)
-{
-        unsigned int reg = (insn >> 16) & 15;
-        unsigned long val;
-
-        val = get_user_reg(child, reg);
-        if (reg == 15)
-                val = pc_pointer(val + 8); //FIXME - correct for arm26?
-
-        return val;
-}
-
-/*
- * Get value of operand 2 (in an ALU instruction)
- */
-static unsigned long
-ptrace_getaluop2(struct task_struct *child, unsigned long insn)
-{
-        unsigned long val;
-        int shift;
-        int type;
-
-        if (insn & 1 << 25) {
-                val = insn & 255;
-                shift = (insn >> 8) & 15;
-                type = 3;
-        } else {
-                val = get_user_reg (child, insn & 15);
-
-                if (insn & (1 << 4))
-                        shift = (int)get_user_reg (child, (insn >> 8) & 15);
-                else
-                        shift = (insn >> 7) & 31;
-
-                type = (insn >> 5) & 3;
-        }
-
-        switch (type) {
-        case 0: val <<= shift;  break;
-        case 1: val >>= shift;  break;
-        case 2:
-                val = (((signed long)val) >> shift);
-                break;
-        case 3:
-                val = (val >> shift) | (val << (32 - shift));
-                break;
-        }
-        return val;
-}
-
-/*
- * Get value of operand 2 (in a LDR instruction)
- */
-static unsigned long
-ptrace_getldrop2(struct task_struct *child, unsigned long insn)
-{
-        unsigned long val;
-        int shift;
-        int type;
-
-        val = get_user_reg(child, insn & 15);
-        shift = (insn >> 7) & 31;
-        type = (insn >> 5) & 3;
-
-        switch (type) {
-        case 0: val <<= shift;  break;
-        case 1: val >>= shift;  break;
-        case 2:
-                val = (((signed long)val) >> shift);
-                break;
-        case 3:
-                val = (val >> shift) | (val << (32 - shift));
-                break;
-        }
-        return val;
-}
-
-#define OP_MASK 0x01e00000
-#define OP_AND  0x00000000
-#define OP_EOR  0x00200000
-#define OP_SUB  0x00400000
-#define OP_RSB  0x00600000
-#define OP_ADD  0x00800000
-#define OP_ADC  0x00a00000
-#define OP_SBC  0x00c00000
-#define OP_RSC  0x00e00000
-#define OP_ORR  0x01800000
-#define OP_MOV  0x01a00000
-#define OP_BIC  0x01c00000
-#define OP_MVN  0x01e00000
-
-static unsigned long
-get_branch_address(struct task_struct *child, unsigned long pc, unsigned long insn)
-{
-        u32 alt = 0;
-
-        switch (insn & 0x0e000000) {
-        case 0x00000000:
-        case 0x02000000: {
-                /*
-                 * data processing
-                 */
-                long aluop1, aluop2, ccbit;
-
-                if ((insn & 0xf000) != 0xf000)
-                        break;
-
-                aluop1 = ptrace_getrn(child, insn);
-                aluop2 = ptrace_getaluop2(child, insn);
-                ccbit  = get_user_reg(child, REG_PSR) & PSR_C_BIT ? 1 : 0;
-
-                switch (insn & OP_MASK) {
-                case OP_AND: alt = aluop1 & aluop2;             break;
-                case OP_EOR: alt = aluop1 ^ aluop2;             break;
-                case OP_SUB: alt = aluop1 - aluop2;             break;
-                case OP_RSB: alt = aluop2 - aluop1;             break;
-                case OP_ADD: alt = aluop1 + aluop2;             break;
-                case OP_ADC: alt = aluop1 + aluop2 + ccbit;     break;
-                case OP_SBC: alt = aluop1 - aluop2 + ccbit;     break;
-                case OP_RSC: alt = aluop2 - aluop1 + ccbit;     break;
-                case OP_ORR: alt = aluop1 | aluop2;             break;
-                case OP_MOV: alt = aluop2;                      break;
-                case OP_BIC: alt = aluop1 & ~aluop2;            break;
-                case OP_MVN: alt = ~aluop2;                     break;
-                }
-                break;
-        }
-
-        case 0x04000000:
-        case 0x06000000:
-                /*
-                 * ldr
-                 */
-                if ((insn & 0x0010f000) == 0x0010f000) {
-                        unsigned long base;
-
-                        base = ptrace_getrn(child, insn);
-                        if (insn & 1 << 24) {
-                                long aluop2;
-
-                                if (insn & 0x02000000)
-                                        aluop2 = ptrace_getldrop2(child, insn);
-                                else
-                                        aluop2 = insn & 0xfff;
-
-                                if (insn & 1 << 23)
-                                        base += aluop2;
-                                else
-                                        base -= aluop2;
-                        }
-                        if (read_u32(child, base, &alt) == 0)
-                                alt = pc_pointer(alt);
-                }
-                break;
-
-        case 0x08000000:
-                /*
-                 * ldm
-                 */
-                if ((insn & 0x00108000) == 0x00108000) {
-                        unsigned long base;
-                        unsigned int nr_regs;
-
-                        if (insn & (1 << 23)) {
-                                nr_regs = hweight16(insn & 65535) << 2;
-
-                                if (!(insn & (1 << 24)))
-                                        nr_regs -= 4;
-                        } else {
-                                if (insn & (1 << 24))
-                                        nr_regs = -4;
-                                else
-                                        nr_regs = 0;
-                        }
-
-                        base = ptrace_getrn(child, insn);
-
-                        if (read_u32(child, base + nr_regs, &alt) == 0)
-                                alt = pc_pointer(alt);
-                        break;
-                }
-                break;
-
-        case 0x0a000000: {
-                /*
-                 * bl or b
-                 */
-                signed long displ;
-                /* It's a branch/branch link: instead of trying to
-                 * figure out whether the branch will be taken or not,
-                 * we'll put a breakpoint at both locations.  This is
-                 * simpler, more reliable, and probably not a whole lot
-                 * slower than the alternative approach of emulating the
-                 * branch.
-                 */
-                displ = (insn & 0x00ffffff) << 8;
-                displ = (displ >> 6) + 8;
-                if (displ != 0 && displ != 4)
-                        alt = pc + displ;
-            }
-            break;
-        }
-
-        return alt;
-}
-
-static int
-swap_insn(struct task_struct *task, unsigned long addr,
-          void *old_insn, void *new_insn, int size)
-{
-        int ret;
-
-        ret = access_process_vm(task, addr, old_insn, size, 0);
-        if (ret == size)
-                ret = access_process_vm(task, addr, new_insn, size, 1);
-        return ret;
-}
-
-static void
-add_breakpoint(struct task_struct *task, struct debug_info *dbg, unsigned long addr)
-{
-        int nr = dbg->nsaved;
-
-        if (nr < 2) {
-                u32 new_insn = BREAKINST_ARM;
-                int res;
-
-                res = swap_insn(task, addr, &dbg->bp[nr].insn, &new_insn, 4);
-
-                if (res == 4) {
-                        dbg->bp[nr].address = addr;
-                        dbg->nsaved += 1;
-                }
-        } else
-                printk(KERN_ERR "ptrace: too many breakpoints\n");
-}
-
-/*
- * Clear one breakpoint in the user program.  We copy what the hardware
- * does and use bit 0 of the address to indicate whether this is a Thumb
- * breakpoint or an ARM breakpoint.
- */
-static void clear_breakpoint(struct task_struct *task, struct debug_entry *bp)
-{
-        unsigned long addr = bp->address;
-        u32 old_insn;
-        int ret;
-
-        ret = swap_insn(task, addr & ~3, &old_insn,
-                        &bp->insn, 4);
-
-        if (ret != 4 || old_insn != BREAKINST_ARM)
-                printk(KERN_ERR "%s:%d: corrupted ARM breakpoint at "
-                        "0x%08lx (0x%08x)\n", task->comm, task->pid,
-                        addr, old_insn);
-}
-
-void ptrace_set_bpt(struct task_struct *child)
-{
-        struct pt_regs *regs;
-        unsigned long pc;
-        u32 insn;
-        int res;
-
-        regs = task_pt_regs(child);
-        pc = instruction_pointer(regs);
-
-        res = read_instr(child, pc, &insn);
-        if (!res) {
-                struct debug_info *dbg = &child->thread.debug;
-                unsigned long alt;
-
-                dbg->nsaved = 0;
-
-                alt = get_branch_address(child, pc, insn);
-                if (alt)
-                        add_breakpoint(child, dbg, alt);
-
-                /*
-                 * Note that we ignore the result of setting the above
-                 * breakpoint since it may fail.  When it does, this is
-                 * not so much an error, but a forewarning that we may
-                 * be receiving a prefetch abort shortly.
-                 *
-                 * If we don't set this breakpoint here, then we can
-                 * lose control of the thread during single stepping.
-                 */
-                if (!alt || predicate(insn) != PREDICATE_ALWAYS)
-                        add_breakpoint(child, dbg, pc + 4);
-        }
-}
-
-/*
- * Ensure no single-step breakpoint is pending.  Returns non-zero
- * value if child was being single-stepped.
- */
-void ptrace_cancel_bpt(struct task_struct *child)
-{
-        int i, nsaved = child->thread.debug.nsaved;
-
-        child->thread.debug.nsaved = 0;
-
-        if (nsaved > 2) {
-                printk("ptrace_cancel_bpt: bogus nsaved: %d!\n", nsaved);
-                nsaved = 2;
-        }
-
-        for (i = 0; i < nsaved; i++)
-                clear_breakpoint(child, &child->thread.debug.bp[i]);
-}
-
-/*
- * Called by kernel/ptrace.c when detaching..
- *
- * Make sure the single step bit is not set.
- */
-void ptrace_disable(struct task_struct *child)
-{
-        child->ptrace &= ~PT_SINGLESTEP;
-        ptrace_cancel_bpt(child);
-}
-
-/*
- * Handle hitting a breakpoint.
- */
-void ptrace_break(struct task_struct *tsk, struct pt_regs *regs)
-{
-        siginfo_t info;
-
-        /*
-         * The PC is always left pointing at the next instruction.  Fix this.
-         */
-        regs->ARM_pc -= 4;
-
-        if (tsk->thread.debug.nsaved == 0)
-                printk(KERN_ERR "ptrace: bogus breakpoint trap\n");
-
-        ptrace_cancel_bpt(tsk);
-
-        info.si_signo = SIGTRAP;
-        info.si_errno = 0;
-        info.si_code  = TRAP_BRKPT;
-        info.si_addr  = (void *)instruction_pointer(regs) - 4;
-
-        force_sig_info(SIGTRAP, &info, tsk);
-}
-
-/*
- * Read the word at offset "off" into the "struct user".  We
- * actually access the pt_regs stored on the kernel stack.
- */
-static int ptrace_read_user(struct task_struct *tsk, unsigned long off,
-                            unsigned long *ret)
-{
-        unsigned long tmp;
-
-        if (off & 3 || off >= sizeof(struct user))
-                return -EIO;
-
-        tmp = 0;
-        if (off < sizeof(struct pt_regs))
-                tmp = get_user_reg(tsk, off >> 2);
-
-        return put_user(tmp, ret);
-}
-
-/*
- * Write the word at offset "off" into "struct user".  We
- * actually access the pt_regs stored on the kernel stack.
- */
-static int ptrace_write_user(struct task_struct *tsk, unsigned long off,
-                             unsigned long val)
-{
-        if (off & 3 || off >= sizeof(struct user))
-                return -EIO;
-
-        if (off >= sizeof(struct pt_regs))
-                return 0;
-
-        return put_user_reg(tsk, off >> 2, val);
-}
-
-/*
- * Get all user integer registers.
- */
-static int ptrace_getregs(struct task_struct *tsk, void *uregs)
-{
-        struct pt_regs *regs = task_pt_regs(tsk);
-
-        return copy_to_user(uregs, regs, sizeof(struct pt_regs)) ? -EFAULT : 0;
-}
-
-/*
- * Set all user integer registers.
- */
-static int ptrace_setregs(struct task_struct *tsk, void *uregs)
-{
-        struct pt_regs newregs;
-        int ret;
-
-        ret = -EFAULT;
-        if (copy_from_user(&newregs, uregs, sizeof(struct pt_regs)) == 0) {
-                struct pt_regs *regs = task_pt_regs(tsk);
-
-                ret = -EINVAL;
-                if (valid_user_regs(&newregs)) {
-                        *regs = newregs;
-                        ret = 0;
-                }
-        }
-
-        return ret;
-}
-
-/*
- * Get the child FPU state.
- */
-static int ptrace_getfpregs(struct task_struct *tsk, void *ufp)
-{
-        return copy_to_user(ufp, &task_thread_info(tsk)->fpstate,
-                            sizeof(struct user_fp)) ? -EFAULT : 0;
-}
-
-/*
- * Set the child FPU state.
- */
-static int ptrace_setfpregs(struct task_struct *tsk, void *ufp)
-{
-        set_stopped_child_used_math(tsk);
-        return copy_from_user(&task_thread_info(tsk)->fpstate, ufp,
-                              sizeof(struct user_fp)) ? -EFAULT : 0;
-}
-
-long arch_ptrace(struct task_struct *child, long request, long addr, long data)
-{
-        int ret;
-
-        switch (request) {
-                /*
-                 * read word at location "addr" in the child process.
-                 */
-                case PTRACE_PEEKTEXT:
-                case PTRACE_PEEKDATA:
-                        ret = generic_ptrace_peekdata(child, addr, data);
-                        break;
-
-                case PTRACE_PEEKUSR:
-                        ret = ptrace_read_user(child, addr, (unsigned long *)data);
-                        break;
-
-                /*
-                 * write the word at location addr.
-                 */
-                case PTRACE_POKETEXT:
-                case PTRACE_POKEDATA:
-                        ret = generic_ptrace_pokedata(child, addr, data);
-                        break;
-
-                case PTRACE_POKEUSR:
-                        ret = ptrace_write_user(child, addr, data);
-                        break;
-
-                /*
-                 * continue/restart and stop at next (return from) syscall
-                 */
-                case PTRACE_SYSCALL:
-                case PTRACE_CONT:
-                        ret = -EIO;
-                        if (!valid_signal(data))
-                                break;
-                        if (request == PTRACE_SYSCALL)
-                                set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-                        else
-                                clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-                        child->exit_code = data;
-                        /* make sure single-step breakpoint is gone. */
-                        child->ptrace &= ~PT_SINGLESTEP;
-                        ptrace_cancel_bpt(child);
-                        wake_up_process(child);
-                        ret = 0;
-                        break;
-
-                /*
-                 * make the child exit.  Best I can do is send it a sigkill.
-                 * perhaps it should be put in the status that it wants to
-                 * exit.
-                 */
-                case PTRACE_KILL:
-                        /* make sure single-step breakpoint is gone. */
-                        child->ptrace &= ~PT_SINGLESTEP;
-                        ptrace_cancel_bpt(child);
-                        if (child->exit_state != EXIT_ZOMBIE) {
-                                child->exit_code = SIGKILL;
-                                wake_up_process(child);
-                        }
-                        ret = 0;
-                        break;
-
-                /*
-                 * execute single instruction.
-                 */
-                case PTRACE_SINGLESTEP:
-                        ret = -EIO;
-                        if (!valid_signal(data))
-                                break;
-                        child->ptrace |= PT_SINGLESTEP;
-                        clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-                        child->exit_code = data;
-                        /* give it a chance to run. */
-                        wake_up_process(child);
-                        ret = 0;
-                        break;
-
-                case PTRACE_DETACH:
-                        ret = ptrace_detach(child, data);
-                        break;
-
-                case PTRACE_GETREGS:
-                        ret = ptrace_getregs(child, (void *)data);
-                        break;
-
-                case PTRACE_SETREGS:
-                        ret = ptrace_setregs(child, (void *)data);
-                        break;
-
-                case PTRACE_GETFPREGS:
-                        ret = ptrace_getfpregs(child, (void *)data);
-                        break;
-                
-                case PTRACE_SETFPREGS:
-                        ret = ptrace_setfpregs(child, (void *)data);
-                        break;
-
-                default:
-                        ret = ptrace_request(child, request, addr, data);
-                        break;
-        }
-
-        return ret;
-}
-
-asmlinkage void syscall_trace(int why, struct pt_regs *regs)
-{
-        unsigned long ip;
-
-        if (!test_thread_flag(TIF_SYSCALL_TRACE))
-                return;
-        if (!(current->ptrace & PT_PTRACED))
-                return;
-
-        /*
-         * Save IP.  IP is used to denote syscall entry/exit:
-         *  IP = 0 -> entry, = 1 -> exit
-         */
-        ip = regs->ARM_ip;
-        regs->ARM_ip = why;
-
-        /* the 0x80 provides a way for the tracing parent to distinguish
-           between a syscall stop and SIGTRAP delivery */
-        ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
-                                 ? 0x80 : 0));
-        /*
-         * this isn't the same as continuing with a signal, but it will do
-         * for normal use.  strace only continues with a signal if the
-         * stopping signal is not SIGTRAP.  -brl
-         */
-        if (current->exit_code) {
-                send_sig(current->exit_code, current, 1);
-                current->exit_code = 0;
-        }
-        regs->ARM_ip = ip;
-}
diff --git a/arch/arm26/kernel/ptrace.h b/arch/arm26/kernel/ptrace.h
deleted file mode 100644
index 846c9d8d36ed..000000000000
--- a/arch/arm26/kernel/ptrace.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/ptrace.h
- *
- *  Copyright (C) 2000-2003 Russell King
- *  Copyright (C) 2003 Ian Molton
- *
- * 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.
- */
-extern void ptrace_cancel_bpt(struct task_struct *);
-extern void ptrace_set_bpt(struct task_struct *);
-extern void ptrace_break(struct task_struct *, struct pt_regs *);
diff --git a/arch/arm26/kernel/semaphore.c b/arch/arm26/kernel/semaphore.c
deleted file mode 100644
index 5447a06db3fa..000000000000
--- a/arch/arm26/kernel/semaphore.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- *  ARM semaphore implementation, taken from
- *
- *  i386 semaphore implementation.
- *
- *  (C) Copyright 1999 Linus Torvalds
- *  (C) Copyright 2003 Ian Molton (ARM26 mods)
- *
- *  Modified for ARM by Russell King
- *
- * 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>
-#include <linux/sched.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-
-#include <asm/semaphore.h>
-
-/*
- * Semaphores are implemented using a two-way counter:
- * The "count" variable is decremented for each process
- * that tries to acquire the semaphore, while the "sleeping"
- * variable is a count of such acquires.
- *
- * Notably, the inline "up()" and "down()" functions can
- * efficiently test if they need to do any extra work (up
- * needs to do something only if count was negative before
- * the increment operation.
- *
- * "sleeping" and the contention routine ordering is
- * protected by the semaphore spinlock.
- *
- * Note that these functions are only called when there is
- * contention on the lock, and as such all this is the
- * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
- * where we want to avoid any extra jumps and calls.
- */
-
-/*
- * Logic:
- *  - only on a boundary condition do we need to care. When we go
- *    from a negative count to a non-negative, we wake people up.
- *  - when we go from a non-negative count to a negative do we
- *    (a) synchronize with the "sleeper" count and (b) make sure
- *    that we're on the wakeup list before we synchronize so that
- *    we cannot lose wakeup events.
- */
-
-void __up(struct semaphore *sem)
-{
-        wake_up(&sem->wait);
-}
-
-static DEFINE_SPINLOCK(semaphore_lock);
-
-void __sched __down(struct semaphore * sem)
-{
-        struct task_struct *tsk = current;
-        DECLARE_WAITQUEUE(wait, tsk);
-        tsk->state = TASK_UNINTERRUPTIBLE;
-        add_wait_queue_exclusive(&sem->wait, &wait);
-
-        spin_lock_irq(&semaphore_lock);
-        sem->sleepers++;
-        for (;;) {
-                int sleepers = sem->sleepers;
-
-                /*
-                 * Add "everybody else" into it. They aren't
-                 * playing, because we own the spinlock.
-                 */
-                if (!atomic_add_negative(sleepers - 1, &sem->count)) {
-                        sem->sleepers = 0;
-                        break;
-                }
-                sem->sleepers = 1;      /* us - see -1 above */
-                spin_unlock_irq(&semaphore_lock);
-
-                schedule();
-                tsk->state = TASK_UNINTERRUPTIBLE;
-                spin_lock_irq(&semaphore_lock);
-        }
-        spin_unlock_irq(&semaphore_lock);
-        remove_wait_queue(&sem->wait, &wait);
-        tsk->state = TASK_RUNNING;
-        wake_up(&sem->wait);
-}
-
-int __sched __down_interruptible(struct semaphore * sem)
-{
-        int retval = 0;
-        struct task_struct *tsk = current;
-        DECLARE_WAITQUEUE(wait, tsk);
-        tsk->state = TASK_INTERRUPTIBLE;
-        add_wait_queue_exclusive(&sem->wait, &wait);
-
-        spin_lock_irq(&semaphore_lock);
-        sem->sleepers ++;
-        for (;;) {
-                int sleepers = sem->sleepers;
-
-                /*
-                 * With signals pending, this turns into
-                 * the trylock failure case - we won't be
-                 * sleeping, and we* can't get the lock as
-                 * it has contention. Just correct the count
-                 * and exit.
-                 */
-                if (signal_pending(current)) {
-                        retval = -EINTR;
-                        sem->sleepers = 0;
-                        atomic_add(sleepers, &sem->count);
-                        break;
-                }
-
-                /*
-                 * Add "everybody else" into it. They aren't
-                 * playing, because we own the spinlock. The
-                 * "-1" is because we're still hoping to get
-                 * the lock.
-                 */
-                if (!atomic_add_negative(sleepers - 1, &sem->count)) {
-                        sem->sleepers = 0;
-                        break;
-                }
-                sem->sleepers = 1;      /* us - see -1 above */
-                spin_unlock_irq(&semaphore_lock);
-
-                schedule();
-                tsk->state = TASK_INTERRUPTIBLE;
-                spin_lock_irq(&semaphore_lock);
-        }
-        spin_unlock_irq(&semaphore_lock);
-        tsk->state = TASK_RUNNING;
-        remove_wait_queue(&sem->wait, &wait);
-        wake_up(&sem->wait);
-        return retval;
-}
-
-/*
- * Trylock failed - make sure we correct for
- * having decremented the count.
- *
- * We could have done the trylock with a
- * single "cmpxchg" without failure cases,
- * but then it wouldn't work on a 386.
- */
-int __down_trylock(struct semaphore * sem)
-{
-        int sleepers;
-        unsigned long flags;
-
-        spin_lock_irqsave(&semaphore_lock, flags);
-        sleepers = sem->sleepers + 1;
-        sem->sleepers = 0;
-
-        /*
-         * Add "everybody else" and us into it. They aren't
-         * playing, because we own the spinlock.
-         */
-        if (!atomic_add_negative(sleepers, &sem->count))
-                wake_up(&sem->wait);
-
-        spin_unlock_irqrestore(&semaphore_lock, flags);
-        return 1;
-}
-
-/*
- * The semaphore operations have a special calling sequence that
- * allow us to do a simpler in-line version of them. These routines
- * need to convert that sequence back into the C sequence when
- * there is contention on the semaphore.
- *
- * ip contains the semaphore pointer on entry. Save the C-clobbered
- * registers (r0 to r3 and lr), but not ip, as we use it as a return
- * value in some cases..
- */
-asm("   .section .sched.text , #alloc, #execinstr       \n\
-        .align  5                               \n\
-        .globl  __down_failed                   \n\
-__down_failed:                                  \n\
-        stmfd   sp!, {r0 - r3, lr}              \n\
-        mov     r0, ip                          \n\
-        bl      __down                          \n\
-        ldmfd   sp!, {r0 - r3, pc}^             \n\
-                                                \n\
-        .align  5                               \n\
-        .globl  __down_interruptible_failed     \n\
-__down_interruptible_failed:                    \n\
-        stmfd   sp!, {r0 - r3, lr}              \n\
-        mov     r0, ip                          \n\
-        bl      __down_interruptible            \n\
-        mov     ip, r0                          \n\
-        ldmfd   sp!, {r0 - r3, pc}^             \n\
-                                                \n\
-        .align  5                               \n\
-        .globl  __down_trylock_failed           \n\
-__down_trylock_failed:                          \n\
-        stmfd   sp!, {r0 - r3, lr}              \n\
-        mov     r0, ip                          \n\
-        bl      __down_trylock                  \n\
-        mov     ip, r0                          \n\
-        ldmfd   sp!, {r0 - r3, pc}^             \n\
-                                                \n\
-        .align  5                               \n\
-        .globl  __up_wakeup                     \n\
-__up_wakeup:                                    \n\
-        stmfd   sp!, {r0 - r3, lr}              \n\
-        mov     r0, ip                          \n\
-        bl      __up                            \n\
-        ldmfd   sp!, {r0 - r3, pc}^             \n\
-        ");
-
-EXPORT_SYMBOL(__down_failed);
-EXPORT_SYMBOL(__down_interruptible_failed);
-EXPORT_SYMBOL(__down_trylock_failed);
-EXPORT_SYMBOL(__up_wakeup);
-
diff --git a/arch/arm26/kernel/setup.c b/arch/arm26/kernel/setup.c
deleted file mode 100644
index 0e006c6cd5a0..000000000000
--- a/arch/arm26/kernel/setup.c
+++ /dev/null
@@ -1,572 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/setup.c
- *
- *  Copyright (C) 1995-2001 Russell King
- *  Copyright (C) 2003 Ian Molton
- *
- * 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/stddef.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/utsname.h>
-#include <linux/blkdev.h>
-#include <linux/console.h>
-#include <linux/bootmem.h>
-#include <linux/seq_file.h>
-#include <linux/screen_info.h>
-#include <linux/init.h>
-#include <linux/root_dev.h>
-
-#include <asm/elf.h>
-#include <asm/hardware.h>
-#include <asm/io.h>
-#include <asm/procinfo.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/tlbflush.h>
-
-#include <asm/irqchip.h>
-
-#ifndef MEM_SIZE
-#define MEM_SIZE        (16*1024*1024)
-#endif
-
-#ifdef CONFIG_PREEMPT
-DEFINE_SPINLOCK(kernel_flag);
-#endif
-
-#if defined(CONFIG_FPE_NWFPE)
-char fpe_type[8];
-
-static int __init fpe_setup(char *line)
-{
-        memcpy(fpe_type, line, 8);
-        return 1;
-}
-
-__setup("fpe=", fpe_setup);
-#endif
-
-extern void paging_init(struct meminfo *);
-extern void convert_to_tag_list(struct tag *tags);
-extern void squash_mem_tags(struct tag *tag);
-extern void bootmem_init(struct meminfo *);
-extern int root_mountflags;
-extern int _stext, _text, _etext, _edata, _end;
-#ifdef CONFIG_XIP_KERNEL
-extern int _endtext, _sdata;
-#endif
-
-
-unsigned int processor_id;
-unsigned int __machine_arch_type;
-unsigned int system_rev;
-unsigned int system_serial_low;
-unsigned int system_serial_high;
-unsigned int elf_hwcap;
-unsigned int memc_ctrl_reg;
-unsigned int number_mfm_drives;
-
-struct processor processor;
-
-char elf_platform[ELF_PLATFORM_SIZE];
-
-unsigned long phys_initrd_start __initdata = 0;
-unsigned long phys_initrd_size __initdata = 0;
-static struct meminfo meminfo __initdata = { 0, };
-static struct proc_info_item proc_info;
-static const char *machine_name;
-static char __initdata command_line[COMMAND_LINE_SIZE];
-
-static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
-
-/*
- * Standard memory resources
- */
-static struct resource mem_res[] = {
-        { "Video RAM",   0,     0,     IORESOURCE_MEM                   },
-        { "Kernel code", 0,     0,     IORESOURCE_MEM                   },
-        { "Kernel data", 0,     0,     IORESOURCE_MEM                   }
-};
-
-#define video_ram   mem_res[0]
-#define kernel_code mem_res[1]
-#define kernel_data mem_res[2]
-
-static struct resource io_res[] = {
-        { "reserved",    0x3bc, 0x3be, IORESOURCE_IO | IORESOURCE_BUSY },
-        { "reserved",    0x378, 0x37f, IORESOURCE_IO | IORESOURCE_BUSY },
-        { "reserved",    0x278, 0x27f, IORESOURCE_IO | IORESOURCE_BUSY }
-};
-
-#define lp0 io_res[0]
-#define lp1 io_res[1]
-#define lp2 io_res[2]
-
-#define dump_cpu_info() do { } while (0)
-
-static void __init setup_processor(void)
-{
-        extern struct proc_info_list __proc_info_begin, __proc_info_end;
-        struct proc_info_list *list;
-
-        /*
-         * locate processor in the list of supported processor
-         * types.  The linker builds this table for us from the
-         * entries in arch/arm26/mm/proc-*.S
-         */
-        for (list = &__proc_info_begin; list < &__proc_info_end ; list++)
-                if ((processor_id & list->cpu_mask) == list->cpu_val)
-                        break;
-
-        /*
-         * If processor type is unrecognised, then we
-         * can do nothing...
-         */
-        if (list >= &__proc_info_end) {
-                printk("CPU configuration botched (ID %08x), unable "
-                       "to continue.\n", processor_id);
-                while (1);
-        }
-
-        proc_info = *list->info;
-        processor = *list->proc;
-
-
-        printk("CPU: %s %s revision %d\n",
-               proc_info.manufacturer, proc_info.cpu_name,
-               (int)processor_id & 15);
-
-        dump_cpu_info();
-
-        sprintf(init_utsname()->machine, "%s", list->arch_name);
-        sprintf(elf_platform, "%s", list->elf_name);
-        elf_hwcap = list->elf_hwcap;
-
-        cpu_proc_init();
-}
-
-/*
- * Initial parsing of the command line.  We need to pick out the
- * memory size.  We look for mem=size@start, where start and size
- * are "size[KkMm]"
- */
-static void __init
-parse_cmdline(struct meminfo *mi, char **cmdline_p, char *from)
-{
-        char c = ' ', *to = command_line;
-        int usermem = 0, len = 0;
-
-        for (;;) {
-                if (c == ' ' && !memcmp(from, "mem=", 4)) {
-                        unsigned long size, start;
-
-                        if (to != command_line)
-                                to -= 1;
-
-                        /*
-                         * If the user specifies memory size, we
-                         * blow away any automatically generated
-                         * size.
-                         */
-                        if (usermem == 0) {
-                                usermem = 1;
-                                mi->nr_banks = 0;
-                        }
-
-                        start = PHYS_OFFSET;
-                        size  = memparse(from + 4, &from);
-                        if (*from == '@')
-                                start = memparse(from + 1, &from);
-
-                        mi->bank[mi->nr_banks].start = start;
-                        mi->bank[mi->nr_banks].size  = size;
-                        mi->bank[mi->nr_banks].node  = PHYS_TO_NID(start);
-                        mi->nr_banks += 1;
-                }
-                c = *from++;
-                if (!c)
-                        break;
-                if (COMMAND_LINE_SIZE <= ++len)
-                        break;
-                *to++ = c;
-        }
-        *to = '\0';
-        *cmdline_p = command_line;
-}
-
-static void __init
-setup_ramdisk(int doload, int prompt, int image_start, unsigned int rd_sz)
-{
-#ifdef CONFIG_BLK_DEV_RAM
-        extern int rd_size, rd_image_start, rd_prompt, rd_doload;
-
-        rd_image_start = image_start;
-        rd_prompt = prompt;
-        rd_doload = doload;
-
-        if (rd_sz)
-                rd_size = rd_sz;
-#endif
-}
-
-static void __init
-request_standard_resources(struct meminfo *mi)
-{
-        struct resource *res;
-        int i;
-
-        kernel_code.start  = init_mm.start_code;
-        kernel_code.end    = init_mm.end_code - 1;
-#ifdef CONFIG_XIP_KERNEL
-        kernel_data.start  = init_mm.start_data;
-#else
-        kernel_data.start  = init_mm.end_code;
-#endif
-        kernel_data.end    = init_mm.brk - 1;
-
-        for (i = 0; i < mi->nr_banks; i++) {
-                unsigned long virt_start, virt_end;
-
-                if (mi->bank[i].size == 0)
-                        continue;
-
-                virt_start = mi->bank[i].start;
-                virt_end   = virt_start + mi->bank[i].size - 1;
-
-                res = alloc_bootmem_low(sizeof(*res));
-                res->name  = "System RAM";
-                res->start = virt_start;
-                res->end   = virt_end;
-                res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
-
-                request_resource(&iomem_resource, res);
-
-                if (kernel_code.start >= res->start &&
-                    kernel_code.end <= res->end)
-                        request_resource(res, &kernel_code);
-                if (kernel_data.start >= res->start &&
-                    kernel_data.end <= res->end)
-                        request_resource(res, &kernel_data);
-        }
-
-/*      FIXME - needed? if (mdesc->video_start) {
-                video_ram.start = mdesc->video_start;
-                video_ram.end   = mdesc->video_end;
-                request_resource(&iomem_resource, &video_ram);
-        }*/
-
-        /*
-         * Some machines don't have the possibility of ever
-         * possessing lp1 or lp2
-         */
-        if (0)  /* FIXME - need to do this for A5k at least */
-                request_resource(&ioport_resource, &lp0);
-}
-
-/*
- *  Tag parsing.
- *
- * This is the new way of passing data to the kernel at boot time.  Rather
- * than passing a fixed inflexible structure to the kernel, we pass a list
- * of variable-sized tags to the kernel.  The first tag must be a ATAG_CORE
- * tag for the list to be recognised (to distinguish the tagged list from
- * a param_struct).  The list is terminated with a zero-length tag (this tag
- * is not parsed in any way).
- */
-static int __init parse_tag_core(const struct tag *tag)
-{
-        if (tag->hdr.size > 2) {
-                if ((tag->u.core.flags & 1) == 0)
-                        root_mountflags &= ~MS_RDONLY;
-                ROOT_DEV = old_decode_dev(tag->u.core.rootdev);
-        }
-        return 0;
-}
-
-__tagtable(ATAG_CORE, parse_tag_core);
-
-static int __init parse_tag_mem32(const struct tag *tag)
-{
-        if (meminfo.nr_banks >= NR_BANKS) {
-                printk(KERN_WARNING
-                       "Ignoring memory bank 0x%08x size %dKB\n",
-                        tag->u.mem.start, tag->u.mem.size / 1024);
-                return -EINVAL;
-        }
-        meminfo.bank[meminfo.nr_banks].start = tag->u.mem.start;
-        meminfo.bank[meminfo.nr_banks].size  = tag->u.mem.size;
-        meminfo.bank[meminfo.nr_banks].node  = PHYS_TO_NID(tag->u.mem.start);
-        meminfo.nr_banks += 1;
-
-        return 0;
-}
-
-__tagtable(ATAG_MEM, parse_tag_mem32);
-
-#if defined(CONFIG_DUMMY_CONSOLE)
-struct screen_info screen_info = {
- .orig_video_lines      = 30,
- .orig_video_cols       = 80,
- .orig_video_mode       = 0,
- .orig_video_ega_bx     = 0,
- .orig_video_isVGA      = 1,
- .orig_video_points     = 8
-};
-
-static int __init parse_tag_videotext(const struct tag *tag)
-{
-        screen_info.orig_x            = tag->u.videotext.x;
-        screen_info.orig_y            = tag->u.videotext.y;
-        screen_info.orig_video_page   = tag->u.videotext.video_page;
-        screen_info.orig_video_mode   = tag->u.videotext.video_mode;
-        screen_info.orig_video_cols   = tag->u.videotext.video_cols;
-        screen_info.orig_video_ega_bx = tag->u.videotext.video_ega_bx;
-        screen_info.orig_video_lines  = tag->u.videotext.video_lines;
-        screen_info.orig_video_isVGA  = tag->u.videotext.video_isvga;
-        screen_info.orig_video_points = tag->u.videotext.video_points;
-        return 0;
-}
-
-__tagtable(ATAG_VIDEOTEXT, parse_tag_videotext);
-#endif
-
-static int __init parse_tag_acorn(const struct tag *tag)
-{
-        memc_ctrl_reg = tag->u.acorn.memc_control_reg;
-        number_mfm_drives = tag->u.acorn.adfsdrives;
-        return 0;
-}
-
-__tagtable(ATAG_ACORN, parse_tag_acorn);
-
-static int __init parse_tag_ramdisk(const struct tag *tag)
-{
-        setup_ramdisk((tag->u.ramdisk.flags & 1) == 0,
-                      (tag->u.ramdisk.flags & 2) == 0,
-                      tag->u.ramdisk.start, tag->u.ramdisk.size);
-        return 0;
-}
-
-__tagtable(ATAG_RAMDISK, parse_tag_ramdisk);
-
-static int __init parse_tag_initrd(const struct tag *tag)
-{
-        printk(KERN_WARNING "ATAG_INITRD is deprecated; please update your bootloader. \n");
-        phys_initrd_start = (unsigned long)tag->u.initrd.start;
-        phys_initrd_size = (unsigned long)tag->u.initrd.size;
-        return 0;
-}
-
-__tagtable(ATAG_INITRD, parse_tag_initrd);
-
-static int __init parse_tag_initrd2(const struct tag *tag)
-{
-        printk(KERN_WARNING "ATAG_INITRD is deprecated; please update your bootloader. \n");
-        phys_initrd_start = (unsigned long)tag->u.initrd.start;
-        phys_initrd_size = (unsigned long)tag->u.initrd.size;
-        return 0;
-}
-
-__tagtable(ATAG_INITRD2, parse_tag_initrd2);
-
-static int __init parse_tag_serialnr(const struct tag *tag)
-{
-        system_serial_low = tag->u.serialnr.low;
-        system_serial_high = tag->u.serialnr.high;
-        return 0;
-}
-
-__tagtable(ATAG_SERIAL, parse_tag_serialnr);
-
-static int __init parse_tag_revision(const struct tag *tag)
-{
-        system_rev = tag->u.revision.rev;
-        return 0;
-}
-
-__tagtable(ATAG_REVISION, parse_tag_revision);
-
-static int __init parse_tag_cmdline(const struct tag *tag)
-{
-        strncpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
-        default_command_line[COMMAND_LINE_SIZE - 1] = '\0';
-        return 0;
-}
-
-__tagtable(ATAG_CMDLINE, parse_tag_cmdline);
-
-/*
- * Scan the tag table for this tag, and call its parse function.
- * The tag table is built by the linker from all the __tagtable
- * declarations.
- */
-static int __init parse_tag(const struct tag *tag)
-{
-        extern struct tagtable __tagtable_begin, __tagtable_end;
-        struct tagtable *t;
-
-        for (t = &__tagtable_begin; t < &__tagtable_end; t++)
-                if (tag->hdr.tag == t->tag) {
-                        t->parse(tag);
-                        break;
-                }
-
-        return t < &__tagtable_end;
-}
-
-/*
- * Parse all tags in the list, checking both the global and architecture
- * specific tag tables.
- */
-static void __init parse_tags(const struct tag *t)
-{
-        for (; t->hdr.size; t = tag_next(t))
-                if (!parse_tag(t))
-                        printk(KERN_WARNING
-                                "Ignoring unrecognised tag 0x%08x\n",
-                                t->hdr.tag);
-}
-
-/*
- * This holds our defaults.
- */
-static struct init_tags {
-        struct tag_header hdr1;
-        struct tag_core   core;
-        struct tag_header hdr2;
-        struct tag_mem32  mem;
-        struct tag_header hdr3;
-} init_tags __initdata = {
-        { tag_size(tag_core), ATAG_CORE },
-        { 1, PAGE_SIZE, 0xff },
-        { tag_size(tag_mem32), ATAG_MEM },
-        { MEM_SIZE, PHYS_OFFSET },
-        { 0, ATAG_NONE }
-};
-
-void __init setup_arch(char **cmdline_p)
-{
-        struct tag *tags = (struct tag *)&init_tags;
-        char *from = default_command_line;
-
-        setup_processor();
-        if(machine_arch_type == MACH_TYPE_A5K)
-                machine_name = "A5000";
-        else if(machine_arch_type == MACH_TYPE_ARCHIMEDES)
-                machine_name = "Archimedes";
-        else
-                machine_name = "UNKNOWN";
-
-        //FIXME - the tag struct is always copied here but this is a block
-        // of RAM that is accidentally reserved along with video RAM. perhaps
-        // it would be a good idea to explicitly reserve this?
-
-        tags = (struct tag *)0x0207c000;
-
-        /*
-         * If we have the old style parameters, convert them to
-         * a tag list.
-         */
-        if (tags->hdr.tag != ATAG_CORE)
-                convert_to_tag_list(tags);
-        if (tags->hdr.tag != ATAG_CORE)
-                tags = (struct tag *)&init_tags;
-        if (tags->hdr.tag == ATAG_CORE) {
-                if (meminfo.nr_banks != 0)
-                        squash_mem_tags(tags);
-                parse_tags(tags);
-        }
-
-        init_mm.start_code = (unsigned long) &_text;
-#ifndef CONFIG_XIP_KERNEL
-        init_mm.end_code   = (unsigned long) &_etext;
-#else
-        init_mm.end_code   = (unsigned long) &_endtext;
-        init_mm.start_data   = (unsigned long) &_sdata;
-#endif
-        init_mm.end_data   = (unsigned long) &_edata;
-        init_mm.brk        = (unsigned long) &_end;
-
-        memcpy(boot_command_line, from, COMMAND_LINE_SIZE);
-        boot_command_line[COMMAND_LINE_SIZE-1] = '\0';
-        parse_cmdline(&meminfo, cmdline_p, from);
-        bootmem_init(&meminfo);
-        paging_init(&meminfo);
-        request_standard_resources(&meminfo);
-
-#ifdef CONFIG_VT
-#if defined(CONFIG_DUMMY_CONSOLE)
-        conswitchp = &dummy_con;
-#endif
-#endif
-}
-
-static const char *hwcap_str[] = {
-        "swp",
-        "half",
-        "thumb",
-        "26bit",
-        "fastmult",
-        "fpa",
-        "vfp",
-        "edsp",
-        NULL
-};
-
-static int c_show(struct seq_file *m, void *v)
-{
-        int i;
-
-        seq_printf(m, "Processor\t: %s %s rev %d (%s)\n",
-                   proc_info.manufacturer, proc_info.cpu_name,
-                   (int)processor_id & 15, elf_platform);
-
-        seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
-                   loops_per_jiffy / (500000/HZ),
-                   (loops_per_jiffy / (5000/HZ)) % 100);
-
-        /* dump out the processor features */
-        seq_puts(m, "Features\t: ");
-
-        for (i = 0; hwcap_str[i]; i++)
-                if (elf_hwcap & (1 << i))
-                        seq_printf(m, "%s ", hwcap_str[i]);
-
-        seq_puts(m, "\n");
-
-        seq_printf(m, "CPU part\t\t: %07x\n", processor_id >> 4);
-        seq_printf(m, "CPU revision\t: %d\n\n", processor_id & 15);
-        seq_printf(m, "Hardware\t: %s\n", machine_name);
-        seq_printf(m, "Revision\t: %04x\n", system_rev);
-        seq_printf(m, "Serial\t\t: %08x%08x\n",
-                   system_serial_high, system_serial_low);
-
-        return 0;
-}
-
-static void *c_start(struct seq_file *m, loff_t *pos)
-{
-        return *pos < 1 ? (void *)1 : NULL;
-}
-
-static void *c_next(struct seq_file *m, void *v, loff_t *pos)
-{
-        ++*pos;
-        return NULL;
-}
-
-static void c_stop(struct seq_file *m, void *v)
-{
-}
-
-struct seq_operations cpuinfo_op = {
-        .start  = c_start,
-        .next   = c_next,
-        .stop   = c_stop,
-        .show   = c_show
-};
diff --git a/arch/arm26/kernel/signal.c b/arch/arm26/kernel/signal.c
deleted file mode 100644
index 379b82dc645f..000000000000
--- a/arch/arm26/kernel/signal.c
+++ /dev/null
@@ -1,538 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/signal.c
- *
- *  Copyright (C) 1995-2002 Russell King
- *  Copyright (C) 2003 Ian Molton (ARM26)
- *
- * FIXME!!! This is probably very broken (13/05/2003)
- *
- * 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/sched.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/wait.h>
-#include <linux/ptrace.h>
-#include <linux/personality.h>
-#include <linux/tty.h>
-#include <linux/binfmts.h>
-#include <linux/elf.h>
-
-#include <asm/pgalloc.h>
-#include <asm/ucontext.h>
-#include <asm/uaccess.h>
-#include <asm/unistd.h>
-
-#include "ptrace.h"
-
-#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
-
-/*
- * For ARM syscalls, we encode the syscall number into the instruction.
- */
-#define SWI_SYS_SIGRETURN       (0xef000000|(__NR_sigreturn))
-#define SWI_SYS_RT_SIGRETURN    (0xef000000|(__NR_rt_sigreturn))
-
-static int do_signal(sigset_t *oldset, struct pt_regs * regs, int syscall);
-
-/*
- * atomically swap in the new signal mask, and wait for a signal.
- */
-asmlinkage int sys_sigsuspend(int restart, unsigned long oldmask, old_sigset_t mask, struct pt_regs *regs)
-{
-        sigset_t saveset;
-
-        mask &= _BLOCKABLE;
-        spin_lock_irq(&current->sighand->siglock);
-        saveset = current->blocked;
-        siginitset(&current->blocked, mask);
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
-        regs->ARM_r0 = -EINTR;
-
-        while (1) {
-                current->state = TASK_INTERRUPTIBLE;
-                schedule();
-                if (do_signal(&saveset, regs, 0))
-                        return regs->ARM_r0;
-        }
-}
-
-asmlinkage int
-sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize, struct pt_regs *regs)
-{
-        sigset_t saveset, newset;
-
-        /* XXX: Don't preclude handling different sized sigset_t's. */
-        if (sigsetsize != sizeof(sigset_t))
-                return -EINVAL;
-
-        if (copy_from_user(&newset, unewset, sizeof(newset)))
-                return -EFAULT;
-        sigdelsetmask(&newset, ~_BLOCKABLE);
-
-        spin_lock_irq(&current->sighand->siglock);
-        saveset = current->blocked;
-        current->blocked = newset;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
-        regs->ARM_r0 = -EINTR;
-
-        while (1) {
-                current->state = TASK_INTERRUPTIBLE;
-                schedule();
-                if (do_signal(&saveset, regs, 0))
-                        return regs->ARM_r0;
-        }
-}
-
-asmlinkage int 
-sys_sigaction(int sig, const struct old_sigaction *act,
-              struct old_sigaction *oact)
-{
-        struct k_sigaction new_ka, old_ka;
-        int ret;
-
-        if (act) {
-                old_sigset_t mask;
-                if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||
-                    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
-                    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
-                        return -EFAULT;
-                __get_user(new_ka.sa.sa_flags, &act->sa_flags);
-                __get_user(mask, &act->sa_mask);
-                siginitset(&new_ka.sa.sa_mask, mask);
-        }
-
-        ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
-
-        if (!ret && oact) {
-                if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
-                    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
-                    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
-                        return -EFAULT;
-                __put_user(old_ka.sa.sa_flags, &oact->sa_flags);
-                __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
-        }
-
-        return ret;
-}
-
-/*
- * Do a signal return; undo the signal stack.
- */
-struct sigframe
-{
-        struct sigcontext sc;
-        unsigned long extramask[_NSIG_WORDS-1];
-        unsigned long retcode;
-};
-
-struct rt_sigframe
-{
-        struct siginfo *pinfo;
-        void *puc;
-        struct siginfo info;
-        struct ucontext uc;
-        unsigned long retcode;
-};
-
-static int
-restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc)
-{
-        int err = 0;
-
-        __get_user_error(regs->ARM_r0, &sc->arm_r0, err);
-        __get_user_error(regs->ARM_r1, &sc->arm_r1, err);
-        __get_user_error(regs->ARM_r2, &sc->arm_r2, err);
-        __get_user_error(regs->ARM_r3, &sc->arm_r3, err);
-        __get_user_error(regs->ARM_r4, &sc->arm_r4, err);
-        __get_user_error(regs->ARM_r5, &sc->arm_r5, err);
-        __get_user_error(regs->ARM_r6, &sc->arm_r6, err);
-        __get_user_error(regs->ARM_r7, &sc->arm_r7, err);
-        __get_user_error(regs->ARM_r8, &sc->arm_r8, err);
-        __get_user_error(regs->ARM_r9, &sc->arm_r9, err);
-        __get_user_error(regs->ARM_r10, &sc->arm_r10, err);
-        __get_user_error(regs->ARM_fp, &sc->arm_fp, err);
-        __get_user_error(regs->ARM_ip, &sc->arm_ip, err);
-        __get_user_error(regs->ARM_sp, &sc->arm_sp, err);
-        __get_user_error(regs->ARM_lr, &sc->arm_lr, err);
-        __get_user_error(regs->ARM_pc, &sc->arm_pc, err);
-
-        err |= !valid_user_regs(regs);
-
-        return err;
-}
-
-asmlinkage int sys_sigreturn(struct pt_regs *regs)
-{
-        struct sigframe *frame;
-        sigset_t set;
-
-        /*
-         * Since we stacked the signal on a 64-bit boundary,
-         * then 'sp' should be word aligned here.  If it's
-         * not, then the user is trying to mess with us.
-         */
-        if (regs->ARM_sp & 7)
-                goto badframe;
-
-        frame = (struct sigframe *)regs->ARM_sp;
-
-        if (!access_ok(VERIFY_READ, frame, sizeof (*frame)))
-                goto badframe;
-        if (__get_user(set.sig[0], &frame->sc.oldmask)
-            || (_NSIG_WORDS > 1
-                && __copy_from_user(&set.sig[1], &frame->extramask,
-                                    sizeof(frame->extramask))))
-                goto badframe;
-
-        sigdelsetmask(&set, ~_BLOCKABLE);
-        spin_lock_irq(&current->sighand->siglock);
-        current->blocked = set;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
-
-        if (restore_sigcontext(regs, &frame->sc))
-                goto badframe;
-
-        /* Send SIGTRAP if we're single-stepping */
-        if (current->ptrace & PT_SINGLESTEP) {
-                ptrace_cancel_bpt(current);
-                send_sig(SIGTRAP, current, 1);
-        }
-
-        return regs->ARM_r0;
-
-badframe:
-        force_sig(SIGSEGV, current);
-        return 0;
-}
-
-asmlinkage int sys_rt_sigreturn(struct pt_regs *regs)
-{
-        struct rt_sigframe *frame;
-        sigset_t set;
-
-        /*
-         * Since we stacked the signal on a 64-bit boundary,
-         * then 'sp' should be word aligned here.  If it's
-         * not, then the user is trying to mess with us.
-         */
-        if (regs->ARM_sp & 7)
-                goto badframe;
-
-        frame = (struct rt_sigframe *)regs->ARM_sp;
-
-        if (!access_ok(VERIFY_READ, frame, sizeof (*frame)))
-                goto badframe;
-        if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
-                goto badframe;
-
-        sigdelsetmask(&set, ~_BLOCKABLE);
-        spin_lock_irq(&current->sighand->siglock);
-        current->blocked = set;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
-
-        if (restore_sigcontext(regs, &frame->uc.uc_mcontext))
-                goto badframe;
-
-        /* Send SIGTRAP if we're single-stepping */
-        if (current->ptrace & PT_SINGLESTEP) {
-                ptrace_cancel_bpt(current);
-                send_sig(SIGTRAP, current, 1);
-        }
-
-        return regs->ARM_r0;
-
-badframe:
-        force_sig(SIGSEGV, current);
-        return 0;
-}
-
-static int
-setup_sigcontext(struct sigcontext *sc, /*struct _fpstate *fpstate,*/
-                 struct pt_regs *regs, unsigned long mask)
-{
-        int err = 0;
-
-        __put_user_error(regs->ARM_r0, &sc->arm_r0, err);
-        __put_user_error(regs->ARM_r1, &sc->arm_r1, err);
-        __put_user_error(regs->ARM_r2, &sc->arm_r2, err);
-        __put_user_error(regs->ARM_r3, &sc->arm_r3, err);
-        __put_user_error(regs->ARM_r4, &sc->arm_r4, err);
-        __put_user_error(regs->ARM_r5, &sc->arm_r5, err);
-        __put_user_error(regs->ARM_r6, &sc->arm_r6, err);
-        __put_user_error(regs->ARM_r7, &sc->arm_r7, err);
-        __put_user_error(regs->ARM_r8, &sc->arm_r8, err);
-        __put_user_error(regs->ARM_r9, &sc->arm_r9, err);
-        __put_user_error(regs->ARM_r10, &sc->arm_r10, err);
-        __put_user_error(regs->ARM_fp, &sc->arm_fp, err);
-        __put_user_error(regs->ARM_ip, &sc->arm_ip, err);
-        __put_user_error(regs->ARM_sp, &sc->arm_sp, err);
-        __put_user_error(regs->ARM_lr, &sc->arm_lr, err);
-        __put_user_error(regs->ARM_pc, &sc->arm_pc, err);
-
-        __put_user_error(current->thread.trap_no, &sc->trap_no, err);
-        __put_user_error(current->thread.error_code, &sc->error_code, err);
-        __put_user_error(current->thread.address, &sc->fault_address, err);
-        __put_user_error(mask, &sc->oldmask, err);
-
-        return err;
-}
-
-static inline void *
-get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, int framesize)
-{
-        unsigned long sp = regs->ARM_sp;
-
-        /*
-         * This is the X/Open sanctioned signal stack switching.
-         */
-        if ((ka->sa.sa_flags & SA_ONSTACK) && !sas_ss_flags(sp))
-                sp = current->sas_ss_sp + current->sas_ss_size;
-
-        /*
-         * ATPCS B01 mandates 8-byte alignment
-         */
-        return (void *)((sp - framesize) & ~7);
-}
-
-static int
-setup_return(struct pt_regs *regs, struct k_sigaction *ka,
-             unsigned long *rc, void *frame, int usig)
-{
-        unsigned long handler = (unsigned long)ka->sa.sa_handler;
-        unsigned long retcode;
-
-        if (ka->sa.sa_flags & SA_RESTORER) {
-                retcode = (unsigned long)ka->sa.sa_restorer;
-        } else {
-
-                if (__put_user((ka->sa.sa_flags & SA_SIGINFO)?SWI_SYS_RT_SIGRETURN:SWI_SYS_SIGRETURN, rc))
-                        return 1;
-
-                retcode = ((unsigned long)rc);
-        }
-
-        regs->ARM_r0 = usig;
-        regs->ARM_sp = (unsigned long)frame;
-        regs->ARM_lr = retcode;
-        regs->ARM_pc = handler & ~3;
-
-        return 0;
-}
-
-static int
-setup_frame(int usig, struct k_sigaction *ka, sigset_t *set, struct pt_regs *regs)
-{
-        struct sigframe *frame = get_sigframe(ka, regs, sizeof(*frame));
-        int err = 0;
-
-        if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame)))
-                return 1;
-
-        err |= setup_sigcontext(&frame->sc, /*&frame->fpstate,*/ regs, set->sig[0]);
-
-        if (_NSIG_WORDS > 1) {
-                err |= __copy_to_user(frame->extramask, &set->sig[1],
-                                      sizeof(frame->extramask));
-        }
-
-        if (err == 0)
-                err = setup_return(regs, ka, &frame->retcode, frame, usig);
-
-        return err;
-}
-
-static int
-setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
-               sigset_t *set, struct pt_regs *regs)
-{
-        struct rt_sigframe *frame = get_sigframe(ka, regs, sizeof(*frame));
-        int err = 0;
-
-        if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame)))
-                return 1;
-
-        __put_user_error(&frame->info, &frame->pinfo, err);
-        __put_user_error(&frame->uc, &frame->puc, err);
-        err |= copy_siginfo_to_user(&frame->info, info);
-
-        /* Clear all the bits of the ucontext we don't use.  */
-        err |= __clear_user(&frame->uc, offsetof(struct ucontext, uc_mcontext));
-
-        err |= setup_sigcontext(&frame->uc.uc_mcontext, /*&frame->fpstate,*/
-                                regs, set->sig[0]);
-        err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
-
-        if (err == 0)
-                err = setup_return(regs, ka, &frame->retcode, frame, usig);
-
-        if (err == 0) {
-                /*
-                 * For realtime signals we must also set the second and third
-                 * arguments for the signal handler.
-                 *   -- Peter Maydell <pmaydell@chiark.greenend.org.uk> 2000-12-06
-                 */
-                regs->ARM_r1 = (unsigned long)frame->pinfo;
-                regs->ARM_r2 = (unsigned long)frame->puc;
-        }
-
-        return err;
-}
-
-static inline void restart_syscall(struct pt_regs *regs)
-{
-        regs->ARM_r0 = regs->ARM_ORIG_r0;
-        regs->ARM_pc -= 4;
-}
-
-/*
- * OK, we're invoking a handler
- */     
-static void
-handle_signal(unsigned long sig, siginfo_t *info, sigset_t *oldset,
-              struct pt_regs * regs, int syscall)
-{
-        struct thread_info *thread = current_thread_info();
-        struct task_struct *tsk = current;
-        struct k_sigaction *ka = &tsk->sighand->action[sig-1];
-        int usig = sig;
-        int ret;
-
-        /*
-         * If we were from a system call, check for system call restarting...
-         */
-        if (syscall) {
-                switch (regs->ARM_r0) {
-                case -ERESTART_RESTARTBLOCK:
-                        current_thread_info()->restart_block.fn =
-                                do_no_restart_syscall;
-                case -ERESTARTNOHAND:
-                        regs->ARM_r0 = -EINTR;
-                        break;
-                case -ERESTARTSYS:
-                        if (!(ka->sa.sa_flags & SA_RESTART)) {
-                                regs->ARM_r0 = -EINTR;
-                                break;
-                        }
-                        /* fallthrough */
-                case -ERESTARTNOINTR:
-                        restart_syscall(regs);
-                }
-        }
-
-        /*
-         * translate the signal
-         */
-        if (usig < 32 && thread->exec_domain && thread->exec_domain->signal_invmap)
-                usig = thread->exec_domain->signal_invmap[usig];
-
-        /*
-         * Set up the stack frame
-         */
-        if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = setup_rt_frame(usig, ka, info, oldset, regs);
-        else
-                ret = setup_frame(usig, ka, oldset, regs);
-
-        /*
-         * Check that the resulting registers are actually sane.
-         */
-        ret |= !valid_user_regs(regs);
-
-        if (ret == 0) {
-                if (ka->sa.sa_flags & SA_ONESHOT)
-                        ka->sa.sa_handler = SIG_DFL;
-
-                spin_lock_irq(&tsk->sighand->siglock);
-                sigorsets(&tsk->blocked, &tsk->blocked,
-                          &ka->sa.sa_mask);
-                if (!(ka->sa.sa_flags & SA_NODEFER))
-                        sigaddset(&tsk->blocked, sig);
-                recalc_sigpending();
-                spin_unlock_irq(&tsk->sighand->siglock);
-                return;
-        }
-
-        force_sigsegv(sig, tsk);
-}
-
-/*
- * Note that 'init' is a special process: it doesn't get signals it doesn't
- * want to handle. Thus you cannot kill init even with a SIGKILL even by
- * mistake.
- *
- * Note that we go through the signals twice: once to check the signals that
- * the kernel can handle, and then we build all the user-level signal handling
- * stack-frames in one go after that.
- */
-static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall)
-{
-        siginfo_t info;
-        int signr;
-        struct k_sigaction ka;
-
-        /*
-         * We want the common case to go fast, which
-         * is why we may in certain cases get here from
-         * kernel mode. Just return without doing anything
-         * if so.
-         */
-        if (!user_mode(regs))
-                return 0;
-
-        if (current->ptrace & PT_SINGLESTEP)
-                ptrace_cancel_bpt(current);
-        
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
-                handle_signal(signr, &info, oldset, regs, syscall);
-                if (current->ptrace & PT_SINGLESTEP)
-                        ptrace_set_bpt(current);
-                return 1;
-        }
-
-        /*
-         * No signal to deliver to the process - restart the syscall.
-         */
-        if (syscall) {
-                if (regs->ARM_r0 == -ERESTART_RESTARTBLOCK) {
-                        u32 *usp;
-
-                        regs->ARM_sp -= 12;
-                        usp = (u32 *)regs->ARM_sp;
-
-                        put_user(regs->ARM_pc, &usp[0]);
-                        /* swi __NR_restart_syscall */
-                        put_user(0xef000000 | __NR_restart_syscall, &usp[1]);
-                        /* ldr  pc, [sp], #12 */
-// FIXME!!! is #12 correct there?
-                        put_user(0xe49df00c, &usp[2]);
-
-                        regs->ARM_pc = regs->ARM_sp + 4;
-                }
-                if (regs->ARM_r0 == -ERESTARTNOHAND ||
-                    regs->ARM_r0 == -ERESTARTSYS ||
-                    regs->ARM_r0 == -ERESTARTNOINTR) {
-                        restart_syscall(regs);
-                }
-        }
-        if (current->ptrace & PT_SINGLESTEP)
-                ptrace_set_bpt(current);
-        return 0;
-}
-
-asmlinkage void
-do_notify_resume(struct pt_regs *regs, unsigned int thread_flags, int syscall)
-{
-        if (thread_flags & _TIF_SIGPENDING)
-                do_signal(&current->blocked, regs, syscall);
-}
diff --git a/arch/arm26/kernel/sys_arm.c b/arch/arm26/kernel/sys_arm.c
deleted file mode 100644
index dc05aba58baf..000000000000
--- a/arch/arm26/kernel/sys_arm.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/sys_arm.c
- *
- *  Copyright (C) People who wrote linux/arch/i386/kernel/sys_i386.c
- *  Copyright (C) 1995, 1996 Russell King.
- *  Copyright (C) 2003 Ian Molton.
- *
- * 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 file contains various random system calls that
- *  have a non-standard calling sequence on the Linux/arm
- *  platform.
- */
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/mm.h>
-#include <linux/sem.h>
-#include <linux/msg.h>
-#include <linux/shm.h>
-#include <linux/stat.h>
-#include <linux/syscalls.h>
-#include <linux/mman.h>
-#include <linux/fs.h>
-#include <linux/file.h>
-#include <linux/utsname.h>
-
-#include <asm/uaccess.h>
-#include <asm/ipc.h>
-
-extern unsigned long do_mremap(unsigned long addr, unsigned long old_len,
-                               unsigned long new_len, unsigned long flags,
-                               unsigned long new_addr);
-
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way unix traditionally does this, though.
- */
-asmlinkage int sys_pipe(unsigned long * fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
-/* common code for old and new mmaps */
-inline long do_mmap2(
-        unsigned long addr, unsigned long len,
-        unsigned long prot, unsigned long flags,
-        unsigned long fd, unsigned long pgoff)
-{
-        int error = -EINVAL;
-        struct file * file = NULL;
-
-        flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-
-        /*
-         * If we are doing a fixed mapping, and address < FIRST_USER_ADDRESS,
-         * then deny it.
-         */
-        if (flags & MAP_FIXED && addr < FIRST_USER_ADDRESS)
-                goto out;
-
-        error = -EBADF;
-        if (!(flags & MAP_ANONYMOUS)) {
-                file = fget(fd);
-                if (!file)
-                        goto out;
-        }
-
-        down_write(&current->mm->mmap_sem);
-        error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-        up_write(&current->mm->mmap_sem);
-
-        if (file)
-                fput(file);
-out:
-        return error;
-}
-
-struct mmap_arg_struct {
-        unsigned long addr;
-        unsigned long len;
-        unsigned long prot;
-        unsigned long flags;
-        unsigned long fd;
-        unsigned long offset;
-};
-
-asmlinkage int old_mmap(struct mmap_arg_struct *arg)
-{
-        int error = -EFAULT;
-        struct mmap_arg_struct a;
-
-        if (copy_from_user(&a, arg, sizeof(a)))
-                goto out;
-
-        error = -EINVAL;
-        if (a.offset & ~PAGE_MASK)
-                goto out;
-
-        error = do_mmap2(a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT);
-out:
-        return error;
-}
-
-asmlinkage unsigned long
-sys_arm_mremap(unsigned long addr, unsigned long old_len,
-               unsigned long new_len, unsigned long flags,
-               unsigned long new_addr)
-{
-        unsigned long ret = -EINVAL;
-
-        /*
-         * If we are doing a fixed mapping, and address < FIRST_USER_ADDRESS,
-         * then deny it.
-         */
-        if (flags & MREMAP_FIXED && new_addr < FIRST_USER_ADDRESS)
-                goto out;
-
-        down_write(&current->mm->mmap_sem);
-        ret = do_mremap(addr, old_len, new_len, flags, new_addr);
-        up_write(&current->mm->mmap_sem);
-
-out:
-        return ret;
-}
-
-/*
- * Perform the select(nd, in, out, ex, tv) and mmap() system
- * calls.
- */
-
-struct sel_arg_struct {
-        unsigned long n;
-        fd_set *inp, *outp, *exp;
-        struct timeval *tvp;
-};
-
-asmlinkage int old_select(struct sel_arg_struct *arg)
-{
-        struct sel_arg_struct a;
-
-        if (copy_from_user(&a, arg, sizeof(a)))
-                return -EFAULT;
-        /* sys_select() does the appropriate kernel locking */
-        return sys_select(a.n, a.inp, a.outp, a.exp, a.tvp);
-}
-
-/*
- * sys_ipc() is the de-multiplexer for the SysV IPC calls..
- *
- * This is really horribly ugly.
- */
-asmlinkage int sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth)
-{
-        int version, ret;
-
-        version = call >> 16; /* hack for backward compatibility */
-        call &= 0xffff;
-
-        switch (call) {
-        case SEMOP:
-                return sys_semop (first, (struct sembuf *)ptr, second);
-        case SEMGET:
-                return sys_semget (first, second, third);
-        case SEMCTL: {
-                union semun fourth;
-                if (!ptr)
-                        return -EINVAL;
-                if (get_user(fourth.__pad, (void **) ptr))
-                        return -EFAULT;
-                return sys_semctl (first, second, third, fourth);
-        }
-
-        case MSGSND:
-                return sys_msgsnd (first, (struct msgbuf *) ptr, 
-                                   second, third);
-        case MSGRCV:
-                switch (version) {
-                case 0: {
-                        struct ipc_kludge tmp;
-                        if (!ptr)
-                                return -EINVAL;
-                        if (copy_from_user(&tmp,(struct ipc_kludge *) ptr,
-                                           sizeof (tmp)))
-                                return -EFAULT;
-                        return sys_msgrcv (first, tmp.msgp, second,
-                                           tmp.msgtyp, third);
-                }
-                default:
-                        return sys_msgrcv (first,
-                                           (struct msgbuf *) ptr,
-                                           second, fifth, third);
-                }
-        case MSGGET:
-                return sys_msgget ((key_t) first, second);
-        case MSGCTL:
-                return sys_msgctl (first, second, (struct msqid_ds *) ptr);
-
-        case SHMAT:
-                switch (version) {
-                default: {
-                        ulong raddr;
-                        ret = do_shmat (first, (char *) ptr, second, &raddr);
-                        if (ret)
-                                return ret;
-                        return put_user (raddr, (ulong *) third);
-                }
-                case 1: /* iBCS2 emulator entry point */
-                        if (!segment_eq(get_fs(), get_ds()))
-                                return -EINVAL;
-                        return do_shmat (first, (char *) ptr,
-                                          second, (ulong *) third);
-                }
-        case SHMDT: 
-                return sys_shmdt ((char *)ptr);
-        case SHMGET:
-                return sys_shmget (first, second, third);
-        case SHMCTL:
-                return sys_shmctl (first, second,
-                                   (struct shmid_ds *) ptr);
-        default:
-                return -EINVAL;
-        }
-}
-
-/* Fork a new task - this creates a new program thread.
- * This is called indirectly via a small wrapper
- */
-asmlinkage int sys_fork(struct pt_regs *regs)
-{
-        return do_fork(SIGCHLD, regs->ARM_sp, regs, 0, NULL, NULL);
-}
-
-/* Clone a task - this clones the calling program thread.
- * This is called indirectly via a small wrapper
- */
-asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, struct pt_regs *regs)
-{
-        /*
-         * We don't support SETTID / CLEARTID  (FIXME!!! (nicked from arm32))
-         */
-        if (clone_flags & (CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID))
-                return -EINVAL;
-        
-        if (!newsp)
-                newsp = regs->ARM_sp;
-
-        return do_fork(clone_flags, newsp, regs, 0, NULL, NULL);
-}
-
-asmlinkage int sys_vfork(struct pt_regs *regs)
-{
-        return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->ARM_sp, regs, 0, NULL, NULL);
-}
-
-/* sys_execve() executes a new program.
- * This is called indirectly via a small wrapper
- */
-asmlinkage int sys_execve(char *filenamei, char **argv, char **envp, struct pt_regs *regs)
-{
-        int error;
-        char * filename;
-
-        filename = getname(filenamei);
-        error = PTR_ERR(filename);
-        if (IS_ERR(filename))
-                goto out;
-        error = do_execve(filename, argv, envp, regs);
-        putname(filename);
-out:
-        return error;
-}
-
-/* FIXME - see if this is correct for arm26 */
-int kernel_execve(const char *filename, char *const argv[], char *const envp[])
-{
-        struct pt_regs regs;
-        int ret;
-         memset(&regs, 0, sizeof(struct pt_regs));
-        ret = do_execve((char *)filename, (char __user * __user *)argv,                         (char __user * __user *)envp, &regs);
-        if (ret < 0)
-                goto out;
-
-        /*
-         * Save argc to the register structure for userspace.
-         */
-        regs.ARM_r0 = ret;
-
-        /*
-         * We were successful.  We won't be returning to our caller, but
-         * instead to user space by manipulating the kernel stack.
-         */
-        asm(    "add    r0, %0, %1\n\t"
-                "mov    r1, %2\n\t"
-                "mov    r2, %3\n\t"
-                "bl     memmove\n\t"    /* copy regs to top of stack */
-                "mov    r8, #0\n\t"     /* not a syscall */
-                "mov    r9, %0\n\t"     /* thread structure */
-                "mov    sp, r0\n\t"     /* reposition stack pointer */
-                "b      ret_to_user"
-                :
-                : "r" (current_thread_info()),
-                  "Ir" (THREAD_SIZE - 8 - sizeof(regs)),
-                  "r" (&regs),
-                  "Ir" (sizeof(regs))
-                : "r0", "r1", "r2", "r3", "ip", "memory");
-
- out:
-        return ret;
-}
-
-EXPORT_SYMBOL(kernel_execve);
diff --git a/arch/arm26/kernel/time.c b/arch/arm26/kernel/time.c
deleted file mode 100644
index 0f1d57fbd3d7..000000000000
--- a/arch/arm26/kernel/time.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/time.c
- *
- *  Copyright (C) 1991, 1992, 1995  Linus Torvalds
- *  Modifications for ARM (C) 1994-2001 Russell King
- *  Mods for ARM26 (C) 2003 Ian Molton
- *
- * 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 file contains the ARM-specific time handling details:
- *  reading the RTC at bootup, etc...
- *
- *  1994-07-02  Alan Modra
- *              fixed set_rtc_mmss, fixed time.year for >= 2000, new mktime
- *  1998-12-20  Updated NTP code according to technical memorandum Jan '96
- *              "A Kernel Model for Precision Timekeeping" by Dave Mills
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/interrupt.h>
-#include <linux/time.h>
-#include <linux/init.h>
-#include <linux/smp.h>
-#include <linux/timex.h>
-#include <linux/errno.h>
-#include <linux/profile.h>
-
-#include <asm/hardware.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/ioc.h>
-
-/* this needs a better home */
-DEFINE_SPINLOCK(rtc_lock);
-
-/* change this if you have some constant time drift */
-#define USECS_PER_JIFFY (1000000/HZ)
-
-static int dummy_set_rtc(void)
-{
-        return 0;
-}
-
-/*
- * hook for setting the RTC's idea of the current time.
- */
-int (*set_rtc)(void) = dummy_set_rtc;
-
-/*
- * Get time offset based on IOCs timer.
- * FIXME - if this is called with interrutps off, why the shennanigans
- * below ?
- */
-static unsigned long gettimeoffset(void)
-{
-        unsigned int count1, count2, status;
-        long offset;
-
-        ioc_writeb (0, IOC_T0LATCH);
-        barrier ();
-        count1 = ioc_readb(IOC_T0CNTL) | (ioc_readb(IOC_T0CNTH) << 8);
-        barrier ();
-        status = ioc_readb(IOC_IRQREQA);
-        barrier ();
-        ioc_writeb (0, IOC_T0LATCH);
-        barrier ();
-        count2 = ioc_readb(IOC_T0CNTL) | (ioc_readb(IOC_T0CNTH) << 8);
-
-        offset = count2;
-        if (count2 < count1) {
-                /*
-                 * We have not had an interrupt between reading count1
-                 * and count2.
-                 */
-                if (status & (1 << 5))
-                        offset -= LATCH;
-        } else if (count2 > count1) {
-                /*
-                 * We have just had another interrupt between reading
-                 * count1 and count2.
-                 */
-                offset -= LATCH;
-        }
-
-        offset = (LATCH - offset) * (tick_nsec / 1000);
-        return (offset + LATCH/2) / LATCH;
-}
-
-static unsigned long next_rtc_update;
-
-/*
- * If we have an externally synchronized linux clock, then update
- * CMOS clock accordingly every ~11 minutes.  set_rtc() has to be
- * called as close as possible to 500 ms before the new second
- * starts.
- */
-static inline void do_set_rtc(void)
-{
-        if (!ntp_synced() || set_rtc == NULL)
-                return;
-
-//FIXME - timespec.tv_sec is a time_t not unsigned long
-        if (next_rtc_update &&
-            time_before((unsigned long)xtime.tv_sec, next_rtc_update))
-                return;
-
-        if (xtime.tv_nsec < 500000000 - ((unsigned) tick_nsec >> 1) &&
-            xtime.tv_nsec >= 500000000 + ((unsigned) tick_nsec >> 1))
-                return;
-
-        if (set_rtc())
-                /*
-                 * rtc update failed.  Try again in 60s
-                 */
-                next_rtc_update = xtime.tv_sec + 60;
-        else
-                next_rtc_update = xtime.tv_sec + 660;
-}
-
-#define do_leds()
-
-void do_gettimeofday(struct timeval *tv)
-{
-        unsigned long flags;
-        unsigned long seq;
-        unsigned long usec, sec;
-
-        do {
-                seq = read_seqbegin_irqsave(&xtime_lock, flags);
-                usec = gettimeoffset();
-                sec = xtime.tv_sec;
-                usec += xtime.tv_nsec / 1000;
-        } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
-
-        /* usec may have gone up a lot: be safe */
-        while (usec >= 1000000) {
-                usec -= 1000000;
-                sec++;
-        }
-
-        tv->tv_sec = sec;
-        tv->tv_usec = usec;
-}
-
-EXPORT_SYMBOL(do_gettimeofday);
-
-int do_settimeofday(struct timespec *tv)
-{
-        if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
-                return -EINVAL;
-
-        write_seqlock_irq(&xtime_lock);
-        /*
-         * This is revolting. We need to set "xtime" correctly. However, the
-         * value in this location is the value at the most recent update of
-         * wall time.  Discover what correction gettimeofday() would have
-         * done, and then undo it!
-         */
-        tv->tv_nsec -= 1000 * gettimeoffset();
-
-        while (tv->tv_nsec < 0) {
-                tv->tv_nsec += NSEC_PER_SEC;
-                tv->tv_sec--;
-        }
-
-        xtime.tv_sec = tv->tv_sec;
-        xtime.tv_nsec = tv->tv_nsec;
-        ntp_clear();
-        write_sequnlock_irq(&xtime_lock);
-        clock_was_set();
-        return 0;
-}
-
-EXPORT_SYMBOL(do_settimeofday);
-
-static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-        do_timer(1);
-#ifndef CONFIG_SMP
-        update_process_times(user_mode(regs));
-#endif
-        do_set_rtc(); //FIME - EVERY timer IRQ?
-        profile_tick(CPU_PROFILING, regs);
-        return IRQ_HANDLED; //FIXME - is this right?
-}
-
-static struct irqaction timer_irq = {
-        .name   = "timer",
-        .flags  = IRQF_DISABLED,
-        .handler = timer_interrupt,
-};
-
-extern void ioctime_init(void);
-
-/*
- * Set up timer interrupt.
- */
-void __init time_init(void)
-{
-        ioc_writeb(LATCH & 255, IOC_T0LTCHL);
-        ioc_writeb(LATCH >> 8, IOC_T0LTCHH);
-        ioc_writeb(0, IOC_T0GO);
-
-
-        setup_irq(IRQ_TIMER, &timer_irq);
-}
-
diff --git a/arch/arm26/kernel/traps.c b/arch/arm26/kernel/traps.c
deleted file mode 100644
index 2911e2eae80e..000000000000
--- a/arch/arm26/kernel/traps.c
+++ /dev/null
@@ -1,548 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/traps.c
- *
- *  Copyright (C) 1995-2002 Russell King
- *  Fragments that appear the same as linux/arch/i386/kernel/traps.c (C) Linus Torvalds
- *  Copyright (C) 2003 Ian Molton (ARM26)
- *
- * 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.
- *
- *  'traps.c' handles hardware exceptions after we have saved some state in
- *  'linux/arch/arm26/lib/traps.S'.  Mostly a debugging aid, but will probably
- *  kill the offending process.
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/spinlock.h>
-#include <linux/personality.h>
-#include <linux/ptrace.h>
-#include <linux/elf.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-
-#include <asm/atomic.h>
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/system.h>
-#include <asm/uaccess.h>
-#include <asm/unistd.h>
-#include <linux/mutex.h>
-
-#include "ptrace.h"
-
-extern void c_backtrace (unsigned long fp, int pmode);
-extern void show_pte(struct mm_struct *mm, unsigned long addr);
-
-const char *processor_modes[] = { "USER_26", "FIQ_26" , "IRQ_26" , "SVC_26" };
-
-static const char *handler[]= { "prefetch abort", "data abort", "address exception", "interrupt" "*bad reason*"};
-
-/*
- * Stack pointers should always be within the kernels view of
- * physical memory.  If it is not there, then we can't dump
- * out any information relating to the stack.
- */
-static int verify_stack(unsigned long sp)
-{
-        if (sp < PAGE_OFFSET || (sp > (unsigned long)high_memory && high_memory != 0))
-                return -EFAULT;
-
-        return 0;
-}
-
-/*
- * Dump out the contents of some memory nicely...
- */
-static void dump_mem(const char *str, unsigned long bottom, unsigned long top)
-{
-        unsigned long p = bottom & ~31;
-        mm_segment_t fs;
-        int i;
-
-        /*
-         * We need to switch to kernel mode so that we can use __get_user
-         * to safely read from kernel space.  Note that we now dump the
-         * code first, just in case the backtrace kills us.
-         */
-        fs = get_fs();
-        set_fs(KERNEL_DS);
-
-        printk("%s", str);
-        printk("(0x%08lx to 0x%08lx)\n", bottom, top);
-
-        for (p = bottom & ~31; p < top;) {
-                printk("%04lx: ", p & 0xffff);
-
-                for (i = 0; i < 8; i++, p += 4) {
-                        unsigned int val;
-
-                        if (p < bottom || p >= top)
-                                printk("         ");
-                        else {
-                                __get_user(val, (unsigned long *)p);
-                                printk("%08x ", val);
-                        }
-                }
-                printk ("\n");
-        }
-
-        set_fs(fs);
-}
-
-static void dump_instr(struct pt_regs *regs)
-{
-        unsigned long addr = instruction_pointer(regs);
-        const int width = 8;
-        mm_segment_t fs;
-        int i;
-
-        /*
-         * We need to switch to kernel mode so that we can use __get_user
-         * to safely read from kernel space.  Note that we now dump the
-         * code first, just in case the backtrace kills us.
-         */
-        fs = get_fs();
-        set_fs(KERNEL_DS);
-
-        printk("Code: ");
-        for (i = -4; i < 1; i++) {
-                unsigned int val, bad;
-
-                bad = __get_user(val, &((u32 *)addr)[i]);
-
-                if (!bad)
-                        printk(i == 0 ? "(%0*x) " : "%0*x ", width, val);
-                else {
-                        printk("bad PC value.");
-                        break;
-                }
-        }
-        printk("\n");
-
-        set_fs(fs);
-}
-
-/*static*/ void __dump_stack(struct task_struct *tsk, unsigned long sp)
-{
-        dump_mem("Stack: ", sp, 8192+(unsigned long)task_stack_page(tsk));
-}
-
-void dump_stack(void)
-{
-#ifdef CONFIG_DEBUG_ERRORS
-        __backtrace();
-#endif
-}
-
-EXPORT_SYMBOL(dump_stack);
-
-//FIXME - was a static fn
-void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
-{
-        unsigned int fp;
-        int ok = 1;
-
-        printk("Backtrace: ");
-        fp = regs->ARM_fp;
-        if (!fp) {
-                printk("no frame pointer");
-                ok = 0;
-        } else if (verify_stack(fp)) {
-                printk("invalid frame pointer 0x%08x", fp);
-                ok = 0;
-        } else if (fp < (unsigned long)end_of_stack(tsk))
-                printk("frame pointer underflow");
-        printk("\n");
-
-        if (ok)
-                c_backtrace(fp, processor_mode(regs));
-}
-
-/* FIXME - this is probably wrong.. */
-void show_stack(struct task_struct *task, unsigned long *sp) {
-        dump_mem("Stack: ", (unsigned long)sp, 8192+(unsigned long)task_stack_page(task));
-}
-
-DEFINE_SPINLOCK(die_lock);
-
-/*
- * This function is protected against re-entrancy.
- */
-NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
-{
-        struct task_struct *tsk = current;
-
-        console_verbose();
-        spin_lock_irq(&die_lock);
-
-        printk("Internal error: %s: %x\n", str, err);
-        printk("CPU: %d\n", smp_processor_id());
-        show_regs(regs);
-        add_taint(TAINT_DIE);
-        printk("Process %s (pid: %d, stack limit = 0x%p)\n",
-                current->comm, current->pid, end_of_stack(tsk));
-
-        if (!user_mode(regs) || in_interrupt()) {
-                __dump_stack(tsk, (unsigned long)(regs + 1));
-                dump_backtrace(regs, tsk);
-                dump_instr(regs);
-        }
-while(1);
-        spin_unlock_irq(&die_lock);
-        do_exit(SIGSEGV);
-}
-
-void die_if_kernel(const char *str, struct pt_regs *regs, int err)
-{
-        if (user_mode(regs))
-                return;
-
-        die(str, regs, err);
-}
-
-static DEFINE_MUTEX(undef_mutex);
-static int (*undef_hook)(struct pt_regs *);
-
-int request_undef_hook(int (*fn)(struct pt_regs *))
-{
-        int ret = -EBUSY;
-
-        mutex_lock(&undef_mutex);
-        if (undef_hook == NULL) {
-                undef_hook = fn;
-                ret = 0;
-        }
-        mutex_unlock(&undef_mutex);
-
-        return ret;
-}
-
-int release_undef_hook(int (*fn)(struct pt_regs *))
-{
-        int ret = -EINVAL;
-
-        mutex_lock(&undef_mutex);
-        if (undef_hook == fn) {
-                undef_hook = NULL;
-                ret = 0;
-        }
-        mutex_unlock(&undef_mutex);
-
-        return ret;
-}
-
-static int undefined_extension(struct pt_regs *regs, unsigned int op)
-{
-        switch (op) {
-        case 1: /* 0xde01 / 0x?7f001f0 */
-                ptrace_break(current, regs);
-                return 0;
-        }
-        return 1;
-}
-
-asmlinkage void do_undefinstr(struct pt_regs *regs)
-{
-        siginfo_t info;
-        void *pc;
-
-        regs->ARM_pc -= 4;
-
-        pc = (unsigned long *)instruction_pointer(regs); /* strip PSR */
-
-        if (user_mode(regs)) {
-                u32 instr;
-
-                get_user(instr, (u32 *)pc);
-
-                if ((instr & 0x0fff00ff) == 0x07f000f0 &&
-                    undefined_extension(regs, (instr >> 8) & 255) == 0) {
-                        regs->ARM_pc += 4;
-                        return;
-                }
-        } else {
-                if (undef_hook && undef_hook(regs) == 0) {
-                        regs->ARM_pc += 4;
-                        return;
-                }
-        }
-
-#ifdef CONFIG_DEBUG_USER
-        printk(KERN_INFO "%s (%d): undefined instruction: pc=%p\n",
-                current->comm, current->pid, pc);
-        dump_instr(regs);
-#endif
-
-        current->thread.error_code = 0;
-        current->thread.trap_no = 6;
-
-        info.si_signo = SIGILL;
-        info.si_errno = 0;
-        info.si_code  = ILL_ILLOPC;
-        info.si_addr  = pc;
-
-        force_sig_info(SIGILL, &info, current);
-
-        die_if_kernel("Oops - undefined instruction", regs, 0);
-}
-
-asmlinkage void do_excpt(unsigned long address, struct pt_regs *regs, int mode)
-{
-        siginfo_t info;
-
-#ifdef CONFIG_DEBUG_USER
-        printk(KERN_INFO "%s (%d): address exception: pc=%08lx\n",
-                current->comm, current->pid, instruction_pointer(regs));
-        dump_instr(regs);
-#endif
-
-        current->thread.error_code = 0;
-        current->thread.trap_no = 11;
-
-        info.si_signo = SIGBUS;
-        info.si_errno = 0;
-        info.si_code  = BUS_ADRERR;
-        info.si_addr  = (void *)address;
-
-        force_sig_info(SIGBUS, &info, current);
-
-        die_if_kernel("Oops - address exception", regs, mode);
-}
-
-asmlinkage void do_unexp_fiq (struct pt_regs *regs)
-{
-#ifndef CONFIG_IGNORE_FIQ
-        printk("Hmm.  Unexpected FIQ received, but trying to continue\n");
-        printk("You may have a hardware problem...\n");
-#endif
-}
-
-/*
- * bad_mode handles the impossible case in the vectors.  If you see one of
- * these, then it's extremely serious, and could mean you have buggy hardware.
- * It never returns, and never tries to sync.  We hope that we can at least
- * dump out some state information...
- */
-asmlinkage void bad_mode(struct pt_regs *regs, int reason, int proc_mode)
-{
-        unsigned int vectors = vectors_base();
-
-        console_verbose();
-
-        printk(KERN_CRIT "Bad mode in %s handler detected: mode %s\n",
-                handler[reason<5?reason:4], processor_modes[proc_mode]);
-
-        /*
-         * Dump out the vectors and stub routines.  Maybe a better solution
-         * would be to dump them out only if we detect that they are corrupted.
-         */
-        dump_mem(KERN_CRIT "Vectors: ", vectors, vectors + 0x40);
-        dump_mem(KERN_CRIT "Stubs: ", vectors + 0x200, vectors + 0x4b8);
-
-        die("Oops", regs, 0);
-        local_irq_disable();
-        panic("bad mode");
-}
-
-static int bad_syscall(int n, struct pt_regs *regs)
-{
-        struct thread_info *thread = current_thread_info();
-        siginfo_t info;
-
-        if (current->personality != PER_LINUX && thread->exec_domain->handler) {
-                thread->exec_domain->handler(n, regs);
-                return regs->ARM_r0;
-        }
-
-#ifdef CONFIG_DEBUG_USER
-        printk(KERN_ERR "[%d] %s: obsolete system call %08x.\n",
-                current->pid, current->comm, n);
-        dump_instr(regs);
-#endif
-
-        info.si_signo = SIGILL;
-        info.si_errno = 0;
-        info.si_code  = ILL_ILLTRP;
-        info.si_addr  = (void *)instruction_pointer(regs) - 4;
-
-        force_sig_info(SIGILL, &info, current);
-        die_if_kernel("Oops", regs, n);
-        return regs->ARM_r0;
-}
-
-static inline void
-do_cache_op(unsigned long start, unsigned long end, int flags)
-{
-        struct vm_area_struct *vma;
-
-        if (end < start)
-                return;
-
-        vma = find_vma(current->active_mm, start);
-        if (vma && vma->vm_start < end) {
-                if (start < vma->vm_start)
-                        start = vma->vm_start;
-                if (end > vma->vm_end)
-                        end = vma->vm_end;
-        }
-}
-
-/*
- * Handle all unrecognised system calls.
- *  0x9f0000 - 0x9fffff are some more esoteric system calls
- */
-#define NR(x) ((__ARM_NR_##x) - __ARM_NR_BASE)
-asmlinkage int arm_syscall(int no, struct pt_regs *regs)
-{
-        siginfo_t info;
-
-        if ((no >> 16) != 0x9f)
-                return bad_syscall(no, regs);
-
-        switch (no & 0xffff) {
-        case 0: /* branch through 0 */
-                info.si_signo = SIGSEGV;
-                info.si_errno = 0;
-                info.si_code  = SEGV_MAPERR;
-                info.si_addr  = NULL;
-
-                force_sig_info(SIGSEGV, &info, current);
-
-                die_if_kernel("branch through zero", regs, 0);
-                return 0;
-
-        case NR(breakpoint): /* SWI BREAK_POINT */
-                ptrace_break(current, regs);
-                return regs->ARM_r0;
-
-        case NR(cacheflush):
-                return 0;
-
-        case NR(usr26):
-                break;
-
-        default:
-                /* Calls 9f00xx..9f07ff are defined to return -ENOSYS
-                   if not implemented, rather than raising SIGILL.  This
-                   way the calling program can gracefully determine whether
-                   a feature is supported.  */
-                if (no <= 0x7ff)
-                        return -ENOSYS;
-                break;
-        }
-#ifdef CONFIG_DEBUG_USER
-        /*
-         * experience shows that these seem to indicate that
-         * something catastrophic has happened
-         */
-        printk("[%d] %s: arm syscall %d\n", current->pid, current->comm, no);
-        dump_instr(regs);
-        if (user_mode(regs)) {
-                show_regs(regs);
-                c_backtrace(regs->ARM_fp, processor_mode(regs));
-        }
-#endif
-        info.si_signo = SIGILL;
-        info.si_errno = 0;
-        info.si_code  = ILL_ILLTRP;
-        info.si_addr  = (void *)instruction_pointer(regs) - 4;
-
-        force_sig_info(SIGILL, &info, current);
-        die_if_kernel("Oops", regs, no);
-        return 0;
-}
-
-void __bad_xchg(volatile void *ptr, int size)
-{
-        printk("xchg: bad data size: pc 0x%p, ptr 0x%p, size %d\n",
-                __builtin_return_address(0), ptr, size);
-        BUG();
-}
-
-/*
- * A data abort trap was taken, but we did not handle the instruction.
- * Try to abort the user program, or panic if it was the kernel.
- */
-asmlinkage void
-baddataabort(int code, unsigned long instr, struct pt_regs *regs)
-{
-        unsigned long addr = instruction_pointer(regs);
-        siginfo_t info;
-
-#ifdef CONFIG_DEBUG_USER
-        printk(KERN_ERR "[%d] %s: bad data abort: code %d instr 0x%08lx\n",
-                current->pid, current->comm, code, instr);
-        dump_instr(regs);
-        show_pte(current->mm, addr);
-#endif
-
-        info.si_signo = SIGILL;
-        info.si_errno = 0;
-        info.si_code  = ILL_ILLOPC;
-        info.si_addr  = (void *)addr;
-
-        force_sig_info(SIGILL, &info, current);
-        die_if_kernel("unknown data abort code", regs, instr);
-}
-
-volatile void __bug(const char *file, int line, void *data)
-{
-        printk(KERN_CRIT"kernel BUG at %s:%d!", file, line);
-        if (data)
-                printk(KERN_CRIT" - extra data = %p", data);
-        printk("\n");
-        *(int *)0 = 0;
-}
-
-void __readwrite_bug(const char *fn)
-{
-        printk("%s called, but not implemented", fn);
-        BUG();
-}
-
-void __pte_error(const char *file, int line, unsigned long val)
-{
-        printk("%s:%d: bad pte %08lx.\n", file, line, val);
-}
-
-void __pmd_error(const char *file, int line, unsigned long val)
-{
-        printk("%s:%d: bad pmd %08lx.\n", file, line, val);
-}
-
-void __pgd_error(const char *file, int line, unsigned long val)
-{
-        printk("%s:%d: bad pgd %08lx.\n", file, line, val);
-}
-
-asmlinkage void __div0(void)
-{
-        printk("Division by zero in kernel.\n");
-        dump_stack();
-}
-
-void abort(void)
-{
-        BUG();
-
-        /* if that doesn't kill us, halt */
-        panic("Oops failed to kill thread");
-}
-
-void __init trap_init(void)
-{
-        extern void __trap_init(unsigned long);
-        unsigned long base = vectors_base();
-
-        __trap_init(base);
-        if (base != 0)
-                printk(KERN_DEBUG "Relocating machine vectors to 0x%08lx\n",
-                        base);
-}
diff --git a/arch/arm26/kernel/vmlinux-arm26-xip.lds.in b/arch/arm26/kernel/vmlinux-arm26-xip.lds.in
deleted file mode 100644
index 4ec715c25dea..000000000000
--- a/arch/arm26/kernel/vmlinux-arm26-xip.lds.in
+++ /dev/null
@@ -1,136 +0,0 @@
-/* ld script to make ARM Linux kernel
- * taken from the i386 version by Russell King
- * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>
- * borrowed from Russels ARM port by Ian Molton
- */
-
-#include <asm-generic/vmlinux.lds.h>
-
-OUTPUT_ARCH(arm)
-ENTRY(stext)
-jiffies = jiffies_64;
-SECTIONS
-{
-        . = TEXTADDR;
-        .init : {                       /* Init code and data           */
-                _stext = .;
-                __init_begin = .;
-                        _sinittext = .;
-                        *(.init.text)
-                        _einittext = .;
-                __proc_info_begin = .;
-                        *(.proc.info)
-                __proc_info_end = .;
-                __arch_info_begin = .;
-                        *(.arch.info)
-                __arch_info_end = .;
-                __tagtable_begin = .;
-                        *(.taglist)
-                __tagtable_end = .;
-                . = ALIGN(16);
-                __setup_start = .;
-                        *(.init.setup)
-                __setup_end = .;
-                __early_begin = .;
-                        *(__early_param)
-                __early_end = .;
-                __initcall_start = .;
-                        *(.initcall1.init)
-                        *(.initcall2.init)
-                        *(.initcall3.init)
-                        *(.initcall4.init)
-                        *(.initcall5.init)
-                        *(.initcall6.init)
-                        *(.initcall7.init)
-                __initcall_end = .;
-                __con_initcall_start = .;
-                        *(.con_initcall.init)
-                __con_initcall_end = .;
-#ifdef CONFIG_BLK_DEV_INITRD
-                . = ALIGN(32);
-                __initramfs_start = .;
-                        usr/built-in.o(.init.ramfs)
-                __initramfs_end = .;
-#endif
-                . = ALIGN(32768);
-                __init_end = .;
-        }
-
-        /DISCARD/ : {                   /* Exit code and data           */
-                *(.exit.text)
-                *(.exit.data)
-                *(.exitcall.exit)
-        }
-
-        .text : {                       /* Real text segment            */
-                _text = .;              /* Text and read-only data      */
-                        TEXT_TEXT
-                        SCHED_TEXT
-                        LOCK_TEXT       /* FIXME - borrowed from arm32 - check*/
-                        *(.fixup)
-                        *(.gnu.warning)
-                        *(.rodata)
-                        *(.rodata.*)
-                        *(.glue_7)
-                        *(.glue_7t)
-                *(.got)                 /* Global offset table          */
-
-                _etext = .;             /* End of text section          */
-        }
-
-        . = ALIGN(16);
-        __ex_table : {                  /* Exception table              */
-                __start___ex_table = .;
-                        *(__ex_table)
-                __stop___ex_table = .;
-        }
-
-        RODATA
-
-        _endtext = .;
-
-        . = DATAADDR;
-
-        _sdata = .;
-
-        .data : {
-                . = ALIGN(8192);
-                /*
-                 * first, the init thread union, aligned
-                 * to an 8192 byte boundary. (see arm26/kernel/init_task.c)
-                 * FIXME - sould this be 32K aligned on arm26?
-                 */
-                *(.init.task)
-
-                /*
-                 * The cacheline aligned data
-                 */
-                . = ALIGN(32);
-                *(.data.cacheline_aligned)
-
-                /*
-                 * and the usual data section
-                 */
-                DATA_DATA
-                CONSTRUCTORS
-
-                *(.init.data)
-
-                _edata = .;
-        }
-
-        .bss : {
-                __bss_start = .;        /* BSS                          */
-                *(.bss)
-                *(COMMON)
-                _end = . ;
-        }
-                                        /* Stabs debugging sections.    */
-        .stab 0 : { *(.stab) }
-        .stabstr 0 : { *(.stabstr) }
-        .stab.excl 0 : { *(.stab.excl) }
-        .stab.exclstr 0 : { *(.stab.exclstr) }
-        .stab.index 0 : { *(.stab.index) }
-        .stab.indexstr 0 : { *(.stab.indexstr) }
-        .comment 0 : { *(.comment) }
-}
diff --git a/arch/arm26/kernel/vmlinux-arm26.lds.in b/arch/arm26/kernel/vmlinux-arm26.lds.in
deleted file mode 100644
index 6c44f6a17bf7..000000000000
--- a/arch/arm26/kernel/vmlinux-arm26.lds.in
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ld script to make ARM Linux kernel
- * taken from the i386 version by Russell King
- * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>
- * borrowed from Russels ARM port by Ian Molton and subsequently modified.
- */
-
-#include <asm-generic/vmlinux.lds.h>
-
-OUTPUT_ARCH(arm)
-ENTRY(stext)
-jiffies = jiffies_64;
-SECTIONS
-{
-        . = TEXTADDR;
-        .init : {                       /* Init code and data           */
-                _stext = .;
-                __init_begin = .;
-                        _sinittext = .;
-                        *(.init.text)
-                        _einittext = .;
-                __proc_info_begin = .;
-                        *(.proc.info)
-                __proc_info_end = .;
-                __arch_info_begin = .;
-                        *(.arch.info)
-                __arch_info_end = .;
-                __tagtable_begin = .;
-                        *(.taglist)
-                __tagtable_end = .;
-                        *(.init.data)
-                . = ALIGN(16);
-                __setup_start = .;
-                        *(.init.setup)
-                __setup_end = .;
-                __early_begin = .;
-                        *(__early_param)
-                __early_end = .;
-                __initcall_start = .;
-                        *(.initcall1.init)
-                        *(.initcall2.init)
-                        *(.initcall3.init)
-                        *(.initcall4.init)
-                        *(.initcall5.init)
-                        *(.initcall6.init)
-                        *(.initcall7.init)
-                __initcall_end = .;
-                __con_initcall_start = .;
-                        *(.con_initcall.init)
-                __con_initcall_end = .;
-#ifdef CONFIG_BLK_DEV_INITRD
-                . = ALIGN(32);
-                __initramfs_start = .;
-                        usr/built-in.o(.init.ramfs)
-                __initramfs_end = .;
-#endif
-                . = ALIGN(32768);
-                __init_end = .;
-        }
-
-        /DISCARD/ : {                   /* Exit code and data           */
-                *(.exit.text)
-                *(.exit.data)
-                *(.exitcall.exit)
-        }
-
-        .text : {                       /* Real text segment            */
-                _text = .;              /* Text and read-only data      */
-                        TEXT_TEXT
-                        SCHED_TEXT
-                        LOCK_TEXT
-                        *(.fixup)
-                        *(.gnu.warning)
-                        *(.rodata)
-                        *(.rodata.*)
-                        *(.glue_7)
-                        *(.glue_7t)
-                *(.got)                 /* Global offset table          */
-
-                _etext = .;             /* End of text section          */
-        }
-
-        . = ALIGN(16);
-        __ex_table : {                  /* Exception table              */
-                __start___ex_table = .;
-                        *(__ex_table)
-                __stop___ex_table = .;
-        }
-
-        RODATA
-
-        . = ALIGN(8192);
-
-        .data : {
-                /*
-                 * first, the init task union, aligned
-                 * to an 8192 byte boundary. (see arm26/kernel/init_task.c)
-                 */
-                *(.init.task)
-
-                /*
-                 * The cacheline aligned data
-                 */
-                . = ALIGN(32);
-                *(.data.cacheline_aligned)
-
-                /*
-                 * and the usual data section
-                 */
-                DATA_DATA
-                CONSTRUCTORS
-
-                _edata = .;
-        }
-
-        .bss : {
-                __bss_start = .;        /* BSS                          */
-                *(.bss)
-                *(COMMON)
-                _end = . ;
-        }
-                                        /* Stabs debugging sections.    */
-        .stab 0 : { *(.stab) }
-        .stabstr 0 : { *(.stabstr) }
-        .stab.excl 0 : { *(.stab.excl) }
-        .stab.exclstr 0 : { *(.stab.exclstr) }
-        .stab.index 0 : { *(.stab.index) }
-        .stab.indexstr 0 : { *(.stab.indexstr) }
-        .comment 0 : { *(.comment) }
-}
diff --git a/arch/arm26/kernel/vmlinux.lds.S b/arch/arm26/kernel/vmlinux.lds.S
deleted file mode 100644
index 1fa39f02e07c..000000000000
--- a/arch/arm26/kernel/vmlinux.lds.S
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#ifdef CONFIG_XIP_KERNEL
-
-#include "vmlinux-arm26-xip.lds.in"
-
-#else
-
-#include "vmlinux-arm26.lds.in"
-
-#endif
-
diff --git a/arch/arm26/lib/Makefile b/arch/arm26/lib/Makefile
deleted file mode 100644
index 6df2b793d367..000000000000
--- a/arch/arm26/lib/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# linux/arch/arm26/lib/Makefile
-#
-# Copyright (C) 1995-2000 Russell King
-#
-
-lib-y           := backtrace.o changebit.o csumipv6.o csumpartial.o   \
-                   csumpartialcopy.o csumpartialcopyuser.o clearbit.o \
-                   copy_page.o delay.o findbit.o memchr.o memcpy.o    \
-                   memset.o memzero.o setbit.o                        \
-                   strchr.o strrchr.o testchangebit.o                 \
-                   testclearbit.o testsetbit.o getuser.o              \
-                   putuser.o ashldi3.o ashrdi3.o lshrdi3.o muldi3.o   \
-                   ucmpdi2.o udivdi3.o lib1funcs.o ecard.o io-acorn.o \
-                   floppydma.o io-readsb.o io-writesb.o io-writesl.o  \
-                   uaccess-kernel.o uaccess-user.o io-readsw.o        \
-                   io-writesw.o io-readsl.o ecard.o io-acorn.o        \
-                   floppydma.o
-
-lib-n           :=
-
-lib-$(CONFIG_VT)+= kbd.o
-
-csumpartialcopy.o: csumpartialcopygeneric.S
-csumpartialcopyuser.o: csumpartialcopygeneric.S
-
diff --git a/arch/arm26/lib/ashldi3.c b/arch/arm26/lib/ashldi3.c
deleted file mode 100644
index 130f5a839669..000000000000
--- a/arch/arm26/lib/ashldi3.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* More subroutines needed by GCC output code on some machines.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC 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.
-
-GNU CC 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 GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.
- */
-/* support functions required by the kernel. based on code from gcc-2.95.3 */
-/* I Molton     29/07/01 */
-
-#include "gcclib.h"
-
-DItype
-__ashldi3 (DItype u, word_type b)
-{
-  DIunion w;
-  word_type bm;
-  DIunion uu;
-
-  if (b == 0)
-    return u;
-
-  uu.ll = u;
-
-  bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
-  if (bm <= 0)
-    {
-      w.s.low = 0;
-      w.s.high = (USItype)uu.s.low << -bm;
-    }
-  else
-    {
-      USItype carries = (USItype)uu.s.low >> bm;
-      w.s.low = (USItype)uu.s.low << b;
-      w.s.high = ((USItype)uu.s.high << b) | carries;
-    }
-
-  return w.ll;
-}
-
diff --git a/arch/arm26/lib/ashrdi3.c b/arch/arm26/lib/ashrdi3.c
deleted file mode 100644
index 71625d218f8d..000000000000
--- a/arch/arm26/lib/ashrdi3.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* More subroutines needed by GCC output code on some machines.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC 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.
-
-GNU CC 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 GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.
- */
-/* support functions required by the kernel. based on code from gcc-2.95.3 */
-/* I Molton     29/07/01 */
-
-#include "gcclib.h"
-
-DItype
-__ashrdi3 (DItype u, word_type b)
-{
-  DIunion w;
-  word_type bm;
-  DIunion uu;
-
-  if (b == 0)
-    return u;
-
-  uu.ll = u;
-
-  bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
-  if (bm <= 0)
-    {
-      /* w.s.high = 1..1 or 0..0 */
-      w.s.high = uu.s.high >> (sizeof (SItype) * BITS_PER_UNIT - 1);
-      w.s.low = uu.s.high >> -bm;
-    }
-  else
-    {
-      USItype carries = (USItype)uu.s.high << bm;
-      w.s.high = uu.s.high >> b;
-      w.s.low = ((USItype)uu.s.low >> b) | carries;
-    }
-
-  return w.ll;
-}
diff --git a/arch/arm26/lib/backtrace.S b/arch/arm26/lib/backtrace.S
deleted file mode 100644
index e27feb1e891d..000000000000
--- a/arch/arm26/lib/backtrace.S
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *  linux/arch/arm26/lib/backtrace.S
- *
- *  Copyright (C) 1995, 1996 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-                .text
-
-@ fp is 0 or stack frame
-
-#define frame   r4
-#define next    r5
-#define save    r6
-#define mask    r7
-#define offset  r8
-
-ENTRY(__backtrace)
-                mov     r1, #0x10
-                mov     r0, fp
-
-ENTRY(c_backtrace)
-
-#ifdef CONFIG_NO_FRAME_POINTER
-                mov     pc, lr
-#else
-
-                stmfd   sp!, {r4 - r8, lr}      @ Save an extra register so we have a location...
-                mov     mask, #0xfc000003
-                tst     mask, r0
-                movne   r0, #0
-                movs    frame, r0
-1:              moveq   r0, #-2
-                LOADREGS(eqfd, sp!, {r4 - r8, pc})
-
-2:              stmfd   sp!, {pc}               @ calculate offset of PC in STMIA instruction
-                ldr     r0, [sp], #4
-                adr     r1, 2b - 4
-                sub     offset, r0, r1
-
-3:              tst     frame, mask             @ Check for address exceptions...
-                bne     1b
-
-1001:           ldr     next, [frame, #-12]     @ get fp
-1002:           ldr     r2, [frame, #-4]        @ get lr
-1003:           ldr     r3, [frame, #0]         @ get pc
-                sub     save, r3, offset        @ Correct PC for prefetching
-                bic     save, save, mask
-1004:           ldr     r1, [save, #0]          @ get instruction at function
-                mov     r1, r1, lsr #10
-                ldr     r3, .Ldsi+4
-                teq     r1, r3
-                subeq   save, save, #4
-                adr     r0, .Lfe
-                mov     r1, save
-                bic     r2, r2, mask
-                bl      printk                  @ print pc and link register
-
-                ldr     r0, [frame, #-8]        @ get sp
-                sub     r0, r0, #4
-1005:           ldr     r1, [save, #4]          @ get instruction at function+4
-                mov     r3, r1, lsr #10
-                ldr     r2, .Ldsi+4
-                teq     r3, r2                  @ Check for stmia sp!, {args}
-                addeq   save, save, #4          @ next instruction
-                bleq    .Ldumpstm
-
-                sub     r0, frame, #16
-1006:           ldr     r1, [save, #4]          @ Get 'stmia sp!, {rlist, fp, ip, lr, pc}' instruction
-                mov     r3, r1, lsr #10
-                ldr     r2, .Ldsi
-                teq     r3, r2
-                bleq    .Ldumpstm
-
-                teq     frame, next
-                movne   frame, next
-                teqne   frame, #0
-                bne     3b
-                LOADREGS(fd, sp!, {r4 - r8, pc})
-
-/*
- * Fixup for LDMDB
- */
-                .section .fixup,"ax"
-                .align  0
-1007:           ldr     r0, =.Lbad
-                mov     r1, frame
-                bl      printk
-                LOADREGS(fd, sp!, {r4 - r8, pc})
-                .ltorg
-                .previous
-                
-                .section __ex_table,"a"
-                .align  3
-                .long   1001b, 1007b
-                .long   1002b, 1007b
-                .long   1003b, 1007b
-                .long   1004b, 1007b
-                .long   1005b, 1007b
-                .long   1006b, 1007b
-                .previous
-
-#define instr r4
-#define reg   r5
-#define stack r6
-
-.Ldumpstm:      stmfd   sp!, {instr, reg, stack, r7, lr}
-                mov     stack, r0
-                mov     instr, r1
-                mov     reg, #9
-                mov     r7, #0
-1:              mov     r3, #1
-                tst     instr, r3, lsl reg
-                beq     2f
-                add     r7, r7, #1
-                teq     r7, #4
-                moveq   r7, #0
-                moveq   r3, #'\n'
-                movne   r3, #' '
-                ldr     r2, [stack], #-4
-                mov     r1, reg
-                adr     r0, .Lfp
-                bl      printk
-2:              subs    reg, reg, #1
-                bpl     1b
-                teq     r7, #0
-                adrne   r0, .Lcr
-                blne    printk
-                mov     r0, stack
-                LOADREGS(fd, sp!, {instr, reg, stack, r7, pc})
-
-.Lfe:           .asciz  "Function entered at [<%p>] from [<%p>]\n"
-.Lfp:           .asciz  " r%d = %08X%c"
-.Lcr:           .asciz  "\n"
-.Lbad:          .asciz  "Backtrace aborted due to bad frame pointer <%p>\n"
-                .align
-.Ldsi:          .word   0x00e92dd8 >> 2
-                .word   0x00e92d00 >> 2
-
-#endif
diff --git a/arch/arm26/lib/changebit.S b/arch/arm26/lib/changebit.S
deleted file mode 100644
index 1b6a077be5a6..000000000000
--- a/arch/arm26/lib/changebit.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  linux/arch/arm26/lib/changebit.S
- *
- *  Copyright (C) 1995-1996 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-                .text
-
-/* Purpose  : Function to change a bit
- * Prototype: int change_bit(int bit, void *addr)
- */
-ENTRY(_change_bit_be)
-                eor     r0, r0, #0x18           @ big endian byte ordering
-ENTRY(_change_bit_le)
-                and     r2, r0, #7
-                mov     r3, #1
-                mov     r3, r3, lsl r2
-                save_and_disable_irqs ip, r2
-                ldrb    r2, [r1, r0, lsr #3]
-                eor     r2, r2, r3
-                strb    r2, [r1, r0, lsr #3]
-                restore_irqs ip
-                RETINSTR(mov,pc,lr)
diff --git a/arch/arm26/lib/clearbit.S b/arch/arm26/lib/clearbit.S
deleted file mode 100644
index 0a895b0c759f..000000000000
--- a/arch/arm26/lib/clearbit.S
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  linux/arch/arm26/lib/clearbit.S
- *
- *  Copyright (C) 1995-1996 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-                .text
-
-/*
- * Purpose  : Function to clear a bit
- * Prototype: int clear_bit(int bit, void *addr)
- */
-ENTRY(_clear_bit_be)
-                eor     r0, r0, #0x18           @ big endian byte ordering
-ENTRY(_clear_bit_le)
-                and     r2, r0, #7
-                mov     r3, #1
-                mov     r3, r3, lsl r2
-                save_and_disable_irqs ip, r2
-                ldrb    r2, [r1, r0, lsr #3]
-                bic     r2, r2, r3
-                strb    r2, [r1, r0, lsr #3]
-                restore_irqs ip
-                RETINSTR(mov,pc,lr)
-
-
diff --git a/arch/arm26/lib/copy_page.S b/arch/arm26/lib/copy_page.S
deleted file mode 100644
index c7511a2739d3..000000000000
--- a/arch/arm26/lib/copy_page.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  linux/arch/arm26/lib/copypage.S
- *
- *  Copyright (C) 1995-1999 Russell King
- *
- * 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.
- *
- *  ASM optimised string functions
- */
-#include <linux/linkage.h>
-#include <asm/assembler.h>
-#include <asm/asm-offsets.h>
-
-                .text
-                .align  5
-/*
- * ARMv3 optimised copy_user_page
- *
- * FIXME: rmk do we need to handle cache stuff...
- * FIXME: im is this right on ARM26?
- */
-ENTRY(__copy_user_page)
-        stmfd   sp!, {r4, lr}                   @       2
-        mov     r2, #PAGE_SZ/64                 @       1
-        ldmia   r1!, {r3, r4, ip, lr}           @       4+1
-1:      stmia   r0!, {r3, r4, ip, lr}           @       4
-        ldmia   r1!, {r3, r4, ip, lr}           @       4+1
-        stmia   r0!, {r3, r4, ip, lr}           @       4
-        ldmia   r1!, {r3, r4, ip, lr}           @       4+1
-        stmia   r0!, {r3, r4, ip, lr}           @       4
-        ldmia   r1!, {r3, r4, ip, lr}           @       4
-        subs    r2, r2, #1                      @       1
-        stmia   r0!, {r3, r4, ip, lr}           @       4
-        ldmneia r1!, {r3, r4, ip, lr}           @       4
-        bne     1b                              @       1
-        LOADREGS(fd, sp!, {r4, pc})             @       3
-
-        .align  5
-/*
- * ARMv3 optimised clear_user_page
- *
- * FIXME: rmk do we need to handle cache stuff...
- */
-ENTRY(__clear_user_page)
-        str     lr, [sp, #-4]!
-        mov     r1, #PAGE_SZ/64                 @ 1
-        mov     r2, #0                          @ 1
-        mov     r3, #0                          @ 1
-        mov     ip, #0                          @ 1
-        mov     lr, #0                          @ 1
-1:      stmia   r0!, {r2, r3, ip, lr}           @ 4
-        stmia   r0!, {r2, r3, ip, lr}           @ 4
-        stmia   r0!, {r2, r3, ip, lr}           @ 4
-        stmia   r0!, {r2, r3, ip, lr}           @ 4
-        subs    r1, r1, #1                      @ 1
-        bne     1b                              @ 1
-        ldr     pc, [sp], #4
-
-        .section ".init.text", #alloc, #execinstr
-
diff --git a/arch/arm26/lib/csumipv6.S b/arch/arm26/lib/csumipv6.S
deleted file mode 100644
index 62831155acde..000000000000
--- a/arch/arm26/lib/csumipv6.S
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  linux/arch/arm26/lib/csumipv6.S
- *
- *  Copyright (C) 1995-1998 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-
-                .text
-
-ENTRY(__csum_ipv6_magic)
-                str     lr, [sp, #-4]!
-                adds    ip, r2, r3
-                ldmia   r1, {r1 - r3, lr}
-                adcs    ip, ip, r1
-                adcs    ip, ip, r2
-                adcs    ip, ip, r3
-                adcs    ip, ip, lr
-                ldmia   r0, {r0 - r3}
-                adcs    r0, ip, r0
-                adcs    r0, r0, r1
-                adcs    r0, r0, r2
-                ldr     r2, [sp, #4]
-                adcs    r0, r0, r3
-                adcs    r0, r0, r2
-                adcs    r0, r0, #0
-                LOADREGS(fd, sp!, {pc})
-
diff --git a/arch/arm26/lib/csumpartial.S b/arch/arm26/lib/csumpartial.S
deleted file mode 100644
index e53e7109e623..000000000000
--- a/arch/arm26/lib/csumpartial.S
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  linux/arch/arm26/lib/csumpartial.S
- *
- *  Copyright (C) 1995-1998 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-
-                .text
-
-/*
- * Function: __u32 csum_partial(const char *src, int len, __u32 sum)
- * Params  : r0 = buffer, r1 = len, r2 = checksum
- * Returns : r0 = new checksum
- */
-
-buf     .req    r0
-len     .req    r1
-sum     .req    r2
-td0     .req    r3
-td1     .req    r4      @ save before use
-td2     .req    r5      @ save before use
-td3     .req    lr
-
-.zero:          mov     r0, sum
-                add     sp, sp, #4
-                ldr     pc, [sp], #4
-
-                /*
-                 * Handle 0 to 7 bytes, with any alignment of source and
-                 * destination pointers.  Note that when we get here, C = 0
-                 */
-.less8:         teq     len, #0                 @ check for zero count
-                beq     .zero
-
-                /* we must have at least one byte. */
-                tst     buf, #1                 @ odd address?
-                ldrneb  td0, [buf], #1
-                subne   len, len, #1
-                adcnes  sum, sum, td0, lsl #byte(1)
-
-.less4:         tst     len, #6
-                beq     .less8_byte
-
-                /* we are now half-word aligned */
-
-.less8_wordlp:
-#if __LINUX_ARM_ARCH__ >= 4
-                ldrh    td0, [buf], #2
-                sub     len, len, #2
-#else
-                ldrb    td0, [buf], #1
-                ldrb    td3, [buf], #1
-                sub     len, len, #2
-                orr     td0, td0, td3, lsl #8
-#endif
-                adcs    sum, sum, td0
-                tst     len, #6
-                bne     .less8_wordlp
-
-.less8_byte:    tst     len, #1                 @ odd number of bytes
-                ldrneb  td0, [buf], #1          @ include last byte
-                adcnes  sum, sum, td0, lsl #byte(0)     @ update checksum
-
-.done:          adc     r0, sum, #0             @ collect up the last carry
-                ldr     td0, [sp], #4
-                tst     td0, #1                 @ check buffer alignment
-                movne   td0, r0, lsl #8         @ rotate checksum by 8 bits
-                orrne   r0, td0, r0, lsr #24
-                ldr     pc, [sp], #4            @ return
-
-.not_aligned:   tst     buf, #1                 @ odd address
-                ldrneb  td0, [buf], #1          @ make even
-                subne   len, len, #1
-                adcnes  sum, sum, td0, lsl #byte(1)     @ update checksum
-
-                tst     buf, #2                 @ 32-bit aligned?
-#if __LINUX_ARM_ARCH__ >= 4
-                ldrneh  td0, [buf], #2          @ make 32-bit aligned
-                subne   len, len, #2
-#else
-                ldrneb  td0, [buf], #1
-                ldrneb  ip, [buf], #1
-                subne   len, len, #2
-                orrne   td0, td0, ip, lsl #8
-#endif
-                adcnes  sum, sum, td0           @ update checksum
-                mov     pc, lr
-
-ENTRY(csum_partial)
-                stmfd   sp!, {buf, lr}
-                cmp     len, #8                 @ Ensure that we have at least
-                blo     .less8                  @ 8 bytes to copy.
-
-                adds    sum, sum, #0            @ C = 0
-                tst     buf, #3                 @ Test destination alignment
-                blne    .not_aligned            @ aligh destination, return here
-
-1:              bics    ip, len, #31
-                beq     3f
-
-                stmfd   sp!, {r4 - r5}
-2:              ldmia   buf!, {td0, td1, td2, td3}
-                adcs    sum, sum, td0
-                adcs    sum, sum, td1
-                adcs    sum, sum, td2
-                adcs    sum, sum, td3
-                ldmia   buf!, {td0, td1, td2, td3}
-                adcs    sum, sum, td0
-                adcs    sum, sum, td1
-                adcs    sum, sum, td2
-                adcs    sum, sum, td3
-                sub     ip, ip, #32
-                teq     ip, #0
-                bne     2b
-                ldmfd   sp!, {r4 - r5}
-
-3:              tst     len, #0x1c              @ should not change C
-                beq     .less4
-
-4:              ldr     td0, [buf], #4
-                sub     len, len, #4
-                adcs    sum, sum, td0
-                tst     len, #0x1c
-                bne     4b
-                b       .less4
diff --git a/arch/arm26/lib/csumpartialcopy.S b/arch/arm26/lib/csumpartialcopy.S
deleted file mode 100644
index a1c4b5fdd498..000000000000
--- a/arch/arm26/lib/csumpartialcopy.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  linux/arch/arm26/lib/csumpartialcopy.S
- *
- *  Copyright (C) 1995-1998 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-
-                .text
-
-/* Function: __u32 csum_partial_copy_nocheck(const char *src, char *dst, int len, __u32 sum)
- * Params  : r0 = src, r1 = dst, r2 = len, r3 = checksum
- * Returns : r0 = new checksum
- */
-
-                .macro  save_regs
-                stmfd   sp!, {r1, r4 - r8, fp, ip, lr, pc}
-                .endm
-
-                .macro  load_regs,flags
-                LOADREGS(\flags,fp,{r1, r4 - r8, fp, sp, pc})
-                .endm
-
-                .macro  load1b, reg1
-                ldrb    \reg1, [r0], #1
-                .endm
-
-                .macro  load2b, reg1, reg2
-                ldrb    \reg1, [r0], #1
-                ldrb    \reg2, [r0], #1
-                .endm
-
-                .macro  load1l, reg1
-                ldr     \reg1, [r0], #4
-                .endm
-
-                .macro  load2l, reg1, reg2
-                ldr     \reg1, [r0], #4
-                ldr     \reg2, [r0], #4
-                .endm
-
-                .macro  load4l, reg1, reg2, reg3, reg4
-                ldmia   r0!, {\reg1, \reg2, \reg3, \reg4}
-                .endm
-
-#define FN_ENTRY        ENTRY(csum_partial_copy_nocheck)
-
-#include "csumpartialcopygeneric.S"
diff --git a/arch/arm26/lib/csumpartialcopygeneric.S b/arch/arm26/lib/csumpartialcopygeneric.S
deleted file mode 100644
index 5249c3ad11db..000000000000
--- a/arch/arm26/lib/csumpartialcopygeneric.S
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- *  linux/arch/arm26/lib/csumpartialcopygeneric.S
- *
- *  Copyright (C) 1995-2001 Russell King
- *
- * 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.
- *
- * JMA 01/06/03 Commented out some shl0s; probobly irrelevant to arm26 
- *
- */
-
-/*
- * unsigned int
- * csum_partial_copy_xxx(const char *src, char *dst, int len, int sum, )
- *  r0 = src, r1 = dst, r2 = len, r3 = sum
- *  Returns : r0 = checksum
- *
- * Note that 'tst' and 'teq' preserve the carry flag.
- */
-
-/* Quick hack */
-                .macro  save_regs
-                stmfd   sp!, {r1, r4 - r8, fp, ip, lr, pc}
-                .endm
-
-/* end Quick Hack */
-
-src     .req    r0
-dst     .req    r1
-len     .req    r2
-sum     .req    r3
-
-.zero:          mov     r0, sum
-                load_regs       ea
-
-                /*
-                 * Align an unaligned destination pointer.  We know that
-                 * we have >= 8 bytes here, so we don't need to check
-                 * the length.  Note that the source pointer hasn't been
-                 * aligned yet.
-                 */
-.dst_unaligned: tst     dst, #1
-                beq     .dst_16bit
-
-                load1b  ip
-                sub     len, len, #1
-                adcs    sum, sum, ip, lsl #byte(1)      @ update checksum
-                strb    ip, [dst], #1
-                tst     dst, #2
-                moveq   pc, lr                  @ dst is now 32bit aligned
-
-.dst_16bit:     load2b  r8, ip
-                sub     len, len, #2
-                adcs    sum, sum, r8, lsl #byte(0)
-                strb    r8, [dst], #1
-                adcs    sum, sum, ip, lsl #byte(1)
-                strb    ip, [dst], #1
-                mov     pc, lr                  @ dst is now 32bit aligned
-
-                /*
-                 * Handle 0 to 7 bytes, with any alignment of source and
-                 * destination pointers.  Note that when we get here, C = 0
-                 */
-.less8:         teq     len, #0                 @ check for zero count
-                beq     .zero
-
-                /* we must have at least one byte. */
-                tst     dst, #1                 @ dst 16-bit aligned
-                beq     .less8_aligned
-
-                /* Align dst */
-                load1b  ip
-                sub     len, len, #1
-                adcs    sum, sum, ip, lsl #byte(1)      @ update checksum
-                strb    ip, [dst], #1
-                tst     len, #6
-                beq     .less8_byteonly
-
-1:              load2b  r8, ip
-                sub     len, len, #2
-                adcs    sum, sum, r8, lsl #byte(0)
-                strb    r8, [dst], #1
-                adcs    sum, sum, ip, lsl #byte(1)
-                strb    ip, [dst], #1
-.less8_aligned: tst     len, #6
-                bne     1b
-.less8_byteonly:
-                tst     len, #1
-                beq     .done
-                load1b  r8
-                adcs    sum, sum, r8, lsl #byte(0)      @ update checksum
-                strb    r8, [dst], #1
-                b       .done
-
-FN_ENTRY
-                mov     ip, sp
-                save_regs
-                sub     fp, ip, #4
-
-                cmp     len, #8                 @ Ensure that we have at least
-                blo     .less8                  @ 8 bytes to copy.
-
-                adds    sum, sum, #0            @ C = 0
-                tst     dst, #3                 @ Test destination alignment
-                blne    .dst_unaligned          @ align destination, return here
-
-                /*
-                 * Ok, the dst pointer is now 32bit aligned, and we know
-                 * that we must have more than 4 bytes to copy.  Note
-                 * that C contains the carry from the dst alignment above.
-                 */
-
-                tst     src, #3                 @ Test source alignment
-                bne     .src_not_aligned
-
-                /* Routine for src & dst aligned */
-
-                bics    ip, len, #15
-                beq     2f
-
-1:              load4l  r4, r5, r6, r7
-                stmia   dst!, {r4, r5, r6, r7}
-                adcs    sum, sum, r4
-                adcs    sum, sum, r5
-                adcs    sum, sum, r6
-                adcs    sum, sum, r7
-                sub     ip, ip, #16
-                teq     ip, #0
-                bne     1b
-
-2:              ands    ip, len, #12
-                beq     4f
-                tst     ip, #8
-                beq     3f
-                load2l  r4, r5
-                stmia   dst!, {r4, r5}
-                adcs    sum, sum, r4
-                adcs    sum, sum, r5
-                tst     ip, #4
-                beq     4f
-
-3:              load1l  r4
-                str     r4, [dst], #4
-                adcs    sum, sum, r4
-
-4:              ands    len, len, #3
-                beq     .done
-                load1l  r4
-                tst     len, #2
-/*              mov     r5, r4, lsr #byte(0)
-FIXME? 0 Shift anyhow!
-*/
-                beq     .exit
-                adcs    sum, sum, r4, push #16
-                strb    r5, [dst], #1
-                mov     r5, r4, lsr #byte(1)
-                strb    r5, [dst], #1
-                mov     r5, r4, lsr #byte(2)
-.exit:          tst     len, #1
-                strneb  r5, [dst], #1
-                andne   r5, r5, #255
-                adcnes  sum, sum, r5, lsl #byte(0)
-
-                /*
-                 * If the dst pointer was not 16-bit aligned, we
-                 * need to rotate the checksum here to get around
-                 * the inefficient byte manipulations in the
-                 * architecture independent code.
-                 */
-.done:          adc     r0, sum, #0
-                ldr     sum, [sp, #0]           @ dst
-                tst     sum, #1
-                movne   sum, r0, lsl #8
-                orrne   r0, sum, r0, lsr #24
-                load_regs       ea
-
-.src_not_aligned:
-                adc     sum, sum, #0            @ include C from dst alignment
-                and     ip, src, #3
-                bic     src, src, #3
-                load1l  r5
-                cmp     ip, #2
-                beq     .src2_aligned
-                bhi     .src3_aligned
-                mov     r4, r5, pull #8         @ C = 0
-                bics    ip, len, #15
-                beq     2f
-1:              load4l  r5, r6, r7, r8
-                orr     r4, r4, r5, push #24
-                mov     r5, r5, pull #8
-                orr     r5, r5, r6, push #24
-                mov     r6, r6, pull #8
-                orr     r6, r6, r7, push #24
-                mov     r7, r7, pull #8
-                orr     r7, r7, r8, push #24
-                stmia   dst!, {r4, r5, r6, r7}
-                adcs    sum, sum, r4
-                adcs    sum, sum, r5
-                adcs    sum, sum, r6
-                adcs    sum, sum, r7
-                mov     r4, r8, pull #8
-                sub     ip, ip, #16
-                teq     ip, #0
-                bne     1b
-2:              ands    ip, len, #12
-                beq     4f
-                tst     ip, #8
-                beq     3f
-                load2l  r5, r6
-                orr     r4, r4, r5, push #24
-                mov     r5, r5, pull #8
-                orr     r5, r5, r6, push #24
-                stmia   dst!, {r4, r5}
-                adcs    sum, sum, r4
-                adcs    sum, sum, r5
-                mov     r4, r6, pull #8
-                tst     ip, #4
-                beq     4f
-3:              load1l  r5
-                orr     r4, r4, r5, push #24
-                str     r4, [dst], #4
-                adcs    sum, sum, r4
-                mov     r4, r5, pull #8
-4:              ands    len, len, #3
-                beq     .done
-/*              mov     r5, r4, lsr #byte(0)
-FIXME? 0 Shift anyhow
-*/
-                tst     len, #2
-                beq     .exit
-                adcs    sum, sum, r4, push #16
-                strb    r5, [dst], #1
-                mov     r5, r4, lsr #byte(1)
-                strb    r5, [dst], #1
-                mov     r5, r4, lsr #byte(2)
-                b       .exit
-
-.src2_aligned:  mov     r4, r5, pull #16
-                adds    sum, sum, #0
-                bics    ip, len, #15
-                beq     2f
-1:              load4l  r5, r6, r7, r8
-                orr     r4, r4, r5, push #16
-                mov     r5, r5, pull #16
-                orr     r5, r5, r6, push #16
-                mov     r6, r6, pull #16
-                orr     r6, r6, r7, push #16
-                mov     r7, r7, pull #16
-                orr     r7, r7, r8, push #16
-                stmia   dst!, {r4, r5, r6, r7}
-                adcs    sum, sum, r4
-                adcs    sum, sum, r5
-                adcs    sum, sum, r6
-                adcs    sum, sum, r7
-                mov     r4, r8, pull #16
-                sub     ip, ip, #16
-                teq     ip, #0
-                bne     1b
-2:              ands    ip, len, #12
-                beq     4f
-                tst     ip, #8
-                beq     3f
-                load2l  r5, r6
-                orr     r4, r4, r5, push #16
-                mov     r5, r5, pull #16
-                orr     r5, r5, r6, push #16
-                stmia   dst!, {r4, r5}
-                adcs    sum, sum, r4
-                adcs    sum, sum, r5
-                mov     r4, r6, pull #16
-                tst     ip, #4
-                beq     4f
-3:              load1l  r5
-                orr     r4, r4, r5, push #16
-                str     r4, [dst], #4
-                adcs    sum, sum, r4
-                mov     r4, r5, pull #16
-4:              ands    len, len, #3
-                beq     .done
-/*              mov     r5, r4, lsr #byte(0)
-FIXME? 0 Shift anyhow
-*/
-                tst     len, #2
-                beq     .exit
-                adcs    sum, sum, r4
-                strb    r5, [dst], #1
-                mov     r5, r4, lsr #byte(1)
-                strb    r5, [dst], #1
-                tst     len, #1
-                beq     .done
-                load1b  r5
-                b       .exit
-
-.src3_aligned:  mov     r4, r5, pull #24
-                adds    sum, sum, #0
-                bics    ip, len, #15
-                beq     2f
-1:              load4l  r5, r6, r7, r8
-                orr     r4, r4, r5, push #8
-                mov     r5, r5, pull #24
-                orr     r5, r5, r6, push #8
-                mov     r6, r6, pull #24
-                orr     r6, r6, r7, push #8
-                mov     r7, r7, pull #24
-                orr     r7, r7, r8, push #8
-                stmia   dst!, {r4, r5, r6, r7}
-                adcs    sum, sum, r4
-                adcs    sum, sum, r5
-                adcs    sum, sum, r6
-                adcs    sum, sum, r7
-                mov     r4, r8, pull #24
-                sub     ip, ip, #16
-                teq     ip, #0
-                bne     1b
-2:              ands    ip, len, #12
-                beq     4f
-                tst     ip, #8
-                beq     3f
-                load2l  r5, r6
-                orr     r4, r4, r5, push #8
-                mov     r5, r5, pull #24
-                orr     r5, r5, r6, push #8
-                stmia   dst!, {r4, r5}
-                adcs    sum, sum, r4
-                adcs    sum, sum, r5
-                mov     r4, r6, pull #24
-                tst     ip, #4
-                beq     4f
-3:              load1l  r5
-                orr     r4, r4, r5, push #8
-                str     r4, [dst], #4
-                adcs    sum, sum, r4
-                mov     r4, r5, pull #24
-4:              ands    len, len, #3
-                beq     .done
-/*              mov     r5, r4, lsr #byte(0)
-FIXME? 0 Shift anyhow
-*/
-                tst     len, #2
-                beq     .exit
-                strb    r5, [dst], #1
-                adcs    sum, sum, r4
-                load1l  r4
-/*              mov     r5, r4, lsr #byte(0)
-FIXME? 0 Shift anyhow
-*/
-                strb    r5, [dst], #1
-                adcs    sum, sum, r4, push #24
-                mov     r5, r4, lsr #byte(1)
-                b       .exit
diff --git a/arch/arm26/lib/csumpartialcopyuser.S b/arch/arm26/lib/csumpartialcopyuser.S
deleted file mode 100644
index a98eea74305a..000000000000
--- a/arch/arm26/lib/csumpartialcopyuser.S
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  linux/arch/arm26/lib/csumpartialcopyuser.S
- *
- *  Copyright (C) 1995-1998 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-#include <asm/errno.h>
-#include <asm/asm-offsets.h>
-
-                .text
-
-                .macro  save_regs
-                stmfd   sp!, {r1 - r2, r4 - r9, fp, ip, lr, pc}
-                mov     r9, sp, lsr #13
-                mov     r9, r9, lsl #13
-                ldr     r9, [r9, #TSK_ADDR_LIMIT]
-                mov     r9, r9, lsr #24
-                .endm
-
-                .macro  load_regs,flags
-                ldm\flags       fp, {r1, r2, r4-r9, fp, sp, pc}^
-                .endm
-
-                .macro  load1b, reg1
-                tst     r9, #0x01
-9999:           ldreqbt \reg1, [r0], #1
-                ldrneb  \reg1, [r0], #1
-                .section __ex_table, "a"
-                .align  3
-                .long   9999b, 6001f
-                .previous
-                .endm
-
-                .macro  load2b, reg1, reg2
-                tst     r9, #0x01
-9999:           ldreqbt \reg1, [r0], #1
-                ldrneb  \reg1, [r0], #1
-9998:           ldreqbt \reg2, [r0], #1
-                ldrneb  \reg2, [r0], #1
-                .section __ex_table, "a"
-                .long   9999b, 6001f
-                .long   9998b, 6001f
-                .previous
-                .endm
-
-                .macro  load1l, reg1
-                tst     r9, #0x01
-9999:           ldreqt  \reg1, [r0], #4
-                ldrne   \reg1, [r0], #4
-                .section __ex_table, "a"
-                .align  3
-                .long   9999b, 6001f
-                .previous
-                .endm
-
-                .macro  load2l, reg1, reg2
-                tst     r9, #0x01
-                ldmneia r0!, {\reg1, \reg2}
-9999:           ldreqt  \reg1, [r0], #4
-9998:           ldreqt  \reg2, [r0], #4
-                .section __ex_table, "a"
-                .long   9999b, 6001f
-                .long   9998b, 6001f
-                .previous
-                .endm
-
-                .macro  load4l, reg1, reg2, reg3, reg4
-                tst     r9, #0x01
-                ldmneia r0!, {\reg1, \reg2, \reg3, \reg4}
-9999:           ldreqt  \reg1, [r0], #4
-9998:           ldreqt  \reg2, [r0], #4
-9997:           ldreqt  \reg3, [r0], #4
-9996:           ldreqt  \reg4, [r0], #4
-                .section __ex_table, "a"
-                .long   9999b, 6001f
-                .long   9998b, 6001f
-                .long   9997b, 6001f
-                .long   9996b, 6001f
-                .previous
-                .endm
-
-/*
- * unsigned int
- * csum_partial_copy_from_user(const char *src, char *dst, int len, int sum, int *err_ptr)
- *  r0 = src, r1 = dst, r2 = len, r3 = sum, [sp] = *err_ptr
- *  Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
- */
-
-#define FN_ENTRY        ENTRY(csum_partial_copy_from_user)
-
-#include "csumpartialcopygeneric.S"
-
-/*
- * FIXME: minor buglet here
- * We don't return the checksum for the data present in the buffer.  To do
- * so properly, we would have to add in whatever registers were loaded before
- * the fault, which, with the current asm above is not predictable.
- */
-                .align  4
-6001:           mov     r4, #-EFAULT
-                ldr     r5, [fp, #4]            @ *err_ptr
-                str     r4, [r5]
-                ldmia   sp, {r1, r2}            @ retrieve dst, len
-                add     r2, r2, r1
-                mov     r0, #0                  @ zero the buffer
-6002:           teq     r2, r1
-                strneb  r0, [r1], #1
-                bne     6002b
-                load_regs       ea
diff --git a/arch/arm26/lib/delay.S b/arch/arm26/lib/delay.S
deleted file mode 100644
index 66f2b68e1b13..000000000000
--- a/arch/arm26/lib/delay.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  linux/arch/arm26/lib/delay.S
- *
- *  Copyright (C) 1995, 1996 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-                .text
-
-LC0:            .word   loops_per_jiffy
-
-/*
- * 0 <= r0 <= 2000
- */
-ENTRY(udelay)
-                mov     r2,     #0x6800
-                orr     r2, r2, #0x00db
-                mul     r1, r0, r2
-                ldr     r2, LC0
-                ldr     r2, [r2]
-                mov     r1, r1, lsr #11
-                mov     r2, r2, lsr #11
-                mul     r0, r1, r2
-                movs    r0, r0, lsr #6
-                RETINSTR(moveq,pc,lr)
-
-/*
- * loops = (r0 * 0x10c6 * 100 * loops_per_jiffy) / 2^32
- *
- * Oh, if only we had a cycle counter...
- */
-
-@ Delay routine
-ENTRY(__delay)
-                subs    r0, r0, #1
-#if 0
-                RETINSTR(movls,pc,lr)
-                subs    r0, r0, #1
-                RETINSTR(movls,pc,lr)
-                subs    r0, r0, #1
-                RETINSTR(movls,pc,lr)
-                subs    r0, r0, #1
-                RETINSTR(movls,pc,lr)
-                subs    r0, r0, #1
-                RETINSTR(movls,pc,lr)
-                subs    r0, r0, #1
-                RETINSTR(movls,pc,lr)
-                subs    r0, r0, #1
-                RETINSTR(movls,pc,lr)
-                subs    r0, r0, #1
-#endif
-                bhi     __delay
-                RETINSTR(mov,pc,lr)
diff --git a/arch/arm26/lib/ecard.S b/arch/arm26/lib/ecard.S
deleted file mode 100644
index 658bc4529c9d..000000000000
--- a/arch/arm26/lib/ecard.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  linux/arch/arm26/lib/ecard.S
- *
- *  Copyright (C) 1995, 1996 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-#include <asm/hardware.h>
-
-#define CPSR2SPSR(rt)
-
-@ Purpose: call an expansion card loader to read bytes.
-@ Proto  : char read_loader(int offset, char *card_base, char *loader);
-@ Returns: byte read
-
-ENTRY(ecard_loader_read)
-                stmfd   sp!, {r4 - r12, lr}
-                mov     r11, r1
-                mov     r1, r0
-                CPSR2SPSR(r0)
-                mov     lr, pc
-                mov     pc, r2
-                LOADREGS(fd, sp!, {r4 - r12, pc})
-
-@ Purpose: call an expansion card loader to reset the card
-@ Proto  : void read_loader(int card_base, char *loader);
-@ Returns: byte read
-
-ENTRY(ecard_loader_reset)
-                stmfd   sp!, {r4 - r12, lr}
-                mov     r11, r0
-                CPSR2SPSR(r0)
-                mov     lr, pc
-                add     pc, r1, #8
-                LOADREGS(fd, sp!, {r4 - r12, pc})
-
diff --git a/arch/arm26/lib/findbit.S b/arch/arm26/lib/findbit.S
deleted file mode 100644
index 26f67cccc37c..000000000000
--- a/arch/arm26/lib/findbit.S
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  linux/arch/arm/lib/findbit.S
- *
- *  Copyright (C) 1995-2000 Russell King
- *
- * 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.
- *
- * 16th March 2001 - John Ripley <jripley@sonicblue.com>
- *   Fixed so that "size" is an exclusive not an inclusive quantity.
- *   All users of these functions expect exclusive sizes, and may
- *   also call with zero size.
- * Reworked by rmk.
- */
-#include <linux/linkage.h>
-#include <asm/assembler.h>
-                .text
-
-/*
- * Purpose  : Find a 'zero' bit
- * Prototype: int find_first_zero_bit(void *addr, unsigned int maxbit);
- */
-ENTRY(_find_first_zero_bit_le)
-                teq     r1, #0  
-                beq     3f
-                mov     r2, #0
-1:              ldrb    r3, [r0, r2, lsr #3]
-                eors    r3, r3, #0xff           @ invert bits
-                bne     .found                  @ any now set - found zero bit
-                add     r2, r2, #8              @ next bit pointer
-2:              cmp     r2, r1                  @ any more?
-                blo     1b
-3:              mov     r0, r1                  @ no free bits
-                RETINSTR(mov,pc,lr)
-
-/*
- * Purpose  : Find next 'zero' bit
- * Prototype: int find_next_zero_bit(void *addr, unsigned int maxbit, int offset)
- */
-ENTRY(_find_next_zero_bit_le)
-                teq     r1, #0
-                beq     2b
-                ands    ip, r2, #7
-                beq     1b                      @ If new byte, goto old routine
-                ldrb    r3, [r0, r2, lsr #3]
-                eor     r3, r3, #0xff           @ now looking for a 1 bit
-                movs    r3, r3, lsr ip          @ shift off unused bits
-                bne     .found
-                orr     r2, r2, #7              @ if zero, then no bits here
-                add     r2, r2, #1              @ align bit pointer
-                b       2b                      @ loop for next bit
-
-/*
- * One or more bits in the LSB of r3 are assumed to be set.
- */
-.found:         tst     r3, #0x0f
-                addeq   r2, r2, #4
-                movne   r3, r3, lsl #4
-                tst     r3, #0x30
-                addeq   r2, r2, #2
-                movne   r3, r3, lsl #2
-                tst     r3, #0x40
-                addeq   r2, r2, #1
-                mov     r0, r2
-                RETINSTR(mov,pc,lr)
-
diff --git a/arch/arm26/lib/floppydma.S b/arch/arm26/lib/floppydma.S
deleted file mode 100644
index e99ebbb20353..000000000000
--- a/arch/arm26/lib/floppydma.S
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  linux/arch/arm26/lib/floppydma.S
- *
- *  Copyright (C) 1995, 1996 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-                .text
-
-                .global floppy_fiqin_end
-ENTRY(floppy_fiqin_start)
-                subs    r9, r9, #1
-                ldrgtb  r12, [r11, #-4]
-                ldrleb  r12, [r11], #0
-                strb    r12, [r10], #1
-                subs    pc, lr, #4
-floppy_fiqin_end:
-
-                .global floppy_fiqout_end
-ENTRY(floppy_fiqout_start)
-                subs    r9, r9, #1
-                ldrgeb  r12, [r10], #1
-                movlt   r12, #0
-                strleb  r12, [r11], #0
-                subles  pc, lr, #4
-                strb    r12, [r11, #-4]
-                subs    pc, lr, #4
-floppy_fiqout_end:
diff --git a/arch/arm26/lib/gcclib.h b/arch/arm26/lib/gcclib.h
deleted file mode 100644
index 9895e78904b5..000000000000
--- a/arch/arm26/lib/gcclib.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* gcclib.h -- definitions for various functions 'borrowed' from gcc-2.95.3 */
-/* I Molton     29/07/01 */
-
-#define BITS_PER_UNIT  8
-#define SI_TYPE_SIZE (sizeof (SItype) * BITS_PER_UNIT)
-
-typedef unsigned int UQItype    __attribute__ ((mode (QI)));
-typedef          int SItype     __attribute__ ((mode (SI)));
-typedef unsigned int USItype    __attribute__ ((mode (SI)));
-typedef          int DItype     __attribute__ ((mode (DI)));
-typedef          int word_type  __attribute__ ((mode (__word__)));
-typedef unsigned int UDItype    __attribute__ ((mode (DI)));
-
-struct DIstruct {SItype low, high;};
-
-typedef union
-{
-  struct DIstruct s;
-  DItype ll;
-} DIunion;
-
diff --git a/arch/arm26/lib/getuser.S b/arch/arm26/lib/getuser.S
deleted file mode 100644
index 2b1de7fbfe1f..000000000000
--- a/arch/arm26/lib/getuser.S
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *  linux/arch/arm26/lib/getuser.S
- *
- *  Copyright (C) 2001 Russell King
- *
- * 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.
- *
- *  Idea from x86 version, (C) Copyright 1998 Linus Torvalds
- *
- * These functions have a non-standard call interface to make them more
- * efficient, especially as they return an error value in addition to
- * the "real" return value.
- *
- * __get_user_X
- *
- * Inputs:      r0 contains the address
- * Outputs:     r0 is the error code
- *              r1, r2 contains the zero-extended value
- *              lr corrupted
- *
- * No other registers must be altered.  (see include/asm-arm/uaccess.h
- * for specific ASM register usage).
- *
- * Note that ADDR_LIMIT is either 0 or 0xc0000000.
- * Note also that it is intended that __get_user_bad is not global.
- */
-#include <asm/asm-offsets.h>
-#include <asm/thread_info.h>
-#include <asm/errno.h>
-
-        .global __get_user_1
-__get_user_1:
-        bic     r1, sp, #0x1f00
-        bic     r1, r1, #0x00ff
-        str     lr, [sp, #-4]!
-        ldr     r1, [r1, #TI_ADDR_LIMIT]
-        sub     r1, r1, #1
-        cmp     r0, r1
-        bge     __get_user_bad
-        cmp     r0, #0x02000000
-1:      ldrlsbt r1, [r0]
-        ldrgeb  r1, [r0]
-        mov     r0, #0
-        ldmfd   sp!, {pc}^
-
-        .global __get_user_2
-__get_user_2:
-        bic     r2, sp, #0x1f00
-        bic     r2, r2, #0x00ff
-        str     lr, [sp, #-4]!
-        ldr     r2, [r2, #TI_ADDR_LIMIT]
-        sub     r2, r2, #2
-        cmp     r0, r2
-        bge     __get_user_bad
-        cmp     r0, #0x02000000
-2:      ldrlsbt r1, [r0], #1
-3:      ldrlsbt r2, [r0]
-        ldrgeb  r1, [r0], #1
-        ldrgeb  r2, [r0]
-        orr     r1, r1, r2, lsl #8
-        mov     r0, #0
-        ldmfd   sp!, {pc}^
-
-        .global __get_user_4
-__get_user_4:
-        bic     r1, sp, #0x1f00
-        bic     r1, r1, #0x00ff
-        str     lr, [sp, #-4]!
-        ldr     r1, [r1, #TI_ADDR_LIMIT]
-        sub     r1, r1, #4
-        cmp     r0, r1
-        bge     __get_user_bad
-        cmp     r0, #0x02000000
-4:      ldrlst  r1, [r0]
-        ldrge   r1, [r0]
-        mov     r0, #0
-        ldmfd   sp!, {pc}^
-
-        .global __get_user_8
-__get_user_8:
-        bic     r2, sp, #0x1f00
-        bic     r2, r2, #0x00ff
-        str     lr, [sp, #-4]!
-        ldr     r2, [r2, #TI_ADDR_LIMIT]
-        sub     r2, r2, #8
-        cmp     r0, r2
-        bge     __get_user_bad_8
-        cmp     r0, #0x02000000
-5:      ldrlst  r1, [r0], #4
-6:      ldrlst  r2, [r0]
-        ldrge   r1, [r0], #4
-        ldrge   r2, [r0]
-        mov     r0, #0
-        ldmfd   sp!, {pc}^
-
-__get_user_bad_8:
-        mov     r2, #0
-__get_user_bad:
-        mov     r1, #0
-        mov     r0, #-EFAULT
-        ldmfd   sp!, {pc}^
-
-.section __ex_table, "a"
-        .long   1b, __get_user_bad
-        .long   2b, __get_user_bad
-        .long   3b, __get_user_bad
-        .long   4b, __get_user_bad
-        .long   5b, __get_user_bad_8
-        .long   6b, __get_user_bad_8
-.previous
diff --git a/arch/arm26/lib/io-acorn.S b/arch/arm26/lib/io-acorn.S
deleted file mode 100644
index 5f62ade5be39..000000000000
--- a/arch/arm26/lib/io-acorn.S
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  linux/arch/arm26/lib/io-acorn.S
- *
- *  Copyright (C) 1995, 1996 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-#include <asm/hardware.h>
-
-                .text
-                .align
-
-                .equ    diff_pcio_base, PCIO_BASE - IO_BASE
-
-                .macro  outw2   rd
-                mov     r8, \rd, lsl #16
-                orr     r8, r8, r8, lsr #16
-                str     r8, [r3, r0, lsl #2]
-                mov     r8, \rd, lsr #16
-                orr     r8, r8, r8, lsl #16
-                str     r8, [r3, r0, lsl #2]
-                .endm
-
-                .macro  inw2    rd, mask, temp
-                ldr     \rd, [r0]
-                and     \rd, \rd, \mask
-                ldr     \temp, [r0]
-                orr     \rd, \rd, \temp, lsl #16
-                .endm
-
-                .macro  addr    rd
-                tst     \rd, #0x80000000
-                mov     \rd, \rd, lsl #2
-                add     \rd, \rd, #IO_BASE
-                addeq   \rd, \rd, #diff_pcio_base
-                .endm
-
-.iosl_warning:
-                .ascii  "<4>insl/outsl not implemented, called from %08lX\0"
-                .align
-
-/*
- * These make no sense on Acorn machines.
- * Print a warning message.
- */
-ENTRY(insl)
-ENTRY(outsl)
-                adr     r0, .iosl_warning
-                mov     r1, lr
-                b       printk
-
-@ Purpose: write a memc register
-@ Proto  : void memc_write(int register, int value);
-@ Returns: nothing
-
-ENTRY(memc_write)
-                cmp     r0, #7
-                RETINSTR(movgt,pc,lr)
-                mov     r0, r0, lsl #17
-                mov     r1, r1, lsl #15
-                mov     r1, r1, lsr #17
-                orr     r0, r0, r1, lsl #2
-                add     r0, r0, #0x03600000
-                strb    r0, [r0]
-                RETINSTR(mov,pc,lr)
-
diff --git a/arch/arm26/lib/io-readsb.S b/arch/arm26/lib/io-readsb.S
deleted file mode 100644
index 4c4d99c05856..000000000000
--- a/arch/arm26/lib/io-readsb.S
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  linux/arch/arm26/lib/io-readsb.S
- *
- *  Copyright (C) 1995-2000 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-#include <asm/hardware.h>
-
-.insb_align:    rsb     ip, ip, #4
-                cmp     ip, r2
-                movgt   ip, r2
-                cmp     ip, #2
-                ldrb    r3, [r0]
-                strb    r3, [r1], #1
-                ldrgeb  r3, [r0]
-                strgeb  r3, [r1], #1
-                ldrgtb  r3, [r0]
-                strgtb  r3, [r1], #1
-                subs    r2, r2, ip
-                bne     .insb_aligned
-
-ENTRY(__raw_readsb)
-                teq     r2, #0          @ do we have to check for the zero len?
-                moveq   pc, lr
-                ands    ip, r1, #3
-                bne     .insb_align
-
-.insb_aligned:  stmfd   sp!, {r4 - r6, lr}
-
-                subs    r2, r2, #16
-                bmi     .insb_no_16
-
-.insb_16_lp:    ldrb    r3, [r0]
-                ldrb    r4, [r0]
-                orr     r3, r3, r4, lsl #8
-                ldrb    r4, [r0]
-                orr     r3, r3, r4, lsl #16
-                ldrb    r4, [r0]
-                orr     r3, r3, r4, lsl #24
-                ldrb    r4, [r0]
-                ldrb    r5, [r0]
-                orr     r4, r4, r5, lsl #8
-                ldrb    r5, [r0]
-                orr     r4, r4, r5, lsl #16
-                ldrb    r5, [r0]
-                orr     r4, r4, r5, lsl #24
-                ldrb    r5, [r0]
-                ldrb    r6, [r0]
-                orr     r5, r5, r6, lsl #8
-                ldrb    r6, [r0]
-                orr     r5, r5, r6, lsl #16
-                ldrb    r6, [r0]
-                orr     r5, r5, r6, lsl #24
-                ldrb    r6, [r0]
-                ldrb    ip, [r0]
-                orr     r6, r6, ip, lsl #8
-                ldrb    ip, [r0]
-                orr     r6, r6, ip, lsl #16
-                ldrb    ip, [r0]
-                orr     r6, r6, ip, lsl #24
-                stmia   r1!, {r3 - r6}
-
-                subs    r2, r2, #16
-                bpl     .insb_16_lp
-
-                tst     r2, #15
-                LOADREGS(eqfd, sp!, {r4 - r6, pc})
-
-.insb_no_16:    tst     r2, #8
-                beq     .insb_no_8
-
-                ldrb    r3, [r0]
-                ldrb    r4, [r0]
-                orr     r3, r3, r4, lsl #8
-                ldrb    r4, [r0]
-                orr     r3, r3, r4, lsl #16
-                ldrb    r4, [r0]
-                orr     r3, r3, r4, lsl #24
-                ldrb    r4, [r0]
-                ldrb    r5, [r0]
-                orr     r4, r4, r5, lsl #8
-                ldrb    r5, [r0]
-                orr     r4, r4, r5, lsl #16
-                ldrb    r5, [r0]
-                orr     r4, r4, r5, lsl #24
-                stmia   r1!, {r3, r4}
-
-.insb_no_8:     tst     r2, #4
-                beq     .insb_no_4
-
-                ldrb    r3, [r0]
-                ldrb    r4, [r0]
-                orr     r3, r3, r4, lsl #8
-                ldrb    r4, [r0]
-                orr     r3, r3, r4, lsl #16
-                ldrb    r4, [r0]
-                orr     r3, r3, r4, lsl #24
-                str     r3, [r1], #4
-
-.insb_no_4:     ands    r2, r2, #3
-                LOADREGS(eqfd, sp!, {r4 - r6, pc})
-
-                cmp     r2, #2
-                ldrb    r3, [r0]
-                strb    r3, [r1], #1
-                ldrgeb  r3, [r0]
-                strgeb  r3, [r1], #1
-                ldrgtb  r3, [r0]
-                strgtb  r3, [r1]
-
-                LOADREGS(fd, sp!, {r4 - r6, pc})
diff --git a/arch/arm26/lib/io-readsl.S b/arch/arm26/lib/io-readsl.S
deleted file mode 100644
index 7be208bd23c6..000000000000
--- a/arch/arm26/lib/io-readsl.S
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  linux/arch/arm26/lib/io-readsl.S
- *
- *  Copyright (C) 1995-2000 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-#include <asm/hardware.h>
-
-/*
- * Note that some reads can be aligned on half-word boundaries.
- */
-ENTRY(__raw_readsl)
-                teq     r2, #0          @ do we have to check for the zero len?
-                moveq   pc, lr
-                ands    ip, r1, #3
-                bne     2f
-
-1:              ldr     r3, [r0]
-                str     r3, [r1], #4
-                subs    r2, r2, #1
-                bne     1b
-                mov     pc, lr
-
-2:              cmp     ip, #2
-                ldr     ip, [r0]
-                blt     4f
-                bgt     6f
-
-                strb    ip, [r1], #1
-                mov     ip, ip, lsr #8
-                strb    ip, [r1], #1
-                mov     ip, ip, lsr #8
-3:              subs    r2, r2, #1
-                ldrne   r3, [r0]
-                orrne   ip, ip, r3, lsl #16
-                strne   ip, [r1], #4
-                movne   ip, r3, lsr #16
-                bne     3b
-                strb    ip, [r1], #1
-                mov     ip, ip, lsr #8
-                strb    ip, [r1], #1
-                mov     pc, lr
-
-4:              strb    ip, [r1], #1
-                mov     ip, ip, lsr #8
-                strb    ip, [r1], #1
-                mov     ip, ip, lsr #8
-                strb    ip, [r1], #1
-                mov     ip, ip, lsr #8
-5:              subs    r2, r2, #1
-                ldrne   r3, [r0]
-                orrne   ip, ip, r3, lsl #8
-                strne   ip, [r1], #4
-                movne   ip, r3, lsr #24
-                bne     5b
-                strb    ip, [r1], #1
-                mov     pc, lr
-
-6:              strb    ip, [r1], #1
-                mov     ip, ip, lsr #8
-7:              subs    r2, r2, #1
-                ldrne   r3, [r0]
-                orrne   ip, ip, r3, lsl #24
-                strne   ip, [r1], #4
-                movne   ip, r3, lsr #8
-                bne     7b
-                strb    ip, [r1], #1
-                mov     ip, ip, lsr #8
-                strb    ip, [r1], #1
-                mov     ip, ip, lsr #8
-                strb    ip, [r1], #1
-                mov     pc, lr
-
diff --git a/arch/arm26/lib/io-readsw.S b/arch/arm26/lib/io-readsw.S
deleted file mode 100644
index c65c1f28fcff..000000000000
--- a/arch/arm26/lib/io-readsw.S
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *  linux/arch/arm26/lib/io-readsw.S
- *
- *  Copyright (C) 1995-2000 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-#include <asm/hardware.h>
-
-.insw_bad_alignment:
-                adr     r0, .insw_bad_align_msg
-                mov     r2, lr
-                b       panic
-.insw_bad_align_msg:
-                .asciz  "insw: bad buffer alignment (0x%p, lr=0x%08lX)\n"
-                .align
-
-.insw_align:    tst     r1, #1
-                bne     .insw_bad_alignment
-
-                ldr     r3, [r0]
-                strb    r3, [r1], #1
-                mov     r3, r3, lsr #8
-                strb    r3, [r1], #1
-
-                subs    r2, r2, #1
-                RETINSTR(moveq, pc, lr)
-
-ENTRY(__raw_readsw)
-                teq     r2, #0          @ do we have to check for the zero len?
-                moveq   pc, lr
-                tst     r1, #3
-                bne     .insw_align
-
-.insw_aligned:  mov     ip, #0xff
-                orr     ip, ip, ip, lsl #8
-                stmfd   sp!, {r4, r5, r6, lr}
-
-                subs    r2, r2, #8
-                bmi     .no_insw_8
-
-.insw_8_lp:     ldr     r3, [r0]
-                and     r3, r3, ip
-                ldr     r4, [r0]
-                orr     r3, r3, r4, lsl #16
-
-                ldr     r4, [r0]
-                and     r4, r4, ip
-                ldr     r5, [r0]
-                orr     r4, r4, r5, lsl #16
-
-                ldr     r5, [r0]
-                and     r5, r5, ip
-                ldr     r6, [r0]
-                orr     r5, r5, r6, lsl #16
-
-                ldr     r6, [r0]
-                and     r6, r6, ip
-                ldr     lr, [r0]
-                orr     r6, r6, lr, lsl #16
-
-                stmia   r1!, {r3 - r6}
-
-                subs    r2, r2, #8
-                bpl     .insw_8_lp
-
-                tst     r2, #7
-                LOADREGS(eqfd, sp!, {r4, r5, r6, pc})
-
-.no_insw_8:     tst     r2, #4
-                beq     .no_insw_4
-
-                ldr     r3, [r0]
-                and     r3, r3, ip
-                ldr     r4, [r0]
-                orr     r3, r3, r4, lsl #16
-
-                ldr     r4, [r0]
-                and     r4, r4, ip
-                ldr     r5, [r0]
-                orr     r4, r4, r5, lsl #16
-
-                stmia   r1!, {r3, r4}
-
-.no_insw_4:     tst     r2, #2
-                beq     .no_insw_2
-
-                ldr     r3, [r0]
-                and     r3, r3, ip
-                ldr     r4, [r0]
-                orr     r3, r3, r4, lsl #16
-
-                str     r3, [r1], #4
-
-.no_insw_2:     tst     r2, #1
-                ldrne   r3, [r0]
-                strneb  r3, [r1], #1
-                movne   r3, r3, lsr #8
-                strneb  r3, [r1]
-
-                LOADREGS(fd, sp!, {r4, r5, r6, pc})
-
-
diff --git a/arch/arm26/lib/io-writesb.S b/arch/arm26/lib/io-writesb.S
deleted file mode 100644
index 16251b4d5101..000000000000
--- a/arch/arm26/lib/io-writesb.S
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- *  linux/arch/arm26/lib/io-writesb.S
- *
- *  Copyright (C) 1995-2000 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-#include <asm/hardware.h>
-
-.outsb_align:   rsb     ip, ip, #4
-                cmp     ip, r2
-                movgt   ip, r2
-                cmp     ip, #2
-                ldrb    r3, [r1], #1
-                strb    r3, [r0]
-                ldrgeb  r3, [r1], #1
-                strgeb  r3, [r0]
-                ldrgtb  r3, [r1], #1
-                strgtb  r3, [r0]
-                subs    r2, r2, ip
-                bne     .outsb_aligned
-
-ENTRY(__raw_writesb)
-                teq     r2, #0          @ do we have to check for the zero len?
-                moveq   pc, lr
-                ands    ip, r1, #3
-                bne     .outsb_align
-
-.outsb_aligned: stmfd   sp!, {r4 - r6, lr}
-
-                subs    r2, r2, #16
-                bmi     .outsb_no_16
-
-.outsb_16_lp:   ldmia   r1!, {r3 - r6}
-
-                strb    r3, [r0]
-                mov     r3, r3, lsr #8
-                strb    r3, [r0]
-                mov     r3, r3, lsr #8
-                strb    r3, [r0]
-                mov     r3, r3, lsr #8
-                strb    r3, [r0]
-
-                strb    r4, [r0]
-                mov     r4, r4, lsr #8
-                strb    r4, [r0]
-                mov     r4, r4, lsr #8
-                strb    r4, [r0]
-                mov     r4, r4, lsr #8
-                strb    r4, [r0]
-
-                strb    r5, [r0]
-                mov     r5, r5, lsr #8
-                strb    r5, [r0]
-                mov     r5, r5, lsr #8
-                strb    r5, [r0]
-                mov     r5, r5, lsr #8
-                strb    r5, [r0]
-
-                strb    r6, [r0]
-                mov     r6, r6, lsr #8
-                strb    r6, [r0]
-                mov     r6, r6, lsr #8
-                strb    r6, [r0]
-                mov     r6, r6, lsr #8
-                strb    r6, [r0]
-
-                subs    r2, r2, #16
-                bpl     .outsb_16_lp
-
-                tst     r2, #15
-                LOADREGS(eqfd, sp!, {r4 - r6, pc})
-
-.outsb_no_16:   tst     r2, #8
-                beq     .outsb_no_8
-
-                ldmia   r1!, {r3, r4}
-
-                strb    r3, [r0]
-                mov     r3, r3, lsr #8
-                strb    r3, [r0]
-                mov     r3, r3, lsr #8
-                strb    r3, [r0]
-                mov     r3, r3, lsr #8
-                strb    r3, [r0]
-
-                strb    r4, [r0]
-                mov     r4, r4, lsr #8
-                strb    r4, [r0]
-                mov     r4, r4, lsr #8
-                strb    r4, [r0]
-                mov     r4, r4, lsr #8
-                strb    r4, [r0]
-
-.outsb_no_8:    tst     r2, #4
-                beq     .outsb_no_4
-
-                ldr     r3, [r1], #4
-                strb    r3, [r0]
-                mov     r3, r3, lsr #8
-                strb    r3, [r0]
-                mov     r3, r3, lsr #8
-                strb    r3, [r0]
-                mov     r3, r3, lsr #8
-                strb    r3, [r0]
-
-.outsb_no_4:    ands    r2, r2, #3
-                LOADREGS(eqfd, sp!, {r4 - r6, pc})
-
-                cmp     r2, #2
-                ldrb    r3, [r1], #1
-                strb    r3, [r0]
-                ldrgeb  r3, [r1], #1
-                strgeb  r3, [r0]
-                ldrgtb  r3, [r1]
-                strgtb  r3, [r0]
-
-                LOADREGS(fd, sp!, {r4 - r6, pc})
diff --git a/arch/arm26/lib/io-writesl.S b/arch/arm26/lib/io-writesl.S
deleted file mode 100644
index 4d6049b16e71..000000000000
--- a/arch/arm26/lib/io-writesl.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  linux/arch/arm26/lib/io-writesl.S
- *
- *  Copyright (C) 1995-2000 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-#include <asm/hardware.h>
-
-ENTRY(__raw_writesl)
-                teq     r2, #0          @ do we have to check for the zero len?
-                moveq   pc, lr
-                ands    ip, r1, #3
-                bne     2f
-
-1:              ldr     r3, [r1], #4
-                str     r3, [r0]
-                subs    r2, r2, #1
-                bne     1b
-                mov     pc, lr
-
-2:              bic     r1, r1, #3
-                cmp     ip, #2
-                ldr     r3, [r1], #4
-                bgt     4f
-                blt     5f
-
-3:              mov     ip, r3, lsr #16
-                ldr     r3, [r1], #4
-                orr     ip, ip, r3, lsl #16
-                str     ip, [r0]
-                subs    r2, r2, #1
-                bne     3b
-                mov     pc, lr
-
-4:              mov     ip, r3, lsr #24
-                ldr     r3, [r1], #4
-                orr     ip, ip, r3, lsl #8
-                str     ip, [r0]
-                subs    r2, r2, #1
-                bne     4b
-                mov     pc, lr
-
-5:              mov     ip, r3, lsr #8
-                ldr     r3, [r1], #4
-                orr     ip, ip, r3, lsl #24
-                str     ip, [r0]
-                subs    r2, r2, #1
-                bne     5b
-                mov     pc, lr
-
-
diff --git a/arch/arm26/lib/io-writesw.S b/arch/arm26/lib/io-writesw.S
deleted file mode 100644
index a24f891f6b1c..000000000000
--- a/arch/arm26/lib/io-writesw.S
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- *  linux/arch/arm26/lib/io-writesw.S
- *
- *  Copyright (C) 1995-2000 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-#include <asm/hardware.h>
-
-.outsw_bad_alignment:
-                adr     r0, .outsw_bad_align_msg
-                mov     r2, lr
-                b       panic
-.outsw_bad_align_msg:
-                .asciz  "outsw: bad buffer alignment (0x%p, lr=0x%08lX)\n"
-                .align
-
-.outsw_align:   tst     r1, #1
-                bne     .outsw_bad_alignment
-
-                add     r1, r1, #2
-
-                ldr     r3, [r1, #-4]
-                mov     r3, r3, lsr #16
-                orr     r3, r3, r3, lsl #16
-                str     r3, [r0]
-                subs    r2, r2, #1
-                RETINSTR(moveq, pc, lr)
-
-ENTRY(__raw_writesw)
-                teq     r2, #0          @ do we have to check for the zero len?
-                moveq   pc, lr
-                tst     r1, #3
-                bne     .outsw_align
-
-.outsw_aligned: stmfd   sp!, {r4, r5, r6, lr}
-
-                subs    r2, r2, #8
-                bmi     .no_outsw_8
-
-.outsw_8_lp:    ldmia   r1!, {r3, r4, r5, r6}
-
-                mov     ip, r3, lsl #16
-                orr     ip, ip, ip, lsr #16
-                str     ip, [r0]
-
-                mov     ip, r3, lsr #16
-                orr     ip, ip, ip, lsl #16
-                str     ip, [r0]
-
-                mov     ip, r4, lsl #16
-                orr     ip, ip, ip, lsr #16
-                str     ip, [r0]
-
-                mov     ip, r4, lsr #16
-                orr     ip, ip, ip, lsl #16
-                str     ip, [r0]
-
-                mov     ip, r5, lsl #16
-                orr     ip, ip, ip, lsr #16
-                str     ip, [r0]
-
-                mov     ip, r5, lsr #16
-                orr     ip, ip, ip, lsl #16
-                str     ip, [r0]
-
-                mov     ip, r6, lsl #16
-                orr     ip, ip, ip, lsr #16
-                str     ip, [r0]
-
-                mov     ip, r6, lsr #16
-                orr     ip, ip, ip, lsl #16
-                str     ip, [r0]
-
-                subs    r2, r2, #8
-                bpl     .outsw_8_lp
-
-                tst     r2, #7
-                LOADREGS(eqfd, sp!, {r4, r5, r6, pc})
-
-.no_outsw_8:    tst     r2, #4
-                beq     .no_outsw_4
-
-                ldmia   r1!, {r3, r4}
-
-                mov     ip, r3, lsl #16
-                orr     ip, ip, ip, lsr #16
-                str     ip, [r0]
-
-                mov     ip, r3, lsr #16
-                orr     ip, ip, ip, lsl #16
-                str     ip, [r0]
-
-                mov     ip, r4, lsl #16
-                orr     ip, ip, ip, lsr #16
-                str     ip, [r0]
-
-                mov     ip, r4, lsr #16
-                orr     ip, ip, ip, lsl #16
-                str     ip, [r0]
-
-.no_outsw_4:    tst     r2, #2
-                beq     .no_outsw_2
-
-                ldr     r3, [r1], #4
-
-                mov     ip, r3, lsl #16
-                orr     ip, ip, ip, lsr #16
-                str     ip, [r0]
-
-                mov     ip, r3, lsr #16
-                orr     ip, ip, ip, lsl #16
-                str     ip, [r0]
-
-.no_outsw_2:    tst     r2, #1
-
-                ldrne   r3, [r1]
-
-                movne   ip, r3, lsl #16
-                orrne   ip, ip, ip, lsr #16
-                strne   ip, [r0]
-
-                LOADREGS(fd, sp!, {r4, r5, r6, pc})
diff --git a/arch/arm26/lib/kbd.c b/arch/arm26/lib/kbd.c
deleted file mode 100644
index cb56e943e006..000000000000
--- a/arch/arm26/lib/kbd.c
+++ /dev/null
@@ -1,278 +0,0 @@
-#include <linux/kd.h>
-//#include <linux/kbd_ll.h>
-#include <linux/kbd_kern.h>
-
-/*
- * Translation of escaped scancodes to keycodes.
- * This is now user-settable.
- * The keycodes 1-88,96-111,119 are fairly standard, and
- * should probably not be changed - changing might confuse X.
- * X also interprets scancode 0x5d (KEY_Begin).
- *
- * For 1-88 keycode equals scancode.
- */
-
-#define E0_KPENTER 96
-#define E0_RCTRL   97
-#define E0_KPSLASH 98
-#define E0_PRSCR   99
-#define E0_RALT    100
-#define E0_BREAK   101          /* (control-pause) */
-#define E0_HOME    102
-#define E0_UP      103
-#define E0_PGUP    104
-#define E0_LEFT    105
-#define E0_RIGHT   106
-#define E0_END     107
-#define E0_DOWN    108
-#define E0_PGDN    109
-#define E0_INS     110
-#define E0_DEL     111
-
-/* for USB 106 keyboard */
-#define E0_YEN         124
-#define E0_BACKSLASH   89
-
-
-#define E1_PAUSE   119
-
-/*
- * The keycodes below are randomly located in 89-95,112-118,120-127.
- * They could be thrown away (and all occurrences below replaced by 0),
- * but that would force many users to use the `setkeycodes' utility, where
- * they needed not before. It does not matter that there are duplicates, as
- * long as no duplication occurs for any single keyboard.
- */
-#define SC_LIM 89
-
-#define FOCUS_PF1 85            /* actual code! */
-#define FOCUS_PF2 89
-#define FOCUS_PF3 90
-#define FOCUS_PF4 91
-#define FOCUS_PF5 92
-#define FOCUS_PF6 93
-#define FOCUS_PF7 94
-#define FOCUS_PF8 95
-#define FOCUS_PF9 120
-#define FOCUS_PF10 121
-#define FOCUS_PF11 122
-#define FOCUS_PF12 123
-
-#define JAP_86     124
-/* tfj@olivia.ping.dk:
- * The four keys are located over the numeric keypad, and are
- * labelled A1-A4. It's an rc930 keyboard, from
- * Regnecentralen/RC International, Now ICL.
- * Scancodes: 59, 5a, 5b, 5c.
- */
-#define RGN1 124
-#define RGN2 125
-#define RGN3 126
-#define RGN4 127
-
-static unsigned char high_keys[128 - SC_LIM] = {
-        RGN1, RGN2, RGN3, RGN4, 0, 0, 0,        /* 0x59-0x5f */
-        0, 0, 0, 0, 0, 0, 0, 0, /* 0x60-0x67 */
-        0, 0, 0, 0, 0, FOCUS_PF11, 0, FOCUS_PF12,       /* 0x68-0x6f */
-        0, 0, 0, FOCUS_PF2, FOCUS_PF9, 0, 0, FOCUS_PF3, /* 0x70-0x77 */
-        FOCUS_PF4, FOCUS_PF5, FOCUS_PF6, FOCUS_PF7,     /* 0x78-0x7b */
-        FOCUS_PF8, JAP_86, FOCUS_PF10, 0        /* 0x7c-0x7f */
-};
-
-/* BTC */
-#define E0_MACRO   112
-/* LK450 */
-#define E0_F13     113
-#define E0_F14     114
-#define E0_HELP    115
-#define E0_DO      116
-#define E0_F17     117
-#define E0_KPMINPLUS 118
-/*
- * My OmniKey generates e0 4c for  the "OMNI" key and the
- * right alt key does nada. [kkoller@nyx10.cs.du.edu]
- */
-#define E0_OK  124
-/*
- * New microsoft keyboard is rumoured to have
- * e0 5b (left window button), e0 5c (right window button),
- * e0 5d (menu button). [or: LBANNER, RBANNER, RMENU]
- * [or: Windows_L, Windows_R, TaskMan]
- */
-#define E0_MSLW        125
-#define E0_MSRW        126
-#define E0_MSTM        127
-
-static unsigned char e0_keys[128] = {
-        0, 0, 0, 0, 0, 0, 0, 0, /* 0x00-0x07 */
-        0, 0, 0, 0, 0, 0, 0, 0, /* 0x08-0x0f */
-        0, 0, 0, 0, 0, 0, 0, 0, /* 0x10-0x17 */
-        0, 0, 0, 0, E0_KPENTER, E0_RCTRL, 0, 0, /* 0x18-0x1f */
-        0, 0, 0, 0, 0, 0, 0, 0, /* 0x20-0x27 */
-        0, 0, 0, 0, 0, 0, 0, 0, /* 0x28-0x2f */
-        0, 0, 0, 0, 0, E0_KPSLASH, 0, E0_PRSCR, /* 0x30-0x37 */
-        E0_RALT, 0, 0, 0, 0, E0_F13, E0_F14, E0_HELP,   /* 0x38-0x3f */
-        E0_DO, E0_F17, 0, 0, 0, 0, E0_BREAK, E0_HOME,   /* 0x40-0x47 */
-        E0_UP, E0_PGUP, 0, E0_LEFT, E0_OK, E0_RIGHT, E0_KPMINPLUS, E0_END,      /* 0x48-0x4f */
-        E0_DOWN, E0_PGDN, E0_INS, E0_DEL, 0, 0, 0, 0,   /* 0x50-0x57 */
-        0, 0, 0, E0_MSLW, E0_MSRW, E0_MSTM, 0, 0,       /* 0x58-0x5f */
-        0, 0, 0, 0, 0, 0, 0, 0, /* 0x60-0x67 */
-        0, 0, 0, 0, 0, 0, 0, E0_MACRO,  /* 0x68-0x6f */
-        //0, 0, 0, 0, 0, 0, 0, 0,                          /* 0x70-0x77 */
-        0, 0, 0, 0, 0, E0_BACKSLASH, 0, 0,      /* 0x70-0x77 */
-        0, 0, 0, E0_YEN, 0, 0, 0, 0     /* 0x78-0x7f */
-};
-
-static int gen_setkeycode(unsigned int scancode, unsigned int keycode)
-{
-        if (scancode < SC_LIM || scancode > 255 || keycode > 127)
-                return -EINVAL;
-        if (scancode < 128)
-                high_keys[scancode - SC_LIM] = keycode;
-        else
-                e0_keys[scancode - 128] = keycode;
-        return 0;
-}
-
-static int gen_getkeycode(unsigned int scancode)
-{
-        return
-            (scancode < SC_LIM || scancode > 255) ? -EINVAL :
-            (scancode <
-             128) ? high_keys[scancode - SC_LIM] : e0_keys[scancode - 128];
-}
-
-static int
-gen_translate(unsigned char scancode, unsigned char *keycode, char raw_mode)
-{
-        static int prev_scancode;
-
-        /* special prefix scancodes.. */
-        if (scancode == 0xe0 || scancode == 0xe1) {
-                prev_scancode = scancode;
-                return 0;
-        }
-
-        /* 0xFF is sent by a few keyboards, ignore it. 0x00 is error */
-        if (scancode == 0x00 || scancode == 0xff) {
-                prev_scancode = 0;
-                return 0;
-        }
-
-        scancode &= 0x7f;
-
-        if (prev_scancode) {
-                /*
-                 * usually it will be 0xe0, but a Pause key generates
-                 * e1 1d 45 e1 9d c5 when pressed, and nothing when released
-                 */
-                if (prev_scancode != 0xe0) {
-                        if (prev_scancode == 0xe1 && scancode == 0x1d) {
-                                prev_scancode = 0x100;
-                                return 0;
-                        }
-                                else if (prev_scancode == 0x100
-                                         && scancode == 0x45) {
-                                *keycode = E1_PAUSE;
-                                prev_scancode = 0;
-                        } else {
-#ifdef KBD_REPORT_UNKN
-                                if (!raw_mode)
-                                        printk(KERN_INFO
-                                               "keyboard: unknown e1 escape sequence\n");
-#endif
-                                prev_scancode = 0;
-                                return 0;
-                        }
-                } else {
-                        prev_scancode = 0;
-                        /*
-                         *  The keyboard maintains its own internal caps lock and
-                         *  num lock statuses. In caps lock mode E0 AA precedes make
-                         *  code and E0 2A follows break code. In num lock mode,
-                         *  E0 2A precedes make code and E0 AA follows break code.
-                         *  We do our own book-keeping, so we will just ignore these.
-                         */
-                        /*
-                         *  For my keyboard there is no caps lock mode, but there are
-                         *  both Shift-L and Shift-R modes. The former mode generates
-                         *  E0 2A / E0 AA pairs, the latter E0 B6 / E0 36 pairs.
-                         *  So, we should also ignore the latter. - aeb@cwi.nl
-                         */
-                        if (scancode == 0x2a || scancode == 0x36)
-                                return 0;
-
-                        if (e0_keys[scancode])
-                                *keycode = e0_keys[scancode];
-                        else {
-#ifdef KBD_REPORT_UNKN
-                                if (!raw_mode)
-                                        printk(KERN_INFO
-                                               "keyboard: unknown scancode e0 %02x\n",
-                                               scancode);
-#endif
-                                return 0;
-                        }
-                }
-        } else if (scancode >= SC_LIM) {
-                /* This happens with the FOCUS 9000 keyboard
-                   Its keys PF1..PF12 are reported to generate
-                   55 73 77 78 79 7a 7b 7c 74 7e 6d 6f
-                   Moreover, unless repeated, they do not generate
-                   key-down events, so we have to zero up_flag below */
-                /* Also, Japanese 86/106 keyboards are reported to
-                   generate 0x73 and 0x7d for \ - and \ | respectively. */
-                /* Also, some Brazilian keyboard is reported to produce
-                   0x73 and 0x7e for \ ? and KP-dot, respectively. */
-
-                *keycode = high_keys[scancode - SC_LIM];
-
-                if (!*keycode) {
-                        if (!raw_mode) {
-#ifdef KBD_REPORT_UNKN
-                                printk(KERN_INFO
-                                       "keyboard: unrecognized scancode (%02x)"
-                                       " - ignored\n", scancode);
-#endif
-                        }
-                        return 0;
-                }
-        } else
-                *keycode = scancode;
-        return 1;
-}
-
-static char gen_unexpected_up(unsigned char keycode)
-{
-        /* unexpected, but this can happen: maybe this was a key release for a
-           FOCUS 9000 PF key; if we want to see it, we have to clear up_flag */
-        if (keycode >= SC_LIM || keycode == 85)
-                return 0;
-        else
-                return 0200;
-}
-
-/*
- * These are the default mappings
- */
-int  (*k_setkeycode)(unsigned int, unsigned int) = gen_setkeycode;
-int  (*k_getkeycode)(unsigned int) = gen_getkeycode;
-int  (*k_translate)(unsigned char, unsigned char *, char) = gen_translate;
-char (*k_unexpected_up)(unsigned char) = gen_unexpected_up;
-void (*k_leds)(unsigned char);
-
-/* Simple translation table for the SysRq keys */
-
-#ifdef CONFIG_MAGIC_SYSRQ
-static unsigned char gen_sysrq_xlate[128] =
-        "\000\0331234567890-=\177\t"    /* 0x00 - 0x0f */
-        "qwertyuiop[]\r\000as"  /* 0x10 - 0x1f */
-        "dfghjkl;'`\000\\zxcv"  /* 0x20 - 0x2f */
-        "bnm,./\000*\000 \000\201\202\203\204\205"      /* 0x30 - 0x3f */
-        "\206\207\210\211\212\000\000789-456+1" /* 0x40 - 0x4f */
-        "230\177\000\000\213\214\000\000\000\000\000\000\000\000\000\000"       /* 0x50 - 0x5f */
-        "\r\000/";                      /* 0x60 - 0x6f */
-
-unsigned char *k_sysrq_xlate = gen_sysrq_xlate;
-int k_sysrq_key = 0x54;
-#endif
diff --git a/arch/arm26/lib/lib1funcs.S b/arch/arm26/lib/lib1funcs.S
deleted file mode 100644
index 0e29970b0e8a..000000000000
--- a/arch/arm26/lib/lib1funcs.S
+++ /dev/null
@@ -1,313 +0,0 @@
-@ libgcc1 routines for ARM cpu.
-@ Division routines, written by Richard Earnshaw, (rearnsha@armltd.co.uk)
-
-/* Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
-
-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.
-
-In addition to the permissions in the GNU General Public License, the
-Free Software Foundation gives you unlimited permission to link the
-compiled version of this file with other programs, and to distribute
-those programs without any restriction coming from the use of this
-file.  (The General Public License restrictions do apply in other
-respects; for example, they cover modification of the file, and
-distribution when not linked into another program.)
-
-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 program; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.
- */
-/* This code is derived from gcc 2.95.3 */
-/* I Molton     29/07/01 */
-
-#include <linux/linkage.h>
-#include <asm/assembler.h>
-#include <asm/hardware.h>
-
-#define RET     movs
-#define RETc(x) mov##x##s
-#define RETCOND ^
-
-dividend        .req    r0
-divisor         .req    r1
-result          .req    r2
-overdone        .req    r2
-curbit          .req    r3
-ip              .req    r12
-sp              .req    r13
-lr              .req    r14
-pc              .req    r15
-        
-ENTRY(__udivsi3)
-        cmp     divisor, #0
-        beq     Ldiv0
-        mov     curbit, #1
-        mov     result, #0
-        cmp     dividend, divisor
-        bcc     Lgot_result_udivsi3
-1:
-        @ Unless the divisor is very big, shift it up in multiples of
-        @ four bits, since this is the amount of unwinding in the main
-        @ division loop.  Continue shifting until the divisor is 
-        @ larger than the dividend.
-        cmp     divisor, #0x10000000
-        cmpcc   divisor, dividend
-        movcc   divisor, divisor, lsl #4
-        movcc   curbit, curbit, lsl #4
-        bcc     1b
-
-2:
-        @ For very big divisors, we must shift it a bit at a time, or
-        @ we will be in danger of overflowing.
-        cmp     divisor, #0x80000000
-        cmpcc   divisor, dividend
-        movcc   divisor, divisor, lsl #1
-        movcc   curbit, curbit, lsl #1
-        bcc     2b
-
-3:
-        @ Test for possible subtractions, and note which bits
-        @ are done in the result.  On the final pass, this may subtract
-        @ too much from the dividend, but the result will be ok, since the
-        @ "bit" will have been shifted out at the bottom.
-        cmp     dividend, divisor
-        subcs   dividend, dividend, divisor
-        orrcs   result, result, curbit
-        cmp     dividend, divisor, lsr #1
-        subcs   dividend, dividend, divisor, lsr #1
-        orrcs   result, result, curbit, lsr #1
-        cmp     dividend, divisor, lsr #2
-        subcs   dividend, dividend, divisor, lsr #2
-        orrcs   result, result, curbit, lsr #2
-        cmp     dividend, divisor, lsr #3
-        subcs   dividend, dividend, divisor, lsr #3
-        orrcs   result, result, curbit, lsr #3
-        cmp     dividend, #0                    @ Early termination?
-        movnes  curbit, curbit, lsr #4          @ No, any more bits to do?
-        movne   divisor, divisor, lsr #4
-        bne     3b
-Lgot_result_udivsi3:
-        mov     r0, result
-        RET     pc, lr
-
-Ldiv0:
-        str     lr, [sp, #-4]!
-        bl      __div0
-        mov     r0, #0                  @ about as wrong as it could be
-        ldmia   sp!, {pc}RETCOND
-
-/* __umodsi3 ----------------------- */
-
-ENTRY(__umodsi3)
-        cmp     divisor, #0
-        beq     Ldiv0
-        mov     curbit, #1
-        cmp     dividend, divisor
-        RETc(cc)        pc, lr
-1:
-        @ Unless the divisor is very big, shift it up in multiples of
-        @ four bits, since this is the amount of unwinding in the main
-        @ division loop.  Continue shifting until the divisor is 
-        @ larger than the dividend.
-        cmp     divisor, #0x10000000
-        cmpcc   divisor, dividend
-        movcc   divisor, divisor, lsl #4
-        movcc   curbit, curbit, lsl #4
-        bcc     1b
-
-2:
-        @ For very big divisors, we must shift it a bit at a time, or
-        @ we will be in danger of overflowing.
-        cmp     divisor, #0x80000000
-        cmpcc   divisor, dividend
-        movcc   divisor, divisor, lsl #1
-        movcc   curbit, curbit, lsl #1
-        bcc     2b
-
-3:
-        @ Test for possible subtractions.  On the final pass, this may 
-        @ subtract too much from the dividend, so keep track of which
-        @ subtractions are done, we can fix them up afterwards...
-        mov     overdone, #0
-        cmp     dividend, divisor
-        subcs   dividend, dividend, divisor
-        cmp     dividend, divisor, lsr #1
-        subcs   dividend, dividend, divisor, lsr #1
-        orrcs   overdone, overdone, curbit, ror #1
-        cmp     dividend, divisor, lsr #2
-        subcs   dividend, dividend, divisor, lsr #2
-        orrcs   overdone, overdone, curbit, ror #2
-        cmp     dividend, divisor, lsr #3
-        subcs   dividend, dividend, divisor, lsr #3
-        orrcs   overdone, overdone, curbit, ror #3
-        mov     ip, curbit
-        cmp     dividend, #0                    @ Early termination?
-        movnes  curbit, curbit, lsr #4          @ No, any more bits to do?
-        movne   divisor, divisor, lsr #4
-        bne     3b
-
-        @ Any subtractions that we should not have done will be recorded in
-        @ the top three bits of "overdone".  Exactly which were not needed
-        @ are governed by the position of the bit, stored in ip.
-        @ If we terminated early, because dividend became zero,
-        @ then none of the below will match, since the bit in ip will not be
-        @ in the bottom nibble.
-        ands    overdone, overdone, #0xe0000000
-        RETc(eq)        pc, lr                          @ No fixups needed
-        tst     overdone, ip, ror #3
-        addne   dividend, dividend, divisor, lsr #3
-        tst     overdone, ip, ror #2
-        addne   dividend, dividend, divisor, lsr #2
-        tst     overdone, ip, ror #1
-        addne   dividend, dividend, divisor, lsr #1
-        RET     pc, lr
-
-ENTRY(__divsi3)
-        eor     ip, dividend, divisor           @ Save the sign of the result.
-        mov     curbit, #1
-        mov     result, #0
-        cmp     divisor, #0
-        rsbmi   divisor, divisor, #0            @ Loops below use unsigned.
-        beq     Ldiv0
-        cmp     dividend, #0
-        rsbmi   dividend, dividend, #0
-        cmp     dividend, divisor
-        bcc     Lgot_result_divsi3
-
-1:
-        @ Unless the divisor is very big, shift it up in multiples of
-        @ four bits, since this is the amount of unwinding in the main
-        @ division loop.  Continue shifting until the divisor is 
-        @ larger than the dividend.
-        cmp     divisor, #0x10000000
-        cmpcc   divisor, dividend
-        movcc   divisor, divisor, lsl #4
-        movcc   curbit, curbit, lsl #4
-        bcc     1b
-
-2:
-        @ For very big divisors, we must shift it a bit at a time, or
-        @ we will be in danger of overflowing.
-        cmp     divisor, #0x80000000
-        cmpcc   divisor, dividend
-        movcc   divisor, divisor, lsl #1
-        movcc   curbit, curbit, lsl #1
-        bcc     2b
-
-3:
-        @ Test for possible subtractions, and note which bits
-        @ are done in the result.  On the final pass, this may subtract
-        @ too much from the dividend, but the result will be ok, since the
-        @ "bit" will have been shifted out at the bottom.
-        cmp     dividend, divisor
-        subcs   dividend, dividend, divisor
-        orrcs   result, result, curbit
-        cmp     dividend, divisor, lsr #1
-        subcs   dividend, dividend, divisor, lsr #1
-        orrcs   result, result, curbit, lsr #1
-        cmp     dividend, divisor, lsr #2
-        subcs   dividend, dividend, divisor, lsr #2
-        orrcs   result, result, curbit, lsr #2
-        cmp     dividend, divisor, lsr #3
-        subcs   dividend, dividend, divisor, lsr #3
-        orrcs   result, result, curbit, lsr #3
-        cmp     dividend, #0                    @ Early termination?
-        movnes  curbit, curbit, lsr #4          @ No, any more bits to do?
-        movne   divisor, divisor, lsr #4
-        bne     3b
-Lgot_result_divsi3:
-        mov     r0, result
-        cmp     ip, #0
-        rsbmi   r0, r0, #0
-        RET     pc, lr
-
-ENTRY(__modsi3)
-        mov     curbit, #1
-        cmp     divisor, #0
-        rsbmi   divisor, divisor, #0            @ Loops below use unsigned.
-        beq     Ldiv0
-        @ Need to save the sign of the dividend, unfortunately, we need
-        @ ip later on; this is faster than pushing lr and using that.
-        str     dividend, [sp, #-4]!
-        cmp     dividend, #0
-        rsbmi   dividend, dividend, #0
-        cmp     dividend, divisor
-        bcc     Lgot_result_modsi3
-
-1:
-        @ Unless the divisor is very big, shift it up in multiples of
-        @ four bits, since this is the amount of unwinding in the main
-        @ division loop.  Continue shifting until the divisor is 
-        @ larger than the dividend.
-        cmp     divisor, #0x10000000
-        cmpcc   divisor, dividend
-        movcc   divisor, divisor, lsl #4
-        movcc   curbit, curbit, lsl #4
-        bcc     1b
-
-2:
-        @ For very big divisors, we must shift it a bit at a time, or
-        @ we will be in danger of overflowing.
-        cmp     divisor, #0x80000000
-        cmpcc   divisor, dividend
-        movcc   divisor, divisor, lsl #1
-        movcc   curbit, curbit, lsl #1
-        bcc     2b
-
-3:
-        @ Test for possible subtractions.  On the final pass, this may 
-        @ subtract too much from the dividend, so keep track of which
-        @ subtractions are done, we can fix them up afterwards...
-        mov     overdone, #0
-        cmp     dividend, divisor
-        subcs   dividend, dividend, divisor
-        cmp     dividend, divisor, lsr #1
-        subcs   dividend, dividend, divisor, lsr #1
-        orrcs   overdone, overdone, curbit, ror #1
-        cmp     dividend, divisor, lsr #2
-        subcs   dividend, dividend, divisor, lsr #2
-        orrcs   overdone, overdone, curbit, ror #2
-        cmp     dividend, divisor, lsr #3
-        subcs   dividend, dividend, divisor, lsr #3
-        orrcs   overdone, overdone, curbit, ror #3
-        mov     ip, curbit
-        cmp     dividend, #0                    @ Early termination?
-        movnes  curbit, curbit, lsr #4          @ No, any more bits to do?
-        movne   divisor, divisor, lsr #4
-        bne     3b
-
-        @ Any subtractions that we should not have done will be recorded in
-        @ the top three bits of "overdone".  Exactly which were not needed
-        @ are governed by the position of the bit, stored in ip.
-        @ If we terminated early, because dividend became zero,
-        @ then none of the below will match, since the bit in ip will not be
-        @ in the bottom nibble.
-        ands    overdone, overdone, #0xe0000000
-        beq     Lgot_result_modsi3
-        tst     overdone, ip, ror #3
-        addne   dividend, dividend, divisor, lsr #3
-        tst     overdone, ip, ror #2
-        addne   dividend, dividend, divisor, lsr #2
-        tst     overdone, ip, ror #1
-        addne   dividend, dividend, divisor, lsr #1
-Lgot_result_modsi3:
-        ldr     ip, [sp], #4
-        cmp     ip, #0
-        rsbmi   dividend, dividend, #0
-        RET     pc, lr
diff --git a/arch/arm26/lib/longlong.h b/arch/arm26/lib/longlong.h
deleted file mode 100644
index 05ec1abd6a2c..000000000000
--- a/arch/arm26/lib/longlong.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* longlong.h -- based on code from gcc-2.95.3
-
-   definitions for mixed size 32/64 bit arithmetic.
-   Copyright (C) 1991, 92, 94, 95, 96, 1997, 1998 Free Software Foundation, Inc.
-
-   This definition 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 definition 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 program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* Borrowed from GCC 2.95.3, I Molton 29/07/01 */
-
-#ifndef SI_TYPE_SIZE
-#define SI_TYPE_SIZE 32
-#endif
-
-#define __BITS4 (SI_TYPE_SIZE / 4)
-#define __ll_B (1L << (SI_TYPE_SIZE / 2))
-#define __ll_lowpart(t) ((USItype) (t) % __ll_B)
-#define __ll_highpart(t) ((USItype) (t) / __ll_B)
-
-/* Define auxiliary asm macros.
-
-   1) umul_ppmm(high_prod, low_prod, multipler, multiplicand)
-   multiplies two USItype integers MULTIPLER and MULTIPLICAND,
-   and generates a two-part USItype product in HIGH_PROD and
-   LOW_PROD.
-
-   2) __umulsidi3(a,b) multiplies two USItype integers A and B,
-   and returns a UDItype product.  This is just a variant of umul_ppmm.
-
-   3) udiv_qrnnd(quotient, remainder, high_numerator, low_numerator,
-   denominator) divides a two-word unsigned integer, composed by the
-   integers HIGH_NUMERATOR and LOW_NUMERATOR, by DENOMINATOR and
-   places the quotient in QUOTIENT and the remainder in REMAINDER.
-   HIGH_NUMERATOR must be less than DENOMINATOR for correct operation.
-   If, in addition, the most significant bit of DENOMINATOR must be 1,
-   then the pre-processor symbol UDIV_NEEDS_NORMALIZATION is defined to 1.
-
-   4) sdiv_qrnnd(quotient, remainder, high_numerator, low_numerator,
-   denominator).  Like udiv_qrnnd but the numbers are signed.  The
-   quotient is rounded towards 0.
-
-   5) count_leading_zeros(count, x) counts the number of zero-bits from
-   the msb to the first non-zero bit.  This is the number of steps X
-   needs to be shifted left to set the msb.  Undefined for X == 0.
-
-   6) add_ssaaaa(high_sum, low_sum, high_addend_1, low_addend_1,
-   high_addend_2, low_addend_2) adds two two-word unsigned integers,
-   composed by HIGH_ADDEND_1 and LOW_ADDEND_1, and HIGH_ADDEND_2 and
-   LOW_ADDEND_2 respectively.  The result is placed in HIGH_SUM and
-   LOW_SUM.  Overflow (i.e. carry out) is not stored anywhere, and is
-   lost.
-
-   7) sub_ddmmss(high_difference, low_difference, high_minuend,
-   low_minuend, high_subtrahend, low_subtrahend) subtracts two
-   two-word unsigned integers, composed by HIGH_MINUEND_1 and
-   LOW_MINUEND_1, and HIGH_SUBTRAHEND_2 and LOW_SUBTRAHEND_2
-   respectively.  The result is placed in HIGH_DIFFERENCE and
-   LOW_DIFFERENCE.  Overflow (i.e. carry out) is not stored anywhere,
-   and is lost.
-
-   If any of these macros are left undefined for a particular CPU,
-   C macros are used.  */
-
-#if defined (__arm__)
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("adds        %1, %4, %5                                      \n\
-        adc     %0, %2, %3"                                             \
-           : "=r" ((USItype) (sh)),                                     \
-             "=&r" ((USItype) (sl))                                     \
-           : "%r" ((USItype) (ah)),                                     \
-             "rI" ((USItype) (bh)),                                     \
-             "%r" ((USItype) (al)),                                     \
-             "rI" ((USItype) (bl)))
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("subs        %1, %4, %5                                      \n\
-        sbc     %0, %2, %3"                                             \
-           : "=r" ((USItype) (sh)),                                     \
-             "=&r" ((USItype) (sl))                                     \
-           : "r" ((USItype) (ah)),                                      \
-             "rI" ((USItype) (bh)),                                     \
-             "r" ((USItype) (al)),                                      \
-             "rI" ((USItype) (bl)))
-#define umul_ppmm(xh, xl, a, b) \
-{register USItype __t0, __t1, __t2;                                     \
-  __asm__ ("%@ Inlined umul_ppmm                                        \n\
-        mov     %2, %5, lsr #16                                         \n\
-        mov     %0, %6, lsr #16                                         \n\
-        bic     %3, %5, %2, lsl #16                                     \n\
-        bic     %4, %6, %0, lsl #16                                     \n\
-        mul     %1, %3, %4                                              \n\
-        mul     %4, %2, %4                                              \n\
-        mul     %3, %0, %3                                              \n\
-        mul     %0, %2, %0                                              \n\
-        adds    %3, %4, %3                                              \n\
-        addcs   %0, %0, #65536                                          \n\
-        adds    %1, %1, %3, lsl #16                                     \n\
-        adc     %0, %0, %3, lsr #16"                                    \
-           : "=&r" ((USItype) (xh)),                                    \
-             "=r" ((USItype) (xl)),                                     \
-             "=&r" (__t0), "=&r" (__t1), "=r" (__t2)                    \
-           : "r" ((USItype) (a)),                                       \
-             "r" ((USItype) (b)));}
-#define UMUL_TIME 20
-#define UDIV_TIME 100
-#endif /* __arm__ */
-
-#define __umulsidi3(u, v) \
-  ({DIunion __w;                                                        \
-    umul_ppmm (__w.s.high, __w.s.low, u, v);                            \
-    __w.ll; })
-
-#define __udiv_qrnnd_c(q, r, n1, n0, d) \
-  do {                                                                  \
-    USItype __d1, __d0, __q1, __q0;                                     \
-    USItype __r1, __r0, __m;                                            \
-    __d1 = __ll_highpart (d);                                           \
-    __d0 = __ll_lowpart (d);                                            \
-                                                                        \
-    __r1 = (n1) % __d1;                                                 \
-    __q1 = (n1) / __d1;                                                 \
-    __m = (USItype) __q1 * __d0;                                        \
-    __r1 = __r1 * __ll_B | __ll_highpart (n0);                          \
-    if (__r1 < __m)                                                     \
-      {                                                                 \
-        __q1--, __r1 += (d);                                            \
-        if (__r1 >= (d)) /* i.e. we didn't get carry when adding to __r1 */\
-          if (__r1 < __m)                                               \
-            __q1--, __r1 += (d);                                        \
-      }                                                                 \
-    __r1 -= __m;                                                        \
-                                                                        \
-    __r0 = __r1 % __d1;                                                 \
-    __q0 = __r1 / __d1;                                                 \
-    __m = (USItype) __q0 * __d0;                                        \
-    __r0 = __r0 * __ll_B | __ll_lowpart (n0);                           \
-    if (__r0 < __m)                                                     \
-      {                                                                 \
-        __q0--, __r0 += (d);                                            \
-        if (__r0 >= (d))                                                \
-          if (__r0 < __m)                                               \
-            __q0--, __r0 += (d);                                        \
-      }                                                                 \
-    __r0 -= __m;                                                        \
-                                                                        \
-    (q) = (USItype) __q1 * __ll_B | __q0;                               \
-    (r) = __r0;                                                         \
-  } while (0)
-
-#define UDIV_NEEDS_NORMALIZATION 1
-#define udiv_qrnnd __udiv_qrnnd_c
-
-extern const UQItype __clz_tab[];
-#define count_leading_zeros(count, x) \
-  do {                                                                  \
-    USItype __xr = (x);                                                 \
-    USItype __a;                                                        \
-                                                                        \
-    if (SI_TYPE_SIZE <= 32)                                             \
-      {                                                                 \
-        __a = __xr < ((USItype)1<<2*__BITS4)                            \
-          ? (__xr < ((USItype)1<<__BITS4) ? 0 : __BITS4)                \
-          : (__xr < ((USItype)1<<3*__BITS4) ?  2*__BITS4 : 3*__BITS4);  \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        for (__a = SI_TYPE_SIZE - 8; __a > 0; __a -= 8)                 \
-          if (((__xr >> __a) & 0xff) != 0)                              \
-            break;                                                      \
-      }                                                                 \
-                                                                        \
-    (count) = SI_TYPE_SIZE - (__clz_tab[__xr >> __a] + __a);            \
-  } while (0)
diff --git a/arch/arm26/lib/lshrdi3.c b/arch/arm26/lib/lshrdi3.c
deleted file mode 100644
index b666f1bad451..000000000000
--- a/arch/arm26/lib/lshrdi3.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* More subroutines needed by GCC output code on some machines.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC 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.
-
-GNU CC 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 GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.
- */
-/* support functions required by the kernel. based on code from gcc-2.95.3 */
-/* I Molton     29/07/01 */
-
-#include "gcclib.h"
-
-DItype
-__lshrdi3 (DItype u, word_type b)
-{
-  DIunion w;
-  word_type bm;
-  DIunion uu;
-
-  if (b == 0)
-    return u;
-
-  uu.ll = u;
-
-  bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
-  if (bm <= 0)
-    {
-      w.s.high = 0;
-      w.s.low = (USItype)uu.s.high >> -bm;
-    }
-  else
-    {
-      USItype carries = (USItype)uu.s.high << bm;
-      w.s.high = (USItype)uu.s.high >> b;
-      w.s.low = ((USItype)uu.s.low >> b) | carries;
-    }
-
-  return w.ll;
-}
-
diff --git a/arch/arm26/lib/memchr.S b/arch/arm26/lib/memchr.S
deleted file mode 100644
index 34e7c14c08ad..000000000000
--- a/arch/arm26/lib/memchr.S
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  linux/arch/arm26/lib/memchr.S
- *
- *  Copyright (C) 1995-2000 Russell King
- *
- * 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.
- *
- *  ASM optimised string functions
- */
-#include <linux/linkage.h>
-#include <asm/assembler.h>
-
-        .text
-        .align  5
-ENTRY(memchr)
-1:      subs    r2, r2, #1
-        bmi     2f
-        ldrb    r3, [r0], #1
-        teq     r3, r1
-        bne     1b
-        sub     r0, r0, #1
-2:      movne   r0, #0
-        RETINSTR(mov,pc,lr)
diff --git a/arch/arm26/lib/memcpy.S b/arch/arm26/lib/memcpy.S
deleted file mode 100644
index 3f719e412069..000000000000
--- a/arch/arm26/lib/memcpy.S
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- *  linux/arch/arm26/lib/memcpy.S
- *
- *  Copyright (C) 1995-1999 Russell King
- *
- * 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.
- *
- *  ASM optimised string functions
- */
-#include <linux/linkage.h>
-#include <asm/assembler.h>
-
-                .text
-
-#define ENTER   \
-                mov     ip,sp   ;\
-                stmfd   sp!,{r4-r9,fp,ip,lr,pc} ;\
-                sub     fp,ip,#4
-
-#define EXIT    \
-                LOADREGS(ea, fp, {r4 - r9, fp, sp, pc})
-
-#define EXITEQ  \
-                LOADREGS(eqea, fp, {r4 - r9, fp, sp, pc})
-
-/*
- * Prototype: void memcpy(void *to,const void *from,unsigned long n);
- * ARM3: cant use memcopy here!!!
- */
-ENTRY(memcpy)
-ENTRY(memmove)
-                ENTER
-                cmp     r1, r0
-                bcc     19f
-                subs    r2, r2, #4
-                blt     6f
-                ands    ip, r0, #3
-                bne     7f
-                ands    ip, r1, #3
-                bne     8f
-
-1:              subs    r2, r2, #8
-                blt     5f
-                subs    r2, r2, #0x14
-                blt     3f
-2:              ldmia   r1!,{r3 - r9, ip}
-                stmia   r0!,{r3 - r9, ip}
-                subs    r2, r2, #32
-                bge     2b
-                cmn     r2, #16
-                ldmgeia r1!, {r3 - r6}
-                stmgeia r0!, {r3 - r6}
-                subge   r2, r2, #0x10
-3:              adds    r2, r2, #0x14
-4:              ldmgeia r1!, {r3 - r5}
-                stmgeia r0!, {r3 - r5}
-                subges  r2, r2, #12
-                bge     4b
-5:              adds    r2, r2, #8
-                blt     6f
-                subs    r2, r2, #4
-                ldrlt   r3, [r1], #4
-                ldmgeia r1!, {r4, r5}
-                strlt   r3, [r0], #4
-                stmgeia r0!, {r4, r5}
-                subge   r2, r2, #4
-
-6:              adds    r2, r2, #4
-                EXITEQ
-                cmp     r2, #2
-                ldrb    r3, [r1], #1
-                ldrgeb  r4, [r1], #1
-                ldrgtb  r5, [r1], #1
-                strb    r3, [r0], #1
-                strgeb  r4, [r0], #1
-                strgtb  r5, [r0], #1
-                EXIT
-
-7:              rsb     ip, ip, #4
-                cmp     ip, #2
-                ldrb    r3, [r1], #1
-                ldrgeb  r4, [r1], #1
-                ldrgtb  r5, [r1], #1
-                strb    r3, [r0], #1
-                strgeb  r4, [r0], #1
-                strgtb  r5, [r0], #1
-                subs    r2, r2, ip
-                blt     6b
-                ands    ip, r1, #3
-                beq     1b
-
-8:              bic     r1, r1, #3
-                ldr     r7, [r1], #4
-                cmp     ip, #2
-                bgt     15f
-                beq     11f
-                cmp     r2, #12
-                blt     10f
-                sub     r2, r2, #12
-9:              mov     r3, r7, pull #8
-                ldmia   r1!, {r4 - r7}
-                orr     r3, r3, r4, push #24
-                mov     r4, r4, pull #8
-                orr     r4, r4, r5, push #24
-                mov     r5, r5, pull #8
-                orr     r5, r5, r6, push #24
-                mov     r6, r6, pull #8
-                orr     r6, r6, r7, push #24
-                stmia   r0!, {r3 - r6}
-                subs    r2, r2, #16
-                bge     9b
-                adds    r2, r2, #12
-                blt     100f
-10:             mov     r3, r7, pull #8
-                ldr     r7, [r1], #4
-                subs    r2, r2, #4
-                orr     r3, r3, r7, push #24
-                str     r3, [r0], #4
-                bge     10b
-100:            sub     r1, r1, #3
-                b       6b
-
-11:             cmp     r2, #12
-                blt     13f             /* */
-                sub     r2, r2, #12
-12:             mov     r3, r7, pull #16
-                ldmia   r1!, {r4 - r7}
-                orr     r3, r3, r4, push #16
-                mov     r4, r4, pull #16
-                orr     r4, r4, r5, push #16
-                mov     r5, r5, pull #16
-                orr     r5, r5, r6, push #16
-                mov     r6, r6, pull #16
-                orr     r6, r6, r7, push #16
-                stmia   r0!, {r3 - r6}
-                subs    r2, r2, #16
-                bge     12b
-                adds    r2, r2, #12
-                blt     14f
-13:             mov     r3, r7, pull #16
-                ldr     r7, [r1], #4
-                subs    r2, r2, #4
-                orr     r3, r3, r7, push #16
-                str     r3, [r0], #4
-                bge     13b
-14:             sub     r1, r1, #2
-                b       6b
-
-15:             cmp     r2, #12
-                blt     17f
-                sub     r2, r2, #12
-16:             mov     r3, r7, pull #24
-                ldmia   r1!, {r4 - r7}
-                orr     r3, r3, r4, push #8
-                mov     r4, r4, pull #24
-                orr     r4, r4, r5, push #8
-                mov     r5, r5, pull #24
-                orr     r5, r5, r6, push #8
-                mov     r6, r6, pull #24
-                orr     r6, r6, r7, push #8
-                stmia   r0!, {r3 - r6}
-                subs    r2, r2, #16
-                bge     16b
-                adds    r2, r2, #12
-                blt     18f
-17:             mov     r3, r7, pull #24
-                ldr     r7, [r1], #4
-                subs    r2, r2, #4
-                orr     r3, r3, r7, push #8
-                str     r3, [r0], #4
-                bge     17b
-18:             sub     r1, r1, #1
-                b       6b
-
-
-19:             add     r1, r1, r2
-                add     r0, r0, r2
-                subs    r2, r2, #4
-                blt     24f
-                ands    ip, r0, #3
-                bne     25f
-                ands    ip, r1, #3
-                bne     26f
-
-20:             subs    r2, r2, #8
-                blt     23f
-                subs    r2, r2, #0x14
-                blt     22f
-21:             ldmdb   r1!, {r3 - r9, ip}
-                stmdb   r0!, {r3 - r9, ip}
-                subs    r2, r2, #32
-                bge     21b
-22:             cmn     r2, #16
-                ldmgedb r1!, {r3 - r6}
-                stmgedb r0!, {r3 - r6}
-                subge   r2, r2, #16
-                adds    r2, r2, #20
-                ldmgedb r1!, {r3 - r5}
-                stmgedb r0!, {r3 - r5}
-                subge   r2, r2, #12
-23:             adds    r2, r2, #8
-                blt     24f
-                subs    r2, r2, #4
-                ldrlt   r3, [r1, #-4]!
-                ldmgedb r1!, {r4, r5}
-                strlt   r3, [r0, #-4]!
-                stmgedb r0!, {r4, r5}
-                subge   r2, r2, #4
-
-24:             adds    r2, r2, #4
-                EXITEQ
-                cmp     r2, #2
-                ldrb    r3, [r1, #-1]!
-                ldrgeb  r4, [r1, #-1]!
-                ldrgtb  r5, [r1, #-1]!
-                strb    r3, [r0, #-1]!
-                strgeb  r4, [r0, #-1]!
-                strgtb  r5, [r0, #-1]!
-                EXIT
-
-25:             cmp     ip, #2
-                ldrb    r3, [r1, #-1]!
-                ldrgeb  r4, [r1, #-1]!
-                ldrgtb  r5, [r1, #-1]!
-                strb    r3, [r0, #-1]!
-                strgeb  r4, [r0, #-1]!
-                strgtb  r5, [r0, #-1]!
-                subs    r2, r2, ip
-                blt     24b
-                ands    ip, r1, #3
-                beq     20b
-
-26:             bic     r1, r1, #3
-                ldr     r3, [r1], #0
-                cmp     ip, #2
-                blt     34f
-                beq     30f
-                cmp     r2, #12
-                blt     28f
-                sub     r2, r2, #12
-27:             mov     r7, r3, push #8
-                ldmdb   r1!, {r3, r4, r5, r6}
-                orr     r7, r7, r6, pull #24
-                mov     r6, r6, push #8
-                orr     r6, r6, r5, pull #24
-                mov     r5, r5, push #8
-                orr     r5, r5, r4, pull #24
-                mov     r4, r4, push #8
-                orr     r4, r4, r3, pull #24
-                stmdb   r0!, {r4, r5, r6, r7}
-                subs    r2, r2, #16
-                bge     27b
-                adds    r2, r2, #12
-                blt     29f
-28:             mov     ip, r3, push #8
-                ldr     r3, [r1, #-4]!
-                subs    r2, r2, #4
-                orr     ip, ip, r3, pull #24
-                str     ip, [r0, #-4]!
-                bge     28b
-29:             add     r1, r1, #3
-                b       24b
-
-30:             cmp     r2, #12
-                blt     32f
-                sub     r2, r2, #12
-31:             mov     r7, r3, push #16
-                ldmdb   r1!, {r3, r4, r5, r6}
-                orr     r7, r7, r6, pull #16
-                mov     r6, r6, push #16
-                orr     r6, r6, r5, pull #16
-                mov     r5, r5, push #16
-                orr     r5, r5, r4, pull #16
-                mov     r4, r4, push #16
-                orr     r4, r4, r3, pull #16
-                stmdb   r0!, {r4, r5, r6, r7}
-                subs    r2, r2, #16
-                bge     31b
-                adds    r2, r2, #12
-                blt     33f
-32:             mov     ip, r3, push #16
-                ldr     r3, [r1, #-4]!
-                subs    r2, r2, #4
-                orr     ip, ip, r3, pull #16
-                str     ip, [r0, #-4]!
-                bge     32b
-33:             add     r1, r1, #2
-                b       24b
-
-34:             cmp     r2, #12
-                blt     36f
-                sub     r2, r2, #12
-35:             mov     r7, r3, push #24
-                ldmdb   r1!, {r3, r4, r5, r6}
-                orr     r7, r7, r6, pull #8
-                mov     r6, r6, push #24
-                orr     r6, r6, r5, pull #8
-                mov     r5, r5, push #24
-                orr     r5, r5, r4, pull #8
-                mov     r4, r4, push #24
-                orr     r4, r4, r3, pull #8
-                stmdb   r0!, {r4, r5, r6, r7}
-                subs    r2, r2, #16
-                bge     35b
-                adds    r2, r2, #12
-                blt     37f
-36:             mov     ip, r3, push #24
-                ldr     r3, [r1, #-4]!
-                subs    r2, r2, #4
-                orr     ip, ip, r3, pull #8
-                str     ip, [r0, #-4]!
-                bge     36b
-37:             add     r1, r1, #1
-                b       24b
-
-                .align
diff --git a/arch/arm26/lib/memset.S b/arch/arm26/lib/memset.S
deleted file mode 100644
index aedec10b58f5..000000000000
--- a/arch/arm26/lib/memset.S
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  linux/arch/arm26/lib/memset.S
- *
- *  Copyright (C) 1995-2000 Russell King
- *
- * 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.
- *
- *  ASM optimised string functions
- */
-#include <linux/linkage.h>
-#include <asm/assembler.h>
-
-        .text
-        .align  5
-        .word   0
-
-1:      subs    r2, r2, #4              @ 1 do we have enough
-        blt     5f                      @ 1 bytes to align with?
-        cmp     r3, #2                  @ 1
-        strltb  r1, [r0], #1            @ 1
-        strleb  r1, [r0], #1            @ 1
-        strb    r1, [r0], #1            @ 1
-        add     r2, r2, r3              @ 1 (r2 = r2 - (4 - r3))
-/*
- * The pointer is now aligned and the length is adjusted.  Try doing the
- * memzero again.
- */
-
-ENTRY(memset)
-        ands    r3, r0, #3              @ 1 unaligned?
-        bne     1b                      @ 1
-/*
- * we know that the pointer in r0 is aligned to a word boundary.
- */
-        orr     r1, r1, r1, lsl #8
-        orr     r1, r1, r1, lsl #16
-        mov     r3, r1
-        cmp     r2, #16
-        blt     4f
-/*
- * We need an extra register for this loop - save the return address and
- * use the LR
- */
-        str     lr, [sp, #-4]!
-        mov     ip, r1
-        mov     lr, r1
-
-2:      subs    r2, r2, #64
-        stmgeia r0!, {r1, r3, ip, lr}   @ 64 bytes at a time.
-        stmgeia r0!, {r1, r3, ip, lr}
-        stmgeia r0!, {r1, r3, ip, lr}
-        stmgeia r0!, {r1, r3, ip, lr}
-        bgt     2b
-        LOADREGS(eqfd, sp!, {pc})       @ Now <64 bytes to go.
-/*
- * No need to correct the count; we're only testing bits from now on
- */
-        tst     r2, #32
-        stmneia r0!, {r1, r3, ip, lr}
-        stmneia r0!, {r1, r3, ip, lr}
-        tst     r2, #16
-        stmneia r0!, {r1, r3, ip, lr}
-        ldr     lr, [sp], #4
-
-4:      tst     r2, #8
-        stmneia r0!, {r1, r3}
-        tst     r2, #4
-        strne   r1, [r0], #4
-/*
- * When we get here, we've got less than 4 bytes to zero.  We
- * may have an unaligned pointer as well.
- */
-5:      tst     r2, #2
-        strneb  r1, [r0], #1
-        strneb  r1, [r0], #1
-        tst     r2, #1
-        strneb  r1, [r0], #1
-        RETINSTR(mov,pc,lr)
diff --git a/arch/arm26/lib/memzero.S b/arch/arm26/lib/memzero.S
deleted file mode 100644
index cc5bf6860061..000000000000
--- a/arch/arm26/lib/memzero.S
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  linux/arch/arm26/lib/memzero.S
- *
- *  Copyright (C) 1995-2000 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-
-        .text
-        .align  5
-        .word   0
-/*
- * Align the pointer in r0.  r3 contains the number of bytes that we are
- * mis-aligned by, and r1 is the number of bytes.  If r1 < 4, then we
- * don't bother; we use byte stores instead.
- */
-1:      subs    r1, r1, #4              @ 1 do we have enough
-        blt     5f                      @ 1 bytes to align with?
-        cmp     r3, #2                  @ 1
-        strltb  r2, [r0], #1            @ 1
-        strleb  r2, [r0], #1            @ 1
-        strb    r2, [r0], #1            @ 1
-        add     r1, r1, r3              @ 1 (r1 = r1 - (4 - r3))
-/*
- * The pointer is now aligned and the length is adjusted.  Try doing the
- * memzero again.
- */
-
-ENTRY(__memzero)
-        mov     r2, #0                  @ 1
-        ands    r3, r0, #3              @ 1 unaligned?
-        bne     1b                      @ 1
-/*
- * r3 = 0, and we know that the pointer in r0 is aligned to a word boundary.
- */
-        cmp     r1, #16                 @ 1 we can skip this chunk if we
-        blt     4f                      @ 1 have < 16 bytes
-/*
- * We need an extra register for this loop - save the return address and
- * use the LR
- */
-        str     lr, [sp, #-4]!          @ 1
-        mov     ip, r2                  @ 1
-        mov     lr, r2                  @ 1
-
-3:      subs    r1, r1, #64             @ 1 write 32 bytes out per loop
-        stmgeia r0!, {r2, r3, ip, lr}   @ 4
-        stmgeia r0!, {r2, r3, ip, lr}   @ 4
-        stmgeia r0!, {r2, r3, ip, lr}   @ 4
-        stmgeia r0!, {r2, r3, ip, lr}   @ 4
-        bgt     3b                      @ 1
-        LOADREGS(eqfd, sp!, {pc})       @ 1/2 quick exit
-/*
- * No need to correct the count; we're only testing bits from now on
- */
-        tst     r1, #32                 @ 1
-        stmneia r0!, {r2, r3, ip, lr}   @ 4
-        stmneia r0!, {r2, r3, ip, lr}   @ 4
-        tst     r1, #16                 @ 1 16 bytes or more?
-        stmneia r0!, {r2, r3, ip, lr}   @ 4
-        ldr     lr, [sp], #4            @ 1
-
-4:      tst     r1, #8                  @ 1 8 bytes or more?
-        stmneia r0!, {r2, r3}           @ 2
-        tst     r1, #4                  @ 1 4 bytes or more?
-        strne   r2, [r0], #4            @ 1
-/*
- * When we get here, we've got less than 4 bytes to zero.  We
- * may have an unaligned pointer as well.
- */
-5:      tst     r1, #2                  @ 1 2 bytes or more?
-        strneb  r2, [r0], #1            @ 1
-        strneb  r2, [r0], #1            @ 1
-        tst     r1, #1                  @ 1 a byte left over
-        strneb  r2, [r0], #1            @ 1
-        RETINSTR(mov,pc,lr)             @ 1
diff --git a/arch/arm26/lib/muldi3.c b/arch/arm26/lib/muldi3.c
deleted file mode 100644
index 44d611b1cfdb..000000000000
--- a/arch/arm26/lib/muldi3.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* More subroutines needed by GCC output code on some machines.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC 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.
-
-GNU CC 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 GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.
- */
-/* support functions required by the kernel. based on code from gcc-2.95.3 */
-/* I Molton     29/07/01 */
-
-#include "gcclib.h"
-
-#define umul_ppmm(xh, xl, a, b) \
-{register USItype __t0, __t1, __t2;                                     \
-  __asm__ ("%@ Inlined umul_ppmm                                        \n\
-        mov     %2, %5, lsr #16                                         \n\
-        mov     %0, %6, lsr #16                                         \n\
-        bic     %3, %5, %2, lsl #16                                     \n\
-        bic     %4, %6, %0, lsl #16                                     \n\
-        mul     %1, %3, %4                                              \n\
-        mul     %4, %2, %4                                              \n\
-        mul     %3, %0, %3                                              \n\
-        mul     %0, %2, %0                                              \n\
-        adds    %3, %4, %3                                              \n\
-        addcs   %0, %0, #65536                                          \n\
-        adds    %1, %1, %3, lsl #16                                     \n\
-        adc     %0, %0, %3, lsr #16"                                    \
-           : "=&r" ((USItype) (xh)),                                    \
-             "=r" ((USItype) (xl)),                                     \
-             "=&r" (__t0), "=&r" (__t1), "=r" (__t2)                    \
-           : "r" ((USItype) (a)),                                       \
-             "r" ((USItype) (b)));}
-
-
-#define __umulsidi3(u, v) \
-  ({DIunion __w;                                                        \
-    umul_ppmm (__w.s.high, __w.s.low, u, v);                            \
-    __w.ll; })
-
-
-DItype
-__muldi3 (DItype u, DItype v)
-{
-  DIunion w;
-  DIunion uu, vv;
-
-  uu.ll = u,
-  vv.ll = v;
-
-  w.ll = __umulsidi3 (uu.s.low, vv.s.low);
-  w.s.high += ((USItype) uu.s.low * (USItype) vv.s.high
-               + (USItype) uu.s.high * (USItype) vv.s.low);
-
-  return w.ll;
-}
-
diff --git a/arch/arm26/lib/putuser.S b/arch/arm26/lib/putuser.S
deleted file mode 100644
index 46c7f15f9f2d..000000000000
--- a/arch/arm26/lib/putuser.S
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *  linux/arch/arm26/lib/putuser.S
- *
- *  Copyright (C) 2001 Russell King
- *
- * 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.
- *
- *  Idea from x86 version, (C) Copyright 1998 Linus Torvalds
- *
- * These functions have a non-standard call interface to make
- * them more efficient, especially as they return an error
- * value in addition to the "real" return value.
- *
- * __put_user_X
- *
- * Inputs:      r0 contains the address
- *              r1, r2 contains the value
- * Outputs:     r0 is the error code
- *              lr corrupted
- *
- * No other registers must be altered.  (see include/asm-arm/uaccess.h
- * for specific ASM register usage).
- *
- * Note that ADDR_LIMIT is either 0 or 0xc0000000
- * Note also that it is intended that __put_user_bad is not global.
- */
-#include <asm/asm-offsets.h>
-#include <asm/thread_info.h>
-#include <asm/errno.h>
-
-        .global __put_user_1
-__put_user_1:
-        bic     r2, sp, #0x1f00
-        bic     r2, r2, #0x00ff
-        str     lr, [sp, #-4]!
-        ldr     r2, [r2, #TI_ADDR_LIMIT]
-        sub     r2, r2, #1
-        cmp     r0, r2
-        bge     __put_user_bad
-1:      cmp     r0, #0x02000000
-        strlsbt r1, [r0]
-        strgeb  r1, [r0]
-        mov     r0, #0
-        ldmfd   sp!, {pc}^
-
-        .global __put_user_2
-__put_user_2:
-        bic     r2, sp, #0x1f00
-        bic     r2, r2, #0x00ff
-        str     lr, [sp, #-4]!
-        ldr     r2, [r2, #TI_ADDR_LIMIT]
-        sub     r2, r2, #2
-        cmp     r0, r2
-        bge     __put_user_bad
-2:      cmp     r0, #0x02000000
-        strlsbt r1, [r0], #1
-        strgeb  r1, [r0], #1
-        mov     r1, r1, lsr #8
-3:      strlsbt r1, [r0]
-        strgeb  r1, [r0]
-        mov     r0, #0
-        ldmfd   sp!, {pc}^
-
-        .global __put_user_4
-__put_user_4:
-        bic     r2, sp, #0x1f00
-        bic     r2, r2, #0x00ff
-        str     lr, [sp, #-4]!
-        ldr     r2, [r2, #TI_ADDR_LIMIT]
-        sub     r2, r2, #4
-        cmp     r0, r2
-4:      bge     __put_user_bad
-        cmp     r0, #0x02000000
-        strlst  r1, [r0]
-        strge   r1, [r0]
-        mov     r0, #0
-        ldmfd   sp!, {pc}^
-
-        .global __put_user_8
-__put_user_8:
-        bic     ip, sp, #0x1f00
-        bic     ip, ip, #0x00ff
-        str     lr, [sp, #-4]!
-        ldr     ip, [ip, #TI_ADDR_LIMIT]
-        sub     ip, ip, #8
-        cmp     r0, ip
-        bge     __put_user_bad
-        cmp     r0, #0x02000000
-5:      strlst  r1, [r0], #4
-6:      strlst  r2, [r0]
-        strge   r1, [r0], #4
-        strge   r2, [r0]
-        mov     r0, #0
-        ldmfd   sp!, {pc}^
-
-__put_user_bad:
-        mov     r0, #-EFAULT
-        mov     pc, lr
-
-.section __ex_table, "a"
-        .long   1b, __put_user_bad
-        .long   2b, __put_user_bad
-        .long   3b, __put_user_bad
-        .long   4b, __put_user_bad
-        .long   5b, __put_user_bad
-        .long   6b, __put_user_bad
-.previous
diff --git a/arch/arm26/lib/setbit.S b/arch/arm26/lib/setbit.S
deleted file mode 100644
index e180c1a1b2f1..000000000000
--- a/arch/arm26/lib/setbit.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  linux/arch/arm26/lib/setbit.S
- *
- *  Copyright (C) 1995-1996 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-                .text
-
-/*
- * Purpose  : Function to set a bit
- * Prototype: int set_bit(int bit, void *addr)
- */
-ENTRY(_set_bit_be)
-                eor     r0, r0, #0x18           @ big endian byte ordering
-ENTRY(_set_bit_le)
-                and     r2, r0, #7
-                mov     r3, #1
-                mov     r3, r3, lsl r2
-                save_and_disable_irqs ip, r2
-                ldrb    r2, [r1, r0, lsr #3]
-                orr     r2, r2, r3
-                strb    r2, [r1, r0, lsr #3]
-                restore_irqs ip
-                RETINSTR(mov,pc,lr)
diff --git a/arch/arm26/lib/strchr.S b/arch/arm26/lib/strchr.S
deleted file mode 100644
index ecfff21aa7c7..000000000000
--- a/arch/arm26/lib/strchr.S
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  linux/arch/arm26/lib/strchr.S
- *
- *  Copyright (C) 1995-2000 Russell King
- *
- * 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.
- *
- *  ASM optimised string functions
- */
-#include <linux/linkage.h>
-#include <asm/assembler.h>
-
-                .text
-                .align  5
-ENTRY(strchr)
-1:              ldrb    r2, [r0], #1
-                teq     r2, r1
-                teqne   r2, #0
-                bne     1b
-                teq     r2, #0
-                moveq   r0, #0
-                subne   r0, r0, #1
-                RETINSTR(mov,pc,lr)
diff --git a/arch/arm26/lib/strrchr.S b/arch/arm26/lib/strrchr.S
deleted file mode 100644
index db43b28e78dc..000000000000
--- a/arch/arm26/lib/strrchr.S
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  linux/arch/arm26/lib/strrchr.S
- *
- *  Copyright (C) 1995-2000 Russell King
- *
- * 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.
- *
- *  ASM optimised string functions
- */
-#include <linux/linkage.h>
-#include <asm/assembler.h>
-
-                .text
-                .align  5
-ENTRY(strrchr)
-                mov     r3, #0
-1:              ldrb    r2, [r0], #1
-                teq     r2, r1
-                subeq   r3, r0, #1
-                teq     r2, #0
-                bne     1b
-                mov     r0, r3
-                RETINSTR(mov,pc,lr)
diff --git a/arch/arm26/lib/testchangebit.S b/arch/arm26/lib/testchangebit.S
deleted file mode 100644
index 17049a2d93a4..000000000000
--- a/arch/arm26/lib/testchangebit.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  linux/arch/arm26/lib/testchangebit.S
- *
- *  Copyright (C) 1995-1996 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-                .text
-
-ENTRY(_test_and_change_bit_be)
-                eor     r0, r0, #0x18           @ big endian byte ordering
-ENTRY(_test_and_change_bit_le)
-                add     r1, r1, r0, lsr #3
-                and     r3, r0, #7
-                mov     r0, #1
-                save_and_disable_irqs ip, r2
-                ldrb    r2, [r1]
-                tst     r2, r0, lsl r3
-                eor     r2, r2, r0, lsl r3
-                strb    r2, [r1]
-                restore_irqs ip
-                moveq   r0, #0
-                RETINSTR(mov,pc,lr)
-
-
diff --git a/arch/arm26/lib/testclearbit.S b/arch/arm26/lib/testclearbit.S
deleted file mode 100644
index 2506bd743ab4..000000000000
--- a/arch/arm26/lib/testclearbit.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  linux/arch/arm26/lib/testclearbit.S
- *
- *  Copyright (C) 1995-1996 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-                .text
-
-ENTRY(_test_and_clear_bit_be)
-                eor     r0, r0, #0x18           @ big endian byte ordering
-ENTRY(_test_and_clear_bit_le)
-                add     r1, r1, r0, lsr #3      @ Get byte offset
-                and     r3, r0, #7              @ Get bit offset
-                mov     r0, #1
-                save_and_disable_irqs ip, r2
-                ldrb    r2, [r1]
-                tst     r2, r0, lsl r3
-                bic     r2, r2, r0, lsl r3
-                strb    r2, [r1]
-                restore_irqs ip
-                moveq   r0, #0
-                RETINSTR(mov,pc,lr)
-
-
diff --git a/arch/arm26/lib/testsetbit.S b/arch/arm26/lib/testsetbit.S
deleted file mode 100644
index f827de64b22d..000000000000
--- a/arch/arm26/lib/testsetbit.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  linux/arch/arm26/lib/testsetbit.S
- *
- *  Copyright (C) 1995-1996 Russell King
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-                .text
-
-ENTRY(_test_and_set_bit_be)
-                eor     r0, r0, #0x18           @ big endian byte ordering
-ENTRY(_test_and_set_bit_le)
-                add     r1, r1, r0, lsr #3      @ Get byte offset
-                and     r3, r0, #7              @ Get bit offset
-                mov     r0, #1
-                save_and_disable_irqs ip, r2
-                ldrb    r2, [r1]
-                tst     r2, r0, lsl r3
-                orr     r2, r2, r0, lsl r3
-                strb    r2, [r1]
-                restore_irqs ip
-                moveq   r0, #0
-                RETINSTR(mov,pc,lr)
-
-
diff --git a/arch/arm26/lib/uaccess-kernel.S b/arch/arm26/lib/uaccess-kernel.S
deleted file mode 100644
index 3950a1f6bc99..000000000000
--- a/arch/arm26/lib/uaccess-kernel.S
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- *  linux/arch/arm26/lib/uaccess-kernel.S
- *
- *  Copyright (C) 1998 Russell King
- *
- *  Note!  Some code fragments found in here have a special calling
- *  convention - they are not APCS compliant!
- *
- * 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/linkage.h>
-#include <asm/assembler.h>
-
-                .text
-
-//FIXME - surely this can be done in C not asm, removing the problem of keeping C and asm in sync? (this is a struct uaccess_t)
-
-                .globl  uaccess_kernel
-uaccess_kernel:
-                .word   uaccess_kernel_put_byte
-                .word   uaccess_kernel_get_byte
-                .word   uaccess_kernel_put_half
-                .word   uaccess_kernel_get_half
-                .word   uaccess_kernel_put_word
-                .word   uaccess_kernel_get_word
-                .word   uaccess_kernel_put_dword
-                .word   uaccess_kernel_copy
-                .word   uaccess_kernel_copy
-                .word   uaccess_kernel_clear
-                .word   uaccess_kernel_strncpy
-                .word   uaccess_kernel_strnlen
-
-@ In : r0 = x, r1 = addr, r2 = error
-@ Out: r2 = error
-uaccess_kernel_put_byte:
-                stmfd   sp!, {lr}
-                strb    r0, [r1]
-                ldmfd   sp!, {pc}^
-
-@ In : r0 = x, r1 = addr, r2 = error
-@ Out: r2 = error
-uaccess_kernel_put_half:
-                stmfd   sp!, {lr}
-                strb    r0, [r1]
-                mov     r0, r0, lsr #8
-                strb    r0, [r1, #1]
-                ldmfd   sp!, {pc}^
-
-@ In : r0 = x, r1 = addr, r2 = error
-@ Out: r2 = error
-uaccess_kernel_put_word:
-                stmfd   sp!, {lr}
-                str     r0, [r1]
-                ldmfd   sp!, {pc}^
-
-@ In : r0 = x, r1 = addr, r2 = error
-@ Out: r2 = error
-uaccess_kernel_put_dword:
-                stmfd   sp!, {lr}
-                str     r0, [r1], #4
-                str     r0, [r1], #0
-                ldmfd   sp!, {pc}^
-
-@ In : r0 = addr, r1 = error
-@ Out: r0 = x, r1 = error
-uaccess_kernel_get_byte:
-                stmfd   sp!, {lr}
-                ldrb    r0, [r0]
-                ldmfd   sp!, {pc}^
-
-@ In : r0 = addr, r1 = error
-@ Out: r0 = x, r1 = error
-uaccess_kernel_get_half:
-                stmfd   sp!, {lr}
-                ldr     r0, [r0]
-                mov     r0, r0, lsl #16
-                mov     r0, r0, lsr #16
-                ldmfd   sp!, {pc}^
-
-@ In : r0 = addr, r1 = error
-@ Out: r0 = x, r1 = error
-uaccess_kernel_get_word:
-                stmfd   sp!, {lr}
-                ldr     r0, [r0]
-                ldmfd   sp!, {pc}^
-
-
-/* Prototype: int uaccess_kernel_copy(void *to, const char *from, size_t n)
- * Purpose  : copy a block to kernel memory from kernel memory
- * Params   : to   - kernel memory
- *          : from - kernel memory
- *          : n    - number of bytes to copy
- * Returns  : Number of bytes NOT copied.
- */
-uaccess_kernel_copy:
-                stmfd   sp!, {lr}
-                bl      memcpy
-                mov     r0, #0
-                ldmfd   sp!, {pc}^
-
-/* Prototype: int uaccess_kernel_clear(void *addr, size_t sz)
- * Purpose  : clear some kernel memory
- * Params   : addr - kernel memory address to clear
- *          : sz   - number of bytes to clear
- * Returns  : number of bytes NOT cleared
- */
-uaccess_kernel_clear:
-                stmfd   sp!, {lr}
-                mov     r2, #0
-                cmp     r1, #4
-                blt     2f
-                ands    ip, r0, #3
-                beq     1f
-                cmp     ip, #1
-                strb    r2, [r0], #1
-                strleb  r2, [r0], #1
-                strltb  r2, [r0], #1
-                rsb     ip, ip, #4
-                sub     r1, r1, ip              @  7  6  5  4  3  2  1
-1:              subs    r1, r1, #8              @ -1 -2 -3 -4 -5 -6 -7
-                bmi     2f
-                str     r2, [r0], #4
-                str     r2, [r0], #4
-                b       1b
-2:              adds    r1, r1, #4              @  3  2  1  0 -1 -2 -3
-                strpl   r2, [r0], #4
-                tst     r1, #2                  @ 1x 1x 0x 0x 1x 1x 0x
-                strneb  r2, [r0], #1
-                strneb  r2, [r0], #1
-                tst     r1, #1                  @ x1 x0 x1 x0 x1 x0 x1
-                strneb  r2, [r0], #1
-                mov     r0, #0
-                ldmfd   sp!, {pc}^
-
-/* Prototype: size_t uaccess_kernel_strncpy(char *dst, char *src, size_t len)
- * Purpose  : copy a string from kernel memory to kernel memory
- * Params   : dst - kernel memory destination
- *          : src - kernel memory source
- *          : len - maximum length of string
- * Returns  : number of characters copied
- */
-uaccess_kernel_strncpy:
-                stmfd   sp!, {lr}
-                mov     ip, r2
-1:              subs    r2, r2, #1
-                bmi     2f
-                ldrb    r3, [r1], #1
-                strb    r3, [r0], #1
-                teq     r3, #0
-                bne     1b
-2:              subs    r0, ip, r2
-                ldmfd   sp!, {pc}^
-
-/* Prototype: int uaccess_kernel_strlen(char *str, long n)
- * Purpose  : get length of a string in kernel memory
- * Params   : str - address of string in kernel memory
- * Returns  : length of string *including terminator*,
- *            or zero on exception, or n + 1 if too long
- */
-uaccess_kernel_strnlen:
-                stmfd   sp!, {lr}
-                mov     r2, r0
-1:              ldrb    r1, [r0], #1
-                teq     r1, #0
-                beq     2f
-                subs    r1, r1, #1
-                bne     1b
-                add     r0, r0, #1
-2:              sub     r0, r0, r2
-                ldmfd   sp!, {pc}^
-
diff --git a/arch/arm26/lib/uaccess-user.S b/arch/arm26/lib/uaccess-user.S
deleted file mode 100644
index 130b8f28610a..000000000000
--- a/arch/arm26/lib/uaccess-user.S
+++ /dev/null
@@ -1,718 +0,0 @@
-/*
- *  linux/arch/arm26/lib/uaccess-user.S
- *
- *  Copyright (C) 1995, 1996,1997,1998 Russell King
- *
- * 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.
- *
- *  Routines to block copy data to/from user memory
- *   These are highly optimised both for the 4k page size
- *   and for various alignments.
- */
-#include <linux/linkage.h>
-#include <asm/assembler.h>
-#include <asm/errno.h>
-#include <asm/page.h>
-
-                .text
-
-//FIXME - surely this can be done in C not asm, removing the problem of keeping C and asm in sync? (this is a struct uaccess_t)
-                .globl  uaccess_user
-uaccess_user:
-                .word   uaccess_user_put_byte
-                .word   uaccess_user_get_byte
-                .word   uaccess_user_put_half
-                .word   uaccess_user_get_half
-                .word   uaccess_user_put_word
-                .word   uaccess_user_get_word
-                .word   uaccess_user_put_dword
-                .word   uaccess_user_copy_from_user
-                .word   uaccess_user_copy_to_user
-                .word   uaccess_user_clear_user
-                .word   uaccess_user_strncpy_from_user
-                .word   uaccess_user_strnlen_user
-
-
-@ In : r0 = x, r1 = addr, r2 = error
-@ Out: r2 = error
-uaccess_user_put_byte:
-                stmfd   sp!, {lr}
-USER(           strbt   r0, [r1])
-                ldmfd   sp!, {pc}^
-
-@ In : r0 = x, r1 = addr, r2 = error
-@ Out: r2 = error
-uaccess_user_put_half:
-                stmfd   sp!, {lr}
-USER(           strbt   r0, [r1], #1)
-                mov     r0, r0, lsr #8
-USER(           strbt   r0, [r1])
-                ldmfd   sp!, {pc}^
-
-@ In : r0 = x, r1 = addr, r2 = error
-@ Out: r2 = error
-uaccess_user_put_word:
-                stmfd   sp!, {lr}
-USER(           strt    r0, [r1])
-                ldmfd   sp!, {pc}^
-
-@ In : r0 = x, r1 = addr, r2 = error
-@ Out: r2 = error
-uaccess_user_put_dword:
-                stmfd   sp!, {lr}
-USER(           strt    r0, [r1], #4)
-USER(           strt    r0, [r1], #0)
-                ldmfd   sp!, {pc}^
-
-9001:           mov     r2, #-EFAULT
-                ldmfd   sp!, {pc}^
-
-
-@ In : r0 = addr, r1 = error
-@ Out: r0 = x, r1 = error
-uaccess_user_get_byte:
-                stmfd   sp!, {lr}
-USER(           ldrbt   r0, [r0])
-                ldmfd   sp!, {pc}^
-
-@ In : r0 = addr, r1 = error
-@ Out: r0 = x, r1 = error
-uaccess_user_get_half:
-                stmfd   sp!, {lr}
-USER(           ldrt    r0, [r0])
-                mov     r0, r0, lsl #16
-                mov     r0, r0, lsr #16
-                ldmfd   sp!, {pc}^
-
-@ In : r0 = addr, r1 = error
-@ Out: r0 = x, r1 = error
-uaccess_user_get_word:
-                stmfd   sp!, {lr}
-USER(           ldrt    r0, [r0])
-                ldmfd   sp!, {pc}^
-
-9001:           mov     r1, #-EFAULT
-                ldmfd   sp!, {pc}^
-
-/* Prototype: int uaccess_user_copy_to_user(void *to, const char *from, size_t n)
- * Purpose  : copy a block to user memory from kernel memory
- * Params   : to   - user memory
- *          : from - kernel memory
- *          : n    - number of bytes to copy
- * Returns  : Number of bytes NOT copied.
- */
-
-.c2u_dest_not_aligned:
-                rsb     ip, ip, #4
-                cmp     ip, #2
-                ldrb    r3, [r1], #1
-USER(           strbt   r3, [r0], #1)                   @ May fault
-                ldrgeb  r3, [r1], #1
-USER(           strgebt r3, [r0], #1)                   @ May fault
-                ldrgtb  r3, [r1], #1
-USER(           strgtbt r3, [r0], #1)                   @ May fault
-                sub     r2, r2, ip
-                b       .c2u_dest_aligned
-
-ENTRY(uaccess_user_copy_to_user)
-                stmfd   sp!, {r2, r4 - r7, lr}
-                cmp     r2, #4
-                blt     .c2u_not_enough
-                ands    ip, r0, #3
-                bne     .c2u_dest_not_aligned
-.c2u_dest_aligned:
-
-                ands    ip, r1, #3
-                bne     .c2u_src_not_aligned
-/*
- * Seeing as there has to be at least 8 bytes to copy, we can
- * copy one word, and force a user-mode page fault...
- */
-
-.c2u_0fupi:     subs    r2, r2, #4
-                addmi   ip, r2, #4
-                bmi     .c2u_0nowords
-                ldr     r3, [r1], #4
-USER(           strt    r3, [r0], #4)                   @ May fault
-                mov     ip, r0, lsl #32 - PAGE_SHIFT    @ On each page, use a ld/st??t instruction
-                rsb     ip, ip, #0
-                movs    ip, ip, lsr #32 - PAGE_SHIFT
-                beq     .c2u_0fupi
-/*
- * ip = max no. of bytes to copy before needing another "strt" insn
- */
-                cmp     r2, ip
-                movlt   ip, r2
-                sub     r2, r2, ip
-                subs    ip, ip, #32
-                blt     .c2u_0rem8lp
-
-.c2u_0cpy8lp:   ldmia   r1!, {r3 - r6}
-                stmia   r0!, {r3 - r6}                  @ Shouldnt fault
-                ldmia   r1!, {r3 - r6}
-                stmia   r0!, {r3 - r6}                  @ Shouldnt fault
-                subs    ip, ip, #32
-                bpl     .c2u_0cpy8lp
-.c2u_0rem8lp:   cmn     ip, #16
-                ldmgeia r1!, {r3 - r6}
-                stmgeia r0!, {r3 - r6}                  @ Shouldnt fault
-                tst     ip, #8
-                ldmneia r1!, {r3 - r4}
-                stmneia r0!, {r3 - r4}                  @ Shouldnt fault
-                tst     ip, #4
-                ldrne   r3, [r1], #4
-                strnet  r3, [r0], #4                    @ Shouldnt fault
-                ands    ip, ip, #3
-                beq     .c2u_0fupi
-.c2u_0nowords:  teq     ip, #0
-                beq     .c2u_finished
-.c2u_nowords:   cmp     ip, #2
-                ldrb    r3, [r1], #1
-USER(           strbt   r3, [r0], #1)                   @ May fault
-                ldrgeb  r3, [r1], #1
-USER(           strgebt r3, [r0], #1)                   @ May fault
-                ldrgtb  r3, [r1], #1
-USER(           strgtbt r3, [r0], #1)                   @ May fault
-                b       .c2u_finished
-
-.c2u_not_enough:
-                movs    ip, r2
-                bne     .c2u_nowords
-.c2u_finished:  mov     r0, #0
-                LOADREGS(fd,sp!,{r2, r4 - r7, pc})
-
-.c2u_src_not_aligned:
-                bic     r1, r1, #3
-                ldr     r7, [r1], #4
-                cmp     ip, #2
-                bgt     .c2u_3fupi
-                beq     .c2u_2fupi
-.c2u_1fupi:     subs    r2, r2, #4
-                addmi   ip, r2, #4
-                bmi     .c2u_1nowords
-                mov     r3, r7, pull #8
-                ldr     r7, [r1], #4
-                orr     r3, r3, r7, push #24
-USER(           strt    r3, [r0], #4)                   @ May fault
-                mov     ip, r0, lsl #32 - PAGE_SHIFT
-                rsb     ip, ip, #0
-                movs    ip, ip, lsr #32 - PAGE_SHIFT
-                beq     .c2u_1fupi
-                cmp     r2, ip
-                movlt   ip, r2
-                sub     r2, r2, ip
-                subs    ip, ip, #16
-                blt     .c2u_1rem8lp
-
-.c2u_1cpy8lp:   mov     r3, r7, pull #8
-                ldmia   r1!, {r4 - r7}
-                orr     r3, r3, r4, push #24
-                mov     r4, r4, pull #8
-                orr     r4, r4, r5, push #24
-                mov     r5, r5, pull #8
-                orr     r5, r5, r6, push #24
-                mov     r6, r6, pull #8
-                orr     r6, r6, r7, push #24
-                stmia   r0!, {r3 - r6}                  @ Shouldnt fault
-                subs    ip, ip, #16
-                bpl     .c2u_1cpy8lp
-.c2u_1rem8lp:   tst     ip, #8
-                movne   r3, r7, pull #8
-                ldmneia r1!, {r4, r7}
-                orrne   r3, r3, r4, push #24
-                movne   r4, r4, pull #8
-                orrne   r4, r4, r7, push #24
-                stmneia r0!, {r3 - r4}                  @ Shouldnt fault
-                tst     ip, #4
-                movne   r3, r7, pull #8
-                ldrne   r7, [r1], #4
-                orrne   r3, r3, r7, push #24
-                strnet  r3, [r0], #4                    @ Shouldnt fault
-                ands    ip, ip, #3
-                beq     .c2u_1fupi
-.c2u_1nowords:  mov     r3, r7, lsr #byte(1)
-                teq     ip, #0
-                beq     .c2u_finished
-                cmp     ip, #2
-USER(           strbt   r3, [r0], #1)                   @ May fault
-                movge   r3, r7, lsr #byte(2)
-USER(           strgebt r3, [r0], #1)                   @ May fault
-                movgt   r3, r7, lsr #byte(3)
-USER(           strgtbt r3, [r0], #1)                   @ May fault
-                b       .c2u_finished
-
-.c2u_2fupi:     subs    r2, r2, #4
-                addmi   ip, r2, #4
-                bmi     .c2u_2nowords
-                mov     r3, r7, pull #16
-                ldr     r7, [r1], #4
-                orr     r3, r3, r7, push #16
-USER(           strt    r3, [r0], #4)                   @ May fault
-                mov     ip, r0, lsl #32 - PAGE_SHIFT
-                rsb     ip, ip, #0
-                movs    ip, ip, lsr #32 - PAGE_SHIFT
-                beq     .c2u_2fupi
-                cmp     r2, ip
-                movlt   ip, r2
-                sub     r2, r2, ip
-                subs    ip, ip, #16
-                blt     .c2u_2rem8lp
-
-.c2u_2cpy8lp:   mov     r3, r7, pull #16
-                ldmia   r1!, {r4 - r7}
-                orr     r3, r3, r4, push #16
-                mov     r4, r4, pull #16
-                orr     r4, r4, r5, push #16
-                mov     r5, r5, pull #16
-                orr     r5, r5, r6, push #16
-                mov     r6, r6, pull #16
-                orr     r6, r6, r7, push #16
-                stmia   r0!, {r3 - r6}                  @ Shouldnt fault
-                subs    ip, ip, #16
-                bpl     .c2u_2cpy8lp
-.c2u_2rem8lp:   tst     ip, #8
-                movne   r3, r7, pull #16
-                ldmneia r1!, {r4, r7}
-                orrne   r3, r3, r4, push #16
-                movne   r4, r4, pull #16
-                orrne   r4, r4, r7, push #16
-                stmneia r0!, {r3 - r4}                  @ Shouldnt fault
-                tst     ip, #4
-                movne   r3, r7, pull #16
-                ldrne   r7, [r1], #4
-                orrne   r3, r3, r7, push #16
-                strnet  r3, [r0], #4                    @ Shouldnt fault
-                ands    ip, ip, #3
-                beq     .c2u_2fupi
-.c2u_2nowords:  mov     r3, r7, lsr #byte(2)
-                teq     ip, #0
-                beq     .c2u_finished
-                cmp     ip, #2
-USER(           strbt   r3, [r0], #1)                   @ May fault
-                movge   r3, r7, lsr #byte(3)
-USER(           strgebt r3, [r0], #1)                   @ May fault
-                ldrgtb  r3, [r1], #0
-USER(           strgtbt r3, [r0], #1)                   @ May fault
-                b       .c2u_finished
-
-.c2u_3fupi:     subs    r2, r2, #4
-                addmi   ip, r2, #4
-                bmi     .c2u_3nowords
-                mov     r3, r7, pull #24
-                ldr     r7, [r1], #4
-                orr     r3, r3, r7, push #8
-USER(           strt    r3, [r0], #4)                   @ May fault
-                mov     ip, r0, lsl #32 - PAGE_SHIFT
-                rsb     ip, ip, #0
-                movs    ip, ip, lsr #32 - PAGE_SHIFT
-                beq     .c2u_3fupi
-                cmp     r2, ip
-                movlt   ip, r2
-                sub     r2, r2, ip
-                subs    ip, ip, #16
-                blt     .c2u_3rem8lp
-
-.c2u_3cpy8lp:   mov     r3, r7, pull #24
-                ldmia   r1!, {r4 - r7}
-                orr     r3, r3, r4, push #8
-                mov     r4, r4, pull #24
-                orr     r4, r4, r5, push #8
-                mov     r5, r5, pull #24
-                orr     r5, r5, r6, push #8
-                mov     r6, r6, pull #24
-                orr     r6, r6, r7, push #8
-                stmia   r0!, {r3 - r6}                  @ Shouldnt fault
-                subs    ip, ip, #16
-                bpl     .c2u_3cpy8lp
-.c2u_3rem8lp:   tst     ip, #8
-                movne   r3, r7, pull #24
-                ldmneia r1!, {r4, r7}
-                orrne   r3, r3, r4, push #8
-                movne   r4, r4, pull #24
-                orrne   r4, r4, r7, push #8
-                stmneia r0!, {r3 - r4}                  @ Shouldnt fault
-                tst     ip, #4
-                movne   r3, r7, pull #24
-                ldrne   r7, [r1], #4
-                orrne   r3, r3, r7, push #8
-                strnet  r3, [r0], #4                    @ Shouldnt fault
-                ands    ip, ip, #3
-                beq     .c2u_3fupi
-.c2u_3nowords:  mov     r3, r7, lsr #byte(3)
-                teq     ip, #0
-                beq     .c2u_finished
-                cmp     ip, #2
-USER(           strbt   r3, [r0], #1)                   @ May fault
-                ldrgeb  r3, [r1], #1
-USER(           strgebt r3, [r0], #1)                   @ May fault
-                ldrgtb  r3, [r1], #0
-USER(           strgtbt r3, [r0], #1)                   @ May fault
-                b       .c2u_finished
-
-                .section .fixup,"ax"
-                .align  0
-9001:           LOADREGS(fd,sp!, {r0, r4 - r7, pc})
-                .previous
-
-/* Prototype: unsigned long uaccess_user_copy_from_user(void *to,const void *from,unsigned long n);
- * Purpose  : copy a block from user memory to kernel memory
- * Params   : to   - kernel memory
- *          : from - user memory
- *          : n    - number of bytes to copy
- * Returns  : Number of bytes NOT copied.
- */
-.cfu_dest_not_aligned:
-                rsb     ip, ip, #4
-                cmp     ip, #2
-USER(           ldrbt   r3, [r1], #1)                   @ May fault
-                strb    r3, [r0], #1
-USER(           ldrgebt r3, [r1], #1)                   @ May fault
-                strgeb  r3, [r0], #1
-USER(           ldrgtbt r3, [r1], #1)                   @ May fault
-                strgtb  r3, [r0], #1
-                sub     r2, r2, ip
-                b       .cfu_dest_aligned
-
-ENTRY(uaccess_user_copy_from_user)
-                stmfd   sp!, {r0, r2, r4 - r7, lr}
-                cmp     r2, #4
-                blt     .cfu_not_enough
-                ands    ip, r0, #3
-                bne     .cfu_dest_not_aligned
-.cfu_dest_aligned:
-                ands    ip, r1, #3
-                bne     .cfu_src_not_aligned
-/*
- * Seeing as there has to be at least 8 bytes to copy, we can
- * copy one word, and force a user-mode page fault...
- */
-
-.cfu_0fupi:     subs    r2, r2, #4
-                addmi   ip, r2, #4
-                bmi     .cfu_0nowords
-USER(           ldrt    r3, [r1], #4)
-                str     r3, [r0], #4
-                mov     ip, r1, lsl #32 - PAGE_SHIFT    @ On each page, use a ld/st??t instruction
-                rsb     ip, ip, #0
-                movs    ip, ip, lsr #32 - PAGE_SHIFT
-                beq     .cfu_0fupi
-/*
- * ip = max no. of bytes to copy before needing another "strt" insn
- */
-                cmp     r2, ip
-                movlt   ip, r2
-                sub     r2, r2, ip
-                subs    ip, ip, #32
-                blt     .cfu_0rem8lp
-
-.cfu_0cpy8lp:   ldmia   r1!, {r3 - r6}                  @ Shouldnt fault
-                stmia   r0!, {r3 - r6}
-                ldmia   r1!, {r3 - r6}                  @ Shouldnt fault
-                stmia   r0!, {r3 - r6}
-                subs    ip, ip, #32
-                bpl     .cfu_0cpy8lp
-.cfu_0rem8lp:   cmn     ip, #16
-                ldmgeia r1!, {r3 - r6}                  @ Shouldnt fault
-                stmgeia r0!, {r3 - r6}
-                tst     ip, #8
-                ldmneia r1!, {r3 - r4}                  @ Shouldnt fault
-                stmneia r0!, {r3 - r4}
-                tst     ip, #4
-                ldrnet  r3, [r1], #4                    @ Shouldnt fault
-                strne   r3, [r0], #4
-                ands    ip, ip, #3
-                beq     .cfu_0fupi
-.cfu_0nowords:  teq     ip, #0
-                beq     .cfu_finished
-.cfu_nowords:   cmp     ip, #2
-USER(           ldrbt   r3, [r1], #1)                   @ May fault
-                strb    r3, [r0], #1
-USER(           ldrgebt r3, [r1], #1)                   @ May fault
-                strgeb  r3, [r0], #1
-USER(           ldrgtbt r3, [r1], #1)                   @ May fault
-                strgtb  r3, [r0], #1
-                b       .cfu_finished
-
-.cfu_not_enough:
-                movs    ip, r2
-                bne     .cfu_nowords
-.cfu_finished:  mov     r0, #0
-                add     sp, sp, #8
-                LOADREGS(fd,sp!,{r4 - r7, pc})
-
-.cfu_src_not_aligned:
-                bic     r1, r1, #3
-USER(           ldrt    r7, [r1], #4)                   @ May fault
-                cmp     ip, #2
-                bgt     .cfu_3fupi
-                beq     .cfu_2fupi
-.cfu_1fupi:     subs    r2, r2, #4
-                addmi   ip, r2, #4
-                bmi     .cfu_1nowords
-                mov     r3, r7, pull #8
-USER(           ldrt    r7, [r1], #4)                   @ May fault
-                orr     r3, r3, r7, push #24
-                str     r3, [r0], #4
-                mov     ip, r1, lsl #32 - PAGE_SHIFT
-                rsb     ip, ip, #0
-                movs    ip, ip, lsr #32 - PAGE_SHIFT
-                beq     .cfu_1fupi
-                cmp     r2, ip
-                movlt   ip, r2
-                sub     r2, r2, ip
-                subs    ip, ip, #16
-                blt     .cfu_1rem8lp
-
-.cfu_1cpy8lp:   mov     r3, r7, pull #8
-                ldmia   r1!, {r4 - r7}                  @ Shouldnt fault
-                orr     r3, r3, r4, push #24
-                mov     r4, r4, pull #8
-                orr     r4, r4, r5, push #24
-                mov     r5, r5, pull #8
-                orr     r5, r5, r6, push #24
-                mov     r6, r6, pull #8
-                orr     r6, r6, r7, push #24
-                stmia   r0!, {r3 - r6}
-                subs    ip, ip, #16
-                bpl     .cfu_1cpy8lp
-.cfu_1rem8lp:   tst     ip, #8
-                movne   r3, r7, pull #8
-                ldmneia r1!, {r4, r7}                   @ Shouldnt fault
-                orrne   r3, r3, r4, push #24
-                movne   r4, r4, pull #8
-                orrne   r4, r4, r7, push #24
-                stmneia r0!, {r3 - r4}
-                tst     ip, #4
-                movne   r3, r7, pull #8
-USER(           ldrnet  r7, [r1], #4)                   @ May fault
-                orrne   r3, r3, r7, push #24
-                strne   r3, [r0], #4
-                ands    ip, ip, #3
-                beq     .cfu_1fupi
-.cfu_1nowords:  mov     r3, r7, lsr #byte(1)
-                teq     ip, #0
-                beq     .cfu_finished
-                cmp     ip, #2
-                strb    r3, [r0], #1
-                movge   r3, r7, lsr #byte(2)
-                strgeb  r3, [r0], #1
-                movgt   r3, r7, lsr #byte(3)
-                strgtb  r3, [r0], #1
-                b       .cfu_finished
-
-.cfu_2fupi:     subs    r2, r2, #4
-                addmi   ip, r2, #4
-                bmi     .cfu_2nowords
-                mov     r3, r7, pull #16
-USER(           ldrt    r7, [r1], #4)                   @ May fault
-                orr     r3, r3, r7, push #16
-                str     r3, [r0], #4
-                mov     ip, r1, lsl #32 - PAGE_SHIFT
-                rsb     ip, ip, #0
-                movs    ip, ip, lsr #32 - PAGE_SHIFT
-                beq     .cfu_2fupi
-                cmp     r2, ip
-                movlt   ip, r2
-                sub     r2, r2, ip
-                subs    ip, ip, #16
-                blt     .cfu_2rem8lp
-
-.cfu_2cpy8lp:   mov     r3, r7, pull #16
-                ldmia   r1!, {r4 - r7}                  @ Shouldnt fault
-                orr     r3, r3, r4, push #16
-                mov     r4, r4, pull #16
-                orr     r4, r4, r5, push #16
-                mov     r5, r5, pull #16
-                orr     r5, r5, r6, push #16
-                mov     r6, r6, pull #16
-                orr     r6, r6, r7, push #16
-                stmia   r0!, {r3 - r6}
-                subs    ip, ip, #16
-                bpl     .cfu_2cpy8lp
-.cfu_2rem8lp:   tst     ip, #8
-                movne   r3, r7, pull #16
-                ldmneia r1!, {r4, r7}                   @ Shouldnt fault
-                orrne   r3, r3, r4, push #16
-                movne   r4, r4, pull #16
-                orrne   r4, r4, r7, push #16
-                stmneia r0!, {r3 - r4}
-                tst     ip, #4
-                movne   r3, r7, pull #16
-USER(           ldrnet  r7, [r1], #4)                   @ May fault
-                orrne   r3, r3, r7, push #16
-                strne   r3, [r0], #4
-                ands    ip, ip, #3
-                beq     .cfu_2fupi
-.cfu_2nowords:  mov     r3, r7, lsr #byte(2)
-                teq     ip, #0
-                beq     .cfu_finished
-                cmp     ip, #2
-                strb    r3, [r0], #1
-                movge   r3, r7, lsr #byte(3)
-                strgeb  r3, [r0], #1
-USER(           ldrgtbt r3, [r1], #0)                   @ May fault
-                strgtb  r3, [r0], #1
-                b       .cfu_finished
-
-.cfu_3fupi:     subs    r2, r2, #4
-                addmi   ip, r2, #4
-                bmi     .cfu_3nowords
-                mov     r3, r7, pull #24
-USER(           ldrt    r7, [r1], #4)                   @ May fault
-                orr     r3, r3, r7, push #8
-                str     r3, [r0], #4
-                mov     ip, r1, lsl #32 - PAGE_SHIFT
-                rsb     ip, ip, #0
-                movs    ip, ip, lsr #32 - PAGE_SHIFT
-                beq     .cfu_3fupi
-                cmp     r2, ip
-                movlt   ip, r2
-                sub     r2, r2, ip
-                subs    ip, ip, #16
-                blt     .cfu_3rem8lp
-
-.cfu_3cpy8lp:   mov     r3, r7, pull #24
-                ldmia   r1!, {r4 - r7}                  @ Shouldnt fault
-                orr     r3, r3, r4, push #8
-                mov     r4, r4, pull #24
-                orr     r4, r4, r5, push #8
-                mov     r5, r5, pull #24
-                orr     r5, r5, r6, push #8
-                mov     r6, r6, pull #24
-                orr     r6, r6, r7, push #8
-                stmia   r0!, {r3 - r6}
-                subs    ip, ip, #16
-                bpl     .cfu_3cpy8lp
-.cfu_3rem8lp:   tst     ip, #8
-                movne   r3, r7, pull #24
-                ldmneia r1!, {r4, r7}                   @ Shouldnt fault
-                orrne   r3, r3, r4, push #8
-                movne   r4, r4, pull #24
-                orrne   r4, r4, r7, push #8
-                stmneia r0!, {r3 - r4}
-                tst     ip, #4
-                movne   r3, r7, pull #24
-USER(           ldrnet  r7, [r1], #4)                   @ May fault
-                orrne   r3, r3, r7, push #8
-                strne   r3, [r0], #4
-                ands    ip, ip, #3
-                beq     .cfu_3fupi
-.cfu_3nowords:  mov     r3, r7, lsr #byte(3)
-                teq     ip, #0
-                beq     .cfu_finished
-                cmp     ip, #2
-                strb    r3, [r0], #1
-USER(           ldrgebt r3, [r1], #1)                   @ May fault
-                strgeb  r3, [r0], #1
-USER(           ldrgtbt r3, [r1], #1)                   @ May fault
-                strgtb  r3, [r0], #1
-                b       .cfu_finished
-
-                .section .fixup,"ax"
-                .align  0
-                /*
-                 * We took an exception.  r0 contains a pointer to
-                 * the byte not copied.
-                 */
-9001:           ldr     r2, [sp], #4                    @ void *to
-                sub     r2, r0, r2                      @ bytes copied
-                ldr     r1, [sp], #4                    @ unsigned long count
-                subs    r4, r1, r2                      @ bytes left to copy
-                movne   r1, r4
-                blne    __memzero
-                mov     r0, r4
-                LOADREGS(fd,sp!, {r4 - r7, pc})
-                .previous
-
-/* Prototype: int uaccess_user_clear_user(void *addr, size_t sz)
- * Purpose  : clear some user memory
- * Params   : addr - user memory address to clear
- *          : sz   - number of bytes to clear
- * Returns  : number of bytes NOT cleared
- */
-ENTRY(uaccess_user_clear_user)
-                stmfd   sp!, {r1, lr}
-                mov     r2, #0
-                cmp     r1, #4
-                blt     2f
-                ands    ip, r0, #3
-                beq     1f
-                cmp     ip, #2
-USER(           strbt   r2, [r0], #1)
-USER(           strlebt r2, [r0], #1)
-USER(           strltbt r2, [r0], #1)
-                rsb     ip, ip, #4
-                sub     r1, r1, ip              @  7  6  5  4  3  2  1
-1:              subs    r1, r1, #8              @ -1 -2 -3 -4 -5 -6 -7
-USER(           strplt  r2, [r0], #4)
-USER(           strplt  r2, [r0], #4)
-                bpl     1b
-                adds    r1, r1, #4              @  3  2  1  0 -1 -2 -3
-USER(           strplt  r2, [r0], #4)
-2:              tst     r1, #2                  @ 1x 1x 0x 0x 1x 1x 0x
-USER(           strnebt r2, [r0], #1)
-USER(           strnebt r2, [r0], #1)
-                tst     r1, #1                  @ x1 x0 x1 x0 x1 x0 x1
-USER(           strnebt r2, [r0], #1)
-                mov     r0, #0
-                LOADREGS(fd,sp!, {r1, pc})
-
-                .section .fixup,"ax"
-                .align  0
-9001:           LOADREGS(fd,sp!, {r0, pc})
-                .previous
-
-/*
- * Copy a string from user space to kernel space.
- *  r0 = dst, r1 = src, r2 = byte length
- * returns the number of characters copied (strlen of copied string),
- *  -EFAULT on exception, or "len" if we fill the whole buffer
- */
-ENTRY(uaccess_user_strncpy_from_user)
-        save_lr
-        mov     ip, r1
-1:      subs    r2, r2, #1
-USER(   ldrplbt r3, [r1], #1)
-        bmi     2f
-        strb    r3, [r0], #1
-        teq     r3, #0
-        bne     1b
-        sub     r1, r1, #1      @ take NUL character out of count
-2:      sub     r0, r1, ip
-        restore_pc
-
-        .section .fixup,"ax"
-        .align  0
-9001:   mov     r3, #0
-        strb    r3, [r0, #0]    @ null terminate
-        mov     r0, #-EFAULT
-        restore_pc
-        .previous
-
-/* Prototype: unsigned long uaccess_user_strnlen_user(const char *str, long n)
- * Purpose  : get length of a string in user memory
- * Params   : str - address of string in user memory
- * Returns  : length of string *including terminator*
- *            or zero on exception, or n + 1 if too long
- */
-ENTRY(uaccess_user_strnlen_user)
-        save_lr
-        mov     r2, r0
-1:
-USER(   ldrbt   r3, [r0], #1)
-        teq     r3, #0
-        beq     2f
-        subs    r1, r1, #1
-        bne     1b
-        add     r0, r0, #1
-2:      sub     r0, r0, r2
-        restore_pc
-
-        .section .fixup,"ax"
-        .align  0
-9001:   mov     r0, #0
-        restore_pc
-        .previous
-
diff --git a/arch/arm26/lib/ucmpdi2.c b/arch/arm26/lib/ucmpdi2.c
deleted file mode 100644
index 6c6ae63efa02..000000000000
--- a/arch/arm26/lib/ucmpdi2.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* More subroutines needed by GCC output code on some machines.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC 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.
-
-GNU CC 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 GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.
- */
-/* support functions required by the kernel. based on code from gcc-2.95.3 */
-/* I Molton     29/07/01 */
-
-#include "gcclib.h"
-
-word_type
-__ucmpdi2 (DItype a, DItype b)
-{
-  DIunion au, bu;
-
-  au.ll = a, bu.ll = b;
-
-  if ((USItype) au.s.high < (USItype) bu.s.high)
-    return 0;
-  else if ((USItype) au.s.high > (USItype) bu.s.high)
-    return 2;
-  if ((USItype) au.s.low < (USItype) bu.s.low)
-    return 0;
-  else if ((USItype) au.s.low > (USItype) bu.s.low)
-    return 2;
-  return 1;
-}
-
diff --git a/arch/arm26/lib/udivdi3.c b/arch/arm26/lib/udivdi3.c
deleted file mode 100644
index d25195f673f4..000000000000
--- a/arch/arm26/lib/udivdi3.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/* More subroutines needed by GCC output code on some machines.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC 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.
-
-GNU CC 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 GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.
- */
-/* support functions required by the kernel. based on code from gcc-2.95.3 */
-/* I Molton     29/07/01 */
-
-#include "gcclib.h"
-#include "longlong.h"
-
-static const UQItype __clz_tab[] =
-{
-  0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
-  6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
-  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-  8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-  8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-  8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-  8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-};
-
-UDItype
-__udivmoddi4 (UDItype n, UDItype d, UDItype *rp)
-{
-  DIunion ww;
-  DIunion nn, dd;
-  DIunion rr;
-  USItype d0, d1, n0, n1, n2;
-  USItype q0, q1;
-  USItype b, bm;
-
-  nn.ll = n;
-  dd.ll = d;
-
-  d0 = dd.s.low;
-  d1 = dd.s.high;
-  n0 = nn.s.low;
-  n1 = nn.s.high;
-
-  if (d1 == 0)
-    {
-      if (d0 > n1)
-        {
-          /* 0q = nn / 0D */
-
-          count_leading_zeros (bm, d0);
-
-          if (bm != 0)
-            {
-              /* Normalize, i.e. make the most significant bit of the
-                 denominator set.  */
-
-              d0 = d0 << bm;
-              n1 = (n1 << bm) | (n0 >> (SI_TYPE_SIZE - bm));
-              n0 = n0 << bm;
-            }
-
-          udiv_qrnnd (q0, n0, n1, n0, d0);
-          q1 = 0;
-
-          /* Remainder in n0 >> bm.  */
-        }
-      else
-        {
-          /* qq = NN / 0d */
-
-          if (d0 == 0)
-            d0 = 1 / d0;        /* Divide intentionally by zero.  */
-
-          count_leading_zeros (bm, d0);
-
-          if (bm == 0)
-            {
-              /* From (n1 >= d0) /\ (the most significant bit of d0 is set),
-                 conclude (the most significant bit of n1 is set) /\ (the
-                 leading quotient digit q1 = 1).
-
-                 This special case is necessary, not an optimization.
-                 (Shifts counts of SI_TYPE_SIZE are undefined.)  */
-
-              n1 -= d0;
-              q1 = 1;
-            }
-          else
-            {
-              /* Normalize.  */
-
-              b = SI_TYPE_SIZE - bm;
-
-              d0 = d0 << bm;
-              n2 = n1 >> b;
-              n1 = (n1 << bm) | (n0 >> b);
-              n0 = n0 << bm;
-
-              udiv_qrnnd (q1, n1, n2, n1, d0);
-            }
-
-          /* n1 != d0...  */
-
-          udiv_qrnnd (q0, n0, n1, n0, d0);
-
-          /* Remainder in n0 >> bm.  */
-        }
-
-      if (rp != 0)
-        {
-          rr.s.low = n0 >> bm;
-          rr.s.high = 0;
-          *rp = rr.ll;
-        }
-    }
-  else
-    {
-      if (d1 > n1)
-        {
-          /* 00 = nn / DD */
-
-          q0 = 0;
-          q1 = 0;
-
-          /* Remainder in n1n0.  */
-          if (rp != 0)
-            {
-              rr.s.low = n0;
-              rr.s.high = n1;
-              *rp = rr.ll;
-            }
-        }
-      else
-        {
-          /* 0q = NN / dd */
-
-          count_leading_zeros (bm, d1);
-          if (bm == 0)
-            {
-              /* From (n1 >= d1) /\ (the most significant bit of d1 is set),
-                 conclude (the most significant bit of n1 is set) /\ (the
-                 quotient digit q0 = 0 or 1).
-
-                 This special case is necessary, not an optimization.  */
-
-              /* The condition on the next line takes advantage of that
-                 n1 >= d1 (true due to program flow).  */
-              if (n1 > d1 || n0 >= d0)
-                {
-                  q0 = 1;
-                  sub_ddmmss (n1, n0, n1, n0, d1, d0);
-                }
-              else
-                q0 = 0;
-
-              q1 = 0;
-
-              if (rp != 0)
-                {
-                  rr.s.low = n0;
-                  rr.s.high = n1;
-                  *rp = rr.ll;
-                }
-            }
-          else
-            {
-              USItype m1, m0;
-              /* Normalize.  */
-
-              b = SI_TYPE_SIZE - bm;
-
-              d1 = (d1 << bm) | (d0 >> b);
-              d0 = d0 << bm;
-              n2 = n1 >> b;
-              n1 = (n1 << bm) | (n0 >> b);
-              n0 = n0 << bm;
-
-              udiv_qrnnd (q0, n1, n2, n1, d1);
-              umul_ppmm (m1, m0, q0, d0);
-
-              if (m1 > n1 || (m1 == n1 && m0 > n0))
-                {
-                  q0--;
-                  sub_ddmmss (m1, m0, m1, m0, d1, d0);
-                }
-
-              q1 = 0;
-
-              /* Remainder in (n1n0 - m1m0) >> bm.  */
-              if (rp != 0)
-                {
-                  sub_ddmmss (n1, n0, n1, n0, m1, m0);
-                  rr.s.low = (n1 << b) | (n0 >> bm);
-                  rr.s.high = n1 >> bm;
-                  *rp = rr.ll;
-                }
-            }
-        }
-    }
-
-  ww.s.low = q0;
-  ww.s.high = q1;
-  return ww.ll;
-}
-
-UDItype
-__udivdi3 (UDItype n, UDItype d)
-{
-  return __udivmoddi4 (n, d, (UDItype *) 0);
-}
-
-UDItype
-__umoddi3 (UDItype u, UDItype v)
-{
-  UDItype w;
-
-  (void) __udivmoddi4 (u ,v, &w);
-
-  return w;
-}
-
diff --git a/arch/arm26/machine/Makefile b/arch/arm26/machine/Makefile
deleted file mode 100644
index 86ea97cc07fc..000000000000
--- a/arch/arm26/machine/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-# Object file lists.
-
-obj-y                   := dma.o irq.o latches.o
-
diff --git a/arch/arm26/machine/dma.c b/arch/arm26/machine/dma.c
deleted file mode 100644
index 4402a5a1b78f..000000000000
--- a/arch/arm26/machine/dma.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/dma.c
- *
- *  Copyright (C) 1998-1999 Dave Gilbert / Russell King
- *  Copyright (C) 2003 Ian Molton
- *
- * 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.
- *
- *  DMA functions specific to Archimedes and A5000 architecture
- */
-#include <linux/sched.h>
-#include <linux/init.h>
-
-#include <asm/dma.h>
-#include <asm/fiq.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-#include <asm/hardware.h>
-#include <asm/mach-types.h>
-
-#define DPRINTK(x...) printk(KERN_DEBUG x)
-
-#if defined(CONFIG_BLK_DEV_FD1772) || defined(CONFIG_BLK_DEV_FD1772_MODULE)
-
-extern unsigned char fdc1772_dma_read, fdc1772_dma_read_end;
-extern unsigned char fdc1772_dma_write, fdc1772_dma_write_end;
-extern void fdc1772_setupdma(unsigned int count,unsigned int addr);
-
-static void arc_floppy_data_enable_dma(dmach_t channel, dma_t *dma)
-{
-        DPRINTK("arc_floppy_data_enable_dma\n");
-
-        if (dma->using_sg)
-                BUG();
-
-        switch (dma->dma_mode) {
-        case DMA_MODE_READ: { /* read */
-                unsigned long flags;
-                DPRINTK("enable_dma fdc1772 data read\n");
-                local_save_flags_cli(flags);
-                clf();
-                        
-                memcpy ((void *)0x1c, (void *)&fdc1772_dma_read,
-                        &fdc1772_dma_read_end - &fdc1772_dma_read);
-                fdc1772_setupdma(dma->buf.length, dma->buf.__address); /* Sets data pointer up */
-                enable_fiq(FIQ_FLOPPYDATA);
-                local_irq_restore(flags);
-           }
-           break;
-
-        case DMA_MODE_WRITE: { /* write */
-                unsigned long flags;
-                DPRINTK("enable_dma fdc1772 data write\n");
-                local_save_flags_cli(flags);
-                clf();
-                memcpy ((void *)0x1c, (void *)&fdc1772_dma_write,
-                        &fdc1772_dma_write_end - &fdc1772_dma_write);
-                fdc1772_setupdma(dma->buf.length, dma->buf.__address); /* Sets data pointer up */
-                enable_fiq(FIQ_FLOPPYDATA);
-
-                local_irq_restore(flags);
-            }
-            break;
-        default:
-                printk ("enable_dma: dma%d not initialised\n", channel);
-        }
-}
-
-static int arc_floppy_data_get_dma_residue(dmach_t channel, dma_t *dma)
-{
-        extern unsigned int fdc1772_bytestogo;
-
-        /* 10/1/1999 DAG - I presume its the number of bytes left? */
-        return fdc1772_bytestogo;
-}
-
-static void arc_floppy_cmdend_enable_dma(dmach_t channel, dma_t *dma)
-{
-        /* Need to build a branch at the FIQ address */
-        extern void fdc1772_comendhandler(void);
-        unsigned long flags;
-
-        DPRINTK("arc_floppy_cmdend_enable_dma\n");
-        /*printk("enable_dma fdc1772 command end FIQ\n");*/
-        save_flags(flags);
-        clf();
-        
-        /* B fdc1772_comendhandler */
-        *((unsigned int *)0x1c)=0xea000000 |
-                        (((unsigned int)fdc1772_comendhandler-(0x1c+8))/4);
-
-        local_irq_restore(flags);
-}
-
-static int arc_floppy_cmdend_get_dma_residue(dmach_t channel, dma_t *dma)
-{
-        /* 10/1/1999 DAG - Presume whether there is an outstanding command? */
-        extern unsigned int fdc1772_fdc_int_done;
-
-        /* Explicit! If the int done is 0 then 1 int to go */
-        return (fdc1772_fdc_int_done==0)?1:0;
-}
-
-static void arc_disable_dma(dmach_t channel, dma_t *dma)
-{
-        disable_fiq(dma->dma_irq);
-}
-
-static struct dma_ops arc_floppy_data_dma_ops = {
-        .type           = "FIQDMA",
-        .enable         = arc_floppy_data_enable_dma,
-        .disable        = arc_disable_dma,
-        .residue        = arc_floppy_data_get_dma_residue,
-};
-
-static struct dma_ops arc_floppy_cmdend_dma_ops = {
-        .type           = "FIQCMD",
-        .enable         = arc_floppy_cmdend_enable_dma,
-        .disable        = arc_disable_dma,
-        .residue        = arc_floppy_cmdend_get_dma_residue,
-};
-#endif
-
-#ifdef CONFIG_ARCH_A5K
-static struct fiq_handler fh = {
-        .name   = "floppydata"
-};
-
-static int a5k_floppy_get_dma_residue(dmach_t channel, dma_t *dma)
-{
-        struct pt_regs regs;
-        get_fiq_regs(&regs);
-        return regs.ARM_r9;
-}
-
-static void a5k_floppy_enable_dma(dmach_t channel, dma_t *dma)
-{
-        struct pt_regs regs;
-        void *fiqhandler_start;
-        unsigned int fiqhandler_length;
-        extern void floppy_fiqsetup(unsigned long len, unsigned long addr,
-                                     unsigned long port);
-
-        if (dma->using_sg)
-                BUG();
-
-        if (dma->dma_mode == DMA_MODE_READ) {
-                extern unsigned char floppy_fiqin_start, floppy_fiqin_end;
-                fiqhandler_start = &floppy_fiqin_start;
-                fiqhandler_length = &floppy_fiqin_end - &floppy_fiqin_start;
-        } else {
-                extern unsigned char floppy_fiqout_start, floppy_fiqout_end;
-                fiqhandler_start = &floppy_fiqout_start;
-                fiqhandler_length = &floppy_fiqout_end - &floppy_fiqout_start;
-        }
-        if (claim_fiq(&fh)) {
-                printk("floppydma: couldn't claim FIQ.\n");
-                return;
-        }
-        memcpy((void *)0x1c, fiqhandler_start, fiqhandler_length);
-        regs.ARM_r9 = dma->buf.length;
-        regs.ARM_r10 = (unsigned long)dma->buf.__address;
-        regs.ARM_fp = FLOPPYDMA_BASE;
-        set_fiq_regs(&regs);
-        enable_fiq(dma->dma_irq);
-}
-
-static void a5k_floppy_disable_dma(dmach_t channel, dma_t *dma)
-{
-        disable_fiq(dma->dma_irq);
-        release_fiq(&fh);
-}
-
-static struct dma_ops a5k_floppy_dma_ops = {
-        .type           = "FIQDMA",
-        .enable         = a5k_floppy_enable_dma,
-        .disable        = a5k_floppy_disable_dma,
-        .residue        = a5k_floppy_get_dma_residue,
-};
-#endif
-
-/*
- * This is virtual DMA - we don't need anything here
- */
-static void sound_enable_disable_dma(dmach_t channel, dma_t *dma)
-{
-}
-
-static struct dma_ops sound_dma_ops = {
-        .type           = "VIRTUAL",
-        .enable         = sound_enable_disable_dma,
-        .disable        = sound_enable_disable_dma,
-};
-
-void __init arch_dma_init(dma_t *dma)
-{
-#if defined(CONFIG_BLK_DEV_FD1772) || defined(CONFIG_BLK_DEV_FD1772_MODULE)
-        if (machine_is_archimedes()) {
-                dma[DMA_VIRTUAL_FLOPPY0].dma_irq = FIQ_FLOPPYDATA;
-                dma[DMA_VIRTUAL_FLOPPY0].d_ops   = &arc_floppy_data_dma_ops;
-                dma[DMA_VIRTUAL_FLOPPY1].dma_irq = 1;
-                dma[DMA_VIRTUAL_FLOPPY1].d_ops   = &arc_floppy_cmdend_dma_ops;
-        }
-#endif
-#ifdef CONFIG_ARCH_A5K
-        if (machine_is_a5k()) {
-                dma[DMA_VIRTUAL_FLOPPY0].dma_irq = FIQ_FLOPPYDATA;
-                dma[DMA_VIRTUAL_FLOPPY0].d_ops   = &a5k_floppy_dma_ops;
-        }
-#endif
-        dma[DMA_VIRTUAL_SOUND].d_ops = &sound_dma_ops;
-}
diff --git a/arch/arm26/machine/irq.c b/arch/arm26/machine/irq.c
deleted file mode 100644
index a60d543edecc..000000000000
--- a/arch/arm26/machine/irq.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- *  linux/arch/arm26/mach-arc/irq.c
- *
- *  Copyright (C) 1996 Russell King
- *
- * 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.
- *
- *  Changelog:
- *   24-09-1996 RMK     Created
- *   10-10-1996 RMK     Brought up to date with arch-sa110eval
- *   22-10-1996 RMK     Changed interrupt numbers & uses new inb/outb macros
- *   11-01-1998 RMK     Added mask_and_ack_irq
- *   22-08-1998 RMK     Restructured IRQ routines
- *   08-09-2002 IM      Brought up to date for 2.5
- *   01-06-2003 JMA     Removed arc_fiq_chip
- */
-#include <linux/init.h>
-
-#include <asm/irq.h>
-#include <asm/irqchip.h>
-#include <asm/ioc.h>
-#include <asm/io.h>
-#include <asm/system.h>
-
-extern void init_FIQ(void);
-
-#define a_clf() clf()
-#define a_stf() stf()
-
-static void arc_ack_irq_a(unsigned int irq)
-{
-        unsigned int val, mask;
-
-        mask = 1 << irq;
-        a_clf();
-        val = ioc_readb(IOC_IRQMASKA);
-        ioc_writeb(val & ~mask, IOC_IRQMASKA);
-        ioc_writeb(mask, IOC_IRQCLRA);
-        a_stf();
-}
-
-static void arc_mask_irq_a(unsigned int irq)
-{
-        unsigned int val, mask;
-
-        mask = 1 << irq;
-        a_clf();
-        val = ioc_readb(IOC_IRQMASKA);
-        ioc_writeb(val & ~mask, IOC_IRQMASKA);
-        a_stf();
-}
-
-static void arc_unmask_irq_a(unsigned int irq)
-{
-        unsigned int val, mask;
-
-        mask = 1 << irq;
-        a_clf();
-        val = ioc_readb(IOC_IRQMASKA);
-        ioc_writeb(val | mask, IOC_IRQMASKA);
-        a_stf();
-}
-
-static struct irqchip arc_a_chip = {
-        .ack    = arc_ack_irq_a,
-        .mask   = arc_mask_irq_a,
-        .unmask = arc_unmask_irq_a,
-};
-
-static void arc_mask_irq_b(unsigned int irq)
-{
-        unsigned int val, mask;
-        mask = 1 << (irq & 7);
-        val = ioc_readb(IOC_IRQMASKB);
-        ioc_writeb(val & ~mask, IOC_IRQMASKB);
-}
-
-static void arc_unmask_irq_b(unsigned int irq)
-{
-        unsigned int val, mask;
-
-        mask = 1 << (irq & 7);
-        val = ioc_readb(IOC_IRQMASKB);
-        ioc_writeb(val | mask, IOC_IRQMASKB);
-}
-
-static struct irqchip arc_b_chip = {
-        .ack    = arc_mask_irq_b,
-        .mask   = arc_mask_irq_b,
-        .unmask = arc_unmask_irq_b,
-};
-
-/* FIXME - JMA none of these functions are used in arm26 currently
-static void arc_mask_irq_fiq(unsigned int irq)
-{
-        unsigned int val, mask;
-
-        mask = 1 << (irq & 7);
-        val = ioc_readb(IOC_FIQMASK);
-        ioc_writeb(val & ~mask, IOC_FIQMASK);
-}
-
-static void arc_unmask_irq_fiq(unsigned int irq)
-{
-        unsigned int val, mask;
-
-        mask = 1 << (irq & 7);
-        val = ioc_readb(IOC_FIQMASK);
-        ioc_writeb(val | mask, IOC_FIQMASK);
-}
-
-static struct irqchip arc_fiq_chip = {
-        .ack    = arc_mask_irq_fiq,
-        .mask   = arc_mask_irq_fiq,
-        .unmask = arc_unmask_irq_fiq,
-};
-*/
-
-void __init arc_init_irq(void)
-{
-        unsigned int irq, flags;
-
-        /* Disable all IOC interrupt sources */
-        ioc_writeb(0, IOC_IRQMASKA);
-        ioc_writeb(0, IOC_IRQMASKB);
-        ioc_writeb(0, IOC_FIQMASK);
-
-        for (irq = 0; irq < NR_IRQS; irq++) {
-                flags = IRQF_VALID;
-                
-                if (irq <= 6 || (irq >= 9 && irq <= 15))
-                        flags |= IRQF_PROBE;
-        
-                if (irq == IRQ_KEYBOARDTX)
-                        flags |= IRQF_NOAUTOEN; 
-                
-                switch (irq) {
-                case 0 ... 7:
-                        set_irq_chip(irq, &arc_a_chip);
-                        set_irq_handler(irq, do_level_IRQ);
-                        set_irq_flags(irq, flags);
-                        break;
-
-                case 8 ... 15:
-                        set_irq_chip(irq, &arc_b_chip);
-                        set_irq_handler(irq, do_level_IRQ);
-                        set_irq_flags(irq, flags);
-
-/*              case 64 ... 72:
-                        set_irq_chip(irq, &arc_fiq_chip);
-                        set_irq_flags(irq, flags);
-                        break;
-*/
-
-                }
-        }
-
-        irq_desc[IRQ_KEYBOARDTX].noautoenable = 1;
-
-        init_FIQ();
-}
-
diff --git a/arch/arm26/machine/latches.c b/arch/arm26/machine/latches.c
deleted file mode 100644
index 94f05d2a3b2b..000000000000
--- a/arch/arm26/machine/latches.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  linux/arch/arm26/kernel/latches.c
- *
- *  Copyright (C) David Alan Gilbert 1995/1996,2000
- *  Copyright (C) Ian Molton 2003
- *
- * 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.
- *
- *  Support for the latches on the old Archimedes which control the floppy,
- *  hard disc and printer
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-
-#include <asm/io.h>
-#include <asm/hardware.h>
-#include <asm/mach-types.h>
-#include <asm/oldlatches.h>
-
-static unsigned char latch_a_copy;
-static unsigned char latch_b_copy;
-
-/* newval=(oldval & ~mask)|newdata */
-void oldlatch_aupdate(unsigned char mask,unsigned char newdata)
-{
-        unsigned long flags;
-
-        BUG_ON(!machine_is_archimedes());
-
-        local_irq_save(flags); //FIXME: was local_save_flags
-        latch_a_copy = (latch_a_copy & ~mask) | newdata;
-        __raw_writeb(latch_a_copy, LATCHA_BASE);
-        local_irq_restore(flags);
-
-        printk("Latch: A = 0x%02x\n", latch_a_copy);
-}
-
-
-/* newval=(oldval & ~mask)|newdata */
-void oldlatch_bupdate(unsigned char mask,unsigned char newdata)
-{
-        unsigned long flags;
-
-        BUG_ON(!machine_is_archimedes());
-
-
-        local_irq_save(flags);//FIXME: was local_save_flags
-        latch_b_copy = (latch_b_copy & ~mask) | newdata;
-        __raw_writeb(latch_b_copy, LATCHB_BASE);
-        local_irq_restore(flags);
-
-        printk("Latch: B = 0x%02x\n", latch_b_copy);
-}
-
-static int __init oldlatch_init(void)
-{
-        if (machine_is_archimedes()) {
-                oldlatch_aupdate(0xff, 0xff);
-                /* Thats no FDC reset...*/
-                oldlatch_bupdate(0xff, LATCHB_FDCRESET);
-        }
-        return 0;
-}
-
-arch_initcall(oldlatch_init);
-
-EXPORT_SYMBOL(oldlatch_aupdate);
-EXPORT_SYMBOL(oldlatch_bupdate);
diff --git a/arch/arm26/mm/Makefile b/arch/arm26/mm/Makefile
deleted file mode 100644
index a8fb166d5c6d..000000000000
--- a/arch/arm26/mm/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Makefile for the linux arm26-specific parts of the memory manager.
-#
-
-obj-y           := init.o extable.o proc-funcs.o memc.o fault.o \
-                   small_page.o
diff --git a/arch/arm26/mm/extable.c b/arch/arm26/mm/extable.c
deleted file mode 100644
index 38e1958d9538..000000000000
--- a/arch/arm26/mm/extable.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  linux/arch/arm26/mm/extable.c
- */
-
-#include <linux/module.h>
-#include <asm/uaccess.h>
-
-int fixup_exception(struct pt_regs *regs)
-{
-        const struct exception_table_entry *fixup;
-
-        fixup = search_exception_tables(instruction_pointer(regs));
-
-        /*
-         * The kernel runs in SVC mode - make sure we keep running in SVC mode
-         * by frobbing the PSR appropriately (PSR and PC are in the same reg.
-         * on ARM26)
-         */
-        if (fixup)
-                regs->ARM_pc = fixup->fixup | PSR_I_BIT | MODE_SVC26;
-
-        return fixup != NULL;
-}
-
diff --git a/arch/arm26/mm/fault.c b/arch/arm26/mm/fault.c
deleted file mode 100644
index dec638a0c8d9..000000000000
--- a/arch/arm26/mm/fault.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- *  linux/arch/arm26/mm/fault.c
- *
- *  Copyright (C) 1995  Linus Torvalds
- *  Modifications for ARM processor (c) 1995-2001 Russell King
- *
- * 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/signal.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/ptrace.h>
-#include <linux/mman.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <linux/proc_fs.h>
-#include <linux/init.h>
-
-#include <asm/system.h>
-#include <asm/pgtable.h>
-#include <asm/uaccess.h> //FIXME this header may be bogusly included
-
-#include "fault.h"
-
-#define FAULT_CODE_LDRSTRPOST   0x80
-#define FAULT_CODE_LDRSTRPRE    0x40
-#define FAULT_CODE_LDRSTRREG    0x20
-#define FAULT_CODE_LDMSTM       0x10
-#define FAULT_CODE_LDCSTC       0x08
-#define FAULT_CODE_PREFETCH     0x04
-#define FAULT_CODE_WRITE        0x02
-#define FAULT_CODE_FORCECOW     0x01
-
-#define DO_COW(m)               ((m) & (FAULT_CODE_WRITE|FAULT_CODE_FORCECOW))
-#define READ_FAULT(m)           (!((m) & FAULT_CODE_WRITE))
-#define DEBUG
-/*
- * This is useful to dump out the page tables associated with
- * 'addr' in mm 'mm'.
- */
-void show_pte(struct mm_struct *mm, unsigned long addr)
-{
-        pgd_t *pgd;
-
-        if (!mm)
-                mm = &init_mm;
-
-        printk(KERN_ALERT "pgd = %p\n", mm->pgd);
-        pgd = pgd_offset(mm, addr);
-        printk(KERN_ALERT "[%08lx] *pgd=%08lx", addr, pgd_val(*pgd));
-
-        do {
-                pmd_t *pmd;
-                pte_t *pte;
-
-                pmd = pmd_offset(pgd, addr);
-
-                if (pmd_none(*pmd))
-                        break;
-
-                if (pmd_bad(*pmd)) {
-                        printk("(bad)");
-                        break;
-                }
-
-                /* We must not map this if we have highmem enabled */
-                /* FIXME */
-                pte = pte_offset_map(pmd, addr);
-                printk(", *pte=%08lx", pte_val(*pte));
-                pte_unmap(pte);
-        } while(0);
-
-        printk("\n");
-}
-
-/*
- * Oops.  The kernel tried to access some page that wasn't present.
- */
-static void
-__do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
-                  struct pt_regs *regs)
-{
-        /*
-         * Are we prepared to handle this kernel fault?
-         */
-        if (fixup_exception(regs))
-                return;
-
-        /*
-         * No handler, we'll have to terminate things with extreme prejudice.
-         */
-        bust_spinlocks(1);
-        printk(KERN_ALERT
-                "Unable to handle kernel %s at virtual address %08lx\n",
-                (addr < PAGE_SIZE) ? "NULL pointer dereference" :
-                "paging request", addr);
-
-        show_pte(mm, addr);
-        die("Oops", regs, fsr);
-        bust_spinlocks(0);
-        do_exit(SIGKILL);
-}
-
-/*
- * Something tried to access memory that isn't in our memory map..
- * User mode accesses just cause a SIGSEGV
- */
-static void
-__do_user_fault(struct task_struct *tsk, unsigned long addr,
-                unsigned int fsr, int code, struct pt_regs *regs)
-{
-        struct siginfo si;
-
-#ifdef CONFIG_DEBUG_USER
-        printk("%s: unhandled page fault at 0x%08lx, code 0x%03x\n",
-               tsk->comm, addr, fsr);
-        show_pte(tsk->mm, addr);
-        show_regs(regs);
-        //dump_backtrace(regs, tsk); // FIXME ARM32 dropped this - why?
-        while(1); //FIXME - hack to stop debug going nutso
-#endif
-
-        tsk->thread.address = addr;
-        tsk->thread.error_code = fsr;
-        tsk->thread.trap_no = 14;
-        si.si_signo = SIGSEGV;
-        si.si_errno = 0;
-        si.si_code = code;
-        si.si_addr = (void *)addr;
-        force_sig_info(SIGSEGV, &si, tsk);
-}
-
-static int
-__do_page_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
-                struct task_struct *tsk)
-{
-        struct vm_area_struct *vma;
-        int fault, mask;
-
-        vma = find_vma(mm, addr);
-        fault = -2; /* bad map area */
-        if (!vma)
-                goto out;
-        if (vma->vm_start > addr)
-                goto check_stack;
-
-        /*
-         * Ok, we have a good vm_area for this
-         * memory access, so we can handle it.
-         */
-good_area:
-        if (READ_FAULT(fsr)) /* read? */
-                mask = VM_READ|VM_EXEC|VM_WRITE;
-        else
-                mask = VM_WRITE;
-
-        fault = -1; /* bad access type */
-        if (!(vma->vm_flags & mask))
-                goto out;
-
-        /*
-         * If for any reason at all we couldn't handle
-         * the fault, make sure we exit gracefully rather
-         * than endlessly redo the fault.
-         */
-survive:
-        fault = handle_mm_fault(mm, vma, addr & PAGE_MASK, DO_COW(fsr));
-        if (unlikely(fault & VM_FAULT_ERROR)) {
-                if (fault & VM_FAULT_OOM)
-                        goto out_of_memory;
-                else if (fault & VM_FAULT_SIGBUS)
-                        return fault;
-                BUG();
-        }
-        if (fault & VM_FAULT_MAJOR)
-                tsk->maj_flt++;
-        else
-                tsk->min_flt++;
-        return fault;
-
-out_of_memory:
-        fault = -3; /* out of memory */
-        if (!is_init(tsk))
-                goto out;
-
-        /*
-         * If we are out of memory for pid1,
-         * sleep for a while and retry
-         */
-        yield();
-        goto survive;
-
-check_stack:
-        if (vma->vm_flags & VM_GROWSDOWN && !expand_stack(vma, addr))
-                goto good_area;
-out:
-        return fault;
-}
-
-int do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
-{
-        struct task_struct *tsk;
-        struct mm_struct *mm;
-        int fault;
-
-        tsk = current;
-        mm  = tsk->mm;
-
-        /*
-         * If we're in an interrupt or have no user
-         * context, we must not take the fault..
-         */
-        if (in_atomic() || !mm)
-                goto no_context;
-
-        down_read(&mm->mmap_sem);
-        fault = __do_page_fault(mm, addr, fsr, tsk);
-        up_read(&mm->mmap_sem);
-
-        /*
-         * Handle the "normal" case first
-         */
-        if (likely(!(fault & VM_FAULT_ERROR)))
-                return 0;
-        if (fault & VM_FAULT_SIGBUS)
-                goto do_sigbus;
-        /* else VM_FAULT_OOM */
-
-        /*
-         * If we are in kernel mode at this point, we
-         * have no context to handle this fault with.
-         * FIXME - is this test right?
-         */
-        if (!user_mode(regs)){
-                goto no_context;
-        }
-
-        if (fault == -3) {
-                /*
-                 * We ran out of memory, or some other thing happened to
-                 * us that made us unable to handle the page fault gracefully.
-                 */
-                printk("VM: killing process %s\n", tsk->comm);
-                do_exit(SIGKILL);
-        }
-        else{
-                __do_user_fault(tsk, addr, fsr, fault == -1 ? SEGV_ACCERR : SEGV_MAPERR, regs);
-        }
-
-        return 0;
-
-
-/*
- * We ran out of memory, or some other thing happened to us that made
- * us unable to handle the page fault gracefully.
- */
-do_sigbus:
-        /*
-         * Send a sigbus, regardless of whether we were in kernel
-         * or user mode.
-         */
-        tsk->thread.address = addr;  //FIXME - need other bits setting?
-        tsk->thread.error_code = fsr;
-        tsk->thread.trap_no = 14;
-        force_sig(SIGBUS, tsk);
-#ifdef CONFIG_DEBUG_USER
-        printk(KERN_DEBUG "%s: sigbus at 0x%08lx, pc=0x%08lx\n",
-                current->comm, addr, instruction_pointer(regs));
-#endif
-
-        /* Kernel mode? Handle exceptions or die */
-        if (user_mode(regs))
-                return 0;
-
-no_context:
-        __do_kernel_fault(mm, addr, fsr, regs);
-        return 0;
-}
-
-/*
- * Handle a data abort.  Note that we have to handle a range of addresses
- * on ARM2/3 for ldm.  If both pages are zero-mapped, then we have to force
- * a copy-on-write.  However, on the second page, we always force COW.
- */
-asmlinkage void
-do_DataAbort(unsigned long min_addr, unsigned long max_addr, int mode, struct pt_regs *regs)
-{
-        do_page_fault(min_addr, mode, regs);
-
-        if ((min_addr ^ max_addr) >> PAGE_SHIFT){
-               do_page_fault(max_addr, mode | FAULT_CODE_FORCECOW, regs);
-        }
-}
-
-asmlinkage int
-do_PrefetchAbort(unsigned long addr, struct pt_regs *regs)
-{
-#if 0
-        if (the memc mapping for this page exists) {
-                printk ("Page in, but got abort (undefined instruction?)\n");
-                return 0;
-        }
-#endif
-        do_page_fault(addr, FAULT_CODE_PREFETCH, regs);
-        return 1;
-}
-
diff --git a/arch/arm26/mm/fault.h b/arch/arm26/mm/fault.h
deleted file mode 100644
index 4442d00d86ac..000000000000
--- a/arch/arm26/mm/fault.h
+++ /dev/null
@@ -1,5 +0,0 @@
-void show_pte(struct mm_struct *mm, unsigned long addr);
-
-int do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
-
-unsigned long search_extable(unsigned long addr); //FIXME - is it right?
diff --git a/arch/arm26/mm/init.c b/arch/arm26/mm/init.c
deleted file mode 100644
index 36e7ee3f8321..000000000000
--- a/arch/arm26/mm/init.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
- *  linux/arch/arm26/mm/init.c
- *
- *  Copyright (C) 1995-2002 Russell King
- *
- * 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/signal.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/ptrace.h>
-#include <linux/mman.h>
-#include <linux/mm.h>
-#include <linux/swap.h>
-#include <linux/smp.h>
-#include <linux/init.h>
-#include <linux/initrd.h>
-#include <linux/bootmem.h>
-#include <linux/blkdev.h>
-#include <linux/pfn.h>
-
-#include <asm/segment.h>
-#include <asm/mach-types.h>
-#include <asm/dma.h>
-#include <asm/hardware.h>
-#include <asm/setup.h>
-#include <asm/tlb.h>
-
-#include <asm/map.h>
-
-struct mmu_gather mmu_gathers[NR_CPUS];
-
-extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-extern char _stext, _text, _etext, _end, __init_begin, __init_end;
-#ifdef CONFIG_XIP_KERNEL
-extern char _endtext, _sdata;
-#endif
-extern unsigned long phys_initrd_start;
-extern unsigned long phys_initrd_size;
-
-/*
- * The sole use of this is to pass memory configuration
- * data from paging_init to mem_init.
- */
-static struct meminfo meminfo __initdata = { 0, };
-
-/*
- * empty_zero_page is a special page that is used for
- * zero-initialized data and COW.
- */
-struct page *empty_zero_page;
-
-void show_mem(void)
-{
-        int free = 0, total = 0, reserved = 0;
-        int shared = 0, cached = 0, slab = 0;
-        struct page *page, *end;
-
-        printk("Mem-info:\n");
-        show_free_areas();
-        printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
-
-
-        page = NODE_MEM_MAP(0);
-        end  = page + NODE_DATA(0)->node_spanned_pages;
-
-        do {
-                total++;
-                if (PageReserved(page))
-                        reserved++;
-                else if (PageSwapCache(page))
-                        cached++;
-                else if (PageSlab(page))
-                        slab++;
-                else if (!page_count(page))
-                        free++;
-                else
-                        shared += page_count(page) - 1;
-                page++;
-        } while (page < end);
-
-        printk("%d pages of RAM\n", total);
-        printk("%d free pages\n", free);
-        printk("%d reserved pages\n", reserved);
-        printk("%d slab pages\n", slab);
-        printk("%d pages shared\n", shared);
-        printk("%d pages swap cached\n", cached);
-}
-
-struct node_info {
-        unsigned int start;
-        unsigned int end;
-        int bootmap_pages;
-};
-
-/*
- * FIXME: We really want to avoid allocating the bootmap bitmap
- * over the top of the initrd.  Hopefully, this is located towards
- * the start of a bank, so if we allocate the bootmap bitmap at
- * the end, we won't clash.
- */
-static unsigned int __init
-find_bootmap_pfn(struct meminfo *mi, unsigned int bootmap_pages)
-{
-        unsigned int start_pfn, bootmap_pfn;
-        unsigned int start, end;
-
-        start_pfn   = PFN_UP((unsigned long)&_end);
-        bootmap_pfn = 0;
-
-        /* ARM26 machines only have one node */
-        if (mi->bank->node != 0)
-                BUG();
-
-        start = PFN_UP(mi->bank->start);
-        end   = PFN_DOWN(mi->bank->size + mi->bank->start);
-
-        if (start < start_pfn)
-                start = start_pfn;
-
-        if (end <= start)
-                BUG();
-
-        if (end - start >= bootmap_pages) 
-                bootmap_pfn = start;
-        else
-                BUG();
-
-        return bootmap_pfn;
-}
-
-/*
- * Scan the memory info structure and pull out:
- *  - the end of memory
- *  - the number of nodes
- *  - the pfn range of each node
- *  - the number of bootmem bitmap pages
- */
-static void __init
-find_memend_and_nodes(struct meminfo *mi, struct node_info *np)
-{
-        unsigned int memend_pfn = 0;
-
-        nodes_clear(node_online_map);
-        node_set_online(0);
-
-        np->bootmap_pages = 0;
-
-        if (mi->bank->size == 0) {
-                BUG();
-        }
-
-        /*
-         * Get the start and end pfns for this bank
-         */
-        np->start = PFN_UP(mi->bank->start);
-        np->end   = PFN_DOWN(mi->bank->start + mi->bank->size);
-
-        if (memend_pfn < np->end)
-                memend_pfn = np->end;
-
-        /*
-         * Calculate the number of pages we require to
-         * store the bootmem bitmaps.
-         */
-        np->bootmap_pages = bootmem_bootmap_pages(np->end - np->start);
-
-        /*
-         * This doesn't seem to be used by the Linux memory
-         * manager any more.  If we can get rid of it, we
-         * also get rid of some of the stuff above as well.
-         */
-        max_low_pfn = memend_pfn - PFN_DOWN(PHYS_OFFSET);
-        max_pfn = memend_pfn - PFN_DOWN(PHYS_OFFSET);
-        mi->end = memend_pfn << PAGE_SHIFT;
-
-}
-
-/*
- * Initialise the bootmem allocator for all nodes.  This is called
- * early during the architecture specific initialisation.
- */
-void __init bootmem_init(struct meminfo *mi)
-{
-        struct node_info node_info;
-        unsigned int bootmap_pfn;
-        pg_data_t *pgdat = NODE_DATA(0);
-
-        find_memend_and_nodes(mi, &node_info);
-
-        bootmap_pfn   = find_bootmap_pfn(mi, node_info.bootmap_pages);
-
-        /*
-         * Note that node 0 must always have some pages.
-         */
-        if (node_info.end == 0)
-                BUG();
-
-        /*
-         * Initialise the bootmem allocator.
-         */
-        init_bootmem_node(pgdat, bootmap_pfn, node_info.start, node_info.end);
-
-        /*
-         * Register all available RAM in this node with the bootmem allocator. 
-         */
-        free_bootmem_node(pgdat, mi->bank->start, mi->bank->size);
-
-        /*
-         * Register the kernel text and data with bootmem.
-         * Note: with XIP we dont register .text since
-         * its in ROM.
-         */
-#ifdef CONFIG_XIP_KERNEL
-        reserve_bootmem_node(pgdat, __pa(&_sdata), &_end - &_sdata);
-#else
-        reserve_bootmem_node(pgdat, __pa(&_stext), &_end - &_stext);
-#endif
-
-        /*
-         * And don't forget to reserve the allocator bitmap,
-         * which will be freed later.
-         */
-        reserve_bootmem_node(pgdat, bootmap_pfn << PAGE_SHIFT,
-                             node_info.bootmap_pages << PAGE_SHIFT);
-
-        /*
-         * These should likewise go elsewhere.  They pre-reserve
-         * the screen memory region at the start of main system
-         * memory. FIXME - screen RAM is not 512K!
-         */
-        reserve_bootmem_node(pgdat, 0x02000000, 0x00080000);
-
-#ifdef CONFIG_BLK_DEV_INITRD
-        initrd_start = phys_initrd_start;
-        initrd_end = initrd_start + phys_initrd_size;
-
-        /* Achimedes machines only have one node, so initrd is in node 0 */
-#ifdef CONFIG_XIP_KERNEL
-        /* Only reserve initrd space if it is in RAM */
-        if(initrd_start && initrd_start < 0x03000000){
-#else
-        if(initrd_start){
-#endif
-                reserve_bootmem_node(pgdat, __pa(initrd_start),
-                                             initrd_end - initrd_start);
-        }
-#endif   /* CONFIG_BLK_DEV_INITRD */
-
-
-}
-
-/*
- * paging_init() sets up the page tables, initialises the zone memory
- * maps, and sets up the zero page, bad page and bad page tables.
- */
-void __init paging_init(struct meminfo *mi)
-{
-        void *zero_page;
-        unsigned long zone_size[MAX_NR_ZONES];
-        unsigned long zhole_size[MAX_NR_ZONES];
-        struct bootmem_data *bdata;
-        pg_data_t *pgdat;
-        int i;
-
-        memcpy(&meminfo, mi, sizeof(meminfo));
-
-        /*
-         * allocate the zero page.  Note that we count on this going ok.
-         */
-        zero_page = alloc_bootmem_low_pages(PAGE_SIZE);
-
-        /*
-         * initialise the page tables.
-         */
-        memtable_init(mi);
-        flush_tlb_all();
-
-        /*
-         * initialise the zones in node 0 (archimedes have only 1 node)
-         */
-
-        for (i = 0; i < MAX_NR_ZONES; i++) {
-                zone_size[i]  = 0;
-                zhole_size[i] = 0;
-        }
-
-        pgdat = NODE_DATA(0);
-        bdata = pgdat->bdata;
-        zone_size[0] = bdata->node_low_pfn -
-                        (bdata->node_boot_start >> PAGE_SHIFT);
-        if (!zone_size[0])
-                BUG();
-        pgdat->node_mem_map = NULL;
-        free_area_init_node(0, pgdat, zone_size,
-                        bdata->node_boot_start >> PAGE_SHIFT, zhole_size);
-
-        /*
-         * finish off the bad pages once
-         * the mem_map is initialised
-         */
-        memzero(zero_page, PAGE_SIZE);
-        empty_zero_page = virt_to_page(zero_page);
-}
-
-static inline void free_area(unsigned long addr, unsigned long end, char *s)
-{
-        unsigned int size = (end - addr) >> 10;
-
-        for (; addr < end; addr += PAGE_SIZE) {
-                struct page *page = virt_to_page(addr);
-                ClearPageReserved(page);
-                init_page_count(page);
-                free_page(addr);
-                totalram_pages++;
-        }
-
-        if (size && s)
-                printk(KERN_INFO "Freeing %s memory: %dK\n", s, size);
-}
-
-/*
- * mem_init() marks the free areas in the mem_map and tells us how much
- * memory is free.  This is done after various parts of the system have
- * claimed their memory after the kernel image.
- */
-void __init mem_init(void)
-{
-        unsigned int codepages, datapages, initpages;
-        pg_data_t *pgdat = NODE_DATA(0);
-        extern int sysctl_overcommit_memory;
-
-
-        /* Note: data pages includes BSS */
-#ifdef CONFIG_XIP_KERNEL
-        codepages = &_endtext - &_text;
-        datapages = &_end - &_sdata;
-#else
-        codepages = &_etext - &_text;
-        datapages = &_end - &_etext;
-#endif
-        initpages = &__init_end - &__init_begin;
-
-        high_memory = (void *)__va(meminfo.end);
-        max_mapnr   = virt_to_page(high_memory) - mem_map;
-
-        /* this will put all unused low memory onto the freelists */
-        if (pgdat->node_spanned_pages != 0)
-                totalram_pages += free_all_bootmem_node(pgdat);
-
-        num_physpages = meminfo.bank[0].size >> PAGE_SHIFT;
-
-        printk(KERN_INFO "Memory: %luMB total\n", num_physpages >> (20 - PAGE_SHIFT));
-        printk(KERN_NOTICE "Memory: %luKB available (%dK code, "
-                "%dK data, %dK init)\n",
-                (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
-                codepages >> 10, datapages >> 10, initpages >> 10);
-
-        /*
-         * Turn on overcommit on tiny machines
-         */
-        if (PAGE_SIZE >= 16384 && num_physpages <= 128) {
-                sysctl_overcommit_memory = OVERCOMMIT_ALWAYS;
-                printk("Turning on overcommit\n");
-        }
-}
-
-void free_initmem(void){
-#ifndef CONFIG_XIP_KERNEL
-        free_area((unsigned long)(&__init_begin),
-                  (unsigned long)(&__init_end),
-                  "init");
-#endif
-}
-
-#ifdef CONFIG_BLK_DEV_INITRD
-
-static int keep_initrd;
-
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
-#ifdef CONFIG_XIP_KERNEL
-        /* Only bin initrd if it is in RAM... */
-        if(!keep_initrd && start < 0x03000000)
-#else
-        if (!keep_initrd)
-#endif
-                free_area(start, end, "initrd");
-}
-
-static int __init keepinitrd_setup(char *__unused)
-{
-        keep_initrd = 1;
-        return 1;
-}
-
-__setup("keepinitrd", keepinitrd_setup);
-#endif
diff --git a/arch/arm26/mm/memc.c b/arch/arm26/mm/memc.c
deleted file mode 100644
index ffecd8578247..000000000000
--- a/arch/arm26/mm/memc.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- *  linux/arch/arm26/mm/memc.c
- *
- *  Copyright (C) 1998-2000 Russell King
- *
- * 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.
- *
- *  Page table sludge for older ARM processor architectures.
- */
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/init.h>
-#include <linux/bootmem.h>
-
-#include <asm/pgtable.h>
-#include <asm/pgalloc.h>
-#include <asm/page.h>
-#include <asm/memory.h>
-#include <asm/hardware.h>
-
-#include <asm/map.h>
-
-#define MEMC_TABLE_SIZE (256*sizeof(unsigned long))
-
-struct kmem_cache *pte_cache, *pgd_cache;
-int page_nr;
-
-/*
- * Allocate space for a page table and a MEMC table.
- * Note that we place the MEMC
- * table before the page directory.  This means we can
- * easily get to both tightly-associated data structures
- * with a single pointer.
- */
-static inline pgd_t *alloc_pgd_table(void)
-{
-        void *pg2k = kmem_cache_alloc(pgd_cache, GFP_KERNEL);
-
-        if (pg2k)
-                pg2k += MEMC_TABLE_SIZE;
-
-        return (pgd_t *)pg2k;
-}
-
-/*
- * Free a page table. this function is the counterpart to get_pgd_slow
- * below, not alloc_pgd_table above.
- */
-void free_pgd_slow(pgd_t *pgd)
-{
-        unsigned long tbl = (unsigned long)pgd;
-
-        tbl -= MEMC_TABLE_SIZE;
-
-        kmem_cache_free(pgd_cache, (void *)tbl);
-}
-
-/*
- * Allocate a new pgd and fill it in ready for use
- *
- * A new tasks pgd is completely empty (all pages !present) except for:
- *
- * o The machine vectors at virtual address 0x0
- * o The vmalloc region at the top of address space
- *
- */
-#define FIRST_KERNEL_PGD_NR     (FIRST_USER_PGD_NR + USER_PTRS_PER_PGD)
-
-pgd_t *get_pgd_slow(struct mm_struct *mm)
-{
-        pgd_t *new_pgd, *init_pgd;
-        pmd_t *new_pmd, *init_pmd;
-        pte_t *new_pte, *init_pte;
-
-        new_pgd = alloc_pgd_table();
-        if (!new_pgd)
-                goto no_pgd;
-
-        /*
-         * On ARM, first page must always be allocated since it contains
-         * the machine vectors.
-         */
-        new_pmd = pmd_alloc(mm, new_pgd, 0);
-        if (!new_pmd)
-                goto no_pmd;
-
-        new_pte = pte_alloc_map(mm, new_pmd, 0);
-        if (!new_pte)
-                goto no_pte;
-
-        init_pgd = pgd_offset(&init_mm, 0);
-        init_pmd = pmd_offset(init_pgd, 0);
-        init_pte = pte_offset(init_pmd, 0);
-
-        set_pte(new_pte, *init_pte);
-        pte_unmap(new_pte);
-
-        /*
-         * the page table entries are zeroed
-         * when the table is created. (see the cache_ctor functions below)
-         * Now we need to plonk the kernel (vmalloc) area at the end of
-         * the address space. We copy this from the init thread, just like
-         * the init_pte we copied above...
-         */
-        memcpy(new_pgd + FIRST_KERNEL_PGD_NR, init_pgd + FIRST_KERNEL_PGD_NR,
-                (PTRS_PER_PGD - FIRST_KERNEL_PGD_NR) * sizeof(pgd_t));
-
-        /* update MEMC tables */
-        cpu_memc_update_all(new_pgd);
-        return new_pgd;
-
-no_pte:
-        pmd_free(new_pmd);
-no_pmd:
-        free_pgd_slow(new_pgd);
-no_pgd:
-        return NULL;
-}
-
-/*
- * No special code is required here.
- */
-void setup_mm_for_reboot(char mode)
-{
-}
-
-/*
- * This contains the code to setup the memory map on an ARM2/ARM250/ARM3
- *  o swapper_pg_dir = 0x0207d000
- *  o kernel proper starts at 0x0208000
- *  o create (allocate) a pte to contain the machine vectors
- *  o populate the pte (points to 0x02078000) (FIXME - is it zeroed?)
- *  o populate the init tasks page directory (pgd) with the new pte
- *  o zero the rest of the init tasks pgdir (FIXME - what about vmalloc?!)
- */
-void __init memtable_init(struct meminfo *mi)
-{
-        pte_t *pte;
-        int i;
-
-        page_nr = max_low_pfn;
-
-        pte = alloc_bootmem_low_pages(PTRS_PER_PTE * sizeof(pte_t));
-        pte[0] = mk_pte_phys(PAGE_OFFSET + SCREEN_SIZE, PAGE_READONLY);
-        pmd_populate(&init_mm, pmd_offset(swapper_pg_dir, 0), pte);
-
-        for (i = 1; i < PTRS_PER_PGD; i++)
-                pgd_val(swapper_pg_dir[i]) = 0;
-}
-
-void __init iotable_init(struct map_desc *io_desc)
-{
-        /* nothing to do */
-}
-
-/*
- * We never have holes in the memmap
- */
-void __init create_memmap_holes(struct meminfo *mi)
-{
-}
-
-static void pte_cache_ctor(void *pte, struct kmem_cache *cache, unsigned long flags)
-{
-        memzero(pte, sizeof(pte_t) * PTRS_PER_PTE);
-}
-
-static void pgd_cache_ctor(void *pgd, struct kmem_cache *cache, unsigned long flags)
-{
-        memzero(pgd + MEMC_TABLE_SIZE, USER_PTRS_PER_PGD * sizeof(pgd_t));
-}
-
-void __init pgtable_cache_init(void)
-{
-        pte_cache = kmem_cache_create("pte-cache",
-                                sizeof(pte_t) * PTRS_PER_PTE,
-                                0, SLAB_PANIC, pte_cache_ctor);
-
-        pgd_cache = kmem_cache_create("pgd-cache", MEMC_TABLE_SIZE +
-                                sizeof(pgd_t) * PTRS_PER_PGD,
-                                0, SLAB_PANIC, pgd_cache_ctor);
-}
diff --git a/arch/arm26/mm/proc-funcs.S b/arch/arm26/mm/proc-funcs.S
deleted file mode 100644
index f9fca524c57a..000000000000
--- a/arch/arm26/mm/proc-funcs.S
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- *  linux/arch/arm26/mm/proc-arm2,3.S
- *
- *  Copyright (C) 1997-1999 Russell King
- *
- * 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.
- *
- *  MMU functions for ARM2,3
- *
- *  These are the low level assembler for performing cache
- *  and memory functions on ARM2, ARM250 and ARM3 processors.
- */
-#include <linux/linkage.h>
-#include <asm/assembler.h>
-#include <asm/asm-offsets.h>
-#include <asm/procinfo.h>
-#include <asm/ptrace.h>
-
-/*
- * MEMC workhorse code.  It's both a horse which things it's a pig.
- */
-/*
- * Function: cpu_memc_update_entry(pgd_t *pgd, unsigned long phys_pte, unsigned long addr)
- * Params  : pgd        Page tables/MEMC mapping
- *         : phys_pte   physical address, or PTE
- *         : addr       virtual address
- */
-ENTRY(cpu_memc_update_entry)
-                tst     r1, #PAGE_PRESENT               @ is the page present
-                orreq   r1, r1, #PAGE_OLD | PAGE_CLEAN
-                moveq   r2, #0x01f00000
-                mov     r3, r1, lsr #13                 @ convert to physical page nr
-                and     r3, r3, #0x3fc
-                adr     ip, memc_phys_table_32
-                ldr     r3, [ip, r3]
-                tst     r1, #PAGE_OLD | PAGE_NOT_USER
-                biceq   r3, r3, #0x200
-                tsteq   r1, #PAGE_READONLY | PAGE_CLEAN
-                biceq   r3, r3, #0x300
-                mov     r2, r2, lsr #15                 @ virtual -> nr
-                orr     r3, r3, r2, lsl #15
-                and     r2, r2, #0x300
-                orr     r3, r3, r2, lsl #2
-                and     r2, r3, #255
-                sub     r0, r0, #256 * 4
-                str     r3, [r0, r2, lsl #2]
-                strb    r3, [r3]
-                movs    pc, lr
-/*
- * Params  : r0 = preserved
- *         : r1 = memc table base (preserved)
- *         : r2 = page table entry
- *         : r3 = preserved
- *         : r4 = unused
- *         : r5 = memc physical address translation table
- *         : ip = virtual address (preserved)
- */
-update_pte:
-                mov     r4, r2, lsr #13
-                and     r4, r4, #0x3fc
-                ldr     r4, [r5, r4]                    @ covert to MEMC page
-
-                tst     r2, #PAGE_OLD | PAGE_NOT_USER   @ check for MEMC read
-                biceq   r4, r4, #0x200
-                tsteq   r2, #PAGE_READONLY | PAGE_CLEAN @ check for MEMC write
-                biceq   r4, r4, #0x300
-
-                orr     r4, r4, ip
-                and     r2, ip, #0x01800000
-                orr     r4, r4, r2, lsr #13
-
-                and     r2, r4, #255
-                str     r4, [r1, r2, lsl #2]
-                movs    pc, lr
-
-/*
- * Params  : r0 = preserved
- *         : r1 = memc table base (preserved)
- *         : r2 = page table base
- *         : r3 = preserved
- *         : r4 = unused
- *         : r5 = memc physical address translation table
- *         : ip = virtual address (updated)
- */
-update_pte_table:
-                stmfd   sp!, {r0, lr}
-                bic     r0, r2, #3
-1:              ldr     r2, [r0], #4                    @ get entry
-                tst     r2, #PAGE_PRESENT               @ page present
-                blne    update_pte                      @ process pte
-                add     ip, ip, #32768                  @ increment virt addr
-                ldr     r2, [r0], #4                    @ get entry
-                tst     r2, #PAGE_PRESENT               @ page present
-                blne    update_pte                      @ process pte
-                add     ip, ip, #32768                  @ increment virt addr
-                ldr     r2, [r0], #4                    @ get entry
-                tst     r2, #PAGE_PRESENT               @ page present
-                blne    update_pte                      @ process pte
-                add     ip, ip, #32768                  @ increment virt addr
-                ldr     r2, [r0], #4                    @ get entry
-                tst     r2, #PAGE_PRESENT               @ page present
-                blne    update_pte                      @ process pte
-                add     ip, ip, #32768                  @ increment virt addr
-                tst     ip, #32768 * 31                 @ finished?
-                bne     1b
-                ldmfd   sp!, {r0, pc}^
-
-/*
- * Function: cpu_memc_update_all(pgd_t *pgd)
- * Params  : pgd        Page tables/MEMC mapping
- * Notes   : this is optimised for 32k pages
- */
-ENTRY(cpu_memc_update_all)
-                stmfd   sp!, {r4, r5, lr}
-                bl      clear_tables
-                sub     r1, r0, #256 * 4                @ start of MEMC tables
-                adr     r5, memc_phys_table_32          @ Convert to logical page number
-                mov     ip, #0                          @ virtual address
-1:              ldmia   r0!, {r2, r3}                   @ load two pgd entries
-                tst     r2, #PAGE_PRESENT               @ is pgd entry present?
-                addeq   ip, ip, #1048576        @FIXME - PAGE_PRESENT is for PTEs technically...
-                blne    update_pte_table
-                mov     r2, r3
-                tst     r2, #PAGE_PRESENT               @ is pgd entry present?
-                addeq   ip, ip, #1048576
-                blne    update_pte_table
-                teq     ip, #32 * 1048576
-                bne     1b
-                ldmfd   sp!, {r4, r5, pc}^
-
-/*
- * Build the table to map from physical page number to memc page number
- */
-                .type   memc_phys_table_32, #object
-memc_phys_table_32:
-                .irp    b7, 0x00, 0x80
-                .irp    b6, 0x00, 0x02
-                .irp    b5, 0x00, 0x04
-                .irp    b4, 0x00, 0x01
-
-                .irp    b3, 0x00, 0x40
-                .irp    b2, 0x00, 0x20
-                .irp    b1, 0x00, 0x10
-                .irp    b0, 0x00, 0x08
-                .long   0x03800300 + \b7 + \b6 + \b5 + \b4 + \b3 + \b2 + \b1 + \b0
-                .endr
-                .endr
-                .endr
-                .endr
-
-                .endr
-                .endr
-                .endr
-                .endr
-                .size   memc_phys_table_32, . - memc_phys_table_32
-
-/*
- * helper for cpu_memc_update_all, this clears out all
- * mappings, setting them close to the top of memory,
- * and inaccessible (0x01f00000).
- * Params  : r0 = page table pointer
- */
-clear_tables:   ldr     r1, _arm3_set_pgd - 4
-                ldr     r2, [r1]
-                sub     r1, r0, #256 * 4                @ start of MEMC tables
-                add     r2, r1, r2, lsl #2              @ end of tables
-                mov     r3, #0x03f00000                 @ Default mapping (null mapping)
-                orr     r3, r3, #0x00000f00
-                orr     r4, r3, #1
-                orr     r5, r3, #2
-                orr     ip, r3, #3
-1:              stmia   r1!, {r3, r4, r5, ip}
-                add     r3, r3, #4
-                add     r4, r4, #4
-                add     r5, r5, #4
-                add     ip, ip, #4
-                stmia   r1!, {r3, r4, r5, ip}
-                add     r3, r3, #4
-                add     r4, r4, #4
-                add     r5, r5, #4
-                add     ip, ip, #4
-                teq     r1, r2
-                bne     1b
-                mov     pc, lr
-
-/*
- * Function: *_set_pgd(pgd_t *pgd)
- * Params  : pgd        New page tables/MEMC mapping
- * Purpose : update MEMC hardware with new mapping
- */
-                .word   page_nr   @ extern - declared in mm-memc.c
-_arm3_set_pgd:  mcr     p15, 0, r1, c1, c0, 0           @ flush cache
-_arm2_set_pgd:  stmfd   sp!, {lr}
-                ldr     r1, _arm3_set_pgd - 4
-                ldr     r2, [r1]
-                sub     r0, r0, #256 * 4                @ start of MEMC tables
-                add     r1, r0, r2, lsl #2              @ end of tables
-1:              ldmia   r0!, {r2, r3, ip, lr}
-                strb    r2, [r2]
-                strb    r3, [r3]
-                strb    ip, [ip]
-                strb    lr, [lr]
-                ldmia   r0!, {r2, r3, ip, lr}
-                strb    r2, [r2]
-                strb    r3, [r3]
-                strb    ip, [ip]
-                strb    lr, [lr]
-                teq     r0, r1
-                bne     1b
-                ldmfd   sp!, {pc}^
-
-/*
- * Function: *_proc_init (void)
- * Purpose : Initialise the cache control registers
- */
-_arm3_proc_init:
-                mov     r0, #0x001f0000
-                orr     r0, r0, #0x0000ff00
-                orr     r0, r0, #0x000000ff
-                mcr     p15, 0, r0, c3, c0              @ ARM3 Cacheable
-                mcr     p15, 0, r0, c4, c0              @ ARM3 Updateable
-                mov     r0, #0
-                mcr     p15, 0, r0, c5, c0              @ ARM3 Disruptive
-                mcr     p15, 0, r0, c1, c0              @ ARM3 Flush
-                mov     r0, #3
-                mcr     p15, 0, r0, c2, c0              @ ARM3 Control
-_arm2_proc_init:
-                movs    pc, lr
-
-/*
- * Function: *_proc_fin (void)
- * Purpose : Finalise processor (disable caches)
- */
-_arm3_proc_fin: mov     r0, #2
-                mcr     p15, 0, r0, c2, c0
-_arm2_proc_fin: orrs    pc, lr, #PSR_I_BIT|PSR_F_BIT
-
-/*
- * Function: *_xchg_1 (int new, volatile void *ptr)
- * Params  : new        New value to store at...
- *         : ptr        pointer to byte-wide location
- * Purpose : Performs an exchange operation
- * Returns : Original byte data at 'ptr'
- */
-_arm2_xchg_1:   mov     r2, pc
-                orr     r2, r2, #PSR_I_BIT
-                teqp    r2, #0
-                ldrb    r2, [r1]
-                strb    r0, [r1]
-                mov     r0, r2
-                movs    pc, lr
-
-_arm3_xchg_1:   swpb    r0, r0, [r1]
-                movs    pc, lr
-
-/*
- * Function: *_xchg_4 (int new, volatile void *ptr)
- * Params  : new        New value to store at...
- *         : ptr        pointer to word-wide location
- * Purpose : Performs an exchange operation
- * Returns : Original word data at 'ptr'
- */
-_arm2_xchg_4:   mov     r2, pc
-                orr     r2, r2, #PSR_I_BIT
-                teqp    r2, #0
-                ldr     r2, [r1]
-                str     r0, [r1]
-                mov     r0, r2
-                movs    pc, lr
-
-_arm3_xchg_4:   swp     r0, r0, [r1]
-                movs    pc, lr
-
-_arm2_3_check_bugs:
-                bics    pc, lr, #PSR_F_BIT              @ Clear FIQ disable bit
-
-armvlsi_name:   .asciz  "ARM/VLSI"
-_arm2_name:     .asciz  "ARM 2"
-_arm250_name:   .asciz  "ARM 250"
-_arm3_name:     .asciz  "ARM 3"
-
-                .section ".init.text", #alloc, #execinstr
-/*
- * Purpose : Function pointers used to access above functions - all calls
- *           come through these
- */
-                .globl  arm2_processor_functions
-arm2_processor_functions:
-                .word   _arm2_3_check_bugs
-                .word   _arm2_proc_init
-                .word   _arm2_proc_fin
-                .word   _arm2_set_pgd
-                .word   _arm2_xchg_1
-                .word   _arm2_xchg_4
-
-cpu_arm2_info:
-                .long   armvlsi_name
-                .long   _arm2_name
-
-                .globl  arm250_processor_functions
-arm250_processor_functions:
-                .word   _arm2_3_check_bugs
-                .word   _arm2_proc_init
-                .word   _arm2_proc_fin
-                .word   _arm2_set_pgd
-                .word   _arm3_xchg_1
-                .word   _arm3_xchg_4
-
-cpu_arm250_info:
-                .long   armvlsi_name
-                .long   _arm250_name
-
-                .globl  arm3_processor_functions
-arm3_processor_functions:
-                .word   _arm2_3_check_bugs
-                .word   _arm3_proc_init
-                .word   _arm3_proc_fin
-                .word   _arm3_set_pgd
-                .word   _arm3_xchg_1
-                .word   _arm3_xchg_4
-
-cpu_arm3_info:
-                .long   armvlsi_name
-                .long   _arm3_name
-
-arm2_arch_name: .asciz  "armv1"
-arm3_arch_name: .asciz  "armv2"
-arm2_elf_name:  .asciz  "v1"
-arm3_elf_name:  .asciz  "v2"
-                .align
-
-                .section ".proc.info", #alloc, #execinstr
-
-                .long   0x41560200
-                .long   0xfffffff0
-                .long   arm2_arch_name
-                .long   arm2_elf_name
-                .long   0
-                .long   cpu_arm2_info
-                .long   arm2_processor_functions
-
-                .long   0x41560250
-                .long   0xfffffff0
-                .long   arm3_arch_name
-                .long   arm3_elf_name
-                .long   0
-                .long   cpu_arm250_info
-                .long   arm250_processor_functions
-
-                .long   0x41560300
-                .long   0xfffffff0
-                .long   arm3_arch_name
-                .long   arm3_elf_name
-                .long   0
-                .long   cpu_arm3_info
-                .long   arm3_processor_functions
-
diff --git a/arch/arm26/mm/small_page.c b/arch/arm26/mm/small_page.c
deleted file mode 100644
index 30447106c25f..000000000000
--- a/arch/arm26/mm/small_page.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- *  linux/arch/arm26/mm/small_page.c
- *
- *  Copyright (C) 1996  Russell King
- *  Copyright (C) 2003  Ian Molton
- *
- * 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.
- *
- *  Changelog:
- *   26/01/1996 RMK     Cleaned up various areas to make little more generic
- *   07/02/1999 RMK     Support added for 16K and 32K page sizes
- *                      containing 8K blocks
- *   23/05/2004 IM      Fixed to use struct page->lru (thanks wli)
- *
- */
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/ptrace.h>
-#include <linux/mman.h>
-#include <linux/mm.h>
-#include <linux/swap.h>
-#include <linux/smp.h>
-#include <linux/bitops.h>
-
-#include <asm/pgtable.h>
-
-#define PEDANTIC
-
-/*
- * Requirement:
- *  We need to be able to allocate naturally aligned memory of finer
- *  granularity than the page size.  This is typically used for the
- *  second level page tables on 32-bit ARMs.
- *
- * FIXME - this comment is *out of date*
- * Theory:
- *  We "misuse" the Linux memory management system.  We use alloc_page
- *  to allocate a page and then mark it as reserved.  The Linux memory
- *  management system will then ignore the "offset", "next_hash" and
- *  "pprev_hash" entries in the mem_map for this page.
- *
- *  We then use a bitstring in the "offset" field to mark which segments
- *  of the page are in use, and manipulate this as required during the
- *  allocation and freeing of these small pages.
- *
- *  We also maintain a queue of pages being used for this purpose using
- *  the "next_hash" and "pprev_hash" entries of mem_map;
- */
-
-struct order {
-        struct list_head queue;
-        unsigned int mask;              /* (1 << shift) - 1             */
-        unsigned int shift;             /* (1 << shift) size of page    */
-        unsigned int block_mask;        /* nr_blocks - 1                */
-        unsigned int all_used;          /* (1 << nr_blocks) - 1         */
-};
-
-
-static struct order orders[] = {
-#if PAGE_SIZE == 32768
-        { LIST_HEAD_INIT(orders[0].queue), 2047, 11, 15, 0x0000ffff },
-        { LIST_HEAD_INIT(orders[1].queue), 8191, 13,  3, 0x0000000f }
-#else
-#error unsupported page size (ARGH!)
-#endif
-};
-
-#define USED_MAP(pg)                    ((pg)->index)
-#define TEST_AND_CLEAR_USED(pg,off)     (test_and_clear_bit(off, &USED_MAP(pg)))
-#define SET_USED(pg,off)                (set_bit(off, &USED_MAP(pg)))
-
-static DEFINE_SPINLOCK(small_page_lock);
-
-static unsigned long __get_small_page(int priority, struct order *order)
-{
-        unsigned long flags;
-        struct page *page;
-        int offset;
-
-        do {
-                spin_lock_irqsave(&small_page_lock, flags);
-
-                if (list_empty(&order->queue))
-                        goto need_new_page;
-
-                page = list_entry(order->queue.next, struct page, lru);
-again:
-#ifdef PEDANTIC
-                BUG_ON(USED_MAP(page) & ~order->all_used);
-#endif
-                offset = ffz(USED_MAP(page));
-                SET_USED(page, offset);
-                if (USED_MAP(page) == order->all_used)
-                        list_del_init(&page->lru);
-                spin_unlock_irqrestore(&small_page_lock, flags);
-
-                return (unsigned long) page_address(page) + (offset << order->shift);
-
-need_new_page:
-                spin_unlock_irqrestore(&small_page_lock, flags);
-                page = alloc_page(priority);
-                spin_lock_irqsave(&small_page_lock, flags);
-
-                if (list_empty(&order->queue)) {
-                        if (!page)
-                                goto no_page;
-                        SetPageReserved(page);
-                        USED_MAP(page) = 0;
-                        list_add(&page->lru, &order->queue);
-                        goto again;
-                }
-
-                spin_unlock_irqrestore(&small_page_lock, flags);
-                __free_page(page);
-        } while (1);
-
-no_page:
-        spin_unlock_irqrestore(&small_page_lock, flags);
-        return 0;
-}
-
-static void __free_small_page(unsigned long spage, struct order *order)
-{
-        unsigned long flags;
-        struct page *page;
-
-        if (virt_addr_valid(spage)) {
-                page = virt_to_page(spage);
-
-                /*
-                 * The container-page must be marked Reserved
-                 */
-                if (!PageReserved(page) || spage & order->mask)
-                        goto non_small;
-
-#ifdef PEDANTIC
-                BUG_ON(USED_MAP(page) & ~order->all_used);
-#endif
-
-                spage = spage >> order->shift;
-                spage &= order->block_mask;
-
-                /*
-                 * the following must be atomic wrt get_page
-                 */
-                spin_lock_irqsave(&small_page_lock, flags);
-
-                if (USED_MAP(page) == order->all_used)
-                        list_add(&page->lru, &order->queue);
-
-                if (!TEST_AND_CLEAR_USED(page, spage))
-                        goto already_free;
-
-                if (USED_MAP(page) == 0)
-                        goto free_page;
-
-                spin_unlock_irqrestore(&small_page_lock, flags);
-        }
-        return;
-
-free_page:
-        /*
-         * unlink the page from the small page queue and free it
-         */
-        list_del_init(&page->lru);
-        spin_unlock_irqrestore(&small_page_lock, flags);
-        ClearPageReserved(page);
-        __free_page(page);
-        return;
-
-non_small:
-        printk("Trying to free non-small page from %p\n", __builtin_return_address(0));
-        return;
-already_free:
-        printk("Trying to free free small page from %p\n", __builtin_return_address(0));
-}
-
-unsigned long get_page_8k(int priority)
-{
-        return __get_small_page(priority, orders+1);
-}
-
-void free_page_8k(unsigned long spage)
-{
-        __free_small_page(spage, orders+1);
-}
diff --git a/arch/arm26/nwfpe/ARM-gcc.h b/arch/arm26/nwfpe/ARM-gcc.h
deleted file mode 100644
index e6598470b076..000000000000
--- a/arch/arm26/nwfpe/ARM-gcc.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
--------------------------------------------------------------------------------
-The macro `BITS64' can be defined to indicate that 64-bit integer types are
-supported by the compiler.
--------------------------------------------------------------------------------
-*/
-#define BITS64
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines the most convenient type that holds
-integers of at least as many bits as specified.  For example, `uint8' should
-be the most convenient type that can hold unsigned integers of as many as
-8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
-implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
-to the same as `int'.
--------------------------------------------------------------------------------
-*/
-typedef char flag;
-typedef unsigned char uint8;
-typedef signed char int8;
-typedef int uint16;
-typedef int int16;
-typedef unsigned int uint32;
-typedef signed int int32;
-#ifdef BITS64
-typedef unsigned long long int bits64;
-typedef signed long long int sbits64;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines a type that holds integers
-of _exactly_ the number of bits specified.  For instance, for most
-implementation of C, `bits16' and `sbits16' should be `typedef'ed to
-`unsigned short int' and `signed short int' (or `short int'), respectively.
--------------------------------------------------------------------------------
-*/
-typedef unsigned char bits8;
-typedef signed char sbits8;
-typedef unsigned short int bits16;
-typedef signed short int sbits16;
-typedef unsigned int bits32;
-typedef signed int sbits32;
-#ifdef BITS64
-typedef unsigned long long int uint64;
-typedef signed long long int int64;
-#endif
-
-#ifdef BITS64
-/*
--------------------------------------------------------------------------------
-The `LIT64' macro takes as its argument a textual integer literal and if
-necessary ``marks'' the literal as having a 64-bit integer type.  For
-example, the Gnu C Compiler (`gcc') requires that 64-bit literals be
-appended with the letters `LL' standing for `long long', which is `gcc's
-name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
-defined as the identity macro:  `#define LIT64( a ) a'.
--------------------------------------------------------------------------------
-*/
-#define LIT64( a ) a##LL
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `INLINE' can be used before functions that should be inlined.  If
-a compiler does not support explicit inlining, this macro should be defined
-to be `static'.
--------------------------------------------------------------------------------
-*/
-#define INLINE extern __inline__
-
-
-/* For use as a GCC soft-float library we need some special function names. */
-
-#ifdef __LIBFLOAT__
-
-/* Some 32-bit ops can be mapped straight across by just changing the name. */
-#define float32_add                     __addsf3
-#define float32_sub                     __subsf3
-#define float32_mul                     __mulsf3
-#define float32_div                     __divsf3
-#define int32_to_float32                __floatsisf
-#define float32_to_int32_round_to_zero  __fixsfsi
-#define float32_to_uint32_round_to_zero __fixunssfsi
-
-/* These ones go through the glue code.  To avoid namespace pollution
-   we rename the internal functions too.  */
-#define float32_eq                      ___float32_eq
-#define float32_le                      ___float32_le
-#define float32_lt                      ___float32_lt
-
-/* All the 64-bit ops have to go through the glue, so we pull the same
-   trick.  */
-#define float64_add                     ___float64_add
-#define float64_sub                     ___float64_sub
-#define float64_mul                     ___float64_mul
-#define float64_div                     ___float64_div
-#define int32_to_float64                ___int32_to_float64
-#define float64_to_int32_round_to_zero  ___float64_to_int32_round_to_zero
-#define float64_to_uint32_round_to_zero ___float64_to_uint32_round_to_zero
-#define float64_to_float32              ___float64_to_float32
-#define float32_to_float64              ___float32_to_float64
-#define float64_eq                      ___float64_eq
-#define float64_le                      ___float64_le
-#define float64_lt                      ___float64_lt
-
-#if 0
-#define float64_add                     __adddf3
-#define float64_sub                     __subdf3
-#define float64_mul                     __muldf3
-#define float64_div                     __divdf3
-#define int32_to_float64                __floatsidf
-#define float64_to_int32_round_to_zero  __fixdfsi
-#define float64_to_uint32_round_to_zero __fixunsdfsi
-#define float64_to_float32              __truncdfsf2
-#define float32_to_float64              __extendsfdf2
-#endif
-
-#endif
diff --git a/arch/arm26/nwfpe/ChangeLog b/arch/arm26/nwfpe/ChangeLog
deleted file mode 100644
index 0c580f764baf..000000000000
--- a/arch/arm26/nwfpe/ChangeLog
+++ /dev/null
@@ -1,83 +0,0 @@
-2002-01-19  Russell King <rmk@arm.linux.org.uk>
-
-        * fpa11.h - Add documentation
-                  - remove userRegisters pointer from this structure.
-                  - add new method to obtain integer register values.
-        * softfloat.c - Remove float128
-        * softfloat.h - Remove float128
-        * softfloat-specialize - Remove float128
-
-        * The FPA11 structure is not a kernel-specific data structure.
-          It is used by users of ptrace to examine the values of the
-          floating point registers.  Therefore, any changes to the
-          FPA11 structure (size or position of elements contained
-          within) have to be well thought out.
-
-        * Since 128-bit float requires the FPA11 structure to change
-          size, it has been removed.  128-bit float is currently unused,
-          and needs various things to be re-worked so that we won't
-          overflow the available space in the task structure.
-
-        * The changes are designed to break any patch that goes on top
-          of this code, so that the authors properly review their changes.
-
-1999-08-19  Scott Bambrough  <scottb@netwinder.org>
-
-        * fpmodule.c - Changed version number to 0.95
-        * fpa11.h - modified FPA11, FPREG structures
-        * fpa11.c - Changes due to FPA11, FPREG structure alterations.
-        * fpa11_cpdo.c - Changes due to FPA11, FPREG structure alterations.
-        * fpa11_cpdt.c - Changes due to FPA11, FPREG structure alterations.
-        * fpa11_cprt.c - Changes due to FPA11, FPREG structure alterations.
-        * single_cpdo.c - Changes due to FPA11, FPREG structure alterations.
-        * double_cpdo.c - Changes due to FPA11, FPREG structure alterations.
-        * extended_cpdo.c - Changes due to FPA11, FPREG structure alterations.
-
-        * I discovered several bugs.  First and worst is that the kernel
-          passes in a pointer to the FPE's state area.  This is defined
-          as a struct user_fp (see user.h).  This pointer was cast to a
-          FPA11*.  Unfortunately FPA11 and user_fp are of different sizes;
-          user_fp is smaller.  This meant that the FPE scribbled on things
-          below its area, which is bad, as the area is in the thread_struct
-          embedded in the process task structure.  Thus we were scribbling
-          over one of the most important structures in the entire OS.
-
-        * user_fp and FPA11 have now been harmonized.  Most of the changes
-          in the above code were dereferencing problems due to moving the
-          register type out of FPREG, and getting rid of the union variable
-          fpvalue.
-
-        * Second I noticed resetFPA11 was not always being called for a
-          task.  This should happen on the first floating point exception
-          that occurs.  It is controlled by init_flag in FPA11.  The
-          comment in the code beside init_flag state the kernel guarantees
-          this to be zero.  Not so.  I found that the kernel recycles task
-          structures, and that recycled ones may not have init_flag zeroed.
-          I couldn't even find anything that guarantees it is zeroed when
-          when the task structure is initially allocated.  In any case
-          I now initialize the entire FPE state in the thread structure to
-          zero when allocated and recycled.  See alloc_task_struct() and
-          flush_thread() in arch/arm/process.c.  The change to
-          alloc_task_struct() may not be necessary, but I left it in for
-          completeness (better safe than sorry).
-
-1998-11-23  Scott Bambrough  <scottb@netwinder.org>
-
-        * README.FPE - fix typo in description of lfm/sfm instructions
-        * NOTES - Added file to describe known bugs/problems 
-        * fpmodule.c - Changed version number to 0.94
-
-1998-11-20  Scott Bambrough  <scottb@netwinder.org>
-
-        * README.FPE - fix description of URD, NRM instructions
-        * TODO - remove URD, NRM instructions from TODO list
-        * single_cpdo.c - implement URD, NRM
-        * double_cpdo.c - implement URD, NRM
-        * extended_cpdo.c - implement URD, NRM
-
-1998-11-19  Scott Bambrough  <scottb@netwinder.org>
-
-        * ChangeLog - Added this file to track changes made.
-        * fpa11.c - added code to initialize register types to typeNone
-        * fpa11_cpdt.c - fixed bug in storeExtended (typeExtended changed to
-          typeDouble in switch statement)
diff --git a/arch/arm26/nwfpe/Makefile b/arch/arm26/nwfpe/Makefile
deleted file mode 100644
index b39d34dff054..000000000000
--- a/arch/arm26/nwfpe/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (C) 1998, 1999, 2001 Philip Blundell
-#
-
-obj-y                   :=
-obj-m                   :=
-obj-n                   :=
-
-obj-$(CONFIG_FPE_NWFPE) += nwfpe.o
-
-nwfpe-objs              := fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o \
-                           fpmodule.o fpopcode.o softfloat.o \
-                           single_cpdo.o double_cpdo.o extended_cpdo.o \
-                           entry.o
-
diff --git a/arch/arm26/nwfpe/double_cpdo.c b/arch/arm26/nwfpe/double_cpdo.c
deleted file mode 100644
index 7f4fef0216c7..000000000000
--- a/arch/arm26/nwfpe/double_cpdo.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.COM, 1998,1999
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "fpa11.h"
-#include "softfloat.h"
-#include "fpopcode.h"
-
-float64 float64_exp(float64 Fm);
-float64 float64_ln(float64 Fm);
-float64 float64_sin(float64 rFm);
-float64 float64_cos(float64 rFm);
-float64 float64_arcsin(float64 rFm);
-float64 float64_arctan(float64 rFm);
-float64 float64_log(float64 rFm);
-float64 float64_tan(float64 rFm);
-float64 float64_arccos(float64 rFm);
-float64 float64_pow(float64 rFn,float64 rFm);
-float64 float64_pol(float64 rFn,float64 rFm);
-
-unsigned int DoubleCPDO(const unsigned int opcode)
-{
-   FPA11 *fpa11 = GET_FPA11();
-   float64 rFm, rFn = 0; //FIXME - should be zero?
-   unsigned int Fd, Fm, Fn, nRc = 1;
-
-   //printk("DoubleCPDO(0x%08x)\n",opcode);
-   
-   Fm = getFm(opcode);
-   if (CONSTANT_FM(opcode))
-   {
-     rFm = getDoubleConstant(Fm);
-   }
-   else
-   {  
-     switch (fpa11->fType[Fm])
-     {
-        case typeSingle:
-          rFm = float32_to_float64(fpa11->fpreg[Fm].fSingle);
-        break;
-
-        case typeDouble:
-          rFm = fpa11->fpreg[Fm].fDouble;
-          break;
-
-        case typeExtended:
-            // !! patb
-            //printk("not implemented! why not?\n");
-            //!! ScottB
-            // should never get here, if extended involved
-            // then other operand should be promoted then
-            // ExtendedCPDO called.
-            break;
-
-        default: return 0;
-     }
-   }
-
-   if (!MONADIC_INSTRUCTION(opcode))
-   {
-      Fn = getFn(opcode);
-      switch (fpa11->fType[Fn])
-      {
-        case typeSingle:
-          rFn = float32_to_float64(fpa11->fpreg[Fn].fSingle);
-        break;
-
-        case typeDouble:
-          rFn = fpa11->fpreg[Fn].fDouble;
-        break;
-        
-        default: return 0;
-      }
-   }
-
-   Fd = getFd(opcode);
-   /* !! this switch isn't optimized; better (opcode & MASK_ARITHMETIC_OPCODE)>>24, sort of */
-   switch (opcode & MASK_ARITHMETIC_OPCODE)
-   {
-      /* dyadic opcodes */
-      case ADF_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_add(rFn,rFm);
-      break;
-
-      case MUF_CODE:
-      case FML_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_mul(rFn,rFm);
-      break;
-
-      case SUF_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_sub(rFn,rFm);
-      break;
-
-      case RSF_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_sub(rFm,rFn);
-      break;
-
-      case DVF_CODE:
-      case FDV_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_div(rFn,rFm);
-      break;
-
-      case RDF_CODE:
-      case FRD_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_div(rFm,rFn);
-      break;
-
-#if 0
-      case POW_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_pow(rFn,rFm);
-      break;
-
-      case RPW_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_pow(rFm,rFn);
-      break;
-#endif
-
-      case RMF_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_rem(rFn,rFm);
-      break;
-
-#if 0
-      case POL_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_pol(rFn,rFm);
-      break;
-#endif
-
-      /* monadic opcodes */
-      case MVF_CODE:
-         fpa11->fpreg[Fd].fDouble = rFm;
-      break;
-
-      case MNF_CODE:
-      {
-         unsigned int *p = (unsigned int*)&rFm;
-         p[1] ^= 0x80000000;
-         fpa11->fpreg[Fd].fDouble = rFm;
-      }
-      break;
-
-      case ABS_CODE:
-      {
-         unsigned int *p = (unsigned int*)&rFm;
-         p[1] &= 0x7fffffff;
-         fpa11->fpreg[Fd].fDouble = rFm;
-      }
-      break;
-
-      case RND_CODE:
-      case URD_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_round_to_int(rFm);
-      break;
-
-      case SQT_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_sqrt(rFm);
-      break;
-
-#if 0
-      case LOG_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_log(rFm);
-      break;
-
-      case LGN_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_ln(rFm);
-      break;
-
-      case EXP_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_exp(rFm);
-      break;
-
-      case SIN_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_sin(rFm);
-      break;
-
-      case COS_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_cos(rFm);
-      break;
-
-      case TAN_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_tan(rFm);
-      break;
-
-      case ASN_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_arcsin(rFm);
-      break;
-
-      case ACS_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_arccos(rFm);
-      break;
-
-      case ATN_CODE:
-         fpa11->fpreg[Fd].fDouble = float64_arctan(rFm);
-      break;
-#endif
-
-      case NRM_CODE:
-      break;
-      
-      default:
-      {
-        nRc = 0;
-      }
-   }
-
-   if (0 != nRc) fpa11->fType[Fd] = typeDouble;
-   return nRc;
-}
-
-#if 0
-float64 float64_exp(float64 rFm)
-{
-  return rFm;
-//series
-}
-
-float64 float64_ln(float64 rFm)
-{
-  return rFm;
-//series
-}
-
-float64 float64_sin(float64 rFm)
-{
-  return rFm;
-//series
-}
-
-float64 float64_cos(float64 rFm)
-{
-   return rFm;
-   //series
-}
-
-#if 0
-float64 float64_arcsin(float64 rFm)
-{
-//series
-}
-
-float64 float64_arctan(float64 rFm)
-{
-  //series
-}
-#endif
-
-float64 float64_log(float64 rFm)
-{
-  return float64_div(float64_ln(rFm),getDoubleConstant(7));
-}
-
-float64 float64_tan(float64 rFm)
-{
-  return float64_div(float64_sin(rFm),float64_cos(rFm));
-}
-
-float64 float64_arccos(float64 rFm)
-{
-return rFm;
-   //return float64_sub(halfPi,float64_arcsin(rFm));
-}
-
-float64 float64_pow(float64 rFn,float64 rFm)
-{
-  return float64_exp(float64_mul(rFm,float64_ln(rFn))); 
-}
-
-float64 float64_pol(float64 rFn,float64 rFm)
-{
-  return float64_arctan(float64_div(rFn,rFm)); 
-}
-#endif
diff --git a/arch/arm26/nwfpe/entry.S b/arch/arm26/nwfpe/entry.S
deleted file mode 100644
index e6312000d9f8..000000000000
--- a/arch/arm26/nwfpe/entry.S
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.COM, 1998
-    (c) Philip Blundell 1998-1999
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <asm/asm-offsets.h>
-
-/* This is the kernel's entry point into the floating point emulator.
-It is called from the kernel with code similar to this:
-
-        mov     fp, #0
-        teqp    pc, #PSR_I_BIT | MODE_SVC
-        ldr     r4, .LC2
-        ldr     pc, [r4]                @ Call FP module USR entry point
-
-The kernel expects the emulator to return via one of two possible
-points of return it passes to the emulator.  The emulator, if
-successful in its emulation, jumps to ret_from_exception and the
-kernel takes care of returning control from the trap to the user code.
-If the emulator is unable to emulate the instruction, it returns to
-fpundefinstr and the kernel halts the user program with a core dump.
-
-This routine does four things:
-
-1) It saves SP into a variable called userRegisters.  The kernel has
-created a struct pt_regs on the stack and saved the user registers
-into it.  See /usr/include/asm/proc/ptrace.h for details.  The
-emulator code uses userRegisters as the base of an array of words from
-which the contents of the registers can be extracted.
-
-2) It locates the FP emulator work area within the TSS structure and
-points `fpa11' to it.
-
-3) It calls EmulateAll to emulate a floating point instruction.
-EmulateAll returns 1 if the emulation was successful, or 0 if not.
-
-4) If an instruction has been emulated successfully, it looks ahead at
-the next instruction.  If it is a floating point instruction, it
-executes the instruction, without returning to user space.  In this
-way it repeatedly looks ahead and executes floating point instructions
-until it encounters a non floating point instruction, at which time it
-returns via _fpreturn.
-
-This is done to reduce the effect of the trap overhead on each
-floating point instructions.  GCC attempts to group floating point
-instructions to allow the emulator to spread the cost of the trap over
-several floating point instructions.  */
-
-        .globl  nwfpe_enter
-nwfpe_enter:
-        mov     sl, sp
-        bl      FPA11_CheckInit         @ check to see if we are initialised
-
-        ldr     r5, [sp, #60]           @ get contents of PC
-        bic     r5, r5, #0xfc000003
-        ldr     r0, [r5, #-4]           @ get actual instruction into r0
-        bl      EmulateAll              @ emulate the instruction
-1:      cmp     r0, #0                  @ was emulation successful
-        beq     fpundefinstr            @ no, return failure
-
-next:
-.Lx1:   ldrt    r6, [r5], #4            @ get the next instruction and
-                                        @ increment PC
-
-        and     r2, r6, #0x0F000000     @ test for FP insns
-        teq     r2, #0x0C000000
-        teqne   r2, #0x0D000000
-        teqne   r2, #0x0E000000
-        bne     ret_from_exception      @ return ok if not a fp insn
-
-        ldr     r9, [sp, #60]           @ get new condition codes
-        and     r9, r9, #0xfc000003
-        orr     r7, r5, r9
-        str     r7, [sp, #60]           @ update PC copy in regs
-
-        mov     r0, r6                  @ save a copy
-        mov     r1, r9                  @ fetch the condition codes
-        bl      checkCondition          @ check the condition
-        cmp     r0, #0                  @ r0 = 0 ==> condition failed
-
-        @ if condition code failed to match, next insn
-        beq     next                    @ get the next instruction;
-            
-        mov     r0, r6                  @ prepare for EmulateAll()
-        adr     lr, 1b
-        orr     lr, lr, #3
-        b       EmulateAll              @ if r0 != 0, goto EmulateAll
-
-.Lret:  b       ret_from_exception      @ let the user eat segfaults
-        
-        @ We need to be prepared for the instruction at .Lx1 to fault.
-        @ Emit the appropriate exception gunk to fix things up.
-        .section __ex_table,"a"
-        .align  3
-        .long   .Lx1
-        ldr     lr, [lr, $(.Lret - .Lx1)/4]
-        .previous
diff --git a/arch/arm26/nwfpe/extended_cpdo.c b/arch/arm26/nwfpe/extended_cpdo.c
deleted file mode 100644
index 331407596d91..000000000000
--- a/arch/arm26/nwfpe/extended_cpdo.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.COM, 1998,1999
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "fpa11.h"
-#include "softfloat.h"
-#include "fpopcode.h"
-
-floatx80 floatx80_exp(floatx80 Fm);
-floatx80 floatx80_ln(floatx80 Fm);
-floatx80 floatx80_sin(floatx80 rFm);
-floatx80 floatx80_cos(floatx80 rFm);
-floatx80 floatx80_arcsin(floatx80 rFm);
-floatx80 floatx80_arctan(floatx80 rFm);
-floatx80 floatx80_log(floatx80 rFm);
-floatx80 floatx80_tan(floatx80 rFm);
-floatx80 floatx80_arccos(floatx80 rFm);
-floatx80 floatx80_pow(floatx80 rFn,floatx80 rFm);
-floatx80 floatx80_pol(floatx80 rFn,floatx80 rFm);
-
-unsigned int ExtendedCPDO(const unsigned int opcode)
-{
-   FPA11 *fpa11 = GET_FPA11();
-   floatx80 rFm, rFn;
-   unsigned int Fd, Fm, Fn, nRc = 1;
-
-   //printk("ExtendedCPDO(0x%08x)\n",opcode);
-   
-   Fm = getFm(opcode);
-   if (CONSTANT_FM(opcode))
-   {
-     rFm = getExtendedConstant(Fm);
-   }
-   else
-   {  
-     switch (fpa11->fType[Fm])
-     {
-        case typeSingle:
-          rFm = float32_to_floatx80(fpa11->fpreg[Fm].fSingle);
-        break;
-
-        case typeDouble:
-          rFm = float64_to_floatx80(fpa11->fpreg[Fm].fDouble);
-        break;
-        
-        case typeExtended:
-          rFm = fpa11->fpreg[Fm].fExtended;
-        break;
-        
-        default: return 0;
-     }
-   }
-   
-   if (!MONADIC_INSTRUCTION(opcode))
-   {
-      Fn = getFn(opcode);
-      switch (fpa11->fType[Fn])
-      {
-        case typeSingle:
-          rFn = float32_to_floatx80(fpa11->fpreg[Fn].fSingle);
-        break;
-
-        case typeDouble:
-          rFn = float64_to_floatx80(fpa11->fpreg[Fn].fDouble);
-        break;
-        
-        case typeExtended:
-          rFn = fpa11->fpreg[Fn].fExtended;
-        break;
-        
-        default: return 0;
-      }
-   }
-
-   Fd = getFd(opcode);
-   switch (opcode & MASK_ARITHMETIC_OPCODE)
-   {
-      /* dyadic opcodes */
-      case ADF_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_add(rFn,rFm);
-      break;
-
-      case MUF_CODE:
-      case FML_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_mul(rFn,rFm);
-      break;
-
-      case SUF_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_sub(rFn,rFm);
-      break;
-
-      case RSF_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_sub(rFm,rFn);
-      break;
-
-      case DVF_CODE:
-      case FDV_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_div(rFn,rFm);
-      break;
-
-      case RDF_CODE:
-      case FRD_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_div(rFm,rFn);
-      break;
-
-#if 0
-      case POW_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_pow(rFn,rFm);
-      break;
-
-      case RPW_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_pow(rFm,rFn);
-      break;
-#endif
-
-      case RMF_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_rem(rFn,rFm);
-      break;
-
-#if 0
-      case POL_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_pol(rFn,rFm);
-      break;
-#endif
-
-      /* monadic opcodes */
-      case MVF_CODE:
-         fpa11->fpreg[Fd].fExtended = rFm;
-      break;
-
-      case MNF_CODE:
-         rFm.high ^= 0x8000;
-         fpa11->fpreg[Fd].fExtended = rFm;
-      break;
-
-      case ABS_CODE:
-         rFm.high &= 0x7fff;
-         fpa11->fpreg[Fd].fExtended = rFm;
-      break;
-
-      case RND_CODE:
-      case URD_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_round_to_int(rFm);
-      break;
-
-      case SQT_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_sqrt(rFm);
-      break;
-
-#if 0
-      case LOG_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_log(rFm);
-      break;
-
-      case LGN_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_ln(rFm);
-      break;
-
-      case EXP_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_exp(rFm);
-      break;
-
-      case SIN_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_sin(rFm);
-      break;
-
-      case COS_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_cos(rFm);
-      break;
-
-      case TAN_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_tan(rFm);
-      break;
-
-      case ASN_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_arcsin(rFm);
-      break;
-
-      case ACS_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_arccos(rFm);
-      break;
-
-      case ATN_CODE:
-         fpa11->fpreg[Fd].fExtended = floatx80_arctan(rFm);
-      break;
-#endif
-
-      case NRM_CODE:
-      break;
-      
-      default:
-      {
-        nRc = 0;
-      }
-   }
-   
-   if (0 != nRc) fpa11->fType[Fd] = typeExtended;
-   return nRc;
-}
-
-#if 0
-floatx80 floatx80_exp(floatx80 Fm)
-{
-//series
-}
-
-floatx80 floatx80_ln(floatx80 Fm)
-{
-//series
-}
-
-floatx80 floatx80_sin(floatx80 rFm)
-{
-//series
-}
-
-floatx80 floatx80_cos(floatx80 rFm)
-{
-//series
-}
-
-floatx80 floatx80_arcsin(floatx80 rFm)
-{
-//series
-}
-
-floatx80 floatx80_arctan(floatx80 rFm)
-{
-  //series
-}
-
-floatx80 floatx80_log(floatx80 rFm)
-{
-  return floatx80_div(floatx80_ln(rFm),getExtendedConstant(7));
-}
-
-floatx80 floatx80_tan(floatx80 rFm)
-{
-  return floatx80_div(floatx80_sin(rFm),floatx80_cos(rFm));
-}
-
-floatx80 floatx80_arccos(floatx80 rFm)
-{
-   //return floatx80_sub(halfPi,floatx80_arcsin(rFm));
-}
-
-floatx80 floatx80_pow(floatx80 rFn,floatx80 rFm)
-{
-  return floatx80_exp(floatx80_mul(rFm,floatx80_ln(rFn))); 
-}
-
-floatx80 floatx80_pol(floatx80 rFn,floatx80 rFm)
-{
-  return floatx80_arctan(floatx80_div(rFn,rFm)); 
-}
-#endif
diff --git a/arch/arm26/nwfpe/fpa11.c b/arch/arm26/nwfpe/fpa11.c
deleted file mode 100644
index e954540a9464..000000000000
--- a/arch/arm26/nwfpe/fpa11.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.COM, 1998,1999
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "fpa11.h"
-#include "fpopcode.h"
-
-#include "fpmodule.h"
-#include "fpmodule.inl"
-
-#include <linux/compiler.h>
-#include <asm/system.h>
-
-/* forward declarations */
-unsigned int EmulateCPDO(const unsigned int);
-unsigned int EmulateCPDT(const unsigned int);
-unsigned int EmulateCPRT(const unsigned int);
-
-/* Reset the FPA11 chip.  Called to initialize and reset the emulator. */
-void resetFPA11(void)
-{
-  int i;
-  FPA11 *fpa11 = GET_FPA11();
-  
-  /* initialize the register type array */
-  for (i=0;i<=7;i++)
-  {
-    fpa11->fType[i] = typeNone;
-  }
-  
-  /* FPSR: set system id to FP_EMULATOR, set AC, clear all other bits */
-  fpa11->fpsr = FP_EMULATOR | BIT_AC;
-  
-  /* FPCR: set SB, AB and DA bits, clear all others */
-#if MAINTAIN_FPCR
-  fpa11->fpcr = MASK_RESET;
-#endif
-}
-
-void SetRoundingMode(const unsigned int opcode)
-{
-#if MAINTAIN_FPCR
-   FPA11 *fpa11 = GET_FPA11();
-   fpa11->fpcr &= ~MASK_ROUNDING_MODE;
-#endif   
-   switch (opcode & MASK_ROUNDING_MODE)
-   {
-      default:
-      case ROUND_TO_NEAREST:
-         float_rounding_mode = float_round_nearest_even;
-#if MAINTAIN_FPCR         
-         fpa11->fpcr |= ROUND_TO_NEAREST;
-#endif         
-      break;
-      
-      case ROUND_TO_PLUS_INFINITY:
-         float_rounding_mode = float_round_up;
-#if MAINTAIN_FPCR         
-         fpa11->fpcr |= ROUND_TO_PLUS_INFINITY;
-#endif         
-      break;
-      
-      case ROUND_TO_MINUS_INFINITY:
-         float_rounding_mode = float_round_down;
-#if MAINTAIN_FPCR         
-         fpa11->fpcr |= ROUND_TO_MINUS_INFINITY;
-#endif         
-      break;
-      
-      case ROUND_TO_ZERO:
-         float_rounding_mode = float_round_to_zero;
-#if MAINTAIN_FPCR         
-         fpa11->fpcr |= ROUND_TO_ZERO;
-#endif         
-      break;
-  }
-}
-
-void SetRoundingPrecision(const unsigned int opcode)
-{
-#if MAINTAIN_FPCR
-   FPA11 *fpa11 = GET_FPA11();
-   fpa11->fpcr &= ~MASK_ROUNDING_PRECISION;
-#endif   
-   switch (opcode & MASK_ROUNDING_PRECISION)
-   {
-      case ROUND_SINGLE:
-         floatx80_rounding_precision = 32;
-#if MAINTAIN_FPCR         
-         fpa11->fpcr |= ROUND_SINGLE;
-#endif         
-      break;
-      
-      case ROUND_DOUBLE:
-         floatx80_rounding_precision = 64;
-#if MAINTAIN_FPCR         
-         fpa11->fpcr |= ROUND_DOUBLE;
-#endif         
-      break;
-      
-      case ROUND_EXTENDED:
-         floatx80_rounding_precision = 80;
-#if MAINTAIN_FPCR         
-         fpa11->fpcr |= ROUND_EXTENDED;
-#endif         
-      break;
-      
-      default: floatx80_rounding_precision = 80;
-  }
-}
-
-void FPA11_CheckInit(void)
-{
-  FPA11 *fpa11 = GET_FPA11();
-  if (unlikely(fpa11->initflag == 0))
-  {
-    resetFPA11();
-    SetRoundingMode(ROUND_TO_NEAREST);
-    SetRoundingPrecision(ROUND_EXTENDED);
-    fpa11->initflag = 1;
-  }
-}
-
-/* Emulate the instruction in the opcode. */
-unsigned int EmulateAll(unsigned int opcode)
-{
-  unsigned int nRc = 1, code;
-
-  code = opcode & 0x00000f00;
-  if (code == 0x00000100 || code == 0x00000200)
-  {
-    /* For coprocessor 1 or 2 (FPA11) */
-    code = opcode & 0x0e000000;
-    if (code == 0x0e000000)
-    {
-      if (opcode & 0x00000010)
-      {
-        /* Emulate conversion opcodes. */
-        /* Emulate register transfer opcodes. */
-        /* Emulate comparison opcodes. */
-        nRc = EmulateCPRT(opcode);
-      }
-      else
-      {
-        /* Emulate monadic arithmetic opcodes. */
-        /* Emulate dyadic arithmetic opcodes. */
-        nRc = EmulateCPDO(opcode);
-      }
-    }
-    else if (code == 0x0c000000)
-    {
-      /* Emulate load/store opcodes. */
-      /* Emulate load/store multiple opcodes. */
-      nRc = EmulateCPDT(opcode);
-    }
-    else
-    {
-      /* Invalid instruction detected.  Return FALSE. */
-      nRc = 0;
-    }
-  }
-
-  return(nRc);
-}
-
-#if 0
-unsigned int EmulateAll1(unsigned int opcode)
-{
-  switch ((opcode >> 24) & 0xf)
-  {
-     case 0xc:
-     case 0xd:
-       if ((opcode >> 20) & 0x1)
-       {
-          switch ((opcode >> 8) & 0xf)
-          {
-             case 0x1: return PerformLDF(opcode); break;
-             case 0x2: return PerformLFM(opcode); break;
-             default: return 0;
-          }
-       }
-       else
-       {
-          switch ((opcode >> 8) & 0xf)
-          {
-             case 0x1: return PerformSTF(opcode); break;
-             case 0x2: return PerformSFM(opcode); break;
-             default: return 0;
-          }
-      }
-     break;
-     
-     case 0xe: 
-       if (opcode & 0x10)
-         return EmulateCPDO(opcode);
-       else
-         return EmulateCPRT(opcode);
-     break;
-  
-     default: return 0;
-  }
-}
-#endif
-
diff --git a/arch/arm26/nwfpe/fpa11.h b/arch/arm26/nwfpe/fpa11.h
deleted file mode 100644
index be09902a211d..000000000000
--- a/arch/arm26/nwfpe/fpa11.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.com, 1998-1999
-    
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef __FPA11_H__
-#define __FPA11_H__
-
-#define GET_FPA11() ((FPA11 *)(&current_thread_info()->fpstate))
-
-/*
- * The processes registers are always at the very top of the 8K
- * stack+task struct.  Use the same method as 'current' uses to
- * reach them.
- */
-register unsigned int *user_registers asm("sl");
-
-#define GET_USERREG() (user_registers)
-
-#include <linux/thread_info.h>
-
-/* includes */
-#include "fpsr.h"               /* FP control and status register definitions */
-#include "softfloat.h"
-
-#define         typeNone                0x00
-#define         typeSingle              0x01
-#define         typeDouble              0x02
-#define         typeExtended            0x03
-
-/*
- * This must be no more and no less than 12 bytes.
- */
-typedef union tagFPREG {
-   floatx80 fExtended;
-   float64  fDouble;
-   float32  fSingle;
-} FPREG;
-
-/*
- * FPA11 device model.
- *
- * This structure is exported to user space.  Do not re-order.
- * Only add new stuff to the end, and do not change the size of
- * any element.  Elements of this structure are used by user
- * space, and must match struct user_fp in include/asm-arm/user.h.
- * We include the byte offsets below for documentation purposes.
- *
- * The size of this structure and FPREG are checked by fpmodule.c
- * on initialisation.  If the rules have been broken, NWFPE will
- * not initialise.
- */
-typedef struct tagFPA11 {
-/*   0 */  FPREG fpreg[8];              /* 8 floating point registers */
-/*  96 */  FPSR fpsr;                   /* floating point status register */
-/* 100 */  FPCR fpcr;                   /* floating point control register */
-/* 104 */  unsigned char fType[8];      /* type of floating point value held in
-                                           floating point registers.  One of none
-                                           single, double or extended. */
-/* 112 */  int initflag;                /* this is special.  The kernel guarantees
-                                           to set it to 0 when a thread is launched,
-                                           so we can use it to detect whether this
-                                           instance of the emulator needs to be
-                                           initialised. */
-} FPA11;
-
-extern void resetFPA11(void);
-extern void SetRoundingMode(const unsigned int);
-extern void SetRoundingPrecision(const unsigned int);
-
-#endif
diff --git a/arch/arm26/nwfpe/fpa11.inl b/arch/arm26/nwfpe/fpa11.inl
deleted file mode 100644
index 1c45cba2de66..000000000000
--- a/arch/arm26/nwfpe/fpa11.inl
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.COM, 1998,1999
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "fpa11.h"
-
-/* Read and write floating point status register */
-extern __inline__ unsigned int readFPSR(void)
-{
-  FPA11 *fpa11 = GET_FPA11();
-  return(fpa11->fpsr);
-}
-
-extern __inline__ void writeFPSR(FPSR reg)
-{
-  FPA11 *fpa11 = GET_FPA11();
-  /* the sysid byte in the status register is readonly */
-  fpa11->fpsr = (fpa11->fpsr & MASK_SYSID) | (reg & ~MASK_SYSID);
-}
-
-/* Read and write floating point control register */
-extern __inline__ FPCR readFPCR(void)
-{
-  FPA11 *fpa11 = GET_FPA11();
-  /* clear SB, AB and DA bits before returning FPCR */
-  return(fpa11->fpcr & ~MASK_RFC);
-}
-
-extern __inline__ void writeFPCR(FPCR reg)
-{
-  FPA11 *fpa11 = GET_FPA11();
-  fpa11->fpcr &= ~MASK_WFC;             /* clear SB, AB and DA bits */
-  fpa11->fpcr |= (reg & MASK_WFC);      /* write SB, AB and DA bits */
-}
diff --git a/arch/arm26/nwfpe/fpa11_cpdo.c b/arch/arm26/nwfpe/fpa11_cpdo.c
deleted file mode 100644
index 343a6b9fd520..000000000000
--- a/arch/arm26/nwfpe/fpa11_cpdo.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.COM, 1998,1999
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "fpa11.h"
-#include "fpopcode.h"
-
-unsigned int SingleCPDO(const unsigned int opcode);
-unsigned int DoubleCPDO(const unsigned int opcode);
-unsigned int ExtendedCPDO(const unsigned int opcode);
-
-unsigned int EmulateCPDO(const unsigned int opcode)
-{
-   FPA11 *fpa11 = GET_FPA11();
-   unsigned int Fd, nType, nDest, nRc = 1;
-   
-   //printk("EmulateCPDO(0x%08x)\n",opcode);
-
-   /* Get the destination size.  If not valid let Linux perform
-      an invalid instruction trap. */
-   nDest = getDestinationSize(opcode);
-   if (typeNone == nDest) return 0;
-   
-   SetRoundingMode(opcode);
-     
-   /* Compare the size of the operands in Fn and Fm.
-      Choose the largest size and perform operations in that size,
-      in order to make use of all the precision of the operands. 
-      If Fm is a constant, we just grab a constant of a size 
-      matching the size of the operand in Fn. */
-   if (MONADIC_INSTRUCTION(opcode))
-     nType = nDest;
-   else
-     nType = fpa11->fType[getFn(opcode)];
-   
-   if (!CONSTANT_FM(opcode))
-   {
-     register unsigned int Fm = getFm(opcode);
-     if (nType < fpa11->fType[Fm])
-     {
-        nType = fpa11->fType[Fm];
-     }
-   }
-
-   switch (nType)
-   {
-      case typeSingle   : nRc = SingleCPDO(opcode);   break;
-      case typeDouble   : nRc = DoubleCPDO(opcode);   break;
-      case typeExtended : nRc = ExtendedCPDO(opcode); break;
-      default           : nRc = 0;
-   }
-
-   /* If the operation succeeded, check to see if the result in the
-      destination register is the correct size.  If not force it
-      to be. */
-   Fd = getFd(opcode);
-   nType = fpa11->fType[Fd];
-   if ((0 != nRc) && (nDest != nType))
-   {
-     switch (nDest)
-     {
-       case typeSingle:
-       {
-         if (typeDouble == nType)
-           fpa11->fpreg[Fd].fSingle = 
-              float64_to_float32(fpa11->fpreg[Fd].fDouble);
-         else
-           fpa11->fpreg[Fd].fSingle = 
-              floatx80_to_float32(fpa11->fpreg[Fd].fExtended);
-       }
-       break;
-          
-       case typeDouble:
-       {
-         if (typeSingle == nType)
-           fpa11->fpreg[Fd].fDouble = 
-              float32_to_float64(fpa11->fpreg[Fd].fSingle);
-         else
-           fpa11->fpreg[Fd].fDouble = 
-              floatx80_to_float64(fpa11->fpreg[Fd].fExtended);
-       }
-       break;
-          
-       case typeExtended:
-       {
-         if (typeSingle == nType)
-           fpa11->fpreg[Fd].fExtended = 
-              float32_to_floatx80(fpa11->fpreg[Fd].fSingle);
-         else
-           fpa11->fpreg[Fd].fExtended = 
-              float64_to_floatx80(fpa11->fpreg[Fd].fDouble);
-       }
-       break;
-     }
-     
-     fpa11->fType[Fd] = nDest;
-   }
-   
-   return nRc;
-}
diff --git a/arch/arm26/nwfpe/fpa11_cpdt.c b/arch/arm26/nwfpe/fpa11_cpdt.c
deleted file mode 100644
index e12db7c51a76..000000000000
--- a/arch/arm26/nwfpe/fpa11_cpdt.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.com, 1998-1999
-    (c) Philip Blundell, 1998
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "fpa11.h"
-#include "softfloat.h"
-#include "fpopcode.h"
-#include "fpmodule.h"
-#include "fpmodule.inl"
-
-#include <asm/uaccess.h>
-
-static inline
-void loadSingle(const unsigned int Fn,const unsigned int *pMem)
-{
-   FPA11 *fpa11 = GET_FPA11();
-   fpa11->fType[Fn] = typeSingle;
-   get_user(fpa11->fpreg[Fn].fSingle, pMem);
-}
-
-static inline
-void loadDouble(const unsigned int Fn,const unsigned int *pMem)
-{
-   FPA11 *fpa11 = GET_FPA11();
-   unsigned int *p;
-   p = (unsigned int*)&fpa11->fpreg[Fn].fDouble;
-   fpa11->fType[Fn] = typeDouble;
-   get_user(p[0], &pMem[1]);
-   get_user(p[1], &pMem[0]); /* sign & exponent */
-}
-
-static inline
-void loadExtended(const unsigned int Fn,const unsigned int *pMem)
-{
-   FPA11 *fpa11 = GET_FPA11();
-   unsigned int *p;
-   p = (unsigned int*)&fpa11->fpreg[Fn].fExtended;
-   fpa11->fType[Fn] = typeExtended;
-   get_user(p[0], &pMem[0]);  /* sign & exponent */
-   get_user(p[1], &pMem[2]);  /* ls bits */
-   get_user(p[2], &pMem[1]);  /* ms bits */
-}
-
-static inline
-void loadMultiple(const unsigned int Fn,const unsigned int *pMem)
-{
-   FPA11 *fpa11 = GET_FPA11();
-   register unsigned int *p;
-   unsigned long x;
-
-   p = (unsigned int*)&(fpa11->fpreg[Fn]);
-   get_user(x, &pMem[0]);
-   fpa11->fType[Fn] = (x >> 14) & 0x00000003;
-
-   switch (fpa11->fType[Fn])
-   {
-      case typeSingle:
-      case typeDouble:
-      {
-         get_user(p[0], &pMem[2]);  /* Single */
-         get_user(p[1], &pMem[1]);  /* double msw */
-         p[2] = 0;        /* empty */
-      }
-      break;
-
-      case typeExtended:
-      {
-         get_user(p[1], &pMem[2]);
-         get_user(p[2], &pMem[1]);  /* msw */
-         p[0] = (x & 0x80003fff);
-      }
-      break;
-   }
-}
-
-static inline
-void storeSingle(const unsigned int Fn,unsigned int *pMem)
-{
-   FPA11 *fpa11 = GET_FPA11();
-   union
-   {
-     float32 f;
-     unsigned int i[1];
-   } val;
-
-   switch (fpa11->fType[Fn])
-   {
-      case typeDouble:
-         val.f = float64_to_float32(fpa11->fpreg[Fn].fDouble);
-      break;
-
-      case typeExtended:
-         val.f = floatx80_to_float32(fpa11->fpreg[Fn].fExtended);
-      break;
-
-      default: val.f = fpa11->fpreg[Fn].fSingle;
-   }
-
-   put_user(val.i[0], pMem);
-}
-
-static inline
-void storeDouble(const unsigned int Fn,unsigned int *pMem)
-{
-   FPA11 *fpa11 = GET_FPA11();
-   union
-   {
-     float64 f;
-     unsigned int i[2];
-   } val;
-
-   switch (fpa11->fType[Fn])
-   {
-      case typeSingle:
-         val.f = float32_to_float64(fpa11->fpreg[Fn].fSingle);
-      break;
-
-      case typeExtended:
-         val.f = floatx80_to_float64(fpa11->fpreg[Fn].fExtended);
-      break;
-
-      default: val.f = fpa11->fpreg[Fn].fDouble;
-   }
-
-   put_user(val.i[1], &pMem[0]);        /* msw */
-   put_user(val.i[0], &pMem[1]);        /* lsw */
-}
-
-static inline
-void storeExtended(const unsigned int Fn,unsigned int *pMem)
-{
-   FPA11 *fpa11 = GET_FPA11();
-   union
-   {
-     floatx80 f;
-     unsigned int i[3];
-   } val;
-
-   switch (fpa11->fType[Fn])
-   {
-      case typeSingle:
-         val.f = float32_to_floatx80(fpa11->fpreg[Fn].fSingle);
-      break;
-
-      case typeDouble:
-         val.f = float64_to_floatx80(fpa11->fpreg[Fn].fDouble);
-      break;
-
-      default: val.f = fpa11->fpreg[Fn].fExtended;
-   }
-
-   put_user(val.i[0], &pMem[0]); /* sign & exp */
-   put_user(val.i[1], &pMem[2]);
-   put_user(val.i[2], &pMem[1]); /* msw */
-}
-
-static inline
-void storeMultiple(const unsigned int Fn,unsigned int *pMem)
-{
-   FPA11 *fpa11 = GET_FPA11();
-   register unsigned int nType, *p;
-
-   p = (unsigned int*)&(fpa11->fpreg[Fn]);
-   nType = fpa11->fType[Fn];
-
-   switch (nType)
-   {
-      case typeSingle:
-      case typeDouble:
-      {
-         put_user(p[0], &pMem[2]); /* single */
-         put_user(p[1], &pMem[1]); /* double msw */
-         put_user(nType << 14, &pMem[0]);
-      }
-      break;
-
-      case typeExtended:
-      {
-         put_user(p[2], &pMem[1]); /* msw */
-         put_user(p[1], &pMem[2]);
-         put_user((p[0] & 0x80003fff) | (nType << 14), &pMem[0]);
-      }
-      break;
-   }
-}
-
-unsigned int PerformLDF(const unsigned int opcode)
-{
-   unsigned int *pBase, *pAddress, *pFinal, nRc = 1,
-     write_back = WRITE_BACK(opcode);
-
-   //printk("PerformLDF(0x%08x), Fd = 0x%08x\n",opcode,getFd(opcode));
-
-   pBase = (unsigned int*)readRegister(getRn(opcode));
-   if (REG_PC == getRn(opcode))
-   {
-     pBase += 2;
-     write_back = 0;
-   }
-
-   pFinal = pBase;
-   if (BIT_UP_SET(opcode))
-     pFinal += getOffset(opcode);
-   else
-     pFinal -= getOffset(opcode);
-
-   if (PREINDEXED(opcode)) pAddress = pFinal; else pAddress = pBase;
-
-   switch (opcode & MASK_TRANSFER_LENGTH)
-   {
-      case TRANSFER_SINGLE  : loadSingle(getFd(opcode),pAddress);   break;
-      case TRANSFER_DOUBLE  : loadDouble(getFd(opcode),pAddress);   break;
-      case TRANSFER_EXTENDED: loadExtended(getFd(opcode),pAddress); break;
-      default: nRc = 0;
-   }
-
-   if (write_back) writeRegister(getRn(opcode),(unsigned int)pFinal);
-   return nRc;
-}
-
-unsigned int PerformSTF(const unsigned int opcode)
-{
-   unsigned int *pBase, *pAddress, *pFinal, nRc = 1,
-     write_back = WRITE_BACK(opcode);
-
-   //printk("PerformSTF(0x%08x), Fd = 0x%08x\n",opcode,getFd(opcode));
-   SetRoundingMode(ROUND_TO_NEAREST);
-
-   pBase = (unsigned int*)readRegister(getRn(opcode));
-   if (REG_PC == getRn(opcode))
-   {
-     pBase += 2;
-     write_back = 0;
-   }
-
-   pFinal = pBase;
-   if (BIT_UP_SET(opcode))
-     pFinal += getOffset(opcode);
-   else
-     pFinal -= getOffset(opcode);
-
-   if (PREINDEXED(opcode)) pAddress = pFinal; else pAddress = pBase;
-
-   switch (opcode & MASK_TRANSFER_LENGTH)
-   {
-      case TRANSFER_SINGLE  : storeSingle(getFd(opcode),pAddress);   break;
-      case TRANSFER_DOUBLE  : storeDouble(getFd(opcode),pAddress);   break;
-      case TRANSFER_EXTENDED: storeExtended(getFd(opcode),pAddress); break;
-      default: nRc = 0;
-   }
-
-   if (write_back) writeRegister(getRn(opcode),(unsigned int)pFinal);
-   return nRc;
-}
-
-unsigned int PerformLFM(const unsigned int opcode)
-{
-   unsigned int i, Fd, *pBase, *pAddress, *pFinal,
-     write_back = WRITE_BACK(opcode);
-
-   pBase = (unsigned int*)readRegister(getRn(opcode));
-   if (REG_PC == getRn(opcode))
-   {
-     pBase += 2;
-     write_back = 0;
-   }
-
-   pFinal = pBase;
-   if (BIT_UP_SET(opcode))
-     pFinal += getOffset(opcode);
-   else
-     pFinal -= getOffset(opcode);
-
-   if (PREINDEXED(opcode)) pAddress = pFinal; else pAddress = pBase;
-
-   Fd = getFd(opcode);
-   for (i=getRegisterCount(opcode);i>0;i--)
-   {
-     loadMultiple(Fd,pAddress);
-     pAddress += 3; Fd++;
-     if (Fd == 8) Fd = 0;
-   }
-
-   if (write_back) writeRegister(getRn(opcode),(unsigned int)pFinal);
-   return 1;
-}
-
-unsigned int PerformSFM(const unsigned int opcode)
-{
-   unsigned int i, Fd, *pBase, *pAddress, *pFinal,
-     write_back = WRITE_BACK(opcode);
-
-   pBase = (unsigned int*)readRegister(getRn(opcode));
-   if (REG_PC == getRn(opcode))
-   {
-     pBase += 2;
-     write_back = 0;
-   }
-
-   pFinal = pBase;
-   if (BIT_UP_SET(opcode))
-     pFinal += getOffset(opcode);
-   else
-     pFinal -= getOffset(opcode);
-
-   if (PREINDEXED(opcode)) pAddress = pFinal; else pAddress = pBase;
-
-   Fd = getFd(opcode);
-   for (i=getRegisterCount(opcode);i>0;i--)
-   {
-     storeMultiple(Fd,pAddress);
-     pAddress += 3; Fd++;
-     if (Fd == 8) Fd = 0;
-   }
-
-   if (write_back) writeRegister(getRn(opcode),(unsigned int)pFinal);
-   return 1;
-}
-
-#if 1
-unsigned int EmulateCPDT(const unsigned int opcode)
-{
-  unsigned int nRc = 0;
-
-  //printk("EmulateCPDT(0x%08x)\n",opcode);
-
-  if (LDF_OP(opcode))
-  {
-    nRc = PerformLDF(opcode);
-  }
-  else if (LFM_OP(opcode))
-  {
-    nRc = PerformLFM(opcode);
-  }
-  else if (STF_OP(opcode))
-  {
-    nRc = PerformSTF(opcode);
-  }
-  else if (SFM_OP(opcode))
-  {
-    nRc = PerformSFM(opcode);
-  }
-  else
-  {
-    nRc = 0;
-  }
-
-  return nRc;
-}
-#endif
diff --git a/arch/arm26/nwfpe/fpa11_cprt.c b/arch/arm26/nwfpe/fpa11_cprt.c
deleted file mode 100644
index a201076c1f14..000000000000
--- a/arch/arm26/nwfpe/fpa11_cprt.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.COM, 1998,1999
-    (c) Philip Blundell, 1999
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "fpa11.h"
-#include "milieu.h"
-#include "softfloat.h"
-#include "fpopcode.h"
-#include "fpa11.inl"
-#include "fpmodule.h"
-#include "fpmodule.inl"
-
-extern flag floatx80_is_nan(floatx80);
-extern flag float64_is_nan( float64);
-extern flag float32_is_nan( float32);
-
-void SetRoundingMode(const unsigned int opcode);
-
-unsigned int PerformFLT(const unsigned int opcode);
-unsigned int PerformFIX(const unsigned int opcode);
-
-static unsigned int
-PerformComparison(const unsigned int opcode);
-
-unsigned int EmulateCPRT(const unsigned int opcode)
-{
-  unsigned int nRc = 1;
-
-  //printk("EmulateCPRT(0x%08x)\n",opcode);
-
-  if (opcode & 0x800000)
-  {
-     /* This is some variant of a comparison (PerformComparison will
-        sort out which one).  Since most of the other CPRT
-        instructions are oddball cases of some sort or other it makes
-        sense to pull this out into a fast path.  */
-     return PerformComparison(opcode);
-  }
-
-  /* Hint to GCC that we'd like a jump table rather than a load of CMPs */
-  switch ((opcode & 0x700000) >> 20)
-  {
-    case  FLT_CODE >> 20: nRc = PerformFLT(opcode); break;
-    case  FIX_CODE >> 20: nRc = PerformFIX(opcode); break;
-    
-    case  WFS_CODE >> 20: writeFPSR(readRegister(getRd(opcode))); break;
-    case  RFS_CODE >> 20: writeRegister(getRd(opcode),readFPSR()); break;
-
-#if 0    /* We currently have no use for the FPCR, so there's no point
-            in emulating it. */
-    case  WFC_CODE >> 20: writeFPCR(readRegister(getRd(opcode)));
-    case  RFC_CODE >> 20: writeRegister(getRd(opcode),readFPCR()); break;
-#endif
-
-    default: nRc = 0;
-  }
-  
-  return nRc;
-}
-
-unsigned int PerformFLT(const unsigned int opcode)
-{
-   FPA11 *fpa11 = GET_FPA11();
-   
-   unsigned int nRc = 1;
-   SetRoundingMode(opcode);
-
-   switch (opcode & MASK_ROUNDING_PRECISION)
-   {
-      case ROUND_SINGLE:
-      {
-        fpa11->fType[getFn(opcode)] = typeSingle;
-        fpa11->fpreg[getFn(opcode)].fSingle =
-           int32_to_float32(readRegister(getRd(opcode)));
-      }
-      break;
-
-      case ROUND_DOUBLE:
-      {
-        fpa11->fType[getFn(opcode)] = typeDouble;
-        fpa11->fpreg[getFn(opcode)].fDouble =
-            int32_to_float64(readRegister(getRd(opcode)));
-      }
-      break;
-        
-      case ROUND_EXTENDED:
-      {
-        fpa11->fType[getFn(opcode)] = typeExtended;
-        fpa11->fpreg[getFn(opcode)].fExtended =
-           int32_to_floatx80(readRegister(getRd(opcode)));
-      }
-      break;
-      
-      default: nRc = 0;
-  }
-  
-  return nRc;
-}
-
-unsigned int PerformFIX(const unsigned int opcode)
-{
-   FPA11 *fpa11 = GET_FPA11();
-   unsigned int nRc = 1;
-   unsigned int Fn = getFm(opcode);
-   
-   SetRoundingMode(opcode);
-
-   switch (fpa11->fType[Fn])
-   {
-      case typeSingle:
-      {
-         writeRegister(getRd(opcode),
-                       float32_to_int32(fpa11->fpreg[Fn].fSingle));
-      }
-      break;
-
-      case typeDouble:
-      {
-         writeRegister(getRd(opcode),
-                       float64_to_int32(fpa11->fpreg[Fn].fDouble));
-      }
-      break;
-                       
-      case typeExtended:
-      {
-         writeRegister(getRd(opcode),
-                       floatx80_to_int32(fpa11->fpreg[Fn].fExtended));
-      }
-      break;
-      
-      default: nRc = 0;
-  }
-  
-  return nRc;
-}
-
-   
-static unsigned int __inline__
-PerformComparisonOperation(floatx80 Fn, floatx80 Fm)
-{
-   unsigned int flags = 0;
-
-   /* test for less than condition */
-   if (floatx80_lt(Fn,Fm))
-   {
-      flags |= CC_NEGATIVE;
-   }
-  
-   /* test for equal condition */
-   if (floatx80_eq(Fn,Fm))
-   {
-      flags |= CC_ZERO;
-   }
-
-   /* test for greater than or equal condition */
-   if (floatx80_lt(Fm,Fn))
-   {
-      flags |= CC_CARRY;
-   }
-   
-   writeConditionCodes(flags);
-   return 1;
-}
-
-/* This instruction sets the flags N, Z, C, V in the FPSR. */
-   
-static unsigned int PerformComparison(const unsigned int opcode)
-{
-   FPA11 *fpa11 = GET_FPA11();
-   unsigned int Fn, Fm;
-   floatx80 rFn, rFm;
-   int e_flag = opcode & 0x400000;      /* 1 if CxFE */
-   int n_flag = opcode & 0x200000;      /* 1 if CNxx */
-   unsigned int flags = 0;
-
-   //printk("PerformComparison(0x%08x)\n",opcode);
-
-   Fn = getFn(opcode);
-   Fm = getFm(opcode);
-
-   /* Check for unordered condition and convert all operands to 80-bit
-      format.
-      ?? Might be some mileage in avoiding this conversion if possible.
-      Eg, if both operands are 32-bit, detect this and do a 32-bit
-      comparison (cheaper than an 80-bit one).  */
-   switch (fpa11->fType[Fn])
-   {
-      case typeSingle: 
-        //printk("single.\n");
-        if (float32_is_nan(fpa11->fpreg[Fn].fSingle))
-           goto unordered;
-        rFn = float32_to_floatx80(fpa11->fpreg[Fn].fSingle);
-      break;
-
-      case typeDouble: 
-        //printk("double.\n");
-        if (float64_is_nan(fpa11->fpreg[Fn].fDouble))
-           goto unordered;
-        rFn = float64_to_floatx80(fpa11->fpreg[Fn].fDouble);
-      break;
-      
-      case typeExtended: 
-        //printk("extended.\n");
-        if (floatx80_is_nan(fpa11->fpreg[Fn].fExtended))
-           goto unordered;
-        rFn = fpa11->fpreg[Fn].fExtended;
-      break;
-      
-      default: return 0;
-   }
-
-   if (CONSTANT_FM(opcode))
-   {
-     //printk("Fm is a constant: #%d.\n",Fm);
-     rFm = getExtendedConstant(Fm);
-     if (floatx80_is_nan(rFm))
-        goto unordered;
-   }
-   else
-   {
-     //printk("Fm = r%d which contains a ",Fm);
-      switch (fpa11->fType[Fm])
-      {
-         case typeSingle: 
-           //printk("single.\n");
-           if (float32_is_nan(fpa11->fpreg[Fm].fSingle))
-              goto unordered;
-           rFm = float32_to_floatx80(fpa11->fpreg[Fm].fSingle);
-         break;
-
-         case typeDouble: 
-           //printk("double.\n");
-           if (float64_is_nan(fpa11->fpreg[Fm].fDouble))
-              goto unordered;
-           rFm = float64_to_floatx80(fpa11->fpreg[Fm].fDouble);
-         break;
-      
-         case typeExtended: 
-           //printk("extended.\n");
-           if (floatx80_is_nan(fpa11->fpreg[Fm].fExtended))
-              goto unordered;
-           rFm = fpa11->fpreg[Fm].fExtended;
-         break;
-      
-         default: return 0;
-      }
-   }
-
-   if (n_flag)
-   {
-      rFm.high ^= 0x8000;
-   }
-
-   return PerformComparisonOperation(rFn,rFm);
-
- unordered:
-   /* ?? The FPA data sheet is pretty vague about this, in particular
-      about whether the non-E comparisons can ever raise exceptions.
-      This implementation is based on a combination of what it says in
-      the data sheet, observation of how the Acorn emulator actually
-      behaves (and how programs expect it to) and guesswork.  */
-   flags |= CC_OVERFLOW;
-   flags &= ~(CC_ZERO | CC_NEGATIVE);
-
-   if (BIT_AC & readFPSR()) flags |= CC_CARRY;
-
-   if (e_flag) float_raise(float_flag_invalid);
-
-   writeConditionCodes(flags);
-   return 1;
-}
diff --git a/arch/arm26/nwfpe/fpmodule.c b/arch/arm26/nwfpe/fpmodule.c
deleted file mode 100644
index a8fad92eb44f..000000000000
--- a/arch/arm26/nwfpe/fpmodule.c
+++ /dev/null
@@ -1,180 +0,0 @@
-
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.com, 1998-1999
-    (c) Philip Blundell, 1998-1999
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "fpa11.h"
-
-#include <linux/module.h>
-#include <linux/version.h>
-
-/* XXX */
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/init.h>
-/* XXX */
-
-#include "softfloat.h"
-#include "fpopcode.h"
-#include "fpmodule.h"
-#include "fpa11.inl"
-
-/* kernel symbols required for signal handling */
-typedef struct task_struct*     PTASK;
-
-#ifdef MODULE
-void fp_send_sig(unsigned long sig, PTASK p, int priv);
-
-MODULE_AUTHOR("Scott Bambrough <scottb@rebel.com>");
-MODULE_DESCRIPTION("NWFPE floating point emulator");
-
-#else
-#define fp_send_sig     send_sig
-#define kern_fp_enter   fp_enter
-
-extern char fpe_type[];
-#endif
-
-/* kernel function prototypes required */
-void fp_setup(void);
-
-/* external declarations for saved kernel symbols */
-extern void (*kern_fp_enter)(void);
-
-/* Original value of fp_enter from kernel before patched by fpe_init. */ 
-static void (*orig_fp_enter)(void);
-
-/* forward declarations */
-extern void nwfpe_enter(void);
-
-#ifdef MODULE
-/*
- * Return 0 if we can be unloaded.  This can only happen if
- * kern_fp_enter is still pointing at nwfpe_enter
- */
-static int fpe_unload(void)
-{
-  return (kern_fp_enter == nwfpe_enter) ? 0 : 1;
-}
-#endif
-
-static int __init fpe_init(void)
-{
-  if (sizeof(FPA11) > sizeof(union fp_state)) {
-    printk(KERN_ERR "nwfpe: bad structure size\n");
-    return -EINVAL;
-  }
-
-  if (sizeof(FPREG) != 12) {
-    printk(KERN_ERR "nwfpe: bad register size\n");
-    return -EINVAL;
-  }
-
-#ifdef MODULE
-  if (!mod_member_present(&__this_module, can_unload))
-    return -EINVAL;
-  __this_module.can_unload = fpe_unload;
-#else
-  if (fpe_type[0] && strcmp(fpe_type, "nwfpe"))
-    return 0;
-#endif
-
-  /* Display title, version and copyright information. */
-  printk(KERN_WARNING "NetWinder Floating Point Emulator V0.95 "
-         "(c) 1998-1999 Rebel.com\n");
-
-  /* Save pointer to the old FP handler and then patch ourselves in */
-  orig_fp_enter = kern_fp_enter;
-  kern_fp_enter = nwfpe_enter;
-
-  return 0;
-}
-
-static void __exit fpe_exit(void)
-{
-  /* Restore the values we saved earlier. */
-  kern_fp_enter = orig_fp_enter;
-}
-
-/*
-ScottB:  November 4, 1998
-
-Moved this function out of softfloat-specialize into fpmodule.c.
-This effectively isolates all the changes required for integrating with the
-Linux kernel into fpmodule.c.  Porting to NetBSD should only require modifying
-fpmodule.c to integrate with the NetBSD kernel (I hope!).
-
-[1/1/99: Not quite true any more unfortunately.  There is Linux-specific
-code to access data in user space in some other source files at the 
-moment (grep for get_user / put_user calls).  --philb]
-
-float_exception_flags is a global variable in SoftFloat.
-
-This function is called by the SoftFloat routines to raise a floating
-point exception.  We check the trap enable byte in the FPSR, and raise
-a SIGFPE exception if necessary.  If not the relevant bits in the 
-cumulative exceptions flag byte are set and we return.
-*/
-
-void float_raise(signed char flags)
-{
-  register unsigned int fpsr, cumulativeTraps;
-  
-#ifdef CONFIG_DEBUG_USER
-  printk(KERN_DEBUG "NWFPE: %s[%d] takes exception %08x at %p from %08x\n",
-         current->comm, current->pid, flags,
-         __builtin_return_address(0), GET_USERREG()[15]);
-#endif
-
-  /* Keep SoftFloat exception flags up to date.  */
-  float_exception_flags |= flags;
-
-  /* Read fpsr and initialize the cumulativeTraps.  */
-  fpsr = readFPSR();
-  cumulativeTraps = 0;
-  
-  /* For each type of exception, the cumulative trap exception bit is only
-     set if the corresponding trap enable bit is not set.  */
-  if ((!(fpsr & BIT_IXE)) && (flags & BIT_IXC))
-     cumulativeTraps |= BIT_IXC;  
-  if ((!(fpsr & BIT_UFE)) && (flags & BIT_UFC))
-     cumulativeTraps |= BIT_UFC;  
-  if ((!(fpsr & BIT_OFE)) && (flags & BIT_OFC))
-     cumulativeTraps |= BIT_OFC;  
-  if ((!(fpsr & BIT_DZE)) && (flags & BIT_DZC))
-     cumulativeTraps |= BIT_DZC;  
-  if ((!(fpsr & BIT_IOE)) && (flags & BIT_IOC))
-     cumulativeTraps |= BIT_IOC;  
-
-  /* Set the cumulative exceptions flags.  */
-  if (cumulativeTraps)
-    writeFPSR(fpsr | cumulativeTraps);
-
-  /* Raise an exception if necessary.  */
-  if (fpsr & (flags << 16))
-    fp_send_sig(SIGFPE, current, 1);
-}
-
-module_init(fpe_init);
-module_exit(fpe_exit);
diff --git a/arch/arm26/nwfpe/fpmodule.h b/arch/arm26/nwfpe/fpmodule.h
deleted file mode 100644
index f971ddd60cc1..000000000000
--- a/arch/arm26/nwfpe/fpmodule.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.com, 1998-1999
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef __FPMODULE_H__
-#define __FPMODULE_H__
-
-
-#define REG_ORIG_R0     16
-#define REG_CPSR        15
-#define REG_PC          15
-#define REG_LR          14
-#define REG_SP          13
-#define REG_IP          12
-#define REG_FP          11
-#define REG_R10         10
-#define REG_R9          9
-#define REG_R9          9
-#define REG_R8          8
-#define REG_R7          7
-#define REG_R6          6
-#define REG_R5          5
-#define REG_R4          4
-#define REG_R3          3
-#define REG_R2          2
-#define REG_R1          1
-#define REG_R0          0
-
-#endif
diff --git a/arch/arm26/nwfpe/fpmodule.inl b/arch/arm26/nwfpe/fpmodule.inl
deleted file mode 100644
index ef228378ffaf..000000000000
--- a/arch/arm26/nwfpe/fpmodule.inl
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.COM, 1998,1999
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-extern __inline__
-unsigned int readRegister(const unsigned int nReg)
-{
-  /* Note: The CPU thinks it has dealt with the current instruction.  As
-           a result the program counter has been advanced to the next
-           instruction, and points 4 bytes beyond the actual instruction
-           that caused the invalid instruction trap to occur.  We adjust
-           for this in this routine.  LDF/STF instructions with Rn = PC
-           depend on the PC being correct, as they use PC+8 in their 
-           address calculations. */
-  unsigned int *userRegisters = GET_USERREG();
-  unsigned int val = userRegisters[nReg];
-  if (REG_PC == nReg) val -= 4;
-  return val;
-}
-
-extern __inline__
-void writeRegister(const unsigned int nReg, const unsigned int val)
-{
-  unsigned int *userRegisters = GET_USERREG();
-  userRegisters[nReg] = val;
-}
-
-extern __inline__
-unsigned int readCPSR(void)
-{
-  return(readRegister(REG_CPSR));
-}
-
-extern __inline__
-void writeCPSR(const unsigned int val)
-{
-  writeRegister(REG_CPSR,val);
-}
-
-extern __inline__
-unsigned int readConditionCodes(void)
-{
-#ifdef __FPEM_TEST__
-   return(0);
-#else
-   return(readCPSR() & CC_MASK);
-#endif
-}
-
-extern __inline__
-void writeConditionCodes(const unsigned int val)
-{
-  unsigned int *userRegisters = GET_USERREG();
-  unsigned int rval;
-  /*
-   * Operate directly on userRegisters since
-   * the CPSR may be the PC register itself.
-   */
-  rval = userRegisters[REG_CPSR] & ~CC_MASK;
-  userRegisters[REG_CPSR] = rval | (val & CC_MASK);
-}
-
-extern __inline__
-unsigned int readMemoryInt(unsigned int *pMem)
-{
-  return *pMem;
-}
diff --git a/arch/arm26/nwfpe/fpopcode.c b/arch/arm26/nwfpe/fpopcode.c
deleted file mode 100644
index d81ddd188322..000000000000
--- a/arch/arm26/nwfpe/fpopcode.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.COM, 1998,1999
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "fpa11.h"
-#include "softfloat.h"
-#include "fpopcode.h"
-#include "fpsr.h"
-#include "fpmodule.h"
-#include "fpmodule.inl"
-
-const floatx80 floatx80Constant[] = {
-  { 0x0000, 0x0000000000000000ULL},     /* extended 0.0 */
-  { 0x3fff, 0x8000000000000000ULL},     /* extended 1.0 */
-  { 0x4000, 0x8000000000000000ULL},     /* extended 2.0 */
-  { 0x4000, 0xc000000000000000ULL},     /* extended 3.0 */
-  { 0x4001, 0x8000000000000000ULL},     /* extended 4.0 */
-  { 0x4001, 0xa000000000000000ULL},     /* extended 5.0 */
-  { 0x3ffe, 0x8000000000000000ULL},     /* extended 0.5 */
-  { 0x4002, 0xa000000000000000ULL}      /* extended 10.0 */
-};  
-
-const float64 float64Constant[] = {
-  0x0000000000000000ULL,                /* double 0.0 */
-  0x3ff0000000000000ULL,                /* double 1.0 */
-  0x4000000000000000ULL,                /* double 2.0 */
-  0x4008000000000000ULL,                /* double 3.0 */
-  0x4010000000000000ULL,                /* double 4.0 */
-  0x4014000000000000ULL,                /* double 5.0 */
-  0x3fe0000000000000ULL,                /* double 0.5 */
-  0x4024000000000000ULL                 /* double 10.0 */
-};  
-
-const float32 float32Constant[] = {
-  0x00000000,                           /* single 0.0 */
-  0x3f800000,                           /* single 1.0 */
-  0x40000000,                           /* single 2.0 */
-  0x40400000,                           /* single 3.0 */
-  0x40800000,                           /* single 4.0 */
-  0x40a00000,                           /* single 5.0 */
-  0x3f000000,                           /* single 0.5 */
-  0x41200000                            /* single 10.0 */
-};  
-
-unsigned int getTransferLength(const unsigned int opcode)
-{
-  unsigned int nRc;
-  
-  switch (opcode & MASK_TRANSFER_LENGTH)
-  {
-    case 0x00000000: nRc = 1; break; /* single precision */
-    case 0x00008000: nRc = 2; break; /* double precision */
-    case 0x00400000: nRc = 3; break; /* extended precision */
-    default: nRc = 0;
-  }
-  
-  return(nRc);
-}
-
-unsigned int getRegisterCount(const unsigned int opcode)
-{
-  unsigned int nRc;
-  
-  switch (opcode & MASK_REGISTER_COUNT)
-  {
-    case 0x00000000: nRc = 4; break;
-    case 0x00008000: nRc = 1; break;
-    case 0x00400000: nRc = 2; break;
-    case 0x00408000: nRc = 3; break;
-    default: nRc = 0;
-  }
-  
-  return(nRc);
-}
-
-unsigned int getRoundingPrecision(const unsigned int opcode)
-{
-  unsigned int nRc;
-  
-  switch (opcode & MASK_ROUNDING_PRECISION)
-  {
-    case 0x00000000: nRc = 1; break;
-    case 0x00000080: nRc = 2; break;
-    case 0x00080000: nRc = 3; break;
-    default: nRc = 0;
-  }
-  
-  return(nRc);
-}
-
-unsigned int getDestinationSize(const unsigned int opcode)
-{
-  unsigned int nRc;
-  
-  switch (opcode & MASK_DESTINATION_SIZE)
-  {
-    case 0x00000000: nRc = typeSingle; break;
-    case 0x00000080: nRc = typeDouble; break;
-    case 0x00080000: nRc = typeExtended; break;
-    default: nRc = typeNone;
-  }
-  
-  return(nRc);
-}
-
-/* condition code lookup table
- index into the table is test code: EQ, NE, ... LT, GT, AL, NV
- bit position in short is condition code: NZCV */
-static const unsigned short aCC[16] = {
-    0xF0F0, // EQ == Z set
-    0x0F0F, // NE
-    0xCCCC, // CS == C set
-    0x3333, // CC
-    0xFF00, // MI == N set
-    0x00FF, // PL
-    0xAAAA, // VS == V set
-    0x5555, // VC
-    0x0C0C, // HI == C set && Z clear
-    0xF3F3, // LS == C clear || Z set
-    0xAA55, // GE == (N==V)
-    0x55AA, // LT == (N!=V)
-    0x0A05, // GT == (!Z && (N==V))
-    0xF5FA, // LE == (Z || (N!=V))
-    0xFFFF, // AL always
-    0 // NV
-};
-
-unsigned int checkCondition(const unsigned int opcode, const unsigned int ccodes)
-{
-  return (aCC[opcode>>28] >> (ccodes>>28)) & 1;
-}
diff --git a/arch/arm26/nwfpe/fpopcode.h b/arch/arm26/nwfpe/fpopcode.h
deleted file mode 100644
index 13c7419262ab..000000000000
--- a/arch/arm26/nwfpe/fpopcode.h
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.COM, 1998,1999
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef __FPOPCODE_H__
-#define __FPOPCODE_H__
-
-/*
-ARM Floating Point Instruction Classes
-| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 
-|c o n d|1 1 0 P|U|u|W|L|   Rn  |v|  Fd |0|0|0|1|  o f f s e t  | CPDT
-|c o n d|1 1 0 P|U|w|W|L|   Rn  |x|  Fd |0|0|0|1|  o f f s e t  | CPDT
-| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 
-|c o n d|1 1 1 0|a|b|c|d|e|  Fn |j|  Fd |0|0|0|1|f|g|h|0|i|  Fm | CPDO
-|c o n d|1 1 1 0|a|b|c|L|e|  Fn |   Rd  |0|0|0|1|f|g|h|1|i|  Fm | CPRT
-|c o n d|1 1 1 0|a|b|c|1|e|  Fn |1|1|1|1|0|0|0|1|f|g|h|1|i|  Fm | comparisons
-| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 
-
-CPDT            data transfer instructions
-                LDF, STF, LFM, SFM
-                
-CPDO            dyadic arithmetic instructions
-                ADF, MUF, SUF, RSF, DVF, RDF,
-                POW, RPW, RMF, FML, FDV, FRD, POL
-
-CPDO            monadic arithmetic instructions
-                MVF, MNF, ABS, RND, SQT, LOG, LGN, EXP,
-                SIN, COS, TAN, ASN, ACS, ATN, URD, NRM
-                
-CPRT            joint arithmetic/data transfer instructions
-                FIX (arithmetic followed by load/store)
-                FLT (load/store followed by arithmetic)
-                CMF, CNF CMFE, CNFE (comparisons)
-                WFS, RFS (write/read floating point status register)
-                WFC, RFC (write/read floating point control register)
-
-cond            condition codes
-P               pre/post index bit: 0 = postindex, 1 = preindex
-U               up/down bit: 0 = stack grows down, 1 = stack grows up
-W               write back bit: 1 = update base register (Rn)
-L               load/store bit: 0 = store, 1 = load
-Rn              base register
-Rd              destination/source register             
-Fd              floating point destination register
-Fn              floating point source register
-Fm              floating point source register or floating point constant
-
-uv              transfer length (TABLE 1)
-wx              register count (TABLE 2)
-abcd            arithmetic opcode (TABLES 3 & 4)
-ef              destination size (rounding precision) (TABLE 5)
-gh              rounding mode (TABLE 6)
-j               dyadic/monadic bit: 0 = dyadic, 1 = monadic
-i               constant bit: 1 = constant (TABLE 6)
-*/
-
-/*
-TABLE 1
-+-------------------------+---+---+---------+---------+
-|  Precision              | u | v | FPSR.EP | length  |
-+-------------------------+---+---+---------+---------+
-| Single                  | 0 ü 0 |    x    | 1 words |
-| Double                  | 1 ü 1 |    x    | 2 words |
-| Extended                | 1 ü 1 |    x    | 3 words |
-| Packed decimal          | 1 ü 1 |    0    | 3 words |
-| Expanded packed decimal | 1 ü 1 |    1    | 4 words |
-+-------------------------+---+---+---------+---------+
-Note: x = don't care
-*/
-
-/*
-TABLE 2
-+---+---+---------------------------------+
-| w | x | Number of registers to transfer |
-+---+---+---------------------------------+
-| 0 ü 1 |  1                              |
-| 1 ü 0 |  2                              |
-| 1 ü 1 |  3                              |
-| 0 ü 0 |  4                              |
-+---+---+---------------------------------+
-*/
-
-/*
-TABLE 3: Dyadic Floating Point Opcodes
-+---+---+---+---+----------+-----------------------+-----------------------+
-| a | b | c | d | Mnemonic | Description           | Operation             |
-+---+---+---+---+----------+-----------------------+-----------------------+
-| 0 | 0 | 0 | 0 | ADF      | Add                   | Fd := Fn + Fm         |
-| 0 | 0 | 0 | 1 | MUF      | Multiply              | Fd := Fn * Fm         |
-| 0 | 0 | 1 | 0 | SUF      | Subtract              | Fd := Fn - Fm         |
-| 0 | 0 | 1 | 1 | RSF      | Reverse subtract      | Fd := Fm - Fn         |
-| 0 | 1 | 0 | 0 | DVF      | Divide                | Fd := Fn / Fm         |
-| 0 | 1 | 0 | 1 | RDF      | Reverse divide        | Fd := Fm / Fn         |
-| 0 | 1 | 1 | 0 | POW      | Power                 | Fd := Fn ^ Fm         |
-| 0 | 1 | 1 | 1 | RPW      | Reverse power         | Fd := Fm ^ Fn         |
-| 1 | 0 | 0 | 0 | RMF      | Remainder             | Fd := IEEE rem(Fn/Fm) |
-| 1 | 0 | 0 | 1 | FML      | Fast Multiply         | Fd := Fn * Fm         |
-| 1 | 0 | 1 | 0 | FDV      | Fast Divide           | Fd := Fn / Fm         |
-| 1 | 0 | 1 | 1 | FRD      | Fast reverse divide   | Fd := Fm / Fn         |
-| 1 | 1 | 0 | 0 | POL      | Polar angle (ArcTan2) | Fd := arctan2(Fn,Fm)  |
-| 1 | 1 | 0 | 1 |          | undefined instruction | trap                  |
-| 1 | 1 | 1 | 0 |          | undefined instruction | trap                  |
-| 1 | 1 | 1 | 1 |          | undefined instruction | trap                  |
-+---+---+---+---+----------+-----------------------+-----------------------+
-Note: POW, RPW, POL are deprecated, and are available for backwards
-      compatibility only.
-*/
-
-/*
-TABLE 4: Monadic Floating Point Opcodes
-+---+---+---+---+----------+-----------------------+-----------------------+
-| a | b | c | d | Mnemonic | Description           | Operation             |
-+---+---+---+---+----------+-----------------------+-----------------------+
-| 0 | 0 | 0 | 0 | MVF      | Move                  | Fd := Fm              |
-| 0 | 0 | 0 | 1 | MNF      | Move negated          | Fd := - Fm            |
-| 0 | 0 | 1 | 0 | ABS      | Absolute value        | Fd := abs(Fm)         |
-| 0 | 0 | 1 | 1 | RND      | Round to integer      | Fd := int(Fm)         |
-| 0 | 1 | 0 | 0 | SQT      | Square root           | Fd := sqrt(Fm)        |
-| 0 | 1 | 0 | 1 | LOG      | Log base 10           | Fd := log10(Fm)       |
-| 0 | 1 | 1 | 0 | LGN      | Log base e            | Fd := ln(Fm)          |
-| 0 | 1 | 1 | 1 | EXP      | Exponent              | Fd := e ^ Fm          |
-| 1 | 0 | 0 | 0 | SIN      | Sine                  | Fd := sin(Fm)         |
-| 1 | 0 | 0 | 1 | COS      | Cosine                | Fd := cos(Fm)         |
-| 1 | 0 | 1 | 0 | TAN      | Tangent               | Fd := tan(Fm)         |
-| 1 | 0 | 1 | 1 | ASN      | Arc Sine              | Fd := arcsin(Fm)      |
-| 1 | 1 | 0 | 0 | ACS      | Arc Cosine            | Fd := arccos(Fm)      |
-| 1 | 1 | 0 | 1 | ATN      | Arc Tangent           | Fd := arctan(Fm)      |
-| 1 | 1 | 1 | 0 | URD      | Unnormalized round    | Fd := int(Fm)         |
-| 1 | 1 | 1 | 1 | NRM      | Normalize             | Fd := norm(Fm)        |
-+---+---+---+---+----------+-----------------------+-----------------------+
-Note: LOG, LGN, EXP, SIN, COS, TAN, ASN, ACS, ATN are deprecated, and are
-      available for backwards compatibility only.
-*/
-
-/*
-TABLE 5
-+-------------------------+---+---+
-|  Rounding Precision     | e | f |
-+-------------------------+---+---+
-| IEEE Single precision   | 0 ü 0 |
-| IEEE Double precision   | 0 ü 1 |
-| IEEE Extended precision | 1 ü 0 |
-| undefined (trap)        | 1 ü 1 |
-+-------------------------+---+---+
-*/
-
-/*
-TABLE 5
-+---------------------------------+---+---+
-|  Rounding Mode                  | g | h |
-+---------------------------------+---+---+
-| Round to nearest (default)      | 0 ü 0 |
-| Round toward plus infinity      | 0 ü 1 |
-| Round toward negative infinity  | 1 ü 0 |
-| Round toward zero               | 1 ü 1 |
-+---------------------------------+---+---+
-*/
-
-/*
-===
-=== Definitions for load and store instructions
-===
-*/
-
-/* bit masks */
-#define BIT_PREINDEX    0x01000000
-#define BIT_UP          0x00800000
-#define BIT_WRITE_BACK  0x00200000
-#define BIT_LOAD        0x00100000
-
-/* masks for load/store */
-#define MASK_CPDT               0x0c000000  /* data processing opcode */
-#define MASK_OFFSET             0x000000ff
-#define MASK_TRANSFER_LENGTH    0x00408000
-#define MASK_REGISTER_COUNT     MASK_TRANSFER_LENGTH
-#define MASK_COPROCESSOR        0x00000f00
-
-/* Tests for transfer length */
-#define TRANSFER_SINGLE         0x00000000
-#define TRANSFER_DOUBLE         0x00008000
-#define TRANSFER_EXTENDED       0x00400000
-#define TRANSFER_PACKED         MASK_TRANSFER_LENGTH
-
-/* Get the coprocessor number from the opcode. */
-#define getCoprocessorNumber(opcode)    ((opcode & MASK_COPROCESSOR) >> 8)
-
-/* Get the offset from the opcode. */
-#define getOffset(opcode)               (opcode & MASK_OFFSET)
-
-/* Tests for specific data transfer load/store opcodes. */
-#define TEST_OPCODE(opcode,mask)        (((opcode) & (mask)) == (mask))
-
-#define LOAD_OP(opcode)   TEST_OPCODE((opcode),MASK_CPDT | BIT_LOAD)
-#define STORE_OP(opcode)  ((opcode & (MASK_CPDT | BIT_LOAD)) == MASK_CPDT)
-
-#define LDF_OP(opcode)  (LOAD_OP(opcode) && (getCoprocessorNumber(opcode) == 1))
-#define LFM_OP(opcode)  (LOAD_OP(opcode) && (getCoprocessorNumber(opcode) == 2))
-#define STF_OP(opcode)  (STORE_OP(opcode) && (getCoprocessorNumber(opcode) == 1))
-#define SFM_OP(opcode)  (STORE_OP(opcode) && (getCoprocessorNumber(opcode) == 2))
-
-#define PREINDEXED(opcode)              ((opcode & BIT_PREINDEX) != 0)
-#define POSTINDEXED(opcode)             ((opcode & BIT_PREINDEX) == 0)
-#define BIT_UP_SET(opcode)              ((opcode & BIT_UP) != 0)
-#define BIT_UP_CLEAR(opcode)            ((opcode & BIT_DOWN) == 0)
-#define WRITE_BACK(opcode)              ((opcode & BIT_WRITE_BACK) != 0)
-#define LOAD(opcode)                    ((opcode & BIT_LOAD) != 0)
-#define STORE(opcode)                   ((opcode & BIT_LOAD) == 0)
-
-/*
-===
-=== Definitions for arithmetic instructions
-===
-*/
-/* bit masks */
-#define BIT_MONADIC     0x00008000
-#define BIT_CONSTANT    0x00000008
-
-#define CONSTANT_FM(opcode)             ((opcode & BIT_CONSTANT) != 0)
-#define MONADIC_INSTRUCTION(opcode)     ((opcode & BIT_MONADIC) != 0)
-
-/* instruction identification masks */
-#define MASK_CPDO               0x0e000000  /* arithmetic opcode */
-#define MASK_ARITHMETIC_OPCODE  0x00f08000
-#define MASK_DESTINATION_SIZE   0x00080080
-
-/* dyadic arithmetic opcodes. */
-#define ADF_CODE        0x00000000
-#define MUF_CODE        0x00100000
-#define SUF_CODE        0x00200000
-#define RSF_CODE        0x00300000
-#define DVF_CODE        0x00400000
-#define RDF_CODE        0x00500000
-#define POW_CODE        0x00600000
-#define RPW_CODE        0x00700000
-#define RMF_CODE        0x00800000
-#define FML_CODE        0x00900000
-#define FDV_CODE        0x00a00000
-#define FRD_CODE        0x00b00000
-#define POL_CODE        0x00c00000
-/* 0x00d00000 is an invalid dyadic arithmetic opcode */
-/* 0x00e00000 is an invalid dyadic arithmetic opcode */
-/* 0x00f00000 is an invalid dyadic arithmetic opcode */
-
-/* monadic arithmetic opcodes. */
-#define MVF_CODE        0x00008000
-#define MNF_CODE        0x00108000
-#define ABS_CODE        0x00208000
-#define RND_CODE        0x00308000
-#define SQT_CODE        0x00408000
-#define LOG_CODE        0x00508000
-#define LGN_CODE        0x00608000
-#define EXP_CODE        0x00708000
-#define SIN_CODE        0x00808000
-#define COS_CODE        0x00908000
-#define TAN_CODE        0x00a08000
-#define ASN_CODE        0x00b08000
-#define ACS_CODE        0x00c08000
-#define ATN_CODE        0x00d08000
-#define URD_CODE        0x00e08000
-#define NRM_CODE        0x00f08000
-
-/*
-===
-=== Definitions for register transfer and comparison instructions
-===
-*/
-
-#define MASK_CPRT               0x0e000010  /* register transfer opcode */
-#define MASK_CPRT_CODE          0x00f00000
-#define FLT_CODE                0x00000000
-#define FIX_CODE                0x00100000
-#define WFS_CODE                0x00200000
-#define RFS_CODE                0x00300000
-#define WFC_CODE                0x00400000
-#define RFC_CODE                0x00500000
-#define CMF_CODE                0x00900000
-#define CNF_CODE                0x00b00000
-#define CMFE_CODE               0x00d00000
-#define CNFE_CODE               0x00f00000
-
-/*
-===
-=== Common definitions
-===
-*/
-
-/* register masks */
-#define MASK_Rd         0x0000f000
-#define MASK_Rn         0x000f0000
-#define MASK_Fd         0x00007000
-#define MASK_Fm         0x00000007
-#define MASK_Fn         0x00070000
-
-/* condition code masks */
-#define CC_MASK         0xf0000000
-#define CC_NEGATIVE     0x80000000
-#define CC_ZERO         0x40000000
-#define CC_CARRY        0x20000000
-#define CC_OVERFLOW     0x10000000
-#define CC_EQ           0x00000000
-#define CC_NE           0x10000000
-#define CC_CS           0x20000000
-#define CC_HS           CC_CS
-#define CC_CC           0x30000000
-#define CC_LO           CC_CC
-#define CC_MI           0x40000000
-#define CC_PL           0x50000000
-#define CC_VS           0x60000000
-#define CC_VC           0x70000000
-#define CC_HI           0x80000000
-#define CC_LS           0x90000000
-#define CC_GE           0xa0000000
-#define CC_LT           0xb0000000
-#define CC_GT           0xc0000000
-#define CC_LE           0xd0000000
-#define CC_AL           0xe0000000
-#define CC_NV           0xf0000000
-
-/* rounding masks/values */
-#define MASK_ROUNDING_MODE      0x00000060
-#define ROUND_TO_NEAREST        0x00000000
-#define ROUND_TO_PLUS_INFINITY  0x00000020
-#define ROUND_TO_MINUS_INFINITY 0x00000040
-#define ROUND_TO_ZERO           0x00000060
-
-#define MASK_ROUNDING_PRECISION 0x00080080
-#define ROUND_SINGLE            0x00000000
-#define ROUND_DOUBLE            0x00000080
-#define ROUND_EXTENDED          0x00080000
-
-/* Get the condition code from the opcode. */
-#define getCondition(opcode)            (opcode >> 28)
-
-/* Get the source register from the opcode. */
-#define getRn(opcode)                   ((opcode & MASK_Rn) >> 16)
-
-/* Get the destination floating point register from the opcode. */
-#define getFd(opcode)                   ((opcode & MASK_Fd) >> 12)
-
-/* Get the first source floating point register from the opcode. */
-#define getFn(opcode)           ((opcode & MASK_Fn) >> 16)
-
-/* Get the second source floating point register from the opcode. */
-#define getFm(opcode)           (opcode & MASK_Fm)
-
-/* Get the destination register from the opcode. */
-#define getRd(opcode)           ((opcode & MASK_Rd) >> 12)
-
-/* Get the rounding mode from the opcode. */
-#define getRoundingMode(opcode)         ((opcode & MASK_ROUNDING_MODE) >> 5)
-
-static inline const floatx80 getExtendedConstant(const unsigned int nIndex)
-{
-   extern const floatx80 floatx80Constant[];
-   return floatx80Constant[nIndex];
-} 
-
-static inline const float64 getDoubleConstant(const unsigned int nIndex)
-{
-   extern const float64 float64Constant[];
-   return float64Constant[nIndex];
-} 
-
-static inline const float32 getSingleConstant(const unsigned int nIndex)
-{
-   extern const float32 float32Constant[];
-   return float32Constant[nIndex];
-} 
-
-extern unsigned int getRegisterCount(const unsigned int opcode);
-extern unsigned int getDestinationSize(const unsigned int opcode);
-
-#endif
diff --git a/arch/arm26/nwfpe/fpsr.h b/arch/arm26/nwfpe/fpsr.h
deleted file mode 100644
index 6dafb0f5243c..000000000000
--- a/arch/arm26/nwfpe/fpsr.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.com, 1998-1999
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef __FPSR_H__
-#define __FPSR_H__
-
-/*
-The FPSR is a 32 bit register consisting of 4 parts, each exactly
-one byte.
-
-        SYSTEM ID
-        EXCEPTION TRAP ENABLE BYTE
-        SYSTEM CONTROL BYTE
-        CUMULATIVE EXCEPTION FLAGS BYTE
-        
-The FPCR is a 32 bit register consisting of bit flags.
-*/
-
-/* SYSTEM ID
-------------
-Note: the system id byte is read only  */
-
-typedef unsigned int FPSR;  /* type for floating point status register */
-typedef unsigned int FPCR;  /* type for floating point control register */
-
-#define MASK_SYSID              0xff000000
-#define BIT_HARDWARE            0x80000000
-#define FP_EMULATOR             0x01000000      /* System ID for emulator */ 
-#define FP_ACCELERATOR          0x81000000      /* System ID for FPA11 */
-
-/* EXCEPTION TRAP ENABLE BYTE
------------------------------ */
-
-#define MASK_TRAP_ENABLE        0x00ff0000
-#define MASK_TRAP_ENABLE_STRICT 0x001f0000
-#define BIT_IXE         0x00100000   /* inexact exception enable */
-#define BIT_UFE         0x00080000   /* underflow exception enable */
-#define BIT_OFE         0x00040000   /* overflow exception enable */
-#define BIT_DZE         0x00020000   /* divide by zero exception enable */
-#define BIT_IOE         0x00010000   /* invalid operation exception enable */
-
-/* SYSTEM CONTROL BYTE
----------------------- */
-
-#define MASK_SYSTEM_CONTROL     0x0000ff00
-#define MASK_TRAP_STRICT        0x00001f00
-
-#define BIT_AC  0x00001000      /* use alternative C-flag definition
-                                   for compares */
-#define BIT_EP  0x00000800      /* use expanded packed decimal format */
-#define BIT_SO  0x00000400      /* select synchronous operation of FPA */
-#define BIT_NE  0x00000200      /* NaN exception bit */
-#define BIT_ND  0x00000100      /* no denormalized numbers bit */
-
-/* CUMULATIVE EXCEPTION FLAGS BYTE
----------------------------------- */
-
-#define MASK_EXCEPTION_FLAGS            0x000000ff
-#define MASK_EXCEPTION_FLAGS_STRICT     0x0000001f
-
-#define BIT_IXC         0x00000010      /* inexact exception flag */
-#define BIT_UFC         0x00000008      /* underflow exception flag */
-#define BIT_OFC         0x00000004      /* overfloat exception flag */
-#define BIT_DZC         0x00000002      /* divide by zero exception flag */
-#define BIT_IOC         0x00000001      /* invalid operation exception flag */
-
-/* Floating Point Control Register
-----------------------------------*/
-
-#define BIT_RU          0x80000000      /* rounded up bit */
-#define BIT_IE          0x10000000      /* inexact bit */
-#define BIT_MO          0x08000000      /* mantissa overflow bit */
-#define BIT_EO          0x04000000      /* exponent overflow bit */
-#define BIT_SB          0x00000800      /* store bounce */
-#define BIT_AB          0x00000400      /* arithmetic bounce */
-#define BIT_RE          0x00000200      /* rounding exception */
-#define BIT_DA          0x00000100      /* disable FPA */
-
-#define MASK_OP         0x00f08010      /* AU operation code */
-#define MASK_PR         0x00080080      /* AU precision */
-#define MASK_S1         0x00070000      /* AU source register 1 */
-#define MASK_S2         0x00000007      /* AU source register 2 */
-#define MASK_DS         0x00007000      /* AU destination register */
-#define MASK_RM         0x00000060      /* AU rounding mode */
-#define MASK_ALU        0x9cfff2ff      /* only ALU can write these bits */
-#define MASK_RESET      0x00000d00      /* bits set on reset, all others cleared */
-#define MASK_WFC        MASK_RESET
-#define MASK_RFC        ~MASK_RESET
-
-#endif
diff --git a/arch/arm26/nwfpe/milieu.h b/arch/arm26/nwfpe/milieu.h
deleted file mode 100644
index a3892ab2dca4..000000000000
--- a/arch/arm26/nwfpe/milieu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/softfloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these three paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Include common integer types and flags.
--------------------------------------------------------------------------------
-*/
-#include "ARM-gcc.h"
-
-/*
--------------------------------------------------------------------------------
-Symbolic Boolean literals.
--------------------------------------------------------------------------------
-*/
-enum {
-    FALSE = 0,
-    TRUE  = 1
-};
-
diff --git a/arch/arm26/nwfpe/single_cpdo.c b/arch/arm26/nwfpe/single_cpdo.c
deleted file mode 100644
index 5cdcddbb8999..000000000000
--- a/arch/arm26/nwfpe/single_cpdo.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
-    NetWinder Floating Point Emulator
-    (c) Rebel.COM, 1998,1999
-
-    Direct questions, comments to Scott Bambrough <scottb@netwinder.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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "fpa11.h"
-#include "softfloat.h"
-#include "fpopcode.h"
-
-float32 float32_exp(float32 Fm);
-float32 float32_ln(float32 Fm);
-float32 float32_sin(float32 rFm);
-float32 float32_cos(float32 rFm);
-float32 float32_arcsin(float32 rFm);
-float32 float32_arctan(float32 rFm);
-float32 float32_log(float32 rFm);
-float32 float32_tan(float32 rFm);
-float32 float32_arccos(float32 rFm);
-float32 float32_pow(float32 rFn,float32 rFm);
-float32 float32_pol(float32 rFn,float32 rFm);
-
-unsigned int SingleCPDO(const unsigned int opcode)
-{
-   FPA11 *fpa11 = GET_FPA11();
-   float32 rFm, rFn = 0; //FIXME - should be zero?
-   unsigned int Fd, Fm, Fn, nRc = 1;
-
-   Fm = getFm(opcode);
-   if (CONSTANT_FM(opcode))
-   {
-     rFm = getSingleConstant(Fm);
-   }
-   else
-   {  
-     switch (fpa11->fType[Fm])
-     {
-        case typeSingle:
-          rFm = fpa11->fpreg[Fm].fSingle;
-        break;
-        
-        default: return 0;
-     }
-   }
-
-   if (!MONADIC_INSTRUCTION(opcode))
-   {
-      Fn = getFn(opcode);
-      switch (fpa11->fType[Fn])
-      {
-        case typeSingle:
-          rFn = fpa11->fpreg[Fn].fSingle;
-        break;
-
-        default: return 0;
-      }
-   }
-
-   Fd = getFd(opcode);
-   switch (opcode & MASK_ARITHMETIC_OPCODE)
-   {
-      /* dyadic opcodes */
-      case ADF_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_add(rFn,rFm);
-      break;
-
-      case MUF_CODE:
-      case FML_CODE:
-        fpa11->fpreg[Fd].fSingle = float32_mul(rFn,rFm);
-      break;
-
-      case SUF_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_sub(rFn,rFm);
-      break;
-
-      case RSF_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_sub(rFm,rFn);
-      break;
-
-      case DVF_CODE:
-      case FDV_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_div(rFn,rFm);
-      break;
-
-      case RDF_CODE:
-      case FRD_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_div(rFm,rFn);
-      break;
-
-#if 0
-      case POW_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_pow(rFn,rFm);
-      break;
-
-      case RPW_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_pow(rFm,rFn);
-      break;
-#endif
-
-      case RMF_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_rem(rFn,rFm);
-      break;
-
-#if 0
-      case POL_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_pol(rFn,rFm);
-      break;
-#endif
-
-      /* monadic opcodes */
-      case MVF_CODE:
-         fpa11->fpreg[Fd].fSingle = rFm;
-      break;
-
-      case MNF_CODE:
-         rFm ^= 0x80000000;
-         fpa11->fpreg[Fd].fSingle = rFm;
-      break;
-
-      case ABS_CODE:
-         rFm &= 0x7fffffff;
-         fpa11->fpreg[Fd].fSingle = rFm;
-      break;
-
-      case RND_CODE:
-      case URD_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_round_to_int(rFm);
-      break;
-
-      case SQT_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_sqrt(rFm);
-      break;
-
-#if 0
-      case LOG_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_log(rFm);
-      break;
-
-      case LGN_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_ln(rFm);
-      break;
-
-      case EXP_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_exp(rFm);
-      break;
-
-      case SIN_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_sin(rFm);
-      break;
-
-      case COS_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_cos(rFm);
-      break;
-
-      case TAN_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_tan(rFm);
-      break;
-
-      case ASN_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_arcsin(rFm);
-      break;
-
-      case ACS_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_arccos(rFm);
-      break;
-
-      case ATN_CODE:
-         fpa11->fpreg[Fd].fSingle = float32_arctan(rFm);
-      break;
-#endif
-
-      case NRM_CODE:
-      break;
-      
-      default:
-      {
-        nRc = 0;
-      }
-   }
-
-   if (0 != nRc) fpa11->fType[Fd] = typeSingle;
-   return nRc;
-}
-
-#if 0
-float32 float32_exp(float32 Fm)
-{
-//series
-}
-
-float32 float32_ln(float32 Fm)
-{
-//series
-}
-
-float32 float32_sin(float32 rFm)
-{
-//series
-}
-
-float32 float32_cos(float32 rFm)
-{
-//series
-}
-
-float32 float32_arcsin(float32 rFm)
-{
-//series
-}
-
-float32 float32_arctan(float32 rFm)
-{
-  //series
-}
-
-float32 float32_arccos(float32 rFm)
-{
-   //return float32_sub(halfPi,float32_arcsin(rFm));
-}
-
-float32 float32_log(float32 rFm)
-{
-  return float32_div(float32_ln(rFm),getSingleConstant(7));
-}
-
-float32 float32_tan(float32 rFm)
-{
-  return float32_div(float32_sin(rFm),float32_cos(rFm));
-}
-
-float32 float32_pow(float32 rFn,float32 rFm)
-{
-  return float32_exp(float32_mul(rFm,float32_ln(rFn))); 
-}
-
-float32 float32_pol(float32 rFn,float32 rFm)
-{
-  return float32_arctan(float32_div(rFn,rFm)); 
-}
-#endif
diff --git a/arch/arm26/nwfpe/softfloat-macros b/arch/arm26/nwfpe/softfloat-macros
deleted file mode 100644
index 5469989f2c5e..000000000000
--- a/arch/arm26/nwfpe/softfloat-macros
+++ /dev/null
@@ -1,740 +0,0 @@
-
-/*
-===============================================================================
-
-This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/softfloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these three paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Shifts `a' right by the number of bits given in `count'.  If any nonzero
-bits are shifted off, they are ``jammed'' into the least significant bit of
-the result by setting the least significant bit to 1.  The value of `count'
-can be arbitrarily large; in particular, if `count' is greater than 32, the
-result will be either 0 or 1, depending on whether `a' is zero or nonzero.
-The result is stored in the location pointed to by `zPtr'.
--------------------------------------------------------------------------------
-*/
-INLINE void shift32RightJamming( bits32 a, int16 count, bits32 *zPtr )
-{
-    bits32 z;
-    if ( count == 0 ) {
-        z = a;
-    }
-    else if ( count < 32 ) {
-        z = ( a>>count ) | ( ( a<<( ( - count ) & 31 ) ) != 0 );
-    }
-    else {
-        z = ( a != 0 );
-    }
-    *zPtr = z;
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts `a' right by the number of bits given in `count'.  If any nonzero
-bits are shifted off, they are ``jammed'' into the least significant bit of
-the result by setting the least significant bit to 1.  The value of `count'
-can be arbitrarily large; in particular, if `count' is greater than 64, the
-result will be either 0 or 1, depending on whether `a' is zero or nonzero.
-The result is stored in the location pointed to by `zPtr'.
--------------------------------------------------------------------------------
-*/
-INLINE void shift64RightJamming( bits64 a, int16 count, bits64 *zPtr )
-{
-    bits64 z;
-
- __asm__("@shift64RightJamming -- start");   
-    if ( count == 0 ) {
-        z = a;
-    }
-    else if ( count < 64 ) {
-        z = ( a>>count ) | ( ( a<<( ( - count ) & 63 ) ) != 0 );
-    }
-    else {
-        z = ( a != 0 );
-    }
- __asm__("@shift64RightJamming -- end");   
-    *zPtr = z;
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 128-bit value formed by concatenating `a0' and `a1' right by 64
-_plus_ the number of bits given in `count'.  The shifted result is at most
-64 nonzero bits; this is stored at the location pointed to by `z0Ptr'.  The
-bits shifted off form a second 64-bit result as follows:  The _last_ bit
-shifted off is the most-significant bit of the extra result, and the other
-63 bits of the extra result are all zero if and only if _all_but_the_last_
-bits shifted off were all zero.  This extra result is stored in the location
-pointed to by `z1Ptr'.  The value of `count' can be arbitrarily large.
-    (This routine makes more sense if `a0' and `a1' are considered to form a
-fixed-point value with binary point between `a0' and `a1'.  This fixed-point
-value is shifted right by the number of bits given in `count', and the
-integer part of the result is returned at the location pointed to by
-`z0Ptr'.  The fractional part of the result may be slightly corrupted as
-described above, and is returned at the location pointed to by `z1Ptr'.)
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift64ExtraRightJamming(
-     bits64 a0, bits64 a1, int16 count, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-    bits64 z0, z1;
-    int8 negCount = ( - count ) & 63;
-
-    if ( count == 0 ) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if ( count < 64 ) {
-        z1 = ( a0<<negCount ) | ( a1 != 0 );
-        z0 = a0>>count;
-    }
-    else {
-        if ( count == 64 ) {
-            z1 = a0 | ( a1 != 0 );
-        }
-        else {
-            z1 = ( ( a0 | a1 ) != 0 );
-        }
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 128-bit value formed by concatenating `a0' and `a1' right by the
-number of bits given in `count'.  Any bits shifted off are lost.  The value
-of `count' can be arbitrarily large; in particular, if `count' is greater
-than 128, the result will be 0.  The result is broken into two 64-bit pieces
-which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift128Right(
-     bits64 a0, bits64 a1, int16 count, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-    bits64 z0, z1;
-    int8 negCount = ( - count ) & 63;
-
-    if ( count == 0 ) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if ( count < 64 ) {
-        z1 = ( a0<<negCount ) | ( a1>>count );
-        z0 = a0>>count;
-    }
-    else {
-        z1 = ( count < 64 ) ? ( a0>>( count & 63 ) ) : 0;
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 128-bit value formed by concatenating `a0' and `a1' right by the
-number of bits given in `count'.  If any nonzero bits are shifted off, they
-are ``jammed'' into the least significant bit of the result by setting the
-least significant bit to 1.  The value of `count' can be arbitrarily large;
-in particular, if `count' is greater than 128, the result will be either 0
-or 1, depending on whether the concatenation of `a0' and `a1' is zero or
-nonzero.  The result is broken into two 64-bit pieces which are stored at
-the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift128RightJamming(
-     bits64 a0, bits64 a1, int16 count, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-    bits64 z0, z1;
-    int8 negCount = ( - count ) & 63;
-
-    if ( count == 0 ) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if ( count < 64 ) {
-        z1 = ( a0<<negCount ) | ( a1>>count ) | ( ( a1<<negCount ) != 0 );
-        z0 = a0>>count;
-    }
-    else {
-        if ( count == 64 ) {
-            z1 = a0 | ( a1 != 0 );
-        }
-        else if ( count < 128 ) {
-            z1 = ( a0>>( count & 63 ) ) | ( ( ( a0<<negCount ) | a1 ) != 0 );
-        }
-        else {
-            z1 = ( ( a0 | a1 ) != 0 );
-        }
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 192-bit value formed by concatenating `a0', `a1', and `a2' right
-by 64 _plus_ the number of bits given in `count'.  The shifted result is
-at most 128 nonzero bits; these are broken into two 64-bit pieces which are
-stored at the locations pointed to by `z0Ptr' and `z1Ptr'.  The bits shifted
-off form a third 64-bit result as follows:  The _last_ bit shifted off is
-the most-significant bit of the extra result, and the other 63 bits of the
-extra result are all zero if and only if _all_but_the_last_ bits shifted off
-were all zero.  This extra result is stored in the location pointed to by
-`z2Ptr'.  The value of `count' can be arbitrarily large.
-    (This routine makes more sense if `a0', `a1', and `a2' are considered
-to form a fixed-point value with binary point between `a1' and `a2'.  This
-fixed-point value is shifted right by the number of bits given in `count',
-and the integer part of the result is returned at the locations pointed to
-by `z0Ptr' and `z1Ptr'.  The fractional part of the result may be slightly
-corrupted as described above, and is returned at the location pointed to by
-`z2Ptr'.)
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift128ExtraRightJamming(
-     bits64 a0,
-     bits64 a1,
-     bits64 a2,
-     int16 count,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr
- )
-{
-    bits64 z0, z1, z2;
-    int8 negCount = ( - count ) & 63;
-
-    if ( count == 0 ) {
-        z2 = a2;
-        z1 = a1;
-        z0 = a0;
-    }
-    else {
-        if ( count < 64 ) {
-            z2 = a1<<negCount;
-            z1 = ( a0<<negCount ) | ( a1>>count );
-            z0 = a0>>count;
-        }
-        else {
-            if ( count == 64 ) {
-                z2 = a1;
-                z1 = a0;
-            }
-            else {
-                a2 |= a1;
-                if ( count < 128 ) {
-                    z2 = a0<<negCount;
-                    z1 = a0>>( count & 63 );
-                }
-                else {
-                    z2 = ( count == 128 ) ? a0 : ( a0 != 0 );
-                    z1 = 0;
-                }
-            }
-            z0 = 0;
-        }
-        z2 |= ( a2 != 0 );
-    }
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 128-bit value formed by concatenating `a0' and `a1' left by the
-number of bits given in `count'.  Any bits shifted off are lost.  The value
-of `count' must be less than 64.  The result is broken into two 64-bit
-pieces which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shortShift128Left(
-     bits64 a0, bits64 a1, int16 count, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-
-    *z1Ptr = a1<<count;
-    *z0Ptr =
-        ( count == 0 ) ? a0 : ( a0<<count ) | ( a1>>( ( - count ) & 63 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 192-bit value formed by concatenating `a0', `a1', and `a2' left
-by the number of bits given in `count'.  Any bits shifted off are lost.
-The value of `count' must be less than 64.  The result is broken into three
-64-bit pieces which are stored at the locations pointed to by `z0Ptr',
-`z1Ptr', and `z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shortShift192Left(
-     bits64 a0,
-     bits64 a1,
-     bits64 a2,
-     int16 count,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr
- )
-{
-    bits64 z0, z1, z2;
-    int8 negCount;
-
-    z2 = a2<<count;
-    z1 = a1<<count;
-    z0 = a0<<count;
-    if ( 0 < count ) {
-        negCount = ( ( - count ) & 63 );
-        z1 |= a2>>negCount;
-        z0 |= a1>>negCount;
-    }
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Adds the 128-bit value formed by concatenating `a0' and `a1' to the 128-bit
-value formed by concatenating `b0' and `b1'.  Addition is modulo 2^128, so
-any carry out is lost.  The result is broken into two 64-bit pieces which
-are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- add128(
-     bits64 a0, bits64 a1, bits64 b0, bits64 b1, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-    bits64 z1;
-
-    z1 = a1 + b1;
-    *z1Ptr = z1;
-    *z0Ptr = a0 + b0 + ( z1 < a1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Adds the 192-bit value formed by concatenating `a0', `a1', and `a2' to the
-192-bit value formed by concatenating `b0', `b1', and `b2'.  Addition is
-modulo 2^192, so any carry out is lost.  The result is broken into three
-64-bit pieces which are stored at the locations pointed to by `z0Ptr',
-`z1Ptr', and `z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- add192(
-     bits64 a0,
-     bits64 a1,
-     bits64 a2,
-     bits64 b0,
-     bits64 b1,
-     bits64 b2,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr
- )
-{
-    bits64 z0, z1, z2;
-    int8 carry0, carry1;
-
-    z2 = a2 + b2;
-    carry1 = ( z2 < a2 );
-    z1 = a1 + b1;
-    carry0 = ( z1 < a1 );
-    z0 = a0 + b0;
-    z1 += carry1;
-    z0 += ( z1 < carry1 );
-    z0 += carry0;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Subtracts the 128-bit value formed by concatenating `b0' and `b1' from the
-128-bit value formed by concatenating `a0' and `a1'.  Subtraction is modulo
-2^128, so any borrow out (carry out) is lost.  The result is broken into two
-64-bit pieces which are stored at the locations pointed to by `z0Ptr' and
-`z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- sub128(
-     bits64 a0, bits64 a1, bits64 b0, bits64 b1, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-
-    *z1Ptr = a1 - b1;
-    *z0Ptr = a0 - b0 - ( a1 < b1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Subtracts the 192-bit value formed by concatenating `b0', `b1', and `b2'
-from the 192-bit value formed by concatenating `a0', `a1', and `a2'.
-Subtraction is modulo 2^192, so any borrow out (carry out) is lost.  The
-result is broken into three 64-bit pieces which are stored at the locations
-pointed to by `z0Ptr', `z1Ptr', and `z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- sub192(
-     bits64 a0,
-     bits64 a1,
-     bits64 a2,
-     bits64 b0,
-     bits64 b1,
-     bits64 b2,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr
- )
-{
-    bits64 z0, z1, z2;
-    int8 borrow0, borrow1;
-
-    z2 = a2 - b2;
-    borrow1 = ( a2 < b2 );
-    z1 = a1 - b1;
-    borrow0 = ( a1 < b1 );
-    z0 = a0 - b0;
-    z0 -= ( z1 < borrow1 );
-    z1 -= borrow1;
-    z0 -= borrow0;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Multiplies `a' by `b' to obtain a 128-bit product.  The product is broken
-into two 64-bit pieces which are stored at the locations pointed to by
-`z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void mul64To128( bits64 a, bits64 b, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-    bits32 aHigh, aLow, bHigh, bLow;
-    bits64 z0, zMiddleA, zMiddleB, z1;
-
-    aLow = a;
-    aHigh = a>>32;
-    bLow = b;
-    bHigh = b>>32;
-    z1 = ( (bits64) aLow ) * bLow;
-    zMiddleA = ( (bits64) aLow ) * bHigh;
-    zMiddleB = ( (bits64) aHigh ) * bLow;
-    z0 = ( (bits64) aHigh ) * bHigh;
-    zMiddleA += zMiddleB;
-    z0 += ( ( (bits64) ( zMiddleA < zMiddleB ) )<<32 ) + ( zMiddleA>>32 );
-    zMiddleA <<= 32;
-    z1 += zMiddleA;
-    z0 += ( z1 < zMiddleA );
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Multiplies the 128-bit value formed by concatenating `a0' and `a1' by `b' to
-obtain a 192-bit product.  The product is broken into three 64-bit pieces
-which are stored at the locations pointed to by `z0Ptr', `z1Ptr', and
-`z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- mul128By64To192(
-     bits64 a0,
-     bits64 a1,
-     bits64 b,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr
- )
-{
-    bits64 z0, z1, z2, more1;
-
-    mul64To128( a1, b, &z1, &z2 );
-    mul64To128( a0, b, &z0, &more1 );
-    add128( z0, more1, 0, z1, &z0, &z1 );
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Multiplies the 128-bit value formed by concatenating `a0' and `a1' to the
-128-bit value formed by concatenating `b0' and `b1' to obtain a 256-bit
-product.  The product is broken into four 64-bit pieces which are stored at
-the locations pointed to by `z0Ptr', `z1Ptr', `z2Ptr', and `z3Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- mul128To256(
-     bits64 a0,
-     bits64 a1,
-     bits64 b0,
-     bits64 b1,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr,
-     bits64 *z3Ptr
- )
-{
-    bits64 z0, z1, z2, z3;
-    bits64 more1, more2;
-
-    mul64To128( a1, b1, &z2, &z3 );
-    mul64To128( a1, b0, &z1, &more2 );
-    add128( z1, more2, 0, z2, &z1, &z2 );
-    mul64To128( a0, b0, &z0, &more1 );
-    add128( z0, more1, 0, z1, &z0, &z1 );
-    mul64To128( a0, b1, &more1, &more2 );
-    add128( more1, more2, 0, z2, &more1, &z2 );
-    add128( z0, z1, 0, more1, &z0, &z1 );
-    *z3Ptr = z3;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns an approximation to the 64-bit integer quotient obtained by dividing
-`b' into the 128-bit value formed by concatenating `a0' and `a1'.  The
-divisor `b' must be at least 2^63.  If q is the exact quotient truncated
-toward zero, the approximation returned lies between q and q + 2 inclusive.
-If the exact quotient q is larger than 64 bits, the maximum positive 64-bit
-unsigned integer is returned.
--------------------------------------------------------------------------------
-*/
-static bits64 estimateDiv128To64( bits64 a0, bits64 a1, bits64 b )
-{
-    bits64 b0, b1;
-    bits64 rem0, rem1, term0, term1;
-    bits64 z;
-    if ( b <= a0 ) return LIT64( 0xFFFFFFFFFFFFFFFF );
-    b0 = b>>32;
-    z = ( b0<<32 <= a0 ) ? LIT64( 0xFFFFFFFF00000000 ) : ( a0 / b0 )<<32;
-    mul64To128( b, z, &term0, &term1 );
-    sub128( a0, a1, term0, term1, &rem0, &rem1 );
-    while ( ( (sbits64) rem0 ) < 0 ) {
-        z -= LIT64( 0x100000000 );
-        b1 = b<<32;
-        add128( rem0, rem1, b0, b1, &rem0, &rem1 );
-    }
-    rem0 = ( rem0<<32 ) | ( rem1>>32 );
-    z |= ( b0<<32 <= rem0 ) ? 0xFFFFFFFF : rem0 / b0;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns an approximation to the square root of the 32-bit significand given
-by `a'.  Considered as an integer, `a' must be at least 2^31.  If bit 0 of
-`aExp' (the least significant bit) is 1, the integer returned approximates
-2^31*sqrt(`a'/2^31), where `a' is considered an integer.  If bit 0 of `aExp'
-is 0, the integer returned approximates 2^31*sqrt(`a'/2^30).  In either
-case, the approximation returned lies strictly within +/-2 of the exact
-value.
--------------------------------------------------------------------------------
-*/
-static bits32 estimateSqrt32( int16 aExp, bits32 a )
-{
-    static const bits16 sqrtOddAdjustments[] = {
-        0x0004, 0x0022, 0x005D, 0x00B1, 0x011D, 0x019F, 0x0236, 0x02E0,
-        0x039C, 0x0468, 0x0545, 0x0631, 0x072B, 0x0832, 0x0946, 0x0A67
-    };
-    static const bits16 sqrtEvenAdjustments[] = {
-        0x0A2D, 0x08AF, 0x075A, 0x0629, 0x051A, 0x0429, 0x0356, 0x029E,
-        0x0200, 0x0179, 0x0109, 0x00AF, 0x0068, 0x0034, 0x0012, 0x0002
-    };
-    int8 index;
-    bits32 z;
-
-    index = ( a>>27 ) & 15;
-    if ( aExp & 1 ) {
-        z = 0x4000 + ( a>>17 ) - sqrtOddAdjustments[ index ];
-        z = ( ( a / z )<<14 ) + ( z<<15 );
-        a >>= 1;
-    }
-    else {
-        z = 0x8000 + ( a>>17 ) - sqrtEvenAdjustments[ index ];
-        z = a / z + z;
-        z = ( 0x20000 <= z ) ? 0xFFFF8000 : ( z<<15 );
-        if ( z <= a ) return (bits32) ( ( (sbits32) a )>>1 );
-    }
-    return ( (bits32) ( ( ( (bits64) a )<<31 ) / z ) ) + ( z>>1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the number of leading 0 bits before the most-significant 1 bit
-of `a'.  If `a' is zero, 32 is returned.
--------------------------------------------------------------------------------
-*/
-static int8 countLeadingZeros32( bits32 a )
-{
-    static const int8 countLeadingZerosHigh[] = {
-        8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
-        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-    int8 shiftCount;
-
-    shiftCount = 0;
-    if ( a < 0x10000 ) {
-        shiftCount += 16;
-        a <<= 16;
-    }
-    if ( a < 0x1000000 ) {
-        shiftCount += 8;
-        a <<= 8;
-    }
-    shiftCount += countLeadingZerosHigh[ a>>24 ];
-    return shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the number of leading 0 bits before the most-significant 1 bit
-of `a'.  If `a' is zero, 64 is returned.
--------------------------------------------------------------------------------
-*/
-static int8 countLeadingZeros64( bits64 a )
-{
-    int8 shiftCount;
-
-    shiftCount = 0;
-    if ( a < ( (bits64) 1 )<<32 ) {
-        shiftCount += 32;
-    }
-    else {
-        a >>= 32;
-    }
-    shiftCount += countLeadingZeros32( a );
-    return shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 128-bit value formed by concatenating `a0' and `a1'
-is equal to the 128-bit value formed by concatenating `b0' and `b1'.
-Otherwise, returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag eq128( bits64 a0, bits64 a1, bits64 b0, bits64 b1 )
-{
-
-    return ( a0 == b0 ) && ( a1 == b1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 128-bit value formed by concatenating `a0' and `a1' is less
-than or equal to the 128-bit value formed by concatenating `b0' and `b1'.
-Otherwise, returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag le128( bits64 a0, bits64 a1, bits64 b0, bits64 b1 )
-{
-
-    return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 <= b1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 128-bit value formed by concatenating `a0' and `a1' is less
-than the 128-bit value formed by concatenating `b0' and `b1'.  Otherwise,
-returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag lt128( bits64 a0, bits64 a1, bits64 b0, bits64 b1 )
-{
-
-    return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 < b1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 128-bit value formed by concatenating `a0' and `a1' is
-not equal to the 128-bit value formed by concatenating `b0' and `b1'.
-Otherwise, returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag ne128( bits64 a0, bits64 a1, bits64 b0, bits64 b1 )
-{
-
-    return ( a0 != b0 ) || ( a1 != b1 );
-
-}
-
diff --git a/arch/arm26/nwfpe/softfloat-specialize b/arch/arm26/nwfpe/softfloat-specialize
deleted file mode 100644
index acf409144763..000000000000
--- a/arch/arm26/nwfpe/softfloat-specialize
+++ /dev/null
@@ -1,366 +0,0 @@
-
-/*
-===============================================================================
-
-This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/softfloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these three paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Underflow tininess-detection mode, statically initialized to default value.
-(The declaration in `softfloat.h' must match the `int8' type here.)
--------------------------------------------------------------------------------
-*/
-int8 float_detect_tininess = float_tininess_after_rounding;
-
-/*
--------------------------------------------------------------------------------
-Raises the exceptions specified by `flags'.  Floating-point traps can be
-defined here if desired.  It is currently not possible for such a trap to
-substitute a result value.  If traps are not implemented, this routine
-should be simply `float_exception_flags |= flags;'.
-
-ScottB:  November 4, 1998
-Moved this function out of softfloat-specialize into fpmodule.c.
-This effectively isolates all the changes required for integrating with the
-Linux kernel into fpmodule.c.  Porting to NetBSD should only require modifying
-fpmodule.c to integrate with the NetBSD kernel (I hope!).
--------------------------------------------------------------------------------
-void float_raise( int8 flags )
-{
-    float_exception_flags |= flags;
-}
-*/
-
-/*
--------------------------------------------------------------------------------
-Internal canonical NaN format.
--------------------------------------------------------------------------------
-*/
-typedef struct {
-    flag sign;
-    bits64 high, low;
-} commonNaNT;
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated single-precision NaN.
--------------------------------------------------------------------------------
-*/
-#define float32_default_nan 0xFFFFFFFF
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is a NaN;
-otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float32_is_nan( float32 a )
-{
-
-    return ( 0xFF000000 < (bits32) ( a<<1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is a signaling
-NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float32_is_signaling_nan( float32 a )
-{
-
-    return ( ( ( a>>22 ) & 0x1FF ) == 0x1FE ) && ( a & 0x003FFFFF );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point NaN
-`a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT float32ToCommonNaN( float32 a )
-{
-    commonNaNT z;
-
-    if ( float32_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a>>31;
-    z.low = 0;
-    z.high = ( (bits64) a )<<41;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the single-
-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static float32 commonNaNToFloat32( commonNaNT a )
-{
-
-    return ( ( (bits32) a.sign )<<31 ) | 0x7FC00000 | ( a.high>>41 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two single-precision floating-point values `a' and `b', one of which
-is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a
-signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static float32 propagateFloat32NaN( float32 a, float32 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = float32_is_nan( a );
-    aIsSignalingNaN = float32_is_signaling_nan( a );
-    bIsNaN = float32_is_nan( b );
-    bIsSignalingNaN = float32_is_signaling_nan( b );
-    a |= 0x00400000;
-    b |= 0x00400000;
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated double-precision NaN.
--------------------------------------------------------------------------------
-*/
-#define float64_default_nan LIT64( 0xFFFFFFFFFFFFFFFF )
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is a NaN;
-otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float64_is_nan( float64 a )
-{
-
-    return ( LIT64( 0xFFE0000000000000 ) < (bits64) ( a<<1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is a signaling
-NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float64_is_signaling_nan( float64 a )
-{
-
-    return
-           ( ( ( a>>51 ) & 0xFFF ) == 0xFFE )
-        && ( a & LIT64( 0x0007FFFFFFFFFFFF ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point NaN
-`a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT float64ToCommonNaN( float64 a )
-{
-    commonNaNT z;
-
-    if ( float64_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a>>63;
-    z.low = 0;
-    z.high = a<<12;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the double-
-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static float64 commonNaNToFloat64( commonNaNT a )
-{
-
-    return
-          ( ( (bits64) a.sign )<<63 )
-        | LIT64( 0x7FF8000000000000 )
-        | ( a.high>>12 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two double-precision floating-point values `a' and `b', one of which
-is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a
-signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static float64 propagateFloat64NaN( float64 a, float64 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = float64_is_nan( a );
-    aIsSignalingNaN = float64_is_signaling_nan( a );
-    bIsNaN = float64_is_nan( b );
-    bIsSignalingNaN = float64_is_signaling_nan( b );
-    a |= LIT64( 0x0008000000000000 );
-    b |= LIT64( 0x0008000000000000 );
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated extended double-precision NaN.  The
-`high' and `low' values hold the most- and least-significant bits,
-respectively.
--------------------------------------------------------------------------------
-*/
-#define floatx80_default_nan_high 0xFFFF
-#define floatx80_default_nan_low  LIT64( 0xFFFFFFFFFFFFFFFF )
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is a
-NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag floatx80_is_nan( floatx80 a )
-{
-
-    return ( ( a.high & 0x7FFF ) == 0x7FFF ) && (bits64) ( a.low<<1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is a
-signaling NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag floatx80_is_signaling_nan( floatx80 a )
-{
-    //register int lr;
-    bits64 aLow;
-
-    //__asm__("mov %0, lr" : : "g" (lr));
-    //fp_printk("floatx80_is_signalling_nan() called from 0x%08x\n",lr);
-    aLow = a.low & ~ LIT64( 0x4000000000000000 );
-    return
-           ( ( a.high & 0x7FFF ) == 0x7FFF )
-        && (bits64) ( aLow<<1 )
-        && ( a.low == aLow );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point NaN `a' to the canonical NaN format.  If `a' is a signaling NaN, the
-invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT floatx80ToCommonNaN( floatx80 a )
-{
-    commonNaNT z;
-
-    if ( floatx80_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a.high>>15;
-    z.low = 0;
-    z.high = a.low<<1;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the extended
-double-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static floatx80 commonNaNToFloatx80( commonNaNT a )
-{
-    floatx80 z;
-
-    z.low = LIT64( 0xC000000000000000 ) | ( a.high>>1 );
-    z.high = ( ( (bits16) a.sign )<<15 ) | 0x7FFF;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two extended double-precision floating-point values `a' and `b', one
-of which is a NaN, and returns the appropriate NaN result.  If either `a' or
-`b' is a signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static floatx80 propagateFloatx80NaN( floatx80 a, floatx80 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = floatx80_is_nan( a );
-    aIsSignalingNaN = floatx80_is_signaling_nan( a );
-    bIsNaN = floatx80_is_nan( b );
-    bIsSignalingNaN = floatx80_is_signaling_nan( b );
-    a.low |= LIT64( 0xC000000000000000 );
-    b.low |= LIT64( 0xC000000000000000 );
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-#endif
diff --git a/arch/arm26/nwfpe/softfloat.c b/arch/arm26/nwfpe/softfloat.c
deleted file mode 100644
index 26c1b916e527..000000000000
--- a/arch/arm26/nwfpe/softfloat.c
+++ /dev/null
@@ -1,3439 +0,0 @@
-/*
-===============================================================================
-
-This C source file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/softfloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these three paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-#include "fpa11.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-/*
--------------------------------------------------------------------------------
-Floating-point rounding mode, extended double-precision rounding precision,
-and exception flags.
--------------------------------------------------------------------------------
-*/
-int8 float_rounding_mode = float_round_nearest_even;
-int8 floatx80_rounding_precision = 80;
-int8 float_exception_flags;
-
-/*
--------------------------------------------------------------------------------
-Primitive arithmetic functions, including multi-word arithmetic, and
-division and square root approximations.  (Can be specialized to target if
-desired.)
--------------------------------------------------------------------------------
-*/
-#include "softfloat-macros"
-
-/*
--------------------------------------------------------------------------------
-Functions and definitions to determine:  (1) whether tininess for underflow
-is detected before or after rounding by default, (2) what (if anything)
-happens when exceptions are raised, (3) how signaling NaNs are distinguished
-from quiet NaNs, (4) the default generated quiet NaNs, and (5) how NaNs
-are propagated from function inputs to output.  These details are target-
-specific.
--------------------------------------------------------------------------------
-*/
-#include "softfloat-specialize"
-
-/*
--------------------------------------------------------------------------------
-Takes a 64-bit fixed-point value `absZ' with binary point between bits 6
-and 7, and returns the properly rounded 32-bit integer corresponding to the
-input.  If `zSign' is nonzero, the input is negated before being converted
-to an integer.  Bit 63 of `absZ' must be zero.  Ordinarily, the fixed-point
-input is simply rounded to an integer, with the inexact exception raised if
-the input cannot be represented exactly as an integer.  If the fixed-point
-input is too large, however, the invalid exception is raised and the largest
-positive or negative integer is returned.
--------------------------------------------------------------------------------
-*/
-static int32 roundAndPackInt32( flag zSign, bits64 absZ )
-{
-    int8 roundingMode;
-    flag roundNearestEven;
-    int8 roundIncrement, roundBits;
-    int32 z;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    roundIncrement = 0x40;
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            roundIncrement = 0;
-        }
-        else {
-            roundIncrement = 0x7F;
-            if ( zSign ) {
-                if ( roundingMode == float_round_up ) roundIncrement = 0;
-            }
-            else {
-                if ( roundingMode == float_round_down ) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = absZ & 0x7F;
-    absZ = ( absZ + roundIncrement )>>7;
-    absZ &= ~ ( ( ( roundBits ^ 0x40 ) == 0 ) & roundNearestEven );
-    z = absZ;
-    if ( zSign ) z = - z;
-    if ( ( absZ>>32 ) || ( z && ( ( z < 0 ) ^ zSign ) ) ) {
-        float_exception_flags |= float_flag_invalid;
-        return zSign ? 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( roundBits ) float_exception_flags |= float_flag_inexact;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the fraction bits of the single-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits32 extractFloat32Frac( float32 a )
-{
-
-    return a & 0x007FFFFF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the exponent bits of the single-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE int16 extractFloat32Exp( float32 a )
-{
-
-    return ( a>>23 ) & 0xFF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the sign bit of the single-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE flag extractFloat32Sign( float32 a )
-{
-
-    return a>>31;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Normalizes the subnormal single-precision floating-point value represented
-by the denormalized significand `aSig'.  The normalized exponent and
-significand are stored at the locations pointed to by `zExpPtr' and
-`zSigPtr', respectively.
--------------------------------------------------------------------------------
-*/
-static void
- normalizeFloat32Subnormal( bits32 aSig, int16 *zExpPtr, bits32 *zSigPtr )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros32( aSig ) - 8;
-    *zSigPtr = aSig<<shiftCount;
-    *zExpPtr = 1 - shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Packs the sign `zSign', exponent `zExp', and significand `zSig' into a
-single-precision floating-point value, returning the result.  After being
-shifted into the proper positions, the three fields are simply added
-together to form the result.  This means that any integer portion of `zSig'
-will be added into the exponent.  Since a properly normalized significand
-will have an integer portion equal to 1, the `zExp' input should be 1 less
-than the desired result exponent whenever `zSig' is a complete, normalized
-significand.
--------------------------------------------------------------------------------
-*/
-INLINE float32 packFloat32( flag zSign, int16 zExp, bits32 zSig )
-{
-#if 0
-   float32 f;
-   __asm__("@ packFloat32;              \n\
-            mov %0, %1, asl #31;        \n\
-            orr %0, %2, asl #23;        \n\
-            orr %0, %3"
-            : /* no outputs */
-            : "g" (f), "g" (zSign), "g" (zExp), "g" (zSig)
-            : "cc");
-   return f;
-#else
-    return ( ( (bits32) zSign )<<31 ) + ( ( (bits32) zExp )<<23 ) + zSig;
-#endif 
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper single-precision floating-
-point value corresponding to the abstract input.  Ordinarily, the abstract
-value is simply rounded and packed into the single-precision format, with
-the inexact exception raised if the abstract input cannot be represented
-exactly.  If the abstract value is too large, however, the overflow and
-inexact exceptions are raised and an infinity or maximal finite value is
-returned.  If the abstract value is too small, the input value is rounded to
-a subnormal number, and the underflow and inexact exceptions are raised if
-the abstract input cannot be represented exactly as a subnormal single-
-precision floating-point number.
-    The input significand `zSig' has its binary point between bits 30
-and 29, which is 7 bits to the left of the usual location.  This shifted
-significand must be normalized or smaller.  If `zSig' is not normalized,
-`zExp' must be 0; in that case, the result returned is a subnormal number,
-and it must not require rounding.  In the usual case that `zSig' is
-normalized, `zExp' must be 1 less than the ``true'' floating-point exponent.
-The handling of underflow and overflow follows the IEC/IEEE Standard for
-Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float32 roundAndPackFloat32( flag zSign, int16 zExp, bits32 zSig )
-{
-    int8 roundingMode;
-    flag roundNearestEven;
-    int8 roundIncrement, roundBits;
-    flag isTiny;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    roundIncrement = 0x40;
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            roundIncrement = 0;
-        }
-        else {
-            roundIncrement = 0x7F;
-            if ( zSign ) {
-                if ( roundingMode == float_round_up ) roundIncrement = 0;
-            }
-            else {
-                if ( roundingMode == float_round_down ) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = zSig & 0x7F;
-    if ( 0xFD <= (bits16) zExp ) {
-        if (    ( 0xFD < zExp )
-             || (    ( zExp == 0xFD )
-                  && ( (sbits32) ( zSig + roundIncrement ) < 0 ) )
-           ) {
-            float_raise( float_flag_overflow | float_flag_inexact );
-            return packFloat32( zSign, 0xFF, 0 ) - ( roundIncrement == 0 );
-        }
-        if ( zExp < 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < -1 )
-                || ( zSig + roundIncrement < 0x80000000 );
-            shift32RightJamming( zSig, - zExp, &zSig );
-            zExp = 0;
-            roundBits = zSig & 0x7F;
-            if ( isTiny && roundBits ) float_raise( float_flag_underflow );
-        }
-    }
-    if ( roundBits ) float_exception_flags |= float_flag_inexact;
-    zSig = ( zSig + roundIncrement )>>7;
-    zSig &= ~ ( ( ( roundBits ^ 0x40 ) == 0 ) & roundNearestEven );
-    if ( zSig == 0 ) zExp = 0;
-    return packFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper single-precision floating-
-point value corresponding to the abstract input.  This routine is just like
-`roundAndPackFloat32' except that `zSig' does not have to be normalized in
-any way.  In all cases, `zExp' must be 1 less than the ``true'' floating-
-point exponent.
--------------------------------------------------------------------------------
-*/
-static float32
- normalizeRoundAndPackFloat32( flag zSign, int16 zExp, bits32 zSig )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros32( zSig ) - 1;
-    return roundAndPackFloat32( zSign, zExp - shiftCount, zSig<<shiftCount );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the fraction bits of the double-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits64 extractFloat64Frac( float64 a )
-{
-
-    return a & LIT64( 0x000FFFFFFFFFFFFF );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the exponent bits of the double-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE int16 extractFloat64Exp( float64 a )
-{
-
-    return ( a>>52 ) & 0x7FF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the sign bit of the double-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE flag extractFloat64Sign( float64 a )
-{
-
-    return a>>63;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Normalizes the subnormal double-precision floating-point value represented
-by the denormalized significand `aSig'.  The normalized exponent and
-significand are stored at the locations pointed to by `zExpPtr' and
-`zSigPtr', respectively.
--------------------------------------------------------------------------------
-*/
-static void
- normalizeFloat64Subnormal( bits64 aSig, int16 *zExpPtr, bits64 *zSigPtr )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros64( aSig ) - 11;
-    *zSigPtr = aSig<<shiftCount;
-    *zExpPtr = 1 - shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Packs the sign `zSign', exponent `zExp', and significand `zSig' into a
-double-precision floating-point value, returning the result.  After being
-shifted into the proper positions, the three fields are simply added
-together to form the result.  This means that any integer portion of `zSig'
-will be added into the exponent.  Since a properly normalized significand
-will have an integer portion equal to 1, the `zExp' input should be 1 less
-than the desired result exponent whenever `zSig' is a complete, normalized
-significand.
--------------------------------------------------------------------------------
-*/
-INLINE float64 packFloat64( flag zSign, int16 zExp, bits64 zSig )
-{
-
-    return ( ( (bits64) zSign )<<63 ) + ( ( (bits64) zExp )<<52 ) + zSig;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper double-precision floating-
-point value corresponding to the abstract input.  Ordinarily, the abstract
-value is simply rounded and packed into the double-precision format, with
-the inexact exception raised if the abstract input cannot be represented
-exactly.  If the abstract value is too large, however, the overflow and
-inexact exceptions are raised and an infinity or maximal finite value is
-returned.  If the abstract value is too small, the input value is rounded to
-a subnormal number, and the underflow and inexact exceptions are raised if
-the abstract input cannot be represented exactly as a subnormal double-
-precision floating-point number.
-    The input significand `zSig' has its binary point between bits 62
-and 61, which is 10 bits to the left of the usual location.  This shifted
-significand must be normalized or smaller.  If `zSig' is not normalized,
-`zExp' must be 0; in that case, the result returned is a subnormal number,
-and it must not require rounding.  In the usual case that `zSig' is
-normalized, `zExp' must be 1 less than the ``true'' floating-point exponent.
-The handling of underflow and overflow follows the IEC/IEEE Standard for
-Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float64 roundAndPackFloat64( flag zSign, int16 zExp, bits64 zSig )
-{
-    int8 roundingMode;
-    flag roundNearestEven;
-    int16 roundIncrement, roundBits;
-    flag isTiny;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    roundIncrement = 0x200;
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            roundIncrement = 0;
-        }
-        else {
-            roundIncrement = 0x3FF;
-            if ( zSign ) {
-                if ( roundingMode == float_round_up ) roundIncrement = 0;
-            }
-            else {
-                if ( roundingMode == float_round_down ) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = zSig & 0x3FF;
-    if ( 0x7FD <= (bits16) zExp ) {
-        if (    ( 0x7FD < zExp )
-             || (    ( zExp == 0x7FD )
-                  && ( (sbits64) ( zSig + roundIncrement ) < 0 ) )
-           ) {
-            //register int lr = __builtin_return_address(0);
-            //printk("roundAndPackFloat64 called from 0x%08x\n",lr);
-            float_raise( float_flag_overflow | float_flag_inexact );
-            return packFloat64( zSign, 0x7FF, 0 ) - ( roundIncrement == 0 );
-        }
-        if ( zExp < 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < -1 )
-                || ( zSig + roundIncrement < LIT64( 0x8000000000000000 ) );
-            shift64RightJamming( zSig, - zExp, &zSig );
-            zExp = 0;
-            roundBits = zSig & 0x3FF;
-            if ( isTiny && roundBits ) float_raise( float_flag_underflow );
-        }
-    }
-    if ( roundBits ) float_exception_flags |= float_flag_inexact;
-    zSig = ( zSig + roundIncrement )>>10;
-    zSig &= ~ ( ( ( roundBits ^ 0x200 ) == 0 ) & roundNearestEven );
-    if ( zSig == 0 ) zExp = 0;
-    return packFloat64( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper double-precision floating-
-point value corresponding to the abstract input.  This routine is just like
-`roundAndPackFloat64' except that `zSig' does not have to be normalized in
-any way.  In all cases, `zExp' must be 1 less than the ``true'' floating-
-point exponent.
--------------------------------------------------------------------------------
-*/
-static float64
- normalizeRoundAndPackFloat64( flag zSign, int16 zExp, bits64 zSig )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros64( zSig ) - 1;
-    return roundAndPackFloat64( zSign, zExp - shiftCount, zSig<<shiftCount );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the fraction bits of the extended double-precision floating-point
-value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits64 extractFloatx80Frac( floatx80 a )
-{
-
-    return a.low;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the exponent bits of the extended double-precision floating-point
-value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE int32 extractFloatx80Exp( floatx80 a )
-{
-
-    return a.high & 0x7FFF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the sign bit of the extended double-precision floating-point value
-`a'.
--------------------------------------------------------------------------------
-*/
-INLINE flag extractFloatx80Sign( floatx80 a )
-{
-
-    return a.high>>15;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Normalizes the subnormal extended double-precision floating-point value
-represented by the denormalized significand `aSig'.  The normalized exponent
-and significand are stored at the locations pointed to by `zExpPtr' and
-`zSigPtr', respectively.
--------------------------------------------------------------------------------
-*/
-static void
- normalizeFloatx80Subnormal( bits64 aSig, int32 *zExpPtr, bits64 *zSigPtr )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros64( aSig );
-    *zSigPtr = aSig<<shiftCount;
-    *zExpPtr = 1 - shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Packs the sign `zSign', exponent `zExp', and significand `zSig' into an
-extended double-precision floating-point value, returning the result.
--------------------------------------------------------------------------------
-*/
-INLINE floatx80 packFloatx80( flag zSign, int32 zExp, bits64 zSig )
-{
-    floatx80 z;
-
-    z.low = zSig;
-    z.high = ( ( (bits16) zSign )<<15 ) + zExp;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and extended significand formed by the concatenation of `zSig0' and `zSig1',
-and returns the proper extended double-precision floating-point value
-corresponding to the abstract input.  Ordinarily, the abstract value is
-rounded and packed into the extended double-precision format, with the
-inexact exception raised if the abstract input cannot be represented
-exactly.  If the abstract value is too large, however, the overflow and
-inexact exceptions are raised and an infinity or maximal finite value is
-returned.  If the abstract value is too small, the input value is rounded to
-a subnormal number, and the underflow and inexact exceptions are raised if
-the abstract input cannot be represented exactly as a subnormal extended
-double-precision floating-point number.
-    If `roundingPrecision' is 32 or 64, the result is rounded to the same
-number of bits as single or double precision, respectively.  Otherwise, the
-result is rounded to the full precision of the extended double-precision
-format.
-    The input significand must be normalized or smaller.  If the input
-significand is not normalized, `zExp' must be 0; in that case, the result
-returned is a subnormal number, and it must not require rounding.  The
-handling of underflow and overflow follows the IEC/IEEE Standard for Binary
-Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static floatx80
- roundAndPackFloatx80(
-     int8 roundingPrecision, flag zSign, int32 zExp, bits64 zSig0, bits64 zSig1
- )
-{
-    int8 roundingMode;
-    flag roundNearestEven, increment, isTiny;
-    int64 roundIncrement, roundMask, roundBits;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    if ( roundingPrecision == 80 ) goto precision80;
-    if ( roundingPrecision == 64 ) {
-        roundIncrement = LIT64( 0x0000000000000400 );
-        roundMask = LIT64( 0x00000000000007FF );
-    }
-    else if ( roundingPrecision == 32 ) {
-        roundIncrement = LIT64( 0x0000008000000000 );
-        roundMask = LIT64( 0x000000FFFFFFFFFF );
-    }
-    else {
-        goto precision80;
-    }
-    zSig0 |= ( zSig1 != 0 );
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            roundIncrement = 0;
-        }
-        else {
-            roundIncrement = roundMask;
-            if ( zSign ) {
-                if ( roundingMode == float_round_up ) roundIncrement = 0;
-            }
-            else {
-                if ( roundingMode == float_round_down ) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = zSig0 & roundMask;
-    if ( 0x7FFD <= (bits32) ( zExp - 1 ) ) {
-        if (    ( 0x7FFE < zExp )
-             || ( ( zExp == 0x7FFE ) && ( zSig0 + roundIncrement < zSig0 ) )
-           ) {
-            goto overflow;
-        }
-        if ( zExp <= 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < 0 )
-                || ( zSig0 <= zSig0 + roundIncrement );
-            shift64RightJamming( zSig0, 1 - zExp, &zSig0 );
-            zExp = 0;
-            roundBits = zSig0 & roundMask;
-            if ( isTiny && roundBits ) float_raise( float_flag_underflow );
-            if ( roundBits ) float_exception_flags |= float_flag_inexact;
-            zSig0 += roundIncrement;
-            if ( (sbits64) zSig0 < 0 ) zExp = 1;
-            roundIncrement = roundMask + 1;
-            if ( roundNearestEven && ( roundBits<<1 == roundIncrement ) ) {
-                roundMask |= roundIncrement;
-            }
-            zSig0 &= ~ roundMask;
-            return packFloatx80( zSign, zExp, zSig0 );
-        }
-    }
-    if ( roundBits ) float_exception_flags |= float_flag_inexact;
-    zSig0 += roundIncrement;
-    if ( zSig0 < roundIncrement ) {
-        ++zExp;
-        zSig0 = LIT64( 0x8000000000000000 );
-    }
-    roundIncrement = roundMask + 1;
-    if ( roundNearestEven && ( roundBits<<1 == roundIncrement ) ) {
-        roundMask |= roundIncrement;
-    }
-    zSig0 &= ~ roundMask;
-    if ( zSig0 == 0 ) zExp = 0;
-    return packFloatx80( zSign, zExp, zSig0 );
- precision80:
-    increment = ( (sbits64) zSig1 < 0 );
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            increment = 0;
-        }
-        else {
-            if ( zSign ) {
-                increment = ( roundingMode == float_round_down ) && zSig1;
-            }
-            else {
-                increment = ( roundingMode == float_round_up ) && zSig1;
-            }
-        }
-    }
-    if ( 0x7FFD <= (bits32) ( zExp - 1 ) ) {
-        if (    ( 0x7FFE < zExp )
-             || (    ( zExp == 0x7FFE )
-                  && ( zSig0 == LIT64( 0xFFFFFFFFFFFFFFFF ) )
-                  && increment
-                )
-           ) {
-            roundMask = 0;
- overflow:
-            float_raise( float_flag_overflow | float_flag_inexact );
-            if (    ( roundingMode == float_round_to_zero )
-                 || ( zSign && ( roundingMode == float_round_up ) )
-                 || ( ! zSign && ( roundingMode == float_round_down ) )
-               ) {
-                return packFloatx80( zSign, 0x7FFE, ~ roundMask );
-            }
-            return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-        }
-        if ( zExp <= 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < 0 )
-                || ! increment
-                || ( zSig0 < LIT64( 0xFFFFFFFFFFFFFFFF ) );
-            shift64ExtraRightJamming( zSig0, zSig1, 1 - zExp, &zSig0, &zSig1 );
-            zExp = 0;
-            if ( isTiny && zSig1 ) float_raise( float_flag_underflow );
-            if ( zSig1 ) float_exception_flags |= float_flag_inexact;
-            if ( roundNearestEven ) {
-                increment = ( (sbits64) zSig1 < 0 );
-            }
-            else {
-                if ( zSign ) {
-                    increment = ( roundingMode == float_round_down ) && zSig1;
-                }
-                else {
-                    increment = ( roundingMode == float_round_up ) && zSig1;
-                }
-            }
-            if ( increment ) {
-                ++zSig0;
-                zSig0 &= ~ ( ( zSig1 + zSig1 == 0 ) & roundNearestEven );
-                if ( (sbits64) zSig0 < 0 ) zExp = 1;
-            }
-            return packFloatx80( zSign, zExp, zSig0 );
-        }
-    }
-    if ( zSig1 ) float_exception_flags |= float_flag_inexact;
-    if ( increment ) {
-        ++zSig0;
-        if ( zSig0 == 0 ) {
-            ++zExp;
-            zSig0 = LIT64( 0x8000000000000000 );
-        }
-        else {
-            zSig0 &= ~ ( ( zSig1 + zSig1 == 0 ) & roundNearestEven );
-        }
-    }
-    else {
-        if ( zSig0 == 0 ) zExp = 0;
-    }
-    
-    return packFloatx80( zSign, zExp, zSig0 );
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent
-`zExp', and significand formed by the concatenation of `zSig0' and `zSig1',
-and returns the proper extended double-precision floating-point value
-corresponding to the abstract input.  This routine is just like
-`roundAndPackFloatx80' except that the input significand does not have to be
-normalized.
--------------------------------------------------------------------------------
-*/
-static floatx80
- normalizeRoundAndPackFloatx80(
-     int8 roundingPrecision, flag zSign, int32 zExp, bits64 zSig0, bits64 zSig1
- )
-{
-    int8 shiftCount;
-
-    if ( zSig0 == 0 ) {
-        zSig0 = zSig1;
-        zSig1 = 0;
-        zExp -= 64;
-    }
-    shiftCount = countLeadingZeros64( zSig0 );
-    shortShift128Left( zSig0, zSig1, shiftCount, &zSig0, &zSig1 );
-    zExp -= shiftCount;
-    return
-        roundAndPackFloatx80( roundingPrecision, zSign, zExp, zSig0, zSig1 );
-
-}
-
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 32-bit two's complement integer `a' to
-the single-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int32 a )
-{
-    flag zSign;
-
-    if ( a == 0 ) return 0;
-    if ( a == 0x80000000 ) return packFloat32( 1, 0x9E, 0 );
-    zSign = ( a < 0 );
-    return normalizeRoundAndPackFloat32( zSign, 0x9C, zSign ? - a : a );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 32-bit two's complement integer `a' to
-the double-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 int32_to_float64( int32 a )
-{
-    flag aSign;
-    uint32 absA;
-    int8 shiftCount;
-    bits64 zSig;
-
-    if ( a == 0 ) return 0;
-    aSign = ( a < 0 );
-    absA = aSign ? - a : a;
-    shiftCount = countLeadingZeros32( absA ) + 21;
-    zSig = absA;
-    return packFloat64( aSign, 0x432 - shiftCount, zSig<<shiftCount );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 32-bit two's complement integer `a'
-to the extended double-precision floating-point format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 int32_to_floatx80( int32 a )
-{
-    flag zSign;
-    uint32 absA;
-    int8 shiftCount;
-    bits64 zSig;
-
-    if ( a == 0 ) return packFloatx80( 0, 0, 0 );
-    zSign = ( a < 0 );
-    absA = zSign ? - a : a;
-    shiftCount = countLeadingZeros32( absA ) + 32;
-    zSig = absA;
-    return packFloatx80( zSign, 0x403E - shiftCount, zSig<<shiftCount );
-
-}
-
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 float32_to_int32( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig;
-    bits64 zSig;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( ( aExp == 0x7FF ) && aSig ) aSign = 0;
-    if ( aExp ) aSig |= 0x00800000;
-    shiftCount = 0xAF - aExp;
-    zSig = aSig;
-    zSig <<= 32;
-    if ( 0 < shiftCount ) shift64RightJamming( zSig, shiftCount, &zSig );
-    return roundAndPackInt32( aSign, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic, except that the conversion is always rounded toward zero.  If
-`a' is a NaN, the largest positive integer is returned.  Otherwise, if the
-conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int32 float32_to_int32_round_to_zero( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig;
-    int32 z;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    shiftCount = aExp - 0x9E;
-    if ( 0 <= shiftCount ) {
-        if ( a == 0xCF000000 ) return 0x80000000;
-        float_raise( float_flag_invalid );
-        if ( ! aSign || ( ( aExp == 0xFF ) && aSig ) ) return 0x7FFFFFFF;
-        return 0x80000000;
-    }
-    else if ( aExp <= 0x7E ) {
-        if ( aExp | aSig ) float_exception_flags |= float_flag_inexact;
-        return 0;
-    }
-    aSig = ( aSig | 0x00800000 )<<8;
-    z = aSig>>( - shiftCount );
-    if ( (bits32) ( aSig<<( shiftCount & 31 ) ) ) {
-        float_exception_flags |= float_flag_inexact;
-    }
-    return aSign ? - z : z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the double-precision floating-point format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float32_to_float64( float32 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 aSig;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return commonNaNToFloat64( float32ToCommonNaN( a ) );
-        return packFloat64( aSign, 0x7FF, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat64( aSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-        --aExp;
-    }
-    return packFloat64( aSign, aExp + 0x380, ( (bits64) aSig )<<29 );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the extended double-precision floating-point format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 float32_to_floatx80( float32 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 aSig;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return commonNaNToFloatx80( float32ToCommonNaN( a ) );
-        return packFloatx80( aSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloatx80( aSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    aSig |= 0x00800000;
-    return packFloatx80( aSign, aExp + 0x3F80, ( (bits64) aSig )<<40 );
-
-}
-
-#endif
-
-/*
--------------------------------------------------------------------------------
-Rounds the single-precision floating-point value `a' to an integer, and
-returns the result as a single-precision floating-point value.  The
-operation is performed according to the IEC/IEEE Standard for Binary
-Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 lastBitMask, roundBitsMask;
-    int8 roundingMode;
-    float32 z;
-
-    aExp = extractFloat32Exp( a );
-    if ( 0x96 <= aExp ) {
-        if ( ( aExp == 0xFF ) && extractFloat32Frac( a ) ) {
-            return propagateFloat32NaN( a, a );
-        }
-        return a;
-    }
-    if ( aExp <= 0x7E ) {
-        if ( (bits32) ( a<<1 ) == 0 ) return a;
-        float_exception_flags |= float_flag_inexact;
-        aSign = extractFloat32Sign( a );
-        switch ( float_rounding_mode ) {
-         case float_round_nearest_even:
-            if ( ( aExp == 0x7E ) && extractFloat32Frac( a ) ) {
-                return packFloat32( aSign, 0x7F, 0 );
-            }
-            break;
-         case float_round_down:
-            return aSign ? 0xBF800000 : 0;
-         case float_round_up:
-            return aSign ? 0x80000000 : 0x3F800000;
-        }
-        return packFloat32( aSign, 0, 0 );
-    }
-    lastBitMask = 1;
-    lastBitMask <<= 0x96 - aExp;
-    roundBitsMask = lastBitMask - 1;
-    z = a;
-    roundingMode = float_rounding_mode;
-    if ( roundingMode == float_round_nearest_even ) {
-        z += lastBitMask>>1;
-        if ( ( z & roundBitsMask ) == 0 ) z &= ~ lastBitMask;
-    }
-    else if ( roundingMode != float_round_to_zero ) {
-        if ( extractFloat32Sign( z ) ^ ( roundingMode == float_round_up ) ) {
-            z += roundBitsMask;
-        }
-    }
-    z &= ~ roundBitsMask;
-    if ( z != a ) float_exception_flags |= float_flag_inexact;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the absolute values of the single-precision
-floating-point values `a' and `b'.  If `zSign' is true, the sum is negated
-before being returned.  `zSign' is ignored if the result is a NaN.  The
-addition is performed according to the IEC/IEEE Standard for Binary
-Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float32 addFloat32Sigs( float32 a, float32 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 6;
-    bSig <<= 6;
-    if ( 0 < expDiff ) {
-        if ( aExp == 0xFF ) {
-            if ( aSig ) return propagateFloat32NaN( a, b );
-            return a;
-        }
-        if ( bExp == 0 ) {
-            --expDiff;
-        }
-        else {
-            bSig |= 0x20000000;
-        }
-        shift32RightJamming( bSig, expDiff, &bSig );
-        zExp = aExp;
-    }
-    else if ( expDiff < 0 ) {
-        if ( bExp == 0xFF ) {
-            if ( bSig ) return propagateFloat32NaN( a, b );
-            return packFloat32( zSign, 0xFF, 0 );
-        }
-        if ( aExp == 0 ) {
-            ++expDiff;
-        }
-        else {
-            aSig |= 0x20000000;
-        }
-        shift32RightJamming( aSig, - expDiff, &aSig );
-        zExp = bExp;
-    }
-    else {
-        if ( aExp == 0xFF ) {
-            if ( aSig | bSig ) return propagateFloat32NaN( a, b );
-            return a;
-        }
-        if ( aExp == 0 ) return packFloat32( zSign, 0, ( aSig + bSig )>>6 );
-        zSig = 0x40000000 + aSig + bSig;
-        zExp = aExp;
-        goto roundAndPack;
-    }
-    aSig |= 0x20000000;
-    zSig = ( aSig + bSig )<<1;
-    --zExp;
-    if ( (sbits32) zSig < 0 ) {
-        zSig = aSig + bSig;
-        ++zExp;
-    }
- roundAndPack:
-    return roundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the absolute values of the single-
-precision floating-point values `a' and `b'.  If `zSign' is true, the
-difference is negated before being returned.  `zSign' is ignored if the
-result is a NaN.  The subtraction is performed according to the IEC/IEEE
-Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float32 subFloat32Sigs( float32 a, float32 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 7;
-    bSig <<= 7;
-    if ( 0 < expDiff ) goto aExpBigger;
-    if ( expDiff < 0 ) goto bExpBigger;
-    if ( aExp == 0xFF ) {
-        if ( aSig | bSig ) return propagateFloat32NaN( a, b );
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( aExp == 0 ) {
-        aExp = 1;
-        bExp = 1;
-    }
-    if ( bSig < aSig ) goto aBigger;
-    if ( aSig < bSig ) goto bBigger;
-    return packFloat32( float_rounding_mode == float_round_down, 0, 0 );
- bExpBigger:
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        return packFloat32( zSign ^ 1, 0xFF, 0 );
-    }
-    if ( aExp == 0 ) {
-        ++expDiff;
-    }
-    else {
-        aSig |= 0x40000000;
-    }
-    shift32RightJamming( aSig, - expDiff, &aSig );
-    bSig |= 0x40000000;
- bBigger:
-    zSig = bSig - aSig;
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return propagateFloat32NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        --expDiff;
-    }
-    else {
-        bSig |= 0x40000000;
-    }
-    shift32RightJamming( bSig, expDiff, &bSig );
-    aSig |= 0x40000000;
- aBigger:
-    zSig = aSig - bSig;
-    zExp = aExp;
- normalizeRoundAndPack:
-    --zExp;
-    return normalizeRoundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the single-precision floating-point values `a'
-and `b'.  The operation is performed according to the IEC/IEEE Standard for
-Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_add( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign == bSign ) {
-        return addFloat32Sigs( a, b, aSign );
-    }
-    else {
-        return subFloat32Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the single-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_sub( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign == bSign ) {
-        return subFloat32Sigs( a, b, aSign );
-    }
-    else {
-        return addFloat32Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of multiplying the single-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_mul( float32 a, float32 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig;
-    bits64 zSig64;
-    bits32 zSig;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    bSign = extractFloat32Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0xFF ) {
-        if ( aSig || ( ( bExp == 0xFF ) && bSig ) ) {
-            return propagateFloat32NaN( a, b );
-        }
-        if ( ( bExp | bSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        return packFloat32( zSign, 0xFF, 0 );
-    }
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        if ( ( aExp | aSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        return packFloat32( zSign, 0xFF, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat32( zSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) return packFloat32( zSign, 0, 0 );
-        normalizeFloat32Subnormal( bSig, &bExp, &bSig );
-    }
-    zExp = aExp + bExp - 0x7F;
-    aSig = ( aSig | 0x00800000 )<<7;
-    bSig = ( bSig | 0x00800000 )<<8;
-    shift64RightJamming( ( (bits64) aSig ) * bSig, 32, &zSig64 );
-    zSig = zSig64;
-    if ( 0 <= (sbits32) ( zSig<<1 ) ) {
-        zSig <<= 1;
-        --zExp;
-    }
-    return roundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of dividing the single-precision floating-point value `a'
-by the corresponding value `b'.  The operation is performed according to the
-IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_div( float32 a, float32 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    bSign = extractFloat32Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return propagateFloat32NaN( a, b );
-        if ( bExp == 0xFF ) {
-            if ( bSig ) return propagateFloat32NaN( a, b );
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        return packFloat32( zSign, 0xFF, 0 );
-    }
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        return packFloat32( zSign, 0, 0 );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            if ( ( aExp | aSig ) == 0 ) {
-                float_raise( float_flag_invalid );
-                return float32_default_nan;
-            }
-            float_raise( float_flag_divbyzero );
-            return packFloat32( zSign, 0xFF, 0 );
-        }
-        normalizeFloat32Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat32( zSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = aExp - bExp + 0x7D;
-    aSig = ( aSig | 0x00800000 )<<7;
-    bSig = ( bSig | 0x00800000 )<<8;
-    if ( bSig <= ( aSig + aSig ) ) {
-        aSig >>= 1;
-        ++zExp;
-    }
-    zSig = ( ( (bits64) aSig )<<32 ) / bSig;
-    if ( ( zSig & 0x3F ) == 0 ) {
-        zSig |= ( ( (bits64) bSig ) * zSig != ( (bits64) aSig )<<32 );
-    }
-    return roundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the remainder of the single-precision floating-point value `a'
-with respect to the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_rem( float32 a, float32 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, expDiff;
-    bits32 aSig, bSig;
-    bits32 q;
-    bits64 aSig64, bSig64, q64;
-    bits32 alternateASig;
-    sbits32 sigMean;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    bSign = extractFloat32Sign( b );
-    if ( aExp == 0xFF ) {
-        if ( aSig || ( ( bExp == 0xFF ) && bSig ) ) {
-            return propagateFloat32NaN( a, b );
-        }
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        normalizeFloat32Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return a;
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    expDiff = aExp - bExp;
-    aSig |= 0x00800000;
-    bSig |= 0x00800000;
-    if ( expDiff < 32 ) {
-        aSig <<= 8;
-        bSig <<= 8;
-        if ( expDiff < 0 ) {
-            if ( expDiff < -1 ) return a;
-            aSig >>= 1;
-        }
-        q = ( bSig <= aSig );
-        if ( q ) aSig -= bSig;
-        if ( 0 < expDiff ) {
-            q = ( ( (bits64) aSig )<<32 ) / bSig;
-            q >>= 32 - expDiff;
-            bSig >>= 2;
-            aSig = ( ( aSig>>1 )<<( expDiff - 1 ) ) - bSig * q;
-        }
-        else {
-            aSig >>= 2;
-            bSig >>= 2;
-        }
-    }
-    else {
-        if ( bSig <= aSig ) aSig -= bSig;
-        aSig64 = ( (bits64) aSig )<<40;
-        bSig64 = ( (bits64) bSig )<<40;
-        expDiff -= 64;
-        while ( 0 < expDiff ) {
-            q64 = estimateDiv128To64( aSig64, 0, bSig64 );
-            q64 = ( 2 < q64 ) ? q64 - 2 : 0;
-            aSig64 = - ( ( bSig * q64 )<<38 );
-            expDiff -= 62;
-        }
-        expDiff += 64;
-        q64 = estimateDiv128To64( aSig64, 0, bSig64 );
-        q64 = ( 2 < q64 ) ? q64 - 2 : 0;
-        q = q64>>( 64 - expDiff );
-        bSig <<= 6;
-        aSig = ( ( aSig64>>33 )<<( expDiff - 1 ) ) - bSig * q;
-    }
-    do {
-        alternateASig = aSig;
-        ++q;
-        aSig -= bSig;
-    } while ( 0 <= (sbits32) aSig );
-    sigMean = aSig + alternateASig;
-    if ( ( sigMean < 0 ) || ( ( sigMean == 0 ) && ( q & 1 ) ) ) {
-        aSig = alternateASig;
-    }
-    zSign = ( (sbits32) aSig < 0 );
-    if ( zSign ) aSig = - aSig;
-    return normalizeRoundAndPackFloat32( aSign ^ zSign, bExp, aSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the square root of the single-precision floating-point value `a'.
-The operation is performed according to the IEC/IEEE Standard for Binary
-Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_sqrt( float32 a )
-{
-    flag aSign;
-    int16 aExp, zExp;
-    bits32 aSig, zSig;
-    bits64 rem, term;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return propagateFloat32NaN( a, 0 );
-        if ( ! aSign ) return a;
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( aSign ) {
-        if ( ( aExp | aSig ) == 0 ) return a;
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return 0;
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = ( ( aExp - 0x7F )>>1 ) + 0x7E;
-    aSig = ( aSig | 0x00800000 )<<8;
-    zSig = estimateSqrt32( aExp, aSig ) + 2;
-    if ( ( zSig & 0x7F ) <= 5 ) {
-        if ( zSig < 2 ) {
-            zSig = 0xFFFFFFFF;
-        }
-        else {
-            aSig >>= aExp & 1;
-            term = ( (bits64) zSig ) * zSig;
-            rem = ( ( (bits64) aSig )<<32 ) - term;
-            while ( (sbits64) rem < 0 ) {
-                --zSig;
-                rem += ( ( (bits64) zSig )<<1 ) | 1;
-            }
-            zSig |= ( rem != 0 );
-        }
-    }
-    shift32RightJamming( zSig, 1, &zSig );
-    return roundAndPackFloat32( 0, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is equal to the
-corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_eq( float32 a, float32 b )
-{
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    return ( a == b ) || ( (bits32) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than or
-equal to the corresponding value `b', and 0 otherwise.  The comparison is
-performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_le( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits32) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_lt( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits32) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is equal to the
-corresponding value `b', and 0 otherwise.  The invalid exception is raised
-if either operand is a NaN.  Otherwise, the comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_eq_signaling( float32 a, float32 b )
-{
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    return ( a == b ) || ( (bits32) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than or
-equal to the corresponding value `b', and 0 otherwise.  Quiet NaNs do not
-cause an exception.  Otherwise, the comparison is performed according to the
-IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_le_quiet( float32 a, float32 b )
-{
-    flag aSign, bSign;
-    //int16 aExp, bExp;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits32) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  Quiet NaNs do not cause an
-exception.  Otherwise, the comparison is performed according to the IEC/IEEE
-Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_lt_quiet( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits32) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 float64_to_int32( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits64 aSig;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( ( aExp == 0x7FF ) && aSig ) aSign = 0;
-    if ( aExp ) aSig |= LIT64( 0x0010000000000000 );
-    shiftCount = 0x42C - aExp;
-    if ( 0 < shiftCount ) shift64RightJamming( aSig, shiftCount, &aSig );
-    return roundAndPackInt32( aSign, aSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic, except that the conversion is always rounded toward zero.  If
-`a' is a NaN, the largest positive integer is returned.  Otherwise, if the
-conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int32 float64_to_int32_round_to_zero( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits64 aSig, savedASig;
-    int32 z;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    shiftCount = 0x433 - aExp;
-    if ( shiftCount < 21 ) {
-        if ( ( aExp == 0x7FF ) && aSig ) aSign = 0;
-        goto invalid;
-    }
-    else if ( 52 < shiftCount ) {
-        if ( aExp || aSig ) float_exception_flags |= float_flag_inexact;
-        return 0;
-    }
-    aSig |= LIT64( 0x0010000000000000 );
-    savedASig = aSig;
-    aSig >>= shiftCount;
-    z = aSig;
-    if ( aSign ) z = - z;
-    if ( ( z < 0 ) ^ aSign ) {
- invalid:
-        float_exception_flags |= float_flag_invalid;
-        return aSign ? 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( ( aSig<<shiftCount ) != savedASig ) {
-        float_exception_flags |= float_flag_inexact;
-    }
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 32-bit two's complement unsigned integer format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest positive integer is returned.
--------------------------------------------------------------------------------
-*/
-int32 float64_to_uint32( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits64 aSig;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = 0; //extractFloat64Sign( a );
-    //if ( ( aExp == 0x7FF ) && aSig ) aSign = 0;
-    if ( aExp ) aSig |= LIT64( 0x0010000000000000 );
-    shiftCount = 0x42C - aExp;
-    if ( 0 < shiftCount ) shift64RightJamming( aSig, shiftCount, &aSig );
-    return roundAndPackInt32( aSign, aSig );
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic, except that the conversion is always rounded toward zero.  If
-`a' is a NaN, the largest positive integer is returned.  Otherwise, if the
-conversion overflows, the largest positive integer is returned.
--------------------------------------------------------------------------------
-*/
-int32 float64_to_uint32_round_to_zero( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits64 aSig, savedASig;
-    int32 z;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    shiftCount = 0x433 - aExp;
-    if ( shiftCount < 21 ) {
-        if ( ( aExp == 0x7FF ) && aSig ) aSign = 0;
-        goto invalid;
-    }
-    else if ( 52 < shiftCount ) {
-        if ( aExp || aSig ) float_exception_flags |= float_flag_inexact;
-        return 0;
-    }
-    aSig |= LIT64( 0x0010000000000000 );
-    savedASig = aSig;
-    aSig >>= shiftCount;
-    z = aSig;
-    if ( aSign ) z = - z;
-    if ( ( z < 0 ) ^ aSign ) {
- invalid:
-        float_exception_flags |= float_flag_invalid;
-        return aSign ? 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( ( aSig<<shiftCount ) != savedASig ) {
-        float_exception_flags |= float_flag_inexact;
-    }
-    return z;
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the single-precision floating-point format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float64_to_float32( float64 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits64 aSig;
-    bits32 zSig;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return commonNaNToFloat32( float64ToCommonNaN( a ) );
-        return packFloat32( aSign, 0xFF, 0 );
-    }
-    shift64RightJamming( aSig, 22, &aSig );
-    zSig = aSig;
-    if ( aExp || zSig ) {
-        zSig |= 0x40000000;
-        aExp -= 0x381;
-    }
-    return roundAndPackFloat32( aSign, aExp, zSig );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the extended double-precision floating-point format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 float64_to_floatx80( float64 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits64 aSig;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return commonNaNToFloatx80( float64ToCommonNaN( a ) );
-        return packFloatx80( aSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloatx80( aSign, 0, 0 );
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-    }
-    return
-        packFloatx80(
-            aSign, aExp + 0x3C00, ( aSig | LIT64( 0x0010000000000000 ) )<<11 );
-
-}
-
-#endif
-
-/*
--------------------------------------------------------------------------------
-Rounds the double-precision floating-point value `a' to an integer, and
-returns the result as a double-precision floating-point value.  The
-operation is performed according to the IEC/IEEE Standard for Binary
-Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits64 lastBitMask, roundBitsMask;
-    int8 roundingMode;
-    float64 z;
-
-    aExp = extractFloat64Exp( a );
-    if ( 0x433 <= aExp ) {
-        if ( ( aExp == 0x7FF ) && extractFloat64Frac( a ) ) {
-            return propagateFloat64NaN( a, a );
-        }
-        return a;
-    }
-    if ( aExp <= 0x3FE ) {
-        if ( (bits64) ( a<<1 ) == 0 ) return a;
-        float_exception_flags |= float_flag_inexact;
-        aSign = extractFloat64Sign( a );
-        switch ( float_rounding_mode ) {
-         case float_round_nearest_even:
-            if ( ( aExp == 0x3FE ) && extractFloat64Frac( a ) ) {
-                return packFloat64( aSign, 0x3FF, 0 );
-            }
-            break;
-         case float_round_down:
-            return aSign ? LIT64( 0xBFF0000000000000 ) : 0;
-         case float_round_up:
-            return
-            aSign ? LIT64( 0x8000000000000000 ) : LIT64( 0x3FF0000000000000 );
-        }
-        return packFloat64( aSign, 0, 0 );
-    }
-    lastBitMask = 1;
-    lastBitMask <<= 0x433 - aExp;
-    roundBitsMask = lastBitMask - 1;
-    z = a;
-    roundingMode = float_rounding_mode;
-    if ( roundingMode == float_round_nearest_even ) {
-        z += lastBitMask>>1;
-        if ( ( z & roundBitsMask ) == 0 ) z &= ~ lastBitMask;
-    }
-    else if ( roundingMode != float_round_to_zero ) {
-        if ( extractFloat64Sign( z ) ^ ( roundingMode == float_round_up ) ) {
-            z += roundBitsMask;
-        }
-    }
-    z &= ~ roundBitsMask;
-    if ( z != a ) float_exception_flags |= float_flag_inexact;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the absolute values of the double-precision
-floating-point values `a' and `b'.  If `zSign' is true, the sum is negated
-before being returned.  `zSign' is ignored if the result is a NaN.  The
-addition is performed according to the IEC/IEEE Standard for Binary
-Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float64 addFloat64Sigs( float64 a, float64 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    bSig = extractFloat64Frac( b );
-    bExp = extractFloat64Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 9;
-    bSig <<= 9;
-    if ( 0 < expDiff ) {
-        if ( aExp == 0x7FF ) {
-            if ( aSig ) return propagateFloat64NaN( a, b );
-            return a;
-        }
-        if ( bExp == 0 ) {
-            --expDiff;
-        }
-        else {
-            bSig |= LIT64( 0x2000000000000000 );
-        }
-        shift64RightJamming( bSig, expDiff, &bSig );
-        zExp = aExp;
-    }
-    else if ( expDiff < 0 ) {
-        if ( bExp == 0x7FF ) {
-            if ( bSig ) return propagateFloat64NaN( a, b );
-            return packFloat64( zSign, 0x7FF, 0 );
-        }
-        if ( aExp == 0 ) {
-            ++expDiff;
-        }
-        else {
-            aSig |= LIT64( 0x2000000000000000 );
-        }
-        shift64RightJamming( aSig, - expDiff, &aSig );
-        zExp = bExp;
-    }
-    else {
-        if ( aExp == 0x7FF ) {
-            if ( aSig | bSig ) return propagateFloat64NaN( a, b );
-            return a;
-        }
-        if ( aExp == 0 ) return packFloat64( zSign, 0, ( aSig + bSig )>>9 );
-        zSig = LIT64( 0x4000000000000000 ) + aSig + bSig;
-        zExp = aExp;
-        goto roundAndPack;
-    }
-    aSig |= LIT64( 0x2000000000000000 );
-    zSig = ( aSig + bSig )<<1;
-    --zExp;
-    if ( (sbits64) zSig < 0 ) {
-        zSig = aSig + bSig;
-        ++zExp;
-    }
- roundAndPack:
-    return roundAndPackFloat64( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the absolute values of the double-
-precision floating-point values `a' and `b'.  If `zSign' is true, the
-difference is negated before being returned.  `zSign' is ignored if the
-result is a NaN.  The subtraction is performed according to the IEC/IEEE
-Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float64 subFloat64Sigs( float64 a, float64 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    bSig = extractFloat64Frac( b );
-    bExp = extractFloat64Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 10;
-    bSig <<= 10;
-    if ( 0 < expDiff ) goto aExpBigger;
-    if ( expDiff < 0 ) goto bExpBigger;
-    if ( aExp == 0x7FF ) {
-        if ( aSig | bSig ) return propagateFloat64NaN( a, b );
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( aExp == 0 ) {
-        aExp = 1;
-        bExp = 1;
-    }
-    if ( bSig < aSig ) goto aBigger;
-    if ( aSig < bSig ) goto bBigger;
-    return packFloat64( float_rounding_mode == float_round_down, 0, 0 );
- bExpBigger:
-    if ( bExp == 0x7FF ) {
-        if ( bSig ) return propagateFloat64NaN( a, b );
-        return packFloat64( zSign ^ 1, 0x7FF, 0 );
-    }
-    if ( aExp == 0 ) {
-        ++expDiff;
-    }
-    else {
-        aSig |= LIT64( 0x4000000000000000 );
-    }
-    shift64RightJamming( aSig, - expDiff, &aSig );
-    bSig |= LIT64( 0x4000000000000000 );
- bBigger:
-    zSig = bSig - aSig;
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return propagateFloat64NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        --expDiff;
-    }
-    else {
-        bSig |= LIT64( 0x4000000000000000 );
-    }
-    shift64RightJamming( bSig, expDiff, &bSig );
-    aSig |= LIT64( 0x4000000000000000 );
- aBigger:
-    zSig = aSig - bSig;
-    zExp = aExp;
- normalizeRoundAndPack:
-    --zExp;
-    return normalizeRoundAndPackFloat64( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the double-precision floating-point values `a'
-and `b'.  The operation is performed according to the IEC/IEEE Standard for
-Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_add( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign == bSign ) {
-        return addFloat64Sigs( a, b, aSign );
-    }
-    else {
-        return subFloat64Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the double-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_sub( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign == bSign ) {
-        return subFloat64Sigs( a, b, aSign );
-    }
-    else {
-        return addFloat64Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of multiplying the double-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_mul( float64 a, float64 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig0, zSig1;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    bSig = extractFloat64Frac( b );
-    bExp = extractFloat64Exp( b );
-    bSign = extractFloat64Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FF ) {
-        if ( aSig || ( ( bExp == 0x7FF ) && bSig ) ) {
-            return propagateFloat64NaN( a, b );
-        }
-        if ( ( bExp | bSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        return packFloat64( zSign, 0x7FF, 0 );
-    }
-    if ( bExp == 0x7FF ) {
-        if ( bSig ) return propagateFloat64NaN( a, b );
-        if ( ( aExp | aSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        return packFloat64( zSign, 0x7FF, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat64( zSign, 0, 0 );
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) return packFloat64( zSign, 0, 0 );
-        normalizeFloat64Subnormal( bSig, &bExp, &bSig );
-    }
-    zExp = aExp + bExp - 0x3FF;
-    aSig = ( aSig | LIT64( 0x0010000000000000 ) )<<10;
-    bSig = ( bSig | LIT64( 0x0010000000000000 ) )<<11;
-    mul64To128( aSig, bSig, &zSig0, &zSig1 );
-    zSig0 |= ( zSig1 != 0 );
-    if ( 0 <= (sbits64) ( zSig0<<1 ) ) {
-        zSig0 <<= 1;
-        --zExp;
-    }
-    return roundAndPackFloat64( zSign, zExp, zSig0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of dividing the double-precision floating-point value `a'
-by the corresponding value `b'.  The operation is performed according to
-the IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_div( float64 a, float64 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig;
-    bits64 rem0, rem1;
-    bits64 term0, term1;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    bSig = extractFloat64Frac( b );
-    bExp = extractFloat64Exp( b );
-    bSign = extractFloat64Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return propagateFloat64NaN( a, b );
-        if ( bExp == 0x7FF ) {
-            if ( bSig ) return propagateFloat64NaN( a, b );
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        return packFloat64( zSign, 0x7FF, 0 );
-    }
-    if ( bExp == 0x7FF ) {
-        if ( bSig ) return propagateFloat64NaN( a, b );
-        return packFloat64( zSign, 0, 0 );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            if ( ( aExp | aSig ) == 0 ) {
-                float_raise( float_flag_invalid );
-                return float64_default_nan;
-            }
-            float_raise( float_flag_divbyzero );
-            return packFloat64( zSign, 0x7FF, 0 );
-        }
-        normalizeFloat64Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat64( zSign, 0, 0 );
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = aExp - bExp + 0x3FD;
-    aSig = ( aSig | LIT64( 0x0010000000000000 ) )<<10;
-    bSig = ( bSig | LIT64( 0x0010000000000000 ) )<<11;
-    if ( bSig <= ( aSig + aSig ) ) {
-        aSig >>= 1;
-        ++zExp;
-    }
-    zSig = estimateDiv128To64( aSig, 0, bSig );
-    if ( ( zSig & 0x1FF ) <= 2 ) {
-        mul64To128( bSig, zSig, &term0, &term1 );
-        sub128( aSig, 0, term0, term1, &rem0, &rem1 );
-        while ( (sbits64) rem0 < 0 ) {
-            --zSig;
-            add128( rem0, rem1, 0, bSig, &rem0, &rem1 );
-        }
-        zSig |= ( rem1 != 0 );
-    }
-    return roundAndPackFloat64( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the remainder of the double-precision floating-point value `a'
-with respect to the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_rem( float64 a, float64 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, expDiff;
-    bits64 aSig, bSig;
-    bits64 q, alternateASig;
-    sbits64 sigMean;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    bSig = extractFloat64Frac( b );
-    bExp = extractFloat64Exp( b );
-    bSign = extractFloat64Sign( b );
-    if ( aExp == 0x7FF ) {
-        if ( aSig || ( ( bExp == 0x7FF ) && bSig ) ) {
-            return propagateFloat64NaN( a, b );
-        }
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( bExp == 0x7FF ) {
-        if ( bSig ) return propagateFloat64NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        normalizeFloat64Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return a;
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-    }
-    expDiff = aExp - bExp;
-    aSig = ( aSig | LIT64( 0x0010000000000000 ) )<<11;
-    bSig = ( bSig | LIT64( 0x0010000000000000 ) )<<11;
-    if ( expDiff < 0 ) {
-        if ( expDiff < -1 ) return a;
-        aSig >>= 1;
-    }
-    q = ( bSig <= aSig );
-    if ( q ) aSig -= bSig;
-    expDiff -= 64;
-    while ( 0 < expDiff ) {
-        q = estimateDiv128To64( aSig, 0, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        aSig = - ( ( bSig>>2 ) * q );
-        expDiff -= 62;
-    }
-    expDiff += 64;
-    if ( 0 < expDiff ) {
-        q = estimateDiv128To64( aSig, 0, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        q >>= 64 - expDiff;
-        bSig >>= 2;
-        aSig = ( ( aSig>>1 )<<( expDiff - 1 ) ) - bSig * q;
-    }
-    else {
-        aSig >>= 2;
-        bSig >>= 2;
-    }
-    do {
-        alternateASig = aSig;
-        ++q;
-        aSig -= bSig;
-    } while ( 0 <= (sbits64) aSig );
-    sigMean = aSig + alternateASig;
-    if ( ( sigMean < 0 ) || ( ( sigMean == 0 ) && ( q & 1 ) ) ) {
-        aSig = alternateASig;
-    }
-    zSign = ( (sbits64) aSig < 0 );
-    if ( zSign ) aSig = - aSig;
-    return normalizeRoundAndPackFloat64( aSign ^ zSign, bExp, aSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the square root of the double-precision floating-point value `a'.
-The operation is performed according to the IEC/IEEE Standard for Binary
-Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_sqrt( float64 a )
-{
-    flag aSign;
-    int16 aExp, zExp;
-    bits64 aSig, zSig;
-    bits64 rem0, rem1, term0, term1; //, shiftedRem;
-    //float64 z;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return propagateFloat64NaN( a, a );
-        if ( ! aSign ) return a;
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( aSign ) {
-        if ( ( aExp | aSig ) == 0 ) return a;
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return 0;
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = ( ( aExp - 0x3FF )>>1 ) + 0x3FE;
-    aSig |= LIT64( 0x0010000000000000 );
-    zSig = estimateSqrt32( aExp, aSig>>21 );
-    zSig <<= 31;
-    aSig <<= 9 - ( aExp & 1 );
-    zSig = estimateDiv128To64( aSig, 0, zSig ) + zSig + 2;
-    if ( ( zSig & 0x3FF ) <= 5 ) {
-        if ( zSig < 2 ) {
-            zSig = LIT64( 0xFFFFFFFFFFFFFFFF );
-        }
-        else {
-            aSig <<= 2;
-            mul64To128( zSig, zSig, &term0, &term1 );
-            sub128( aSig, 0, term0, term1, &rem0, &rem1 );
-            while ( (sbits64) rem0 < 0 ) {
-                --zSig;
-                shortShift128Left( 0, zSig, 1, &term0, &term1 );
-                term1 |= 1;
-                add128( rem0, rem1, term0, term1, &rem0, &rem1 );
-            }
-            zSig |= ( ( rem0 | rem1 ) != 0 );
-        }
-    }
-    shift64RightJamming( zSig, 1, &zSig );
-    return roundAndPackFloat64( 0, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is equal to the
-corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_eq( float64 a, float64 b )
-{
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    return ( a == b ) || ( (bits64) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than or
-equal to the corresponding value `b', and 0 otherwise.  The comparison is
-performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_le( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits64) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_lt( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits64) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is equal to the
-corresponding value `b', and 0 otherwise.  The invalid exception is raised
-if either operand is a NaN.  Otherwise, the comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_eq_signaling( float64 a, float64 b )
-{
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    return ( a == b ) || ( (bits64) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than or
-equal to the corresponding value `b', and 0 otherwise.  Quiet NaNs do not
-cause an exception.  Otherwise, the comparison is performed according to the
-IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_le_quiet( float64 a, float64 b )
-{
-    flag aSign, bSign;
-    //int16 aExp, bExp;
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits64) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  Quiet NaNs do not cause an
-exception.  Otherwise, the comparison is performed according to the IEC/IEEE
-Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_lt_quiet( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits64) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the 32-bit two's complement integer format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-point Arithmetic---which means in particular that the conversion
-is rounded according to the current rounding mode.  If `a' is a NaN, the
-largest positive integer is returned.  Otherwise, if the conversion
-overflows, the largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 floatx80_to_int32( floatx80 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( ( aExp == 0x7FFF ) && (bits64) ( aSig<<1 ) ) aSign = 0;
-    shiftCount = 0x4037 - aExp;
-    if ( shiftCount <= 0 ) shiftCount = 1;
-    shift64RightJamming( aSig, shiftCount, &aSig );
-    return roundAndPackInt32( aSign, aSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the 32-bit two's complement integer format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-point Arithmetic, except that the conversion is always rounded
-toward zero.  If `a' is a NaN, the largest positive integer is returned.
-Otherwise, if the conversion overflows, the largest integer with the same
-sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 floatx80_to_int32_round_to_zero( floatx80 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig, savedASig;
-    int32 z;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    shiftCount = 0x403E - aExp;
-    if ( shiftCount < 32 ) {
-        if ( ( aExp == 0x7FFF ) && (bits64) ( aSig<<1 ) ) aSign = 0;
-        goto invalid;
-    }
-    else if ( 63 < shiftCount ) {
-        if ( aExp || aSig ) float_exception_flags |= float_flag_inexact;
-        return 0;
-    }
-    savedASig = aSig;
-    aSig >>= shiftCount;
-    z = aSig;
-    if ( aSign ) z = - z;
-    if ( ( z < 0 ) ^ aSign ) {
- invalid:
-        float_exception_flags |= float_flag_invalid;
-        return aSign ? 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( ( aSig<<shiftCount ) != savedASig ) {
-        float_exception_flags |= float_flag_inexact;
-    }
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the single-precision floating-point format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 floatx80_to_float32( floatx80 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 aSig;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( aSig<<1 ) ) {
-            return commonNaNToFloat32( floatx80ToCommonNaN( a ) );
-        }
-        return packFloat32( aSign, 0xFF, 0 );
-    }
-    shift64RightJamming( aSig, 33, &aSig );
-    if ( aExp || aSig ) aExp -= 0x3F81;
-    return roundAndPackFloat32( aSign, aExp, aSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the double-precision floating-point format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 floatx80_to_float64( floatx80 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 aSig, zSig;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( aSig<<1 ) ) {
-            return commonNaNToFloat64( floatx80ToCommonNaN( a ) );
-        }
-        return packFloat64( aSign, 0x7FF, 0 );
-    }
-    shift64RightJamming( aSig, 1, &zSig );
-    if ( aExp || aSig ) aExp -= 0x3C01;
-    return roundAndPackFloat64( aSign, aExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Rounds the extended double-precision floating-point value `a' to an integer,
-and returns the result as an extended quadruple-precision floating-point
-value.  The operation is performed according to the IEC/IEEE Standard for
-Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 lastBitMask, roundBitsMask;
-    int8 roundingMode;
-    floatx80 z;
-
-    aExp = extractFloatx80Exp( a );
-    if ( 0x403E <= aExp ) {
-        if ( ( aExp == 0x7FFF ) && (bits64) ( extractFloatx80Frac( a )<<1 ) ) {
-            return propagateFloatx80NaN( a, a );
-        }
-        return a;
-    }
-    if ( aExp <= 0x3FFE ) {
-        if (    ( aExp == 0 )
-             && ( (bits64) ( extractFloatx80Frac( a )<<1 ) == 0 ) ) {
-            return a;
-        }
-        float_exception_flags |= float_flag_inexact;
-        aSign = extractFloatx80Sign( a );
-        switch ( float_rounding_mode ) {
-         case float_round_nearest_even:
-            if ( ( aExp == 0x3FFE ) && (bits64) ( extractFloatx80Frac( a )<<1 )
-               ) {
-                return
-                    packFloatx80( aSign, 0x3FFF, LIT64( 0x8000000000000000 ) );
-            }
-            break;
-         case float_round_down:
-            return
-                  aSign ?
-                      packFloatx80( 1, 0x3FFF, LIT64( 0x8000000000000000 ) )
-                : packFloatx80( 0, 0, 0 );
-         case float_round_up:
-            return
-                  aSign ? packFloatx80( 1, 0, 0 )
-                : packFloatx80( 0, 0x3FFF, LIT64( 0x8000000000000000 ) );
-        }
-        return packFloatx80( aSign, 0, 0 );
-    }
-    lastBitMask = 1;
-    lastBitMask <<= 0x403E - aExp;
-    roundBitsMask = lastBitMask - 1;
-    z = a;
-    roundingMode = float_rounding_mode;
-    if ( roundingMode == float_round_nearest_even ) {
-        z.low += lastBitMask>>1;
-        if ( ( z.low & roundBitsMask ) == 0 ) z.low &= ~ lastBitMask;
-    }
-    else if ( roundingMode != float_round_to_zero ) {
-        if ( extractFloatx80Sign( z ) ^ ( roundingMode == float_round_up ) ) {
-            z.low += roundBitsMask;
-        }
-    }
-    z.low &= ~ roundBitsMask;
-    if ( z.low == 0 ) {
-        ++z.high;
-        z.low = LIT64( 0x8000000000000000 );
-    }
-    if ( z.low != a.low ) float_exception_flags |= float_flag_inexact;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the absolute values of the extended double-
-precision floating-point values `a' and `b'.  If `zSign' is true, the sum is
-negated before being returned.  `zSign' is ignored if the result is a NaN.
-The addition is performed according to the IEC/IEEE Standard for Binary
-Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static floatx80 addFloatx80Sigs( floatx80 a, floatx80 b, flag zSign )
-{
-    int32 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig0, zSig1;
-    int32 expDiff;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    bSig = extractFloatx80Frac( b );
-    bExp = extractFloatx80Exp( b );
-    expDiff = aExp - bExp;
-    if ( 0 < expDiff ) {
-        if ( aExp == 0x7FFF ) {
-            if ( (bits64) ( aSig<<1 ) ) return propagateFloatx80NaN( a, b );
-            return a;
-        }
-        if ( bExp == 0 ) --expDiff;
-        shift64ExtraRightJamming( bSig, 0, expDiff, &bSig, &zSig1 );
-        zExp = aExp;
-    }
-    else if ( expDiff < 0 ) {
-        if ( bExp == 0x7FFF ) {
-            if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-            return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-        }
-        if ( aExp == 0 ) ++expDiff;
-        shift64ExtraRightJamming( aSig, 0, - expDiff, &aSig, &zSig1 );
-        zExp = bExp;
-    }
-    else {
-        if ( aExp == 0x7FFF ) {
-            if ( (bits64) ( ( aSig | bSig )<<1 ) ) {
-                return propagateFloatx80NaN( a, b );
-            }
-            return a;
-        }
-        zSig1 = 0;
-        zSig0 = aSig + bSig;
-        if ( aExp == 0 ) {
-            normalizeFloatx80Subnormal( zSig0, &zExp, &zSig0 );
-            goto roundAndPack;
-        }
-        zExp = aExp;
-        goto shiftRight1;
-    }
-    
-    zSig0 = aSig + bSig;
-
-    if ( (sbits64) zSig0 < 0 ) goto roundAndPack; 
- shiftRight1:
-    shift64ExtraRightJamming( zSig0, zSig1, 1, &zSig0, &zSig1 );
-    zSig0 |= LIT64( 0x8000000000000000 );
-    ++zExp;
- roundAndPack:
-    return
-        roundAndPackFloatx80(
-            floatx80_rounding_precision, zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the absolute values of the extended
-double-precision floating-point values `a' and `b'.  If `zSign' is true,
-the difference is negated before being returned.  `zSign' is ignored if the
-result is a NaN.  The subtraction is performed according to the IEC/IEEE
-Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static floatx80 subFloatx80Sigs( floatx80 a, floatx80 b, flag zSign )
-{
-    int32 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig0, zSig1;
-    int32 expDiff;
-    floatx80 z;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    bSig = extractFloatx80Frac( b );
-    bExp = extractFloatx80Exp( b );
-    expDiff = aExp - bExp;
-    if ( 0 < expDiff ) goto aExpBigger;
-    if ( expDiff < 0 ) goto bExpBigger;
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( ( aSig | bSig )<<1 ) ) {
-            return propagateFloatx80NaN( a, b );
-        }
-        float_raise( float_flag_invalid );
-        z.low = floatx80_default_nan_low;
-        z.high = floatx80_default_nan_high;
-        return z;
-    }
-    if ( aExp == 0 ) {
-        aExp = 1;
-        bExp = 1;
-    }
-    zSig1 = 0;
-    if ( bSig < aSig ) goto aBigger;
-    if ( aSig < bSig ) goto bBigger;
-    return packFloatx80( float_rounding_mode == float_round_down, 0, 0 );
- bExpBigger:
-    if ( bExp == 0x7FFF ) {
-        if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        return packFloatx80( zSign ^ 1, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( aExp == 0 ) ++expDiff;
-    shift128RightJamming( aSig, 0, - expDiff, &aSig, &zSig1 );
- bBigger:
-    sub128( bSig, 0, aSig, zSig1, &zSig0, &zSig1 );
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( aSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) --expDiff;
-    shift128RightJamming( bSig, 0, expDiff, &bSig, &zSig1 );
- aBigger:
-    sub128( aSig, 0, bSig, zSig1, &zSig0, &zSig1 );
-    zExp = aExp;
- normalizeRoundAndPack:
-    return
-        normalizeRoundAndPackFloatx80(
-            floatx80_rounding_precision, zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the extended double-precision floating-point
-values `a' and `b'.  The operation is performed according to the IEC/IEEE
-Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_add( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-    
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign == bSign ) {
-        return addFloatx80Sigs( a, b, aSign );
-    }
-    else {
-        return subFloatx80Sigs( a, b, aSign );
-    }
-    
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the extended double-precision floating-
-point values `a' and `b'.  The operation is performed according to the
-IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_sub( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign == bSign ) {
-        return subFloatx80Sigs( a, b, aSign );
-    }
-    else {
-        return addFloatx80Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of multiplying the extended double-precision floating-
-point values `a' and `b'.  The operation is performed according to the
-IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_mul( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign, zSign;
-    int32 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig0, zSig1;
-    floatx80 z;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    bSig = extractFloatx80Frac( b );
-    bExp = extractFloatx80Exp( b );
-    bSign = extractFloatx80Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FFF ) {
-        if (    (bits64) ( aSig<<1 )
-             || ( ( bExp == 0x7FFF ) && (bits64) ( bSig<<1 ) ) ) {
-            return propagateFloatx80NaN( a, b );
-        }
-        if ( ( bExp | bSig ) == 0 ) goto invalid;
-        return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( bExp == 0x7FFF ) {
-        if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        if ( ( aExp | aSig ) == 0 ) {
- invalid:
-            float_raise( float_flag_invalid );
-            z.low = floatx80_default_nan_low;
-            z.high = floatx80_default_nan_high;
-            return z;
-        }
-        return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloatx80( zSign, 0, 0 );
-        normalizeFloatx80Subnormal( aSig, &aExp, &aSig );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) return packFloatx80( zSign, 0, 0 );
-        normalizeFloatx80Subnormal( bSig, &bExp, &bSig );
-    }
-    zExp = aExp + bExp - 0x3FFE;
-    mul64To128( aSig, bSig, &zSig0, &zSig1 );
-    if ( 0 < (sbits64) zSig0 ) {
-        shortShift128Left( zSig0, zSig1, 1, &zSig0, &zSig1 );
-        --zExp;
-    }
-    return
-        roundAndPackFloatx80(
-            floatx80_rounding_precision, zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of dividing the extended double-precision floating-point
-value `a' by the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_div( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign, zSign;
-    int32 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig0, zSig1;
-    bits64 rem0, rem1, rem2, term0, term1, term2;
-    floatx80 z;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    bSig = extractFloatx80Frac( b );
-    bExp = extractFloatx80Exp( b );
-    bSign = extractFloatx80Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( aSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        if ( bExp == 0x7FFF ) {
-            if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-            goto invalid;
-        }
-        return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( bExp == 0x7FFF ) {
-        if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        return packFloatx80( zSign, 0, 0 );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            if ( ( aExp | aSig ) == 0 ) {
- invalid:
-                float_raise( float_flag_invalid );
-                z.low = floatx80_default_nan_low;
-                z.high = floatx80_default_nan_high;
-                return z;
-            }
-            float_raise( float_flag_divbyzero );
-            return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-        }
-        normalizeFloatx80Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloatx80( zSign, 0, 0 );
-        normalizeFloatx80Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = aExp - bExp + 0x3FFE;
-    rem1 = 0;
-    if ( bSig <= aSig ) {
-        shift128Right( aSig, 0, 1, &aSig, &rem1 );
-        ++zExp;
-    }
-    zSig0 = estimateDiv128To64( aSig, rem1, bSig );
-    mul64To128( bSig, zSig0, &term0, &term1 );
-    sub128( aSig, rem1, term0, term1, &rem0, &rem1 );
-    while ( (sbits64) rem0 < 0 ) {
-        --zSig0;
-        add128( rem0, rem1, 0, bSig, &rem0, &rem1 );
-    }
-    zSig1 = estimateDiv128To64( rem1, 0, bSig );
-    if ( (bits64) ( zSig1<<1 ) <= 8 ) {
-        mul64To128( bSig, zSig1, &term1, &term2 );
-        sub128( rem1, 0, term1, term2, &rem1, &rem2 );
-        while ( (sbits64) rem1 < 0 ) {
-            --zSig1;
-            add128( rem1, rem2, 0, bSig, &rem1, &rem2 );
-        }
-        zSig1 |= ( ( rem1 | rem2 ) != 0 );
-    }
-    return
-        roundAndPackFloatx80(
-            floatx80_rounding_precision, zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the remainder of the extended double-precision floating-point value
-`a' with respect to the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_rem( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign, zSign;
-    int32 aExp, bExp, expDiff;
-    bits64 aSig0, aSig1, bSig;
-    bits64 q, term0, term1, alternateASig0, alternateASig1;
-    floatx80 z;
-
-    aSig0 = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    bSig = extractFloatx80Frac( b );
-    bExp = extractFloatx80Exp( b );
-    bSign = extractFloatx80Sign( b );
-    if ( aExp == 0x7FFF ) {
-        if (    (bits64) ( aSig0<<1 )
-             || ( ( bExp == 0x7FFF ) && (bits64) ( bSig<<1 ) ) ) {
-            return propagateFloatx80NaN( a, b );
-        }
-        goto invalid;
-    }
-    if ( bExp == 0x7FFF ) {
-        if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
- invalid:
-            float_raise( float_flag_invalid );
-            z.low = floatx80_default_nan_low;
-            z.high = floatx80_default_nan_high;
-            return z;
-        }
-        normalizeFloatx80Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( (bits64) ( aSig0<<1 ) == 0 ) return a;
-        normalizeFloatx80Subnormal( aSig0, &aExp, &aSig0 );
-    }
-    bSig |= LIT64( 0x8000000000000000 );
-    zSign = aSign;
-    expDiff = aExp - bExp;
-    aSig1 = 0;
-    if ( expDiff < 0 ) {
-        if ( expDiff < -1 ) return a;
-        shift128Right( aSig0, 0, 1, &aSig0, &aSig1 );
-        expDiff = 0;
-    }
-    q = ( bSig <= aSig0 );
-    if ( q ) aSig0 -= bSig;
-    expDiff -= 64;
-    while ( 0 < expDiff ) {
-        q = estimateDiv128To64( aSig0, aSig1, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        mul64To128( bSig, q, &term0, &term1 );
-        sub128( aSig0, aSig1, term0, term1, &aSig0, &aSig1 );
-        shortShift128Left( aSig0, aSig1, 62, &aSig0, &aSig1 );
-        expDiff -= 62;
-    }
-    expDiff += 64;
-    if ( 0 < expDiff ) {
-        q = estimateDiv128To64( aSig0, aSig1, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        q >>= 64 - expDiff;
-        mul64To128( bSig, q<<( 64 - expDiff ), &term0, &term1 );
-        sub128( aSig0, aSig1, term0, term1, &aSig0, &aSig1 );
-        shortShift128Left( 0, bSig, 64 - expDiff, &term0, &term1 );
-        while ( le128( term0, term1, aSig0, aSig1 ) ) {
-            ++q;
-            sub128( aSig0, aSig1, term0, term1, &aSig0, &aSig1 );
-        }
-    }
-    else {
-        term1 = 0;
-        term0 = bSig;
-    }
-    sub128( term0, term1, aSig0, aSig1, &alternateASig0, &alternateASig1 );
-    if (    lt128( alternateASig0, alternateASig1, aSig0, aSig1 )
-         || (    eq128( alternateASig0, alternateASig1, aSig0, aSig1 )
-              && ( q & 1 ) )
-       ) {
-        aSig0 = alternateASig0;
-        aSig1 = alternateASig1;
-        zSign = ! zSign;
-    }
-    return
-        normalizeRoundAndPackFloatx80(
-            80, zSign, bExp + expDiff, aSig0, aSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the square root of the extended double-precision floating-point
-value `a'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_sqrt( floatx80 a )
-{
-    flag aSign;
-    int32 aExp, zExp;
-    bits64 aSig0, aSig1, zSig0, zSig1;
-    bits64 rem0, rem1, rem2, rem3, term0, term1, term2, term3;
-    bits64 shiftedRem0, shiftedRem1;
-    floatx80 z;
-
-    aSig0 = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( aSig0<<1 ) ) return propagateFloatx80NaN( a, a );
-        if ( ! aSign ) return a;
-        goto invalid;
-    }
-    if ( aSign ) {
-        if ( ( aExp | aSig0 ) == 0 ) return a;
- invalid:
-        float_raise( float_flag_invalid );
-        z.low = floatx80_default_nan_low;
-        z.high = floatx80_default_nan_high;
-        return z;
-    }
-    if ( aExp == 0 ) {
-        if ( aSig0 == 0 ) return packFloatx80( 0, 0, 0 );
-        normalizeFloatx80Subnormal( aSig0, &aExp, &aSig0 );
-    }
-    zExp = ( ( aExp - 0x3FFF )>>1 ) + 0x3FFF;
-    zSig0 = estimateSqrt32( aExp, aSig0>>32 );
-    zSig0 <<= 31;
-    aSig1 = 0;
-    shift128Right( aSig0, 0, ( aExp & 1 ) + 2, &aSig0, &aSig1 );
-    zSig0 = estimateDiv128To64( aSig0, aSig1, zSig0 ) + zSig0 + 4;
-    if ( 0 <= (sbits64) zSig0 ) zSig0 = LIT64( 0xFFFFFFFFFFFFFFFF );
-    shortShift128Left( aSig0, aSig1, 2, &aSig0, &aSig1 );
-    mul64To128( zSig0, zSig0, &term0, &term1 );
-    sub128( aSig0, aSig1, term0, term1, &rem0, &rem1 );
-    while ( (sbits64) rem0 < 0 ) {
-        --zSig0;
-        shortShift128Left( 0, zSig0, 1, &term0, &term1 );
-        term1 |= 1;
-        add128( rem0, rem1, term0, term1, &rem0, &rem1 );
-    }
-    shortShift128Left( rem0, rem1, 63, &shiftedRem0, &shiftedRem1 );
-    zSig1 = estimateDiv128To64( shiftedRem0, shiftedRem1, zSig0 );
-    if ( (bits64) ( zSig1<<1 ) <= 10 ) {
-        if ( zSig1 == 0 ) zSig1 = 1;
-        mul64To128( zSig0, zSig1, &term1, &term2 );
-        shortShift128Left( term1, term2, 1, &term1, &term2 );
-        sub128( rem1, 0, term1, term2, &rem1, &rem2 );
-        mul64To128( zSig1, zSig1, &term2, &term3 );
-        sub192( rem1, rem2, 0, 0, term2, term3, &rem1, &rem2, &rem3 );
-        while ( (sbits64) rem1 < 0 ) {
-            --zSig1;
-            shortShift192Left( 0, zSig0, zSig1, 1, &term1, &term2, &term3 );
-            term3 |= 1;
-            add192(
-                rem1, rem2, rem3, term1, term2, term3, &rem1, &rem2, &rem3 );
-        }
-        zSig1 |= ( ( rem1 | rem2 | rem3 ) != 0 );
-    }
-    return
-        roundAndPackFloatx80(
-            floatx80_rounding_precision, 0, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is
-equal to the corresponding value `b', and 0 otherwise.  The comparison is
-performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_eq( floatx80 a, floatx80 b )
-{
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        if (    floatx80_is_signaling_nan( a )
-             || floatx80_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    return
-           ( a.low == b.low )
-        && (    ( a.high == b.high )
-             || (    ( a.low == 0 )
-                  && ( (bits16) ( ( a.high | b.high )<<1 ) == 0 ) )
-           );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is
-less than or equal to the corresponding value `b', and 0 otherwise.  The
-comparison is performed according to the IEC/IEEE Standard for Binary
-Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_le( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            || (    ( ( (bits16) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 == 0 );
-    }
-    return
-          aSign ? le128( b.high, b.low, a.high, a.low )
-        : le128( a.high, a.low, b.high, b.low );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is
-less than the corresponding value `b', and 0 otherwise.  The comparison
-is performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_lt( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            && (    ( ( (bits16) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 != 0 );
-    }
-    return
-          aSign ? lt128( b.high, b.low, a.high, a.low )
-        : lt128( a.high, a.low, b.high, b.low );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is equal
-to the corresponding value `b', and 0 otherwise.  The invalid exception is
-raised if either operand is a NaN.  Otherwise, the comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_eq_signaling( floatx80 a, floatx80 b )
-{
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    return
-           ( a.low == b.low )
-        && (    ( a.high == b.high )
-             || (    ( a.low == 0 )
-                  && ( (bits16) ( ( a.high | b.high )<<1 ) == 0 ) )
-           );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is less
-than or equal to the corresponding value `b', and 0 otherwise.  Quiet NaNs
-do not cause an exception.  Otherwise, the comparison is performed according
-to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_le_quiet( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        if (    floatx80_is_signaling_nan( a )
-             || floatx80_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            || (    ( ( (bits16) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 == 0 );
-    }
-    return
-          aSign ? le128( b.high, b.low, a.high, a.low )
-        : le128( a.high, a.low, b.high, b.low );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is less
-than the corresponding value `b', and 0 otherwise.  Quiet NaNs do not cause
-an exception.  Otherwise, the comparison is performed according to the
-IEC/IEEE Standard for Binary Floating-point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_lt_quiet( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        if (    floatx80_is_signaling_nan( a )
-             || floatx80_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            && (    ( ( (bits16) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 != 0 );
-    }
-    return
-          aSign ? lt128( b.high, b.low, a.high, a.low )
-        : lt128( a.high, a.low, b.high, b.low );
-
-}
-
-#endif
-
diff --git a/arch/arm26/nwfpe/softfloat.h b/arch/arm26/nwfpe/softfloat.h
deleted file mode 100644
index 22c2193a4997..000000000000
--- a/arch/arm26/nwfpe/softfloat.h
+++ /dev/null
@@ -1,232 +0,0 @@
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/softfloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these three paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-#ifndef __SOFTFLOAT_H__
-#define __SOFTFLOAT_H__
-
-/*
--------------------------------------------------------------------------------
-The macro `FLOATX80' must be defined to enable the extended double-precision
-floating-point format `floatx80'.  If this macro is not defined, the
-`floatx80' type will not be defined, and none of the functions that either
-input or output the `floatx80' type will be defined.
--------------------------------------------------------------------------------
-*/
-#define FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point types.
--------------------------------------------------------------------------------
-*/
-typedef unsigned long int float32;
-typedef unsigned long long float64;
-typedef struct {
-    unsigned short high;
-    unsigned long long low;
-} floatx80;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point underflow tininess-detection mode.
--------------------------------------------------------------------------------
-*/
-extern signed char float_detect_tininess;
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point rounding mode.
--------------------------------------------------------------------------------
-*/
-extern signed char float_rounding_mode;
-enum {
-    float_round_nearest_even = 0,
-    float_round_to_zero      = 1,
-    float_round_down         = 2,
-    float_round_up           = 3
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point exception flags.
--------------------------------------------------------------------------------
-extern signed char float_exception_flags;
-enum {
-    float_flag_inexact   =  1,
-    float_flag_underflow =  2,
-    float_flag_overflow  =  4,
-    float_flag_divbyzero =  8,
-    float_flag_invalid   = 16
-};
-
-ScottB: November 4, 1998
-Changed the enumeration to match the bit order in the FPA11.
-*/
-
-extern signed char float_exception_flags;
-enum {
-    float_flag_invalid   =  1,
-    float_flag_divbyzero =  2,
-    float_flag_overflow  =  4,
-    float_flag_underflow =  8,
-    float_flag_inexact   = 16
-};
-
-/*
--------------------------------------------------------------------------------
-Routine to raise any or all of the software IEC/IEEE floating-point
-exception flags.
--------------------------------------------------------------------------------
-*/
-void float_raise( signed char );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE integer-to-floating-point conversion routines.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( signed int );
-float64 int32_to_float64( signed int );
-#ifdef FLOATX80
-floatx80 int32_to_floatx80( signed int );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-signed int float32_to_int32( float32 );
-signed int float32_to_int32_round_to_zero( float32 );
-float64 float32_to_float64( float32 );
-#ifdef FLOATX80
-floatx80 float32_to_floatx80( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision operations.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 );
-float32 float32_add( float32, float32 );
-float32 float32_sub( float32, float32 );
-float32 float32_mul( float32, float32 );
-float32 float32_div( float32, float32 );
-float32 float32_rem( float32, float32 );
-float32 float32_sqrt( float32 );
-char float32_eq( float32, float32 );
-char float32_le( float32, float32 );
-char float32_lt( float32, float32 );
-char float32_eq_signaling( float32, float32 );
-char float32_le_quiet( float32, float32 );
-char float32_lt_quiet( float32, float32 );
-char float32_is_signaling_nan( float32 );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-signed int float64_to_int32( float64 );
-signed int float64_to_int32_round_to_zero( float64 );
-float32 float64_to_float32( float64 );
-#ifdef FLOATX80
-floatx80 float64_to_floatx80( float64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision operations.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 );
-float64 float64_add( float64, float64 );
-float64 float64_sub( float64, float64 );
-float64 float64_mul( float64, float64 );
-float64 float64_div( float64, float64 );
-float64 float64_rem( float64, float64 );
-float64 float64_sqrt( float64 );
-char float64_eq( float64, float64 );
-char float64_le( float64, float64 );
-char float64_lt( float64, float64 );
-char float64_eq_signaling( float64, float64 );
-char float64_le_quiet( float64, float64 );
-char float64_lt_quiet( float64, float64 );
-char float64_is_signaling_nan( float64 );
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-signed int floatx80_to_int32( floatx80 );
-signed int floatx80_to_int32_round_to_zero( floatx80 );
-float32 floatx80_to_float32( floatx80 );
-float64 floatx80_to_float64( floatx80 );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision rounding precision.  Valid
-values are 32, 64, and 80.
--------------------------------------------------------------------------------
-*/
-extern signed char floatx80_rounding_precision;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision operations.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 );
-floatx80 floatx80_add( floatx80, floatx80 );
-floatx80 floatx80_sub( floatx80, floatx80 );
-floatx80 floatx80_mul( floatx80, floatx80 );
-floatx80 floatx80_div( floatx80, floatx80 );
-floatx80 floatx80_rem( floatx80, floatx80 );
-floatx80 floatx80_sqrt( floatx80 );
-char floatx80_eq( floatx80, floatx80 );
-char floatx80_le( floatx80, floatx80 );
-char floatx80_lt( floatx80, floatx80 );
-char floatx80_eq_signaling( floatx80, floatx80 );
-char floatx80_le_quiet( floatx80, floatx80 );
-char floatx80_lt_quiet( floatx80, floatx80 );
-char floatx80_is_signaling_nan( floatx80 );
-
-#endif
-
-#endif
diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c
index 0b581e3cf7c7..6d51f133fb23 100644
--- a/arch/frv/mb93090-mb00/pci-vdk.c
+++ b/arch/frv/mb93090-mb00/pci-vdk.c
@@ -400,7 +400,8 @@ int __init pcibios_init(void)
         __reg_MB86943_pci_sl_mem_base   = __region_CS2 + 0x08000000;
         mb();
 
-        *(volatile unsigned long *)(__region_CS2+0x01300014) == 1;
+        /* enable PCI arbitration */
+        __reg_MB86943_pci_arbiter       = MB86943_PCIARB_EN;
 
         ioport_resource.start   = (__reg_MB86943_sl_pci_io_base << 9) & 0xfffffc00;
         ioport_resource.end     = (__reg_MB86943_sl_pci_io_range << 9) | 0x3ff;
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 5c8a845a4129..f9524933258a 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -458,8 +458,7 @@ config MICROCODE
         tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
         select FW_LOADER
         ---help---
-          If you say Y here and also to "/dev file system support" in the
-          'File systems' section, you will be able to update the microcode on
+          If you say Y here, you will be able to update the microcode on
           Intel processors in the IA32 family, e.g. Pentium Pro, Pentium II,
           Pentium III, Pentium 4, Xeon etc.  You will obviously need the
           actual microcode binary data itself which is not shipped with the
diff --git a/arch/i386/boot/code16gcc.h b/arch/i386/boot/code16gcc.h
index 3bd848093b9d..d93e48010b61 100644
--- a/arch/i386/boot/code16gcc.h
+++ b/arch/i386/boot/code16gcc.h
@@ -2,7 +2,7 @@
  * code16gcc.h
  *
  * This file is -include'd when compiling 16-bit C code.
- * Note: this asm() needs to be emitted before gcc omits any code.
+ * Note: this asm() needs to be emitted before gcc emits any code.
  * Depending on gcc version, this requires -fno-unit-at-a-time or
  * -fno-toplevel-reorder.
  *
diff --git a/arch/i386/boot/edd.c b/arch/i386/boot/edd.c
index 25a282494f4c..77d92daf7923 100644
--- a/arch/i386/boot/edd.c
+++ b/arch/i386/boot/edd.c
@@ -72,17 +72,18 @@ static u32 read_mbr_sig(u8 devno, struct edd_info *ei)
         u32 mbrsig;
         u32 buf_base, mbr_base;
         extern char _end[];
-        static char mbr_buf[1024];
 
         sector_size = ei->params.bytes_per_sector;
         if (!sector_size)
                 sector_size = 512; /* Best available guess */
 
+        /* Produce a naturally aligned buffer on the heap */
         buf_base = (ds() << 4) + (u32)&_end;
         mbr_base = (buf_base+sector_size-1) & ~(sector_size-1);
-        mbrbuf_ptr = mbr_buf + (mbr_base-buf_base);
+        mbrbuf_ptr = _end + (mbr_base-buf_base);
         mbrbuf_end = mbrbuf_ptr + sector_size;
 
+        /* Make sure we actually have space on the heap... */
         if (!(boot_params.hdr.loadflags & CAN_USE_HEAP))
                 return 0;
         if (mbrbuf_end > (char *)(size_t)boot_params.hdr.heap_end_ptr)
diff --git a/arch/i386/boot/header.S b/arch/i386/boot/header.S
index 6b9923fb6eae..7f4a2c53bd76 100644
--- a/arch/i386/boot/header.S
+++ b/arch/i386/boot/header.S
@@ -225,7 +225,7 @@ start_of_setup:
         int     $0x13
 #endif
 
-# We will have entired with %cs = %ds+0x20, normalize %cs so
+# We will have entered with %cs = %ds+0x20, normalize %cs so
 # it is on par with the other segments.
         pushw   %ds
         pushw   $setup2
@@ -280,4 +280,4 @@ die:
         .section ".initdata", "a"
 setup_corrupt:
         .byte   7
-        .string "No setup signature found..."
+        .string "No setup signature found...\n"
diff --git a/arch/i386/boot/install.sh b/arch/i386/boot/install.sh
index 5e44c736eea8..88d77761d01b 100644
--- a/arch/i386/boot/install.sh
+++ b/arch/i386/boot/install.sh
@@ -51,4 +51,11 @@ fi
 cat $2 > $4/vmlinuz
 cp $3 $4/System.map
 
-if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi
+if [ -x /sbin/lilo ]; then
+       /sbin/lilo
+elif [ -x /etc/lilo/install ]; then
+       /etc/lilo/install
+else
+       sync
+       echo "Cannot find LILO."
+fi
diff --git a/arch/i386/boot/pm.c b/arch/i386/boot/pm.c
index 1df025c73261..6be9ca811d17 100644
--- a/arch/i386/boot/pm.c
+++ b/arch/i386/boot/pm.c
@@ -80,7 +80,7 @@ static void move_kernel_around(void)
  */
 static void mask_all_interrupts(void)
 {
-        outb(0xff, 0xa1);       /* Mask all interrupts on the seconday PIC */
+        outb(0xff, 0xa1);       /* Mask all interrupts on the secondary PIC */
         io_delay();
         outb(0xfb, 0x21);       /* Mask all but cascade on the primary PIC */
         io_delay();
diff --git a/arch/i386/boot/video-bios.c b/arch/i386/boot/video-bios.c
index afea46c500cc..68e65d95cdfd 100644
--- a/arch/i386/boot/video-bios.c
+++ b/arch/i386/boot/video-bios.c
@@ -44,7 +44,7 @@ static int set_bios_mode(u8 mode)
                      : "+a" (ax)
                      : : "ebx", "ecx", "edx", "esi", "edi");
 
-        do_restore = 1;         /* Assume video contents was lost */
+        do_restore = 1;         /* Assume video contents were lost */
         new_mode = ax & 0x7f;   /* Not all BIOSes are clean with the top bit */
 
         if (new_mode == mode)
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index dbe5e87e0d66..9d33b00de659 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -35,7 +35,6 @@ obj-y				+= sysenter.o vsyscall.o
 obj-$(CONFIG_ACPI_SRAT)         += srat.o
 obj-$(CONFIG_EFI)               += efi.o efi_stub.o
 obj-$(CONFIG_DOUBLEFAULT)       += doublefault.o
-obj-$(CONFIG_SERIAL_8250)       += legacy_serial.o
 obj-$(CONFIG_VM86)              += vm86.o
 obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
 obj-$(CONFIG_HPET_TIMER)        += hpet.o
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index 47001d50a083..f02a8aca826b 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -2235,7 +2235,7 @@ static int __init apm_init(void)
                 apm_info.bios.cseg_16_len = 0; /* 64k */
 
         if (debug) {
-                printk(KERN_INFO "apm: entry %x:%lx cseg16 %x dseg %x",
+                printk(KERN_INFO "apm: entry %x:%x cseg16 %x dseg %x",
                         apm_info.bios.cseg, apm_info.bios.offset,
                         apm_info.bios.cseg_16, apm_info.bios.dseg);
                 if (apm_info.bios.version > 0x100)
diff --git a/arch/i386/kernel/cpu/bugs.c b/arch/i386/kernel/cpu/bugs.c
index 54428a2500f3..59266f03d1cd 100644
--- a/arch/i386/kernel/cpu/bugs.c
+++ b/arch/i386/kernel/cpu/bugs.c
@@ -11,6 +11,7 @@
  */
 #include <linux/init.h>
 #include <linux/utsname.h>
+#include <asm/bugs.h>
 #include <asm/processor.h>
 #include <asm/i387.h>
 #include <asm/msr.h>
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 6f846bee2103..32d04b083e38 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -511,7 +511,6 @@ acpi_cpufreq_guess_freq(struct acpi_cpufreq_data *data, unsigned int cpu)
 static int acpi_cpufreq_early_init(void)
 {
         struct acpi_processor_performance *data;
-        cpumask_t covered;
         unsigned int i, j;
 
         dprintk("acpi_cpufreq_early_init\n");
@@ -520,14 +519,13 @@ static int acpi_cpufreq_early_init(void)
                 data = kzalloc(sizeof(struct acpi_processor_performance),
                                GFP_KERNEL);
                 if (!data) {
-                        for_each_cpu_mask(j, covered) {
+                        for_each_possible_cpu(j) {
                                 kfree(acpi_perf_data[j]);
                                 acpi_perf_data[j] = NULL;
                         }
                         return -ENOMEM;
                 }
                 acpi_perf_data[i] = data;
-                cpu_set(i, covered);
         }
 
         /* Do initialization in ACPI core */
diff --git a/arch/i386/kernel/legacy_serial.c b/arch/i386/kernel/legacy_serial.c
deleted file mode 100644
index 21510118544e..000000000000
--- a/arch/i386/kernel/legacy_serial.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Legacy COM port devices for x86 platforms without PNPBIOS or ACPI.
- * Data taken from include/asm-i386/serial.h.
- *
- * (c) Copyright 2007 Hewlett-Packard Development Company, L.P.
- *      Bjorn Helgaas <bjorn.helgaas@hp.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/module.h>
-#include <linux/init.h>
-#include <linux/pnp.h>
-#include <linux/serial_8250.h>
-
-/* Standard COM flags (except for COM4, because of the 8514 problem) */
-#ifdef CONFIG_SERIAL_DETECT_IRQ
-#define COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ)
-#define COM4_FLAGS (UPF_BOOT_AUTOCONF | UPF_AUTO_IRQ)
-#else
-#define COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST)
-#define COM4_FLAGS UPF_BOOT_AUTOCONF
-#endif
-
-#define PORT(_base,_irq,_flags)                         \
-        {                                               \
-                .iobase         = _base,                \
-                .irq            = _irq,                 \
-                .uartclk        = 1843200,              \
-                .iotype         = UPIO_PORT,            \
-                .flags          = _flags,               \
-        }
-
-static struct plat_serial8250_port x86_com_data[] = {
-        PORT(0x3F8, 4, COM_FLAGS),
-        PORT(0x2F8, 3, COM_FLAGS),
-        PORT(0x3E8, 4, COM_FLAGS),
-        PORT(0x2E8, 3, COM4_FLAGS),
-        { },
-};
-
-static struct platform_device x86_com_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_PLATFORM,
-        .dev                    = {
-                .platform_data  = x86_com_data,
-        },
-};
-
-static int force_legacy_probe;
-module_param_named(force, force_legacy_probe, bool, 0);
-MODULE_PARM_DESC(force, "Force legacy serial port probe");
-
-static int __init serial8250_x86_com_init(void)
-{
-        if (pnp_platform_devices && !force_legacy_probe)
-                return -ENODEV;
-
-        return platform_device_register(&x86_com_device);
-}
-
-module_init(serial8250_x86_com_init);
-
-MODULE_AUTHOR("Bjorn Helgaas");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Generic 8250/16x50 legacy probe module");
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index b7133cabdbea..14b8e5a6222b 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -591,13 +591,13 @@ pfm_set_task_notify(struct task_struct *task)
         struct thread_info *info;
 
         info = (struct thread_info *) ((char *) task + IA64_TASK_SIZE);
-        set_bit(TIF_NOTIFY_RESUME, &info->flags);
+        set_bit(TIF_PERFMON_WORK, &info->flags);
 }
 
 static inline void
 pfm_clear_task_notify(void)
 {
-        clear_thread_flag(TIF_NOTIFY_RESUME);
+        clear_thread_flag(TIF_PERFMON_WORK);
 }
 
 static inline void
diff --git a/arch/m68knommu/platform/5206e/config.c b/arch/m68knommu/platform/5206e/config.c
index 4ab614f1ecda..425703fb6cee 100644
--- a/arch/m68knommu/platform/5206e/config.c
+++ b/arch/m68knommu/platform/5206e/config.c
@@ -20,7 +20,6 @@
 #include <asm/mcftimer.h>
 #include <asm/mcfsim.h>
 #include <asm/mcfdma.h>
-#include <asm/irq.h>
 
 /***************************************************************************/
 
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 1e3aeccd7322..3b404b7dfa39 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -15,29 +15,6 @@ choice
         prompt "System type"
         default SGI_IP22
 
-config LEMOTE_FULONG
-        bool "Lemote Fulong mini-PC"
-        select ARCH_SPARSEMEM_ENABLE
-        select SYS_HAS_CPU_LOONGSON2
-        select DMA_NONCOHERENT
-        select BOOT_ELF32
-        select BOARD_SCACHE
-        select HAVE_STD_PC_SERIAL_PORT
-        select HW_HAS_PCI
-        select I8259
-        select ISA
-        select IRQ_CPU
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_SUPPORTS_HIGHMEM
-        select SYS_HAS_EARLY_PRINTK
-        select GENERIC_HARDIRQS_NO__DO_IRQ
-        select CPU_HAS_WB
-        help
-          Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and
-          an FPGA northbridge
-
 config MACH_ALCHEMY
         bool "Alchemy processor based machines"
 
@@ -131,6 +108,29 @@ config MACH_JAZZ
          Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
          Olivetti M700-10 workstations.
 
+config LEMOTE_FULONG
+        bool "Lemote Fulong mini-PC"
+        select ARCH_SPARSEMEM_ENABLE
+        select SYS_HAS_CPU_LOONGSON2
+        select DMA_NONCOHERENT
+        select BOOT_ELF32
+        select BOARD_SCACHE
+        select HAVE_STD_PC_SERIAL_PORT
+        select HW_HAS_PCI
+        select I8259
+        select ISA
+        select IRQ_CPU
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_64BIT_KERNEL
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+        select SYS_SUPPORTS_HIGHMEM
+        select SYS_HAS_EARLY_PRINTK
+        select GENERIC_HARDIRQS_NO__DO_IRQ
+        select CPU_HAS_WB
+        help
+          Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and
+          an FPGA northbridge
+
 config MIPS_ATLAS
         bool "MIPS Atlas board"
         select BOOT_ELF32
@@ -210,27 +210,6 @@ config MIPS_SEAD
           This enables support for the MIPS Technologies SEAD evaluation
           board.
 
-config WR_PPMC
-        bool "Wind River PPMC board"
-        select IRQ_CPU
-        select BOOT_ELF32
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select PCI_GT64XXX_PCI0
-        select SWAP_IO_SPACE
-        select SYS_HAS_CPU_MIPS32_R1
-        select SYS_HAS_CPU_MIPS32_R2
-        select SYS_HAS_CPU_MIPS64_R1
-        select SYS_HAS_CPU_NEVADA
-        select SYS_HAS_CPU_RM7000
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        help
-          This enables support for the Wind River MIPS32 4KC PPMC evaluation
-          board, which is based on GT64120 bridge chip.
-
 config MIPS_SIM
         bool 'MIPS simulator (MIPSsim)'
         select DMA_NONCOHERENT
@@ -248,23 +227,24 @@ config MIPS_SIM
           This option enables support for MIPS Technologies MIPSsim software
           emulator.
 
-config MOMENCO_OCELOT
-        bool "Momentum Ocelot board"
+config MARKEINS
+        bool "NEC EMMA2RH Mark-eins"
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select IRQ_CPU
-        select IRQ_CPU_RM7K
-        select PCI_GT64XXX_PCI0
-        select RM7000_CPU_SCACHE
         select SWAP_IO_SPACE
-        select SYS_HAS_CPU_RM7000
         select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_KGDB
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+        select SYS_HAS_CPU_R5000
         help
-          The Ocelot is a MIPS-based Single Board Computer (SBC) made by
-          Momentum Computer <http://www.momenco.com/>.
+          This enables support for the R5432-based NEC Mark-eins
+          boards with R5500 CPU.
+
+config MACH_VR41XX
+        bool "NEC VR4100 series based machines"
+        select SYS_HAS_CPU_VR41XX
+        select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config PNX8550_JBS
         bool "Philips PNX8550 based JBS board"
@@ -276,31 +256,6 @@ config PNX8550_STB810
         select PNX8550
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
-config DDB5477
-        bool "NEC DDB Vrc-5477"
-        select DDB5XXX_COMMON
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select I8259
-        select IRQ_CPU
-        select SYS_HAS_CPU_R5432
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
-        select SYS_SUPPORTS_KGDB
-        select SYS_SUPPORTS_KGDB
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        help
-          This enables support for the R5432-based NEC DDB Vrc-5477,
-          or Rockhopper/SolutionGear boards with R5432/R5500 CPUs.
-
-          Features : kernel debugging, serial terminal, NFS root fs, on-board
-          ether port USB, AC97, PCI, etc.
-
-config MACH_VR41XX
-        bool "NEC VR4100 series based machines"
-        select SYS_HAS_CPU_VR41XX
-        select GENERIC_HARDIRQS_NO__DO_IRQ
-
 config PMC_MSP
         bool "PMC-Sierra MSP chipsets"
         depends on EXPERIMENTAL
@@ -367,20 +322,6 @@ config QEMU
           simulate actual MIPS hardware platforms.  More information on Qemu
           can be found at http://www.linux-mips.org/wiki/Qemu.
 
-config MARKEINS
-        bool "NEC EMMA2RH Mark-eins"
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select IRQ_CPU
-        select SWAP_IO_SPACE
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_CPU_R5000
-        help
-          This enables support for the R5432-based NEC Mark-eins
-          boards with R5500 CPU.
-
 config SGI_IP22
         bool "SGI IP22 (Indy/Indigo2)"
         select ARC
@@ -443,41 +384,38 @@ config SGI_IP32
         help
           If you want this kernel to run on SGI O2 workstation, say Y here.
 
-config SIBYTE_BIGSUR
-        bool "Sibyte BCM91480B-BigSur"
+config SIBYTE_CRHINE
+        bool "Sibyte BCM91120C-CRhine"
+        depends on EXPERIMENTAL
         select BOOT_ELF32
         select DMA_COHERENT
-        select NR_CPUS_DEFAULT_4
-        select PCI_DOMAINS
-        select SIBYTE_BCM1x80
+        select SIBYTE_BCM1120
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_SB1
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
-config SIBYTE_SWARM
-        bool "Sibyte BCM91250A-SWARM"
+config SIBYTE_CARMEL
+        bool "Sibyte BCM91120x-Carmel"
+        depends on EXPERIMENTAL
         select BOOT_ELF32
         select DMA_COHERENT
-        select NR_CPUS_DEFAULT_2
-        select SIBYTE_SB1250
+        select SIBYTE_BCM1120
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_SB1
         select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_HIGHMEM
-        select SYS_SUPPORTS_KGDB
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
-config SIBYTE_SENTOSA
-        bool "Sibyte BCM91250E-Sentosa"
+config SIBYTE_CRHONE
+        bool "Sibyte BCM91125C-CRhone"
         depends on EXPERIMENTAL
         select BOOT_ELF32
         select DMA_COHERENT
-        select NR_CPUS_DEFAULT_2
-        select SIBYTE_SB1250
+        select SIBYTE_BCM1125
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_SB1
         select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_HIGHMEM
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_RHONE
@@ -491,19 +429,21 @@ config SIBYTE_RHONE
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
-config SIBYTE_CARMEL
-        bool "Sibyte BCM91120x-Carmel"
-        depends on EXPERIMENTAL
+config SIBYTE_SWARM
+        bool "Sibyte BCM91250A-SWARM"
         select BOOT_ELF32
         select DMA_COHERENT
-        select SIBYTE_BCM1120
+        select NR_CPUS_DEFAULT_2
+        select SIBYTE_SB1250
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_SB1
         select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_HIGHMEM
+        select SYS_SUPPORTS_KGDB
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
-config SIBYTE_PTSWARM
-        bool "Sibyte BCM91250PT-PTSWARM"
+config SIBYTE_LITTLESUR
+        bool "Sibyte BCM91250C2-LittleSur"
         depends on EXPERIMENTAL
         select BOOT_ELF32
         select DMA_COHERENT
@@ -515,8 +455,8 @@ config SIBYTE_PTSWARM
         select SYS_SUPPORTS_HIGHMEM
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
-config SIBYTE_LITTLESUR
-        bool "Sibyte BCM91250C2-LittleSur"
+config SIBYTE_SENTOSA
+        bool "Sibyte BCM91250E-Sentosa"
         depends on EXPERIMENTAL
         select BOOT_ELF32
         select DMA_COHERENT
@@ -525,30 +465,31 @@ config SIBYTE_LITTLESUR
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_SB1
         select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_HIGHMEM
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
-config SIBYTE_CRHINE
-        bool "Sibyte BCM91120C-CRhine"
+config SIBYTE_PTSWARM
+        bool "Sibyte BCM91250PT-PTSWARM"
         depends on EXPERIMENTAL
         select BOOT_ELF32
         select DMA_COHERENT
-        select SIBYTE_BCM1120
+        select NR_CPUS_DEFAULT_2
+        select SIBYTE_SB1250
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_SB1
         select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_HIGHMEM
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
-config SIBYTE_CRHONE
-        bool "Sibyte BCM91125C-CRhone"
-        depends on EXPERIMENTAL
+config SIBYTE_BIGSUR
+        bool "Sibyte BCM91480B-BigSur"
         select BOOT_ELF32
         select DMA_COHERENT
-        select SIBYTE_BCM1125
+        select NR_CPUS_DEFAULT_4
+        select PCI_DOMAINS
+        select SIBYTE_BCM1x80
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_SB1
         select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_HIGHMEM
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SNI_RM
@@ -595,7 +536,7 @@ config TOSHIBA_JMR3927
         select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config TOSHIBA_RBTX4927
-        bool "Toshiba TBTX49[23]7 board"
+        bool "Toshiba RBTX49[23]7 board"
         select DMA_NONCOHERENT
         select HAS_TXX9_SERIAL
         select HW_HAS_PCI
@@ -632,10 +573,30 @@ config TOSHIBA_RBTX4938
           This Toshiba board is based on the TX4938 processor. Say Y here to
           support this machine type
 
+config WR_PPMC
+        bool "Wind River PPMC board"
+        select IRQ_CPU
+        select BOOT_ELF32
+        select DMA_NONCOHERENT
+        select HW_HAS_PCI
+        select PCI_GT64XXX_PCI0
+        select SWAP_IO_SPACE
+        select SYS_HAS_CPU_MIPS32_R1
+        select SYS_HAS_CPU_MIPS32_R2
+        select SYS_HAS_CPU_MIPS64_R1
+        select SYS_HAS_CPU_NEVADA
+        select SYS_HAS_CPU_RM7000
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_64BIT_KERNEL
+        select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+        help
+          This enables support for the Wind River MIPS32 4KC PPMC evaluation
+          board, which is based on GT64120 bridge chip.
+
 endchoice
 
 source "arch/mips/au1000/Kconfig"
-source "arch/mips/ddb5xxx/Kconfig"
 source "arch/mips/jazz/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"
 source "arch/mips/sgi-ip27/Kconfig"
@@ -807,10 +768,6 @@ config IRQ_MSP_SLP
 config IRQ_MSP_CIC
         bool
 
-config DDB5XXX_COMMON
-        bool
-        select SYS_SUPPORTS_KGDB
-
 config MIPS_BOARDS_GEN
         bool
 
@@ -1377,17 +1334,6 @@ config MIPS_MT_SMTC
           This is a kernel model which is known a SMTC or lately has been
           marketesed into SMVP.
 
-config MIPS_VPE_LOADER
-        bool "VPE loader support."
-        depends on SYS_SUPPORTS_MULTITHREADING
-        select CPU_MIPSR2_IRQ_VI
-        select CPU_MIPSR2_IRQ_EI
-        select CPU_MIPSR2_SRS
-        select MIPS_MT
-        help
-          Includes a loader for loading an elf relocatable object
-          onto another VPE and running it.
-
 endchoice
 
 config MIPS_MT
@@ -1398,8 +1344,19 @@ config SYS_SUPPORTS_MULTITHREADING
 
 config MIPS_MT_FPAFF
         bool "Dynamic FPU affinity for FP-intensive threads"
-        depends on MIPS_MT
         default y
+        depends on MIPS_MT_SMP || MIPS_MT_SMTC
+
+config MIPS_VPE_LOADER
+        bool "VPE loader support."
+        depends on SYS_SUPPORTS_MULTITHREADING
+        select CPU_MIPSR2_IRQ_VI
+        select CPU_MIPSR2_IRQ_EI
+        select CPU_MIPSR2_SRS
+        select MIPS_MT
+        help
+          Includes a loader for loading an elf relocatable object
+          onto another VPE and running it.
 
 config MIPS_MT_SMTC_INSTANT_REPLAY
         bool "Low-latency Dispatch of Deferred SMTC IPIs"
@@ -1772,7 +1729,7 @@ config KEXEC
 
 config SECCOMP
         bool "Enable seccomp to safely compute untrusted bytecode"
-        depends on PROC_FS && BROKEN
+        depends on PROC_FS
         default y
         help
           This kernel feature is useful for number crunching applications
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index a9a987a06daf..32c1c8fb6f98 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -67,6 +67,8 @@ cflags-y		+= $(call cc-option,-msym32)
 endif
 endif
 
+all-$(CONFIG_BOOT_ELF32)        := $(vmlinux-32)
+all-$(CONFIG_BOOT_ELF64)        := $(vmlinux-64)
 
 #
 # GCC uses -G 0 -mabicalls -fpic as default.  We don't want PIC in the kernel
@@ -309,6 +311,7 @@ core-$(CONFIG_MIPS_ATLAS)	+= arch/mips/mips-boards/atlas/
 cflags-$(CONFIG_MIPS_ATLAS)     += -Iinclude/asm-mips/mach-atlas
 cflags-$(CONFIG_MIPS_ATLAS)     += -Iinclude/asm-mips/mach-mips
 load-$(CONFIG_MIPS_ATLAS)       += 0xffffffff80100000
+all-$(CONFIG_MIPS_ATLAS)        := vmlinux.srec
 
 #
 # MIPS Malta board
@@ -316,6 +319,7 @@ load-$(CONFIG_MIPS_ATLAS)	+= 0xffffffff80100000
 core-$(CONFIG_MIPS_MALTA)       += arch/mips/mips-boards/malta/
 cflags-$(CONFIG_MIPS_MALTA)     += -Iinclude/asm-mips/mach-mips
 load-$(CONFIG_MIPS_MALTA)       += 0xffffffff80100000
+all-$(CONFIG_MIPS_MALTA)        := vmlinux.srec
 
 #
 # MIPS SEAD board
@@ -323,6 +327,7 @@ load-$(CONFIG_MIPS_MALTA)	+= 0xffffffff80100000
 core-$(CONFIG_MIPS_SEAD)        += arch/mips/mips-boards/sead/
 cflags-$(CONFIG_MIPS_SEAD)      += -Iinclude/asm-mips/mach-mips
 load-$(CONFIG_MIPS_SEAD)        += 0xffffffff80100000
+all-$(CONFIG_MIPS_SEAD)         := vmlinux.srec
 
 #
 # MIPS SIM
@@ -332,17 +337,6 @@ cflags-$(CONFIG_MIPS_SIM)	+= -Iinclude/asm-mips/mach-mipssim
 load-$(CONFIG_MIPS_SIM)         += 0x80100000
 
 #
-# Momentum Ocelot board
-#
-# The Ocelot setup.o must be linked early - it does the ioremap() for the
-# mips_io_port_base.
-#
-core-$(CONFIG_MOMENCO_OCELOT)   += arch/mips/gt64120/common/ \
-                                   arch/mips/gt64120/momenco_ocelot/
-cflags-$(CONFIG_MOMENCO_OCELOT) += -Iinclude/asm-mips/mach-ocelot
-load-$(CONFIG_MOMENCO_OCELOT)   += 0xffffffff80100000
-
-#
 # PMC-Sierra MSP SOCs
 #
 core-$(CONFIG_PMC_MSP)          += arch/mips/pmc-sierra/msp71xx/
@@ -363,6 +357,7 @@ load-$(CONFIG_PMC_YOSEMITE)	+= 0xffffffff80100000
 core-$(CONFIG_QEMU)             += arch/mips/qemu/
 cflags-$(CONFIG_QEMU)           += -Iinclude/asm-mips/mach-qemu
 load-$(CONFIG_QEMU)             += 0xffffffff80010000
+all-$(CONFIG_QEMU)              := vmlinux.bin
 
 #
 # Basler eXcite
@@ -372,17 +367,6 @@ cflags-$(CONFIG_BASLER_EXCITE)	+= -Iinclude/asm-mips/mach-excite
 load-$(CONFIG_BASLER_EXCITE)    += 0x80100000
 
 #
-# NEC DDB
-#
-core-$(CONFIG_DDB5XXX_COMMON)   += arch/mips/ddb5xxx/common/
-
-#
-# NEC DDB Vrc-5477
-#
-core-$(CONFIG_DDB5477)          += arch/mips/ddb5xxx/ddb5477/
-load-$(CONFIG_DDB5477)          += 0xffffffff80100000
-
-#
 # Common VR41xx
 #
 core-$(CONFIG_MACH_VR41XX)      += arch/mips/vr41xx/common/
@@ -554,6 +538,7 @@ load-$(CONFIG_SIBYTE_BIGSUR)	:= 0xffffffff80100000
 core-$(CONFIG_SNI_RM)           += arch/mips/sni/
 cflags-$(CONFIG_SNI_RM)         += -Iinclude/asm-mips/mach-rm
 load-$(CONFIG_SNI_RM)           += 0xffffffff80600000
+all-$(CONFIG_SNI_RM)            := vmlinux.ecoff
 
 #
 # Toshiba JMR-TX3927 board
@@ -647,33 +632,7 @@ vmlinux.64: vmlinux
 
 makeboot =$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) $(1)
 
-ifdef CONFIG_BOOT_ELF32
-all:    $(vmlinux-32)
-endif
-
-ifdef CONFIG_BOOT_ELF64
-all:    $(vmlinux-64)
-endif
-
-ifdef CONFIG_MIPS_ATLAS
-all:    vmlinux.srec
-endif
-
-ifdef CONFIG_MIPS_MALTA
-all:    vmlinux.srec
-endif
-
-ifdef CONFIG_MIPS_SEAD
-all:    vmlinux.srec
-endif
-
-ifdef CONFIG_QEMU
-all:    vmlinux.bin
-endif
-
-ifdef CONFIG_SNI_RM
-all:    vmlinux.ecoff
-endif
+all:    $(all-y)
 
 vmlinux.bin: $(vmlinux-32)
         +@$(call makeboot,$@)
@@ -700,6 +659,14 @@ endif
 archclean:
         @$(MAKE) $(clean)=arch/mips/boot
 
+define archhelp
+        echo '  vmlinux.ecoff        - ECOFF boot image'
+        echo '  vmlinux.bin          - Raw binary boot image'
+        echo '  vmlinux.srec         - SREC boot image'
+        echo
+        echo '  These will be default as apropriate for a configured platform.'
+endef
+
 CLEAN_FILES += vmlinux.32 \
                vmlinux.64 \
                vmlinux.ecoff
diff --git a/arch/mips/arc/file.c b/arch/mips/arc/file.c
index a43425b3c838..cb0127cf5bc1 100644
--- a/arch/mips/arc/file.c
+++ b/arch/mips/arc/file.c
@@ -13,63 +13,63 @@
 #include <asm/arc/types.h>
 #include <asm/sgialib.h>
 
-LONG __init
+LONG
 ArcGetDirectoryEntry(ULONG FileID, struct linux_vdirent *Buffer,
                      ULONG N, ULONG *Count)
 {
         return ARC_CALL4(get_vdirent, FileID, Buffer, N, Count);
 }
 
-LONG __init
+LONG
 ArcOpen(CHAR *Path, enum linux_omode OpenMode, ULONG *FileID)
 {
         return ARC_CALL3(open, Path, OpenMode, FileID);
 }
 
-LONG __init
+LONG
 ArcClose(ULONG FileID)
 {
         return ARC_CALL1(close, FileID);
 }
 
-LONG __init
+LONG
 ArcRead(ULONG FileID, VOID *Buffer, ULONG N, ULONG *Count)
 {
         return ARC_CALL4(read, FileID, Buffer, N, Count);
 }
 
-LONG __init
+LONG
 ArcGetReadStatus(ULONG FileID)
 {
         return ARC_CALL1(get_rstatus, FileID);
 }
 
-LONG __init
+LONG
 ArcWrite(ULONG FileID, PVOID Buffer, ULONG N, PULONG Count)
 {
         return ARC_CALL4(write, FileID, Buffer, N, Count);
 }
 
-LONG __init
+LONG
 ArcSeek(ULONG FileID, struct linux_bigint *Position, enum linux_seekmode SeekMode)
 {
         return ARC_CALL3(seek, FileID, Position, SeekMode);
 }
 
-LONG __init
+LONG
 ArcMount(char *name, enum linux_mountops op)
 {
         return ARC_CALL2(mount, name, op);
 }
 
-LONG __init
+LONG
 ArcGetFileInformation(ULONG FileID, struct linux_finfo *Information)
 {
         return ARC_CALL2(get_finfo, FileID, Information);
 }
 
-LONG __init ArcSetFileInformation(ULONG FileID, ULONG AttributeFlags,
-                                  ULONG AttributeMask)
+LONG ArcSetFileInformation(ULONG FileID, ULONG AttributeFlags,
+                           ULONG AttributeMask)
 {
         return ARC_CALL3(set_finfo, FileID, AttributeFlags, AttributeMask);
 }
diff --git a/arch/mips/au1000/common/Makefile b/arch/mips/au1000/common/Makefile
index 4c35525edb4f..90e2d7a46e8e 100644
--- a/arch/mips/au1000/common/Makefile
+++ b/arch/mips/au1000/common/Makefile
@@ -12,3 +12,5 @@ obj-y += prom.o irq.o puts.o time.o reset.o \
 
 obj-$(CONFIG_KGDB)              += dbg_io.o
 obj-$(CONFIG_PCI)               += pci.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile
index 0dc84417bf49..2a209d74f0b4 100644
--- a/arch/mips/boot/Makefile
+++ b/arch/mips/boot/Makefile
@@ -42,10 +42,6 @@ vmlinux.srec: $(VMLINUX)
 $(obj)/addinitrd: $(obj)/addinitrd.c
         $(HOSTCC) -o $@ $^
 
-archhelp:
-        @echo   '* vmlinux.ecoff        - ECOFF boot image'
-        @echo   '* vmlinux.srec         - SREC boot image'
-
 clean-files += addinitrd \
                elf2ecoff \
                vmlinux.bin \
diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index c292f80a8c74..a043f93f7d08 100644
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -7,3 +7,5 @@ obj-y := buttons.o irq.o reset.o rtc.o serial.o setup.o
 obj-$(CONFIG_PCI)               += pci.o
 obj-$(CONFIG_EARLY_PRINTK)      += console.o
 obj-$(CONFIG_MTD_PHYSMAP)       += mtd.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/cobalt/serial.c b/arch/mips/cobalt/serial.c
index c27116599a5f..08e739704cc9 100644
--- a/arch/mips/cobalt/serial.c
+++ b/arch/mips/cobalt/serial.c
@@ -55,9 +55,9 @@ static __init int cobalt_uart_add(void)
         int retval;
 
         /*
-         * Cobalt Qube1 and RAQ1 have no UART.
+         * Cobalt Qube1 has no UART.
          */
-        if (cobalt_board_id <= COBALT_BRD_ID_RAQ1)
+        if (cobalt_board_id == COBALT_BRD_ID_QUBE1)
                 return 0;
 
         pdev = platform_device_alloc("serial8250", -1);
diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig
index 129e2c961fec..62bcc887f2ca 100644
--- a/arch/mips/configs/atlas_defconfig
+++ b/arch/mips/configs/atlas_defconfig
@@ -32,12 +32,9 @@ CONFIG_MIPS_ATLAS=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index dc3e1bf4e42e..67a80f4c7d87 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig
index 4c7031222e64..4dc3197e2e9f 100644
--- a/arch/mips/configs/capcella_defconfig
+++ b/arch/mips/configs/capcella_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 CONFIG_MACH_VR41XX=y
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig
index c8c05785a86d..6d6a01b9a817 100644
--- a/arch/mips/configs/cobalt_defconfig
+++ b/arch/mips/configs/cobalt_defconfig
@@ -18,10 +18,8 @@ CONFIG_MIPS_COBALT=y
 # CONFIG_MIPS_SEAD is not set
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig
index ec60beb888b2..885b633647e9 100644
--- a/arch/mips/configs/db1000_defconfig
+++ b/arch/mips/configs/db1000_defconfig
@@ -33,12 +33,9 @@ CONFIG_MIPS_DB1000=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig
index f3c25f08bfad..e3c3a07e8a7c 100644
--- a/arch/mips/configs/db1100_defconfig
+++ b/arch/mips/configs/db1100_defconfig
@@ -33,12 +33,9 @@ CONFIG_MIPS_DB1100=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig
index 6d400befbacc..9aa7c3ebfa3f 100644
--- a/arch/mips/configs/db1200_defconfig
+++ b/arch/mips/configs/db1200_defconfig
@@ -33,12 +33,9 @@ CONFIG_MIPS_DB1200=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig
index 82aea6e08823..99240668bca1 100644
--- a/arch/mips/configs/db1500_defconfig
+++ b/arch/mips/configs/db1500_defconfig
@@ -33,12 +33,9 @@ CONFIG_MIPS_DB1500=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig
index 82697714a9e3..19992f76c60d 100644
--- a/arch/mips/configs/db1550_defconfig
+++ b/arch/mips/configs/db1550_defconfig
@@ -33,12 +33,9 @@ CONFIG_MIPS_DB1550=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig
deleted file mode 100644
index a42ab9ae7d4b..000000000000
--- a/arch/mips/configs/ddb5477_defconfig
+++ /dev/null
@@ -1,990 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:28 2007
-#
-CONFIG_MIPS=y
-
-#
-# Machine selection
-#
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_MALTA is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
-# CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
-# CONFIG_MIPS_XXS1500 is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-CONFIG_DDB5477=y
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
-CONFIG_DDB5477_BUS_FREQUENCY=0
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_I8259=y
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-CONFIG_IRQ_CPU=y
-CONFIG_DDB5XXX_COMMON=y
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-
-#
-# CPU selection
-#
-# CONFIG_CPU_MIPS32_R1 is not set
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_VR41XX is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_R5000 is not set
-CONFIG_CPU_R5432=y
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_SYS_HAS_CPU_R5432=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
-
-#
-# Kernel type
-#
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_64KB is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-# CONFIG_HZ_48 is not set
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
-# CONFIG_HZ_1024 is not set
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_KEXEC is not set
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_RELAY=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_EMBEDDED=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SHMEM=y
-CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
-
-#
-# Block layer
-#
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-
-#
-# Bus options (PCI, PCMCIA, EISA, ISA, TC)
-#
-CONFIG_HW_HAS_PCI=y
-CONFIG_PCI=y
-CONFIG_MMU=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-# CONFIG_PCCARD is not set
-
-#
-# PCI Hotplug Support
-#
-# CONFIG_HOTPLUG_PCI is not set
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-CONFIG_TRAD_SIGNALS=y
-
-#
-# Power management options
-#
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
-
-#
-# Networking
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-# CONFIG_NETDEBUG is not set
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=y
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_MIGRATE=y
-CONFIG_NET_KEY=y
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-# CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
-CONFIG_NETWORK_SECMARK=y
-# CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-CONFIG_IEEE80211=y
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=y
-CONFIG_IEEE80211_CRYPT_CCMP=y
-CONFIG_IEEE80211_SOFTMAC=y
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-# CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CDROM_PKTCDVD=y
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=y
-
-#
-# Misc devices
-#
-CONFIG_SGI_IOC4=y
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_RAID_ATTRS=y
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-# CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
-CONFIG_PHYLIB=y
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=y
-CONFIG_DAVICOM_PHY=y
-CONFIG_QSEMI_PHY=y
-CONFIG_LXT_PHY=y
-CONFIG_CICADA_PHY=y
-CONFIG_VITESSE_PHY=y
-CONFIG_SMSC_PHY=y
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_DM9000 is not set
-
-#
-# Tulip family network device support
-#
-# CONFIG_NET_TULIP is not set
-# CONFIG_HP100 is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=y
-# CONFIG_PCNET32_NAPI is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_B44 is not set
-# CONFIG_FORCEDETH is not set
-# CONFIG_DGRS is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_E100 is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_SIS900 is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_SC92031 is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-CONFIG_QLA3XXX=y
-# CONFIG_ATL1 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-CONFIG_CHELSIO_T3=y
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-CONFIG_NETXEN_NIC=y
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-# CONFIG_SERIO_I8042 is not set
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_LIBPS2 is not set
-CONFIG_SERIO_RAW=y
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_JSM is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-# CONFIG_DRM is not set
-# CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# SPI support
-#
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
-# CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-
-#
-# Graphics support
-#
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
-# CONFIG_HID is not set
-
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-
-#
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-# CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
-# CONFIG_RTC_CLASS is not set
-
-#
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
-# Auxiliary Display support
-#
-
-#
-# Virtualization
-#
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-CONFIG_AUTOFS_FS=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=y
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-# CONFIG_TMPFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-CONFIG_CONFIGFS_FS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_ECRYPT_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-# CONFIG_NFS_V3 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=y
-# CONFIG_NFSD_V3 is not set
-# CONFIG_NFSD_TCP is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_EXPORTFS=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-
-#
-# Distributed Lock Manager
-#
-CONFIG_DLM=y
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CROSSCOMPILE=y
-CONFIG_CMDLINE="ip=any"
-CONFIG_SYS_SUPPORTS_KGDB=y
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_WP512=y
-CONFIG_CRYPTO_TGR192=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_SERPENT=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_CAST5=y
-CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_TEA=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_KHAZAD=y
-CONFIG_CRYPTO_ANUBIS=y
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CAMELLIA=y
-
-#
-# Hardware crypto devices
-#
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=y
-CONFIG_CRC32=y
-CONFIG_LIBCRC32C=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_PLIST=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig
index d6e3fffbc80d..2fb350432669 100644
--- a/arch/mips/configs/decstation_defconfig
+++ b/arch/mips/configs/decstation_defconfig
@@ -32,12 +32,9 @@ CONFIG_MACH_DECSTATION=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig
index 78f5004fb721..5467d750b6eb 100644
--- a/arch/mips/configs/e55_defconfig
+++ b/arch/mips/configs/e55_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 CONFIG_MACH_VR41XX=y
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/emma2rh_defconfig b/arch/mips/configs/emma2rh_defconfig
index b29bff0f56c3..d73d965f7615 100644
--- a/arch/mips/configs/emma2rh_defconfig
+++ b/arch/mips/configs/emma2rh_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/excite_defconfig b/arch/mips/configs/excite_defconfig
index 69810592aa6b..17a866057fd4 100644
--- a/arch/mips/configs/excite_defconfig
+++ b/arch/mips/configs/excite_defconfig
@@ -33,12 +33,9 @@ CONFIG_BASLER_EXCITE=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/fulong_defconfig b/arch/mips/configs/fulong_defconfig
index 6ab94d8cf08b..4ef39a0527cc 100644
--- a/arch/mips/configs/fulong_defconfig
+++ b/arch/mips/configs/fulong_defconfig
@@ -19,10 +19,8 @@ CONFIG_LEMOTE_FULONG=y
 # CONFIG_MIPS_SEAD is not set
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index 405c9f505a77..934d8a008936 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index a9dcbcf563cb..eb35f7518d06 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index a040459bec11..47f49b60c5d6 100644
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/jazz_defconfig b/arch/mips/configs/jazz_defconfig
index 8a0b4ac5283d..fa655e247ecc 100644
--- a/arch/mips/configs/jazz_defconfig
+++ b/arch/mips/configs/jazz_defconfig
@@ -32,12 +32,9 @@ CONFIG_MACH_JAZZ=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig
index 9a25e770abd8..95a72d2750ef 100644
--- a/arch/mips/configs/jmr3927_defconfig
+++ b/arch/mips/configs/jmr3927_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index 546cb243fd09..fbfa5685887c 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -32,12 +32,9 @@ CONFIG_MIPS_MALTA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig
index 6abad6f88313..86dcb7464353 100644
--- a/arch/mips/configs/mipssim_defconfig
+++ b/arch/mips/configs/mipssim_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 CONFIG_MIPS_SIM=y
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig
index 4981ce425d82..239810b6c88d 100644
--- a/arch/mips/configs/mpc30x_defconfig
+++ b/arch/mips/configs/mpc30x_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 CONFIG_MACH_VR41XX=y
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/msp71xx_defconfig b/arch/mips/configs/msp71xx_defconfig
index adca5f7ba533..69278999c9a2 100644
--- a/arch/mips/configs/msp71xx_defconfig
+++ b/arch/mips/configs/msp71xx_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 CONFIG_PMC_MSP=y
 # CONFIG_PMC_YOSEMITE is not set
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig
deleted file mode 100644
index e1db1fb80cd0..000000000000
--- a/arch/mips/configs/ocelot_defconfig
+++ /dev/null
@@ -1,919 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:36 2007
-#
-CONFIG_MIPS=y
-
-#
-# Machine selection
-#
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_MALTA is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
-# CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-CONFIG_MOMENCO_OCELOT=y
-# CONFIG_MOMENCO_OCELOT_G is not set
-# CONFIG_MIPS_XXS1500 is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_IRQ_CPU=y
-CONFIG_IRQ_CPU_RM7K=y
-CONFIG_MIPS_GT64120=y
-CONFIG_SWAP_IO_SPACE=y
-# CONFIG_SYSCLK_75 is not set
-# CONFIG_SYSCLK_83 is not set
-CONFIG_SYSCLK_100=y
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-
-#
-# CPU selection
-#
-# CONFIG_CPU_MIPS32_R1 is not set
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_VR41XX is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_R10000 is not set
-CONFIG_CPU_RM7000=y
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_SYS_HAS_CPU_RM7000=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
-
-#
-# Kernel type
-#
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_64KB is not set
-CONFIG_BOARD_SCACHE=y
-CONFIG_RM7000_CPU_SCACHE=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
-# CONFIG_64BIT_PHYS_ADDR is not set
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-# CONFIG_HZ_48 is not set
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
-# CONFIG_HZ_1024 is not set
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_KEXEC is not set
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_RELAY=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_EMBEDDED=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_HOTPLUG is not set
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SHMEM=y
-CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
-
-#
-# Block layer
-#
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-
-#
-# Bus options (PCI, PCMCIA, EISA, ISA, TC)
-#
-CONFIG_HW_HAS_PCI=y
-# CONFIG_PCI is not set
-CONFIG_MMU=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-
-#
-# PCI Hotplug Support
-#
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-CONFIG_TRAD_SIGNALS=y
-
-#
-# Power management options
-#
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
-
-#
-# Networking
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-# CONFIG_NETDEBUG is not set
-# CONFIG_PACKET is not set
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=y
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_MIGRATE=y
-CONFIG_NET_KEY=y
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-# CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
-CONFIG_NETWORK_SECMARK=y
-# CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-CONFIG_IEEE80211=y
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=y
-CONFIG_IEEE80211_CRYPT_CCMP=y
-CONFIG_IEEE80211_SOFTMAC=y
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CDROM_PKTCDVD=y
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=y
-
-#
-# Misc devices
-#
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_RAID_ATTRS=y
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-# CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-
-#
-# PHY device support
-#
-CONFIG_PHYLIB=y
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=y
-CONFIG_DAVICOM_PHY=y
-CONFIG_QSEMI_PHY=y
-CONFIG_LXT_PHY=y
-CONFIG_CICADA_PHY=y
-CONFIG_VITESSE_PHY=y
-CONFIG_SMSC_PHY=y
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
-# CONFIG_DM9000 is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-# CONFIG_SERIO_I8042 is not set
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_LIBPS2 is not set
-CONFIG_SERIO_RAW=y
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# SPI support
-#
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
-# CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-
-#
-# Graphics support
-#
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
-# CONFIG_HID is not set
-
-#
-# USB support
-#
-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-
-#
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
-# CONFIG_RTC_CLASS is not set
-
-#
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
-# Auxiliary Display support
-#
-
-#
-# Virtualization
-#
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-CONFIG_FUSE_FS=y
-CONFIG_GENERIC_ACL=y
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-CONFIG_CONFIGFS_FS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_ECRYPT_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-# CONFIG_NFS_V3 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=y
-# CONFIG_NFSD_V3 is not set
-# CONFIG_NFSD_TCP is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_EXPORTFS=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-
-#
-# Distributed Lock Manager
-#
-CONFIG_DLM=y
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CROSSCOMPILE=y
-CONFIG_CMDLINE=""
-CONFIG_SYS_SUPPORTS_KGDB=y
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_WP512=y
-CONFIG_CRYPTO_TGR192=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_SERPENT=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_CAST5=y
-CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_TEA=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_KHAZAD=y
-CONFIG_CRYPTO_ANUBIS=y
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CAMELLIA=y
-
-#
-# Hardware crypto devices
-#
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=y
-CONFIG_CRC32=y
-CONFIG_LIBCRC32C=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_PLIST=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig
index 0028aef0af9d..d53fa8f8e099 100644
--- a/arch/mips/configs/pb1100_defconfig
+++ b/arch/mips/configs/pb1100_defconfig
@@ -33,12 +33,9 @@ CONFIG_MIPS_PB1100=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig
index 8a1d5888739c..dc4aa0c66847 100644
--- a/arch/mips/configs/pb1500_defconfig
+++ b/arch/mips/configs/pb1500_defconfig
@@ -33,12 +33,9 @@ CONFIG_MIPS_PB1500=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig
index 5581ad2ca411..24428e13002b 100644
--- a/arch/mips/configs/pb1550_defconfig
+++ b/arch/mips/configs/pb1550_defconfig
@@ -33,12 +33,9 @@ CONFIG_MIPS_PB1550=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig
index 821c1cee5639..f6906b069e04 100644
--- a/arch/mips/configs/pnx8550-jbs_defconfig
+++ b/arch/mips/configs/pnx8550-jbs_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 CONFIG_PNX8550_JBS=y
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/pnx8550-stb810_defconfig b/arch/mips/configs/pnx8550-stb810_defconfig
index 0e8bd92b38cf..b741f81696fb 100644
--- a/arch/mips/configs/pnx8550-stb810_defconfig
+++ b/arch/mips/configs/pnx8550-stb810_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 CONFIG_PNX8550_STB810=y
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig
index 703de002e372..b3caf5125c15 100644
--- a/arch/mips/configs/qemu_defconfig
+++ b/arch/mips/configs/qemu_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 CONFIG_QEMU=y
diff --git a/arch/mips/configs/rbhma4200_defconfig b/arch/mips/configs/rbhma4200_defconfig
index 20a38526d483..9913980add21 100644
--- a/arch/mips/configs/rbhma4200_defconfig
+++ b/arch/mips/configs/rbhma4200_defconfig
@@ -30,11 +30,9 @@ CONFIG_MIPS=y
 # CONFIG_MIPS_SEAD is not set
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig
index 5dbb250f71c7..40453cd7c70e 100644
--- a/arch/mips/configs/rbhma4500_defconfig
+++ b/arch/mips/configs/rbhma4500_defconfig
@@ -20,10 +20,8 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SEAD is not set
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
index a5dc5cb97aae..fc388118b114 100644
--- a/arch/mips/configs/rm200_defconfig
+++ b/arch/mips/configs/rm200_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index 98a914092258..e72fdf36b3fe 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig
index 69c08b24c82a..2b6282d132a8 100644
--- a/arch/mips/configs/sead_defconfig
+++ b/arch/mips/configs/sead_defconfig
@@ -32,12 +32,9 @@ CONFIG_MIPS_SEAD=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig
index 5d4fc0e4f729..e9f2cef4c716 100644
--- a/arch/mips/configs/tb0219_defconfig
+++ b/arch/mips/configs/tb0219_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 CONFIG_MACH_VR41XX=y
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index 1b92b48de051..aea67568842a 100644
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 CONFIG_MACH_VR41XX=y
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig
index 5b77c7a5d83a..66383ecff200 100644
--- a/arch/mips/configs/tb0287_defconfig
+++ b/arch/mips/configs/tb0287_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 CONFIG_MACH_VR41XX=y
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig
index 94a4f94a8b24..db6fd4f15719 100644
--- a/arch/mips/configs/workpad_defconfig
+++ b/arch/mips/configs/workpad_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 CONFIG_MACH_VR41XX=y
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/wrppmc_defconfig b/arch/mips/configs/wrppmc_defconfig
index e38bd9b0eadc..7e410e10fed7 100644
--- a/arch/mips/configs/wrppmc_defconfig
+++ b/arch/mips/configs/wrppmc_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 CONFIG_WR_PPMC=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig
index f342d8c887b8..acaf0e21bb00 100644
--- a/arch/mips/configs/yosemite_defconfig
+++ b/arch/mips/configs/yosemite_defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 CONFIG_PMC_YOSEMITE=y
 # CONFIG_QEMU is not set
diff --git a/arch/mips/ddb5xxx/Kconfig b/arch/mips/ddb5xxx/Kconfig
deleted file mode 100644
index e9b5de49f4c2..000000000000
--- a/arch/mips/ddb5xxx/Kconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-config DDB5477_BUS_FREQUENCY
-        int "bus frequency (in kHZ, 0 for auto-detect)"
-        depends on DDB5477
-        default 0
diff --git a/arch/mips/ddb5xxx/common/Makefile b/arch/mips/ddb5xxx/common/Makefile
deleted file mode 100644
index bc44e3032711..000000000000
--- a/arch/mips/ddb5xxx/common/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the common code of NEC DDB-Vrc5xxx board
-#
-
-obj-y    += nile4.o prom.o rtc_ds1386.o
diff --git a/arch/mips/ddb5xxx/common/nile4.c b/arch/mips/ddb5xxx/common/nile4.c
deleted file mode 100644
index 7ec7d903ba97..000000000000
--- a/arch/mips/ddb5xxx/common/nile4.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- * arch/mips/ddb5xxx/common/nile4.c
- *     misc low-level routines for vrc-5xxx controllers.
- *
- * derived from original code by Geert Uytterhoeven <geert@sonycom.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/types.h>
-#include <linux/kernel.h>
-
-#include <asm/ddb5xxx/ddb5xxx.h>
-
-u32
-ddb_calc_pdar(u32 phys, u32 size, int width,
-              int on_memory_bus, int pci_visible)
-{
-        u32 maskbits;
-        u32 widthbits;
-
-        switch (size) {
-#if 0                           /* We don't support 4 GB yet */
-        case 0x100000000:       /* 4 GB */
-                maskbits = 4;
-                break;
-#endif
-        case 0x80000000:        /* 2 GB */
-                maskbits = 5;
-                break;
-        case 0x40000000:        /* 1 GB */
-                maskbits = 6;
-                break;
-        case 0x20000000:        /* 512 MB */
-                maskbits = 7;
-                break;
-        case 0x10000000:        /* 256 MB */
-                maskbits = 8;
-                break;
-        case 0x08000000:        /* 128 MB */
-                maskbits = 9;
-                break;
-        case 0x04000000:        /* 64 MB */
-                maskbits = 10;
-                break;
-        case 0x02000000:        /* 32 MB */
-                maskbits = 11;
-                break;
-        case 0x01000000:        /* 16 MB */
-                maskbits = 12;
-                break;
-        case 0x00800000:        /* 8 MB */
-                maskbits = 13;
-                break;
-        case 0x00400000:        /* 4 MB */
-                maskbits = 14;
-                break;
-        case 0x00200000:        /* 2 MB */
-                maskbits = 15;
-                break;
-        case 0:         /* OFF */
-                maskbits = 0;
-                break;
-        default:
-                panic("nile4_set_pdar: unsupported size %p", (void *) size);
-        }
-        switch (width) {
-        case 8:
-                widthbits = 0;
-                break;
-        case 16:
-                widthbits = 1;
-                break;
-        case 32:
-                widthbits = 2;
-                break;
-        case 64:
-                widthbits = 3;
-                break;
-        default:
-                panic("nile4_set_pdar: unsupported width %d", width);
-        }
-
-        return maskbits | (on_memory_bus ? 0x10 : 0) |
-                (pci_visible ? 0x20 : 0) | (widthbits << 6) |
-                (phys & 0xffe00000);
-}
-
-void
-ddb_set_pdar(u32 pdar, u32 phys, u32 size, int width,
-             int on_memory_bus, int pci_visible)
-{
-        u32 temp= ddb_calc_pdar(phys, size, width, on_memory_bus, pci_visible);
-        ddb_out32(pdar, temp);
-        ddb_out32(pdar + 4, 0);
-
-        /*
-         * When programming a PDAR, the register should be read immediately
-         * after writing it. This ensures that address decoders are properly
-         * configured.
-         * [jsun] is this really necessary?
-         */
-        ddb_in32(pdar);
-        ddb_in32(pdar + 4);
-}
-
-/*
- * routines that mess with PCIINITx registers
- */
-
-void ddb_set_pmr(u32 pmr, u32 type, u32 addr, u32 options)
-{
-        switch (type) {
-        case DDB_PCICMD_IACK: /* PCI Interrupt Acknowledge */
-        case DDB_PCICMD_IO:   /* PCI I/O Space */
-        case DDB_PCICMD_MEM:  /* PCI Memory Space */
-        case DDB_PCICMD_CFG:  /* PCI Configuration Space */
-                break;
-        default:
-                panic("nile4_set_pmr: invalid type %d", type);
-        }
-        ddb_out32(pmr, (type << 1) | (addr & 0xffe00000) | options );
-        ddb_out32(pmr + 4, 0);
-}
diff --git a/arch/mips/ddb5xxx/common/prom.c b/arch/mips/ddb5xxx/common/prom.c
deleted file mode 100644
index 54a857b5e3ba..000000000000
--- a/arch/mips/ddb5xxx/common/prom.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- * 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/mm.h>
-#include <linux/sched.h>
-#include <linux/bootmem.h>
-
-#include <asm/addrspace.h>
-#include <asm/bootinfo.h>
-#include <asm/ddb5xxx/ddb5xxx.h>
-#include <asm/debug.h>
-
-const char *get_system_type(void)
-{
-        switch (mips_machtype) {
-        case MACH_NEC_DDB5477:          return "NEC DDB Vrc-5477";
-        case MACH_NEC_ROCKHOPPER:       return "NEC Rockhopper";
-        case MACH_NEC_ROCKHOPPERII:     return "NEC RockhopperII";
-        default:                        return "Unknown NEC board";
-        }
-}
-
-#if defined(CONFIG_DDB5477)
-void ddb5477_runtime_detection(void);
-#endif
-
-/* [jsun@junsun.net] PMON passes arguments in C main() style */
-void __init prom_init(void)
-{
-        int argc = fw_arg0;
-        char **arg = (char**) fw_arg1;
-        int i;
-
-        /* if user passes kernel args, ignore the default one */
-        if (argc > 1)
-                arcs_cmdline[0] = '\0';
-
-        /* arg[0] is "g", the rest is boot parameters */
-        for (i = 1; i < argc; i++) {
-                if (strlen(arcs_cmdline) + strlen(arg[i] + 1)
-                    >= sizeof(arcs_cmdline))
-                        break;
-                strcat(arcs_cmdline, arg[i]);
-                strcat(arcs_cmdline, " ");
-        }
-
-        mips_machgroup = MACH_GROUP_NEC_DDB;
-
-#if defined(CONFIG_DDB5477)
-        ddb5477_runtime_detection();
-        add_memory_region(0, board_ram_size, BOOT_MEM_RAM);
-#endif
-}
-
-void __init prom_free_prom_memory(void)
-{
-}
-
-#if defined(CONFIG_DDB5477)
-
-#define DEFAULT_LCS1_BASE 0x19000000
-#define TESTVAL1 'K'
-#define TESTVAL2 'S'
-
-int board_ram_size;
-void ddb5477_runtime_detection(void)
-{
-        volatile char *test_offset;
-        char saved_test_byte;
-
-        /* Determine if this is a DDB5477 board, or a BSB-VR0300
-           base board.  We can tell by checking for the location of
-           the NVRAM.  It lives at the beginning of LCS1 on the DDB5477,
-           and the beginning of LCS1 on the BSB-VR0300 is flash memory.
-           The first 2K of the NVRAM are reserved, so don't we'll poke
-           around just after that.
-         */
-
-        /* We can only use the PCI bus to distinquish between
-           the Rockhopper and RockhopperII backplanes and this must
-           wait until ddb5477_board_init() in setup.c after the 5477
-           is initialized.  So, until then handle
-           both Rockhopper and RockhopperII backplanes as Rockhopper 1
-         */
-
-        test_offset = (char *)KSEG1ADDR(DEFAULT_LCS1_BASE + 0x800);
-        saved_test_byte = *test_offset;
-
-        *test_offset = TESTVAL1;
-        if (*test_offset != TESTVAL1) {
-                /* We couldn't set our test value, so it must not be NVRAM,
-                   so it's a BSB_VR0300 */
-                mips_machtype = MACH_NEC_ROCKHOPPER;
-        } else {
-                /* We may have gotten lucky, and the TESTVAL1 was already
-                   stored at the test location, so we must check a second
-                   test value */
-                *test_offset = TESTVAL2;
-                if (*test_offset != TESTVAL2) {
-                        /* OK, we couldn't set this value either, so it must
-                           definately be a BSB_VR0300 */
-                        mips_machtype = MACH_NEC_ROCKHOPPER;
-                } else {
-                        /* We could change the value twice, so it must be
-                        NVRAM, so it's a DDB_VRC5477 */
-                        mips_machtype = MACH_NEC_DDB5477;
-                }
-        }
-        /* Restore the original byte */
-        *test_offset = saved_test_byte;
-
-        /* before we know a better way, we will trust PMON for getting
-         * RAM size
-         */
-        board_ram_size = 1 << (36 - (ddb_in32(DDB_SDRAM0) & 0xf));
-
-        db_run(printk("DDB run-time detection : %s, %d MB RAM\n",
-                                mips_machtype == MACH_NEC_DDB5477 ?
-                                "DDB5477" : "Rockhopper",
-                                board_ram_size >> 20));
-
-        /* we can't handle ram size > 128 MB */
-        db_assert(board_ram_size <= (128 << 20));
-}
-#endif
diff --git a/arch/mips/ddb5xxx/common/rtc_ds1386.c b/arch/mips/ddb5xxx/common/rtc_ds1386.c
deleted file mode 100644
index 5dc34daa7150..000000000000
--- a/arch/mips/ddb5xxx/common/rtc_ds1386.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- * arch/mips/ddb5xxx/common/rtc_ds1386.c
- *     low-level RTC hookups for s for Dallas 1396 chip.
- *
- * 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 file exports a function, rtc_ds1386_init(), which expects an
- * uncached base address as the argument.  It will set the two function
- * pointers expected by the MIPS generic timer code.
- */
-
-#include <linux/types.h>
-#include <linux/time.h>
-#include <linux/bcd.h>
-
-#include <asm/time.h>
-#include <asm/addrspace.h>
-
-#include <asm/mc146818rtc.h>
-#include <asm/debug.h>
-
-#define EPOCH           2000
-
-#define READ_RTC(x)     *(volatile unsigned char*)(rtc_base+x)
-#define WRITE_RTC(x, y) *(volatile unsigned char*)(rtc_base+x) = y
-
-static unsigned long rtc_base;
-
-static unsigned long
-rtc_ds1386_get_time(void)
-{
-        u8 byte;
-        u8 temp;
-        unsigned int year, month, day, hour, minute, second;
-        unsigned long flags;
-
-        spin_lock_irqsave(&rtc_lock, flags);
-        /* let us freeze external registers */
-        byte = READ_RTC(0xB);
-        byte &= 0x3f;
-        WRITE_RTC(0xB, byte);
-
-        /* read time data */
-        year = BCD2BIN(READ_RTC(0xA)) + EPOCH;
-        month = BCD2BIN(READ_RTC(0x9) & 0x1f);
-        day = BCD2BIN(READ_RTC(0x8));
-        minute = BCD2BIN(READ_RTC(0x2));
-        second = BCD2BIN(READ_RTC(0x1));
-
-        /* hour is special - deal with it later */
-        temp = READ_RTC(0x4);
-
-        /* enable time transfer */
-        byte |= 0x80;
-        WRITE_RTC(0xB, byte);
-        spin_unlock_irqrestore(&rtc_lock, flags);
-
-        /* calc hour */
-        if (temp & 0x40) {
-                /* 12 hour format */
-                hour = BCD2BIN(temp & 0x1f);
-                if (temp & 0x20) hour += 12;            /* PM */
-        } else {
-                /* 24 hour format */
-                hour = BCD2BIN(temp & 0x3f);
-        }
-
-        return mktime(year, month, day, hour, minute, second);
-}
-
-static int
-rtc_ds1386_set_time(unsigned long t)
-{
-        struct rtc_time tm;
-        u8 byte;
-        u8 temp;
-        u8 year, month, day, hour, minute, second;
-        unsigned long flags;
-
-        spin_lock_irqsave(&rtc_lock, flags);
-        /* let us freeze external registers */
-        byte = READ_RTC(0xB);
-        byte &= 0x3f;
-        WRITE_RTC(0xB, byte);
-
-        /* convert */
-        to_tm(t, &tm);
-
-
-        /* check each field one by one */
-        year = BIN2BCD(tm.tm_year - EPOCH);
-        if (year != READ_RTC(0xA)) {
-                WRITE_RTC(0xA, year);
-        }
-
-        temp = READ_RTC(0x9);
-        month = BIN2BCD(tm.tm_mon+1);   /* tm_mon starts from 0 to 11 */
-        if (month != (temp & 0x1f)) {
-                WRITE_RTC( 0x9,
-                           (month & 0x1f) | (temp & ~0x1f) );
-        }
-
-        day = BIN2BCD(tm.tm_mday);
-        if (day != READ_RTC(0x8)) {
-                WRITE_RTC(0x8, day);
-        }
-
-        temp = READ_RTC(0x4);
-        if (temp & 0x40) {
-                /* 12 hour format */
-                hour = 0x40;
-                if (tm.tm_hour > 12) {
-                        hour |= 0x20 | (BIN2BCD(hour-12) & 0x1f);
-                } else {
-                        hour |= BIN2BCD(tm.tm_hour);
-                }
-        } else {
-                /* 24 hour format */
-                hour = BIN2BCD(tm.tm_hour) & 0x3f;
-        }
-        if (hour != temp) WRITE_RTC(0x4, hour);
-
-        minute = BIN2BCD(tm.tm_min);
-        if (minute != READ_RTC(0x2)) {
-                WRITE_RTC(0x2, minute);
-        }
-
-        second = BIN2BCD(tm.tm_sec);
-        if (second != READ_RTC(0x1)) {
-                WRITE_RTC(0x1, second);
-        }
-        spin_unlock_irqrestore(&rtc_lock, flags);
-
-        return 0;
-}
-
-void
-rtc_ds1386_init(unsigned long base)
-{
-        unsigned char byte;
-
-        /* remember the base */
-        rtc_base = base;
-        db_assert((rtc_base & 0xe0000000) == KSEG1);
-
-        /* turn on RTC if it is not on */
-        byte = READ_RTC(0x9);
-        if (byte & 0x80) {
-                byte &= 0x7f;
-                WRITE_RTC(0x9, byte);
-        }
-
-        /* enable time transfer */
-        byte = READ_RTC(0xB);
-        byte |= 0x80;
-        WRITE_RTC(0xB, byte);
-
-        /* set the function pointers */
-        rtc_mips_get_time = rtc_ds1386_get_time;
-        rtc_mips_set_time = rtc_ds1386_set_time;
-}
diff --git a/arch/mips/ddb5xxx/ddb5477/Makefile b/arch/mips/ddb5xxx/ddb5477/Makefile
deleted file mode 100644
index 4864b8a659c7..000000000000
--- a/arch/mips/ddb5xxx/ddb5477/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for NEC DDB-Vrc5477 board
-#
-
-obj-y                   += ddb5477-platform.o irq.o irq_5477.o setup.o \
-                           lcd44780.o
-
-obj-$(CONFIG_RUNTIME_DEBUG)     += debug.o
-obj-$(CONFIG_KGDB)              += kgdb_io.o
diff --git a/arch/mips/ddb5xxx/ddb5477/ddb5477-platform.c b/arch/mips/ddb5xxx/ddb5477/ddb5477-platform.c
deleted file mode 100644
index c16020ad54c2..000000000000
--- a/arch/mips/ddb5xxx/ddb5477/ddb5477-platform.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org)
- */
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/serial_8250.h>
-
-#include <asm/ddb5xxx/ddb5477.h>
-
-#define DDB_UART_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP)
-
-#define DDB5477_PORT(base, int)                                         \
-{                                                                       \
-        .mapbase        = base,                                         \
-        .irq            = int,                                          \
-        .uartclk        = 1843200,                                      \
-        .iotype         = UPIO_MEM,                                     \
-        .flags          = DDB_UART_FLAGS,                               \
-        .regshift       = 3,                                            \
-}
-
-static struct plat_serial8250_port uart8250_data[] = {
-        DDB5477_PORT(0xbfa04200, VRC5477_IRQ_UART0),
-        DDB5477_PORT(0xbfa04240, VRC5477_IRQ_UART1),
-        { },
-};
-
-static struct platform_device uart8250_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_PLATFORM,
-        .dev                    = {
-                .platform_data  = uart8250_data,
-        },
-};
-
-static int __init uart8250_init(void)
-{
-        return platform_device_register(&uart8250_device);
-}
-
-module_init(uart8250_init);
-
-MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("8250 UART probe driver for the NEC DDB5477");
diff --git a/arch/mips/ddb5xxx/ddb5477/debug.c b/arch/mips/ddb5xxx/ddb5477/debug.c
deleted file mode 100644
index 68919d5f8ffd..000000000000
--- a/arch/mips/ddb5xxx/ddb5477/debug.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/***********************************************************************
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- * arch/mips/ddb5xxx/ddb5477/debug.c
- *     vrc5477 specific debug routines.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- ***********************************************************************
- */
-
-#include <linux/kernel.h>
-
-#include <asm/mipsregs.h>
-#include <asm/ddb5xxx/ddb5xxx.h>
-
-typedef struct {
-       const char *regname;
-       unsigned regaddr;
-} Register;
-
-void jsun_show_regs(char *name, Register *regs)
-{
-        int i;
-
-        printk("\nshow regs: %s\n", name);
-        for(i=0;regs[i].regname!= NULL; i++) {
-                printk("%-16s= %08x\t\t(@%08x)\n",
-                       regs[i].regname,
-                       *(unsigned *)(regs[i].regaddr),
-                       regs[i].regaddr);
-        }
-}
-
-static Register int_regs[] = {
-        {"DDB_INTCTRL0", DDB_BASE + DDB_INTCTRL0},
-        {"DDB_INTCTRL1", DDB_BASE + DDB_INTCTRL1},
-        {"DDB_INTCTRL2", DDB_BASE + DDB_INTCTRL2},
-        {"DDB_INTCTRL3", DDB_BASE + DDB_INTCTRL3},
-        {"DDB_INT0STAT", DDB_BASE + DDB_INT0STAT},
-        {"DDB_INT1STAT", DDB_BASE + DDB_INT1STAT},
-        {"DDB_INT2STAT", DDB_BASE + DDB_INT2STAT},
-        {"DDB_INT3STAT", DDB_BASE + DDB_INT3STAT},
-        {"DDB_INT4STAT", DDB_BASE + DDB_INT4STAT},
-        {"DDB_NMISTAT", DDB_BASE + DDB_NMISTAT},
-        {"DDB_INTPPES0", DDB_BASE + DDB_INTPPES0},
-        {"DDB_INTPPES1", DDB_BASE + DDB_INTPPES1},
-        {NULL, 0x0}
-};
-
-void vrc5477_show_int_regs()
-{
-        jsun_show_regs("interrupt registers", int_regs);
-        printk("CPU CAUSE = %08x\n", read_c0_cause());
-        printk("CPU STATUS = %08x\n", read_c0_status());
-}
-static Register pdar_regs[] = {
-        {"DDB_SDRAM0", DDB_BASE + DDB_SDRAM0},
-        {"DDB_SDRAM1", DDB_BASE + DDB_SDRAM1},
-        {"DDB_LCS0", DDB_BASE + DDB_LCS0},
-        {"DDB_LCS1", DDB_BASE + DDB_LCS1},
-        {"DDB_LCS2", DDB_BASE + DDB_LCS2},
-        {"DDB_INTCS", DDB_BASE + DDB_INTCS},
-        {"DDB_BOOTCS", DDB_BASE + DDB_BOOTCS},
-        {"DDB_PCIW0", DDB_BASE + DDB_PCIW0},
-        {"DDB_PCIW1", DDB_BASE + DDB_PCIW1},
-        {"DDB_IOPCIW0", DDB_BASE + DDB_IOPCIW0},
-        {"DDB_IOPCIW1", DDB_BASE + DDB_IOPCIW1},
-        {NULL, 0x0}
-};
-void vrc5477_show_pdar_regs(void)
-{
-        jsun_show_regs("PDAR regs", pdar_regs);
-}
-
-static Register bar_regs[] = {
-        {"DDB_BARC0", DDB_BASE + DDB_BARC0},
-        {"DDB_BARM010", DDB_BASE + DDB_BARM010},
-        {"DDB_BARM230", DDB_BASE + DDB_BARM230},
-        {"DDB_BAR00", DDB_BASE + DDB_BAR00},
-        {"DDB_BAR10", DDB_BASE + DDB_BAR10},
-        {"DDB_BAR20", DDB_BASE + DDB_BAR20},
-        {"DDB_BAR30", DDB_BASE + DDB_BAR30},
-        {"DDB_BAR40", DDB_BASE + DDB_BAR40},
-        {"DDB_BAR50", DDB_BASE + DDB_BAR50},
-        {"DDB_BARB0", DDB_BASE + DDB_BARB0},
-        {"DDB_BARC1", DDB_BASE + DDB_BARC1},
-        {"DDB_BARM011", DDB_BASE + DDB_BARM011},
-        {"DDB_BARM231", DDB_BASE + DDB_BARM231},
-        {"DDB_BAR01", DDB_BASE + DDB_BAR01},
-        {"DDB_BAR11", DDB_BASE + DDB_BAR11},
-        {"DDB_BAR21", DDB_BASE + DDB_BAR21},
-        {"DDB_BAR31", DDB_BASE + DDB_BAR31},
-        {"DDB_BAR41", DDB_BASE + DDB_BAR41},
-        {"DDB_BAR51", DDB_BASE + DDB_BAR51},
-        {"DDB_BARB1", DDB_BASE + DDB_BARB1},
-        {NULL, 0x0}
-};
-void vrc5477_show_bar_regs(void)
-{
-        jsun_show_regs("BAR regs", bar_regs);
-}
-
-static Register pci_regs[] = {
-        {"DDB_PCIW0", DDB_BASE + DDB_PCIW0},
-        {"DDB_PCIW1", DDB_BASE + DDB_PCIW1},
-        {"DDB_PCIINIT00", DDB_BASE + DDB_PCIINIT00},
-        {"DDB_PCIINIT10", DDB_BASE + DDB_PCIINIT10},
-        {"DDB_PCICTL0_L", DDB_BASE + DDB_PCICTL0_L},
-        {"DDB_PCICTL0_H", DDB_BASE + DDB_PCICTL0_H},
-        {"DDB_PCIARB0_L", DDB_BASE + DDB_PCIARB0_L},
-        {"DDB_PCIARB0_H", DDB_BASE + DDB_PCIARB0_H},
-        {"DDB_PCISWP0", DDB_BASE + DDB_PCISWP0},
-        {"DDB_PCIERR0", DDB_BASE + DDB_PCIERR0},
-        {"DDB_IOPCIW0", DDB_BASE + DDB_IOPCIW0},
-        {"DDB_IOPCIW1", DDB_BASE + DDB_IOPCIW1},
-        {"DDB_PCIINIT01", DDB_BASE + DDB_PCIINIT01},
-        {"DDB_PCIINIT11", DDB_BASE + DDB_PCIINIT11},
-        {"DDB_PCICTL1_L", DDB_BASE + DDB_PCICTL1_L},
-        {"DDB_PCICTL1_H", DDB_BASE + DDB_PCICTL1_H},
-        {"DDB_PCIARB1_L", DDB_BASE + DDB_PCIARB1_L},
-        {"DDB_PCIARB1_H", DDB_BASE + DDB_PCIARB1_H},
-        {"DDB_PCISWP1", DDB_BASE + DDB_PCISWP1},
-        {"DDB_PCIERR1", DDB_BASE + DDB_PCIERR1},
-        {NULL, 0x0}
-};
-void vrc5477_show_pci_regs(void)
-{
-        jsun_show_regs("PCI regs", pci_regs);
-}
-
-static Register lb_regs[] = {
-        {"DDB_LCNFG", DDB_BASE + DDB_LCNFG},
-        {"DDB_LCST0", DDB_BASE + DDB_LCST0},
-        {"DDB_LCST1", DDB_BASE + DDB_LCST1},
-        {"DDB_LCST2", DDB_BASE + DDB_LCST2},
-        {"DDB_ERRADR", DDB_BASE + DDB_ERRADR},
-        {"DDB_ERRCS", DDB_BASE + DDB_ERRCS},
-        {"DDB_BTM", DDB_BASE + DDB_BTM},
-        {"DDB_BCST", DDB_BASE + DDB_BCST},
-        {NULL, 0x0}
-};
-void vrc5477_show_lb_regs(void)
-{
-        jsun_show_regs("Local Bus regs", lb_regs);
-}
-
-void vrc5477_show_all_regs(void)
-{
-        vrc5477_show_pdar_regs();
-        vrc5477_show_pci_regs();
-        vrc5477_show_bar_regs();
-        vrc5477_show_int_regs();
-        vrc5477_show_lb_regs();
-}
diff --git a/arch/mips/ddb5xxx/ddb5477/irq.c b/arch/mips/ddb5xxx/ddb5477/irq.c
deleted file mode 100644
index faa4a506bf82..000000000000
--- a/arch/mips/ddb5xxx/ddb5477/irq.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- *  arch/mips/ddb5xxx/ddb5477/irq.c
- *     The irq setup and misc routines for DDB5476.
- *
- * 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/interrupt.h>
-#include <linux/irq.h>
-#include <linux/types.h>
-#include <linux/ptrace.h>
-
-#include <asm/i8259.h>
-#include <asm/irq_cpu.h>
-#include <asm/system.h>
-#include <asm/mipsregs.h>
-#include <asm/debug.h>
-#include <asm/addrspace.h>
-#include <asm/bootinfo.h>
-
-#include <asm/ddb5xxx/ddb5xxx.h>
-
-
-/*
- * IRQ mapping
- *
- *  0-7: 8 CPU interrupts
- *      0 -     software interrupt 0
- *      1 -     software interrupt 1
- *      2 -     most Vrc5477 interrupts are routed to this pin
- *      3 -     (optional) some other interrupts routed to this pin for debugg
- *      4 -     not used
- *      5 -     not used
- *      6 -     not used
- *      7 -     cpu timer (used by default)
- *
- *  8-39: 32 Vrc5477 interrupt sources
- *      (refer to the Vrc5477 manual)
- */
-
-#define PCI0                    DDB_INTPPES0
-#define PCI1                    DDB_INTPPES1
-
-#define ACTIVE_LOW              1
-#define ACTIVE_HIGH             0
-
-#define LEVEL_SENSE             2
-#define EDGE_TRIGGER            0
-
-#define INTA                    0
-#define INTB                    1
-#define INTC                    2
-#define INTD                    3
-#define INTE                    4
-
-static inline void
-set_pci_int_attr(u32 pci, u32 intn, u32 active, u32 trigger)
-{
-        u32 reg_value;
-        u32 reg_bitmask;
-
-        reg_value = ddb_in32(pci);
-        reg_bitmask = 0x3 << (intn * 2);
-
-        reg_value &= ~reg_bitmask;
-        reg_value |= (active | trigger) << (intn * 2);
-        ddb_out32(pci, reg_value);
-}
-
-extern void vrc5477_irq_init(u32 base);
-static struct irqaction irq_cascade = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL };
-
-void __init arch_init_irq(void)
-{
-        /* by default, we disable all interrupts and route all vrc5477
-         * interrupts to pin 0 (irq 2) */
-        ddb_out32(DDB_INTCTRL0, 0);
-        ddb_out32(DDB_INTCTRL1, 0);
-        ddb_out32(DDB_INTCTRL2, 0);
-        ddb_out32(DDB_INTCTRL3, 0);
-
-        clear_c0_status(0xff00);
-        set_c0_status(0x0400);
-
-        /* setup PCI interrupt attributes */
-        set_pci_int_attr(PCI0, INTA, ACTIVE_LOW, LEVEL_SENSE);
-        set_pci_int_attr(PCI0, INTB, ACTIVE_LOW, LEVEL_SENSE);
-        if (mips_machtype == MACH_NEC_ROCKHOPPERII)
-                set_pci_int_attr(PCI0, INTC, ACTIVE_HIGH, LEVEL_SENSE);
-        else
-                set_pci_int_attr(PCI0, INTC, ACTIVE_LOW, LEVEL_SENSE);
-        set_pci_int_attr(PCI0, INTD, ACTIVE_LOW, LEVEL_SENSE);
-        set_pci_int_attr(PCI0, INTE, ACTIVE_LOW, LEVEL_SENSE);
-
-        set_pci_int_attr(PCI1, INTA, ACTIVE_LOW, LEVEL_SENSE);
-        set_pci_int_attr(PCI1, INTB, ACTIVE_LOW, LEVEL_SENSE);
-        set_pci_int_attr(PCI1, INTC, ACTIVE_LOW, LEVEL_SENSE);
-        set_pci_int_attr(PCI1, INTD, ACTIVE_LOW, LEVEL_SENSE);
-        set_pci_int_attr(PCI1, INTE, ACTIVE_LOW, LEVEL_SENSE);
-
-        /*
-         * for debugging purpose, we enable several error interrupts
-         * and route them to pin 1. (IP3)
-         */
-        /* cpu parity check - 0 */
-        ll_vrc5477_irq_route(0, 1); ll_vrc5477_irq_enable(0);
-        /* cpu no-target decode - 1 */
-        ll_vrc5477_irq_route(1, 1); ll_vrc5477_irq_enable(1);
-        /* local bus read time-out - 7 */
-        ll_vrc5477_irq_route(7, 1); ll_vrc5477_irq_enable(7);
-        /* PCI SERR# - 14 */
-        ll_vrc5477_irq_route(14, 1); ll_vrc5477_irq_enable(14);
-        /* PCI internal error - 15 */
-        ll_vrc5477_irq_route(15, 1); ll_vrc5477_irq_enable(15);
-        /* IOPCI SERR# - 30 */
-        ll_vrc5477_irq_route(30, 1); ll_vrc5477_irq_enable(30);
-        /* IOPCI internal error - 31 */
-        ll_vrc5477_irq_route(31, 1); ll_vrc5477_irq_enable(31);
-
-        /* init all controllers */
-        init_i8259_irqs();
-        mips_cpu_irq_init();
-        vrc5477_irq_init(VRC5477_IRQ_BASE);
-
-
-        /* setup cascade interrupts */
-        setup_irq(VRC5477_IRQ_BASE + VRC5477_I8259_CASCADE, &irq_cascade);
-        setup_irq(CPU_IRQ_BASE + CPU_VRC5477_CASCADE, &irq_cascade);
-}
-
-u8 i8259_interrupt_ack(void)
-{
-        u8 irq;
-        u32 reg;
-
-        /* Set window 0 for interrupt acknowledge */
-        reg = ddb_in32(DDB_PCIINIT10);
-
-        ddb_set_pmr(DDB_PCIINIT10, DDB_PCICMD_IACK, 0, DDB_PCI_ACCESS_32);
-        irq = *(volatile u8 *) KSEG1ADDR(DDB_PCI_IACK_BASE);
-        ddb_out32(DDB_PCIINIT10, reg);
-
-        return irq;
-}
-/*
- * the first level int-handler will jump here if it is a vrc5477 irq
- */
-#define NUM_5477_IRQS   32
-static void vrc5477_irq_dispatch(void)
-{
-        u32 intStatus;
-        u32 bitmask;
-        u32 i;
-
-        db_assert(ddb_in32(DDB_INT2STAT) == 0);
-        db_assert(ddb_in32(DDB_INT3STAT) == 0);
-        db_assert(ddb_in32(DDB_INT4STAT) == 0);
-        db_assert(ddb_in32(DDB_NMISTAT) == 0);
-
-        if (ddb_in32(DDB_INT1STAT) != 0) {
-#if defined(CONFIG_RUNTIME_DEBUG)
-                vrc5477_show_int_regs();
-#endif
-                panic("error interrupt has happened.");
-        }
-
-        intStatus = ddb_in32(DDB_INT0STAT);
-
-        if (mips_machtype == MACH_NEC_ROCKHOPPERII) {
-                /* check for i8259 interrupts */
-                if (intStatus & (1 << VRC5477_I8259_CASCADE)) {
-                        int i8259_irq = i8259_interrupt_ack();
-                        do_IRQ(i8259_irq);
-                        return;
-                }
-        }
-
-        for (i=0, bitmask=1; i<= NUM_5477_IRQS; bitmask <<=1, i++) {
-                /* do we need to "and" with the int mask? */
-                if (intStatus & bitmask) {
-                        do_IRQ(VRC5477_IRQ_BASE + i);
-                        return;
-                }
-        }
-}
-
-#define VR5477INTS (STATUSF_IP2|STATUSF_IP3|STATUSF_IP4|STATUSF_IP5|STATUSF_IP6)
-
-asmlinkage void plat_irq_dispatch(void)
-{
-        unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;
-
-        if (pending & STATUSF_IP7)
-                do_IRQ(CPU_IRQ_BASE + 7);
-        else if (pending & VR5477INTS)
-                vrc5477_irq_dispatch();
-        else if (pending & STATUSF_IP0)
-                do_IRQ(CPU_IRQ_BASE);
-        else if (pending & STATUSF_IP1)
-                do_IRQ(CPU_IRQ_BASE + 1);
-        else
-                spurious_interrupt();
-}
diff --git a/arch/mips/ddb5xxx/ddb5477/irq_5477.c b/arch/mips/ddb5xxx/ddb5477/irq_5477.c
deleted file mode 100644
index 98c3b15eb369..000000000000
--- a/arch/mips/ddb5xxx/ddb5477/irq_5477.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- *  arch/mips/ddb5xxx/ddb5477/irq_5477.c
- *     This file defines the irq handler for Vrc5477.
- *
- * 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.
- *
- */
-
-/*
- * Vrc5477 defines 32 IRQs.
- *
- * This file exports one function:
- *      vrc5477_irq_init(u32 irq_base);
- */
-
-#include <linux/interrupt.h>
-#include <linux/types.h>
-#include <linux/ptrace.h>
-
-#include <asm/debug.h>
-
-#include <asm/ddb5xxx/ddb5xxx.h>
-
-/* number of total irqs supported by Vrc5477 */
-#define NUM_5477_IRQ            32
-
-static int vrc5477_irq_base = -1;
-
-
-static void
-vrc5477_irq_enable(unsigned int irq)
-{
-        db_assert(vrc5477_irq_base != -1);
-        db_assert(irq >= vrc5477_irq_base);
-        db_assert(irq < vrc5477_irq_base+ NUM_5477_IRQ);
-
-        ll_vrc5477_irq_enable(irq - vrc5477_irq_base);
-}
-
-static void
-vrc5477_irq_disable(unsigned int irq)
-{
-        db_assert(vrc5477_irq_base != -1);
-        db_assert(irq >= vrc5477_irq_base);
-        db_assert(irq < vrc5477_irq_base + NUM_5477_IRQ);
-
-        ll_vrc5477_irq_disable(irq - vrc5477_irq_base);
-}
-
-static void
-vrc5477_irq_ack(unsigned int irq)
-{
-        db_assert(vrc5477_irq_base != -1);
-        db_assert(irq >= vrc5477_irq_base);
-        db_assert(irq < vrc5477_irq_base+ NUM_5477_IRQ);
-
-        /* clear the interrupt bit */
-        /* some irqs require the driver to clear the sources */
-        ddb_out32(DDB_INTCLR32, 1 << (irq - vrc5477_irq_base));
-
-        /* disable interrupt - some handler will re-enable the irq
-         * and if the interrupt is leveled, we will have infinite loop
-         */
-        ll_vrc5477_irq_disable(irq - vrc5477_irq_base);
-}
-
-static void
-vrc5477_irq_end(unsigned int irq)
-{
-        db_assert(vrc5477_irq_base != -1);
-        db_assert(irq >= vrc5477_irq_base);
-        db_assert(irq < vrc5477_irq_base + NUM_5477_IRQ);
-
-        if(!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-                ll_vrc5477_irq_enable( irq - vrc5477_irq_base);
-}
-
-struct irq_chip vrc5477_irq_controller = {
-        .name = "vrc5477_irq",
-        .ack = vrc5477_irq_ack,
-        .mask = vrc5477_irq_disable,
-        .mask_ack = vrc5477_irq_ack,
-        .unmask = vrc5477_irq_enable,
-        .end = vrc5477_irq_end
-};
-
-void __init vrc5477_irq_init(u32 irq_base)
-{
-        u32 i;
-
-        for (i= irq_base; i< irq_base+ NUM_5477_IRQ; i++)
-                set_irq_chip(i, &vrc5477_irq_controller);
-
-        vrc5477_irq_base = irq_base;
-}
-
-void ll_vrc5477_irq_route(int vrc5477_irq, int ip)
-{
-        u32 reg_value;
-        u32 reg_bitmask;
-        u32 reg_index;
-
-        db_assert(vrc5477_irq >= 0);
-        db_assert(vrc5477_irq < NUM_5477_IRQ);
-        db_assert(ip >= 0);
-        db_assert((ip < 5) || (ip == 6));
-
-        reg_index = DDB_INTCTRL0 + vrc5477_irq/8*4;
-        reg_value = ddb_in32(reg_index);
-        reg_bitmask = 7 << (vrc5477_irq % 8 * 4);
-        reg_value &= ~reg_bitmask;
-        reg_value |= ip << (vrc5477_irq % 8 * 4);
-        ddb_out32(reg_index, reg_value);
-}
-
-void ll_vrc5477_irq_enable(int vrc5477_irq)
-{
-        u32 reg_value;
-        u32 reg_bitmask;
-        u32 reg_index;
-
-        db_assert(vrc5477_irq >= 0);
-        db_assert(vrc5477_irq < NUM_5477_IRQ);
-
-        reg_index = DDB_INTCTRL0 + vrc5477_irq/8*4;
-        reg_value = ddb_in32(reg_index);
-        reg_bitmask = 8 << (vrc5477_irq % 8 * 4);
-        db_assert((reg_value & reg_bitmask) == 0);
-        ddb_out32(reg_index, reg_value | reg_bitmask);
-}
-
-void ll_vrc5477_irq_disable(int vrc5477_irq)
-{
-        u32 reg_value;
-        u32 reg_bitmask;
-        u32 reg_index;
-
-        db_assert(vrc5477_irq >= 0);
-        db_assert(vrc5477_irq < NUM_5477_IRQ);
-
-        reg_index = DDB_INTCTRL0 + vrc5477_irq/8*4;
-        reg_value = ddb_in32(reg_index);
-        reg_bitmask = 8 << (vrc5477_irq % 8 * 4);
-
-        /* we assert that the interrupt is enabled (perhaps over-zealous) */
-        db_assert( (reg_value & reg_bitmask) != 0);
-        ddb_out32(reg_index, reg_value & ~reg_bitmask);
-}
diff --git a/arch/mips/ddb5xxx/ddb5477/kgdb_io.c b/arch/mips/ddb5xxx/ddb5477/kgdb_io.c
deleted file mode 100644
index 385bbdb10170..000000000000
--- a/arch/mips/ddb5xxx/ddb5477/kgdb_io.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * kgdb io functions for DDB5477.  We use the second serial port (upper one).
- *
- * Copyright (C) 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- * 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.
- *
- */
-
-/* ======================= CONFIG ======================== */
-
-/* [jsun] we use the second serial port for kdb */
-#define         BASE                    0xbfa04240
-#define         MAX_BAUD                115200
-
-/* distance in bytes between two serial registers */
-#define         REG_OFFSET              8
-
-/*
- * 0 - kgdb does serial init
- * 1 - kgdb skip serial init
- */
-static int remoteDebugInitialized = 0;
-
-/*
- * the default baud rate *if* kgdb does serial init
- */
-#define         BAUD_DEFAULT            UART16550_BAUD_38400
-
-/* ======================= END OF CONFIG ======================== */
-
-typedef unsigned char uint8;
-typedef unsigned int uint32;
-
-#define         UART16550_BAUD_2400             2400
-#define         UART16550_BAUD_4800             4800
-#define         UART16550_BAUD_9600             9600
-#define         UART16550_BAUD_19200            19200
-#define         UART16550_BAUD_38400            38400
-#define         UART16550_BAUD_57600            57600
-#define         UART16550_BAUD_115200           115200
-
-#define         UART16550_PARITY_NONE           0
-#define         UART16550_PARITY_ODD            0x08
-#define         UART16550_PARITY_EVEN           0x18
-#define         UART16550_PARITY_MARK           0x28
-#define         UART16550_PARITY_SPACE          0x38
-
-#define         UART16550_DATA_5BIT             0x0
-#define         UART16550_DATA_6BIT             0x1
-#define         UART16550_DATA_7BIT             0x2
-#define         UART16550_DATA_8BIT             0x3
-
-#define         UART16550_STOP_1BIT             0x0
-#define         UART16550_STOP_2BIT             0x4
-
-/* register offset */
-#define         OFS_RCV_BUFFER          0
-#define         OFS_TRANS_HOLD          0
-#define         OFS_SEND_BUFFER         0
-#define         OFS_INTR_ENABLE         (1*REG_OFFSET)
-#define         OFS_INTR_ID             (2*REG_OFFSET)
-#define         OFS_DATA_FORMAT         (3*REG_OFFSET)
-#define         OFS_LINE_CONTROL        (3*REG_OFFSET)
-#define         OFS_MODEM_CONTROL       (4*REG_OFFSET)
-#define         OFS_RS232_OUTPUT        (4*REG_OFFSET)
-#define         OFS_LINE_STATUS         (5*REG_OFFSET)
-#define         OFS_MODEM_STATUS        (6*REG_OFFSET)
-#define         OFS_RS232_INPUT         (6*REG_OFFSET)
-#define         OFS_SCRATCH_PAD         (7*REG_OFFSET)
-
-#define         OFS_DIVISOR_LSB         (0*REG_OFFSET)
-#define         OFS_DIVISOR_MSB         (1*REG_OFFSET)
-
-
-/* memory-mapped read/write of the port */
-#define         UART16550_READ(y)    (*((volatile uint8*)(BASE + y)))
-#define         UART16550_WRITE(y, z)  ((*((volatile uint8*)(BASE + y))) = z)
-
-void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
-{
-        /* disable interrupts */
-        UART16550_WRITE(OFS_INTR_ENABLE, 0);
-
-        /* set up baud rate */
-        {
-                uint32 divisor;
-
-                /* set DIAB bit */
-                UART16550_WRITE(OFS_LINE_CONTROL, 0x80);
-
-                /* set divisor */
-                divisor = MAX_BAUD / baud;
-                UART16550_WRITE(OFS_DIVISOR_LSB, divisor & 0xff);
-                UART16550_WRITE(OFS_DIVISOR_MSB, (divisor & 0xff00) >> 8);
-
-                /* clear DIAB bit */
-                UART16550_WRITE(OFS_LINE_CONTROL, 0x0);
-        }
-
-        /* set data format */
-        UART16550_WRITE(OFS_DATA_FORMAT, data | parity | stop);
-}
-
-
-uint8 getDebugChar(void)
-{
-        if (!remoteDebugInitialized) {
-                remoteDebugInitialized = 1;
-                debugInit(BAUD_DEFAULT,
-                          UART16550_DATA_8BIT,
-                          UART16550_PARITY_NONE, UART16550_STOP_1BIT);
-        }
-
-        while ((UART16550_READ(OFS_LINE_STATUS) & 0x1) == 0);
-        return UART16550_READ(OFS_RCV_BUFFER);
-}
-
-
-int putDebugChar(uint8 byte)
-{
-        if (!remoteDebugInitialized) {
-                remoteDebugInitialized = 1;
-                debugInit(BAUD_DEFAULT,
-                          UART16550_DATA_8BIT,
-                          UART16550_PARITY_NONE, UART16550_STOP_1BIT);
-        }
-
-        while ((UART16550_READ(OFS_LINE_STATUS) & 0x20) == 0);
-        UART16550_WRITE(OFS_SEND_BUFFER, byte);
-        return 1;
-}
diff --git a/arch/mips/ddb5xxx/ddb5477/lcd44780.c b/arch/mips/ddb5xxx/ddb5477/lcd44780.c
deleted file mode 100644
index 9510b9ae6453..000000000000
--- a/arch/mips/ddb5xxx/ddb5477/lcd44780.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * lcd44780.c
- * Simple "driver" for a memory-mapped 44780-style LCD display.
- *
- * Copyright 2001 Bradley D. LaRonde <brad@ltc.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.
- *
- */
-
-#define LCD44780_COMMAND   ((volatile unsigned char *)0xbe020000)
-#define LCD44780_DATA      ((volatile unsigned char *)0xbe020001)
-
-#define LCD44780_4BIT_1LINE        0x20
-#define LCD44780_4BIT_2LINE        0x28
-#define LCD44780_8BIT_1LINE        0x30
-#define LCD44780_8BIT_2LINE        0x38
-#define LCD44780_MODE_DEC          0x04
-#define LCD44780_MODE_DEC_SHIFT    0x05
-#define LCD44780_MODE_INC          0x06
-#define LCD44780_MODE_INC_SHIFT    0x07
-#define LCD44780_SCROLL_LEFT       0x18
-#define LCD44780_SCROLL_RIGHT      0x1e
-#define LCD44780_CURSOR_UNDERLINE  0x0e
-#define LCD44780_CURSOR_BLOCK      0x0f
-#define LCD44780_CURSOR_OFF        0x0c
-#define LCD44780_CLEAR             0x01
-#define LCD44780_BLANK             0x08
-#define LCD44780_RESTORE           0x0c  // Same as CURSOR_OFF
-#define LCD44780_HOME              0x02
-#define LCD44780_LEFT              0x10
-#define LCD44780_RIGHT             0x14
-
-void lcd44780_wait(void)
-{
-        int i, j;
-        for(i=0; i < 400; i++)
-                for(j=0; j < 10000; j++);
-}
-
-void lcd44780_command(unsigned char c)
-{
-        *LCD44780_COMMAND = c;
-        lcd44780_wait();
-}
-
-void lcd44780_data(unsigned char c)
-{
-        *LCD44780_DATA = c;
-        lcd44780_wait();
-}
-
-void lcd44780_puts(const char* s)
-{
-        int j;
-        int pos = 0;
-
-        lcd44780_command(LCD44780_CLEAR);
-        while(*s) {
-                lcd44780_data(*s);
-                s++;
-                pos++;
-                if (pos == 8) {
-                  /* We must write 32 of spaces to get cursor to 2nd line */
-                  for (j=0; j<32; j++) {
-                    lcd44780_data(' ');
-                  }
-                }
-                if (pos == 16) {
-                  /* We have filled all 16 character positions, so stop
-                     outputing data */
-                  break;
-                }
-        }
-#ifdef LCD44780_PUTS_PAUSE
-        {
-                int i;
-
-                for(i = 1; i < 2000; i++)
-                        lcd44780_wait();
-        }
-#endif
-}
-
-void lcd44780_init(void)
-{
-        // The display on the RockHopper is physically a single
-        // 16 char line (two 8 char lines concatenated).  bdl
-        lcd44780_command(LCD44780_8BIT_2LINE);
-        lcd44780_command(LCD44780_MODE_INC);
-        lcd44780_command(LCD44780_CURSOR_BLOCK);
-        lcd44780_command(LCD44780_CLEAR);
-}
diff --git a/arch/mips/ddb5xxx/ddb5477/lcd44780.h b/arch/mips/ddb5xxx/ddb5477/lcd44780.h
deleted file mode 100644
index cf2f0f71eee5..000000000000
--- a/arch/mips/ddb5xxx/ddb5477/lcd44780.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * lcd44780.h
- * Simple "driver" for a memory-mapped 44780-style LCD display.
- *
- * Copyright 2001 Bradley D. LaRonde <brad@ltc.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.
- *
- */
-
-void lcd44780_puts(const char* s);
-void lcd44780_init(void);
diff --git a/arch/mips/ddb5xxx/ddb5477/setup.c b/arch/mips/ddb5xxx/ddb5477/setup.c
deleted file mode 100644
index f0cc0e8a8afa..000000000000
--- a/arch/mips/ddb5xxx/ddb5477/setup.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
- *
- * arch/mips/ddb5xxx/ddb5477/setup.c
- *     Setup file for DDB5477.
- *
- * 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/kernel.h>
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-#include <linux/irq.h>
-#include <linux/fs.h>
-#include <linux/ioport.h>
-#include <linux/param.h>        /* for HZ */
-#include <linux/major.h>
-#include <linux/kdev_t.h>
-#include <linux/root_dev.h>
-#include <linux/pm.h>
-
-#include <asm/cpu.h>
-#include <asm/bootinfo.h>
-#include <asm/addrspace.h>
-#include <asm/time.h>
-#include <asm/bcache.h>
-#include <asm/irq.h>
-#include <asm/reboot.h>
-#include <asm/gdb-stub.h>
-#include <asm/traps.h>
-#include <asm/debug.h>
-
-#include <asm/ddb5xxx/ddb5xxx.h>
-
-#include "lcd44780.h"
-
-
-#define USE_CPU_COUNTER_TIMER   /* whether we use cpu counter */
-
-#define SP_TIMER_BASE                   DDB_SPT1CTRL_L
-#define SP_TIMER_IRQ                    VRC5477_IRQ_SPT1
-
-static int bus_frequency = CONFIG_DDB5477_BUS_FREQUENCY*1000;
-
-static void ddb_machine_restart(char *command)
-{
-        static void (*back_to_prom) (void) = (void (*)(void)) 0xbfc00000;
-
-        u32 t;
-
-        /* PCI cold reset */
-        ddb_pci_reset_bus();
-
-        /* CPU cold reset */
-        t = ddb_in32(DDB_CPUSTAT);
-        db_assert((t&1));
-        ddb_out32(DDB_CPUSTAT, t);
-
-        /* Call the PROM */
-        back_to_prom();
-}
-
-static void ddb_machine_halt(void)
-{
-        printk("DDB Vrc-5477 halted.\n");
-        while (1);
-}
-
-static void ddb_machine_power_off(void)
-{
-        printk("DDB Vrc-5477 halted. Please turn off the power.\n");
-        while (1);
-}
-
-extern void rtc_ds1386_init(unsigned long base);
-
-static unsigned int __init detect_bus_frequency(unsigned long rtc_base)
-{
-        unsigned int freq;
-        unsigned char c;
-        unsigned int t1, t2;
-        unsigned i;
-
-        ddb_out32(SP_TIMER_BASE, 0xffffffff);
-        ddb_out32(SP_TIMER_BASE+4, 0x1);
-        ddb_out32(SP_TIMER_BASE+8, 0xffffffff);
-
-        /* check if rtc is running */
-        c= *(volatile unsigned char*)rtc_base;
-        for(i=0; (c == *(volatile unsigned char*)rtc_base) && (i<100000000); i++);
-        if (c == *(volatile unsigned char*)rtc_base) {
-                printk("Failed to detect bus frequency.  Use default 83.3MHz.\n");
-                return 83333000;
-        }
-
-        c= *(volatile unsigned char*)rtc_base;
-        while (c == *(volatile unsigned char*)rtc_base);
-        /* we are now at the turn of 1/100th second, if no error. */
-        t1 = ddb_in32(SP_TIMER_BASE+8);
-
-        for (i=0; i< 10; i++) {
-                c= *(volatile unsigned char*)rtc_base;
-                while (c == *(volatile unsigned char*)rtc_base);
-                /* we are now at the turn of another 1/100th second */
-                t2 = ddb_in32(SP_TIMER_BASE+8);
-        }
-
-        ddb_out32(SP_TIMER_BASE+4, 0x0);        /* disable it again */
-
-        freq = (t1 - t2)*10;
-        printk("DDB bus frequency detection : %u \n", freq);
-        return freq;
-}
-
-static void __init ddb_time_init(void)
-{
-        unsigned long rtc_base;
-        unsigned int i;
-
-        /* we have ds1396 RTC chip */
-        if (mips_machtype == MACH_NEC_ROCKHOPPER
-                ||  mips_machtype == MACH_NEC_ROCKHOPPERII) {
-                rtc_base = KSEG1ADDR(DDB_LCS2_BASE);
-        } else {
-                rtc_base = KSEG1ADDR(DDB_LCS1_BASE);
-        }
-        rtc_ds1386_init(rtc_base);
-
-        /* do we need to do run-time detection of bus speed? */
-        if (bus_frequency == 0) {
-                bus_frequency = detect_bus_frequency(rtc_base);
-        }
-
-        /* mips_hpt_frequency is 1/2 of the cpu core freq */
-        i =  (read_c0_config() >> 28 ) & 7;
-        if ((current_cpu_data.cputype == CPU_R5432) && (i == 3))
-                i = 4;
-        mips_hpt_frequency = bus_frequency*(i+4)/4;
-}
-
-void __init plat_timer_setup(struct irqaction *irq)
-{
-#if defined(USE_CPU_COUNTER_TIMER)
-
-        /* we are using the cpu counter for timer interrupts */
-        setup_irq(CPU_IRQ_BASE + 7, irq);
-
-#else
-
-        /* if we use Special purpose timer 1 */
-        ddb_out32(SP_TIMER_BASE, bus_frequency/HZ);
-        ddb_out32(SP_TIMER_BASE+4, 0x1);
-        setup_irq(SP_TIMER_IRQ, irq);
-
-#endif
-}
-
-static void ddb5477_board_init(void);
-
-extern struct pci_controller ddb5477_ext_controller;
-extern struct pci_controller ddb5477_io_controller;
-
-void __init plat_mem_setup(void)
-{
-        /* initialize board - we don't trust the loader */
-        ddb5477_board_init();
-
-        set_io_port_base(KSEG1ADDR(DDB_PCI_IO_BASE));
-
-        board_time_init = ddb_time_init;
-
-        _machine_restart = ddb_machine_restart;
-        _machine_halt = ddb_machine_halt;
-        pm_power_off = ddb_machine_power_off;
-
-        /* setup resource limits */
-        ioport_resource.end = DDB_PCI0_IO_SIZE + DDB_PCI1_IO_SIZE - 1;
-        iomem_resource.end = 0xffffffff;
-
-        /* Reboot on panic */
-        panic_timeout = 180;
-
-        register_pci_controller (&ddb5477_ext_controller);
-        register_pci_controller (&ddb5477_io_controller);
-}
-
-static void __init ddb5477_board_init(void)
-{
-        /* ----------- setup PDARs ------------ */
-
-        /* SDRAM should have been set */
-        db_assert(ddb_in32(DDB_SDRAM0) ==
-                    ddb_calc_pdar(DDB_SDRAM_BASE, board_ram_size, 32, 0, 1));
-
-        /* SDRAM1 should be turned off.  What is this for anyway ? */
-        db_assert( (ddb_in32(DDB_SDRAM1) & 0xf) == 0);
-
-        /* Setup local bus. */
-
-        /* Flash U12 PDAR and timing. */
-        ddb_set_pdar(DDB_LCS0, DDB_LCS0_BASE, DDB_LCS0_SIZE, 16, 0, 0);
-        ddb_out32(DDB_LCST0, 0x00090842);
-
-        /* We need to setup LCS1 and LCS2 differently based on the
-           board_version */
-        if (mips_machtype == MACH_NEC_ROCKHOPPER) {
-                /* Flash U13 PDAR and timing. */
-                ddb_set_pdar(DDB_LCS1, DDB_LCS1_BASE, DDB_LCS1_SIZE, 16, 0, 0);
-                ddb_out32(DDB_LCST1, 0x00090842);
-
-                /* EPLD (NVRAM, switch, LCD, and mezzanie). */
-                ddb_set_pdar(DDB_LCS2, DDB_LCS2_BASE, DDB_LCS2_SIZE, 8, 0, 0);
-        } else {
-                /* misc */
-                ddb_set_pdar(DDB_LCS1, DDB_LCS1_BASE, DDB_LCS1_SIZE, 8, 0, 0);
-                /* mezzanie (?) */
-                ddb_set_pdar(DDB_LCS2, DDB_LCS2_BASE, DDB_LCS2_SIZE, 16, 0, 0);
-        }
-
-        /* verify VRC5477 base addr */
-        db_assert(ddb_in32(DDB_VRC5477) ==
-                  ddb_calc_pdar(DDB_VRC5477_BASE, DDB_VRC5477_SIZE, 32, 0, 1));
-
-        /* verify BOOT ROM addr */
-        db_assert(ddb_in32(DDB_BOOTCS) ==
-                  ddb_calc_pdar(DDB_BOOTCS_BASE, DDB_BOOTCS_SIZE, 8, 0, 0));
-
-        /* setup PCI windows - window0 for MEM/config, window1 for IO */
-        ddb_set_pdar(DDB_PCIW0, DDB_PCI0_MEM_BASE, DDB_PCI0_MEM_SIZE, 32, 0, 1);
-        ddb_set_pdar(DDB_PCIW1, DDB_PCI0_IO_BASE, DDB_PCI0_IO_SIZE, 32, 0, 1);
-        ddb_set_pdar(DDB_IOPCIW0, DDB_PCI1_MEM_BASE, DDB_PCI1_MEM_SIZE, 32, 0, 1);
-        ddb_set_pdar(DDB_IOPCIW1, DDB_PCI1_IO_BASE, DDB_PCI1_IO_SIZE, 32, 0, 1);
-
-        /* ------------ reset PCI bus and BARs ----------------- */
-        ddb_pci_reset_bus();
-
-        ddb_out32(DDB_BARM010, 0x00000008);
-        ddb_out32(DDB_BARM011, 0x00000008);
-
-        ddb_out32(DDB_BARC0, 0xffffffff);
-        ddb_out32(DDB_BARM230, 0xffffffff);
-        ddb_out32(DDB_BAR00, 0xffffffff);
-        ddb_out32(DDB_BAR10, 0xffffffff);
-        ddb_out32(DDB_BAR20, 0xffffffff);
-        ddb_out32(DDB_BAR30, 0xffffffff);
-        ddb_out32(DDB_BAR40, 0xffffffff);
-        ddb_out32(DDB_BAR50, 0xffffffff);
-        ddb_out32(DDB_BARB0, 0xffffffff);
-
-        ddb_out32(DDB_BARC1, 0xffffffff);
-        ddb_out32(DDB_BARM231, 0xffffffff);
-        ddb_out32(DDB_BAR01, 0xffffffff);
-        ddb_out32(DDB_BAR11, 0xffffffff);
-        ddb_out32(DDB_BAR21, 0xffffffff);
-        ddb_out32(DDB_BAR31, 0xffffffff);
-        ddb_out32(DDB_BAR41, 0xffffffff);
-        ddb_out32(DDB_BAR51, 0xffffffff);
-        ddb_out32(DDB_BARB1, 0xffffffff);
-
-        /*
-         * We use pci master register 0  for memory space / config space
-         * And we use register 1 for IO space.
-         * Note that for memory space, we bump up the pci base address
-         * so that we have 1:1 mapping between PCI memory and cpu physical.
-         * For PCI IO space, it starts from 0 in PCI IO space but with
-         * DDB_xx_IO_BASE in CPU physical address space.
-         */
-        ddb_set_pmr(DDB_PCIINIT00, DDB_PCICMD_MEM, DDB_PCI0_MEM_BASE,
-                    DDB_PCI_ACCESS_32);
-        ddb_set_pmr(DDB_PCIINIT10, DDB_PCICMD_IO, 0, DDB_PCI_ACCESS_32);
-
-        ddb_set_pmr(DDB_PCIINIT01, DDB_PCICMD_MEM, DDB_PCI1_MEM_BASE,
-                    DDB_PCI_ACCESS_32);
-        ddb_set_pmr(DDB_PCIINIT11, DDB_PCICMD_IO, DDB_PCI0_IO_SIZE,
-                    DDB_PCI_ACCESS_32);
-
-
-        /* PCI cross window should be set properly */
-        ddb_set_pdar(DDB_BARP00, DDB_PCI1_MEM_BASE, DDB_PCI1_MEM_SIZE, 32, 0, 1);
-        ddb_set_pdar(DDB_BARP10, DDB_PCI1_IO_BASE, DDB_PCI1_IO_SIZE, 32, 0, 1);
-        ddb_set_pdar(DDB_BARP01, DDB_PCI0_MEM_BASE, DDB_PCI0_MEM_SIZE, 32, 0, 1);
-        ddb_set_pdar(DDB_BARP11, DDB_PCI0_IO_BASE, DDB_PCI0_IO_SIZE, 32, 0, 1);
-
-        if (mips_machtype == MACH_NEC_ROCKHOPPER
-           ||  mips_machtype == MACH_NEC_ROCKHOPPERII) {
-                /* Disable bus diagnostics. */
-                ddb_out32(DDB_PCICTL0_L, 0);
-                ddb_out32(DDB_PCICTL0_H, 0);
-                ddb_out32(DDB_PCICTL1_L, 0);
-                ddb_out32(DDB_PCICTL1_H, 0);
-        }
-
-        if (mips_machtype == MACH_NEC_ROCKHOPPER) {
-                u16                     vid;
-                struct pci_bus          bus;
-                struct pci_dev          dev_m1533;
-                extern struct pci_ops   ddb5477_ext_pci_ops;
-
-                bus.parent      = NULL;    /* we scan the top level only */
-                bus.ops         = &ddb5477_ext_pci_ops;
-                dev_m1533.bus         = &bus;
-                dev_m1533.sysdata     = NULL;
-                dev_m1533.devfn       = 7*8;     // slot 7: M1533 SouthBridge.
-                pci_read_config_word(&dev_m1533, 0, &vid);
-                if (vid == PCI_VENDOR_ID_AL) {
-                        printk("Changing mips_machtype to MACH_NEC_ROCKHOPPERII\n");
-                        mips_machtype = MACH_NEC_ROCKHOPPERII;
-                }
-        }
-
-        /* enable USB input buffers */
-        ddb_out32(DDB_PIBMISC, 0x00000007);
-
-        /* For dual-function pins, make them all non-GPIO */
-        ddb_out32(DDB_GIUFUNSEL, 0x0);
-        // ddb_out32(DDB_GIUFUNSEL, 0xfe0fcfff);  /* NEC recommanded value */
-
-        if (mips_machtype == MACH_NEC_ROCKHOPPERII) {
-
-                /* enable IDE controller on Ali chip (south bridge) */
-                u8                      temp8;
-                struct pci_bus          bus;
-                struct pci_dev          dev_m1533;
-                struct pci_dev          dev_m5229;
-                extern struct pci_ops   ddb5477_ext_pci_ops;
-
-                /* Setup M1535 registers */
-                bus.parent      = NULL;    /* we scan the top level only */
-                bus.ops         = &ddb5477_ext_pci_ops;
-                dev_m1533.bus         = &bus;
-                dev_m1533.sysdata     = NULL;
-                dev_m1533.devfn       = 7*8;     // slot 7: M1533 SouthBridge.
-
-                /* setup IDE controller
-                 * enable IDE controller (bit 6 - 1)
-                 * IDE IDSEL to be addr:A15 (bit 4:5 - 11)
-                 * disable IDE ATA Secondary Bus Signal Pad Control (bit 3 - 0)
-                 * enable IDE ATA Primary Bus Signal Pad Control (bit 2 - 1)
-                 */
-                pci_write_config_byte(&dev_m1533, 0x58, 0x74);
-
-                /*
-                 * positive decode (bit6 -0)
-                 * enable IDE controler interrupt (bit 4 -1)
-                 * setup SIRQ to point to IRQ 14 (bit 3:0 - 1101)
-                 */
-                pci_write_config_byte(&dev_m1533, 0x44, 0x1d);
-
-                /* Setup M5229 registers */
-                dev_m5229.bus = &bus;
-                dev_m5229.sysdata = NULL;
-                dev_m5229.devfn = 4*8;          // slot 4 (AD15): M5229 IDE
-
-                /*
-                 * enable IDE in the M5229 config register 0x50 (bit 0 - 1)
-                 * M5229 IDSEL is addr:15; see above setting
-                 */
-                pci_read_config_byte(&dev_m5229, 0x50, &temp8);
-                pci_write_config_byte(&dev_m5229, 0x50, temp8 | 0x1);
-
-                /*
-                 * enable bus master (bit 2)  and IO decoding  (bit 0)
-                 */
-                pci_read_config_byte(&dev_m5229, 0x04, &temp8);
-                pci_write_config_byte(&dev_m5229, 0x04, temp8 | 0x5);
-
-                /*
-                 * enable native, copied from arch/ppc/k2boot/head.S
-                 * TODO - need volatile, need to be portable
-                 */
-                pci_write_config_byte(&dev_m5229, 0x09, 0xef);
-
-                /* Set Primary Channel Command Block Timing */
-                pci_write_config_byte(&dev_m5229, 0x59, 0x31);
-
-                /*
-                 * Enable primary channel 40-pin cable
-                 * M5229 register 0x4a (bit 0)
-                 */
-                pci_read_config_byte(&dev_m5229, 0x4a, &temp8);
-                pci_write_config_byte(&dev_m5229, 0x4a, temp8 | 0x1);
-        }
-
-        if (mips_machtype == MACH_NEC_ROCKHOPPER
-           ||  mips_machtype == MACH_NEC_ROCKHOPPERII) {
-                printk("lcd44780: initializing\n");
-                lcd44780_init();
-                lcd44780_puts("MontaVista Linux");
-        }
-}
diff --git a/arch/mips/dec/Makefile b/arch/mips/dec/Makefile
index 9eb2f9c036aa..c530208ee154 100644
--- a/arch/mips/dec/Makefile
+++ b/arch/mips/dec/Makefile
@@ -8,3 +8,5 @@ obj-y		:= ecc-berr.o int-handler.o ioasic-irq.o kn01-berr.o \
 obj-$(CONFIG_PROM_CONSOLE)      += promcon.o
 obj-$(CONFIG_TC)                += tc.o
 obj-$(CONFIG_CPU_HAS_WB)        += wbflush.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index b3b6e58058f6..d3d81fb2765a 100644
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
diff --git a/arch/mips/gt64120/common/Makefile b/arch/mips/gt64120/common/Makefile
deleted file mode 100644
index 1ef676e22ab4..000000000000
--- a/arch/mips/gt64120/common/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for common code of gt64120-based boards.
-#
-
-obj-y                   += time.o
diff --git a/arch/mips/gt64120/common/time.c b/arch/mips/gt64120/common/time.c
deleted file mode 100644
index c47eeb768192..000000000000
--- a/arch/mips/gt64120/common/time.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.
- *
- * Galileo Technology chip interrupt handler
- */
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/kernel_stat.h>
-#include <asm/irq_regs.h>
-#include <asm/gt64120.h>
-
-/*
- * These are interrupt handlers for the GT on-chip interrupts.  They all come
- * in to the MIPS on a single interrupt line, and have to be handled and ack'ed
- * differently than other MIPS interrupts.
- */
-
-static irqreturn_t gt64120_irq(int irq, void *dev_id)
-{
-        unsigned int irq_src, int_high_src, irq_src_mask, int_high_src_mask;
-        int handled = 0;
-
-        irq_src = GT_READ(GT_INTRCAUSE_OFS);
-        irq_src_mask = GT_READ(GT_INTRMASK_OFS);
-        int_high_src = GT_READ(GT_HINTRCAUSE_OFS);
-        int_high_src_mask = GT_READ(GT_HINTRMASK_OFS);
-        irq_src = irq_src & irq_src_mask;
-        int_high_src = int_high_src & int_high_src_mask;
-
-        if (irq_src & 0x00000800) {     /* Check for timer interrupt */
-                handled = 1;
-                irq_src &= ~0x00000800;
-                do_timer(1);
-#ifndef CONFIG_SMP
-                update_process_times(user_mode(get_irq_regs()));
-#endif
-        }
-
-        GT_WRITE(GT_INTRCAUSE_OFS, 0);
-        GT_WRITE(GT_HINTRCAUSE_OFS, 0);
-
-        return IRQ_HANDLED;
-}
-
-/*
- * Initializes timer using galileo's built in timer.
- */
-#ifdef CONFIG_SYSCLK_100
-#define Sys_clock (100 * 1000000)       // 100 MHz
-#endif
-#ifdef CONFIG_SYSCLK_83
-#define Sys_clock (83.333 * 1000000)    // 83.333 MHz
-#endif
-#ifdef CONFIG_SYSCLK_75
-#define Sys_clock (75 * 1000000)        // 75 MHz
-#endif
-
-/*
- * This will ignore the standard MIPS timer interrupt handler that is passed in
- * as *irq (=irq0 in ../kernel/time.c).  We will do our own timer interrupt
- * handling.
- */
-void __init plat_timer_setup(struct irqaction *irq)
-{
-        static struct irqaction timer;
-
-        /* Disable timer first */
-        GT_WRITE(GT_TC_CONTROL_OFS, 0);
-        /* Load timer value for 100 Hz */
-        GT_WRITE(GT_TC3_OFS, Sys_clock / HZ);
-
-        /*
-         * Create the IRQ structure entry for the timer.  Since we're too early
-         * in the boot process to use the "request_irq()" call, we'll hard-code
-         * the values to the correct interrupt line.
-         */
-        timer.handler = gt64120_irq;
-        timer.flags = IRQF_SHARED | IRQF_DISABLED;
-        timer.name = "timer";
-        timer.dev_id = NULL;
-        timer.next = NULL;
-        timer.mask = CPU_MASK_NONE;
-        irq_desc[GT_TIMER].action = &timer;
-
-        enable_irq(GT_TIMER);
-
-        /* Enable timer ints */
-        GT_WRITE(GT_TC_CONTROL_OFS, 0xc0);
-        /* clear Cause register first */
-        GT_WRITE(GT_INTRCAUSE_OFS, 0x0);
-        /* Unmask timer int */
-        GT_WRITE(GT_INTRMASK_OFS, 0x800);
-        /* Clear High int register */
-        GT_WRITE(GT_HINTRCAUSE_OFS, 0x0);
-        /* Mask All interrupts at High cause interrupt */
-        GT_WRITE(GT_HINTRMASK_OFS, 0x0);
-}
diff --git a/arch/mips/gt64120/momenco_ocelot/Makefile b/arch/mips/gt64120/momenco_ocelot/Makefile
deleted file mode 100644
index 1df5fe23c642..000000000000
--- a/arch/mips/gt64120/momenco_ocelot/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for Momentum's Ocelot board.
-#
-
-obj-y                   += irq.o ocelot-platform.o prom.o reset.o setup.o
-
-obj-$(CONFIG_KGDB)      += dbg_io.o
diff --git a/arch/mips/gt64120/momenco_ocelot/dbg_io.c b/arch/mips/gt64120/momenco_ocelot/dbg_io.c
deleted file mode 100644
index 32d6fb4ee679..000000000000
--- a/arch/mips/gt64120/momenco_ocelot/dbg_io.c
+++ /dev/null
@@ -1,121 +0,0 @@
-
-#include <asm/serial.h> /* For the serial port location and base baud */
-
-/* --- CONFIG --- */
-
-typedef unsigned char uint8;
-typedef unsigned int uint32;
-
-/* --- END OF CONFIG --- */
-
-#define         UART16550_BAUD_2400             2400
-#define         UART16550_BAUD_4800             4800
-#define         UART16550_BAUD_9600             9600
-#define         UART16550_BAUD_19200            19200
-#define         UART16550_BAUD_38400            38400
-#define         UART16550_BAUD_57600            57600
-#define         UART16550_BAUD_115200           115200
-
-#define         UART16550_PARITY_NONE           0
-#define         UART16550_PARITY_ODD            0x08
-#define         UART16550_PARITY_EVEN           0x18
-#define         UART16550_PARITY_MARK           0x28
-#define         UART16550_PARITY_SPACE          0x38
-
-#define         UART16550_DATA_5BIT             0x0
-#define         UART16550_DATA_6BIT             0x1
-#define         UART16550_DATA_7BIT             0x2
-#define         UART16550_DATA_8BIT             0x3
-
-#define         UART16550_STOP_1BIT             0x0
-#define         UART16550_STOP_2BIT             0x4
-
-/* ----------------------------------------------------- */
-
-/* === CONFIG === */
-
-/* [jsun] we use the second serial port for kdb */
-#define         BASE                    OCELOT_SERIAL1_BASE
-#define         MAX_BAUD                OCELOT_BASE_BAUD
-
-/* === END OF CONFIG === */
-
-#define         REG_OFFSET              4
-
-/* register offset */
-#define         OFS_RCV_BUFFER          0
-#define         OFS_TRANS_HOLD          0
-#define         OFS_SEND_BUFFER         0
-#define         OFS_INTR_ENABLE         (1*REG_OFFSET)
-#define         OFS_INTR_ID             (2*REG_OFFSET)
-#define         OFS_DATA_FORMAT         (3*REG_OFFSET)
-#define         OFS_LINE_CONTROL        (3*REG_OFFSET)
-#define         OFS_MODEM_CONTROL       (4*REG_OFFSET)
-#define         OFS_RS232_OUTPUT        (4*REG_OFFSET)
-#define         OFS_LINE_STATUS         (5*REG_OFFSET)
-#define         OFS_MODEM_STATUS        (6*REG_OFFSET)
-#define         OFS_RS232_INPUT         (6*REG_OFFSET)
-#define         OFS_SCRATCH_PAD         (7*REG_OFFSET)
-
-#define         OFS_DIVISOR_LSB         (0*REG_OFFSET)
-#define         OFS_DIVISOR_MSB         (1*REG_OFFSET)
-
-
-/* memory-mapped read/write of the port */
-#define         UART16550_READ(y)    (*((volatile uint8*)(BASE + y)))
-#define         UART16550_WRITE(y, z)  ((*((volatile uint8*)(BASE + y))) = z)
-
-void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
-{
-        /* disable interrupts */
-        UART16550_WRITE(OFS_INTR_ENABLE, 0);
-
-        /* set up baud rate */
-        {
-                uint32 divisor;
-
-                /* set DIAB bit */
-                UART16550_WRITE(OFS_LINE_CONTROL, 0x80);
-
-                /* set divisor */
-                divisor = MAX_BAUD / baud;
-                UART16550_WRITE(OFS_DIVISOR_LSB, divisor & 0xff);
-                UART16550_WRITE(OFS_DIVISOR_MSB, (divisor & 0xff00) >> 8);
-
-                /* clear DIAB bit */
-                UART16550_WRITE(OFS_LINE_CONTROL, 0x0);
-        }
-
-        /* set data format */
-        UART16550_WRITE(OFS_DATA_FORMAT, data | parity | stop);
-}
-
-static int remoteDebugInitialized = 0;
-
-uint8 getDebugChar(void)
-{
-        if (!remoteDebugInitialized) {
-                remoteDebugInitialized = 1;
-                debugInit(UART16550_BAUD_38400,
-                          UART16550_DATA_8BIT,
-                          UART16550_PARITY_NONE, UART16550_STOP_1BIT);
-        }
-
-        while ((UART16550_READ(OFS_LINE_STATUS) & 0x1) == 0);
-        return UART16550_READ(OFS_RCV_BUFFER);
-}
-
-
-int putDebugChar(uint8 byte)
-{
-        if (!remoteDebugInitialized) {
-                remoteDebugInitialized = 1;
-                debugInit(UART16550_BAUD_38400,
-                          UART16550_DATA_8BIT,
-                          UART16550_PARITY_NONE, UART16550_STOP_1BIT);
-        }
-
-        while ((UART16550_READ(OFS_LINE_STATUS) & 0x20) == 0);
-        UART16550_WRITE(OFS_SEND_BUFFER, byte);
-        return 1;
-}
diff --git a/arch/mips/gt64120/momenco_ocelot/irq.c b/arch/mips/gt64120/momenco_ocelot/irq.c
deleted file mode 100644
index 2585d9dbda33..000000000000
--- a/arch/mips/gt64120/momenco_ocelot/irq.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2000 RidgeRun, Inc.
- * Author: RidgeRun, Inc.
- *   glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- * Copyright (C) 2000, 2001, 2003 Ralf Baechle (ralf@gnu.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.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/kernel_stat.h>
-#include <linux/module.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/timex.h>
-#include <linux/slab.h>
-#include <linux/random.h>
-#include <linux/bitops.h>
-#include <asm/bootinfo.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/irq_cpu.h>
-#include <asm/mipsregs.h>
-#include <asm/system.h>
-
-asmlinkage void plat_irq_dispatch(void)
-{
-        unsigned int pending = read_c0_status() & read_c0_cause();
-
-        if (pending & STATUSF_IP2)              /* int0 hardware line */
-                do_IRQ(2);
-        else if (pending & STATUSF_IP3)         /* int1 hardware line */
-                do_IRQ(3);
-        else if (pending & STATUSF_IP4)         /* int2 hardware line */
-                do_IRQ(4);
-        else if (pending & STATUSF_IP5)         /* int3 hardware line */
-                do_IRQ(5);
-        else if (pending & STATUSF_IP6)         /* int4 hardware line */
-                do_IRQ(6);
-        else if (pending & STATUSF_IP7)         /* cpu timer */
-                do_IRQ(7);
-        else {
-                /*
-                 * Now look at the extended interrupts
-                 */
-                pending = (read_c0_cause() & (read_c0_intcontrol() << 8)) >> 16;
-
-                if (pending & STATUSF_IP8)              /* int6 hardware line */
-                        do_IRQ(8);
-                else if (pending & STATUSF_IP9)         /* int7 hardware line */
-                        do_IRQ(9);
-                else if (pending & STATUSF_IP10)        /* int8 hardware line */
-                        do_IRQ(10);
-                else if (pending & STATUSF_IP11)        /* int9 hardware line */
-                        do_IRQ(11);
-        }
-}
-
-void __init arch_init_irq(void)
-{
-        /*
-         * Clear all of the interrupts while we change the able around a bit.
-         * int-handler is not on bootstrap
-         */
-        clear_c0_status(ST0_IM);
-        local_irq_disable();
-
-        mips_cpu_irq_init();
-        rm7k_cpu_irq_init();
-}
diff --git a/arch/mips/gt64120/momenco_ocelot/ocelot-platform.c b/arch/mips/gt64120/momenco_ocelot/ocelot-platform.c
deleted file mode 100644
index 81d9031a5a2a..000000000000
--- a/arch/mips/gt64120/momenco_ocelot/ocelot-platform.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org)
- *
- * A NS16552 DUART with a 20MHz crystal.
- *
- */
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/serial_8250.h>
-
-#define OCELOT_UART_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP)
-
-static struct plat_serial8250_port uart8250_data[] = {
-        {
-                .mapbase        = 0xe0001020,
-                .irq            = 4,
-                .uartclk        = 20000000,
-                .iotype         = UPIO_MEM,
-                .flags          = OCELOT_UART_FLAGS,
-                .regshift       = 2,
-        },
-        { },
-};
-
-static struct platform_device uart8250_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_PLATFORM,
-        .dev                    = {
-                .platform_data  = uart8250_data,
-        },
-};
-
-static int __init uart8250_init(void)
-{
-        return platform_device_register(&uart8250_device);
-}
-
-module_init(uart8250_init);
-
-MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("8250 UART probe driver for the Momenco Ocelot");
diff --git a/arch/mips/gt64120/momenco_ocelot/ocelot_pld.h b/arch/mips/gt64120/momenco_ocelot/ocelot_pld.h
deleted file mode 100644
index 11f02c402b2a..000000000000
--- a/arch/mips/gt64120/momenco_ocelot/ocelot_pld.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Ocelot Board Register Definitions
- *
- * (C) 2001 Red Hat, Inc.
- *
- * GPL'd
- */
-#ifndef __MOMENCO_OCELOT_PLD_H__
-#define __MOMENCO_OCELOT_PLD_H__
-
-#define OCELOT_CS0_ADDR (0xe0020000)
-
-#define OCELOT_REG_BOARDREV (0)
-#define OCELOT_REG_PLD1_ID (1)
-#define OCELOT_REG_PLD2_ID (2)
-#define OCELOT_REG_RESET_STATUS (3)
-#define OCELOT_REG_BOARD_STATUS (4)
-#define OCELOT_REG_CPCI_ID (5)
-#define OCELOT_REG_I2C_CTRL (8)
-#define OCELOT_REG_EEPROM_MODE (9)
-#define OCELOT_REG_INTMASK (10)
-#define OCELOT_REG_INTSTATUS (11)
-#define OCELOT_REG_INTSET (12)
-#define OCELOT_REG_INTCLR (13)
-
-#define OCELOT_PLD_WRITE(x, y) writeb(x, OCELOT_CS0_ADDR + OCELOT_REG_##y)
-#define OCELOT_PLD_READ(x) readb(OCELOT_CS0_ADDR + OCELOT_REG_##x)
-
-
-#endif /* __MOMENCO_OCELOT_PLD_H__ */
diff --git a/arch/mips/gt64120/momenco_ocelot/prom.c b/arch/mips/gt64120/momenco_ocelot/prom.c
deleted file mode 100644
index c71c85276c74..000000000000
--- a/arch/mips/gt64120/momenco_ocelot/prom.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- * 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/mm.h>
-#include <linux/sched.h>
-#include <linux/bootmem.h>
-
-#include <asm/addrspace.h>
-#include <asm/bootinfo.h>
-#include <asm/pmon.h>
-
-struct callvectors* debug_vectors;
-
-extern unsigned long gt64120_base;
-
-const char *get_system_type(void)
-{
-        return "Momentum Ocelot";
-}
-
-/* [jsun@junsun.net] PMON passes arguments in C main() style */
-void __init prom_init(void)
-{
-        int argc = fw_arg0;
-        char **arg = (char **) fw_arg1;
-        char **env = (char **) fw_arg2;
-        struct callvectors *cv = (struct callvectors *) fw_arg3;
-        int i;
-
-        /* save the PROM vectors for debugging use */
-        debug_vectors = cv;
-
-        /* arg[0] is "g", the rest is boot parameters */
-        arcs_cmdline[0] = '\0';
-        for (i = 1; i < argc; i++) {
-                if (strlen(arcs_cmdline) + strlen(arg[i] + 1)
-                    >= sizeof(arcs_cmdline))
-                        break;
-                strcat(arcs_cmdline, arg[i]);
-                strcat(arcs_cmdline, " ");
-        }
-
-        mips_machgroup = MACH_GROUP_MOMENCO;
-        mips_machtype = MACH_MOMENCO_OCELOT;
-
-        while (*env) {
-                if (strncmp("gtbase", *env, 6) == 0) {
-                        gt64120_base = simple_strtol(*env + strlen("gtbase="),
-                                                        NULL, 16);
-                        break;
-                }
-                *env++;
-        }
-
-        debug_vectors->printf("Booting Linux kernel...\n");
-
-        /* All the boards have at least 64MiB. If there's more, we
-           detect and register it later */
-        add_memory_region(0, 64 << 20, BOOT_MEM_RAM);
-}
-
-void __init prom_free_prom_memory(void)
-{
-}
diff --git a/arch/mips/gt64120/momenco_ocelot/reset.c b/arch/mips/gt64120/momenco_ocelot/reset.c
deleted file mode 100644
index 3fd499adf4cf..000000000000
--- a/arch/mips/gt64120/momenco_ocelot/reset.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.
- *
- * Copyright (C) 1997, 2001 Ralf Baechle
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- */
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/processor.h>
-#include <asm/reboot.h>
-#include <asm/system.h>
-#include <linux/delay.h>
-
-void momenco_ocelot_restart(char *command)
-{
-        void *nvram = ioremap_nocache(0x2c807000, 0x1000);
-
-        if (!nvram) {
-                printk(KERN_NOTICE "ioremap of reset register failed\n");
-                return;
-        }
-        writeb(0x84, nvram + 0xff7); /* Ask the NVRAM/RTC/watchdog chip to
-                                        assert reset in 1/16 second */
-        mdelay(10+(1000/16));
-        iounmap(nvram);
-        printk(KERN_NOTICE "Watchdog reset failed\n");
-}
-
-void momenco_ocelot_halt(void)
-{
-        printk(KERN_NOTICE "\n** You can safely turn off the power\n");
-        while (1)
-                __asm__(".set\tmips3\n\t"
-                        "wait\n\t"
-                        ".set\tmips0");
-}
-
-void momenco_ocelot_power_off(void)
-{
-        momenco_ocelot_halt();
-}
diff --git a/arch/mips/gt64120/momenco_ocelot/setup.c b/arch/mips/gt64120/momenco_ocelot/setup.c
deleted file mode 100644
index 98b6fb38096d..000000000000
--- a/arch/mips/gt64120/momenco_ocelot/setup.c
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * setup.c
- *
- * BRIEF MODULE DESCRIPTION
- * Momentum Computer Ocelot (CP7000) - board dependent boot routines
- *
- * Copyright (C) 1996, 1997, 2001, 06  Ralf Baechle (ralf@linux-mips.org)
- * Copyright (C) 2000 RidgeRun, Inc.
- * Copyright (C) 2001 Red Hat, Inc.
- * Copyright (C) 2002 Momentum Computer
- *
- * Author: RidgeRun, Inc.
- *   glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- *  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  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/swap.h>
-#include <linux/ioport.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/timex.h>
-#include <linux/vmalloc.h>
-#include <linux/pm.h>
-
-#include <asm/time.h>
-#include <asm/bootinfo.h>
-#include <asm/page.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/pci.h>
-#include <asm/processor.h>
-#include <asm/reboot.h>
-#include <asm/traps.h>
-#include <linux/bootmem.h>
-#include <linux/initrd.h>
-#include <asm/gt64120.h>
-#include "ocelot_pld.h"
-
-unsigned long gt64120_base = KSEG1ADDR(GT_DEF_BASE);
-
-/* These functions are used for rebooting or halting the machine*/
-extern void momenco_ocelot_restart(char *command);
-extern void momenco_ocelot_halt(void);
-extern void momenco_ocelot_power_off(void);
-
-extern void momenco_ocelot_irq_setup(void);
-
-static char reset_reason;
-
-#define ENTRYLO(x) ((pte_val(pfn_pte((x) >> PAGE_SHIFT, PAGE_KERNEL_UNCACHED)) >> 6)|1)
-
-static void __init setup_l3cache(unsigned long size);
-
-/* setup code for a handoff from a version 1 PMON 2000 PROM */
-static void PMON_v1_setup(void)
-{
-        /* A wired TLB entry for the GT64120A and the serial port. The
-           GT64120A is going to be hit on every IRQ anyway - there's
-           absolutely no point in letting it be a random TLB entry, as
-           it'll just cause needless churning of the TLB. And we use
-           the other half for the serial port, which is just a PITA
-           otherwise :)
-
-                Device                  Physical        Virtual
-                GT64120 Internal Regs   0x24000000      0xe0000000
-                UARTs (CS2)             0x2d000000      0xe0001000
-        */
-        add_wired_entry(ENTRYLO(0x24000000), ENTRYLO(0x2D000000), 0xe0000000, PM_4K);
-
-        /* Also a temporary entry to let us talk to the Ocelot PLD and NVRAM
-           in the CS[012] region. We can't use ioremap() yet. The NVRAM
-           is a ST M48T37Y, which includes NVRAM, RTC, and Watchdog functions.
-
-                Ocelot PLD (CS0)        0x2c000000      0xe0020000
-                NVRAM                   0x2c800000      0xe0030000
-        */
-
-        add_temporary_entry(ENTRYLO(0x2C000000), ENTRYLO(0x2d000000), 0xe0020000, PM_64K);
-
-        /* Relocate the CS3/BootCS region */
-        GT_WRITE(GT_CS3BOOTLD_OFS, 0x2f000000 >> 21);
-
-        /* Relocate CS[012] */
-        GT_WRITE(GT_CS20LD_OFS, 0x2c000000 >> 21);
-
-        /* Relocate the GT64120A itself... */
-        GT_WRITE(GT_ISD_OFS, 0x24000000 >> 21);
-        mb();
-        gt64120_base = 0xe0000000;
-
-        /* ...and the PCI0 view of it. */
-        GT_WRITE(GT_PCI0_CFGADDR_OFS, 0x80000020);
-        GT_WRITE(GT_PCI0_CFGDATA_OFS, 0x24000000);
-        GT_WRITE(GT_PCI0_CFGADDR_OFS, 0x80000024);
-        GT_WRITE(GT_PCI0_CFGDATA_OFS, 0x24000001);
-}
-
-/* setup code for a handoff from a version 2 PMON 2000 PROM */
-void PMON_v2_setup()
-{
-        /* A wired TLB entry for the GT64120A and the serial port. The
-           GT64120A is going to be hit on every IRQ anyway - there's
-           absolutely no point in letting it be a random TLB entry, as
-           it'll just cause needless churning of the TLB. And we use
-           the other half for the serial port, which is just a PITA
-           otherwise :)
-
-                Device                  Physical        Virtual
-                GT64120 Internal Regs   0xf4000000      0xe0000000
-                UARTs (CS2)             0xfd000000      0xe0001000
-        */
-        add_wired_entry(ENTRYLO(0xf4000000), ENTRYLO(0xfD000000), 0xe0000000, PM_4K);
-
-        /* Also a temporary entry to let us talk to the Ocelot PLD and NVRAM
-           in the CS[012] region. We can't use ioremap() yet. The NVRAM
-           is a ST M48T37Y, which includes NVRAM, RTC, and Watchdog functions.
-
-                Ocelot PLD (CS0)        0xfc000000      0xe0020000
-                NVRAM                   0xfc800000      0xe0030000
-        */
-        add_temporary_entry(ENTRYLO(0xfC000000), ENTRYLO(0xfd000000), 0xe0020000, PM_64K);
-
-        gt64120_base = 0xe0000000;
-}
-
-void __init plat_mem_setup(void)
-{
-        void (*l3func)(unsigned long)=KSEG1ADDR(&setup_l3cache);
-        unsigned int tmpword;
-
-        _machine_restart = momenco_ocelot_restart;
-        _machine_halt = momenco_ocelot_halt;
-        pm_power_off = momenco_ocelot_power_off;
-
-        /*
-         * initrd_start = (unsigned long)ocelot_initrd_start;
-         * initrd_end = (unsigned long)ocelot_initrd_start + (ulong)ocelot_initrd_size;
-         * initrd_below_start_ok = 1;
-         */
-
-        /* do handoff reconfiguration */
-        if (gt64120_base == KSEG1ADDR(GT_DEF_BASE))
-                PMON_v1_setup();
-        else
-                PMON_v2_setup();
-
-        /* Turn off the Bit-Error LED */
-        OCELOT_PLD_WRITE(0x80, INTCLR);
-
-        /* Relocate all the PCI1 stuff, not that we use it */
-        GT_WRITE(GT_PCI1IOLD_OFS, 0x30000000 >> 21);
-        GT_WRITE(GT_PCI1M0LD_OFS, 0x32000000 >> 21);
-        GT_WRITE(GT_PCI1M1LD_OFS, 0x34000000 >> 21);
-
-        /* Relocate PCI0 I/O and Mem0 */
-        GT_WRITE(GT_PCI0IOLD_OFS, 0x20000000 >> 21);
-        GT_WRITE(GT_PCI0M0LD_OFS, 0x22000000 >> 21);
-
-        /* Relocate PCI0 Mem1 */
-        GT_WRITE(GT_PCI0M1LD_OFS, 0x36000000 >> 21);
-
-        /* For the initial programming, we assume 512MB configuration */
-        /* Relocate the CPU's view of the RAM... */
-        GT_WRITE(GT_SCS10LD_OFS, 0);
-        GT_WRITE(GT_SCS10HD_OFS, 0x0fe00000 >> 21);
-        GT_WRITE(GT_SCS32LD_OFS, 0x10000000 >> 21);
-        GT_WRITE(GT_SCS32HD_OFS, 0x0fe00000 >> 21);
-
-        GT_WRITE(GT_SCS1LD_OFS, 0xff);
-        GT_WRITE(GT_SCS1HD_OFS, 0x00);
-        GT_WRITE(GT_SCS0LD_OFS, 0);
-        GT_WRITE(GT_SCS0HD_OFS, 0xff);
-        GT_WRITE(GT_SCS3LD_OFS, 0xff);
-        GT_WRITE(GT_SCS3HD_OFS, 0x00);
-        GT_WRITE(GT_SCS2LD_OFS, 0);
-        GT_WRITE(GT_SCS2HD_OFS, 0xff);
-
-        /* ...and the PCI0 view of it. */
-        GT_WRITE(GT_PCI0_CFGADDR_OFS, 0x80000010);
-        GT_WRITE(GT_PCI0_CFGDATA_OFS, 0x00000000);
-        GT_WRITE(GT_PCI0_CFGADDR_OFS, 0x80000014);
-        GT_WRITE(GT_PCI0_CFGDATA_OFS, 0x10000000);
-        GT_WRITE(GT_PCI0_BS_SCS10_OFS, 0x0ffff000);
-        GT_WRITE(GT_PCI0_BS_SCS32_OFS, 0x0ffff000);
-
-        tmpword = OCELOT_PLD_READ(BOARDREV);
-        if (tmpword < 26)
-                printk("Momenco Ocelot: Board Assembly Rev. %c\n", 'A'+tmpword);
-        else
-                printk("Momenco Ocelot: Board Assembly Revision #0x%x\n", tmpword);
-
-        tmpword = OCELOT_PLD_READ(PLD1_ID);
-        printk("PLD 1 ID: %d.%d\n", tmpword>>4, tmpword&15);
-        tmpword = OCELOT_PLD_READ(PLD2_ID);
-        printk("PLD 2 ID: %d.%d\n", tmpword>>4, tmpword&15);
-        tmpword = OCELOT_PLD_READ(RESET_STATUS);
-        printk("Reset reason: 0x%x\n", tmpword);
-        reset_reason = tmpword;
-        OCELOT_PLD_WRITE(0xff, RESET_STATUS);
-
-        tmpword = OCELOT_PLD_READ(BOARD_STATUS);
-        printk("Board Status register: 0x%02x\n", tmpword);
-        printk("  - User jumper: %s\n", (tmpword & 0x80)?"installed":"absent");
-        printk("  - Boot flash write jumper: %s\n", (tmpword&0x40)?"installed":"absent");
-        printk("  - Tulip PHY %s connected\n", (tmpword&0x10)?"is":"not");
-        printk("  - L3 Cache size: %d MiB\n", (1<<((tmpword&12) >> 2))&~1);
-        printk("  - SDRAM size: %d MiB\n", 1<<(6+(tmpword&3)));
-
-        if (tmpword&12)
-                l3func((1<<(((tmpword&12) >> 2)+20)));
-
-        switch(tmpword &3) {
-        case 3:
-                /* 512MiB */
-                /* Decoders are allready set -- just add the
-                 * appropriate region */
-                add_memory_region( 0x40<<20,  0xC0<<20, BOOT_MEM_RAM);
-                add_memory_region(0x100<<20, 0x100<<20, BOOT_MEM_RAM);
-                break;
-        case 2:
-                /* 256MiB -- two banks of 128MiB */
-                GT_WRITE(GT_SCS10HD_OFS, 0x07e00000 >> 21);
-                GT_WRITE(GT_SCS32LD_OFS, 0x08000000 >> 21);
-                GT_WRITE(GT_SCS32HD_OFS, 0x0fe00000 >> 21);
-
-                GT_WRITE(GT_SCS0HD_OFS, 0x7f);
-                GT_WRITE(GT_SCS2LD_OFS, 0x80);
-                GT_WRITE(GT_SCS2HD_OFS, 0xff);
-
-                /* reconfigure the PCI0 interface view of memory */
-                GT_WRITE(GT_PCI0_CFGADDR_OFS, 0x80000014);
-                GT_WRITE(GT_PCI0_CFGDATA_OFS, 0x08000000);
-                GT_WRITE(GT_PCI0_BS_SCS10_OFS, 0x0ffff000);
-                GT_WRITE(GT_PCI0_BS_SCS32_OFS, 0x0ffff000);
-
-                add_memory_region(0x40<<20, 0x40<<20, BOOT_MEM_RAM);
-                add_memory_region(0x80<<20, 0x80<<20, BOOT_MEM_RAM);
-                break;
-        case 1:
-                /* 128MiB -- 64MiB per bank */
-                GT_WRITE(GT_SCS10HD_OFS, 0x03e00000 >> 21);
-                GT_WRITE(GT_SCS32LD_OFS, 0x04000000 >> 21);
-                GT_WRITE(GT_SCS32HD_OFS, 0x07e00000 >> 21);
-
-                GT_WRITE(GT_SCS0HD_OFS, 0x3f);
-                GT_WRITE(GT_SCS2LD_OFS, 0x40);
-                GT_WRITE(GT_SCS2HD_OFS, 0x7f);
-
-                /* reconfigure the PCI0 interface view of memory */
-                GT_WRITE(GT_PCI0_CFGADDR_OFS, 0x80000014);
-                GT_WRITE(GT_PCI0_CFGDATA_OFS, 0x04000000);
-                GT_WRITE(GT_PCI0_BS_SCS10_OFS, 0x03fff000);
-                GT_WRITE(GT_PCI0_BS_SCS32_OFS, 0x03fff000);
-
-                /* add the appropriate region */
-                add_memory_region(0x40<<20, 0x40<<20, BOOT_MEM_RAM);
-                break;
-        case 0:
-                /* 64MiB */
-                GT_WRITE(GT_SCS10HD_OFS, 0x01e00000 >> 21);
-                GT_WRITE(GT_SCS32LD_OFS, 0x02000000 >> 21);
-                GT_WRITE(GT_SCS32HD_OFS, 0x03e00000 >> 21);
-
-                GT_WRITE(GT_SCS0HD_OFS, 0x1f);
-                GT_WRITE(GT_SCS2LD_OFS, 0x20);
-                GT_WRITE(GT_SCS2HD_OFS, 0x3f);
-
-                /* reconfigure the PCI0 interface view of memory */
-                GT_WRITE(GT_PCI0_CFGADDR_OFS, 0x80000014);
-                GT_WRITE(GT_PCI0_CFGDATA_OFS, 0x04000000);
-                GT_WRITE(GT_PCI0_BS_SCS10_OFS, 0x01fff000);
-                GT_WRITE(GT_PCI0_BS_SCS32_OFS, 0x01fff000);
-
-                break;
-        }
-
-        /* Fix up the DiskOnChip mapping */
-        GT_WRITE(GT_DEV_B3_OFS, 0xfef73);
-}
-
-extern int rm7k_tcache_enabled;
-/*
- * This runs in KSEG1. See the verbiage in rm7k.c::probe_scache()
- */
-#define Page_Invalidate_T 0x16
-static void __init setup_l3cache(unsigned long size)
-{
-        int register i;
-        unsigned long tmp;
-
-        printk("Enabling L3 cache...");
-
-        /* Enable the L3 cache in the GT64120A's CPU Configuration register */
-        tmp = GT_READ(GT_CPU_OFS);
-        GT_WRITE(GT_CPU_OFS, tmp | (1<<14));
-
-        /* Enable the L3 cache in the CPU */
-        set_c0_config(1<<12 /* CONF_TE */);
-
-        /* Clear the cache */
-        write_c0_taglo(0);
-        write_c0_taghi(0);
-
-        for (i=0; i < size; i+= 4096) {
-                __asm__ __volatile__ (
-                        ".set noreorder\n\t"
-                        ".set mips3\n\t"
-                        "cache %1, (%0)\n\t"
-                        ".set mips0\n\t"
-                        ".set reorder"
-                        :
-                        : "r" (KSEG0ADDR(i)),
-                          "i" (Page_Invalidate_T));
-        }
-
-        /* Let the RM7000 MM code know that the tertiary cache is enabled */
-        rm7k_tcache_enabled = 1;
-
-        printk("Done\n");
-}
-
-
-/* This needs to be one of the first initcalls, because no I/O port access
-   can work before this */
-
-static int io_base_ioremap(void)
-{
-        void *io_remap_range = ioremap(GT_PCI_IO_BASE, GT_PCI_IO_SIZE);
-
-        if (!io_remap_range) {
-                panic("Could not ioremap I/O port range");
-        }
-        set_io_port_base(io_remap_range - GT_PCI_IO_BASE);
-
-        return 0;
-}
-
-module_init(io_base_ioremap);
diff --git a/arch/mips/gt64120/wrppmc/Makefile b/arch/mips/gt64120/wrppmc/Makefile
index e4250435ad89..bef15c90ae15 100644
--- a/arch/mips/gt64120/wrppmc/Makefile
+++ b/arch/mips/gt64120/wrppmc/Makefile
@@ -10,3 +10,5 @@
 #
 
 obj-y += irq.o reset.o setup.o time.o pci.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/jazz/Makefile b/arch/mips/jazz/Makefile
index ae4c402b5004..575a9442bc82 100644
--- a/arch/mips/jazz/Makefile
+++ b/arch/mips/jazz/Makefile
@@ -3,3 +3,5 @@
 #
 
 obj-y           := irq.o jazzdma.o jazz-platform.o reset.o setup.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/jmr3927/common/Makefile b/arch/mips/jmr3927/common/Makefile
index 01e7db19bcbe..8fd4fcccf10e 100644
--- a/arch/mips/jmr3927/common/Makefile
+++ b/arch/mips/jmr3927/common/Makefile
@@ -3,3 +3,5 @@
 #
 
 obj-y    += prom.o puts.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/jmr3927/rbhma3100/Makefile b/arch/mips/jmr3927/rbhma3100/Makefile
index 8d00ba460cef..d86e30dca8f3 100644
--- a/arch/mips/jmr3927/rbhma3100/Makefile
+++ b/arch/mips/jmr3927/rbhma3100/Makefile
@@ -4,3 +4,5 @@
 
 obj-y                           += init.o irq.o setup.o
 obj-$(CONFIG_KGDB)              += kgdb_io.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 5c8085b6d7ab..07344cb37596 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -71,3 +71,5 @@ obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 CFLAGS_cpu-bugs64.o     = $(shell if $(CC) $(CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
 
 obj-$(CONFIG_HAVE_STD_PC_SERIAL_PORT)   += 8250-platform.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 3b27309d54b1..013327286c26 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -132,7 +132,6 @@ void output_thread_defines(void)
         offset("#define THREAD_ECODE   ", struct task_struct, \
                thread.error_code);
         offset("#define THREAD_TRAPNO  ", struct task_struct, thread.trap_no);
-        offset("#define THREAD_MFLAGS  ", struct task_struct, thread.mflags);
         offset("#define THREAD_TRAMP   ", struct task_struct, \
                thread.irix_trampoline);
         offset("#define THREAD_OLDCTX  ", struct task_struct, \
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
index c15bbc436bbd..e46782b0ebc8 100644
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -138,7 +138,6 @@
         .fill   0x400
 #endif
 
-EXPORT(stext)                                   # used for profiling
 EXPORT(_stext)
 
 #ifndef CONFIG_BOOT_RAW
diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c
index c6580018c94b..cb9a14a1ca5b 100644
--- a/arch/mips/kernel/kspd.c
+++ b/arch/mips/kernel/kspd.c
@@ -89,7 +89,7 @@ static int sp_stopping = 0;
 #define MTSP_O_EXCL             0x0800
 #define MTSP_O_BINARY           0x8000
 
-#define SP_VPE 1
+extern int tclimit;
 
 struct apsp_table  {
         int sp;
@@ -225,8 +225,8 @@ void sp_work_handle_request(void)
         /* Run the syscall at the priviledge of the user who loaded the
            SP program */
 
-        if (vpe_getuid(SP_VPE))
-                sp_setfsuidgid( vpe_getuid(SP_VPE), vpe_getgid(SP_VPE));
+        if (vpe_getuid(tclimit))
+                sp_setfsuidgid(vpe_getuid(tclimit), vpe_getgid(tclimit));
 
         switch (sc.cmd) {
         /* needs the flags argument translating from SDE kit to
@@ -245,7 +245,7 @@ void sp_work_handle_request(void)
 
         case MTSP_SYSCALL_EXIT:
                 list_for_each_entry(n, &kspd_notifylist, list)
-                        n->kspd_sp_exit(SP_VPE);
+                        n->kspd_sp_exit(tclimit);
                 sp_stopping = 1;
 
                 printk(KERN_DEBUG "KSPD got exit syscall from SP exitcode %d\n",
@@ -255,7 +255,7 @@ void sp_work_handle_request(void)
         case MTSP_SYSCALL_OPEN:
                 generic.arg1 = translate_open_flags(generic.arg1);
 
-                vcwd = vpe_getcwd(SP_VPE);
+                vcwd = vpe_getcwd(tclimit);
 
                 /* change to the cwd of the process that loaded the SP program */
                 old_fs = get_fs();
@@ -283,7 +283,7 @@ void sp_work_handle_request(void)
                 break;
         } /* switch */
 
-        if (vpe_getuid(SP_VPE))
+        if (vpe_getuid(tclimit))
                 sp_setfsuidgid( 0, 0);
 
         old_fs = get_fs();
@@ -364,10 +364,9 @@ static void startwork(int vpe)
                 }
 
                 INIT_WORK(&work, sp_work);
-                queue_work(workqueue, &work);
-        } else
-                queue_work(workqueue, &work);
+        }
 
+        queue_work(workqueue, &work);
 }
 
 static void stopwork(int vpe)
@@ -389,7 +388,7 @@ static int kspd_module_init(void)
 
         notify.start = startwork;
         notify.stop = stopwork;
-        vpe_notify(SP_VPE, &notify);
+        vpe_notify(tclimit, &notify);
 
         return 0;
 }
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index c37568d6fb55..135d9a5fe337 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -566,6 +566,13 @@ asmlinkage long sys32_fadvise64_64(int fd, int __pad,
                         flags);
 }
 
+asmlinkage long sys32_fallocate(int fd, int mode, unsigned offset_a2,
+        unsigned offset_a3, unsigned len_a4, unsigned len_a5)
+{
+        return sys_fallocate(fd, mode, merge_64(offset_a2, offset_a3),
+                             merge_64(len_a4, len_a5));
+}
+
 save_static_function(sys32_clone);
 static int noinline __used
 _sys32_clone(nabi_no_regargs struct pt_regs regs)
diff --git a/arch/mips/kernel/machine_kexec.c b/arch/mips/kernel/machine_kexec.c
index 8f42fa85ac9e..22960d67cf07 100644
--- a/arch/mips/kernel/machine_kexec.c
+++ b/arch/mips/kernel/machine_kexec.c
@@ -14,7 +14,7 @@
 #include <asm/page.h>
 
 extern const unsigned char relocate_new_kernel[];
-extern const unsigned int relocate_new_kernel_size;
+extern const size_t relocate_new_kernel_size;
 
 extern unsigned long kexec_start_address;
 extern unsigned long kexec_indirection_page;
@@ -40,6 +40,8 @@ machine_crash_shutdown(struct pt_regs *regs)
 {
 }
 
+typedef void (*noretfun_t)(void) __attribute__((noreturn));
+
 void
 machine_kexec(struct kimage *image)
 {
@@ -51,7 +53,8 @@ machine_kexec(struct kimage *image)
           (unsigned long)page_address(image->control_code_page);
 
         kexec_start_address = image->start;
-        kexec_indirection_page = phys_to_virt(image->head & PAGE_MASK);
+        kexec_indirection_page =
+                (unsigned long) phys_to_virt(image->head & PAGE_MASK);
 
         memcpy((void*)reboot_code_buffer, relocate_new_kernel,
                relocate_new_kernel_size);
@@ -67,7 +70,7 @@ machine_kexec(struct kimage *image)
                phys_to_virt(entry & PAGE_MASK) : ptr + 1) {
                 if (*ptr & IND_SOURCE || *ptr & IND_INDIRECTION ||
                     *ptr & IND_DESTINATION)
-                        *ptr = phys_to_virt(*ptr);
+                        *ptr = (unsigned long) phys_to_virt(*ptr);
         }
 
         /*
@@ -78,8 +81,8 @@ machine_kexec(struct kimage *image)
         flush_icache_range(reboot_code_buffer,
                            reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE);
 
-        printk("Will call new kernel at %08x\n", image->start);
+        printk("Will call new kernel at %08lx\n", image->start);
         printk("Bye ...\n");
         flush_cache_all();
-        ((void (*)(void))reboot_code_buffer)();
+        ((noretfun_t) reboot_code_buffer)();
 }
diff --git a/arch/mips/kernel/mips-mt-fpaff.c b/arch/mips/kernel/mips-mt-fpaff.c
index ede5d73d652e..892665bb12b1 100644
--- a/arch/mips/kernel/mips-mt-fpaff.c
+++ b/arch/mips/kernel/mips-mt-fpaff.c
@@ -50,6 +50,7 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,
         cpumask_t effective_mask;
         int retval;
         struct task_struct *p;
+        struct thread_info *ti;
 
         if (len < sizeof(new_mask))
                 return -EINVAL;
@@ -93,16 +94,16 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,
         read_unlock(&tasklist_lock);
 
         /* Compute new global allowed CPU set if necessary */
-        if ((p->thread.mflags & MF_FPUBOUND)
-        && cpus_intersects(new_mask, mt_fpu_cpumask)) {
+        ti = task_thread_info(p);
+        if (test_ti_thread_flag(ti, TIF_FPUBOUND) &&
+            cpus_intersects(new_mask, mt_fpu_cpumask)) {
                 cpus_and(effective_mask, new_mask, mt_fpu_cpumask);
                 retval = set_cpus_allowed(p, effective_mask);
         } else {
-                p->thread.mflags &= ~MF_FPUBOUND;
+                clear_ti_thread_flag(ti, TIF_FPUBOUND);
                 retval = set_cpus_allowed(p, new_mask);
         }
 
-
 out_unlock:
         put_task_struct(p);
         unlock_cpu_hotplug();
diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c
index 1a7d89231299..7169a4db37b8 100644
--- a/arch/mips/kernel/mips-mt.c
+++ b/arch/mips/kernel/mips-mt.c
@@ -21,6 +21,28 @@
 #include <asm/r4kcache.h>
 #include <asm/cacheflush.h>
 
+int vpelimit;
+
+static int __init maxvpes(char *str)
+{
+        get_option(&str, &vpelimit);
+
+        return 1;
+}
+
+__setup("maxvpes=", maxvpes);
+
+int tclimit;
+
+static int __init maxtcs(char *str)
+{
+        get_option(&str, &tclimit);
+
+        return 1;
+}
+
+__setup("maxtcs=", maxtcs);
+
 /*
  * Dump new MIPS MT state for the core. Does not leave TCs halted.
  * Takes an argument which taken to be a pre-call MVPControl value.
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index bd05f5a927ea..e6ce943099a0 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -77,7 +77,7 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)
         status = regs->cp0_status & ~(ST0_CU0|ST0_CU1|KU_MASK);
 #ifdef CONFIG_64BIT
         status &= ~ST0_FR;
-        status |= (current->thread.mflags & MF_32BIT_REGS) ? 0 : ST0_FR;
+        status |= test_thread_flag(TIF_32BIT_REGS) ? 0 : ST0_FR;
 #endif
         status |= KU_USER;
         regs->cp0_status = status;
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index 893e7bccf226..bbd57b20b43e 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -20,11 +20,11 @@
 #include <linux/mm.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/audit.h>
 #include <linux/smp.h>
 #include <linux/user.h>
 #include <linux/security.h>
-#include <linux/signal.h>
+#include <linux/audit.h>
+#include <linux/seccomp.h>
 
 #include <asm/byteorder.h>
 #include <asm/cpu.h>
@@ -470,12 +470,17 @@ static inline int audit_arch(void)
  */
 asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit)
 {
+        /* do the secure computing check first */
+        if (!entryexit)
+                secure_computing(regs->regs[0]);
+
         if (unlikely(current->audit_context) && entryexit)
                 audit_syscall_exit(AUDITSC_RESULT(regs->regs[2]),
                                    regs->regs[2]);
 
         if (!(current->ptrace & PT_PTRACED))
                 goto out;
+
         if (!test_thread_flag(TIF_SYSCALL_TRACE))
                 goto out;
 
@@ -493,9 +498,10 @@ asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit)
                 send_sig(current->exit_code, current, 1);
                 current->exit_code = 0;
         }
- out:
+
+out:
         if (unlikely(current->audit_context) && !entryexit)
-                audit_syscall_entry(audit_arch(), regs->regs[2],
+                audit_syscall_entry(audit_arch(), regs->regs[0],
                                     regs->regs[4], regs->regs[5],
                                     regs->regs[6], regs->regs[7]);
 }
diff --git a/arch/mips/kernel/relocate_kernel.S b/arch/mips/kernel/relocate_kernel.S
index a3f0d00c1334..87481f916a61 100644
--- a/arch/mips/kernel/relocate_kernel.S
+++ b/arch/mips/kernel/relocate_kernel.S
@@ -14,67 +14,69 @@
 #include <asm/stackframe.h>
 #include <asm/addrspace.h>
 
-        .globl relocate_new_kernel
-relocate_new_kernel:
-
-        PTR_L   s0, kexec_indirection_page
-        PTR_L   s1, kexec_start_address
+LEAF(relocate_new_kernel)
+        PTR_L           s0, kexec_indirection_page
+        PTR_L           s1, kexec_start_address
 
 process_entry:
-        PTR_L   s2, (s0)
-        PTR_ADD s0, s0, SZREG
+        PTR_L           s2, (s0)
+        PTR_ADD         s0, s0, SZREG
 
         /* destination page */
-        and     s3, s2, 0x1
-        beq     s3, zero, 1f
-        and     s4, s2, ~0x1    /* store destination addr in s4 */
-        move    a0, s4
-        b       process_entry
+        and             s3, s2, 0x1
+        beq             s3, zero, 1f
+        and             s4, s2, ~0x1    /* store destination addr in s4 */
+        move            a0, s4
+        b               process_entry
 
 1:
         /* indirection page, update s0  */
-        and     s3, s2, 0x2
-        beq     s3, zero, 1f
-        and     s0, s2, ~0x2
-        b       process_entry
+        and             s3, s2, 0x2
+        beq             s3, zero, 1f
+        and             s0, s2, ~0x2
+        b               process_entry
 
 1:
         /* done page */
-        and     s3, s2, 0x4
-        beq     s3, zero, 1f
-        b       done
+        and             s3, s2, 0x4
+        beq             s3, zero, 1f
+        b               done
 1:
         /* source page */
-        and     s3, s2, 0x8
-        beq     s3, zero, process_entry
-        and     s2, s2, ~0x8
-        li      s6, (1 << PAGE_SHIFT) / SZREG
+        and             s3, s2, 0x8
+        beq             s3, zero, process_entry
+        and             s2, s2, ~0x8
+        li              s6, (1 << PAGE_SHIFT) / SZREG
 
 copy_word:
         /* copy page word by word */
-        REG_L   s5, (s2)
-        REG_S   s5, (s4)
-        INT_ADD s4, s4, SZREG
-        INT_ADD s2, s2, SZREG
-        INT_SUB s6, s6, 1
-        beq     s6, zero, process_entry
-        b       copy_word
-        b       process_entry
+        REG_L           s5, (s2)
+        REG_S           s5, (s4)
+        PTR_ADD         s4, s4, SZREG
+        PTR_ADD         s2, s2, SZREG
+        LONG_SUB        s6, s6, 1
+        beq             s6, zero, process_entry
+        b               copy_word
+        b               process_entry
 
 done:
         /* jump to kexec_start_address */
-        j       s1
+        j               s1
+        END(relocate_new_kernel)
 
-        .globl kexec_start_address
 kexec_start_address:
-        .long   0x0
+        EXPORT(kexec_start_address)
+        PTR             0x0
+        .size           kexec_start_address, PTRSIZE
 
-        .globl kexec_indirection_page
 kexec_indirection_page:
-        .long   0x0
+        EXPORT(kexec_indirection_page)
+        PTR             0
+        .size           kexec_indirection_page, PTRSIZE
 
 relocate_new_kernel_end:
 
-        .globl relocate_new_kernel_size
 relocate_new_kernel_size:
-        .long relocate_new_kernel_end - relocate_new_kernel
+        EXPORT(relocate_new_kernel_size)
+        PTR             relocate_new_kernel_end - relocate_new_kernel
+        .size           relocate_new_kernel_size, PTRSIZE
diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index 8cf24d716d41..aab89e97abb5 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -40,12 +40,11 @@
 #include <asm/atomic.h>
 #include <asm/cpu.h>
 #include <asm/processor.h>
+#include <asm/mips_mt.h>
 #include <asm/system.h>
 #include <asm/vpe.h>
 #include <asm/rtlx.h>
 
-#define RTLX_TARG_VPE 1
-
 static struct rtlx_info *rtlx;
 static int major;
 static char module_name[] = "rtlx";
@@ -165,10 +164,10 @@ int rtlx_open(int index, int can_sleep)
         }
 
         if (rtlx == NULL) {
-                if( (p = vpe_get_shared(RTLX_TARG_VPE)) == NULL) {
+                if( (p = vpe_get_shared(tclimit)) == NULL) {
                         if (can_sleep) {
                                 __wait_event_interruptible(channel_wqs[index].lx_queue,
-                                                           (p = vpe_get_shared(RTLX_TARG_VPE)),
+                                                           (p = vpe_get_shared(tclimit)),
                                                            ret);
                                 if (ret)
                                         goto out_fail;
@@ -472,11 +471,24 @@ static int rtlx_irq_num = MIPS_CPU_IRQ_BASE + MIPS_CPU_RTLX_IRQ;
 static char register_chrdev_failed[] __initdata =
         KERN_ERR "rtlx_module_init: unable to register device\n";
 
-static int rtlx_module_init(void)
+static int __init rtlx_module_init(void)
 {
         struct device *dev;
         int i, err;
 
+        if (!cpu_has_mipsmt) {
+                printk("VPE loader: not a MIPS MT capable processor\n");
+                return -ENODEV;
+        }
+
+        if (tclimit == 0) {
+                printk(KERN_WARNING "No TCs reserved for AP/SP, not "
+                       "initializing RTLX.\nPass maxtcs=<n> argument as kernel "
+                       "argument\n");
+
+                return -ENODEV;
+        }
+
         major = register_chrdev(0, module_name, &rtlx_fops);
         if (major < 0) {
                 printk(register_chrdev_failed);
@@ -501,7 +513,7 @@ static int rtlx_module_init(void)
         /* set up notifiers */
         notify.start = starting;
         notify.stop = stopping;
-        vpe_notify(RTLX_TARG_VPE, &notify);
+        vpe_notify(tclimit, &notify);
 
         if (cpu_has_vint)
                 set_vi_handler(MIPS_CPU_RTLX_IRQ, rtlx_dispatch);
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index ae985d1fcca1..82480a1717d8 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -662,6 +662,7 @@ einval:	li	v0, -EINVAL
         sys     sys_signalfd            3
         sys     sys_timerfd             4
         sys     sys_eventfd             1
+        sys     sys_fallocate           6       /* 4320 */
         .endm
 
         /* We pre-compute the number of _instruction_ bytes needed to
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index 7bcd5a1a85f5..c2c10876da2e 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -477,4 +477,5 @@ sys_call_table:
         PTR     sys_signalfd
         PTR     sys_timerfd
         PTR     sys_eventfd
+        PTR     sys_fallocate
         .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 532a2f3b42fc..53d7a977193c 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -403,4 +403,5 @@ EXPORT(sysn32_call_table)
         PTR     compat_sys_signalfd             /* 5280 */
         PTR     compat_sys_timerfd
         PTR     sys_eventfd
+        PTR     sys_fallocate
         .size   sysn32_call_table,.-sysn32_call_table
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 6bbe0f4ed8ba..b3ed731a24c6 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -525,4 +525,5 @@ sys_call_table:
         PTR     compat_sys_signalfd
         PTR     compat_sys_timerfd
         PTR     sys_eventfd
+        PTR     sys_fallocate                   /* 4320 */
         .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index 486b8e5f52d0..64b612a0a622 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -18,7 +18,6 @@
 #include <linux/errno.h>
 #include <linux/wait.h>
 #include <linux/ptrace.h>
-#include <linux/compat.h>
 #include <linux/suspend.h>
 #include <linux/compiler.h>
 #include <linux/uaccess.h>
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 04bbbd8d91ab..73b0dab02668 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -194,6 +194,61 @@ void smp_call_function_interrupt(void)
         }
 }
 
+int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
+                             int retry, int wait)
+{
+        struct call_data_struct data;
+        int me;
+
+        /*
+         * Can die spectacularly if this CPU isn't yet marked online
+         */
+        if (!cpu_online(cpu))
+                return 0;
+
+        me = get_cpu();
+        BUG_ON(!cpu_online(me));
+
+        if (cpu == me) {
+                local_irq_disable();
+                func(info);
+                local_irq_enable();
+                put_cpu();
+                return 0;
+        }
+
+        /* Can deadlock when called with interrupts disabled */
+        WARN_ON(irqs_disabled());
+
+        data.func = func;
+        data.info = info;
+        atomic_set(&data.started, 0);
+        data.wait = wait;
+        if (wait)
+                atomic_set(&data.finished, 0);
+
+        spin_lock(&smp_call_lock);
+        call_data = &data;
+        smp_mb();
+
+        /* Send a message to the other CPU */
+        core_send_ipi(cpu, SMP_CALL_FUNCTION);
+
+        /* Wait for response */
+        /* FIXME: lock-up detection, backtrace on lock-up */
+        while (atomic_read(&data.started) != 1)
+                barrier();
+
+        if (wait)
+                while (atomic_read(&data.finished) != 1)
+                        barrier();
+        call_data = NULL;
+        spin_unlock(&smp_call_lock);
+
+        put_cpu();
+        return 0;
+}
+
 static void stop_this_cpu(void *dummy)
 {
         /*
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 342d873b2ecc..16aa5d37117c 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -86,25 +86,11 @@ unsigned int smtc_status = 0;
 
 /* Boot command line configuration overrides */
 
-static int vpelimit = 0;
-static int tclimit = 0;
 static int ipibuffers = 0;
 static int nostlb = 0;
 static int asidmask = 0;
 unsigned long smtc_asid_mask = 0xff;
 
-static int __init maxvpes(char *str)
-{
-        get_option(&str, &vpelimit);
-        return 1;
-}
-
-static int __init maxtcs(char *str)
-{
-        get_option(&str, &tclimit);
-        return 1;
-}
-
 static int __init ipibufs(char *str)
 {
         get_option(&str, &ipibuffers);
@@ -137,8 +123,6 @@ static int __init asidmask_set(char *str)
         return 1;
 }
 
-__setup("maxvpes=", maxvpes);
-__setup("maxtcs=", maxtcs);
 __setup("ipibufs=", ipibufs);
 __setup("nostlb", stlb_disable);
 __setup("asidmask=", asidmask_set);
@@ -168,9 +152,9 @@ static int __init tintq(char *str)
 
 __setup("tintq=", tintq);
 
-int imstuckcount[2][8];
+static int imstuckcount[2][8];
 /* vpemask represents IM/IE bits of per-VPE Status registers, low-to-high */
-int vpemask[2][8] = {
+static int vpemask[2][8] = {
         {0, 0, 1, 0, 0, 0, 0, 1},
         {0, 0, 0, 0, 0, 0, 0, 1}
 };
@@ -540,7 +524,7 @@ void mipsmt_prepare_cpus(void)
  * (unsigned long)idle->thread_info the gp
  *
  */
-void smtc_boot_secondary(int cpu, struct task_struct *idle)
+void __cpuinit smtc_boot_secondary(int cpu, struct task_struct *idle)
 {
         extern u32 kernelsp[NR_CPUS];
         long flags;
@@ -876,7 +860,7 @@ void deferred_smtc_ipi(void)
  * Send clock tick to all TCs except the one executing the funtion
  */
 
-void smtc_timer_broadcast(int vpe)
+void smtc_timer_broadcast(void)
 {
         int cpu;
         int myTC = cpu_data[smp_processor_id()].tc_id;
@@ -975,7 +959,12 @@ static void ipi_irq_dispatch(void)
         do_IRQ(cpu_ipi_irq);
 }
 
-static struct irqaction irq_ipi;
+static struct irqaction irq_ipi = {
+        .handler        = ipi_interrupt,
+        .flags          = IRQF_DISABLED,
+        .name           = "SMTC_IPI",
+        .flags          = IRQF_PERCPU
+};
 
 static void setup_cross_vpe_interrupts(unsigned int nvpe)
 {
@@ -987,13 +976,8 @@ static void setup_cross_vpe_interrupts(unsigned int nvpe)
 
         set_vi_handler(MIPS_CPU_IPI_IRQ, ipi_irq_dispatch);
 
-        irq_ipi.handler = ipi_interrupt;
-        irq_ipi.flags = IRQF_DISABLED;
-        irq_ipi.name = "SMTC_IPI";
-
         setup_irq_smtc(cpu_ipi_irq, &irq_ipi, (0x100 << MIPS_CPU_IPI_IRQ));
 
-        irq_desc[cpu_ipi_irq].status |= IRQ_PER_CPU;
         set_irq_handler(cpu_ipi_irq, handle_percpu_irq);
 }
 
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index 541b5005957e..7c800ec3ff55 100644
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -281,16 +281,24 @@ asmlinkage int sys_set_thread_area(unsigned long addr)
 
 asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3)
 {
-        int     tmp;
-
-        switch(cmd) {
+        switch (cmd) {
         case MIPS_ATOMIC_SET:
                 printk(KERN_CRIT "How did I get here?\n");
                 return -EINVAL;
 
         case MIPS_FIXADE:
-                tmp = current->thread.mflags & ~3;
-                current->thread.mflags = tmp | (arg1 & 3);
+                if (arg1 & ~3)
+                        return -EINVAL;
+
+                if (arg1 & 1)
+                        set_thread_flag(TIF_FIXADE);
+                else
+                        clear_thread_flag(TIF_FIXADE);
+                if (arg1 & 2)
+                        set_thread_flag(TIF_LOGADE);
+                else
+                        clear_thread_flag(TIF_FIXADE);
+
                 return 0;
 
         case FLUSH_CACHE:
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index ce277cb34dd0..c8e291c83057 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -775,7 +775,7 @@ static void mt_ase_fp_affinity(void)
                         cpus_and(tmask, current->thread.user_cpus_allowed,
                                  mt_fpu_cpumask);
                         set_cpus_allowed(current, tmask);
-                        current->thread.mflags |= MF_FPUBOUND;
+                        set_thread_flag(TIF_FPUBOUND);
                 }
         }
 #endif /* CONFIG_MIPS_MT_FPAFF */
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index 8b9c34ffae18..d34b1fb3665d 100644
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -101,16 +101,14 @@ static u32 unaligned_action;
 #endif
 extern void show_registers(struct pt_regs *regs);
 
-static inline int emulate_load_store_insn(struct pt_regs *regs,
-        void __user *addr, unsigned int __user *pc,
-        unsigned long **regptr, unsigned long *newvalue)
+static void emulate_load_store_insn(struct pt_regs *regs,
+        void __user *addr, unsigned int __user *pc)
 {
         union mips_instruction insn;
         unsigned long value;
         unsigned int res;
 
         regs->regs[0] = 0;
-        *regptr=NULL;
 
         /*
          * This load never faults.
@@ -179,8 +177,8 @@ static inline int emulate_load_store_insn(struct pt_regs *regs,
                         : "r" (addr), "i" (-EFAULT));
                 if (res)
                         goto fault;
-                *newvalue = value;
-                *regptr = &regs->regs[insn.i_format.rt];
+                compute_return_epc(regs);
+                regs->regs[insn.i_format.rt] = value;
                 break;
 
         case lw_op:
@@ -209,8 +207,8 @@ static inline int emulate_load_store_insn(struct pt_regs *regs,
                         : "r" (addr), "i" (-EFAULT));
                 if (res)
                         goto fault;
-                *newvalue = value;
-                *regptr = &regs->regs[insn.i_format.rt];
+                compute_return_epc(regs);
+                regs->regs[insn.i_format.rt] = value;
                 break;
 
         case lhu_op:
@@ -243,8 +241,8 @@ static inline int emulate_load_store_insn(struct pt_regs *regs,
                         : "r" (addr), "i" (-EFAULT));
                 if (res)
                         goto fault;
-                *newvalue = value;
-                *regptr = &regs->regs[insn.i_format.rt];
+                compute_return_epc(regs);
+                regs->regs[insn.i_format.rt] = value;
                 break;
 
         case lwu_op:
@@ -283,8 +281,8 @@ static inline int emulate_load_store_insn(struct pt_regs *regs,
                         : "r" (addr), "i" (-EFAULT));
                 if (res)
                         goto fault;
-                *newvalue = value;
-                *regptr = &regs->regs[insn.i_format.rt];
+                compute_return_epc(regs);
+                regs->regs[insn.i_format.rt] = value;
                 break;
 #endif /* CONFIG_64BIT */
 
@@ -325,8 +323,8 @@ static inline int emulate_load_store_insn(struct pt_regs *regs,
                         : "r" (addr), "i" (-EFAULT));
                 if (res)
                         goto fault;
-                *newvalue = value;
-                *regptr = &regs->regs[insn.i_format.rt];
+                compute_return_epc(regs);
+                regs->regs[insn.i_format.rt] = value;
                 break;
 #endif /* CONFIG_64BIT */
 
@@ -367,6 +365,7 @@ static inline int emulate_load_store_insn(struct pt_regs *regs,
                         : "r" (value), "r" (addr), "i" (-EFAULT));
                 if (res)
                         goto fault;
+                compute_return_epc(regs);
                 break;
 
         case sw_op:
@@ -397,6 +396,7 @@ static inline int emulate_load_store_insn(struct pt_regs *regs,
                 : "r" (value), "r" (addr), "i" (-EFAULT));
                 if (res)
                         goto fault;
+                compute_return_epc(regs);
                 break;
 
         case sd_op:
@@ -435,6 +435,7 @@ static inline int emulate_load_store_insn(struct pt_regs *regs,
                 : "r" (value), "r" (addr), "i" (-EFAULT));
                 if (res)
                         goto fault;
+                compute_return_epc(regs);
                 break;
 #endif /* CONFIG_64BIT */
 
@@ -473,34 +474,31 @@ static inline int emulate_load_store_insn(struct pt_regs *regs,
         unaligned_instructions++;
 #endif
 
-        return 0;
+        return;
 
 fault:
         /* Did we have an exception handler installed? */
         if (fixup_exception(regs))
-                return 1;
+                return;
 
         die_if_kernel ("Unhandled kernel unaligned access", regs);
         send_sig(SIGSEGV, current, 1);
 
-        return 0;
+        return;
 
 sigbus:
         die_if_kernel("Unhandled kernel unaligned access", regs);
         send_sig(SIGBUS, current, 1);
 
-        return 0;
+        return;
 
 sigill:
         die_if_kernel("Unhandled kernel unaligned access or invalid instruction", regs);
         send_sig(SIGILL, current, 1);
-
-        return 0;
 }
 
 asmlinkage void do_ade(struct pt_regs *regs)
 {
-        unsigned long *regptr, newval;
         extern int do_dsemulret(struct pt_regs *);
         unsigned int __user *pc;
         mm_segment_t seg;
@@ -524,7 +522,7 @@ asmlinkage void do_ade(struct pt_regs *regs)
                 goto sigbus;
 
         pc = (unsigned int __user *) exception_epc(regs);
-        if (user_mode(regs) && (current->thread.mflags & MF_FIXADE) == 0)
+        if (user_mode(regs) && !test_thread_flag(TIF_FIXADE))
                 goto sigbus;
         if (unaligned_action == UNALIGNED_ACTION_SIGNAL)
                 goto sigbus;
@@ -538,16 +536,7 @@ asmlinkage void do_ade(struct pt_regs *regs)
         seg = get_fs();
         if (!user_mode(regs))
                 set_fs(KERNEL_DS);
-        if (!emulate_load_store_insn(regs, (void __user *)regs->cp0_badvaddr, pc,
-                                     &regptr, &newval)) {
-                compute_return_epc(regs);
-                /*
-                 * Now that branch is evaluated, update the dest
-                 * register if necessary
-                 */
-                if (regptr)
-                        *regptr = newval;
-        }
+        emulate_load_store_insn(regs, (void __user *)regs->cp0_badvaddr, pc);
         set_fs(seg);
 
         return;
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index a2bee10f04cf..3c09b9785f4c 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -27,7 +27,6 @@
  * To load and run, simply cat a SP 'program file' to /dev/vpe1.
  * i.e cat spapp >/dev/vpe1.
  */
-
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/module.h>
@@ -54,6 +53,7 @@
 #include <asm/system.h>
 #include <asm/vpe.h>
 #include <asm/kspd.h>
+#include <asm/mips_mt.h>
 
 typedef void *vpe_handle;
 
@@ -64,6 +64,10 @@ typedef void *vpe_handle;
 /* If this is set, the section belongs in the init part of the module */
 #define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))
 
+/*
+ * The number of TCs and VPEs physically available on the core
+ */
+static int hw_tcs, hw_vpes;
 static char module_name[] = "vpe";
 static int major;
 static const int minor = 1;     /* fixed for now  */
@@ -126,20 +130,17 @@ struct vpe {
 
         /* the list of who wants to know when something major happens */
         struct list_head notify;
+
+        unsigned int ntcs;
 };
 
 struct tc {
         enum tc_state state;
         int index;
 
-        /* parent VPE */
-        struct vpe *pvpe;
-
-        /* The list of TC's with this VPE */
-        struct list_head tc;
-
-        /* The global list of tc's */
-        struct list_head list;
+        struct vpe *pvpe;       /* parent VPE */
+        struct list_head tc;    /* The list of TC's with this VPE */
+        struct list_head list;  /* The global list of tc's */
 };
 
 struct {
@@ -217,18 +218,17 @@ struct vpe *alloc_vpe(int minor)
 /* allocate a tc. At startup only tc0 is running, all other can be halted. */
 struct tc *alloc_tc(int index)
 {
-        struct tc *t;
+        struct tc *tc;
 
-        if ((t = kzalloc(sizeof(struct tc), GFP_KERNEL)) == NULL) {
-                return NULL;
-        }
-
-        INIT_LIST_HEAD(&t->tc);
-        list_add_tail(&t->list, &vpecontrol.tc_list);
+        if ((tc = kzalloc(sizeof(struct tc), GFP_KERNEL)) == NULL)
+                goto out;
 
-        t->index = index;
+        INIT_LIST_HEAD(&tc->tc);
+        tc->index = index;
+        list_add_tail(&tc->list, &vpecontrol.tc_list);
 
-        return t;
+out:
+        return tc;
 }
 
 /* clean up and free everything */
@@ -663,66 +663,48 @@ static void dump_elfsymbols(Elf_Shdr * sechdrs, unsigned int symindex,
 }
 #endif
 
-static void dump_tc(struct tc *t)
-{
-        unsigned long val;
-
-        settc(t->index);
-        printk(KERN_DEBUG "VPE loader: TC index %d targtc %ld "
-               "TCStatus 0x%lx halt 0x%lx\n",
-               t->index, read_c0_vpecontrol() & VPECONTROL_TARGTC,
-               read_tc_c0_tcstatus(), read_tc_c0_tchalt());
-
-        printk(KERN_DEBUG " tcrestart 0x%lx\n", read_tc_c0_tcrestart());
-        printk(KERN_DEBUG " tcbind 0x%lx\n", read_tc_c0_tcbind());
-
-        val = read_c0_vpeconf0();
-        printk(KERN_DEBUG " VPEConf0 0x%lx MVP %ld\n", val,
-               (val & VPECONF0_MVP) >> VPECONF0_MVP_SHIFT);
-
-        printk(KERN_DEBUG " c0 status 0x%lx\n", read_vpe_c0_status());
-        printk(KERN_DEBUG " c0 cause 0x%lx\n", read_vpe_c0_cause());
-
-        printk(KERN_DEBUG " c0 badvaddr 0x%lx\n", read_vpe_c0_badvaddr());
-        printk(KERN_DEBUG " c0 epc 0x%lx\n", read_vpe_c0_epc());
-}
-
-static void dump_tclist(void)
-{
-        struct tc *t;
-
-        list_for_each_entry(t, &vpecontrol.tc_list, list) {
-                dump_tc(t);
-        }
-}
-
 /* We are prepared so configure and start the VPE... */
 static int vpe_run(struct vpe * v)
 {
+        unsigned long flags, val, dmt_flag;
         struct vpe_notifications *n;
-        unsigned long val, dmt_flag;
+        unsigned int vpeflags;
         struct tc *t;
 
         /* check we are the Master VPE */
+        local_irq_save(flags);
         val = read_c0_vpeconf0();
         if (!(val & VPECONF0_MVP)) {
                 printk(KERN_WARNING
                        "VPE loader: only Master VPE's are allowed to configure MT\n");
+                local_irq_restore(flags);
+
                 return -1;
         }
 
-        /* disable MT (using dvpe) */
-        dvpe();
+        dmt_flag = dmt();
+        vpeflags = dvpe();
 
         if (!list_empty(&v->tc)) {
                 if ((t = list_entry(v->tc.next, struct tc, tc)) == NULL) {
-                        printk(KERN_WARNING "VPE loader: TC %d is already in use.\n",
-                               t->index);
+                        evpe(vpeflags);
+                        emt(dmt_flag);
+                        local_irq_restore(flags);
+
+                        printk(KERN_WARNING
+                               "VPE loader: TC %d is already in use.\n",
+                               t->index);
                         return -ENOEXEC;
                 }
         } else {
-                printk(KERN_WARNING "VPE loader: No TC's associated with VPE %d\n",
+                evpe(vpeflags);
+                emt(dmt_flag);
+                local_irq_restore(flags);
+
+                printk(KERN_WARNING
+                       "VPE loader: No TC's associated with VPE %d\n",
                        v->minor);
+
                 return -ENOEXEC;
         }
 
@@ -733,21 +715,20 @@ static int vpe_run(struct vpe * v)
 
         /* should check it is halted, and not activated */
         if ((read_tc_c0_tcstatus() & TCSTATUS_A) || !(read_tc_c0_tchalt() & TCHALT_H)) {
-                printk(KERN_WARNING "VPE loader: TC %d is already doing something!\n",
+                evpe(vpeflags);
+                emt(dmt_flag);
+                local_irq_restore(flags);
+
+                printk(KERN_WARNING "VPE loader: TC %d is already active!\n",
                        t->index);
-                dump_tclist();
+
                 return -ENOEXEC;
         }
 
-        /*
-         * Disable multi-threaded execution whilst we activate, clear the
-         * halt bit and bound the tc to the other VPE...
-         */
-        dmt_flag = dmt();
-
         /* Write the address we want it to start running from in the TCPC register. */
         write_tc_c0_tcrestart((unsigned long)v->__start);
         write_tc_c0_tccontext((unsigned long)0);
+
         /*
          * Mark the TC as activated, not interrupt exempt and not dynamically
          * allocatable
@@ -763,15 +744,15 @@ static int vpe_run(struct vpe * v)
          * here...  Or set $a3 to zero and define DFLT_STACK_SIZE and
          * DFLT_HEAP_SIZE when you compile your program
          */
-        mttgpr(7, physical_memsize);
-
+        mttgpr(6, v->ntcs);
+        mttgpr(7, physical_memsize);
 
         /* set up VPE1 */
         /*
          * bind the TC to VPE 1 as late as possible so we only have the final
          * VPE registers to set up, and so an EJTAG probe can trigger on it
          */
-        write_tc_c0_tcbind((read_tc_c0_tcbind() & ~TCBIND_CURVPE) | v->minor);
+        write_tc_c0_tcbind((read_tc_c0_tcbind() & ~TCBIND_CURVPE) | 1);
 
         write_vpe_c0_vpeconf0(read_vpe_c0_vpeconf0() & ~(VPECONF0_VPA));
 
@@ -793,15 +774,16 @@ static int vpe_run(struct vpe * v)
         /* take system out of configuration state */
         clear_c0_mvpcontrol(MVPCONTROL_VPC);
 
-        /* now safe to re-enable multi-threading */
-        emt(dmt_flag);
-
-        /* set it running */
+#ifdef CONFIG_SMP
         evpe(EVPE_ENABLE);
+#else
+        evpe(vpeflags);
+#endif
+        emt(dmt_flag);
+        local_irq_restore(flags);
 
-        list_for_each_entry(n, &v->notify, list) {
-                n->start(v->minor);
-        }
+        list_for_each_entry(n, &v->notify, list)
+                n->start(minor);
 
         return 0;
 }
@@ -1023,23 +1005,15 @@ static int vpe_elfload(struct vpe * v)
         return 0;
 }
 
-void __used dump_vpe(struct vpe * v)
-{
-        struct tc *t;
-
-        settc(v->minor);
-
-        printk(KERN_DEBUG "VPEControl 0x%lx\n", read_vpe_c0_vpecontrol());
-        printk(KERN_DEBUG "VPEConf0 0x%lx\n", read_vpe_c0_vpeconf0());
-
-        list_for_each_entry(t, &vpecontrol.tc_list, list)
-                dump_tc(t);
-}
-
 static void cleanup_tc(struct tc *tc)
 {
+        unsigned long flags;
+        unsigned int mtflags, vpflags;
         int tmp;
 
+        local_irq_save(flags);
+        mtflags = dmt();
+        vpflags = dvpe();
         /* Put MVPE's into 'configuration state' */
         set_c0_mvpcontrol(MVPCONTROL_VPC);
 
@@ -1054,9 +1028,12 @@ static void cleanup_tc(struct tc *tc)
         write_tc_c0_tchalt(TCHALT_H);
 
         /* bind it to anything other than VPE1 */
-        write_tc_c0_tcbind(read_tc_c0_tcbind() & ~TCBIND_CURVPE); // | TCBIND_CURVPE
+//      write_tc_c0_tcbind(read_tc_c0_tcbind() & ~TCBIND_CURVPE); // | TCBIND_CURVPE
 
         clear_c0_mvpcontrol(MVPCONTROL_VPC);
+        evpe(vpflags);
+        emt(mtflags);
+        local_irq_restore(flags);
 }
 
 static int getcwd(char *buff, int size)
@@ -1077,36 +1054,32 @@ static int getcwd(char *buff, int size)
 /* checks VPE is unused and gets ready to load program  */
 static int vpe_open(struct inode *inode, struct file *filp)
 {
-        int minor, ret;
         enum vpe_state state;
-        struct vpe *v;
         struct vpe_notifications *not;
+        struct vpe *v;
+        int ret;
 
-        /* assume only 1 device at the mo. */
-        if ((minor = iminor(inode)) != 1) {
+        if (minor != iminor(inode)) {
+                /* assume only 1 device at the moment. */
                 printk(KERN_WARNING "VPE loader: only vpe1 is supported\n");
                 return -ENODEV;
         }
 
-        if ((v = get_vpe(minor)) == NULL) {
+        if ((v = get_vpe(tclimit)) == NULL) {
                 printk(KERN_WARNING "VPE loader: unable to get vpe\n");
                 return -ENODEV;
         }
 
         state = xchg(&v->state, VPE_STATE_INUSE);
         if (state != VPE_STATE_UNUSED) {
-                dvpe();
-
                 printk(KERN_DEBUG "VPE loader: tc in use dumping regs\n");
 
-                dump_tc(get_tc(minor));
-
                 list_for_each_entry(not, &v->notify, list) {
-                        not->stop(minor);
+                        not->stop(tclimit);
                 }
 
                 release_progmem(v->load_addr);
-                cleanup_tc(get_tc(minor));
+                cleanup_tc(get_tc(tclimit));
         }
 
         /* this of-course trashes what was there before... */
@@ -1133,26 +1106,25 @@ static int vpe_open(struct inode *inode, struct file *filp)
 
         v->shared_ptr = NULL;
         v->__start = 0;
+
         return 0;
 }
 
 static int vpe_release(struct inode *inode, struct file *filp)
 {
-        int minor, ret = 0;
         struct vpe *v;
         Elf_Ehdr *hdr;
+        int ret = 0;
 
-        minor = iminor(inode);
-        if ((v = get_vpe(minor)) == NULL)
+        v = get_vpe(tclimit);
+        if (v == NULL)
                 return -ENODEV;
 
-        // simple case of fire and forget, so tell the VPE to run...
-
         hdr = (Elf_Ehdr *) v->pbuffer;
         if (memcmp(hdr->e_ident, ELFMAG, 4) == 0) {
-                if (vpe_elfload(v) >= 0)
+                if (vpe_elfload(v) >= 0) {
                         vpe_run(v);
-                else {
+                } else {
                         printk(KERN_WARNING "VPE loader: ELF load failed.\n");
                         ret = -ENOEXEC;
                 }
@@ -1179,12 +1151,14 @@ static int vpe_release(struct inode *inode, struct file *filp)
 static ssize_t vpe_write(struct file *file, const char __user * buffer,
                          size_t count, loff_t * ppos)
 {
-        int minor;
         size_t ret = count;
         struct vpe *v;
 
-        minor = iminor(file->f_path.dentry->d_inode);
-        if ((v = get_vpe(minor)) == NULL)
+        if (iminor(file->f_path.dentry->d_inode) != minor)
+                return -ENODEV;
+
+        v = get_vpe(tclimit);
+        if (v == NULL)
                 return -ENODEV;
 
         if (v->pbuffer == NULL) {
@@ -1366,62 +1340,173 @@ static void kspd_sp_exit( int sp_id)
 }
 #endif
 
-static struct device *vpe_dev;
+static ssize_t store_kill(struct class_device *dev, const char *buf, size_t len)
+{
+        struct vpe *vpe = get_vpe(tclimit);
+        struct vpe_notifications *not;
+
+        list_for_each_entry(not, &vpe->notify, list) {
+                not->stop(tclimit);
+        }
+
+        release_progmem(vpe->load_addr);
+        cleanup_tc(get_tc(tclimit));
+        vpe_stop(vpe);
+        vpe_free(vpe);
+
+        return len;
+}
+
+static ssize_t show_ntcs(struct class_device *cd, char *buf)
+{
+        struct vpe *vpe = get_vpe(tclimit);
+
+        return sprintf(buf, "%d\n", vpe->ntcs);
+}
+
+static ssize_t store_ntcs(struct class_device *dev, const char *buf, size_t len)
+{
+        struct vpe *vpe = get_vpe(tclimit);
+        unsigned long new;
+        char *endp;
+
+        new = simple_strtoul(buf, &endp, 0);
+        if (endp == buf)
+                goto out_einval;
+
+        if (new == 0 || new > (hw_tcs - tclimit))
+                goto out_einval;
+
+        vpe->ntcs = new;
+
+        return len;
+
+out_einval:
+        return -EINVAL;;
+}
+
+static struct class_device_attribute vpe_class_attributes[] = {
+        __ATTR(kill, S_IWUSR, NULL, store_kill),
+        __ATTR(ntcs, S_IRUGO | S_IWUSR, show_ntcs, store_ntcs),
+        {}
+};
+
+static void vpe_class_device_release(struct class_device *cd)
+{
+        kfree(cd);
+}
+
+struct class vpe_class = {
+        .name = "vpe",
+        .owner = THIS_MODULE,
+        .release = vpe_class_device_release,
+        .class_dev_attrs = vpe_class_attributes,
+};
+
+struct class_device vpe_device;
 
 static int __init vpe_module_init(void)
 {
+        unsigned int mtflags, vpflags;
+        unsigned long flags, val;
         struct vpe *v = NULL;
-        struct device *dev;
         struct tc *t;
-        unsigned long val;
-        int i, err;
+        int tc, err;
 
         if (!cpu_has_mipsmt) {
                 printk("VPE loader: not a MIPS MT capable processor\n");
                 return -ENODEV;
         }
 
+        if (vpelimit == 0) {
+                printk(KERN_WARNING "No VPEs reserved for AP/SP, not "
+                       "initializing VPE loader.\nPass maxvpes=<n> argument as "
+                       "kernel argument\n");
+
+                return -ENODEV;
+        }
+
+        if (tclimit == 0) {
+                printk(KERN_WARNING "No TCs reserved for AP/SP, not "
+                       "initializing VPE loader.\nPass maxtcs=<n> argument as "
+                       "kernel argument\n");
+
+                return -ENODEV;
+        }
+
         major = register_chrdev(0, module_name, &vpe_fops);
         if (major < 0) {
                 printk("VPE loader: unable to register character device\n");
                 return major;
         }
 
-        dev = device_create(mt_class, NULL, MKDEV(major, minor),
-                            "tc%d", minor);
-        if (IS_ERR(dev)) {
-                err = PTR_ERR(dev);
+        err = class_register(&vpe_class);
+        if (err) {
+                printk(KERN_ERR "vpe_class registration failed\n");
                 goto out_chrdev;
         }
-        vpe_dev = dev;
 
-        dmt();
-        dvpe();
+        class_device_initialize(&vpe_device);
+        vpe_device.class        = &vpe_class,
+        vpe_device.parent       = NULL,
+        strlcpy(vpe_device.class_id, "vpe1", BUS_ID_SIZE);
+        vpe_device.devt = MKDEV(major, minor);
+        err = class_device_add(&vpe_device);
+        if (err) {
+                printk(KERN_ERR "Adding vpe_device failed\n");
+                goto out_class;
+        }
+
+        local_irq_save(flags);
+        mtflags = dmt();
+        vpflags = dvpe();
 
         /* Put MVPE's into 'configuration state' */
         set_c0_mvpcontrol(MVPCONTROL_VPC);
 
         /* dump_mtregs(); */
 
-
         val = read_c0_mvpconf0();
-        for (i = 0; i < ((val & MVPCONF0_PTC) + 1); i++) {
-                t = alloc_tc(i);
+        hw_tcs = (val & MVPCONF0_PTC) + 1;
+        hw_vpes = ((val & MVPCONF0_PVPE) >> MVPCONF0_PVPE_SHIFT) + 1;
+
+        for (tc = tclimit; tc < hw_tcs; tc++) {
+                /*
+                 * Must re-enable multithreading temporarily or in case we
+                 * reschedule send IPIs or similar we might hang.
+                 */
+                clear_c0_mvpcontrol(MVPCONTROL_VPC);
+                evpe(vpflags);
+                emt(mtflags);
+                local_irq_restore(flags);
+                t = alloc_tc(tc);
+                if (!t) {
+                        err = -ENOMEM;
+                        goto out;
+                }
+
+                local_irq_save(flags);
+                mtflags = dmt();
+                vpflags = dvpe();
+                set_c0_mvpcontrol(MVPCONTROL_VPC);
 
                 /* VPE's */
-                if (i < ((val & MVPCONF0_PVPE) >> MVPCONF0_PVPE_SHIFT) + 1) {
-                        settc(i);
+                if (tc < hw_tcs) {
+                        settc(tc);
 
-                        if ((v = alloc_vpe(i)) == NULL) {
+                        if ((v = alloc_vpe(tc)) == NULL) {
                                 printk(KERN_WARNING "VPE: unable to allocate VPE\n");
-                                return -ENODEV;
+
+                                goto out_reenable;
                         }
 
+                        v->ntcs = hw_tcs - tclimit;
+
                         /* add the tc to the list of this vpe's tc's. */
                         list_add(&t->tc, &v->tc);
 
                         /* deactivate all but vpe0 */
-                        if (i != 0) {
+                        if (tc >= tclimit) {
                                 unsigned long tmp = read_vpe_c0_vpeconf0();
 
                                 tmp &= ~VPECONF0_VPA;
@@ -1434,7 +1519,7 @@ static int __init vpe_module_init(void)
                         /* disable multi-threading with TC's */
                         write_vpe_c0_vpecontrol(read_vpe_c0_vpecontrol() & ~VPECONTROL_TE);
 
-                        if (i != 0) {
+                        if (tc >= vpelimit) {
                                 /*
                                  * Set config to be the same as vpe0,
                                  * particularly kseg0 coherency alg
@@ -1446,10 +1531,10 @@ static int __init vpe_module_init(void)
                 /* TC's */
                 t->pvpe = v;    /* set the parent vpe */
 
-                if (i != 0) {
+                if (tc >= tclimit) {
                         unsigned long tmp;
 
-                        settc(i);
+                        settc(tc);
 
                         /* Any TC that is bound to VPE0 gets left as is - in case
                            we are running SMTC on VPE0. A TC that is bound to any
@@ -1479,17 +1564,25 @@ static int __init vpe_module_init(void)
                 }
         }
 
+out_reenable:
         /* release config state */
         clear_c0_mvpcontrol(MVPCONTROL_VPC);
 
+        evpe(vpflags);
+        emt(mtflags);
+        local_irq_restore(flags);
+
 #ifdef CONFIG_MIPS_APSP_KSPD
         kspd_events.kspd_sp_exit = kspd_sp_exit;
 #endif
         return 0;
 
+out_class:
+        class_unregister(&vpe_class);
 out_chrdev:
         unregister_chrdev(major, module_name);
 
+out:
         return err;
 }
 
@@ -1503,7 +1596,7 @@ static void __exit vpe_module_exit(void)
                 }
         }
 
-        device_destroy(mt_class, MKDEV(major, minor));
+        class_device_del(&vpe_device);
         unregister_chrdev(major, module_name);
 }
 
diff --git a/arch/mips/lemote/lm2e/Makefile b/arch/mips/lemote/lm2e/Makefile
index fb1b48c48cb3..dcaf6f4c3a37 100644
--- a/arch/mips/lemote/lm2e/Makefile
+++ b/arch/mips/lemote/lm2e/Makefile
@@ -3,5 +3,6 @@
 #
 
 obj-y += setup.o prom.o reset.o irq.o pci.o bonito-irq.o dbg_io.o mem.o
-EXTRA_AFLAGS := $(CFLAGS)
 
+EXTRA_AFLAGS := $(CFLAGS)
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/lemote/lm2e/irq.c b/arch/mips/lemote/lm2e/irq.c
index 05693bceaeaf..3e0b7beb1009 100644
--- a/arch/mips/lemote/lm2e/irq.c
+++ b/arch/mips/lemote/lm2e/irq.c
@@ -25,7 +25,6 @@
  */
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/irq.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
diff --git a/arch/mips/lemote/lm2e/prom.c b/arch/mips/lemote/lm2e/prom.c
index 67312d7acf2a..3efb1cf111f2 100644
--- a/arch/mips/lemote/lm2e/prom.c
+++ b/arch/mips/lemote/lm2e/prom.c
@@ -15,15 +15,11 @@
  * option) any later version.
  */
 #include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
 #include <linux/bootmem.h>
-
-#include <asm/addrspace.h>
 #include <asm/bootinfo.h>
 
 extern unsigned long bus_clock;
-extern unsigned long cpu_clock;
+extern unsigned long cpu_clock_freq;
 extern unsigned int memsize, highmemsize;
 extern int putDebugChar(unsigned char byte);
 
@@ -81,7 +77,7 @@ do {									\
         l = (long)*env;
         while (l != 0) {
                 parse_even_earlier(bus_clock, "busclock", l);
-                parse_even_earlier(cpu_clock, "cpuclock", l);
+                parse_even_earlier(cpu_clock_freq, "cpuclock", l);
                 parse_even_earlier(memsize, "memsize", l);
                 parse_even_earlier(highmemsize, "highmemsize", l);
                 env++;
@@ -91,7 +87,7 @@ do {									\
                 memsize = 256;
 
         pr_info("busclock=%ld, cpuclock=%ld,memsize=%d,highmemsize=%d\n",
-               bus_clock, cpu_clock, memsize, highmemsize);
+               bus_clock, cpu_clock_freq, memsize, highmemsize);
 }
 
 void __init prom_free_prom_memory(void)
diff --git a/arch/mips/lemote/lm2e/setup.c b/arch/mips/lemote/lm2e/setup.c
index 0e4d1fa572b5..f34350a4f271 100644
--- a/arch/mips/lemote/lm2e/setup.c
+++ b/arch/mips/lemote/lm2e/setup.c
@@ -28,17 +28,7 @@
  */
 #include <linux/bootmem.h>
 #include <linux/init.h>
-#include <linux/io.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/kernel.h>
-#include <linux/mc146818rtc.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/tty.h>
-#include <linux/types.h>
 
 #include <asm/bootinfo.h>
 #include <asm/mc146818-time.h>
@@ -58,7 +48,7 @@ extern void mips_reboot_setup(void);
 #define PTR_PAD(p) (p)
 #endif
 
-unsigned long cpu_clock;
+unsigned long cpu_clock_freq;
 unsigned long bus_clock;
 unsigned int memsize;
 unsigned int highmemsize = 0;
@@ -71,7 +61,7 @@ void __init plat_timer_setup(struct irqaction *irq)
 static void __init loongson2e_time_init(void)
 {
         /* setup mips r4k timer */
-        mips_hpt_frequency = cpu_clock / 2;
+        mips_hpt_frequency = cpu_clock_freq / 2;
 }
 
 static unsigned long __init mips_rtc_get_time(void)
diff --git a/arch/mips/math-emu/Makefile b/arch/mips/math-emu/Makefile
index 121a848a3594..d547efdeedc2 100644
--- a/arch/mips/math-emu/Makefile
+++ b/arch/mips/math-emu/Makefile
@@ -9,3 +9,5 @@ obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
            sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
            sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
            dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/mips-boards/atlas/Makefile b/arch/mips/mips-boards/atlas/Makefile
index d8dab75906bf..f71c2dd1041a 100644
--- a/arch/mips/mips-boards/atlas/Makefile
+++ b/arch/mips/mips-boards/atlas/Makefile
@@ -18,3 +18,5 @@
 
 obj-y                   := atlas_int.o atlas_setup.o
 obj-$(CONFIG_KGDB)      += atlas_gdb.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/mips-boards/atlas/atlas_int.c b/arch/mips/mips-boards/atlas/atlas_int.c
index 6c8f0255e85d..3c692abc2553 100644
--- a/arch/mips/mips-boards/atlas/atlas_int.c
+++ b/arch/mips/mips-boards/atlas/atlas_int.c
@@ -245,6 +245,7 @@ void __init arch_init_irq(void)
         case MIPS_REVISION_CORID_CORE_MSC:
         case MIPS_REVISION_CORID_CORE_FPGA2:
         case MIPS_REVISION_CORID_CORE_FPGA3:
+        case MIPS_REVISION_CORID_CORE_FPGA4:
         case MIPS_REVISION_CORID_CORE_24K:
         case MIPS_REVISION_CORID_CORE_EMUL_MSC:
                 if (cpu_has_veic)
diff --git a/arch/mips/mips-boards/generic/Makefile b/arch/mips/mips-boards/generic/Makefile
index aade36d78787..b31d8dfed1be 100644
--- a/arch/mips/mips-boards/generic/Makefile
+++ b/arch/mips/mips-boards/generic/Makefile
@@ -24,3 +24,5 @@ obj-y				:= reset.o display.o init.o memory.o \
 obj-$(CONFIG_EARLY_PRINTK)      += console.o
 obj-$(CONFIG_PCI)               += pci.o
 obj-$(CONFIG_KGDB)              += gdb_hook.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c
index 4eabc1eadd23..e2c7147fedf7 100644
--- a/arch/mips/mips-boards/generic/init.c
+++ b/arch/mips/mips-boards/generic/init.c
@@ -294,6 +294,7 @@ void __init prom_init(void)
                 case MIPS_REVISION_CORID_CORE_MSC:
                 case MIPS_REVISION_CORID_CORE_FPGA2:
                 case MIPS_REVISION_CORID_CORE_FPGA3:
+                case MIPS_REVISION_CORID_CORE_FPGA4:
                 case MIPS_REVISION_CORID_CORE_24K:
                 case MIPS_REVISION_CORID_CORE_EMUL_MSC:
                         mips_revision_sconid = MIPS_REVISION_SCON_SOCIT;
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c
index c45d556aa96b..d7bff9ca5356 100644
--- a/arch/mips/mips-boards/generic/time.c
+++ b/arch/mips/mips-boards/generic/time.c
@@ -55,7 +55,7 @@ unsigned long cpu_khz;
 
 static int mips_cpu_timer_irq;
 extern int cp0_perfcount_irq;
-extern void smtc_timer_broadcast(int);
+extern void smtc_timer_broadcast(void);
 
 static void mips_timer_dispatch(void)
 {
@@ -131,7 +131,7 @@ irqreturn_t mips_timer_interrupt(int irq, void *dev_id)
                                          (mips_hpt_frequency/HZ));
                         local_timer_interrupt(irq, dev_id);
                 }
-                smtc_timer_broadcast(cpu_data[cpu].vpe_id);
+                smtc_timer_broadcast();
         }
 #else /* CONFIG_MIPS_MT_SMTC */
         int r2 = cpu_has_mips_r2;
diff --git a/arch/mips/mips-boards/malta/Makefile b/arch/mips/mips-boards/malta/Makefile
index a242b0fc377d..931ca4600a63 100644
--- a/arch/mips/mips-boards/malta/Makefile
+++ b/arch/mips/mips-boards/malta/Makefile
@@ -23,3 +23,5 @@ obj-y := malta_int.o malta_platform.o malta_setup.o
 
 obj-$(CONFIG_MTD) += malta_mtd.o
 obj-$(CONFIG_MIPS_MT_SMTC) += malta_smtc.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mips-boards/malta/malta_int.c
index c78d48349600..97aeb8c4e601 100644
--- a/arch/mips/mips-boards/malta/malta_int.c
+++ b/arch/mips/mips-boards/malta/malta_int.c
@@ -330,6 +330,18 @@ void __init arch_init_irq(void)
                         (0x100 << MIPSCPU_INT_I8259A));
                 setup_irq_smtc (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI,
                         &corehi_irqaction, (0x100 << MIPSCPU_INT_COREHI));
+                /*
+                 * Temporary hack to ensure that the subsidiary device
+                 * interrupts coing in via the i8259A, but associated
+                 * with low IRQ numbers, will restore the Status.IM
+                 * value associated with the i8259A.
+                 */
+                {
+                        int i;
+
+                        for (i = 0; i < 16; i++)
+                                irq_hwmask[i] = (0x100 << MIPSCPU_INT_I8259A);
+                }
 #else /* Not SMTC */
                 setup_irq (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq);
                 setup_irq (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, &corehi_irqaction);
diff --git a/arch/mips/mips-boards/malta/malta_smtc.c b/arch/mips/mips-boards/malta/malta_smtc.c
index d1c80f631100..0fb4c269901c 100644
--- a/arch/mips/mips-boards/malta/malta_smtc.c
+++ b/arch/mips/mips-boards/malta/malta_smtc.c
@@ -58,7 +58,7 @@ void prom_init_secondary(void)
  * but it may be multithreaded.
  */
 
-void plat_smp_setup(void)
+void __cpuinit plat_smp_setup(void)
 {
         if (read_c0_config3() & (1<<2))
                 mipsmt_build_cpu_map(0);
diff --git a/arch/mips/mips-boards/sead/Makefile b/arch/mips/mips-boards/sead/Makefile
index 224bb848f16b..3682fe217bd5 100644
--- a/arch/mips/mips-boards/sead/Makefile
+++ b/arch/mips/mips-boards/sead/Makefile
@@ -24,3 +24,5 @@
 #
 
 obj-y           := sead_int.o sead_setup.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/mipssim/Makefile b/arch/mips/mipssim/Makefile
index dc0bfda11427..75568b584df4 100644
--- a/arch/mips/mipssim/Makefile
+++ b/arch/mips/mipssim/Makefile
@@ -22,3 +22,5 @@ obj-y := sim_platform.o sim_setup.o sim_mem.o sim_time.o sim_int.o \
 
 obj-$(CONFIG_EARLY_PRINTK) += sim_console.o
 obj-$(CONFIG_SMP) += sim_smp.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/mipssim/sim_setup.c b/arch/mips/mipssim/sim_setup.c
index 17819b594105..d012719c4d24 100644
--- a/arch/mips/mipssim/sim_setup.c
+++ b/arch/mips/mipssim/sim_setup.c
@@ -22,7 +22,6 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/ioport.h>
-#include <linux/serial.h>
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile
index 19a0e544c4e9..43e4810dcaa8 100644
--- a/arch/mips/mm/Makefile
+++ b/arch/mips/mm/Makefile
@@ -32,3 +32,5 @@ obj-$(CONFIG_IP22_CPU_SCACHE)	+= sc-ip22.o
 obj-$(CONFIG_R5000_CPU_SCACHE)  += sc-r5k.o
 obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o
 obj-$(CONFIG_MIPS_CPU_SCACHE)   += sc-mips.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index be96231dccb6..bad571971bf6 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -23,6 +23,7 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/r4kcache.h>
+#include <asm/sections.h>
 #include <asm/system.h>
 #include <asm/mmu_context.h>
 #include <asm/war.h>
@@ -1010,7 +1011,6 @@ static void __init probe_pcache(void)
  */
 static int __init probe_scache(void)
 {
-        extern unsigned long stext;
         unsigned long flags, addr, begin, end, pow2;
         unsigned int config = read_c0_config();
         struct cpuinfo_mips *c = &current_cpu_data;
@@ -1019,7 +1019,7 @@ static int __init probe_scache(void)
         if (config & CONF_SC)
                 return 0;
 
-        begin = (unsigned long) &stext;
+        begin = (unsigned long) &_stext;
         begin &= ~((4 * 1024 * 1024) - 1);
         end = begin + (4 * 1024 * 1024);
 
diff --git a/arch/mips/oprofile/op_model_rm9000.c b/arch/mips/oprofile/op_model_rm9000.c
index 7dc9bf6f1321..d29040a56aea 100644
--- a/arch/mips/oprofile/op_model_rm9000.c
+++ b/arch/mips/oprofile/op_model_rm9000.c
@@ -83,6 +83,7 @@ static void rm9000_cpu_stop(void *args)
 static irqreturn_t rm9000_perfcount_handler(int irq, void * dev_id)
 {
         unsigned int control = read_c0_perfcontrol();
+        struct pt_regs *regs = get_irq_regs();
         uint32_t counter1, counter2;
         uint64_t counters;
 
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index c58bd3d036f4..4ee6800e67e6 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_MARKEINS)		+= ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o
 # These are still pretty much in the old state, watch, go blind.
 #
 obj-$(CONFIG_BASLER_EXCITE)     += ops-titan.o pci-excite.o fixup-excite.o
-obj-$(CONFIG_DDB5477)           += fixup-ddb5477.o pci-ddb5477.o ops-ddb5477.o
 obj-$(CONFIG_MIPS_ATLAS)        += fixup-atlas.o
 obj-$(CONFIG_MIPS_COBALT)       += fixup-cobalt.o
 obj-$(CONFIG_SOC_AU1500)        += fixup-au1000.o ops-au1000.o
@@ -27,7 +26,6 @@ obj-$(CONFIG_SOC_AU1550)	+= fixup-au1000.o ops-au1000.o
 obj-$(CONFIG_SOC_PNX8550)       += fixup-pnx8550.o ops-pnx8550.o
 obj-$(CONFIG_LEMOTE_FULONG)     += fixup-lm2e.o ops-bonito64.o
 obj-$(CONFIG_MIPS_MALTA)        += fixup-malta.o
-obj-$(CONFIG_MOMENCO_OCELOT)    += fixup-ocelot.o pci-ocelot.o
 obj-$(CONFIG_PMC_MSP7120_GW)    += fixup-pmcmsp.o ops-pmcmsp.o
 obj-$(CONFIG_PMC_MSP7120_EVAL)  += fixup-pmcmsp.o ops-pmcmsp.o
 obj-$(CONFIG_PMC_MSP7120_FPGA)  += fixup-pmcmsp.o ops-pmcmsp.o
diff --git a/arch/mips/pci/fixup-ddb5477.c b/arch/mips/pci/fixup-ddb5477.c
deleted file mode 100644
index 2f1444e60654..000000000000
--- a/arch/mips/pci/fixup-ddb5477.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *
- * BRIEF MODULE DESCRIPTION
- *      Board specific pci fixups.
- *
- * Copyright 2001, 2002, 2003 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- *  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  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-
-static void ddb5477_fixup(struct pci_dev *dev)
-{
-        u8 old;
-
-        printk(KERN_NOTICE "Enabling ALI M1533/35 PS2 keyboard/mouse.\n");
-        pci_read_config_byte(dev, 0x41, &old);
-        pci_write_config_byte(dev, 0x41, old | 0xd0);
-}
-
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533,
-          ddb5477_fixup);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1535,
-          ddb5477_fixup);
-
-/*
- * Fixup baseboard AMD chip so that tx does not underflow.
- *      bcr_18 |= 0x0800
- * This sets NOUFLO bit which makes tx not start until whole pkt
- * is fetched to the chip.
- */
-#define PCNET32_WIO_RDP         0x10
-#define PCNET32_WIO_RAP         0x12
-#define PCNET32_WIO_RESET       0x14
-#define PCNET32_WIO_BDP         0x16
-
-static void ddb5477_amd_lance_fixup(struct pci_dev *dev)
-{
-        unsigned long ioaddr;
-        u16 temp;
-
-        ioaddr = pci_resource_start(dev, 0);
-
-        inw(ioaddr + PCNET32_WIO_RESET);        /* reset chip */
-
-        /* bcr_18 |= 0x0800 */
-        outw(18, ioaddr + PCNET32_WIO_RAP);
-        temp = inw(ioaddr + PCNET32_WIO_BDP);
-        temp |= 0x0800;
-        outw(18, ioaddr + PCNET32_WIO_RAP);
-        outw(temp, ioaddr + PCNET32_WIO_BDP);
-}
-
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE,
-          ddb5477_amd_lance_fixup);
diff --git a/arch/mips/pci/fixup-ocelot.c b/arch/mips/pci/fixup-ocelot.c
deleted file mode 100644
index 99629bd047ce..000000000000
--- a/arch/mips/pci/fixup-ocelot.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * arch/mips/gt64120/momenco_ocelot/pci.c
- *     Board-specific PCI routines for gt64120 controller.
- *
- * 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/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <asm/pci.h>
-
-
-void __devinit pcibios_fixup_bus(struct pci_bus *bus)
-{
-        struct pci_bus *current_bus = bus;
-        struct pci_dev *devices;
-        struct list_head *devices_link;
-        u16 cmd;
-
-        list_for_each(devices_link, &(current_bus->devices)) {
-
-                devices = pci_dev_b(devices_link);
-                if (devices == NULL)
-                        continue;
-
-                if (PCI_SLOT(devices->devfn) == 1) {
-                        /*
-                         * Slot 1 is primary ether port, i82559
-                         * we double-check against that assumption
-                         */
-                        if ((devices->vendor != 0x8086) ||
-                            (devices->device != 0x1209)) {
-                                panic("pcibios_fixup_bus: found "
-                                     "unexpected PCI device in slot 1.");
-                        }
-                        devices->irq = 2;       /* irq_nr is 2 for INT0 */
-                } else if (PCI_SLOT(devices->devfn) == 2) {
-                        /*
-                         * Slot 2 is secondary ether port, i21143
-                         * we double-check against that assumption
-                         */
-                        if ((devices->vendor != 0x1011) ||
-                            (devices->device != 0x19)) {
-                                panic("galileo_pcibios_fixup_bus: "
-                                      "found unexpected PCI device in slot 2.");
-                        }
-                        devices->irq = 3;       /* irq_nr is 3 for INT1 */
-                } else if (PCI_SLOT(devices->devfn) == 4) {
-                        /* PMC Slot 1 */
-                        devices->irq = 8;       /* irq_nr is 8 for INT6 */
-                } else if (PCI_SLOT(devices->devfn) == 5) {
-                        /* PMC Slot 1 */
-                        devices->irq = 9;       /* irq_nr is 9 for INT7 */
-                } else {
-                        /* We don't have assign interrupts for other devices. */
-                        devices->irq = 0xff;
-                }
-
-                /* Assign an interrupt number for the device */
-                bus->ops->write_byte(devices, PCI_INTERRUPT_LINE,
-                                     devices->irq);
-
-                /* enable master */
-                bus->ops->read_word(devices, PCI_COMMAND, &cmd);
-                cmd |= PCI_COMMAND_MASTER;
-                bus->ops->write_word(devices, PCI_COMMAND, cmd);
-        }
-}
diff --git a/arch/mips/pci/fixup-rbtx4927.c b/arch/mips/pci/fixup-rbtx4927.c
index 3cdbecb8e714..7450c335b387 100644
--- a/arch/mips/pci/fixup-rbtx4927.c
+++ b/arch/mips/pci/fixup-rbtx4927.c
@@ -79,7 +79,7 @@ static unsigned char backplane_pci_irq[4][4] = {
                                      TX4927_IRQ_IOC_PCIC}
 };
 
-int pci_get_irq(struct pci_dev *dev, int pin)
+static int pci_get_irq(const struct pci_dev *dev, int pin)
 {
         unsigned char irq = pin;
 
diff --git a/arch/mips/pci/fixup-tx4938.c b/arch/mips/pci/fixup-tx4938.c
index 2485f47dfe6f..f2ba06ee0c10 100644
--- a/arch/mips/pci/fixup-tx4938.c
+++ b/arch/mips/pci/fixup-tx4938.c
@@ -18,7 +18,7 @@
 
 extern struct pci_controller tx4938_pci_controller[];
 
-int pci_get_irq(struct pci_dev *dev, int pin)
+static int pci_get_irq(const struct pci_dev *dev, int pin)
 {
         int irq = pin;
         u8 slot = PCI_SLOT(dev->devfn);
diff --git a/arch/mips/pci/ops-ddb5477.c b/arch/mips/pci/ops-ddb5477.c
deleted file mode 100644
index 8e57d4c5d90f..000000000000
--- a/arch/mips/pci/ops-ddb5477.c
+++ /dev/null
@@ -1,278 +0,0 @@
-/***********************************************************************
- * Copyright 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * arch/mips/ddb5xxx/ddb5477/pci_ops.c
- *     Define the pci_ops for DB5477.
- *
- * Much of the code is derived from the original DDB5074 port by
- * Geert Uytterhoeven <geert@sonycom.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.
- ***********************************************************************
- */
-
-/*
- * DDB5477 has two PCI channels, external PCI and IOPIC (internal)
- * Therefore we provide two sets of pci_ops.
- */
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-
-#include <asm/addrspace.h>
-#include <asm/debug.h>
-
-#include <asm/ddb5xxx/ddb5xxx.h>
-
-/*
- * config_swap structure records what set of pdar/pmr are used
- * to access pci config space.  It also provides a place hold the
- * original values for future restoring.
- */
-struct pci_config_swap {
-        u32 pdar;
-        u32 pmr;
-        u32 config_base;
-        u32 config_size;
-        u32 pdar_backup;
-        u32 pmr_backup;
-};
-
-/*
- * On DDB5477, we have two sets of swap registers, for ext PCI and IOPCI.
- */
-struct pci_config_swap ext_pci_swap = {
-        DDB_PCIW0,
-        DDB_PCIINIT00,
-        DDB_PCI0_CONFIG_BASE,
-        DDB_PCI0_CONFIG_SIZE
-};
-struct pci_config_swap io_pci_swap = {
-        DDB_IOPCIW0,
-        DDB_PCIINIT01,
-        DDB_PCI1_CONFIG_BASE,
-        DDB_PCI1_CONFIG_SIZE
-};
-
-
-/*
- * access config space
- */
-static inline u32 ddb_access_config_base(struct pci_config_swap *swap, u32 bus, /* 0 means top level bus */
-                                         u32 slot_num)
-{
-        u32 pci_addr = 0;
-        u32 pciinit_offset = 0;
-        u32 virt_addr;
-        u32 option;
-
-        /* minimum pdar (window) size is 2MB */
-        db_assert(swap->config_size >= (2 << 20));
-
-        db_assert(slot_num < (1 << 5));
-        db_assert(bus < (1 << 8));
-
-        /* backup registers */
-        swap->pdar_backup = ddb_in32(swap->pdar);
-        swap->pmr_backup = ddb_in32(swap->pmr);
-
-        /* set the pdar (pci window) register */
-        ddb_set_pdar(swap->pdar, swap->config_base, swap->config_size, 32,      /* 32 bit wide */
-                     0,         /* not on local memory bus */
-                     0);        /* not visible from PCI bus (N/A) */
-
-        /*
-         * calcuate the absolute pci config addr;
-         * according to the spec, we start scanning from adr:11 (0x800)
-         */
-        if (bus == 0) {
-                /* type 0 config */
-                pci_addr = 0x800 << slot_num;
-        } else {
-                /* type 1 config */
-                pci_addr = (bus << 16) | (slot_num << 11);
-        }
-
-        /*
-         * if pci_addr is less than pci config window size,  we set
-         * pciinit_offset to 0 and adjust the virt_address.
-         * Otherwise we will try to adjust pciinit_offset.
-         */
-        if (pci_addr < swap->config_size) {
-                virt_addr = KSEG1ADDR(swap->config_base + pci_addr);
-                pciinit_offset = 0;
-        } else {
-                db_assert((pci_addr & (swap->config_size - 1)) == 0);
-                virt_addr = KSEG1ADDR(swap->config_base);
-                pciinit_offset = pci_addr;
-        }
-
-        /* set the pmr register */
-        option = DDB_PCI_ACCESS_32;
-        if (bus != 0)
-                option |= DDB_PCI_CFGTYPE1;
-        ddb_set_pmr(swap->pmr, DDB_PCICMD_CFG, pciinit_offset, option);
-
-        return virt_addr;
-}
-
-static inline void ddb_close_config_base(struct pci_config_swap *swap)
-{
-        ddb_out32(swap->pdar, swap->pdar_backup);
-        ddb_out32(swap->pmr, swap->pmr_backup);
-}
-
-static int read_config_dword(struct pci_config_swap *swap,
-                             struct pci_bus *bus, u32 devfn, u32 where,
-                             u32 * val)
-{
-        u32 bus_num, slot_num, func_num;
-        u32 base;
-
-        db_assert((where & 3) == 0);
-        db_assert(where < (1 << 8));
-
-        /* check if the bus is top-level */
-        if (bus->parent != NULL) {
-                bus_num = bus->number;
-                db_assert(bus_num != 0);
-        } else {
-                bus_num = 0;
-        }
-
-        slot_num = PCI_SLOT(devfn);
-        func_num = PCI_FUNC(devfn);
-        base = ddb_access_config_base(swap, bus_num, slot_num);
-        *val = *(volatile u32 *) (base + (func_num << 8) + where);
-        ddb_close_config_base(swap);
-        return PCIBIOS_SUCCESSFUL;
-}
-
-static int read_config_word(struct pci_config_swap *swap,
-                            struct pci_bus *bus, u32 devfn, u32 where,
-                            u16 * val)
-{
-        int status;
-        u32 result;
-
-        db_assert((where & 1) == 0);
-
-        status = read_config_dword(swap, bus, devfn, where & ~3, &result);
-        if (where & 2)
-                result >>= 16;
-        *val = result & 0xffff;
-        return status;
-}
-
-static int read_config_byte(struct pci_config_swap *swap,
-                            struct pci_bus *bus, u32 devfn, u32 where,
-                            u8 * val)
-{
-        int status;
-        u32 result;
-
-        status = read_config_dword(swap, bus, devfn, where & ~3, &result);
-        if (where & 1)
-                result >>= 8;
-        if (where & 2)
-                result >>= 16;
-        *val = result & 0xff;
-
-        return status;
-}
-
-static int write_config_dword(struct pci_config_swap *swap,
-                              struct pci_bus *bus, u32 devfn, u32 where,
-                              u32 val)
-{
-        u32 bus_num, slot_num, func_num;
-        u32 base;
-
-        db_assert((where & 3) == 0);
-        db_assert(where < (1 << 8));
-
-        /* check if the bus is top-level */
-        if (bus->parent != NULL) {
-                bus_num = bus->number;
-                db_assert(bus_num != 0);
-        } else {
-                bus_num = 0;
-        }
-
-        slot_num = PCI_SLOT(devfn);
-        func_num = PCI_FUNC(devfn);
-        base = ddb_access_config_base(swap, bus_num, slot_num);
-        *(volatile u32 *) (base + (func_num << 8) + where) = val;
-        ddb_close_config_base(swap);
-        return PCIBIOS_SUCCESSFUL;
-}
-
-static int write_config_word(struct pci_config_swap *swap,
-                             struct pci_bus *bus, u32 devfn, u32 where, u16 val)
-{
-        int status, shift = 0;
-        u32 result;
-
-        db_assert((where & 1) == 0);
-
-        status = read_config_dword(swap, bus, devfn, where & ~3, &result);
-        if (status != PCIBIOS_SUCCESSFUL)
-                return status;
-
-        if (where & 2)
-                shift += 16;
-        result &= ~(0xffff << shift);
-        result |= val << shift;
-        return write_config_dword(swap, bus, devfn, where & ~3, result);
-}
-
-static int write_config_byte(struct pci_config_swap *swap,
-                             struct pci_bus *bus, u32 devfn, u32 where, u8 val)
-{
-        int status, shift = 0;
-        u32 result;
-
-        status = read_config_dword(swap, bus, devfn, where & ~3, &result);
-        if (status != PCIBIOS_SUCCESSFUL)
-                return status;
-
-        if (where & 2)
-                shift += 16;
-        if (where & 1)
-                shift += 8;
-        result &= ~(0xff << shift);
-        result |= val << shift;
-        return write_config_dword(swap, bus, devfn, where & ~3, result);
-}
-
-#define        MAKE_PCI_OPS(prefix, rw, pciswap, star) \
-static int prefix##_##rw##_config(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 star val) \
-{ \
-        if (size == 1) \
-                return rw##_config_byte(pciswap, bus, devfn, where, (u8 star)val); \
-        else if (size == 2) \
-                return rw##_config_word(pciswap, bus, devfn, where, (u16 star)val); \
-        /* Size must be 4 */ \
-        return rw##_config_dword(pciswap, bus, devfn, where, val); \
-}
-
-MAKE_PCI_OPS(extpci, read, &ext_pci_swap, *)
-MAKE_PCI_OPS(extpci, write, &ext_pci_swap,)
-
-MAKE_PCI_OPS(iopci, read, &io_pci_swap, *)
-MAKE_PCI_OPS(iopci, write, &io_pci_swap,)
-
-struct pci_ops ddb5477_ext_pci_ops = {
-        .read = extpci_read_config,
-        .write = extpci_write_config
-};
-
-
-struct pci_ops ddb5477_io_pci_ops = {
-        .read = iopci_read_config,
-        .write = iopci_write_config
-};
diff --git a/arch/mips/pci/ops-emma2rh.c b/arch/mips/pci/ops-emma2rh.c
index 38f181625e10..d31bfc6d4150 100644
--- a/arch/mips/pci/ops-emma2rh.c
+++ b/arch/mips/pci/ops-emma2rh.c
@@ -45,7 +45,7 @@ static int check_args(struct pci_bus *bus, u32 devfn, u32 * bus_num)
         /* check if the bus is top-level */
         if (bus->parent != NULL) {
                 *bus_num = bus->number;
-                db_assert(bus_num != 0);
+                db_assert(bus_num != NULL);
         } else
                 *bus_num = 0;
 
diff --git a/arch/mips/pci/ops-pnx8550.c b/arch/mips/pci/ops-pnx8550.c
index f556b7a8dccd..d61064652498 100644
--- a/arch/mips/pci/ops-pnx8550.c
+++ b/arch/mips/pci/ops-pnx8550.c
@@ -117,7 +117,7 @@ read_config_byte(struct pci_bus *bus, unsigned int devfn, int where, u8 * val)
         unsigned int data = 0;
         int err;
 
-        if (bus == 0)
+        if (bus == NULL)
                 return -1;
 
         err = config_access(PCI_CMD_CONFIG_READ, bus, devfn, where, ~(1 << (where & 3)), &data);
@@ -145,7 +145,7 @@ read_config_word(struct pci_bus *bus, unsigned int devfn, int where, u16 * val)
         unsigned int data = 0;
         int err;
 
-        if (bus == 0)
+        if (bus == NULL)
                 return -1;
 
         if (where & 0x01)
@@ -168,7 +168,7 @@ static int
 read_config_dword(struct pci_bus *bus, unsigned int devfn, int where, u32 * val)
 {
         int err;
-        if (bus == 0)
+        if (bus == NULL)
                 return -1;
 
         if (where & 0x03)
@@ -185,7 +185,7 @@ write_config_byte(struct pci_bus *bus, unsigned int devfn, int where, u8 val)
         unsigned int data = (unsigned int)val;
         int err;
 
-        if (bus == 0)
+        if (bus == NULL)
                 return -1;
 
         switch (where & 0x03) {
@@ -213,7 +213,7 @@ write_config_word(struct pci_bus *bus, unsigned int devfn, int where, u16 val)
         unsigned int data = (unsigned int)val;
         int err;
 
-        if (bus == 0)
+        if (bus == NULL)
                 return -1;
 
         if (where & 0x01)
@@ -235,7 +235,7 @@ static int
 write_config_dword(struct pci_bus *bus, unsigned int devfn, int where, u32 val)
 {
         int err;
-        if (bus == 0)
+        if (bus == NULL)
                 return -1;
 
         if (where & 0x03)
diff --git a/arch/mips/pci/pci-ddb5477.c b/arch/mips/pci/pci-ddb5477.c
deleted file mode 100644
index 7363e1877842..000000000000
--- a/arch/mips/pci/pci-ddb5477.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * PCI code for DDB5477.
- *
- * Copyright (C) 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.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/kernel.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-
-#include <asm/bootinfo.h>
-#include <asm/debug.h>
-
-#include <asm/ddb5xxx/ddb5xxx.h>
-
-static struct resource extpci_io_resource = {
-        .start  = DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + 0x4000,
-        .end    = DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI0_IO_SIZE - 1,
-        .name   = "ext pci IO space",
-        .flags  = IORESOURCE_IO
-};
-
-static struct resource extpci_mem_resource = {
-        .start  = DDB_PCI0_MEM_BASE + 0x100000,
-        .end    = DDB_PCI0_MEM_BASE + DDB_PCI0_MEM_SIZE - 1,
-        .name   = "ext pci memory space",
-        .flags  = IORESOURCE_MEM
-};
-
-static struct resource iopci_io_resource = {
-        .start  = DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE,
-        .end    = DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI1_IO_SIZE - 1,
-        .name   = "io pci IO space",
-        .flags  = IORESOURCE_IO
-};
-
-static struct resource iopci_mem_resource = {
-        .start  = DDB_PCI1_MEM_BASE,
-        .end    = DDB_PCI1_MEM_BASE + DDB_PCI1_MEM_SIZE - 1,
-        .name   = "ext pci memory space",
-        .flags  = IORESOURCE_MEM
-};
-
-extern struct pci_ops ddb5477_ext_pci_ops;
-extern struct pci_ops ddb5477_io_pci_ops;
-
-struct pci_controller ddb5477_ext_controller = {
-        .pci_ops        = &ddb5477_ext_pci_ops,
-        .io_resource    = &extpci_io_resource,
-        .mem_resource   = &extpci_mem_resource
-};
-
-struct pci_controller ddb5477_io_controller = {
-        .pci_ops        = &ddb5477_io_pci_ops,
-        .io_resource    = &iopci_io_resource,
-        .mem_resource   = &iopci_mem_resource
-};
-
-
-
-/*
- * we fix up irqs based on the slot number.
- * The first entry is at AD:11.
- * Fortunately this works because, although we have two pci buses,
- * they all have different slot numbers (except for rockhopper slot 20
- * which is handled below).
- *
- */
-
-/*
- * irq mapping : device -> pci int # -> vrc4377 irq# ,
- * ddb5477 board manual page 4  and vrc5477 manual page 46
- */
-
-/*
- * based on ddb5477 manual page 11
- */
-#define         MAX_SLOT_NUM            21
-static unsigned char irq_map[MAX_SLOT_NUM] = {
-        /* SLOT:  0, AD:11 */ 0xff,
-        /* SLOT:  1, AD:12 */ 0xff,
-        /* SLOT:  2, AD:13 */ 0xff,
-        /* SLOT:  3, AD:14 */ 0xff,
-        /* SLOT:  4, AD:15 */ VRC5477_IRQ_INTA, /* onboard tulip */
-        /* SLOT:  5, AD:16 */ VRC5477_IRQ_INTB, /* slot 1 */
-        /* SLOT:  6, AD:17 */ VRC5477_IRQ_INTC, /* slot 2 */
-        /* SLOT:  7, AD:18 */ VRC5477_IRQ_INTD, /* slot 3 */
-        /* SLOT:  8, AD:19 */ VRC5477_IRQ_INTE, /* slot 4 */
-        /* SLOT:  9, AD:20 */ 0xff,
-        /* SLOT: 10, AD:21 */ 0xff,
-        /* SLOT: 11, AD:22 */ 0xff,
-        /* SLOT: 12, AD:23 */ 0xff,
-        /* SLOT: 13, AD:24 */ 0xff,
-        /* SLOT: 14, AD:25 */ 0xff,
-        /* SLOT: 15, AD:26 */ 0xff,
-        /* SLOT: 16, AD:27 */ 0xff,
-        /* SLOT: 17, AD:28 */ 0xff,
-        /* SLOT: 18, AD:29 */ VRC5477_IRQ_IOPCI_INTC, /* vrc5477 ac97 */
-        /* SLOT: 19, AD:30 */ VRC5477_IRQ_IOPCI_INTB, /* vrc5477 usb peri */
-        /* SLOT: 20, AD:31 */ VRC5477_IRQ_IOPCI_INTA, /* vrc5477 usb host */
-};
-static unsigned char rockhopperII_irq_map[MAX_SLOT_NUM] = {
-        /* SLOT:  0, AD:11 */ 0xff,
-        /* SLOT:  1, AD:12 */ VRC5477_IRQ_INTB, /* onboard AMD PCNET */
-        /* SLOT:  2, AD:13 */ 0xff,
-        /* SLOT:  3, AD:14 */ 0xff,
-        /* SLOT:  4, AD:15 */ 14, /* M5229 ide ISA irq */
-        /* SLOT:  5, AD:16 */ VRC5477_IRQ_INTD, /* slot 3 */
-        /* SLOT:  6, AD:17 */ VRC5477_IRQ_INTA, /* slot 4 */
-        /* SLOT:  7, AD:18 */ VRC5477_IRQ_INTD, /* slot 5 */
-        /* SLOT:  8, AD:19 */ 0, /* M5457 modem nop */
-        /* SLOT:  9, AD:20 */ VRC5477_IRQ_INTA, /* slot 2 */
-        /* SLOT: 10, AD:21 */ 0xff,
-        /* SLOT: 11, AD:22 */ 0xff,
-        /* SLOT: 12, AD:23 */ 0xff,
-        /* SLOT: 13, AD:24 */ 0xff,
-        /* SLOT: 14, AD:25 */ 0xff,
-        /* SLOT: 15, AD:26 */ 0xff,
-        /* SLOT: 16, AD:27 */ 0xff,
-        /* SLOT: 17, AD:28 */ 0, /* M7101 PMU nop */
-        /* SLOT: 18, AD:29 */ VRC5477_IRQ_IOPCI_INTC, /* vrc5477 ac97 */
-        /* SLOT: 19, AD:30 */ VRC5477_IRQ_IOPCI_INTB, /* vrc5477 usb peri */
-        /* SLOT: 20, AD:31 */ VRC5477_IRQ_IOPCI_INTA, /* vrc5477 usb host */
-};
-
-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-        int slot_num;
-        unsigned char *slot_irq_map;
-        unsigned char irq;
-
-        /*
-         * We ignore the swizzled slot and pin values.  The original
-         * pci_fixup_irq() codes largely base irq number on the dev slot
-         * numbers because except for one case they are unique even
-         * though there are multiple pci buses.
-         */
-
-        if (mips_machtype == MACH_NEC_ROCKHOPPERII)
-                slot_irq_map = rockhopperII_irq_map;
-        else
-                slot_irq_map = irq_map;
-
-        slot_num = PCI_SLOT(dev->devfn);
-        irq = slot_irq_map[slot_num];
-
-        db_assert(slot_num < MAX_SLOT_NUM);
-
-        db_assert(irq != 0xff);
-
-        pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
-
-        if (mips_machtype == MACH_NEC_ROCKHOPPERII) {
-                /* hack to distinquish overlapping slot 20s, one
-                 * on bus 0 (ALI USB on the M1535 on the backplane),
-                 * and one on bus 2 (NEC USB controller on the CPU board)
-                 * Make the M1535 USB - ISA IRQ number 9.
-                 */
-                if (slot_num == 20 && dev->bus->number == 0) {
-                        pci_write_config_byte(dev,
-                                              PCI_INTERRUPT_LINE,
-                                              9);
-                        irq = 9;
-                }
-
-        }
-
-        return irq;
-}
-
-/* Do platform specific device initialization at pci_enable_device() time */
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-        return 0;
-}
-
-void ddb_pci_reset_bus(void)
-{
-        u32 temp;
-
-        /*
-         * I am not sure about the "official" procedure, the following
-         * steps work as far as I know:
-         * We first set PCI cold reset bit (bit 31) in PCICTRL-H.
-         * Then we clear the PCI warm reset bit (bit 30) to 0 in PCICTRL-H.
-         * The same is true for both PCI channels.
-         */
-        temp = ddb_in32(DDB_PCICTL0_H);
-        temp |= 0x80000000;
-        ddb_out32(DDB_PCICTL0_H, temp);
-        temp &= ~0xc0000000;
-        ddb_out32(DDB_PCICTL0_H, temp);
-
-        temp = ddb_in32(DDB_PCICTL1_H);
-        temp |= 0x80000000;
-        ddb_out32(DDB_PCICTL1_H, temp);
-        temp &= ~0xc0000000;
-        ddb_out32(DDB_PCICTL1_H, temp);
-}
diff --git a/arch/mips/pci/pci-ocelot.c b/arch/mips/pci/pci-ocelot.c
deleted file mode 100644
index 1421d34535ef..000000000000
--- a/arch/mips/pci/pci-ocelot.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * BRIEF MODULE DESCRIPTION
- * Galileo Evaluation Boards PCI support.
- *
- * The general-purpose functions to read/write and configure the GT64120A's
- * PCI registers (function names start with pci0 or pci1) are either direct
- * copies of functions written by Galileo Technology, or are modifications
- * of their functions to work with Linux 2.4 vs Linux 2.2.  These functions
- * are Copyright - Galileo Technology.
- *
- * Other functions are derived from other MIPS PCI implementations, or were
- * written by RidgeRun, Inc,  Copyright (C) 2000 RidgeRun, Inc.
- *   glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- *  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  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/cache.h>
-#include <asm/pci.h>
-#include <asm/io.h>
-#include <asm/gt64120.h>
-
-static inline unsigned int pci0ReadConfigReg(unsigned int offset)
-{
-        unsigned int DataForRegCf8;
-        unsigned int data;
-
-        DataForRegCf8 = ((PCI_SLOT(device->devfn) << 11) |
-                         (PCI_FUNC(device->devfn) << 8) |
-                         (offset & ~0x3)) | 0x80000000;
-        GT_WRITE(GT_PCI0_CFGADDR_OFS, DataForRegCf8);
-        GT_READ(GT_PCI0_CFGDATA_OFS, &data);
-
-        return data;
-}
-
-static inline void pci0WriteConfigReg(unsigned int offset, unsigned int data)
-{
-        unsigned int DataForRegCf8;
-
-        DataForRegCf8 = ((PCI_SLOT(device->devfn) << 11) |
-                         (PCI_FUNC(device->devfn) << 8) |
-                         (offset & ~0x3)) | 0x80000000;
-        GT_WRITE(GT_PCI0_CFGADDR_OFS, DataForRegCf8);
-        GT_WRITE(GT_PCI0_CFGDATA_OFS, data);
-}
-
-static struct resource ocelot_mem_resource = {
-        .start  = GT_PCI_MEM_BASE,
-        .end    = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1,
-};
-
-static struct resource ocelot_io_resource = {
-        .start  = GT_PCI_IO_BASE,
-        .end    = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1,
-};
-
-static struct pci_controller ocelot_pci_controller = {
-        .pci_ops        = gt64xxx_pci0_ops,
-        .mem_resource   = &ocelot_mem_resource,
-        .io_resource    = &ocelot_io_resource,
-};
-
-static int __init ocelot_pcibios_init(void)
-{
-        u32 tmp;
-
-        GT_READ(GT_PCI0_CMD_OFS, &tmp);
-        GT_READ(GT_PCI0_BARE_OFS, &tmp);
-
-        /*
-         * You have to enable bus mastering to configure any other
-         * card on the bus.
-         */
-        tmp = pci0ReadConfigReg(PCI_COMMAND);
-        tmp |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | PCI_COMMAND_SERR;
-        pci0WriteConfigReg(PCI_COMMAND, tmp);
-
-        register_pci_controller(&ocelot_pci_controller);
-}
-
-arch_initcall(ocelot_pcibios_init);
diff --git a/arch/mips/philips/pnx8550/common/Makefile b/arch/mips/philips/pnx8550/common/Makefile
index b7c638166e9f..31cc1a5cec3b 100644
--- a/arch/mips/philips/pnx8550/common/Makefile
+++ b/arch/mips/philips/pnx8550/common/Makefile
@@ -25,3 +25,5 @@
 obj-y := setup.o prom.o int.o reset.o time.o proc.o platform.o
 obj-$(CONFIG_PCI) += pci.o
 obj-$(CONFIG_KGDB) += gdb_hook.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/pmc-sierra/yosemite/Makefile b/arch/mips/pmc-sierra/yosemite/Makefile
index e931e0d44229..8fd9a04e3534 100644
--- a/arch/mips/pmc-sierra/yosemite/Makefile
+++ b/arch/mips/pmc-sierra/yosemite/Makefile
@@ -2,7 +2,9 @@
 # Makefile for the PMC-Sierra Titan
 #
 
-obj-y    += irq.o i2c-yosemite.o prom.o py-console.o setup.o
+obj-y    += irq.o prom.o py-console.o setup.o
 
 obj-$(CONFIG_KGDB)              += dbg_io.o
 obj-$(CONFIG_SMP)               += smp.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/pmc-sierra/yosemite/i2c-yosemite.c b/arch/mips/pmc-sierra/yosemite/i2c-yosemite.c
deleted file mode 100644
index 85b14c73c226..000000000000
--- a/arch/mips/pmc-sierra/yosemite/i2c-yosemite.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- *  Copyright (C) 2003 PMC-Sierra Inc.
- *  Author: Manish Lachwani (lachwani@pmc-sierra.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.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * Detailed Description:
- *
- * This block implements the I2C interface to the slave devices like the
- * Atmel 24C32 EEPROM and the MAX 1619 Sensors device. The I2C Master interface
- * can be controlled by the SCMB block. And the SCMB block kicks in only when
- * using the Ethernet Mode of operation and __not__ the SysAD mode
- *
- * The SCMB controls the two modes: MDIO and the I2C. The MDIO mode is used to
- * communicate with the Quad-PHY from Marvel. The I2C is used to communicate
- * with the I2C slave devices.  It seems that the driver does not explicitly
- * deal with the control of SDA and SCL serial lines. So, the driver will set
- * the slave address, drive the command and then the data.  The SCMB will then
- * control the two serial lines as required.
- *
- * It seems the documents are very unclear abt this. Hence, I took some time
- * out to write the desciption to have an idea of how the I2C can actually
- * work. Currently, this Linux driver wont be integrated into the generic Linux
- * I2C framework. And finally, the I2C interface is also known as the 2BI
- * interface. 2BI means 2-bit interface referring to SDA and SCL serial lines
- * respectively.
- *
- * - Manish Lachwani (12/09/2003)
- */
-
-#include "i2c-yosemite.h"
-
-/*
- * Poll the I2C interface for the BUSY bit.
- */
-static int titan_i2c_poll(void)
-{
-        int i = 0;
-        unsigned long val = 0;
-
-        for (i = 0; i < TITAN_I2C_MAX_POLL; i++) {
-                val = TITAN_I2C_READ(TITAN_I2C_COMMAND);
-
-                if (!(val & 0x8000))
-                        return 0;
-        }
-
-        return TITAN_I2C_ERR_TIMEOUT;
-}
-
-/*
- * Execute the I2C command
- */
-int titan_i2c_xfer(unsigned int slave_addr, titan_i2c_command * cmd,
-                   int size, unsigned int *addr)
-{
-        int loop, bytes = 0, i;
-        unsigned int *write_data, data, *read_data;
-        unsigned long reg_val, val;
-
-        write_data = cmd->data;
-        read_data = addr;
-
-        TITAN_I2C_WRITE(TITAN_I2C_SLAVE_ADDRESS, slave_addr);
-
-        if (cmd->type == TITAN_I2C_CMD_WRITE)
-                loop = cmd->write_size;
-        else
-                loop = size;
-
-        while (loop > 0) {
-                if ((cmd->type == TITAN_I2C_CMD_WRITE) ||
-                    (cmd->type == TITAN_I2C_CMD_READ_WRITE)) {
-
-                        reg_val = TITAN_I2C_DATA;
-                        for (i = 0; i < TITAN_I2C_MAX_WORDS_PER_RW;
-                             ++i, write_data += 2, reg_val += 4) {
-                                if (bytes < cmd->write_size) {
-                                        data = write_data[0];
-                                        ++data;
-                                }
-
-                                if (bytes < cmd->write_size) {
-                                        data = write_data[1];
-                                        ++data;
-                                }
-
-                                TITAN_I2C_WRITE(reg_val, data);
-                        }
-                }
-
-                TITAN_I2C_WRITE(TITAN_I2C_COMMAND,
-                                (unsigned int) (cmd->type << 13));
-                if (titan_i2c_poll() != TITAN_I2C_ERR_OK)
-                        return TITAN_I2C_ERR_TIMEOUT;
-
-                if ((cmd->type == TITAN_I2C_CMD_READ) ||
-                    (cmd->type == TITAN_I2C_CMD_READ_WRITE)) {
-
-                        reg_val = TITAN_I2C_DATA;
-                        for (i = 0; i < TITAN_I2C_MAX_WORDS_PER_RW;
-                             ++i, read_data += 2, reg_val += 4) {
-                                data = TITAN_I2C_READ(reg_val);
-
-                                if (bytes < size) {
-                                        read_data[0] = data & 0xff;
-                                        ++bytes;
-                                }
-
-                                if (bytes < size) {
-                                        read_data[1] =
-                                            ((data >> 8) & 0xff);
-                                        ++bytes;
-                                }
-                        }
-                }
-
-                loop -= (TITAN_I2C_MAX_WORDS_PER_RW * 2);
-        }
-
-        /*
-         * Read the Interrupt status and then return the appropriate error code
-         */
-
-        val = TITAN_I2C_READ(TITAN_I2C_INTERRUPTS);
-        if (val & 0x0020)
-                return TITAN_I2C_ERR_ARB_LOST;
-
-        if (val & 0x0040)
-                return TITAN_I2C_ERR_NO_RESP;
-
-        if (val & 0x0080)
-                return TITAN_I2C_ERR_DATA_COLLISION;
-
-        return TITAN_I2C_ERR_OK;
-}
-
-/*
- * Init the I2C subsystem of the PMC-Sierra Yosemite board
- */
-int titan_i2c_init(titan_i2c_config * config)
-{
-        unsigned int val;
-
-        /*
-         * Reset the SCMB and program into the I2C mode
-         */
-        TITAN_I2C_WRITE(TITAN_I2C_SCMB_CONTROL, 0xA000);
-        TITAN_I2C_WRITE(TITAN_I2C_SCMB_CONTROL, 0x2000);
-
-        /*
-         * Configure the filtera and clka values
-         */
-        val = TITAN_I2C_READ(TITAN_I2C_SCMB_CLOCK_A);
-        val |= ((val & ~(0xF000)) | ((config->filtera << 12) & 0xF000));
-        val |= ((val & ~(0x03FF)) | (config->clka & 0x03FF));
-        TITAN_I2C_WRITE(TITAN_I2C_SCMB_CLOCK_A, val);
-
-        /*
-         * Configure the filterb and clkb values
-         */
-        val = TITAN_I2C_READ(TITAN_I2C_SCMB_CLOCK_B);
-        val |= ((val & ~(0xF000)) | ((config->filterb << 12) & 0xF000));
-        val |= ((val & ~(0x03FF)) | (config->clkb & 0x03FF));
-        TITAN_I2C_WRITE(TITAN_I2C_SCMB_CLOCK_B, val);
-
-        return TITAN_I2C_ERR_OK;
-}
diff --git a/arch/mips/pmc-sierra/yosemite/irq.c b/arch/mips/pmc-sierra/yosemite/irq.c
index 428d1f45a287..4decc2807867 100644
--- a/arch/mips/pmc-sierra/yosemite/irq.c
+++ b/arch/mips/pmc-sierra/yosemite/irq.c
@@ -56,6 +56,9 @@
 #define HYPERTRANSPORT_INTC     0x7a            /* INTC# */
 #define HYPERTRANSPORT_INTD     0x7b            /* INTD# */
 
+extern void titan_mailbox_irq(void);
+
+#ifdef CONFIG_HYPERTRANSPORT
 /*
  * Handle hypertransport & SMP interrupts. The interrupt lines are scarce.
  * For interprocessor interrupts, the best thing to do is to use the INTMSG
@@ -107,6 +110,7 @@ static void ll_ht_smp_irq_handler(int irq)
 
         do_IRQ(irq);
 }
+#endif
 
 asmlinkage void plat_irq_dispatch(void)
 {
diff --git a/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c
index 1e1685e415a4..0cd78f0f5f2d 100644
--- a/arch/mips/pmc-sierra/yosemite/prom.c
+++ b/arch/mips/pmc-sierra/yosemite/prom.c
@@ -34,7 +34,7 @@ extern void prom_grab_secondary(void);
 struct callvectors *debug_vectors;
 
 extern unsigned long yosemite_base;
-extern unsigned long cpu_clock;
+extern unsigned long cpu_clock_freq;
 
 const char *get_system_type(void)
 {
@@ -119,7 +119,7 @@ void __init prom_init(void)
                                           16);
 
                 if (strncmp("cpuclock", *env, strlen("cpuclock")) == 0)
-                        cpu_clock =
+                        cpu_clock_freq =
                             simple_strtol(*env + strlen("cpuclock="), NULL,
                                           10);
 
diff --git a/arch/mips/pmc-sierra/yosemite/setup.c b/arch/mips/pmc-sierra/yosemite/setup.c
index f7f93ae24c34..58862c8d1d00 100644
--- a/arch/mips/pmc-sierra/yosemite/setup.c
+++ b/arch/mips/pmc-sierra/yosemite/setup.c
@@ -59,7 +59,7 @@ unsigned char titan_ge_mac_addr_base[6] = {
         0x00, 0xe0, 0x04, 0x00, 0x00, 0x21
 };
 
-unsigned long cpu_clock;
+unsigned long cpu_clock_freq;
 unsigned long yosemite_base;
 
 static struct m48t37_rtc *m48t37_base;
@@ -140,7 +140,7 @@ void __init plat_timer_setup(struct irqaction *irq)
 
 void yosemite_time_init(void)
 {
-        mips_hpt_frequency = cpu_clock / 2;
+        mips_hpt_frequency = cpu_clock_freq / 2;
 mips_hpt_frequency = 33000000 * 3 * 5;
 }
 
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c
index d83c4ada14f3..1c852d6a7654 100644
--- a/arch/mips/pmc-sierra/yosemite/smp.c
+++ b/arch/mips/pmc-sierra/yosemite/smp.c
@@ -106,23 +106,28 @@ void prom_smp_finish(void)
 {
 }
 
-asmlinkage void titan_mailbox_irq(void)
+void titan_mailbox_irq(void)
 {
         int cpu = smp_processor_id();
         unsigned long status;
 
-        if (cpu == 0) {
+        switch (cpu) {
+        case 0:
                 status = OCD_READ(RM9000x2_OCD_INTP0STATUS3);
                 OCD_WRITE(RM9000x2_OCD_INTP0CLEAR3, status);
-        }
 
-        if (cpu == 1) {
+                if (status & 0x2)
+                        smp_call_function_interrupt();
+                break;
+
+        case 1:
                 status = OCD_READ(RM9000x2_OCD_INTP1STATUS3);
                 OCD_WRITE(RM9000x2_OCD_INTP1CLEAR3, status);
-        }
 
-        if (status & 0x2)
-                smp_call_function_interrupt();
+                if (status & 0x2)
+                        smp_call_function_interrupt();
+                break;
+        }
 }
 
 /*
diff --git a/arch/mips/qemu/Makefile b/arch/mips/qemu/Makefile
index 078cd3029c9f..cec24c117f6e 100644
--- a/arch/mips/qemu/Makefile
+++ b/arch/mips/qemu/Makefile
@@ -5,3 +5,5 @@
 obj-y           = q-firmware.o q-irq.o q-mem.o q-setup.o q-reset.o
 
 obj-$(CONFIG_SMP) += q-smp.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/sgi-ip27/Makefile b/arch/mips/sgi-ip27/Makefile
index 7ce76e20beb9..e0a6871d56e4 100644
--- a/arch/mips/sgi-ip27/Makefile
+++ b/arch/mips/sgi-ip27/Makefile
@@ -9,3 +9,5 @@ obj-y	:= ip27-berr.o ip27-irq.o ip27-init.o ip27-klconfig.o ip27-klnuma.o \
 obj-$(CONFIG_EARLY_PRINTK)      += ip27-console.o
 obj-$(CONFIG_KGDB)              += ip27-dbgio.o
 obj-$(CONFIG_SMP)               += ip27-smp.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/sgi-ip27/ip27-klnuma.c b/arch/mips/sgi-ip27/ip27-klnuma.c
index f9f404a8ddad..f10d9839006d 100644
--- a/arch/mips/sgi-ip27/ip27-klnuma.c
+++ b/arch/mips/sgi-ip27/ip27-klnuma.c
@@ -28,8 +28,6 @@ static cpumask_t ktext_repmask;
  */
 void __init setup_replication_mask(void)
 {
-        cnodeid_t       cnode;
-
         /* Set only the master cnode's bit.  The master cnode is always 0. */
         cpus_clear(ktext_repmask);
         cpu_set(0, ktext_repmask);
@@ -38,11 +36,15 @@ void __init setup_replication_mask(void)
 #ifndef CONFIG_MAPPED_KERNEL
 #error Kernel replication works with mapped kernel support. No calias support.
 #endif
-        for_each_online_node(cnode) {
-                if (cnode == 0)
-                        continue;
-                /* Advertise that we have a copy of the kernel */
-                cpu_set(cnode, ktext_repmask);
+        {
+                cnodeid_t       cnode;
+
+                for_each_online_node(cnode) {
+                        if (cnode == 0)
+                                continue;
+                        /* Advertise that we have a copy of the kernel */
+                        cpu_set(cnode, ktext_repmask);
+                }
         }
 #endif
         /* Set up a GDA pointer to the replication mask. */
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index 09fa7f5216f0..08e79141b47c 100644
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
@@ -181,7 +181,7 @@ void __init prom_boot_secondary(int cpu, struct task_struct *idle)
                 0, (void *) sp, (void *) gp);
 }
 
-void prom_init_secondary(void)
+void __cpuinit prom_init_secondary(void)
 {
         per_cpu_init();
         local_irq_enable();
diff --git a/arch/mips/sgi-ip32/Makefile b/arch/mips/sgi-ip32/Makefile
index 60f0227425e7..31c9aa1bcb40 100644
--- a/arch/mips/sgi-ip32/Makefile
+++ b/arch/mips/sgi-ip32/Makefile
@@ -5,3 +5,5 @@
 
 obj-y   += ip32-berr.o ip32-irq.o ip32-platform.o ip32-setup.o ip32-reset.o \
            crime.o ip32-memory.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/sgi-ip32/ip32-reset.c b/arch/mips/sgi-ip32/ip32-reset.c
index db8084411538..624bbdbff2a8 100644
--- a/arch/mips/sgi-ip32/ip32-reset.c
+++ b/arch/mips/sgi-ip32/ip32-reset.c
@@ -195,7 +195,8 @@ static __init int ip32_reboot_setup(void)
         blink_timer.function = blink_timeout;
         atomic_notifier_chain_register(&panic_notifier_list, &panic_block);
 
-        request_irq(MACEISA_RTC_IRQ, ip32_rtc_int, 0, "rtc", NULL);
+        if (request_irq(MACEISA_RTC_IRQ, ip32_rtc_int, 0, "rtc", NULL))
+                panic("Can't allocate MACEISA RTC IRQ");
 
         return 0;
 }
diff --git a/arch/mips/sibyte/bcm1480/Makefile b/arch/mips/sibyte/bcm1480/Makefile
index cdc4c56c3e29..f292f7df0cfb 100644
--- a/arch/mips/sibyte/bcm1480/Makefile
+++ b/arch/mips/sibyte/bcm1480/Makefile
@@ -1,3 +1,5 @@
 obj-y := setup.o irq.o time.o
 
 obj-$(CONFIG_SMP)                       += smp.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/sibyte/bcm1480/setup.c b/arch/mips/sibyte/bcm1480/setup.c
index 89f29233cae1..bb28f28e8042 100644
--- a/arch/mips/sibyte/bcm1480/setup.c
+++ b/arch/mips/sibyte/bcm1480/setup.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/reboot.h>
 #include <linux/string.h>
 
diff --git a/arch/mips/sibyte/common/Makefile b/arch/mips/sibyte/common/Makefile
index 8a06a4fb5212..f8ae30066a05 100644
--- a/arch/mips/sibyte/common/Makefile
+++ b/arch/mips/sibyte/common/Makefile
@@ -3,3 +3,4 @@ obj-y :=
 obj-$(CONFIG_SIBYTE_TBPROF)             += sb_tbprof.o
 
 EXTRA_AFLAGS := $(CFLAGS)
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/sibyte/sb1250/Makefile b/arch/mips/sibyte/sb1250/Makefile
index df662c61473a..697793783a25 100644
--- a/arch/mips/sibyte/sb1250/Makefile
+++ b/arch/mips/sibyte/sb1250/Makefile
@@ -3,3 +3,5 @@ obj-y := setup.o irq.o time.o
 obj-$(CONFIG_SMP)                       += smp.o
 obj-$(CONFIG_SIBYTE_STANDALONE)         += prom.o
 obj-$(CONFIG_SIBYTE_BUS_WATCHER)        += bus_watcher.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/sni/Makefile b/arch/mips/sni/Makefile
index 471418e4f446..3a99cd62c0bd 100644
--- a/arch/mips/sni/Makefile
+++ b/arch/mips/sni/Makefile
@@ -4,3 +4,5 @@
 
 obj-y += irq.o reset.o setup.o a20r.o rm200.o pcimt.o pcit.o time.o
 obj-$(CONFIG_CPU_BIG_ENDIAN) += sniprom.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/tx4927/common/tx4927_irq.c
index 3d25d010f3d5..00b0b975f349 100644
--- a/arch/mips/tx4927/common/tx4927_irq.c
+++ b/arch/mips/tx4927/common/tx4927_irq.c
@@ -43,6 +43,9 @@
 #include <asm/mipsregs.h>
 #include <asm/system.h>
 #include <asm/tx4927/tx4927.h>
+#ifdef CONFIG_TOSHIBA_RBTX4927
+#include <asm/tx4927/toshiba_rbtx4927.h>
+#endif
 
 /*
  * DEBUG
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
index 5cc30c10e746..e265fcd31b60 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
@@ -262,8 +262,6 @@ u32 bit2num(u32 num)
 int toshiba_rbtx4927_irq_nested(int sw_irq)
 {
         u32 level3;
-        u32 level4;
-        u32 level5;
 
         level3 = reg_rd08(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f;
         if (level3) {
@@ -275,6 +273,8 @@ int toshiba_rbtx4927_irq_nested(int sw_irq)
 #ifdef CONFIG_TOSHIBA_FPCIB0
         {
                 if (tx4927_using_backplane) {
+                        u32 level4;
+                        u32 level5;
                         outb(0x0A, 0x20);
                         level4 = inb(0x20) & 0xff;
                         if (level4) {
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
index ab72292a172e..ea5a70b252a0 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
@@ -159,58 +159,6 @@ int tx4927_pci66 = 0;		/* 0:auto */
 char *toshiba_name = "";
 
 #ifdef CONFIG_PCI
-static void tx4927_pcierr_interrupt(int irq, void *dev_id)
-{
-#ifdef CONFIG_BLK_DEV_IDEPCI
-        /* ignore MasterAbort for ide probing... */
-        if (irq == TX4927_IRQ_IRC_PCIERR &&
-            ((tx4927_pcicptr->pcistatus >> 16) & 0xf900) ==
-            PCI_STATUS_REC_MASTER_ABORT) {
-                tx4927_pcicptr->pcistatus =
-                    (tx4927_pcicptr->
-                     pcistatus & 0x0000ffff) | (PCI_STATUS_REC_MASTER_ABORT
-                                                << 16);
-
-                return;
-        }
-#endif
-        printk("PCI error interrupt (irq 0x%x).\n", irq);
-
-        printk("pcistat:%04x, g2pstatus:%08lx, pcicstatus:%08lx\n",
-               (unsigned short) (tx4927_pcicptr->pcistatus >> 16),
-               tx4927_pcicptr->g2pstatus, tx4927_pcicptr->pcicstatus);
-        printk("ccfg:%08lx, tear:%02lx_%08lx\n",
-               (unsigned long) tx4927_ccfgptr->ccfg,
-               (unsigned long) (tx4927_ccfgptr->tear >> 32),
-               (unsigned long) tx4927_ccfgptr->tear);
-        show_regs(get_irq_regs());
-}
-
-void __init toshiba_rbtx4927_pci_irq_init(void)
-{
-        return;
-}
-
-void tx4927_reset_pci_pcic(void)
-{
-        /* Reset PCI Bus */
-        *tx4927_pcireset_ptr = 1;
-        /* Reset PCIC */
-        tx4927_ccfgptr->clkctr |= TX4927_CLKCTR_PCIRST;
-        udelay(10000);
-        /* clear PCIC reset */
-        tx4927_ccfgptr->clkctr &= ~TX4927_CLKCTR_PCIRST;
-        *tx4927_pcireset_ptr = 0;
-}
-#endif /* CONFIG_PCI */
-
-#ifdef CONFIG_PCI
-void print_pci_status(void)
-{
-        printk("PCI STATUS %lx\n", tx4927_pcicptr->pcistatus);
-        printk("PCIC STATUS %lx\n", tx4927_pcicptr->pcicstatus);
-}
-
 extern struct pci_controller tx4927_controller;
 
 static struct pci_dev *fake_pci_dev(struct pci_controller *hose,
@@ -239,10 +187,8 @@ static int early_##rw##_config_##size(struct pci_controller *hose,      \
 }
 
 EARLY_PCI_OP(read, byte, u8 *)
-EARLY_PCI_OP(read, word, u16 *)
 EARLY_PCI_OP(read, dword, u32 *)
 EARLY_PCI_OP(write, byte, u8)
-EARLY_PCI_OP(write, word, u16)
 EARLY_PCI_OP(write, dword, u32)
 
 static int __init tx4927_pcibios_init(void)
@@ -269,7 +215,9 @@ static int __init tx4927_pcibios_init(void)
                         u8 v08_64;
                         u32 v32_b0;
                         u8 v08_e1;
+#ifdef TOSHIBA_RBTX4927_SETUP_DEBUG
                         char *s = " sb/isa --";
+#endif
 
                         TOSHIBA_RBTX4927_SETUP_DPRINTK
                             (TOSHIBA_RBTX4927_SETUP_PCIBIOS, ":%s beg\n",
@@ -354,7 +302,9 @@ static int __init tx4927_pcibios_init(void)
                         u8 v08_41;
                         u8 v08_43;
                         u8 v08_5c;
+#ifdef TOSHIBA_RBTX4927_SETUP_DEBUG
                         char *s = " sb/ide --";
+#endif
 
                         TOSHIBA_RBTX4927_SETUP_DPRINTK
                             (TOSHIBA_RBTX4927_SETUP_PCIBIOS, ":%s beg\n",
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
index 6ed39a5aea72..f9ad482749e4 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
@@ -657,7 +657,7 @@ void __init tx4938_board_setup(void)
 
         /* clocks */
         if (txx9_master_clock) {
-                /* calculate gbus_clock and cpu_clock from master_clock */
+                /* calculate gbus_clock and cpu_clock_freq from master_clock */
                 divmode = (unsigned long)tx4938_ccfgptr->ccfg & TX4938_CCFG_DIVMODE_MASK;
                 switch (divmode) {
                 case TX4938_CCFG_DIVMODE_8:
@@ -691,7 +691,7 @@ void __init tx4938_board_setup(void)
                 if (txx9_cpu_clock == 0) {
                         txx9_cpu_clock = 300000000;     /* 300MHz */
                 }
-                /* calculate gbus_clock and master_clock from cpu_clock */
+                /* calculate gbus_clock and master_clock from cpu_clock_freq */
                 cpuclk = txx9_cpu_clock;
                 divmode = (unsigned long)tx4938_ccfgptr->ccfg & TX4938_CCFG_DIVMODE_MASK;
                 switch (divmode) {
diff --git a/arch/mips/vr41xx/common/Makefile b/arch/mips/vr41xx/common/Makefile
index d0d84ec8d63d..7d5d83b8c582 100644
--- a/arch/mips/vr41xx/common/Makefile
+++ b/arch/mips/vr41xx/common/Makefile
@@ -3,3 +3,5 @@
 #
 
 obj-y   += bcu.o cmu.o giu.o icu.o init.o irq.o pmu.o rtc.o siu.o type.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index 699d0df574d5..5300b50cdc2f 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -207,6 +207,12 @@
                         interrupt-parent = <&/mv64x60/pic>;
                 };
 
+                wdt@b410 {                      /* watchdog timer */
+                        compatible = "marvell,mv64x60-wdt";
+                        reg = <b410 8>;
+                        timeout = <a>;          /* wdt timeout in seconds */
+                };
+
                 i2c@c000 {
                         device_type = "i2c";
                         compatible = "marvell,mv64x60-i2c";
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 2b66d53dcc55..9ef28da2c7fe 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -546,7 +546,6 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
         rfid
         b       .       /* prevent speculative execution */
 
-/* Note: this must change if we start using the TIF_NOTIFY_RESUME bit */
 do_work:
 #ifdef CONFIG_PREEMPT
         andi.   r0,r3,MSR_PR    /* Returning to user mode? */
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index b618fa60aef3..548a32082e4a 100644
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -390,6 +390,61 @@ error:
         return err;
 }
 
+/*
+ * Create mv64x60_wdt platform devices
+ */
+static int __init mv64x60_wdt_device_setup(struct device_node *np, int id)
+{
+        struct resource r;
+        struct platform_device *pdev;
+        struct mv64x60_wdt_pdata pdata;
+        const unsigned int *prop;
+        int err;
+
+        err = of_address_to_resource(np, 0, &r);
+        if (err)
+                return err;
+
+        memset(&pdata, 0, sizeof(pdata));
+
+        prop = of_get_property(np, "timeout", NULL);
+        if (!prop)
+                return -ENODEV;
+        pdata.timeout = *prop;
+
+        np = of_get_parent(np);
+        if (!np)
+                return -ENODEV;
+
+        prop = of_get_property(np, "clock-frequency", NULL);
+        of_node_put(np);
+        if (!prop)
+                return -ENODEV;
+        pdata.bus_clk = *prop / 1000000; /* wdt driver wants freq in MHz */
+
+        pdev = platform_device_alloc(MV64x60_WDT_NAME, id);
+        if (!pdev)
+                return -ENOMEM;
+
+        err = platform_device_add_resources(pdev, &r, 1);
+        if (err)
+                goto error;
+
+        err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
+        if (err)
+                goto error;
+
+        err = platform_device_add(pdev);
+        if (err)
+                goto error;
+
+        return 0;
+
+error:
+        platform_device_put(pdev);
+        return err;
+}
+
 static int __init mv64x60_device_setup(void)
 {
         struct device_node *np = NULL;
@@ -414,6 +469,15 @@ static int __init mv64x60_device_setup(void)
                 if ((err = mv64x60_i2c_device_setup(np, id)))
                         goto error;
 
+        /* support up to one watchdog timer */
+        np = of_find_compatible_node(np, NULL, "marvell,mv64x60-wdt");
+        if (np) {
+                if ((err = mv64x60_wdt_device_setup(np, id)))
+                        goto error;
+                of_node_put(np);
+        }
+
+
         return 0;
 
 error:
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c
index d212b1c418a9..2744b8a6f66a 100644
--- a/arch/ppc/syslib/mv64x60.c
+++ b/arch/ppc/syslib/mv64x60.c
@@ -441,6 +441,32 @@ static struct platform_device i2c_device = {
 };
 #endif
 
+#ifdef CONFIG_WATCHDOG
+static struct mv64x60_wdt_pdata mv64x60_wdt_pdata = {
+        .timeout                = 10,  /* default watchdog expiry in seconds */
+        .bus_clk                = 133, /* default bus clock in MHz */
+};
+
+static struct resource mv64x60_wdt_resources[] = {
+        [0] = {
+                .name   = "mv64x60 wdt base",
+                .start  = MV64x60_WDT_WDC,
+                .end    = MV64x60_WDT_WDC + 8 - 1, /* two 32-bit registers */
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device wdt_device = {
+        .name           = MV64x60_WDT_NAME,
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(mv64x60_wdt_resources),
+        .resource       = mv64x60_wdt_resources,
+        .dev = {
+                .platform_data = &mv64x60_wdt_pdata,
+        },
+};
+#endif
+
 #if defined(CONFIG_SYSFS) && !defined(CONFIG_GT64260)
 static struct mv64xxx_pdata mv64xxx_pdata = {
         .hs_reg_valid   = 0,
@@ -476,6 +502,9 @@ static struct platform_device *mv64x60_pd_devs[] __initdata = {
 #ifdef  CONFIG_I2C_MV64XXX
         &i2c_device,
 #endif
+#ifdef  CONFIG_MV64X60_WDT
+        &wdt_device,
+#endif
 #if defined(CONFIG_SYSFS) && !defined(CONFIG_GT64260)
         &mv64xxx_device,
 #endif
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index f87f429e0b24..54878f07cf0c 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -90,6 +90,9 @@ config ARCH_HAS_ILOG2_U64
         bool
         default n
 
+config ARCH_NO_VIRT_TO_BUS
+        def_bool y
+
 source "init/Kconfig"
 
 menu "System type"
@@ -134,8 +137,8 @@ config SH_FPU_EMU
 
 config SH_DSP
         bool "DSP support"
-        default y if SH4AL_DSP || !CPU_SH4
-        default n
+        depends on CPU_HAS_DSP
+        default y
         help
           Selecting this option will enable support for SH processors that
           have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
@@ -172,9 +175,6 @@ config SPECULATIVE_EXECUTION
 config CPU_HAS_INTEVT
         bool
 
-config CPU_HAS_PINT_IRQ
-        bool
-
 config CPU_HAS_MASKREG_IRQ
         bool
 
@@ -202,6 +202,9 @@ config CPU_HAS_SR_RB
 config CPU_HAS_PTEA
         bool
 
+config CPU_HAS_DSP
+        bool
+
 endmenu
 
 menu "Board support"
@@ -261,14 +264,6 @@ config SH_7780_SOLUTION_ENGINE
           Select 7780 SolutionEngine if configuring for a Renesas SH7780
           evaluation board.
 
-config SH_7300_SOLUTION_ENGINE
-        bool "SolutionEngine7300"
-        select SOLUTION_ENGINE
-        depends on CPU_SUBTYPE_SH7300
-        help
-          Select 7300 SolutionEngine if configuring for a Hitachi
-          SH7300(SH-Mobile V) evaluation board.
-
 config SH_7343_SOLUTION_ENGINE
         bool "SolutionEngine7343"
         select SOLUTION_ENGINE
@@ -277,14 +272,6 @@ config SH_7343_SOLUTION_ENGINE
           Select 7343 SolutionEngine if configuring for a Hitachi
           SH7343 (SH-Mobile 3AS) evaluation board.
 
-config SH_73180_SOLUTION_ENGINE
-        bool "SolutionEngine73180"
-        select SOLUTION_ENGINE
-        depends on CPU_SUBTYPE_SH73180
-        help
-          Select 73180 SolutionEngine if configuring for a Hitachi
-          SH73180(SH-Mobile 3) evaluation board.
-
 config SH_7751_SYSTEMH
         bool "SystemH7751R"
         depends on CPU_SUBTYPE_SH7751R
@@ -448,10 +435,10 @@ config SH_TIMER_IRQ
 
 config SH_PCLK_FREQ
         int "Peripheral clock frequency (in Hz)"
-        default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343
+        default "27000000" if CPU_SUBTYPE_SH7343
         default "31250000" if CPU_SUBTYPE_SH7619
         default "32000000" if CPU_SUBTYPE_SH7722
-        default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || \
+        default "33333333" if CPU_SUBTYPE_SH7770 || \
                               CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705 || \
                               CPU_SUBTYPE_SH7206
         default "60000000" if CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 0016609d1eba..3d211aa33cd8 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -91,9 +91,7 @@ machdir-$(CONFIG_SH_SOLUTION_ENGINE)		+= se/770x
 machdir-$(CONFIG_SH_7722_SOLUTION_ENGINE)       += se/7722
 machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)       += se/7751
 machdir-$(CONFIG_SH_7780_SOLUTION_ENGINE)       += se/7780
-machdir-$(CONFIG_SH_7300_SOLUTION_ENGINE)       += se/7300
 machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE)       += se/7343
-machdir-$(CONFIG_SH_73180_SOLUTION_ENGINE)      += se/73180
 machdir-$(CONFIG_SH_HP6XX)                      += hp6xx
 machdir-$(CONFIG_SH_DREAMCAST)                  += dreamcast
 machdir-$(CONFIG_SH_MPC1211)                    += mpc1211
diff --git a/arch/sh/boards/se/7300/Makefile b/arch/sh/boards/se/7300/Makefile
deleted file mode 100644
index 46247368f14b..000000000000
--- a/arch/sh/boards/se/7300/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the 7300 SolutionEngine specific parts of the kernel
-#
-
-obj-y    := setup.o io.o irq.o
diff --git a/arch/sh/boards/se/7300/io.c b/arch/sh/boards/se/7300/io.c
deleted file mode 100644
index 8a03d7a52a7c..000000000000
--- a/arch/sh/boards/se/7300/io.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * arch/sh/boards/se/7300/io.c
- *
- * Copyright (C) 2003 YOSHII Takashi <yoshii-takashi@hitachi-ul.co.jp>
- * Based on arch/sh/kernel/io_shmse.c
- *
- * I/O routine for SH-Mobile3 73180 SolutionEngine.
- *
- */
-
-#include <linux/kernel.h>
-#include <asm/io.h>
-#include <asm/se7300.h>
-
-#define badio(fn, a) panic("bad i/o operation %s for %08lx.", #fn, a)
-
-struct iop {
-        unsigned long start, end;
-        unsigned long base;
-        struct iop *(*check) (struct iop * p, unsigned long port);
-        unsigned char (*inb) (struct iop * p, unsigned long port);
-        unsigned short (*inw) (struct iop * p, unsigned long port);
-        void (*outb) (struct iop * p, unsigned char value, unsigned long port);
-        void (*outw) (struct iop * p, unsigned short value, unsigned long port);
-};
-
-struct iop *
-simple_check(struct iop *p, unsigned long port)
-{
-        if ((p->start <= port) && (port <= p->end))
-                return p;
-        else
-                badio(check, port);
-}
-
-struct iop *
-ide_check(struct iop *p, unsigned long port)
-{
-        if (((0x1f0 <= port) && (port <= 0x1f7)) || (port == 0x3f7))
-                return p;
-        return NULL;
-}
-
-unsigned char
-simple_inb(struct iop *p, unsigned long port)
-{
-        return *(unsigned char *) (p->base + port);
-}
-
-unsigned short
-simple_inw(struct iop *p, unsigned long port)
-{
-        return *(unsigned short *) (p->base + port);
-}
-
-void
-simple_outb(struct iop *p, unsigned char value, unsigned long port)
-{
-        *(unsigned char *) (p->base + port) = value;
-}
-
-void
-simple_outw(struct iop *p, unsigned short value, unsigned long port)
-{
-        *(unsigned short *) (p->base + port) = value;
-}
-
-unsigned char
-pcc_inb(struct iop *p, unsigned long port)
-{
-        unsigned long addr = p->base + port + 0x40000;
-        unsigned long v;
-
-        if (port & 1)
-                addr += 0x00400000;
-        v = *(volatile unsigned char *) addr;
-        return v;
-}
-
-void
-pcc_outb(struct iop *p, unsigned char value, unsigned long port)
-{
-        unsigned long addr = p->base + port + 0x40000;
-
-        if (port & 1)
-                addr += 0x00400000;
-        *(volatile unsigned char *) addr = value;
-}
-
-unsigned char
-bad_inb(struct iop *p, unsigned long port)
-{
-        badio(inb, port);
-}
-
-void
-bad_outb(struct iop *p, unsigned char value, unsigned long port)
-{
-        badio(inw, port);
-}
-
-#ifdef CONFIG_SMC91X
-/* MSTLANEX01 LAN at 0xb400:0000 */
-static struct iop laniop = {
-        .start = 0x300,
-        .end = 0x30f,
-        .base = 0xb4000000,
-        .check = simple_check,
-        .inb = simple_inb,
-        .inw = simple_inw,
-        .outb = simple_outb,
-        .outw = simple_outw,
-};
-#endif
-
-/* NE2000 pc card NIC */
-static struct iop neiop = {
-        .start = 0x280,
-        .end = 0x29f,
-        .base = 0xb0600000 + 0x80,      /* soft 0x280 -> hard 0x300 */
-        .check = simple_check,
-        .inb = pcc_inb,
-        .inw = simple_inw,
-        .outb = pcc_outb,
-        .outw = simple_outw,
-};
-
-#ifdef CONFIG_IDE
-/* CF in CF slot */
-static struct iop cfiop = {
-        .base = 0xb0600000,
-        .check = ide_check,
-        .inb = pcc_inb,
-        .inw = simple_inw,
-        .outb = pcc_outb,
-        .outw = simple_outw,
-};
-#endif
-
-static __inline__ struct iop *
-port2iop(unsigned long port)
-{
-        if (0) ;
-#if defined(CONFIG_SMC91X)
-        else if (laniop.check(&laniop, port))
-                return &laniop;
-#endif
-#if defined(CONFIG_NE2000)
-        else if (neiop.check(&neiop, port))
-                return &neiop;
-#endif
-#if defined(CONFIG_IDE)
-        else if (cfiop.check(&cfiop, port))
-                return &cfiop;
-#endif
-        else
-                return &neiop;  /* fallback */
-}
-
-static inline void
-delay(void)
-{
-        ctrl_inw(0xac000000);
-        ctrl_inw(0xac000000);
-}
-
-unsigned char
-sh7300se_inb(unsigned long port)
-{
-        struct iop *p = port2iop(port);
-        return (p->inb) (p, port);
-}
-
-unsigned char
-sh7300se_inb_p(unsigned long port)
-{
-        unsigned char v = sh7300se_inb(port);
-        delay();
-        return v;
-}
-
-unsigned short
-sh7300se_inw(unsigned long port)
-{
-        struct iop *p = port2iop(port);
-        return (p->inw) (p, port);
-}
-
-unsigned int
-sh7300se_inl(unsigned long port)
-{
-        badio(inl, port);
-}
-
-void
-sh7300se_outb(unsigned char value, unsigned long port)
-{
-        struct iop *p = port2iop(port);
-        (p->outb) (p, value, port);
-}
-
-void
-sh7300se_outb_p(unsigned char value, unsigned long port)
-{
-        sh7300se_outb(value, port);
-        delay();
-}
-
-void
-sh7300se_outw(unsigned short value, unsigned long port)
-{
-        struct iop *p = port2iop(port);
-        (p->outw) (p, value, port);
-}
-
-void
-sh7300se_outl(unsigned int value, unsigned long port)
-{
-        badio(outl, port);
-}
-
-void
-sh7300se_insb(unsigned long port, void *addr, unsigned long count)
-{
-        unsigned char *a = addr;
-        struct iop *p = port2iop(port);
-        while (count--)
-                *a++ = (p->inb) (p, port);
-}
-
-void
-sh7300se_insw(unsigned long port, void *addr, unsigned long count)
-{
-        unsigned short *a = addr;
-        struct iop *p = port2iop(port);
-        while (count--)
-                *a++ = (p->inw) (p, port);
-}
-
-void
-sh7300se_insl(unsigned long port, void *addr, unsigned long count)
-{
-        badio(insl, port);
-}
-
-void
-sh7300se_outsb(unsigned long port, const void *addr, unsigned long count)
-{
-        unsigned char *a = (unsigned char *) addr;
-        struct iop *p = port2iop(port);
-        while (count--)
-                (p->outb) (p, *a++, port);
-}
-
-void
-sh7300se_outsw(unsigned long port, const void *addr, unsigned long count)
-{
-        unsigned short *a = (unsigned short *) addr;
-        struct iop *p = port2iop(port);
-        while (count--)
-                (p->outw) (p, *a++, port);
-}
-
-void
-sh7300se_outsl(unsigned long port, const void *addr, unsigned long count)
-{
-        badio(outsw, port);
-}
diff --git a/arch/sh/boards/se/7300/irq.c b/arch/sh/boards/se/7300/irq.c
deleted file mode 100644
index 1279d776d60f..000000000000
--- a/arch/sh/boards/se/7300/irq.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * linux/arch/sh/boards/se/7300/irq.c
- *
- * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
- *
- * SH-Mobile SolutionEngine 7300 Support.
- *
- */
-
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-#include <asm/se7300.h>
-
-static struct ipr_data se7300_ipr_map[] = {
-        /* PC_IRQ[0-3] -> IRQ0 (32) */
-        { IRQ0_IRQ, IRQ0_IPR_ADDR, IRQ0_IPR_POS, 0x0f - IRQ0_IRQ },
-        /* A_IRQ[0-3] -> IRQ1 (33) */
-        { IRQ1_IRQ, IRQ1_IPR_ADDR, IRQ1_IPR_POS, 0x0f - IRQ1_IRQ },
-        { SIOF0_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY },
-        { DMTE2_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY },
-        { DMTE3_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY },
-        { VIO_IRQ, VIO_IPR_ADDR, VIO_IPR_POS, VIO_PRIORITY },
-};
-
-/*
- * Initialize IRQ setting
- */
-void __init
-init_7300se_IRQ(void)
-{
-        ctrl_outw(0x0028, PA_EPLD_MODESET);     /* mode set IRQ0,1 active low. */
-        ctrl_outw(0xa000, INTC_ICR1);           /* IRQ mode; IRQ0,1 enable.    */
-        ctrl_outw(0x0000, PORT_PFCR);           /* use F for IRQ[3:0] and SIU. */
-
-        make_ipr_irq(se7300_ipr_map, ARRAY_SIZE(se7300_ipr_map));
-
-        ctrl_outw(0x2000, PA_MRSHPC + 0x0c);    /* mrshpc irq enable */
-}
diff --git a/arch/sh/boards/se/7300/setup.c b/arch/sh/boards/se/7300/setup.c
deleted file mode 100644
index eb469f5b6e97..000000000000
--- a/arch/sh/boards/se/7300/setup.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * linux/arch/sh/boards/se/7300/setup.c
- *
- * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
- *
- * SH-Mobile SolutionEngine 7300 Support.
- *
- */
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <asm/machvec.h>
-#include <asm/se7300.h>
-
-void init_7300se_IRQ(void);
-
-static unsigned char heartbeat_bit_pos[] = { 8, 9, 10, 11, 12, 13, 14, 15 };
-
-static struct resource heartbeat_resources[] = {
-        [0] = {
-                .start  = PA_LED,
-                .end    = PA_LED + ARRAY_SIZE(heartbeat_bit_pos) - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device heartbeat_device = {
-        .name           = "heartbeat",
-        .id             = -1,
-        .dev    = {
-                .platform_data  = heartbeat_bit_pos,
-        },
-        .num_resources  = ARRAY_SIZE(heartbeat_resources),
-        .resource       = heartbeat_resources,
-};
-
-static struct platform_device *se7300_devices[] __initdata = {
-        &heartbeat_device,
-};
-
-static int __init se7300_devices_setup(void)
-{
-        return platform_add_devices(se7300_devices, ARRAY_SIZE(se7300_devices));
-}
-__initcall(se7300_devices_setup);
-
-/*
- * The Machine Vector
- */
-static struct sh_machine_vector mv_7300se __initmv = {
-        .mv_name = "SolutionEngine 7300",
-        .mv_nr_irqs = 109,
-        .mv_inb = sh7300se_inb,
-        .mv_inw = sh7300se_inw,
-        .mv_inl = sh7300se_inl,
-        .mv_outb = sh7300se_outb,
-        .mv_outw = sh7300se_outw,
-        .mv_outl = sh7300se_outl,
-
-        .mv_inb_p = sh7300se_inb_p,
-        .mv_inw_p = sh7300se_inw,
-        .mv_inl_p = sh7300se_inl,
-        .mv_outb_p = sh7300se_outb_p,
-        .mv_outw_p = sh7300se_outw,
-        .mv_outl_p = sh7300se_outl,
-
-        .mv_insb = sh7300se_insb,
-        .mv_insw = sh7300se_insw,
-        .mv_insl = sh7300se_insl,
-        .mv_outsb = sh7300se_outsb,
-        .mv_outsw = sh7300se_outsw,
-        .mv_outsl = sh7300se_outsl,
-
-        .mv_init_irq = init_7300se_IRQ,
-};
diff --git a/arch/sh/boards/se/73180/Makefile b/arch/sh/boards/se/73180/Makefile
deleted file mode 100644
index e7c09967c529..000000000000
--- a/arch/sh/boards/se/73180/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the 73180 SolutionEngine specific parts of the kernel
-#
-
-obj-y    := setup.o io.o irq.o
diff --git a/arch/sh/boards/se/73180/io.c b/arch/sh/boards/se/73180/io.c
deleted file mode 100644
index 72715575458b..000000000000
--- a/arch/sh/boards/se/73180/io.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * arch/sh/boards/se/73180/io.c
- *
- * Copyright (C) 2003 YOSHII Takashi <yoshii-takashi@hitachi-ul.co.jp>
- * Based on arch/sh/boards/se/7300/io.c
- *
- * I/O routine for SH-Mobile3 73180 SolutionEngine.
- *
- */
-
-#include <linux/kernel.h>
-#include <asm/mach/se73180.h>
-#include <asm/io.h>
-
-#define badio(fn, a) panic("bad i/o operation %s for %08lx.", #fn, a)
-
-struct iop {
-        unsigned long start, end;
-        unsigned long base;
-        struct iop *(*check) (struct iop * p, unsigned long port);
-        unsigned char (*inb) (struct iop * p, unsigned long port);
-        unsigned short (*inw) (struct iop * p, unsigned long port);
-        void (*outb) (struct iop * p, unsigned char value, unsigned long port);
-        void (*outw) (struct iop * p, unsigned short value, unsigned long port);
-};
-
-struct iop *
-simple_check(struct iop *p, unsigned long port)
-{
-        if ((p->start <= port) && (port <= p->end))
-                return p;
-        else
-                badio(check, port);
-}
-
-struct iop *
-ide_check(struct iop *p, unsigned long port)
-{
-        if (((0x1f0 <= port) && (port <= 0x1f7)) || (port == 0x3f7))
-                return p;
-        return NULL;
-}
-
-unsigned char
-simple_inb(struct iop *p, unsigned long port)
-{
-        return *(unsigned char *) (p->base + port);
-}
-
-unsigned short
-simple_inw(struct iop *p, unsigned long port)
-{
-        return *(unsigned short *) (p->base + port);
-}
-
-void
-simple_outb(struct iop *p, unsigned char value, unsigned long port)
-{
-        *(unsigned char *) (p->base + port) = value;
-}
-
-void
-simple_outw(struct iop *p, unsigned short value, unsigned long port)
-{
-        *(unsigned short *) (p->base + port) = value;
-}
-
-unsigned char
-pcc_inb(struct iop *p, unsigned long port)
-{
-        unsigned long addr = p->base + port + 0x40000;
-        unsigned long v;
-
-        if (port & 1)
-                addr += 0x00400000;
-        v = *(volatile unsigned char *) addr;
-        return v;
-}
-
-void
-pcc_outb(struct iop *p, unsigned char value, unsigned long port)
-{
-        unsigned long addr = p->base + port + 0x40000;
-
-        if (port & 1)
-                addr += 0x00400000;
-        *(volatile unsigned char *) addr = value;
-}
-
-unsigned char
-bad_inb(struct iop *p, unsigned long port)
-{
-        badio(inb, port);
-}
-
-void
-bad_outb(struct iop *p, unsigned char value, unsigned long port)
-{
-        badio(inw, port);
-}
-
-#ifdef CONFIG_SMC91X
-/* MSTLANEX01 LAN at 0xb400:0000 */
-static struct iop laniop = {
-        .start = 0x300,
-        .end = 0x30f,
-        .base = 0xb4000000,
-        .check = simple_check,
-        .inb = simple_inb,
-        .inw = simple_inw,
-        .outb = simple_outb,
-        .outw = simple_outw,
-};
-#endif
-
-/* NE2000 pc card NIC */
-static struct iop neiop = {
-        .start = 0x280,
-        .end = 0x29f,
-        .base = 0xb0600000 + 0x80,      /* soft 0x280 -> hard 0x300 */
-        .check = simple_check,
-        .inb = pcc_inb,
-        .inw = simple_inw,
-        .outb = pcc_outb,
-        .outw = simple_outw,
-};
-
-#ifdef CONFIG_IDE
-/* CF in CF slot */
-static struct iop cfiop = {
-        .base = 0xb0600000,
-        .check = ide_check,
-        .inb = pcc_inb,
-        .inw = simple_inw,
-        .outb = pcc_outb,
-        .outw = simple_outw,
-};
-#endif
-
-static __inline__ struct iop *
-port2iop(unsigned long port)
-{
-        if (0) ;
-#if defined(CONFIG_SMC91X)
-        else if (laniop.check(&laniop, port))
-                return &laniop;
-#endif
-#if defined(CONFIG_NE2000)
-        else if (neiop.check(&neiop, port))
-                return &neiop;
-#endif
-#if defined(CONFIG_IDE)
-        else if (cfiop.check(&cfiop, port))
-                return &cfiop;
-#endif
-        else
-                return &neiop;  /* fallback */
-}
-
-static inline void
-delay(void)
-{
-        ctrl_inw(0xac000000);
-        ctrl_inw(0xac000000);
-}
-
-unsigned char
-sh73180se_inb(unsigned long port)
-{
-        struct iop *p = port2iop(port);
-        return (p->inb) (p, port);
-}
-
-unsigned char
-sh73180se_inb_p(unsigned long port)
-{
-        unsigned char v = sh73180se_inb(port);
-        delay();
-        return v;
-}
-
-unsigned short
-sh73180se_inw(unsigned long port)
-{
-        struct iop *p = port2iop(port);
-        return (p->inw) (p, port);
-}
-
-unsigned int
-sh73180se_inl(unsigned long port)
-{
-        badio(inl, port);
-}
-
-void
-sh73180se_outb(unsigned char value, unsigned long port)
-{
-        struct iop *p = port2iop(port);
-        (p->outb) (p, value, port);
-}
-
-void
-sh73180se_outb_p(unsigned char value, unsigned long port)
-{
-        sh73180se_outb(value, port);
-        delay();
-}
-
-void
-sh73180se_outw(unsigned short value, unsigned long port)
-{
-        struct iop *p = port2iop(port);
-        (p->outw) (p, value, port);
-}
-
-void
-sh73180se_outl(unsigned int value, unsigned long port)
-{
-        badio(outl, port);
-}
-
-void
-sh73180se_insb(unsigned long port, void *addr, unsigned long count)
-{
-        unsigned char *a = addr;
-        struct iop *p = port2iop(port);
-        while (count--)
-                *a++ = (p->inb) (p, port);
-}
-
-void
-sh73180se_insw(unsigned long port, void *addr, unsigned long count)
-{
-        unsigned short *a = addr;
-        struct iop *p = port2iop(port);
-        while (count--)
-                *a++ = (p->inw) (p, port);
-}
-
-void
-sh73180se_insl(unsigned long port, void *addr, unsigned long count)
-{
-        badio(insl, port);
-}
-
-void
-sh73180se_outsb(unsigned long port, const void *addr, unsigned long count)
-{
-        unsigned char *a = (unsigned char *) addr;
-        struct iop *p = port2iop(port);
-        while (count--)
-                (p->outb) (p, *a++, port);
-}
-
-void
-sh73180se_outsw(unsigned long port, const void *addr, unsigned long count)
-{
-        unsigned short *a = (unsigned short *) addr;
-        struct iop *p = port2iop(port);
-        while (count--)
-                (p->outw) (p, *a++, port);
-}
-
-void
-sh73180se_outsl(unsigned long port, const void *addr, unsigned long count)
-{
-        badio(outsw, port);
-}
diff --git a/arch/sh/boards/se/73180/irq.c b/arch/sh/boards/se/73180/irq.c
deleted file mode 100644
index e7200c56bb45..000000000000
--- a/arch/sh/boards/se/73180/irq.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * arch/sh/boards/se/73180/irq.c
- *
- * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
- * Based on arch/sh/boards/se/7300/irq.c
- *
- * Modified for SH-Mobile SolutionEngine 73180 Support
- *              by YOSHII Takashi <yoshii-takashi@hitachi-ul.co.jp>
- *
- */
-
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-#include <asm/mach/se73180.h>
-
-static int
-irq2intreq(int irq)
-{
-        if (irq == 10)
-                return 5;
-        return 7 - (irq - 32);
-}
-
-static void
-disable_intreq_irq(unsigned int irq)
-{
-        ctrl_outb(1 << (7 - irq2intreq(irq)), INTMSK0);
-}
-
-static void
-enable_intreq_irq(unsigned int irq)
-{
-        ctrl_outb(1 << (7 - irq2intreq(irq)), INTMSKCLR0);
-}
-
-static void
-mask_and_ack_intreq_irq(unsigned int irq)
-{
-        disable_intreq_irq(irq);
-}
-
-static unsigned int
-startup_intreq_irq(unsigned int irq)
-{
-        enable_intreq_irq(irq);
-        return 0;
-}
-
-static void
-shutdown_intreq_irq(unsigned int irq)
-{
-        disable_intreq_irq(irq);
-}
-
-static void
-end_intreq_irq(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-                enable_intreq_irq(irq);
-}
-
-static struct hw_interrupt_type intreq_irq_type = {
-        .typename = "intreq",
-        .startup = startup_intreq_irq,
-        .shutdown = shutdown_intreq_irq,
-        .enable = enable_intreq_irq,
-        .disable = disable_intreq_irq,
-        .ack = mask_and_ack_intreq_irq,
-        .end = end_intreq_irq
-};
-
-void
-make_intreq_irq(unsigned int irq)
-{
-        disable_irq_nosync(irq);
-        irq_desc[irq].chip = &intreq_irq_type;
-        disable_intreq_irq(irq);
-}
-
-int
-shmse_irq_demux(int irq)
-{
-        if (irq == IRQ5_IRQ)
-                return 10;
-        return irq;
-}
-
-static struct ipr_data se73180_siof0_ipr_map[] = {
-        { SIOF0_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY },
-};
-static struct ipr_data se73180_vpu_ipr_map[] = {
-        { VPU_IRQ, VPU_IPR_ADDR, VPU_IPR_POS, 8 },
-};
-static struct ipr_data se73180_other_ipr_map[] = {
-        { DMTE2_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY },
-        { DMTE3_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY },
-        { DMTE4_IRQ, DMA2_IPR_ADDR, DMA2_IPR_POS, DMA2_PRIORITY },
-        { IIC0_ALI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS, IIC0_PRIORITY },
-        { IIC0_TACKI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS, IIC0_PRIORITY },
-        { IIC0_WAITI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS, IIC0_PRIORITY },
-        { IIC0_DTEI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS, IIC0_PRIORITY },
-        { SIOF0_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY },
-        { SIU_IRQ, SIU_IPR_ADDR, SIU_IPR_POS, SIU_PRIORITY },
-
-        /* VIO interrupt */
-        { CEU_IRQ, VIO_IPR_ADDR, VIO_IPR_POS, VIO_PRIORITY },
-        { BEU_IRQ, VIO_IPR_ADDR, VIO_IPR_POS, VIO_PRIORITY },
-        { VEU_IRQ, VIO_IPR_ADDR, VIO_IPR_POS, VIO_PRIORITY },
-
-        { LCDC_IRQ, LCDC_IPR_ADDR, LCDC_IPR_POS, LCDC_PRIORITY },
-};
-
-/*
- * Initialize IRQ setting
- */
-void __init
-init_73180se_IRQ(void)
-{
-        make_ipr_irq(se73180_siof0_ipr_map, ARRAY_SIZE(se73180_siof0_ipr_map));
-
-        ctrl_outw(0x2000, 0xb03fffec);  /* mrshpc irq enable */
-        ctrl_outw(0x2000, 0xb07fffec);  /* mrshpc irq enable */
-        ctrl_outl(3 << ((7 - 5) * 4), INTC_INTPRI0);    /* irq5 pri=3 */
-        ctrl_outw(2 << ((7 - 5) * 2), INTC_ICR1);       /* low-level irq */
-        make_intreq_irq(10);
-
-        make_ipr_irq(se73180_vpu_ipr_map, ARRAY_SIZE(se73180_vpu_ipr_map));
-
-        ctrl_outb(0x0f, INTC_IMCR5);    /* enable SCIF IRQ */
-
-        make_ipr_irq(se73180_other_ipr_map, ARRAY_SIZE(se73180_other_ipr_map));
-
-        ctrl_outw(0x2000, PA_MRSHPC + 0x0c);    /* mrshpc irq enable */
-}
diff --git a/arch/sh/boards/se/73180/setup.c b/arch/sh/boards/se/73180/setup.c
deleted file mode 100644
index 1deee8556642..000000000000
--- a/arch/sh/boards/se/73180/setup.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * arch/sh/boards/se/73180/setup.c
- *
- * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
- * Based on arch/sh/setup_shmse.c
- *
- * Modified for 73180 SolutionEngine
- *           by YOSHII Takashi <yoshii-takashi@hitachi-ul.co.jp>
- *
- */
-
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <asm/machvec.h>
-#include <asm/se73180.h>
-#include <asm/irq.h>
-
-void init_73180se_IRQ(void);
-
-static struct resource heartbeat_resources[] = {
-        [0] = {
-                .start  = PA_LED,
-                .end    = PA_LED + 8 - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device heartbeat_device = {
-        .name           = "heartbeat",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(heartbeat_resources),
-        .resource       = heartbeat_resources,
-};
-
-static struct platform_device *se73180_devices[] __initdata = {
-        &heartbeat_device,
-};
-
-static int __init se73180_devices_setup(void)
-{
-        return platform_add_devices(se73180_devices,
-                                    ARRAY_SIZE(se73180_devices));
-}
-__initcall(se73180_devices_setup);
-
-/*
- * The Machine Vector
- */
-static struct sh_machine_vector mv_73180se __initmv = {
-        .mv_name = "SolutionEngine 73180",
-        .mv_nr_irqs = 108,
-        .mv_inb = sh73180se_inb,
-        .mv_inw = sh73180se_inw,
-        .mv_inl = sh73180se_inl,
-        .mv_outb = sh73180se_outb,
-        .mv_outw = sh73180se_outw,
-        .mv_outl = sh73180se_outl,
-
-        .mv_inb_p = sh73180se_inb_p,
-        .mv_inw_p = sh73180se_inw,
-        .mv_inl_p = sh73180se_inl,
-        .mv_outb_p = sh73180se_outb_p,
-        .mv_outw_p = sh73180se_outw,
-        .mv_outl_p = sh73180se_outl,
-
-        .mv_insb = sh73180se_insb,
-        .mv_insw = sh73180se_insw,
-        .mv_insl = sh73180se_insl,
-        .mv_outsb = sh73180se_outsb,
-        .mv_outsw = sh73180se_outsw,
-        .mv_outsl = sh73180se_outsl,
-
-        .mv_init_irq = init_73180se_IRQ,
-        .mv_irq_demux = shmse_irq_demux,
-};
diff --git a/arch/sh/boot/Makefile b/arch/sh/boot/Makefile
index 11dc272c618e..4c5ffdcd55b6 100644
--- a/arch/sh/boot/Makefile
+++ b/arch/sh/boot/Makefile
@@ -32,9 +32,10 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE
 $(obj)/compressed/vmlinux: FORCE
         $(Q)$(MAKE) $(build)=$(obj)/compressed $@
 
-KERNEL_LOAD     := $(shell printf "0x%8x" $$[$(CONFIG_PAGE_OFFSET)  + \
-                                             $(CONFIG_MEMORY_START) + \
-                                             $(CONFIG_ZERO_PAGE_OFFSET)+0x1000])
+KERNEL_LOAD     := $(shell /bin/bash -c 'printf "0x%8x" \
+                     $$[$(CONFIG_PAGE_OFFSET)  + \
+                        $(CONFIG_MEMORY_START) + \
+                        $(CONFIG_ZERO_PAGE_OFFSET)+0x1000]')
 
 quiet_cmd_uimage = UIMAGE  $@
       cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \
diff --git a/arch/sh/boot/compressed/Makefile b/arch/sh/boot/compressed/Makefile
index d9512416f885..013504ae1122 100644
--- a/arch/sh/boot/compressed/Makefile
+++ b/arch/sh/boot/compressed/Makefile
@@ -16,9 +16,10 @@ endif
 #
 # IMAGE_OFFSET is the load offset of the compression loader
 #
-IMAGE_OFFSET    := $(shell printf "0x%08x" $$[$(CONFIG_PAGE_OFFSET)  + \
-                                              $(CONFIG_MEMORY_START) + \
-                                              $(CONFIG_BOOT_LINK_OFFSET)])
+IMAGE_OFFSET    := $(shell /bin/bash -c 'printf "0x%08x" \
+                     $$[$(CONFIG_PAGE_OFFSET)  + \
+                        $(CONFIG_MEMORY_START) + \
+                        $(CONFIG_BOOT_LINK_OFFSET)]')
 
 LIBGCC  := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
diff --git a/arch/sh/configs/se7300_defconfig b/arch/sh/configs/se7300_defconfig
deleted file mode 100644
index 8a217908b81f..000000000000
--- a/arch/sh/configs/se7300_defconfig
+++ /dev/null
@@ -1,696 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18
-# Tue Oct  3 11:43:22 2006
-#
-CONFIG_SUPERH=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-# CONFIG_SWAP is not set
-# CONFIG_SYSVIPC is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_EMBEDDED=y
-CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_HOTPLUG is not set
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-# CONFIG_FUTEX is not set
-# CONFIG_EPOLL is not set
-CONFIG_SHMEM=y
-CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
-
-#
-# Block layer
-#
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-
-#
-# System type
-#
-CONFIG_SOLUTION_ENGINE=y
-# CONFIG_SH_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SOLUTION_ENGINE is not set
-CONFIG_SH_7300_SOLUTION_ENGINE=y
-# CONFIG_SH_7343_SOLUTION_ENGINE is not set
-# CONFIG_SH_73180_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SYSTEMH is not set
-# CONFIG_SH_HP6XX is not set
-# CONFIG_SH_EC3104 is not set
-# CONFIG_SH_SATURN is not set
-# CONFIG_SH_DREAMCAST is not set
-# CONFIG_SH_BIGSUR is not set
-# CONFIG_SH_MPC1211 is not set
-# CONFIG_SH_SH03 is not set
-# CONFIG_SH_SECUREEDGE5410 is not set
-# CONFIG_SH_HS7751RVOIP is not set
-# CONFIG_SH_7710VOIPGW is not set
-# CONFIG_SH_RTS7751R2D is not set
-# CONFIG_SH_R7780RP is not set
-# CONFIG_SH_EDOSK7705 is not set
-# CONFIG_SH_SH4202_MICRODEV is not set
-# CONFIG_SH_LANDISK is not set
-# CONFIG_SH_TITAN is not set
-# CONFIG_SH_SHMIN is not set
-# CONFIG_SH_UNKNOWN is not set
-
-#
-# Processor selection
-#
-CONFIG_CPU_SH3=y
-
-#
-# SH-2 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7604 is not set
-
-#
-# SH-3 Processor Support
-#
-CONFIG_CPU_SUBTYPE_SH7300=y
-# CONFIG_CPU_SUBTYPE_SH7705 is not set
-# CONFIG_CPU_SUBTYPE_SH7706 is not set
-# CONFIG_CPU_SUBTYPE_SH7707 is not set
-# CONFIG_CPU_SUBTYPE_SH7708 is not set
-# CONFIG_CPU_SUBTYPE_SH7709 is not set
-# CONFIG_CPU_SUBTYPE_SH7710 is not set
-
-#
-# SH-4 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7750 is not set
-# CONFIG_CPU_SUBTYPE_SH7091 is not set
-# CONFIG_CPU_SUBTYPE_SH7750R is not set
-# CONFIG_CPU_SUBTYPE_SH7750S is not set
-# CONFIG_CPU_SUBTYPE_SH7751 is not set
-# CONFIG_CPU_SUBTYPE_SH7751R is not set
-# CONFIG_CPU_SUBTYPE_SH7760 is not set
-# CONFIG_CPU_SUBTYPE_SH4_202 is not set
-
-#
-# ST40 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
-# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
-
-#
-# SH-4A Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7770 is not set
-# CONFIG_CPU_SUBTYPE_SH7780 is not set
-
-#
-# SH4AL-DSP Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH73180 is not set
-# CONFIG_CPU_SUBTYPE_SH7343 is not set
-
-#
-# Memory management options
-#
-CONFIG_MMU=y
-CONFIG_PAGE_OFFSET=0x80000000
-CONFIG_MEMORY_START=0x0c000000
-CONFIG_MEMORY_SIZE=0x04000000
-CONFIG_VSYSCALL=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
-
-#
-# Cache configuration
-#
-# CONFIG_SH_DIRECT_MAPPED is not set
-# CONFIG_SH_WRITETHROUGH is not set
-# CONFIG_SH_OCRAM is not set
-
-#
-# Processor features
-#
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_SH_FPU_EMU is not set
-CONFIG_SH_DSP=y
-# CONFIG_SH_ADC is not set
-CONFIG_CPU_HAS_INTEVT=y
-CONFIG_CPU_HAS_SR_RB=y
-
-#
-# Timer support
-#
-CONFIG_SH_TMU=y
-CONFIG_SH_PCLK_FREQ=33333333
-
-#
-# CPU Frequency scaling
-#
-# CONFIG_CPU_FREQ is not set
-
-#
-# DMA support
-#
-# CONFIG_SH_DMA is not set
-
-#
-# Companion Chips
-#
-# CONFIG_HD6446X_SERIES is not set
-CONFIG_HEARTBEAT=y
-
-#
-# Kernel features
-#
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=250
-# CONFIG_KEXEC is not set
-# CONFIG_SMP is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-
-#
-# Boot options
-#
-CONFIG_ZERO_PAGE_OFFSET=0x00001000
-CONFIG_BOOT_LINK_OFFSET=0x00210000
-# CONFIG_UBC_WAKEUP is not set
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttySC0,38400 root=/dev/ram0"
-
-#
-# Bus options
-#
-# CONFIG_PCI is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-
-#
-# PCI Hotplug Support
-#
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_FLAT is not set
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Power management options (EXPERIMENTAL)
-#
-# CONFIG_PM is not set
-
-#
-# Networking
-#
-# CONFIG_NET is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_CDROM_PKTCDVD is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-# CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-# CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# ISDN subsystem
-#
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-# CONFIG_SERIO_I8042 is not set
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_SERIO_RAW is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-# CONFIG_VT is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=2
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_UNIX98_PTYS is not set
-# CONFIG_LEGACY_PTYS is not set
-
-#
-# IPMI
-#
-CONFIG_IPMI_HANDLER=y
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=y
-# CONFIG_IPMI_SI is not set
-CONFIG_IPMI_WATCHDOG=y
-# CONFIG_IPMI_POWEROFF is not set
-
-#
-# Watchdog Cards
-#
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=y
-# CONFIG_SH_WDT is not set
-CONFIG_HW_RANDOM=y
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# SPI support
-#
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
-
-#
-# Hardware Monitoring support
-#
-CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Misc devices
-#
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
-
-#
-# Digital Video Broadcasting Devices
-#
-
-#
-# Graphics support
-#
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# USB support
-#
-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-
-#
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
-# CONFIG_RTC_CLASS is not set
-
-#
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-# CONFIG_TMPFS is not set
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-# CONFIG_CONFIGFS_FS is not set
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
-CONFIG_FRAME_POINTER=y
-# CONFIG_UNWIND_INFO is not set
-CONFIG_SH_STANDARD_BIOS=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_KGDB=y
-
-#
-# KGDB configuration options
-#
-# CONFIG_MORE_COMPILE_OPTIONS is not set
-# CONFIG_KGDB_NMI is not set
-# CONFIG_KGDB_THREAD is not set
-# CONFIG_SH_KGDB_CONSOLE is not set
-# CONFIG_KGDB_SYSRQ is not set
-# CONFIG_KGDB_KERNEL_ASSERTS is not set
-
-#
-# Serial port setup
-#
-CONFIG_KGDB_DEFPORT=1
-CONFIG_KGDB_DEFBAUD=115200
-CONFIG_KGDB_DEFPARITY_N=y
-# CONFIG_KGDB_DEFPARITY_E is not set
-# CONFIG_KGDB_DEFPARITY_O is not set
-CONFIG_KGDB_DEFBITS_8=y
-# CONFIG_KGDB_DEFBITS_7 is not set
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
-
-#
-# Library routines
-#
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
diff --git a/arch/sh/configs/se73180_defconfig b/arch/sh/configs/se73180_defconfig
deleted file mode 100644
index 1a766153cbb0..000000000000
--- a/arch/sh/configs/se73180_defconfig
+++ /dev/null
@@ -1,648 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18
-# Tue Oct  3 11:44:45 2006
-#
-CONFIG_SUPERH=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-# CONFIG_SYSVIPC is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_EMBEDDED=y
-CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_HOTPLUG is not set
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-# CONFIG_FUTEX is not set
-# CONFIG_EPOLL is not set
-CONFIG_SHMEM=y
-CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_MODULE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_KMOD is not set
-
-#
-# Block layer
-#
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_LSF is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-
-#
-# System type
-#
-CONFIG_SOLUTION_ENGINE=y
-# CONFIG_SH_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SOLUTION_ENGINE is not set
-# CONFIG_SH_7300_SOLUTION_ENGINE is not set
-# CONFIG_SH_7343_SOLUTION_ENGINE is not set
-CONFIG_SH_73180_SOLUTION_ENGINE=y
-# CONFIG_SH_7751_SYSTEMH is not set
-# CONFIG_SH_HP6XX is not set
-# CONFIG_SH_EC3104 is not set
-# CONFIG_SH_SATURN is not set
-# CONFIG_SH_DREAMCAST is not set
-# CONFIG_SH_BIGSUR is not set
-# CONFIG_SH_MPC1211 is not set
-# CONFIG_SH_SH03 is not set
-# CONFIG_SH_SECUREEDGE5410 is not set
-# CONFIG_SH_HS7751RVOIP is not set
-# CONFIG_SH_7710VOIPGW is not set
-# CONFIG_SH_RTS7751R2D is not set
-# CONFIG_SH_R7780RP is not set
-# CONFIG_SH_EDOSK7705 is not set
-# CONFIG_SH_SH4202_MICRODEV is not set
-# CONFIG_SH_LANDISK is not set
-# CONFIG_SH_TITAN is not set
-# CONFIG_SH_SHMIN is not set
-# CONFIG_SH_UNKNOWN is not set
-
-#
-# Processor selection
-#
-CONFIG_CPU_SH4=y
-CONFIG_CPU_SH4A=y
-CONFIG_CPU_SH4AL_DSP=y
-
-#
-# SH-2 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7604 is not set
-
-#
-# SH-3 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7300 is not set
-# CONFIG_CPU_SUBTYPE_SH7705 is not set
-# CONFIG_CPU_SUBTYPE_SH7706 is not set
-# CONFIG_CPU_SUBTYPE_SH7707 is not set
-# CONFIG_CPU_SUBTYPE_SH7708 is not set
-# CONFIG_CPU_SUBTYPE_SH7709 is not set
-# CONFIG_CPU_SUBTYPE_SH7710 is not set
-
-#
-# SH-4 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7750 is not set
-# CONFIG_CPU_SUBTYPE_SH7091 is not set
-# CONFIG_CPU_SUBTYPE_SH7750R is not set
-# CONFIG_CPU_SUBTYPE_SH7750S is not set
-# CONFIG_CPU_SUBTYPE_SH7751 is not set
-# CONFIG_CPU_SUBTYPE_SH7751R is not set
-# CONFIG_CPU_SUBTYPE_SH7760 is not set
-# CONFIG_CPU_SUBTYPE_SH4_202 is not set
-
-#
-# ST40 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
-# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
-
-#
-# SH-4A Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7770 is not set
-# CONFIG_CPU_SUBTYPE_SH7780 is not set
-
-#
-# SH4AL-DSP Processor Support
-#
-CONFIG_CPU_SUBTYPE_SH73180=y
-# CONFIG_CPU_SUBTYPE_SH7343 is not set
-
-#
-# Memory management options
-#
-CONFIG_MMU=y
-CONFIG_PAGE_OFFSET=0x80000000
-CONFIG_MEMORY_START=0x0c000000
-CONFIG_MEMORY_SIZE=0x02000000
-CONFIG_32BIT=y
-CONFIG_VSYSCALL=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
-
-#
-# Cache configuration
-#
-# CONFIG_SH_DIRECT_MAPPED is not set
-# CONFIG_SH_WRITETHROUGH is not set
-# CONFIG_SH_OCRAM is not set
-
-#
-# Processor features
-#
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_SH_FPU is not set
-# CONFIG_SH_FPU_EMU is not set
-CONFIG_SH_DSP=y
-# CONFIG_SH_STORE_QUEUES is not set
-CONFIG_CPU_HAS_INTEVT=y
-CONFIG_CPU_HAS_SR_RB=y
-
-#
-# Timer support
-#
-CONFIG_SH_TMU=y
-CONFIG_SH_PCLK_FREQ=27000000
-
-#
-# CPU Frequency scaling
-#
-# CONFIG_CPU_FREQ is not set
-
-#
-# DMA support
-#
-# CONFIG_SH_DMA is not set
-
-#
-# Companion Chips
-#
-# CONFIG_HD6446X_SERIES is not set
-CONFIG_HEARTBEAT=y
-
-#
-# Kernel features
-#
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=250
-# CONFIG_KEXEC is not set
-# CONFIG_SMP is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-
-#
-# Boot options
-#
-CONFIG_ZERO_PAGE_OFFSET=0x00010000
-CONFIG_BOOT_LINK_OFFSET=0x00800000
-# CONFIG_UBC_WAKEUP is not set
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttySC0,38400 root=/dev/ram"
-
-#
-# Bus options
-#
-# CONFIG_PCI is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-
-#
-# PCI Hotplug Support
-#
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_FLAT is not set
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Power management options (EXPERIMENTAL)
-#
-# CONFIG_PM is not set
-
-#
-# Networking
-#
-# CONFIG_NET is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_CDROM_PKTCDVD is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-# CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-# CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# ISDN subsystem
-#
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-# CONFIG_INPUT is not set
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-# CONFIG_VT is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=2
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_UNIX98_PTYS is not set
-# CONFIG_LEGACY_PTYS is not set
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SH_WDT is not set
-CONFIG_HW_RANDOM=y
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# SPI support
-#
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
-
-#
-# Hardware Monitoring support
-#
-CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Misc devices
-#
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
-
-#
-# Digital Video Broadcasting Devices
-#
-
-#
-# Graphics support
-#
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# USB support
-#
-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-
-#
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
-# CONFIG_RTC_CLASS is not set
-
-#
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-# CONFIG_SYSFS is not set
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_SH_STANDARD_BIOS=y
-# CONFIG_EARLY_SCIF_CONSOLE is not set
-# CONFIG_EARLY_PRINTK is not set
-# CONFIG_KGDB is not set
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
-
-#
-# Library routines
-#
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
diff --git a/arch/sh/drivers/dma/dma-api.c b/arch/sh/drivers/dma/dma-api.c
index cf8e11994330..76ed816d9a24 100644
--- a/arch/sh/drivers/dma/dma-api.c
+++ b/arch/sh/drivers/dma/dma-api.c
@@ -31,8 +31,8 @@ struct dma_info *get_dma_info(unsigned int chan)
          * the channel is.
          */
         list_for_each_entry(info, &registered_dmac_list, list) {
-                if ((chan <  info->first_channel_nr) ||
-                    (chan >= info->first_channel_nr + info->nr_channels))
+                if ((chan <  info->first_vchannel_nr) ||
+                    (chan >= info->first_vchannel_nr + info->nr_channels))
                         continue;
 
                 return info;
@@ -82,7 +82,7 @@ struct dma_channel *get_dma_channel(unsigned int chan)
 
         for (i = 0; i < info->nr_channels; i++) {
                 channel = &info->channels[i];
-                if (channel->chan == chan)
+                if (channel->vchan == chan)
                         return channel;
         }
 
@@ -369,6 +369,7 @@ int register_dmac(struct dma_info *info)
         }
 
         total_channels = get_nr_channels();
+        info->first_vchannel_nr = total_channels;
         for (i = 0; i < info->nr_channels; i++) {
                 struct dma_channel *chan = &info->channels[i];
 
diff --git a/arch/sh/kernel/cpu/irq/Makefile b/arch/sh/kernel/cpu/irq/Makefile
index 9ddb446ac930..60bfc05cf354 100644
--- a/arch/sh/kernel/cpu/irq/Makefile
+++ b/arch/sh/kernel/cpu/irq/Makefile
@@ -4,7 +4,6 @@
 obj-y   += imask.o
 
 obj-$(CONFIG_CPU_HAS_IPR_IRQ)           += ipr.o
-obj-$(CONFIG_CPU_HAS_PINT_IRQ)          += pint.o 
 obj-$(CONFIG_CPU_HAS_MASKREG_IRQ)       += maskreg.o
 obj-$(CONFIG_CPU_HAS_INTC_IRQ)          += intc.o
 obj-$(CONFIG_CPU_HAS_INTC2_IRQ)         += intc2.o
diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c
index 98e84f40c713..5da325414880 100644
--- a/arch/sh/kernel/cpu/irq/ipr.c
+++ b/arch/sh/kernel/cpu/irq/ipr.c
@@ -8,7 +8,7 @@
  *
  * Supported system:
  *      On-chip supporting modules (TMU, RTC, etc.).
- *      On-chip supporting modules for SH7709/SH7709A/SH7729/SH7300.
+ *      On-chip supporting modules for SH7709/SH7709A/SH7729.
  *      Hitachi SolutionEngine external I/O:
  *              MS7709SE01, MS7709ASE01, and MS7750SE01
  *
diff --git a/arch/sh/kernel/cpu/irq/pint.c b/arch/sh/kernel/cpu/irq/pint.c
deleted file mode 100644
index 67602685df1a..000000000000
--- a/arch/sh/kernel/cpu/irq/pint.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * arch/sh/kernel/cpu/irq/pint.c - Interrupt handling for PINT-based IRQs.
- *
- * Copyright (C) 1999  Niibe Yutaka & Takeshi Yaegashi
- * Copyright (C) 2000  Kazumoto Kojima
- * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/module.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/machvec.h>
-
-#if defined(CONFIG_CPU_SUBTYPE_SH7705)
-#define INTC_INTER      0xA4000014UL
-#define INTC_IPRD       0xA4000018UL
-#define INTC_ICR2       0xA4000012UL
-
-/* PFC */
-#define PORT_PACR       0xA4000100UL
-#define PORT_PBCR       0xA4000102UL
-#define PORT_PCCR       0xA4000104UL
-#define PORT_PDCR       0xA4000106UL
-#define PORT_PECR       0xA4000108UL
-#define PORT_PFCR       0xA400010AUL
-#define PORT_PGCR       0xA400010CUL
-#define PORT_PHCR       0xA400010EUL
-#define PORT_PJCR       0xA4000110UL
-#define PORT_PKCR       0xA4000112UL
-#define PORT_PLCR       0xA4000114UL
-#define PORT_PMCR       0xA4000118UL
-#define PORT_PNCR       0xA400011AUL
-#define PORT_PECR2      0xA4050148UL
-#define PORT_PFCR2      0xA405014AUL
-#define PORT_PNCR2      0xA405015AUL
-
-/* I/O port */
-#define PORT_PADR       0xA4000120UL
-#define PORT_PBDR       0xA4000122UL
-#define PORT_PCDR       0xA4000124UL
-#define PORT_PDDR       0xA4000126UL
-#define PORT_PEDR       0xA4000128UL
-#define PORT_PFDR       0xA400012AUL
-#define PORT_PGDR       0xA400012CUL
-#define PORT_PHDR       0xA400012EUL
-#define PORT_PJDR       0xA4000130UL
-#define PORT_PKDR       0xA4000132UL
-#define PORT_PLDR       0xA4000134UL
-#define PORT_PMDR       0xA4000138UL
-#define PORT_PNDR       0xA400013AUL
-
-#define PINT0_IRQ       40
-#define PINT8_IRQ       41
-#define PINT_IRQ_BASE   86
-
-#define PINT0_IPR_ADDR          INTC_IPRD
-#define PINT0_IPR_POS           3
-#define PINT0_PRIORITY      2
-
-#define PINT8_IPR_ADDR          INTC_IPRD
-#define PINT8_IPR_POS           2
-#define PINT8_PRIORITY      2
-
-#endif /* CONFIG_CPU_SUBTYPE_SH7705 */
-
-static unsigned char pint_map[256];
-static unsigned long portcr_mask;
-
-static void enable_pint_irq(unsigned int irq);
-static void disable_pint_irq(unsigned int irq);
-
-/* shutdown is same as "disable" */
-#define shutdown_pint_irq disable_pint_irq
-
-static void mask_and_ack_pint(unsigned int);
-static void end_pint_irq(unsigned int irq);
-
-static unsigned int startup_pint_irq(unsigned int irq)
-{
-        enable_pint_irq(irq);
-        return 0; /* never anything pending */
-}
-
-static struct hw_interrupt_type pint_irq_type = {
-        .typename = "PINT-IRQ",
-        .startup = startup_pint_irq,
-        .shutdown = shutdown_pint_irq,
-        .enable = enable_pint_irq,
-        .disable = disable_pint_irq,
-        .ack = mask_and_ack_pint,
-        .end = end_pint_irq
-};
-
-static void disable_pint_irq(unsigned int irq)
-{
-        unsigned long val;
-
-        val = ctrl_inw(INTC_INTER);
-        val &= ~(1 << (irq - PINT_IRQ_BASE));
-        ctrl_outw(val, INTC_INTER);     /* disable PINTn */
-        portcr_mask &= ~(3 << (irq - PINT_IRQ_BASE)*2);
-}
-
-static void enable_pint_irq(unsigned int irq)
-{
-        unsigned long val;
-
-        val = ctrl_inw(INTC_INTER);
-        val |= 1 << (irq - PINT_IRQ_BASE);
-        ctrl_outw(val, INTC_INTER);     /* enable PINTn */
-        portcr_mask |= 3 << (irq - PINT_IRQ_BASE)*2;
-}
-
-static void mask_and_ack_pint(unsigned int irq)
-{
-        disable_pint_irq(irq);
-}
-
-static void end_pint_irq(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-                enable_pint_irq(irq);
-}
-
-void make_pint_irq(unsigned int irq)
-{
-        disable_irq_nosync(irq);
-        irq_desc[irq].chip = &pint_irq_type;
-        disable_pint_irq(irq);
-}
-
-static struct ipr_data pint_ipr_map[] = {
-        { PINT0_IRQ, PINT0_IPR_ADDR, PINT0_IPR_POS, PINT0_PRIORITY },
-        { PINT8_IRQ, PINT8_IPR_ADDR, PINT8_IPR_POS, PINT8_PRIORITY },
-};
-
-void __init init_IRQ_pint(void)
-{
-        int i;
-
-        make_ipr_irq(pint_ipr_map, ARRAY_SIZE(pint_ipr_map));
-
-        enable_irq(PINT0_IRQ);
-        enable_irq(PINT8_IRQ);
-
-        for(i = 0; i < 16; i++)
-                make_pint_irq(PINT_IRQ_BASE + i);
-
-        for(i = 0; i < 256; i++) {
-                if (i & 1)
-                        pint_map[i] = 0;
-                else if (i & 2)
-                        pint_map[i] = 1;
-                else if (i & 4)
-                        pint_map[i] = 2;
-                else if (i & 8)
-                        pint_map[i] = 3;
-                else if (i & 0x10)
-                        pint_map[i] = 4;
-                else if (i & 0x20)
-                        pint_map[i] = 5;
-                else if (i & 0x40)
-                        pint_map[i] = 6;
-                else if (i & 0x80)
-                        pint_map[i] = 7;
-        }
-}
-
-int ipr_irq_demux(int irq)
-{
-        unsigned long creg, dreg, d, sav;
-
-        if (irq == PINT0_IRQ) {
-#if defined(CONFIG_CPU_SUBTYPE_SH7705) || defined(CONFIG_CPU_SUBTYPE_SH7707)
-                creg = PORT_PACR;
-                dreg = PORT_PADR;
-#else
-                creg = PORT_PCCR;
-                dreg = PORT_PCDR;
-#endif
-                sav = ctrl_inw(creg);
-                ctrl_outw(sav | portcr_mask, creg);
-                d = (~ctrl_inb(dreg) ^ ctrl_inw(INTC_ICR2)) &
-                        ctrl_inw(INTC_INTER) & 0xff;
-                ctrl_outw(sav, creg);
-
-                if (d == 0)
-                        return irq;
-
-                return PINT_IRQ_BASE + pint_map[d];
-        } else if (irq == PINT8_IRQ) {
-#if defined(CONFIG_CPU_SUBTYPE_SH7705) || defined(CONFIG_CPU_SUBTYPE_SH7707)
-                creg = PORT_PBCR;
-                dreg = PORT_PBDR;
-#else
-                creg = PORT_PFCR;
-                dreg = PORT_PFDR;
-#endif
-                sav = ctrl_inw(creg);
-                ctrl_outw(sav | (portcr_mask >> 16), creg);
-                d = (~ctrl_inb(dreg) ^ (ctrl_inw(INTC_ICR2) >> 8)) &
-                        (ctrl_inw(INTC_INTER) >> 8) & 0xff;
-                ctrl_outw(sav, creg);
-
-                if (d == 0)
-                        return irq;
-
-                return PINT_IRQ_BASE + 8 + pint_map[d];
-        }
-
-        return irq;
-}
-
diff --git a/arch/sh/kernel/cpu/sh3/Makefile b/arch/sh/kernel/cpu/sh3/Makefile
index 09faa056cd43..55b750763f66 100644
--- a/arch/sh/kernel/cpu/sh3/Makefile
+++ b/arch/sh/kernel/cpu/sh3/Makefile
@@ -10,16 +10,14 @@ obj-$(CONFIG_CPU_SUBTYPE_SH7706)	+= setup-sh7709.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7707)        += setup-sh7709.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7708)        += setup-sh7708.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7709)        += setup-sh7709.o
-obj-$(CONFIG_CPU_SUBTYPE_SH7300)        += setup-sh7300.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7710)        += setup-sh7710.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7712)        += setup-sh7710.o
 
 # Primary on-chip clocks (common)
 clock-$(CONFIG_CPU_SH3)                 := clock-sh3.o
-clock-$(CONFIG_CPU_SUBTYPE_SH7300)      := clock-sh7300.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7705)      := clock-sh7705.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7706)      := clock-sh7706.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7709)      := clock-sh7709.o
-clock-$(CONFIG_CPU_SUBTYPE_SH7710)      := clock-sh7300.o
+clock-$(CONFIG_CPU_SUBTYPE_SH7710)      := clock-sh7710.o
 
 obj-y   += $(clock-y)
diff --git a/arch/sh/kernel/cpu/sh3/clock-sh7300.c b/arch/sh/kernel/cpu/sh3/clock-sh7710.c
index e804174b9625..4744c50ec449 100644
--- a/arch/sh/kernel/cpu/sh3/clock-sh7300.c
+++ b/arch/sh/kernel/cpu/sh3/clock-sh7710.c
@@ -1,7 +1,7 @@
 /*
- * arch/sh/kernel/cpu/sh3/clock-sh7300.c
+ * arch/sh/kernel/cpu/sh3/clock-sh7710.c
  *
- * SH7300 support for the clock framework
+ * SH7710 support for the clock framework
  *
  *  Copyright (C) 2005  Paul Mundt
  *
@@ -29,7 +29,7 @@ static void master_clk_init(struct clk *clk)
         clk->rate *= md_table[ctrl_inw(FRQCR) & 0x0007];
 }
 
-static struct clk_ops sh7300_master_clk_ops = {
+static struct clk_ops sh7710_master_clk_ops = {
         .init           = master_clk_init,
 };
 
@@ -39,7 +39,7 @@ static void module_clk_recalc(struct clk *clk)
         clk->rate = clk->parent->rate / md_table[idx];
 }
 
-static struct clk_ops sh7300_module_clk_ops = {
+static struct clk_ops sh7710_module_clk_ops = {
         .recalc         = module_clk_recalc,
 };
 
@@ -49,7 +49,7 @@ static void bus_clk_recalc(struct clk *clk)
         clk->rate = clk->parent->rate / md_table[idx];
 }
 
-static struct clk_ops sh7300_bus_clk_ops = {
+static struct clk_ops sh7710_bus_clk_ops = {
         .recalc         = bus_clk_recalc,
 };
 
@@ -59,20 +59,20 @@ static void cpu_clk_recalc(struct clk *clk)
         clk->rate = clk->parent->rate / md_table[idx];
 }
 
-static struct clk_ops sh7300_cpu_clk_ops = {
+static struct clk_ops sh7710_cpu_clk_ops = {
         .recalc         = cpu_clk_recalc,
 };
 
-static struct clk_ops *sh7300_clk_ops[] = {
-        &sh7300_master_clk_ops,
-        &sh7300_module_clk_ops,
-        &sh7300_bus_clk_ops,
-        &sh7300_cpu_clk_ops,
+static struct clk_ops *sh7710_clk_ops[] = {
+        &sh7710_master_clk_ops,
+        &sh7710_module_clk_ops,
+        &sh7710_bus_clk_ops,
+        &sh7710_cpu_clk_ops,
 };
 
 void __init arch_init_clk_ops(struct clk_ops **ops, int idx)
 {
-        if (idx < ARRAY_SIZE(sh7300_clk_ops))
-                *ops = sh7300_clk_ops[idx];
+        if (idx < ARRAY_SIZE(sh7710_clk_ops))
+                *ops = sh7710_clk_ops[idx];
 }
 
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7300.c b/arch/sh/kernel/cpu/sh3/setup-sh7300.c
deleted file mode 100644
index ab4d204bfba5..000000000000
--- a/arch/sh/kernel/cpu/sh3/setup-sh7300.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * SH7300 Setup
- *
- *  Copyright (C) 2006  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/platform_device.h>
-#include <linux/init.h>
-#include <linux/serial.h>
-#include <asm/sci.h>
-
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xa4430000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCI,
-                .irqs           = { 80, 80, 80, 80 },
-        }, {
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
-        .name           = "sh-sci",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = sci_platform_data,
-        },
-};
-
-static struct platform_device *sh7300_devices[] __initdata = {
-        &sci_device,
-};
-
-static int __init sh7300_devices_setup(void)
-{
-        return platform_add_devices(sh7300_devices,
-                                    ARRAY_SIZE(sh7300_devices));
-}
-__initcall(sh7300_devices_setup);
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index 66c3f75647b2..98d28fb1ce16 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -90,12 +90,6 @@ int __init detect_cpu_and_cache_system(void)
                 current_cpu_data.type = CPU_SH7751;
                 current_cpu_data.flags |= CPU_HAS_FPU;
                 break;
-        case 0x2000:
-                current_cpu_data.type = CPU_SH73180;
-                current_cpu_data.icache.ways = 4;
-                current_cpu_data.dcache.ways = 4;
-                current_cpu_data.flags |= CPU_HAS_LLSC;
-                break;
         case 0x2001:
         case 0x2004:
                 current_cpu_data.type = CPU_SH7770;
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index b98d6c3e6f36..c21512c6044e 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -208,7 +208,6 @@ EXPORT_SYMBOL(sq_remap);
 void sq_unmap(unsigned long vaddr)
 {
         struct sq_mapping **p, *map;
-        struct vm_struct *vma;
         int page;
 
         for (p = &sq_mapping_list; (map = *p); p = &map->next)
@@ -225,11 +224,18 @@ void sq_unmap(unsigned long vaddr)
         bitmap_release_region(sq_bitmap, page, get_order(map->size));
 
 #ifdef CONFIG_MMU
-        vma = remove_vm_area((void *)(map->sq_addr & PAGE_MASK));
-        if (!vma) {
-                printk(KERN_ERR "%s: bad address 0x%08lx\n",
-                       __FUNCTION__, map->sq_addr);
-                return;
+        {
+                /*
+                 * Tear down the VMA in the MMU case.
+                 */
+                struct vm_struct *vma;
+
+                vma = remove_vm_area((void *)(map->sq_addr & PAGE_MASK));
+                if (!vma) {
+                        printk(KERN_ERR "%s: bad address 0x%08lx\n",
+                               __FUNCTION__, map->sq_addr);
+                        return;
+                }
         }
 #endif
 
diff --git a/arch/sh/kernel/cpu/sh4a/Makefile b/arch/sh/kernel/cpu/sh4a/Makefile
index 400623286487..e6a1fb5f8484 100644
--- a/arch/sh/kernel/cpu/sh4a/Makefile
+++ b/arch/sh/kernel/cpu/sh4a/Makefile
@@ -6,13 +6,11 @@
 obj-$(CONFIG_CPU_SUBTYPE_SH7770)        += setup-sh7770.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7780)        += setup-sh7780.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7785)        += setup-sh7785.o
-obj-$(CONFIG_CPU_SUBTYPE_SH73180)       += setup-sh73180.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7343)        += setup-sh7343.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7722)        += setup-sh7722.o
 obj-$(CONFIG_CPU_SUBTYPE_SHX3)          += setup-shx3.o
 
 # Primary on-chip clocks (common)
-clock-$(CONFIG_CPU_SUBTYPE_SH73180)     := clock-sh73180.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7770)      := clock-sh7770.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7780)      := clock-sh7780.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7785)      := clock-sh7785.o
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh73180.c b/arch/sh/kernel/cpu/sh4a/clock-sh73180.c
deleted file mode 100644
index 6d5ba373a75e..000000000000
--- a/arch/sh/kernel/cpu/sh4a/clock-sh73180.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * arch/sh/kernel/cpu/sh4a/clock-sh73180.c
- *
- * SH73180 support for the clock framework
- *
- *  Copyright (C) 2005  Paul Mundt
- *
- * FRQCR parsing hacked out of arch/sh/kernel/time.c
- *
- *  Copyright (C) 1999  Tetsuya Okada & Niibe Yutaka
- *  Copyright (C) 2000  Philipp Rumpf <prumpf@tux.org>
- *  Copyright (C) 2002, 2003, 2004  Paul Mundt
- *  Copyright (C) 2002  M. R. Brown  <mrbrown@linux-sh.org>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <asm/clock.h>
-#include <asm/freq.h>
-#include <asm/io.h>
-
-/*
- * SH73180 uses a common set of divisors, so this is quite simple..
- */
-static int divisors[] = { 1, 2, 3, 4, 6, 8, 12, 16 };
-
-static void master_clk_init(struct clk *clk)
-{
-        clk->rate *= divisors[ctrl_inl(FRQCR) & 0x0007];
-}
-
-static struct clk_ops sh73180_master_clk_ops = {
-        .init           = master_clk_init,
-};
-
-static void module_clk_recalc(struct clk *clk)
-{
-        int idx = (ctrl_inl(FRQCR) & 0x0007);
-        clk->rate = clk->parent->rate / divisors[idx];
-}
-
-static struct clk_ops sh73180_module_clk_ops = {
-        .recalc         = module_clk_recalc,
-};
-
-static void bus_clk_recalc(struct clk *clk)
-{
-        int idx = (ctrl_inl(FRQCR) >> 12) & 0x0007;
-        clk->rate = clk->parent->rate / divisors[idx];
-}
-
-static struct clk_ops sh73180_bus_clk_ops = {
-        .recalc         = bus_clk_recalc,
-};
-
-static void cpu_clk_recalc(struct clk *clk)
-{
-        int idx = (ctrl_inl(FRQCR) >> 20) & 0x0007;
-        clk->rate = clk->parent->rate / divisors[idx];
-}
-
-static struct clk_ops sh73180_cpu_clk_ops = {
-        .recalc         = cpu_clk_recalc,
-};
-
-static struct clk_ops *sh73180_clk_ops[] = {
-        &sh73180_master_clk_ops,
-        &sh73180_module_clk_ops,
-        &sh73180_bus_clk_ops,
-        &sh73180_cpu_clk_ops,
-};
-
-void __init arch_init_clk_ops(struct clk_ops **ops, int idx)
-{
-        if (idx < ARRAY_SIZE(sh73180_clk_ops))
-                *ops = sh73180_clk_ops[idx];
-}
-
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh73180.c b/arch/sh/kernel/cpu/sh4a/setup-sh73180.c
deleted file mode 100644
index cc9ea1e2e5df..000000000000
--- a/arch/sh/kernel/cpu/sh4a/setup-sh73180.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * SH73180 Setup
- *
- *  Copyright (C) 2006  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/platform_device.h>
-#include <linux/init.h>
-#include <linux/serial.h>
-#include <asm/sci.h>
-
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xffe80000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 80, 81, 83, 82 },
-        }, {
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
-        .name           = "sh-sci",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = sci_platform_data,
-        },
-};
-
-static struct platform_device *sh73180_devices[] __initdata = {
-        &sci_device,
-};
-
-static int __init sh73180_devices_setup(void)
-{
-        return platform_add_devices(sh73180_devices,
-                                    ARRAY_SIZE(sh73180_devices));
-}
-__initcall(sh73180_devices_setup);
diff --git a/arch/sh/kernel/init_task.c b/arch/sh/kernel/init_task.c
index 44053ea92936..4b449c4a6bad 100644
--- a/arch/sh/kernel/init_task.c
+++ b/arch/sh/kernel/init_task.c
@@ -3,7 +3,7 @@
 #include <linux/sched.h>
 #include <linux/init_task.h>
 #include <linux/mqueue.h>
-
+#include <linux/fs.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index 6334a4c54c7c..15ae322dbd74 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -18,6 +18,7 @@
 #include <linux/kdebug.h>
 #include <linux/tick.h>
 #include <linux/reboot.h>
+#include <linux/fs.h>
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
 #include <asm/pgalloc.h>
@@ -474,7 +475,6 @@ out:
 
 unsigned long get_wchan(struct task_struct *p)
 {
-        unsigned long schedule_frame;
         unsigned long pc;
 
         if (!p || p == current || p->state == TASK_RUNNING)
@@ -484,10 +484,13 @@ unsigned long get_wchan(struct task_struct *p)
          * The same comment as on the Alpha applies here, too ...
          */
         pc = thread_saved_pc(p);
+
+#ifdef CONFIG_FRAME_POINTER
         if (in_sched_functions(pc)) {
-                schedule_frame = (unsigned long)p->thread.sp;
+                unsigned long schedule_frame = (unsigned long)p->thread.sp;
                 return ((unsigned long *)schedule_frame)[21];
         }
+#endif
 
         return pc;
 }
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index c14a3e95d0b1..2cf7dec0d690 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -276,7 +276,6 @@ void __init setup_arch(char **cmdline_p)
 
 static const char *cpu_name[] = {
         [CPU_SH7206]    = "SH7206",     [CPU_SH7619]    = "SH7619",
-        [CPU_SH7300]    = "SH7300",
         [CPU_SH7705]    = "SH7705",     [CPU_SH7706]    = "SH7706",
         [CPU_SH7707]    = "SH7707",     [CPU_SH7708]    = "SH7708",
         [CPU_SH7709]    = "SH7709",     [CPU_SH7710]    = "SH7710",
@@ -284,7 +283,7 @@ static const char *cpu_name[] = {
         [CPU_SH7729]    = "SH7729",     [CPU_SH7750]    = "SH7750",
         [CPU_SH7750S]   = "SH7750S",    [CPU_SH7750R]   = "SH7750R",
         [CPU_SH7751]    = "SH7751",     [CPU_SH7751R]   = "SH7751R",
-        [CPU_SH7760]    = "SH7760",     [CPU_SH73180]   = "SH73180",
+        [CPU_SH7760]    = "SH7760",
         [CPU_ST40RA]    = "ST40RA",     [CPU_ST40GX1]   = "ST40GX1",
         [CPU_SH4_202]   = "SH4-202",    [CPU_SH4_501]   = "SH4-501",
         [CPU_SH7770]    = "SH7770",     [CPU_SH7780]    = "SH7780",
diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c
index 76b1bc7f7029..024ce5dedd8c 100644
--- a/arch/sh/kernel/sys_sh.c
+++ b/arch/sh/kernel/sys_sh.c
@@ -21,6 +21,7 @@
 #include <linux/file.h>
 #include <linux/utsname.h>
 #include <linux/module.h>
+#include <linux/fs.h>
 #include <asm/cacheflush.h>
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c
index 7aca37d79766..8a545d54e2d3 100644
--- a/arch/sh/kernel/timers/timer-tmu.c
+++ b/arch/sh/kernel/timers/timer-tmu.c
@@ -173,8 +173,7 @@ static int tmu_timer_init(void)
 
         tmu_timer_stop();
 
-#if !defined(CONFIG_CPU_SUBTYPE_SH7300) && \
-    !defined(CONFIG_CPU_SUBTYPE_SH7760) && \
+#if !defined(CONFIG_CPU_SUBTYPE_SH7760) && \
     !defined(CONFIG_CPU_SUBTYPE_SH7785) && \
     !defined(CONFIG_CPU_SUBTYPE_SHX3)
         ctrl_outb(TMU_TOCR_INIT, TMU_TOCR);
diff --git a/arch/sh/kernel/vsyscall/vsyscall.c b/arch/sh/kernel/vsyscall/vsyscall.c
index 2aa9438361bc..95f4de0800ec 100644
--- a/arch/sh/kernel/vsyscall/vsyscall.c
+++ b/arch/sh/kernel/vsyscall/vsyscall.c
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/elf.h>
 #include <linux/sched.h>
+#include <linux/err.h>
 
 /*
  * Should the kernel map a VDSO page into processes and pass its
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 70da1c8d407e..43f3972a5fb9 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -27,6 +27,7 @@ config CPU_SH4A
 config CPU_SH4AL_DSP
         bool
         select CPU_SH4A
+        select CPU_HAS_DSP
 
 config CPU_SUBTYPE_ST40
         bool
@@ -62,15 +63,10 @@ config CPU_SUBTYPE_SH7206
 
 # SH-3 Processor Support
 
-config CPU_SUBTYPE_SH7300
-        bool "Support SH7300 processor"
-        select CPU_SH3
-
 config CPU_SUBTYPE_SH7705
         bool "Support SH7705 processor"
         select CPU_SH3
         select CPU_HAS_IPR_IRQ
-        select CPU_HAS_PINT_IRQ
 
 config CPU_SUBTYPE_SH7706
         bool "Support SH7706 processor"
@@ -82,7 +78,6 @@ config CPU_SUBTYPE_SH7706
 config CPU_SUBTYPE_SH7707
         bool "Support SH7707 processor"
         select CPU_SH3
-        select CPU_HAS_PINT_IRQ
         help
           Select SH7707 if you have a  60 Mhz SH-3 HD6417707 CPU.
 
@@ -97,7 +92,6 @@ config CPU_SUBTYPE_SH7709
         bool "Support SH7709 processor"
         select CPU_SH3
         select CPU_HAS_IPR_IRQ
-        select CPU_HAS_PINT_IRQ
         help
           Select SH7709 if you have a  80 Mhz SH-3 HD6417709 CPU.
 
@@ -105,6 +99,7 @@ config CPU_SUBTYPE_SH7710
         bool "Support SH7710 processor"
         select CPU_SH3
         select CPU_HAS_IPR_IRQ
+        select CPU_HAS_DSP
         help
           Select SH7710 if you have a SH3-DSP SH7710 CPU.
 
@@ -112,6 +107,7 @@ config CPU_SUBTYPE_SH7712
         bool "Support SH7712 processor"
         select CPU_SH3
         select CPU_HAS_IPR_IRQ
+        select CPU_HAS_DSP
         help
           Select SH7712 if you have a SH3-DSP SH7712 CPU.
 
@@ -205,10 +201,6 @@ config CPU_SUBTYPE_SHX3
 
 # SH4AL-DSP Processor Support
 
-config CPU_SUBTYPE_SH73180
-        bool "Support SH73180 processor"
-        select CPU_SH4AL_DSP
-
 config CPU_SUBTYPE_SH7343
         bool "Support SH7343 processor"
         select CPU_SH4AL_DSP
diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c
index 981b04089055..86486326ef1d 100644
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
@@ -77,16 +77,8 @@ static void __init emit_cache_params(void)
 /*
  * SH-4 has virtually indexed and physically tagged cache.
  */
-
-/* Worst case assumed to be 64k cache, direct-mapped i.e. 4 synonym bits. */
-#define MAX_P3_MUTEXES 16
-
-struct mutex p3map_mutex[MAX_P3_MUTEXES];
-
 void __init p3_cache_init(void)
 {
-        int i;
-
         compute_alias(&current_cpu_data.icache);
         compute_alias(&current_cpu_data.dcache);
 
@@ -106,12 +98,6 @@ void __init p3_cache_init(void)
         }
 
         emit_cache_params();
-
-        if (ioremap_page_range(P3SEG, P3SEG + (PAGE_SIZE * 4), 0, PAGE_KERNEL))
-                panic("%s failed.", __FUNCTION__);
-
-        for (i = 0; i < current_cpu_data.dcache.n_aliases; i++)
-                mutex_init(&p3map_mutex[i]);
 }
 
 /*
diff --git a/arch/sh/mm/pg-sh4.c b/arch/sh/mm/pg-sh4.c
index df69da9ca69c..25f5c6f6821d 100644
--- a/arch/sh/mm/pg-sh4.c
+++ b/arch/sh/mm/pg-sh4.c
@@ -2,19 +2,45 @@
  * arch/sh/mm/pg-sh4.c
  *
  * Copyright (C) 1999, 2000, 2002  Niibe Yutaka
- * Copyright (C) 2002 - 2005  Paul Mundt
+ * Copyright (C) 2002 - 2007  Paul Mundt
  *
  * Released under the terms of the GNU GPL v2.0.
  */
 #include <linux/mm.h>
 #include <linux/mutex.h>
+#include <linux/fs.h>
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
 
-extern struct mutex p3map_mutex[];
-
 #define CACHE_ALIAS (current_cpu_data.dcache.alias_mask)
 
+static inline void *kmap_coherent(struct page *page, unsigned long addr)
+{
+        enum fixed_addresses idx;
+        unsigned long vaddr, flags;
+        pte_t pte;
+
+        inc_preempt_count();
+
+        idx = (addr & current_cpu_data.dcache.alias_mask) >> PAGE_SHIFT;
+        vaddr = __fix_to_virt(FIX_CMAP_END - idx);
+        pte = mk_pte(page, PAGE_KERNEL);
+
+        local_irq_save(flags);
+        flush_tlb_one(get_asid(), vaddr);
+        local_irq_restore(flags);
+
+        update_mmu_cache(NULL, vaddr, pte);
+
+        return (void *)vaddr;
+}
+
+static inline void kunmap_coherent(struct page *page)
+{
+        dec_preempt_count();
+        preempt_check_resched();
+}
+
 /*
  * clear_user_page
  * @to: P1 address
@@ -27,25 +53,9 @@ void clear_user_page(void *to, unsigned long address, struct page *page)
         if (((address ^ (unsigned long)to) & CACHE_ALIAS) == 0)
                 clear_page(to);
         else {
-                unsigned long phys_addr = PHYSADDR(to);
-                unsigned long p3_addr = P3SEG + (address & CACHE_ALIAS);
-                pgd_t *pgd = pgd_offset_k(p3_addr);
-                pud_t *pud = pud_offset(pgd, p3_addr);
-                pmd_t *pmd = pmd_offset(pud, p3_addr);
-                pte_t *pte = pte_offset_kernel(pmd, p3_addr);
-                pte_t entry;
-                unsigned long flags;
-
-                entry = pfn_pte(phys_addr >> PAGE_SHIFT, PAGE_KERNEL);
-                mutex_lock(&p3map_mutex[(address & CACHE_ALIAS)>>12]);
-                set_pte(pte, entry);
-                local_irq_save(flags);
-                flush_tlb_one(get_asid(), p3_addr);
-                local_irq_restore(flags);
-                update_mmu_cache(NULL, p3_addr, entry);
-                __clear_user_page((void *)p3_addr, to);
-                pte_clear(&init_mm, p3_addr, pte);
-                mutex_unlock(&p3map_mutex[(address & CACHE_ALIAS)>>12]);
+                void *vto = kmap_coherent(page, address);
+                __clear_user_page(vto, to);
+                kunmap_coherent(vto);
         }
 }
 
@@ -63,25 +73,9 @@ void copy_user_page(void *to, void *from, unsigned long address,
         if (((address ^ (unsigned long)to) & CACHE_ALIAS) == 0)
                 copy_page(to, from);
         else {
-                unsigned long phys_addr = PHYSADDR(to);
-                unsigned long p3_addr = P3SEG + (address & CACHE_ALIAS);
-                pgd_t *pgd = pgd_offset_k(p3_addr);
-                pud_t *pud = pud_offset(pgd, p3_addr);
-                pmd_t *pmd = pmd_offset(pud, p3_addr);
-                pte_t *pte = pte_offset_kernel(pmd, p3_addr);
-                pte_t entry;
-                unsigned long flags;
-
-                entry = pfn_pte(phys_addr >> PAGE_SHIFT, PAGE_KERNEL);
-                mutex_lock(&p3map_mutex[(address & CACHE_ALIAS)>>12]);
-                set_pte(pte, entry);
-                local_irq_save(flags);
-                flush_tlb_one(get_asid(), p3_addr);
-                local_irq_restore(flags);
-                update_mmu_cache(NULL, p3_addr, entry);
-                __copy_user_page((void *)p3_addr, from, to);
-                pte_clear(&init_mm, p3_addr, pte);
-                mutex_unlock(&p3map_mutex[(address & CACHE_ALIAS)>>12]);
+                void *vfrom = kmap_coherent(page, address);
+                __copy_user_page(vfrom, from, to);
+                kunmap_coherent(vfrom);
         }
 }
 
diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types
index 4b5e9305092e..439bfe3d29af 100644
--- a/arch/sh/tools/mach-types
+++ b/arch/sh/tools/mach-types
@@ -8,12 +8,10 @@
 SE                      SH_SOLUTION_ENGINE
 7751SE                  SH_7751_SOLUTION_ENGINE         
 7722SE                  SH_7722_SOLUTION_ENGINE         
-7300SE                  SH_7300_SOLUTION_ENGINE
 7343SE                  SH_7343_SOLUTION_ENGINE
 7206SE                  SH_7206_SOLUTION_ENGINE
 7619SE                  SH_7619_SOLUTION_ENGINE
 7780SE                  SH_7780_SOLUTION_ENGINE
-73180SE                 SH_73180_SOLUTION_ENGINE
 7751SYSTEMH             SH_7751_SYSTEMH
 HP6XX                   SH_HP6XX
 HD64461                 HD64461
diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index ff654204b7d4..5664631d8ae5 100644
--- a/arch/sh64/Kconfig
+++ b/arch/sh64/Kconfig
@@ -47,6 +47,9 @@ config ARCH_HAS_ILOG2_U64
         bool
         default n
 
+config ARCH_NO_VIRT_TO_BUS
+        def_bool y
+
 source init/Kconfig
 
 menu "System type"
diff --git a/arch/sh64/kernel/init_task.c b/arch/sh64/kernel/init_task.c
index de2d07db1f88..deee8bfd3270 100644
--- a/arch/sh64/kernel/init_task.c
+++ b/arch/sh64/kernel/init_task.c
@@ -14,7 +14,7 @@
 #include <linux/sched.h>
 #include <linux/init_task.h>
 #include <linux/mqueue.h>
-
+#include <linux/fs.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 
diff --git a/arch/sh64/kernel/irq_intc.c b/arch/sh64/kernel/irq_intc.c
index 42c07d2e71d9..3b63a93198f2 100644
--- a/arch/sh64/kernel/irq_intc.c
+++ b/arch/sh64/kernel/irq_intc.c
@@ -16,6 +16,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/stddef.h>
diff --git a/arch/sh64/kernel/pci-dma.c b/arch/sh64/kernel/pci-dma.c
index a36c3d71a3fe..a9328f894755 100644
--- a/arch/sh64/kernel/pci-dma.c
+++ b/arch/sh64/kernel/pci-dma.c
@@ -30,7 +30,7 @@ void *consistent_alloc(struct pci_dev *hwdev, size_t size,
 
         if (vp != NULL) {
                 memset(vp, 0, size);
-                *dma_handle = virt_to_bus(ret);
+                *dma_handle = virt_to_phys(ret);
                 dma_cache_wback_inv((unsigned long)ret, size);
         }
 
@@ -42,7 +42,7 @@ void consistent_free(struct pci_dev *hwdev, size_t size,
 {
         void *alloc;
 
-        alloc = bus_to_virt((unsigned long)dma_handle);
+        alloc = phys_to_virt((unsigned long)dma_handle);
         free_pages((unsigned long)alloc, get_order(size));
 
         iounmap(vaddr);
diff --git a/arch/sh64/kernel/process.c b/arch/sh64/kernel/process.c
index 1b89c9dfb93d..ceb9458abda4 100644
--- a/arch/sh64/kernel/process.c
+++ b/arch/sh64/kernel/process.c
@@ -21,6 +21,7 @@
  * This file handles the architecture-dependent parts of process handling..
  */
 #include <linux/mm.h>
+#include <linux/fs.h>
 #include <linux/ptrace.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
diff --git a/arch/sh64/kernel/sys_sh64.c b/arch/sh64/kernel/sys_sh64.c
index 19126daf9f4c..b7f18e298a20 100644
--- a/arch/sh64/kernel/sys_sh64.c
+++ b/arch/sh64/kernel/sys_sh64.c
@@ -19,6 +19,7 @@
 #include <linux/rwsem.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
+#include <linux/fs.h>
 #include <linux/smp.h>
 #include <linux/sem.h>
 #include <linux/msg.h>
diff --git a/arch/sh64/lib/dbg.c b/arch/sh64/lib/dbg.c
index 4310fc87444e..97816e0baf19 100644
--- a/arch/sh64/lib/dbg.c
+++ b/arch/sh64/lib/dbg.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
+#include <linux/fs.h>
 #include <asm/mmu_context.h>
 
 typedef u64 regType_t;
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c
index a57a366e339a..79d60d86f6f8 100644
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
@@ -1999,6 +1999,9 @@ void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, p
         unsigned long flags;
         int pseg;
 
+        if (vma->vm_mm->context == NO_CONTEXT)
+                return;
+
         local_irq_save(flags);
         address &= PAGE_MASK;
         if ((pseg = sun4c_get_segmap(address)) == invalid_segment) {
diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 368d3e97dfd9..629b00e3b0b0 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -157,7 +157,7 @@ static void tty_receive_char(struct tty_struct *tty, char ch)
 
 static int open_one_chan(struct chan *chan)
 {
-        int fd;
+        int fd, err;
 
         if(chan->opened)
                 return 0;
@@ -168,6 +168,13 @@ static int open_one_chan(struct chan *chan)
                                      chan->data, &chan->dev);
         if(fd < 0)
                 return fd;
+
+        err = os_set_fd_block(fd, 0);
+        if (err) {
+                (*chan->ops->close)(fd, chan->data);
+                return err;
+        }
+
         chan->fd = fd;
 
         chan->opened = 1;
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index d1d18c1ea0f4..ff5d8c9b96d9 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -32,7 +32,6 @@ obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 obj-$(CONFIG_IOMMU)             += pci-gart.o aperture.o
 obj-$(CONFIG_CALGARY_IOMMU)     += pci-calgary.o tce.o
 obj-$(CONFIG_SWIOTLB)           += pci-swiotlb.o
-obj-$(CONFIG_SERIAL_8250)       += legacy_serial.o
 obj-$(CONFIG_KPROBES)           += kprobes.o
 obj-$(CONFIG_X86_PM_TIMER)      += pmtimer.o
 obj-$(CONFIG_X86_VSMP)          += vsmp.o
@@ -51,7 +50,6 @@ CFLAGS_vsyscall.o		:= $(PROFILING) -g0
 
 therm_throt-y                   += ../../i386/kernel/cpu/mcheck/therm_throt.o
 bootflag-y                      += ../../i386/kernel/bootflag.o
-legacy_serial-y                 += ../../i386/kernel/legacy_serial.o
 cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
 topology-y                     += ../../i386/kernel/topology.o
 microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../i386/kernel/microcode.o
diff --git a/arch/x86_64/kernel/bugs.c b/arch/x86_64/kernel/bugs.c
index c3c6b91566ed..4e5e9d364d63 100644
--- a/arch/x86_64/kernel/bugs.c
+++ b/arch/x86_64/kernel/bugs.c
@@ -8,6 +8,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <asm/alternative.h>
+#include <asm/bugs.h>
 #include <asm/processor.h>
 #include <asm/mtrr.h>
 
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index 830cfc6ee8cb..1d232e5f5658 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -282,7 +282,7 @@ sysret_careful:
 sysret_signal:
         TRACE_IRQS_ON
         sti
-        testl $(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx
+        testl $(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx
         jz    1f
 
         /* Really a signal */
@@ -375,7 +375,7 @@ int_very_careful:
         jmp int_restore_rest
         
 int_signal:
-        testl $(_TIF_NOTIFY_RESUME|_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx
+        testl $(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx
         jz 1f
         movq %rsp,%rdi          # &ptregs -> arg1
         xorl %esi,%esi          # oldset -> arg2
@@ -599,7 +599,7 @@ retint_careful:
         jmp retint_check
         
 retint_signal:
-        testl $(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx
+        testl $(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx
         jz    retint_swapgs
         TRACE_IRQS_ON
         sti
diff --git a/arch/x86_64/kernel/tce.c b/arch/x86_64/kernel/tce.c
index 821527e7faa3..e3f2569b2c44 100644
--- a/arch/x86_64/kernel/tce.c
+++ b/arch/x86_64/kernel/tce.c
@@ -131,7 +131,7 @@ done:
         return ret;
 }
 
-int build_tce_table(struct pci_dev *dev, void __iomem *bbar)
+int __init build_tce_table(struct pci_dev *dev, void __iomem *bbar)
 {
         struct iommu_table *tbl;
         int ret;
diff --git a/drivers/Makefile b/drivers/Makefile
index a9e4c5f922a0..f0878b2ec55e 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -66,6 +66,7 @@ obj-y				+= i2c/
 obj-$(CONFIG_W1)                += w1/
 obj-$(CONFIG_POWER_SUPPLY)      += power/
 obj-$(CONFIG_HWMON)             += hwmon/
+obj-$(CONFIG_WATCHDOG)          += char/watchdog/
 obj-$(CONFIG_PHONE)             += telephony/
 obj-$(CONFIG_MD)                += md/
 obj-$(CONFIG_BT)                += bluetooth/
diff --git a/drivers/acorn/README b/drivers/acorn/README
deleted file mode 100644
index d399c09ca61c..000000000000
--- a/drivers/acorn/README
+++ /dev/null
@@ -1 +0,0 @@
-Drivers for the ACORN "podule" ARM specific bus.
diff --git a/drivers/acorn/block/Kconfig b/drivers/acorn/block/Kconfig
deleted file mode 100644
index a0ff25ea439f..000000000000
--- a/drivers/acorn/block/Kconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Block device driver configuration
-#
-
-menu "Acorn-specific block devices"
-        depends on ARCH_ARC || ARCH_A5K
-
-config BLK_DEV_FD1772
-        tristate "Old Archimedes floppy (1772) support"
-        depends on ARCH_ARC || ARCH_A5K
-        help
-          Support the floppy drive on the Acorn Archimedes (A300, A4x0, A540,
-          R140 and R260) series of computers; it supports only 720K floppies
-          at the moment. If you don't have one of these machines just answer
-          N.
-
-config BLK_DEV_MFM
-        tristate "MFM harddisk support"
-        depends on ARCH_ARC || ARCH_A5K
-        help
-          Support the MFM hard drives on the Acorn Archimedes both
-          on-board the A4x0 motherboards and via the Acorn MFM podules.
-          Drives up to 64MB are supported. If you haven't got one of these
-          machines or drives just say N.
-
-config BLK_DEV_MFM_AUTODETECT
-        bool "Autodetect hard drive geometry"
-        depends on BLK_DEV_MFM
-        help
-          If you answer Y, the MFM code will attempt to automatically detect
-          the cylinders/heads/sectors count on your hard drive. WARNING: This
-          sometimes doesn't work and it also does some dodgy stuff which
-          potentially might damage your drive.
-
-endmenu
-
diff --git a/drivers/acorn/block/Makefile b/drivers/acorn/block/Makefile
deleted file mode 100644
index 38a9afe8e03f..000000000000
--- a/drivers/acorn/block/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for the Acorn block device drivers.
-#
-
-fd1772_mod-objs := fd1772.o fd1772dma.o
-mfmhd_mod-objs  := mfmhd.o mfm.o
-
-obj-$(CONFIG_BLK_DEV_FD1772)    += fd1772_mod.o
-obj-$(CONFIG_BLK_DEV_MFM)       += mfmhd_mod.o
diff --git a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c
deleted file mode 100644
index d7e18ce8dad9..000000000000
--- a/drivers/acorn/block/fd1772.c
+++ /dev/null
@@ -1,1604 +0,0 @@
-/*
- *  linux/kernel/arch/arm/drivers/block/fd1772.c
- *  Based on ataflop.c in the m68k Linux
- *  Copyright (C) 1993  Greg Harp
- *  Atari Support by Bjoern Brauel, Roman Hodek
- *  Archimedes Support by Dave Gilbert (linux@treblig.org)
- *
- *  Big cleanup Sep 11..14 1994 Roman Hodek:
- *   - Driver now works interrupt driven
- *   - Support for two drives; should work, but I cannot test that :-(
- *   - Reading is done in whole tracks and buffered to speed up things
- *   - Disk change detection and drive deselecting after motor-off
- *     similar to TOS
- *   - Autodetection of disk format (DD/HD); untested yet, because I
- *     don't have an HD drive :-(
- *
- *  Fixes Nov 13 1994 Martin Schaller:
- *   - Autodetection works now
- *   - Support for 5 1/4" disks
- *   - Removed drive type (unknown on atari)
- *   - Do seeks with 8 Mhz
- *
- *  Changes by Andreas Schwab:
- *   - After errors in multiple read mode try again reading single sectors
- *  (Feb 1995):
- *   - Clean up error handling
- *   - Set blk_size for proper size checking
- *   - Initialize track register when testing presence of floppy
- *   - Implement some ioctl's
- *
- *  Changes by Torsten Lang:
- *   - When probing the floppies we should add the FDC1772CMDADD_H flag since
- *     the FDC1772 will otherwise wait forever when no disk is inserted...
- *
- *  Things left to do:
- *   - Formatting
- *   - Maybe a better strategy for disk change detection (does anyone
- *     know one?)
- *   - There are some strange problems left: The strangest one is
- *     that, at least on my TT (4+4MB), the first 2 Bytes of the last
- *     page of the TT-Ram (!) change their contents (some bits get
- *     set) while a floppy DMA is going on. But there are no accesses
- *     to these memory locations from the kernel... (I tested that by
- *     making the page read-only). I cannot explain what's going on...
- *   - Sometimes the drive-change-detection stops to work. The
- *     function is still called, but the WP bit always reads as 0...
- *     Maybe a problem with the status reg mode or a timing problem.
- *     Note 10/12/94: The change detection now seems to work reliably.
- *     There is no proof, but I've seen no hang for a long time...
- *
- * ARCHIMEDES changes: (gilbertd@cs.man.ac.uk)
- *     26/12/95 - Changed all names starting with FDC to FDC1772
- *                Removed all references to clock speed of FDC - we're stuck with 8MHz
- *                Modified disk_type structure to remove HD formats
- *
- *      7/ 1/96 - Wrote FIQ code, removed most remaining atariisms
- *
- *     13/ 1/96 - Well I think its read a single sector; but there is a problem
- *                fd_rwsec_done which is called in FIQ mode starts another transfer
- *                off (in fd_rwsec) while still in FIQ mode.  Because its still in
- *                FIQ mode it can't service the DMA and loses data. So need to
- *                heavily restructure.
- *     14/ 1/96 - Found that the definitions of the register numbers of the
- *                FDC were multiplied by 2 in the header for the 16bit words
- *                of the atari so half the writes were going in the wrong place.
- *                Also realised that the FIQ entry didn't make any attempt to
- *                preserve registers or return correctly; now in assembler.
- *
- *     11/ 2/96 - Hmm - doesn't work on real machine.  Auto detect doesn't
- *                and hacking that past seems to wait forever - check motor
- *                being turned on.
- *
- *     17/ 2/96 - still having problems - forcing track to -1 when selecting
- *                new drives seems to allow it to read first few sectors
- *                but then we get solid hangs at apparently random places
- *                which change depending what is happening.
- *
- *      9/ 3/96 - Fiddled a lot of stuff around to move to kernel 1.3.35
- *                A lot of fiddling in DMA stuff. Having problems with it
- *                constnatly thinking its timeing out. Ah - its timeout
- *                was set to (6*HZ) rather than jiffies+(6*HZ).  Now giving
- *                duff data!
- *
- *      5/ 4/96 - Made it use the new IOC_ macros rather than *ioc
- *                Hmm - giving unexpected FIQ and then timeouts
- *     18/ 8/96 - Ran through indent -kr -i8
- *                Some changes to disc change detect; don't know how well it
- *                works.
- *     24/ 8/96 - Put all the track buffering code back in from the atari
- *                code - I wonder if it will still work... No :-)
- *                Still works if I turn off track buffering.
- *     25/ 8/96 - Changed the timer expires that I'd added back to be 
- *                jiffies + ....; and it all sprang to life! Got 2.8K/sec
- *                off a cp -r of a 679K disc (showed 94% cpu usage!)
- *                (PC gets 14.3K/sec - 0% CPU!) Hmm - hard drive corrupt!
- *                Also perhaps that compile was with cache off.
- *                changed cli in fd_readtrack_check to cliIF
- *                changed vmallocs to kmalloc (whats the difference!!)
- *                Removed the busy wait loop in do_fd_request and replaced
- *                by a routine on tq_immediate; only 11% cpu on a dd off the
- *                raw disc - but the speed is the same.
- *      1/ 9/96 - Idea (failed!) - set the 'disable spin-up sequence'
- *                when we read the track if we know the motor is on; didn't
- *                help - perhaps we have to do it in stepping as well.
- *                Nope. Still doesn't help.
- *                Hmm - what seems to be happening is that fd_readtrack_check
- *                is never getting called. Its job is to terminate the read
- *                just after we think we should have got the data; otherwise
- *                the fdc takes 1 second to timeout; which is what's happening
- *                Now I can see 'readtrack_timer' being set (which should do the
- *                call); but it never seems to be called - hmm!
- *                OK - I've moved the check to my tq_immediate code -
- *                and it WORKS! 13.95K/second at 19% CPU.
- *                I wish I knew why that timer didn't work.....
- *
- *     16/11/96 - Fiddled and frigged for 2.0.18
- *
- * DAG 30/01/99 - Started frobbing for 2.2.1
- * DAG 20/06/99 - A little more frobbing:
- *                Included include/asm/uaccess.h for get_user/put_user
- *
- * DAG  1/09/00 - Dusted off for 2.4.0-test7
- *                MAX_SECTORS was name clashing so it is now FD1772_...
- *                Minor parameter, name layouts for 2.4.x differences
- */
-
-#include <linux/sched.h>
-#include <linux/fs.h>
-#include <linux/fcntl.h>
-#include <linux/slab.h>
-#include <linux/kernel.h>
-#include <linux/interrupt.h>
-#include <linux/timer.h>
-#include <linux/workqueue.h>
-#include <linux/fd.h>
-#include <linux/fd1772.h>
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/delay.h>
-#include <linux/mm.h>
-#include <linux/bitops.h>
-
-#include <asm/arch/oldlatches.h>
-#include <asm/dma.h>
-#include <asm/hardware.h>
-#include <asm/hardware/ioc.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/mach-types.h>
-#include <asm/pgtable.h>
-#include <asm/system.h>
-#include <asm/uaccess.h>
-
-
-/* Note: FD_MAX_UNITS could be redefined to 2 for the Atari (with
- * little additional rework in this file). But I'm not yet sure if
- * some other code depends on the number of floppies... (It is defined
- * in a public header!)
- */
-#if 0
-#undef FD_MAX_UNITS
-#define FD_MAX_UNITS    2
-#endif
-
-/* Ditto worries for Arc - DAG */
-#define FD_MAX_UNITS 4
-#define TRACKBUFFER 0
-/*#define DEBUG*/
-
-#ifdef DEBUG
-#define DPRINT(a)       printk a
-#else
-#define DPRINT(a)
-#endif
-
-static struct request_queue *floppy_queue;
-
-#define MAJOR_NR FLOPPY_MAJOR
-#define FLOPPY_DMA 0
-#define DEVICE_NAME "floppy"
-#define QUEUE (floppy_queue)
-#define CURRENT elv_next_request(floppy_queue)
-
-/* Disk types: DD */
-static struct archy_disk_type {
-        const char *name;
-        unsigned spt;           /* sectors per track */
-        unsigned blocks;        /* total number of blocks */
-        unsigned stretch;       /* track doubling ? */
-} disk_type[] = {
-
-        { "d360", 9, 720, 0 },                  /* 360kB diskette */
-        { "D360", 9, 720, 1 },                  /* 360kb in 720kb drive */
-        { "D720", 9, 1440, 0 },                 /* 720kb diskette (DD) */
-        /*{ "D820", 10,1640, 0}, *//* DD disk with 82 tracks/10 sectors 
-                                      - DAG - can't see how type detect can distinguish this
-                                      from 720K until it reads block 4 by which time its too late! */
-};
-
-#define NUM_DISK_TYPES (sizeof(disk_type)/sizeof(*disk_type))
-
-/*
- * Maximum disk size (in kilobytes). This default is used whenever the
- * current disk size is unknown.
- */
-#define MAX_DISK_SIZE 720
-
-static struct gendisk *disks[FD_MAX_UNIT];
-
-/* current info on each unit */
-static struct archy_floppy_struct {
-        int connected;          /* !=0 : drive is connected */
-        int autoprobe;          /* !=0 : do autoprobe       */
-
-        struct archy_disk_type *disktype;       /* current type of disk */
-
-        int track;              /* current head position or -1
-                                   * if unknown */
-        unsigned int steprate;  /* steprate setting */
-        unsigned int wpstat;    /* current state of WP signal
-                                   * (for disk change detection) */
-} unit[FD_MAX_UNITS];
-
-/* DAG: On Arc we spin on a flag being cleared by fdc1772_comendhandler which
-   is an assembler routine */
-extern void fdc1772_comendhandler(void);        /* Actually doens't have these parameters - see fd1772.S */
-extern volatile int fdc1772_comendstatus;
-extern volatile int fdc1772_fdc_int_done;
-
-#define FDC1772BASE ((0x210000>>2)|0x80000000)
-
-#define FDC1772_READ(reg) inb(FDC1772BASE+(reg/2))
-
-/* DAG: You wouldn't be silly to ask why FDC1772_WRITE is a function rather
-   than the #def below - well simple - the #def won't compile - and I
-   don't understand why (__outwc not defined) */
-/* NOTE: Reg is 0,2,4,6 as opposed to 0,1,2,3 or 0,4,8,12 to keep compatibility
-   with the ST version of fd1772.h */
-/*#define FDC1772_WRITE(reg,val) outw(val,(reg+FDC1772BASE)); */
-void FDC1772_WRITE(int reg, unsigned char val)
-{
-        if (reg == FDC1772REG_CMD) {
-                DPRINT(("FDC1772_WRITE new command 0x%x @ %d\n", val,jiffies));
-                if (fdc1772_fdc_int_done) {
-                        DPRINT(("FDC1772_WRITE: Hmm fdc1772_fdc_int_done true - resetting\n"));
-                        fdc1772_fdc_int_done = 0;
-                };
-        };
-        outb(val, (reg / 2) + FDC1772BASE);
-};
-
-#define FD1772_MAX_SECTORS      22
-
-unsigned char *DMABuffer;       /* buffer for writes */
-/*static unsigned long PhysDMABuffer; *//* physical address */
-/* DAG: On Arc we just go straight for the DMA buffer */
-#define PhysDMABuffer DMABuffer
-
-#ifdef TRACKBUFFER   
-unsigned char *TrackBuffer;       /* buffer for reads */
-#define PhysTrackBuffer TrackBuffer /* physical address */
-static int BufferDrive, BufferSide, BufferTrack;
-static int read_track;    /* non-zero if we are reading whole tracks */
-  
-#define SECTOR_BUFFER(sec)  (TrackBuffer + ((sec)-1)*512)
-#define IS_BUFFERED(drive,side,track) \
-    (BufferDrive == (drive) && BufferSide == (side) && BufferTrack == (track))
-#endif
-
-/*
- * These are global variables, as that's the easiest way to give
- * information to interrupts. They are the data used for the current
- * request.
- */
-static int SelectedDrive = 0;
-static int ReqCmd, ReqBlock;
-static int ReqSide, ReqTrack, ReqSector, ReqCnt;
-static int HeadSettleFlag = 0;
-static unsigned char *ReqData, *ReqBuffer;
-static int MotorOn = 0, MotorOffTrys;
-
-/* Synchronization of FDC1772 access. */
-static volatile int fdc_busy = 0;
-static DECLARE_WAIT_QUEUE_HEAD(fdc_wait);
-
-
-/* long req'd for set_bit --RR */
-static unsigned long changed_floppies = 0xff, fake_change = 0;
-#define CHECK_CHANGE_DELAY      HZ/2
-
-/* DAG - increased to 30*HZ - not sure if this is the correct thing to do */
-#define FD_MOTOR_OFF_DELAY      (10*HZ)
-#define FD_MOTOR_OFF_MAXTRY     (10*20)
-
-#define FLOPPY_TIMEOUT          (6*HZ)
-#define RECALIBRATE_ERRORS      4       /* After this many errors the drive
-                                         * will be recalibrated. */
-#define MAX_ERRORS              8       /* After this many errors the driver
-                                         * will give up. */
-
-#define START_MOTOR_OFF_TIMER(delay)                            \
-        do {                                                    \
-                motor_off_timer.expires = jiffies + (delay);    \
-                add_timer( &motor_off_timer );                  \
-                MotorOffTrys = 0;                               \
-        } while(0)
-
-#define START_CHECK_CHANGE_TIMER(delay)                         \
-        do {                                                    \
-                mod_timer(&fd_timer, jiffies + (delay));        \
-        } while(0)
-
-#define START_TIMEOUT()                                         \
-        do {                                                    \
-                mod_timer(&timeout_timer, jiffies+FLOPPY_TIMEOUT); \
-        } while(0)
-
-#define STOP_TIMEOUT()                                          \
-        do {                                                    \
-                del_timer( &timeout_timer );                    \
-        } while(0)
-
-#define ENABLE_IRQ() enable_irq(FIQ_FD1772+64);
-
-#define DISABLE_IRQ() disable_irq(FIQ_FD1772+64);
-
-static void fd1772_checkint(void);
-
-DECLARE_WORK(fd1772_tq, (void *)fd1772_checkint, NULL);
-/*
- * The driver is trying to determine the correct media format
- * while Probing is set. fd_rwsec_done() clears it after a
- * successful access.
- */
-static int Probing = 0;
-
-/* This flag is set when a dummy seek is necessary to make the WP
- * status bit accessible.
- */
-static int NeedSeek = 0;
-
-
-/***************************** Prototypes *****************************/
-
-static void fd_select_side(int side);
-static void fd_select_drive(int drive);
-static void fd_deselect(void);
-static void fd_motor_off_timer(unsigned long dummy);
-static void check_change(unsigned long dummy);
-static void floppy_irqconsequencehandler(void);
-static void fd_error(void);
-static void do_fd_action(int drive);
-static void fd_calibrate(void);
-static void fd_calibrate_done(int status);
-static void fd_seek(void);
-static void fd_seek_done(int status);
-static void fd_rwsec(void);
-#ifdef TRACKBUFFER   
-static void fd_readtrack_check( unsigned long dummy );  
-#endif
-static void fd_rwsec_done(int status);
-static void fd_times_out(unsigned long dummy);
-static void finish_fdc(void);
-static void finish_fdc_done(int dummy);
-static void floppy_off(unsigned int nr);
-static void setup_req_params(int drive);
-static void redo_fd_request(void);
-static int fd_ioctl(struct inode *inode, struct file *filp, unsigned int
-                    cmd, unsigned long param);
-static void fd_probe(int drive);
-static int fd_test_drive_present(int drive);
-static void config_types(void);
-static int floppy_open(struct inode *inode, struct file *filp);
-static int floppy_release(struct inode *inode, struct file *filp);
-static void do_fd_request(struct request_queue *);
-
-/************************* End of Prototypes **************************/
-
-static DEFINE_TIMER(motor_off_timer, fd_motor_off_timer, 0, 0);
-
-#ifdef TRACKBUFFER
-static DEFINE_TIMER(readtrack_timer, fd_readtrack_check, 0, 0);
-#endif
-
-static DEFINE_TIMER(timeout_timer, fd_times_out, 0, 0);
-
-static DEFINE_TIMER(fd_timer, check_change, 0, 0);
-
-/* DAG: Haven't got a clue what this is? */
-int stdma_islocked(void)
-{
-        return 0;
-};
-
-/* Select the side to use. */
-
-static void fd_select_side(int side)
-{
-        oldlatch_aupdate(LATCHA_SIDESEL, side ? 0 : LATCHA_SIDESEL);
-}
-
-
-/* Select a drive, update the FDC1772's track register
- */
-
-static void fd_select_drive(int drive)
-{
-#ifdef DEBUG
-        printk("fd_select_drive:%d\n", drive);
-#endif
-        /* Hmm - nowhere do we seem to turn the motor on - I'm going to do it here! */
-        oldlatch_aupdate(LATCHA_MOTOR | LATCHA_INUSE, 0);
-
-        if (drive == SelectedDrive)
-                return;
-
-        oldlatch_aupdate(LATCHA_FDSELALL, 0xf - (1 << drive));
-
-        /* restore track register to saved value */
-        FDC1772_WRITE(FDC1772REG_TRACK, unit[drive].track);
-        udelay(25);
-
-        SelectedDrive = drive;
-}
-
-
-/* Deselect both drives. */
-
-static void fd_deselect(void)
-{
-        unsigned long flags;
-
-        DPRINT(("fd_deselect\n"));
-
-        oldlatch_aupdate(LATCHA_FDSELALL | LATCHA_MOTOR | LATCHA_INUSE, 0xf | LATCHA_MOTOR | LATCHA_INUSE);
-
-        SelectedDrive = -1;
-}
-
-
-/* This timer function deselects the drives when the FDC1772 switched the
- * motor off. The deselection cannot happen earlier because the FDC1772
- * counts the index signals, which arrive only if one drive is selected.
- */
-
-static void fd_motor_off_timer(unsigned long dummy)
-{
-        unsigned long flags;
-        unsigned char status;
-        int delay;
-
-        del_timer(&motor_off_timer);
-
-        if (SelectedDrive < 0)
-                /* no drive selected, needn't deselect anyone */
-                return;
-
-        save_flags(flags);
-        cli();
-
-        if (fdc_busy)           /* was stdma_islocked */
-                goto retry;
-
-        status = FDC1772_READ(FDC1772REG_STATUS);
-
-        if (!(status & 0x80)) {
-                /*
-                 * motor already turned off by FDC1772 -> deselect drives
-                 * In actual fact its this deselection which turns the motor
-                 * off on the Arc, since the motor control is actually on
-                 * Latch A
-                 */
-                DPRINT(("fdc1772: deselecting in fd_motor_off_timer\n"));
-                fd_deselect();
-                MotorOn = 0;
-                restore_flags(flags);
-                return;
-        }
-        /* not yet off, try again */
-
-retry:
-        restore_flags(flags);
-        /* Test again later; if tested too often, it seems there is no disk
-         * in the drive and the FDC1772 will leave the motor on forever (or,
-         * at least until a disk is inserted). So we'll test only twice
-         * per second from then on...
-         */
-        delay = (MotorOffTrys < FD_MOTOR_OFF_MAXTRY) ?
-            (++MotorOffTrys, HZ / 20) : HZ / 2;
-        START_MOTOR_OFF_TIMER(delay);
-}
-
-
-/* This function is repeatedly called to detect disk changes (as good
- * as possible) and keep track of the current state of the write protection.
- */
-
-static void check_change(unsigned long dummy)
-{
-        static int drive = 0;
-
-        unsigned long flags;
-        int stat;
-
-        if (fdc_busy)
-                return;         /* Don't start poking about if the fdc is busy */
-
-        return;                 /* let's just forget it for the mo DAG */
-
-        if (++drive > 1 || !unit[drive].connected)
-                drive = 0;
-
-        save_flags(flags);
-        cli();
-
-        if (!stdma_islocked()) {
-                stat = !!(FDC1772_READ(FDC1772REG_STATUS) & FDC1772STAT_WPROT);
-
-                /* The idea here is that if the write protect line has changed then
-                the disc must have changed */
-                if (stat != unit[drive].wpstat) {
-                        DPRINT(("wpstat[%d] = %d\n", drive, stat));
-                        unit[drive].wpstat = stat;
-                        set_bit(drive, &changed_floppies);
-                }
-        }
-        restore_flags(flags);
-
-        START_CHECK_CHANGE_TIMER(CHECK_CHANGE_DELAY);
-}
-
-
-/* Handling of the Head Settling Flag: This flag should be set after each
- * seek operation, because we don't use seeks with verify.
- */
-
-static inline void set_head_settle_flag(void)
-{
-        HeadSettleFlag = FDC1772CMDADD_E;
-}
-
-static inline int get_head_settle_flag(void)
-{
-        int tmp = HeadSettleFlag;
-        HeadSettleFlag = 0;
-        return (tmp);
-}
-
-
-
-
-/* General Interrupt Handling */
-
-static inline void copy_buffer(void *from, void *to)
-{
-        ulong *p1 = (ulong *) from, *p2 = (ulong *) to;
-        int cnt;
-
-        for (cnt = 512 / 4; cnt; cnt--)
-                *p2++ = *p1++;
-}
-
-static void (*FloppyIRQHandler) (int status) = NULL;
-
-static void floppy_irqconsequencehandler(void)
-{
-        unsigned char status;
-        void (*handler) (int);
-
-        fdc1772_fdc_int_done = 0;
-
-        handler = FloppyIRQHandler;
-        FloppyIRQHandler = NULL;
-
-        if (handler) {
-                nop();
-                status = (unsigned char) fdc1772_comendstatus;
-                DPRINT(("FDC1772 irq, status = %02x handler = %08lx\n", (unsigned int) status, (unsigned long) handler));
-                handler(status);
-        } else {
-                DPRINT(("FDC1772 irq, no handler status=%02x\n", fdc1772_comendstatus));
-        }
-        DPRINT(("FDC1772 irq: end of floppy_irq\n"));
-}
-
-
-/* Error handling: If some error happened, retry some times, then
- * recalibrate, then try again, and fail after MAX_ERRORS.
- */
-
-static void fd_error(void)
-{
-        printk("FDC1772: fd_error\n");
-        /*panic("fd1772: fd_error"); *//* DAG tmp */
-        if (!CURRENT)
-                return;
-        CURRENT->errors++;
-        if (CURRENT->errors >= MAX_ERRORS) {
-                printk("fd%d: too many errors.\n", SelectedDrive);
-                end_request(CURRENT, 0);
-        } else if (CURRENT->errors == RECALIBRATE_ERRORS) {
-                printk("fd%d: recalibrating\n", SelectedDrive);
-                if (SelectedDrive != -1)
-                        unit[SelectedDrive].track = -1;
-        }
-        redo_fd_request();
-}
-
-
-
-#define SET_IRQ_HANDLER(proc) do { FloppyIRQHandler = (proc); } while(0)
-
-
-/* do_fd_action() is the general procedure for a fd request: All
- * required parameter settings (drive select, side select, track
- * position) are checked and set if needed. For each of these
- * parameters and the actual reading or writing exist two functions:
- * one that starts the setting (or skips it if possible) and one
- * callback for the "done" interrupt. Each done func calls the next
- * set function to propagate the request down to fd_rwsec_done().
- */
-
-static void do_fd_action(int drive)
-{
-        struct request *req;
-        DPRINT(("do_fd_action unit[drive].track=%d\n", unit[drive].track));
-
-#ifdef TRACKBUFFER
-repeat:
-
-        if (IS_BUFFERED( drive, ReqSide, ReqTrack )) {
-                req = CURRENT;
-                if (ReqCmd == READ) {
-                        copy_buffer( SECTOR_BUFFER(ReqSector), ReqData );
-                        if (++ReqCnt < req->current_nr_sectors) {
-                                /* read next sector */
-                                setup_req_params( drive );
-                                goto repeat;
-                        } else {
-                                /* all sectors finished */
-                                req->nr_sectors -= req->current_nr_sectors;
-                                req->sector += req->current_nr_sectors;
-                                end_request(req, 1);
-                                redo_fd_request();
-                                return;
-                        }
-                } else {
-                        /* cmd == WRITE, pay attention to track buffer
-                         * consistency! */
-                        copy_buffer( ReqData, SECTOR_BUFFER(ReqSector) );
-                }
-        }
-#endif
-
-        if (SelectedDrive != drive) {
-                /*unit[drive].track = -1; DAG */
-                fd_select_drive(drive);
-        };
-
-
-        if (unit[drive].track == -1)
-                fd_calibrate();
-        else if (unit[drive].track != ReqTrack << unit[drive].disktype->stretch)
-                fd_seek();
-        else
-                fd_rwsec();
-}
-
-
-/* Seek to track 0 if the current track is unknown */
-
-static void fd_calibrate(void)
-{
-        DPRINT(("fd_calibrate\n"));
-        if (unit[SelectedDrive].track >= 0) {
-                fd_calibrate_done(0);
-                return;
-        }
-        DPRINT(("fd_calibrate (after track compare)\n"));
-        SET_IRQ_HANDLER(fd_calibrate_done);
-        /* we can't verify, since the speed may be incorrect */
-        FDC1772_WRITE(FDC1772REG_CMD, FDC1772CMD_RESTORE | unit[SelectedDrive].steprate);
-
-        NeedSeek = 1;
-        MotorOn = 1;
-        START_TIMEOUT();
-        /* wait for IRQ */
-}
-
-
-static void fd_calibrate_done(int status)
-{
-        DPRINT(("fd_calibrate_done()\n"));
-        STOP_TIMEOUT();
-
-        /* set the correct speed now */
-        if (status & FDC1772STAT_RECNF) {
-                printk("fd%d: restore failed\n", SelectedDrive);
-                fd_error();
-        } else {
-                unit[SelectedDrive].track = 0;
-                fd_seek();
-        }
-}
-
-
-/* Seek the drive to the requested track. The drive must have been
- * calibrated at some point before this.
- */
-
-static void fd_seek(void)
-{
-        unsigned long flags;
-        DPRINT(("fd_seek() to track %d (unit[SelectedDrive].track=%d)\n", ReqTrack,
-                unit[SelectedDrive].track));
-        if (unit[SelectedDrive].track == ReqTrack <<
-            unit[SelectedDrive].disktype->stretch) {
-                fd_seek_done(0);
-                return;
-        }
-        FDC1772_WRITE(FDC1772REG_DATA, ReqTrack <<
-                      unit[SelectedDrive].disktype->stretch);
-        udelay(25);
-        save_flags(flags);
-        clf();
-        SET_IRQ_HANDLER(fd_seek_done);
-        FDC1772_WRITE(FDC1772REG_CMD, FDC1772CMD_SEEK | unit[SelectedDrive].steprate |
-                /* DAG */
-                (MotorOn?FDC1772CMDADD_H:0));
-
-        restore_flags(flags);
-        MotorOn = 1;
-        set_head_settle_flag();
-        START_TIMEOUT();
-        /* wait for IRQ */
-}
-
-
-static void fd_seek_done(int status)
-{
-        DPRINT(("fd_seek_done()\n"));
-        STOP_TIMEOUT();
-
-        /* set the correct speed */
-        if (status & FDC1772STAT_RECNF) {
-                printk("fd%d: seek error (to track %d)\n",
-                       SelectedDrive, ReqTrack);
-                /* we don't know exactly which track we are on now! */
-                unit[SelectedDrive].track = -1;
-                fd_error();
-        } else {
-                unit[SelectedDrive].track = ReqTrack <<
-                    unit[SelectedDrive].disktype->stretch;
-                NeedSeek = 0;
-                fd_rwsec();
-        }
-}
-
-
-/* This does the actual reading/writing after positioning the head
- * over the correct track.
- */
-
-#ifdef TRACKBUFFER
-static int MultReadInProgress = 0;
-#endif
-
-
-static void fd_rwsec(void)
-{
-        unsigned long paddr, flags;
-        unsigned int rwflag, old_motoron;
-        unsigned int track;
-
-        DPRINT(("fd_rwsec(), Sec=%d, Access=%c\n", ReqSector, ReqCmd == WRITE ? 'w' : 'r'));
-        if (ReqCmd == WRITE) {
-                /*cache_push( (unsigned long)ReqData, 512 ); */
-                paddr = (unsigned long) ReqData;
-                rwflag = 0x100;
-        } else {
-                paddr = (unsigned long) PhysDMABuffer;
-#ifdef TRACKBUFFER
-                if (read_track)
-                        paddr = (unsigned long)PhysTrackBuffer;
-#endif
-                rwflag = 0;
-        }
-
-        DPRINT(("fd_rwsec() before sidesel rwflag=%d sec=%d trk=%d\n", rwflag,
-                ReqSector, FDC1772_READ(FDC1772REG_TRACK)));
-        fd_select_side(ReqSide);
-
-        /*DPRINT(("fd_rwsec() before start sector \n")); */
-        /* Start sector of this operation */
-#ifdef TRACKBUFFER
-        FDC1772_WRITE( FDC1772REG_SECTOR, !read_track ? ReqSector : 1 );
-#else
-        FDC1772_WRITE( FDC1772REG_SECTOR, ReqSector );
-#endif
-
-        /* Cheat for track if stretch != 0 */
-        if (unit[SelectedDrive].disktype->stretch) {
-                track = FDC1772_READ(FDC1772REG_TRACK);
-                FDC1772_WRITE(FDC1772REG_TRACK, track >>
-                              unit[SelectedDrive].disktype->stretch);
-        }
-        udelay(25);
-
-        DPRINT(("fd_rwsec() before setup DMA \n"));
-        /* Setup DMA - Heavily modified by DAG */
-        save_flags(flags);
-        clf();
-        disable_dma(FLOPPY_DMA);
-        set_dma_mode(FLOPPY_DMA, rwflag ? DMA_MODE_WRITE : DMA_MODE_READ);
-        set_dma_addr(FLOPPY_DMA, (long) paddr);         /* DAG - changed from Atari specific */
-#ifdef TRACKBUFFER
-        set_dma_count(FLOPPY_DMA,(!read_track ? 1 : unit[SelectedDrive].disktype->spt)*512);
-#else
-        set_dma_count(FLOPPY_DMA, 512);         /* Block/sector size - going to have to change */
-#endif
-        SET_IRQ_HANDLER(fd_rwsec_done);
-        /* Turn on dma int */
-        enable_dma(FLOPPY_DMA);
-        /* Now give it something to do */
-        FDC1772_WRITE(FDC1772REG_CMD, (rwflag ? (FDC1772CMD_WRSEC | FDC1772CMDADD_P) : 
-#ifdef TRACKBUFFER
-              (FDC1772CMD_RDSEC | (read_track ? FDC1772CMDADD_M : 0) |
-              /* Hmm - the idea here is to stop the FDC spinning the disc
-              up when we know that we already still have it spinning */
-              (MotorOn?FDC1772CMDADD_H:0))
-#else
-              FDC1772CMD_RDSEC
-#endif
-                ));
-
-        restore_flags(flags);
-        DPRINT(("fd_rwsec() after DMA setup flags=0x%08x\n", flags));
-        /*sti(); *//* DAG - Hmm */
-        /* Hmm - should do something DAG */
-        old_motoron = MotorOn;
-        MotorOn = 1;
-        NeedSeek = 1;
-
-        /* wait for interrupt */
-
-#ifdef TRACKBUFFER
-        if (read_track) {
-                /*
-                 * If reading a whole track, wait about one disk rotation and
-                 * then check if all sectors are read. The FDC will even
-                 * search for the first non-existant sector and need 1 sec to
-                 * recognise that it isn't present :-(
-                 */
-                /* 1 rot. + 5 rot.s if motor was off  */
-                mod_timer(&readtrack_timer, jiffies + HZ/5 + (old_motoron ? 0 : HZ));
-                DPRINT(("Setting readtrack_timer to %d @ %d\n",
-                        readtrack_timer.expires,jiffies));
-                MultReadInProgress = 1;
-        }
-#endif
-
-        /*DPRINT(("fd_rwsec() before START_TIMEOUT \n")); */
-        START_TIMEOUT();
-        /*DPRINT(("fd_rwsec() after START_TIMEOUT \n")); */
-}
-
-
-#ifdef TRACKBUFFER
-
-static void fd_readtrack_check(unsigned long dummy)
-{
-        unsigned long flags, addr;
-        extern unsigned char *fdc1772_dataaddr;
-
-        DPRINT(("fd_readtrack_check @ %d\n",jiffies));
-
-        save_flags(flags);
-        clf();
-
-        del_timer( &readtrack_timer );
-
-        if (!MultReadInProgress) {
-                /* This prevents a race condition that could arise if the
-                 * interrupt is triggered while the calling of this timer
-                 * callback function takes place. The IRQ function then has
-                 * already cleared 'MultReadInProgress'  when control flow
-                 * gets here.
-                 */
-                restore_flags(flags);
-                return;
-        }
-
-        /* get the current DMA address */
-        addr=(unsigned long)fdc1772_dataaddr; /* DAG - ? */
-        DPRINT(("fd_readtrack_check: addr=%x PhysTrackBuffer=%x\n",addr,PhysTrackBuffer));
-
-        if (addr >= (unsigned int)PhysTrackBuffer + unit[SelectedDrive].disktype->spt*512) {
-                /* already read enough data, force an FDC interrupt to stop
-                 * the read operation
-                 */
-                SET_IRQ_HANDLER( NULL );
-                restore_flags(flags);
-                DPRINT(("fd_readtrack_check(): done\n"));
-                FDC1772_WRITE( FDC1772REG_CMD, FDC1772CMD_FORCI );
-                udelay(25);
-
-                /* No error until now -- the FDC would have interrupted
-                 * otherwise!
-                 */
-                fd_rwsec_done( 0 );
-        } else {
-                /* not yet finished, wait another tenth rotation */
-                restore_flags(flags);
-                DPRINT(("fd_readtrack_check(): not yet finished\n"));
-                readtrack_timer.expires = jiffies + HZ/5/10;
-                add_timer( &readtrack_timer );
-        }
-}
-
-#endif
-
-static void fd_rwsec_done(int status)
-{
-        unsigned int track;
-
-        DPRINT(("fd_rwsec_done() status=%d @ %d\n", status,jiffies));
-
-#ifdef TRACKBUFFER
-        if (read_track && !MultReadInProgress)
-                return;
-
-        MultReadInProgress = 0;
-
-        STOP_TIMEOUT();
-
-        if (read_track)
-                del_timer( &readtrack_timer );
-#endif
-
-
-        /* Correct the track if stretch != 0 */
-        if (unit[SelectedDrive].disktype->stretch) {
-                track = FDC1772_READ(FDC1772REG_TRACK);
-                FDC1772_WRITE(FDC1772REG_TRACK, track <<
-                              unit[SelectedDrive].disktype->stretch);
-        }
-        if (ReqCmd == WRITE && (status & FDC1772STAT_WPROT)) {
-                printk("fd%d: is write protected\n", SelectedDrive);
-                goto err_end;
-        }
-        if ((status & FDC1772STAT_RECNF)
-#ifdef TRACKBUFFER
-            /* RECNF is no error after a multiple read when the FDC
-             * searched for a non-existant sector!
-             */
-            && !(read_track &&
-               FDC1772_READ(FDC1772REG_SECTOR) > unit[SelectedDrive].disktype->spt)
-#endif
-            ) {
-                if (Probing) {
-                        if (unit[SelectedDrive].disktype > disk_type) {
-                                /* try another disk type */
-                                unit[SelectedDrive].disktype--;
-                                set_capacity(disks[SelectedDrive],
-                                    unit[SelectedDrive].disktype->blocks);
-                        } else
-                                Probing = 0;
-                } else {
-                        /* record not found, but not probing. Maybe stretch wrong ? Restart probing */
-                        if (unit[SelectedDrive].autoprobe) {
-                                unit[SelectedDrive].disktype = disk_type + NUM_DISK_TYPES - 1;
-                                set_capacity(disks[SelectedDrive],
-                                    unit[SelectedDrive].disktype->blocks);
-                                Probing = 1;
-                        }
-                }
-                if (Probing) {
-                        setup_req_params(SelectedDrive);
-#ifdef TRACKBUFFER
-                        BufferDrive = -1;
-#endif
-                        do_fd_action(SelectedDrive);
-                        return;
-                }
-                printk("fd%d: sector %d not found (side %d, track %d)\n",
-                       SelectedDrive, FDC1772_READ(FDC1772REG_SECTOR), ReqSide, ReqTrack);
-                goto err_end;
-        }
-        if (status & FDC1772STAT_CRC) {
-                printk("fd%d: CRC error (side %d, track %d, sector %d)\n",
-                       SelectedDrive, ReqSide, ReqTrack, FDC1772_READ(FDC1772REG_SECTOR));
-                goto err_end;
-        }
-        if (status & FDC1772STAT_LOST) {
-                printk("fd%d: lost data (side %d, track %d, sector %d)\n",
-                       SelectedDrive, ReqSide, ReqTrack, FDC1772_READ(FDC1772REG_SECTOR));
-                goto err_end;
-        }
-        Probing = 0;
-
-        if (ReqCmd == READ) {
-#ifdef TRACKBUFFER
-                if (!read_track) {
-                        /*cache_clear (PhysDMABuffer, 512);*/
-                        copy_buffer (DMABuffer, ReqData);
-                } else {
-                        /*cache_clear (PhysTrackBuffer, FD1772_MAX_SECTORS * 512);*/
-                        BufferDrive = SelectedDrive;
-                        BufferSide  = ReqSide;
-                        BufferTrack = ReqTrack;
-                        copy_buffer (SECTOR_BUFFER (ReqSector), ReqData);
-                }
-#else
-                /*cache_clear( PhysDMABuffer, 512 ); */
-                copy_buffer(DMABuffer, ReqData);
-#endif
-        }
-        if (++ReqCnt < CURRENT->current_nr_sectors) {
-                /* read next sector */
-                setup_req_params(SelectedDrive);
-                do_fd_action(SelectedDrive);
-        } else {
-                /* all sectors finished */
-                CURRENT->nr_sectors -= CURRENT->current_nr_sectors;
-                CURRENT->sector += CURRENT->current_nr_sectors;
-                end_request(CURRENT, 1);
-                redo_fd_request();
-        }
-        return;
-
-err_end:
-#ifdef TRACKBUFFER
-        BufferDrive = -1;
-#endif
-
-        fd_error();
-}
-
-
-static void fd_times_out(unsigned long dummy)
-{
-        SET_IRQ_HANDLER(NULL);
-        /* If the timeout occurred while the readtrack_check timer was
-         * active, we need to cancel it, else bad things will happen */
-        del_timer( &readtrack_timer ); 
-        FDC1772_WRITE(FDC1772REG_CMD, FDC1772CMD_FORCI);
-        udelay(25);
-
-        printk("floppy timeout\n");
-        STOP_TIMEOUT();         /* hmm - should we do this ? */
-        fd_error();
-}
-
-
-/* The (noop) seek operation here is needed to make the WP bit in the
- * FDC1772 status register accessible for check_change. If the last disk
- * operation would have been a RDSEC, this bit would always read as 0
- * no matter what :-( To save time, the seek goes to the track we're
- * already on.
- */
-
-static void finish_fdc(void)
-{
-        /* DAG - just try without this dummy seek! */
-        finish_fdc_done(0);
-        return;
-
-        if (!NeedSeek) {
-                finish_fdc_done(0);
-        } else {
-                DPRINT(("finish_fdc: dummy seek started\n"));
-                FDC1772_WRITE(FDC1772REG_DATA, unit[SelectedDrive].track);
-                SET_IRQ_HANDLER(finish_fdc_done);
-                FDC1772_WRITE(FDC1772REG_CMD, FDC1772CMD_SEEK);
-                MotorOn = 1;
-                START_TIMEOUT();
-                /* we must wait for the IRQ here, because the ST-DMA is
-                 * released immediately afterwards and the interrupt may be
-                 * delivered to the wrong driver.
-                 */
-        }
-}
-
-
-static void finish_fdc_done(int dummy)
-{
-        unsigned long flags;
-
-        DPRINT(("finish_fdc_done entered\n"));
-        STOP_TIMEOUT();
-        NeedSeek = 0;
-
-        if (timer_pending(&fd_timer) &&
-            time_after(jiffies + 5, fd_timer.expires)) 
-                /* If the check for a disk change is done too early after this
-                 * last seek command, the WP bit still reads wrong :-((
-                 */
-                mod_timer(&fd_timer, jiffies + 5);
-        else {
-                /*      START_CHECK_CHANGE_TIMER( CHECK_CHANGE_DELAY ); */
-        };
-        del_timer(&motor_off_timer);
-        START_MOTOR_OFF_TIMER(FD_MOTOR_OFF_DELAY);
-
-        save_flags(flags);
-        cli();
-        /* stdma_release(); - not sure if I should do something DAG  */
-        fdc_busy = 0;
-        wake_up(&fdc_wait);
-        restore_flags(flags);
-
-        DPRINT(("finish_fdc() finished\n"));
-}
-
-
-/* Prevent "aliased" accesses. */
-static int fd_ref[4];
-static int fd_device[4];
-
-/* dummy for blk.h */
-static void floppy_off(unsigned int nr)
-{
-}
-
-
-/* On the old arcs write protect depends on the particular model
-   of machine.  On the A310, R140, and A440 there is a disc changed
-   detect, however on the A4x0/1 range there is not.  There
-   is nothing to tell you which machine your on.
-   At the moment I'm just marking changed always. I've
-   left the Atari's 'change on write protect change' code in this
-   part (but nothing sets it).
-   RiscOS apparently checks the disc serial number etc. to detect changes
-   - but if it sees a disc change line go high (?) it flips to using
-   it. Well  maybe I'll add that in the future (!?)
-*/
-static int check_floppy_change(struct gendisk *disk)
-{
-        struct archy_floppy_struct *p = disk->private_data;
-        unsigned int drive = p - unit;
-
-        if (test_bit(drive, &fake_change)) {
-                /* simulated change (e.g. after formatting) */
-                return 1;
-        }
-        if (test_bit(drive, &changed_floppies)) {
-                /* surely changed (the WP signal changed at least once) */
-                return 1;
-        }
-        if (p->wpstat) {
-                /* WP is on -> could be changed: to be sure, buffers should be
-                   * invalidated...
-                 */
-                return 1;
-        }
-        return 1; /* DAG - was 0 */
-}
-
-static int floppy_revalidate(struct gendisk *disk)
-{
-        struct archy_floppy_struct *p = disk->private_data;
-        unsigned int drive = p - unit;
-
-        if (test_bit(drive, &changed_floppies) || test_bit(drive, &fake_change)
-            || unit[drive].disktype == 0) {
-#ifdef TRACKBUFFER
-                BufferDrive = -1;
-#endif
-                clear_bit(drive, &fake_change);
-                clear_bit(drive, &changed_floppies);
-                p->disktype = 0;
-        }
-        return 0;
-}
-
-/* This sets up the global variables describing the current request. */
-
-static void setup_req_params(int drive)
-{
-        int block = ReqBlock + ReqCnt;
-
-        ReqTrack = block / unit[drive].disktype->spt;
-        ReqSector = block - ReqTrack * unit[drive].disktype->spt + 1;
-        ReqSide = ReqTrack & 1;
-        ReqTrack >>= 1;
-        ReqData = ReqBuffer + 512 * ReqCnt;
-
-#ifdef TRACKBUFFER
-        read_track = (ReqCmd == READ && CURRENT->errors == 0);
-#endif
-
-        DPRINT(("Request params: Si=%d Tr=%d Se=%d Data=%08lx\n", ReqSide,
-                ReqTrack, ReqSector, (unsigned long) ReqData));
-}
-
-
-static void redo_fd_request(void)
-{
-        int drive, type;
-        struct archy_floppy_struct *floppy;
-
-        DPRINT(("redo_fd_request: CURRENT=%p dev=%s CURRENT->sector=%ld\n",
-                CURRENT, CURRENT ? CURRENT->rq_disk->disk_name : "",
-                CURRENT ? CURRENT->sector : 0));
-
-repeat:
-
-        if (!CURRENT)
-                goto the_end;
-
-        floppy = CURRENT->rq_disk->private_data;
-        drive = floppy - unit;
-        type = fd_device[drive];
-
-        if (!floppy->connected) {
-                /* drive not connected */
-                printk("Unknown Device: fd%d\n", drive);
-                end_request(CURRENT, 0);
-                goto repeat;
-        }
-        if (type == 0) {
-                if (!floppy->disktype) {
-                        Probing = 1;
-                        floppy->disktype = disk_type + NUM_DISK_TYPES - 1;
-                        set_capacity(disks[drive], floppy->disktype->blocks);
-                        floppy->autoprobe = 1;
-                }
-        } else {
-                /* user supplied disk type */
-                --type;
-                if (type >= NUM_DISK_TYPES) {
-                        printk("fd%d: invalid disk format", drive);
-                        end_request(CURRENT, 0);
-                        goto repeat;
-                }
-                floppy->disktype = &disk_type[type];
-                set_capacity(disks[drive], floppy->disktype->blocks);
-                floppy->autoprobe = 0;
-        }
-
-        if (CURRENT->sector + 1 > floppy->disktype->blocks) {
-                end_request(CURRENT, 0);
-                goto repeat;
-        }
-        /* stop deselect timer */
-        del_timer(&motor_off_timer);
-
-        ReqCnt = 0;
-        ReqCmd = rq_data_dir(CURRENT);
-        ReqBlock = CURRENT->sector;
-        ReqBuffer = CURRENT->buffer;
-        setup_req_params(drive);
-        do_fd_action(drive);
-
-        return;
-
-the_end:
-        finish_fdc();
-}
-
-static void fd1772_checkint(void)
-{
-        extern int fdc1772_bytestogo;
-
-        /*printk("fd1772_checkint %d\n",fdc1772_fdc_int_done);*/
-        if (fdc1772_fdc_int_done)
-                floppy_irqconsequencehandler();
-        if ((MultReadInProgress) && (fdc1772_bytestogo==0)) fd_readtrack_check(0);
-        if (fdc_busy) {
-                schedule_work(&fd1772_tq);
-        }
-}
-
-static void do_fd_request(struct request_queue* q)
-{
-        unsigned long flags;
-
-        DPRINT(("do_fd_request for pid %d\n", current->pid));
-        if (fdc_busy) return;
-        save_flags(flags);
-        cli();
-        wait_event(fdc_wait, !fdc_busy);
-        fdc_busy = 1;
-        ENABLE_IRQ();
-        restore_flags(flags);
-
-        fdc1772_fdc_int_done = 0;
-
-        redo_fd_request();
-
-        schedule_work(&fd1772_tq);
-}
-
-
-static int invalidate_drive(struct block_device *bdev)
-{
-        struct archy_floppy_struct *p = bdev->bd_disk->private_data;
-        /* invalidate the buffer track to force a reread */
-#ifdef TRACKBUFFER
-        BufferDrive = -1;
-#endif
-
-        set_bit(p - unit, &fake_change);
-        return 0;
-}
-
-static int fd_ioctl(struct inode *inode, struct file *filp,
-                    unsigned int cmd, unsigned long param)
-{
-        struct block_device *bdev = inode->i_bdev;
-
-        switch (cmd) {
-        case FDFMTEND:
-        case FDFLUSH:
-                invalidate_drive(bdev);
-                check_disk_change(bdev);
-        case FDFMTBEG:
-                return 0;
-        default:
-                return -EINVAL;
-        }
-}
-
-
-/* Initialize the 'unit' variable for drive 'drive' */
-
-static void fd_probe(int drive)
-{
-        unit[drive].connected = 0;
-        unit[drive].disktype = NULL;
-
-        if (!fd_test_drive_present(drive))
-                return;
-
-        unit[drive].connected = 1;
-        unit[drive].track = -1; /* If we put the auto detect back in this can go to 0 */
-        unit[drive].steprate = FDC1772STEP_6;
-        MotorOn = 1;            /* from probe restore operation! */
-}
-
-
-/* This function tests the physical presence of a floppy drive (not
- * whether a disk is inserted). This is done by issuing a restore
- * command, waiting max. 2 seconds (that should be enough to move the
- * head across the whole disk) and looking at the state of the "TR00"
- * signal. This should now be raised if there is a drive connected
- * (and there is no hardware failure :-) Otherwise, the drive is
- * declared absent.
- */
-
-static int fd_test_drive_present(int drive)
-{
-        unsigned long timeout;
-        unsigned char status;
-        int ok;
-
-        printk("fd_test_drive_present %d\n", drive);
-        if (drive > 1)
-                return (0);
-        return (1);             /* Simple hack for the moment - the autodetect doesn't seem to work on arc */
-        fd_select_drive(drive);
-
-        /* disable interrupt temporarily */
-        DISABLE_IRQ();
-        FDC1772_WRITE(FDC1772REG_TRACK, 0x00);  /* was ff00 why? */
-        FDC1772_WRITE(FDC1772REG_CMD, FDC1772CMD_RESTORE | FDC1772CMDADD_H | FDC1772STEP_6);
-
-        /*printk("fd_test_drive_present: Going into timeout loop\n"); */
-        for (ok = 0, timeout = jiffies + 2 * HZ + HZ / 2; time_before(jiffies, timeout);) {
-                /*  What does this piece of atariism do? - query for an interrupt? */
-                /*  if (!(mfp.par_dt_reg & 0x20))
-                   break; */
-                /* Well this is my nearest guess - quit when we get an FDC interrupt */
-                if (ioc_readb(IOC_FIQSTAT) & 2)
-                        break;
-        }
-
-        /*printk("fd_test_drive_present: Coming out of timeout loop\n"); */
-        status = FDC1772_READ(FDC1772REG_STATUS);
-        ok = (status & FDC1772STAT_TR00) != 0;
-
-        /*printk("fd_test_drive_present: ok=%d\n",ok); */
-        /* force interrupt to abort restore operation (FDC1772 would try
-         * about 50 seconds!) */
-        FDC1772_WRITE(FDC1772REG_CMD, FDC1772CMD_FORCI);
-        udelay(500);
-        status = FDC1772_READ(FDC1772REG_STATUS);
-        udelay(20);
-        /*printk("fd_test_drive_present: just before OK code %d\n",ok); */
-
-        if (ok) {
-                /* dummy seek command to make WP bit accessible */
-                FDC1772_WRITE(FDC1772REG_DATA, 0);
-                FDC1772_WRITE(FDC1772REG_CMD, FDC1772CMD_SEEK);
-                printk("fd_test_drive_present: just before wait for int\n");
-                /* DAG: Guess means wait for interrupt */
-                while (!(ioc_readb(IOC_FIQSTAT) & 2));
-                printk("fd_test_drive_present: just after wait for int\n");
-                status = FDC1772_READ(FDC1772REG_STATUS);
-        }
-        printk("fd_test_drive_present: just before ENABLE_IRQ\n");
-        ENABLE_IRQ();
-        printk("fd_test_drive_present: about to return\n");
-        return (ok);
-}
-
-
-/* Look how many and which kind of drives are connected. If there are
- * floppies, additionally start the disk-change and motor-off timers.
- */
-
-static void config_types(void)
-{
-        int drive, cnt = 0;
-
-        printk("Probing floppy drive(s):\n");
-        for (drive = 0; drive < FD_MAX_UNITS; drive++) {
-                fd_probe(drive);
-                if (unit[drive].connected) {
-                        printk("fd%d\n", drive);
-                        ++cnt;
-                }
-        }
-
-        if (FDC1772_READ(FDC1772REG_STATUS) & FDC1772STAT_BUSY) {
-                /* If FDC1772 is still busy from probing, give it another FORCI
-                 * command to abort the operation. If this isn't done, the FDC1772
-                 * will interrupt later and its IRQ line stays low, because
-                 * the status register isn't read. And this will block any
-                 * interrupts on this IRQ line :-(
-                 */
-                FDC1772_WRITE(FDC1772REG_CMD, FDC1772CMD_FORCI);
-                udelay(500);
-                FDC1772_READ(FDC1772REG_STATUS);
-                udelay(20);
-        }
-        if (cnt > 0) {
-                START_MOTOR_OFF_TIMER(FD_MOTOR_OFF_DELAY);
-                if (cnt == 1)
-                        fd_select_drive(0);
-                /*START_CHECK_CHANGE_TIMER( CHECK_CHANGE_DELAY ); */
-        }
-}
-
-/*
- * floppy_open check for aliasing (/dev/fd0 can be the same as
- * /dev/PS0 etc), and disallows simultaneous access to the same
- * drive with different device numbers.
- */
-
-static int floppy_open(struct inode *inode, struct file *filp)
-{
-        int drive = iminor(inode) & 3;
-        int type =  iminor(inode) >> 2;
-        int old_dev = fd_device[drive];
-
-        if (fd_ref[drive] && old_dev != type)
-                return -EBUSY;
-
-        if (fd_ref[drive] == -1 || (fd_ref[drive] && filp->f_flags & O_EXCL))
-                return -EBUSY;
-
-        if (filp->f_flags & O_EXCL)
-                fd_ref[drive] = -1;
-        else
-                fd_ref[drive]++;
-
-        fd_device[drive] = type;
-
-        if (filp->f_flags & O_NDELAY)
-                return 0;
-
-        if (filp->f_mode & 3) {
-                check_disk_change(inode->i_bdev);
-                if (filp->f_mode & 2) {
-                        if (unit[drive].wpstat) {
-                                floppy_release(inode, filp);
-                                return -EROFS;
-                        }
-                }
-        }
-        return 0;
-}
-
-
-static int floppy_release(struct inode *inode, struct file *filp)
-{
-        int drive = iminor(inode) & 3;
-
-        if (fd_ref[drive] < 0)
-                fd_ref[drive] = 0;
-        else if (!fd_ref[drive]--) {
-                printk("floppy_release with fd_ref == 0");
-                fd_ref[drive] = 0;
-        }
-
-        return 0;
-}
-
-static struct block_device_operations floppy_fops =
-{
-        .open           = floppy_open,
-        .release        = floppy_release,
-        .ioctl          = fd_ioctl,
-        .media_changed  = check_floppy_change,
-        .revalidate_disk= floppy_revalidate,
-};
-
-static struct kobject *floppy_find(dev_t dev, int *part, void *data)
-{
-        int drive = *part & 3;
-        if ((*part >> 2) > NUM_DISK_TYPES || drive >= FD_MAX_UNITS)
-                return NULL;
-        *part = 0;
-        return get_disk(disks[drive]);
-}
-
-int fd1772_init(void)
-{
-        static DEFINE_SPINLOCK(lock);
-        int i, err = -ENOMEM;
-
-        if (!machine_is_archimedes())
-                return 0;
-
-        for (i = 0; i < FD_MAX_UNITS; i++) {
-                disks[i] = alloc_disk(1);
-                if (!disks[i])
-                        goto err_disk;
-        }
-
-        err = register_blkdev(MAJOR_NR, "fd");
-        if (err)
-                goto err_disk;
-
-        err = -EBUSY;
-        if (request_dma(FLOPPY_DMA, "fd1772")) {
-                printk("Unable to grab DMA%d for the floppy (1772) driver\n", FLOPPY_DMA);
-                goto err_blkdev;
-        };
-
-        if (request_dma(FIQ_FD1772, "fd1772 end")) {
-                printk("Unable to grab DMA%d for the floppy (1772) driver\n", FIQ_FD1772);
-                goto err_dma1;
-        };
-
-        /* initialize variables */
-        SelectedDrive = -1;
-#ifdef TRACKBUFFER
-        BufferDrive = BufferSide = BufferTrack = -1;
-        /* Atari uses 512 - I want to eventually cope with 1K sectors */
-        DMABuffer = kmalloc((FD1772_MAX_SECTORS+1)*512,GFP_KERNEL);
-        TrackBuffer = DMABuffer + 512;
-#else
-        /* Allocate memory for the DMAbuffer - on the Atari this takes it
-           out of some special memory... */
-        DMABuffer = kmalloc(2048);      /* Copes with pretty large sectors */
-#endif
-        err = -ENOMEM;
-        if (!DMAbuffer)
-                goto err_dma2;
-
-        enable_dma(FIQ_FD1772); /* This inserts a call to our command end routine */
-
-        floppy_queue = blk_init_queue(do_fd_request, &lock);
-        if (!floppy_queue)
-                goto err_queue;
-
-        for (i = 0; i < FD_MAX_UNITS; i++) {
-                unit[i].track = -1;
-                disks[i]->major = MAJOR_NR;
-                disks[i]->first_minor = 0;
-                disks[i]->fops = &floppy_fops;
-                sprintf(disks[i]->disk_name, "fd%d", i);
-                disks[i]->private_data = &unit[i];
-                disks[i]->queue = floppy_queue;
-                set_capacity(disks[i], MAX_DISK_SIZE * 2);
-        }
-        blk_register_region(MKDEV(MAJOR_NR, 0), 256, THIS_MODULE,
-                                floppy_find, NULL, NULL);
-
-        for (i = 0; i < FD_MAX_UNITS; i++)
-                add_disk(disks[i]);
-
-        config_types();
-
-        return 0;
-
- err_queue:
-        kfree(DMAbuffer);
- err_dma2:
-        free_dma(FIQ_FD1772);
-
- err_dma1:
-        free_dma(FLOPPY_DMA);
-
- err_blkdev:
-        unregister_blkdev(MAJOR_NR, "fd");
-
- err_disk:
-        while (i--)
-                put_disk(disks[i]);
-        return err;
-}
diff --git a/drivers/acorn/block/fd1772dma.S b/drivers/acorn/block/fd1772dma.S
deleted file mode 100644
index 7964435443ec..000000000000
--- a/drivers/acorn/block/fd1772dma.S
+++ /dev/null
@@ -1,100 +0,0 @@
-#include <asm/hardware.h>
-
-@ Code for DMA with the 1772 fdc
-.text
-
-
-  .global fdc1772_dataaddr
-fdc1772_fiqdata:
-@ Number of bytes left to DMA
-  .global fdc1772_bytestogo
-fdc1772_bytestogo:
-  .word 0
-@ Place to put/get data from in DMA
-  .global fdc1772_dataaddr
-fdc1772_dataaddr:
-  .word 0
-  
-  .global fdc1772_fdc_int_done
-fdc1772_fdc_int_done:
-  .word 0
-  .global fdc1772_comendstatus
-fdc1772_comendstatus:
-  .word 0
-
-@ We hang this off DMA channel 1
-    .global fdc1772_comendhandler
-fdc1772_comendhandler:
-  mov      r8,#IOC_BASE
-  ldrb     r9,[r8,#0x34]    @ IOC FIQ status
-  tst      r9,#2
-  subeqs   pc,r14,#4        @ should I leave a space here
-  orr      r9,r8,#0x10000   @ FDC base
-  adr      r8,fdc1772_fdc_int_done
-  ldrb     r10,[r9,#0]  @ FDC status
-  mov      r9,#1        @ Got a FIQ flag
-  stmia    r8,{r9,r10}
-  subs     pc,r14,#4
-
-
-    .global fdc1772_dma_read
-fdc1772_dma_read:
-  mov      r8,#IOC_BASE
-  ldrb     r9,[r8,#0x34]    @ IOC FIQ status
-  tst      r9,#1
-  beq      fdc1772_dma_read_notours
-  orr      r8,r8,#0x10000   @ FDC base
-  ldrb     r10,[r8,#0xc]   @ Read from FDC data reg (also clears interrupt)
-  ldmia    r11,{r8,r9}
-  subs     r8,r8,#1        @ One less byte to go
-  @ If there was somewhere for this data to go then store it and update pointers
-  strplb   r10,[r9],#1     @ Store the data and increment the pointer
-  stmplia  r11,{r8,r9}     @ Update count/pointers
-  @ Handle any other interrupts if there are any
-fdc1772_dma_read_notours:
-  @ Cant branch because this code has been copied down to the FIQ vector
-  ldr pc,[pc,#-4]
-  .word fdc1772_comendhandler
-  .global fdc1772_dma_read_end
-fdc1772_dma_read_end:
-
-    .global fdc1772_dma_write
-fdc1772_dma_write:
-  mov      r8,#IOC_BASE
-  ldrb     r9,[r8,#0x34]    @ IOC FIQ status
-  tst      r9,#1
-  beq      fdc1772_dma_write_notours
-  orr      r8,r8,#0x10000   @ FDC base
-  ldmia    r11,{r9,r10}
-  subs     r9,r9,#1        @ One less byte to go
-  @ If there really is some data then get it, store it and update count
-  ldrplb   r12,[r10],#1
-  strplb   r12,[r8,#0xc]   @ write it to FDC data reg
-  stmplia  r11,{r9,r10}    @ Update count and pointer - should clear interrupt
-  @ Handle any other interrupts
-fdc1772_dma_write_notours:
-  @ Cant branch because this code has been copied down to the FIQ vector
-  ldr pc,[pc,#-4]
-  .word fdc1772_comendhandler
-
-  .global fdc1772_dma_write_end
-fdc1772_dma_write_end:
-  
-
-@ Setup the FIQ R11 to point to the data and store the count, address
-@ for this dma
-@ R0=count
-@ R1=address
-  .global fdc1772_setupdma
-fdc1772_setupdma:
-        @ The big job is flipping in and out of FIQ mode
-        adr     r2,fdc1772_fiqdata      @ This is what we really came here for
-  stmia  r2,{r0,r1}
-        mov     r3, pc
-        teqp    pc,#0x0c000001  @ Disable FIQs, IRQs and switch to FIQ mode
-        mov     r0,r0           @ NOP
-        mov r11,r2
-        teqp    r3,#0           @ Normal mode
-        mov     r0,r0           @ NOP
-  mov pc,r14
-
diff --git a/drivers/acorn/block/mfm.S b/drivers/acorn/block/mfm.S
deleted file mode 100644
index c90cbd41ce21..000000000000
--- a/drivers/acorn/block/mfm.S
+++ /dev/null
@@ -1,162 +0,0 @@
-@ Read/Write DMA code for the ST506/MFM hard drive controllers on the A400 Acorn Archimedes
-@   motherboard and on ST506 expansion podules.
-@ (c) David Alan Gilbert (linux@treblig.org) 1996-1999
-
-#include <asm/assembler.h>
- 
-hdc63463_irqdata:
-@ Controller base address
-  .global hdc63463_baseaddress
-hdc63463_baseaddress:
-  .word 0
-
-  .global hdc63463_irqpolladdress
-hdc63463_irqpolladdress:
-  .word 0
- 
-  .global hdc63463_irqpollmask
-hdc63463_irqpollmask:
-  .word 0
-
-@ where to read/write data  from the kernel data space
-  .global hdc63463_dataptr
-hdc63463_dataptr:
-  .word 0
-
-@ Number of bytes left to transfer
-  .global hdc63463_dataleft
-hdc63463_dataleft:
-  .word 0
-
-@ -------------------------------------------------------------------------
-@ hdc63463_writedma: DMA from host to controller
-@  internal reg usage: r0=hdc base address, r1=irq poll address, r2=poll mask
-@                      r3=data ptr, r4=data left, r5,r6=temporary
-  .global hdc63463_writedma
-hdc63463_writedma:
-  stmfd sp!,{r4-r7}
-  adr r5,hdc63463_irqdata
-  ldmia r5,{r0,r1,r2,r3,r4}
-
-writedma_again:
-
-  @ test number of remaining bytes to transfer
-  cmp r4,#0
-  beq writedma_end
-  bmi writedma_end
-
-  @ Check the hdc is interrupting
-  ldrb r5,[r1,#0]
-  tst r5,r2
-  beq writedma_end
-
-  @ Transfer a block of upto 256 bytes
-  cmp r4,#256
-  movlt r7,r4
-  movge r7,#256
-
-  @ Check the hdc is still busy and command has not ended and no errors
-  ldr r5,[r0,#32]     @ Status reg - 16 bit - its the top few bits which are status
-  @ think we should continue DMA until it drops busy - perhaps this was
-  @ the main problem with corrected errors causing a hang
-  @tst r5,#0x3c00        @ Test for things which should be off
-  @bne writedma_end
-  and r5,r5,#0x8000        @ This is test for things which should be on: Busy
-  cmp r5,#0x8000
-  bne writedma_end 
-
-  @ Bytes remaining at end
-  sub r4,r4,r7
-
-  @ HDC Write register location
-  add r0,r0,#32+8
-
-writedma_loop:
-  @ OK - pretty sure we should be doing this
-
-  ldr r5,[r3],#4          @ Get a word to be written
-  @ get bottom half to be sent first
-  mov r6,r5,lsl#16        @ Separate the first 2 bytes
-  orr r2,r6,r6,lsr #16    @ Duplicate them in the bottom half of the word
-  @ now the top half
-  mov r6,r5,lsr#16        @ Get 2nd 2 bytes
-  orr r6,r6,r6,lsl#16     @ Duplicate
-  @str r6,[r0]       @ to hdc
-  stmia r0,{r2,r6}
-  subs r7,r7,#4           @ Dec. number of bytes left
-  bne writedma_loop
-
-  @ If we were too slow we had better go through again - DAG - took out with new interrupt routine
-  @ sub r0,r0,#32+8
-  @ adr r2,hdc63463_irqdata
-  @ ldr r2,[r2,#8]
-  @ b writedma_again
-
-writedma_end:
-  adr r5,hdc63463_irqdata+12
-  stmia r5,{r3,r4}
-  ldmfd sp!,{r4-r7}
-  RETINSTR(mov,pc,lr)
-
-@ -------------------------------------------------------------------------
-@ hdc63463_readdma: DMA from controller to host
-@  internal reg usage: r0=hdc base address, r1=irq poll address, r2=poll mask
-@                      r3=data ptr, r4=data left, r5,r6=temporary
-  .global hdc63463_readdma
-hdc63463_readdma:
-  stmfd sp!,{r4-r7}
-  adr r5,hdc63463_irqdata
-  ldmia r5,{r0,r1,r2,r3,r4}
-
-readdma_again:
-  @ test number of remaining bytes to transfer
-  cmp r4,#0
-  beq readdma_end
-  bmi readdma_end
-
-  @ Check the hdc is interrupting
-  ldrb r5,[r1,#0]
-  tst r5,r2
-  beq readdma_end
-
-  @ Check the hdc is still busy and command has not ended and no errors
-  ldr r5,[r0,#32]     @ Status reg - 16 bit - its the top few bits which are status
-  @ think we should continue DMA until it drops busy - perhaps this was
-  @ the main problem with corrected errors causing a hang
-  @tst r5,#0x3c00      @ Test for things which should be off
-  @bne readdma_end
-  and r5,r5,#0x8000        @ This is test for things which should be on: Busy
-  cmp r5,#0x8000
-  bne readdma_end 
-
-  @ Transfer a block of upto 256 bytes
-  cmp r4,#256
-  movlt r7,r4
-  movge r7,#256
-
-  @ Bytes remaining at end
-  sub r4,r4,r7
-
-  @ Set a pointer to the data register in the HDC
-  add r0,r0,#8
-readdma_loop:
-  @ OK - pretty sure we should be doing this
-  ldmia r0,{r5,r6}
-  mov r5,r5,lsl#16
-  mov r6,r6,lsl#16
-  orr r6,r6,r5,lsr #16
-  str r6,[r3],#4
-  subs r7,r7,#4        @ Decrement bytes to go
-  bne readdma_loop
-
-  @ Try reading multiple blocks - if this was fast enough then I do not think
-  @ this should help - NO taken out DAG - new interrupt handler has
-  @ non-consecutive memory blocks
-  @ sub r0,r0,#8
-  @ b readdma_again
-
-readdma_end:
-  adr r5,hdc63463_irqdata+12
-  stmia r5,{r3,r4}
-  ldmfd sp!,{r4-r7}
-  RETINSTR(mov,pc,lr)
diff --git a/drivers/acorn/block/mfmhd.c b/drivers/acorn/block/mfmhd.c
deleted file mode 100644
index 74058db674db..000000000000
--- a/drivers/acorn/block/mfmhd.c
+++ /dev/null
@@ -1,1385 +0,0 @@
-/*
- * linux/drivers/acorn/block/mfmhd.c
- *
- * Copyright (C) 1995, 1996 Russell King, Dave Alan Gilbert (gilbertd@cs.man.ac.uk)
- *
- * MFM hard drive code [experimental]
- */
-
-/*
- * Change list:
- *
- *  3/2/96:DAG: Started a change list :-)
- *              Set the hardsect_size pointers up since we are running 256 byte
- *                sectors
- *              Added DMA code, put it into the rw_intr
- *              Moved RCAL out of generic interrupt code - don't want to do it
- *                while DMA'ing - its now in individual handlers.
- *              Took interrupt handlers off task queue lists and called
- *                directly - not sure of implications.
- *
- * 18/2/96:DAG: Well its reading OK I think, well enough for image file code
- *              to find the image file; but now I've discovered that I actually
- *              have to put some code in for image files.
- *
- *              Added stuff for image files; seems to work, but I've not
- *              got a multisegment image file (I don't think!).
- *              Put in a hack (yep a real hack) for multiple cylinder reads.
- *              Not convinced its working.
- *
- *  5/4/96:DAG: Added asm/hardware.h and use IOC_ macros
- *              Rewrote dma code in mfm.S (again!) - now takes a word at a time
- *              from main RAM for speed; still doesn't feel speedy!
- *
- * 20/4/96:DAG: After rewriting mfm.S a heck of a lot of times and speeding
- *              things up, I've finally figured out why its so damn slow.
- *              Linux is only reading a block at a time, and so you never
- *              get more than 1K per disc revoloution ~=60K/second.
- *
- * 27/4/96:DAG: On Russell's advice I change ll_rw_blk.c to ask it to
- *              join adjacent blocks together. Everything falls flat on its
- *              face.
- *              Four hours of debugging later; I hadn't realised that
- *              ll_rw_blk would be so generous as to join blocks whose
- *              results aren't going into consecutive buffers.
- * 
- *              OK; severe rehacking of mfm_rw_interrupt; now end_request's
- *              as soon as its DMA'd each request.  Odd thing is that
- *              we are sometimes getting interrupts where we are not transferring
- *              any data; why? Is that what happens when you miss? I doubt
- *              it; are we too fast? No - its just at command ends. Got 240K/s
- *              better than before, but RiscOS hits 480K/s
- *
- * 25/6/96:RMK: Fixed init code to allow the MFM podule to work.  Increased the
- *              number of errors for my Miniscribe drive (8425).
- *
- * 30/6/96:DAG: Russell suggested that a check drive 0 might turn the LEDs off
- *              - so in request_done just before it clears Busy it sends a
- *              check drive 0 - and the LEDs go off!!!!
- *
- *              Added test for mainboard controller. - Removes need for separate
- *              define.
- *
- * 13/7/96:DAG: Changed hardware sectore size to 512 in attempt to make
- *              IM drivers work.
- * 21/7/96:DAG: Took out old image file stuff (accessing it now produces an IO
- *              error.)
- *
- * 17/8/96:DAG: Ran through indent -kr -i8; evil - all my nice 2 character indents
- *              gone :-( Hand modified afterwards.
- *              Took out last remains of the older image map system.
- *
- * 22/9/96:DAG: Changed mfm.S so it will carry on DMA'ing til; BSY is dropped
- *              Changed mfm_rw_intr so that it doesn't follow the error
- *              code until BSY is dropped. Nope - still broke. Problem
- *              may revolve around when it reads the results for the error
- *              number?
- *
- *16/11/96:DAG: Modified for 2.0.18; request_irq changed
- *
- *17/12/96:RMK: Various cleanups, reorganisation, and the changes for new IO system.
- *              Improved probe for onboard MFM chip - it was hanging on my A5k.
- *              Added autodetect CHS code such that we don't rely on the presence
- *              of an ADFS boot block.  Added ioport resource manager calls so
- *              that we don't clash with already-running hardware (eg. RiscPC Ether
- *              card slots if someone tries this)!
- *
- * 17/1/97:RMK: Upgraded to 2.1 kernels.
- *
- *  4/3/98:RMK: Changed major number to 21.
- *
- * 27/6/98:RMK: Changed asm/delay.h to linux/delay.h for mdelay().
- */
-
-/*
- * Possible enhancements:
- *  Multi-thread the code so that it is possible that while one drive
- *  is seeking, the other one can be reading data/seeking as well.
- *  This would be a performance boost with dual drive systems.
- */
-
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/errno.h>
-#include <linux/genhd.h>
-#include <linux/major.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/blkpg.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include <asm/dma.h>
-#include <asm/hardware.h>
-#include <asm/ecard.h>
-#include <asm/hardware/ioc.h>
-
-static void (*do_mfm)(void) = NULL;
-static struct request_queue *mfm_queue;
-static DEFINE_SPINLOCK(mfm_lock);
-
-#define MAJOR_NR        MFM_ACORN_MAJOR
-#define QUEUE (mfm_queue)
-#define CURRENT elv_next_request(mfm_queue)
-
-/*
- * Configuration section
- *
- * This is the maximum number of drives that we accept
- */
-#define MFM_MAXDRIVES 2
-/*
- * Linux I/O address of onboard MFM controller or 0 to disable this
- */
-#define ONBOARD_MFM_ADDRESS ((0x002d0000 >> 2) | 0x80000000)
-/*
- * Uncomment this to enable debugging in the MFM driver...
- */
-#ifndef DEBUG
-/*#define DEBUG */
-#endif
-/*
- * End of configuration
- */
-
- 
-/*
- * This structure contains all information to do with a particular physical
- * device.
- */
-struct mfm_info {
-        unsigned char sectors;
-        unsigned char heads;
-        unsigned short cylinders;
-        unsigned short lowcurrent;
-        unsigned short precomp;
-#define NO_TRACK -1
-#define NEED_1_RECAL -2
-#define NEED_2_RECAL -3
-                 int cylinder;
-        struct {
-                char recal;
-                char report;
-                char abort;
-        } errors;
-} mfm_info[MFM_MAXDRIVES];
-
-#define MFM_DRV_INFO mfm_info[raw_cmd.dev]
-
-/* Stuff from the assembly routines */
-extern unsigned int hdc63463_baseaddress;       /* Controller base address */
-extern unsigned int hdc63463_irqpolladdress;    /* Address to read to test for int */
-extern unsigned int hdc63463_irqpollmask;       /* Mask for irq register */
-extern unsigned int hdc63463_dataptr;   /* Pointer to kernel data space to DMA */
-extern int hdc63463_dataleft;   /* Number of bytes left to transfer */
-
-
-
-
-static int lastspecifieddrive;
-static unsigned Busy;
-
-static unsigned int PartFragRead;       /* The number of sectors which have been read
-                                           during a partial read split over two
-                                           cylinders.  If 0 it means a partial
-                                           read did not occur. */
-
-static unsigned int PartFragRead_RestartBlock;  /* Where to restart on a split access */
-static unsigned int PartFragRead_SectorsLeft;   /* Where to restart on a split access */
-
-static int Sectors256LeftInCurrent;     /* i.e. 256 byte sectors left in current */
-static int SectorsLeftInRequest;        /* i.e. blocks left in the thing mfm_request was called for */
-static int Copy_Sector;         /* The 256 byte sector we are currently at - fragments need to know 
-                                   where to take over */
-static char *Copy_buffer;
-
-
-static void mfm_seek(void);
-static void mfm_rerequest(void);
-static void mfm_request(void);
-static void mfm_specify (void);
-static void issue_request(unsigned int block, unsigned int nsect,
-                          struct request *req);
-
-static unsigned int mfm_addr;           /* Controller address */
-static unsigned int mfm_IRQPollLoc;     /* Address to read for IRQ information */
-static unsigned int mfm_irqenable;      /* Podule IRQ enable location */
-static unsigned char mfm_irq;           /* Interrupt number */
-static int mfm_drives = 0;              /* drives available */
-static int mfm_status = 0;              /* interrupt status */
-static int *errors;
-
-static struct rawcmd {
-        unsigned int dev;
-        unsigned int cylinder;
-        unsigned int head;
-        unsigned int sector;
-        unsigned int cmdtype;
-        unsigned int cmdcode;
-        unsigned char cmddata[16];
-        unsigned int cmdlen;
-} raw_cmd;
-
-static unsigned char result[16];
-
-static struct cont {
-        void (*interrupt) (void);       /* interrupt handler */
-        void (*error) (void);   /* error handler */
-        void (*redo) (void);    /* redo handler */
-        void (*done) (int st);  /* done handler */
-} *cont = NULL;
-
-#if 0
-static struct tq_struct mfm_tq = {0, 0, (void (*)(void *)) NULL, 0};
-#endif
-
-int number_mfm_drives = 1;
-
-/* ------------------------------------------------------------------------------------------ */
-/*
- * From the HD63463 data sheet from Hitachi Ltd.
- */
-
-#define MFM_COMMAND (mfm_addr + 0)
-#define MFM_DATAOUT (mfm_addr + 1)
-#define MFM_STATUS  (mfm_addr + 8)
-#define MFM_DATAIN  (mfm_addr + 9)
-
-#define CMD_ABT         0xF0    /* Abort */
-#define CMD_SPC         0xE8    /* Specify */
-#define CMD_TST         0xE0    /* Test */
-#define CMD_RCLB        0xC8    /* Recalibrate */
-#define CMD_SEK         0xC0    /* Seek */
-#define CMD_WFS         0xAB    /* Write Format Skew */
-#define CMD_WFM         0xA3    /* Write Format */
-#define CMD_MTB         0x90    /* Memory to buffer */
-#define CMD_CMPD        0x88    /* Compare data */
-#define CMD_WD          0x87    /* Write data */
-#define CMD_RED         0x70    /* Read erroneous data */
-#define CMD_RIS         0x68    /* Read ID skew */
-#define CMD_FID         0x61    /* Find ID */
-#define CMD_RID         0x60    /* Read ID */
-#define CMD_BTM         0x50    /* Buffer to memory */
-#define CMD_CKD         0x48    /* Check data */
-#define CMD_RD          0x40    /* Read data */
-#define CMD_OPBW        0x38    /* Open buffer write */
-#define CMD_OPBR        0x30    /* Open buffer read */
-#define CMD_CKV         0x28    /* Check drive */
-#define CMD_CKE         0x20    /* Check ECC */
-#define CMD_POD         0x18    /* Polling disable */
-#define CMD_POL         0x10    /* Polling enable */
-#define CMD_RCAL        0x08    /* Recall */
-
-#define STAT_BSY        0x8000  /* Busy */
-#define STAT_CPR        0x4000  /* Command Parameter Rejection */
-#define STAT_CED        0x2000  /* Command end */
-#define STAT_SED        0x1000  /* Seek end */
-#define STAT_DER        0x0800  /* Drive error */
-#define STAT_ABN        0x0400  /* Abnormal end */
-#define STAT_POL        0x0200  /* Polling */
-
-/* ------------------------------------------------------------------------------------------ */
-#ifdef DEBUG
-static void console_printf(const char *fmt,...)
-{
-        static char buffer[2048];       /* Arbitary! */
-        extern void console_print(const char *);
-        unsigned long flags;
-        va_list ap;
-
-        local_irq_save(flags);
-
-        va_start(ap, fmt);
-        vsprintf(buffer, fmt, ap);
-        console_print(buffer);
-        va_end(fmt);
-
-        local_irq_restore(flags);
-};      /* console_printf */
-
-#define DBG(x...) console_printf(x)
-#else
-#define DBG(x...)
-#endif
-
-static void print_status(void)
-{
-        char *error;
-        static char *errors[] = {
-         "no error",
-         "command aborted",
-         "invalid command",
-         "parameter error",
-         "not initialised",
-         "rejected TEST",
-         "no useld",
-         "write fault",
-         "not ready",
-         "no scp",
-         "in seek",
-         "invalid NCA",
-         "invalid step rate",
-         "seek error",
-         "over run",
-         "invalid PHA",
-         "data field EEC error",
-         "data field CRC error",
-         "error corrected",
-         "data field fatal error",
-         "no data am",
-         "not hit",
-         "ID field CRC error",
-         "time over",
-         "no ID am",
-         "not writable"
-        };
-        if (result[1] < 0x65)
-                error = errors[result[1] >> 2];
-        else
-                error = "unknown";
-        printk("(");
-        if (mfm_status & STAT_BSY) printk("BSY ");
-        if (mfm_status & STAT_CPR) printk("CPR ");
-        if (mfm_status & STAT_CED) printk("CED ");
-        if (mfm_status & STAT_SED) printk("SED ");
-        if (mfm_status & STAT_DER) printk("DER ");
-        if (mfm_status & STAT_ABN) printk("ABN ");
-        if (mfm_status & STAT_POL) printk("POL ");
-        printk(") SSB = %X (%s)\n", result[1], error);
-
-}
-
-/* ------------------------------------------------------------------------------------- */
-
-static void issue_command(int command, unsigned char *cmdb, int len)
-{
-        int status;
-#ifdef DEBUG
-        int i;
-        console_printf("issue_command: %02X: ", command);
-        for (i = 0; i < len; i++)
-                console_printf("%02X ", cmdb[i]);
-        console_printf("\n");
-#endif
-
-        do {
-                status = inw(MFM_STATUS);
-        } while (status & (STAT_BSY | STAT_POL));
-        DBG("issue_command: status after pol/bsy loop: %02X:\n ", status >> 8);
-
-        if (status & (STAT_CPR | STAT_CED | STAT_SED | STAT_DER | STAT_ABN)) {
-                outw(CMD_RCAL, MFM_COMMAND);
-                while (inw(MFM_STATUS) & STAT_BSY);
-        }
-        status = inw(MFM_STATUS);
-        DBG("issue_command: status before parameter issue: %02X:\n ", status >> 8);
-
-        while (len > 0) {
-                outw(cmdb[1] | (cmdb[0] << 8), MFM_DATAOUT);
-                len -= 2;
-                cmdb += 2;
-        }
-        status = inw(MFM_STATUS);
-        DBG("issue_command: status before command issue: %02X:\n ", status >> 8);
-
-        outw(command, MFM_COMMAND);
-        status = inw(MFM_STATUS);
-        DBG("issue_command: status immediately after command issue: %02X:\n ", status >> 8);
-}
-
-static void wait_for_completion(void)
-{
-        while ((mfm_status = inw(MFM_STATUS)) & STAT_BSY);
-}
-
-static void wait_for_command_end(void)
-{
-        int i;
-
-        while (!((mfm_status = inw(MFM_STATUS)) & STAT_CED));
-
-        for (i = 0; i < 16;) {
-                int in;
-                in = inw(MFM_DATAIN);
-                result[i++] = in >> 8;
-                result[i++] = in;
-        }
-        outw (CMD_RCAL, MFM_COMMAND);
-}
-
-/* ------------------------------------------------------------------------------------- */
-
-static void mfm_rw_intr(void)
-{
-        int old_status;         /* Holds status on entry, we read to see if the command just finished */
-#ifdef DEBUG
-        console_printf("mfm_rw_intr...dataleft=%d\n", hdc63463_dataleft);
-        print_status();
-#endif
-
-  /* Now don't handle the error until BSY drops */
-        if ((mfm_status & (STAT_DER | STAT_ABN)) && ((mfm_status&STAT_BSY)==0)) {
-                /* Something has gone wrong - let's try that again */
-                outw(CMD_RCAL, MFM_COMMAND);    /* Clear interrupt condition */
-                if (cont) {
-                        DBG("mfm_rw_intr: DER/ABN err\n");
-                        cont->error();
-                        cont->redo();
-                };
-                return;
-        };
-
-        /* OK so what ever happened it's not an error, now I reckon we are left between
-           a choice of command end or some data which is ready to be collected */
-        /* I think we have to transfer data while the interrupt line is on and its
-           not any other type of interrupt */
-        if (rq_data_dir(CURRENT) == WRITE) {
-                extern void hdc63463_writedma(void);
-                if ((hdc63463_dataleft <= 0) && (!(mfm_status & STAT_CED))) {
-                        printk("mfm_rw_intr: Apparent DMA write request when no more to DMA\n");
-                        if (cont) {
-                                cont->error();
-                                cont->redo();
-                        };
-                        return;
-                };
-                hdc63463_writedma();
-        } else {
-                extern void hdc63463_readdma(void);
-                if ((hdc63463_dataleft <= 0) && (!(mfm_status & STAT_CED))) {
-                        printk("mfm_rw_intr: Apparent DMA read request when no more to DMA\n");
-                        if (cont) {
-                                cont->error();
-                                cont->redo();
-                        };
-                        return;
-                };
-                DBG("Going to try read dma..............status=0x%x, buffer=%p\n", mfm_status, hdc63463_dataptr);
-                hdc63463_readdma();
-        };                      /* Read */
-
-        if (hdc63463_dataptr != ((unsigned int) Copy_buffer + 256)) {
-                /* If we didn't actually manage to get any data on this interrupt - but why? We got the interrupt */
-                /* Ah - well looking at the status its just when we get command end; so no problem */
-                /*console_printf("mfm: dataptr mismatch. dataptr=0x%08x Copy_buffer+256=0x%08p\n",
-                   hdc63463_dataptr,Copy_buffer+256);
-                   print_status(); */
-        } else {
-                Sectors256LeftInCurrent--;
-                Copy_buffer += 256;
-                Copy_Sector++;
-
-                /* We have come to the end of this request */
-                if (!Sectors256LeftInCurrent) {
-                        DBG("mfm: end_request for CURRENT=0x%p CURRENT(sector=%d current_nr_sectors=%d nr_sectors=%d)\n",
-                                       CURRENT, CURRENT->sector, CURRENT->current_nr_sectors, CURRENT->nr_sectors);
-
-                        CURRENT->nr_sectors -= CURRENT->current_nr_sectors;
-                        CURRENT->sector += CURRENT->current_nr_sectors;
-                        SectorsLeftInRequest -= CURRENT->current_nr_sectors;
-
-                        end_request(CURRENT, 1);
-                        if (SectorsLeftInRequest) {
-                                hdc63463_dataptr = (unsigned int) CURRENT->buffer;
-                                Copy_buffer = CURRENT->buffer;
-                                Sectors256LeftInCurrent = CURRENT->current_nr_sectors * 2;
-                                errors = &(CURRENT->errors);
-                                /* These should match the present calculations of the next logical sector
-                                   on the device
-                                   Copy_Sector=CURRENT->sector*2; */
-
-                                if (Copy_Sector != CURRENT->sector * 2)
-#ifdef DEBUG
-                                        /*console_printf*/printk("mfm: Copy_Sector mismatch. Copy_Sector=%d CURRENT->sector*2=%d\n",
-                                        Copy_Sector, CURRENT->sector * 2);
-#else
-                                        printk("mfm: Copy_Sector mismatch! Eek!\n");
-#endif
-                        };      /* CURRENT */
-                };      /* Sectors256LeftInCurrent */
-        };
-
-        old_status = mfm_status;
-        mfm_status = inw(MFM_STATUS);
-        if (mfm_status & (STAT_DER | STAT_ABN)) {
-                /* Something has gone wrong - let's try that again */
-                if (cont) {
-                        DBG("mfm_rw_intr: DER/ABN error\n");
-                        cont->error();
-                        cont->redo();
-                };
-                return;
-        };
-
-        /* If this code wasn't entered due to command_end but there is
-           now a command end we must read the command results out. If it was
-           entered like this then mfm_interrupt_handler would have done the
-           job. */
-        if ((!((old_status & (STAT_CPR | STAT_BSY)) == STAT_CPR)) &&
-            ((mfm_status & (STAT_CPR | STAT_BSY)) == STAT_CPR)) {
-                int len = 0;
-                while (len < 16) {
-                        int in;
-                        in = inw(MFM_DATAIN);
-                        result[len++] = in >> 8;
-                        result[len++] = in;
-                };
-        };                      /* Result read */
-
-        /*console_printf ("mfm_rw_intr nearexit [%02X]\n", __raw_readb(mfm_IRQPollLoc)); */
-
-        /* If end of command move on */
-        if (mfm_status & (STAT_CED)) {
-                outw(CMD_RCAL, MFM_COMMAND);    /* Clear interrupt condition */
-                /* End of command - trigger the next command */
-                if (cont) {
-                        cont->done(1);
-                }
-                DBG("mfm_rw_intr: returned from cont->done\n");
-        } else {
-                /* Its going to generate another interrupt */
-                do_mfm = mfm_rw_intr;
-        };
-}
-
-static void mfm_setup_rw(void)
-{
-        DBG("setting up for rw...\n");
-
-        do_mfm = mfm_rw_intr;
-        issue_command(raw_cmd.cmdcode, raw_cmd.cmddata, raw_cmd.cmdlen);
-}
-
-static void mfm_recal_intr(void)
-{
-#ifdef DEBUG
-        console_printf("recal intr - status = ");
-        print_status();
-#endif
-        outw(CMD_RCAL, MFM_COMMAND);    /* Clear interrupt condition */
-        if (mfm_status & (STAT_DER | STAT_ABN)) {
-                printk("recal failed\n");
-                MFM_DRV_INFO.cylinder = NEED_2_RECAL;
-                if (cont) {
-                        cont->error();
-                        cont->redo();
-                }
-                return;
-        }
-        /* Thats seek end - we are finished */
-        if (mfm_status & STAT_SED) {
-                issue_command(CMD_POD, NULL, 0);
-                MFM_DRV_INFO.cylinder = 0;
-                mfm_seek();
-                return;
-        }
-        /* Command end without seek end (see data sheet p.20) for parallel seek
-           - we have to send a POL command to wait for the seek */
-        if (mfm_status & STAT_CED) {
-                do_mfm = mfm_recal_intr;
-                issue_command(CMD_POL, NULL, 0);
-                return;
-        }
-        printk("recal: unknown status\n");
-}
-
-static void mfm_seek_intr(void)
-{
-#ifdef DEBUG
-        console_printf("seek intr - status = ");
-        print_status();
-#endif
-        outw(CMD_RCAL, MFM_COMMAND);    /* Clear interrupt condition */
-        if (mfm_status & (STAT_DER | STAT_ABN)) {
-                printk("seek failed\n");
-                MFM_DRV_INFO.cylinder = NEED_2_RECAL;
-                if (cont) {
-                        cont->error();
-                        cont->redo();
-                }
-                return;
-        }
-        if (mfm_status & STAT_SED) {
-                issue_command(CMD_POD, NULL, 0);
-                MFM_DRV_INFO.cylinder = raw_cmd.cylinder;
-                mfm_seek();
-                return;
-        }
-        if (mfm_status & STAT_CED) {
-                do_mfm = mfm_seek_intr;
-                issue_command(CMD_POL, NULL, 0);
-                return;
-        }
-        printk("seek: unknown status\n");
-}
-
-/* IDEA2 seems to work better - its what RiscOS sets my
- * disc to - on its SECOND call to specify!
- */
-#define IDEA2
-#ifndef IDEA2
-#define SPEC_SL 0x16
-#define SPEC_SH 0xa9            /* Step pulse high=21, Record Length=001 (256 bytes) */
-#else
-#define SPEC_SL 0x00            /* OM2 - SL - step pulse low */
-#define SPEC_SH 0x21            /* Step pulse high=4, Record Length=001 (256 bytes) */
-#endif
-
-static void mfm_setupspecify (int drive, unsigned char *cmdb)
-{
-        cmdb[0]  = 0x1f;                /* OM0 - !SECT,!MOD,!DIF,PADP,ECD,CRCP,CRCI,ACOR */
-        cmdb[1]  = 0xc3;                /* OM1 - DTM,BRST,!CEDM,!SEDM,!DERM,0,AMEX,PSK */
-        cmdb[2]  = SPEC_SL;             /* OM2 - SL - step pulse low */
-        cmdb[3]  = (number_mfm_drives == 1) ? 0x02 : 0x06;      /* 1 or 2 drives */
-        cmdb[4]  = 0xfc | ((mfm_info[drive].cylinders - 1) >> 8);/* RW time over/high part of number of cylinders */
-        cmdb[5]  = mfm_info[drive].cylinders - 1;               /* low part of number of cylinders */
-        cmdb[6]  = mfm_info[drive].heads - 1;                   /* Number of heads */
-        cmdb[7]  = mfm_info[drive].sectors - 1;                 /* Number of sectors */
-        cmdb[8]  = SPEC_SH;
-        cmdb[9]  = 0x0a;                /* gap length 1 */
-        cmdb[10] = 0x0d;                /* gap length 2 */
-        cmdb[11] = 0x0c;                /* gap length 3 */
-        cmdb[12] = (mfm_info[drive].precomp - 1) >> 8;  /* pre comp cylinder */
-        cmdb[13] = mfm_info[drive].precomp - 1;
-        cmdb[14] = (mfm_info[drive].lowcurrent - 1) >> 8;       /* Low current cylinder */
-        cmdb[15] = mfm_info[drive].lowcurrent - 1;
-}
-
-static void mfm_specify (void)
-{
-        unsigned char cmdb[16];
-
-        DBG("specify...dev=%d lastspecified=%d\n", raw_cmd.dev, lastspecifieddrive);
-        mfm_setupspecify (raw_cmd.dev, cmdb);
-
-        issue_command (CMD_SPC, cmdb, 16);
-        /* Ensure that we will do another specify if we move to the other drive */
-        lastspecifieddrive = raw_cmd.dev;
-        wait_for_completion();
-}
-
-static void mfm_seek(void)
-{
-        unsigned char cmdb[4];
-
-        DBG("seeking...\n");
-        if (MFM_DRV_INFO.cylinder < 0) {
-                do_mfm = mfm_recal_intr;
-                DBG("mfm_seek: about to call specify\n");
-                mfm_specify (); /* DAG added this */
-
-                cmdb[0] = raw_cmd.dev + 1;
-                cmdb[1] = 0;
-
-                issue_command(CMD_RCLB, cmdb, 2);
-                return;
-        }
-        if (MFM_DRV_INFO.cylinder != raw_cmd.cylinder) {
-                cmdb[0] = raw_cmd.dev + 1;
-                cmdb[1] = 0;    /* raw_cmd.head; DAG: My data sheet says this should be 0 */
-                cmdb[2] = raw_cmd.cylinder >> 8;
-                cmdb[3] = raw_cmd.cylinder;
-
-                do_mfm = mfm_seek_intr;
-                issue_command(CMD_SEK, cmdb, 4);
-        } else
-                mfm_setup_rw();
-}
-
-static void mfm_initialise(void)
-{
-        DBG("init...\n");
-        mfm_seek();
-}
-
-static void request_done(int uptodate)
-{
-        DBG("mfm:request_done\n");
-        if (uptodate) {
-                unsigned char block[2] = {0, 0};
-
-                /* Apparently worked - let's check bytes left to DMA */
-                if (hdc63463_dataleft != (PartFragRead_SectorsLeft * 256)) {
-                        printk("mfm: request_done - dataleft=%d - should be %d - Eek!\n", hdc63463_dataleft, PartFragRead_SectorsLeft * 256);
-                        end_request(CURRENT, 0);
-                        Busy = 0;
-                };
-                /* Potentially this means that we've done; but we might be doing
-                   a partial access, (over two cylinders) or we may have a number
-                   of fragments in an image file.  First let's deal with partial accesss
-                 */
-                if (PartFragRead) {
-                        /* Yep - a partial access */
-
-                        /* and issue the remainder */
-                        issue_request(PartFragRead_RestartBlock, PartFragRead_SectorsLeft, CURRENT);
-                        return;
-                }
-
-                /* ah well - perhaps there is another fragment to go */
-
-                /* Increment pointers/counts to start of next fragment */
-                if (SectorsLeftInRequest > 0) printk("mfm: SectorsLeftInRequest>0 - Eek! Shouldn't happen!\n");
-
-                /* No - its the end of the line */
-                /* end_request's should have happened at the end of sector DMAs */
-                /* Turns Drive LEDs off - may slow it down? */
-                if (!elv_next_request(QUEUE))
-                        issue_command(CMD_CKV, block, 2);
-
-                Busy = 0;
-                DBG("request_done: About to mfm_request\n");
-                /* Next one please */
-                mfm_request();  /* Moved from mfm_rw_intr */
-                DBG("request_done: returned from mfm_request\n");
-        } else {
-                printk("mfm:request_done: update=0\n");
-                end_request(CURRENT, 0);
-                Busy = 0;
-        }
-}
-
-static void error_handler(void)
-{
-        printk("error detected... status = ");
-        print_status();
-        (*errors)++;
-        if (*errors > MFM_DRV_INFO.errors.abort)
-                cont->done(0);
-        if (*errors > MFM_DRV_INFO.errors.recal)
-                MFM_DRV_INFO.cylinder = NEED_2_RECAL;
-}
-
-static void rw_interrupt(void)
-{
-        printk("rw_interrupt\n");
-}
-
-static struct cont rw_cont =
-{
-        rw_interrupt,
-        error_handler,
-        mfm_rerequest,
-        request_done
-};
-
-/*
- * Actually gets round to issuing the request - note everything at this
- * point is in 256 byte sectors not Linux 512 byte blocks
- */
-static void issue_request(unsigned int block, unsigned int nsect,
-                          struct request *req)
-{
-        struct gendisk *disk = req->rq_disk;
-        struct mfm_info *p = disk->private_data;
-        int track, start_head, start_sector;
-        int sectors_to_next_cyl;
-        dev = p - mfm_info;
-
-        track = block / p->sectors;
-        start_sector = block % p->sectors;
-        start_head = track % p->heads;
-
-        /* First get the number of whole tracks which are free before the next
-           track */
-        sectors_to_next_cyl = (p->heads - (start_head + 1)) * p->sectors;
-        /* Then add in the number of sectors left on this track */
-        sectors_to_next_cyl += (p->sectors - start_sector);
-
-        DBG("issue_request: mfm_info[dev].sectors=%d track=%d\n", p->sectors, track);
-
-        raw_cmd.dev = dev;
-        raw_cmd.sector = start_sector;
-        raw_cmd.head = start_head;
-        raw_cmd.cylinder = track / p->heads;
-        raw_cmd.cmdtype = CURRENT->cmd;
-        raw_cmd.cmdcode = rq_data_dir(CURRENT) == WRITE ? CMD_WD : CMD_RD;
-        raw_cmd.cmddata[0] = dev + 1;   /* DAG: +1 to get US */
-        raw_cmd.cmddata[1] = raw_cmd.head;
-        raw_cmd.cmddata[2] = raw_cmd.cylinder >> 8;
-        raw_cmd.cmddata[3] = raw_cmd.cylinder;
-        raw_cmd.cmddata[4] = raw_cmd.head;
-        raw_cmd.cmddata[5] = raw_cmd.sector;
-
-        /* Was == and worked - how the heck??? */
-        if (lastspecifieddrive != raw_cmd.dev)
-                mfm_specify ();
-
-        if (nsect <= sectors_to_next_cyl) {
-                raw_cmd.cmddata[6] = nsect >> 8;
-                raw_cmd.cmddata[7] = nsect;
-                PartFragRead = 0;       /* All in one */
-                PartFragRead_SectorsLeft = 0;   /* Must set this - used in DMA calcs */
-        } else {
-                raw_cmd.cmddata[6] = sectors_to_next_cyl >> 8;
-                raw_cmd.cmddata[7] = sectors_to_next_cyl;
-                PartFragRead = sectors_to_next_cyl;     /* only do this many this time */
-                PartFragRead_RestartBlock = block + sectors_to_next_cyl;        /* Where to restart from */
-                PartFragRead_SectorsLeft = nsect - sectors_to_next_cyl;
-        }
-        raw_cmd.cmdlen = 8;
-
-        /* Setup DMA pointers */
-        hdc63463_dataptr = (unsigned int) Copy_buffer;
-        hdc63463_dataleft = nsect * 256;        /* Better way? */
-
-        DBG("mfm%c: %sing: CHS=%d/%d/%d, sectors=%d, buffer=0x%08lx (%p)\n",
-             raw_cmd.dev + 'a', rq_data_dir(CURRENT) == READ ? "read" : "writ",
-                       raw_cmd.cylinder,
-                       raw_cmd.head,
-            raw_cmd.sector, nsect, (unsigned long) Copy_buffer, CURRENT);
-
-        cont = &rw_cont;
-        errors = &(CURRENT->errors);
-#if 0
-        mfm_tq.routine = (void (*)(void *)) mfm_initialise;
-        queue_task(&mfm_tq, &tq_immediate);
-        mark_bh(IMMEDIATE_BH);
-#else
-        mfm_initialise();
-#endif
-}                               /* issue_request */
-
-/*
- * Called when an error has just happened - need to trick mfm_request
- * into thinking we weren't busy
- *
- * Turn off ints - mfm_request expects them this way
- */
-static void mfm_rerequest(void)
-{
-        DBG("mfm_rerequest\n");
-        cli();
-        Busy = 0;
-        mfm_request();
-}
-
-static struct gendisk *mfm_gendisk[2];
-
-static void mfm_request(void)
-{
-        DBG("mfm_request CURRENT=%p Busy=%d\n", CURRENT, Busy);
-
-        /* If we are still processing then return; we will get called again */
-        if (Busy) {
-                /* Again seems to be common in 1.3.45 */
-                /*DBG*/printk("mfm_request: Exiting due to busy\n");
-                return;
-        }
-        Busy = 1;
-
-        while (1) {
-                unsigned int block, nsect;
-                struct gendisk *disk;
-
-                DBG("mfm_request: loop start\n");
-                sti();
-
-                DBG("mfm_request: before !CURRENT\n");
-
-                if (!CURRENT) {
-                        printk("mfm_request: Exiting due to empty queue (pre)\n");
-                        do_mfm = NULL;
-                        Busy = 0;
-                        return;
-                }
-
-                DBG("mfm_request:                 before arg extraction\n");
-
-                disk = CURRENT->rq_disk;
-                block = CURRENT->sector;
-                nsect = CURRENT->nr_sectors;
-                if (block >= get_capacity(disk) ||
-                    block+nsect > get_capacity(disk)) {
-                        printk("%s: bad access: block=%d, count=%d, nr_sects=%ld\n",
-                               disk->disk_name, block, nsect, get_capacity(disk));
-                        printk("mfm: continue 1\n");
-                        end_request(CURRENT, 0);
-                        Busy = 0;
-                        continue;
-                }
-
-                /* DAG: Linux doesn't cope with this - even though it has an array telling
-                   it the hardware block size - silly */
-                block <<= 1;    /* Now in 256 byte sectors */
-                nsect <<= 1;    /* Ditto */
-
-                SectorsLeftInRequest = nsect >> 1;
-                Sectors256LeftInCurrent = CURRENT->current_nr_sectors * 2;
-                Copy_buffer = CURRENT->buffer;
-                Copy_Sector = CURRENT->sector << 1;
-
-                DBG("mfm_request: block after offset=%d\n", block);
-
-                issue_request(block, nsect, CURRENT);
-
-                break;
-        }
-        DBG("mfm_request: Dropping out bottom\n");
-}
-
-static void do_mfm_request(struct request_queue *q)
-{
-        DBG("do_mfm_request: about to mfm_request\n");
-        mfm_request();
-}
-
-static void mfm_interrupt_handler(int unused, void *dev_id)
-{
-        void (*handler) (void) = do_mfm;
-
-        do_mfm = NULL;
-
-        DBG("mfm_interrupt_handler (handler=0x%p)\n", handler);
-
-        mfm_status = inw(MFM_STATUS);
-
-        /* If CPR (Command Parameter Reject) and not busy it means that the command
-           has some return message to give us */
-        if ((mfm_status & (STAT_CPR | STAT_BSY)) == STAT_CPR) {
-                int len = 0;
-                while (len < 16) {
-                        int in;
-                        in = inw(MFM_DATAIN);
-                        result[len++] = in >> 8;
-                        result[len++] = in;
-                }
-        }
-        if (handler) {
-                handler();
-                return;
-        }
-        outw (CMD_RCAL, MFM_COMMAND);   /* Clear interrupt condition */
-        printk ("mfm: unexpected interrupt - status = ");
-        print_status ();
-        while (1);
-}
-
-
-
-
-
-/*
- * Tell the user about the drive if we decided it exists.
- */
-static void mfm_geometry(int drive)
-{
-        struct mfm_info *p = mfm_info + drive;
-        struct gendisk *disk = mfm_gendisk[drive];
-        disk->private_data = p;
-        if (p->cylinders)
-                printk ("%s: %dMB CHS=%d/%d/%d LCC=%d RECOMP=%d\n",
-                        disk->disk_name,
-                        p->cylinders * p->heads * p->sectors / 4096,
-                        p->cylinders, p->heads, p->sectors,
-                        p->lowcurrent, p->precomp);
-        set_capacity(disk, p->cylinders * p->heads * p->sectors / 2);
-}
-
-#ifdef CONFIG_BLK_DEV_MFM_AUTODETECT
-/*
- * Attempt to detect a drive and find its geometry.  The drive has already been
- * specified...
- *
- * We first recalibrate the disk, then try to probe sectors, heads and then
- * cylinders.  NOTE! the cylinder probe may break drives.  The xd disk driver
- * does something along these lines, so I assume that most drives are up to
- * this mistreatment...
- */
-static int mfm_detectdrive (int drive)
-{
-        unsigned int mingeo[3], maxgeo[3];
-        unsigned int attribute, need_recal = 1;
-        unsigned char cmdb[8];
-
-        memset (mingeo, 0, sizeof (mingeo));
-        maxgeo[0] = mfm_info[drive].sectors;
-        maxgeo[1] = mfm_info[drive].heads;
-        maxgeo[2] = mfm_info[drive].cylinders;
-
-        cmdb[0] = drive + 1;
-        cmdb[6] = 0;
-        cmdb[7] = 1;
-        for (attribute = 0; attribute < 3; attribute++) {
-                while (mingeo[attribute] != maxgeo[attribute]) {
-                        unsigned int variable;
-
-                        variable = (maxgeo[attribute] + mingeo[attribute]) >> 1;
-                        cmdb[1] = cmdb[2] = cmdb[3] = cmdb[4] = cmdb[5] = 0;
-
-                        if (need_recal) {
-                                int tries = 5;
-
-                                do {
-                                        issue_command (CMD_RCLB, cmdb, 2);
-                                        wait_for_completion ();
-                                        wait_for_command_end ();
-                                        if  (result[1] == 0x20)
-                                                break;
-                                } while (result[1] && --tries);
-                                if (result[1]) {
-                                        outw (CMD_RCAL, MFM_COMMAND);
-                                        return 0;
-                                }
-                                need_recal = 0;
-                        }
-
-                        switch (attribute) {
-                        case 0:
-                                cmdb[5] = variable;
-                                issue_command (CMD_CMPD, cmdb, 8);
-                                break;
-                        case 1:
-                                cmdb[1] = variable;
-                                cmdb[4] = variable;
-                                issue_command (CMD_CMPD, cmdb, 8);
-                                break;
-                        case 2:
-                                cmdb[2] = variable >> 8;
-                                cmdb[3] = variable;
-                                issue_command (CMD_SEK, cmdb, 4);
-                                break;
-                        }
-                        wait_for_completion ();
-                        wait_for_command_end ();
-
-                        switch (result[1]) {
-                        case 0x00:
-                        case 0x50:
-                                mingeo[attribute] = variable + 1;
-                                break;
-
-                        case 0x20:
-                                outw (CMD_RCAL, MFM_COMMAND);
-                                return 0;
-
-                        case 0x24:
-                                need_recal = 1;
-                        default:
-                                maxgeo[attribute] = variable;
-                                break;
-                        }
-                }
-        }
-        mfm_info[drive].cylinders  = mingeo[2];
-        mfm_info[drive].lowcurrent = mingeo[2];
-        mfm_info[drive].precomp    = mingeo[2] / 2;
-        mfm_info[drive].heads      = mingeo[1];
-        mfm_info[drive].sectors    = mingeo[0];
-        outw (CMD_RCAL, MFM_COMMAND);
-        return 1;
-}
-#endif
-
-/*
- * Initialise all drive information for this controller.
- */
-static int mfm_initdrives(void)
-{
-        int drive;
-
-        if (number_mfm_drives > MFM_MAXDRIVES) {
-                number_mfm_drives = MFM_MAXDRIVES;
-                printk("No. of ADFS MFM drives is greater than MFM_MAXDRIVES - you can't have that many!\n");
-        }
-
-        for (drive = 0; drive < number_mfm_drives; drive++) {
-                mfm_info[drive].lowcurrent = 1;
-                mfm_info[drive].precomp    = 1;
-                mfm_info[drive].cylinder   = -1;
-                mfm_info[drive].errors.recal  = 0;
-                mfm_info[drive].errors.report = 0;
-                mfm_info[drive].errors.abort  = 4;
-
-#ifdef CONFIG_BLK_DEV_MFM_AUTODETECT
-                mfm_info[drive].cylinders  = 1024;
-                mfm_info[drive].heads      = 8;
-                mfm_info[drive].sectors    = 64;
-                {
-                        unsigned char cmdb[16];
-
-                        mfm_setupspecify (drive, cmdb);
-                        cmdb[1] &= ~0x81;
-                        issue_command (CMD_SPC, cmdb, 16);
-                        wait_for_completion ();
-                        if (!mfm_detectdrive (drive)) {
-                                mfm_info[drive].cylinders = 0;
-                                mfm_info[drive].heads     = 0;
-                                mfm_info[drive].sectors   = 0;
-                        }
-                        cmdb[0] = cmdb[1] = 0;
-                        issue_command (CMD_CKV, cmdb, 2);
-                }
-#else
-                mfm_info[drive].cylinders  = 1; /* its going to have to figure it out from the partition info */
-                mfm_info[drive].heads      = 4;
-                mfm_info[drive].sectors    = 32;
-#endif
-        }
-        return number_mfm_drives;
-}
-
-
-
-/*
- * The 'front' end of the mfm driver follows...
- */
-
-static int mfm_getgeo(struct block_device *bdev, struct hd_geometry *geo)
-{
-        struct mfm_info *p = bdev->bd_disk->private_data;
-
-        geo->heads = p->heads;
-        geo->sectors = p->sectors;
-        geo->cylinders = p->cylinders;
-        return 0;
-}
-
-/*
- * This is to handle various kernel command line parameters
- * specific to this driver.
- */
-void mfm_setup(char *str, int *ints)
-{
-        return;
-}
-
-/*
- * Set the CHS from the ADFS boot block if it is present.  This is not ideal
- * since if there are any non-ADFS partitions on the disk, this won't work!
- * Hence, I want to get rid of this...
- */
-void xd_set_geometry(struct block_device *bdev, unsigned char secsptrack,
-                        unsigned char heads, unsigned int secsize)
-{
-        struct mfm_info *p = bdev->bd_disk->private_data;
-        int drive = p - mfm_info;
-        unsigned long disksize = bdev->bd_inode->i_size;
-
-        if (p->cylinders == 1) {
-                p->sectors = secsptrack;
-                p->heads = heads;
-                p->cylinders = discsize / (secsptrack * heads * secsize);
-
-                if ((heads < 1) || (p->cylinders > 1024)) {
-                        printk("%s: Insane disc shape! Setting to 512/4/32\n",
-                                bdev->bd_disk->disk_name);
-
-                        /* These values are fairly arbitary, but are there so that if your
-                         * lucky you can pick apart your disc to find out what is going on -
-                         * I reckon these figures won't hurt MOST drives
-                         */
-                        p->sectors = 32;
-                        p->heads = 4;
-                        p->cylinders = 512;
-                }
-                if (raw_cmd.dev == drive)
-                        mfm_specify ();
-                mfm_geometry (drive);
-        }
-}
-
-static struct block_device_operations mfm_fops =
-{
-        .owner          = THIS_MODULE,
-        .getgeo         = mfm_getgeo,
-};
-
-/*
- * See if there is a controller at the address presently at mfm_addr
- *
- * We check to see if the controller is busy - if it is, we abort it first,
- * and check that the chip is no longer busy after at least 180 clock cycles.
- * We then issue a command and check that the BSY or CPR bits are set.
- */
-static int mfm_probecontroller (unsigned int mfm_addr)
-{
-        if (inw (MFM_STATUS) & STAT_BSY) {
-                outw (CMD_ABT, MFM_COMMAND);
-                udelay (50);
-                if (inw (MFM_STATUS) & STAT_BSY)
-                        return 0;
-        }
-
-        if (inw (MFM_STATUS) & STAT_CED)
-                outw (CMD_RCAL, MFM_COMMAND);
-
-        outw (CMD_SEK, MFM_COMMAND);
-
-        if (inw (MFM_STATUS) & (STAT_BSY | STAT_CPR)) {
-                unsigned int count = 2000;
-                while (inw (MFM_STATUS) & STAT_BSY) {
-                        udelay (500);
-                        if (!--count)
-                                return 0;
-                }
-
-                outw (CMD_RCAL, MFM_COMMAND);
-        }
-        return 1;
-}
-
-static int mfm_do_init(unsigned char irqmask)
-{
-        int i, ret;
-
-        printk("mfm: found at address %08X, interrupt %d\n", mfm_addr, mfm_irq);
-
-        ret = -EBUSY;
-        if (!request_region (mfm_addr, 10, "mfm"))
-                goto out1;
-
-        ret = register_blkdev(MAJOR_NR, "mfm");
-        if (ret)
-                goto out2;
-
-        /* Stuff for the assembler routines to get to */
-        hdc63463_baseaddress    = ioaddr(mfm_addr);
-        hdc63463_irqpolladdress = mfm_IRQPollLoc;
-        hdc63463_irqpollmask    = irqmask;
-
-        mfm_queue = blk_init_queue(do_mfm_request, &mfm_lock);
-        if (!mfm_queue)
-                goto out2a;
-
-        Busy = 0;
-        lastspecifieddrive = -1;
-
-        mfm_drives = mfm_initdrives();
-        if (!mfm_drives) {
-                ret = -ENODEV;
-                goto out3;
-        }
-        
-        for (i = 0; i < mfm_drives; i++) {
-                struct gendisk *disk = alloc_disk(64);
-                if (!disk)
-                        goto Enomem;
-                disk->major = MAJOR_NR;
-                disk->first_minor = i << 6;
-                disk->fops = &mfm_fops;
-                sprintf(disk->disk_name, "mfm%c", 'a'+i);
-                mfm_gendisk[i] = disk;
-        }
-
-        printk("mfm: detected %d hard drive%s\n", mfm_drives,
-                                mfm_drives == 1 ? "" : "s");
-        ret = request_irq(mfm_irq, mfm_interrupt_handler, IRQF_DISABLED, "MFM harddisk", NULL);
-        if (ret) {
-                printk("mfm: unable to get IRQ%d\n", mfm_irq);
-                goto out4;
-        }
-
-        if (mfm_irqenable)
-                outw(0x80, mfm_irqenable);      /* Required to enable IRQs from MFM podule */
-
-        for (i = 0; i < mfm_drives; i++) {
-                mfm_geometry(i);
-                mfm_gendisk[i]->queue = mfm_queue;
-                add_disk(mfm_gendisk[i]);
-        }
-        return 0;
-
-out4:
-        for (i = 0; i < mfm_drives; i++)
-                put_disk(mfm_gendisk[i]);
-out3:
-        blk_cleanup_queue(mfm_queue);
-out2a:
-        unregister_blkdev(MAJOR_NR, "mfm");
-out2:
-        release_region(mfm_addr, 10);
-out1:
-        return ret;
-Enomem:
-        while (i--)
-                put_disk(mfm_gendisk[i]);
-        goto out3;
-}
-
-static void mfm_do_exit(void)
-{
-        int i;
-
-        free_irq(mfm_irq, NULL);
-        for (i = 0; i < mfm_drives; i++) {
-                del_gendisk(mfm_gendisk[i]);
-                put_disk(mfm_gendisk[i]);
-        }
-        blk_cleanup_queue(mfm_queue);
-        unregister_blkdev(MAJOR_NR, "mfm");
-        if (mfm_addr)
-                release_region(mfm_addr, 10);
-}
-
-static int __devinit mfm_probe(struct expansion_card *ec, struct ecard_id *id)
-{
-        if (mfm_addr)
-                return -EBUSY;
-
-        mfm_addr        = ecard_address(ec, ECARD_IOC, ECARD_MEDIUM) + 0x800;
-        mfm_IRQPollLoc  = ioaddr(mfm_addr + 0x400);
-        mfm_irqenable   = mfm_IRQPollLoc;
-        mfm_irq         = ec->irq;
-
-        return mfm_do_init(0x08);
-}
-
-static void __devexit mfm_remove(struct expansion_card *ec)
-{
-        outw (0, mfm_irqenable);        /* Required to enable IRQs from MFM podule */
-        mfm_do_exit();
-}
-
-static const struct ecard_id mfm_cids[] = {
-        { MANU_ACORN, PROD_ACORN_MFM },
-        { 0xffff, 0xffff },
-};
-
-static struct ecard_driver mfm_driver = {
-        .probe          = mfm_probe,
-        .remove         = __devexit(mfm_remove),
-        .id_table       = mfm_cids,
-        .drv = {
-                .name   = "mfm",
-        },
-};
-
-/*
- * Look for a MFM controller - first check the motherboard, then the podules
- * The podules have an extra interrupt enable that needs to be played with
- *
- * The HDC is accessed at MEDIUM IOC speeds.
- */
-static int __init mfm_init (void)
-{
-        unsigned char irqmask;
-
-        if (mfm_probecontroller(ONBOARD_MFM_ADDRESS)) {
-                mfm_addr        = ONBOARD_MFM_ADDRESS;
-                mfm_IRQPollLoc  = IOC_IRQSTATB;
-                mfm_irqenable   = 0;
-                mfm_irq         = IRQ_HARDDISK;
-                return mfm_do_init(0x08);       /* IL3 pin */
-        } else {
-                return ecard_register_driver(&mfm_driver);
-        }
-}
-
-static void __exit mfm_exit(void)
-{
-        if (mfm_addr == ONBOARD_MFM_ADDRESS)
-                mfm_do_exit();
-        else
-                ecard_unregister_driver(&mfm_driver);
-}
-
-module_init(mfm_init)
-module_exit(mfm_exit)
-MODULE_LICENSE("GPL");
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 934d639b3684..f1372de4ce79 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -68,14 +68,6 @@ config ACPI_PROCFS
 
           Say N to delete /proc/acpi/ files that have moved to /sys/
 
-config ACPI_PROCFS_SLEEP
-        bool "/proc/acpi/sleep (deprecated)"
-        depends on PM_SLEEP && ACPI_PROCFS
-        default n
-        ---help---
-          Create /proc/acpi/sleep
-          Deprecated by /sys/power/state
-
 config ACPI_AC
         tristate "AC Adapter"
         depends on X86
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index ad070861bb53..a78832ea81fa 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -890,37 +890,46 @@ static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev)
 }
 
 #ifdef CONFIG_PM
-static struct dmi_system_id piix_broken_suspend_dmi_table[] = {
-        {
-                .ident = "TECRA M5",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "TECRA M5"),
-                },
-        },
-        {
-                .ident = "Satellite U200",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Satellite U200"),
+static int piix_broken_suspend(void)
+{
+        static struct dmi_system_id sysids[] = {
+                {
+                        .ident = "TECRA M5",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "TECRA M5"),
+                        },
                 },
-        },
-        {
-                .ident = "Satellite U205",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Satellite U205"),
+                {
+                        .ident = "Satellite U205",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "Satellite U205"),
+                        },
                 },
-        },
-        {
-                .ident = "Portege M500",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M500"),
+                {
+                        .ident = "Portege M500",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M500"),
+                        },
                 },
-        },
-        { }
-};
+                { }
+        };
+        static const char *oemstrs[] = {
+                "Tecra M3,",
+        };
+        int i;
+
+        if (dmi_check_system(sysids))
+                return 1;
+
+        for (i = 0; i < ARRAY_SIZE(oemstrs); i++)
+                if (dmi_find_device(DMI_DEV_TYPE_OEM_STRING, oemstrs[i], NULL))
+                        return 1;
+
+        return 0;
+}
 
 static int piix_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
 {
@@ -937,8 +946,7 @@ static int piix_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
          * cycles and power trying to do something to the sleeping
          * beauty.
          */
-        if (dmi_check_system(piix_broken_suspend_dmi_table) &&
-            mesg.event == PM_EVENT_SUSPEND) {
+        if (piix_broken_suspend() && mesg.event == PM_EVENT_SUSPEND) {
                 pci_save_state(pdev);
 
                 /* mark its power state as "unknown", since we don't
@@ -973,10 +981,10 @@ static int piix_pci_device_resume(struct pci_dev *pdev)
                 pci_restore_state(pdev);
 
                 /* PCI device wasn't disabled during suspend.  Use
-                 * __pci_reenable_device() to avoid affecting the
-                 * enable count.
+                 * pci_reenable_device() to avoid affecting the enable
+                 * count.
                  */
-                rc = __pci_reenable_device(pdev);
+                rc = pci_reenable_device(pdev);
                 if (rc)
                         dev_printk(KERN_ERR, &pdev->dev, "failed to enable "
                                    "device after resume (%d)\n", rc);
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 6001aae0b884..60e78bef469f 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -3788,6 +3788,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         { "WDC WD740ADFD-00NLR1", NULL,         ATA_HORKAGE_NONCQ, },
         { "FUJITSU MHV2080BH",  "00840028",     ATA_HORKAGE_NONCQ, },
         { "ST9160821AS",        "3.CLF",        ATA_HORKAGE_NONCQ, },
+        { "SAMSUNG HD401LJ",    "ZZ100-15",     ATA_HORKAGE_NONCQ, },
 
         /* Devices with NCQ limits */
 
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 6c289c7b1322..1cce2198baaf 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -573,6 +573,10 @@ int ata_pci_init_bmdma(struct ata_host *host)
         struct pci_dev *pdev = to_pci_dev(gdev);
         int i, rc;
 
+        /* No BAR4 allocation: No DMA */
+        if (pci_resource_start(pdev, 4) == 0)
+                return 0;
+
         /* TODO: If we get no DMA mask we should fall back to PIO */
         rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);
         if (rc)
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index dc443e7dc37c..e34b632487d7 100644
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -31,7 +31,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_cmd64x"
-#define DRV_VERSION "0.2.3"
+#define DRV_VERSION "0.2.4"
 
 /*
  * CMD64x specific registers definition.
@@ -397,7 +397,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                         .flags = ATA_FLAG_SLAVE_POSS,
                         .pio_mask = 0x1f,
                         .mwdma_mask = 0x07,
-                        .udma_mask = ATA_UDMA1,
+                        .udma_mask = ATA_UDMA2,
                         .port_ops = &cmd64x_port_ops
                 },
                 {       /* CMD 646 rev 1  */
@@ -412,7 +412,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                         .flags = ATA_FLAG_SLAVE_POSS,
                         .pio_mask = 0x1f,
                         .mwdma_mask = 0x07,
-                        .udma_mask = ATA_UDMA2,
+                        .udma_mask = ATA_UDMA4,
                         .port_ops = &cmd648_port_ops
                 },
                 {       /* CMD 649 */
@@ -420,7 +420,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                         .flags = ATA_FLAG_SLAVE_POSS,
                         .pio_mask = 0x1f,
                         .mwdma_mask = 0x07,
-                        .udma_mask = ATA_UDMA3,
+                        .udma_mask = ATA_UDMA5,
                         .port_ops = &cmd648_port_ops
                 }
         };
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 9a829a7cbc60..66bd0e83ac07 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -2,6 +2,7 @@
  *    pata_sis.c - SiS ATA driver
  *
  *      (C) 2005 Red Hat <alan@redhat.com>
+ *      (C) 2007 Bartlomiej Zolnierkiewicz
  *
  *    Based upon linux/drivers/ide/pci/sis5513.c
  * Copyright (C) 1999-2000      Andre Hedrick <andre@linux-ide.org>
@@ -35,7 +36,7 @@
 #include "sis.h"
 
 #define DRV_NAME        "pata_sis"
-#define DRV_VERSION     "0.5.1"
+#define DRV_VERSION     "0.5.2"
 
 struct sis_chipset {
         u16 device;                             /* PCI host ID */
@@ -237,7 +238,7 @@ static void sis_old_set_piomode (struct ata_port *ap, struct ata_device *adev)
 }
 
 /**
- *      sis_100_set_pioode - Initialize host controller PATA PIO timings
+ *      sis_100_set_piomode - Initialize host controller PATA PIO timings
  *      @ap: Port whose timings we are configuring
  *      @adev: Device we are configuring for.
  *
@@ -262,7 +263,7 @@ static void sis_100_set_piomode (struct ata_port *ap, struct ata_device *adev)
 }
 
 /**
- *      sis_133_set_pioode - Initialize host controller PATA PIO timings
+ *      sis_133_set_piomode - Initialize host controller PATA PIO timings
  *      @ap: Port whose timings we are configuring
  *      @adev: Device we are configuring for.
  *
@@ -334,7 +335,7 @@ static void sis_old_set_dmamode (struct ata_port *ap, struct ata_device *adev)
         int drive_pci = sis_old_port_base(adev);
         u16 timing;
 
-        const u16 mwdma_bits[] = { 0x707, 0x202, 0x202 };
+        const u16 mwdma_bits[] = { 0x008, 0x302, 0x301 };
         const u16 udma_bits[]  = { 0xE000, 0xC000, 0xA000 };
 
         pci_read_config_word(pdev, drive_pci, &timing);
@@ -342,15 +343,15 @@ static void sis_old_set_dmamode (struct ata_port *ap, struct ata_device *adev)
         if (adev->dma_mode < XFER_UDMA_0) {
                 /* bits 3-0 hold recovery timing bits 8-10 active timing and
                    the higer bits are dependant on the device */
-                timing &= ~ 0x870F;
+                timing &= ~0x870F;
                 timing |= mwdma_bits[speed];
-                pci_write_config_word(pdev, drive_pci, timing);
         } else {
                 /* Bit 15 is UDMA on/off, bit 13-14 are cycle time */
                 speed = adev->dma_mode - XFER_UDMA_0;
                 timing &= ~0x6000;
                 timing |= udma_bits[speed];
         }
+        pci_write_config_word(pdev, drive_pci, timing);
 }
 
 /**
@@ -373,7 +374,7 @@ static void sis_66_set_dmamode (struct ata_port *ap, struct ata_device *adev)
         int drive_pci = sis_old_port_base(adev);
         u16 timing;
 
-        const u16 mwdma_bits[] = { 0x707, 0x202, 0x202 };
+        const u16 mwdma_bits[] = { 0x008, 0x302, 0x301 };
         const u16 udma_bits[]  = { 0xF000, 0xD000, 0xB000, 0xA000, 0x9000};
 
         pci_read_config_word(pdev, drive_pci, &timing);
@@ -432,8 +433,7 @@ static void sis_100_set_dmamode (struct ata_port *ap, struct ata_device *adev)
  *      @adev: Device to program
  *
  *      Set UDMA/MWDMA mode for device, in host controller PCI config space.
- *      Handles early SiS 961 bridges. Supports MWDMA as well unlike
- *      the old ide/pci driver.
+ *      Handles early SiS 961 bridges.
  *
  *      LOCKING:
  *      None (inherited from caller).
@@ -467,8 +467,6 @@ static void sis_133_early_set_dmamode (struct ata_port *ap, struct ata_device *a
  *      @adev: Device to program
  *
  *      Set UDMA/MWDMA mode for device, in host controller PCI config space.
- *      Handles early SiS 961 bridges. Supports MWDMA as well unlike
- *      the old ide/pci driver.
  *
  *      LOCKING:
  *      None (inherited from caller).
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 3599ab2506d2..e6738bcbe5a9 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -24,8 +24,6 @@
 #include "base.h"
 #include "power/power.h"
 
-extern const char *kobject_actions[];
-
 int (*platform_notify)(struct device * dev) = NULL;
 int (*platform_notify_remove)(struct device * dev) = NULL;
 
@@ -680,8 +678,7 @@ static int device_add_class_symlinks(struct device *dev)
                 if (error)
                         goto out_subsys;
         }
-        /* only bus-device parents get a "device"-link */
-        if (dev->parent && dev->parent->bus) {
+        if (dev->parent) {
                 error = sysfs_create_link(&dev->kobj, &dev->parent->kobj,
                                           "device");
                 if (error)
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index fe7ef3394144..40545071e3c9 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -53,7 +53,7 @@ static ssize_t store_online(struct sys_device *dev, const char *buf,
                 ret = count;
         return ret;
 }
-static SYSDEV_ATTR(online, 0600, show_online, store_online);
+static SYSDEV_ATTR(online, 0644, show_online, store_online);
 
 static void __devinit register_cpu_control(struct cpu *cpu)
 {
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 53f0ee6f3016..b24efd4e3e3d 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -232,6 +232,7 @@ fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
 /**
  * firmware_data_write - write method for firmware
  * @kobj: kobject for the device
+ * @bin_attr: bin_attr structure
  * @buffer: buffer being written
  * @offset: buffer offset for write in total data store area
  * @count: buffer size
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 1be82d544dc3..a11b2bd54bbe 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3227,12 +3227,15 @@ static int alloc_cciss_hba(void)
         for (i = 0; i < MAX_CTLR; i++) {
                 if (!hba[i]) {
                         ctlr_info_t *p;
+
                         p = kzalloc(sizeof(ctlr_info_t), GFP_KERNEL);
                         if (!p)
                                 goto Enomem;
                         p->gendisk[0] = alloc_disk(1 << NWD_SHIFT);
-                        if (!p->gendisk[0])
+                        if (!p->gendisk[0]) {
+                                kfree(p);
                                 goto Enomem;
+                        }
                         hba[i] = p;
                         return i;
                 }
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 23b26b87cc32..d68ddbe70f73 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -97,7 +97,6 @@ obj-$(CONFIG_GPIO_VR41XX)	+= vr41xx_giu.o
 obj-$(CONFIG_GPIO_TB0219)       += tb0219.o
 obj-$(CONFIG_TELCLOCK)          += tlclk.o
 
-obj-$(CONFIG_WATCHDOG)          += watchdog/
 obj-$(CONFIG_MWAVE)             += mwave/
 obj-$(CONFIG_AGP)               += agp/
 obj-$(CONFIG_DRM)               += drm/
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 6005b5225772..8d74b8745e60 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -500,7 +500,6 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)
 {
         int i, j, box;
         int err = 0;
-        int status = 0;
         static int loaded;
         i2eBordStrPtr pB = NULL;
         int rc = -1;
@@ -588,6 +587,8 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)
                 case PCI:
 #ifdef CONFIG_PCI
                         {
+                                int status;
+
                                 pci_dev_i = pci_get_device(PCI_VENDOR_ID_COMPUTONE,
                                                           PCI_DEVICE_ID_COMPUTONE_IP2EX, pci_dev_i);
                                 if (pci_dev_i != NULL) {
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 4edfdda0cf99..96d2f9ee42d6 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2050,6 +2050,7 @@ static __devinit void try_init_dmi(struct dmi_ipmi_data *ipmi_data)
                 info->si_type = SI_BT;
                 break;
         default:
+                kfree(info);
                 return;
         }
 
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index 372a37e25620..bbb7f1292665 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -1,5 +1,5 @@
 /*
- * $Id: synclink_gt.c,v 4.36 2006/08/28 20:47:14 paulkf Exp $
+ * $Id: synclink_gt.c,v 4.50 2007/07/25 19:29:25 paulkf Exp $
  *
  * Device driver for Microgate SyncLink GT serial adapters.
  *
@@ -93,7 +93,7 @@
  * module identification
  */
 static char *driver_name     = "SyncLink GT";
-static char *driver_version  = "$Revision: 4.36 $";
+static char *driver_version  = "$Revision: 4.50 $";
 static char *tty_driver_name = "synclink_gt";
 static char *tty_dev_prefix  = "ttySLG";
 MODULE_LICENSE("GPL");
@@ -477,6 +477,7 @@ static void tx_set_idle(struct slgt_info *info);
 static unsigned int free_tbuf_count(struct slgt_info *info);
 static void reset_tbufs(struct slgt_info *info);
 static void tdma_reset(struct slgt_info *info);
+static void tdma_start(struct slgt_info *info);
 static void tx_load(struct slgt_info *info, const char *buf, unsigned int count);
 
 static void get_signals(struct slgt_info *info);
@@ -904,6 +905,8 @@ start:
                 spin_lock_irqsave(&info->lock,flags);
                 if (!info->tx_active)
                         tx_start(info);
+                else
+                        tdma_start(info);
                 spin_unlock_irqrestore(&info->lock,flags);
         }
 
@@ -3871,44 +3874,58 @@ static void tx_start(struct slgt_info *info)
                         slgt_irq_on(info, IRQ_TXUNDER + IRQ_TXIDLE);
                         /* clear tx idle and underrun status bits */
                         wr_reg16(info, SSR, (unsigned short)(IRQ_TXIDLE + IRQ_TXUNDER));
-
-                        if (!(rd_reg32(info, TDCSR) & BIT0)) {
-                                /* tx DMA stopped, restart tx DMA */
-                                tdma_reset(info);
-                                /* set 1st descriptor address */
-                                wr_reg32(info, TDDAR, info->tbufs[info->tbuf_start].pdesc);
-                                switch(info->params.mode) {
-                                case MGSL_MODE_RAW:
-                                case MGSL_MODE_MONOSYNC:
-                                case MGSL_MODE_BISYNC:
-                                        wr_reg32(info, TDCSR, BIT2 + BIT0); /* IRQ + DMA enable */
-                                        break;
-                                default:
-                                        wr_reg32(info, TDCSR, BIT0); /* DMA enable */
-                                }
-                        }
-
                         if (info->params.mode == MGSL_MODE_HDLC)
                                 mod_timer(&info->tx_timer, jiffies +
                                                 msecs_to_jiffies(5000));
                 } else {
-                        tdma_reset(info);
-                        /* set 1st descriptor address */
-                        wr_reg32(info, TDDAR, info->tbufs[info->tbuf_start].pdesc);
-
                         slgt_irq_off(info, IRQ_TXDATA);
                         slgt_irq_on(info, IRQ_TXIDLE);
                         /* clear tx idle status bit */
                         wr_reg16(info, SSR, IRQ_TXIDLE);
-
-                        /* enable tx DMA */
-                        wr_reg32(info, TDCSR, BIT0);
                 }
-
+                tdma_start(info);
                 info->tx_active = 1;
         }
 }
 
+/*
+ * start transmit DMA if inactive and there are unsent buffers
+ */
+static void tdma_start(struct slgt_info *info)
+{
+        unsigned int i;
+
+        if (rd_reg32(info, TDCSR) & BIT0)
+                return;
+
+        /* transmit DMA inactive, check for unsent buffers */
+        i = info->tbuf_start;
+        while (!desc_count(info->tbufs[i])) {
+                if (++i == info->tbuf_count)
+                        i = 0;
+                if (i == info->tbuf_current)
+                        return;
+        }
+        info->tbuf_start = i;
+
+        /* there are unsent buffers, start transmit DMA */
+
+        /* reset needed if previous error condition */
+        tdma_reset(info);
+
+        /* set 1st descriptor address */
+        wr_reg32(info, TDDAR, info->tbufs[info->tbuf_start].pdesc);
+        switch(info->params.mode) {
+        case MGSL_MODE_RAW:
+        case MGSL_MODE_MONOSYNC:
+        case MGSL_MODE_BISYNC:
+                wr_reg32(info, TDCSR, BIT2 + BIT0); /* IRQ + DMA enable */
+                break;
+        default:
+                wr_reg32(info, TDCSR, BIT0); /* DMA enable */
+        }
+}
+
 static void tx_stop(struct slgt_info *info)
 {
         unsigned short val;
@@ -4642,8 +4659,8 @@ static unsigned int free_tbuf_count(struct slgt_info *info)
                         i=0;
         } while (i != info->tbuf_current);
 
-        /* last buffer with zero count may be in use, assume it is */
-        if (count)
+        /* if tx DMA active, last zero count buffer is in use */
+        if (count && (rd_reg32(info, TDCSR) & BIT0))
                 --count;
 
         return count;
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index 16fb23125e96..37bddc1802de 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -55,6 +55,8 @@ config SOFT_WATCHDOG
           To compile this driver as a module, choose M here: the
           module will be called softdog.
 
+# ALPHA Architecture
+
 # ARM Architecture
 
 config AT91RM9200_WATCHDOG
@@ -189,7 +191,7 @@ config PNX4008_WATCHDOG
 
 config IOP_WATCHDOG
         tristate "IOP Watchdog"
-        depends on WATCHDOG && PLAT_IOP
+        depends on PLAT_IOP
         select WATCHDOG_NOWAYOUT if (ARCH_IOP32X || ARCH_IOP33X)
         help
           Say Y here if to include support for the watchdog timer
@@ -203,15 +205,48 @@ config IOP_WATCHDOG
           operating as an Root Complex and/or Central Resource, the PCI-X
           and/or PCIe busses will also be reset.  THIS IS A VERY BIG HAMMER.
 
+config DAVINCI_WATCHDOG
+        tristate "DaVinci watchdog"
+        depends on ARCH_DAVINCI
+        help
+          Say Y here if to include support for the watchdog timer
+          in the DaVinci DM644x/DM646x processors.
+          To compile this driver as a module, choose M here: the
+          module will be called davinci_wdt.
+
+          NOTE: once enabled, this timer cannot be disabled.
+          Say N if you are unsure.
+
+# ARM26 Architecture
+
 # AVR32 Architecture
 
 config AT32AP700X_WDT
         tristate "AT32AP700x watchdog"
-        depends on WATCHDOG && CPU_AT32AP7000
+        depends on CPU_AT32AP7000
         help
           Watchdog timer embedded into AT32AP700x devices. This will reboot
           your system when the timeout is reached.
 
+# BLACKFIN Architecture
+
+config BFIN_WDT
+        tristate "Blackfin On-Chip Watchdog Timer"
+        depends on BLACKFIN
+        ---help---
+          If you say yes here you will get support for the Blackfin On-Chip
+          Watchdog Timer. If you have one of these processors and wish to
+          have watchdog support enabled, say Y, otherwise say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called bfin_wdt.
+
+# CRIS Architecture
+
+# FRV Architecture
+
+# H8300 Architecture
+
 # X86 (i386 + ia64 + x86_64) Architecture
 
 config ACQUIRE_WDT
@@ -540,37 +575,11 @@ config SBC_EPX_C3_WATCHDOG
           To compile this driver as a module, choose M here: the
           module will be called sbc_epx_c3.
 
-# PowerPC Architecture
+# M32R Architecture
 
-config 8xx_WDT
-        tristate "MPC8xx Watchdog Timer"
-        depends on 8xx
+# M68K Architecture
 
-config 83xx_WDT
-        tristate "MPC83xx Watchdog Timer"
-        depends on PPC_83xx
-
-config MV64X60_WDT
-        tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
-        depends on MV64X60
-
-config BOOKE_WDT
-        bool "PowerPC Book-E Watchdog Timer"
-        depends on BOOKE || 4xx
-        ---help---
-          Please see Documentation/watchdog/watchdog-api.txt for
-          more information.
-
-# PPC64 Architecture
-
-config WATCHDOG_RTAS
-        tristate "RTAS watchdog"
-        depends on PPC_RTAS
-        help
-          This driver adds watchdog support for the RTAS watchdog.
-
-          To compile this driver as a module, choose M here. The module
-          will be called wdrtas.
+# M68KNOMMU Architecture
 
 # MIPS Architecture
 
@@ -600,6 +609,44 @@ config WDT_RM9K_GPI
           To compile this driver as a module, choose M here: the
           module will be called rm9k_wdt.
 
+# PARISC Architecture
+
+# POWERPC Architecture
+
+config MPC5200_WDT
+        tristate "MPC5200 Watchdog Timer"
+        depends on PPC_MPC52xx
+
+config 8xx_WDT
+        tristate "MPC8xx Watchdog Timer"
+        depends on 8xx
+
+config 83xx_WDT
+        tristate "MPC83xx Watchdog Timer"
+        depends on PPC_83xx
+
+config MV64X60_WDT
+        tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
+        depends on MV64X60
+
+config BOOKE_WDT
+        bool "PowerPC Book-E Watchdog Timer"
+        depends on BOOKE || 4xx
+        ---help---
+          Please see Documentation/watchdog/watchdog-api.txt for
+          more information.
+
+# PPC64 Architecture
+
+config WATCHDOG_RTAS
+        tristate "RTAS watchdog"
+        depends on PPC_RTAS
+        help
+          This driver adds watchdog support for the RTAS watchdog.
+
+          To compile this driver as a module, choose M here. The module
+          will be called wdrtas.
+
 # S390 Architecture
 
 config ZVM_WATCHDOG
@@ -614,7 +661,7 @@ config ZVM_WATCHDOG
           To compile this driver as a module, choose M here. The module
           will be called vmwatchdog.
 
-# SUPERH Architecture
+# SUPERH (sh + sh64) Architecture
 
 config SH_WDT
         tristate "SuperH Watchdog"
@@ -641,6 +688,8 @@ config SH_WDT_MMAP
           If you say Y here, user applications will be able to mmap the
           WDT/CPG registers.
 
+# SPARC Architecture
+
 # SPARC64 Architecture
 
 config WATCHDOG_CP1XXX
@@ -665,6 +714,10 @@ config WATCHDOG_RIO
           machines.  The watchdog timeout period is normally one minute but
           can be changed with a boot-time parameter.
 
+# V850 Architecture
+
+# XTENSA Architecture
+
 #
 # ISA-based Watchdog Cards
 #
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index bdb9d5e3bb41..389f8b14ccc4 100644
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -22,6 +22,8 @@ obj-$(CONFIG_WDTPCI) += wdt_pci.o
 # USB-based Watchdog Cards
 obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
 
+# ALPHA Architecture
+
 # ARM Architecture
 obj-$(CONFIG_AT91RM9200_WATCHDOG) += at91rm9200_wdt.o
 obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o
@@ -36,10 +38,22 @@ obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
 obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o
 obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o
 obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o
+obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
+
+# ARM26 Architecture
 
 # AVR32 Architecture
 obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
 
+# BLACKFIN Architecture
+obj-$(CONFIG_BFIN_WDT) += bfin_wdt.o
+
+# CRIS Architecture
+
+# FRV Architecture
+
+# H8300 Architecture
+
 # X86 (i386 + ia64 + x86_64) Architecture
 obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
 obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
@@ -66,8 +80,22 @@ obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
 obj-$(CONFIG_MACHZ_WDT) += machzwd.o
 obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
 
-# PowerPC Architecture
+# M32R Architecture
+
+# M68K Architecture
+
+# M68KNOMMU Architecture
+
+# MIPS Architecture
+obj-$(CONFIG_INDYDOG) += indydog.o
+obj-$(CONFIG_WDT_MTX1)  += mtx-1_wdt.o
+obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
+
+# PARISC Architecture
+
+# POWERPC Architecture
 obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
+obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o
 obj-$(CONFIG_83xx_WDT) += mpc83xx_wdt.o
 obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
 obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
@@ -75,17 +103,18 @@ obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
 # PPC64 Architecture
 obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
 
-# MIPS Architecture
-obj-$(CONFIG_INDYDOG) += indydog.o
-obj-$(CONFIG_WDT_MTX1)  += mtx-1_wdt.o
-obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
-
 # S390 Architecture
 
-# SUPERH Architecture
+# SUPERH (sh + sh64) Architecture
 obj-$(CONFIG_SH_WDT) += shwdt.o
 
+# SPARC Architecture
+
 # SPARC64 Architecture
 
+# V850 Architecture
+
+# XTENSA Architecture
+
 # Architecture Independant
 obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
diff --git a/drivers/char/watchdog/bfin_wdt.c b/drivers/char/watchdog/bfin_wdt.c
new file mode 100644
index 000000000000..309d27913fc1
--- /dev/null
+++ b/drivers/char/watchdog/bfin_wdt.c
@@ -0,0 +1,490 @@
+/*
+ * Blackfin On-Chip Watchdog Driver
+ *  Supports BF53[123]/BF53[467]/BF54[2489]/BF561
+ *
+ * Originally based on softdog.c
+ * Copyright 2006-2007 Analog Devices Inc.
+ * Copyright 2006-2007 Michele d'Amico
+ * Copyright 1996 Alan Cox <alan@redhat.com>
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/types.h>
+#include <linux/timer.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <linux/fs.h>
+#include <linux/notifier.h>
+#include <linux/reboot.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <asm/blackfin.h>
+#include <asm/uaccess.h>
+
+#define stamp(fmt, args...) pr_debug("%s:%i: " fmt "\n", __func__, __LINE__, ## args)
+#define stampit() stamp("here i am")
+
+#define WATCHDOG_NAME "bfin-wdt"
+#define PFX WATCHDOG_NAME ": "
+
+/* The BF561 has two watchdogs (one per core), but since Linux
+ * only runs on core A, we'll just work with that one.
+ */
+#ifdef BF561_FAMILY
+# define bfin_read_WDOG_CTL()    bfin_read_WDOGA_CTL()
+# define bfin_read_WDOG_CNT()    bfin_read_WDOGA_CNT()
+# define bfin_read_WDOG_STAT()   bfin_read_WDOGA_STAT()
+# define bfin_write_WDOG_CTL(x)  bfin_write_WDOGA_CTL(x)
+# define bfin_write_WDOG_CNT(x)  bfin_write_WDOGA_CNT(x)
+# define bfin_write_WDOG_STAT(x) bfin_write_WDOGA_STAT(x)
+#endif
+
+/* Bit in SWRST that indicates boot caused by watchdog */
+#define SWRST_RESET_WDOG 0x4000
+
+/* Bit in WDOG_CTL that indicates watchdog has expired (WDR0) */
+#define WDOG_EXPIRED 0x8000
+
+/* Masks for WDEV field in WDOG_CTL register */
+#define ICTL_RESET   0x0
+#define ICTL_NMI     0x2
+#define ICTL_GPI     0x4
+#define ICTL_NONE    0x6
+#define ICTL_MASK    0x6
+
+/* Masks for WDEN field in WDOG_CTL register */
+#define WDEN_MASK    0x0FF0
+#define WDEN_ENABLE  0x0000
+#define WDEN_DISABLE 0x0AD0
+
+/* some defaults */
+#define WATCHDOG_TIMEOUT 20
+
+static unsigned int timeout = WATCHDOG_TIMEOUT;
+static int nowayout = WATCHDOG_NOWAYOUT;
+static struct watchdog_info bfin_wdt_info;
+static unsigned long open_check;
+static char expect_close;
+static spinlock_t bfin_wdt_spinlock = SPIN_LOCK_UNLOCKED;
+
+/**
+ *      bfin_wdt_keepalive - Keep the Userspace Watchdog Alive
+ *
+ *      The Userspace watchdog got a KeepAlive: schedule the next timeout.
+ */
+static int bfin_wdt_keepalive(void)
+{
+        stampit();
+        bfin_write_WDOG_STAT(0);
+        return 0;
+}
+
+/**
+ *      bfin_wdt_stop - Stop the Watchdog
+ *
+ *      Stops the on-chip watchdog.
+ */
+static int bfin_wdt_stop(void)
+{
+        stampit();
+        bfin_write_WDOG_CTL(WDEN_DISABLE);
+        return 0;
+}
+
+/**
+ *      bfin_wdt_start - Start the Watchdog
+ *
+ *      Starts the on-chip watchdog.  Automatically loads WDOG_CNT
+ *      into WDOG_STAT for us.
+ */
+static int bfin_wdt_start(void)
+{
+        stampit();
+        bfin_write_WDOG_CTL(WDEN_ENABLE | ICTL_RESET);
+        return 0;
+}
+
+/**
+ *      bfin_wdt_running - Check Watchdog status
+ *
+ *      See if the watchdog is running.
+ */
+static int bfin_wdt_running(void)
+{
+        stampit();
+        return ((bfin_read_WDOG_CTL() & WDEN_MASK) != WDEN_DISABLE);
+}
+
+/**
+ *      bfin_wdt_set_timeout - Set the Userspace Watchdog timeout
+ *      @t: new timeout value (in seconds)
+ *
+ *      Translate the specified timeout in seconds into System Clock
+ *      terms which is what the on-chip Watchdog requires.
+ */
+static int bfin_wdt_set_timeout(unsigned long t)
+{
+        u32 cnt;
+        unsigned long flags;
+
+        stampit();
+
+        cnt = t * get_sclk();
+        if (cnt < get_sclk()) {
+                printk(KERN_WARNING PFX "timeout value is too large\n");
+                return -EINVAL;
+        }
+
+        spin_lock_irqsave(&bfin_wdt_spinlock, flags);
+        {
+                int run = bfin_wdt_running();
+                bfin_wdt_stop();
+                bfin_write_WDOG_CNT(cnt);
+                if (run) bfin_wdt_start();
+        }
+        spin_unlock_irqrestore(&bfin_wdt_spinlock, flags);
+
+        timeout = t;
+
+        return 0;
+}
+
+/**
+ *      bfin_wdt_open - Open the Device
+ *      @inode: inode of device
+ *      @file: file handle of device
+ *
+ *      Watchdog device is opened and started.
+ */
+static int bfin_wdt_open(struct inode *inode, struct file *file)
+{
+        stampit();
+
+        if (test_and_set_bit(0, &open_check))
+                return -EBUSY;
+
+        if (nowayout)
+                __module_get(THIS_MODULE);
+
+        bfin_wdt_keepalive();
+        bfin_wdt_start();
+
+        return nonseekable_open(inode, file);
+}
+
+/**
+ *      bfin_wdt_close - Close the Device
+ *      @inode: inode of device
+ *      @file: file handle of device
+ *
+ *      Watchdog device is closed and stopped.
+ */
+static int bfin_wdt_release(struct inode *inode, struct file *file)
+{
+        stampit();
+
+        if (expect_close == 42) {
+                bfin_wdt_stop();
+        } else {
+                printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");
+                bfin_wdt_keepalive();
+        }
+
+        expect_close = 0;
+        clear_bit(0, &open_check);
+
+        return 0;
+}
+
+/**
+ *      bfin_wdt_write - Write to Device
+ *      @file: file handle of device
+ *      @buf: buffer to write
+ *      @count: length of buffer
+ *      @ppos: offset
+ *
+ *      Pings the watchdog on write.
+ */
+static ssize_t bfin_wdt_write(struct file *file, const char __user *data,
+                              size_t len, loff_t *ppos)
+{
+        stampit();
+
+        if (len) {
+                if (!nowayout) {
+                        size_t i;
+
+                        /* In case it was set long ago */
+                        expect_close = 0;
+
+                        for (i = 0; i != len; i++) {
+                                char c;
+                                if (get_user(c, data + i))
+                                        return -EFAULT;
+                                if (c == 'V')
+                                        expect_close = 42;
+                        }
+                }
+                bfin_wdt_keepalive();
+        }
+
+        return len;
+}
+
+/**
+ *      bfin_wdt_ioctl - Query Device
+ *      @inode: inode of device
+ *      @file: file handle of device
+ *      @cmd: watchdog command
+ *      @arg: argument
+ *
+ *      Query basic information from the device or ping it, as outlined by the
+ *      watchdog API.
+ */
+static int bfin_wdt_ioctl(struct inode *inode, struct file *file,
+                          unsigned int cmd, unsigned long arg)
+{
+        void __user *argp = (void __user *)arg;
+        int __user *p = argp;
+
+        stampit();
+
+        switch (cmd) {
+                default:
+                        return -ENOTTY;
+
+                case WDIOC_GETSUPPORT:
+                        if (copy_to_user(argp, &bfin_wdt_info, sizeof(bfin_wdt_info)))
+                                return -EFAULT;
+                        else
+                                return 0;
+
+                case WDIOC_GETSTATUS:
+                case WDIOC_GETBOOTSTATUS:
+                        return put_user(!!(_bfin_swrst & SWRST_RESET_WDOG), p);
+
+                case WDIOC_KEEPALIVE:
+                        bfin_wdt_keepalive();
+                        return 0;
+
+                case WDIOC_SETTIMEOUT: {
+                        int new_timeout;
+
+                        if (get_user(new_timeout, p))
+                                return -EFAULT;
+
+                        if (bfin_wdt_set_timeout(new_timeout))
+                                return -EINVAL;
+                }
+                        /* Fall */
+                case WDIOC_GETTIMEOUT:
+                        return put_user(timeout, p);
+
+                case WDIOC_SETOPTIONS: {
+                        unsigned long flags;
+                        int options, ret = -EINVAL;
+
+                        if (get_user(options, p))
+                                return -EFAULT;
+
+                        spin_lock_irqsave(&bfin_wdt_spinlock, flags);
+
+                        if (options & WDIOS_DISABLECARD) {
+                                bfin_wdt_stop();
+                                ret = 0;
+                        }
+
+                        if (options & WDIOS_ENABLECARD) {
+                                bfin_wdt_start();
+                                ret = 0;
+                        }
+
+                        spin_unlock_irqrestore(&bfin_wdt_spinlock, flags);
+
+                        return ret;
+                }
+        }
+}
+
+/**
+ *      bfin_wdt_notify_sys - Notifier Handler
+ *      @this: notifier block
+ *      @code: notifier event
+ *      @unused: unused
+ *
+ *      Handles specific events, such as turning off the watchdog during a
+ *      shutdown event.
+ */
+static int bfin_wdt_notify_sys(struct notifier_block *this, unsigned long code,
+                               void *unused)
+{
+        stampit();
+
+        if (code == SYS_DOWN || code == SYS_HALT)
+                bfin_wdt_stop();
+
+        return NOTIFY_DONE;
+}
+
+#ifdef CONFIG_PM
+static int state_before_suspend;
+
+/**
+ *      bfin_wdt_suspend - suspend the watchdog
+ *      @pdev: device being suspended
+ *      @state: requested suspend state
+ *
+ *      Remember if the watchdog was running and stop it.
+ *      TODO: is this even right?  Doesn't seem to be any
+ *            standard in the watchdog world ...
+ */
+static int bfin_wdt_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        stampit();
+
+        state_before_suspend = bfin_wdt_running();
+        bfin_wdt_stop();
+
+        return 0;
+}
+
+/**
+ *      bfin_wdt_resume - resume the watchdog
+ *      @pdev: device being resumed
+ *
+ *      If the watchdog was running, turn it back on.
+ */
+static int bfin_wdt_resume(struct platform_device *pdev)
+{
+        stampit();
+
+        if (state_before_suspend) {
+                bfin_wdt_set_timeout(timeout);
+                bfin_wdt_start();
+        }
+
+        return 0;
+}
+#else
+# define bfin_wdt_suspend NULL
+# define bfin_wdt_resume NULL
+#endif
+
+static struct platform_device bfin_wdt_device = {
+        .name          = WATCHDOG_NAME,
+        .id            = -1,
+};
+
+static struct platform_driver bfin_wdt_driver = {
+        .driver    = {
+                .name  = WATCHDOG_NAME,
+                .owner = THIS_MODULE,
+        },
+        .suspend   = bfin_wdt_suspend,
+        .resume    = bfin_wdt_resume,
+};
+
+static struct file_operations bfin_wdt_fops = {
+        .owner    = THIS_MODULE,
+        .llseek   = no_llseek,
+        .write    = bfin_wdt_write,
+        .ioctl    = bfin_wdt_ioctl,
+        .open     = bfin_wdt_open,
+        .release  = bfin_wdt_release,
+};
+
+static struct miscdevice bfin_wdt_miscdev = {
+        .minor    = WATCHDOG_MINOR,
+        .name     = "watchdog",
+        .fops     = &bfin_wdt_fops,
+};
+
+static struct watchdog_info bfin_wdt_info = {
+        .identity = "Blackfin Watchdog",
+        .options  = WDIOF_SETTIMEOUT |
+                    WDIOF_KEEPALIVEPING |
+                    WDIOF_MAGICCLOSE,
+};
+
+static struct notifier_block bfin_wdt_notifier = {
+        .notifier_call = bfin_wdt_notify_sys,
+};
+
+/**
+ *      bfin_wdt_init - Initialize module
+ *
+ *      Registers the device and notifier handler. Actual device
+ *      initialization is handled by bfin_wdt_open().
+ */
+static int __init bfin_wdt_init(void)
+{
+        int ret;
+
+        stampit();
+
+        /* Check that the timeout value is within range */
+        if (bfin_wdt_set_timeout(timeout))
+                return -EINVAL;
+
+        /* Since this is an on-chip device and needs no board-specific
+         * resources, we'll handle all the platform device stuff here.
+         */
+        ret = platform_device_register(&bfin_wdt_device);
+        if (ret)
+                return ret;
+
+        ret = platform_driver_probe(&bfin_wdt_driver, NULL);
+        if (ret)
+                return ret;
+
+        ret = register_reboot_notifier(&bfin_wdt_notifier);
+        if (ret) {
+                printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", ret);
+                return ret;
+        }
+
+        ret = misc_register(&bfin_wdt_miscdev);
+        if (ret) {
+                printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
+                       WATCHDOG_MINOR, ret);
+                unregister_reboot_notifier(&bfin_wdt_notifier);
+                return ret;
+        }
+
+        printk(KERN_INFO PFX "initialized: timeout=%d sec (nowayout=%d)\n",
+               timeout, nowayout);
+
+        return 0;
+}
+
+/**
+ *      bfin_wdt_exit - Deinitialize module
+ *
+ *      Unregisters the device and notifier handler. Actual device
+ *      deinitialization is handled by bfin_wdt_close().
+ */
+static void __exit bfin_wdt_exit(void)
+{
+        misc_deregister(&bfin_wdt_miscdev);
+        unregister_reboot_notifier(&bfin_wdt_notifier);
+}
+
+module_init(bfin_wdt_init);
+module_exit(bfin_wdt_exit);
+
+MODULE_AUTHOR("Michele d'Amico, Mike Frysinger <vapier@gentoo.org>");
+MODULE_DESCRIPTION("Blackfin Watchdog Device Driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+
+module_param(timeout, uint, 0);
+MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=((2^32)/SCLK), default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
+
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c
index 0f5c77ddd39d..d362f5bf658a 100644
--- a/drivers/char/watchdog/booke_wdt.c
+++ b/drivers/char/watchdog/booke_wdt.c
@@ -144,7 +144,7 @@ static int booke_wdt_open (struct inode *inode, struct file *file)
                                 booke_wdt_period);
         }
 
-        return 0;
+        return nonseekable_open(inode, file);
 }
 
 static const struct file_operations booke_wdt_fops = {
diff --git a/drivers/char/watchdog/cpu5wdt.c b/drivers/char/watchdog/cpu5wdt.c
index d0d45a8b09f0..5941ca601a3a 100644
--- a/drivers/char/watchdog/cpu5wdt.c
+++ b/drivers/char/watchdog/cpu5wdt.c
@@ -162,6 +162,10 @@ static int cpu5wdt_ioctl(struct inode *inode, struct file *file, unsigned int cm
                         if ( copy_to_user(argp, &value, sizeof(int)) )
                                 return -EFAULT;
                         break;
+                case WDIOC_GETBOOTSTATUS:
+                        if ( copy_to_user(argp, &value, sizeof(int)) )
+                                return -EFAULT;
+                        break;
                 case WDIOC_GETSUPPORT:
                         if ( copy_to_user(argp, &ident, sizeof(ident)) )
                                 return -EFAULT;
diff --git a/drivers/char/watchdog/davinci_wdt.c b/drivers/char/watchdog/davinci_wdt.c
new file mode 100644
index 000000000000..19db5302ba6e
--- /dev/null
+++ b/drivers/char/watchdog/davinci_wdt.c
@@ -0,0 +1,281 @@
+/*
+ * drivers/char/watchdog/davinci_wdt.c
+ *
+ * Watchdog driver for DaVinci DM644x/DM646x processors
+ *
+ * Copyright (C) 2006 Texas Instruments.
+ *
+ * 2007 (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/moduleparam.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/fs.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <linux/init.h>
+#include <linux/bitops.h>
+#include <linux/platform_device.h>
+#include <linux/spinlock.h>
+
+#include <asm/hardware.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+
+#define MODULE_NAME "DAVINCI-WDT: "
+
+#define DEFAULT_HEARTBEAT 60
+#define MAX_HEARTBEAT     600   /* really the max margin is 264/27MHz*/
+
+/* Timer register set definition */
+#define PID12   (0x0)
+#define EMUMGT  (0x4)
+#define TIM12   (0x10)
+#define TIM34   (0x14)
+#define PRD12   (0x18)
+#define PRD34   (0x1C)
+#define TCR     (0x20)
+#define TGCR    (0x24)
+#define WDTCR   (0x28)
+
+/* TCR bit definitions */
+#define ENAMODE12_DISABLED      (0 << 6)
+#define ENAMODE12_ONESHOT       (1 << 6)
+#define ENAMODE12_PERIODIC      (2 << 6)
+
+/* TGCR bit definitions */
+#define TIM12RS_UNRESET         (1 << 0)
+#define TIM34RS_UNRESET         (1 << 1)
+#define TIMMODE_64BIT_WDOG      (2 << 2)
+
+/* WDTCR bit definitions */
+#define WDEN                    (1 << 14)
+#define WDFLAG                  (1 << 15)
+#define WDKEY_SEQ0              (0xa5c6 << 16)
+#define WDKEY_SEQ1              (0xda7e << 16)
+
+static int heartbeat = DEFAULT_HEARTBEAT;
+
+static spinlock_t io_lock;
+static unsigned long wdt_status;
+#define WDT_IN_USE        0
+#define WDT_OK_TO_CLOSE   1
+#define WDT_REGION_INITED 2
+#define WDT_DEVICE_INITED 3
+
+static struct resource  *wdt_mem;
+static void __iomem     *wdt_base;
+
+static void wdt_service(void)
+{
+        spin_lock(&io_lock);
+
+        /* put watchdog in service state */
+        davinci_writel(WDKEY_SEQ0, wdt_base + WDTCR);
+        /* put watchdog in active state */
+        davinci_writel(WDKEY_SEQ1, wdt_base + WDTCR);
+
+        spin_unlock(&io_lock);
+}
+
+static void wdt_enable(void)
+{
+        u32 tgcr;
+        u32 timer_margin;
+
+        spin_lock(&io_lock);
+
+        /* disable, internal clock source */
+        davinci_writel(0, wdt_base + TCR);
+        /* reset timer, set mode to 64-bit watchdog, and unreset */
+        davinci_writel(0, wdt_base + TGCR);
+        tgcr = TIMMODE_64BIT_WDOG | TIM12RS_UNRESET | TIM34RS_UNRESET;
+        davinci_writel(tgcr, wdt_base + TGCR);
+        /* clear counter regs */
+        davinci_writel(0, wdt_base + TIM12);
+        davinci_writel(0, wdt_base + TIM34);
+        /* set timeout period */
+        timer_margin = (((u64)heartbeat * CLOCK_TICK_RATE) & 0xffffffff);
+        davinci_writel(timer_margin, wdt_base + PRD12);
+        timer_margin = (((u64)heartbeat * CLOCK_TICK_RATE) >> 32);
+        davinci_writel(timer_margin, wdt_base + PRD34);
+        /* enable run continuously */
+        davinci_writel(ENAMODE12_PERIODIC, wdt_base + TCR);
+        /* Once the WDT is in pre-active state write to
+         * TIM12, TIM34, PRD12, PRD34, TCR, TGCR, WDTCR are
+         * write protected (except for the WDKEY field)
+         */
+        /* put watchdog in pre-active state */
+        davinci_writel(WDKEY_SEQ0 | WDEN, wdt_base + WDTCR);
+        /* put watchdog in active state */
+        davinci_writel(WDKEY_SEQ1 | WDEN, wdt_base + WDTCR);
+
+        spin_unlock(&io_lock);
+}
+
+static int davinci_wdt_open(struct inode *inode, struct file *file)
+{
+        if (test_and_set_bit(WDT_IN_USE, &wdt_status))
+                return -EBUSY;
+
+        wdt_enable();
+
+        return nonseekable_open(inode, file);
+}
+
+static ssize_t
+davinci_wdt_write(struct file *file, const char *data, size_t len,
+                  loff_t *ppos)
+{
+        if (len)
+                wdt_service();
+
+        return len;
+}
+
+static struct watchdog_info ident = {
+        .options = WDIOF_KEEPALIVEPING,
+        .identity = "DaVinci Watchdog",
+};
+
+static int
+davinci_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
+                  unsigned long arg)
+{
+        int ret = -ENOTTY;
+
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                ret = copy_to_user((struct watchdog_info *)arg, &ident,
+                                   sizeof(ident)) ? -EFAULT : 0;
+                break;
+
+        case WDIOC_GETSTATUS:
+        case WDIOC_GETBOOTSTATUS:
+                ret = put_user(0, (int *)arg);
+                break;
+
+        case WDIOC_GETTIMEOUT:
+                ret = put_user(heartbeat, (int *)arg);
+                break;
+
+        case WDIOC_KEEPALIVE:
+                wdt_service();
+                ret = 0;
+                break;
+        }
+        return ret;
+}
+
+static int davinci_wdt_release(struct inode *inode, struct file *file)
+{
+        wdt_service();
+        clear_bit(WDT_IN_USE, &wdt_status);
+
+        return 0;
+}
+
+static const struct file_operations davinci_wdt_fops = {
+        .owner = THIS_MODULE,
+        .llseek = no_llseek,
+        .write = davinci_wdt_write,
+        .ioctl = davinci_wdt_ioctl,
+        .open = davinci_wdt_open,
+        .release = davinci_wdt_release,
+};
+
+static struct miscdevice davinci_wdt_miscdev = {
+        .minor = WATCHDOG_MINOR,
+        .name = "watchdog",
+        .fops = &davinci_wdt_fops,
+};
+
+static int davinci_wdt_probe(struct platform_device *pdev)
+{
+        int ret = 0, size;
+        struct resource *res;
+
+        spin_lock_init(&io_lock);
+
+        if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
+                heartbeat = DEFAULT_HEARTBEAT;
+
+        printk(KERN_INFO MODULE_NAME
+                "DaVinci Watchdog Timer: heartbeat %d sec\n", heartbeat);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (res == NULL) {
+                printk(KERN_INFO MODULE_NAME
+                        "failed to get memory region resource\n");
+                return -ENOENT;
+        }
+
+        size = res->end - res->start + 1;
+        wdt_mem = request_mem_region(res->start, size, pdev->name);
+
+        if (wdt_mem == NULL) {
+                printk(KERN_INFO MODULE_NAME "failed to get memory region\n");
+                return -ENOENT;
+        }
+        wdt_base = (void __iomem *)(res->start);
+
+        ret = misc_register(&davinci_wdt_miscdev);
+        if (ret < 0) {
+                printk(KERN_ERR MODULE_NAME "cannot register misc device\n");
+                release_resource(wdt_mem);
+                kfree(wdt_mem);
+        } else {
+                set_bit(WDT_DEVICE_INITED, &wdt_status);
+        }
+
+        return ret;
+}
+
+static int davinci_wdt_remove(struct platform_device *pdev)
+{
+        misc_deregister(&davinci_wdt_miscdev);
+        if (wdt_mem) {
+                release_resource(wdt_mem);
+                kfree(wdt_mem);
+                wdt_mem = NULL;
+        }
+        return 0;
+}
+
+static struct platform_driver platform_wdt_driver = {
+        .driver = {
+                .name = "watchdog",
+        },
+        .probe = davinci_wdt_probe,
+        .remove = davinci_wdt_remove,
+};
+
+static int __init davinci_wdt_init(void)
+{
+        return platform_driver_register(&platform_wdt_driver);
+}
+
+static void __exit davinci_wdt_exit(void)
+{
+        return platform_driver_unregister(&platform_wdt_driver);
+}
+
+module_init(davinci_wdt_init);
+module_exit(davinci_wdt_exit);
+
+MODULE_AUTHOR("Texas Instruments");
+MODULE_DESCRIPTION("DaVinci Watchdog Driver");
+
+module_param(heartbeat, int, 0);
+MODULE_PARM_DESC(heartbeat,
+                 "Watchdog heartbeat period in seconds from 1 to "
+                 __MODULE_STRING(MAX_HEARTBEAT) ", default "
+                 __MODULE_STRING(DEFAULT_HEARTBEAT));
+
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/char/watchdog/iTCO_wdt.c b/drivers/char/watchdog/iTCO_wdt.c
index eac4f9b9f007..cd5a565bc3a0 100644
--- a/drivers/char/watchdog/iTCO_wdt.c
+++ b/drivers/char/watchdog/iTCO_wdt.c
@@ -39,7 +39,12 @@
  *      82801HR  (ICH8R)     : document number 313056-002, 313057-004,
  *      82801HH  (ICH8DH)    : document number 313056-002, 313057-004,
  *      82801HO  (ICH8DO)    : document number 313056-002, 313057-004,
- *      6300ESB  (6300ESB)   : document number 300641-003
+ *      82801IB  (ICH9)      : document number 316972-001, 316973-001,
+ *      82801IR  (ICH9R)     : document number 316972-001, 316973-001,
+ *      82801IH  (ICH9DH)    : document number 316972-001, 316973-001,
+ *      6300ESB  (6300ESB)   : document number 300641-003, 300884-010,
+ *      631xESB  (631xESB)   : document number 313082-001, 313075-005,
+ *      632xESB  (632xESB)   : document number 313082-001, 313075-005
  */
 
 /*
@@ -48,8 +53,8 @@
 
 /* Module and version information */
 #define DRV_NAME        "iTCO_wdt"
-#define DRV_VERSION     "1.01"
-#define DRV_RELDATE     "21-Jan-2007"
+#define DRV_VERSION     "1.02"
+#define DRV_RELDATE     "26-Jul-2007"
 #define PFX             DRV_NAME ": "
 
 /* Includes */
@@ -92,6 +97,10 @@ enum iTCO_chipsets {
         TCO_ICH8,       /* ICH8 & ICH8R */
         TCO_ICH8DH,     /* ICH8DH */
         TCO_ICH8DO,     /* ICH8DO */
+        TCO_ICH9,       /* ICH9 */
+        TCO_ICH9R,      /* ICH9R */
+        TCO_ICH9DH,     /* ICH9DH */
+        TCO_631XESB,    /* 631xESB/632xESB */
 };
 
 static struct {
@@ -118,6 +127,10 @@ static struct {
         {"ICH8 or ICH8R", 2},
         {"ICH8DH", 2},
         {"ICH8DO", 2},
+        {"ICH9", 2},
+        {"ICH9R", 2},
+        {"ICH9DH", 2},
+        {"631xESB/632xESB", 2},
         {NULL,0}
 };
 
@@ -148,6 +161,25 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = {
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_0,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH8    },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_2,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH8DH  },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_3,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH8DO  },
+        { PCI_VENDOR_ID_INTEL, 0x2918,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH9    },
+        { PCI_VENDOR_ID_INTEL, 0x2916,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH9R    },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_2,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_ICH9DH    },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_0,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
+        { PCI_VENDOR_ID_INTEL, 0x2671,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
+        { PCI_VENDOR_ID_INTEL, 0x2672,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
+        { PCI_VENDOR_ID_INTEL, 0x2673,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
+        { PCI_VENDOR_ID_INTEL, 0x2674,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
+        { PCI_VENDOR_ID_INTEL, 0x2675,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
+        { PCI_VENDOR_ID_INTEL, 0x2676,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
+        { PCI_VENDOR_ID_INTEL, 0x2677,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
+        { PCI_VENDOR_ID_INTEL, 0x2678,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
+        { PCI_VENDOR_ID_INTEL, 0x2679,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
+        { PCI_VENDOR_ID_INTEL, 0x267a,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
+        { PCI_VENDOR_ID_INTEL, 0x267b,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
+        { PCI_VENDOR_ID_INTEL, 0x267c,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
+        { PCI_VENDOR_ID_INTEL, 0x267d,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
+        { PCI_VENDOR_ID_INTEL, 0x267e,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
+        { PCI_VENDOR_ID_INTEL, 0x267f,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, TCO_631XESB },
         { 0, },                 /* End of list */
 };
 MODULE_DEVICE_TABLE (pci, iTCO_wdt_pci_tbl);
diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c
index a0d27160c80e..6d35bb112a5f 100644
--- a/drivers/char/watchdog/machzwd.c
+++ b/drivers/char/watchdog/machzwd.c
@@ -321,6 +321,7 @@ static int zf_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                 break;
 
         case WDIOC_GETSTATUS:
+        case WDIOC_GETBOOTSTATUS:
                 return put_user(0, p);
 
         case WDIOC_KEEPALIVE:
diff --git a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c
index db2ccb864412..1adf1d56027d 100644
--- a/drivers/char/watchdog/mixcomwd.c
+++ b/drivers/char/watchdog/mixcomwd.c
@@ -215,6 +215,11 @@ static int mixcomwd_ioctl(struct inode *inode, struct file *file,
                                 return -EFAULT;
                         }
                         break;
+                case WDIOC_GETBOOTSTATUS:
+                        if (copy_to_user(p, &status, sizeof(int))) {
+                                return -EFAULT;
+                        }
+                        break;
                 case WDIOC_GETSUPPORT:
                         if (copy_to_user(argp, &ident, sizeof(ident))) {
                                 return -EFAULT;
diff --git a/drivers/char/watchdog/mpc5200_wdt.c b/drivers/char/watchdog/mpc5200_wdt.c
new file mode 100644
index 000000000000..564143d40610
--- /dev/null
+++ b/drivers/char/watchdog/mpc5200_wdt.c
@@ -0,0 +1,286 @@
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <linux/io.h>
+#include <linux/spinlock.h>
+#include <asm/of_platform.h>
+#include <asm/uaccess.h>
+#include <asm/mpc52xx.h>
+
+
+#define GPT_MODE_WDT            (1<<15)
+#define GPT_MODE_CE             (1<<12)
+#define GPT_MODE_MS_TIMER       (0x4)
+
+
+struct mpc5200_wdt {
+        unsigned count; /* timer ticks before watchdog kicks in */
+        long ipb_freq;
+        struct miscdevice miscdev;
+        struct resource mem;
+        struct mpc52xx_gpt __iomem *regs;
+        spinlock_t io_lock;
+};
+
+/* is_active stores wether or not the /dev/watchdog device is opened */
+static unsigned long is_active;
+
+/* misc devices don't provide a way, to get back to 'dev' or 'miscdev' from
+ * file operations, which sucks. But there can be max 1 watchdog anyway, so...
+ */
+static struct mpc5200_wdt *wdt_global;
+
+
+/* helper to calculate timeout in timer counts */
+static void mpc5200_wdt_set_timeout(struct mpc5200_wdt *wdt, int timeout)
+{
+        /* use biggest prescaler of 64k */
+        wdt->count = (wdt->ipb_freq + 0xffff) / 0x10000 * timeout;
+
+        if (wdt->count > 0xffff)
+                wdt->count = 0xffff;
+}
+/* return timeout in seconds (calculated from timer count) */
+static int mpc5200_wdt_get_timeout(struct mpc5200_wdt *wdt)
+{
+        return wdt->count * 0x10000 / wdt->ipb_freq;
+}
+
+
+/* watchdog operations */
+static int mpc5200_wdt_start(struct mpc5200_wdt *wdt)
+{
+        spin_lock(&wdt->io_lock);
+        /* disable */
+        out_be32(&wdt->regs->mode, 0);
+        /* set timeout, with maximum prescaler */
+        out_be32(&wdt->regs->count, 0x0 | wdt->count);
+        /* enable watchdog */
+        out_be32(&wdt->regs->mode, GPT_MODE_CE | GPT_MODE_WDT | GPT_MODE_MS_TIMER);
+        spin_unlock(&wdt->io_lock);
+
+        return 0;
+}
+static int mpc5200_wdt_ping(struct mpc5200_wdt *wdt)
+{
+        spin_lock(&wdt->io_lock);
+        /* writing A5 to OCPW resets the watchdog */
+        out_be32(&wdt->regs->mode, 0xA5000000 | (0xffffff & in_be32(&wdt->regs->mode)));
+        spin_unlock(&wdt->io_lock);
+        return 0;
+}
+static int mpc5200_wdt_stop(struct mpc5200_wdt *wdt)
+{
+        spin_lock(&wdt->io_lock);
+        /* disable */
+        out_be32(&wdt->regs->mode, 0);
+        spin_unlock(&wdt->io_lock);
+        return 0;
+}
+
+
+/* file operations */
+static ssize_t mpc5200_wdt_write(struct file *file, const char *data,
+                size_t len, loff_t *ppos)
+{
+        struct mpc5200_wdt *wdt = file->private_data;
+        mpc5200_wdt_ping(wdt);
+        return 0;
+}
+static struct watchdog_info mpc5200_wdt_info = {
+        .options        = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+        .identity       = "mpc5200 watchdog on GPT0",
+};
+static int mpc5200_wdt_ioctl(struct inode *inode, struct file *file,
+                unsigned int cmd, unsigned long arg)
+{
+        struct mpc5200_wdt *wdt = file->private_data;
+        int __user *data = (int __user *)arg;
+        int timeout;
+        int ret = 0;
+
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                ret = copy_to_user(data, &mpc5200_wdt_info,
+                        sizeof(mpc5200_wdt_info));
+                if (ret)
+                        ret = -EFAULT;
+                break;
+
+        case WDIOC_GETSTATUS:
+        case WDIOC_GETBOOTSTATUS:
+                ret = put_user(0, data);
+                break;
+
+        case WDIOC_KEEPALIVE:
+                mpc5200_wdt_ping(wdt);
+                break;
+
+        case WDIOC_SETTIMEOUT:
+                ret = get_user(timeout, data);
+                if (ret)
+                        break;
+                mpc5200_wdt_set_timeout(wdt, timeout);
+                mpc5200_wdt_start(wdt);
+                /* fall through and return the timeout */
+
+        case WDIOC_GETTIMEOUT:
+                timeout = mpc5200_wdt_get_timeout(wdt);
+                ret = put_user(timeout, data);
+                break;
+
+        default:
+                ret = -ENOTTY;
+        }
+        return ret;
+}
+static int mpc5200_wdt_open(struct inode *inode, struct file *file)
+{
+        /* /dev/watchdog can only be opened once */
+        if (test_and_set_bit(0, &is_active))
+                return -EBUSY;
+
+        /* Set and activate the watchdog */
+        mpc5200_wdt_set_timeout(wdt_global, 30);
+        mpc5200_wdt_start(wdt_global);
+        file->private_data = wdt_global;
+        return nonseekable_open(inode, file);
+}
+static int mpc5200_wdt_release(struct inode *inode, struct file *file)
+{
+#if WATCHDOG_NOWAYOUT == 0
+        struct mpc5200_wdt *wdt = file->private_data;
+        mpc5200_wdt_stop(wdt);
+        wdt->count = 0;         /* == disabled */
+#endif
+        clear_bit(0, &is_active);
+        return 0;
+}
+
+static struct file_operations mpc5200_wdt_fops = {
+        .owner  = THIS_MODULE,
+        .write  = mpc5200_wdt_write,
+        .ioctl  = mpc5200_wdt_ioctl,
+        .open   = mpc5200_wdt_open,
+        .release = mpc5200_wdt_release,
+};
+
+/* module operations */
+static int mpc5200_wdt_probe(struct of_device *op, const struct of_device_id *match)
+{
+        struct mpc5200_wdt *wdt;
+        int err;
+        const void *has_wdt;
+        int size;
+
+        has_wdt = of_get_property(op->node, "has-wdt", NULL);
+        if (!has_wdt)
+                return -ENODEV;
+
+        wdt = kzalloc(sizeof(*wdt), GFP_KERNEL);
+        if (!wdt)
+                return -ENOMEM;
+
+        wdt->ipb_freq = mpc52xx_find_ipb_freq(op->node);
+
+        err = of_address_to_resource(op->node, 0, &wdt->mem);
+        if (err)
+                goto out_free;
+        size = wdt->mem.end - wdt->mem.start + 1;
+        if (!request_mem_region(wdt->mem.start, size, "mpc5200_wdt")) {
+                err = -ENODEV;
+                goto out_free;
+        }
+        wdt->regs = ioremap(wdt->mem.start, size);
+        if (!wdt->regs) {
+                err = -ENODEV;
+                goto out_release;
+        }
+
+        dev_set_drvdata(&op->dev, wdt);
+        spin_lock_init(&wdt->io_lock);
+
+        wdt->miscdev = (struct miscdevice) {
+                .minor  = WATCHDOG_MINOR,
+                .name   = "watchdog",
+                .fops   = &mpc5200_wdt_fops,
+                .parent = &op->dev,
+        };
+        wdt_global = wdt;
+        err = misc_register(&wdt->miscdev);
+        if (!err)
+                return 0;
+
+        iounmap(wdt->regs);
+ out_release:
+        release_mem_region(wdt->mem.start, size);
+ out_free:
+        kfree(wdt);
+        return err;
+}
+
+static int mpc5200_wdt_remove(struct of_device *op)
+{
+        struct mpc5200_wdt *wdt = dev_get_drvdata(&op->dev);
+
+        mpc5200_wdt_stop(wdt);
+        misc_deregister(&wdt->miscdev);
+        iounmap(wdt->regs);
+        release_mem_region(wdt->mem.start, wdt->mem.end - wdt->mem.start + 1);
+        kfree(wdt);
+
+        return 0;
+}
+static int mpc5200_wdt_suspend(struct of_device *op, pm_message_t state)
+{
+        struct mpc5200_wdt *wdt = dev_get_drvdata(&op->dev);
+        mpc5200_wdt_stop(wdt);
+        return 0;
+}
+static int mpc5200_wdt_resume(struct of_device *op)
+{
+        struct mpc5200_wdt *wdt = dev_get_drvdata(&op->dev);
+        if (wdt->count)
+                mpc5200_wdt_start(wdt);
+        return 0;
+}
+static int mpc5200_wdt_shutdown(struct of_device *op)
+{
+        struct mpc5200_wdt *wdt = dev_get_drvdata(&op->dev);
+        mpc5200_wdt_stop(wdt);
+        return 0;
+}
+
+static struct of_device_id mpc5200_wdt_match[] = {
+        { .compatible = "mpc5200-gpt", },
+        {},
+};
+static struct of_platform_driver mpc5200_wdt_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "mpc5200-gpt-wdt",
+        .match_table    = mpc5200_wdt_match,
+        .probe          = mpc5200_wdt_probe,
+        .remove         = mpc5200_wdt_remove,
+        .suspend        = mpc5200_wdt_suspend,
+        .resume         = mpc5200_wdt_resume,
+        .shutdown       = mpc5200_wdt_shutdown,
+};
+
+
+static int __init mpc5200_wdt_init(void)
+{
+        return of_register_platform_driver(&mpc5200_wdt_driver);
+}
+
+static void __exit mpc5200_wdt_exit(void)
+{
+        of_unregister_platform_driver(&mpc5200_wdt_driver);
+}
+
+module_init(mpc5200_wdt_init);
+module_exit(mpc5200_wdt_exit);
+
+MODULE_AUTHOR("Domen Puncer <domen.puncer@telargo.com>");
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/char/watchdog/mpc83xx_wdt.c b/drivers/char/watchdog/mpc83xx_wdt.c
index 18ca752e2f90..a0bf95fb9763 100644
--- a/drivers/char/watchdog/mpc83xx_wdt.c
+++ b/drivers/char/watchdog/mpc83xx_wdt.c
@@ -119,6 +119,9 @@ static int mpc83xx_wdt_ioctl(struct inode *inode, struct file *file,
         switch (cmd) {
         case WDIOC_GETSUPPORT:
                 return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
+        case WDIOC_GETSTATUS:
+        case WDIOC_GETBOOTSTATUS:
+                return put_user(0, p);
         case WDIOC_KEEPALIVE:
                 mpc83xx_wdt_keepalive();
                 return 0;
diff --git a/drivers/char/watchdog/mpc8xx_wdt.c b/drivers/char/watchdog/mpc8xx_wdt.c
index 8aaed10dd499..85b5734403a5 100644
--- a/drivers/char/watchdog/mpc8xx_wdt.c
+++ b/drivers/char/watchdog/mpc8xx_wdt.c
@@ -57,7 +57,7 @@ static int mpc8xx_wdt_open(struct inode *inode, struct file *file)
         m8xx_wdt_reset();
         mpc8xx_wdt_handler_disable();
 
-        return 0;
+        return nonseekable_open(inode, file);
 }
 
 static int mpc8xx_wdt_release(struct inode *inode, struct file *file)
diff --git a/drivers/char/watchdog/mtx-1_wdt.c b/drivers/char/watchdog/mtx-1_wdt.c
index 419ab445c944..dcfd401a7ad7 100644
--- a/drivers/char/watchdog/mtx-1_wdt.c
+++ b/drivers/char/watchdog/mtx-1_wdt.c
@@ -143,6 +143,7 @@ static int mtx1_wdt_ioctl(struct inode *inode, struct file *file, unsigned int c
                         mtx1_wdt_reset();
                         break;
                 case WDIOC_GETSTATUS:
+                case WDIOC_GETBOOTSTATUS:
                         if ( copy_to_user(argp, &value, sizeof(int)) )
                                 return -EFAULT;
                         break;
diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/char/watchdog/mv64x60_wdt.c
index b887cdb01334..0365c317f7e1 100644
--- a/drivers/char/watchdog/mv64x60_wdt.c
+++ b/drivers/char/watchdog/mv64x60_wdt.c
@@ -23,61 +23,101 @@
 #include <linux/watchdog.h>
 #include <linux/platform_device.h>
 
-#include <asm/mv64x60.h>
+#include <linux/mv643xx.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
-/* MV64x60 WDC (config) register access definitions */
-#define MV64x60_WDC_CTL1_MASK   (3 << 24)
-#define MV64x60_WDC_CTL1(val)   ((val & 3) << 24)
-#define MV64x60_WDC_CTL2_MASK   (3 << 26)
-#define MV64x60_WDC_CTL2(val)   ((val & 3) << 26)
+#define MV64x60_WDT_WDC_OFFSET  0
+
+/*
+ * The watchdog configuration register contains a pair of 2-bit fields,
+ *   1.  a reload field, bits 27-26, which triggers a reload of
+ *       the countdown register, and
+ *   2.  an enable field, bits 25-24, which toggles between
+ *       enabling and disabling the watchdog timer.
+ * Bit 31 is a read-only field which indicates whether the
+ * watchdog timer is currently enabled.
+ *
+ * The low 24 bits contain the timer reload value.
+ */
+#define MV64x60_WDC_ENABLE_SHIFT        24
+#define MV64x60_WDC_SERVICE_SHIFT       26
+#define MV64x60_WDC_ENABLED_SHIFT       31
+
+#define MV64x60_WDC_ENABLED_TRUE        1
+#define MV64x60_WDC_ENABLED_FALSE       0
 
 /* Flags bits */
 #define MV64x60_WDOG_FLAG_OPENED        0
-#define MV64x60_WDOG_FLAG_ENABLED       1
 
 static unsigned long wdt_flags;
 static int wdt_status;
-static void __iomem *mv64x60_regs;
+static void __iomem *mv64x60_wdt_regs;
 static int mv64x60_wdt_timeout;
+static int mv64x60_wdt_count;
+static unsigned int bus_clk;
+static char expect_close;
+static DEFINE_SPINLOCK(mv64x60_wdt_spinlock);
+
+static int nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
 
-static void mv64x60_wdt_reg_write(u32 val)
+static int mv64x60_wdt_toggle_wdc(int enabled_predicate, int field_shift)
 {
-        /* Allow write only to CTL1 / CTL2 fields, retaining values in
-         * other fields.
-         */
-        u32 data = readl(mv64x60_regs + MV64x60_WDT_WDC);
-        data &= ~(MV64x60_WDC_CTL1_MASK | MV64x60_WDC_CTL2_MASK);
-        data |= val;
-        writel(data, mv64x60_regs + MV64x60_WDT_WDC);
+        u32 data;
+        u32 enabled;
+        int ret = 0;
+
+        spin_lock(&mv64x60_wdt_spinlock);
+        data = readl(mv64x60_wdt_regs + MV64x60_WDT_WDC_OFFSET);
+        enabled = (data >> MV64x60_WDC_ENABLED_SHIFT) & 1;
+
+        /* only toggle the requested field if enabled state matches predicate */
+        if ((enabled ^ enabled_predicate) == 0) {
+                /* We write a 1, then a 2 -- to the appropriate field */
+                data = (1 << field_shift) | mv64x60_wdt_count;
+                writel(data, mv64x60_wdt_regs + MV64x60_WDT_WDC_OFFSET);
+
+                data = (2 << field_shift) | mv64x60_wdt_count;
+                writel(data, mv64x60_wdt_regs + MV64x60_WDT_WDC_OFFSET);
+                ret = 1;
+        }
+        spin_unlock(&mv64x60_wdt_spinlock);
+
+        return ret;
 }
 
 static void mv64x60_wdt_service(void)
 {
-        /* Write 01 followed by 10 to CTL2 */
-        mv64x60_wdt_reg_write(MV64x60_WDC_CTL2(0x01));
-        mv64x60_wdt_reg_write(MV64x60_WDC_CTL2(0x02));
+        mv64x60_wdt_toggle_wdc(MV64x60_WDC_ENABLED_TRUE,
+                               MV64x60_WDC_SERVICE_SHIFT);
+}
+
+static void mv64x60_wdt_handler_enable(void)
+{
+        if (mv64x60_wdt_toggle_wdc(MV64x60_WDC_ENABLED_FALSE,
+                                   MV64x60_WDC_ENABLE_SHIFT)) {
+                mv64x60_wdt_service();
+                printk(KERN_NOTICE "mv64x60_wdt: watchdog activated\n");
+        }
 }
 
 static void mv64x60_wdt_handler_disable(void)
 {
-        if (test_and_clear_bit(MV64x60_WDOG_FLAG_ENABLED, &wdt_flags)) {
-                /* Write 01 followed by 10 to CTL1 */
-                mv64x60_wdt_reg_write(MV64x60_WDC_CTL1(0x01));
-                mv64x60_wdt_reg_write(MV64x60_WDC_CTL1(0x02));
+        if (mv64x60_wdt_toggle_wdc(MV64x60_WDC_ENABLED_TRUE,
+                                   MV64x60_WDC_ENABLE_SHIFT))
                 printk(KERN_NOTICE "mv64x60_wdt: watchdog deactivated\n");
-        }
 }
 
-static void mv64x60_wdt_handler_enable(void)
+static void mv64x60_wdt_set_timeout(unsigned int timeout)
 {
-        if (!test_and_set_bit(MV64x60_WDOG_FLAG_ENABLED, &wdt_flags)) {
-                /* Write 01 followed by 10 to CTL1 */
-                mv64x60_wdt_reg_write(MV64x60_WDC_CTL1(0x01));
-                mv64x60_wdt_reg_write(MV64x60_WDC_CTL1(0x02));
-                printk(KERN_NOTICE "mv64x60_wdt: watchdog activated\n");
-        }
+        /* maximum bus cycle count is 0xFFFFFFFF */
+        if (timeout > 0xFFFFFFFF / bus_clk)
+                timeout = 0xFFFFFFFF / bus_clk;
+
+        mv64x60_wdt_count = timeout * bus_clk >> 8;
+        mv64x60_wdt_timeout = timeout;
 }
 
 static int mv64x60_wdt_open(struct inode *inode, struct file *file)
@@ -85,21 +125,24 @@ static int mv64x60_wdt_open(struct inode *inode, struct file *file)
         if (test_and_set_bit(MV64x60_WDOG_FLAG_OPENED, &wdt_flags))
                 return -EBUSY;
 
-        mv64x60_wdt_service();
-        mv64x60_wdt_handler_enable();
+        if (nowayout)
+                __module_get(THIS_MODULE);
 
-        nonseekable_open(inode, file);
+        mv64x60_wdt_handler_enable();
 
-        return 0;
+        return nonseekable_open(inode, file);
 }
 
 static int mv64x60_wdt_release(struct inode *inode, struct file *file)
 {
-        mv64x60_wdt_service();
-
-#if !defined(CONFIG_WATCHDOG_NOWAYOUT)
-        mv64x60_wdt_handler_disable();
-#endif
+        if (expect_close == 42)
+                mv64x60_wdt_handler_disable();
+        else {
+                printk(KERN_CRIT
+                       "mv64x60_wdt: unexpected close, not stopping timer!\n");
+                mv64x60_wdt_service();
+        }
+        expect_close = 0;
 
         clear_bit(MV64x60_WDOG_FLAG_OPENED, &wdt_flags);
 
@@ -109,8 +152,22 @@ static int mv64x60_wdt_release(struct inode *inode, struct file *file)
 static ssize_t mv64x60_wdt_write(struct file *file, const char __user *data,
                                  size_t len, loff_t * ppos)
 {
-        if (len)
+        if (len) {
+                if (!nowayout) {
+                        size_t i;
+
+                        expect_close = 0;
+
+                        for (i = 0; i != len; i++) {
+                                char c;
+                                if(get_user(c, data + i))
+                                        return -EFAULT;
+                                if (c == 'V')
+                                        expect_close = 42;
+                        }
+                }
                 mv64x60_wdt_service();
+        }
 
         return len;
 }
@@ -119,9 +176,12 @@ static int mv64x60_wdt_ioctl(struct inode *inode, struct file *file,
                              unsigned int cmd, unsigned long arg)
 {
         int timeout;
+        int options;
         void __user *argp = (void __user *)arg;
         static struct watchdog_info info = {
-                .options = WDIOF_KEEPALIVEPING,
+                .options =      WDIOF_SETTIMEOUT        |
+                                WDIOF_MAGICCLOSE        |
+                                WDIOF_KEEPALIVEPING,
                 .firmware_version = 0,
                 .identity = "MV64x60 watchdog",
         };
@@ -143,7 +203,15 @@ static int mv64x60_wdt_ioctl(struct inode *inode, struct file *file,
                 return -EOPNOTSUPP;
 
         case WDIOC_SETOPTIONS:
-                return -EOPNOTSUPP;
+                if (get_user(options, (int __user *)argp))
+                        return -EFAULT;
+
+                if (options & WDIOS_DISABLECARD)
+                        mv64x60_wdt_handler_disable();
+
+                if (options & WDIOS_ENABLECARD)
+                        mv64x60_wdt_handler_enable();
+                break;
 
         case WDIOC_KEEPALIVE:
                 mv64x60_wdt_service();
@@ -151,11 +219,13 @@ static int mv64x60_wdt_ioctl(struct inode *inode, struct file *file,
                 break;
 
         case WDIOC_SETTIMEOUT:
-                return -EOPNOTSUPP;
+                if (get_user(timeout, (int __user *)argp))
+                        return -EFAULT;
+                mv64x60_wdt_set_timeout(timeout);
+                /* Fall through */
 
         case WDIOC_GETTIMEOUT:
-                timeout = mv64x60_wdt_timeout * HZ;
-                if (put_user(timeout, (int __user *)argp))
+                if (put_user(mv64x60_wdt_timeout, (int __user *)argp))
                         return -EFAULT;
                 break;
 
@@ -184,18 +254,33 @@ static struct miscdevice mv64x60_wdt_miscdev = {
 static int __devinit mv64x60_wdt_probe(struct platform_device *dev)
 {
         struct mv64x60_wdt_pdata *pdata = dev->dev.platform_data;
-        int bus_clk = 133;
+        struct resource *r;
+        int timeout = 10;
 
-        mv64x60_wdt_timeout = 10;
+        bus_clk = 133;                  /* in MHz */
         if (pdata) {
-                mv64x60_wdt_timeout = pdata->timeout;
+                timeout = pdata->timeout;
                 bus_clk = pdata->bus_clk;
         }
 
-        mv64x60_regs = mv64x60_get_bridge_vbase();
+        /* Since bus_clk is truncated MHz, actual frequency could be
+         * up to 1MHz higher.  Round up, since it's better to time out
+         * too late than too soon.
+         */
+        bus_clk++;
+        bus_clk *= 1000000;             /* convert to Hz */
+
+        r = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        if (!r)
+                return -ENODEV;
 
-        writel((mv64x60_wdt_timeout * (bus_clk * 1000000)) >> 8,
-               mv64x60_regs + MV64x60_WDT_WDC);
+        mv64x60_wdt_regs = ioremap(r->start, r->end - r->start + 1);
+        if (mv64x60_wdt_regs == NULL)
+                return -ENOMEM;
+
+        mv64x60_wdt_set_timeout(timeout);
+
+        mv64x60_wdt_handler_disable();  /* in case timer was already running */
 
         return misc_register(&mv64x60_wdt_miscdev);
 }
@@ -204,9 +289,10 @@ static int __devexit mv64x60_wdt_remove(struct platform_device *dev)
 {
         misc_deregister(&mv64x60_wdt_miscdev);
 
-        mv64x60_wdt_service();
         mv64x60_wdt_handler_disable();
 
+        iounmap(mv64x60_wdt_regs);
+
         return 0;
 }
 
@@ -219,40 +305,16 @@ static struct platform_driver mv64x60_wdt_driver = {
         },
 };
 
-static struct platform_device *mv64x60_wdt_dev;
-
 static int __init mv64x60_wdt_init(void)
 {
-        int ret;
-
         printk(KERN_INFO "MV64x60 watchdog driver\n");
 
-        mv64x60_wdt_dev = platform_device_alloc(MV64x60_WDT_NAME, -1);
-        if (!mv64x60_wdt_dev) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        ret = platform_device_add(mv64x60_wdt_dev);
-        if (ret) {
-                platform_device_put(mv64x60_wdt_dev);
-                goto out;
-        }
-
-        ret = platform_driver_register(&mv64x60_wdt_driver);
-        if (ret) {
-                platform_device_unregister(mv64x60_wdt_dev);
-                goto out;
-        }
-
- out:
-        return ret;
+        return platform_driver_register(&mv64x60_wdt_driver);
 }
 
 static void __exit mv64x60_wdt_exit(void)
 {
         platform_driver_unregister(&mv64x60_wdt_driver);
-        platform_device_unregister(mv64x60_wdt_dev);
 }
 
 module_init(mv64x60_wdt_init);
diff --git a/drivers/char/watchdog/omap_wdt.c b/drivers/char/watchdog/omap_wdt.c
index b36fa8de2131..719b066f73c4 100644
--- a/drivers/char/watchdog/omap_wdt.c
+++ b/drivers/char/watchdog/omap_wdt.c
@@ -142,7 +142,7 @@ static int omap_wdt_open(struct inode *inode, struct file *file)
 
         omap_wdt_set_timeout();
         omap_wdt_enable();
-        return 0;
+        return nonseekable_open(inode, file);
 }
 
 static int omap_wdt_release(struct inode *inode, struct file *file)
@@ -197,7 +197,7 @@ omap_wdt_ioctl(struct inode *inode, struct file *file,
 
         switch (cmd) {
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         case WDIOC_GETSUPPORT:
                 return copy_to_user((struct watchdog_info __user *)arg, &ident,
                                 sizeof(ident));
diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c
index 50430bced2f2..5d1c15f83d23 100644
--- a/drivers/char/watchdog/s3c2410_wdt.c
+++ b/drivers/char/watchdog/s3c2410_wdt.c
@@ -52,10 +52,10 @@
 
 #include <asm/arch/map.h>
 
-#undef S3C24XX_VA_WATCHDOG
-#define S3C24XX_VA_WATCHDOG (0)
+#undef S3C_VA_WATCHDOG
+#define S3C_VA_WATCHDOG (0)
 
-#include <asm/arch/regs-watchdog.h>
+#include <asm/plat-s3c/regs-watchdog.h>
 
 #define PFX "s3c2410-wdt: "
 
diff --git a/drivers/char/watchdog/sa1100_wdt.c b/drivers/char/watchdog/sa1100_wdt.c
index 33c1137f17d6..3475f47aaa45 100644
--- a/drivers/char/watchdog/sa1100_wdt.c
+++ b/drivers/char/watchdog/sa1100_wdt.c
@@ -45,7 +45,6 @@ static int boot_status;
  */
 static int sa1100dog_open(struct inode *inode, struct file *file)
 {
-        nonseekable_open(inode, file);
         if (test_and_set_bit(1,&sa1100wdt_users))
                 return -EBUSY;
 
@@ -54,7 +53,7 @@ static int sa1100dog_open(struct inode *inode, struct file *file)
         OSSR = OSSR_M3;
         OWER = OWER_WME;
         OIER |= OIER_E3;
-        return 0;
+        return nonseekable_open(inode, file);
 }
 
 /*
diff --git a/drivers/char/watchdog/sbc60xxwdt.c b/drivers/char/watchdog/sbc60xxwdt.c
index b6282039198c..e4f3cb6090bc 100644
--- a/drivers/char/watchdog/sbc60xxwdt.c
+++ b/drivers/char/watchdog/sbc60xxwdt.c
@@ -191,8 +191,6 @@ static ssize_t fop_write(struct file * file, const char __user * buf, size_t cou
 
 static int fop_open(struct inode * inode, struct file * file)
 {
-        nonseekable_open(inode, file);
-
         /* Just in case we're already talking to someone... */
         if(test_and_set_bit(0, &wdt_is_open))
                 return -EBUSY;
@@ -202,7 +200,7 @@ static int fop_open(struct inode * inode, struct file * file)
 
         /* Good, fire up the show */
         wdt_startup();
-        return 0;
+        return nonseekable_open(inode, file);
 }
 
 static int fop_close(struct inode * inode, struct file * file)
diff --git a/drivers/char/watchdog/sc1200wdt.c b/drivers/char/watchdog/sc1200wdt.c
index 2f7ba7a514fe..9670d47190d0 100644
--- a/drivers/char/watchdog/sc1200wdt.c
+++ b/drivers/char/watchdog/sc1200wdt.c
@@ -150,8 +150,6 @@ static inline int sc1200wdt_status(void)
 
 static int sc1200wdt_open(struct inode *inode, struct file *file)
 {
-        nonseekable_open(inode, file);
-
         /* allow one at a time */
         if (down_trylock(&open_sem))
                 return -EBUSY;
@@ -162,7 +160,7 @@ static int sc1200wdt_open(struct inode *inode, struct file *file)
         sc1200wdt_start();
         printk(KERN_INFO PFX "Watchdog enabled, timeout = %d min(s)", timeout);
 
-        return 0;
+        return nonseekable_open(inode, file);
 }
 
 
diff --git a/drivers/char/watchdog/sc520_wdt.c b/drivers/char/watchdog/sc520_wdt.c
index 2676a43895a7..e8594c64d1e6 100644
--- a/drivers/char/watchdog/sc520_wdt.c
+++ b/drivers/char/watchdog/sc520_wdt.c
@@ -248,8 +248,6 @@ static ssize_t fop_write(struct file * file, const char __user * buf, size_t cou
 
 static int fop_open(struct inode * inode, struct file * file)
 {
-        nonseekable_open(inode, file);
-
         /* Just in case we're already talking to someone... */
         if(test_and_set_bit(0, &wdt_is_open))
                 return -EBUSY;
@@ -258,7 +256,7 @@ static int fop_open(struct inode * inode, struct file * file)
 
         /* Good, fire up the show */
         wdt_startup();
-        return 0;
+        return nonseekable_open(inode, file);
 }
 
 static int fop_close(struct inode * inode, struct file * file)
diff --git a/drivers/char/watchdog/w83627hf_wdt.c b/drivers/char/watchdog/w83627hf_wdt.c
index b46e7f47d705..df33b3b5a53c 100644
--- a/drivers/char/watchdog/w83627hf_wdt.c
+++ b/drivers/char/watchdog/w83627hf_wdt.c
@@ -4,7 +4,7 @@
  *      (c) Copyright 2007 Vlad Drukker <vlad@storewiz.com>
  *              added support for W83627THF.
  *
- *      (c) Copyright 2003 Pádraig Brady <P@draigBrady.com>
+ *      (c) Copyright 2003,2007 Pádraig Brady <P@draigBrady.com>
  *
  *      Based on advantechwdt.c which is based on wdt.c.
  *      Original copyright messages:
@@ -42,7 +42,7 @@
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
-#define WATCHDOG_NAME "w83627hf/thf WDT"
+#define WATCHDOG_NAME "w83627hf/thf/hg WDT"
 #define PFX WATCHDOG_NAME ": "
 #define WATCHDOG_TIMEOUT 60             /* 60 sec default timeout */
 
@@ -57,7 +57,7 @@ MODULE_PARM_DESC(wdt_io, "w83627hf/thf WDT io port (default 0x2E)");
 
 static int timeout = WATCHDOG_TIMEOUT;  /* in seconds */
 module_param(timeout, int, 0);
-MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=63, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=255, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
 
 static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, int, 0);
@@ -78,9 +78,9 @@ w83627hf_select_wd_register(void)
         outb_p(0x87, WDT_EFER); /* Enter extended function mode */
         outb_p(0x87, WDT_EFER); /* Again according to manual */
 
-        outb(0x20, WDT_EFER);   /* check chip version   */
+        outb(0x20, WDT_EFER);   /* check chip version   */
         c = inb(WDT_EFDR);
-        if (c == 0x82) {        /* W83627THF            */
+        if (c == 0x82) {        /* W83627THF            */
                 outb_p(0x2b, WDT_EFER); /* select GPIO3 */
                 c = ((inb_p(WDT_EFDR) & 0xf7) | 0x04); /* select WDT0 */
                 outb_p(0x2b, WDT_EFER);
@@ -114,11 +114,17 @@ w83627hf_init(void)
                 printk (KERN_INFO PFX "Watchdog already running. Resetting timeout to %d sec\n", timeout);
                 outb_p(timeout, WDT_EFDR);    /* Write back to CRF6 */
         }
+
         outb_p(0xF5, WDT_EFER); /* Select CRF5 */
         t=inb_p(WDT_EFDR);      /* read CRF5 */
         t&=~0x0C;               /* set second mode & disable keyboard turning off watchdog */
         outb_p(t, WDT_EFDR);    /* Write back to CRF5 */
 
+        outb_p(0xF7, WDT_EFER); /* Select CRF7 */
+        t=inb_p(WDT_EFDR);      /* read CRF7 */
+        t&=~0xC0;               /* disable keyboard & mouse turning off watchdog */
+        outb_p(t, WDT_EFDR);    /* Write back to CRF7 */
+
         w83627hf_unselect_wd_register();
 }
 
@@ -126,7 +132,7 @@ static void
 wdt_ctrl(int timeout)
 {
         spin_lock(&io_lock);
-        
+
         w83627hf_select_wd_register();
 
         outb_p(0xF6, WDT_EFER);    /* Select CRF6 */
@@ -154,7 +160,7 @@ wdt_disable(void)
 static int
 wdt_set_heartbeat(int t)
 {
-        if ((t < 1) || (t > 63))
+        if ((t < 1) || (t > 255))
                 return -EINVAL;
 
         timeout = t;
@@ -324,11 +330,11 @@ wdt_init(void)
 
         spin_lock_init(&io_lock);
 
-        printk(KERN_INFO "WDT driver for the Winbond(TM) W83627HF/THF Super I/O chip initialising.\n");
+        printk(KERN_INFO "WDT driver for the Winbond(TM) W83627HF/THF/HG Super I/O chip initialising.\n");
 
         if (wdt_set_heartbeat(timeout)) {
                 wdt_set_heartbeat(WATCHDOG_TIMEOUT);
-                printk (KERN_INFO PFX "timeout value must be 1<=timeout<=63, using %d\n",
+                printk (KERN_INFO PFX "timeout value must be 1<=timeout<=255, using %d\n",
                         WATCHDOG_TIMEOUT);
         }
 
diff --git a/drivers/dma/iovlock.c b/drivers/dma/iovlock.c
index d637555a833b..e763d723e4cf 100644
--- a/drivers/dma/iovlock.c
+++ b/drivers/dma/iovlock.c
@@ -143,29 +143,6 @@ void dma_unpin_iovec_pages(struct dma_pinned_list *pinned_list)
         kfree(pinned_list);
 }
 
-static dma_cookie_t dma_memcpy_to_kernel_iovec(struct dma_chan *chan, struct
-        iovec *iov, unsigned char *kdata, size_t len)
-{
-        dma_cookie_t dma_cookie = 0;
-
-        while (len > 0) {
-                if (iov->iov_len) {
-                        int copy = min_t(unsigned int, iov->iov_len, len);
-                        dma_cookie = dma_async_memcpy_buf_to_buf(
-                                        chan,
-                                        iov->iov_base,
-                                        kdata,
-                                        copy);
-                        kdata += copy;
-                        len -= copy;
-                        iov->iov_len -= copy;
-                        iov->iov_base += copy;
-                }
-                iov++;
-        }
-
-        return dma_cookie;
-}
 
 /*
  * We have already pinned down the pages we will be using in the iovecs.
@@ -187,10 +164,6 @@ dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
         if (!chan)
                 return memcpy_toiovec(iov, kdata, len);
 
-        /* -> kernel copies (e.g. smbfs) */
-        if (!pinned_list)
-                return dma_memcpy_to_kernel_iovec(chan, iov, kdata, len);
-
         iovec_idx = 0;
         while (iovec_idx < pinned_list->nr_iovecs) {
                 struct dma_page_list *page_list;
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index dbdca6f10e46..192953b29b28 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -520,6 +520,16 @@ config SENSORS_SMSC47B397
           This driver can also be built as a module.  If so, the module
           will be called smsc47b397.
 
+config SENSORS_THMC50
+        tristate "Texas Instruments THMC50 / Analog Devices ADM1022"
+        depends on I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for Texas Instruments THMC50
+          sensor chips and clones: the Analog Devices ADM1022.
+
+          This driver can also be built as a module.  If so, the module
+          will be called thmc50.
+
 config SENSORS_VIA686A
         tristate "VIA686A"
         depends on PCI
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 59f81fae40a0..d04f90031ebf 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -56,6 +56,7 @@ obj-$(CONFIG_SENSORS_SIS5595)	+= sis5595.o
 obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
 obj-$(CONFIG_SENSORS_SMSC47M1)  += smsc47m1.o
 obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
+obj-$(CONFIG_SENSORS_THMC50)    += thmc50.o
 obj-$(CONFIG_SENSORS_VIA686A)   += via686a.o
 obj-$(CONFIG_SENSORS_VT1211)    += vt1211.o
 obj-$(CONFIG_SENSORS_VT8231)    += vt8231.o
diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c
index a003d104ca45..cdd8b6dea16d 100644
--- a/drivers/hwmon/abituguru3.c
+++ b/drivers/hwmon/abituguru3.c
@@ -691,8 +691,9 @@ static int abituguru3_read(struct abituguru3_data *data, u8 bank, u8 offset,
 
 /* Sensor settings are stored 1 byte per offset with the bytes
    placed add consecutive offsets. */
-int abituguru3_read_increment_offset(struct abituguru3_data *data, u8 bank,
-        u8 offset, u8 count, u8 *buf, int offset_count)
+static int abituguru3_read_increment_offset(struct abituguru3_data *data,
+                                            u8 bank, u8 offset, u8 count,
+                                            u8 *buf, int offset_count)
 {
         int i, x;
 
diff --git a/drivers/hwmon/ams/ams-core.c b/drivers/hwmon/ams/ams-core.c
index 6db973739725..a112a03e8f29 100644
--- a/drivers/hwmon/ams/ams-core.c
+++ b/drivers/hwmon/ams/ams-core.c
@@ -23,7 +23,6 @@
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/module.h>
 #include <asm/pmac_pfunc.h>
 #include <asm/of_platform.h>
 
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index fd1281f42209..941729a131f5 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -79,11 +79,15 @@
 
 /*
  * Temperature sensors keys (sp78 - 2 bytes).
- * First set for Macbook(Pro), second for Macmini.
  */
 static const char* temperature_sensors_sets[][13] = {
+/* Set 0: Macbook Pro */
         { "TA0P", "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "Th0H",
           "Th1H", "Tm0P", "Ts0P", "Ts1P", NULL },
+/* Set 1: Macbook set */
+        { "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TN1P", "Th0H", "Th0S",
+          "Th1H", "Ts0P", NULL },
+/* Set 2: Macmini set */
         { "TC0D", "TC0P", NULL }
 };
 
@@ -1150,10 +1154,10 @@ static void applesmc_release_accelerometer(void)
 static __initdata struct dmi_match_data applesmc_dmi_data[] = {
 /* MacBook Pro: accelerometer, backlight and temperature set 0 */
         { .accelerometer = 1, .light = 1, .temperature_set = 0 },
-/* MacBook: accelerometer and temperature set 0 */
-        { .accelerometer = 1, .light = 0, .temperature_set = 0 },
-/* MacBook: temperature set 1 */
-        { .accelerometer = 0, .light = 0, .temperature_set = 1 }
+/* MacBook: accelerometer and temperature set 1 */
+        { .accelerometer = 1, .light = 0, .temperature_set = 1 },
+/* MacMini: temperature set 2 */
+        { .accelerometer = 0, .light = 0, .temperature_set = 2 },
 };
 
 /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index be3aaa5d0b91..e9cbc727664d 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -750,7 +750,7 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
                 res = (data->alarms >> DME1737_BIT_ALARM_TEMP[ix]) & 0x01;
                 break;
         case SYS_TEMP_FAULT:
-                res = (data->temp[ix] == 0x0800);
+                res = (((u16)data->temp[ix] & 0xff00) == 0x8000);
                 break;
         default:
                 res = 0;
diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
index 19717752cfca..b34b546c68b8 100644
--- a/drivers/hwmon/fscher.c
+++ b/drivers/hwmon/fscher.c
@@ -441,6 +441,8 @@ static struct fscher_data *fscher_update_device(struct device *dev)
                 data->watchdog[2] = fscher_read_value(client, FSCHER_REG_WDOG_CONTROL);
 
                 data->global_event = fscher_read_value(client, FSCHER_REG_EVENT_STATE);
+                data->global_control = fscher_read_value(client,
+                                                        FSCHER_REG_CONTROL);
 
                 data->last_updated = jiffies;
                 data->valid = 1;                 
@@ -599,7 +601,7 @@ static ssize_t set_control(struct i2c_client *client, struct fscher_data *data,
         unsigned long v = simple_strtoul(buf, NULL, 10) & 0x01;
 
         mutex_lock(&data->update_lock);
-        data->global_control &= ~v;
+        data->global_control = v;
         fscher_write_value(client, reg, v);
         mutex_unlock(&data->update_lock);
         return count;
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index eff6036e15c0..d75dba9b810b 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -252,7 +252,7 @@ struct it87_data {
 
 
 static int it87_probe(struct platform_device *pdev);
-static int it87_remove(struct platform_device *pdev);
+static int __devexit it87_remove(struct platform_device *pdev);
 
 static int it87_read_value(struct it87_data *data, u8 reg);
 static void it87_write_value(struct it87_data *data, u8 reg, u8 value);
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 9fb572f03ba5..565c4e679b8d 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -864,7 +864,7 @@ static int __init lm78_isa_found(unsigned short address)
         /* Determine the chip type */
         outb_p(LM78_REG_CHIPID, address + LM78_ADDR_REG_OFFSET);
         val = inb_p(address + LM78_DATA_REG_OFFSET);
-        if (val == 0x00                 /* LM78 */
+        if (val == 0x00 || val == 0x20  /* LM78 */
          || val == 0x40                 /* LM78-J */
          || (val & 0xfe) == 0xc0)       /* LM79 */
                 found = 1;
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 48833fff4920..af541d67245d 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -585,7 +585,7 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
                          * those of the man_id register.
                          */
                         if (chip_id == man_id
-                         && (address == 0x4F || address == 0x4D)
+                         && (address == 0x4C || address == 0x4D)
                          && (reg_config1 & 0x1F) == (man_id & 0x0F)
                          && reg_convrate <= 0x09) {
                                 kind = max6657;
diff --git a/drivers/hwmon/lm93.c b/drivers/hwmon/lm93.c
index 23edf4fe4221..d84f8bf6f284 100644
--- a/drivers/hwmon/lm93.c
+++ b/drivers/hwmon/lm93.c
@@ -234,7 +234,7 @@ struct lm93_data {
         struct {
                 u8 min;
                 u8 max;
-        } temp_lim[3];
+        } temp_lim[4];
 
         /* vin1 - vin16: low and high limits */
         struct {
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index cb72526c346a..f57c75d59a5b 100644
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -220,7 +220,7 @@ struct pc87360_data {
  */
 
 static int pc87360_probe(struct platform_device *pdev);
-static int pc87360_remove(struct platform_device *pdev);
+static int __devexit pc87360_remove(struct platform_device *pdev);
 
 static int pc87360_read_value(struct pc87360_data *data, u8 ldi, u8 bank,
                               u8 reg);
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 83321b28cf0e..92956eb3f3c1 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -187,7 +187,7 @@ struct sis5595_data {
 static struct pci_dev *s_bridge;        /* pointer to the (only) sis5595 */
 
 static int sis5595_probe(struct platform_device *pdev);
-static int sis5595_remove(struct platform_device *pdev);
+static int __devexit sis5595_remove(struct platform_device *pdev);
 
 static int sis5595_read_value(struct sis5595_data *data, u8 reg);
 static void sis5595_write_value(struct sis5595_data *data, u8 reg, u8 value);
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 1de2f2be8708..338ee4f54614 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -134,7 +134,7 @@ struct smsc47m1_sio_data {
 
 
 static int smsc47m1_probe(struct platform_device *pdev);
-static int smsc47m1_remove(struct platform_device *pdev);
+static int __devexit smsc47m1_remove(struct platform_device *pdev);
 static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
                 int init);
 
diff --git a/drivers/hwmon/thmc50.c b/drivers/hwmon/thmc50.c
new file mode 100644
index 000000000000..9395b52d9b99
--- /dev/null
+++ b/drivers/hwmon/thmc50.c
@@ -0,0 +1,440 @@
+/*
+    thmc50.c - Part of lm_sensors, Linux kernel modules for hardware
+             monitoring
+    Copyright (C) 2007 Krzysztof Helt <krzysztof.h1@wp.pl>
+    Based on 2.4 driver by Frodo Looijaard <frodol@dds.nl> and
+    Philip Edelbrock <phil@netroedge.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.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+
+MODULE_LICENSE("GPL");
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
+
+/* Insmod parameters */
+I2C_CLIENT_INSMOD_2(thmc50, adm1022);
+I2C_CLIENT_MODULE_PARM(adm1022_temp3, "List of adapter,address pairs "
+                        "to enable 3rd temperature (ADM1022 only)");
+
+/* Many THMC50 constants specified below */
+
+/* The THMC50 registers */
+#define THMC50_REG_CONF                         0x40
+#define THMC50_REG_COMPANY_ID                   0x3E
+#define THMC50_REG_DIE_CODE                     0x3F
+#define THMC50_REG_ANALOG_OUT                   0x19
+
+const static u8 THMC50_REG_TEMP[] = { 0x27, 0x26, 0x20 };
+const static u8 THMC50_REG_TEMP_MIN[] = { 0x3A, 0x38, 0x2C };
+const static u8 THMC50_REG_TEMP_MAX[] = { 0x39, 0x37, 0x2B };
+
+#define THMC50_REG_CONF_nFANOFF                 0x20
+
+/* Each client has this additional data */
+struct thmc50_data {
+        struct i2c_client client;
+        struct class_device *class_dev;
+
+        struct mutex update_lock;
+        enum chips type;
+        unsigned long last_updated;     /* In jiffies */
+        char has_temp3;         /* !=0 if it is ADM1022 in temp3 mode */
+        char valid;             /* !=0 if following fields are valid */
+
+        /* Register values */
+        s8 temp_input[3];
+        s8 temp_max[3];
+        s8 temp_min[3];
+        u8 analog_out;
+};
+
+static int thmc50_attach_adapter(struct i2c_adapter *adapter);
+static int thmc50_detach_client(struct i2c_client *client);
+static void thmc50_init_client(struct i2c_client *client);
+static struct thmc50_data *thmc50_update_device(struct device *dev);
+
+static struct i2c_driver thmc50_driver = {
+        .driver = {
+                .name = "thmc50",
+        },
+        .attach_adapter = thmc50_attach_adapter,
+        .detach_client = thmc50_detach_client,
+};
+
+static ssize_t show_analog_out(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+        struct thmc50_data *data = thmc50_update_device(dev);
+        return sprintf(buf, "%d\n", data->analog_out);
+}
+
+static ssize_t set_analog_out(struct device *dev,
+                              struct device_attribute *attr,
+                              const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct thmc50_data *data = i2c_get_clientdata(client);
+        int tmp = simple_strtoul(buf, NULL, 10);
+        int config;
+
+        mutex_lock(&data->update_lock);
+        data->analog_out = SENSORS_LIMIT(tmp, 0, 255);
+        i2c_smbus_write_byte_data(client, THMC50_REG_ANALOG_OUT,
+                                  data->analog_out);
+
+        config = i2c_smbus_read_byte_data(client, THMC50_REG_CONF);
+        if (data->analog_out == 0)
+                config &= ~THMC50_REG_CONF_nFANOFF;
+        else
+                config |= THMC50_REG_CONF_nFANOFF;
+        i2c_smbus_write_byte_data(client, THMC50_REG_CONF, config);
+
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+/* There is only one PWM mode = DC */
+static ssize_t show_pwm_mode(struct device *dev, struct device_attribute *attr,
+                             char *buf)
+{
+        return sprintf(buf, "0\n");
+}
+
+/* Temperatures */
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+        int nr = to_sensor_dev_attr(attr)->index;
+        struct thmc50_data *data = thmc50_update_device(dev);
+        return sprintf(buf, "%d\n", data->temp_input[nr] * 1000);
+}
+
+static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,
+                             char *buf)
+{
+        int nr = to_sensor_dev_attr(attr)->index;
+        struct thmc50_data *data = thmc50_update_device(dev);
+        return sprintf(buf, "%d\n", data->temp_min[nr] * 1000);
+}
+
+static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
+                            const char *buf, size_t count)
+{
+        int nr = to_sensor_dev_attr(attr)->index;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct thmc50_data *data = i2c_get_clientdata(client);
+        int val = simple_strtol(buf, NULL, 10);
+
+        mutex_lock(&data->update_lock);
+        data->temp_min[nr] = SENSORS_LIMIT(val / 1000, -128, 127);
+        i2c_smbus_write_byte_data(client, THMC50_REG_TEMP_MIN[nr],
+                                  data->temp_min[nr]);
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,
+                             char *buf)
+{
+        int nr = to_sensor_dev_attr(attr)->index;
+        struct thmc50_data *data = thmc50_update_device(dev);
+        return sprintf(buf, "%d\n", data->temp_max[nr] * 1000);
+}
+
+static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
+                            const char *buf, size_t count)
+{
+        int nr = to_sensor_dev_attr(attr)->index;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct thmc50_data *data = i2c_get_clientdata(client);
+        int val = simple_strtol(buf, NULL, 10);
+
+        mutex_lock(&data->update_lock);
+        data->temp_max[nr] = SENSORS_LIMIT(val / 1000, -128, 127);
+        i2c_smbus_write_byte_data(client, THMC50_REG_TEMP_MAX[nr],
+                                  data->temp_max[nr]);
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+#define temp_reg(offset)                                                \
+static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp,     \
+                        NULL, offset - 1);                              \
+static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,        \
+                        show_temp_min, set_temp_min, offset - 1);       \
+static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,        \
+                        show_temp_max, set_temp_max, offset - 1);
+
+temp_reg(1);
+temp_reg(2);
+temp_reg(3);
+
+static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, show_analog_out,
+                          set_analog_out, 0);
+static SENSOR_DEVICE_ATTR(pwm1_mode, S_IRUGO, show_pwm_mode, NULL, 0);
+
+static struct attribute *thmc50_attributes[] = {
+        &sensor_dev_attr_temp1_max.dev_attr.attr,
+        &sensor_dev_attr_temp1_min.dev_attr.attr,
+        &sensor_dev_attr_temp1_input.dev_attr.attr,
+        &sensor_dev_attr_temp2_max.dev_attr.attr,
+        &sensor_dev_attr_temp2_min.dev_attr.attr,
+        &sensor_dev_attr_temp2_input.dev_attr.attr,
+        &sensor_dev_attr_pwm1.dev_attr.attr,
+        &sensor_dev_attr_pwm1_mode.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group thmc50_group = {
+        .attrs = thmc50_attributes,
+};
+
+/* for ADM1022 3rd temperature mode */
+static struct attribute *adm1022_attributes[] = {
+        &sensor_dev_attr_temp3_max.dev_attr.attr,
+        &sensor_dev_attr_temp3_min.dev_attr.attr,
+        &sensor_dev_attr_temp3_input.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group adm1022_group = {
+        .attrs = adm1022_attributes,
+};
+
+static int thmc50_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        unsigned company;
+        unsigned revision;
+        unsigned config;
+        struct i2c_client *client;
+        struct thmc50_data *data;
+        struct device *dev;
+        int err = 0;
+        const char *type_name = "";
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
+                pr_debug("thmc50: detect failed, "
+                         "smbus byte data not supported!\n");
+                goto exit;
+        }
+
+        /* OK. For now, we presume we have a valid client. We now create the
+           client structure, even though we cannot fill it completely yet.
+           But it allows us to access thmc50 registers. */
+        if (!(data = kzalloc(sizeof(struct thmc50_data), GFP_KERNEL))) {
+                pr_debug("thmc50: detect failed, kzalloc failed!\n");
+                err = -ENOMEM;
+                goto exit;
+        }
+
+        client = &data->client;
+        i2c_set_clientdata(client, data);
+        client->addr = address;
+        client->adapter = adapter;
+        client->driver = &thmc50_driver;
+        dev = &client->dev;
+
+        pr_debug("thmc50: Probing for THMC50 at 0x%2X on bus %d\n",
+                 client->addr, i2c_adapter_id(client->adapter));
+
+        /* Now, we do the remaining detection. */
+        company = i2c_smbus_read_byte_data(client, THMC50_REG_COMPANY_ID);
+        revision = i2c_smbus_read_byte_data(client, THMC50_REG_DIE_CODE);
+        config = i2c_smbus_read_byte_data(client, THMC50_REG_CONF);
+
+        if (kind == 0)
+                kind = thmc50;
+        else if (kind < 0) {
+                err = -ENODEV;
+                if (revision >= 0xc0 && ((config & 0x10) == 0)) {
+                        if (company == 0x49) {
+                                kind = thmc50;
+                                err = 0;
+                        } else if (company == 0x41) {
+                                kind = adm1022;
+                                err = 0;
+                        }
+                }
+        }
+        if (err == -ENODEV) {
+                pr_debug("thmc50: Detection of THMC50/ADM1022 failed\n");
+                goto exit_free;
+        }
+        pr_debug("thmc50: Detected %s (version %x, revision %x)\n",
+                 type_name, (revision >> 4) - 0xc, revision & 0xf);
+        data->type = kind;
+
+        if (kind == thmc50)
+                type_name = "thmc50";
+        else if (kind == adm1022) {
+                int id = i2c_adapter_id(client->adapter);
+                int i;
+
+                type_name = "adm1022";
+                data->has_temp3 = (config >> 7) & 1;    /* config MSB */
+                for (i = 0; i + 1 < adm1022_temp3_num; i += 2)
+                        if (adm1022_temp3[i] == id &&
+                            adm1022_temp3[i + 1] == address) {
+                                /* enable 2nd remote temp */
+                                data->has_temp3 = 1;
+                                break;
+                        }
+        }
+
+        /* Fill in the remaining client fields & put it into the global list */
+        strlcpy(client->name, type_name, I2C_NAME_SIZE);
+        mutex_init(&data->update_lock);
+
+        /* Tell the I2C layer a new client has arrived */
+        if ((err = i2c_attach_client(client)))
+                goto exit_free;
+
+        thmc50_init_client(client);
+
+        /* Register sysfs hooks */
+        if ((err = sysfs_create_group(&client->dev.kobj, &thmc50_group)))
+                goto exit_detach;
+
+        /* Register ADM1022 sysfs hooks */
+        if (data->type == adm1022)
+                if ((err = sysfs_create_group(&client->dev.kobj,
+                                              &adm1022_group)))
+                        goto exit_remove_sysfs_thmc50;
+
+        /* Register a new directory entry with module sensors */
+        data->class_dev = hwmon_device_register(&client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_remove_sysfs;
+        }
+
+        return 0;
+
+exit_remove_sysfs:
+        if (data->type == adm1022)
+                sysfs_remove_group(&client->dev.kobj, &adm1022_group);
+exit_remove_sysfs_thmc50:
+        sysfs_remove_group(&client->dev.kobj, &thmc50_group);
+exit_detach:
+        i2c_detach_client(client);
+exit_free:
+        kfree(data);
+exit:
+        return err;
+}
+
+static int thmc50_attach_adapter(struct i2c_adapter *adapter)
+{
+        if (!(adapter->class & I2C_CLASS_HWMON))
+                return 0;
+        return i2c_probe(adapter, &addr_data, thmc50_detect);
+}
+
+static int thmc50_detach_client(struct i2c_client *client)
+{
+        struct thmc50_data *data = i2c_get_clientdata(client);
+        int err;
+
+        hwmon_device_unregister(data->class_dev);
+        sysfs_remove_group(&client->dev.kobj, &thmc50_group);
+        if (data->type == adm1022)
+                sysfs_remove_group(&client->dev.kobj, &adm1022_group);
+
+        if ((err = i2c_detach_client(client)))
+                return err;
+
+        kfree(data);
+
+        return 0;
+}
+
+static void thmc50_init_client(struct i2c_client *client)
+{
+        struct thmc50_data *data = i2c_get_clientdata(client);
+        int config;
+
+        data->analog_out = i2c_smbus_read_byte_data(client,
+                                                    THMC50_REG_ANALOG_OUT);
+        /* set up to at least 1 */
+        if (data->analog_out == 0) {
+                data->analog_out = 1;
+                i2c_smbus_write_byte_data(client, THMC50_REG_ANALOG_OUT,
+                                          data->analog_out);
+        }
+        config = i2c_smbus_read_byte_data(client, THMC50_REG_CONF);
+        config |= 0x1;  /* start the chip if it is in standby mode */
+        if (data->has_temp3)
+                config |= 0x80;         /* enable 2nd remote temp */
+        i2c_smbus_write_byte_data(client, THMC50_REG_CONF, config);
+}
+
+static struct thmc50_data *thmc50_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct thmc50_data *data = i2c_get_clientdata(client);
+        int timeout = HZ / 5 + (data->type == thmc50 ? HZ : 0);
+
+        mutex_lock(&data->update_lock);
+
+        if (time_after(jiffies, data->last_updated + timeout)
+            || !data->valid) {
+
+                int temps = data->has_temp3 ? 3 : 2;
+                int i;
+                for (i = 0; i < temps; i++) {
+                        data->temp_input[i] = i2c_smbus_read_byte_data(client,
+                                                THMC50_REG_TEMP[i]);
+                        data->temp_max[i] = i2c_smbus_read_byte_data(client,
+                                                THMC50_REG_TEMP_MAX[i]);
+                        data->temp_min[i] = i2c_smbus_read_byte_data(client,
+                                                THMC50_REG_TEMP_MIN[i]);
+                }
+                data->analog_out =
+                    i2c_smbus_read_byte_data(client, THMC50_REG_ANALOG_OUT);
+                data->last_updated = jiffies;
+                data->valid = 1;
+        }
+
+        mutex_unlock(&data->update_lock);
+
+        return data;
+}
+
+static int __init sm_thmc50_init(void)
+{
+        return i2c_add_driver(&thmc50_driver);
+}
+
+static void __exit sm_thmc50_exit(void)
+{
+        i2c_del_driver(&thmc50_driver);
+}
+
+MODULE_AUTHOR("Krzysztof Helt <krzysztof.h1@wp.pl>");
+MODULE_DESCRIPTION("THMC50 driver");
+
+module_init(sm_thmc50_init);
+module_exit(sm_thmc50_exit);
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 24a6851491d0..696c8a2e5374 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -314,7 +314,7 @@ struct via686a_data {
 static struct pci_dev *s_bridge;        /* pointer to the (only) via686a */
 
 static int via686a_probe(struct platform_device *pdev);
-static int via686a_remove(struct platform_device *pdev);
+static int __devexit via686a_remove(struct platform_device *pdev);
 
 static inline int via686a_read_value(struct via686a_data *data, u8 reg)
 {
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index c604972f0186..3e63eaf19041 100644
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -167,7 +167,7 @@ struct vt8231_data {
 
 static struct pci_dev *s_bridge;
 static int vt8231_probe(struct platform_device *pdev);
-static int vt8231_remove(struct platform_device *pdev);
+static int __devexit vt8231_remove(struct platform_device *pdev);
 static struct vt8231_data *vt8231_update_device(struct device *dev);
 static void vt8231_init_device(struct vt8231_data *data);
 
@@ -751,7 +751,7 @@ exit_release:
         return err;
 }
 
-static int vt8231_remove(struct platform_device *pdev)
+static int __devexit vt8231_remove(struct platform_device *pdev)
 {
         struct vt8231_data *data = platform_get_drvdata(pdev);
         int i;
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index 1ce78179b005..7a4a15f4bf8b 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -387,7 +387,7 @@ struct w83627hf_sio_data {
 
 
 static int w83627hf_probe(struct platform_device *pdev);
-static int w83627hf_remove(struct platform_device *pdev);
+static int __devexit w83627hf_remove(struct platform_device *pdev);
 
 static int w83627hf_read_value(struct w83627hf_data *data, u16 reg);
 static int w83627hf_write_value(struct w83627hf_data *data, u16 reg, u16 value);
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index b1a9b81c211f..e049f65bc3a2 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -833,7 +833,7 @@ config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
        depends on BLK_DEV_IDE_AU1XXX
 
 config IDE_ARM
-        def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)
+        def_bool ARM && (ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)
 
 config BLK_DEV_IDE_ICSIDE
         tristate "ICS IDE interface support"
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index c89b5f4b2d04..8a9b98fcb66d 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -693,13 +693,12 @@ icside_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto out;
 
-        state = kmalloc(sizeof(struct icside_state), GFP_KERNEL);
+        state = kzalloc(sizeof(struct icside_state), GFP_KERNEL);
         if (!state) {
                 ret = -ENOMEM;
                 goto release;
         }
 
-        memset(state, 0, sizeof(state));
         state->type     = ICS_TYPE_NOTYPE;
         state->dev      = &ec->dev;
 
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index a3d6744e870a..bce2bec81413 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -1,5 +1,5 @@
 /*
- * ARM/ARM26 default IDE host driver
+ * ARM default IDE host driver
  *
  * Copyright (C) 2004 Bartlomiej Zolnierkiewicz
  * Based on code by: Russell King, Ian Molton and Alexander Schulz.
@@ -14,12 +14,6 @@
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 
-#ifdef CONFIG_ARM26
-# define IDE_ARM_HOST   (machine_is_a5k())
-#else
-# define IDE_ARM_HOST   (1)
-#endif
-
 #ifdef CONFIG_ARCH_CLPS7500
 # include <asm/arch/hardware.h>
 #
@@ -32,12 +26,10 @@
 
 void __init ide_arm_init(void)
 {
-        if (IDE_ARM_HOST) {
-                hw_regs_t hw;
+        hw_regs_t hw;
 
-                memset(&hw, 0, sizeof(hw));
-                ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206);
-                hw.irq = IDE_ARM_IRQ;
-                ide_register_hw(&hw, 1, NULL);
-        }
+        memset(&hw, 0, sizeof(hw));
+        ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206);
+        hw.irq = IDE_ARM_IRQ;
+        ide_register_hw(&hw, 1, NULL);
 }
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index e82bfa5e0ab8..1fa57947bca0 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -640,7 +640,7 @@ typedef enum {
 } idetape_chrdev_direction_t;
 
 struct idetape_bh {
-        unsigned short b_size;
+        u32 b_size;
         atomic_t b_count;
         struct idetape_bh *b_reqnext;
         char *b_data;
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 5511c86733dc..025689de50e9 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -593,7 +593,7 @@ static struct dmi_system_id cable_dmi_table[] = {
                 .ident = "HP Pavilion N5430",
                 .matches = {
                         DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
-                        DMI_MATCH(DMI_BOARD_NAME, "OmniBook N32N-736"),
+                        DMI_MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736"),
                 },
         },
         { }
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 19633c5aba15..0e3b5de26e69 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -475,11 +475,11 @@ static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev, const cha
                 switch (rev) {
                 case 0x07:
                 case 0x05:
-                        printk("%s: UltraDMA capable", name);
+                        printk("%s: UltraDMA capable\n", name);
                         break;
                 case 0x03:
                 default:
-                        printk("%s: MultiWord DMA force limited", name);
+                        printk("%s: MultiWord DMA force limited\n", name);
                         break;
                 case 0x01:
                         printk("%s: MultiWord DMA limited, "
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index bccedf9b8b28..b89e81656875 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -133,7 +133,7 @@ static void cs5520_tune_drive(ide_drive_t *drive, u8 pio)
 static int cs5520_config_drive_xfer_rate(ide_drive_t *drive)
 {
         /* Tune the drive for PIO modes up to PIO 4 */  
-        cs5520_tune_drive(drive, 4);
+        cs5520_tune_drive(drive, 255);
 
         /* Then tell the core to use DMA operations */
         return 0;
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index ce44e38390aa..082ca7da2cbc 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -2,6 +2,7 @@
  * linux/drivers/ide/pci/cs5535.c
  *
  * Copyright (C) 2004-2005 Advanced Micro Devices, Inc.
+ * Copyright (C)      2007 Bartlomiej Zolnierkiewicz
  *
  * History:
  * 09/20/2005 - Jaya Kumar <jayakumar.ide@gmail.com>
@@ -83,14 +84,17 @@ static void cs5535_set_speed(ide_drive_t *drive, u8 speed)
 
         /* Set the PIO timings */
         if ((speed & XFER_MODE) == XFER_PIO) {
-                u8 pioa;
-                u8 piob;
-                u8 cmd;
+                ide_drive_t *pair = &drive->hwif->drives[drive->dn ^ 1];
+                u8 cmd, pioa;
 
-                pioa = speed - XFER_PIO_0;
-                piob = ide_get_best_pio_mode(&(drive->hwif->drives[!unit]),
-                                                255, 4);
-                cmd = pioa < piob ? pioa : piob;
+                cmd = pioa = speed - XFER_PIO_0;
+
+                if (pair->present) {
+                        u8 piob = ide_get_best_pio_mode(pair, 255, 4);
+
+                        if (piob < cmd)
+                                cmd = piob;
+                }
 
                 /* Write the speed of the current drive */
                 reg = (cs5535_pio_cmd_timings[cmd] << 16) |
@@ -116,7 +120,7 @@ static void cs5535_set_speed(ide_drive_t *drive, u8 speed)
 
                 reg &= 0x80000000UL;  /* Preserve the PIO format bit */
 
-                if (speed >= XFER_UDMA_0 && speed <= XFER_UDMA_7)
+                if (speed >= XFER_UDMA_0 && speed <= XFER_UDMA_4)
                         reg |= cs5535_udma_timings[speed - XFER_UDMA_0];
                 else if (speed >= XFER_MW_DMA_0 && speed <= XFER_MW_DMA_2)
                         reg |= cs5535_mwdma_timings[speed - XFER_MW_DMA_0];
@@ -151,32 +155,22 @@ static int cs5535_set_drive(ide_drive_t *drive, u8 speed)
  *
  *      A callback from the upper layers for PIO-only tuning.
  */
-static void cs5535_tuneproc(ide_drive_t *drive, u8 xferspeed)
+static void cs5535_tuneproc(ide_drive_t *drive, u8 pio)
 {
-        u8 modes[] = {  XFER_PIO_0, XFER_PIO_1, XFER_PIO_2, XFER_PIO_3,
-                        XFER_PIO_4 };
-
-        /* cs5535 max pio is pio 4, best_pio will check the blacklist.
-        i think we don't need to rate_filter the incoming xferspeed
-        since we know we're only going to choose pio */
-        xferspeed = ide_get_best_pio_mode(drive, xferspeed, 4);
-        ide_config_drive_speed(drive, modes[xferspeed]);
-        cs5535_set_speed(drive, xferspeed);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
+        ide_config_drive_speed(drive, XFER_PIO_0 + pio);
+        cs5535_set_speed(drive, XFER_PIO_0 + pio);
 }
 
 static int cs5535_dma_check(ide_drive_t *drive)
 {
-        u8 speed;
-
         drive->init_speed = 0;
 
         if (ide_tune_dma(drive))
                 return 0;
 
-        if (ide_use_fast_pio(drive)) {
-                speed = ide_get_best_pio_mode(drive, 255, 4);
-                cs5535_set_drive(drive, speed);
-        }
+        if (ide_use_fast_pio(drive))
+                cs5535_tuneproc(drive, 255);
 
         return -1;
 }
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index 95dbed7e6022..70b3245dbf62 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -21,7 +21,7 @@
  *      it8213_dma_2_pio                -       return the PIO mode matching DMA
  *      @xfer_rate: transfer speed
  *
- *      Returns the nearest equivalent PIO timing for the PIO or DMA
+ *      Returns the nearest equivalent PIO timing for the DMA
  *      mode requested by the controller.
  */
 
@@ -35,34 +35,28 @@ static u8 it8213_dma_2_pio (u8 xfer_rate) {
                 case XFER_UDMA_1:
                 case XFER_UDMA_0:
                 case XFER_MW_DMA_2:
-                case XFER_PIO_4:
                         return 4;
                 case XFER_MW_DMA_1:
-                case XFER_PIO_3:
                         return 3;
                 case XFER_SW_DMA_2:
-                case XFER_PIO_2:
                         return 2;
                 case XFER_MW_DMA_0:
                 case XFER_SW_DMA_1:
                 case XFER_SW_DMA_0:
-                case XFER_PIO_1:
-                case XFER_PIO_0:
-                case XFER_PIO_SLOW:
                 default:
                         return 0;
         }
 }
 
 /*
- *      it8213_tuneproc -       tune a drive
+ *      it8213_tune_pio -       tune a drive
  *      @drive: drive to tune
  *      @pio: desired PIO mode
  *
  *      Set the interface PIO mode.
  */
 
-static void it8213_tuneproc (ide_drive_t *drive, u8 pio)
+static void it8213_tune_pio(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = hwif->pci_dev;
@@ -82,8 +76,6 @@ static void it8213_tuneproc (ide_drive_t *drive, u8 pio)
                                         { 2, 1 },
                                         { 2, 3 }, };
 
-        pio = ide_get_best_pio_mode(drive, pio, 4);
-
         spin_lock_irqsave(&tune_lock, flags);
         pci_read_config_word(dev, master_port, &master_data);
 
@@ -113,6 +105,13 @@ static void it8213_tuneproc (ide_drive_t *drive, u8 pio)
         spin_unlock_irqrestore(&tune_lock, flags);
 }
 
+static void it8213_tuneproc(ide_drive_t *drive, u8 pio)
+{
+        pio = ide_get_best_pio_mode(drive, pio, 4);
+        it8213_tune_pio(drive, pio);
+        ide_config_drive_speed(drive, XFER_PIO_0 + pio);
+}
+
 /**
  *      it8213_tune_chipset     -       set controller timings
  *      @drive: Drive to set up
@@ -193,7 +192,12 @@ static int it8213_tune_chipset (ide_drive_t *drive, u8 xferspeed)
                 if (reg55 & w_flag)
                         pci_write_config_byte(dev, 0x55, (u8) reg55 & ~w_flag);
         }
-        it8213_tuneproc(drive, it8213_dma_2_pio(speed));
+
+        if (speed > XFER_PIO_4)
+                it8213_tune_pio(drive, it8213_dma_2_pio(speed));
+        else
+                it8213_tune_pio(drive, speed - XFER_PIO_0);
+
         return ide_config_drive_speed(drive, speed);
 }
 
@@ -209,13 +213,10 @@ static int it8213_tune_chipset (ide_drive_t *drive, u8 xferspeed)
 
 static int it8213_config_drive_for_dma (ide_drive_t *drive)
 {
-        u8 pio;
-
         if (ide_tune_dma(drive))
                 return 0;
 
-        pio = ide_get_best_pio_mode(drive, 255, 4);
-        it8213_tune_chipset(drive, XFER_PIO_0 + pio);
+        it8213_tuneproc(drive, 255);
 
         return -1;
 }
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index d7ce9dd8de16..65a0ff352b98 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -83,23 +83,10 @@ static u8 __devinit ata66_jmicron(ide_hwif_t *hwif)
         return ATA_CBL_PATA80;
 }
 
-static void jmicron_tuneproc (ide_drive_t *drive, byte mode_wanted)
+static void jmicron_tuneproc(ide_drive_t *drive, u8 pio)
 {
-        return;
-}
-
-/**
- *      config_jmicron_chipset_for_pio  -       set drive timings
- *      @drive: drive to tune
- *      @speed we want
- *
- */
-
-static void config_jmicron_chipset_for_pio (ide_drive_t *drive, byte set_speed)
-{
-        u8 speed = XFER_PIO_0 + ide_get_best_pio_mode(drive, 255, 5);
-        if (set_speed)
-                (void) ide_config_drive_speed(drive, speed);
+        pio = ide_get_best_pio_mode(drive, pio, 5);
+        ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
 
 /**
@@ -132,7 +119,7 @@ static int jmicron_config_drive_for_dma (ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        config_jmicron_chipset_for_pio(drive, 1);
+        jmicron_tuneproc(drive, 255);
 
         return -1;
 }
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index 4f69cd067e5e..5cfa9378bbb8 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/ide/pci/piix.c        Version 0.50    Jun 10, 2007
+ *  linux/drivers/ide/pci/piix.c        Version 0.51    Jul 6, 2007
  *
  *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
  *  Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
@@ -109,7 +109,7 @@ static int no_piix_dma;
  *      piix_dma_2_pio          -       return the PIO mode matching DMA
  *      @xfer_rate: transfer speed
  *
- *      Returns the nearest equivalent PIO timing for the PIO or DMA
+ *      Returns the nearest equivalent PIO timing for the DMA
  *      mode requested by the controller.
  */
  
@@ -123,20 +123,14 @@ static u8 piix_dma_2_pio (u8 xfer_rate) {
                 case XFER_UDMA_1:
                 case XFER_UDMA_0:
                 case XFER_MW_DMA_2:
-                case XFER_PIO_4:
                         return 4;
                 case XFER_MW_DMA_1:
-                case XFER_PIO_3:
                         return 3;
                 case XFER_SW_DMA_2:
-                case XFER_PIO_2:
                         return 2;
                 case XFER_MW_DMA_0:
                 case XFER_SW_DMA_1:
                 case XFER_SW_DMA_0:
-                case XFER_PIO_1:
-                case XFER_PIO_0:
-                case XFER_PIO_SLOW:
                 default:
                         return 0;
         }
@@ -269,6 +263,7 @@ static int piix_tune_chipset (ide_drive_t *drive, u8 xferspeed)
                 case XFER_PIO_4:
                 case XFER_PIO_3:
                 case XFER_PIO_2:
+                case XFER_PIO_1:
                 case XFER_PIO_0:        break;
                 default:                return -1;
         }
@@ -299,7 +294,11 @@ static int piix_tune_chipset (ide_drive_t *drive, u8 xferspeed)
                         pci_write_config_byte(dev, 0x55, (u8) reg55 & ~w_flag);
         }
 
-        piix_tune_pio(drive, piix_dma_2_pio(speed));
+        if (speed > XFER_PIO_4)
+                piix_tune_pio(drive, piix_dma_2_pio(speed));
+        else
+                piix_tune_pio(drive, speed - XFER_PIO_0);
+
         return ide_config_drive_speed(drive, speed);
 }
 
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index bf19ddfa6cda..eeb0a6d434aa 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -190,7 +190,7 @@ scc_ide_outsl(unsigned long port, void *addr, u32 count)
 }
 
 /**
- *      scc_tuneproc    -       tune a drive PIO mode
+ *      scc_tune_pio    -       tune a drive PIO mode
  *      @drive: drive to tune
  *      @mode_wanted: the target operating mode
  *
@@ -198,7 +198,7 @@ scc_ide_outsl(unsigned long port, void *addr, u32 count)
  *      controller.
  */
 
-static void scc_tuneproc(ide_drive_t *drive, byte mode_wanted)
+static void scc_tune_pio(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif = HWIF(drive);
         struct scc_ports *ports = ide_get_hwifdata(hwif);
@@ -207,41 +207,25 @@ static void scc_tuneproc(ide_drive_t *drive, byte mode_wanted)
         unsigned long piosht_port = ctl_base + 0x000;
         unsigned long pioct_port = ctl_base + 0x004;
         unsigned long reg;
-        unsigned char speed = XFER_PIO_0;
         int offset;
 
-        mode_wanted = ide_get_best_pio_mode(drive, mode_wanted, 4);
-        switch (mode_wanted) {
-        case 4:
-                speed = XFER_PIO_4;
-                break;
-        case 3:
-                speed = XFER_PIO_3;
-                break;
-        case 2:
-                speed = XFER_PIO_2;
-                break;
-        case 1:
-                speed = XFER_PIO_1;
-                break;
-        case 0:
-        default:
-                speed = XFER_PIO_0;
-                break;
-        }
-
         reg = in_be32((void __iomem *)cckctrl_port);
         if (reg & CCKCTRL_ATACLKOEN) {
                 offset = 1; /* 133MHz */
         } else {
                 offset = 0; /* 100MHz */
         }
-        reg = JCHSTtbl[offset][mode_wanted] << 16 | JCHHTtbl[offset][mode_wanted];
+        reg = JCHSTtbl[offset][pio] << 16 | JCHHTtbl[offset][pio];
         out_be32((void __iomem *)piosht_port, reg);
-        reg = JCHCTtbl[offset][mode_wanted];
+        reg = JCHCTtbl[offset][pio];
         out_be32((void __iomem *)pioct_port, reg);
+}
 
-        ide_config_drive_speed(drive, speed);
+static void scc_tuneproc(ide_drive_t *drive, u8 pio)
+{
+        pio = ide_get_best_pio_mode(drive, pio, 4);
+        scc_tune_pio(drive, pio);
+        ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
 
 /**
@@ -280,26 +264,21 @@ static int scc_tune_chipset(ide_drive_t *drive, byte xferspeed)
 
         switch (speed) {
         case XFER_UDMA_6:
-                idx = 6;
-                break;
         case XFER_UDMA_5:
-                idx = 5;
-                break;
         case XFER_UDMA_4:
-                idx = 4;
-                break;
         case XFER_UDMA_3:
-                idx = 3;
-                break;
         case XFER_UDMA_2:
-                idx = 2;
-                break;
         case XFER_UDMA_1:
-                idx = 1;
-                break;
         case XFER_UDMA_0:
-                idx = 0;
+                idx = speed - XFER_UDMA_0;
                 break;
+        case XFER_PIO_4:
+        case XFER_PIO_3:
+        case XFER_PIO_2:
+        case XFER_PIO_1:
+        case XFER_PIO_0:
+                scc_tune_pio(drive, speed - XFER_PIO_0);
+                return ide_config_drive_speed(drive, speed);
         default:
                 return 1;
         }
@@ -329,7 +308,7 @@ static int scc_tune_chipset(ide_drive_t *drive, byte xferspeed)
  *      required.
  *      If the drive isn't suitable for DMA or we hit other problems
  *      then we will drop down to PIO and set up PIO appropriately.
- *      (return 1)
+ *      (return -1)
  */
 
 static int scc_config_drive_for_dma(ide_drive_t *drive)
@@ -338,7 +317,7 @@ static int scc_config_drive_for_dma(ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                scc_tuneproc(drive, 4);
+                scc_tuneproc(drive, 255);
 
         return -1;
 }
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 63fbb79e8178..26f24802d3e8 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -801,6 +801,7 @@ struct sis_laptop {
 static const struct sis_laptop sis_laptop[] = {
         /* devid, subvendor, subdev */
         { 0x5513, 0x1043, 0x1107 },     /* ASUS A6K */
+        { 0x5513, 0x1734, 0x105f },     /* FSC Amilo A1630 */
         /* end marker */
         { 0, }
 };
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index 8e655f2db5cb..628b0664f576 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/ide/pci/slc90e66.c    Version 0.14    February 8, 2007
+ *  linux/drivers/ide/pci/slc90e66.c    Version 0.15    Jul 6, 2007
  *
  *  Copyright (C) 2000-2002 Andre Hedrick <andre@linux-ide.org>
  *  Copyright (C) 2006-2007 MontaVista Software, Inc. <source@mvista.com>
@@ -29,20 +29,14 @@ static u8 slc90e66_dma_2_pio (u8 xfer_rate) {
                 case XFER_UDMA_1:
                 case XFER_UDMA_0:
                 case XFER_MW_DMA_2:
-                case XFER_PIO_4:
                         return 4;
                 case XFER_MW_DMA_1:
-                case XFER_PIO_3:
                         return 3;
                 case XFER_SW_DMA_2:
-                case XFER_PIO_2:
                         return 2;
                 case XFER_MW_DMA_0:
                 case XFER_SW_DMA_1:
                 case XFER_SW_DMA_0:
-                case XFER_PIO_1:
-                case XFER_PIO_0:
-                case XFER_PIO_SLOW:
                 default:
                         return 0;
         }
@@ -136,6 +130,7 @@ static int slc90e66_tune_chipset (ide_drive_t *drive, u8 xferspeed)
                 case XFER_PIO_4:
                 case XFER_PIO_3:
                 case XFER_PIO_2:
+                case XFER_PIO_1:
                 case XFER_PIO_0:        break;
                 default:                return -1;
         }
@@ -156,7 +151,11 @@ static int slc90e66_tune_chipset (ide_drive_t *drive, u8 xferspeed)
                         pci_write_config_word(dev, 0x4a, reg4a & ~a_speed);
         }
 
-        slc90e66_tune_pio(drive, slc90e66_dma_2_pio(speed));
+        if (speed > XFER_PIO_4)
+                slc90e66_tune_pio(drive, slc90e66_dma_2_pio(speed));
+        else
+                slc90e66_tune_pio(drive, speed - XFER_PIO_0);
+
         return ide_config_drive_speed(drive, speed);
 }
 
diff --git a/drivers/infiniband/hw/amso1100/c2_qp.c b/drivers/infiniband/hw/amso1100/c2_qp.c
index 420c1380f5c3..01d07862ea86 100644
--- a/drivers/infiniband/hw/amso1100/c2_qp.c
+++ b/drivers/infiniband/hw/amso1100/c2_qp.c
@@ -506,6 +506,7 @@ int c2_alloc_qp(struct c2_dev *c2dev,
         qp->send_sgl_depth = qp_attrs->cap.max_send_sge;
         qp->rdma_write_sgl_depth = qp_attrs->cap.max_send_sge;
         qp->recv_sgl_depth = qp_attrs->cap.max_recv_sge;
+        init_waitqueue_head(&qp->wait);
 
         /* Initialize the SQ MQ */
         q_size = be32_to_cpu(reply->sq_depth);
diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h
index 3725aa8664d9..b5e960305316 100644
--- a/drivers/infiniband/hw/ehca/ehca_classes.h
+++ b/drivers/infiniband/hw/ehca/ehca_classes.h
@@ -322,6 +322,7 @@ extern int ehca_static_rate;
 extern int ehca_port_act_time;
 extern int ehca_use_hp_mr;
 extern int ehca_scaling_code;
+extern int ehca_mr_largepage;
 
 struct ipzu_queue_resp {
         u32 qe_size;      /* queue entry size */
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
index 71c0799b3500..ee06d8bd7396 100644
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -116,7 +116,7 @@ static void print_error_data(struct ehca_shca *shca, void *data,
         }
         default:
                 ehca_err(&shca->ib_device,
-                         "Unknown errror type: %lx on %s.",
+                         "Unknown error type: %lx on %s.",
                          type, shca->ib_device.name);
                 break;
         }
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c
index c1b868b79d67..d97eda3e1da0 100644
--- a/drivers/infiniband/hw/ehca/ehca_mrmw.c
+++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c
@@ -40,10 +40,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <rdma/ib_umem.h>
-
 #include <asm/current.h>
 
+#include <rdma/ib_umem.h>
+
 #include "ehca_iverbs.h"
 #include "ehca_mrmw.h"
 #include "hcp_if.h"
@@ -64,8 +64,6 @@ enum ehca_mr_pgsize {
         EHCA_MR_PGSIZE16M = 0x1000000L
 };
 
-extern int ehca_mr_largepage;
-
 static u32 ehca_encode_hwpage_size(u32 pgsize)
 {
         u32 idx = 0;
diff --git a/drivers/infiniband/hw/ehca/ehca_pd.c b/drivers/infiniband/hw/ehca/ehca_pd.c
index 3dafd7ff36cd..43bcf085fcf2 100644
--- a/drivers/infiniband/hw/ehca/ehca_pd.c
+++ b/drivers/infiniband/hw/ehca/ehca_pd.c
@@ -88,7 +88,6 @@ int ehca_dealloc_pd(struct ib_pd *pd)
         u32 cur_pid = current->tgid;
         struct ehca_pd *my_pd = container_of(pd, struct ehca_pd, ib_pd);
         int i, leftovers = 0;
-        extern struct kmem_cache *small_qp_cache;
         struct ipz_small_queue_page *page, *tmp;
 
         if (my_pd->ib_pd.uobject && my_pd->ib_pd.uobject->context &&
diff --git a/drivers/infiniband/hw/ehca/hcp_if.c b/drivers/infiniband/hw/ehca/hcp_if.c
index fdbfebea7d11..24f454162f24 100644
--- a/drivers/infiniband/hw/ehca/hcp_if.c
+++ b/drivers/infiniband/hw/ehca/hcp_if.c
@@ -758,7 +758,6 @@ u64 hipz_h_register_rpage_mr(const struct ipz_adapter_handle adapter_handle,
                              const u64 logical_address_of_page,
                              const u64 count)
 {
-        extern int ehca_debug_level;
         u64 ret;
 
         if (unlikely(ehca_debug_level >= 2)) {
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.h b/drivers/infiniband/hw/ehca/ipz_pt_fn.h
index c6937a044e8a..a801274ea337 100644
--- a/drivers/infiniband/hw/ehca/ipz_pt_fn.h
+++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.h
@@ -54,6 +54,8 @@
 struct ehca_pd;
 struct ipz_small_queue_page;
 
+extern struct kmem_cache *small_qp_cache;
+
 /* struct generic ehca page */
 struct ipz_page {
         u8 entries[EHCA_PAGESIZE];
diff --git a/drivers/infiniband/hw/ipath/ipath_common.h b/drivers/infiniband/hw/ipath/ipath_common.h
index b4b786d0dfca..6ad822c35930 100644
--- a/drivers/infiniband/hw/ipath/ipath_common.h
+++ b/drivers/infiniband/hw/ipath/ipath_common.h
@@ -100,8 +100,7 @@ struct infinipath_stats {
         __u64 sps_hwerrs;
         /* number of times IB link changed state unexpectedly */
         __u64 sps_iblink;
-        /* kernel receive interrupts that didn't read intstat */
-        __u64 sps_fastrcvint;
+        __u64 sps_unused; /* was fastrcvint, no longer implemented */
         /* number of kernel (port0) packets received */
         __u64 sps_port0pkts;
         /* number of "ethernet" packets sent by driver */
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index 09c5fd84b1e3..6ccba365a24c 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -740,7 +740,7 @@ void ipath_disarm_piobufs(struct ipath_devdata *dd, unsigned first,
          * pioavail updates to memory to stop.
          */
         ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl,
-                         sendorig & ~IPATH_S_PIOBUFAVAILUPD);
+                         sendorig & ~INFINIPATH_S_PIOBUFAVAILUPD);
         sendorig = ipath_read_kreg64(dd, dd->ipath_kregs->kr_scratch);
         ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl,
                          dd->ipath_sendctrl);
@@ -1614,7 +1614,7 @@ int ipath_waitfor_mdio_cmdready(struct ipath_devdata *dd)
  * it's safer to always do it.
  * PIOAvail bits are updated by the chip as if normal send had happened.
  */
-void ipath_cancel_sends(struct ipath_devdata *dd)
+void ipath_cancel_sends(struct ipath_devdata *dd, int restore_sendctrl)
 {
         ipath_dbg("Cancelling all in-progress send buffers\n");
         dd->ipath_lastcancel = jiffies+HZ/2; /* skip armlaunch errs a bit */
@@ -1627,6 +1627,9 @@ void ipath_cancel_sends(struct ipath_devdata *dd)
         ipath_read_kreg64(dd, dd->ipath_kregs->kr_scratch);
         ipath_disarm_piobufs(dd, 0,
                 (unsigned)(dd->ipath_piobcnt2k + dd->ipath_piobcnt4k));
+        if (restore_sendctrl) /* else done by caller later */
+                ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl,
+                                 dd->ipath_sendctrl);
 
         /* and again, be sure all have hit the chip */
         ipath_read_kreg64(dd, dd->ipath_kregs->kr_scratch);
@@ -1655,7 +1658,7 @@ static void ipath_set_ib_lstate(struct ipath_devdata *dd, int which)
         /* flush all queued sends when going to DOWN or INIT, to be sure that
          * they don't block MAD packets */
         if (!linkcmd || linkcmd == INFINIPATH_IBCC_LINKCMD_INIT)
-                ipath_cancel_sends(dd);
+                ipath_cancel_sends(dd, 1);
 
         ipath_write_kreg(dd, dd->ipath_kregs->kr_ibcctrl,
                          dd->ipath_ibcctrl | which);
@@ -2000,7 +2003,7 @@ void ipath_shutdown_device(struct ipath_devdata *dd)
 
         ipath_set_ib_lstate(dd, INFINIPATH_IBCC_LINKINITCMD_DISABLE <<
                             INFINIPATH_IBCC_LINKINITCMD_SHIFT);
-        ipath_cancel_sends(dd);
+        ipath_cancel_sends(dd, 0);
 
         /* disable IBC */
         dd->ipath_control &= ~INFINIPATH_C_LINKENABLE;
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c
index 9868ccda5f26..5b6ac9a1a709 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6120.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c
@@ -321,6 +321,8 @@ static const struct ipath_hwerror_msgs ipath_6120_hwerror_msgs[] = {
                         << INFINIPATH_HWE_TXEMEMPARITYERR_SHIFT)
 
 static int ipath_pe_txe_recover(struct ipath_devdata *);
+static void ipath_pe_put_tid_2(struct ipath_devdata *, u64 __iomem *,
+                               u32, unsigned long);
 
 /**
  * ipath_pe_handle_hwerrors - display hardware errors.
@@ -555,8 +557,11 @@ static int ipath_pe_boardname(struct ipath_devdata *dd, char *name,
                 ipath_dev_err(dd, "Unsupported InfiniPath hardware revision %u.%u!\n",
                               dd->ipath_majrev, dd->ipath_minrev);
                 ret = 1;
-        } else
+        } else {
                 ret = 0;
+                if (dd->ipath_minrev >= 2)
+                        dd->ipath_f_put_tid = ipath_pe_put_tid_2;
+        }
 
         return ret;
 }
@@ -1220,7 +1225,7 @@ static void ipath_pe_clear_tids(struct ipath_devdata *dd, unsigned port)
                  port * dd->ipath_rcvtidcnt * sizeof(*tidbase));
 
         for (i = 0; i < dd->ipath_rcvtidcnt; i++)
-                ipath_pe_put_tid(dd, &tidbase[i], RCVHQ_RCV_TYPE_EXPECTED,
+                dd->ipath_f_put_tid(dd, &tidbase[i], RCVHQ_RCV_TYPE_EXPECTED,
                                  tidinv);
 
         tidbase = (u64 __iomem *)
@@ -1229,7 +1234,7 @@ static void ipath_pe_clear_tids(struct ipath_devdata *dd, unsigned port)
                  port * dd->ipath_rcvegrcnt * sizeof(*tidbase));
 
         for (i = 0; i < dd->ipath_rcvegrcnt; i++)
-                ipath_pe_put_tid(dd, &tidbase[i], RCVHQ_RCV_TYPE_EAGER,
+                dd->ipath_f_put_tid(dd, &tidbase[i], RCVHQ_RCV_TYPE_EAGER,
                                  tidinv);
 }
 
@@ -1395,10 +1400,11 @@ void ipath_init_iba6120_funcs(struct ipath_devdata *dd)
         dd->ipath_f_quiet_serdes = ipath_pe_quiet_serdes;
         dd->ipath_f_bringup_serdes = ipath_pe_bringup_serdes;
         dd->ipath_f_clear_tids = ipath_pe_clear_tids;
-        if (dd->ipath_minrev >= 2)
-                dd->ipath_f_put_tid = ipath_pe_put_tid_2;
-        else
-                dd->ipath_f_put_tid = ipath_pe_put_tid;
+        /*
+         * this may get changed after we read the chip revision,
+         * but we start with the safe version for all revs
+         */
+        dd->ipath_f_put_tid = ipath_pe_put_tid;
         dd->ipath_f_cleanup = ipath_setup_pe_cleanup;
         dd->ipath_f_setextled = ipath_setup_pe_setextled;
         dd->ipath_f_get_base_info = ipath_pe_get_base_info;
diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/infiniband/hw/ipath/ipath_init_chip.c
index 49951d583804..9dd0bacf8461 100644
--- a/drivers/infiniband/hw/ipath/ipath_init_chip.c
+++ b/drivers/infiniband/hw/ipath/ipath_init_chip.c
@@ -782,7 +782,7 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit)
          * Follows early_init because some chips have to initialize
          * PIO buffers in early_init to avoid false parity errors.
          */
-        ipath_cancel_sends(dd);
+        ipath_cancel_sends(dd, 0);
 
         /* early_init sets rcvhdrentsize and rcvhdrsize, so this must be
          * done after early_init */
@@ -851,13 +851,14 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit)
         ipath_write_kreg(dd, dd->ipath_kregs->kr_hwerrmask,
                          dd->ipath_hwerrmask);
 
-        dd->ipath_maskederrs = dd->ipath_ignorederrs;
         /* clear all */
         ipath_write_kreg(dd, dd->ipath_kregs->kr_errorclear, -1LL);
         /* enable errors that are masked, at least this first time. */
         ipath_write_kreg(dd, dd->ipath_kregs->kr_errormask,
                          ~dd->ipath_maskederrs);
-        /* clear any interrups up to this point (ints still not enabled) */
+        dd->ipath_errormask = ipath_read_kreg64(dd,
+                dd->ipath_kregs->kr_errormask);
+        /* clear any interrupts up to this point (ints still not enabled) */
         ipath_write_kreg(dd, dd->ipath_kregs->kr_intclear, -1LL);
 
         /*
diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c
index 1fd91c59f246..b29fe7e9b11a 100644
--- a/drivers/infiniband/hw/ipath/ipath_intr.c
+++ b/drivers/infiniband/hw/ipath/ipath_intr.c
@@ -303,7 +303,7 @@ static void handle_e_ibstatuschanged(struct ipath_devdata *dd,
                  * Flush all queued sends when link went to DOWN or INIT,
                  * to be sure that they don't block SMA and other MAD packets
                  */
-                ipath_cancel_sends(dd);
+                ipath_cancel_sends(dd, 1);
         }
         else if (lstate == IPATH_IBSTATE_INIT || lstate == IPATH_IBSTATE_ARM ||
             lstate == IPATH_IBSTATE_ACTIVE) {
@@ -517,10 +517,7 @@ static int handle_errors(struct ipath_devdata *dd, ipath_err_t errs)
 
         supp_msgs = handle_frequent_errors(dd, errs, msg, &noprint);
 
-        /*
-         * don't report errors that are masked (includes those always
-         * ignored)
-         */
+        /* don't report errors that are masked */
         errs &= ~dd->ipath_maskederrs;
 
         /* do these first, they are most important */
@@ -566,19 +563,19 @@ static int handle_errors(struct ipath_devdata *dd, ipath_err_t errs)
                  * ones on this particular interrupt, which also isn't great
                  */
                 dd->ipath_maskederrs |= dd->ipath_lasterror | errs;
+                dd->ipath_errormask &= ~dd->ipath_maskederrs;
                 ipath_write_kreg(dd, dd->ipath_kregs->kr_errormask,
-                                 ~dd->ipath_maskederrs);
+                        dd->ipath_errormask);
                 s_iserr = ipath_decode_err(msg, sizeof msg,
-                                 (dd->ipath_maskederrs & ~dd->
-                                  ipath_ignorederrs));
+                        dd->ipath_maskederrs);
 
-                if ((dd->ipath_maskederrs & ~dd->ipath_ignorederrs) &
+                if (dd->ipath_maskederrs &
                         ~(INFINIPATH_E_RRCVEGRFULL |
                         INFINIPATH_E_RRCVHDRFULL | INFINIPATH_E_PKTERRS))
                         ipath_dev_err(dd, "Temporarily disabling "
                             "error(s) %llx reporting; too frequent (%s)\n",
-                                (unsigned long long) (dd->ipath_maskederrs &
-                                ~dd->ipath_ignorederrs), msg);
+                                (unsigned long long)dd->ipath_maskederrs,
+                                msg);
                 else {
                         /*
                          * rcvegrfull and rcvhdrqfull are "normal",
@@ -793,19 +790,22 @@ void ipath_clear_freeze(struct ipath_devdata *dd)
         /* disable error interrupts, to avoid confusion */
         ipath_write_kreg(dd, dd->ipath_kregs->kr_errormask, 0ULL);
 
+        /* also disable interrupts; errormask is sometimes overwriten */
+        ipath_write_kreg(dd, dd->ipath_kregs->kr_intmask, 0ULL);
+
         /*
          * clear all sends, because they have may been
          * completed by usercode while in freeze mode, and
          * therefore would not be sent, and eventually
          * might cause the process to run out of bufs
          */
-        ipath_cancel_sends(dd);
+        ipath_cancel_sends(dd, 0);
         ipath_write_kreg(dd, dd->ipath_kregs->kr_control,
                          dd->ipath_control);
 
         /* ensure pio avail updates continue */
         ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl,
-                 dd->ipath_sendctrl & ~IPATH_S_PIOBUFAVAILUPD);
+                 dd->ipath_sendctrl & ~INFINIPATH_S_PIOBUFAVAILUPD);
         ipath_read_kreg64(dd, dd->ipath_kregs->kr_scratch);
         ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl,
                  dd->ipath_sendctrl);
@@ -817,7 +817,7 @@ void ipath_clear_freeze(struct ipath_devdata *dd)
         for (i = 0; i < dd->ipath_pioavregs; i++) {
                 /* deal with 6110 chip bug */
                 im = i > 3 ? ((i&1) ? i-1 : i+1) : i;
-                val = ipath_read_kreg64(dd, 0x1000+(im*sizeof(u64)));
+                val = ipath_read_kreg64(dd, (0x1000/sizeof(u64))+im);
                 dd->ipath_pioavailregs_dma[i] = dd->ipath_pioavailshadow[i]
                         = le64_to_cpu(val);
         }
@@ -832,7 +832,8 @@ void ipath_clear_freeze(struct ipath_devdata *dd)
         ipath_write_kreg(dd, dd->ipath_kregs->kr_errorclear,
                 E_SPKT_ERRS_IGNORE);
         ipath_write_kreg(dd, dd->ipath_kregs->kr_errormask,
-                ~dd->ipath_maskederrs);
+                dd->ipath_errormask);
+        ipath_write_kreg(dd, dd->ipath_kregs->kr_intmask, -1LL);
         ipath_write_kreg(dd, dd->ipath_kregs->kr_intclear, 0ULL);
 }
 
@@ -1002,7 +1003,6 @@ irqreturn_t ipath_intr(int irq, void *data)
         u32 istat, chk0rcv = 0;
         ipath_err_t estat = 0;
         irqreturn_t ret;
-        u32 oldhead, curtail;
         static unsigned unexpected = 0;
         static const u32 port0rbits = (1U<<INFINIPATH_I_RCVAVAIL_SHIFT) |
                  (1U<<INFINIPATH_I_RCVURG_SHIFT);
@@ -1035,36 +1035,6 @@ irqreturn_t ipath_intr(int irq, void *data)
                 goto bail;
         }
 
-        /*
-         * We try to avoid reading the interrupt status register, since
-         * that's a PIO read, and stalls the processor for up to about
-         * ~0.25 usec. The idea is that if we processed a port0 packet,
-         * we blindly clear the  port 0 receive interrupt bits, and nothing
-         * else, then return.  If other interrupts are pending, the chip
-         * will re-interrupt us as soon as we write the intclear register.
-         * We then won't process any more kernel packets (if not the 2nd
-         * time, then the 3rd or 4th) and we'll then handle the other
-         * interrupts.   We clear the interrupts first so that we don't
-         * lose intr for later packets that arrive while we are processing.
-         */
-        oldhead = dd->ipath_port0head;
-        curtail = (u32)le64_to_cpu(*dd->ipath_hdrqtailptr);
-        if (oldhead != curtail) {
-                if (dd->ipath_flags & IPATH_GPIO_INTR) {
-                        ipath_write_kreg(dd, dd->ipath_kregs->kr_gpio_clear,
-                                         (u64) (1 << IPATH_GPIO_PORT0_BIT));
-                        istat = port0rbits | INFINIPATH_I_GPIO;
-                }
-                else
-                        istat = port0rbits;
-                ipath_write_kreg(dd, dd->ipath_kregs->kr_intclear, istat);
-                ipath_kreceive(dd);
-                if (oldhead != dd->ipath_port0head) {
-                        ipath_stats.sps_fastrcvint++;
-                        goto done;
-                }
-        }
-
         istat = ipath_read_kreg32(dd, dd->ipath_kregs->kr_intstatus);
 
         if (unlikely(!istat)) {
@@ -1225,7 +1195,6 @@ irqreturn_t ipath_intr(int irq, void *data)
                 handle_layer_pioavail(dd);
         }
 
-done:
         ret = IRQ_HANDLED;
 
 bail:
diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h
index ace63ef78e6f..7a7966f7e4ff 100644
--- a/drivers/infiniband/hw/ipath/ipath_kernel.h
+++ b/drivers/infiniband/hw/ipath/ipath_kernel.h
@@ -261,18 +261,10 @@ struct ipath_devdata {
          * limiting of hwerror reporting
          */
         ipath_err_t ipath_lasthwerror;
-        /*
-         * errors masked because they occur too fast, also includes errors
-         * that are always ignored (ipath_ignorederrs)
-         */
+        /* errors masked because they occur too fast */
         ipath_err_t ipath_maskederrs;
         /* time in jiffies at which to re-enable maskederrs */
         unsigned long ipath_unmasktime;
-        /*
-         * errors always ignored (masked), at least for a given
-         * chip/device, because they are wrong or not useful
-         */
-        ipath_err_t ipath_ignorederrs;
         /* count of egrfull errors, combined for all ports */
         u64 ipath_last_tidfull;
         /* for ipath_qcheck() */
@@ -436,6 +428,7 @@ struct ipath_devdata {
         u64 ipath_lastibcstat;
         /* hwerrmask shadow */
         ipath_err_t ipath_hwerrmask;
+        ipath_err_t ipath_errormask; /* errormask shadow */
         /* interrupt config reg shadow */
         u64 ipath_intconfig;
         /* kr_sendpiobufbase value */
@@ -683,7 +676,7 @@ int ipath_unordered_wc(void);
 
 void ipath_disarm_piobufs(struct ipath_devdata *, unsigned first,
                           unsigned cnt);
-void ipath_cancel_sends(struct ipath_devdata *);
+void ipath_cancel_sends(struct ipath_devdata *, int);
 
 int ipath_create_rcvhdrq(struct ipath_devdata *, struct ipath_portdata *);
 void ipath_free_pddata(struct ipath_devdata *, struct ipath_portdata *);
diff --git a/drivers/infiniband/hw/ipath/ipath_stats.c b/drivers/infiniband/hw/ipath/ipath_stats.c
index 73ed17d03188..bae4f56f7271 100644
--- a/drivers/infiniband/hw/ipath/ipath_stats.c
+++ b/drivers/infiniband/hw/ipath/ipath_stats.c
@@ -196,6 +196,45 @@ static void ipath_qcheck(struct ipath_devdata *dd)
         }
 }
 
+static void ipath_chk_errormask(struct ipath_devdata *dd)
+{
+        static u32 fixed;
+        u32 ctrl;
+        unsigned long errormask;
+        unsigned long hwerrs;
+
+        if (!dd->ipath_errormask || !(dd->ipath_flags & IPATH_INITTED))
+                return;
+
+        errormask = ipath_read_kreg64(dd, dd->ipath_kregs->kr_errormask);
+
+        if (errormask == dd->ipath_errormask)
+                return;
+        fixed++;
+
+        hwerrs = ipath_read_kreg64(dd, dd->ipath_kregs->kr_hwerrstatus);
+        ctrl = ipath_read_kreg32(dd, dd->ipath_kregs->kr_control);
+
+        ipath_write_kreg(dd, dd->ipath_kregs->kr_errormask,
+                dd->ipath_errormask);
+
+        if ((hwerrs & dd->ipath_hwerrmask) ||
+                (ctrl & INFINIPATH_C_FREEZEMODE)) {
+                /* force re-interrupt of pending events, just in case */
+                ipath_write_kreg(dd, dd->ipath_kregs->kr_hwerrclear, 0ULL);
+                ipath_write_kreg(dd, dd->ipath_kregs->kr_errorclear, 0ULL);
+                ipath_write_kreg(dd, dd->ipath_kregs->kr_intclear, 0ULL);
+                dev_info(&dd->pcidev->dev,
+                        "errormask fixed(%u) %lx -> %lx, ctrl %x hwerr %lx\n",
+                        fixed, errormask, (unsigned long)dd->ipath_errormask,
+                        ctrl, hwerrs);
+        } else
+                ipath_dbg("errormask fixed(%u) %lx -> %lx, no freeze\n",
+                        fixed, errormask,
+                        (unsigned long)dd->ipath_errormask);
+}
+
+
 /**
  * ipath_get_faststats - get word counters from chip before they overflow
  * @opaque - contains a pointer to the infinipath device ipath_devdata
@@ -251,14 +290,13 @@ void ipath_get_faststats(unsigned long opaque)
                 dd->ipath_lasterror = 0;
         if (dd->ipath_lasthwerror)
                 dd->ipath_lasthwerror = 0;
-        if ((dd->ipath_maskederrs & ~dd->ipath_ignorederrs)
+        if (dd->ipath_maskederrs
             && time_after(jiffies, dd->ipath_unmasktime)) {
                 char ebuf[256];
                 int iserr;
                 iserr = ipath_decode_err(ebuf, sizeof ebuf,
-                                 (dd->ipath_maskederrs & ~dd->
-                                  ipath_ignorederrs));
-                if ((dd->ipath_maskederrs & ~dd->ipath_ignorederrs) &
+                        dd->ipath_maskederrs);
+                if (dd->ipath_maskederrs &
                                 ~(INFINIPATH_E_RRCVEGRFULL | INFINIPATH_E_RRCVHDRFULL |
                                 INFINIPATH_E_PKTERRS ))
                         ipath_dev_err(dd, "Re-enabling masked errors "
@@ -278,9 +316,12 @@ void ipath_get_faststats(unsigned long opaque)
                                 ipath_cdbg(ERRPKT, "Re-enabling packet"
                                                 " problem interrupt (%s)\n", ebuf);
                 }
-                dd->ipath_maskederrs = dd->ipath_ignorederrs;
+
+                /* re-enable masked errors */
+                dd->ipath_errormask |= dd->ipath_maskederrs;
                 ipath_write_kreg(dd, dd->ipath_kregs->kr_errormask,
-                                 ~dd->ipath_maskederrs);
+                        dd->ipath_errormask);
+                dd->ipath_maskederrs = 0;
         }
 
         /* limit qfull messages to ~one per minute per port */
@@ -294,6 +335,7 @@ void ipath_get_faststats(unsigned long opaque)
                 }
         }
 
+        ipath_chk_errormask(dd);
 done:
         mod_timer(&dd->ipath_stats_timer, jiffies + HZ * 5);
 }
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index f6315dfb213e..ba0428d872aa 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -1209,7 +1209,6 @@ static void set_datagram_seg(struct mlx4_wqe_datagram_seg *dseg,
         memcpy(dseg->av, &to_mah(wr->wr.ud.ah)->av, sizeof (struct mlx4_av));
         dseg->dqpn = cpu_to_be32(wr->wr.ud.remote_qpn);
         dseg->qkey = cpu_to_be32(wr->wr.ud.remote_qkey);
-
 }
 
 static void set_data_seg(struct mlx4_wqe_data_seg *dseg,
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index ab4b2d9b5327..f1c3d6cebd58 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -186,7 +186,7 @@ struct input_event_compat {
 #elif defined(CONFIG_S390)
 #  define COMPAT_TEST test_thread_flag(TIF_31BIT)
 #elif defined(CONFIG_MIPS)
-#  define COMPAT_TEST (current->thread.mflags & MF_32BIT_ADDR)
+#  define COMPAT_TEST test_thread_flag(TIF_32BIT_ADDR)
 #else
 #  define COMPAT_TEST test_thread_flag(TIF_32BIT)
 #endif
diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c
index be77ee625bb7..559a0d0244cf 100644
--- a/drivers/isdn/divert/divert_procfs.c
+++ b/drivers/isdn/divert/divert_procfs.c
@@ -70,6 +70,8 @@ put_info_buffer(char *cp)
         wake_up_interruptible(&(rd_queue));
 }                               /* put_info_buffer */
 
+#ifdef CONFIG_PROC_FS
+
 /**********************************/
 /* deflection device read routine */
 /**********************************/
@@ -253,8 +255,6 @@ isdn_divert_ioctl(struct inode *inode, struct file *file,
         return copy_to_user((void __user *)arg, &dioctl, sizeof(dioctl)) ? -EFAULT : 0;
 }                               /* isdn_divert_ioctl */
 
-
-#ifdef CONFIG_PROC_FS
 static const struct file_operations isdn_fops =
 {
         .owner          = THIS_MODULE,
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index f730a144baf1..4e53792aa520 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -917,6 +917,13 @@ static int make_request(struct request_queue *q, struct bio * bio)
                 bio_list_add(&bl, mbio);
         }
 
+        if (unlikely(!atomic_read(&r10_bio->remaining))) {
+                /* the array is dead */
+                md_write_end(mddev);
+                raid_end_bio_io(r10_bio);
+                return 0;
+        }
+
         bitmap_startwrite(mddev->bitmap, bio->bi_sector, r10_bio->sectors, 0);
         spin_lock_irqsave(&conf->device_lock, flags);
         bio_list_merge(&conf->pending_bio_list, &bl);
@@ -1557,7 +1564,6 @@ static void raid10d(mddev_t *mddev)
                         bio = r10_bio->devs[r10_bio->read_slot].bio;
                         r10_bio->devs[r10_bio->read_slot].bio =
                                 mddev->ro ? IO_BLOCKED : NULL;
-                        bio_put(bio);
                         mirror = read_balance(conf, r10_bio);
                         if (mirror == -1) {
                                 printk(KERN_ALERT "raid10: %s: unrecoverable I/O"
@@ -1565,8 +1571,10 @@ static void raid10d(mddev_t *mddev)
                                        bdevname(bio->bi_bdev,b),
                                        (unsigned long long)r10_bio->sector);
                                 raid_end_bio_io(r10_bio);
+                                bio_put(bio);
                         } else {
                                 const int do_sync = bio_sync(r10_bio->master_bio);
+                                bio_put(bio);
                                 rdev = conf->mirrors[mirror].rdev;
                                 if (printk_ratelimit())
                                         printk(KERN_ERR "raid10: %s: redirecting sector %llu to"
diff --git a/drivers/media/dvb/dvb-usb/af9005-fe.c b/drivers/media/dvb/dvb-usb/af9005-fe.c
index 7195c9461524..b1a9c4cdec93 100644
--- a/drivers/media/dvb/dvb-usb/af9005-fe.c
+++ b/drivers/media/dvb/dvb-usb/af9005-fe.c
@@ -29,8 +29,6 @@
 
 struct af9005_fe_state {
         struct dvb_usb_device *d;
-        struct dvb_frontend *tuner;
-
         fe_status_t stat;
 
         /* retraining parameters */
@@ -345,8 +343,8 @@ static int af9005_reset_pre_viterbi(struct dvb_frontend *fe)
                                        1 & 0xff);
         if (ret)
                 return ret;
-        af9005_write_ofdm_register(state->d, xd_p_fec_super_frm_unit_15_8,
-                                   1 >> 8);
+        ret = af9005_write_ofdm_register(state->d, xd_p_fec_super_frm_unit_15_8,
+                                         1 >> 8);
         if (ret)
                 return ret;
         /* reset pre viterbi error count */
@@ -447,7 +445,7 @@ static int af9005_fe_read_status(struct dvb_frontend *fe, fe_status_t * stat)
         u8 temp;
         int ret;
 
-        if (state->tuner == NULL)
+        if (fe->ops.tuner_ops.release == NULL)
                 return -ENODEV;
 
         *stat = 0;
@@ -493,7 +491,7 @@ static int af9005_fe_read_status(struct dvb_frontend *fe, fe_status_t * stat)
 static int af9005_fe_read_ber(struct dvb_frontend *fe, u32 * ber)
 {
         struct af9005_fe_state *state = fe->demodulator_priv;
-        if (state->tuner == NULL)
+        if (fe->ops.tuner_ops.release  == NULL)
                 return -ENODEV;
         af9005_fe_refresh_state(fe);
         *ber = state->ber;
@@ -503,7 +501,7 @@ static int af9005_fe_read_ber(struct dvb_frontend *fe, u32 * ber)
 static int af9005_fe_read_unc_blocks(struct dvb_frontend *fe, u32 * unc)
 {
         struct af9005_fe_state *state = fe->demodulator_priv;
-        if (state->tuner == NULL)
+        if (fe->ops.tuner_ops.release == NULL)
                 return -ENODEV;
         af9005_fe_refresh_state(fe);
         *unc = state->unc;
@@ -517,7 +515,7 @@ static int af9005_fe_read_signal_strength(struct dvb_frontend *fe,
         int ret;
         u8 if_gain, rf_gain;
 
-        if (state->tuner == NULL)
+        if (fe->ops.tuner_ops.release == NULL)
                 return -ENODEV;
         ret =
             af9005_read_ofdm_register(state->d, xd_r_reg_aagc_rf_gain,
@@ -881,10 +879,8 @@ static int af9005_fe_init(struct dvb_frontend *fe)
              af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst,
                                         reg_ofdm_rst_pos, reg_ofdm_rst_len, 1)))
                 return ret;
-        if ((ret =
-             af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst,
-                                        reg_ofdm_rst_pos, reg_ofdm_rst_len, 0)))
-                return ret;
+        ret = af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst,
+                                         reg_ofdm_rst_pos, reg_ofdm_rst_len, 0);
 
         if (ret)
                 return ret;
@@ -1041,7 +1037,7 @@ static int af9005_fe_init(struct dvb_frontend *fe)
                 return ret;
 
         /* attach tuner and init */
-        if (state->tuner == NULL) {
+        if (fe->ops.tuner_ops.release == NULL) {
                 /* read tuner and board id from eeprom */
                 ret = af9005_read_eeprom(adap->dev, 0xc6, buf, 2);
                 if (ret) {
@@ -1058,20 +1054,16 @@ static int af9005_fe_init(struct dvb_frontend *fe)
                                 return ret;
                         }
                         if1 = (u16) (buf[0] << 8) + buf[1];
-                        state->tuner =
-                            dvb_attach(mt2060_attach, fe, &adap->dev->i2c_adap,
-                                       &af9005_mt2060_config, if1);
-                        if (state->tuner == NULL) {
+                        if (dvb_attach(mt2060_attach, fe, &adap->dev->i2c_adap,
+                                         &af9005_mt2060_config, if1) == NULL) {
                                 deb_info("MT2060 attach failed\n");
                                 return -ENODEV;
                         }
                         break;
                 case 3: /* QT1010 */
                 case 9: /* QT1010B */
-                        state->tuner =
-                            dvb_attach(qt1010_attach, fe, &adap->dev->i2c_adap,
-                                       &af9005_qt1010_config);
-                        if (state->tuner == NULL) {
+                        if (dvb_attach(qt1010_attach, fe, &adap->dev->i2c_adap,
+                                        &af9005_qt1010_config) ==NULL) {
                                 deb_info("QT1010 attach failed\n");
                                 return -ENODEV;
                         }
@@ -1080,7 +1072,7 @@ static int af9005_fe_init(struct dvb_frontend *fe)
                         err("Unsupported tuner type %d", buf[0]);
                         return -ENODEV;
                 }
-                ret = state->tuner->ops.tuner_ops.init(state->tuner);
+                ret = fe->ops.tuner_ops.init(fe);
                 if (ret)
                         return ret;
         }
@@ -1118,7 +1110,7 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe,
 
         deb_info("af9005_fe_set_frontend freq %d bw %d\n", fep->frequency,
                  fep->u.ofdm.bandwidth);
-        if (state->tuner == NULL) {
+        if (fe->ops.tuner_ops.release == NULL) {
                 err("Tuner not attached");
                 return -ENODEV;
         }
@@ -1199,7 +1191,7 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe,
                 return ret;
         /* set tuner */
         deb_info("set tuner\n");
-        ret = state->tuner->ops.tuner_ops.set_params(state->tuner, fep);
+        ret = fe->ops.tuner_ops.set_params(fe, fep);
         if (ret)
                 return ret;
 
@@ -1435,12 +1427,6 @@ static void af9005_fe_release(struct dvb_frontend *fe)
 {
         struct af9005_fe_state *state =
             (struct af9005_fe_state *)fe->demodulator_priv;
-        if (state->tuner != NULL && state->tuner->ops.tuner_ops.release != NULL) {
-                state->tuner->ops.tuner_ops.release(state->tuner);
-#ifdef CONFIG_DVB_CORE_ATTACH
-                symbol_put_addr(state->tuner->ops.tuner_ops.release);
-#endif
-        }
         kfree(state);
 }
 
@@ -1458,7 +1444,6 @@ struct dvb_frontend *af9005_fe_attach(struct dvb_usb_device *d)
         deb_info("attaching frontend af9005\n");
 
         state->d = d;
-        state->tuner = NULL;
         state->opened = 0;
 
         memcpy(&state->frontend.ops, &af9005_fe_ops,
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index 0c0b94767bc1..ca99e439c97c 100644
--- a/drivers/media/dvb/frontends/dvb-pll.c
+++ b/drivers/media/dvb/frontends/dvb-pll.c
@@ -501,7 +501,7 @@ static struct dvb_pll_desc dvb_pll_opera1 = {
 
 /* Philips FCV1236D
  */
-struct dvb_pll_desc dvb_pll_fcv1236d = {
+static struct dvb_pll_desc dvb_pll_fcv1236d = {
 /* Bit_0: RF Input select
  * Bit_1: 0=digital, 1=analog
  */
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 387cb2122d4f..f6715007d409 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -33,6 +33,7 @@
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
 #include <linux/firmware.h>
+#include <net/checksum.h>
 
 #include <asm/io.h>
 
@@ -45,7 +46,7 @@ static void boot_msp34xx(struct bttv *btv, int pin);
 static void boot_bt832(struct bttv *btv);
 static void hauppauge_eeprom(struct bttv *btv);
 static void avermedia_eeprom(struct bttv *btv);
-static void osprey_eeprom(struct bttv *btv);
+static void osprey_eeprom(struct bttv *btv, const u8 ee[256]);
 static void modtec_eeprom(struct bttv *btv);
 static void init_PXC200(struct bttv *btv);
 static void init_RTV24(struct bttv *btv);
@@ -2843,13 +2844,28 @@ struct tvcard bttv_tvcards[] = {
                 .has_remote     = 1,
         },
                 /* ---- card 0x8c ---------------------------------- */
+        /* Has four Bt878 chips behind a PCI bridge, each chip has:
+             one external BNC composite input (mux 2)
+             three internal composite inputs (unknown muxes)
+             an 18-bit stereo A/D (CS5331A), which has:
+               one external stereo unblanced (RCA) audio connection
+               one (or 3?) internal stereo balanced (XLR) audio connection
+               input is selected via gpio to a 14052B mux
+                 (mask=0x300, unbal=0x000, bal=0x100, ??=0x200,0x300)
+               gain is controlled via an X9221A chip on the I2C bus @0x28
+               sample rate is controlled via gpio to an MK1413S
+                 (mask=0x3, 32kHz=0x0, 44.1kHz=0x1, 48kHz=0x2, ??=0x3)
+             There is neither a tuner nor an svideo input. */
         [BTTV_BOARD_OSPREY440]  = {
                 .name           = "Osprey 440",
-                .video_inputs   = 1,
-                .audio_inputs   = 1,
+                .video_inputs   = 4,
+                .audio_inputs   = 2, /* this is meaningless */
                 .tuner          = UNSET,
-                .svhs           = 1,
-                .muxsel         = { 2 },
+                .svhs           = UNSET,
+                .muxsel         = { 2, 3, 0, 1 }, /* 3,0,1 are guesses */
+                .gpiomask       = 0x303,
+                .gpiomute       = 0x000, /* int + 32kHz */
+                .gpiomux        = { 0, 0, 0x000, 0x100},
                 .pll            = PLL_28,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
@@ -3453,11 +3469,12 @@ void __devinit bttv_init_card2(struct bttv *btv)
         case BTTV_BOARD_OSPREY2xx:
         case BTTV_BOARD_OSPREY2x0_SVID:
         case BTTV_BOARD_OSPREY2x0:
+        case BTTV_BOARD_OSPREY440:
         case BTTV_BOARD_OSPREY500:
         case BTTV_BOARD_OSPREY540:
         case BTTV_BOARD_OSPREY2000:
                 bttv_readee(btv,eeprom_data,0xa0);
-                osprey_eeprom(btv);
+                osprey_eeprom(btv, eeprom_data);
                 break;
         case BTTV_BOARD_IDS_EAGLE:
                 init_ids_eagle(btv);
@@ -3748,106 +3765,119 @@ static int __devinit pvr_boot(struct bttv *btv)
 /* ----------------------------------------------------------------------- */
 /* some osprey specific stuff                                              */
 
-static void __devinit osprey_eeprom(struct bttv *btv)
+static void __devinit osprey_eeprom(struct bttv *btv, const u8 ee[256])
 {
-       int i = 0;
-       unsigned char *ee = eeprom_data;
-       unsigned long serial = 0;
-
-       if (btv->c.type == 0) {
-               /* this might be an antique... check for MMAC label in eeprom */
-               if ((ee[0]=='M') && (ee[1]=='M') && (ee[2]=='A') && (ee[3]=='C')) {
-                       unsigned char checksum = 0;
-                       for (i = 0; i < 21; i++)
-                               checksum += ee[i];
-                       if (checksum != ee[21])
-                               return;
-                       btv->c.type = BTTV_BOARD_OSPREY1x0_848;
-                       for (i = 12; i < 21; i++)
-                               serial *= 10, serial += ee[i] - '0';
-               }
+        int i;
+        u32 serial = 0;
+        int cardid = -1;
+
+        /* This code will nevery actually get called in this case.... */
+        if (btv->c.type == BTTV_BOARD_UNKNOWN) {
+                /* this might be an antique... check for MMAC label in eeprom */
+                if (!strncmp(ee, "MMAC", 4)) {
+                        u8 checksum = 0;
+                        for (i = 0; i < 21; i++)
+                                checksum += ee[i];
+                        if (checksum != ee[21])
+                                return;
+                        cardid = BTTV_BOARD_OSPREY1x0_848;
+                        for (i = 12; i < 21; i++)
+                                serial *= 10, serial += ee[i] - '0';
+                }
        } else {
-               unsigned short type;
-               int offset = 4*16;
-
-               for (; offset < 8*16; offset += 16) {
-                       unsigned short checksum = 0;
-                       /* verify the checksum */
-                       for (i = 0; i < 14; i++)
-                                checksum += ee[i+offset];
-                        checksum = ~checksum;  /* no idea why */
-                        if ((((checksum>>8)&0x0FF) == ee[offset+14]) &&
-                                   ((checksum & 0x0FF) == ee[offset+15])) {
-                               break;
-                       }
-               }
-
-               if (offset >= 8*16)
-                       return;
-
-               /* found a valid descriptor */
-               type = (ee[offset+4]<<8) | (ee[offset+5]);
-
-               switch(type) {
-               /* 848 based */
-               case 0x0004:
-                       btv->c.type = BTTV_BOARD_OSPREY1x0_848;
-                       break;
-               case 0x0005:
-                       btv->c.type = BTTV_BOARD_OSPREY101_848;
-                       break;
-
-               /* 878 based */
-               case 0x0012:
-               case 0x0013:
-                       btv->c.type = BTTV_BOARD_OSPREY1x0;
-                       break;
-               case 0x0014:
-               case 0x0015:
-                       btv->c.type = BTTV_BOARD_OSPREY1x1;
-                       break;
-               case 0x0016:
-               case 0x0017:
-               case 0x0020:
-                       btv->c.type = BTTV_BOARD_OSPREY1x1_SVID;
-                       break;
-               case 0x0018:
-               case 0x0019:
-               case 0x001E:
-               case 0x001F:
-                       btv->c.type = BTTV_BOARD_OSPREY2xx;
-                       break;
-               case 0x001A:
-               case 0x001B:
-                       btv->c.type = BTTV_BOARD_OSPREY2x0_SVID;
-                       break;
-               case 0x0040:
-                       btv->c.type = BTTV_BOARD_OSPREY500;
-                       break;
-               case 0x0050:
-               case 0x0056:
-                       btv->c.type = BTTV_BOARD_OSPREY540;
-                       /* bttv_osprey_540_init(btv); */
-                       break;
-               case 0x0060:
-               case 0x0070:
-               case 0x00A0:
-                       btv->c.type = BTTV_BOARD_OSPREY2x0;
-                       /* enable output on select control lines */
-                       gpio_inout(0xffffff,0x000303);
-                       break;
-               default:
-                       /* unknown...leave generic, but get serial # */
-                       break;
-               }
-               serial =  (ee[offset+6] << 24)
-                       | (ee[offset+7] << 16)
-                       | (ee[offset+8] <<  8)
-                       | (ee[offset+9]);
-       }
-
-       printk(KERN_INFO "bttv%d: osprey eeprom: card=%d name=%s serial=%ld\n",
-              btv->c.nr, btv->c.type, bttv_tvcards[btv->c.type].name,serial);
+                unsigned short type;
+
+                for (i = 4*16; i < 8*16; i += 16) {
+                        u16 checksum = ip_compute_csum(ee + i, 16);
+
+                        if ((checksum&0xff) + (checksum>>8) == 0xff)
+                                break;
+                }
+                if (i >= 8*16)
+                        return;
+                ee += i;
+
+                /* found a valid descriptor */
+                type = be16_to_cpup((u16*)(ee+4));
+
+                switch(type) {
+                /* 848 based */
+                case 0x0004:
+                        cardid = BTTV_BOARD_OSPREY1x0_848;
+                        break;
+                case 0x0005:
+                        cardid = BTTV_BOARD_OSPREY101_848;
+                        break;
+
+                /* 878 based */
+                case 0x0012:
+                case 0x0013:
+                        cardid = BTTV_BOARD_OSPREY1x0;
+                        break;
+                case 0x0014:
+                case 0x0015:
+                        cardid = BTTV_BOARD_OSPREY1x1;
+                        break;
+                case 0x0016:
+                case 0x0017:
+                case 0x0020:
+                        cardid = BTTV_BOARD_OSPREY1x1_SVID;
+                        break;
+                case 0x0018:
+                case 0x0019:
+                case 0x001E:
+                case 0x001F:
+                        cardid = BTTV_BOARD_OSPREY2xx;
+                        break;
+                case 0x001A:
+                case 0x001B:
+                        cardid = BTTV_BOARD_OSPREY2x0_SVID;
+                        break;
+                case 0x0040:
+                        cardid = BTTV_BOARD_OSPREY500;
+                        break;
+                case 0x0050:
+                case 0x0056:
+                        cardid = BTTV_BOARD_OSPREY540;
+                        /* bttv_osprey_540_init(btv); */
+                        break;
+                case 0x0060:
+                case 0x0070:
+                case 0x00A0:
+                        cardid = BTTV_BOARD_OSPREY2x0;
+                        /* enable output on select control lines */
+                        gpio_inout(0xffffff,0x000303);
+                        break;
+                case 0x00D8:
+                        cardid = BTTV_BOARD_OSPREY440;
+                        break;
+                default:
+                        /* unknown...leave generic, but get serial # */
+                        printk(KERN_INFO "bttv%d: "
+                               "osprey eeprom: unknown card type 0x%04x\n",
+                               btv->c.nr, type);
+                        break;
+                }
+                serial = be32_to_cpup((u32*)(ee+6));
+        }
+
+        printk(KERN_INFO "bttv%d: osprey eeprom: card=%d '%s' serial=%u\n",
+               btv->c.nr, cardid,
+               cardid>0 ? bttv_tvcards[cardid].name : "Unknown", serial);
+
+        if (cardid<0 || btv->c.type == cardid)
+                return;
+
+        /* card type isn't set correctly */
+        if (card[btv->c.nr] < bttv_num_tvcards) {
+                printk(KERN_WARNING "bttv%d: osprey eeprom: "
+                       "Not overriding user specified card type\n", btv->c.nr);
+        } else {
+                printk(KERN_INFO "bttv%d: osprey eeprom: "
+                       "Changing card type from %d to %d\n", btv->c.nr,
+                       btv->c.type, cardid);
+                btv->c.type = cardid;
+        }
 }
 
 /* ----------------------------------------------------------------------- */
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index 91b588d261ae..8abb34a35816 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -417,6 +417,7 @@ struct ivtv_mailbox_data {
 #define IVTV_F_I_WORK_HANDLER_YUV  17   /* there is work to be done for YUV */
 #define IVTV_F_I_WORK_HANDLER_PIO  18   /* there is work to be done for PIO */
 #define IVTV_F_I_PIO               19   /* PIO in progress */
+#define IVTV_F_I_DEC_PAUSED        20   /* the decoder is paused */
 
 /* Event notifications */
 #define IVTV_F_I_EV_DEC_STOPPED    28   /* decoder stopped event */
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 8e97a938398f..5dd519caf81d 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -757,6 +757,7 @@ static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts)
             itv->output_mode = OUT_NONE;
 
         itv->speed = 0;
+        clear_bit(IVTV_F_I_DEC_PAUSED, &itv->i_flags);
         ivtv_release_stream(s);
 }
 
@@ -799,7 +800,16 @@ int ivtv_v4l2_close(struct inode *inode, struct file *filp)
                 ivtv_unmute(itv);
                 ivtv_release_stream(s);
         } else if (s->type >= IVTV_DEC_STREAM_TYPE_MPG) {
+                struct ivtv_stream *s_vout = &itv->streams[IVTV_DEC_STREAM_TYPE_VOUT];
+
                 ivtv_stop_decoding(id, VIDEO_CMD_STOP_TO_BLACK | VIDEO_CMD_STOP_IMMEDIATELY, 0);
+
+                /* If all output streams are closed, and if the user doesn't have
+                   IVTV_DEC_STREAM_TYPE_VOUT open, then disable VBI on TV-out. */
+                if (itv->output_mode == OUT_NONE && !test_bit(IVTV_F_S_APPL_IO, &s_vout->s_flags)) {
+                        /* disable VBI on TV-out */
+                        ivtv_disable_vbi(itv);
+                }
         } else {
                 ivtv_stop_capture(id, 0);
         }
diff --git a/drivers/media/video/ivtv/ivtv-firmware.c b/drivers/media/video/ivtv/ivtv-firmware.c
index d0feabf93080..425eb1063904 100644
--- a/drivers/media/video/ivtv/ivtv-firmware.c
+++ b/drivers/media/video/ivtv/ivtv-firmware.c
@@ -72,8 +72,8 @@ retry:
                         dst++;
                         src++;
                 }
-                release_firmware(fw);
                 IVTV_INFO("Loaded %s firmware (%zd bytes)\n", fn, fw->size);
+                release_firmware(fw);
                 return size;
         }
         IVTV_ERR("Unable to open firmware %s (must be %ld bytes)\n", fn, size);
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 4773453e8dab..047624b9e271 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -285,6 +285,10 @@ static int ivtv_video_command(struct ivtv *itv, struct ivtv_open_id *id,
 
                 if (ivtv_set_output_mode(itv, OUT_MPG) != OUT_MPG)
                         return -EBUSY;
+                if (test_and_clear_bit(IVTV_F_I_DEC_PAUSED, &itv->i_flags)) {
+                        /* forces ivtv_set_speed to be called */
+                        itv->speed = 0;
+                }
                 return ivtv_start_decoding(id, vc->play.speed);
         }
 
@@ -309,6 +313,7 @@ static int ivtv_video_command(struct ivtv *itv, struct ivtv_open_id *id,
                 if (atomic_read(&itv->decoding) > 0) {
                         ivtv_vapi(itv, CX2341X_DEC_PAUSE_PLAYBACK, 1,
                                 (vc->flags & VIDEO_CMD_FREEZE_TO_BLACK) ? 1 : 0);
+                        set_bit(IVTV_F_I_DEC_PAUSED, &itv->i_flags);
                 }
                 break;
 
@@ -317,8 +322,10 @@ static int ivtv_video_command(struct ivtv *itv, struct ivtv_open_id *id,
                 if (try) break;
                 if (itv->output_mode != OUT_MPG)
                         return -EBUSY;
-                if (atomic_read(&itv->decoding) > 0) {
-                        ivtv_vapi(itv, CX2341X_DEC_START_PLAYBACK, 2, 0, 0);
+                if (test_and_clear_bit(IVTV_F_I_DEC_PAUSED, &itv->i_flags)) {
+                        int speed = itv->speed;
+                        itv->speed = 0;
+                        return ivtv_start_decoding(id, speed);
                 }
                 break;
 
diff --git a/drivers/media/video/ivtv/ivtv-mailbox.c b/drivers/media/video/ivtv/ivtv-mailbox.c
index 814a673712b3..5e3b679202ae 100644
--- a/drivers/media/video/ivtv/ivtv-mailbox.c
+++ b/drivers/media/video/ivtv/ivtv-mailbox.c
@@ -40,6 +40,7 @@
 #define API_HIGH_VOL     (1 << 5)       /* High volume command (i.e. called during encoding or decoding) */
 #define API_NO_WAIT_MB   (1 << 4)       /* Command may not wait for a free mailbox */
 #define API_NO_WAIT_RES  (1 << 5)       /* Command may not wait for the result */
+#define API_NO_POLL      (1 << 6)       /* Avoid pointless polling */
 
 struct ivtv_api_info {
         int flags;              /* Flags, see above */
@@ -51,7 +52,7 @@ struct ivtv_api_info {
 static const struct ivtv_api_info api_info[256] = {
         /* MPEG encoder API */
         API_ENTRY(CX2341X_ENC_PING_FW,                  API_FAST_RESULT),
-        API_ENTRY(CX2341X_ENC_START_CAPTURE,            API_RESULT),
+        API_ENTRY(CX2341X_ENC_START_CAPTURE,            API_RESULT | API_NO_POLL),
         API_ENTRY(CX2341X_ENC_STOP_CAPTURE,             API_RESULT),
         API_ENTRY(CX2341X_ENC_SET_AUDIO_ID,             API_CACHE),
         API_ENTRY(CX2341X_ENC_SET_VIDEO_ID,             API_CACHE),
@@ -96,7 +97,7 @@ static const struct ivtv_api_info api_info[256] = {
 
         /* MPEG decoder API */
         API_ENTRY(CX2341X_DEC_PING_FW,                  API_FAST_RESULT),
-        API_ENTRY(CX2341X_DEC_START_PLAYBACK,           API_RESULT),
+        API_ENTRY(CX2341X_DEC_START_PLAYBACK,           API_RESULT | API_NO_POLL),
         API_ENTRY(CX2341X_DEC_STOP_PLAYBACK,            API_RESULT),
         API_ENTRY(CX2341X_DEC_SET_PLAYBACK_SPEED,       API_RESULT),
         API_ENTRY(CX2341X_DEC_STEP_VIDEO,               API_RESULT),
@@ -290,6 +291,13 @@ static int ivtv_api_call(struct ivtv *itv, int cmd, int args, u32 data[])
         /* Get results */
         then = jiffies;
 
+        if (!(flags & API_NO_POLL)) {
+                /* First try to poll, then switch to delays */
+                for (i = 0; i < 100; i++) {
+                        if (readl(&mbox->flags) & IVTV_MBOX_FIRMWARE_DONE)
+                                break;
+                }
+        }
         while (!(readl(&mbox->flags) & IVTV_MBOX_FIRMWARE_DONE)) {
                 if (jiffies - then > api_timeout) {
                         IVTV_DEBUG_WARN("Could not get result (%s)\n", api_info[cmd].name);
@@ -301,7 +309,7 @@ static int ivtv_api_call(struct ivtv *itv, int cmd, int args, u32 data[])
                 if (flags & API_NO_WAIT_RES)
                         mdelay(1);
                 else
-                        ivtv_msleep_timeout(10, 0);
+                        ivtv_msleep_timeout(1, 0);
         }
         if (jiffies - then > msecs_to_jiffies(100))
                 IVTV_DEBUG_WARN("%s took %u jiffies\n",
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 322b347b67c2..51df3f855031 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -603,10 +603,6 @@ static int ivtv_setup_v4l2_decode_stream(struct ivtv_stream *s)
 
         IVTV_DEBUG_INFO("Setting some initial decoder settings\n");
 
-        /* disable VBI signals, if the MPEG stream contains VBI data,
-           then that data will be processed automatically for you. */
-        ivtv_disable_vbi(itv);
-
         /* set audio mode to left/stereo  for dual/stereo mode. */
         ivtv_vapi(itv, CX2341X_DEC_SET_AUDIO_MODE, 2, itv->audio_bilingual_mode, itv->audio_stereo_mode);
 
@@ -639,7 +635,7 @@ static int ivtv_setup_v4l2_decode_stream(struct ivtv_stream *s)
         }
         if (ivtv_vapi(itv, CX2341X_DEC_SET_DECODER_SOURCE, 4, datatype,
                         itv->params.width, itv->params.height, itv->params.audio_properties)) {
-                IVTV_DEBUG_WARN("COULDN'T INITIALIZE DECODER SOURCE\n");
+                IVTV_DEBUG_WARN("Couldn't initialize decoder source\n");
         }
         return 0;
 }
@@ -909,11 +905,6 @@ int ivtv_stop_v4l2_decode_stream(struct ivtv_stream *s, int flags, u64 pts)
         clear_bit(IVTV_F_S_STREAMING, &s->s_flags);
         ivtv_flush_queues(s);
 
-        if (!test_bit(IVTV_F_S_PASSTHROUGH, &s->s_flags)) {
-                /* disable VBI on TV-out */
-                ivtv_disable_vbi(itv);
-        }
-
         /* decrement decoding */
         atomic_dec(&itv->decoding);
 
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 868b6886fe7f..e3371f972240 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -517,6 +517,7 @@ static int vidioc_g_register (struct file *file, void *priv,
                     __FUNCTION__, errCode);
                 return errCode;
         }
+        reg->val = errCode;
         return 0;
 }
 
@@ -531,8 +532,8 @@ static int vidioc_s_register (struct file *file, void *priv,
         if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
                 return -EINVAL;
         /* NT100x has a 8-bit register space */
-        reg->val = (u8)usbvision_write_reg(usbvision, reg->reg&0xff, reg->val);
-        if (reg->val < 0) {
+        errCode = usbvision_write_reg(usbvision, reg->reg&0xff, reg->val);
+        if (errCode < 0) {
                 err("%s: VIDIOC_DBG_S_REGISTER failed: error %d",
                     __FUNCTION__, errCode);
                 return errCode;
diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran.h
index 8fb4a3414e0a..937c4a616c0e 100644
--- a/drivers/media/video/zoran.h
+++ b/drivers/media/video/zoran.h
@@ -240,11 +240,16 @@ enum gpcs_type {
 
 struct zoran_format {
         char *name;
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
         int palette;
+#endif
+#ifdef CONFIG_VIDEO_V4L2
         __u32 fourcc;
         int colorspace;
+#endif
         int depth;
         __u32 flags;
+        __u32 vfespfr;
 };
 /* flags */
 #define ZORAN_FORMAT_COMPRESSED 1<<0
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c
index b0752767ee4f..ba2f4ed29483 100644
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran_device.c
@@ -429,8 +429,6 @@ zr36057_set_vfe (struct zoran              *zr,
         reg |= (HorDcm << ZR36057_VFESPFR_HorDcm);
         reg |= (VerDcm << ZR36057_VFESPFR_VerDcm);
         reg |= (DispMode << ZR36057_VFESPFR_DispMode);
-        if (format->palette != VIDEO_PALETTE_YUV422 && format->palette != VIDEO_PALETTE_YUYV)
-                reg |= ZR36057_VFESPFR_LittleEndian;
         /* RJ: I don't know, why the following has to be the opposite
          * of the corresponding ZR36060 setting, but only this way
          * we get the correct colors when uncompressing to the screen  */
@@ -439,36 +437,6 @@ zr36057_set_vfe (struct zoran              *zr,
         if (zr->norm != VIDEO_MODE_NTSC)
                 reg |= ZR36057_VFESPFR_ExtFl;   // NEEDED!!!!!!! Wolfgang
         reg |= ZR36057_VFESPFR_TopField;
-        switch (format->palette) {
-
-        case VIDEO_PALETTE_YUYV:
-        case VIDEO_PALETTE_YUV422:
-                reg |= ZR36057_VFESPFR_YUV422;
-                break;
-
-        case VIDEO_PALETTE_RGB555:
-                reg |= ZR36057_VFESPFR_RGB555 | ZR36057_VFESPFR_ErrDif;
-                break;
-
-        case VIDEO_PALETTE_RGB565:
-                reg |= ZR36057_VFESPFR_RGB565 | ZR36057_VFESPFR_ErrDif;
-                break;
-
-        case VIDEO_PALETTE_RGB24:
-                reg |= ZR36057_VFESPFR_RGB888 | ZR36057_VFESPFR_Pack24;
-                break;
-
-        case VIDEO_PALETTE_RGB32:
-                reg |= ZR36057_VFESPFR_RGB888;
-                break;
-
-        default:
-                dprintk(1,
-                        KERN_INFO "%s: set_vfe() - unknown color_fmt=%x\n",
-                        ZR_DEVNAME(zr), format->palette);
-                return;
-
-        }
         if (HorDcm >= 48) {
                 reg |= 3 << ZR36057_VFESPFR_HFilter;    /* 5 tap filter */
         } else if (HorDcm >= 32) {
@@ -476,6 +444,7 @@ zr36057_set_vfe (struct zoran              *zr,
         } else if (HorDcm >= 16) {
                 reg |= 1 << ZR36057_VFESPFR_HFilter;    /* 3 tap filter */
         }
+        reg |= format->vfespfr;
         btwrite(reg, ZR36057_VFESPFR);
 
         /* display configuration */
@@ -651,11 +620,17 @@ zr36057_set_memgrab (struct zoran *zr,
                      int           mode)
 {
         if (mode) {
-                if (btread(ZR36057_VSSFGR) &
-                    (ZR36057_VSSFGR_SnapShot | ZR36057_VSSFGR_FrameGrab))
+                /* We only check SnapShot and not FrameGrab here.  SnapShot==1
+                 * means a capture is already in progress, but FrameGrab==1
+                 * doesn't necessary mean that.  It's more correct to say a 1
+                 * to 0 transition indicates a capture completed.  If a
+                 * capture is pending when capturing is tuned off, FrameGrab
+                 * will be stuck at 1 until capturing is turned back on.
+                 */
+                if (btread(ZR36057_VSSFGR) & ZR36057_VSSFGR_SnapShot)
                         dprintk(1,
                                 KERN_WARNING
-                                "%s: zr36057_set_memgrab(1) with SnapShot or FrameGrab on!?\n",
+                                "%s: zr36057_set_memgrab(1) with SnapShot on!?\n",
                                 ZR_DEVNAME(zr));
 
                 /* switch on VSync interrupts */
@@ -672,11 +647,12 @@ zr36057_set_memgrab (struct zoran *zr,
 
                 zr->v4l_memgrab_active = 1;
         } else {
-                zr->v4l_memgrab_active = 0;
-
                 /* switch off VSync interrupts */
                 btand(~zr->card.vsync_int, ZR36057_ICR);        // SW
 
+                zr->v4l_memgrab_active = 0;
+                zr->v4l_grab_frame = NO_GRAB_ACTIVE;
+
                 /* reenable grabbing to screen if it was running */
                 if (zr->v4l_overlay_active) {
                         zr36057_overlay(zr, 1);
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 17118a490f81..72a037b75d63 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -99,88 +99,103 @@
 
 #include <asm/byteorder.h>
 
-const struct zoran_format zoran_formats[] = {
-        {
-                .name = "15-bit RGB",
-                .palette = VIDEO_PALETTE_RGB555,
-#ifdef CONFIG_VIDEO_V4L2
-#ifdef __LITTLE_ENDIAN
-                .fourcc = V4L2_PIX_FMT_RGB555,
+#if defined(CONFIG_VIDEO_V4L2) && defined(CONFIG_VIDEO_V4L1_COMPAT)
+#define ZFMT(pal, fcc, cs) \
+        .palette = (pal), .fourcc = (fcc), .colorspace = (cs)
+#elif defined(CONFIG_VIDEO_V4L2)
+#define ZFMT(pal, fcc, cs) \
+        .fourcc = (fcc), .colorspace = (cs)
 #else
-                .fourcc = V4L2_PIX_FMT_RGB555X,
-#endif
-                .colorspace = V4L2_COLORSPACE_SRGB,
+#define ZFMT(pal, fcc, cs) \
+        .palette = (pal)
 #endif
+
+const struct zoran_format zoran_formats[] = {
+        {
+                .name = "15-bit RGB LE",
+                ZFMT(VIDEO_PALETTE_RGB555,
+                     V4L2_PIX_FMT_RGB555, V4L2_COLORSPACE_SRGB),
                 .depth = 15,
                 .flags = ZORAN_FORMAT_CAPTURE |
                          ZORAN_FORMAT_OVERLAY,
+                .vfespfr = ZR36057_VFESPFR_RGB555|ZR36057_VFESPFR_ErrDif|
+                           ZR36057_VFESPFR_LittleEndian,
         }, {
-                .name = "16-bit RGB",
-                .palette = VIDEO_PALETTE_RGB565,
-#ifdef CONFIG_VIDEO_V4L2
-#ifdef __LITTLE_ENDIAN
-                .fourcc = V4L2_PIX_FMT_RGB565,
-#else
-                .fourcc = V4L2_PIX_FMT_RGB565X,
-#endif
-                .colorspace = V4L2_COLORSPACE_SRGB,
-#endif
+                .name = "15-bit RGB BE",
+                ZFMT(-1,
+                     V4L2_PIX_FMT_RGB555X, V4L2_COLORSPACE_SRGB),
+                .depth = 15,
+                .flags = ZORAN_FORMAT_CAPTURE |
+                         ZORAN_FORMAT_OVERLAY,
+                .vfespfr = ZR36057_VFESPFR_RGB555|ZR36057_VFESPFR_ErrDif,
+        }, {
+                .name = "16-bit RGB LE",
+                ZFMT(VIDEO_PALETTE_RGB565,
+                     V4L2_PIX_FMT_RGB565, V4L2_COLORSPACE_SRGB),
                 .depth = 16,
                 .flags = ZORAN_FORMAT_CAPTURE |
                          ZORAN_FORMAT_OVERLAY,
+                .vfespfr = ZR36057_VFESPFR_RGB565|ZR36057_VFESPFR_ErrDif|
+                           ZR36057_VFESPFR_LittleEndian,
+        }, {
+                .name = "16-bit RGB BE",
+                ZFMT(-1,
+                     V4L2_PIX_FMT_RGB565, V4L2_COLORSPACE_SRGB),
+                .depth = 16,
+                .flags = ZORAN_FORMAT_CAPTURE |
+                         ZORAN_FORMAT_OVERLAY,
+                .vfespfr = ZR36057_VFESPFR_RGB565|ZR36057_VFESPFR_ErrDif,
         }, {
                 .name = "24-bit RGB",
-                .palette = VIDEO_PALETTE_RGB24,
-#ifdef CONFIG_VIDEO_V4L2
-#ifdef __LITTLE_ENDIAN
-                .fourcc = V4L2_PIX_FMT_BGR24,
-#else
-                .fourcc = V4L2_PIX_FMT_RGB24,
-#endif
-                .colorspace = V4L2_COLORSPACE_SRGB,
-#endif
+                ZFMT(VIDEO_PALETTE_RGB24,
+                     V4L2_PIX_FMT_BGR24, V4L2_COLORSPACE_SRGB),
                 .depth = 24,
                 .flags = ZORAN_FORMAT_CAPTURE |
                          ZORAN_FORMAT_OVERLAY,
+                .vfespfr = ZR36057_VFESPFR_RGB888|ZR36057_VFESPFR_Pack24,
         }, {
-                .name = "32-bit RGB",
-                .palette = VIDEO_PALETTE_RGB32,
-#ifdef CONFIG_VIDEO_V4L2
-#ifdef __LITTLE_ENDIAN
-                .fourcc = V4L2_PIX_FMT_BGR32,
-#else
-                .fourcc = V4L2_PIX_FMT_RGB32,
-#endif
-                .colorspace = V4L2_COLORSPACE_SRGB,
-#endif
+                .name = "32-bit RGB LE",
+                ZFMT(VIDEO_PALETTE_RGB32,
+                     V4L2_PIX_FMT_BGR32, V4L2_COLORSPACE_SRGB),
+                .depth = 32,
+                .flags = ZORAN_FORMAT_CAPTURE |
+                         ZORAN_FORMAT_OVERLAY,
+                .vfespfr = ZR36057_VFESPFR_RGB888|ZR36057_VFESPFR_LittleEndian,
+        }, {
+                .name = "32-bit RGB BE",
+                ZFMT(-1,
+                     V4L2_PIX_FMT_RGB32, V4L2_COLORSPACE_SRGB),
                 .depth = 32,
                 .flags = ZORAN_FORMAT_CAPTURE |
                          ZORAN_FORMAT_OVERLAY,
+                .vfespfr = ZR36057_VFESPFR_RGB888,
         }, {
                 .name = "4:2:2, packed, YUYV",
-                .palette = VIDEO_PALETTE_YUV422,
-#ifdef CONFIG_VIDEO_V4L2
-                .fourcc = V4L2_PIX_FMT_YUYV,
-                .colorspace = V4L2_COLORSPACE_SMPTE170M,
-#endif
+                ZFMT(VIDEO_PALETTE_YUV422,
+                     V4L2_PIX_FMT_YUYV, V4L2_COLORSPACE_SMPTE170M),
+                .depth = 16,
+                .flags = ZORAN_FORMAT_CAPTURE |
+                         ZORAN_FORMAT_OVERLAY,
+                .vfespfr = ZR36057_VFESPFR_YUV422,
+        }, {
+                .name = "4:2:2, packed, UYVY",
+                ZFMT(VIDEO_PALETTE_UYVY,
+                     V4L2_PIX_FMT_UYVY, V4L2_COLORSPACE_SMPTE170M),
                 .depth = 16,
                 .flags = ZORAN_FORMAT_CAPTURE |
                          ZORAN_FORMAT_OVERLAY,
+                .vfespfr = ZR36057_VFESPFR_YUV422|ZR36057_VFESPFR_LittleEndian,
         }, {
                 .name = "Hardware-encoded Motion-JPEG",
-                .palette = -1,
-#ifdef CONFIG_VIDEO_V4L2
-                .fourcc = V4L2_PIX_FMT_MJPEG,
-                .colorspace = V4L2_COLORSPACE_SMPTE170M,
-#endif
+                ZFMT(-1,
+                     V4L2_PIX_FMT_MJPEG, V4L2_COLORSPACE_SMPTE170M),
                 .depth = 0,
                 .flags = ZORAN_FORMAT_CAPTURE |
                          ZORAN_FORMAT_PLAYBACK |
                          ZORAN_FORMAT_COMPRESSED,
         }
 };
-static const int zoran_num_formats =
-    (sizeof(zoran_formats) / sizeof(struct zoran_format));
+#define NUM_FORMATS ARRAY_SIZE(zoran_formats)
 
 // RJ: Test only - want to test BUZ_USE_HIMEM even when CONFIG_BIGPHYS_AREA is defined
 
@@ -768,13 +783,13 @@ v4l_grab (struct file       *file,
         struct zoran *zr = fh->zr;
         int res = 0, i;
 
-        for (i = 0; i < zoran_num_formats; i++) {
+        for (i = 0; i < NUM_FORMATS; i++) {
                 if (zoran_formats[i].palette == mp->format &&
                     zoran_formats[i].flags & ZORAN_FORMAT_CAPTURE &&
                     !(zoran_formats[i].flags & ZORAN_FORMAT_COMPRESSED))
                         break;
         }
-        if (i == zoran_num_formats || zoran_formats[i].depth == 0) {
+        if (i == NUM_FORMATS || zoran_formats[i].depth == 0) {
                 dprintk(1,
                         KERN_ERR
                         "%s: v4l_grab() - wrong bytes-per-pixel format\n",
@@ -1173,10 +1188,14 @@ zoran_close_end_session (struct file *file)
 
         /* v4l capture */
         if (fh->v4l_buffers.active != ZORAN_FREE) {
+                long flags;
+
+                spin_lock_irqsave(&zr->spinlock, flags);
                 zr36057_set_memgrab(zr, 0);
                 zr->v4l_buffers.allocated = 0;
                 zr->v4l_buffers.active = fh->v4l_buffers.active =
                     ZORAN_FREE;
+                spin_unlock_irqrestore(&zr->spinlock, flags);
         }
 
         /* v4l buffers */
@@ -2107,7 +2126,7 @@ zoran_do_ioctl (struct inode *inode,
                         vpict->colour, vpict->contrast, vpict->depth,
                         vpict->palette);
 
-                for (i = 0; i < zoran_num_formats; i++) {
+                for (i = 0; i < NUM_FORMATS; i++) {
                         const struct zoran_format *fmt = &zoran_formats[i];
 
                         if (fmt->palette != -1 &&
@@ -2116,7 +2135,7 @@ zoran_do_ioctl (struct inode *inode,
                             fmt->depth == vpict->depth)
                                 break;
                 }
-                if (i == zoran_num_formats) {
+                if (i == NUM_FORMATS) {
                         dprintk(1,
                                 KERN_ERR
                                 "%s: VIDIOCSPICT - Invalid palette %d\n",
@@ -2220,10 +2239,10 @@ zoran_do_ioctl (struct inode *inode,
                         ZR_DEVNAME(zr), vbuf->base, vbuf->width,
                         vbuf->height, vbuf->depth, vbuf->bytesperline);
 
-                for (i = 0; i < zoran_num_formats; i++)
+                for (i = 0; i < NUM_FORMATS; i++)
                         if (zoran_formats[i].depth == vbuf->depth)
                                 break;
-                if (i == zoran_num_formats) {
+                if (i == NUM_FORMATS) {
                         dprintk(1,
                                 KERN_ERR
                                 "%s: VIDIOCSFBUF - invalid fbuf depth %d\n",
@@ -2672,14 +2691,14 @@ zoran_do_ioctl (struct inode *inode,
                         return -EINVAL;
                 }
 
-                for (i = 0; i < zoran_num_formats; i++) {
+                for (i = 0; i < NUM_FORMATS; i++) {
                         if (zoran_formats[i].flags & flag)
                                 num++;
                         if (num == fmt->index)
                                 break;
                 }
                 if (fmt->index < 0 /* late, but not too late */  ||
-                    i == zoran_num_formats)
+                    i == NUM_FORMATS)
                         return -EINVAL;
 
                 memset(fmt, 0, sizeof(*fmt));
@@ -2737,7 +2756,8 @@ zoran_do_ioctl (struct inode *inode,
                                 fmt->fmt.pix.height =
                                     fh->v4l_settings.height;
                                 fmt->fmt.pix.sizeimage =
-                                    fh->v4l_buffers.buffer_size;
+                                    fh->v4l_settings.bytesperline *
+                                    fh->v4l_settings.height;
                                 fmt->fmt.pix.pixelformat =
                                     fh->v4l_settings.format->fourcc;
                                 fmt->fmt.pix.colorspace =
@@ -2941,11 +2961,11 @@ zoran_do_ioctl (struct inode *inode,
                         sfmtjpg_unlock_and_return:
                                 mutex_unlock(&zr->resource_lock);
                         } else {
-                                for (i = 0; i < zoran_num_formats; i++)
+                                for (i = 0; i < NUM_FORMATS; i++)
                                         if (fmt->fmt.pix.pixelformat ==
                                             zoran_formats[i].fourcc)
                                                 break;
-                                if (i == zoran_num_formats) {
+                                if (i == NUM_FORMATS) {
                                         dprintk(1,
                                                 KERN_ERR
                                                 "%s: VIDIOC_S_FMT - unknown/unsupported format 0x%x (%4.4s)\n",
@@ -2984,8 +3004,9 @@ zoran_do_ioctl (struct inode *inode,
 
                                 /* tell the user the
                                  * results/missing stuff */
-                                fmt->fmt.pix.sizeimage = fh->v4l_buffers.buffer_size    /*zr->gbpl * zr->gheight */
-                                    ;
+                                fmt->fmt.pix.sizeimage =
+                                        fh->v4l_settings.height *
+                                        fh->v4l_settings.bytesperline;
                                 if (BUZ_MAX_HEIGHT <
                                     (fh->v4l_settings.height * 2))
                                         fmt->fmt.pix.field =
@@ -3053,10 +3074,10 @@ zoran_do_ioctl (struct inode *inode,
                         fb->fmt.bytesperline, fb->fmt.pixelformat,
                         (char *) &printformat);
 
-                for (i = 0; i < zoran_num_formats; i++)
+                for (i = 0; i < NUM_FORMATS; i++)
                         if (zoran_formats[i].fourcc == fb->fmt.pixelformat)
                                 break;
-                if (i == zoran_num_formats) {
+                if (i == NUM_FORMATS) {
                         dprintk(1,
                                 KERN_ERR
                                 "%s: VIDIOC_S_FBUF - format=0x%x (%4.4s) not allowed\n",
@@ -3439,8 +3460,13 @@ zoran_do_ioctl (struct inode *inode,
                                 goto strmoff_unlock_and_return;
 
                         /* unload capture */
-                        if (zr->v4l_memgrab_active)
+                        if (zr->v4l_memgrab_active) {
+                                long flags;
+
+                                spin_lock_irqsave(&zr->spinlock, flags);
                                 zr36057_set_memgrab(zr, 0);
+                                spin_unlock_irqrestore(&zr->spinlock, flags);
+                        }
 
                         for (i = 0; i < fh->v4l_buffers.num_buffers; i++)
                                 zr->v4l_buffers.buffer[i].state =
@@ -3704,11 +3730,11 @@ zoran_do_ioctl (struct inode *inode,
                 dprintk(3, KERN_DEBUG "%s: VIDIOC_S_STD - norm=0x%llx\n",
                         ZR_DEVNAME(zr), (unsigned long long)*std);
 
-                if (*std == V4L2_STD_PAL)
+                if ((*std & V4L2_STD_PAL) && !(*std & ~V4L2_STD_PAL))
                         norm = VIDEO_MODE_PAL;
-                else if (*std == V4L2_STD_NTSC)
+                else if ((*std & V4L2_STD_NTSC) && !(*std & ~V4L2_STD_NTSC))
                         norm = VIDEO_MODE_NTSC;
-                else if (*std == V4L2_STD_SECAM)
+                else if ((*std & V4L2_STD_SECAM) && !(*std & ~V4L2_STD_SECAM))
                         norm = VIDEO_MODE_SECAM;
                 else if (*std == V4L2_STD_ALL)
                         norm = VIDEO_MODE_AUTO;
@@ -4149,11 +4175,11 @@ zoran_do_ioctl (struct inode *inode,
                                    V4L2_BUF_TYPE_VIDEO_CAPTURE) {
                                 int i;
 
-                                for (i = 0; i < zoran_num_formats; i++)
+                                for (i = 0; i < NUM_FORMATS; i++)
                                         if (zoran_formats[i].fourcc ==
                                             fmt->fmt.pix.pixelformat)
                                                 break;
-                                if (i == zoran_num_formats) {
+                                if (i == NUM_FORMATS) {
                                         res = -EINVAL;
                                         goto tryfmt_unlock_and_return;
                                 }
@@ -4213,8 +4239,8 @@ zoran_poll (struct file *file,
 {
         struct zoran_fh *fh = file->private_data;
         struct zoran *zr = fh->zr;
-        wait_queue_head_t *queue = NULL;
         int res = 0, frame;
+        unsigned long flags;
 
         /* we should check whether buffers are ready to be synced on
          * (w/o waits - O_NONBLOCK) here
@@ -4228,51 +4254,58 @@ zoran_poll (struct file *file,
 
         switch (fh->map_mode) {
         case ZORAN_MAP_MODE_RAW:
-                if (fh->v4l_buffers.active == ZORAN_FREE ||
-                    zr->v4l_pend_head == zr->v4l_pend_tail) {
-                        dprintk(1,
-                                "%s: zoran_poll() - no buffers queued\n",
-                                ZR_DEVNAME(zr));
-                        res = POLLNVAL;
-                        goto poll_unlock_and_return;
-                }
-                queue = &zr->v4l_capq;
-                frame = zr->v4l_pend[zr->v4l_pend_tail & V4L_MASK_FRAME];
-                poll_wait(file, queue, wait);
-                if (fh->v4l_buffers.buffer[frame].state == BUZ_STATE_DONE)
+                poll_wait(file, &zr->v4l_capq, wait);
+                frame = zr->v4l_pend[zr->v4l_sync_tail & V4L_MASK_FRAME];
+
+                spin_lock_irqsave(&zr->spinlock, flags);
+                dprintk(3,
+                        KERN_DEBUG
+                        "%s: %s() raw - active=%c, sync_tail=%lu/%c, pend_tail=%lu, pend_head=%lu\n",
+                        ZR_DEVNAME(zr), __FUNCTION__,
+                        "FAL"[fh->v4l_buffers.active], zr->v4l_sync_tail,
+                        "UPMD"[zr->v4l_buffers.buffer[frame].state],
+                        zr->v4l_pend_tail, zr->v4l_pend_head);
+                /* Process is the one capturing? */
+                if (fh->v4l_buffers.active != ZORAN_FREE &&
+                    /* Buffer ready to DQBUF? */
+                    zr->v4l_buffers.buffer[frame].state == BUZ_STATE_DONE)
                         res = POLLIN | POLLRDNORM;
+                spin_unlock_irqrestore(&zr->spinlock, flags);
+
                 break;
 
         case ZORAN_MAP_MODE_JPG_REC:
         case ZORAN_MAP_MODE_JPG_PLAY:
-                if (fh->jpg_buffers.active == ZORAN_FREE ||
-                    zr->jpg_que_head == zr->jpg_que_tail) {
-                        dprintk(1,
-                                "%s: zoran_poll() - no buffers queued\n",
-                                ZR_DEVNAME(zr));
-                        res = POLLNVAL;
-                        goto poll_unlock_and_return;
-                }
-                queue = &zr->jpg_capq;
+                poll_wait(file, &zr->jpg_capq, wait);
                 frame = zr->jpg_pend[zr->jpg_que_tail & BUZ_MASK_FRAME];
-                poll_wait(file, queue, wait);
-                if (fh->jpg_buffers.buffer[frame].state == BUZ_STATE_DONE) {
+
+                spin_lock_irqsave(&zr->spinlock, flags);
+                dprintk(3,
+                        KERN_DEBUG
+                        "%s: %s() jpg - active=%c, que_tail=%lu/%c, que_head=%lu, dma=%lu/%lu\n",
+                        ZR_DEVNAME(zr), __FUNCTION__,
+                        "FAL"[fh->jpg_buffers.active], zr->jpg_que_tail,
+                        "UPMD"[zr->jpg_buffers.buffer[frame].state],
+                        zr->jpg_que_head, zr->jpg_dma_tail, zr->jpg_dma_head);
+                if (fh->jpg_buffers.active != ZORAN_FREE &&
+                    zr->jpg_buffers.buffer[frame].state == BUZ_STATE_DONE) {
                         if (fh->map_mode == ZORAN_MAP_MODE_JPG_REC)
                                 res = POLLIN | POLLRDNORM;
                         else
                                 res = POLLOUT | POLLWRNORM;
                 }
+                spin_unlock_irqrestore(&zr->spinlock, flags);
+
                 break;
 
         default:
                 dprintk(1,
+                        KERN_ERR
                         "%s: zoran_poll() - internal error, unknown map_mode=%d\n",
                         ZR_DEVNAME(zr), fh->map_mode);
                 res = POLLNVAL;
-                goto poll_unlock_and_return;
         }
 
-poll_unlock_and_return:
         mutex_unlock(&zr->resource_lock);
 
         return res;
@@ -4368,11 +4401,15 @@ zoran_vm_close (struct vm_area_struct *vma)
                                 mutex_lock(&zr->resource_lock);
 
                                 if (fh->v4l_buffers.active != ZORAN_FREE) {
+                                        long flags;
+
+                                        spin_lock_irqsave(&zr->spinlock, flags);
                                         zr36057_set_memgrab(zr, 0);
                                         zr->v4l_buffers.allocated = 0;
                                         zr->v4l_buffers.active =
                                             fh->v4l_buffers.active =
                                             ZORAN_FREE;
+                                        spin_unlock_irqrestore(&zr->spinlock, flags);
                                 }
                                 //v4l_fbuffer_free(file);
                                 fh->v4l_buffers.allocated = 0;
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 5e1c99f83ab5..50b2c7334410 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -744,7 +744,7 @@ static int i2o_block_transfer(struct request *req)
 {
         struct i2o_block_device *dev = req->rq_disk->private_data;
         struct i2o_controller *c;
-        int tid = dev->i2o_dev->lct_data.tid;
+        u32 tid = dev->i2o_dev->lct_data.tid;
         struct i2o_message *msg;
         u32 *mptr;
         struct i2o_block_request *ireq = req->special;
diff --git a/drivers/mtd/devices/docprobe.c b/drivers/mtd/devices/docprobe.c
index b96ac8e119dc..54aa75907640 100644
--- a/drivers/mtd/devices/docprobe.c
+++ b/drivers/mtd/devices/docprobe.c
@@ -81,9 +81,6 @@ static unsigned long __initdata doc_locations[] = {
 #endif /*  CONFIG_MTD_DOCPROBE_HIGH */
 #elif defined(__PPC__)
         0xe4000000,
-#elif defined(CONFIG_MOMENCO_OCELOT)
-        0x2f000000,
-        0xff000000,
 #elif defined(CONFIG_MOMENCO_OCELOT_G)
         0xff000000,
 ##else
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index 17c868034aad..e96259f22cca 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -56,9 +56,6 @@ static unsigned long __initdata doc_locations[] = {
 #endif /*  CONFIG_MTD_DOCPROBE_HIGH */
 #elif defined(__PPC__)
         0xe4000000,
-#elif defined(CONFIG_MOMENCO_OCELOT)
-        0x2f000000,
-        0xff000000,
 #elif defined(CONFIG_MOMENCO_OCELOT_G)
         0xff000000,
 #else
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 6deb20fc7a08..001c66dd3a94 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -2886,7 +2886,6 @@ static const struct ethtool_ops vortex_ethtool_ops = {
         .set_settings           = vortex_set_settings,
         .get_link               = ethtool_op_get_link,
         .nway_reset             = vortex_nway_reset,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 #ifdef CONFIG_PCI
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index e970e64bf966..a79f28c7a100 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1578,7 +1578,6 @@ static const struct ethtool_ops cp_ethtool_ops = {
         .set_wol                = cp_set_wol,
         .get_strings            = cp_get_strings,
         .get_ethtool_stats      = cp_get_ethtool_stats,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
         .get_eeprom_len         = cp_get_eeprom_len,
         .get_eeprom             = cp_get_eeprom,
         .set_eeprom             = cp_set_eeprom,
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 327eaa7b4999..f4e4298d24b9 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -2452,7 +2452,6 @@ static const struct ethtool_ops rtl8139_ethtool_ops = {
         .get_strings            = rtl8139_get_strings,
         .get_stats_count        = rtl8139_get_stats_count,
         .get_ethtool_stats      = rtl8139_get_ethtool_stats,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f8a602caabcb..81ef81c9a584 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2851,7 +2851,7 @@ config PPPOATM
 
 config PPPOL2TP
         tristate "PPP over L2TP (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && PPP
+        depends on EXPERIMENTAL && PPP && INET
         help
           Support for PPP-over-L2TP socket family. L2TP is a protocol
           used by ISPs and enterprises to tunnel PPP traffic over UDP
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c
index e43e8047b90e..83da1770bafb 100644
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -580,7 +580,6 @@ static const struct ethtool_ops ax_ethtool_ops = {
         .set_settings           = ax_set_settings,
         .nway_reset             = ax_nway_reset,
         .get_link               = ax_get_link,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 /* setup code */
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 37f1b6ff5c12..0795df235492 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -2033,7 +2033,6 @@ static const struct ethtool_ops b44_ethtool_ops = {
         .get_strings            = b44_get_strings,
         .get_stats_count        = b44_get_stats_count,
         .get_ethtool_stats      = b44_get_ethtool_stats,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index a729da061bbb..d53dfc5bbae0 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -6269,7 +6269,6 @@ static const struct ethtool_ops bnx2_ethtool_ops = {
         .phys_id                = bnx2_phys_id,
         .get_stats_count        = bnx2_get_stats_count,
         .get_ethtool_stats      = bnx2_get_ethtool_stats,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 /* Called with rtnl_lock */
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index cb9cb3013f42..070b78d959cc 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -613,38 +613,20 @@ down:
 static int bond_update_speed_duplex(struct slave *slave)
 {
         struct net_device *slave_dev = slave->dev;
-        static int (* ioctl)(struct net_device *, struct ifreq *, int);
-        struct ifreq ifr;
         struct ethtool_cmd etool;
+        int res;
 
         /* Fake speed and duplex */
         slave->speed = SPEED_100;
         slave->duplex = DUPLEX_FULL;
 
-        if (slave_dev->ethtool_ops) {
-                int res;
-
-                if (!slave_dev->ethtool_ops->get_settings) {
-                        return -1;
-                }
-
-                res = slave_dev->ethtool_ops->get_settings(slave_dev, &etool);
-                if (res < 0) {
-                        return -1;
-                }
-
-                goto verify;
-        }
+        if (!slave_dev->ethtool_ops || !slave_dev->ethtool_ops->get_settings)
+                return -1;
 
-        ioctl = slave_dev->do_ioctl;
-        strncpy(ifr.ifr_name, slave_dev->name, IFNAMSIZ);
-        etool.cmd = ETHTOOL_GSET;
-        ifr.ifr_data = (char*)&etool;
-        if (!ioctl || (IOCTL(slave_dev, &ifr, SIOCETHTOOL) < 0)) {
+        res = slave_dev->ethtool_ops->get_settings(slave_dev, &etool);
+        if (res < 0)
                 return -1;
-        }
 
-verify:
         switch (etool.speed) {
         case SPEED_10:
         case SPEED_100:
@@ -690,7 +672,6 @@ static int bond_check_dev_link(struct bonding *bond, struct net_device *slave_de
         static int (* ioctl)(struct net_device *, struct ifreq *, int);
         struct ifreq ifr;
         struct mii_ioctl_data *mii;
-        struct ethtool_value etool;
 
         if (bond->params.use_carrier) {
                 return netif_carrier_ok(slave_dev) ? BMSR_LSTATUS : 0;
@@ -721,9 +702,10 @@ static int bond_check_dev_link(struct bonding *bond, struct net_device *slave_de
                 }
         }
 
-        /* try SIOCETHTOOL ioctl, some drivers cache ETHTOOL_GLINK */
-        /* for a period of time so we attempt to get link status   */
-        /* from it last if the above MII ioctls fail...            */
+        /*
+         * Some drivers cache ETHTOOL_GLINK for a period of time so we only
+         * attempt to get link status from it if the above MII ioctls fail.
+         */
         if (slave_dev->ethtool_ops) {
                 if (slave_dev->ethtool_ops->get_link) {
                         u32 link;
@@ -734,23 +716,9 @@ static int bond_check_dev_link(struct bonding *bond, struct net_device *slave_de
                 }
         }
 
-        if (ioctl) {
-                strncpy(ifr.ifr_name, slave_dev->name, IFNAMSIZ);
-                etool.cmd = ETHTOOL_GLINK;
-                ifr.ifr_data = (char*)&etool;
-                if (IOCTL(slave_dev, &ifr, SIOCETHTOOL) == 0) {
-                        if (etool.data == 1) {
-                                return BMSR_LSTATUS;
-                        } else {
-                                dprintk("SIOCETHTOOL shows link down\n");
-                                return 0;
-                        }
-                }
-        }
-
         /*
          * If reporting, report that either there's no dev->do_ioctl,
-         * or both SIOCGMIIREG and SIOCETHTOOL failed (meaning that we
+         * or both SIOCGMIIREG and get_link failed (meaning that we
          * cannot report link status).  If not reporting, pretend
          * we're ok.
          */
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 6fd1e5241833..dc5d26988bb3 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -1583,7 +1583,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = {
         .get_wol = get_wol,
         .get_tso = ethtool_op_get_tso,
         .set_tso = ethtool_op_set_tso,
-        .get_perm_addr = ethtool_op_get_perm_addr
 };
 
 static int in_range(int val, int lo, int hi)
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 6b6401e9304e..280313b9b069 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2506,7 +2506,6 @@ static const struct ethtool_ops e100_ethtool_ops = {
         .phys_id                = e100_phys_id,
         .get_stats_count        = e100_get_stats_count,
         .get_ethtool_stats      = e100_get_ethtool_stats,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 static int e100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index bb08375b5f13..c90c92e72d2a 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -1973,7 +1973,6 @@ static const struct ethtool_ops e1000_ethtool_ops = {
         .phys_id                = e1000_phys_id,
         .get_stats_count        = e1000_get_stats_count,
         .get_ethtool_stats      = e1000_get_ethtool_stats,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 void e1000_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 661c747389e4..69f5f365239a 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -178,6 +178,7 @@
 #define DEV_HAS_STATISTICS_V2   0x0800  /* device supports hw statistics version 2 */
 #define DEV_HAS_TEST_EXTENDED   0x1000  /* device supports extended diagnostic test */
 #define DEV_HAS_MGMT_UNIT       0x2000  /* device supports management unit */
+#define DEV_HAS_CORRECT_MACADDR 0x4000  /* device supports correct mac address order */
 
 enum {
         NvRegIrqStatus = 0x000,
@@ -4706,7 +4707,6 @@ static const struct ethtool_ops ops = {
         .get_regs_len = nv_get_regs_len,
         .get_regs = nv_get_regs,
         .nway_reset = nv_nway_reset,
-        .get_perm_addr = ethtool_op_get_perm_addr,
         .get_tso = ethtool_op_get_tso,
         .set_tso = nv_set_tso,
         .get_ringparam = nv_get_ringparam,
@@ -5172,7 +5172,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
 
         /* check the workaround bit for correct mac address order */
         txreg = readl(base + NvRegTransmitPoll);
-        if (txreg & NVREG_TRANSMITPOLL_MAC_ADDR_REV) {
+        if ((txreg & NVREG_TRANSMITPOLL_MAC_ADDR_REV) ||
+            (id->driver_data & DEV_HAS_CORRECT_MACADDR)) {
                 /* mac address is already in correct order */
                 dev->dev_addr[0] = (np->orig_mac[0] >>  0) & 0xff;
                 dev->dev_addr[1] = (np->orig_mac[0] >>  8) & 0xff;
@@ -5500,67 +5501,67 @@ static struct pci_device_id pci_tbl[] = {
         },
         {       /* MCP61 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_16),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {       /* MCP61 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_17),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {       /* MCP61 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_18),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {       /* MCP61 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_19),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {       /* MCP65 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_20),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {       /* MCP65 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_21),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {       /* MCP65 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_22),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {       /* MCP65 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_23),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {       /* MCP67 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_24),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {       /* MCP67 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_25),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {       /* MCP67 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_26),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {       /* MCP67 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_27),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {       /* MCP73 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_28),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {       /* MCP73 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_29),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {       /* MCP73 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_30),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {       /* MCP73 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_31),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
         },
         {0,},
 };
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c
index ac3596f45dd8..100bf410bf5f 100644
--- a/drivers/net/gianfar_mii.c
+++ b/drivers/net/gianfar_mii.c
@@ -245,7 +245,7 @@ int __init gfar_mdio_init(void)
         return driver_register(&gianfar_mdio_driver);
 }
 
-void __exit gfar_mdio_exit(void)
+void gfar_mdio_exit(void)
 {
         driver_unregister(&gianfar_mdio_driver);
 }
diff --git a/drivers/net/gianfar_mii.h b/drivers/net/gianfar_mii.h
index 5d3400469514..b373091c7031 100644
--- a/drivers/net/gianfar_mii.h
+++ b/drivers/net/gianfar_mii.h
@@ -42,5 +42,5 @@ struct gfar_mii {
 int gfar_mdio_read(struct mii_bus *bus, int mii_id, int regnum);
 int gfar_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 value);
 int __init gfar_mdio_init(void);
-void __exit gfar_mdio_exit(void);
+void gfar_mdio_exit(void);
 #endif /* GIANFAR_PHY_H */
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 656f2789c9ba..cc0ee93669ea 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -413,12 +413,12 @@ static void *bpq_seq_next(struct seq_file *seq, void *v, loff_t *pos)
         ++*pos;
 
         if (v == SEQ_START_TOKEN)
-                p = bpq_devices.next;
+                p = rcu_dereference(bpq_devices.next);
         else
-                p = ((struct bpqdev *)v)->bpq_list.next;
+                p = rcu_dereference(((struct bpqdev *)v)->bpq_list.next);
 
         return (p == &bpq_devices) ? NULL 
-                : rcu_dereference(list_entry(p, struct bpqdev, bpq_list));
+                : list_entry(p, struct bpqdev, bpq_list);
 }
 
 static void bpq_seq_stop(struct seq_file *seq, void *v)
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c
index afde84868bea..0413cd95eda7 100644
--- a/drivers/net/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ixgb/ixgb_ethtool.c
@@ -724,7 +724,6 @@ static const struct ethtool_ops ixgb_ethtool_ops = {
         .phys_id = ixgb_phys_id,
         .get_stats_count = ixgb_get_stats_count,
         .get_ethtool_stats = ixgb_get_ethtool_stats,
-        .get_perm_addr = ethtool_op_get_perm_addr,
 };
 
 void ixgb_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
index 721ee38d2241..c429a5002dd6 100644
--- a/drivers/net/lib8390.c
+++ b/drivers/net/lib8390.c
@@ -143,6 +143,52 @@ static void __NS8390_init(struct net_device *dev, int startp);
  *      annoying the transmit function is called bh atomic. That places
  *      restrictions on the user context callers as disable_irq won't save
  *      them.
+ *
+ *      Additional explanation of problems with locking by Alan Cox:
+ *
+ *      "The author (me) didn't use spin_lock_irqsave because the slowness of the
+ *      card means that approach caused horrible problems like losing serial data
+ *      at 38400 baud on some chips. Rememeber many 8390 nics on PCI were ISA
+ *      chips with FPGA front ends.
+ *      
+ *      Ok the logic behind the 8390 is very simple:
+ *      
+ *      Things to know
+ *              - IRQ delivery is asynchronous to the PCI bus
+ *              - Blocking the local CPU IRQ via spin locks was too slow
+ *              - The chip has register windows needing locking work
+ *      
+ *      So the path was once (I say once as people appear to have changed it
+ *      in the mean time and it now looks rather bogus if the changes to use
+ *      disable_irq_nosync_irqsave are disabling the local IRQ)
+ *      
+ *      
+ *              Take the page lock
+ *              Mask the IRQ on chip
+ *              Disable the IRQ (but not mask locally- someone seems to have
+ *                      broken this with the lock validator stuff)
+ *                      [This must be _nosync as the page lock may otherwise
+ *                              deadlock us]
+ *              Drop the page lock and turn IRQs back on
+ *              
+ *              At this point an existing IRQ may still be running but we can't
+ *              get a new one
+ *      
+ *              Take the lock (so we know the IRQ has terminated) but don't mask
+ *      the IRQs on the processor
+ *              Set irqlock [for debug]
+ *      
+ *              Transmit (slow as ****)
+ *      
+ *              re-enable the IRQ
+ *      
+ *      
+ *      We have to use disable_irq because otherwise you will get delayed
+ *      interrupts on the APIC bus deadlocking the transmit path.
+ *      
+ *      Quite hairy but the chip simply wasn't designed for SMP and you can't
+ *      even ACK an interrupt without risking corrupting other parallel
+ *      activities on the chip." [lkml, 25 Jul 2007]
  */
 
 
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 6ba6ed2b480a..5106c2328d12 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -229,7 +229,12 @@ struct net_device loopback_dev = {
 /* Setup and register the loopback device. */
 static int __init loopback_init(void)
 {
-        return register_netdev(&loopback_dev);
+        int err = register_netdev(&loopback_dev);
+
+        if (err)
+                panic("loopback: Failed to register netdevice: %d\n", err);
+
+        return err;
 };
 
 module_init(loopback_init);
diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c
index d0808fa3ec82..5b87183e62ce 100644
--- a/drivers/net/mlx4/mr.c
+++ b/drivers/net/mlx4/mr.c
@@ -255,10 +255,8 @@ int mlx4_mr_alloc(struct mlx4_dev *dev, u32 pd, u64 iova, u64 size, u32 access,
         int err;
 
         index = mlx4_bitmap_alloc(&priv->mr_table.mpt_bitmap);
-        if (index == -1) {
-                err = -ENOMEM;
-                goto err;
-        }
+        if (index == -1)
+                return -ENOMEM;
 
         mr->iova       = iova;
         mr->size       = size;
@@ -269,15 +267,8 @@ int mlx4_mr_alloc(struct mlx4_dev *dev, u32 pd, u64 iova, u64 size, u32 access,
 
         err = mlx4_mtt_init(dev, npages, page_shift, &mr->mtt);
         if (err)
-                goto err_index;
-
-        return 0;
-
-err_index:
-        mlx4_bitmap_free(&priv->mr_table.mpt_bitmap, index);
+                mlx4_bitmap_free(&priv->mr_table.mpt_bitmap, index);
 
-err:
-        kfree(mr);
         return err;
 }
 EXPORT_SYMBOL_GPL(mlx4_mr_alloc);
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index cfdeaf7aa163..f81d9398d605 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -638,7 +638,6 @@ static const struct ethtool_ops ne2k_pci_ethtool_ops = {
         .get_drvinfo            = ne2k_pci_get_drvinfo,
         .get_tx_csum            = ethtool_op_get_tx_csum,
         .get_sg                 = ethtool_op_get_sg,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 static void __devexit ne2k_pci_remove_one (struct pci_dev *pdev)
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index 0175f6c353f6..a6138b474b4a 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -755,5 +755,4 @@ struct ethtool_ops netxen_nic_ethtool_ops = {
         .get_strings = netxen_nic_get_strings,
         .get_stats_count = netxen_nic_get_stats_count,
         .get_ethtool_stats = netxen_nic_get_ethtool_stats,
-        .get_perm_addr = ethtool_op_get_perm_addr,
 };
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 19e2fa940ac0..08a62acde8bf 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -335,7 +335,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         adapter->ahw.pdev = pdev;
         adapter->ahw.pci_func  = pci_func_id;
         spin_lock_init(&adapter->tx_lock);
-        spin_lock_init(&adapter->lock);
 
         /* remap phys address */
         mem_base = pci_resource_start(pdev, 0); /* 0 is for BAR 0 */
@@ -895,8 +894,6 @@ static int netxen_nic_open(struct net_device *netdev)
 
         /* Done here again so that even if phantom sw overwrote it,
          * we set it */
-        if (adapter->macaddr_set)
-                adapter->macaddr_set(adapter, netdev->dev_addr);
         if (adapter->init_port
             && adapter->init_port(adapter, adapter->portnum) != 0) {
             del_timer_sync(&adapter->watchdog_timer);
@@ -904,6 +901,8 @@ static int netxen_nic_open(struct net_device *netdev)
                                 netxen_nic_driver_name, adapter->portnum);
                 return -EIO;
         }
+        if (adapter->macaddr_set)
+                adapter->macaddr_set(adapter, netdev->dev_addr);
 
         netxen_nic_set_link_parameters(adapter);
 
@@ -930,6 +929,8 @@ static int netxen_nic_close(struct net_device *netdev)
         netif_carrier_off(netdev);
         netif_stop_queue(netdev);
 
+        netxen_nic_disable_int(adapter);
+
         cmd_buff = adapter->cmd_buf_arr;
         for (i = 0; i < adapter->max_tx_desc_count; i++) {
                 buffrag = cmd_buff->frag_array;
@@ -1226,15 +1227,12 @@ static void netxen_tx_timeout_task(struct work_struct *work)
 {
         struct netxen_adapter *adapter = 
                 container_of(work, struct netxen_adapter, tx_timeout_task);
-        unsigned long flags;
 
         printk(KERN_ERR "%s %s: transmit timeout, resetting.\n",
                netxen_nic_driver_name, adapter->netdev->name);
 
-        spin_lock_irqsave(&adapter->lock, flags);
         netxen_nic_close(adapter->netdev);
         netxen_nic_open(adapter->netdev);
-        spin_unlock_irqrestore(&adapter->lock, flags);
         adapter->netdev->trans_start = jiffies;
         netif_wake_queue(adapter->netdev);
 }
@@ -1243,28 +1241,12 @@ static int
 netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev)
 {
         u32 ret = 0;
-        u32 our_int = 0;
 
         DPRINTK(INFO, "Entered handle ISR\n");
         adapter->stats.ints++;
 
-        if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
-                our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
-                /* not our interrupt */
-                if ((our_int & (0x80 << adapter->portnum)) == 0)
-                        return ret;
-        }
-
         netxen_nic_disable_int(adapter);
 
-        if (adapter->intr_scheme == INTR_SCHEME_PERPORT) {
-                /* claim interrupt */
-                if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
-                        writel(our_int & ~((u32)(0x80 << adapter->portnum)),
-                        NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
-                }
-        }
-
         if (netxen_nic_rx_has_work(adapter) || netxen_nic_tx_has_work(adapter)) {
                 if (netif_rx_schedule_prep(netdev)) {
                         /*
@@ -1298,6 +1280,7 @@ irqreturn_t netxen_intr(int irq, void *data)
 {
         struct netxen_adapter *adapter;
         struct net_device *netdev;
+        u32 our_int = 0;
 
         if (unlikely(!irq)) {
                 return IRQ_NONE;        /* Not our interrupt */
@@ -1305,7 +1288,22 @@ irqreturn_t netxen_intr(int irq, void *data)
 
         adapter = (struct netxen_adapter *)data;
         netdev  = adapter->netdev;
-        /* process our status queue (for all 4 ports) */
+
+        if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
+                our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
+                /* not our interrupt */
+                if ((our_int & (0x80 << adapter->portnum)) == 0)
+                        return IRQ_NONE;
+        }
+
+        if (adapter->intr_scheme == INTR_SCHEME_PERPORT) {
+                /* claim interrupt */
+                if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
+                        writel(our_int & ~((u32)(0x80 << adapter->portnum)),
+                        NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
+                }
+        }
+
         if (netif_running(netdev))
                 netxen_handle_int(adapter, netdev);
 
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 73da611fd536..997c2d0c83bb 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -996,7 +996,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)
 {
   struct net_device *dev = (struct net_device *) dev_id;
   mace_private *lp = netdev_priv(dev);
-  kio_addr_t ioaddr = dev->base_addr;
+  kio_addr_t ioaddr;
   int status;
   int IntrCnt = MACE_MAX_IR_ITERATIONS;
 
@@ -1006,6 +1006,8 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)
     return IRQ_NONE;
   }
 
+  ioaddr = dev->base_addr;
+
   if (lp->tx_irq_disabled) {
     printk(
       (lp->tx_irq_disabled?
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 7912dbd14251..af6728cb49c3 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -1368,6 +1368,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev)
     kio_addr_t ioaddr = dev->base_addr;
     u_short num_pages;
     short time_out, ir;
+    unsigned long flags;
 
     netif_stop_queue(dev);
 
@@ -1395,6 +1396,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev)
     /* A packet is now waiting. */
     smc->packets_waiting++;
 
+    spin_lock_irqsave(&smc->lock, flags);
     SMC_SELECT_BANK(2); /* Paranoia, we should always be in window 2 */
 
     /* need MC_RESET to keep the memory consistent. errata? */
@@ -1411,6 +1413,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev)
             /* Acknowledge the interrupt, send the packet. */
             outw((ir&0xff00) | IM_ALLOC_INT, ioaddr + INTERRUPT);
             smc_hardware_send_packet(dev);      /* Send the packet now.. */
+            spin_unlock_irqrestore(&smc->lock, flags);
             return 0;
         }
     }
@@ -1418,6 +1421,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev)
     /* Otherwise defer until the Tx-space-allocated interrupt. */
     DEBUG(2, "%s: memory allocation deferred.\n", dev->name);
     outw((IM_ALLOC_INT << 8) | (ir & 0xff00), ioaddr + INTERRUPT);
+    spin_unlock_irqrestore(&smc->lock, flags);
 
     return 0;
 }
@@ -1523,6 +1527,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id)
     DEBUG(3, "%s: SMC91c92 interrupt %d at %#x.\n", dev->name,
           irq, ioaddr);
 
+    spin_lock(&smc->lock);
     smc->watchdog = 0;
     saved_bank = inw(ioaddr + BANK_SELECT);
     if ((saved_bank & 0xff00) != 0x3300) {
@@ -1620,6 +1625,7 @@ irq_done:
         readb(smc->base+MEGAHERTZ_ISR);
     }
 #endif
+    spin_unlock(&smc->lock);
     return IRQ_RETVAL(handled);
 }
 
@@ -1902,6 +1908,9 @@ static void media_check(u_long arg)
     kio_addr_t ioaddr = dev->base_addr;
     u_short i, media, saved_bank;
     u_short link;
+    unsigned long flags;
+
+    spin_lock_irqsave(&smc->lock, flags);
 
     saved_bank = inw(ioaddr + BANK_SELECT);
 
@@ -1934,6 +1943,7 @@ static void media_check(u_long arg)
         smc->media.expires = jiffies + HZ/100;
         add_timer(&smc->media);
         SMC_SELECT_BANK(saved_bank);
+        spin_unlock_irqrestore(&smc->lock, flags);
         return;
     }
 
@@ -2007,6 +2017,7 @@ reschedule:
     smc->media.expires = jiffies + HZ;
     add_timer(&smc->media);
     SMC_SELECT_BANK(saved_bank);
+    spin_unlock_irqrestore(&smc->lock, flags);
 }
 
 static int smc_link_ok(struct net_device *dev)
@@ -2094,14 +2105,14 @@ static int smc_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         u16 saved_bank = inw(ioaddr + BANK_SELECT);
         int ret;
 
-        SMC_SELECT_BANK(3);
         spin_lock_irq(&smc->lock);
+        SMC_SELECT_BANK(3);
         if (smc->cfg & CFG_MII_SELECT)
                 ret = mii_ethtool_gset(&smc->mii_if, ecmd);
         else
                 ret = smc_netdev_get_ecmd(dev, ecmd);
-        spin_unlock_irq(&smc->lock);
         SMC_SELECT_BANK(saved_bank);
+        spin_unlock_irq(&smc->lock);
         return ret;
 }
 
@@ -2112,14 +2123,14 @@ static int smc_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         u16 saved_bank = inw(ioaddr + BANK_SELECT);
         int ret;
 
-        SMC_SELECT_BANK(3);
         spin_lock_irq(&smc->lock);
+        SMC_SELECT_BANK(3);
         if (smc->cfg & CFG_MII_SELECT)
                 ret = mii_ethtool_sset(&smc->mii_if, ecmd);
         else
                 ret = smc_netdev_set_ecmd(dev, ecmd);
-        spin_unlock_irq(&smc->lock);
         SMC_SELECT_BANK(saved_bank);
+        spin_unlock_irq(&smc->lock);
         return ret;
 }
 
@@ -2130,11 +2141,11 @@ static u32 smc_get_link(struct net_device *dev)
         u16 saved_bank = inw(ioaddr + BANK_SELECT);
         u32 ret;
 
-        SMC_SELECT_BANK(3);
         spin_lock_irq(&smc->lock);
+        SMC_SELECT_BANK(3);
         ret = smc_link_ok(dev);
-        spin_unlock_irq(&smc->lock);
         SMC_SELECT_BANK(saved_bank);
+        spin_unlock_irq(&smc->lock);
         return ret;
 }
 
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 465485a3fbc6..e6a67531de99 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -1515,7 +1515,6 @@ static const struct ethtool_ops pcnet32_ethtool_ops = {
         .phys_id                = pcnet32_phys_id,
         .get_regs_len           = pcnet32_get_regs_len,
         .get_regs               = pcnet32_get_regs,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 /* only probes for non-PCI devices, the rest are handled by
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 6f98834e6ace..68631a5721ac 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -108,19 +108,24 @@ static inline int cmp_addr(struct pppoe_addr *a, unsigned long sid, char *addr)
                 (memcmp(a->remote,addr,ETH_ALEN) == 0));
 }
 
-static int hash_item(unsigned long sid, unsigned char *addr)
+#if 8%PPPOE_HASH_BITS
+#error 8 must be a multiple of PPPOE_HASH_BITS
+#endif
+
+static int hash_item(unsigned int sid, unsigned char *addr)
 {
-        char hash = 0;
-        int i, j;
+        unsigned char hash = 0;
+        unsigned int i;
 
-        for (i = 0; i < ETH_ALEN ; ++i) {
-                for (j = 0; j < 8/PPPOE_HASH_BITS ; ++j) {
-                        hash ^= addr[i] >> ( j * PPPOE_HASH_BITS );
-                }
+        for (i = 0 ; i < ETH_ALEN ; i++) {
+                hash ^= addr[i];
+        }
+        for (i = 0 ; i < sizeof(sid_t)*8 ; i += 8 ){
+                hash ^= sid>>i;
+        }
+        for (i = 8 ; (i>>=1) >= PPPOE_HASH_BITS ; ) {
+                hash ^= hash>>i;
         }
-
-        for (i = 0; i < (sizeof(unsigned long)*8) / PPPOE_HASH_BITS ; ++i)
-                hash ^= sid >> (i*PPPOE_HASH_BITS);
 
         return hash & ( PPPOE_HASH_SIZE - 1 );
 }
@@ -664,8 +669,8 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd,
 {
         struct sock *sk = sock->sk;
         struct pppox_sock *po = pppox_sk(sk);
-        int val = 0;
-        int err = 0;
+        int val;
+        int err;
 
         switch (cmd) {
         case PPPIOCGMRU:
@@ -754,8 +759,9 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd,
                 err = 0;
                 break;
 
-        default:;
-        };
+        default:
+                err = -ENOTTY;
+        }
 
         return err;
 }
@@ -773,6 +779,7 @@ static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock,
         struct net_device *dev;
         char *start;
 
+        lock_sock(sk);
         if (sock_flag(sk, SOCK_DEAD) || !(sk->sk_state & PPPOX_CONNECTED)) {
                 error = -ENOTCONN;
                 goto end;
@@ -783,8 +790,6 @@ static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock,
         hdr.code = 0;
         hdr.sid = po->num;
 
-        lock_sock(sk);
-
         dev = po->pppoe_dev;
 
         error = -EMSGSIZE;
diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c
index f3e47d0c2b3c..25c52b55c38f 100644
--- a/drivers/net/pppox.c
+++ b/drivers/net/pppox.c
@@ -73,7 +73,7 @@ int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {
         struct sock *sk = sock->sk;
         struct pppox_sock *po = pppox_sk(sk);
-        int rc = 0;
+        int rc;
 
         lock_sock(sk);
 
@@ -94,12 +94,9 @@ int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 break;
         }
         default:
-                if (pppox_protos[sk->sk_protocol]->ioctl)
-                        rc = pppox_protos[sk->sk_protocol]->ioctl(sock, cmd,
-                                                                  arg);
-
-                break;
-        };
+                rc = pppox_protos[sk->sk_protocol]->ioctl ?
+                        pppox_protos[sk->sk_protocol]->ioctl(sock, cmd, arg) : -ENOTTY;
+        }
 
         release_sock(sk);
         return rc;
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 8be8be451ada..69da95b5ad0c 100755
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -1904,7 +1904,6 @@ static void ql_get_pauseparam(struct net_device *ndev,
 static const struct ethtool_ops ql3xxx_ethtool_ops = {
         .get_settings = ql_get_settings,
         .get_drvinfo = ql_get_drvinfo,
-        .get_perm_addr = ethtool_op_get_perm_addr,
         .get_link = ethtool_op_get_link,
         .get_msglevel = ql_get_msglevel,
         .set_msglevel = ql_set_msglevel,
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index bb6896ae3151..c9333b9dd51a 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1066,7 +1066,6 @@ static const struct ethtool_ops rtl8169_ethtool_ops = {
         .get_strings            = rtl8169_get_strings,
         .get_stats_count        = rtl8169_get_stats_count,
         .get_ethtool_stats      = rtl8169_get_ethtool_stats,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 static void rtl8169_write_gmii_reg_bit(void __iomem *ioaddr, int reg,
diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h
index 4cb710bbe729..cfa267914476 100644
--- a/drivers/net/s2io-regs.h
+++ b/drivers/net/s2io-regs.h
@@ -747,10 +747,9 @@ struct XENA_dev_config {
 #define MC_ERR_REG_MIRI_CRI_ERR_1          BIT(23)
 #define MC_ERR_REG_SM_ERR                  BIT(31)
 #define MC_ERR_REG_ECC_ALL_SNG             (BIT(2) | BIT(3) | BIT(4) | BIT(5) |\
-                                            BIT(6) | BIT(7) | BIT(17) | BIT(19))
+                                        BIT(17) | BIT(19))
 #define MC_ERR_REG_ECC_ALL_DBL             (BIT(10) | BIT(11) | BIT(12) |\
-                                            BIT(13) | BIT(14) | BIT(15) |\
-                                            BIT(18) | BIT(20))
+                                        BIT(13) | BIT(18) | BIT(20))
         u64 mc_err_mask;
         u64 mc_err_alarm;
 
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index afef6c0c59fe..2be0a0f1b48f 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -32,12 +32,12 @@
  * rx_ring_sz: This defines the number of receive blocks each ring can have.
  *     This is also an array of size 8.
  * rx_ring_mode: This defines the operation mode of all 8 rings. The valid
- *              values are 1, 2 and 3.
+ *              values are 1, 2.
  * tx_fifo_num: This defines the number of Tx FIFOs thats used int the driver.
  * tx_fifo_len: This too is an array of 8. Each element defines the number of
  * Tx descriptors that can be associated with each corresponding FIFO.
  * intr_type: This defines the type of interrupt. The values can be 0(INTA),
- *     1(MSI), 2(MSI_X). Default value is '0(INTA)'
+ *     2(MSI_X). Default value is '0(INTA)'
  * lro: Specifies whether to enable Large Receive Offload (LRO) or not.
  *     Possible values '1' for enable '0' for disable. Default is '0'
  * lro_max_pkts: This parameter defines maximum number of packets can be
@@ -84,14 +84,14 @@
 #include "s2io.h"
 #include "s2io-regs.h"
 
-#define DRV_VERSION "2.0.23.1"
+#define DRV_VERSION "2.0.25.1"
 
 /* S2io Driver name & version. */
 static char s2io_driver_name[] = "Neterion";
 static char s2io_driver_version[] = DRV_VERSION;
 
-static int rxd_size[4] = {32,48,48,64};
-static int rxd_count[4] = {127,85,85,63};
+static int rxd_size[2] = {32,48};
+static int rxd_count[2] = {127,85};
 
 static inline int RXD_IS_UP2DT(struct RxD_t *rxdp)
 {
@@ -282,6 +282,7 @@ static char ethtool_driver_stats_keys[][ETH_GSTRING_LEN] = {
         ("lro_flush_due_to_max_pkts"),
         ("lro_avg_aggr_pkts"),
         ("mem_alloc_fail_cnt"),
+        ("pci_map_fail_cnt"),
         ("watchdog_timer_cnt"),
         ("mem_allocated"),
         ("mem_freed"),
@@ -426,7 +427,7 @@ S2IO_PARM_INT(bimodal, 0);
 S2IO_PARM_INT(l3l4hdr_size, 128);
 /* Frequency of Rx desc syncs expressed as power of 2 */
 S2IO_PARM_INT(rxsync_frequency, 3);
-/* Interrupt type. Values can be 0(INTA), 1(MSI), 2(MSI_X) */
+/* Interrupt type. Values can be 0(INTA), 2(MSI_X) */
 S2IO_PARM_INT(intr_type, 0);
 /* Large receive offload feature */
 S2IO_PARM_INT(lro, 0);
@@ -701,7 +702,7 @@ static int init_shared_mem(struct s2io_nic *nic)
                             (u64) tmp_p_addr_next;
                 }
         }
-        if (nic->rxd_mode >= RXD_MODE_3A) {
+        if (nic->rxd_mode == RXD_MODE_3B) {
                 /*
                  * Allocation of Storages for buffer addresses in 2BUFF mode
                  * and the buffers as well.
@@ -870,7 +871,7 @@ static void free_shared_mem(struct s2io_nic *nic)
                 }
         }
 
-        if (nic->rxd_mode >= RXD_MODE_3A) {
+        if (nic->rxd_mode == RXD_MODE_3B) {
                 /* Freeing buffer storage addresses in 2BUFF mode. */
                 for (i = 0; i < config->rx_ring_num; i++) {
                         blk_cnt = config->rx_cfg[i].num_rxd /
@@ -2233,44 +2234,6 @@ static void stop_nic(struct s2io_nic *nic)
         writeq(val64, &bar0->adapter_control);
 }
 
-static int fill_rxd_3buf(struct s2io_nic *nic, struct RxD_t *rxdp, struct \
-                                sk_buff *skb)
-{
-        struct net_device *dev = nic->dev;
-        struct sk_buff *frag_list;
-        void *tmp;
-
-        /* Buffer-1 receives L3/L4 headers */
-        ((struct RxD3*)rxdp)->Buffer1_ptr = pci_map_single
-                        (nic->pdev, skb->data, l3l4hdr_size + 4,
-                        PCI_DMA_FROMDEVICE);
-
-        /* skb_shinfo(skb)->frag_list will have L4 data payload */
-        skb_shinfo(skb)->frag_list = dev_alloc_skb(dev->mtu + ALIGN_SIZE);
-        if (skb_shinfo(skb)->frag_list == NULL) {
-                nic->mac_control.stats_info->sw_stat.mem_alloc_fail_cnt++;
-                DBG_PRINT(INFO_DBG, "%s: dev_alloc_skb failed\n ", dev->name);
-                return -ENOMEM ;
-        }
-        frag_list = skb_shinfo(skb)->frag_list;
-        skb->truesize += frag_list->truesize;
-        nic->mac_control.stats_info->sw_stat.mem_allocated 
-                += frag_list->truesize;
-        frag_list->next = NULL;
-        tmp = (void *)ALIGN((long)frag_list->data, ALIGN_SIZE + 1);
-        frag_list->data = tmp;
-        skb_reset_tail_pointer(frag_list);
-
-        /* Buffer-2 receives L4 data payload */
-        ((struct RxD3*)rxdp)->Buffer2_ptr = pci_map_single(nic->pdev,
-                                frag_list->data, dev->mtu,
-                                PCI_DMA_FROMDEVICE);
-        rxdp->Control_2 |= SET_BUFFER1_SIZE_3(l3l4hdr_size + 4);
-        rxdp->Control_2 |= SET_BUFFER2_SIZE_3(dev->mtu);
-
-        return SUCCESS;
-}
-
 /**
  *  fill_rx_buffers - Allocates the Rx side skbs
  *  @nic:  device private variable
@@ -2307,6 +2270,9 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
         unsigned long flags;
         struct RxD_t *first_rxdp = NULL;
         u64 Buffer0_ptr = 0, Buffer1_ptr = 0;
+        struct RxD1 *rxdp1;
+        struct RxD3 *rxdp3;
+        struct swStat *stats = &nic->mac_control.stats_info->sw_stat;
 
         mac_control = &nic->mac_control;
         config = &nic->config;
@@ -2359,7 +2325,7 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
                         (block_no * (rxd_count[nic->rxd_mode] + 1)) + off;
                 }
                 if ((rxdp->Control_1 & RXD_OWN_XENA) &&
-                        ((nic->rxd_mode >= RXD_MODE_3A) &&
+                        ((nic->rxd_mode == RXD_MODE_3B) &&
                                 (rxdp->Control_2 & BIT(0)))) {
                         mac_control->rings[ring_no].rx_curr_put_info.
                                         offset = off;
@@ -2370,10 +2336,8 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
                                 HEADER_802_2_SIZE + HEADER_SNAP_SIZE;
                 if (nic->rxd_mode == RXD_MODE_1)
                         size += NET_IP_ALIGN;
-                else if (nic->rxd_mode == RXD_MODE_3B)
-                        size = dev->mtu + ALIGN_SIZE + BUF0_LEN + 4;
                 else
-                        size = l3l4hdr_size + ALIGN_SIZE + BUF0_LEN + 4;
+                        size = dev->mtu + ALIGN_SIZE + BUF0_LEN + 4;
 
                 /* allocate skb */
                 skb = dev_alloc_skb(size);
@@ -2392,33 +2356,35 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
                         += skb->truesize;
                 if (nic->rxd_mode == RXD_MODE_1) {
                         /* 1 buffer mode - normal operation mode */
+                        rxdp1 = (struct RxD1*)rxdp;
                         memset(rxdp, 0, sizeof(struct RxD1));
                         skb_reserve(skb, NET_IP_ALIGN);
-                        ((struct RxD1*)rxdp)->Buffer0_ptr = pci_map_single
+                        rxdp1->Buffer0_ptr = pci_map_single
                             (nic->pdev, skb->data, size - NET_IP_ALIGN,
                                 PCI_DMA_FROMDEVICE);
+                        if( (rxdp1->Buffer0_ptr == 0) ||
+                                (rxdp1->Buffer0_ptr ==
+                                DMA_ERROR_CODE))
+                                goto pci_map_failed;
+
                         rxdp->Control_2 = 
                                 SET_BUFFER0_SIZE_1(size - NET_IP_ALIGN);
 
-                } else if (nic->rxd_mode >= RXD_MODE_3A) {
+                } else if (nic->rxd_mode == RXD_MODE_3B) {
                         /*
-                         * 2 or 3 buffer mode -
-                         * Both 2 buffer mode and 3 buffer mode provides 128
+                         * 2 buffer mode -
+                         * 2 buffer mode provides 128
                          * byte aligned receive buffers.
-                         *
-                         * 3 buffer mode provides header separation where in
-                         * skb->data will have L3/L4 headers where as
-                         * skb_shinfo(skb)->frag_list will have the L4 data
-                         * payload
                          */
 
+                        rxdp3 = (struct RxD3*)rxdp;
                         /* save buffer pointers to avoid frequent dma mapping */
-                        Buffer0_ptr = ((struct RxD3*)rxdp)->Buffer0_ptr;
-                        Buffer1_ptr = ((struct RxD3*)rxdp)->Buffer1_ptr;
+                        Buffer0_ptr = rxdp3->Buffer0_ptr;
+                        Buffer1_ptr = rxdp3->Buffer1_ptr;
                         memset(rxdp, 0, sizeof(struct RxD3));
                         /* restore the buffer pointers for dma sync*/
-                        ((struct RxD3*)rxdp)->Buffer0_ptr = Buffer0_ptr;
-                        ((struct RxD3*)rxdp)->Buffer1_ptr = Buffer1_ptr;
+                        rxdp3->Buffer0_ptr = Buffer0_ptr;
+                        rxdp3->Buffer1_ptr = Buffer1_ptr;
 
                         ba = &mac_control->rings[ring_no].ba[block_no][off];
                         skb_reserve(skb, BUF0_LEN);
@@ -2428,14 +2394,18 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
                         skb->data = (void *) (unsigned long)tmp;
                         skb_reset_tail_pointer(skb);
 
-                        if (!(((struct RxD3*)rxdp)->Buffer0_ptr))
-                                ((struct RxD3*)rxdp)->Buffer0_ptr =
+                        if (!(rxdp3->Buffer0_ptr))
+                                rxdp3->Buffer0_ptr =
                                    pci_map_single(nic->pdev, ba->ba_0, BUF0_LEN,
                                            PCI_DMA_FROMDEVICE);
                         else
                                 pci_dma_sync_single_for_device(nic->pdev,
-                                (dma_addr_t) ((struct RxD3*)rxdp)->Buffer0_ptr,
+                                (dma_addr_t) rxdp3->Buffer0_ptr,
                                     BUF0_LEN, PCI_DMA_FROMDEVICE);
+                        if( (rxdp3->Buffer0_ptr == 0) ||
+                                (rxdp3->Buffer0_ptr == DMA_ERROR_CODE))
+                                goto pci_map_failed;
+
                         rxdp->Control_2 = SET_BUFFER0_SIZE_3(BUF0_LEN);
                         if (nic->rxd_mode == RXD_MODE_3B) {
                                 /* Two buffer mode */
@@ -2444,33 +2414,30 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
                                  * Buffer2 will have L3/L4 header plus
                                  * L4 payload
                                  */
-                                ((struct RxD3*)rxdp)->Buffer2_ptr = pci_map_single
+                                rxdp3->Buffer2_ptr = pci_map_single
                                 (nic->pdev, skb->data, dev->mtu + 4,
                                                 PCI_DMA_FROMDEVICE);
 
-                                /* Buffer-1 will be dummy buffer. Not used */
-                                if (!(((struct RxD3*)rxdp)->Buffer1_ptr)) {
-                                        ((struct RxD3*)rxdp)->Buffer1_ptr =
+                                if( (rxdp3->Buffer2_ptr == 0) ||
+                                        (rxdp3->Buffer2_ptr == DMA_ERROR_CODE))
+                                        goto pci_map_failed;
+
+                                rxdp3->Buffer1_ptr =
                                                 pci_map_single(nic->pdev,
                                                 ba->ba_1, BUF1_LEN,
                                                 PCI_DMA_FROMDEVICE);
+                                if( (rxdp3->Buffer1_ptr == 0) ||
+                                        (rxdp3->Buffer1_ptr == DMA_ERROR_CODE)) {
+                                        pci_unmap_single
+                                                (nic->pdev,
+                                                (dma_addr_t)skb->data,
+                                                dev->mtu + 4,
+                                                PCI_DMA_FROMDEVICE);
+                                        goto pci_map_failed;
                                 }
                                 rxdp->Control_2 |= SET_BUFFER1_SIZE_3(1);
                                 rxdp->Control_2 |= SET_BUFFER2_SIZE_3
                                                                 (dev->mtu + 4);
-                        } else {
-                                /* 3 buffer mode */
-                                if (fill_rxd_3buf(nic, rxdp, skb) == -ENOMEM) {
-                                        nic->mac_control.stats_info->sw_stat.\
-                                        mem_freed += skb->truesize;
-                                        dev_kfree_skb_irq(skb);
-                                        if (first_rxdp) {
-                                                wmb();
-                                                first_rxdp->Control_1 |=
-                                                        RXD_OWN_XENA;
-                                        }
-                                        return -ENOMEM ;
-                                }
                         }
                         rxdp->Control_2 |= BIT(0);
                 }
@@ -2505,6 +2472,11 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
         }
 
         return SUCCESS;
+pci_map_failed:
+        stats->pci_map_fail_cnt++;
+        stats->mem_freed += skb->truesize;
+        dev_kfree_skb_irq(skb);
+        return -ENOMEM;
 }
 
 static void free_rxd_blk(struct s2io_nic *sp, int ring_no, int blk)
@@ -2515,6 +2487,8 @@ static void free_rxd_blk(struct s2io_nic *sp, int ring_no, int blk)
         struct RxD_t *rxdp;
         struct mac_info *mac_control;
         struct buffAdd *ba;
+        struct RxD1 *rxdp1;
+        struct RxD3 *rxdp3;
 
         mac_control = &sp->mac_control;
         for (j = 0 ; j < rxd_count[sp->rxd_mode]; j++) {
@@ -2526,40 +2500,30 @@ static void free_rxd_blk(struct s2io_nic *sp, int ring_no, int blk)
                         continue;
                 }
                 if (sp->rxd_mode == RXD_MODE_1) {
+                        rxdp1 = (struct RxD1*)rxdp;
                         pci_unmap_single(sp->pdev, (dma_addr_t)
-                                 ((struct RxD1*)rxdp)->Buffer0_ptr,
-                                 dev->mtu +
-                                 HEADER_ETHERNET_II_802_3_SIZE
-                                 + HEADER_802_2_SIZE +
-                                 HEADER_SNAP_SIZE,
-                                 PCI_DMA_FROMDEVICE);
+                                rxdp1->Buffer0_ptr,
+                                dev->mtu +
+                                HEADER_ETHERNET_II_802_3_SIZE
+                                + HEADER_802_2_SIZE +
+                                HEADER_SNAP_SIZE,
+                                PCI_DMA_FROMDEVICE);
                         memset(rxdp, 0, sizeof(struct RxD1));
                 } else if(sp->rxd_mode == RXD_MODE_3B) {
+                        rxdp3 = (struct RxD3*)rxdp;
                         ba = &mac_control->rings[ring_no].
                                 ba[blk][j];
                         pci_unmap_single(sp->pdev, (dma_addr_t)
-                                 ((struct RxD3*)rxdp)->Buffer0_ptr,
-                                 BUF0_LEN,
-                                 PCI_DMA_FROMDEVICE);
-                        pci_unmap_single(sp->pdev, (dma_addr_t)
-                                 ((struct RxD3*)rxdp)->Buffer1_ptr,
-                                 BUF1_LEN,
-                                 PCI_DMA_FROMDEVICE);
-                        pci_unmap_single(sp->pdev, (dma_addr_t)
-                                 ((struct RxD3*)rxdp)->Buffer2_ptr,
-                                 dev->mtu + 4,
-                                 PCI_DMA_FROMDEVICE);
-                        memset(rxdp, 0, sizeof(struct RxD3));
-                } else {
-                        pci_unmap_single(sp->pdev, (dma_addr_t)
-                                ((struct RxD3*)rxdp)->Buffer0_ptr, BUF0_LEN,
+                                rxdp3->Buffer0_ptr,
+                                BUF0_LEN,
                                 PCI_DMA_FROMDEVICE);
                         pci_unmap_single(sp->pdev, (dma_addr_t)
-                                ((struct RxD3*)rxdp)->Buffer1_ptr,
-                                l3l4hdr_size + 4,
+                                rxdp3->Buffer1_ptr,
+                                BUF1_LEN,
                                 PCI_DMA_FROMDEVICE);
                         pci_unmap_single(sp->pdev, (dma_addr_t)
-                                ((struct RxD3*)rxdp)->Buffer2_ptr, dev->mtu,
+                                rxdp3->Buffer2_ptr,
+                                dev->mtu + 4,
                                 PCI_DMA_FROMDEVICE);
                         memset(rxdp, 0, sizeof(struct RxD3));
                 }
@@ -2756,6 +2720,8 @@ static void rx_intr_handler(struct ring_info *ring_data)
         struct sk_buff *skb;
         int pkt_cnt = 0;
         int i;
+        struct RxD1* rxdp1;
+        struct RxD3* rxdp3;
 
         spin_lock(&nic->rx_lock);
         if (atomic_read(&nic->card_state) == CARD_DOWN) {
@@ -2796,32 +2762,23 @@ static void rx_intr_handler(struct ring_info *ring_data)
                         return;
                 }
                 if (nic->rxd_mode == RXD_MODE_1) {
+                        rxdp1 = (struct RxD1*)rxdp;
                         pci_unmap_single(nic->pdev, (dma_addr_t)
-                                 ((struct RxD1*)rxdp)->Buffer0_ptr,
-                                 dev->mtu +
-                                 HEADER_ETHERNET_II_802_3_SIZE +
-                                 HEADER_802_2_SIZE +
-                                 HEADER_SNAP_SIZE,
-                                 PCI_DMA_FROMDEVICE);
+                                rxdp1->Buffer0_ptr,
+                                dev->mtu +
+                                HEADER_ETHERNET_II_802_3_SIZE +
+                                HEADER_802_2_SIZE +
+                                HEADER_SNAP_SIZE,
+                                PCI_DMA_FROMDEVICE);
                 } else if (nic->rxd_mode == RXD_MODE_3B) {
+                        rxdp3 = (struct RxD3*)rxdp;
                         pci_dma_sync_single_for_cpu(nic->pdev, (dma_addr_t)
-                                 ((struct RxD3*)rxdp)->Buffer0_ptr,
-                                 BUF0_LEN, PCI_DMA_FROMDEVICE);
-                        pci_unmap_single(nic->pdev, (dma_addr_t)
-                                 ((struct RxD3*)rxdp)->Buffer2_ptr,
-                                 dev->mtu + 4,
-                                 PCI_DMA_FROMDEVICE);
-                } else {
-                        pci_dma_sync_single_for_cpu(nic->pdev, (dma_addr_t)
-                                         ((struct RxD3*)rxdp)->Buffer0_ptr, BUF0_LEN,
-                                         PCI_DMA_FROMDEVICE);
-                        pci_unmap_single(nic->pdev, (dma_addr_t)
-                                         ((struct RxD3*)rxdp)->Buffer1_ptr,
-                                         l3l4hdr_size + 4,
-                                         PCI_DMA_FROMDEVICE);
+                                rxdp3->Buffer0_ptr,
+                                BUF0_LEN, PCI_DMA_FROMDEVICE);
                         pci_unmap_single(nic->pdev, (dma_addr_t)
-                                         ((struct RxD3*)rxdp)->Buffer2_ptr,
-                                         dev->mtu, PCI_DMA_FROMDEVICE);
+                                rxdp3->Buffer2_ptr,
+                                dev->mtu + 4,
+                                PCI_DMA_FROMDEVICE);
                 }
                 prefetch(skb->data);
                 rx_osm_handler(ring_data, rxdp);
@@ -3425,23 +3382,8 @@ static void s2io_reset(struct s2io_nic * sp)
         /* Back up  the PCI-X CMD reg, dont want to lose MMRBC, OST settings */
         pci_read_config_word(sp->pdev, PCIX_COMMAND_REGISTER, &(pci_cmd));
 
-        if (sp->device_type == XFRAME_II_DEVICE) {
-                int ret;
-                ret = pci_set_power_state(sp->pdev, 3);
-                if (!ret)
-                        ret = pci_set_power_state(sp->pdev, 0);
-                else {
-                        DBG_PRINT(ERR_DBG,"%s PME based SW_Reset failed!\n",
-                                        __FUNCTION__);
-                        goto old_way;
-                }
-                msleep(20);
-                goto new_way;
-        }
-old_way:
         val64 = SW_RESET_ALL;
         writeq(val64, &bar0->sw_reset);
-new_way:
         if (strstr(sp->product_name, "CX4")) {
                 msleep(750);
         }
@@ -3731,56 +3673,6 @@ static void store_xmsi_data(struct s2io_nic *nic)
         }
 }
 
-int s2io_enable_msi(struct s2io_nic *nic)
-{
-        struct XENA_dev_config __iomem *bar0 = nic->bar0;
-        u16 msi_ctrl, msg_val;
-        struct config_param *config = &nic->config;
-        struct net_device *dev = nic->dev;
-        u64 val64, tx_mat, rx_mat;
-        int i, err;
-
-        val64 = readq(&bar0->pic_control);
-        val64 &= ~BIT(1);
-        writeq(val64, &bar0->pic_control);
-
-        err = pci_enable_msi(nic->pdev);
-        if (err) {
-                DBG_PRINT(ERR_DBG, "%s: enabling MSI failed\n",
-                          nic->dev->name);
-                return err;
-        }
-
-        /*
-         * Enable MSI and use MSI-1 in stead of the standard MSI-0
-         * for interrupt handling.
-         */
-        pci_read_config_word(nic->pdev, 0x4c, &msg_val);
-        msg_val ^= 0x1;
-        pci_write_config_word(nic->pdev, 0x4c, msg_val);
-        pci_read_config_word(nic->pdev, 0x4c, &msg_val);
-
-        pci_read_config_word(nic->pdev, 0x42, &msi_ctrl);
-        msi_ctrl |= 0x10;
-        pci_write_config_word(nic->pdev, 0x42, msi_ctrl);
-
-        /* program MSI-1 into all usable Tx_Mat and Rx_Mat fields */
-        tx_mat = readq(&bar0->tx_mat0_n[0]);
-        for (i=0; i<config->tx_fifo_num; i++) {
-                tx_mat |= TX_MAT_SET(i, 1);
-        }
-        writeq(tx_mat, &bar0->tx_mat0_n[0]);
-
-        rx_mat = readq(&bar0->rx_mat);
-        for (i=0; i<config->rx_ring_num; i++) {
-                rx_mat |= RX_MAT_SET(i, 1);
-        }
-        writeq(rx_mat, &bar0->rx_mat);
-
-        dev->irq = nic->pdev->irq;
-        return 0;
-}
-
 static int s2io_enable_msi_x(struct s2io_nic *nic)
 {
         struct XENA_dev_config __iomem *bar0 = nic->bar0;
@@ -4001,6 +3893,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
         struct mac_info *mac_control;
         struct config_param *config;
         int offload_type;
+        struct swStat *stats = &sp->mac_control.stats_info->sw_stat;
 
         mac_control = &sp->mac_control;
         config = &sp->config;
@@ -4085,11 +3978,18 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                 txdp->Buffer_Pointer = pci_map_single(sp->pdev,
                                         sp->ufo_in_band_v,
                                         sizeof(u64), PCI_DMA_TODEVICE);
+                if((txdp->Buffer_Pointer == 0) ||
+                        (txdp->Buffer_Pointer == DMA_ERROR_CODE))
+                        goto pci_map_failed;
                 txdp++;
         }
 
         txdp->Buffer_Pointer = pci_map_single
             (sp->pdev, skb->data, frg_len, PCI_DMA_TODEVICE);
+        if((txdp->Buffer_Pointer == 0) ||
+                (txdp->Buffer_Pointer == DMA_ERROR_CODE))
+                goto pci_map_failed;
+
         txdp->Host_Control = (unsigned long) skb;
         txdp->Control_1 |= TXD_BUFFER0_SIZE(frg_len);
         if (offload_type == SKB_GSO_UDP)
@@ -4146,6 +4046,13 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
         spin_unlock_irqrestore(&sp->tx_lock, flags);
 
         return 0;
+pci_map_failed:
+        stats->pci_map_fail_cnt++;
+        netif_stop_queue(dev);
+        stats->mem_freed += skb->truesize;
+        dev_kfree_skb(skb);
+        spin_unlock_irqrestore(&sp->tx_lock, flags);
+        return 0;
 }
 
 static void
@@ -4186,39 +4093,6 @@ static int s2io_chk_rx_buffers(struct s2io_nic *sp, int rng_n)
         return 0;
 }
 
-static irqreturn_t s2io_msi_handle(int irq, void *dev_id)
-{
-        struct net_device *dev = (struct net_device *) dev_id;
-        struct s2io_nic *sp = dev->priv;
-        int i;
-        struct mac_info *mac_control;
-        struct config_param *config;
-
-        atomic_inc(&sp->isr_cnt);
-        mac_control = &sp->mac_control;
-        config = &sp->config;
-        DBG_PRINT(INTR_DBG, "%s: MSI handler\n", __FUNCTION__);
-
-        /* If Intr is because of Rx Traffic */
-        for (i = 0; i < config->rx_ring_num; i++)
-                rx_intr_handler(&mac_control->rings[i]);
-
-        /* If Intr is because of Tx Traffic */
-        for (i = 0; i < config->tx_fifo_num; i++)
-                tx_intr_handler(&mac_control->fifos[i]);
-
-        /*
-         * If the Rx buffer count is below the panic threshold then
-         * reallocate the buffers from the interrupt handler itself,
-         * else schedule a tasklet to reallocate the buffers.
-         */
-        for (i = 0; i < config->rx_ring_num; i++)
-                s2io_chk_rx_buffers(sp, i);
-
-        atomic_dec(&sp->isr_cnt);
-        return IRQ_HANDLED;
-}
-
 static irqreturn_t s2io_msix_ring_handle(int irq, void *dev_id)
 {
         struct ring_info *ring = (struct ring_info *)dev_id;
@@ -4927,19 +4801,17 @@ static void s2io_ethtool_gringparam(struct net_device *dev,
                 ering->rx_max_pending = MAX_RX_DESC_1;
         else if (sp->rxd_mode == RXD_MODE_3B)
                 ering->rx_max_pending = MAX_RX_DESC_2;
-        else if (sp->rxd_mode == RXD_MODE_3A)
-                ering->rx_max_pending = MAX_RX_DESC_3;
 
         ering->tx_max_pending = MAX_TX_DESC;
-        for (i = 0 ; i < sp->config.tx_fifo_num ; i++) {
+        for (i = 0 ; i < sp->config.tx_fifo_num ; i++) 
                 tx_desc_count += sp->config.tx_cfg[i].fifo_len;
-        }
+        
         DBG_PRINT(INFO_DBG,"\nmax txds : %d\n",sp->config.max_txds);
         ering->tx_pending = tx_desc_count;
         rx_desc_count = 0;
-        for (i = 0 ; i < sp->config.rx_ring_num ; i++) {
+        for (i = 0 ; i < sp->config.rx_ring_num ; i++) 
                 rx_desc_count += sp->config.rx_cfg[i].num_rxd;
-        }
+
         ering->rx_pending = rx_desc_count;
 
         ering->rx_mini_max_pending = 0;
@@ -5923,6 +5795,7 @@ static void s2io_get_ethtool_stats(struct net_device *dev,
         else
                 tmp_stats[i++] = 0;
         tmp_stats[i++] = stat_info->sw_stat.mem_alloc_fail_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.pci_map_fail_cnt;
         tmp_stats[i++] = stat_info->sw_stat.watchdog_timer_cnt;
         tmp_stats[i++] = stat_info->sw_stat.mem_allocated;
         tmp_stats[i++] = stat_info->sw_stat.mem_freed;
@@ -6266,9 +6139,10 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                                 u64 *temp2, int size)
 {
         struct net_device *dev = sp->dev;
-        struct sk_buff *frag_list;
+        struct swStat *stats = &sp->mac_control.stats_info->sw_stat;
 
         if ((sp->rxd_mode == RXD_MODE_1) && (rxdp->Host_Control == 0)) {
+                struct RxD1 *rxdp1 = (struct RxD1 *)rxdp;
                 /* allocate skb */
                 if (*skb) {
                         DBG_PRINT(INFO_DBG, "SKB is not NULL\n");
@@ -6277,7 +6151,7 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                          * using same mapped address for the Rxd
                          * buffer pointer
                          */
-                        ((struct RxD1*)rxdp)->Buffer0_ptr = *temp0;
+                        rxdp1->Buffer0_ptr = *temp0;
                 } else {
                         *skb = dev_alloc_skb(size);
                         if (!(*skb)) {
@@ -6294,18 +6168,23 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                          * such it will be used for next rxd whose
                          * Host Control is NULL
                          */
-                        ((struct RxD1*)rxdp)->Buffer0_ptr = *temp0 =
+                        rxdp1->Buffer0_ptr = *temp0 =
                                 pci_map_single( sp->pdev, (*skb)->data,
                                         size - NET_IP_ALIGN,
                                         PCI_DMA_FROMDEVICE);
+                        if( (rxdp1->Buffer0_ptr == 0) ||
+                                (rxdp1->Buffer0_ptr == DMA_ERROR_CODE)) {
+                                goto memalloc_failed;
+                        }
                         rxdp->Host_Control = (unsigned long) (*skb);
                 }
         } else if ((sp->rxd_mode == RXD_MODE_3B) && (rxdp->Host_Control == 0)) {
+                struct RxD3 *rxdp3 = (struct RxD3 *)rxdp;
                 /* Two buffer Mode */
                 if (*skb) {
-                        ((struct RxD3*)rxdp)->Buffer2_ptr = *temp2;
-                        ((struct RxD3*)rxdp)->Buffer0_ptr = *temp0;
-                        ((struct RxD3*)rxdp)->Buffer1_ptr = *temp1;
+                        rxdp3->Buffer2_ptr = *temp2;
+                        rxdp3->Buffer0_ptr = *temp0;
+                        rxdp3->Buffer1_ptr = *temp1;
                 } else {
                         *skb = dev_alloc_skb(size);
                         if (!(*skb)) {
@@ -6318,73 +6197,47 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                         }
                         sp->mac_control.stats_info->sw_stat.mem_allocated 
                                 += (*skb)->truesize;
-                        ((struct RxD3*)rxdp)->Buffer2_ptr = *temp2 =
+                        rxdp3->Buffer2_ptr = *temp2 =
                                 pci_map_single(sp->pdev, (*skb)->data,
                                                dev->mtu + 4,
                                                PCI_DMA_FROMDEVICE);
-                        ((struct RxD3*)rxdp)->Buffer0_ptr = *temp0 =
+                        if( (rxdp3->Buffer2_ptr == 0) ||
+                                (rxdp3->Buffer2_ptr == DMA_ERROR_CODE)) {
+                                goto memalloc_failed;
+                        }
+                        rxdp3->Buffer0_ptr = *temp0 =
                                 pci_map_single( sp->pdev, ba->ba_0, BUF0_LEN,
                                                 PCI_DMA_FROMDEVICE);
+                        if( (rxdp3->Buffer0_ptr == 0) ||
+                                (rxdp3->Buffer0_ptr == DMA_ERROR_CODE)) {
+                                pci_unmap_single (sp->pdev,
+                                        (dma_addr_t)(*skb)->data,
+                                        dev->mtu + 4, PCI_DMA_FROMDEVICE);
+                                goto memalloc_failed;
+                        }
                         rxdp->Host_Control = (unsigned long) (*skb);
 
                         /* Buffer-1 will be dummy buffer not used */
-                        ((struct RxD3*)rxdp)->Buffer1_ptr = *temp1 =
+                        rxdp3->Buffer1_ptr = *temp1 =
                                 pci_map_single(sp->pdev, ba->ba_1, BUF1_LEN,
-                                               PCI_DMA_FROMDEVICE);
-                }
-        } else if ((rxdp->Host_Control == 0)) {
-                /* Three buffer mode */
-                if (*skb) {
-                        ((struct RxD3*)rxdp)->Buffer0_ptr = *temp0;
-                        ((struct RxD3*)rxdp)->Buffer1_ptr = *temp1;
-                        ((struct RxD3*)rxdp)->Buffer2_ptr = *temp2;
-                } else {
-                        *skb = dev_alloc_skb(size);
-                        if (!(*skb)) {
-                                DBG_PRINT(INFO_DBG, "%s: Out of ", dev->name);
-                                DBG_PRINT(INFO_DBG, "memory to allocate ");
-                                DBG_PRINT(INFO_DBG, "3 buf mode SKBs\n");
-                                sp->mac_control.stats_info->sw_stat. \
-                                        mem_alloc_fail_cnt++;
-                                return -ENOMEM;
-                        }
-                        sp->mac_control.stats_info->sw_stat.mem_allocated 
-                                += (*skb)->truesize;
-                        ((struct RxD3*)rxdp)->Buffer0_ptr = *temp0 =
-                                pci_map_single(sp->pdev, ba->ba_0, BUF0_LEN,
-                                               PCI_DMA_FROMDEVICE);
-                        /* Buffer-1 receives L3/L4 headers */
-                        ((struct RxD3*)rxdp)->Buffer1_ptr = *temp1 =
-                                pci_map_single( sp->pdev, (*skb)->data,
-                                                l3l4hdr_size + 4,
                                                 PCI_DMA_FROMDEVICE);
-                        /*
-                         * skb_shinfo(skb)->frag_list will have L4
-                         * data payload
-                         */
-                        skb_shinfo(*skb)->frag_list = dev_alloc_skb(dev->mtu +
-                                                                   ALIGN_SIZE);
-                        if (skb_shinfo(*skb)->frag_list == NULL) {
-                                DBG_PRINT(ERR_DBG, "%s: dev_alloc_skb \
-                                          failed\n ", dev->name);
-                                sp->mac_control.stats_info->sw_stat. \
-                                        mem_alloc_fail_cnt++;
-                                return -ENOMEM ;
+                        if( (rxdp3->Buffer1_ptr == 0) ||
+                                (rxdp3->Buffer1_ptr == DMA_ERROR_CODE)) {
+                                pci_unmap_single (sp->pdev,
+                                        (dma_addr_t)(*skb)->data,
+                                        dev->mtu + 4, PCI_DMA_FROMDEVICE);
+                                goto memalloc_failed;
                         }
-                        frag_list = skb_shinfo(*skb)->frag_list;
-                        frag_list->next = NULL;
-                        sp->mac_control.stats_info->sw_stat.mem_allocated 
-                                += frag_list->truesize;
-                        /*
-                         * Buffer-2 receives L4 data payload
-                         */
-                        ((struct RxD3*)rxdp)->Buffer2_ptr = *temp2 =
-                                pci_map_single( sp->pdev, frag_list->data,
-                                                dev->mtu, PCI_DMA_FROMDEVICE);
                 }
         }
         return 0;
+        memalloc_failed:
+                stats->pci_map_fail_cnt++;
+                stats->mem_freed += (*skb)->truesize;
+                dev_kfree_skb(*skb);
+                return -ENOMEM;
 }
+
 static void set_rxd_buffer_size(struct s2io_nic *sp, struct RxD_t *rxdp,
                                 int size)
 {
@@ -6395,10 +6248,6 @@ static void set_rxd_buffer_size(struct s2io_nic *sp, struct RxD_t *rxdp,
                 rxdp->Control_2 = SET_BUFFER0_SIZE_3(BUF0_LEN);
                 rxdp->Control_2 |= SET_BUFFER1_SIZE_3(1);
                 rxdp->Control_2 |= SET_BUFFER2_SIZE_3( dev->mtu + 4);
-        } else {
-                rxdp->Control_2 = SET_BUFFER0_SIZE_3(BUF0_LEN);
-                rxdp->Control_2 |= SET_BUFFER1_SIZE_3(l3l4hdr_size + 4);
-                rxdp->Control_2 |= SET_BUFFER2_SIZE_3(dev->mtu);
         }
 }
 
@@ -6420,8 +6269,6 @@ static  int rxd_owner_bit_reset(struct s2io_nic *sp)
                 size += NET_IP_ALIGN;
         else if (sp->rxd_mode == RXD_MODE_3B)
                 size = dev->mtu + ALIGN_SIZE + BUF0_LEN + 4;
-        else
-                size = l3l4hdr_size + ALIGN_SIZE + BUF0_LEN + 4;
 
         for (i = 0; i < config->rx_ring_num; i++) {
                 blk_cnt = config->rx_cfg[i].num_rxd /
@@ -6431,7 +6278,7 @@ static  int rxd_owner_bit_reset(struct s2io_nic *sp)
                         for (k = 0; k < rxd_count[sp->rxd_mode]; k++) {
                                 rxdp = mac_control->rings[i].
                                         rx_blocks[j].rxds[k].virt_addr;
-                                if(sp->rxd_mode >= RXD_MODE_3A)
+                                if(sp->rxd_mode == RXD_MODE_3B)
                                         ba = &mac_control->rings[i].ba[j][k];
                                 if (set_rxd_buffer_pointer(sp, rxdp, ba,
                                                        &skb,(u64 *)&temp0_64,
@@ -6458,9 +6305,7 @@ static int s2io_add_isr(struct s2io_nic * sp)
         struct net_device *dev = sp->dev;
         int err = 0;
 
-        if (sp->intr_type == MSI)
-                ret = s2io_enable_msi(sp);
-        else if (sp->intr_type == MSI_X)
+        if (sp->intr_type == MSI_X)
                 ret = s2io_enable_msi_x(sp);
         if (ret) {
                 DBG_PRINT(ERR_DBG, "%s: Defaulting to INTA\n", dev->name);
@@ -6471,16 +6316,6 @@ static int s2io_add_isr(struct s2io_nic * sp)
         store_xmsi_data(sp);
 
         /* After proper initialization of H/W, register ISR */
-        if (sp->intr_type == MSI) {
-                err = request_irq((int) sp->pdev->irq, s2io_msi_handle,
-                        IRQF_SHARED, sp->name, dev);
-                if (err) {
-                        pci_disable_msi(sp->pdev);
-                        DBG_PRINT(ERR_DBG, "%s: MSI registration failed\n",
-                                  dev->name);
-                        return -1;
-                }
-        }
         if (sp->intr_type == MSI_X) {
                 int i, msix_tx_cnt=0,msix_rx_cnt=0;
 
@@ -6567,14 +6402,6 @@ static void s2io_rem_isr(struct s2io_nic * sp)
                 pci_disable_msix(sp->pdev);
         } else {
                 free_irq(sp->pdev->irq, dev);
-                if (sp->intr_type == MSI) {
-                        u16 val;
-
-                        pci_disable_msi(sp->pdev);
-                        pci_read_config_word(sp->pdev, 0x4c, &val);
-                        val ^= 0x1;
-                        pci_write_config_word(sp->pdev, 0x4c, val);
-                }
         }
         /* Waiting till all Interrupt handlers are complete */
         cnt = 0;
@@ -6907,6 +6734,7 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
         }
 
         /* Updating statistics */
+        sp->stats.rx_packets++;
         rxdp->Host_Control = 0;
         if (sp->rxd_mode == RXD_MODE_1) {
                 int len = RXD_GET_BUFFER0_SIZE_1(rxdp->Control_2);
@@ -6914,7 +6742,7 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
                 sp->stats.rx_bytes += len;
                 skb_put(skb, len);
 
-        } else if (sp->rxd_mode >= RXD_MODE_3A) {
+        } else if (sp->rxd_mode == RXD_MODE_3B) {
                 int get_block = ring_data->rx_curr_get_info.block_index;
                 int get_off = ring_data->rx_curr_get_info.offset;
                 int buf0_len = RXD_GET_BUFFER0_SIZE_3(rxdp->Control_2);
@@ -6924,18 +6752,7 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
                 struct buffAdd *ba = &ring_data->ba[get_block][get_off];
                 sp->stats.rx_bytes += buf0_len + buf2_len;
                 memcpy(buff, ba->ba_0, buf0_len);
-
-                if (sp->rxd_mode == RXD_MODE_3A) {
-                        int buf1_len = RXD_GET_BUFFER1_SIZE_3(rxdp->Control_2);
-
-                        skb_put(skb, buf1_len);
-                        skb->len += buf2_len;
-                        skb->data_len += buf2_len;
-                        skb_put(skb_shinfo(skb)->frag_list, buf2_len);
-                        sp->stats.rx_bytes += buf1_len;
-
-                } else
-                        skb_put(skb, buf2_len);
+                skb_put(skb, buf2_len);
         }
 
         if ((rxdp->Control_1 & TCP_OR_UDP_FRAME) && ((!sp->lro) ||
@@ -7131,7 +6948,7 @@ static int s2io_verify_parm(struct pci_dev *pdev, u8 *dev_intr_type)
                 *dev_intr_type = INTA;
         }
 #else
-        if (*dev_intr_type > MSI_X) {
+        if ((*dev_intr_type != INTA) && (*dev_intr_type != MSI_X)) {
                 DBG_PRINT(ERR_DBG, "s2io: Wrong intr_type requested. "
                           "Defaulting to INTA\n");
                 *dev_intr_type = INTA;
@@ -7145,10 +6962,10 @@ static int s2io_verify_parm(struct pci_dev *pdev, u8 *dev_intr_type)
                 *dev_intr_type = INTA;
         }
 
-        if (rx_ring_mode > 3) {
+        if ((rx_ring_mode != 1) && (rx_ring_mode != 2)) {
                 DBG_PRINT(ERR_DBG, "s2io: Requested ring mode not supported\n");
-                DBG_PRINT(ERR_DBG, "s2io: Defaulting to 3-buffer mode\n");
-                rx_ring_mode = 3;
+                DBG_PRINT(ERR_DBG, "s2io: Defaulting to 1-buffer mode\n");
+                rx_ring_mode = 1;
         }
         return SUCCESS;
 }
@@ -7240,28 +7057,10 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                 pci_disable_device(pdev);
                 return -ENOMEM;
         }
-        if (dev_intr_type != MSI_X) {
-                if (pci_request_regions(pdev, s2io_driver_name)) {
-                        DBG_PRINT(ERR_DBG, "Request Regions failed\n");
-                        pci_disable_device(pdev);
-                        return -ENODEV;
-                }
-        }
-        else {
-                if (!(request_mem_region(pci_resource_start(pdev, 0),
-                         pci_resource_len(pdev, 0), s2io_driver_name))) {
-                        DBG_PRINT(ERR_DBG, "bar0 Request Regions failed\n");
-                        pci_disable_device(pdev);
-                        return -ENODEV;
-                }
-                if (!(request_mem_region(pci_resource_start(pdev, 2),
-                         pci_resource_len(pdev, 2), s2io_driver_name))) {
-                        DBG_PRINT(ERR_DBG, "bar1 Request Regions failed\n");
-                        release_mem_region(pci_resource_start(pdev, 0),
-                                   pci_resource_len(pdev, 0));
-                        pci_disable_device(pdev);
-                        return -ENODEV;
-                }
+        if ((ret = pci_request_regions(pdev, s2io_driver_name))) {
+                DBG_PRINT(ERR_DBG, "%s: Request Regions failed - %x \n", __FUNCTION__, ret);
+                pci_disable_device(pdev);
+                return -ENODEV;
         }
 
         dev = alloc_etherdev(sizeof(struct s2io_nic));
@@ -7288,8 +7087,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                 sp->rxd_mode = RXD_MODE_1;
         if (rx_ring_mode == 2)
                 sp->rxd_mode = RXD_MODE_3B;
-        if (rx_ring_mode == 3)
-                sp->rxd_mode = RXD_MODE_3A;
 
         sp->intr_type = dev_intr_type;
 
@@ -7565,10 +7362,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                     DBG_PRINT(ERR_DBG, "%s: 2-Buffer receive mode enabled\n",
                                                 dev->name);
                     break;
-                case RXD_MODE_3A:
-                    DBG_PRINT(ERR_DBG, "%s: 3-Buffer receive mode enabled\n",
-                                                dev->name);
-                    break;
         }
 
         if (napi)
@@ -7577,9 +7370,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                 case INTA:
                     DBG_PRINT(ERR_DBG, "%s: Interrupt type INTA\n", dev->name);
                     break;
-                case MSI:
-                    DBG_PRINT(ERR_DBG, "%s: Interrupt type MSI\n", dev->name);
-                    break;
                 case MSI_X:
                     DBG_PRINT(ERR_DBG, "%s: Interrupt type MSI-X\n", dev->name);
                     break;
@@ -7619,14 +7409,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
       mem_alloc_failed:
         free_shared_mem(sp);
         pci_disable_device(pdev);
-        if (dev_intr_type != MSI_X)
-                pci_release_regions(pdev);
-        else {
-                release_mem_region(pci_resource_start(pdev, 0),
-                        pci_resource_len(pdev, 0));
-                release_mem_region(pci_resource_start(pdev, 2),
-                        pci_resource_len(pdev, 2));
-        }
+        pci_release_regions(pdev);
         pci_set_drvdata(pdev, NULL);
         free_netdev(dev);
 
@@ -7661,14 +7444,7 @@ static void __devexit s2io_rem_nic(struct pci_dev *pdev)
         free_shared_mem(sp);
         iounmap(sp->bar0);
         iounmap(sp->bar1);
-        if (sp->intr_type != MSI_X)
-                pci_release_regions(pdev);
-        else {
-                release_mem_region(pci_resource_start(pdev, 0),
-                        pci_resource_len(pdev, 0));
-                release_mem_region(pci_resource_start(pdev, 2),
-                        pci_resource_len(pdev, 2));
-        }
+        pci_release_regions(pdev);
         pci_set_drvdata(pdev, NULL);
         free_netdev(dev);
         pci_disable_device(pdev);
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 3887fe63a908..92983ee7df8c 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -74,6 +74,10 @@ static int debug_level = ERR_DBG;
 /* DEBUG message print. */
 #define DBG_PRINT(dbg_level, args...)  if(!(debug_level<dbg_level)) printk(args)
 
+#ifndef DMA_ERROR_CODE
+#define DMA_ERROR_CODE          (~(dma_addr_t)0x0)
+#endif
+
 /* Protocol assist features of the NIC */
 #define L3_CKSUM_OK 0xFFFF
 #define L4_CKSUM_OK 0xFFFF
@@ -97,6 +101,7 @@ struct swStat {
         unsigned long long num_aggregations;
         /* Other statistics */
         unsigned long long mem_alloc_fail_cnt;
+        unsigned long long pci_map_fail_cnt;
         unsigned long long watchdog_timer_cnt;
         unsigned long long mem_allocated;
         unsigned long long mem_freed;
@@ -575,8 +580,7 @@ struct RxD_block {
 #define SIZE_OF_BLOCK   4096
 
 #define RXD_MODE_1      0 /* One Buffer mode */
-#define RXD_MODE_3A     1 /* Three Buffer mode */
-#define RXD_MODE_3B     2 /* Two Buffer mode */
+#define RXD_MODE_3B     1 /* Two Buffer mode */
 
 /* Structure to hold virtual addresses of Buf0 and Buf1 in
  * 2buf mode. */
@@ -876,7 +880,6 @@ struct s2io_nic {
         u16             lro_max_aggr_per_sess;
 
 #define INTA    0
-#define MSI     1
 #define MSI_X   2
         u8 intr_type;
 
@@ -1020,8 +1023,6 @@ static int s2io_poll(struct net_device *dev, int *budget);
 static void s2io_init_pci(struct s2io_nic * sp);
 static int s2io_set_mac_addr(struct net_device *dev, u8 * addr);
 static void s2io_alarm_handle(unsigned long data);
-static int s2io_enable_msi(struct s2io_nic *nic);
-static irqreturn_t s2io_msi_handle(int irq, void *dev_id);
 static irqreturn_t
 s2io_msix_ring_handle(int irq, void *dev_id);
 static irqreturn_t
diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c
index 5b7284c955dc..872cb1cc9c41 100644
--- a/drivers/net/sc92031.c
+++ b/drivers/net/sc92031.c
@@ -1402,7 +1402,6 @@ static struct ethtool_ops sc92031_ethtool_ops = {
         .get_strings            = sc92031_ethtool_get_strings,
         .get_stats_count        = sc92031_ethtool_get_stats_count,
         .get_ethtool_stats      = sc92031_ethtool_get_ethtool_stats,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
         .get_ufo                = ethtool_op_get_ufo,
 };
 
diff --git a/drivers/net/skfp/pmf.c b/drivers/net/skfp/pmf.c
index efc639c013fd..ea85de918233 100644
--- a/drivers/net/skfp/pmf.c
+++ b/drivers/net/skfp/pmf.c
@@ -575,7 +575,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
         int             sp_len ;
 
         /*
-         * skip if errror
+         * skip if error
          */
         if (pcon->pc_err)
                 return ;
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 776692946562..e3d8520209b8 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -821,7 +821,6 @@ static const struct ethtool_ops skge_ethtool_ops = {
         .phys_id        = skge_phys_id,
         .get_stats_count = skge_get_stats_count,
         .get_ethtool_stats = skge_get_ethtool_stats,
-        .get_perm_addr  = ethtool_op_get_perm_addr,
 };
 
 /*
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 13f08a390e1f..e7a2eadcc3b0 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -3548,7 +3548,6 @@ static const struct ethtool_ops sky2_ethtool_ops = {
         .phys_id        = sky2_phys_id,
         .get_stats_count = sky2_get_stats_count,
         .get_ethtool_stats = sky2_get_ethtool_stats,
-        .get_perm_addr  = ethtool_op_get_perm_addr,
 };
 
 #ifdef CONFIG_SKY2_DEBUG
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index af0c9831074c..a8f2af8f778a 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -1586,7 +1586,6 @@ static const struct ethtool_ops ethtool_ops = {
         .get_link = get_link,
         .get_msglevel = get_msglevel,
         .set_msglevel = set_msglevel,
-        .get_perm_addr = ethtool_op_get_perm_addr,
 };
 
 static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 053b7cb0d944..68e4f660367d 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -99,8 +99,7 @@ static char lancestr[] = "LANCE";
 #include <asm/byteorder.h>      /* Used by the checksum routines */
 #include <asm/idprom.h>
 #include <asm/sbus.h>
-#include <asm/openprom.h>
-#include <asm/oplib.h>
+#include <asm/prom.h>
 #include <asm/auxio.h>          /* For tpe-link-test? setting */
 #include <asm/irq.h>
 
@@ -1326,6 +1325,7 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
                                            struct sbus_dev *lebuffer)
 {
         static unsigned version_printed;
+        struct device_node *dp = sdev->ofdev.node;
         struct net_device *dev;
         struct lance_private *lp;
         int    i;
@@ -1389,54 +1389,46 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
                 lp->rx = lance_rx_dvma;
                 lp->tx = lance_tx_dvma;
         }
-        lp->busmaster_regval = prom_getintdefault(sdev->prom_node,
-                                                  "busmaster-regval",
-                                                  (LE_C3_BSWP | LE_C3_ACON |
-                                                   LE_C3_BCON));
+        lp->busmaster_regval = of_getintprop_default(dp,  "busmaster-regval",
+                                                     (LE_C3_BSWP |
+                                                      LE_C3_ACON |
+                                                      LE_C3_BCON));
 
         lp->name = lancestr;
         lp->ledma = ledma;
 
         lp->burst_sizes = 0;
         if (lp->ledma) {
-                char prop[6];
+                struct device_node *ledma_dp = ledma->sdev->ofdev.node;
+                const char *prop;
                 unsigned int sbmask;
                 u32 csr;
 
                 /* Find burst-size property for ledma */
-                lp->burst_sizes = prom_getintdefault(ledma->sdev->prom_node,
-                                                     "burst-sizes", 0);
+                lp->burst_sizes = of_getintprop_default(ledma_dp,
+                                                        "burst-sizes", 0);
 
                 /* ledma may be capable of fast bursts, but sbus may not. */
-                sbmask = prom_getintdefault(ledma->sdev->bus->prom_node,
-                                            "burst-sizes", DMA_BURSTBITS);
+                sbmask = of_getintprop_default(ledma_dp, "burst-sizes",
+                                               DMA_BURSTBITS);
                 lp->burst_sizes &= sbmask;
 
                 /* Get the cable-selection property */
-                memset(prop, 0, sizeof(prop));
-                prom_getstring(ledma->sdev->prom_node, "cable-selection",
-                               prop, sizeof(prop));
-                if (prop[0] == 0) {
-                        int topnd, nd;
+                prop = of_get_property(ledma_dp, "cable-selection", NULL);
+                if (!prop || prop[0] == '\0') {
+                        struct device_node *nd;
 
-                        printk(KERN_INFO "SunLance: using auto-carrier-detection.\n");
+                        printk(KERN_INFO "SunLance: using "
+                               "auto-carrier-detection.\n");
 
-                        /* Is this found at /options .attributes in all
-                         * Prom versions? XXX
-                         */
-                        topnd = prom_getchild(prom_root_node);
-
-                        nd = prom_searchsiblings(topnd, "options");
+                        nd = of_find_node_by_path("/options");
                         if (!nd)
                                 goto no_link_test;
 
-                        if (!prom_node_has_property(nd, "tpe-link-test?"))
+                        prop = of_get_property(nd, "tpe-link-test?", NULL);
+                        if (!prop)
                                 goto no_link_test;
 
-                        memset(prop, 0, sizeof(prop));
-                        prom_getstring(nd, "tpe-link-test?", prop,
-                                       sizeof(prop));
-
                         if (strcmp(prop, "true")) {
                                 printk(KERN_NOTICE "SunLance: warning: overriding option "
                                        "'tpe-link-test?'\n");
diff --git a/drivers/net/sunvnet.c b/drivers/net/sunvnet.c
index 61f98251feab..ff1028a597df 100644
--- a/drivers/net/sunvnet.c
+++ b/drivers/net/sunvnet.c
@@ -906,7 +906,6 @@ static const struct ethtool_ops vnet_ethtool_ops = {
         .get_msglevel           = vnet_get_msglevel,
         .set_msglevel           = vnet_set_msglevel,
         .get_link               = ethtool_op_get_link,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 static void vnet_port_free_tx_bufs(struct vnet_port *port)
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index 7f94ca930988..ec41469eee82 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -2198,7 +2198,6 @@ static const struct ethtool_ops tc35815_ethtool_ops = {
         .get_strings            = tc35815_get_strings,
         .get_stats_count        = tc35815_get_stats_count,
         .get_ethtool_stats      = tc35815_get_ethtool_stats,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 static int tc35815_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 887b9a5cfe48..dc41c055ebb5 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -9294,7 +9294,6 @@ static const struct ethtool_ops tg3_ethtool_ops = {
         .get_ethtool_stats      = tg3_get_ethtool_stats,
         .get_coalesce           = tg3_get_coalesce,
         .set_coalesce           = tg3_set_coalesce,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 static void __devinit tg3_get_eeprom_size(struct tg3 *tp)
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index f87d76981ab7..eca984f89bbf 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1471,14 +1471,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
                         sa_offset = 2;          /* Grrr, damn Matrox boards. */
                         multiport_cnt = 4;
                 }
-#ifdef CONFIG_DDB5477
-               if ((pdev->bus->number == 0) && (PCI_SLOT(pdev->devfn) == 4)) {
-                       /* DDB5477 MAC address in first EEPROM locations. */
-                       sa_offset = 0;
-                       /* No media table either */
-                       tp->flags &= ~HAS_MEDIA_TABLE;
-               }
-#endif
 #ifdef CONFIG_MIPS_COBALT
                if ((pdev->bus->number == 0) &&
                    ((PCI_SLOT(pdev->devfn) == 7) ||
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index a05fd97e5bc2..04cba6bf3d54 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -768,11 +768,13 @@ done:
 static void write_bulk_callback(struct urb *urb)
 {
         pegasus_t *pegasus = urb->context;
-        struct net_device *net = pegasus->net;
+        struct net_device *net;
 
         if (!pegasus)
                 return;
 
+        net = pegasus->net;
+
         if (!netif_device_present(net) || !netif_running(net))
                 return;
 
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index f51c2c138f10..c3fe230695a0 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -1805,7 +1805,6 @@ static const struct ethtool_ops netdev_ethtool_ops = {
         .set_wol                = rhine_set_wol,
         .get_sg                 = ethtool_op_get_sg,
         .get_tx_csum            = ethtool_op_get_tx_csum,
-        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index f331843d1102..93574add4063 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1613,7 +1613,7 @@ static void velocity_error(struct velocity_info *vptr, int status)
         if (status & ISR_TXSTLI) {
                 struct mac_regs __iomem * regs = vptr->mac_regs;
 
-                printk(KERN_ERR "TD structure errror TDindex=%hx\n", readw(&regs->TDIdx[0]));
+                printk(KERN_ERR "TD structure error TDindex=%hx\n", readw(&regs->TDIdx[0]));
                 BYTE_REG_BITS_ON(TXESR_TDSTR, &regs->TXESR);
                 writew(TRDCSR_RUN, &regs->TDCSRClr);
                 netif_stop_queue(vptr->dev);
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 5d58ad55d85c..e2be84001105 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -3445,7 +3445,6 @@ static void __exit parport_pc_exit(void)
                 pnp_unregister_driver (&parport_pc_pnp_driver);
         platform_driver_unregister(&parport_pc_platform_driver);
 
-        spin_lock(&ports_lock);
         while (!list_empty(&ports_list)) {
                 struct parport_pc_private *priv;
                 struct parport *port;
@@ -3455,11 +3454,8 @@ static void __exit parport_pc_exit(void)
                 if (port->dev && port->dev->bus == &platform_bus_type)
                         platform_device_unregister(
                                 to_platform_device(port->dev));
-                spin_unlock(&ports_lock);
                 parport_pc_unregister_port(port);
-                spin_lock(&ports_lock);
         }
-        spin_unlock(&ports_lock);
 }
 
 MODULE_AUTHOR("Phil Blundell, Tim Waugh, others");
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 8e58ea3d95c0..004bc2487270 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -310,7 +310,7 @@ static int pci_default_resume(struct pci_dev *pci_dev)
         /* restore the PCI config space */
         pci_restore_state(pci_dev);
         /* if the device was enabled before suspend, reenable */
-        retval = __pci_reenable_device(pci_dev);
+        retval = pci_reenable_device(pci_dev);
         /* if the device was busmaster before the suspend, make it busmaster again */
         if (pci_dev->is_busmaster)
                 pci_set_master(pci_dev);
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index fba319d6fcc8..37c00f6fd801 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -695,14 +695,13 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars)
 }
 
 /**
- * __pci_reenable_device - Resume abandoned device
+ * pci_reenable_device - Resume abandoned device
  * @dev: PCI device to be resumed
  *
  *  Note this function is a backend of pci_default_resume and is not supposed
  *  to be called by normal code, write proper resume handler and use it instead.
  */
-int
-__pci_reenable_device(struct pci_dev *dev)
+int pci_reenable_device(struct pci_dev *dev)
 {
         if (atomic_read(&dev->enable_cnt))
                 return do_pci_enable_device(dev, (1 << PCI_NUM_RESOURCES) - 1);
@@ -1517,7 +1516,7 @@ EXPORT_SYMBOL(pcie_get_readrq);
 /**
  * pcie_set_readrq - set PCI Express maximum memory read request
  * @dev: PCI device to query
- * @count: maximum memory read count in bytes
+ * @rq: maximum memory read count in bytes
  *    valid values are 128, 256, 512, 1024, 2048, 4096
  *
  * If possible sets maximum read byte count
@@ -1604,7 +1603,7 @@ early_param("pci", pci_setup);
 device_initcall(pci_init);
 
 EXPORT_SYMBOL_GPL(pci_restore_bars);
-EXPORT_SYMBOL(__pci_reenable_device);
+EXPORT_SYMBOL(pci_reenable_device);
 EXPORT_SYMBOL(pci_enable_device_bars);
 EXPORT_SYMBOL(pci_enable_device);
 EXPORT_SYMBOL(pcim_enable_device);
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 7c93a108f9b8..f8b13f0270d7 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -409,6 +409,9 @@ static void socket_shutdown(struct pcmcia_socket *s)
 #endif
         s->functions = 0;
 
+        /* give socket some time to power down */
+        msleep(100);
+
         s->ops->get_status(s, &status);
         if (status & SS_POWERON) {
                 printk(KERN_ERR "PCMCIA: socket %p: *** DANGER *** unable to remove socket power\n", s);
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 9d8d40d5c8f7..ff9e35cb308d 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -2,15 +2,13 @@
 # RTC class/drivers configuration
 #
 
-menu "Real Time Clock"
-        depends on !S390
-
 config RTC_LIB
         tristate
 
-config RTC_CLASS
-        tristate "RTC class"
+menuconfig RTC_CLASS
+        tristate "Real Time Clock"
         default n
+        depends on !S390
         select RTC_LIB
         help
           Generic RTC class support. If you say yes here, you will
@@ -20,6 +18,8 @@ config RTC_CLASS
           This driver can also be built as a module. If so, the module
           will be called rtc-class.
 
+if RTC_CLASS
+
 config RTC_HCTOSYS
         bool "Set system time from RTC on startup and resume"
         depends on RTC_CLASS = y
@@ -58,11 +58,10 @@ config RTC_DEBUG
           and individual RTC drivers.
 
 comment "RTC interfaces"
-        depends on RTC_CLASS
 
 config RTC_INTF_SYSFS
         boolean "/sys/class/rtc/rtcN (sysfs)"
-        depends on RTC_CLASS && SYSFS
+        depends on SYSFS
         default RTC_CLASS
         help
           Say yes here if you want to use your RTCs using sysfs interfaces,
@@ -73,7 +72,7 @@ config RTC_INTF_SYSFS
 
 config RTC_INTF_PROC
         boolean "/proc/driver/rtc (procfs for rtc0)"
-        depends on RTC_CLASS && PROC_FS
+        depends on PROC_FS
         default RTC_CLASS
         help
           Say yes here if you want to use your first RTC through the proc
@@ -85,7 +84,6 @@ config RTC_INTF_PROC
 
 config RTC_INTF_DEV
         boolean "/dev/rtcN (character devices)"
-        depends on RTC_CLASS
         default RTC_CLASS
         help
           Say yes here if you want to use your RTCs using the /dev
@@ -107,7 +105,6 @@ config RTC_INTF_DEV_UIE_EMUL
 
 config RTC_DRV_TEST
         tristate "Test driver/device"
-        depends on RTC_CLASS
         help
           If you say yes here you get support for the
           RTC test driver. It's a software RTC which can be
@@ -121,11 +118,12 @@ config RTC_DRV_TEST
           will be called rtc-test.
 
 comment "I2C RTC drivers"
-        depends on RTC_CLASS && I2C
+        depends on I2C
+
+if I2C
 
 config RTC_DRV_DS1307
         tristate "Dallas/Maxim DS1307/37/38/39/40, ST M41T00"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for various compatible RTC
           chips (often with battery backup) connected with I2C.  This driver
@@ -143,7 +141,6 @@ config RTC_DRV_DS1307
 
 config RTC_DRV_DS1672
         tristate "Dallas/Maxim DS1672"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the
           Dallas/Maxim DS1672 timekeeping chip.
@@ -153,7 +150,6 @@ config RTC_DRV_DS1672
 
 config RTC_DRV_MAX6900
         tristate "Maxim 6900"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you will get support for the
           Maxim MAX6900 I2C RTC chip.
@@ -163,7 +159,6 @@ config RTC_DRV_MAX6900
 
 config RTC_DRV_RS5C372
         tristate "Ricoh RS5C372A/B, RV5C386, RV5C387A"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the
           Ricoh RS5C372A, RS5C372B, RV5C386, and RV5C387A RTC chips.
@@ -173,7 +168,6 @@ config RTC_DRV_RS5C372
 
 config RTC_DRV_ISL1208
         tristate "Intersil 1208"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the
           Intersil 1208 RTC chip.
@@ -183,7 +177,6 @@ config RTC_DRV_ISL1208
 
 config RTC_DRV_X1205
         tristate "Xicor/Intersil X1205"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the
           Xicor/Intersil X1205 RTC chip.
@@ -193,7 +186,6 @@ config RTC_DRV_X1205
 
 config RTC_DRV_PCF8563
         tristate "Philips PCF8563/Epson RTC8564"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the
           Philips PCF8563 RTC chip. The Epson RTC8564
@@ -204,7 +196,6 @@ config RTC_DRV_PCF8563
 
 config RTC_DRV_PCF8583
         tristate "Philips PCF8583"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the Philips PCF8583
           RTC chip found on Acorn RiscPCs. This driver supports the
@@ -217,7 +208,6 @@ config RTC_DRV_PCF8583
 
 config RTC_DRV_M41T80
         tristate "ST M41T80 series RTC"
-        depends on RTC_CLASS && I2C
         help
           If you say Y here you will get support for the
           ST M41T80 RTC chips series. Currently following chips are
@@ -236,19 +226,21 @@ config RTC_DRV_M41T80_WDT
 
 config RTC_DRV_TWL92330
         boolean "TI TWL92330/Menelaus"
-        depends on RTC_CLASS && I2C && MENELAUS
+        depends on MENELAUS
         help
           If you say yes here you get support for the RTC on the
           TWL92330 "Menelaus" power mangement chip, used with OMAP2
           platforms.  The support is integrated with the rest of
           the Menelaus driver; it's not separate module.
 
+endif # I2C
+
 comment "SPI RTC drivers"
-        depends on RTC_CLASS && SPI_MASTER
+
+if SPI_MASTER
 
 config RTC_DRV_RS5C348
         tristate "Ricoh RS5C348A/B"
-        depends on RTC_CLASS && SPI_MASTER
         help
           If you say yes here you get support for the
           Ricoh RS5C348A and RS5C348B RTC chips.
@@ -258,7 +250,6 @@ config RTC_DRV_RS5C348
 
 config RTC_DRV_MAX6902
         tristate "Maxim 6902"
-        depends on RTC_CLASS && SPI_MASTER
         help
           If you say yes here you will get support for the
           Maxim MAX6902 SPI RTC chip.
@@ -266,8 +257,9 @@ config RTC_DRV_MAX6902
           This driver can also be built as a module. If so, the module
           will be called rtc-max6902.
 
+endif # SPI_MASTER
+
 comment "Platform RTC drivers"
-        depends on RTC_CLASS
 
 # this 'CMOS' RTC driver is arch dependent because <asm-generic/rtc.h>
 # requires <asm/mc146818rtc.h> defining CMOS_READ/CMOS_WRITE, and a
@@ -275,8 +267,7 @@ comment "Platform RTC drivers"
 
 config RTC_DRV_CMOS
         tristate "PC-style 'CMOS'"
-        depends on RTC_CLASS && (X86 || ALPHA || ARM26 || ARM \
-                || M32R || ATARI || PPC || MIPS)
+        depends on X86 || ALPHA || ARM || M32R || ATARI || PPC || MIPS
         help
           Say "yes" here to get direct support for the real time clock
           found in every PC or ACPI-based system, and some other boards.
@@ -294,13 +285,12 @@ config RTC_DRV_CMOS
 
 config RTC_DRV_DS1216
         tristate "Dallas DS1216"
-        depends on RTC_CLASS && SNI_RM
+        depends on SNI_RM
         help
           If you say yes here you get support for the Dallas DS1216 RTC chips.
 
 config RTC_DRV_DS1553
         tristate "Dallas DS1553"
-        depends on RTC_CLASS
         help
           If you say yes here you get support for the
           Dallas DS1553 timekeeping chip.
@@ -320,7 +310,6 @@ config RTC_DRV_STK17TA8
 
 config RTC_DRV_DS1742
         tristate "Dallas DS1742/1743"
-        depends on RTC_CLASS
         help
           If you say yes here you get support for the
           Dallas DS1742/1743 timekeeping chip.
@@ -330,7 +319,6 @@ config RTC_DRV_DS1742
 
 config RTC_DRV_M48T86
         tristate "ST M48T86/Dallas DS12887"
-        depends on RTC_CLASS
         help
           If you say Y here you will get support for the
           ST M48T86 and Dallas DS12887 RTC chips.
@@ -340,7 +328,6 @@ config RTC_DRV_M48T86
 
 config RTC_DRV_M48T59
         tristate "ST M48T59"
-        depends on RTC_CLASS
         help
           If you say Y here you will get support for the
           ST M48T59 RTC chip.
@@ -350,7 +337,6 @@ config RTC_DRV_M48T59
 
 config RTC_DRV_V3020
         tristate "EM Microelectronic V3020"
-        depends on RTC_CLASS
         help
           If you say yes here you will get support for the
           EM Microelectronic v3020 RTC chip.
@@ -359,19 +345,17 @@ config RTC_DRV_V3020
           will be called rtc-v3020.
 
 comment "on-CPU RTC drivers"
-        depends on RTC_CLASS
 
 config RTC_DRV_OMAP
         tristate "TI OMAP1"
-        depends on RTC_CLASS && ( \
-                ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 )
+        depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730
         help
           Say "yes" here to support the real time clock on TI OMAP1 chips.
           This driver can also be built as a module called rtc-omap.
 
 config RTC_DRV_S3C
         tristate "Samsung S3C series SoC RTC"
-        depends on RTC_CLASS && ARCH_S3C2410
+        depends on ARCH_S3C2410
         help
           RTC (Realtime Clock) driver for the clock inbuilt into the
           Samsung S3C24XX series of SoCs. This can provide periodic
@@ -387,7 +371,7 @@ config RTC_DRV_S3C
 
 config RTC_DRV_EP93XX
         tristate "Cirrus Logic EP93XX"
-        depends on RTC_CLASS && ARCH_EP93XX
+        depends on ARCH_EP93XX
         help
           If you say yes here you get support for the
           RTC embedded in the Cirrus Logic EP93XX processors.
@@ -397,7 +381,7 @@ config RTC_DRV_EP93XX
 
 config RTC_DRV_SA1100
         tristate "SA11x0/PXA2xx"
-        depends on RTC_CLASS && (ARCH_SA1100 || ARCH_PXA)
+        depends on ARCH_SA1100 || ARCH_PXA
         help
           If you say Y here you will get access to the real time clock
           built into your SA11x0 or PXA2xx CPU.
@@ -407,7 +391,7 @@ config RTC_DRV_SA1100
 
 config RTC_DRV_SH
         tristate "SuperH On-Chip RTC"
-        depends on RTC_CLASS && SUPERH && (CPU_SH3 || CPU_SH4)
+        depends on RTC_CLASS && (CPU_SH3 || CPU_SH4)
         help
           Say Y here to enable support for the on-chip RTC found in
           most SuperH processors.
@@ -417,7 +401,7 @@ config RTC_DRV_SH
 
 config RTC_DRV_VR41XX
         tristate "NEC VR41XX"
-        depends on RTC_CLASS && CPU_VR41XX
+        depends on CPU_VR41XX
         help
           If you say Y here you will get access to the real time clock
           built into your NEC VR41XX CPU.
@@ -427,7 +411,7 @@ config RTC_DRV_VR41XX
 
 config RTC_DRV_PL031
         tristate "ARM AMBA PL031 RTC"
-        depends on RTC_CLASS && ARM_AMBA
+        depends on ARM_AMBA
         help
           If you say Y here you will get access to ARM AMBA
           PrimeCell PL031 RTC found on certain ARM SOCs.
@@ -437,20 +421,20 @@ config RTC_DRV_PL031
 
 config RTC_DRV_AT32AP700X
         tristate "AT32AP700X series RTC"
-        depends on RTC_CLASS && PLATFORM_AT32AP
+        depends on PLATFORM_AT32AP
         help
           Driver for the internal RTC (Realtime Clock) on Atmel AVR32
           AT32AP700x family processors.
 
 config RTC_DRV_AT91RM9200
         tristate "AT91RM9200"
-        depends on RTC_CLASS && ARCH_AT91RM9200
+        depends on ARCH_AT91RM9200
         help
           Driver for the Atmel AT91RM9200's internal RTC (Realtime Clock).
 
 config RTC_DRV_BFIN
         tristate "Blackfin On-Chip RTC"
-        depends on RTC_CLASS && BFIN
+        depends on BFIN
         help
           If you say yes here you will get support for the
           Blackfin On-Chip Real Time Clock.
@@ -460,8 +444,8 @@ config RTC_DRV_BFIN
 
 config RTC_DRV_RS5C313
         tristate "Ricoh RS5C313"
-        depends on RTC_CLASS && SH_LANDISK
+        depends on SH_LANDISK
         help
           If you say yes here you get support for the Ricoh RS5C313 RTC chips.
 
-endmenu
+endif # RTC_CLASS
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 304535942de2..005fff3a3508 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -348,6 +348,8 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
         case RTC_IRQP_SET:
                 if (ops->irq_set_freq)
                         err = rtc_irq_set_freq(rtc, rtc->irq_task, arg);
+                else
+                        err = -ENOTTY;
                 break;
 
 #if 0
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
index 33b752350ab5..bf60d35f580b 100644
--- a/drivers/rtc/rtc-m48t59.c
+++ b/drivers/rtc/rtc-m48t59.c
@@ -35,7 +35,7 @@
 struct m48t59_private {
         void __iomem *ioaddr;
         unsigned int size; /* iomem size */
-        unsigned int irq;
+        int irq;
         struct rtc_device *rtc;
         spinlock_t lock; /* serialize the NVRAM and RTC access */
 };
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 54b613053468..8c1012b432bb 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -29,7 +29,7 @@
 
 #include <asm/mach/time.h>
 
-#include <asm/arch/regs-rtc.h>
+#include <asm/plat-s3c/regs-rtc.h>
 
 /* I have yet to find an S3C implementation with more than one
  * of these rtc blocks in */
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index e0f91dfce0f5..93ee05eeaeba 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -365,6 +365,7 @@ static int sh_rtc_set_time(struct device *dev, struct rtc_time *tm)
         /* Reset pre-scaler & stop RTC */
         tmp = readb(rtc->regbase + RCR2);
         tmp |= RCR2_RESET;
+        tmp &= ~RCR2_START;
         writeb(tmp, rtc->regbase + RCR2);
 
         writeb(BIN2BCD(tm->tm_sec),  rtc->regbase + RSECCNT);
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 418b4e63a4fa..ea63ba7828f9 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -555,7 +555,7 @@ dasd_eckd_read_conf(struct dasd_device *device)
                         if (conf_data == NULL) {
                                 MESSAGE(KERN_WARNING, "%s", "No configuration "
                                         "data retrieved");
-                                continue;       /* no errror */
+                                continue;       /* no error */
                         }
                         if (conf_len != sizeof (struct dasd_eckd_confdata)) {
                                 MESSAGE(KERN_WARNING,
@@ -564,7 +564,7 @@ dasd_eckd_read_conf(struct dasd_device *device)
                                         conf_len,
                                         sizeof (struct dasd_eckd_confdata));
                                 kfree(conf_data);
-                                continue;       /* no errror */
+                                continue;       /* no error */
                         }
                         /* save first valid configuration data */
                         if (!conf_data_saved){
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c
index e821a155b658..0bde26989a23 100644
--- a/drivers/sbus/char/bbc_envctrl.c
+++ b/drivers/sbus/char/bbc_envctrl.c
@@ -479,11 +479,12 @@ static int kenvctrld(void *__unused)
 
 static void attach_one_temp(struct linux_ebus_child *echild, int temp_idx)
 {
-        struct bbc_cpu_temperature *tp = kmalloc(sizeof(*tp), GFP_KERNEL);
+        struct bbc_cpu_temperature *tp;
 
+        tp = kzalloc(sizeof(*tp), GFP_KERNEL);
         if (!tp)
                 return;
-        memset(tp, 0, sizeof(*tp));
+
         tp->client = bbc_i2c_attach(echild);
         if (!tp->client) {
                 kfree(tp);
@@ -525,11 +526,12 @@ static void attach_one_temp(struct linux_ebus_child *echild, int temp_idx)
 
 static void attach_one_fan(struct linux_ebus_child *echild, int fan_idx)
 {
-        struct bbc_fan_control *fp = kmalloc(sizeof(*fp), GFP_KERNEL);
+        struct bbc_fan_control *fp;
 
+        fp = kzalloc(sizeof(*fp), GFP_KERNEL);
         if (!fp)
                 return;
-        memset(fp, 0, sizeof(*fp));
+
         fp->client = bbc_i2c_attach(echild);
         if (!fp->client) {
                 kfree(fp);
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c
index fbadd4d761f3..ac8ef2ce07fb 100644
--- a/drivers/sbus/char/bbc_i2c.c
+++ b/drivers/sbus/char/bbc_i2c.c
@@ -357,13 +357,13 @@ static void __init reset_one_i2c(struct bbc_i2c_bus *bp)
 
 static int __init attach_one_i2c(struct linux_ebus_device *edev, int index)
 {
-        struct bbc_i2c_bus *bp = kmalloc(sizeof(*bp), GFP_KERNEL);
+        struct bbc_i2c_bus *bp;
         struct linux_ebus_child *echild;
         int entry;
 
+        bp = kzalloc(sizeof(*bp), GFP_KERNEL);
         if (!bp)
                 return -ENOMEM;
-        memset(bp, 0, sizeof(*bp));
 
         bp->i2c_control_regs = ioremap(edev->resource[0].start, 0x2);
         if (!bp->i2c_control_regs)
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index 26b1d2a17ed2..9269f7fbd363 100644
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -248,6 +248,7 @@ static int vfc_debug(struct vfc_dev *dev, int cmd, void __user *argp)
                                         buffer,inout.len);
 
                 if (copy_to_user(argp,&inout,sizeof(inout))) {
+                        vfc_unlock_device(dev);
                         kfree(buffer);
                         return -EFAULT;
                 }
diff --git a/drivers/scsi/arm/Kconfig b/drivers/scsi/arm/Kconfig
index d006a8cb4a74..7236143941f3 100644
--- a/drivers/scsi/arm/Kconfig
+++ b/drivers/scsi/arm/Kconfig
@@ -74,15 +74,6 @@ config SCSI_CUMANA_1
           This enables support for the Cumana SCSI I card. If you have an
           Acorn system with one of these, say Y. If unsure, say N.
 
-config SCSI_ECOSCSI
-        tristate "EcoScsi support (EXPERIMENTAL)"
-        depends on ARCH_ACORN && EXPERIMENTAL && (ARCH_ARC || ARCH_A5K) && SCSI
-        select SCSI_SPI_ATTRS
-        help
-          This enables support for the EcoSCSI card -- a small card that sits
-          in the Econet socket. If you have an Acorn system with one of these,
-          say Y. If unsure, say N.
-
 config SCSI_OAK1
         tristate "Oak SCSI support (EXPERIMENTAL)"
         depends on ARCH_ACORN && EXPERIMENTAL && SCSI
diff --git a/drivers/scsi/arm/Makefile b/drivers/scsi/arm/Makefile
index e8db17924c1d..16c3e86a6b1b 100644
--- a/drivers/scsi/arm/Makefile
+++ b/drivers/scsi/arm/Makefile
@@ -8,7 +8,6 @@ obj-$(CONFIG_SCSI_ACORNSCSI_3)	+= acornscsi_mod.o queue.o msgqueue.o
 obj-$(CONFIG_SCSI_ARXESCSI)     += arxescsi.o fas216.o queue.o msgqueue.o
 obj-$(CONFIG_SCSI_CUMANA_1)     += cumana_1.o
 obj-$(CONFIG_SCSI_CUMANA_2)     += cumana_2.o fas216.o queue.o msgqueue.o
-obj-$(CONFIG_SCSI_ECOSCSI)      += ecoscsi.o
 obj-$(CONFIG_SCSI_OAK1)         += oak.o
 obj-$(CONFIG_SCSI_POWERTECSCSI) += powertec.o fas216.o queue.o msgqueue.o
 obj-$(CONFIG_SCSI_EESOXSCSI)    += eesox.o fas216.o queue.o msgqueue.o
diff --git a/drivers/scsi/arm/ecoscsi.c b/drivers/scsi/arm/ecoscsi.c
deleted file mode 100644
index 5265a9884338..000000000000
--- a/drivers/scsi/arm/ecoscsi.c
+++ /dev/null
@@ -1,166 +0,0 @@
-#define AUTOSENSE
-/* #define PSEUDO_DMA */
-
-/*
- * EcoSCSI Generic NCR5380 driver
- *
- * Copyright 1995, Russell King
- *
- * ALPHA RELEASE 1.
- *
- * For more information, please consult
- *
- * NCR 5380 Family
- * SCSI Protocol Controller
- * Databook
- *
- * NCR Microelectronics
- * 1635 Aeroplaza Drive
- * Colorado Springs, CO 80916
- * 1+ (719) 578-3400
- * 1+ (800) 334-5454
- */
-
-#include <linux/module.h>
-#include <linux/signal.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/blkdev.h>
-
-#include <asm/io.h>
-#include <asm/system.h>
-
-#include "../scsi.h"
-#include <scsi/scsi_host.h>
-
-#define priv(host)                      ((struct NCR5380_hostdata *)(host)->hostdata)
-
-#define NCR5380_local_declare()         void __iomem *_base
-#define NCR5380_setup(host)             _base = priv(host)->base
-
-#define NCR5380_read(reg)               ({ writeb(reg | 8, _base); readb(_base + 4); })
-#define NCR5380_write(reg, value)       ({ writeb(reg | 8, _base); writeb(value, _base + 4); })
-
-#define NCR5380_intr                    ecoscsi_intr
-#define NCR5380_queue_command           ecoscsi_queue_command
-#define NCR5380_proc_info               ecoscsi_proc_info
-
-#define NCR5380_implementation_fields   \
-        void __iomem *base
-
-#include "../NCR5380.h"
-
-#define ECOSCSI_PUBLIC_RELEASE 1
-
-/*
- * Function : ecoscsi_setup(char *str, int *ints)
- *
- * Purpose : LILO command line initialization of the overrides array,
- *
- * Inputs : str - unused, ints - array of integer parameters with ints[0]
- *      equal to the number of ints.
- *
- */
-
-void ecoscsi_setup(char *str, int *ints)
-{
-}
-
-const char * ecoscsi_info (struct Scsi_Host *spnt)
-{
-        return "";
-}
-
-#define BOARD_NORMAL    0
-#define BOARD_NCR53C400 1
-
-#include "../NCR5380.c"
-
-static struct scsi_host_template ecoscsi_template =  {
-        .module         = THIS_MODULE,
-        .name           = "Serial Port EcoSCSI NCR5380",
-        .proc_name      = "ecoscsi",
-        .info           = ecoscsi_info,
-        .queuecommand   = ecoscsi_queue_command,
-        .eh_abort_handler       = NCR5380_abort,
-        .eh_bus_reset_handler   = NCR5380_bus_reset,
-        .can_queue      = 16,
-        .this_id        = 7,
-        .sg_tablesize   = SG_ALL,
-        .cmd_per_lun    = 2,
-        .use_clustering = DISABLE_CLUSTERING
-};
-
-static struct Scsi_Host *host;
-
-static int __init ecoscsi_init(void)
-{
-        void __iomem *_base;
-        int ret;
-
-        if (!request_mem_region(0x33a0000, 4096, "ecoscsi")) {
-                ret = -EBUSY;
-                goto out;
-        }
-
-        _base = ioremap(0x33a0000, 4096);
-        if (!_base) {
-                ret = -ENOMEM;
-                goto out_release;
-        }
-
-        NCR5380_write(MODE_REG, 0x20);          /* Is it really SCSI? */
-        if (NCR5380_read(MODE_REG) != 0x20)     /* Write to a reg.    */
-                goto out_unmap;
-
-        NCR5380_write(MODE_REG, 0x00);          /* it back.           */
-        if (NCR5380_read(MODE_REG) != 0x00)
-                goto out_unmap;
-
-        host = scsi_host_alloc(tpnt, sizeof(struct NCR5380_hostdata));
-        if (!host) {
-                ret = -ENOMEM;
-                goto out_unmap;
-        }
-
-        priv(host)->base = _base;
-        host->irq = IRQ_NONE;
-
-        NCR5380_init(host, 0);
-
-        printk("scsi%d: at port 0x%08lx irqs disabled", host->host_no, host->io_port);
-        printk(" options CAN_QUEUE=%d CMD_PER_LUN=%d release=%d",
-                host->can_queue, host->cmd_per_lun, ECOSCSI_PUBLIC_RELEASE);
-        printk("\nscsi%d:", host->host_no);
-        NCR5380_print_options(host);
-        printk("\n");
-
-        scsi_add_host(host, NULL); /* XXX handle failure */
-        scsi_scan_host(host);
-        return 0;
-
- out_unmap:
-        iounmap(_base);
- out_release:
-        release_mem_region(0x33a0000, 4096);
- out:
-        return ret;
-}
-
-static void __exit ecoscsi_exit(void)
-{
-        scsi_remove_host(host);
-        NCR5380_exit(host);
-        scsi_host_put(host);
-        release_mem_region(0x33a0000, 4096);
-        return 0;
-}
-
-module_init(ecoscsi_init);
-module_exit(ecoscsi_exit);
-
-MODULE_AUTHOR("Russell King");
-MODULE_DESCRIPTION("Econet-SCSI driver for Acorn machines");
-MODULE_LICENSE("GPL");
-
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index bb90df8bdce4..1cc01acc2808 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -328,17 +328,15 @@ static int idescsi_check_condition(ide_drive_t *drive, struct request *failed_co
         u8             *buf;
 
         /* stuff a sense request in front of our current request */
-        pc = kmalloc (sizeof (idescsi_pc_t), GFP_ATOMIC);
-        rq = kmalloc (sizeof (struct request), GFP_ATOMIC);
-        buf = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_ATOMIC);
-        if (pc == NULL || rq == NULL || buf == NULL) {
+        pc = kzalloc(sizeof(idescsi_pc_t), GFP_ATOMIC);
+        rq = kmalloc(sizeof(struct request), GFP_ATOMIC);
+        buf = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_ATOMIC);
+        if (!pc || !rq || !buf) {
                 kfree(buf);
                 kfree(rq);
                 kfree(pc);
                 return -ENOMEM;
         }
-        memset (pc, 0, sizeof (idescsi_pc_t));
-        memset (buf, 0, SCSI_SENSE_BUFFERSIZE);
         ide_init_drive_cmd(rq);
         rq->special = (char *) pc;
         pc->rq = rq;
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 6d7d616e9ccd..5e485876f54c 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -976,7 +976,6 @@ enum pci_board_num_t {
         pbn_oxsemi,
         pbn_intel_i960,
         pbn_sgi_ioc3,
-        pbn_nec_nile4,
         pbn_computone_4,
         pbn_computone_6,
         pbn_computone_8,
@@ -1443,18 +1442,6 @@ static struct pciserial_board pci_boards[] __devinitdata = {
         },
 
         /*
-         * NEC Vrc-5074 (Nile 4) builtin UART.
-         */
-        [pbn_nec_nile4] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 1,
-                .base_baud      = 520833,
-                .uart_offset    = 8 << 3,
-                .reg_shift      = 3,
-                .first_offset   = 0x300,
-        },
-
-        /*
          * Computone - uses IOMEM.
          */
         [pbn_computone_4] = {
@@ -2345,13 +2332,6 @@ static struct pci_device_id serial_pci_tbl[] = {
                 PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                 pbn_b2_1_115200 },
 
-        /*
-         * NEC Vrc-5074 (Nile 4) builtin UART.
-         */
-        {       PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_NILE4,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_nec_nile4 },
-
         {       PCI_VENDOR_ID_DCI, PCI_DEVICE_ID_DCI_PCCOM2,
                 PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                 pbn_b3_2_115200 },
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 18f629706448..64ff6a5f6afd 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -88,21 +88,17 @@ config SERIAL_8250_PCI
         depends on SERIAL_8250 && PCI
         default SERIAL_8250
         help
-          Say Y here if you have PCI serial ports.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_pci.
+          This builds standard PCI serial support. You may be able to
+          disable this feature if you only need legacy serial support.
+          Saves about 9K.
 
 config SERIAL_8250_PNP
         tristate "8250/16550 PNP device support" if EMBEDDED
         depends on SERIAL_8250 && PNP
         default SERIAL_8250
         help
-          Say Y here if you have serial ports described by PNPBIOS or ACPI.
-          These are typically ports built into the system board.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_pnp.
+          This builds standard PNP serial support. You may be able to
+          disable this feature if you only need legacy serial support.
 
 config SERIAL_8250_HP300
         tristate
@@ -1195,7 +1191,7 @@ config SERIAL_VR41XX
 
 config SERIAL_VR41XX_CONSOLE
         bool "Enable NEC VR4100 series Serial Interface Unit console"
-        depends on SERIAL_VR41XX
+        depends on SERIAL_VR41XX=y
         select SERIAL_CORE_CONSOLE
         help
           If you have a NEC VR4100 series processor and you want to use
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index 00924feaf621..4d643c926657 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -74,10 +74,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
 #define MPSC_NUM_CTLRS          2
 
 /*
@@ -97,9 +93,8 @@
 #define MPSC_TXBE_SIZE          dma_get_cache_alignment()
 #define MPSC_TXB_SIZE           (MPSC_TXR_ENTRIES * MPSC_TXBE_SIZE)
 
-#define MPSC_DMA_ALLOC_SIZE     (MPSC_RXR_SIZE + MPSC_RXB_SIZE +        \
-                                MPSC_TXR_SIZE + MPSC_TXB_SIZE +         \
-                                dma_get_cache_alignment() /* for alignment */)
+#define MPSC_DMA_ALLOC_SIZE     (MPSC_RXR_SIZE + MPSC_RXB_SIZE + MPSC_TXR_SIZE \
+                + MPSC_TXB_SIZE + dma_get_cache_alignment() /* for alignment */)
 
 /* Rx and Tx Ring entry descriptors -- assume entry size is <= cacheline size */
 struct mpsc_rx_desc {
@@ -270,8 +265,8 @@ struct mpsc_port_info *mpsc_device_remove(int index);
 #define SDMA_DESC_CMDSTAT_EI            (1<<23)
 #define SDMA_DESC_CMDSTAT_O             (1<<31)
 
-#define SDMA_DESC_DFLT                  (SDMA_DESC_CMDSTAT_O |  \
-                                        SDMA_DESC_CMDSTAT_EI)
+#define SDMA_DESC_DFLT                  (SDMA_DESC_CMDSTAT_O \
+                | SDMA_DESC_CMDSTAT_EI)
 
 #define SDMA_SDC_RFT                    (1<<0)
 #define SDMA_SDC_SFM                    (1<<1)
@@ -295,10 +290,10 @@ struct mpsc_port_info *mpsc_device_remove(int index);
 #define SDMA_1_CAUSE_TXBUF              (1<<10)
 #define SDMA_1_CAUSE_TXEND              (1<<11)
 
-#define SDMA_CAUSE_RX_MASK      (SDMA_0_CAUSE_RXBUF | SDMA_0_CAUSE_RXERR | \
-        SDMA_1_CAUSE_RXBUF | SDMA_1_CAUSE_RXERR)
-#define SDMA_CAUSE_TX_MASK      (SDMA_0_CAUSE_TXBUF | SDMA_0_CAUSE_TXEND | \
-        SDMA_1_CAUSE_TXBUF | SDMA_1_CAUSE_TXEND)
+#define SDMA_CAUSE_RX_MASK      (SDMA_0_CAUSE_RXBUF | SDMA_0_CAUSE_RXERR \
+                | SDMA_1_CAUSE_RXBUF | SDMA_1_CAUSE_RXERR)
+#define SDMA_CAUSE_TX_MASK      (SDMA_0_CAUSE_TXBUF | SDMA_0_CAUSE_TXEND \
+                | SDMA_1_CAUSE_TXBUF | SDMA_1_CAUSE_TXEND)
 
 /* SDMA Interrupt registers */
 #define SDMA_INTR_CAUSE                 0x0000
@@ -312,11 +307,11 @@ struct mpsc_port_info *mpsc_device_remove(int index);
  * Define how this driver is known to the outside (we've been assigned a
  * range on the "Low-density serial ports" major).
  */
-#define MPSC_MAJOR              204
-#define MPSC_MINOR_START        44
-#define MPSC_DRIVER_NAME        "MPSC"
-#define MPSC_DEV_NAME           "ttyMM"
-#define MPSC_VERSION            "1.00"
+#define MPSC_MAJOR                      204
+#define MPSC_MINOR_START                44
+#define MPSC_DRIVER_NAME                "MPSC"
+#define MPSC_DEV_NAME                   "ttyMM"
+#define MPSC_VERSION                    "1.00"
 
 static struct mpsc_port_info mpsc_ports[MPSC_NUM_CTLRS];
 static struct mpsc_shared_regs mpsc_shared_regs;
@@ -332,8 +327,7 @@ static void mpsc_release_port(struct uart_port *port);
  *
  ******************************************************************************
  */
-static void
-mpsc_brg_init(struct mpsc_port_info *pi, u32 clk_src)
+static void mpsc_brg_init(struct mpsc_port_info *pi, u32 clk_src)
 {
         u32     v;
 
@@ -349,11 +343,9 @@ mpsc_brg_init(struct mpsc_port_info *pi, u32 clk_src)
 
         writel(readl(pi->brg_base + BRG_BTR) & 0xffff0000,
                 pi->brg_base + BRG_BTR);
-        return;
 }
 
-static void
-mpsc_brg_enable(struct mpsc_port_info *pi)
+static void mpsc_brg_enable(struct mpsc_port_info *pi)
 {
         u32     v;
 
@@ -363,11 +355,9 @@ mpsc_brg_enable(struct mpsc_port_info *pi)
         if (pi->mirror_regs)
                 pi->BRG_BCR_m = v;
         writel(v, pi->brg_base + BRG_BCR);
-        return;
 }
 
-static void
-mpsc_brg_disable(struct mpsc_port_info *pi)
+static void mpsc_brg_disable(struct mpsc_port_info *pi)
 {
         u32     v;
 
@@ -377,21 +367,19 @@ mpsc_brg_disable(struct mpsc_port_info *pi)
         if (pi->mirror_regs)
                 pi->BRG_BCR_m = v;
         writel(v, pi->brg_base + BRG_BCR);
-        return;
 }
 
-static inline void
-mpsc_set_baudrate(struct mpsc_port_info *pi, u32 baud)
+/*
+ * To set the baud, we adjust the CDV field in the BRG_BCR reg.
+ * From manual: Baud = clk / ((CDV+1)*2) ==> CDV = (clk / (baud*2)) - 1.
+ * However, the input clock is divided by 16 in the MPSC b/c of how
+ * 'MPSC_MMCRH' was set up so we have to divide the 'clk' used in our
+ * calculation by 16 to account for that.  So the real calculation
+ * that accounts for the way the mpsc is set up is:
+ * CDV = (clk / (baud*2*16)) - 1 ==> CDV = (clk / (baud << 5)) - 1.
+ */
+static void mpsc_set_baudrate(struct mpsc_port_info *pi, u32 baud)
 {
-        /*
-         * To set the baud, we adjust the CDV field in the BRG_BCR reg.
-         * From manual: Baud = clk / ((CDV+1)*2) ==> CDV = (clk / (baud*2)) - 1.
-         * However, the input clock is divided by 16 in the MPSC b/c of how
-         * 'MPSC_MMCRH' was set up so we have to divide the 'clk' used in our
-         * calculation by 16 to account for that.  So the real calculation
-         * that accounts for the way the mpsc is set up is:
-         * CDV = (clk / (baud*2*16)) - 1 ==> CDV = (clk / (baud << 5)) - 1.
-         */
         u32     cdv = (pi->port.uartclk / (baud << 5)) - 1;
         u32     v;
 
@@ -403,8 +391,6 @@ mpsc_set_baudrate(struct mpsc_port_info *pi, u32 baud)
                 pi->BRG_BCR_m = v;
         writel(v, pi->brg_base + BRG_BCR);
         mpsc_brg_enable(pi);
-
-        return;
 }
 
 /*
@@ -415,13 +401,12 @@ mpsc_set_baudrate(struct mpsc_port_info *pi, u32 baud)
  ******************************************************************************
  */
 
-static void
-mpsc_sdma_burstsize(struct mpsc_port_info *pi, u32 burst_size)
+static void mpsc_sdma_burstsize(struct mpsc_port_info *pi, u32 burst_size)
 {
         u32     v;
 
         pr_debug("mpsc_sdma_burstsize[%d]: burst_size: %d\n",
-            pi->port.line, burst_size);
+                        pi->port.line, burst_size);
 
         burst_size >>= 3; /* Divide by 8 b/c reg values are 8-byte chunks */
 
@@ -436,11 +421,9 @@ mpsc_sdma_burstsize(struct mpsc_port_info *pi, u32 burst_size)
 
         writel((readl(pi->sdma_base + SDMA_SDC) & (0x3 << 12)) | (v << 12),
                 pi->sdma_base + SDMA_SDC);
-        return;
 }
 
-static void
-mpsc_sdma_init(struct mpsc_port_info *pi, u32 burst_size)
+static void mpsc_sdma_init(struct mpsc_port_info *pi, u32 burst_size)
 {
         pr_debug("mpsc_sdma_init[%d]: burst_size: %d\n", pi->port.line,
                 burst_size);
@@ -448,11 +431,9 @@ mpsc_sdma_init(struct mpsc_port_info *pi, u32 burst_size)
         writel((readl(pi->sdma_base + SDMA_SDC) & 0x3ff) | 0x03f,
                 pi->sdma_base + SDMA_SDC);
         mpsc_sdma_burstsize(pi, burst_size);
-        return;
 }
 
-static inline u32
-mpsc_sdma_intr_mask(struct mpsc_port_info *pi, u32 mask)
+static u32 mpsc_sdma_intr_mask(struct mpsc_port_info *pi, u32 mask)
 {
         u32     old, v;
 
@@ -475,15 +456,14 @@ mpsc_sdma_intr_mask(struct mpsc_port_info *pi, u32 mask)
         return old & 0xf;
 }
 
-static inline void
-mpsc_sdma_intr_unmask(struct mpsc_port_info *pi, u32 mask)
+static void mpsc_sdma_intr_unmask(struct mpsc_port_info *pi, u32 mask)
 {
         u32     v;
 
         pr_debug("mpsc_sdma_intr_unmask[%d]: mask: 0x%x\n", pi->port.line,mask);
 
-        v = (pi->mirror_regs) ? pi->shared_regs->SDMA_INTR_MASK_m :
-                readl(pi->shared_regs->sdma_intr_base + SDMA_INTR_MASK);
+        v = (pi->mirror_regs) ? pi->shared_regs->SDMA_INTR_MASK_m
+                : readl(pi->shared_regs->sdma_intr_base + SDMA_INTR_MASK);
 
         mask &= 0xf;
         if (pi->port.line)
@@ -493,41 +473,35 @@ mpsc_sdma_intr_unmask(struct mpsc_port_info *pi, u32 mask)
         if (pi->mirror_regs)
                 pi->shared_regs->SDMA_INTR_MASK_m = v;
         writel(v, pi->shared_regs->sdma_intr_base + SDMA_INTR_MASK);
-        return;
 }
 
-static inline void
-mpsc_sdma_intr_ack(struct mpsc_port_info *pi)
+static void mpsc_sdma_intr_ack(struct mpsc_port_info *pi)
 {
         pr_debug("mpsc_sdma_intr_ack[%d]: Acknowledging IRQ\n", pi->port.line);
 
         if (pi->mirror_regs)
                 pi->shared_regs->SDMA_INTR_CAUSE_m = 0;
-        writeb(0x00, pi->shared_regs->sdma_intr_base + SDMA_INTR_CAUSE +
-               pi->port.line);
-        return;
+        writeb(0x00, pi->shared_regs->sdma_intr_base + SDMA_INTR_CAUSE
+                        + pi->port.line);
 }
 
-static inline void
-mpsc_sdma_set_rx_ring(struct mpsc_port_info *pi, struct mpsc_rx_desc *rxre_p)
+static void mpsc_sdma_set_rx_ring(struct mpsc_port_info *pi,
+                struct mpsc_rx_desc *rxre_p)
 {
         pr_debug("mpsc_sdma_set_rx_ring[%d]: rxre_p: 0x%x\n",
-                pi->port.line, (u32) rxre_p);
+                pi->port.line, (u32)rxre_p);
 
         writel((u32)rxre_p, pi->sdma_base + SDMA_SCRDP);
-        return;
 }
 
-static inline void
-mpsc_sdma_set_tx_ring(struct mpsc_port_info *pi, struct mpsc_tx_desc *txre_p)
+static void mpsc_sdma_set_tx_ring(struct mpsc_port_info *pi,
+                struct mpsc_tx_desc *txre_p)
 {
         writel((u32)txre_p, pi->sdma_base + SDMA_SFTDP);
         writel((u32)txre_p, pi->sdma_base + SDMA_SCTDP);
-        return;
 }
 
-static inline void
-mpsc_sdma_cmd(struct mpsc_port_info *pi, u32 val)
+static void mpsc_sdma_cmd(struct mpsc_port_info *pi, u32 val)
 {
         u32     v;
 
@@ -539,46 +513,40 @@ mpsc_sdma_cmd(struct mpsc_port_info *pi, u32 val)
         wmb();
         writel(v, pi->sdma_base + SDMA_SDCM);
         wmb();
-        return;
 }
 
-static inline uint
-mpsc_sdma_tx_active(struct mpsc_port_info *pi)
+static uint mpsc_sdma_tx_active(struct mpsc_port_info *pi)
 {
         return readl(pi->sdma_base + SDMA_SDCM) & SDMA_SDCM_TXD;
 }
 
-static inline void
-mpsc_sdma_start_tx(struct mpsc_port_info *pi)
+static void mpsc_sdma_start_tx(struct mpsc_port_info *pi)
 {
         struct mpsc_tx_desc *txre, *txre_p;
 
         /* If tx isn't running & there's a desc ready to go, start it */
         if (!mpsc_sdma_tx_active(pi)) {
-                txre = (struct mpsc_tx_desc *)(pi->txr +
-                        (pi->txr_tail * MPSC_TXRE_SIZE));
-                dma_cache_sync(pi->port.dev, (void *) txre, MPSC_TXRE_SIZE, DMA_FROM_DEVICE);
+                txre = (struct mpsc_tx_desc *)(pi->txr
+                                + (pi->txr_tail * MPSC_TXRE_SIZE));
+                dma_cache_sync(pi->port.dev, (void *)txre, MPSC_TXRE_SIZE,
+                                DMA_FROM_DEVICE);
 #if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
                 if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
                         invalidate_dcache_range((ulong)txre,
-                                (ulong)txre + MPSC_TXRE_SIZE);
+                                        (ulong)txre + MPSC_TXRE_SIZE);
 #endif
 
                 if (be32_to_cpu(txre->cmdstat) & SDMA_DESC_CMDSTAT_O) {
-                        txre_p = (struct mpsc_tx_desc *)(pi->txr_p +
-                                                         (pi->txr_tail *
-                                                          MPSC_TXRE_SIZE));
+                        txre_p = (struct mpsc_tx_desc *)
+                                (pi->txr_p + (pi->txr_tail * MPSC_TXRE_SIZE));
 
                         mpsc_sdma_set_tx_ring(pi, txre_p);
                         mpsc_sdma_cmd(pi, SDMA_SDCM_STD | SDMA_SDCM_TXD);
                 }
         }
-
-        return;
 }
 
-static inline void
-mpsc_sdma_stop(struct mpsc_port_info *pi)
+static void mpsc_sdma_stop(struct mpsc_port_info *pi)
 {
         pr_debug("mpsc_sdma_stop[%d]: Stopping SDMA\n", pi->port.line);
 
@@ -593,8 +561,6 @@ mpsc_sdma_stop(struct mpsc_port_info *pi)
         /* Disable interrupts */
         mpsc_sdma_intr_mask(pi, 0xf);
         mpsc_sdma_intr_ack(pi);
-
-        return;
 }
 
 /*
@@ -605,8 +571,7 @@ mpsc_sdma_stop(struct mpsc_port_info *pi)
  ******************************************************************************
  */
 
-static void
-mpsc_hw_init(struct mpsc_port_info *pi)
+static void mpsc_hw_init(struct mpsc_port_info *pi)
 {
         u32     v;
 
@@ -628,8 +593,7 @@ mpsc_hw_init(struct mpsc_port_info *pi)
                 v = (v & ~0xf0f) | 0x100;
                 pi->shared_regs->MPSC_TCRR_m = v;
                 writel(v, pi->shared_regs->mpsc_routing_base + MPSC_TCRR);
-        }
-        else {
+        } else {
                 v = readl(pi->shared_regs->mpsc_routing_base + MPSC_MRR);
                 v &= ~0x1c7;
                 writel(v, pi->shared_regs->mpsc_routing_base + MPSC_MRR);
@@ -646,7 +610,7 @@ mpsc_hw_init(struct mpsc_port_info *pi)
         /* Put MPSC in UART mode & enabel Tx/Rx egines */
         writel(0x000004c4, pi->mpsc_base + MPSC_MMCRL);
 
-        /* No preamble, 16x divider, low-latency,  */
+        /* No preamble, 16x divider, low-latency, */
         writel(0x04400400, pi->mpsc_base + MPSC_MMCRH);
 
         if (pi->mirror_regs) {
@@ -663,12 +627,9 @@ mpsc_hw_init(struct mpsc_port_info *pi)
         writel(0, pi->mpsc_base + MPSC_CHR_8);
         writel(0, pi->mpsc_base + MPSC_CHR_9);
         writel(0, pi->mpsc_base + MPSC_CHR_10);
-
-        return;
 }
 
-static inline void
-mpsc_enter_hunt(struct mpsc_port_info *pi)
+static void mpsc_enter_hunt(struct mpsc_port_info *pi)
 {
         pr_debug("mpsc_enter_hunt[%d]: Hunting...\n", pi->port.line);
 
@@ -677,20 +638,16 @@ mpsc_enter_hunt(struct mpsc_port_info *pi)
                         pi->mpsc_base + MPSC_CHR_2);
                 /* Erratum prevents reading CHR_2 so just delay for a while */
                 udelay(100);
-        }
-        else {
+        } else {
                 writel(readl(pi->mpsc_base + MPSC_CHR_2) | MPSC_CHR_2_EH,
-                        pi->mpsc_base + MPSC_CHR_2);
+                                pi->mpsc_base + MPSC_CHR_2);
 
                 while (readl(pi->mpsc_base + MPSC_CHR_2) & MPSC_CHR_2_EH)
                         udelay(10);
         }
-
-        return;
 }
 
-static inline void
-mpsc_freeze(struct mpsc_port_info *pi)
+static void mpsc_freeze(struct mpsc_port_info *pi)
 {
         u32     v;
 
@@ -703,11 +660,9 @@ mpsc_freeze(struct mpsc_port_info *pi)
         if (pi->mirror_regs)
                 pi->MPSC_MPCR_m = v;
         writel(v, pi->mpsc_base + MPSC_MPCR);
-        return;
 }
 
-static inline void
-mpsc_unfreeze(struct mpsc_port_info *pi)
+static void mpsc_unfreeze(struct mpsc_port_info *pi)
 {
         u32     v;
 
@@ -720,11 +675,9 @@ mpsc_unfreeze(struct mpsc_port_info *pi)
         writel(v, pi->mpsc_base + MPSC_MPCR);
 
         pr_debug("mpsc_unfreeze[%d]: Unfrozen\n", pi->port.line);
-        return;
 }
 
-static inline void
-mpsc_set_char_length(struct mpsc_port_info *pi, u32 len)
+static void mpsc_set_char_length(struct mpsc_port_info *pi, u32 len)
 {
         u32     v;
 
@@ -737,11 +690,9 @@ mpsc_set_char_length(struct mpsc_port_info *pi, u32 len)
         if (pi->mirror_regs)
                 pi->MPSC_MPCR_m = v;
         writel(v, pi->mpsc_base + MPSC_MPCR);
-        return;
 }
 
-static inline void
-mpsc_set_stop_bit_length(struct mpsc_port_info *pi, u32 len)
+static void mpsc_set_stop_bit_length(struct mpsc_port_info *pi, u32 len)
 {
         u32     v;
 
@@ -756,11 +707,9 @@ mpsc_set_stop_bit_length(struct mpsc_port_info *pi, u32 len)
         if (pi->mirror_regs)
                 pi->MPSC_MPCR_m = v;
         writel(v, pi->mpsc_base + MPSC_MPCR);
-        return;
 }
 
-static inline void
-mpsc_set_parity(struct mpsc_port_info *pi, u32 p)
+static void mpsc_set_parity(struct mpsc_port_info *pi, u32 p)
 {
         u32     v;
 
@@ -775,7 +724,6 @@ mpsc_set_parity(struct mpsc_port_info *pi, u32 p)
         if (pi->mirror_regs)
                 pi->MPSC_CHR_2_m = v;
         writel(v, pi->mpsc_base + MPSC_CHR_2);
-        return;
 }
 
 /*
@@ -786,8 +734,7 @@ mpsc_set_parity(struct mpsc_port_info *pi, u32 p)
  ******************************************************************************
  */
 
-static void
-mpsc_init_hw(struct mpsc_port_info *pi)
+static void mpsc_init_hw(struct mpsc_port_info *pi)
 {
         pr_debug("mpsc_init_hw[%d]: Initializing\n", pi->port.line);
 
@@ -796,12 +743,9 @@ mpsc_init_hw(struct mpsc_port_info *pi)
         mpsc_sdma_init(pi, dma_get_cache_alignment());  /* burst a cacheline */
         mpsc_sdma_stop(pi);
         mpsc_hw_init(pi);
-
-        return;
 }
 
-static int
-mpsc_alloc_ring_mem(struct mpsc_port_info *pi)
+static int mpsc_alloc_ring_mem(struct mpsc_port_info *pi)
 {
         int rc = 0;
 
@@ -812,11 +756,10 @@ mpsc_alloc_ring_mem(struct mpsc_port_info *pi)
                 if (!dma_supported(pi->port.dev, 0xffffffff)) {
                         printk(KERN_ERR "MPSC: Inadequate DMA support\n");
                         rc = -ENXIO;
-                }
-                else if ((pi->dma_region = dma_alloc_noncoherent(pi->port.dev,
-                        MPSC_DMA_ALLOC_SIZE, &pi->dma_region_p, GFP_KERNEL))
-                        == NULL) {
-
+                } else if ((pi->dma_region = dma_alloc_noncoherent(pi->port.dev,
+                                                MPSC_DMA_ALLOC_SIZE,
+                                                &pi->dma_region_p, GFP_KERNEL))
+                                == NULL) {
                         printk(KERN_ERR "MPSC: Can't alloc Desc region\n");
                         rc = -ENOMEM;
                 }
@@ -825,23 +768,19 @@ mpsc_alloc_ring_mem(struct mpsc_port_info *pi)
         return rc;
 }
 
-static void
-mpsc_free_ring_mem(struct mpsc_port_info *pi)
+static void mpsc_free_ring_mem(struct mpsc_port_info *pi)
 {
         pr_debug("mpsc_free_ring_mem[%d]: Freeing ring mem\n", pi->port.line);
 
         if (pi->dma_region) {
                 dma_free_noncoherent(pi->port.dev, MPSC_DMA_ALLOC_SIZE,
-                          pi->dma_region, pi->dma_region_p);
+                                pi->dma_region, pi->dma_region_p);
                 pi->dma_region = NULL;
-                pi->dma_region_p = (dma_addr_t) NULL;
+                pi->dma_region_p = (dma_addr_t)NULL;
         }
-
-        return;
 }
 
-static void
-mpsc_init_rings(struct mpsc_port_info *pi)
+static void mpsc_init_rings(struct mpsc_port_info *pi)
 {
         struct mpsc_rx_desc *rxre;
         struct mpsc_tx_desc *txre;
@@ -859,8 +798,8 @@ mpsc_init_rings(struct mpsc_port_info *pi)
          * Descriptors & buffers are multiples of cacheline size and must be
          * cacheline aligned.
          */
-        dp = ALIGN((u32) pi->dma_region, dma_get_cache_alignment());
-        dp_p = ALIGN((u32) pi->dma_region_p, dma_get_cache_alignment());
+        dp = ALIGN((u32)pi->dma_region, dma_get_cache_alignment());
+        dp_p = ALIGN((u32)pi->dma_region_p, dma_get_cache_alignment());
 
         /*
          * Partition dma region into rx ring descriptor, rx buffers,
@@ -871,8 +810,8 @@ mpsc_init_rings(struct mpsc_port_info *pi)
         dp += MPSC_RXR_SIZE;
         dp_p += MPSC_RXR_SIZE;
 
-        pi->rxb = (u8 *) dp;
-        pi->rxb_p = (u8 *) dp_p;
+        pi->rxb = (u8 *)dp;
+        pi->rxb_p = (u8 *)dp_p;
         dp += MPSC_RXB_SIZE;
         dp_p += MPSC_RXB_SIZE;
 
@@ -883,8 +822,8 @@ mpsc_init_rings(struct mpsc_port_info *pi)
         dp += MPSC_TXR_SIZE;
         dp_p += MPSC_TXR_SIZE;
 
-        pi->txb = (u8 *) dp;
-        pi->txb_p = (u8 *) dp_p;
+        pi->txb = (u8 *)dp;
+        pi->txb_p = (u8 *)dp_p;
 
         pi->txr_head = 0;
         pi->txr_tail = 0;
@@ -900,10 +839,9 @@ mpsc_init_rings(struct mpsc_port_info *pi)
 
                 rxre->bufsize = cpu_to_be16(MPSC_RXBE_SIZE);
                 rxre->bytecnt = cpu_to_be16(0);
-                rxre->cmdstat = cpu_to_be32(SDMA_DESC_CMDSTAT_O |
-                                            SDMA_DESC_CMDSTAT_EI |
-                                            SDMA_DESC_CMDSTAT_F |
-                                            SDMA_DESC_CMDSTAT_L);
+                rxre->cmdstat = cpu_to_be32(SDMA_DESC_CMDSTAT_O
+                                | SDMA_DESC_CMDSTAT_EI | SDMA_DESC_CMDSTAT_F
+                                | SDMA_DESC_CMDSTAT_L);
                 rxre->link = cpu_to_be32(dp_p + MPSC_RXRE_SIZE);
                 rxre->buf_ptr = cpu_to_be32(bp_p);
 
@@ -933,19 +871,19 @@ mpsc_init_rings(struct mpsc_port_info *pi)
         }
         txre->link = cpu_to_be32(pi->txr_p);    /* Wrap last back to first */
 
-        dma_cache_sync(pi->port.dev, (void *) pi->dma_region, MPSC_DMA_ALLOC_SIZE,
-                DMA_BIDIRECTIONAL);
+        dma_cache_sync(pi->port.dev, (void *)pi->dma_region,
+                        MPSC_DMA_ALLOC_SIZE, DMA_BIDIRECTIONAL);
 #if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
                 if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
                         flush_dcache_range((ulong)pi->dma_region,
-                                (ulong)pi->dma_region + MPSC_DMA_ALLOC_SIZE);
+                                        (ulong)pi->dma_region
+                                        + MPSC_DMA_ALLOC_SIZE);
 #endif
 
         return;
 }
 
-static void
-mpsc_uninit_rings(struct mpsc_port_info *pi)
+static void mpsc_uninit_rings(struct mpsc_port_info *pi)
 {
         pr_debug("mpsc_uninit_rings[%d]: Uninitializing rings\n",pi->port.line);
 
@@ -963,12 +901,9 @@ mpsc_uninit_rings(struct mpsc_port_info *pi)
         pi->txb_p = NULL;
         pi->txr_head = 0;
         pi->txr_tail = 0;
-
-        return;
 }
 
-static int
-mpsc_make_ready(struct mpsc_port_info *pi)
+static int mpsc_make_ready(struct mpsc_port_info *pi)
 {
         int rc;
 
@@ -993,8 +928,7 @@ mpsc_make_ready(struct mpsc_port_info *pi)
  ******************************************************************************
  */
 
-static inline int
-mpsc_rx_intr(struct mpsc_port_info *pi)
+static int mpsc_rx_intr(struct mpsc_port_info *pi)
 {
         struct mpsc_rx_desc *rxre;
         struct tty_struct *tty = pi->port.info->tty;
@@ -1007,21 +941,24 @@ mpsc_rx_intr(struct mpsc_port_info *pi)
 
         rxre = (struct mpsc_rx_desc *)(pi->rxr + (pi->rxr_posn*MPSC_RXRE_SIZE));
 
-        dma_cache_sync(pi->port.dev, (void *)rxre, MPSC_RXRE_SIZE, DMA_FROM_DEVICE);
+        dma_cache_sync(pi->port.dev, (void *)rxre, MPSC_RXRE_SIZE,
+                        DMA_FROM_DEVICE);
 #if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
         if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
                 invalidate_dcache_range((ulong)rxre,
-                        (ulong)rxre + MPSC_RXRE_SIZE);
+                                (ulong)rxre + MPSC_RXRE_SIZE);
 #endif
 
         /*
          * Loop through Rx descriptors handling ones that have been completed.
          */
-        while (!((cmdstat = be32_to_cpu(rxre->cmdstat)) & SDMA_DESC_CMDSTAT_O)){
+        while (!((cmdstat = be32_to_cpu(rxre->cmdstat))
+                                & SDMA_DESC_CMDSTAT_O)) {
                 bytes_in = be16_to_cpu(rxre->bytecnt);
 
                 /* Following use of tty struct directly is deprecated */
-                if (unlikely(tty_buffer_request_room(tty, bytes_in) < bytes_in)) {
+                if (unlikely(tty_buffer_request_room(tty, bytes_in)
+                                        < bytes_in)) {
                         if (tty->low_latency)
                                 tty_flip_buffer_push(tty);
                         /*
@@ -1031,11 +968,12 @@ mpsc_rx_intr(struct mpsc_port_info *pi)
                 }
 
                 bp = pi->rxb + (pi->rxr_posn * MPSC_RXBE_SIZE);
-                dma_cache_sync(pi->port.dev, (void *) bp, MPSC_RXBE_SIZE, DMA_FROM_DEVICE);
+                dma_cache_sync(pi->port.dev, (void *)bp, MPSC_RXBE_SIZE,
+                                DMA_FROM_DEVICE);
 #if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
                 if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
                         invalidate_dcache_range((ulong)bp,
-                                (ulong)bp + MPSC_RXBE_SIZE);
+                                        (ulong)bp + MPSC_RXBE_SIZE);
 #endif
 
                 /*
@@ -1046,8 +984,9 @@ mpsc_rx_intr(struct mpsc_port_info *pi)
                  * we'll assume there is no data in the buffer.
                  * If there is...it gets lost.
                  */
-                if (unlikely(cmdstat & (SDMA_DESC_CMDSTAT_BR |
-                        SDMA_DESC_CMDSTAT_FR | SDMA_DESC_CMDSTAT_OR))) {
+                if (unlikely(cmdstat & (SDMA_DESC_CMDSTAT_BR
+                                                | SDMA_DESC_CMDSTAT_FR
+                                                | SDMA_DESC_CMDSTAT_OR))) {
 
                         pi->port.icount.rx++;
 
@@ -1056,11 +995,11 @@ mpsc_rx_intr(struct mpsc_port_info *pi)
 
                                 if (uart_handle_break(&pi->port))
                                         goto next_frame;
-                        }
-                        else if (cmdstat & SDMA_DESC_CMDSTAT_FR)/* Framing */
+                        } else if (cmdstat & SDMA_DESC_CMDSTAT_FR) {
                                 pi->port.icount.frame++;
-                        else if (cmdstat & SDMA_DESC_CMDSTAT_OR) /* Overrun */
+                        } else if (cmdstat & SDMA_DESC_CMDSTAT_OR) {
                                 pi->port.icount.overrun++;
+                        }
 
                         cmdstat &= pi->port.read_status_mask;
 
@@ -1080,12 +1019,12 @@ mpsc_rx_intr(struct mpsc_port_info *pi)
                         goto next_frame;
                 }
 
-                if ((unlikely(cmdstat & (SDMA_DESC_CMDSTAT_BR |
-                        SDMA_DESC_CMDSTAT_FR | SDMA_DESC_CMDSTAT_OR))) &&
-                        !(cmdstat & pi->port.ignore_status_mask))
-
+                if ((unlikely(cmdstat & (SDMA_DESC_CMDSTAT_BR
+                                                | SDMA_DESC_CMDSTAT_FR
+                                                | SDMA_DESC_CMDSTAT_OR)))
+                                && !(cmdstat & pi->port.ignore_status_mask)) {
                         tty_insert_flip_char(tty, *bp, flag);
-                else {
+                } else {
                         for (i=0; i<bytes_in; i++)
                                 tty_insert_flip_char(tty, *bp++, TTY_NORMAL);
 
@@ -1095,29 +1034,29 @@ mpsc_rx_intr(struct mpsc_port_info *pi)
 next_frame:
                 rxre->bytecnt = cpu_to_be16(0);
                 wmb();
-                rxre->cmdstat = cpu_to_be32(SDMA_DESC_CMDSTAT_O |
-                                            SDMA_DESC_CMDSTAT_EI |
-                                            SDMA_DESC_CMDSTAT_F |
-                                            SDMA_DESC_CMDSTAT_L);
+                rxre->cmdstat = cpu_to_be32(SDMA_DESC_CMDSTAT_O
+                                | SDMA_DESC_CMDSTAT_EI | SDMA_DESC_CMDSTAT_F
+                                | SDMA_DESC_CMDSTAT_L);
                 wmb();
-                dma_cache_sync(pi->port.dev, (void *)rxre, MPSC_RXRE_SIZE, DMA_BIDIRECTIONAL);
+                dma_cache_sync(pi->port.dev, (void *)rxre, MPSC_RXRE_SIZE,
+                                DMA_BIDIRECTIONAL);
 #if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
                 if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
                         flush_dcache_range((ulong)rxre,
-                                (ulong)rxre + MPSC_RXRE_SIZE);
+                                        (ulong)rxre + MPSC_RXRE_SIZE);
 #endif
 
                 /* Advance to next descriptor */
                 pi->rxr_posn = (pi->rxr_posn + 1) & (MPSC_RXR_ENTRIES - 1);
-                rxre = (struct mpsc_rx_desc *)(pi->rxr +
-                        (pi->rxr_posn * MPSC_RXRE_SIZE));
-                dma_cache_sync(pi->port.dev, (void *)rxre, MPSC_RXRE_SIZE, DMA_FROM_DEVICE);
+                rxre = (struct mpsc_rx_desc *)
+                        (pi->rxr + (pi->rxr_posn * MPSC_RXRE_SIZE));
+                dma_cache_sync(pi->port.dev, (void *)rxre, MPSC_RXRE_SIZE,
+                                DMA_FROM_DEVICE);
 #if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
                 if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
                         invalidate_dcache_range((ulong)rxre,
-                                (ulong)rxre + MPSC_RXRE_SIZE);
+                                        (ulong)rxre + MPSC_RXRE_SIZE);
 #endif
-
                 rc = 1;
         }
 
@@ -1129,42 +1068,38 @@ next_frame:
         return rc;
 }
 
-static inline void
-mpsc_setup_tx_desc(struct mpsc_port_info *pi, u32 count, u32 intr)
+static void mpsc_setup_tx_desc(struct mpsc_port_info *pi, u32 count, u32 intr)
 {
         struct mpsc_tx_desc *txre;
 
-        txre = (struct mpsc_tx_desc *)(pi->txr +
-                (pi->txr_head * MPSC_TXRE_SIZE));
+        txre = (struct mpsc_tx_desc *)(pi->txr
+                        + (pi->txr_head * MPSC_TXRE_SIZE));
 
         txre->bytecnt = cpu_to_be16(count);
         txre->shadow = txre->bytecnt;
         wmb();                  /* ensure cmdstat is last field updated */
-        txre->cmdstat = cpu_to_be32(SDMA_DESC_CMDSTAT_O | SDMA_DESC_CMDSTAT_F |
-                                    SDMA_DESC_CMDSTAT_L | ((intr) ?
-                                                           SDMA_DESC_CMDSTAT_EI
-                                                           : 0));
+        txre->cmdstat = cpu_to_be32(SDMA_DESC_CMDSTAT_O | SDMA_DESC_CMDSTAT_F
+                        | SDMA_DESC_CMDSTAT_L
+                        | ((intr) ? SDMA_DESC_CMDSTAT_EI : 0));
         wmb();
-        dma_cache_sync(pi->port.dev, (void *) txre, MPSC_TXRE_SIZE, DMA_BIDIRECTIONAL);
+        dma_cache_sync(pi->port.dev, (void *)txre, MPSC_TXRE_SIZE,
+                        DMA_BIDIRECTIONAL);
 #if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
         if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
                 flush_dcache_range((ulong)txre,
-                        (ulong)txre + MPSC_TXRE_SIZE);
+                                (ulong)txre + MPSC_TXRE_SIZE);
 #endif
-
-        return;
 }
 
-static inline void
-mpsc_copy_tx_data(struct mpsc_port_info *pi)
+static void mpsc_copy_tx_data(struct mpsc_port_info *pi)
 {
         struct circ_buf *xmit = &pi->port.info->xmit;
         u8 *bp;
         u32 i;
 
         /* Make sure the desc ring isn't full */
-        while (CIRC_CNT(pi->txr_head, pi->txr_tail, MPSC_TXR_ENTRIES) <
-               (MPSC_TXR_ENTRIES - 1)) {
+        while (CIRC_CNT(pi->txr_head, pi->txr_tail, MPSC_TXR_ENTRIES)
+                        < (MPSC_TXR_ENTRIES - 1)) {
                 if (pi->port.x_char) {
                         /*
                          * Ideally, we should use the TCS field in
@@ -1178,11 +1113,11 @@ mpsc_copy_tx_data(struct mpsc_port_info *pi)
                         *bp = pi->port.x_char;
                         pi->port.x_char = 0;
                         i = 1;
-                }
-                else if (!uart_circ_empty(xmit) && !uart_tx_stopped(&pi->port)){
-                        i = min((u32) MPSC_TXBE_SIZE,
-                                (u32) uart_circ_chars_pending(xmit));
-                        i = min(i, (u32) CIRC_CNT_TO_END(xmit->head, xmit->tail,
+                } else if (!uart_circ_empty(xmit)
+                                && !uart_tx_stopped(&pi->port)) {
+                        i = min((u32)MPSC_TXBE_SIZE,
+                                (u32)uart_circ_chars_pending(xmit));
+                        i = min(i, (u32)CIRC_CNT_TO_END(xmit->head, xmit->tail,
                                 UART_XMIT_SIZE));
                         bp = pi->txb + (pi->txr_head * MPSC_TXBE_SIZE);
                         memcpy(bp, &xmit->buf[xmit->tail], i);
@@ -1190,27 +1125,25 @@ mpsc_copy_tx_data(struct mpsc_port_info *pi)
 
                         if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                                 uart_write_wakeup(&pi->port);
-                }
-                else /* All tx data copied into ring bufs */
+                } else { /* All tx data copied into ring bufs */
                         return;
+                }
 
-                dma_cache_sync(pi->port.dev, (void *) bp, MPSC_TXBE_SIZE, DMA_BIDIRECTIONAL);
+                dma_cache_sync(pi->port.dev, (void *)bp, MPSC_TXBE_SIZE,
+                                DMA_BIDIRECTIONAL);
 #if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
                 if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
                         flush_dcache_range((ulong)bp,
-                                (ulong)bp + MPSC_TXBE_SIZE);
+                                        (ulong)bp + MPSC_TXBE_SIZE);
 #endif
                 mpsc_setup_tx_desc(pi, i, 1);
 
                 /* Advance to next descriptor */
                 pi->txr_head = (pi->txr_head + 1) & (MPSC_TXR_ENTRIES - 1);
         }
-
-        return;
 }
 
-static inline int
-mpsc_tx_intr(struct mpsc_port_info *pi)
+static int mpsc_tx_intr(struct mpsc_port_info *pi)
 {
         struct mpsc_tx_desc *txre;
         int rc = 0;
@@ -1219,14 +1152,15 @@ mpsc_tx_intr(struct mpsc_port_info *pi)
         spin_lock_irqsave(&pi->tx_lock, iflags);
 
         if (!mpsc_sdma_tx_active(pi)) {
-                txre = (struct mpsc_tx_desc *)(pi->txr +
-                        (pi->txr_tail * MPSC_TXRE_SIZE));
+                txre = (struct mpsc_tx_desc *)(pi->txr
+                                + (pi->txr_tail * MPSC_TXRE_SIZE));
 
-                dma_cache_sync(pi->port.dev, (void *) txre, MPSC_TXRE_SIZE, DMA_FROM_DEVICE);
+                dma_cache_sync(pi->port.dev, (void *)txre, MPSC_TXRE_SIZE,
+                                DMA_FROM_DEVICE);
 #if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
                 if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
                         invalidate_dcache_range((ulong)txre,
-                                (ulong)txre + MPSC_TXRE_SIZE);
+                                        (ulong)txre + MPSC_TXRE_SIZE);
 #endif
 
                 while (!(be32_to_cpu(txre->cmdstat) & SDMA_DESC_CMDSTAT_O)) {
@@ -1238,14 +1172,14 @@ mpsc_tx_intr(struct mpsc_port_info *pi)
                         if (pi->txr_head == pi->txr_tail)
                                 break;
 
-                        txre = (struct mpsc_tx_desc *)(pi->txr +
-                                (pi->txr_tail * MPSC_TXRE_SIZE));
-                        dma_cache_sync(pi->port.dev, (void *) txre, MPSC_TXRE_SIZE,
-                                DMA_FROM_DEVICE);
+                        txre = (struct mpsc_tx_desc *)(pi->txr
+                                        + (pi->txr_tail * MPSC_TXRE_SIZE));
+                        dma_cache_sync(pi->port.dev, (void *)txre,
+                                        MPSC_TXRE_SIZE, DMA_FROM_DEVICE);
 #if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
                         if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
                                 invalidate_dcache_range((ulong)txre,
-                                        (ulong)txre + MPSC_TXRE_SIZE);
+                                                (ulong)txre + MPSC_TXRE_SIZE);
 #endif
                 }
 
@@ -1262,8 +1196,7 @@ mpsc_tx_intr(struct mpsc_port_info *pi)
  * the interrupt, then handle any completed Rx/Tx descriptors.  When done
  * handling those descriptors, we restart the Rx/Tx engines if they're stopped.
  */
-static irqreturn_t
-mpsc_sdma_intr(int irq, void *dev_id)
+static irqreturn_t mpsc_sdma_intr(int irq, void *dev_id)
 {
         struct mpsc_port_info *pi = dev_id;
         ulong iflags;
@@ -1290,8 +1223,7 @@ mpsc_sdma_intr(int irq, void *dev_id)
  *
  ******************************************************************************
  */
-static uint
-mpsc_tx_empty(struct uart_port *port)
+static uint mpsc_tx_empty(struct uart_port *port)
 {
         struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
         ulong iflags;
@@ -1304,21 +1236,18 @@ mpsc_tx_empty(struct uart_port *port)
         return rc;
 }
 
-static void
-mpsc_set_mctrl(struct uart_port *port, uint mctrl)
+static void mpsc_set_mctrl(struct uart_port *port, uint mctrl)
 {
         /* Have no way to set modem control lines AFAICT */
-        return;
 }
 
-static uint
-mpsc_get_mctrl(struct uart_port *port)
+static uint mpsc_get_mctrl(struct uart_port *port)
 {
         struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
         u32 mflags, status;
 
-        status = (pi->mirror_regs) ? pi->MPSC_CHR_10_m :
-                readl(pi->mpsc_base + MPSC_CHR_10);
+        status = (pi->mirror_regs) ? pi->MPSC_CHR_10_m
+                : readl(pi->mpsc_base + MPSC_CHR_10);
 
         mflags = 0;
         if (status & 0x1)
@@ -1329,19 +1258,16 @@ mpsc_get_mctrl(struct uart_port *port)
         return mflags | TIOCM_DSR;      /* No way to tell if DSR asserted */
 }
 
-static void
-mpsc_stop_tx(struct uart_port *port)
+static void mpsc_stop_tx(struct uart_port *port)
 {
         struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
 
         pr_debug("mpsc_stop_tx[%d]\n", port->line);
 
         mpsc_freeze(pi);
-        return;
 }
 
-static void
-mpsc_start_tx(struct uart_port *port)
+static void mpsc_start_tx(struct uart_port *port)
 {
         struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
         unsigned long iflags;
@@ -1355,42 +1281,45 @@ mpsc_start_tx(struct uart_port *port)
         spin_unlock_irqrestore(&pi->tx_lock, iflags);
 
         pr_debug("mpsc_start_tx[%d]\n", port->line);
-        return;
 }
 
-static void
-mpsc_start_rx(struct mpsc_port_info *pi)
+static void mpsc_start_rx(struct mpsc_port_info *pi)
 {
         pr_debug("mpsc_start_rx[%d]: Starting...\n", pi->port.line);
 
-        /* Issue a Receive Abort to clear any receive errors */
-        writel(MPSC_CHR_2_RA, pi->mpsc_base + MPSC_CHR_2);
         if (pi->rcv_data) {
                 mpsc_enter_hunt(pi);
                 mpsc_sdma_cmd(pi, SDMA_SDCM_ERD);
         }
-        return;
 }
 
-static void
-mpsc_stop_rx(struct uart_port *port)
+static void mpsc_stop_rx(struct uart_port *port)
 {
         struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
 
         pr_debug("mpsc_stop_rx[%d]: Stopping...\n", port->line);
 
+        if (pi->mirror_regs) {
+                writel(pi->MPSC_CHR_2_m | MPSC_CHR_2_RA,
+                                pi->mpsc_base + MPSC_CHR_2);
+                /* Erratum prevents reading CHR_2 so just delay for a while */
+                udelay(100);
+        } else {
+                writel(readl(pi->mpsc_base + MPSC_CHR_2) | MPSC_CHR_2_RA,
+                                pi->mpsc_base + MPSC_CHR_2);
+
+                while (readl(pi->mpsc_base + MPSC_CHR_2) & MPSC_CHR_2_RA)
+                        udelay(10);
+        }
+
         mpsc_sdma_cmd(pi, SDMA_SDCM_AR);
-        return;
 }
 
-static void
-mpsc_enable_ms(struct uart_port *port)
+static void mpsc_enable_ms(struct uart_port *port)
 {
-        return;                 /* Not supported */
 }
 
-static void
-mpsc_break_ctl(struct uart_port *port, int ctl)
+static void mpsc_break_ctl(struct uart_port *port, int ctl)
 {
         struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
         ulong   flags;
@@ -1403,12 +1332,9 @@ mpsc_break_ctl(struct uart_port *port, int ctl)
                 pi->MPSC_CHR_1_m = v;
         writel(v, pi->mpsc_base + MPSC_CHR_1);
         spin_unlock_irqrestore(&pi->port.lock, flags);
-
-        return;
 }
 
-static int
-mpsc_startup(struct uart_port *port)
+static int mpsc_startup(struct uart_port *port)
 {
         struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
         u32 flag = 0;
@@ -1426,20 +1352,19 @@ mpsc_startup(struct uart_port *port)
                         flag = IRQF_SHARED;
 
                 if (request_irq(pi->port.irq, mpsc_sdma_intr, flag,
-                                "mpsc-sdma", pi))
+                                        "mpsc-sdma", pi))
                         printk(KERN_ERR "MPSC: Can't get SDMA IRQ %d\n",
-                               pi->port.irq);
+                                        pi->port.irq);
 
                 mpsc_sdma_intr_unmask(pi, 0xf);
-                mpsc_sdma_set_rx_ring(pi, (struct mpsc_rx_desc *)(pi->rxr_p +
-                        (pi->rxr_posn * MPSC_RXRE_SIZE)));
+                mpsc_sdma_set_rx_ring(pi, (struct mpsc_rx_desc *)(pi->rxr_p
+                                        + (pi->rxr_posn * MPSC_RXRE_SIZE)));
         }
 
         return rc;
 }
 
-static void
-mpsc_shutdown(struct uart_port *port)
+static void mpsc_shutdown(struct uart_port *port)
 {
         struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
 
@@ -1447,11 +1372,9 @@ mpsc_shutdown(struct uart_port *port)
 
         mpsc_sdma_stop(pi);
         free_irq(pi->port.irq, pi);
-        return;
 }
 
-static void
-mpsc_set_termios(struct uart_port *port, struct ktermios *termios,
+static void mpsc_set_termios(struct uart_port *port, struct ktermios *termios,
                  struct ktermios *old)
 {
         struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
@@ -1508,12 +1431,11 @@ mpsc_set_termios(struct uart_port *port, struct ktermios *termios,
         mpsc_set_baudrate(pi, baud);
 
         /* Characters/events to read */
-        pi->rcv_data = 1;
         pi->port.read_status_mask = SDMA_DESC_CMDSTAT_OR;
 
         if (termios->c_iflag & INPCK)
-                pi->port.read_status_mask |= SDMA_DESC_CMDSTAT_PE |
-                    SDMA_DESC_CMDSTAT_FR;
+                pi->port.read_status_mask |= SDMA_DESC_CMDSTAT_PE
+                        | SDMA_DESC_CMDSTAT_FR;
 
         if (termios->c_iflag & (BRKINT | PARMRK))
                 pi->port.read_status_mask |= SDMA_DESC_CMDSTAT_BR;
@@ -1522,8 +1444,8 @@ mpsc_set_termios(struct uart_port *port, struct ktermios *termios,
         pi->port.ignore_status_mask = 0;
 
         if (termios->c_iflag & IGNPAR)
-                pi->port.ignore_status_mask |= SDMA_DESC_CMDSTAT_PE |
-                    SDMA_DESC_CMDSTAT_FR;
+                pi->port.ignore_status_mask |= SDMA_DESC_CMDSTAT_PE
+                        | SDMA_DESC_CMDSTAT_FR;
 
         if (termios->c_iflag & IGNBRK) {
                 pi->port.ignore_status_mask |= SDMA_DESC_CMDSTAT_BR;
@@ -1532,32 +1454,32 @@ mpsc_set_termios(struct uart_port *port, struct ktermios *termios,
                         pi->port.ignore_status_mask |= SDMA_DESC_CMDSTAT_OR;
         }
 
-        /* Ignore all chars if CREAD not set */
-        if (!(termios->c_cflag & CREAD))
+        if ((termios->c_cflag & CREAD)) {
+                if (!pi->rcv_data) {
+                        pi->rcv_data = 1;
+                        mpsc_start_rx(pi);
+                }
+        } else if (pi->rcv_data) {
+                mpsc_stop_rx(port);
                 pi->rcv_data = 0;
-        else
-                mpsc_start_rx(pi);
+        }
 
         spin_unlock_irqrestore(&pi->port.lock, flags);
-        return;
 }
 
-static const char *
-mpsc_type(struct uart_port *port)
+static const char *mpsc_type(struct uart_port *port)
 {
         pr_debug("mpsc_type[%d]: port type: %s\n", port->line,MPSC_DRIVER_NAME);
         return MPSC_DRIVER_NAME;
 }
 
-static int
-mpsc_request_port(struct uart_port *port)
+static int mpsc_request_port(struct uart_port *port)
 {
         /* Should make chip/platform specific call */
         return 0;
 }
 
-static void
-mpsc_release_port(struct uart_port *port)
+static void mpsc_release_port(struct uart_port *port)
 {
         struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
 
@@ -1566,18 +1488,13 @@ mpsc_release_port(struct uart_port *port)
                 mpsc_free_ring_mem(pi);
                 pi->ready = 0;
         }
-
-        return;
 }
 
-static void
-mpsc_config_port(struct uart_port *port, int flags)
+static void mpsc_config_port(struct uart_port *port, int flags)
 {
-        return;
 }
 
-static int
-mpsc_verify_port(struct uart_port *port, struct serial_struct *ser)
+static int mpsc_verify_port(struct uart_port *port, struct serial_struct *ser)
 {
         struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
         int rc = 0;
@@ -1603,22 +1520,22 @@ mpsc_verify_port(struct uart_port *port, struct serial_struct *ser)
 }
 
 static struct uart_ops mpsc_pops = {
-        .tx_empty     = mpsc_tx_empty,
-        .set_mctrl    = mpsc_set_mctrl,
-        .get_mctrl    = mpsc_get_mctrl,
-        .stop_tx      = mpsc_stop_tx,
-        .start_tx     = mpsc_start_tx,
-        .stop_rx      = mpsc_stop_rx,
-        .enable_ms    = mpsc_enable_ms,
-        .break_ctl    = mpsc_break_ctl,
-        .startup      = mpsc_startup,
-        .shutdown     = mpsc_shutdown,
-        .set_termios  = mpsc_set_termios,
-        .type         = mpsc_type,
-        .release_port = mpsc_release_port,
-        .request_port = mpsc_request_port,
-        .config_port  = mpsc_config_port,
-        .verify_port  = mpsc_verify_port,
+        .tx_empty       = mpsc_tx_empty,
+        .set_mctrl      = mpsc_set_mctrl,
+        .get_mctrl      = mpsc_get_mctrl,
+        .stop_tx        = mpsc_stop_tx,
+        .start_tx       = mpsc_start_tx,
+        .stop_rx        = mpsc_stop_rx,
+        .enable_ms      = mpsc_enable_ms,
+        .break_ctl      = mpsc_break_ctl,
+        .startup        = mpsc_startup,
+        .shutdown       = mpsc_shutdown,
+        .set_termios    = mpsc_set_termios,
+        .type           = mpsc_type,
+        .release_port   = mpsc_release_port,
+        .request_port   = mpsc_request_port,
+        .config_port    = mpsc_config_port,
+        .verify_port    = mpsc_verify_port,
 };
 
 /*
@@ -1630,8 +1547,7 @@ static struct uart_ops mpsc_pops = {
  */
 
 #ifdef CONFIG_SERIAL_MPSC_CONSOLE
-static void
-mpsc_console_write(struct console *co, const char *s, uint count)
+static void mpsc_console_write(struct console *co, const char *s, uint count)
 {
         struct mpsc_port_info *pi = &mpsc_ports[co->index];
         u8 *bp, *dp, add_cr = 0;
@@ -1660,8 +1576,7 @@ mpsc_console_write(struct console *co, const char *s, uint count)
                         if (add_cr) {
                                 *(dp++) = '\r';
                                 add_cr = 0;
-                        }
-                        else {
+                        } else {
                                 *(dp++) = *s;
 
                                 if (*(s++) == '\n') { /* add '\r' after '\n' */
@@ -1673,11 +1588,12 @@ mpsc_console_write(struct console *co, const char *s, uint count)
                         count--;
                 }
 
-                dma_cache_sync(pi->port.dev, (void *) bp, MPSC_TXBE_SIZE, DMA_BIDIRECTIONAL);
+                dma_cache_sync(pi->port.dev, (void *)bp, MPSC_TXBE_SIZE,
+                                DMA_BIDIRECTIONAL);
 #if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
                 if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
                         flush_dcache_range((ulong)bp,
-                                (ulong)bp + MPSC_TXBE_SIZE);
+                                        (ulong)bp + MPSC_TXBE_SIZE);
 #endif
                 mpsc_setup_tx_desc(pi, i, 0);
                 pi->txr_head = (pi->txr_head + 1) & (MPSC_TXR_ENTRIES - 1);
@@ -1690,11 +1606,9 @@ mpsc_console_write(struct console *co, const char *s, uint count)
         }
 
         spin_unlock_irqrestore(&pi->tx_lock, iflags);
-        return;
 }
 
-static int __init
-mpsc_console_setup(struct console *co, char *options)
+static int __init mpsc_console_setup(struct console *co, char *options)
 {
         struct mpsc_port_info *pi;
         int baud, bits, parity, flow;
@@ -1723,17 +1637,16 @@ mpsc_console_setup(struct console *co, char *options)
 }
 
 static struct console mpsc_console = {
-        .name   = MPSC_DEV_NAME,
-        .write  = mpsc_console_write,
-        .device = uart_console_device,
-        .setup  = mpsc_console_setup,
-        .flags  = CON_PRINTBUFFER,
-        .index  = -1,
-        .data   = &mpsc_reg,
+        .name   = MPSC_DEV_NAME,
+        .write  = mpsc_console_write,
+        .device = uart_console_device,
+        .setup  = mpsc_console_setup,
+        .flags  = CON_PRINTBUFFER,
+        .index  = -1,
+        .data   = &mpsc_reg,
 };
 
-static int __init
-mpsc_late_console_init(void)
+static int __init mpsc_late_console_init(void)
 {
         pr_debug("mpsc_late_console_init: Enter\n");
 
@@ -1755,43 +1668,40 @@ late_initcall(mpsc_late_console_init);
  *
  ******************************************************************************
  */
-static void
-mpsc_resource_err(char *s)
+static void mpsc_resource_err(char *s)
 {
         printk(KERN_WARNING "MPSC: Platform device resource error in %s\n", s);
-        return;
 }
 
-static int
-mpsc_shared_map_regs(struct platform_device *pd)
+static int mpsc_shared_map_regs(struct platform_device *pd)
 {
         struct resource *r;
 
         if ((r = platform_get_resource(pd, IORESOURCE_MEM,
-                MPSC_ROUTING_BASE_ORDER)) && request_mem_region(r->start,
-                MPSC_ROUTING_REG_BLOCK_SIZE, "mpsc_routing_regs")) {
-
+                                        MPSC_ROUTING_BASE_ORDER))
+                        && request_mem_region(r->start,
+                                MPSC_ROUTING_REG_BLOCK_SIZE,
+                                "mpsc_routing_regs")) {
                 mpsc_shared_regs.mpsc_routing_base = ioremap(r->start,
-                        MPSC_ROUTING_REG_BLOCK_SIZE);
+                                MPSC_ROUTING_REG_BLOCK_SIZE);
                 mpsc_shared_regs.mpsc_routing_base_p = r->start;
-        }
-        else {
+        } else {
                 mpsc_resource_err("MPSC routing base");
                 return -ENOMEM;
         }
 
         if ((r = platform_get_resource(pd, IORESOURCE_MEM,
-                MPSC_SDMA_INTR_BASE_ORDER)) && request_mem_region(r->start,
-                MPSC_SDMA_INTR_REG_BLOCK_SIZE, "sdma_intr_regs")) {
-
+                                        MPSC_SDMA_INTR_BASE_ORDER))
+                        && request_mem_region(r->start,
+                                MPSC_SDMA_INTR_REG_BLOCK_SIZE,
+                                "sdma_intr_regs")) {
                 mpsc_shared_regs.sdma_intr_base = ioremap(r->start,
                         MPSC_SDMA_INTR_REG_BLOCK_SIZE);
                 mpsc_shared_regs.sdma_intr_base_p = r->start;
-        }
-        else {
+        } else {
                 iounmap(mpsc_shared_regs.mpsc_routing_base);
                 release_mem_region(mpsc_shared_regs.mpsc_routing_base_p,
-                        MPSC_ROUTING_REG_BLOCK_SIZE);
+                                MPSC_ROUTING_REG_BLOCK_SIZE);
                 mpsc_resource_err("SDMA intr base");
                 return -ENOMEM;
         }
@@ -1799,18 +1709,17 @@ mpsc_shared_map_regs(struct platform_device *pd)
         return 0;
 }
 
-static void
-mpsc_shared_unmap_regs(void)
+static void mpsc_shared_unmap_regs(void)
 {
         if (!mpsc_shared_regs.mpsc_routing_base) {
                 iounmap(mpsc_shared_regs.mpsc_routing_base);
                 release_mem_region(mpsc_shared_regs.mpsc_routing_base_p,
-                        MPSC_ROUTING_REG_BLOCK_SIZE);
+                                MPSC_ROUTING_REG_BLOCK_SIZE);
         }
         if (!mpsc_shared_regs.sdma_intr_base) {
                 iounmap(mpsc_shared_regs.sdma_intr_base);
                 release_mem_region(mpsc_shared_regs.sdma_intr_base_p,
-                        MPSC_SDMA_INTR_REG_BLOCK_SIZE);
+                                MPSC_SDMA_INTR_REG_BLOCK_SIZE);
         }
 
         mpsc_shared_regs.mpsc_routing_base = NULL;
@@ -1818,19 +1727,17 @@ mpsc_shared_unmap_regs(void)
 
         mpsc_shared_regs.mpsc_routing_base_p = 0;
         mpsc_shared_regs.sdma_intr_base_p = 0;
-
-        return;
 }
 
-static int
-mpsc_shared_drv_probe(struct platform_device *dev)
+static int mpsc_shared_drv_probe(struct platform_device *dev)
 {
         struct mpsc_shared_pdata        *pdata;
         int                              rc = -ENODEV;
 
         if (dev->id == 0) {
-                if (!(rc = mpsc_shared_map_regs(dev)))  {
-                        pdata = (struct mpsc_shared_pdata *)dev->dev.platform_data;
+                if (!(rc = mpsc_shared_map_regs(dev))) {
+                        pdata = (struct mpsc_shared_pdata *)
+                                dev->dev.platform_data;
 
                         mpsc_shared_regs.MPSC_MRR_m = pdata->mrr_val;
                         mpsc_shared_regs.MPSC_RCRR_m= pdata->rcrr_val;
@@ -1847,8 +1754,7 @@ mpsc_shared_drv_probe(struct platform_device *dev)
         return rc;
 }
 
-static int
-mpsc_shared_drv_remove(struct platform_device *dev)
+static int mpsc_shared_drv_remove(struct platform_device *dev)
 {
         int     rc = -ENODEV;
 
@@ -1869,7 +1775,7 @@ static struct platform_driver mpsc_shared_driver = {
         .probe  = mpsc_shared_drv_probe,
         .remove = mpsc_shared_drv_remove,
         .driver = {
-                .name = MPSC_SHARED_NAME,
+                .name   = MPSC_SHARED_NAME,
         },
 };
 
@@ -1881,55 +1787,51 @@ static struct platform_driver mpsc_shared_driver = {
  ******************************************************************************
  */
 static struct uart_driver mpsc_reg = {
-        .owner       = THIS_MODULE,
-        .driver_name = MPSC_DRIVER_NAME,
-        .dev_name    = MPSC_DEV_NAME,
-        .major       = MPSC_MAJOR,
-        .minor       = MPSC_MINOR_START,
-        .nr          = MPSC_NUM_CTLRS,
-        .cons        = MPSC_CONSOLE,
+        .owner          = THIS_MODULE,
+        .driver_name    = MPSC_DRIVER_NAME,
+        .dev_name       = MPSC_DEV_NAME,
+        .major          = MPSC_MAJOR,
+        .minor          = MPSC_MINOR_START,
+        .nr             = MPSC_NUM_CTLRS,
+        .cons           = MPSC_CONSOLE,
 };
 
-static int
-mpsc_drv_map_regs(struct mpsc_port_info *pi, struct platform_device *pd)
+static int mpsc_drv_map_regs(struct mpsc_port_info *pi,
+                struct platform_device *pd)
 {
         struct resource *r;
 
-        if ((r = platform_get_resource(pd, IORESOURCE_MEM, MPSC_BASE_ORDER)) &&
-                request_mem_region(r->start, MPSC_REG_BLOCK_SIZE, "mpsc_regs")){
-
+        if ((r = platform_get_resource(pd, IORESOURCE_MEM, MPSC_BASE_ORDER))
+                        && request_mem_region(r->start, MPSC_REG_BLOCK_SIZE,
+                        "mpsc_regs")) {
                 pi->mpsc_base = ioremap(r->start, MPSC_REG_BLOCK_SIZE);
                 pi->mpsc_base_p = r->start;
-        }
-        else {
+        } else {
                 mpsc_resource_err("MPSC base");
-                return -ENOMEM;
+                goto err;
         }
 
         if ((r = platform_get_resource(pd, IORESOURCE_MEM,
-                MPSC_SDMA_BASE_ORDER)) && request_mem_region(r->start,
-                MPSC_SDMA_REG_BLOCK_SIZE, "sdma_regs")) {
-
+                                        MPSC_SDMA_BASE_ORDER))
+                        && request_mem_region(r->start,
+                                MPSC_SDMA_REG_BLOCK_SIZE, "sdma_regs")) {
                 pi->sdma_base = ioremap(r->start,MPSC_SDMA_REG_BLOCK_SIZE);
                 pi->sdma_base_p = r->start;
-        }
-        else {
+        } else {
                 mpsc_resource_err("SDMA base");
                 if (pi->mpsc_base) {
                         iounmap(pi->mpsc_base);
                         pi->mpsc_base = NULL;
                 }
-                return -ENOMEM;
+                goto err;
         }
 
         if ((r = platform_get_resource(pd,IORESOURCE_MEM,MPSC_BRG_BASE_ORDER))
-                && request_mem_region(r->start, MPSC_BRG_REG_BLOCK_SIZE,
-                "brg_regs")) {
-
+                        && request_mem_region(r->start,
+                                MPSC_BRG_REG_BLOCK_SIZE, "brg_regs")) {
                 pi->brg_base = ioremap(r->start, MPSC_BRG_REG_BLOCK_SIZE);
                 pi->brg_base_p = r->start;
-        }
-        else {
+        } else {
                 mpsc_resource_err("BRG base");
                 if (pi->mpsc_base) {
                         iounmap(pi->mpsc_base);
@@ -1939,14 +1841,15 @@ mpsc_drv_map_regs(struct mpsc_port_info *pi, struct platform_device *pd)
                         iounmap(pi->sdma_base);
                         pi->sdma_base = NULL;
                 }
-                return -ENOMEM;
+                goto err;
         }
-
         return 0;
+
+err:
+        return -ENOMEM;
 }
 
-static void
-mpsc_drv_unmap_regs(struct mpsc_port_info *pi)
+static void mpsc_drv_unmap_regs(struct mpsc_port_info *pi)
 {
         if (!pi->mpsc_base) {
                 iounmap(pi->mpsc_base);
@@ -1968,13 +1871,10 @@ mpsc_drv_unmap_regs(struct mpsc_port_info *pi)
         pi->mpsc_base_p = 0;
         pi->sdma_base_p = 0;
         pi->brg_base_p = 0;
-
-        return;
 }
 
-static void
-mpsc_drv_get_platform_data(struct mpsc_port_info *pi,
-        struct platform_device *pd, int num)
+static void mpsc_drv_get_platform_data(struct mpsc_port_info *pi,
+                struct platform_device *pd, int num)
 {
         struct mpsc_pdata       *pdata;
 
@@ -2009,12 +1909,9 @@ mpsc_drv_get_platform_data(struct mpsc_port_info *pi,
         pi->shared_regs = &mpsc_shared_regs;
 
         pi->port.irq = platform_get_irq(pd, 0);
-
-        return;
 }
 
-static int
-mpsc_drv_probe(struct platform_device *dev)
+static int mpsc_drv_probe(struct platform_device *dev)
 {
         struct mpsc_port_info   *pi;
         int                     rc = -ENODEV;
@@ -2030,47 +1927,46 @@ mpsc_drv_probe(struct platform_device *dev)
                         if (!(rc = mpsc_make_ready(pi))) {
                                 spin_lock_init(&pi->tx_lock);
                                 if (!(rc = uart_add_one_port(&mpsc_reg,
-                                        &pi->port)))
+                                                                &pi->port))) {
                                         rc = 0;
-                                else {
-                                        mpsc_release_port(
-                                                (struct uart_port *)pi);
+                                } else {
+                                        mpsc_release_port((struct uart_port *)
+                                                        pi);
                                         mpsc_drv_unmap_regs(pi);
                                 }
-                        }
-                        else
+                        } else {
                                 mpsc_drv_unmap_regs(pi);
+                        }
                 }
         }
 
         return rc;
 }
 
-static int
-mpsc_drv_remove(struct platform_device *dev)
+static int mpsc_drv_remove(struct platform_device *dev)
 {
         pr_debug("mpsc_drv_exit: Removing MPSC %d\n", dev->id);
 
         if (dev->id < MPSC_NUM_CTLRS) {
                 uart_remove_one_port(&mpsc_reg, &mpsc_ports[dev->id].port);
-                mpsc_release_port((struct uart_port *)&mpsc_ports[dev->id].port);
+                mpsc_release_port((struct uart_port *)
+                                &mpsc_ports[dev->id].port);
                 mpsc_drv_unmap_regs(&mpsc_ports[dev->id]);
                 return 0;
-        }
-        else
+        } else {
                 return -ENODEV;
+        }
 }
 
 static struct platform_driver mpsc_driver = {
         .probe  = mpsc_drv_probe,
         .remove = mpsc_drv_remove,
         .driver = {
-                .name = MPSC_CTLR_NAME,
+                .name   = MPSC_CTLR_NAME,
         },
 };
 
-static int __init
-mpsc_drv_init(void)
+static int __init mpsc_drv_init(void)
 {
         int     rc;
 
@@ -2085,24 +1981,21 @@ mpsc_drv_init(void)
                                 platform_driver_unregister(&mpsc_shared_driver);
                                 uart_unregister_driver(&mpsc_reg);
                         }
-                }
-                else
+                } else {
                         uart_unregister_driver(&mpsc_reg);
+                }
         }
 
         return rc;
-
 }
 
-static void __exit
-mpsc_drv_exit(void)
+static void __exit mpsc_drv_exit(void)
 {
         platform_driver_unregister(&mpsc_driver);
         platform_driver_unregister(&mpsc_shared_driver);
         uart_unregister_driver(&mpsc_reg);
         memset(mpsc_ports, 0, sizeof(mpsc_ports));
         memset(&mpsc_shared_regs, 0, sizeof(mpsc_shared_regs));
-        return;
 }
 
 module_init(mpsc_drv_init);
diff --git a/drivers/serial/sb1250-duart.c b/drivers/serial/sb1250-duart.c
index 1d9d7285172a..201253755011 100644
--- a/drivers/serial/sb1250-duart.c
+++ b/drivers/serial/sb1250-duart.c
@@ -25,6 +25,7 @@
 #define SUPPORT_SYSRQ
 #endif
 
+#include <linux/compiler.h>
 #include <linux/console.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
@@ -103,8 +104,6 @@ struct sbd_duart {
 
 static struct sbd_duart sbd_duarts[DUART_MAX_CHIP];
 
-#define __unused __attribute__((__unused__))
-
 
 /*
  * Reading and writing SB1250 DUART registers.
@@ -204,12 +203,12 @@ static int sbd_receive_drain(struct sbd_port *sport)
         return loops;
 }
 
-static int __unused sbd_transmit_ready(struct sbd_port *sport)
+static int __maybe_unused sbd_transmit_ready(struct sbd_port *sport)
 {
         return read_sbdchn(sport, R_DUART_STATUS) & M_DUART_TX_RDY;
 }
 
-static int __unused sbd_transmit_drain(struct sbd_port *sport)
+static int __maybe_unused sbd_transmit_drain(struct sbd_port *sport)
 {
         int loops = 10000;
 
@@ -664,7 +663,7 @@ static void sbd_release_port(struct uart_port *uport)
 
 static int sbd_map_port(struct uart_port *uport)
 {
-        static const char *err = KERN_ERR "sbd: Cannot map MMIO\n";
+        const char *err = KERN_ERR "sbd: Cannot map MMIO\n";
         struct sbd_port *sport = to_sport(uport);
         struct sbd_duart *duart = sport->duart;
 
@@ -691,8 +690,7 @@ static int sbd_map_port(struct uart_port *uport)
 
 static int sbd_request_port(struct uart_port *uport)
 {
-        static const char *err = KERN_ERR
-                                 "sbd: Unable to reserve MMIO resource\n";
+        const char *err = KERN_ERR "sbd: Unable to reserve MMIO resource\n";
         struct sbd_duart *duart = to_sport(uport)->duart;
         int map_guard;
         int ret = 0;
@@ -755,7 +753,7 @@ static int sbd_verify_port(struct uart_port *uport, struct serial_struct *ser)
 }
 
 
-static struct uart_ops sbd_ops = {
+static const struct uart_ops sbd_ops = {
         .tx_empty       = sbd_tx_empty,
         .set_mctrl      = sbd_set_mctrl,
         .get_mctrl      = sbd_get_mctrl,
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
index 1deb5764326d..b8f91e018b21 100644
--- a/drivers/serial/serial_txx9.c
+++ b/drivers/serial/serial_txx9.c
@@ -1043,8 +1043,9 @@ static int __devinit serial_txx9_probe(struct platform_device *dev)
                 ret = serial_txx9_register_port(&port);
                 if (ret < 0) {
                         dev_err(&dev->dev, "unable to register port at index %d "
-                                "(IO%x MEM%lx IRQ%d): %d\n", i,
-                                p->iobase, p->mapbase, p->irq, ret);
+                                "(IO%x MEM%llx IRQ%d): %d\n", i,
+                                p->iobase, (unsigned long long)p->mapbase,
+                                p->irq, ret);
                 }
         }
         return 0;
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 672cd1042539..053fca41b08a 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -12,6 +12,7 @@
  *   Modified to support multiple serial ports. Stuart Menefy (May 2000).
  *   Modified to support SecureEdge. David McCullough (2002)
  *   Modified to support SH7300 SCIF. Takashi Kusuda (Jun 2003).
+ *   Removed SH7300 support (Jul 2007).
  *
  * 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
@@ -289,13 +290,7 @@ static void sci_init_pins_irda(struct uart_port *port, unsigned int cflag)
 #endif
 
 #if defined(SCIF_ONLY) || defined(SCI_AND_SCIF)
-#if defined(CONFIG_CPU_SUBTYPE_SH7300) 
-/* SH7300 doesn't use RTS/CTS */
-static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
-{
-        sci_out(port, SCFCR, 0);
-}
-#elif defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712)
+#if defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712)
 static void sci_init_pins_scif(struct uart_port* port, unsigned int cflag)
 {
         unsigned int fcr_val = 0;
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h
index 247fb66bf0f4..cf75466ebf57 100644
--- a/drivers/serial/sh-sci.h
+++ b/drivers/serial/sh-sci.h
@@ -9,6 +9,7 @@
  *  Modified to support multiple serial ports. Stuart Menefy (May 2000).
  *  Modified to support SH7300(SH-Mobile) SCIF. Takashi Kusuda (Jun 2003).
  *  Modified to support H8/300 Series Yoshinori Sato (Feb 2004).
+ *  Removed SH7300 support (Jul 2007).
  */
 #include <linux/serial_core.h>
 #include <asm/io.h>
@@ -23,13 +24,10 @@
 #endif
 #endif
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7708)
-# define SCSPTR 0xffffff7c /* 8 bit */
-# define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
-# define SCI_ONLY
-#elif defined(CONFIG_CPU_SUBTYPE_SH7707) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7709) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7706)
+#if defined(CONFIG_CPU_SUBTYPE_SH7706) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7707) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7708) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7709)
 # define SCPCR  0xA4000116 /* 16 bit SCI and SCIF */
 # define SCPDR  0xA4000136 /* 8  bit SCI and SCIF */
 # define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
@@ -73,11 +71,6 @@
 # define SCIF_ORER 0x0001  /* overrun error bit */
 # define SCSCR_INIT(port)          0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
 # define SCIF_ONLY
-#elif defined(CONFIG_CPU_SUBTYPE_SH7300)
-# define SCPCR  0xA4050116        /* 16 bit SCIF */
-# define SCPDR  0xA4050136        /* 16 bit SCIF */
-# define SCSCR_INIT(port)  0x0030 /* TIE=0,RIE=0,TE=1,RE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712)
 # define SCSPTR0 0xA4400000       /* 16 bit SCIF */
 # define SCI_NPORTS 2
@@ -86,12 +79,6 @@
 # define PBCR 0xa4050102
 # define SCSCR_INIT(port)          0x3B
 # define SCIF_ONLY
-#elif defined(CONFIG_CPU_SUBTYPE_SH73180)
-# define SCPDR  0xA4050138        /* 16 bit SCIF */
-# define SCSPTR2 SCPDR
-# define SCIF_ORER 0x0001   /* overrun error bit */
-# define SCSCR_INIT(port)  0x0038 /* TIE=0,RIE=0,TE=1,RE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7343)
 # define SCSPTR0 0xffe00010     /* 16 bit SCIF */
 # define SCSPTR1 0xffe10010     /* 16 bit SCIF */
@@ -230,7 +217,7 @@
 #define SCIF_RDF   0x0002 /* 7705 SCIF, 7707 SCIF, 7709 SCIF, 7750 SCIF */
 #define SCIF_DR    0x0001 /* 7705 SCIF, 7707 SCIF, 7709 SCIF, 7750 SCIF */
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)
+#if defined(CONFIG_CPU_SUBTYPE_SH7705)
 #define SCIF_ORER    0x0200
 #define SCIF_ERRORS ( SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK | SCIF_ORER)
 #define SCIF_RFDC_MASK 0x007f
@@ -259,7 +246,7 @@
 # define SCxSR_ERRORS(port)             SCIF_ERRORS
 # define SCxSR_RDxF(port)               SCIF_RDF
 # define SCxSR_TDxE(port)               SCIF_TDFE
-#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)
+#if defined(CONFIG_CPU_SUBTYPE_SH7705)
 # define SCxSR_ORER(port)               SCIF_ORER
 #else
 # define SCxSR_ORER(port)               0x0000
@@ -267,13 +254,13 @@
 # define SCxSR_FER(port)                SCIF_FER
 # define SCxSR_PER(port)                SCIF_PER
 # define SCxSR_BRK(port)                SCIF_BRK
-#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)
+#if defined(CONFIG_CPU_SUBTYPE_SH7705)
 # define SCxSR_RDxF_CLEAR(port)         (sci_in(port,SCxSR)&0xfffc)
 # define SCxSR_ERROR_CLEAR(port)        (sci_in(port,SCxSR)&0xfd73)
 # define SCxSR_TDxE_CLEAR(port)         (sci_in(port,SCxSR)&0xffdf)
 # define SCxSR_BREAK_CLEAR(port)        (sci_in(port,SCxSR)&0xffe3)
 #else
-/* SH7705 can also use this, clearing is same between 7705 and 7709 and 7300 */
+/* SH7705 can also use this, clearing is same between 7705 and 7709 */
 # define SCxSR_RDxF_CLEAR(port)         0x00fc
 # define SCxSR_ERROR_CLEAR(port)        0x0073
 # define SCxSR_TDxE_CLEAR(port)         0x00df
@@ -375,8 +362,7 @@
   CPU_SCIx_FNS(name, sh4_sci_offset, sh4_sci_size, sh4_scif_offset, sh4_scif_size)
 #define SCIF_FNS(name, sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size) \
           CPU_SCIF_FNS(name, sh4_scif_offset, sh4_scif_size)
-#elif defined(CONFIG_CPU_SUBTYPE_SH7300) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7705) 
+#elif defined(CONFIG_CPU_SUBTYPE_SH7705)
 #define SCIF_FNS(name, scif_offset, scif_size) \
   CPU_SCIF_FNS(name, scif_offset, scif_size)
 #else
@@ -402,8 +388,7 @@
   CPU_SCIF_FNS(name, sh4_scif_offset, sh4_scif_size)
 #endif
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7300) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7705) 
+#if defined(CONFIG_CPU_SUBTYPE_SH7705)
 
 SCIF_FNS(SCSMR,  0x00, 16)
 SCIF_FNS(SCBRR,  0x04,  8)
@@ -485,16 +470,10 @@ static const struct __attribute__((packed)) {
 };
 #endif
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7708)
-static inline int sci_rxd_in(struct uart_port *port)
-{
-        if (port->mapbase == 0xfffffe80)
-                return ctrl_inb(SCSPTR)&0x01 ? 1 : 0; /* SCI */
-        return 1;
-}
-#elif defined(CONFIG_CPU_SUBTYPE_SH7707) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7709) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7706)
+#if defined(CONFIG_CPU_SUBTYPE_SH7706) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7707) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7708) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7709)
 static inline int sci_rxd_in(struct uart_port *port)
 {
         if (port->mapbase == 0xfffffe80)
@@ -562,18 +541,6 @@ static inline int sci_rxd_in(struct uart_port *port)
                 return ctrl_inw(SCSPTR2) & 0x0001 ? 1 : 0; /* SCIF */
         return 1;
 }
-#elif defined(CONFIG_CPU_SUBTYPE_SH7300)
-static inline int sci_rxd_in(struct uart_port *port)
-{
-        if (port->mapbase == 0xa4430000)
-                return ctrl_inb(SCPDR)&0x01 ? 1 : 0; /* SCIF0 */
-        return 1;
-}
-#elif defined(CONFIG_CPU_SUBTYPE_SH73180)
-static inline int sci_rxd_in(struct uart_port *port)
-{
-        return ctrl_inb(SCPDR)&0x01 ? 1 : 0; /* SCIF0 */
-}
 #elif defined(CONFIG_CPU_SUBTYPE_SH7343)
 static inline int sci_rxd_in(struct uart_port *port)
 {
@@ -721,8 +688,7 @@ static inline int sci_rxd_in(struct uart_port *port)
  * -- Mitch Davis - 15 Jul 2000
  */
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7300) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7780) || \
+#if defined(CONFIG_CPU_SUBTYPE_SH7780) || \
     defined(CONFIG_CPU_SUBTYPE_SH7785)
 #define SCBRR_VALUE(bps, clk) ((clk+16*bps)/(16*bps)-1)
 #elif defined(CONFIG_CPU_SUBTYPE_SH7705)
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index 85309acb75f6..6fd51b0022ca 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -65,7 +65,9 @@ static struct uart_port siu_uart_ports[SIU_PORTS_MAX] = {
         },
 };
 
+#ifdef CONFIG_SERIAL_VR41XX_CONSOLE
 static uint8_t lsr_break_flag[SIU_PORTS_MAX];
+#endif
 
 #define siu_read(port, offset)          readb((port)->membase + (offset))
 #define siu_write(port, offset, value)  writeb((value), (port)->membase + (offset))
@@ -782,7 +784,7 @@ static void siu_console_write(struct console *con, const char *s, unsigned count
         siu_write(port, UART_IER, ier);
 }
 
-static int siu_console_setup(struct console *con, char *options)
+static int __init siu_console_setup(struct console *con, char *options)
 {
         struct uart_port *port;
         int baud = 9600;
@@ -800,7 +802,8 @@ static int siu_console_setup(struct console *con, char *options)
                 port->membase = ioremap(port->mapbase, siu_port_size(port));
         }
 
-        vr41xx_select_siu_interface(SIU_INTERFACE_RS232C);
+        if (port->type == PORT_VR41XX_SIU)
+                vr41xx_select_siu_interface(SIU_INTERFACE_RS232C);
 
         if (options != NULL)
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index b05de30b5d9b..e84d21597943 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -200,6 +200,8 @@ static DEFINE_MUTEX(board_lock);
  * platforms may not be able to use spi_register_board_info though, and
  * this is exported so that for example a USB or parport based adapter
  * driver could add devices (which it would learn about out-of-band).
+ *
+ * Returns the new device, or NULL.
  */
 struct spi_device *spi_new_device(struct spi_master *master,
                                   struct spi_board_info *chip)
@@ -208,7 +210,20 @@ struct spi_device *spi_new_device(struct spi_master *master,
         struct device           *dev = master->cdev.dev;
         int                     status;
 
-        /* NOTE:  caller did any chip->bus_num checks necessary */
+        /* NOTE:  caller did any chip->bus_num checks necessary.
+         *
+         * Also, unless we change the return value convention to use
+         * error-or-pointer (not NULL-or-pointer), troubleshootability
+         * suggests syslogged diagnostics are best here (ugh).
+         */
+
+        /* Chipselects are numbered 0..max; validate. */
+        if (chip->chip_select >= master->num_chipselect) {
+                dev_err(dev, "cs%d > max %d\n",
+                        chip->chip_select,
+                        master->num_chipselect);
+                return NULL;
+        }
 
         if (!spi_master_get(master))
                 return NULL;
@@ -236,10 +251,10 @@ struct spi_device *spi_new_device(struct spi_master *master,
         proxy->controller_state = NULL;
         proxy->dev.release = spidev_release;
 
-        /* drivers may modify this default i/o setup */
+        /* drivers may modify this initial i/o setup */
         status = master->setup(proxy);
         if (status < 0) {
-                dev_dbg(dev, "can't %s %s, status %d\n",
+                dev_err(dev, "can't %s %s, status %d\n",
                                 "setup", proxy->dev.bus_id, status);
                 goto fail;
         }
@@ -249,7 +264,7 @@ struct spi_device *spi_new_device(struct spi_master *master,
          */
         status = device_register(&proxy->dev);
         if (status < 0) {
-                dev_dbg(dev, "can't %s %s, status %d\n",
+                dev_err(dev, "can't %s %s, status %d\n",
                                 "add", proxy->dev.bus_id, status);
                 goto fail;
         }
@@ -306,7 +321,6 @@ spi_register_board_info(struct spi_board_info const *info, unsigned n)
 static void scan_boardinfo(struct spi_master *master)
 {
         struct boardinfo        *bi;
-        struct device           *dev = master->cdev.dev;
 
         mutex_lock(&board_lock);
         list_for_each_entry(bi, &board_list, list) {
@@ -316,17 +330,9 @@ static void scan_boardinfo(struct spi_master *master)
                 for (n = bi->n_board_info; n > 0; n--, chip++) {
                         if (chip->bus_num != master->bus_num)
                                 continue;
-                        /* some controllers only have one chip, so they
-                         * might not use chipselects.  otherwise, the
-                         * chipselects are numbered 0..max.
+                        /* NOTE: this relies on spi_new_device to
+                         * issue diagnostics when given bogus inputs
                          */
-                        if (chip->chip_select >= master->num_chipselect
-                                        && master->num_chipselect) {
-                                dev_dbg(dev, "cs%d > max %d\n",
-                                        chip->chip_select,
-                                        master->num_chipselect);
-                                continue;
-                        }
                         (void) spi_new_device(master, chip);
                 }
         }
@@ -419,8 +425,17 @@ int spi_register_master(struct spi_master *master)
         if (!dev)
                 return -ENODEV;
 
+        /* even if it's just one always-selected device, there must
+         * be at least one chipselect
+         */
+        if (master->num_chipselect == 0)
+                return -EINVAL;
+
         /* convention:  dynamically assigned bus IDs count down from the max */
         if (master->bus_num < 0) {
+                /* FIXME switch to an IDR based scheme, something like
+                 * I2C now uses, so we can't run out of "dynamic" IDs
+                 */
                 master->bus_num = atomic_dec_return(&dyn_bus_id);
                 dynamic = 1;
         }
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index 3295cfcc9f20..0c16a2b39b41 100644
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -39,6 +39,7 @@ struct mpc83xx_spi_reg {
 };
 
 /* SPI Controller mode register definitions */
+#define SPMODE_LOOP             (1 << 30)
 #define SPMODE_CI_INACTIVEHIGH  (1 << 29)
 #define SPMODE_CP_BEGIN_EDGECLK (1 << 28)
 #define SPMODE_DIV16            (1 << 27)
@@ -153,12 +154,18 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
                         len = len - 1;
 
                 /* mask out bits we are going to set */
-                regval &= ~0x38ff0000;
+                regval &= ~(SPMODE_CP_BEGIN_EDGECLK | SPMODE_CI_INACTIVEHIGH
+                                | SPMODE_LEN(0xF) | SPMODE_DIV16
+                                | SPMODE_PM(0xF) | SPMODE_REV | SPMODE_LOOP);
 
                 if (spi->mode & SPI_CPHA)
                         regval |= SPMODE_CP_BEGIN_EDGECLK;
                 if (spi->mode & SPI_CPOL)
                         regval |= SPMODE_CI_INACTIVEHIGH;
+                if (!(spi->mode & SPI_LSB_FIRST))
+                        regval |= SPMODE_REV;
+                if (spi->mode & SPI_LOOP)
+                        regval |= SPMODE_LOOP;
 
                 regval |= SPMODE_LEN(len);
 
@@ -176,6 +183,8 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
                         regval |= SPMODE_PM(pm);
                 }
 
+                /* Turn off SPI unit prior changing mode */
+                mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode, 0);
                 mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode, regval);
                 if (mpc83xx_spi->activate_cs)
                         mpc83xx_spi->activate_cs(spi->chip_select, pol);
@@ -231,6 +240,14 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
         } else
                 return -EINVAL;
 
+        if (mpc83xx_spi->qe_mode && spi->mode & SPI_LSB_FIRST) {
+                mpc83xx_spi->tx_shift = 0;
+                if (bits_per_word <= 8)
+                        mpc83xx_spi->rx_shift = 8;
+                else
+                        mpc83xx_spi->rx_shift = 0;
+        }
+
         /* nsecs = (clock period)/2 */
         if (!hz)
                 hz = spi->max_speed_hz;
@@ -245,17 +262,22 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
 
         regval = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode);
 
-        /* Mask out bits_per_wordgth */
-        regval &= 0xff0fffff;
+        /* mask out bits we are going to set */
+        regval &= ~(SPMODE_LEN(0xF) | SPMODE_REV);
         regval |= SPMODE_LEN(bits_per_word);
+        if (!(spi->mode & SPI_LSB_FIRST))
+                regval |= SPMODE_REV;
 
+        /* Turn off SPI unit prior changing mode */
+        mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode, 0);
         mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode, regval);
 
         return 0;
 }
 
 /* the spi->mode bits understood by this driver: */
-#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH)
+#define MODEBITS        (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH \
+                        | SPI_LSB_FIRST | SPI_LOOP)
 
 static int mpc83xx_spi_setup(struct spi_device *spi)
 {
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 38b60ad0eda0..630f781aeb19 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -55,9 +55,16 @@
 static unsigned long    minors[N_SPI_MINORS / BITS_PER_LONG];
 
 
-/* Bit masks for spi_device.mode management */
-#define SPI_MODE_MASK                   (SPI_CPHA | SPI_CPOL)
-
+/* Bit masks for spi_device.mode management.  Note that incorrect
+ * settings for CS_HIGH and 3WIRE can cause *lots* of trouble for other
+ * devices on a shared bus:  CS_HIGH, because this device will be
+ * active when it shouldn't be;  3WIRE, because when active it won't
+ * behave as it should.
+ *
+ * REVISIT should changing those two modes be privileged?
+ */
+#define SPI_MODE_MASK           (SPI_CPHA | SPI_CPOL | SPI_CS_HIGH \
+                                | SPI_LSB_FIRST | SPI_3WIRE | SPI_LOOP)
 
 struct spidev_data {
         struct device           dev;
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index befff5f9d58c..ac49b15fa768 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -48,6 +48,7 @@ obj-$(CONFIG_USB_SISUSBVGA)	+= misc/
 obj-$(CONFIG_USB_TEST)          += misc/
 obj-$(CONFIG_USB_TRANCEVIBRATOR)+= misc/
 obj-$(CONFIG_USB_USS720)        += misc/
+obj-$(CONFIG_USB_IOWARRIOR)     += misc/
 
 obj-$(CONFIG_USB_ATM)           += atm/
 obj-$(CONFIG_USB_SPEEDTOUCH)    += atm/
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 25f63f1096b4..b6bd05e3d439 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -18,9 +18,17 @@
 #include "hcd.h"        /* for usbcore internals */
 #include "usb.h"
 
+struct api_context {
+        struct completion       done;
+        int                     status;
+};
+
 static void usb_api_blocking_completion(struct urb *urb)
 {
-        complete((struct completion *)urb->context);
+        struct api_context *ctx = urb->context;
+
+        ctx->status = urb->status;
+        complete(&ctx->done);
 }
 
 
@@ -32,20 +40,21 @@ static void usb_api_blocking_completion(struct urb *urb)
  */
 static int usb_start_wait_urb(struct urb *urb, int timeout, int *actual_length)
 { 
-        struct completion done;
+        struct api_context ctx;
         unsigned long expire;
         int retval;
-        int status = urb->status;
 
-        init_completion(&done);         
-        urb->context = &done;
+        init_completion(&ctx.done);
+        urb->context = &ctx;
         urb->actual_length = 0;
         retval = usb_submit_urb(urb, GFP_NOIO);
         if (unlikely(retval))
                 goto out;
 
         expire = timeout ? msecs_to_jiffies(timeout) : MAX_SCHEDULE_TIMEOUT;
-        if (!wait_for_completion_timeout(&done, expire)) {
+        if (!wait_for_completion_timeout(&ctx.done, expire)) {
+                usb_kill_urb(urb);
+                retval = (ctx.status == -ENOENT ? -ETIMEDOUT : ctx.status);
 
                 dev_dbg(&urb->dev->dev,
                         "%s timed out on ep%d%s len=%d/%d\n",
@@ -54,11 +63,8 @@ static int usb_start_wait_urb(struct urb *urb, int timeout, int *actual_length)
                         usb_pipein(urb->pipe) ? "in" : "out",
                         urb->actual_length,
                         urb->transfer_buffer_length);
-
-                usb_kill_urb(urb);
-                retval = status == -ENOENT ? -ETIMEDOUT : status;
         } else
-                retval = status;
+                retval = ctx.status;
 out:
         if (actual_length)
                 *actual_length = urb->actual_length;
@@ -411,15 +417,22 @@ int usb_sg_init (
                  * Some systems need to revert to PIO when DMA is temporarily
                  * unavailable.  For their sakes, both transfer_buffer and
                  * transfer_dma are set when possible.  However this can only
-                 * work on systems without HIGHMEM, since DMA buffers located
-                 * in high memory are not directly addressable by the CPU for
-                 * PIO ... so when HIGHMEM is in use, transfer_buffer is NULL
+                 * work on systems without:
+                 *
+                 *  - HIGHMEM, since DMA buffers located in high memory are
+                 *    not directly addressable by the CPU for PIO;
+                 *
+                 *  - IOMMU, since dma_map_sg() is allowed to use an IOMMU to
+                 *    make virtually discontiguous buffers be "dma-contiguous"
+                 *    so that PIO and DMA need diferent numbers of URBs.
+                 *
+                 * So when HIGHMEM or IOMMU are in use, transfer_buffer is NULL
                  * to prevent stale pointers and to help spot bugs.
                  */
                 if (dma) {
                         io->urbs [i]->transfer_dma = sg_dma_address (sg + i);
                         len = sg_dma_len (sg + i);
-#ifdef CONFIG_HIGHMEM
+#if defined(CONFIG_HIGHMEM) || defined(CONFIG_IOMMU)
                         io->urbs[i]->transfer_buffer = NULL;
 #else
                         io->urbs[i]->transfer_buffer =
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index aa21b38a31ce..b7917c5a3c6f 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -30,18 +30,40 @@
 static const struct usb_device_id usb_quirk_list[] = {
         /* HP 5300/5370C scanner */
         { USB_DEVICE(0x03f0, 0x0701), .driver_info = USB_QUIRK_STRING_FETCH_255 },
+        /* Acer Peripherals Inc. (now BenQ Corp.) Prisa 640BU */
+        { USB_DEVICE(0x04a5, 0x207e), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Benq S2W 3300U */
         { USB_DEVICE(0x04a5, 0x20b0), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+        /* Canon, Inc. CanoScan N1240U/LiDE30 */
+        { USB_DEVICE(0x04a9, 0x220e), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+        /* Canon, Inc. CanoScan N650U/N656U */
+        { USB_DEVICE(0x04a9, 0x2206), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+        /* Canon, Inc. CanoScan 1220U */
+        { USB_DEVICE(0x04a9, 0x2207), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+        /* Canon, Inc. CanoScan N670U/N676U/LiDE 20 */
+        { USB_DEVICE(0x04a9, 0x220d), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+        /* old Cannon scanner */
+        { USB_DEVICE(0x04a9, 0x2220), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Seiko Epson Corp. Perfection 1200 */
         { USB_DEVICE(0x04b8, 0x0104), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+        /* Seiko Epson Corp. Perfection 660 */
+        { USB_DEVICE(0x04b8, 0x0114), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+        /* Epson Perfection 1260 Photo */
+        { USB_DEVICE(0x04b8, 0x011d), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Seiko Epson Corp - Perfection 1670 */
         { USB_DEVICE(0x04b8, 0x011f), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+        /* EPSON Perfection 2480 */
+        { USB_DEVICE(0x04b8, 0x0121), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+        /* Seiko Epson Corp.*/
+        { USB_DEVICE(0x04b8, 0x0122), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Samsung ML-2510 Series printer */
         { USB_DEVICE(0x04e8, 0x327e), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Elsa MicroLink 56k (V.250) */
         { USB_DEVICE(0x05cc, 0x2267), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Ultima Electronics Corp.*/
         { USB_DEVICE(0x05d8, 0x4005), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+        /* Agfa Snapscan1212u */
+        { USB_DEVICE(0x06bd, 0x2061), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Umax [hex] Astra 3400U */
         { USB_DEVICE(0x1606, 0x0060), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
 
diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c
index d18901b92cda..c6760aee1e5c 100644
--- a/drivers/usb/gadget/config.c
+++ b/drivers/usb/gadget/config.c
@@ -50,7 +50,7 @@ usb_descriptor_fillbuf(void *buf, unsigned buflen,
                 return -EINVAL;
 
         /* fill buffer from src[] until null descriptor ptr */
-        for (; 0 != *src; src++) {
+        for (; NULL != *src; src++) {
                 unsigned                len = (*src)->bLength;
 
                 if (len > buflen)
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index 6042364402b8..3aa46cfa66ba 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -71,7 +71,7 @@ ep_matches (
         u16             max;
 
         /* endpoint already claimed? */
-        if (0 != ep->driver_data)
+        if (NULL != ep->driver_data)
                 return 0;
 
         /* only support ep0 for portable CONTROL traffic */
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index a3376739a81b..593e23507b1a 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -1723,7 +1723,8 @@ rx_submit (struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags)
                 size += sizeof (struct rndis_packet_msg_type);
         size -= size % dev->out_ep->maxpacket;
 
-        if ((skb = alloc_skb (size + NET_IP_ALIGN, gfp_flags)) == 0) {
+        skb = alloc_skb(size + NET_IP_ALIGN, gfp_flags);
+        if (skb == NULL) {
                 DEBUG (dev, "no rx skb\n");
                 goto enomem;
         }
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index e60745ffaf8e..173004f60fea 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -964,7 +964,7 @@ static int setup_req (struct usb_ep *ep, struct usb_request *req, u16 len)
         }
         if (len > sizeof (dev->rbuf))
                 req->buf = kmalloc(len, GFP_ATOMIC);
-        if (req->buf == 0) {
+        if (req->buf == NULL) {
                 req->buf = dev->rbuf;
                 return -ENOMEM;
         }
@@ -1394,7 +1394,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
         dev->setup_abort = 0;
         if (dev->state == STATE_DEV_UNCONNECTED) {
 #ifdef  CONFIG_USB_GADGET_DUALSPEED
-                if (gadget->speed == USB_SPEED_HIGH && dev->hs_config == 0) {
+                if (gadget->speed == USB_SPEED_HIGH && dev->hs_config == NULL) {
                         spin_unlock(&dev->lock);
                         ERROR (dev, "no high speed config??\n");
                         return -EINVAL;
diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c
index 700dda8a9157..4b27d12f049d 100644
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/m66592-udc.c
@@ -1299,7 +1299,7 @@ static int m66592_queue(struct usb_ep *_ep, struct usb_request *_req,
         req->req.actual = 0;
         req->req.status = -EINPROGRESS;
 
-        if (ep->desc == 0)      /* control */
+        if (ep->desc == NULL)   /* control */
                 start_ep0(ep, req);
         else {
                 if (request && !ep->busy)
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 63b9521c1322..72b4ebbf132d 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -93,8 +93,6 @@ static const char driver_name [] = "pxa2xx_udc";
 static const char ep0name [] = "ep0";
 
 
-// #define      DISABLE_TEST_MODE
-
 #ifdef CONFIG_ARCH_IXP4XX
 
 /* cpu-specific register addresses are compiled in to this code */
@@ -113,17 +111,6 @@ static const char ep0name [] = "ep0";
 #define SIZE_STR        ""
 #endif
 
-#ifdef DISABLE_TEST_MODE
-/* (mode == 0) == no undocumented chip tweaks
- * (mode & 1)  == double buffer bulk IN
- * (mode & 2)  == double buffer bulk OUT
- * ... so mode = 3 (or 7, 15, etc) does it for both
- */
-static ushort fifo_mode = 0;
-module_param(fifo_mode, ushort, 0);
-MODULE_PARM_DESC (fifo_mode, "pxa2xx udc fifo mode");
-#endif
-
 /* ---------------------------------------------------------------------------
  *      endpoint related parts of the api to the usb controller hardware,
  *      used by gadget driver; and the inner talker-to-hardware core.
@@ -1252,23 +1239,6 @@ static void udc_enable (struct pxa2xx_udc *dev)
                 UDC_RES2 = 0x00;
         }
 
-#ifdef  DISABLE_TEST_MODE
-        /* "test mode" seems to have become the default in later chip
-         * revs, preventing double buffering (and invalidating docs).
-         * this EXPERIMENT enables it for bulk endpoints by tweaking
-         * undefined/reserved register bits (that other drivers clear).
-         * Belcarra code comments noted this usage.
-         */
-        if (fifo_mode & 1) {    /* IN endpoints */
-                UDC_RES1 |= USIR0_IR1|USIR0_IR6;
-                UDC_RES2 |= USIR1_IR11;
-        }
-        if (fifo_mode & 2) {    /* OUT endpoints */
-                UDC_RES1 |= USIR0_IR2|USIR0_IR7;
-                UDC_RES2 |= USIR1_IR12;
-        }
-#endif
-
         /* enable suspend/resume and reset irqs */
         udc_clear_mask_UDCCR(UDCCR_SRM | UDCCR_REM);
 
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index a2e6e3fc8c8d..fcfe869acb94 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -653,7 +653,8 @@ set_source_sink_config (struct zero_dev *dev, gfp_t gfp_flags)
                         result = usb_ep_enable (ep, d);
                         if (result == 0) {
                                 ep->driver_data = dev;
-                                if (source_sink_start_ep (ep, gfp_flags) != 0) {
+                                if (source_sink_start_ep(ep, gfp_flags)
+                                                != NULL) {
                                         dev->in_ep = ep;
                                         continue;
                                 }
@@ -667,7 +668,8 @@ set_source_sink_config (struct zero_dev *dev, gfp_t gfp_flags)
                         result = usb_ep_enable (ep, d);
                         if (result == 0) {
                                 ep->driver_data = dev;
-                                if (source_sink_start_ep (ep, gfp_flags) != 0) {
+                                if (source_sink_start_ep(ep, gfp_flags)
+                                                != NULL) {
                                         dev->out_ep = ep;
                                         continue;
                                 }
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index e831cb7f64fd..33f6ee50b8d3 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -356,7 +356,7 @@ static void cp2101_get_termios (struct usb_serial_port *port)
 
         dbg("%s - port %d", __FUNCTION__, port->number);
 
-        if ((!port->tty) || (!port->tty->termios)) {
+        if (!port->tty || !port->tty->termios) {
                 dbg("%s - no tty structures", __FUNCTION__);
                 return;
         }
@@ -526,50 +526,35 @@ static void cp2101_set_termios (struct usb_serial_port *port,
                 return;
         }
         cflag = port->tty->termios->c_cflag;
-
-        /* Check that they really want us to change something */
-        if (old_termios) {
-                if ((cflag == old_termios->c_cflag) &&
-                                (RELEVANT_IFLAG(port->tty->termios->c_iflag)
-                                == RELEVANT_IFLAG(old_termios->c_iflag))) {
-                        dbg("%s - nothing to change...", __FUNCTION__);
-                        return;
-                }
-
-                old_cflag = old_termios->c_cflag;
-        }
+        old_cflag = old_termios->c_cflag;
+        baud = tty_get_baud_rate(port->tty);
 
         /* If the baud rate is to be updated*/
-        if ((cflag & CBAUD) != (old_cflag & CBAUD)) {
-                switch (cflag & CBAUD) {
-                        /*
-                         * The baud rates which are commented out below
-                         * appear to be supported by the device
-                         * but are non-standard
-                         */
-                        case B0:        baud = 0;       break;
-                        case B600:      baud = 600;     break;
-                        case B1200:     baud = 1200;    break;
-                        case B1800:     baud = 1800;    break;
-                        case B2400:     baud = 2400;    break;
-                        case B4800:     baud = 4800;    break;
-                        /*case B7200:   baud = 7200;    break;*/
-                        case B9600:     baud = 9600;    break;
-                        /*ase B14400:   baud = 14400;   break;*/
-                        case B19200:    baud = 19200;   break;
-                        /*case B28800:  baud = 28800;   break;*/
-                        case B38400:    baud = 38400;   break;
-                        /*case B55854:  baud = 55054;   break;*/
-                        case B57600:    baud = 57600;   break;
-                        case B115200:   baud = 115200;  break;
-                        /*case B127117: baud = 127117;  break;*/
-                        case B230400:   baud = 230400;  break;
-                        case B460800:   baud = 460800;  break;
-                        case B921600:   baud = 921600;  break;
-                        /*case B3686400:        baud = 3686400; break;*/
+        if (baud != tty_termios_baud_rate(old_termios)) {
+                switch (baud) {
+                        case 0:
+                        case 600:
+                        case 1200:
+                        case 1800:
+                        case 2400:
+                        case 4800:
+                        case 7200:
+                        case 9600:
+                        case 14400:
+                        case 19200:
+                        case 28800:
+                        case 38400:
+                        case 55854:
+                        case 57600:
+                        case 115200:
+                        case 127117:
+                        case 230400:
+                        case 460800:
+                        case 921600:
+                        case 3686400:
+                                break;
                         default:
-                                dev_err(&port->dev, "cp2101 driver does not "
-                                        "support the baudrate requested\n");
+                                baud = 9600;
                                 break;
                 }
 
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 976f54ec26e6..dab2e66d111d 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -433,38 +433,38 @@ struct digi_port {
 
 /* Local Function Declarations */
 
-static void digi_wakeup_write( struct usb_serial_port *port );
+static void digi_wakeup_write(struct usb_serial_port *port);
 static void digi_wakeup_write_lock(struct work_struct *work);
-static int digi_write_oob_command( struct usb_serial_port *port,
-        unsigned char *buf, int count, int interruptible );
-static int digi_write_inb_command( struct usb_serial_port *port,
-        unsigned char *buf, int count, unsigned long timeout );
-static int digi_set_modem_signals( struct usb_serial_port *port,
-        unsigned int modem_signals, int interruptible );
-static int digi_transmit_idle( struct usb_serial_port *port,
-        unsigned long timeout );
+static int digi_write_oob_command(struct usb_serial_port *port,
+        unsigned char *buf, int count, int interruptible);
+static int digi_write_inb_command(struct usb_serial_port *port,
+        unsigned char *buf, int count, unsigned long timeout);
+static int digi_set_modem_signals(struct usb_serial_port *port,
+        unsigned int modem_signals, int interruptible);
+static int digi_transmit_idle(struct usb_serial_port *port,
+        unsigned long timeout);
 static void digi_rx_throttle (struct usb_serial_port *port);
 static void digi_rx_unthrottle (struct usb_serial_port *port);
-static void digi_set_termios( struct usb_serial_port *port, 
-        struct ktermios *old_termios );
-static void digi_break_ctl( struct usb_serial_port *port, int break_state );
-static int digi_ioctl( struct usb_serial_port *port, struct file *file,
-        unsigned int cmd, unsigned long arg );
-static int digi_tiocmget( struct usb_serial_port *port, struct file *file );
-static int digi_tiocmset( struct usb_serial_port *port, struct file *file,
-        unsigned int set, unsigned int clear );
-static int digi_write( struct usb_serial_port *port, const unsigned char *buf, int count );
-static void digi_write_bulk_callback( struct urb *urb );
-static int digi_write_room( struct usb_serial_port *port );
-static int digi_chars_in_buffer( struct usb_serial_port *port );
-static int digi_open( struct usb_serial_port *port, struct file *filp );
-static void digi_close( struct usb_serial_port *port, struct file *filp );
-static int digi_startup_device( struct usb_serial *serial );
-static int digi_startup( struct usb_serial *serial );
-static void digi_shutdown( struct usb_serial *serial );
-static void digi_read_bulk_callback( struct urb *urb );
-static int digi_read_inb_callback( struct urb *urb );
-static int digi_read_oob_callback( struct urb *urb );
+static void digi_set_termios(struct usb_serial_port *port,
+        struct ktermios *old_termios);
+static void digi_break_ctl(struct usb_serial_port *port, int break_state);
+static int digi_ioctl(struct usb_serial_port *port, struct file *file,
+        unsigned int cmd, unsigned long arg);
+static int digi_tiocmget(struct usb_serial_port *port, struct file *file);
+static int digi_tiocmset(struct usb_serial_port *port, struct file *file,
+        unsigned int set, unsigned int clear);
+static int digi_write(struct usb_serial_port *port, const unsigned char *buf, int count);
+static void digi_write_bulk_callback(struct urb *urb);
+static int digi_write_room(struct usb_serial_port *port);
+static int digi_chars_in_buffer(struct usb_serial_port *port);
+static int digi_open(struct usb_serial_port *port, struct file *filp);
+static void digi_close(struct usb_serial_port *port, struct file *filp);
+static int digi_startup_device(struct usb_serial *serial);
+static int digi_startup(struct usb_serial *serial);
+static void digi_shutdown(struct usb_serial *serial);
+static void digi_read_bulk_callback(struct urb *urb);
+static int digi_read_inb_callback(struct urb *urb);
+static int digi_read_oob_callback(struct urb *urb);
 
 
 /* Statics */
@@ -576,9 +576,9 @@ static struct usb_serial_driver digi_acceleport_4_device = {
 *  with the equivalent code.
 */
 
-static inline long cond_wait_interruptible_timeout_irqrestore(
+static long cond_wait_interruptible_timeout_irqrestore(
         wait_queue_head_t *q, long timeout,
-        spinlock_t *lock, unsigned long flags )
+        spinlock_t *lock, unsigned long flags)
 {
         DEFINE_WAIT(wait);
 
@@ -600,18 +600,16 @@ static inline long cond_wait_interruptible_timeout_irqrestore(
 
 static void digi_wakeup_write_lock(struct work_struct *work)
 {
-        struct digi_port *priv =
-                container_of(work, struct digi_port, dp_wakeup_work);
+        struct digi_port *priv = container_of(work, struct digi_port, dp_wakeup_work);
         struct usb_serial_port *port = priv->dp_port;
         unsigned long flags;
 
-
-        spin_lock_irqsave( &priv->dp_port_lock, flags );
-        digi_wakeup_write( port );
-        spin_unlock_irqrestore( &priv->dp_port_lock, flags );
+        spin_lock_irqsave(&priv->dp_port_lock, flags);
+        digi_wakeup_write(port);
+        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
 }
 
-static void digi_wakeup_write( struct usb_serial_port *port )
+static void digi_wakeup_write(struct usb_serial_port *port)
 {
         tty_wakeup(port->tty);
 }
@@ -628,8 +626,8 @@ static void digi_wakeup_write( struct usb_serial_port *port )
 *  returned by usb_submit_urb.
 */
 
-static int digi_write_oob_command( struct usb_serial_port *port,
-        unsigned char *buf, int count, int interruptible )
+static int digi_write_oob_command(struct usb_serial_port *port,
+        unsigned char *buf, int count, int interruptible)
 {
 
         int ret = 0;
@@ -638,49 +636,37 @@ static int digi_write_oob_command( struct usb_serial_port *port,
         struct digi_port *oob_priv = usb_get_serial_port_data(oob_port);
         unsigned long flags = 0;
 
+        dbg("digi_write_oob_command: TOP: port=%d, count=%d", oob_priv->dp_port_num, count);
 
-dbg( "digi_write_oob_command: TOP: port=%d, count=%d", oob_priv->dp_port_num, count );
-
-        spin_lock_irqsave( &oob_priv->dp_port_lock, flags );
-
-        while( count > 0 ) {
-
-                while( oob_port->write_urb->status == -EINPROGRESS
-                || oob_priv->dp_write_urb_in_use ) {
+        spin_lock_irqsave(&oob_priv->dp_port_lock, flags);
+        while(count > 0) {
+                while(oob_port->write_urb->status == -EINPROGRESS
+                        || oob_priv->dp_write_urb_in_use) {
                         cond_wait_interruptible_timeout_irqrestore(
                                 &oob_port->write_wait, DIGI_RETRY_TIMEOUT,
-                                &oob_priv->dp_port_lock, flags );
-                        if( interruptible && signal_pending(current) ) {
-                                return( -EINTR );
-                        }
-                        spin_lock_irqsave( &oob_priv->dp_port_lock, flags );
+                                &oob_priv->dp_port_lock, flags);
+                        if (interruptible && signal_pending(current))
+                                return -EINTR;
+                        spin_lock_irqsave(&oob_priv->dp_port_lock, flags);
                 }
 
                 /* len must be a multiple of 4, so commands are not split */
-                len = min(count, oob_port->bulk_out_size );
-                if( len > 4 )
+                len = min(count, oob_port->bulk_out_size);
+                if (len > 4)
                         len &= ~3;
-
-                memcpy( oob_port->write_urb->transfer_buffer, buf, len );
+                memcpy(oob_port->write_urb->transfer_buffer, buf, len);
                 oob_port->write_urb->transfer_buffer_length = len;
                 oob_port->write_urb->dev = port->serial->dev;
-
-                if( (ret=usb_submit_urb(oob_port->write_urb, GFP_ATOMIC)) == 0 ) {
+                if ((ret = usb_submit_urb(oob_port->write_urb, GFP_ATOMIC)) == 0) {
                         oob_priv->dp_write_urb_in_use = 1;
                         count -= len;
                         buf += len;
                 }
-
-        }
-
-        spin_unlock_irqrestore( &oob_priv->dp_port_lock, flags );
-
-        if( ret ) {
-                err("%s: usb_submit_urb failed, ret=%d", __FUNCTION__,
-                        ret );
         }
-
-        return( ret );
+        spin_unlock_irqrestore(&oob_priv->dp_port_lock, flags);
+        if (ret)
+                err("%s: usb_submit_urb failed, ret=%d", __FUNCTION__, ret);
+        return ret;
 
 }
 
@@ -697,63 +683,58 @@ dbg( "digi_write_oob_command: TOP: port=%d, count=%d", oob_priv->dp_port_num, co
 *  error returned by digi_write.
 */
 
-static int digi_write_inb_command( struct usb_serial_port *port,
-        unsigned char *buf, int count, unsigned long timeout )
+static int digi_write_inb_command(struct usb_serial_port *port,
+        unsigned char *buf, int count, unsigned long timeout)
 {
-
         int ret = 0;
         int len;
         struct digi_port *priv = usb_get_serial_port_data(port);
         unsigned char *data = port->write_urb->transfer_buffer;
         unsigned long flags = 0;
 
+        dbg("digi_write_inb_command: TOP: port=%d, count=%d",
+                priv->dp_port_num, count);
 
-dbg( "digi_write_inb_command: TOP: port=%d, count=%d", priv->dp_port_num,
-count );
-
-        if( timeout )
+        if (timeout)
                 timeout += jiffies;
         else
                 timeout = ULONG_MAX;
 
-        spin_lock_irqsave( &priv->dp_port_lock, flags );
-
-        while( count > 0 && ret == 0 ) {
-
-                while( (port->write_urb->status == -EINPROGRESS
-                || priv->dp_write_urb_in_use) && time_before(jiffies, timeout)) {
+        spin_lock_irqsave(&priv->dp_port_lock, flags);
+        while(count > 0 && ret == 0) {
+                while((port->write_urb->status == -EINPROGRESS
+                        || priv->dp_write_urb_in_use) && time_before(jiffies, timeout)) {
                         cond_wait_interruptible_timeout_irqrestore(
                                 &port->write_wait, DIGI_RETRY_TIMEOUT,
-                                &priv->dp_port_lock, flags );
-                        if( signal_pending(current) ) {
-                                return( -EINTR );
-                        }
-                        spin_lock_irqsave( &priv->dp_port_lock, flags );
+                                &priv->dp_port_lock, flags);
+                        if (signal_pending(current))
+                                return -EINTR;
+                        spin_lock_irqsave(&priv->dp_port_lock, flags);
                 }
 
                 /* len must be a multiple of 4 and small enough to */
                 /* guarantee the write will send buffered data first, */
                 /* so commands are in order with data and not split */
-                len = min(count, port->bulk_out_size-2-priv->dp_out_buf_len );
-                if( len > 4 )
+                len = min(count, port->bulk_out_size-2-priv->dp_out_buf_len);
+                if (len > 4)
                         len &= ~3;
 
                 /* write any buffered data first */
-                if( priv->dp_out_buf_len > 0 ) {
+                if (priv->dp_out_buf_len > 0) {
                         data[0] = DIGI_CMD_SEND_DATA;
                         data[1] = priv->dp_out_buf_len;
-                        memcpy( data+2, priv->dp_out_buf,
-                                priv->dp_out_buf_len );
-                        memcpy( data+2+priv->dp_out_buf_len, buf, len );
+                        memcpy(data + 2, priv->dp_out_buf,
+                                priv->dp_out_buf_len);
+                        memcpy(data + 2 + priv->dp_out_buf_len, buf, len);
                         port->write_urb->transfer_buffer_length
-                                = priv->dp_out_buf_len+2+len;
+                                = priv->dp_out_buf_len + 2 + len;
                 } else {
-                        memcpy( data, buf, len );
+                        memcpy(data, buf, len);
                         port->write_urb->transfer_buffer_length = len;
                 }
                 port->write_urb->dev = port->serial->dev;
 
-                if( (ret=usb_submit_urb(port->write_urb, GFP_ATOMIC)) == 0 ) {
+                if ((ret = usb_submit_urb(port->write_urb, GFP_ATOMIC)) == 0) {
                         priv->dp_write_urb_in_use = 1;
                         priv->dp_out_buf_len = 0;
                         count -= len;
@@ -761,16 +742,12 @@ count );
                 }
 
         }
+        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
 
-        spin_unlock_irqrestore( &priv->dp_port_lock, flags );
-
-        if( ret ) {
-                err("%s: usb_submit_urb failed, ret=%d, port=%d", __FUNCTION__,
-                ret, priv->dp_port_num );
-        }
-
-        return( ret );
-
+        if (ret)
+                err("%s: usb_submit_urb failed, ret=%d, port=%d",
+                        __FUNCTION__, ret, priv->dp_port_num);
+        return ret;
 }
 
 
@@ -784,8 +761,8 @@ count );
 *  returned by usb_submit_urb.
 */
 
-static int digi_set_modem_signals( struct usb_serial_port *port,
-        unsigned int modem_signals, int interruptible )
+static int digi_set_modem_signals(struct usb_serial_port *port,
+        unsigned int modem_signals, int interruptible)
 {
 
         int ret;
@@ -796,60 +773,47 @@ static int digi_set_modem_signals( struct usb_serial_port *port,
         unsigned long flags = 0;
 
 
-dbg( "digi_set_modem_signals: TOP: port=%d, modem_signals=0x%x",
-port_priv->dp_port_num, modem_signals );
+        dbg("digi_set_modem_signals: TOP: port=%d, modem_signals=0x%x",
+                port_priv->dp_port_num, modem_signals);
 
-        spin_lock_irqsave( &oob_priv->dp_port_lock, flags );
-        spin_lock( &port_priv->dp_port_lock );
+        spin_lock_irqsave(&oob_priv->dp_port_lock, flags);
+        spin_lock(&port_priv->dp_port_lock);
 
-        while( oob_port->write_urb->status == -EINPROGRESS
-        || oob_priv->dp_write_urb_in_use ) {
-                spin_unlock( &port_priv->dp_port_lock );
+        while(oob_port->write_urb->status == -EINPROGRESS || oob_priv->dp_write_urb_in_use) {
+                spin_unlock(&port_priv->dp_port_lock);
                 cond_wait_interruptible_timeout_irqrestore(
                         &oob_port->write_wait, DIGI_RETRY_TIMEOUT,
-                        &oob_priv->dp_port_lock, flags );
-                if( interruptible && signal_pending(current) ) {
-                        return( -EINTR );
-                }
-                spin_lock_irqsave( &oob_priv->dp_port_lock, flags );
-                spin_lock( &port_priv->dp_port_lock );
+                        &oob_priv->dp_port_lock, flags);
+                if (interruptible && signal_pending(current))
+                        return -EINTR;
+                spin_lock_irqsave(&oob_priv->dp_port_lock, flags);
+                spin_lock(&port_priv->dp_port_lock);
         }
-
         data[0] = DIGI_CMD_SET_DTR_SIGNAL;
         data[1] = port_priv->dp_port_num;
-        data[2] = (modem_signals&TIOCM_DTR) ?
-                DIGI_DTR_ACTIVE : DIGI_DTR_INACTIVE;
+        data[2] = (modem_signals&TIOCM_DTR) ? DIGI_DTR_ACTIVE : DIGI_DTR_INACTIVE;
         data[3] = 0;
-
         data[4] = DIGI_CMD_SET_RTS_SIGNAL;
         data[5] = port_priv->dp_port_num;
-        data[6] = (modem_signals&TIOCM_RTS) ?
-                DIGI_RTS_ACTIVE : DIGI_RTS_INACTIVE;
+        data[6] = (modem_signals&TIOCM_RTS) ? DIGI_RTS_ACTIVE : DIGI_RTS_INACTIVE;
         data[7] = 0;
 
         oob_port->write_urb->transfer_buffer_length = 8;
         oob_port->write_urb->dev = port->serial->dev;
 
-        if( (ret=usb_submit_urb(oob_port->write_urb, GFP_ATOMIC)) == 0 ) {
+        if ((ret = usb_submit_urb(oob_port->write_urb, GFP_ATOMIC)) == 0) {
                 oob_priv->dp_write_urb_in_use = 1;
                 port_priv->dp_modem_signals =
                         (port_priv->dp_modem_signals&~(TIOCM_DTR|TIOCM_RTS))
                         | (modem_signals&(TIOCM_DTR|TIOCM_RTS));
         }
-
-        spin_unlock( &port_priv->dp_port_lock );
-        spin_unlock_irqrestore( &oob_priv->dp_port_lock, flags );
-
-        if( ret ) {
-                err("%s: usb_submit_urb failed, ret=%d", __FUNCTION__,
-                ret );
-        }
-
-        return( ret );
-
+        spin_unlock(&port_priv->dp_port_lock);
+        spin_unlock_irqrestore(&oob_priv->dp_port_lock, flags);
+        if (ret)
+                err("%s: usb_submit_urb failed, ret=%d", __FUNCTION__, ret);
+        return ret;
 }
 
-
 /*
 *  Digi Transmit Idle
 *
@@ -862,203 +826,182 @@ port_priv->dp_port_num, modem_signals );
 *  port at a time, so its ok.
 */
 
-static int digi_transmit_idle( struct usb_serial_port *port,
-        unsigned long timeout )
+static int digi_transmit_idle(struct usb_serial_port *port,
+        unsigned long timeout)
 {
-
         int ret;
         unsigned char buf[2];
         struct digi_port *priv = usb_get_serial_port_data(port);
         unsigned long flags = 0;
 
-
-        spin_lock_irqsave( &priv->dp_port_lock, flags );
+        spin_lock_irqsave(&priv->dp_port_lock, flags);
         priv->dp_transmit_idle = 0;
-        spin_unlock_irqrestore( &priv->dp_port_lock, flags );
+        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
 
         buf[0] = DIGI_CMD_TRANSMIT_IDLE;
         buf[1] = 0;
 
         timeout += jiffies;
 
-        if( (ret=digi_write_inb_command( port, buf, 2, timeout-jiffies )) != 0 )
-                return( ret );
+        if ((ret = digi_write_inb_command(port, buf, 2, timeout - jiffies)) != 0)
+                return ret;
 
-        spin_lock_irqsave( &priv->dp_port_lock, flags );
+        spin_lock_irqsave(&priv->dp_port_lock, flags);
 
-        while( time_before(jiffies, timeout) && !priv->dp_transmit_idle ) {
+        while(time_before(jiffies, timeout) && !priv->dp_transmit_idle) {
                 cond_wait_interruptible_timeout_irqrestore(
                         &priv->dp_transmit_idle_wait, DIGI_RETRY_TIMEOUT,
-                        &priv->dp_port_lock, flags );
-                if( signal_pending(current) ) {
-                        return( -EINTR );
-                }
-                spin_lock_irqsave( &priv->dp_port_lock, flags );
+                        &priv->dp_port_lock, flags);
+                if (signal_pending(current))
+                        return -EINTR;
+                spin_lock_irqsave(&priv->dp_port_lock, flags);
         }
-
         priv->dp_transmit_idle = 0;
-        spin_unlock_irqrestore( &priv->dp_port_lock, flags );
-
-        return( 0 );
+        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
+        return 0;
 
 }
 
 
-static void digi_rx_throttle( struct usb_serial_port *port )
+static void digi_rx_throttle(struct usb_serial_port *port)
 {
-
         unsigned long flags;
         struct digi_port *priv = usb_get_serial_port_data(port);
 
 
-dbg( "digi_rx_throttle: TOP: port=%d", priv->dp_port_num );
+        dbg("digi_rx_throttle: TOP: port=%d", priv->dp_port_num);
 
         /* stop receiving characters by not resubmitting the read urb */
-        spin_lock_irqsave( &priv->dp_port_lock, flags );
+        spin_lock_irqsave(&priv->dp_port_lock, flags);
         priv->dp_throttled = 1;
         priv->dp_throttle_restart = 0;
-        spin_unlock_irqrestore( &priv->dp_port_lock, flags );
-
+        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
 }
 
 
-static void digi_rx_unthrottle( struct usb_serial_port *port )
+static void digi_rx_unthrottle(struct usb_serial_port *port)
 {
-
         int ret = 0;
         unsigned long flags;
         struct digi_port *priv = usb_get_serial_port_data(port);
 
-dbg( "digi_rx_unthrottle: TOP: port=%d", priv->dp_port_num );
+        dbg("digi_rx_unthrottle: TOP: port=%d", priv->dp_port_num);
 
-        spin_lock_irqsave( &priv->dp_port_lock, flags );
+        spin_lock_irqsave(&priv->dp_port_lock, flags);
 
         /* turn throttle off */
         priv->dp_throttled = 0;
         priv->dp_throttle_restart = 0;
 
         /* restart read chain */
-        if( priv->dp_throttle_restart ) {
+        if (priv->dp_throttle_restart) {
                 port->read_urb->dev = port->serial->dev;
-                ret = usb_submit_urb( port->read_urb, GFP_ATOMIC );
+                ret = usb_submit_urb(port->read_urb, GFP_ATOMIC);
         }
 
-        spin_unlock_irqrestore( &priv->dp_port_lock, flags );
-
-        if( ret ) {
-                err("%s: usb_submit_urb failed, ret=%d, port=%d", __FUNCTION__,
-                        ret, priv->dp_port_num );
-        }
+        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
 
+        if (ret)
+                err("%s: usb_submit_urb failed, ret=%d, port=%d",
+                        __FUNCTION__, ret, priv->dp_port_num);
 }
 
 
-static void digi_set_termios( struct usb_serial_port *port, 
-        struct ktermios *old_termios )
+static void digi_set_termios(struct usb_serial_port *port,
+                                        struct ktermios *old_termios)
 {
 
         struct digi_port *priv = usb_get_serial_port_data(port);
-        unsigned int iflag = port->tty->termios->c_iflag;
-        unsigned int cflag = port->tty->termios->c_cflag;
+        struct tty_struct *tty = port->tty;
+        unsigned int iflag = tty->termios->c_iflag;
+        unsigned int cflag = tty->termios->c_cflag;
         unsigned int old_iflag = old_termios->c_iflag;
         unsigned int old_cflag = old_termios->c_cflag;
         unsigned char buf[32];
         unsigned int modem_signals;
         int arg,ret;
         int i = 0;
+        speed_t baud;
 
-
-dbg( "digi_set_termios: TOP: port=%d, iflag=0x%x, old_iflag=0x%x, cflag=0x%x, old_cflag=0x%x", priv->dp_port_num, iflag, old_iflag, cflag, old_cflag );
+        dbg("digi_set_termios: TOP: port=%d, iflag=0x%x, old_iflag=0x%x, cflag=0x%x, old_cflag=0x%x", priv->dp_port_num, iflag, old_iflag, cflag, old_cflag);
 
         /* set baud rate */
-        if( (cflag&CBAUD) != (old_cflag&CBAUD) ) {
-
+        if ((baud = tty_get_baud_rate(tty)) != tty_termios_baud_rate(old_termios)) {
                 arg = -1;
 
                 /* reassert DTR and (maybe) RTS on transition from B0 */
-                if( (old_cflag&CBAUD) == B0 ) {
+                if ((old_cflag&CBAUD) == B0) {
                         /* don't set RTS if using hardware flow control */
                         /* and throttling input */
                         modem_signals = TIOCM_DTR;
-                        if( !(port->tty->termios->c_cflag & CRTSCTS) ||
-                        !test_bit(TTY_THROTTLED, &port->tty->flags) ) {
+                        if (!(tty->termios->c_cflag & CRTSCTS) ||
+                            !test_bit(TTY_THROTTLED, &tty->flags))
                                 modem_signals |= TIOCM_RTS;
-                        }
-                        digi_set_modem_signals( port, modem_signals, 1 );
+                        digi_set_modem_signals(port, modem_signals, 1);
                 }
-
-                switch( (cflag&CBAUD) ) {
+                switch (baud) {
                         /* drop DTR and RTS on transition to B0 */
-                case B0: digi_set_modem_signals( port, 0, 1 ); break;
-                case B50: arg = DIGI_BAUD_50; break;
-                case B75: arg = DIGI_BAUD_75; break;
-                case B110: arg = DIGI_BAUD_110; break;
-                case B150: arg = DIGI_BAUD_150; break;
-                case B200: arg = DIGI_BAUD_200; break;
-                case B300: arg = DIGI_BAUD_300; break;
-                case B600: arg = DIGI_BAUD_600; break;
-                case B1200: arg = DIGI_BAUD_1200; break;
-                case B1800: arg = DIGI_BAUD_1800; break;
-                case B2400: arg = DIGI_BAUD_2400; break;
-                case B4800: arg = DIGI_BAUD_4800; break;
-                case B9600: arg = DIGI_BAUD_9600; break;
-                case B19200: arg = DIGI_BAUD_19200; break;
-                case B38400: arg = DIGI_BAUD_38400; break;
-                case B57600: arg = DIGI_BAUD_57600; break;
-                case B115200: arg = DIGI_BAUD_115200; break;
-                case B230400: arg = DIGI_BAUD_230400; break;
-                case B460800: arg = DIGI_BAUD_460800; break;
-                default:
-                        dbg( "digi_set_termios: can't handle baud rate 0x%x",
-                                (cflag&CBAUD) );
-                        break;
+                        case 0: digi_set_modem_signals(port, 0, 1); break;
+                        case 50: arg = DIGI_BAUD_50; break;
+                        case 75: arg = DIGI_BAUD_75; break;
+                        case 110: arg = DIGI_BAUD_110; break;
+                        case 150: arg = DIGI_BAUD_150; break;
+                        case 200: arg = DIGI_BAUD_200; break;
+                        case 300: arg = DIGI_BAUD_300; break;
+                        case 600: arg = DIGI_BAUD_600; break;
+                        case 1200: arg = DIGI_BAUD_1200; break;
+                        case 1800: arg = DIGI_BAUD_1800; break;
+                        case 2400: arg = DIGI_BAUD_2400; break;
+                        case 4800: arg = DIGI_BAUD_4800; break;
+                        case 9600: arg = DIGI_BAUD_9600; break;
+                        case 19200: arg = DIGI_BAUD_19200; break;
+                        case 38400: arg = DIGI_BAUD_38400; break;
+                        case 57600: arg = DIGI_BAUD_57600; break;
+                        case 115200: arg = DIGI_BAUD_115200; break;
+                        case 230400: arg = DIGI_BAUD_230400; break;
+                        case 460800: arg = DIGI_BAUD_460800; break;
+                        default:
+                                arg = DIGI_BAUD_9600;
+                                baud = 9600;
+                                break;
                 }
-
-                if( arg != -1 ) {
+                if (arg != -1) {
                         buf[i++] = DIGI_CMD_SET_BAUD_RATE;
                         buf[i++] = priv->dp_port_num;
                         buf[i++] = arg;
                         buf[i++] = 0;
                 }
-
         }
-
         /* set parity */
-        if( (cflag&(PARENB|PARODD)) != (old_cflag&(PARENB|PARODD)) ) {
-
-                if( (cflag&PARENB) ) {
-                        if( (cflag&PARODD) )
+        if ((cflag&(PARENB|PARODD)) != (old_cflag&(PARENB|PARODD))) {
+                if (cflag&PARENB) {
+                        if (cflag&PARODD)
                                 arg = DIGI_PARITY_ODD;
                         else
                                 arg = DIGI_PARITY_EVEN;
                 } else {
                         arg = DIGI_PARITY_NONE;
                 }
-
                 buf[i++] = DIGI_CMD_SET_PARITY;
                 buf[i++] = priv->dp_port_num;
                 buf[i++] = arg;
                 buf[i++] = 0;
-
         }
-
         /* set word size */
-        if( (cflag&CSIZE) != (old_cflag&CSIZE) ) {
-
+        if ((cflag&CSIZE) != (old_cflag&CSIZE)) {
                 arg = -1;
-
-                switch( (cflag&CSIZE) ) {
+                switch (cflag&CSIZE) {
                 case CS5: arg = DIGI_WORD_SIZE_5; break;
                 case CS6: arg = DIGI_WORD_SIZE_6; break;
                 case CS7: arg = DIGI_WORD_SIZE_7; break;
                 case CS8: arg = DIGI_WORD_SIZE_8; break;
                 default:
-                        dbg( "digi_set_termios: can't handle word size %d",
-                                (cflag&CSIZE) );
+                        dbg("digi_set_termios: can't handle word size %d",
+                                (cflag&CSIZE));
                         break;
                 }
 
-                if( arg != -1 ) {
+                if (arg != -1) {
                         buf[i++] = DIGI_CMD_SET_WORD_SIZE;
                         buf[i++] = priv->dp_port_num;
                         buf[i++] = arg;
@@ -1068,9 +1011,9 @@ dbg( "digi_set_termios: TOP: port=%d, iflag=0x%x, old_iflag=0x%x, cflag=0x%x, ol
         }
 
         /* set stop bits */
-        if( (cflag&CSTOPB) != (old_cflag&CSTOPB) ) {
+        if ((cflag&CSTOPB) != (old_cflag&CSTOPB)) {
 
-                if( (cflag&CSTOPB) )
+                if ((cflag&CSTOPB))
                         arg = DIGI_STOP_BITS_2;
                 else
                         arg = DIGI_STOP_BITS_1;
@@ -1083,18 +1026,15 @@ dbg( "digi_set_termios: TOP: port=%d, iflag=0x%x, old_iflag=0x%x, cflag=0x%x, ol
         }
 
         /* set input flow control */
-        if( (iflag&IXOFF) != (old_iflag&IXOFF)
-        || (cflag&CRTSCTS) != (old_cflag&CRTSCTS) ) {
-
+        if ((iflag&IXOFF) != (old_iflag&IXOFF)
+            || (cflag&CRTSCTS) != (old_cflag&CRTSCTS)) {
                 arg = 0;
-
-                if( (iflag&IXOFF) )
+                if (iflag&IXOFF)
                         arg |= DIGI_INPUT_FLOW_CONTROL_XON_XOFF;
                 else
                         arg &= ~DIGI_INPUT_FLOW_CONTROL_XON_XOFF;
 
-                if( (cflag&CRTSCTS) ) {
-
+                if (cflag&CRTSCTS) {
                         arg |= DIGI_INPUT_FLOW_CONTROL_RTS;
 
                         /* On USB-4 it is necessary to assert RTS prior */
@@ -1107,43 +1047,37 @@ dbg( "digi_set_termios: TOP: port=%d, iflag=0x%x, old_iflag=0x%x, cflag=0x%x, ol
                 } else {
                         arg &= ~DIGI_INPUT_FLOW_CONTROL_RTS;
                 }
-
                 buf[i++] = DIGI_CMD_SET_INPUT_FLOW_CONTROL;
                 buf[i++] = priv->dp_port_num;
                 buf[i++] = arg;
                 buf[i++] = 0;
-
         }
 
         /* set output flow control */
-        if( (iflag&IXON) != (old_iflag&IXON)
-        || (cflag&CRTSCTS) != (old_cflag&CRTSCTS) ) {
-
+        if ((iflag&IXON) != (old_iflag&IXON)
+            || (cflag&CRTSCTS) != (old_cflag&CRTSCTS)) {
                 arg = 0;
-
-                if( (iflag&IXON) )
+                if (iflag&IXON)
                         arg |= DIGI_OUTPUT_FLOW_CONTROL_XON_XOFF;
                 else
                         arg &= ~DIGI_OUTPUT_FLOW_CONTROL_XON_XOFF;
 
-                if( (cflag&CRTSCTS) ) {
+                if (cflag&CRTSCTS) {
                         arg |= DIGI_OUTPUT_FLOW_CONTROL_CTS;
                 } else {
                         arg &= ~DIGI_OUTPUT_FLOW_CONTROL_CTS;
-                        port->tty->hw_stopped = 0;
+                        tty->hw_stopped = 0;
                 }
 
                 buf[i++] = DIGI_CMD_SET_OUTPUT_FLOW_CONTROL;
                 buf[i++] = priv->dp_port_num;
                 buf[i++] = arg;
                 buf[i++] = 0;
-
         }
 
         /* set receive enable/disable */
-        if( (cflag&CREAD) != (old_cflag&CREAD) ) {
-
-                if( (cflag&CREAD) )
+        if ((cflag&CREAD) != (old_cflag&CREAD)) {
+                if (cflag&CREAD)
                         arg = DIGI_ENABLE;
                 else
                         arg = DIGI_DISABLE;
@@ -1152,32 +1086,26 @@ dbg( "digi_set_termios: TOP: port=%d, iflag=0x%x, old_iflag=0x%x, cflag=0x%x, ol
                 buf[i++] = priv->dp_port_num;
                 buf[i++] = arg;
                 buf[i++] = 0;
-
         }
-
-        if( (ret=digi_write_oob_command( port, buf, i, 1 )) != 0 )
-                dbg( "digi_set_termios: write oob failed, ret=%d", ret );
+        if ((ret = digi_write_oob_command(port, buf, i, 1)) != 0)
+                dbg("digi_set_termios: write oob failed, ret=%d", ret);
 
 }
 
 
-static void digi_break_ctl( struct usb_serial_port *port, int break_state )
+static void digi_break_ctl(struct usb_serial_port *port, int break_state)
 {
-
         unsigned char buf[4];
 
-
         buf[0] = DIGI_CMD_BREAK_CONTROL;
         buf[1] = 2;                             /* length */
         buf[2] = break_state ? 1 : 0;
         buf[3] = 0;                             /* pad */
-
-        digi_write_inb_command( port, buf, 4, 0 );
-
+        digi_write_inb_command(port, buf, 4, 0);
 }
 
 
-static int digi_tiocmget( struct usb_serial_port *port, struct file *file )
+static int digi_tiocmget(struct usb_serial_port *port, struct file *file)
 {
         struct digi_port *priv = usb_get_serial_port_data(port);
         unsigned int val;
@@ -1185,15 +1113,15 @@ static int digi_tiocmget( struct usb_serial_port *port, struct file *file )
 
         dbg("%s: TOP: port=%d", __FUNCTION__, priv->dp_port_num);
 
-        spin_lock_irqsave( &priv->dp_port_lock, flags );
+        spin_lock_irqsave(&priv->dp_port_lock, flags);
         val = priv->dp_modem_signals;
-        spin_unlock_irqrestore( &priv->dp_port_lock, flags );
+        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
         return val;
 }
 
 
-static int digi_tiocmset( struct usb_serial_port *port, struct file *file,
-        unsigned int set, unsigned int clear )
+static int digi_tiocmset(struct usb_serial_port *port, struct file *file,
+        unsigned int set, unsigned int clear)
 {
         struct digi_port *priv = usb_get_serial_port_data(port);
         unsigned int val;
@@ -1201,41 +1129,34 @@ static int digi_tiocmset( struct usb_serial_port *port, struct file *file,
 
         dbg("%s: TOP: port=%d", __FUNCTION__, priv->dp_port_num);
 
-        spin_lock_irqsave( &priv->dp_port_lock, flags );
+        spin_lock_irqsave(&priv->dp_port_lock, flags);
         val = (priv->dp_modem_signals & ~clear) | set;
-        spin_unlock_irqrestore( &priv->dp_port_lock, flags );
-        return digi_set_modem_signals( port, val, 1 );
+        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
+        return digi_set_modem_signals(port, val, 1);
 }
 
 
-static int digi_ioctl( struct usb_serial_port *port, struct file *file,
-        unsigned int cmd, unsigned long arg )
+static int digi_ioctl(struct usb_serial_port *port, struct file *file,
+        unsigned int cmd, unsigned long arg)
 {
-
         struct digi_port *priv = usb_get_serial_port_data(port);
-
-dbg( "digi_ioctl: TOP: port=%d, cmd=0x%x", priv->dp_port_num, cmd );
+        dbg("digi_ioctl: TOP: port=%d, cmd=0x%x", priv->dp_port_num, cmd);
 
         switch (cmd) {
-
         case TIOCMIWAIT:
                 /* wait for any of the 4 modem inputs (DCD,RI,DSR,CTS)*/
                 /* TODO */
-                return( 0 );
-
+                return 0;
         case TIOCGICOUNT:
                 /* return count of modemline transitions */
                 /* TODO */
                 return 0;
-
         }
-
-        return( -ENOIOCTLCMD );
+        return -ENOIOCTLCMD;
 
 }
 
-
-static int digi_write( struct usb_serial_port *port, const unsigned char *buf, int count )
+static int digi_write(struct usb_serial_port *port, const unsigned char *buf, int count)
 {
 
         int ret,data_len,new_len;
@@ -1243,35 +1164,29 @@ static int digi_write( struct usb_serial_port *port, const unsigned char *buf, i
         unsigned char *data = port->write_urb->transfer_buffer;
         unsigned long flags = 0;
 
-
-dbg( "digi_write: TOP: port=%d, count=%d, in_interrupt=%ld",
-priv->dp_port_num, count, in_interrupt() );
+        dbg("digi_write: TOP: port=%d, count=%d, in_interrupt=%ld",
+                priv->dp_port_num, count, in_interrupt());
 
         /* copy user data (which can sleep) before getting spin lock */
-        count = min( count, port->bulk_out_size-2 );
-        count = min( 64, count);
+        count = min(count, port->bulk_out_size-2);
+        count = min(64, count);
 
         /* be sure only one write proceeds at a time */
         /* there are races on the port private buffer */
         /* and races to check write_urb->status */
-        spin_lock_irqsave( &priv->dp_port_lock, flags );
+        spin_lock_irqsave(&priv->dp_port_lock, flags);
 
         /* wait for urb status clear to submit another urb */
-        if( port->write_urb->status == -EINPROGRESS
-        || priv->dp_write_urb_in_use ) {
-
+        if (port->write_urb->status == -EINPROGRESS || priv->dp_write_urb_in_use) {
                 /* buffer data if count is 1 (probably put_char) if possible */
-                if( count == 1 && priv->dp_out_buf_len < DIGI_OUT_BUF_SIZE ) {
+                if (count == 1 && priv->dp_out_buf_len < DIGI_OUT_BUF_SIZE) {
                         priv->dp_out_buf[priv->dp_out_buf_len++] = *buf;
                         new_len = 1;
                 } else {
                         new_len = 0;
                 }
-
-                spin_unlock_irqrestore( &priv->dp_port_lock, flags );
-
-                return( new_len );
-
+                spin_unlock_irqrestore(&priv->dp_port_lock, flags);
+                return new_len;
         }
 
         /* allow space for any buffered data and for new data, up to */
@@ -1279,9 +1194,9 @@ priv->dp_port_num, count, in_interrupt() );
         new_len = min(count, port->bulk_out_size-2-priv->dp_out_buf_len);
         data_len = new_len + priv->dp_out_buf_len;
 
-        if( data_len == 0 ) {
-                spin_unlock_irqrestore( &priv->dp_port_lock, flags );
-                return( 0 );
+        if (data_len == 0) {
+                spin_unlock_irqrestore(&priv->dp_port_lock, flags);
+                return 0;
         }
 
         port->write_urb->transfer_buffer_length = data_len+2;
@@ -1291,32 +1206,29 @@ priv->dp_port_num, count, in_interrupt() );
         *data++ = data_len;
 
         /* copy in buffered data first */
-        memcpy( data, priv->dp_out_buf, priv->dp_out_buf_len );
+        memcpy(data, priv->dp_out_buf, priv->dp_out_buf_len);
         data += priv->dp_out_buf_len;
 
         /* copy in new data */
-        memcpy( data, buf, new_len );
+        memcpy(data, buf, new_len);
 
-        if( (ret=usb_submit_urb(port->write_urb, GFP_ATOMIC)) == 0 ) {
+        if ((ret = usb_submit_urb(port->write_urb, GFP_ATOMIC)) == 0) {
                 priv->dp_write_urb_in_use = 1;
                 ret = new_len;
                 priv->dp_out_buf_len = 0;
         }
 
         /* return length of new data written, or error */
-        spin_unlock_irqrestore( &priv->dp_port_lock, flags );
-        if( ret < 0 ) {
-                err("%s: usb_submit_urb failed, ret=%d, port=%d", __FUNCTION__,
-                        ret, priv->dp_port_num );
-        }
-
-dbg( "digi_write: returning %d", ret );
-        return( ret );
+        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
+        if (ret < 0)
+                err("%s: usb_submit_urb failed, ret=%d, port=%d",
+                        __FUNCTION__, ret, priv->dp_port_num);
+        dbg("digi_write: returning %d", ret);
+        return ret;
 
 } 
 
-
-static void digi_write_bulk_callback( struct urb *urb )
+static void digi_write_bulk_callback(struct urb *urb)
 {
 
         struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
@@ -1326,153 +1238,136 @@ static void digi_write_bulk_callback( struct urb *urb )
         int ret = 0;
         int status = urb->status;
 
-
-        dbg("digi_write_bulk_callback: TOP, urb status=%d", status);
+        dbg("digi_write_bulk_callback: TOP, urb->status=%d", status);
 
         /* port and serial sanity check */
-        if( port == NULL || (priv=usb_get_serial_port_data(port)) == NULL ) {
+        if (port == NULL || (priv=usb_get_serial_port_data(port)) == NULL) {
                 err("%s: port or port->private is NULL, status=%d",
                     __FUNCTION__, status);
                 return;
         }
         serial = port->serial;
-        if( serial == NULL || (serial_priv=usb_get_serial_data(serial)) == NULL ) {
+        if (serial == NULL || (serial_priv=usb_get_serial_data(serial)) == NULL) {
                 err("%s: serial or serial->private is NULL, status=%d",
                     __FUNCTION__, status);
                 return;
         }
 
         /* handle oob callback */
-        if( priv->dp_port_num == serial_priv->ds_oob_port_num ) {
-                dbg( "digi_write_bulk_callback: oob callback" );
-                spin_lock( &priv->dp_port_lock );
+        if (priv->dp_port_num == serial_priv->ds_oob_port_num) {
+                dbg("digi_write_bulk_callback: oob callback");
+                spin_lock(&priv->dp_port_lock);
                 priv->dp_write_urb_in_use = 0;
-                wake_up_interruptible( &port->write_wait );
-                spin_unlock( &priv->dp_port_lock );
+                wake_up_interruptible(&port->write_wait);
+                spin_unlock(&priv->dp_port_lock);
                 return;
         }
 
         /* try to send any buffered data on this port, if it is open */
-        spin_lock( &priv->dp_port_lock );
+        spin_lock(&priv->dp_port_lock);
         priv->dp_write_urb_in_use = 0;
-        if( port->open_count && port->write_urb->status != -EINPROGRESS
-        && priv->dp_out_buf_len > 0 ) {
-
+        if (port->open_count && port->write_urb->status != -EINPROGRESS
+            && priv->dp_out_buf_len > 0) {
                 *((unsigned char *)(port->write_urb->transfer_buffer))
                         = (unsigned char)DIGI_CMD_SEND_DATA;
                 *((unsigned char *)(port->write_urb->transfer_buffer)+1)
                         = (unsigned char)priv->dp_out_buf_len;
-
-                port->write_urb->transfer_buffer_length
-                        = priv->dp_out_buf_len+2;
+                port->write_urb->transfer_buffer_length = priv->dp_out_buf_len+2;
                 port->write_urb->dev = serial->dev;
-
-                memcpy( port->write_urb->transfer_buffer+2, priv->dp_out_buf,
-                        priv->dp_out_buf_len );
-
-                if( (ret=usb_submit_urb(port->write_urb, GFP_ATOMIC)) == 0 ) {
+                memcpy(port->write_urb->transfer_buffer+2, priv->dp_out_buf,
+                        priv->dp_out_buf_len);
+                if ((ret = usb_submit_urb(port->write_urb, GFP_ATOMIC)) == 0) {
                         priv->dp_write_urb_in_use = 1;
                         priv->dp_out_buf_len = 0;
                 }
-
         }
-
         /* wake up processes sleeping on writes immediately */
-        digi_wakeup_write( port );
-
+        digi_wakeup_write(port);
         /* also queue up a wakeup at scheduler time, in case we */
         /* lost the race in write_chan(). */
         schedule_work(&priv->dp_wakeup_work);
 
-        spin_unlock( &priv->dp_port_lock );
-
-        if( ret ) {
-                err("%s: usb_submit_urb failed, ret=%d, port=%d", __FUNCTION__,
-                        ret, priv->dp_port_num );
-        }
-
+        spin_unlock(&priv->dp_port_lock);
+        if (ret)
+                err("%s: usb_submit_urb failed, ret=%d, port=%d",
+                        __FUNCTION__, ret, priv->dp_port_num);
 }
 
-
-static int digi_write_room( struct usb_serial_port *port )
+static int digi_write_room(struct usb_serial_port *port)
 {
 
         int room;
         struct digi_port *priv = usb_get_serial_port_data(port);
         unsigned long flags = 0;
 
+        spin_lock_irqsave(&priv->dp_port_lock, flags);
 
-        spin_lock_irqsave( &priv->dp_port_lock, flags );
-
-        if( port->write_urb->status == -EINPROGRESS
-        || priv->dp_write_urb_in_use )
+        if (port->write_urb->status == -EINPROGRESS || priv->dp_write_urb_in_use)
                 room = 0;
         else
                 room = port->bulk_out_size - 2 - priv->dp_out_buf_len;
 
-        spin_unlock_irqrestore( &priv->dp_port_lock, flags );
-
-dbg( "digi_write_room: port=%d, room=%d", priv->dp_port_num, room );
-        return( room );
+        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
+        dbg("digi_write_room: port=%d, room=%d", priv->dp_port_num, room);
+        return room;
 
 }
 
-
-static int digi_chars_in_buffer( struct usb_serial_port *port )
+static int digi_chars_in_buffer(struct usb_serial_port *port)
 {
 
         struct digi_port *priv = usb_get_serial_port_data(port);
 
 
-        if( port->write_urb->status == -EINPROGRESS
-        || priv->dp_write_urb_in_use ) {
-dbg( "digi_chars_in_buffer: port=%d, chars=%d", priv->dp_port_num, port->bulk_out_size - 2 );
-                /* return( port->bulk_out_size - 2 ); */
-                return( 256 );
+        if (port->write_urb->status == -EINPROGRESS
+            || priv->dp_write_urb_in_use) {
+                dbg("digi_chars_in_buffer: port=%d, chars=%d",
+                        priv->dp_port_num, port->bulk_out_size - 2);
+                /* return(port->bulk_out_size - 2); */
+                return 256;
         } else {
-dbg( "digi_chars_in_buffer: port=%d, chars=%d", priv->dp_port_num, priv->dp_out_buf_len );
-                return( priv->dp_out_buf_len );
+                dbg("digi_chars_in_buffer: port=%d, chars=%d",
+                        priv->dp_port_num, priv->dp_out_buf_len);
+                return priv->dp_out_buf_len;
         }
 
 }
 
 
-static int digi_open( struct usb_serial_port *port, struct file *filp )
+static int digi_open(struct usb_serial_port *port, struct file *filp)
 {
-
         int ret;
         unsigned char buf[32];
         struct digi_port *priv = usb_get_serial_port_data(port);
         struct ktermios not_termios;
         unsigned long flags = 0;
 
-
-dbg( "digi_open: TOP: port=%d, open_count=%d", priv->dp_port_num, port->open_count );
+        dbg("digi_open: TOP: port=%d, open_count=%d",
+                priv->dp_port_num, port->open_count);
 
         /* be sure the device is started up */
-        if( digi_startup_device( port->serial ) != 0 )
-                return( -ENXIO );
+        if (digi_startup_device(port->serial) != 0)
+                return -ENXIO;
 
-        spin_lock_irqsave( &priv->dp_port_lock, flags );
+        spin_lock_irqsave(&priv->dp_port_lock, flags);
 
         /* don't wait on a close in progress for non-blocking opens */
-        if( priv->dp_in_close && (filp->f_flags&(O_NDELAY|O_NONBLOCK)) == 0 ) {
-                spin_unlock_irqrestore( &priv->dp_port_lock, flags );
-                return( -EAGAIN );
+        if (priv->dp_in_close && (filp->f_flags&(O_NDELAY|O_NONBLOCK)) == 0) {
+                spin_unlock_irqrestore(&priv->dp_port_lock, flags);
+                return -EAGAIN;
         }
 
         /* wait for a close in progress to finish */
-        while( priv->dp_in_close ) {
+        while(priv->dp_in_close) {
                 cond_wait_interruptible_timeout_irqrestore(
                         &priv->dp_close_wait, DIGI_RETRY_TIMEOUT,
-                        &priv->dp_port_lock, flags );
-                if( signal_pending(current) ) {
-                        return( -EINTR );
-                }
-                spin_lock_irqsave( &priv->dp_port_lock, flags );
+                        &priv->dp_port_lock, flags);
+                if (signal_pending(current))
+                        return -EINTR;
+                spin_lock_irqsave(&priv->dp_port_lock, flags);
         }
 
-        spin_unlock_irqrestore( &priv->dp_port_lock, flags );
+        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
  
         /* read modem signals automatically whenever they change */
         buf[0] = DIGI_CMD_READ_INPUT_SIGNALS;
@@ -1486,23 +1381,22 @@ dbg( "digi_open: TOP: port=%d, open_count=%d", priv->dp_port_num, port->open_cou
         buf[6] = DIGI_FLUSH_TX | DIGI_FLUSH_RX;
         buf[7] = 0;
 
-        if( (ret=digi_write_oob_command( port, buf, 8, 1 )) != 0 )
-                dbg( "digi_open: write oob failed, ret=%d", ret );
+        if ((ret = digi_write_oob_command(port, buf, 8, 1)) != 0)
+                dbg("digi_open: write oob failed, ret=%d", ret);
 
         /* set termios settings */
         not_termios.c_cflag = ~port->tty->termios->c_cflag;
         not_termios.c_iflag = ~port->tty->termios->c_iflag;
-        digi_set_termios( port, &not_termios );
+        digi_set_termios(port, &not_termios);
 
         /* set DTR and RTS */
-        digi_set_modem_signals( port, TIOCM_DTR|TIOCM_RTS, 1 );
-
-        return( 0 );
+        digi_set_modem_signals(port, TIOCM_DTR|TIOCM_RTS, 1);
 
+        return 0;
 }
 
 
-static void digi_close( struct usb_serial_port *port, struct file *filp )
+static void digi_close(struct usb_serial_port *port, struct file *filp)
 {
         DEFINE_WAIT(wait);
         int ret;
@@ -1511,40 +1405,37 @@ static void digi_close( struct usb_serial_port *port, struct file *filp )
         struct digi_port *priv = usb_get_serial_port_data(port);
         unsigned long flags = 0;
 
-
-dbg( "digi_close: TOP: port=%d, open_count=%d", priv->dp_port_num, port->open_count );
-
+        dbg("digi_close: TOP: port=%d, open_count=%d",
+                priv->dp_port_num, port->open_count);
 
         /* if disconnected, just clear flags */
         if (!usb_get_intfdata(port->serial->interface))
                 goto exit;
 
         /* do cleanup only after final close on this port */
-        spin_lock_irqsave( &priv->dp_port_lock, flags );
+        spin_lock_irqsave(&priv->dp_port_lock, flags);
         priv->dp_in_close = 1;
-        spin_unlock_irqrestore( &priv->dp_port_lock, flags );
+        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
 
         /* tell line discipline to process only XON/XOFF */
         tty->closing = 1;
 
         /* wait for output to drain */
-        if( (filp->f_flags&(O_NDELAY|O_NONBLOCK)) == 0 ) {
-                tty_wait_until_sent( tty, DIGI_CLOSE_TIMEOUT );
-        }
+        if ((filp->f_flags&(O_NDELAY|O_NONBLOCK)) == 0)
+                tty_wait_until_sent(tty, DIGI_CLOSE_TIMEOUT);
 
         /* flush driver and line discipline buffers */
-        if( tty->driver->flush_buffer )
-                tty->driver->flush_buffer( tty );
+        if (tty->driver->flush_buffer)
+                tty->driver->flush_buffer(tty);
         tty_ldisc_flush(tty);
 
         if (port->serial->dev) {
                 /* wait for transmit idle */
-                if( (filp->f_flags&(O_NDELAY|O_NONBLOCK)) == 0 ) {
-                        digi_transmit_idle( port, DIGI_CLOSE_TIMEOUT );
+                if ((filp->f_flags&(O_NDELAY|O_NONBLOCK)) == 0) {
+                        digi_transmit_idle(port, DIGI_CLOSE_TIMEOUT);
                 }
-
                 /* drop DTR and RTS */
-                digi_set_modem_signals( port, 0, 0 );
+                digi_set_modem_signals(port, 0, 0);
 
                 /* disable input flow control */
                 buf[0] = DIGI_CMD_SET_INPUT_FLOW_CONTROL;
@@ -1576,8 +1467,8 @@ dbg( "digi_close: TOP: port=%d, open_count=%d", priv->dp_port_num, port->open_co
                 buf[18] = DIGI_FLUSH_TX | DIGI_FLUSH_RX;
                 buf[19] = 0;
 
-                if( (ret=digi_write_oob_command( port, buf, 20, 0 )) != 0 )
-                        dbg( "digi_close: write oob failed, ret=%d", ret );
+                if ((ret = digi_write_oob_command(port, buf, 20, 0)) != 0)
+                        dbg("digi_close: write oob failed, ret=%d", ret);
 
                 /* wait for final commands on oob port to complete */
                 prepare_to_wait(&priv->dp_flush_wait, &wait, TASK_INTERRUPTIBLE);
@@ -1587,17 +1478,14 @@ dbg( "digi_close: TOP: port=%d, open_count=%d", priv->dp_port_num, port->open_co
                 /* shutdown any outstanding bulk writes */
                 usb_kill_urb(port->write_urb);
         }
-
         tty->closing = 0;
-
 exit:
-        spin_lock_irqsave( &priv->dp_port_lock, flags );
+        spin_lock_irqsave(&priv->dp_port_lock, flags);
         priv->dp_write_urb_in_use = 0;
         priv->dp_in_close = 0;
-        wake_up_interruptible( &priv->dp_close_wait );
-        spin_unlock_irqrestore( &priv->dp_port_lock, flags );
-
-dbg( "digi_close: done" );
+        wake_up_interruptible(&priv->dp_close_wait);
+        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
+        dbg("digi_close: done");
 }
 
 
@@ -1608,155 +1496,136 @@ dbg( "digi_close: done" );
 *  urbs initialized.  Returns 0 if successful, non-zero error otherwise.
 */
 
-static int digi_startup_device( struct usb_serial *serial )
+static int digi_startup_device(struct usb_serial *serial)
 {
-
         int i,ret = 0;
         struct digi_serial *serial_priv = usb_get_serial_data(serial);
         struct usb_serial_port *port;
 
-
         /* be sure this happens exactly once */
-        spin_lock( &serial_priv->ds_serial_lock );
-        if( serial_priv->ds_device_started ) {
-                spin_unlock( &serial_priv->ds_serial_lock );
-                return( 0 );
+        spin_lock(&serial_priv->ds_serial_lock);
+        if (serial_priv->ds_device_started) {
+                spin_unlock(&serial_priv->ds_serial_lock);
+                return 0;
         }
         serial_priv->ds_device_started = 1;
-        spin_unlock( &serial_priv->ds_serial_lock );
+        spin_unlock(&serial_priv->ds_serial_lock);
 
         /* start reading from each bulk in endpoint for the device */
         /* set USB_DISABLE_SPD flag for write bulk urbs */
-        for( i=0; i<serial->type->num_ports+1; i++ ) {
-
+        for (i = 0; i < serial->type->num_ports + 1; i++) {
                 port = serial->port[i];
-
                 port->write_urb->dev = port->serial->dev;
-
-                if( (ret=usb_submit_urb(port->read_urb, GFP_KERNEL)) != 0 ) {
-                        err("%s: usb_submit_urb failed, ret=%d, port=%d", __FUNCTION__,
-                        ret, i );
+                if ((ret = usb_submit_urb(port->read_urb, GFP_KERNEL)) != 0) {
+                        err("%s: usb_submit_urb failed, ret=%d, port=%d",
+                                        __FUNCTION__, ret, i);
                         break;
                 }
-
         }
-
-        return( ret );
-
+        return ret;
 }
 
 
-static int digi_startup( struct usb_serial *serial )
+static int digi_startup(struct usb_serial *serial)
 {
 
         int i;
         struct digi_port *priv;
         struct digi_serial *serial_priv;
 
-
-dbg( "digi_startup: TOP" );
+        dbg("digi_startup: TOP");
 
         /* allocate the private data structures for all ports */
         /* number of regular ports + 1 for the out-of-band port */
-        for( i=0; i<serial->type->num_ports+1; i++ ) {
-
+        for(i = 0; i < serial->type->num_ports + 1; i++) {
                 /* allocate port private structure */
-                priv = kmalloc( sizeof(struct digi_port),
-                        GFP_KERNEL );
-                if( priv == (struct digi_port *)0 ) {
-                        while( --i >= 0 )
-                                kfree( usb_get_serial_port_data(serial->port[i]) );
-                        return( 1 );                    /* error */
+                priv = kmalloc(sizeof(struct digi_port), GFP_KERNEL);
+                if (priv == NULL) {
+                        while (--i >= 0)
+                                kfree(usb_get_serial_port_data(serial->port[i]));
+                        return 1;                       /* error */
                 }
 
                 /* initialize port private structure */
-                spin_lock_init( &priv->dp_port_lock );
+                spin_lock_init(&priv->dp_port_lock);
                 priv->dp_port_num = i;
                 priv->dp_out_buf_len = 0;
                 priv->dp_write_urb_in_use = 0;
                 priv->dp_modem_signals = 0;
-                init_waitqueue_head( &priv->dp_modem_change_wait );
+                init_waitqueue_head(&priv->dp_modem_change_wait);
                 priv->dp_transmit_idle = 0;
-                init_waitqueue_head( &priv->dp_transmit_idle_wait );
+                init_waitqueue_head(&priv->dp_transmit_idle_wait);
                 priv->dp_throttled = 0;
                 priv->dp_throttle_restart = 0;
-                init_waitqueue_head( &priv->dp_flush_wait );
+                init_waitqueue_head(&priv->dp_flush_wait);
                 priv->dp_in_close = 0;
-                init_waitqueue_head( &priv->dp_close_wait );
+                init_waitqueue_head(&priv->dp_close_wait);
                 INIT_WORK(&priv->dp_wakeup_work, digi_wakeup_write_lock);
                 priv->dp_port = serial->port[i];
-
                 /* initialize write wait queue for this port */
-                init_waitqueue_head( &serial->port[i]->write_wait );
+                init_waitqueue_head(&serial->port[i]->write_wait);
 
                 usb_set_serial_port_data(serial->port[i], priv);
         }
 
         /* allocate serial private structure */
-        serial_priv = kmalloc( sizeof(struct digi_serial),
-                GFP_KERNEL );
-        if( serial_priv == (struct digi_serial *)0 ) {
-                for( i=0; i<serial->type->num_ports+1; i++ )
-                        kfree( usb_get_serial_port_data(serial->port[i]) );
-                return( 1 );                    /* error */
+        serial_priv = kmalloc(sizeof(struct digi_serial), GFP_KERNEL);
+        if (serial_priv == NULL) {
+                for (i = 0; i < serial->type->num_ports + 1; i++)
+                        kfree(usb_get_serial_port_data(serial->port[i]));
+                return 1;                       /* error */
         }
 
         /* initialize serial private structure */
-        spin_lock_init( &serial_priv->ds_serial_lock );
+        spin_lock_init(&serial_priv->ds_serial_lock);
         serial_priv->ds_oob_port_num = serial->type->num_ports;
         serial_priv->ds_oob_port = serial->port[serial_priv->ds_oob_port_num];
         serial_priv->ds_device_started = 0;
         usb_set_serial_data(serial, serial_priv);
 
-        return( 0 );
-
+        return 0;
 }
 
 
-static void digi_shutdown( struct usb_serial *serial )
+static void digi_shutdown(struct usb_serial *serial)
 {
-
         int i;
-
-
-dbg( "digi_shutdown: TOP, in_interrupt()=%ld", in_interrupt() );
+        dbg("digi_shutdown: TOP, in_interrupt()=%ld", in_interrupt());
 
         /* stop reads and writes on all ports */
-        for( i=0; i<serial->type->num_ports+1; i++ ) {
+        for (i = 0; i < serial->type->num_ports + 1; i++) {
                 usb_kill_urb(serial->port[i]->read_urb);
                 usb_kill_urb(serial->port[i]->write_urb);
         }
 
         /* free the private data structures for all ports */
         /* number of regular ports + 1 for the out-of-band port */
-        for( i=0; i<serial->type->num_ports+1; i++ )
-                kfree( usb_get_serial_port_data(serial->port[i]) );
-        kfree( usb_get_serial_data(serial) );
+        for(i = 0; i < serial->type->num_ports + 1; i++)
+                kfree(usb_get_serial_port_data(serial->port[i]));
+        kfree(usb_get_serial_data(serial));
 }
 
 
-static void digi_read_bulk_callback( struct urb *urb )
+static void digi_read_bulk_callback(struct urb *urb)
 {
-
         struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
         struct digi_port *priv;
         struct digi_serial *serial_priv;
         int ret;
         int status = urb->status;
 
-
-dbg( "digi_read_bulk_callback: TOP" );
+        dbg("digi_read_bulk_callback: TOP");
 
         /* port sanity check, do not resubmit if port is not valid */
-        if( port == NULL || (priv=usb_get_serial_port_data(port)) == NULL ) {
+        if (port == NULL || (priv = usb_get_serial_port_data(port)) == NULL) {
                 err("%s: port or port->private is NULL, status=%d",
                     __FUNCTION__, status);
                 return;
         }
-        if( port->serial == NULL
-        || (serial_priv=usb_get_serial_data(port->serial)) == NULL ) {
+        if (port->serial == NULL ||
+                (serial_priv=usb_get_serial_data(port->serial)) == NULL) {
                 err("%s: serial is bad or serial->private is NULL, status=%d",
-                    __FUNCTION__, status);
+                        __FUNCTION__, status);
                 return;
         }
 
@@ -1768,24 +1637,23 @@ dbg( "digi_read_bulk_callback: TOP" );
         }
 
         /* handle oob or inb callback, do not resubmit if error */
-        if( priv->dp_port_num == serial_priv->ds_oob_port_num ) {
-                if( digi_read_oob_callback( urb ) != 0 )
+        if (priv->dp_port_num == serial_priv->ds_oob_port_num) {
+                if (digi_read_oob_callback(urb) != 0)
                         return;
         } else {
-                if( digi_read_inb_callback( urb ) != 0 )
+                if (digi_read_inb_callback(urb) != 0)
                         return;
         }
 
         /* continue read */
         urb->dev = port->serial->dev;
-        if( (ret=usb_submit_urb(urb, GFP_ATOMIC)) != 0 ) {
-                err("%s: failed resubmitting urb, ret=%d, port=%d", __FUNCTION__,
-                        ret, priv->dp_port_num );
+        if ((ret = usb_submit_urb(urb, GFP_ATOMIC)) != 0) {
+                err("%s: failed resubmitting urb, ret=%d, port=%d",
+                    __FUNCTION__, ret, priv->dp_port_num);
         }
 
 }
 
-
 /* 
 *  Digi Read INB Callback
 *
@@ -1796,7 +1664,7 @@ dbg( "digi_read_bulk_callback: TOP" );
 *  throttled, and -1 if the sanity checks failed.
 */
 
-static int digi_read_inb_callback( struct urb *urb )
+static int digi_read_inb_callback(struct urb *urb)
 {
 
         struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
@@ -1812,72 +1680,67 @@ static int digi_read_inb_callback( struct urb *urb )
 
         /* do not process callbacks on closed ports */
         /* but do continue the read chain */
-        if( port->open_count == 0 )
-                return( 0 );
+        if (port->open_count == 0)
+                return 0;
 
         /* short/multiple packet check */
-        if( urb->actual_length != len + 2 ) {
-                err("%s: INCOMPLETE OR MULTIPLE PACKET, urb status=%d, "
+        if (urb->actual_length != len + 2) {
+                err("%s: INCOMPLETE OR MULTIPLE PACKET, urb->status=%d, "
                     "port=%d, opcode=%d, len=%d, actual_length=%d, "
-                    "port_status=%d", __FUNCTION__, status, priv->dp_port_num,
+                    "status=%d", __FUNCTION__, status, priv->dp_port_num,
                     opcode, len, urb->actual_length, port_status);
-                return( -1 );
+                return -1;
         }
 
-        spin_lock( &priv->dp_port_lock );
+        spin_lock(&priv->dp_port_lock);
 
         /* check for throttle; if set, do not resubmit read urb */
         /* indicate the read chain needs to be restarted on unthrottle */
         throttled = priv->dp_throttled;
-        if( throttled )
+        if (throttled)
                 priv->dp_throttle_restart = 1;
 
         /* receive data */
-        if( opcode == DIGI_CMD_RECEIVE_DATA ) {
-
+        if (opcode == DIGI_CMD_RECEIVE_DATA) {
                 /* get flag from port_status */
                 flag = 0;
 
                 /* overrun is special, not associated with a char */
-                if (port_status & DIGI_OVERRUN_ERROR) {
-                        tty_insert_flip_char( tty, 0, TTY_OVERRUN );
-                }
+                if (port_status & DIGI_OVERRUN_ERROR)
+                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
 
                 /* break takes precedence over parity, */
                 /* which takes precedence over framing errors */
-                if (port_status & DIGI_BREAK_ERROR) {
+                if (port_status & DIGI_BREAK_ERROR)
                         flag = TTY_BREAK;
-                } else if (port_status & DIGI_PARITY_ERROR) {
+                else if (port_status & DIGI_PARITY_ERROR)
                         flag = TTY_PARITY;
-                } else if (port_status & DIGI_FRAMING_ERROR) {
+                else if (port_status & DIGI_FRAMING_ERROR)
                         flag = TTY_FRAME;
-                }
 
                 /* data length is len-1 (one byte of len is port_status) */
                 --len;
 
                 len = tty_buffer_request_room(tty, len);
-                if( len > 0 ) {
+                if (len > 0) {
                         /* Hot path */
-                        if(flag == TTY_NORMAL)
+                        if (flag == TTY_NORMAL)
                                 tty_insert_flip_string(tty, data, len);
                         else {
                                 for(i = 0; i < len; i++)
                                         tty_insert_flip_char(tty, data[i], flag);
                         }
-                        tty_flip_buffer_push( tty );
+                        tty_flip_buffer_push(tty);
                 }
         }
+        spin_unlock(&priv->dp_port_lock);
 
-        spin_unlock( &priv->dp_port_lock );
-
-        if( opcode == DIGI_CMD_RECEIVE_DISABLE ) {
-                dbg("%s: got RECEIVE_DISABLE", __FUNCTION__ );
-        } else if( opcode != DIGI_CMD_RECEIVE_DATA ) {
-                dbg("%s: unknown opcode: %d", __FUNCTION__, opcode );
-        }
+        if (opcode == DIGI_CMD_RECEIVE_DISABLE)
+                dbg("%s: got RECEIVE_DISABLE", __FUNCTION__);
+        else if (opcode != DIGI_CMD_RECEIVE_DATA)
+                dbg("%s: unknown opcode: %d", __FUNCTION__, opcode);
 
-        return( throttled ? 1 : 0 );
+        return(throttled ? 1 : 0);
 
 }
 
@@ -1891,7 +1754,7 @@ static int digi_read_inb_callback( struct urb *urb )
 *  -1 if the sanity checks failed.
 */
 
-static int digi_read_oob_callback( struct urb *urb )
+static int digi_read_oob_callback(struct urb *urb)
 {
 
         struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
@@ -1900,87 +1763,75 @@ static int digi_read_oob_callback( struct urb *urb )
         int opcode, line, status, val;
         int i;
 
-
-dbg( "digi_read_oob_callback: port=%d, len=%d", priv->dp_port_num,
-urb->actual_length );
+        dbg("digi_read_oob_callback: port=%d, len=%d",
+                        priv->dp_port_num, urb->actual_length);
 
         /* handle each oob command */
-        for( i=0; i<urb->actual_length-3; ) {
-
+        for(i = 0; i < urb->actual_length - 3;) {
                 opcode = ((unsigned char *)urb->transfer_buffer)[i++];
                 line = ((unsigned char *)urb->transfer_buffer)[i++];
                 status = ((unsigned char *)urb->transfer_buffer)[i++];
                 val = ((unsigned char *)urb->transfer_buffer)[i++];
 
-dbg( "digi_read_oob_callback: opcode=%d, line=%d, status=%d, val=%d",
-opcode, line, status, val );
+                dbg("digi_read_oob_callback: opcode=%d, line=%d, status=%d, val=%d",
+                        opcode, line, status, val);
 
-                if( status != 0 || line >= serial->type->num_ports )
+                if (status != 0 || line >= serial->type->num_ports)
                         continue;
 
                 port = serial->port[line];
 
-                if ((priv=usb_get_serial_port_data(port)) == NULL )
+                if ((priv=usb_get_serial_port_data(port)) == NULL)
                         return -1;
 
-                if( opcode == DIGI_CMD_READ_INPUT_SIGNALS ) {
-
-                        spin_lock( &priv->dp_port_lock );
-
+                if (opcode == DIGI_CMD_READ_INPUT_SIGNALS) {
+                        spin_lock(&priv->dp_port_lock);
                         /* convert from digi flags to termiox flags */
-                        if( val & DIGI_READ_INPUT_SIGNALS_CTS ) {
+                        if (val & DIGI_READ_INPUT_SIGNALS_CTS) {
                                 priv->dp_modem_signals |= TIOCM_CTS;
                                 /* port must be open to use tty struct */
-                                if( port->open_count
-                                && port->tty->termios->c_cflag & CRTSCTS ) {
+                                if (port->open_count
+                                        && port->tty->termios->c_cflag & CRTSCTS) {
                                         port->tty->hw_stopped = 0;
-                                        digi_wakeup_write( port );
+                                        digi_wakeup_write(port);
                                 }
                         } else {
                                 priv->dp_modem_signals &= ~TIOCM_CTS;
                                 /* port must be open to use tty struct */
-                                if( port->open_count
-                                && port->tty->termios->c_cflag & CRTSCTS ) {
+                                if (port->open_count
+                                        && port->tty->termios->c_cflag & CRTSCTS) {
                                         port->tty->hw_stopped = 1;
                                 }
                         }
-                        if( val & DIGI_READ_INPUT_SIGNALS_DSR )
+                        if (val & DIGI_READ_INPUT_SIGNALS_DSR)
                                 priv->dp_modem_signals |= TIOCM_DSR;
                         else
                                 priv->dp_modem_signals &= ~TIOCM_DSR;
-                        if( val & DIGI_READ_INPUT_SIGNALS_RI )
+                        if (val & DIGI_READ_INPUT_SIGNALS_RI)
                                 priv->dp_modem_signals |= TIOCM_RI;
                         else
                                 priv->dp_modem_signals &= ~TIOCM_RI;
-                        if( val & DIGI_READ_INPUT_SIGNALS_DCD )
+                        if (val & DIGI_READ_INPUT_SIGNALS_DCD)
                                 priv->dp_modem_signals |= TIOCM_CD;
                         else
                                 priv->dp_modem_signals &= ~TIOCM_CD;
 
-                        wake_up_interruptible( &priv->dp_modem_change_wait );
-                        spin_unlock( &priv->dp_port_lock );
-
-                } else if( opcode == DIGI_CMD_TRANSMIT_IDLE ) {
-
-                        spin_lock( &priv->dp_port_lock );
+                        wake_up_interruptible(&priv->dp_modem_change_wait);
+                        spin_unlock(&priv->dp_port_lock);
+                } else if (opcode == DIGI_CMD_TRANSMIT_IDLE) {
+                        spin_lock(&priv->dp_port_lock);
                         priv->dp_transmit_idle = 1;
-                        wake_up_interruptible( &priv->dp_transmit_idle_wait );
-                        spin_unlock( &priv->dp_port_lock );
-
-                } else if( opcode == DIGI_CMD_IFLUSH_FIFO ) {
-
-                        wake_up_interruptible( &priv->dp_flush_wait );
-
+                        wake_up_interruptible(&priv->dp_transmit_idle_wait);
+                        spin_unlock(&priv->dp_port_lock);
+                } else if (opcode == DIGI_CMD_IFLUSH_FIFO) {
+                        wake_up_interruptible(&priv->dp_flush_wait);
                 }
-
         }
-
-        return( 0 );
+        return 0;
 
 }
 
-
-static int __init digi_init (void)
+static int __init digi_init(void)
 {
         int retval;
         retval = usb_serial_register(&digi_acceleport_2_device);
@@ -2002,12 +1853,11 @@ failed_acceleport_2_device:
         return retval;
 }
 
-
 static void __exit digi_exit (void)
 {
-        usb_deregister (&digi_driver);
-        usb_serial_deregister (&digi_acceleport_2_device);
-        usb_serial_deregister (&digi_acceleport_4_device);
+        usb_deregister(&digi_driver);
+        usb_serial_deregister(&digi_acceleport_2_device);
+        usb_serial_deregister(&digi_acceleport_4_device);
 }
 
 
@@ -2015,8 +1865,8 @@ module_init(digi_init);
 module_exit(digi_exit);
 
 
-MODULE_AUTHOR( DRIVER_AUTHOR );
-MODULE_DESCRIPTION( DRIVER_DESC );
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 
 module_param(debug, bool, S_IRUGO | S_IWUSR);
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index dd42f57089ff..2ecb1d2a034d 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -2366,9 +2366,8 @@ static int send_cmd_write_baud_rate (struct edgeport_port *edge_port, int baudRa
         int status;
         unsigned char number = edge_port->port->number - edge_port->port->serial->minor;
 
-        if ((!edge_serial->is_epic) ||
-            ((edge_serial->is_epic) &&
-             (!edge_serial->epic_descriptor.Supports.IOSPSetBaudRate))) {
+        if (edge_serial->is_epic &&
+            !edge_serial->epic_descriptor.Supports.IOSPSetBaudRate) {
                 dbg("SendCmdWriteBaudRate - NOT Setting baud rate for port = %d, baud = %d",
                     edge_port->port->number, baudRate);
                 return 0;
@@ -2461,18 +2460,16 @@ static int send_cmd_write_uart_register (struct edgeport_port *edge_port, __u8 r
 
         dbg("%s - write to %s register 0x%02x", (regNum == MCR) ? "MCR" : "LCR", __FUNCTION__, regValue);
 
-        if ((!edge_serial->is_epic) ||
-            ((edge_serial->is_epic) &&
-             (!edge_serial->epic_descriptor.Supports.IOSPWriteMCR) &&
-             (regNum == MCR))) {
+        if (edge_serial->is_epic &&
+            !edge_serial->epic_descriptor.Supports.IOSPWriteMCR &&
+            regNum == MCR) {
                 dbg("SendCmdWriteUartReg - Not writing to MCR Register");
                 return 0;
         }
 
-        if ((!edge_serial->is_epic) ||
-            ((edge_serial->is_epic) &&
-             (!edge_serial->epic_descriptor.Supports.IOSPWriteLCR) &&
-             (regNum == LCR))) {
+        if (edge_serial->is_epic &&
+            !edge_serial->epic_descriptor.Supports.IOSPWriteLCR &&
+            regNum == LCR) {
                 dbg ("SendCmdWriteUartReg - Not writing to LCR Register");
                 return 0;
         }
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 2a3fabcf5186..e08c9bb403d8 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -184,21 +184,21 @@ struct mct_u232_private {
  * we do not know how to support. We ignore them for the moment.
  * XXX Rate-limit the error message, it's user triggerable.
  */
-static int mct_u232_calculate_baud_rate(struct usb_serial *serial, int value)
+static int mct_u232_calculate_baud_rate(struct usb_serial *serial, speed_t value)
 {
         if (le16_to_cpu(serial->dev->descriptor.idProduct) == MCT_U232_SITECOM_PID
           || le16_to_cpu(serial->dev->descriptor.idProduct) == MCT_U232_BELKIN_F5U109_PID) {
                 switch (value) {
-                case    B300: return 0x01;
-                case    B600: return 0x02; /* this one not tested */
-                case   B1200: return 0x03;
-                case   B2400: return 0x04;
-                case   B4800: return 0x06;
-                case   B9600: return 0x08;
-                case  B19200: return 0x09;
-                case  B38400: return 0x0a;
-                case  B57600: return 0x0b;
-                case B115200: return 0x0c;
+                case    300: return 0x01;
+                case    600: return 0x02; /* this one not tested */
+                case   1200: return 0x03;
+                case   2400: return 0x04;
+                case   4800: return 0x06;
+                case   9600: return 0x08;
+                case  19200: return 0x09;
+                case  38400: return 0x0a;
+                case  57600: return 0x0b;
+                case 115200: return 0x0c;
                 default:
                         err("MCT USB-RS232: unsupported baudrate request 0x%x,"
                             " using default of B9600", value);
@@ -206,27 +206,27 @@ static int mct_u232_calculate_baud_rate(struct usb_serial *serial, int value)
                 }
         } else {
                 switch (value) {
-                case    B300: value =     300; break;
-                case    B600: value =     600; break;
-                case   B1200: value =    1200; break;
-                case   B2400: value =    2400; break;
-                case   B4800: value =    4800; break;
-                case   B9600: value =    9600; break;
-                case  B19200: value =   19200; break;
-                case  B38400: value =   38400; break;
-                case  B57600: value =   57600; break;
-                case B115200: value =  115200; break;
-                default:
-                        err("MCT USB-RS232: unsupported baudrate request 0x%x,"
-                            " using default of B9600", value);
-                        value = 9600;
+                        case 300: break;
+                        case 600: break;
+                        case 1200: break;
+                        case 2400: break;
+                        case 4800: break;
+                        case 9600: break;
+                        case 19200: break;
+                        case 38400: break;
+                        case 57600: break;
+                        case 115200: break;
+                        default:
+                                err("MCT USB-RS232: unsupported baudrate request 0x%x,"
+                                    " using default of B9600", value);
+                                value = 9600;
                 }
                 return 115200/value;
         }
 }
 
 static int mct_u232_set_baud_rate(struct usb_serial *serial, struct usb_serial_port *port,
-                                  int value)
+                                  speed_t value)
 {
         __le32 divisor;
         int rc;
@@ -634,7 +634,7 @@ static void mct_u232_set_termios (struct usb_serial_port *port,
                 mct_u232_set_modem_ctrl(serial, control_state);
         }
 
-        mct_u232_set_baud_rate(serial, port, cflag & CBAUD);
+        mct_u232_set_baud_rate(serial, port, tty_get_baud_rate(port->tty));
 
         if ((cflag & CBAUD) == B0 ) {
                 dbg("%s: baud is B0", __FUNCTION__);
diff --git a/drivers/usb/serial/mct_u232.h b/drivers/usb/serial/mct_u232.h
index a61bac8f224a..aae10c8174d6 100644
--- a/drivers/usb/serial/mct_u232.h
+++ b/drivers/usb/serial/mct_u232.h
@@ -79,7 +79,7 @@
  * and "Intel solution". They are the regular MCT and "Sitecom" for us.
  * This is pointless to document in the header, see the code for the bits.
  */
-static int mct_u232_calculate_baud_rate(struct usb_serial *serial, int value);
+static int mct_u232_calculate_baud_rate(struct usb_serial *serial, speed_t value);
 
 /*
  * Line Control Register (LCR)
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 0794ccdebfd4..0bb8de4cc524 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -45,7 +45,7 @@ enum devicetype {
         DEVICE_INSTALLER =      2,
 };
 
-int sierra_set_power_state(struct usb_device *udev, __u16 swiState)
+static int sierra_set_power_state(struct usb_device *udev, __u16 swiState)
 {
         int result;
         dev_dbg(&udev->dev, "%s", "SET POWER STATE");
@@ -60,7 +60,7 @@ int sierra_set_power_state(struct usb_device *udev, __u16 swiState)
         return result;
 }
 
-int sierra_set_ms_mode(struct usb_device *udev, __u16 eSocMode)
+static int sierra_set_ms_mode(struct usb_device *udev, __u16 eSocMode)
 {
         int result;
         dev_dbg(&udev->dev, "%s", "DEVICE MODE SWITCH");
@@ -75,7 +75,8 @@ int sierra_set_ms_mode(struct usb_device *udev, __u16 eSocMode)
         return result;
 }
 
-int sierra_probe(struct usb_interface *iface, const struct usb_device_id *id)
+static int sierra_probe(struct usb_interface *iface,
+                        const struct usb_device_id *id)
 {
         int result;
         struct usb_device *udev;
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index a3665659d13b..9bf01a5efc84 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -60,19 +60,19 @@ static struct usb_driver usb_serial_driver = {
 
 static int debug;
 static struct usb_serial *serial_table[SERIAL_TTY_MINORS];      /* initially all NULL */
-static spinlock_t table_lock;
+static DEFINE_MUTEX(table_lock);
 static LIST_HEAD(usb_serial_driver_list);
 
 struct usb_serial *usb_serial_get_by_index(unsigned index)
 {
         struct usb_serial *serial;
 
-        spin_lock(&table_lock);
+        mutex_lock(&table_lock);
         serial = serial_table[index];
 
         if (serial)
                 kref_get(&serial->kref);
-        spin_unlock(&table_lock);
+        mutex_unlock(&table_lock);
         return serial;
 }
 
@@ -84,7 +84,7 @@ static struct usb_serial *get_free_serial (struct usb_serial *serial, int num_po
         dbg("%s %d", __FUNCTION__, num_ports);
 
         *minor = 0;
-        spin_lock(&table_lock);
+        mutex_lock(&table_lock);
         for (i = 0; i < SERIAL_TTY_MINORS; ++i) {
                 if (serial_table[i])
                         continue;
@@ -106,10 +106,10 @@ static struct usb_serial *get_free_serial (struct usb_serial *serial, int num_po
                         serial_table[i] = serial;
                         serial->port[j++]->number = i;
                 }
-                spin_unlock(&table_lock);
+                mutex_unlock(&table_lock);
                 return serial;
         }
-        spin_unlock(&table_lock);
+        mutex_unlock(&table_lock);
         return NULL;
 }
 
@@ -172,9 +172,9 @@ static void destroy_serial(struct kref *kref)
 
 void usb_serial_put(struct usb_serial *serial)
 {
-        spin_lock(&table_lock);
+        mutex_lock(&table_lock);
         kref_put(&serial->kref, destroy_serial);
-        spin_unlock(&table_lock);
+        mutex_unlock(&table_lock);
 }
 
 /*****************************************************************************
@@ -1077,16 +1077,17 @@ int usb_serial_suspend(struct usb_interface *intf, pm_message_t message)
         struct usb_serial_port *port;
         int i, r = 0;
 
-        if (serial) {
-                for (i = 0; i < serial->num_ports; ++i) {
-                        port = serial->port[i];
-                        if (port)
-                                kill_traffic(port);
-                }
+        if (!serial) /* device has been disconnected */
+                return 0;
+
+        for (i = 0; i < serial->num_ports; ++i) {
+                port = serial->port[i];
+                if (port)
+                        kill_traffic(port);
         }
 
         if (serial->type->suspend)
-                serial->type->suspend(serial, message);
+                r = serial->type->suspend(serial, message);
 
         return r;
 }
@@ -1128,7 +1129,6 @@ static int __init usb_serial_init(void)
                 return -ENOMEM;
 
         /* Initialize our global data */
-        spin_lock_init(&table_lock);
         for (i = 0; i < SERIAL_TTY_MINORS; ++i) {
                 serial_table[i] = NULL;
         }
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index a624e72f81dc..d8d008d42946 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -320,6 +320,13 @@ UNUSUAL_DEV(  0x04b0, 0x0401, 0x0200, 0x0200,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY),
 
+/* Reported by Milinevsky Dmitry <niam.niam@gmail.com> */
+UNUSUAL_DEV(  0x04b0, 0x0409, 0x0100, 0x0100,
+                "NIKON",
+                "NIKON DSC D50",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY),
+
 /* Reported by Andreas Bockhold <andreas@bockionline.de> */
 UNUSUAL_DEV(  0x04b0, 0x0405, 0x0100, 0x0100,
                 "NIKON",
@@ -1357,6 +1364,20 @@ UNUSUAL_DEV(  0x0f19, 0x0105, 0x0100, 0x0100,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_IGNORE_RESIDUE ),
 
+/* Jeremy Katz <katzj@redhat.com>:
+ * The Blackberry Pearl can run in two modes; a usb-storage only mode
+ * and a mode that allows access via mass storage and to its database.
+ * The berry_charge module will set the device to dual mode and thus we
+ * should ignore its native mode if that module is built
+ */
+#ifdef CONFIG_USB_BERRY_CHARGE
+UNUSUAL_DEV(  0x0fca, 0x0006, 0x0001, 0x0001,
+                "RIM",
+                "Blackberry Pearl",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_IGNORE_DEVICE ),
+#endif
+
 /* Reported by Michael Stattmann <michael@stattmann.com> */
 UNUSUAL_DEV(  0x0fce, 0xd008, 0x0000, 0x0000,
                 "Sony Ericsson",
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index a7231d171bd5..5216c11d4dec 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1645,18 +1645,6 @@ config FB_MAXINE
           DECstation series (Personal DECstation 5000/20, /25, /33, /50,
           Codename "Maxine").
 
-config FB_TX3912
-        bool "TMPTX3912/PR31700 frame buffer support"
-        depends on (FB = y) && NINO
-        select FB_CFB_FILLRECT
-        select FB_CFB_COPYAREA
-        select FB_CFB_IMAGEBLIT
-        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>.
-
-          Say Y here to enable kernel support for the on-board framebuffer.
-
 config FB_G364
         bool "G364 frame buffer support"
         depends on (FB = y) && (MIPS_MAGNUM_4000 || OLIVETTI_M700)
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 518933d4905f..06eec7b182b7 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -103,7 +103,6 @@ obj-$(CONFIG_FB_PMAG_AA)	  += pmag-aa-fb.o
 obj-$(CONFIG_FB_PMAG_BA)          += pmag-ba-fb.o
 obj-$(CONFIG_FB_PMAGB_B)          += pmagb-b-fb.o
 obj-$(CONFIG_FB_MAXINE)           += maxinefb.o
-obj-$(CONFIG_FB_TX3912)           += tx3912fb.o
 obj-$(CONFIG_FB_S1D13XXX)         += s1d13xxxfb.o
 obj-$(CONFIG_FB_IMX)              += imxfb.o
 obj-$(CONFIG_FB_S3C2410)          += s3c2410fb.o
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index 61a8bf159cb0..eedb8285e32f 100644
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -138,17 +138,6 @@ static struct pixclock arc_clocks[] = {
         {  41250,  42083, VIDC_CTRL_DIV1,   VID_CTL_24MHz },    /* 24.000MHz */
 };
 
-#ifdef CONFIG_ARCH_A5K
-static struct pixclock a5k_clocks[] = {
-        { 117974, 120357, VIDC_CTRL_DIV3,   VID_CTL_25MHz },    /*  8.392MHz */
-        {  78649,  80238, VIDC_CTRL_DIV2,   VID_CTL_25MHz },    /* 12.588MHz */
-        {  58987,  60178, VIDC_CTRL_DIV1_5, VID_CTL_25MHz },    /* 16.588MHz */
-        {  55000,  56111, VIDC_CTRL_DIV2,   VID_CTL_36MHz },    /* 18.000MHz */
-        {  39325,  40119, VIDC_CTRL_DIV1,   VID_CTL_25MHz },    /* 25.175MHz */
-        {  27500,  28055, VIDC_CTRL_DIV1,   VID_CTL_36MHz },    /* 36.000MHz */
-};
-#endif
-
 static struct pixclock *
 acornfb_valid_pixrate(struct fb_var_screeninfo *var)
 {
@@ -163,15 +152,6 @@ acornfb_valid_pixrate(struct fb_var_screeninfo *var)
                     pixclock < arc_clocks[i].max_clock)
                         return arc_clocks + i;
 
-#ifdef CONFIG_ARCH_A5K
-        if (machine_is_a5k()) {
-                for (i = 0; i < ARRAY_SIZE(a5k_clocks); i++)
-                        if (pixclock > a5k_clocks[i].min_clock &&
-                            pixclock < a5k_clocks[i].max_clock)
-                                return a5k_clocks + i;
-        }
-#endif
-
         return NULL;
 }
 
diff --git a/drivers/video/console/fonts.c b/drivers/video/console/fonts.c
index a6828d0a4c56..96979c377518 100644
--- a/drivers/video/console/fonts.c
+++ b/drivers/video/console/fonts.c
@@ -133,8 +133,8 @@ const struct font_desc *get_default_font(int xres, int yres, u32 font_w,
         if ((yres < 400) == (f->height <= 8))
             c += 1000;
 
-        if (!(font_w & (1 << (f->width - 1))) ||
-            !(font_w & (1 << (f->height - 1))))
+        if ((font_w & (1 << (f->width - 1))) &&
+            (font_h & (1 << (f->height - 1))))
             c += 1000;
 
         if (c > cc) {
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 215ac579f901..074027204702 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -244,8 +244,17 @@ static void fb_set_logo(struct fb_info *info,
         u8 xor = (info->fix.visual == FB_VISUAL_MONO01) ? 0xff : 0;
         u8 fg = 1, d;
 
-        if (fb_get_color_depth(&info->var, &info->fix) == 3)
+        switch (fb_get_color_depth(&info->var, &info->fix)) {
+        case 1:
+                fg = 1;
+                break;
+        case 2:
+                fg = 3;
+                break;
+        default:
                 fg = 7;
+                break;
+        }
 
         if (info->fix.visual == FB_VISUAL_MONO01 ||
             info->fix.visual == FB_VISUAL_MONO10)
@@ -564,21 +573,6 @@ int fb_prepare_logo(struct fb_info *info, int rotate)
                 depth = 4;
         }
 
-        if (depth >= 8) {
-                switch (info->fix.visual) {
-                case FB_VISUAL_TRUECOLOR:
-                        fb_logo.needs_truepalette = 1;
-                        break;
-                case FB_VISUAL_DIRECTCOLOR:
-                        fb_logo.needs_directpalette = 1;
-                        fb_logo.needs_cmapreset = 1;
-                        break;
-                case FB_VISUAL_PSEUDOCOLOR:
-                        fb_logo.needs_cmapreset = 1;
-                        break;
-                }
-        }
-
         /* Return if no suitable logo was found */
         fb_logo.logo = fb_find_logo(depth);
 
@@ -604,6 +598,22 @@ int fb_prepare_logo(struct fb_info *info, int rotate)
         else
                 fb_logo.depth = 1;
 
+
+        if (fb_logo.depth > 4 && depth > 4) {
+                switch (info->fix.visual) {
+                case FB_VISUAL_TRUECOLOR:
+                        fb_logo.needs_truepalette = 1;
+                        break;
+                case FB_VISUAL_DIRECTCOLOR:
+                        fb_logo.needs_directpalette = 1;
+                        fb_logo.needs_cmapreset = 1;
+                        break;
+                case FB_VISUAL_PSEUDOCOLOR:
+                        fb_logo.needs_cmapreset = 1;
+                        break;
+                }
+        }
+
         return fb_prepare_extra_logos(info, fb_logo.logo->height, yres);
 }
 
diff --git a/drivers/video/geode/Kconfig b/drivers/video/geode/Kconfig
index a814b6c2605c..7608429b3943 100644
--- a/drivers/video/geode/Kconfig
+++ b/drivers/video/geode/Kconfig
@@ -8,6 +8,21 @@ config FB_GEODE
           Say 'Y' here to allow you to select framebuffer drivers for
           the AMD Geode family of processors.
 
+config FB_GEODE_LX
+        tristate "AMD Geode LX framebuffer support (EXPERIMENTAL)"
+        depends on FB && FB_GEODE
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        ---help---
+          Framebuffer driver for the display controller integrated into the
+          AMD Geode LX processors.
+
+          To compile this driver as a module, choose M here: the module will
+          be called lxfb.
+
+          If unsure, say N.
+
 config FB_GEODE_GX
         tristate "AMD Geode GX framebuffer support (EXPERIMENTAL)"
         depends on FB && FB_GEODE && EXPERIMENTAL
diff --git a/drivers/video/geode/Makefile b/drivers/video/geode/Makefile
index f896565bc312..957304b45fba 100644
--- a/drivers/video/geode/Makefile
+++ b/drivers/video/geode/Makefile
@@ -2,6 +2,8 @@
 
 obj-$(CONFIG_FB_GEODE_GX1) += gx1fb.o
 obj-$(CONFIG_FB_GEODE_GX)  += gxfb.o
+obj-$(CONFIG_FB_GEODE_LX)  += lxfb.o
 
 gx1fb-objs := gx1fb_core.o display_gx1.o video_cs5530.o
 gxfb-objs  := gxfb_core.o display_gx.o video_gx.o
+lxfb-objs  := lxfb_core.o lxfb_ops.o
diff --git a/drivers/video/geode/lxfb.h b/drivers/video/geode/lxfb.h
new file mode 100644
index 000000000000..6c227f9592a5
--- /dev/null
+++ b/drivers/video/geode/lxfb.h
@@ -0,0 +1,199 @@
+#ifndef _LXFB_H_
+#define _LXFB_H_
+
+#include <linux/fb.h>
+
+#define OUTPUT_CRT   0x01
+#define OUTPUT_PANEL 0x02
+
+struct lxfb_par {
+        int output;
+        int panel_width;
+        int panel_height;
+
+        void __iomem *gp_regs;
+        void __iomem *dc_regs;
+        void __iomem *df_regs;
+};
+
+static inline unsigned int lx_get_pitch(unsigned int xres, int bpp)
+{
+        return (((xres * (bpp >> 3)) + 7) & ~7);
+}
+
+void lx_set_mode(struct fb_info *);
+void lx_get_gamma(struct fb_info *, unsigned int *, int);
+void lx_set_gamma(struct fb_info *, unsigned int *, int);
+unsigned int lx_framebuffer_size(void);
+int lx_blank_display(struct fb_info *, int);
+void lx_set_palette_reg(struct fb_info *, unsigned int, unsigned int,
+                        unsigned int, unsigned int);
+
+/* MSRS */
+
+#define MSR_LX_GLD_CONFIG    0x48002001
+#define MSR_LX_GLCP_DOTPLL   0x4c000015
+#define MSR_LX_DF_PADSEL     0x48000011
+#define MSR_LX_DC_SPARE      0x80000011
+#define MSR_LX_DF_GLCONFIG   0x48002001
+
+#define MSR_LX_GLIU0_P2D_RO0 0x10000029
+
+#define GLCP_DOTPLL_RESET    (1 << 0)
+#define GLCP_DOTPLL_BYPASS   (1 << 15)
+#define GLCP_DOTPLL_HALFPIX  (1 << 24)
+#define GLCP_DOTPLL_LOCK     (1 << 25)
+
+#define DF_CONFIG_OUTPUT_MASK       0x38
+#define DF_OUTPUT_PANEL             0x08
+#define DF_OUTPUT_CRT               0x00
+#define DF_SIMULTANEOUS_CRT_AND_FP  (1 << 15)
+
+#define DF_DEFAULT_TFT_PAD_SEL_LOW  0xDFFFFFFF
+#define DF_DEFAULT_TFT_PAD_SEL_HIGH 0x0000003F
+
+#define DC_SPARE_DISABLE_CFIFO_HGO         0x00000800
+#define DC_SPARE_VFIFO_ARB_SELECT          0x00000400
+#define DC_SPARE_WM_LPEN_OVRD              0x00000200
+#define DC_SPARE_LOAD_WM_LPEN_MASK         0x00000100
+#define DC_SPARE_DISABLE_INIT_VID_PRI      0x00000080
+#define DC_SPARE_DISABLE_VFIFO_WM          0x00000040
+#define DC_SPARE_DISABLE_CWD_CHECK         0x00000020
+#define DC_SPARE_PIX8_PAN_FIX              0x00000010
+#define DC_SPARE_FIRST_REQ_MASK            0x00000002
+
+/* Registers */
+
+#define DC_UNLOCK         0x00
+#define  DC_UNLOCK_CODE   0x4758
+
+#define DC_GENERAL_CFG    0x04
+#define  DC_GCFG_DFLE     (1 << 0)
+#define  DC_GCFG_VIDE     (1 << 3)
+#define  DC_GCFG_VGAE     (1 << 7)
+#define  DC_GCFG_CMPE     (1 << 5)
+#define  DC_GCFG_DECE     (1 << 6)
+#define  DC_GCFG_FDTY     (1 << 17)
+
+#define DC_DISPLAY_CFG    0x08
+#define  DC_DCFG_TGEN     (1 << 0)
+#define  DC_DCFG_GDEN     (1 << 3)
+#define  DC_DCFG_VDEN     (1 << 4)
+#define  DC_DCFG_TRUP     (1 << 6)
+#define  DC_DCFG_DCEN     (1 << 24)
+#define  DC_DCFG_PALB     (1 << 25)
+#define  DC_DCFG_VISL     (1 << 27)
+
+#define  DC_DCFG_16BPP           0x0
+
+#define  DC_DCFG_DISP_MODE_MASK  0x00000300
+#define  DC_DCFG_DISP_MODE_8BPP  0x00000000
+#define  DC_DCFG_DISP_MODE_16BPP 0x00000100
+#define  DC_DCFG_DISP_MODE_24BPP 0x00000200
+#define  DC_DCFG_DISP_MODE_32BPP 0x00000300
+
+
+#define DC_ARB_CFG        0x0C
+
+#define DC_FB_START       0x10
+#define DC_CB_START       0x14
+#define DC_CURSOR_START   0x18
+
+#define DC_DV_TOP          0x2C
+#define DC_DV_TOP_ENABLE   (1 << 0)
+
+#define DC_LINE_SIZE       0x30
+#define DC_GRAPHICS_PITCH  0x34
+#define DC_H_ACTIVE_TIMING 0x40
+#define DC_H_BLANK_TIMING  0x44
+#define DC_H_SYNC_TIMING   0x48
+#define DC_V_ACTIVE_TIMING 0x50
+#define DC_V_BLANK_TIMING  0x54
+#define DC_V_SYNC_TIMING   0x58
+#define DC_FB_ACTIVE       0x5C
+
+#define DC_PAL_ADDRESS     0x70
+#define DC_PAL_DATA        0x74
+
+#define DC_PHY_MEM_OFFSET  0x84
+
+#define DC_DV_CTL          0x88
+#define DC_DV_LINE_SIZE_MASK               0x00000C00
+#define DC_DV_LINE_SIZE_1024               0x00000000
+#define DC_DV_LINE_SIZE_2048               0x00000400
+#define DC_DV_LINE_SIZE_4096               0x00000800
+#define DC_DV_LINE_SIZE_8192               0x00000C00
+
+
+#define DC_GFX_SCALE       0x90
+#define DC_IRQ_FILT_CTL    0x94
+
+
+#define DC_IRQ               0xC8
+#define  DC_IRQ_MASK         (1 << 0)
+#define  DC_VSYNC_IRQ_MASK   (1 << 1)
+#define  DC_IRQ_STATUS       (1 << 20)
+#define  DC_VSYNC_IRQ_STATUS (1 << 21)
+
+#define DC_GENLCK_CTRL      0xD4
+#define  DC_GENLCK_ENABLE   (1 << 18)
+#define  DC_GC_ALPHA_FLICK_ENABLE  (1 << 25)
+#define  DC_GC_FLICKER_FILTER_ENABLE (1 << 24)
+#define  DC_GC_FLICKER_FILTER_MASK (0x0F << 28)
+
+#define DC_COLOR_KEY       0xB8
+#define DC_CLR_KEY_ENABLE (1 << 24)
+
+
+#define DC3_DV_LINE_SIZE_MASK               0x00000C00
+#define DC3_DV_LINE_SIZE_1024               0x00000000
+#define DC3_DV_LINE_SIZE_2048               0x00000400
+#define DC3_DV_LINE_SIZE_4096               0x00000800
+#define DC3_DV_LINE_SIZE_8192               0x00000C00
+
+#define DF_VIDEO_CFG       0x0
+#define  DF_VCFG_VID_EN    (1 << 0)
+
+#define DF_DISPLAY_CFG     0x08
+
+#define DF_DCFG_CRT_EN     (1 << 0)
+#define DF_DCFG_HSYNC_EN   (1 << 1)
+#define DF_DCFG_VSYNC_EN   (1 << 2)
+#define DF_DCFG_DAC_BL_EN  (1 << 3)
+#define DF_DCFG_CRT_HSYNC_POL  (1 << 8)
+#define DF_DCFG_CRT_VSYNC_POL  (1 << 9)
+#define DF_DCFG_GV_PAL_BYP     (1 << 21)
+
+#define DF_DCFG_CRT_SYNC_SKW_INIT 0x10000
+#define DF_DCFG_CRT_SYNC_SKW_MASK  0x1c000
+
+#define DF_DCFG_PWR_SEQ_DLY_INIT     0x80000
+#define DF_DCFG_PWR_SEQ_DLY_MASK     0xe0000
+
+#define DF_MISC            0x50
+
+#define  DF_MISC_GAM_BYPASS (1 << 0)
+#define  DF_MISC_DAC_PWRDN  (1 << 10)
+#define  DF_MISC_A_PWRDN    (1 << 11)
+
+#define DF_PAR             0x38
+#define DF_PDR             0x40
+#define DF_ALPHA_CONTROL_1 0xD8
+#define DF_VIDEO_REQUEST   0x120
+
+#define DF_PANEL_TIM1      0x400
+#define DF_DEFAULT_TFT_PMTIM1 0x0
+
+#define DF_PANEL_TIM2      0x408
+#define DF_DEFAULT_TFT_PMTIM2 0x08000000
+
+#define DF_FP_PM             0x410
+#define  DF_FP_PM_P          (1 << 24)
+
+#define DF_DITHER_CONTROL    0x418
+#define DF_DEFAULT_TFT_DITHCTL                  0x00000070
+#define GP_BLT_STATUS      0x44
+#define  GP_BS_BLT_BUSY    (1 << 0)
+#define  GP_BS_CB_EMPTY    (1 << 4)
+
+#endif
diff --git a/drivers/video/geode/lxfb_core.c b/drivers/video/geode/lxfb_core.c
new file mode 100644
index 000000000000..5e30b40c8c0f
--- /dev/null
+++ b/drivers/video/geode/lxfb_core.c
@@ -0,0 +1,621 @@
+/*
+ * Geode LX framebuffer driver.
+ *
+ * Copyright (C) 2007 Advanced Micro Devices, Inc.
+ * Built from gxfb (which is Copyright (C) 2006 Arcom Control Systems 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.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/console.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/uaccess.h>
+
+#include "lxfb.h"
+
+static char *mode_option;
+static int noclear, nopanel, nocrt;
+static int fbsize;
+
+/* Most of these modes are sorted in ascending order, but
+ * since the first entry in this table is the "default" mode,
+ * we try to make it something sane - 640x480-60 is sane
+ */
+
+const struct fb_videomode geode_modedb[] __initdata = {
+        /* 640x480-60 */
+        { NULL, 60, 640, 480, 39682, 48, 8, 25, 2, 88, 2,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, 0 },
+        /* 640x400-70 */
+        { NULL, 70, 640, 400, 39770, 40, 8, 28, 5, 96, 2,
+          FB_SYNC_HOR_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, 0 },
+        /* 640x480-70 */
+        { NULL, 70, 640, 480, 35014, 88, 24, 15, 2, 64, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 640x480-72 */
+        { NULL, 72, 640, 480, 32102, 120, 16, 20, 1, 40, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, 0 },
+        /* 640x480-75 */
+        { NULL, 75, 640, 480, 31746, 120, 16, 16, 1, 64, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, 0 },
+        /* 640x480-85 */
+        { NULL, 85, 640, 480, 27780, 80, 56, 25, 1, 56, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, 0 },
+        /* 640x480-90 */
+        { NULL, 90, 640, 480, 26392, 96, 32, 22, 1, 64, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 640x480-100 */
+        { NULL, 100, 640, 480, 23167, 104, 40, 25, 1, 64, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 640x480-60 */
+        { NULL, 60, 640, 480, 39682, 48, 16, 25, 10, 88, 2,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, 0 },
+        /* 800x600-56 */
+        { NULL, 56, 800, 600, 27901, 128, 24, 22, 1, 72, 2,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 800x600-60 */
+        { NULL, 60, 800, 600, 25131, 72, 32, 23, 1, 136, 4,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 800x600-70 */
+        { NULL, 70, 800, 600, 21873, 120, 40, 21, 4, 80, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 800x600-72 */
+        { NULL, 72, 800, 600, 20052, 64, 56, 23, 37, 120, 6,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 800x600-75 */
+        { NULL, 75, 800, 600, 20202, 160, 16, 21, 1, 80, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 800x600-85 */
+        { NULL, 85, 800, 600, 17790, 152, 32, 27, 1, 64, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 800x600-90 */
+        { NULL, 90, 800, 600, 16648, 128, 40, 28, 1, 88, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 800x600-100 */
+        { NULL, 100, 800, 600, 14667, 136, 48, 27, 1, 88, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 800x600-60 */
+        { NULL, 60, 800, 600, 25131, 88, 40, 23, 1, 128, 4,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, 0 },
+        /* 1024x768-60 */
+        { NULL, 60, 1024, 768, 15385, 160, 24, 29, 3, 136, 6,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, 0 },
+        /* 1024x768-70 */
+        { NULL, 70, 1024, 768, 13346, 144, 24, 29, 3, 136, 6,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, 0 },
+        /* 1024x768-72 */
+        { NULL, 72, 1024, 768, 12702, 168, 56, 29, 4, 112, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1024x768-75 */
+        { NULL, 75, 1024, 768, 12703, 176, 16, 28, 1, 96, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1024x768-85 */
+        { NULL, 85, 1024, 768, 10581, 208, 48, 36, 1, 96, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1024x768-90 */
+        { NULL, 90, 1024, 768, 9981, 176, 64, 37, 1, 112, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1024x768-100 */
+        { NULL, 100, 1024, 768, 8825, 184, 72, 42, 1, 112, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1024x768-60 */
+        { NULL, 60, 1024, 768, 15385, 160, 24, 29, 3, 136, 6,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, 0 },
+        /* 1152x864-60 */
+        { NULL, 60, 1152, 864, 12251, 184, 64, 27, 1, 120, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1152x864-70 */
+        { NULL, 70, 1152, 864, 10254, 192, 72, 32, 8, 120, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1152x864-72 */
+        { NULL, 72, 1152, 864, 9866, 200, 72, 33, 7, 128, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1152x864-75 */
+        { NULL, 75, 1152, 864, 9259, 256, 64, 32, 1, 128, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1152x864-85 */
+        { NULL, 85, 1152, 864, 8357, 200, 72, 37, 3, 128, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1152x864-90 */
+        { NULL, 90, 1152, 864, 7719, 208, 80, 42, 9, 128, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1152x864-100 */
+        { NULL, 100, 1152, 864, 6947, 208, 80, 48, 3, 128, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1152x864-60 */
+        { NULL, 60, 1152, 864, 12251, 184, 64, 27, 1, 120, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, 0 },
+        /* 1280x1024-60 */
+        { NULL, 60, 1280, 1024, 9262, 248, 48, 38, 1, 112, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1280x1024-70 */
+        { NULL, 70, 1280, 1024, 7719, 224, 88, 38, 6, 136, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1280x1024-72 */
+        { NULL, 72, 1280, 1024, 7490, 224, 88, 39, 7, 136, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1280x1024-75 */
+        { NULL, 75, 1280, 1024, 7409, 248, 16, 38, 1, 144, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1280x1024-85 */
+        { NULL, 85, 1280, 1024, 6351, 224, 64, 44, 1, 160, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1280x1024-90 */
+        { NULL, 90, 1280, 1024, 5791, 240, 96, 51, 12, 144, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1280x1024-100 */
+        { NULL, 100, 1280, 1024, 5212, 240, 96, 57, 6, 144, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1280x1024-60 */
+        { NULL, 60, 1280, 1024, 9262, 248, 48, 38, 1, 112, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, 0 },
+        /* 1600x1200-60 */
+        { NULL, 60, 1600, 1200, 6172, 304, 64, 46, 1, 192, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1600x1200-70 */
+        { NULL, 70, 1600, 1200, 5291, 304, 64, 46, 1, 192, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1600x1200-72 */
+        { NULL, 72, 1600, 1200, 5053, 288, 112, 47, 13, 176, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1600x1200-75 */
+        { NULL, 75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1600x1200-85 */
+        { NULL, 85, 1600, 1200, 4357, 304, 64, 46, 1, 192, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1600x1200-90 */
+        { NULL, 90, 1600, 1200, 3981, 304, 128, 60, 1, 176, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1600x1200-100 */
+        { NULL, 100, 1600, 1200, 3563, 304, 128, 67, 1, 176, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1600x1200-60 */
+        { NULL, 60, 1600, 1200, 6172, 304, 64, 46, 1, 192, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, 0 },
+        /* 1920x1440-60 */
+        { NULL, 60, 1920, 1440, 4273, 344, 128, 56, 1, 208, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1920x1440-70 */
+        { NULL, 70, 1920, 1440, 3593, 360, 152, 55, 8, 208, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1920x1440-72 */
+        { NULL, 72, 1920, 1440, 3472, 360, 152, 68, 4, 208, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1920x1440-75 */
+        { NULL, 75, 1920, 1440, 3367, 352, 144, 56, 1, 224, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+        /* 1920x1440-85 */
+        { NULL, 85, 1920, 1440, 2929, 368, 152, 68, 1, 216, 3,
+          0, FB_VMODE_NONINTERLACED, 0 },
+};
+
+static int lxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        if (var->xres > 1920 || var->yres > 1440)
+                return -EINVAL;
+
+        if (var->bits_per_pixel == 32) {
+                var->red.offset   = 16; var->red.length   = 8;
+                var->green.offset =  8; var->green.length = 8;
+                var->blue.offset  =  0; var->blue.length  = 8;
+        } else if (var->bits_per_pixel == 16) {
+                var->red.offset   = 11; var->red.length   = 5;
+                var->green.offset =  5; var->green.length = 6;
+                var->blue.offset  =  0; var->blue.length  = 5;
+        } else if (var->bits_per_pixel == 8) {
+                var->red.offset   = 0; var->red.length   = 8;
+                var->green.offset = 0; var->green.length = 8;
+                var->blue.offset  = 0; var->blue.length  = 8;
+        } else
+                return -EINVAL;
+
+        var->transp.offset = 0; var->transp.length = 0;
+
+        /* Enough video memory? */
+        if ((lx_get_pitch(var->xres, var->bits_per_pixel) * var->yres)
+            > info->fix.smem_len)
+          return -EINVAL;
+
+        return 0;
+}
+
+static int lxfb_set_par(struct fb_info *info)
+{
+        if (info->var.bits_per_pixel > 8) {
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+                fb_dealloc_cmap(&info->cmap);
+        } else {
+                info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+                fb_alloc_cmap(&info->cmap, 1<<info->var.bits_per_pixel, 0);
+        }
+
+        info->fix.line_length = lx_get_pitch(info->var.xres,
+                info->var.bits_per_pixel);
+
+        lx_set_mode(info);
+        return 0;
+}
+
+static inline u_int chan_to_field(u_int chan, struct fb_bitfield *bf)
+{
+        chan &= 0xffff;
+        chan >>= 16 - bf->length;
+        return chan << bf->offset;
+}
+
+static int lxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
+                           unsigned blue, unsigned transp,
+                           struct fb_info *info)
+{
+        if (info->var.grayscale) {
+                /* grayscale = 0.30*R + 0.59*G + 0.11*B */
+                red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;
+        }
+
+        /* Truecolor has hardware independent palette */
+        if (info->fix.visual == FB_VISUAL_TRUECOLOR) {
+                u32 *pal = info->pseudo_palette;
+                u32 v;
+
+                if (regno >= 16)
+                        return -EINVAL;
+
+                v  = chan_to_field(red, &info->var.red);
+                v |= chan_to_field(green, &info->var.green);
+                v |= chan_to_field(blue, &info->var.blue);
+
+                pal[regno] = v;
+        } else {
+                if (regno >= 256)
+                        return -EINVAL;
+
+                lx_set_palette_reg(info, regno, red, green, blue);
+        }
+
+        return 0;
+}
+
+static int lxfb_blank(int blank_mode, struct fb_info *info)
+{
+        return lx_blank_display(info, blank_mode);
+}
+
+
+static int __init lxfb_map_video_memory(struct fb_info *info,
+                                        struct pci_dev *dev)
+{
+        struct lxfb_par *par = info->par;
+        int ret;
+
+        ret = pci_enable_device(dev);
+
+        if (ret)
+                return ret;
+
+        ret = pci_request_region(dev, 0, "lxfb-framebuffer");
+
+        if (ret)
+                return ret;
+
+        ret = pci_request_region(dev, 1, "lxfb-gp");
+
+        if (ret)
+                return ret;
+
+        ret = pci_request_region(dev, 2, "lxfb-vg");
+
+        if (ret)
+                return ret;
+
+        ret = pci_request_region(dev, 3, "lxfb-vip");
+
+        if (ret)
+                return ret;
+
+        info->fix.smem_start = pci_resource_start(dev, 0);
+        info->fix.smem_len = fbsize ? fbsize : lx_framebuffer_size();
+
+        info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
+
+        ret = -ENOMEM;
+
+        if (info->screen_base == NULL)
+                return ret;
+
+        par->gp_regs = ioremap(pci_resource_start(dev, 1),
+                                pci_resource_len(dev, 1));
+
+        if (par->gp_regs == NULL)
+                return ret;
+
+        par->dc_regs = ioremap(pci_resource_start(dev, 2),
+                               pci_resource_len(dev, 2));
+
+        if (par->dc_regs == NULL)
+                return ret;
+
+        par->df_regs = ioremap(pci_resource_start(dev, 3),
+                               pci_resource_len(dev, 3));
+
+        if (par->df_regs == NULL)
+                return ret;
+
+        writel(DC_UNLOCK_CODE, par->dc_regs + DC_UNLOCK);
+
+        writel(info->fix.smem_start & 0xFF000000,
+               par->dc_regs + DC_PHY_MEM_OFFSET);
+
+        writel(0, par->dc_regs + DC_UNLOCK);
+
+        dev_info(&dev->dev, "%d KB of video memory at 0x%lx\n",
+                 info->fix.smem_len / 1024, info->fix.smem_start);
+
+        return 0;
+}
+
+static struct fb_ops lxfb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_check_var   = lxfb_check_var,
+        .fb_set_par     = lxfb_set_par,
+        .fb_setcolreg   = lxfb_setcolreg,
+        .fb_blank       = lxfb_blank,
+        /* No HW acceleration for now. */
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = cfb_imageblit,
+};
+
+static struct fb_info * __init lxfb_init_fbinfo(struct device *dev)
+{
+        struct lxfb_par *par;
+        struct fb_info *info;
+
+        /* Alloc enough space for the pseudo palette. */
+        info = framebuffer_alloc(sizeof(struct lxfb_par) + sizeof(u32) * 16,
+                                 dev);
+        if (!info)
+                return NULL;
+
+        par = info->par;
+
+        strcpy(info->fix.id, "Geode LX");
+
+        info->fix.type          = FB_TYPE_PACKED_PIXELS;
+        info->fix.type_aux      = 0;
+        info->fix.xpanstep      = 0;
+        info->fix.ypanstep      = 0;
+        info->fix.ywrapstep     = 0;
+        info->fix.accel         = FB_ACCEL_NONE;
+
+        info->var.nonstd        = 0;
+        info->var.activate      = FB_ACTIVATE_NOW;
+        info->var.height        = -1;
+        info->var.width = -1;
+        info->var.accel_flags = 0;
+        info->var.vmode = FB_VMODE_NONINTERLACED;
+
+        info->fbops             = &lxfb_ops;
+        info->flags             = FBINFO_DEFAULT;
+        info->node              = -1;
+
+        info->pseudo_palette    = (void *)par + sizeof(struct lxfb_par);
+
+        info->var.grayscale     = 0;
+
+        return info;
+}
+
+static int __init lxfb_probe(struct pci_dev *pdev,
+                             const struct pci_device_id *id)
+{
+        struct lxfb_par *par;
+        struct fb_info *info;
+        int ret;
+
+        struct fb_videomode *modedb_ptr;
+        int modedb_size;
+
+        info = lxfb_init_fbinfo(&pdev->dev);
+
+        if (info == NULL)
+                return -ENOMEM;
+
+        par = info->par;
+
+        ret = lxfb_map_video_memory(info, pdev);
+
+        if (ret < 0) {
+                dev_err(&pdev->dev,
+                        "failed to map frame buffer or controller registers\n");
+                goto err;
+        }
+
+        /* Set up the desired outputs */
+
+        par->output = 0;
+        par->output |= (nopanel) ? 0 : OUTPUT_PANEL;
+        par->output |= (nocrt) ? 0 : OUTPUT_CRT;
+
+        /* Set up the mode database */
+
+        modedb_ptr = (struct fb_videomode *) geode_modedb;
+        modedb_size = ARRAY_SIZE(geode_modedb);
+
+        ret = fb_find_mode(&info->var, info, mode_option,
+                           modedb_ptr, modedb_size, NULL, 16);
+
+        if (ret == 0 || ret == 4) {
+                dev_err(&pdev->dev, "could not find valid video mode\n");
+                ret = -EINVAL;
+                goto err;
+        }
+
+        /* Clear the screen of garbage, unless noclear was specified,
+         * in which case we assume the user knows what he is doing */
+
+        if (!noclear)
+                memset_io(info->screen_base, 0, info->fix.smem_len);
+
+        /* Set the mode */
+
+        lxfb_check_var(&info->var, info);
+        lxfb_set_par(info);
+
+        if (register_framebuffer(info) < 0) {
+                ret = -EINVAL;
+                goto err;
+        }
+        pci_set_drvdata(pdev, info);
+        printk(KERN_INFO "fb%d: %s frame buffer device\n",
+                info->node, info->fix.id);
+
+        return 0;
+
+err:
+        if (info->screen_base) {
+                iounmap(info->screen_base);
+                pci_release_region(pdev, 0);
+        }
+        if (par->gp_regs) {
+                iounmap(par->gp_regs);
+                pci_release_region(pdev, 1);
+        }
+        if (par->dc_regs) {
+                iounmap(par->dc_regs);
+                pci_release_region(pdev, 2);
+        }
+        if (par->df_regs) {
+                iounmap(par->df_regs);
+                pci_release_region(pdev, 3);
+        }
+
+        if (info)
+                framebuffer_release(info);
+
+        return ret;
+}
+
+static void lxfb_remove(struct pci_dev *pdev)
+{
+        struct fb_info *info = pci_get_drvdata(pdev);
+        struct lxfb_par *par = info->par;
+
+        unregister_framebuffer(info);
+
+        iounmap(info->screen_base);
+        pci_release_region(pdev, 0);
+
+        iounmap(par->gp_regs);
+        pci_release_region(pdev, 1);
+
+        iounmap(par->dc_regs);
+        pci_release_region(pdev, 2);
+
+        iounmap(par->df_regs);
+        pci_release_region(pdev, 3);
+
+        pci_set_drvdata(pdev, NULL);
+        framebuffer_release(info);
+}
+
+static struct pci_device_id lxfb_id_table[] = {
+        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LX_VIDEO) },
+        { 0, }
+};
+
+MODULE_DEVICE_TABLE(pci, lxfb_id_table);
+
+static struct pci_driver lxfb_driver = {
+        .name           = "lxfb",
+        .id_table       = lxfb_id_table,
+        .probe          = lxfb_probe,
+        .remove         = lxfb_remove,
+};
+
+#ifndef MODULE
+static int __init lxfb_setup(char *options)
+{
+        char *opt;
+
+        if (!options || !*options)
+                return 0;
+
+        while (1) {
+                char *opt = strsep(&options, ",");
+
+                if (opt == NULL)
+                        break;
+
+                if (!*opt)
+                        continue;
+
+                if (!strncmp(opt, "fbsize:", 7))
+                        fbsize = simple_strtoul(opt+7, NULL, 0);
+                else if (!strcmp(opt, "noclear"))
+                        noclear = 1;
+                else if (!strcmp(opt, "nopanel"))
+                        nopanel = 1;
+                else if (!strcmp(opt, "nocrt"))
+                        nocrt = 1;
+                else
+                        mode_option = opt;
+        }
+
+        return 0;
+}
+#endif
+
+static int __init lxfb_init(void)
+{
+#ifndef MODULE
+        char *option = NULL;
+
+        if (fb_get_options("lxfb", &option))
+                return -ENODEV;
+
+        lxfb_setup(option);
+#endif
+        return pci_register_driver(&lxfb_driver);
+}
+static void __exit lxfb_cleanup(void)
+{
+        pci_unregister_driver(&lxfb_driver);
+}
+
+module_init(lxfb_init);
+module_exit(lxfb_cleanup);
+
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "video mode (<x>x<y>[-<bpp>][@<refr>])");
+
+module_param(fbsize, int, 0);
+MODULE_PARM_DESC(fbsize, "video memory size");
+
+MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode LX");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/geode/lxfb_ops.c b/drivers/video/geode/lxfb_ops.c
new file mode 100644
index 000000000000..4fbc99be96ef
--- /dev/null
+++ b/drivers/video/geode/lxfb_ops.c
@@ -0,0 +1,536 @@
+/* Geode LX framebuffer driver
+ *
+ * Copyright (C) 2006-2007, Advanced Micro Devices,Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/fb.h>
+#include <linux/uaccess.h>
+#include <linux/delay.h>
+
+#include "lxfb.h"
+
+/* TODO
+ * Support panel scaling
+ * Add acceleration
+ * Add support for interlacing (TV out)
+ * Support compression
+ */
+
+/* This is the complete list of PLL frequencies that we can set -
+ * we will choose the closest match to the incoming clock.
+ * freq is the frequency of the dotclock * 1000 (for example,
+ * 24823 = 24.983 Mhz).
+ * pllval is the corresponding PLL value
+*/
+
+static const struct {
+  unsigned int pllval;
+  unsigned int freq;
+} pll_table[] = {
+  { 0x000031AC, 24923 },
+  { 0x0000215D, 25175 },
+  { 0x00001087, 27000 },
+  { 0x0000216C, 28322 },
+  { 0x0000218D, 28560 },
+  { 0x000010C9, 31200 },
+  { 0x00003147, 31500 },
+  { 0x000010A7, 33032 },
+  { 0x00002159, 35112 },
+  { 0x00004249, 35500 },
+  { 0x00000057, 36000 },
+  { 0x0000219A, 37889 },
+  { 0x00002158, 39168 },
+  { 0x00000045, 40000 },
+  { 0x00000089, 43163 },
+  { 0x000010E7, 44900 },
+  { 0x00002136, 45720 },
+  { 0x00003207, 49500 },
+  { 0x00002187, 50000 },
+  { 0x00004286, 56250 },
+  { 0x000010E5, 60065 },
+  { 0x00004214, 65000 },
+  { 0x00001105, 68179 },
+  { 0x000031E4, 74250 },
+  { 0x00003183, 75000 },
+  { 0x00004284, 78750 },
+  { 0x00001104, 81600 },
+  { 0x00006363, 94500 },
+  { 0x00005303, 97520 },
+  { 0x00002183, 100187 },
+  { 0x00002122, 101420 },
+  { 0x00001081, 108000 },
+  { 0x00006201, 113310 },
+  { 0x00000041, 119650 },
+  { 0x000041A1, 129600 },
+  { 0x00002182, 133500 },
+  { 0x000041B1, 135000 },
+  { 0x00000051, 144000 },
+  { 0x000041E1, 148500 },
+  { 0x000062D1, 157500 },
+  { 0x000031A1, 162000 },
+  { 0x00000061, 169203 },
+  { 0x00004231, 172800 },
+  { 0x00002151, 175500 },
+  { 0x000052E1, 189000 },
+  { 0x00000071, 192000 },
+  { 0x00003201, 198000 },
+  { 0x00004291, 202500 },
+  { 0x00001101, 204750 },
+  { 0x00007481, 218250 },
+  { 0x00004170, 229500 },
+  { 0x00006210, 234000 },
+  { 0x00003140, 251182 },
+  { 0x00006250, 261000 },
+  { 0x000041C0, 278400 },
+  { 0x00005220, 280640 },
+  { 0x00000050, 288000 },
+  { 0x000041E0, 297000 },
+  { 0x00002130, 320207 }
+};
+
+
+static void lx_set_dotpll(u32 pllval)
+{
+        u32 dotpll_lo, dotpll_hi;
+        int i;
+
+        rdmsr(MSR_LX_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
+
+        if ((dotpll_lo & GLCP_DOTPLL_LOCK) && (dotpll_hi == pllval))
+                return;
+
+        dotpll_hi = pllval;
+        dotpll_lo &= ~(GLCP_DOTPLL_BYPASS | GLCP_DOTPLL_HALFPIX);
+        dotpll_lo |= GLCP_DOTPLL_RESET;
+
+        wrmsr(MSR_LX_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
+
+        /* Wait 100us for the PLL to lock */
+
+        udelay(100);
+
+        /* Now, loop for the lock bit */
+
+        for (i = 0; i < 1000; i++) {
+                rdmsr(MSR_LX_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
+                if (dotpll_lo & GLCP_DOTPLL_LOCK)
+                        break;
+        }
+
+        /* Clear the reset bit */
+
+        dotpll_lo &= ~GLCP_DOTPLL_RESET;
+        wrmsr(MSR_LX_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
+}
+
+/* Set the clock based on the frequency specified by the current mode */
+
+static void lx_set_clock(struct fb_info *info)
+{
+        unsigned int diff, min, best = 0;
+        unsigned int freq, i;
+
+        freq = (unsigned int) (0x3b9aca00 / info->var.pixclock);
+
+        min = abs(pll_table[0].freq - freq);
+
+        for (i = 0; i < ARRAY_SIZE(pll_table); i++) {
+                diff = abs(pll_table[i].freq - freq);
+                if (diff < min) {
+                        min = diff;
+                        best = i;
+                }
+        }
+
+        lx_set_dotpll(pll_table[best].pllval & 0x7FFF);
+}
+
+static void lx_graphics_disable(struct fb_info *info)
+{
+        struct lxfb_par *par = info->par;
+        unsigned int val, gcfg;
+
+        /* Note:  This assumes that the video is in a quitet state */
+
+        writel(0, par->df_regs + DF_ALPHA_CONTROL_1);
+        writel(0, par->df_regs + DF_ALPHA_CONTROL_1 + 32);
+        writel(0, par->df_regs + DF_ALPHA_CONTROL_1 + 64);
+
+        /* Turn off the VGA and video enable */
+        val = readl (par->dc_regs + DC_GENERAL_CFG) &
+                ~(DC_GCFG_VGAE | DC_GCFG_VIDE);
+
+        writel(val, par->dc_regs + DC_GENERAL_CFG);
+
+        val = readl(par->df_regs + DF_VIDEO_CFG) & ~DF_VCFG_VID_EN;
+        writel(val, par->df_regs + DF_VIDEO_CFG);
+
+        writel( DC_IRQ_MASK | DC_VSYNC_IRQ_MASK |
+                DC_IRQ_STATUS | DC_VSYNC_IRQ_STATUS,
+                par->dc_regs + DC_IRQ);
+
+        val = readl(par->dc_regs + DC_GENLCK_CTRL) & ~DC_GENLCK_ENABLE;
+        writel(val, par->dc_regs + DC_GENLCK_CTRL);
+
+        val = readl(par->dc_regs + DC_COLOR_KEY) & ~DC_CLR_KEY_ENABLE;
+        writel(val & ~DC_CLR_KEY_ENABLE, par->dc_regs + DC_COLOR_KEY);
+
+        /* We don't actually blank the panel, due to the long latency
+           involved with bringing it back */
+
+        val = readl(par->df_regs + DF_MISC) | DF_MISC_DAC_PWRDN;
+        writel(val, par->df_regs + DF_MISC);
+
+        /* Turn off the display */
+
+        val = readl(par->df_regs + DF_DISPLAY_CFG);
+        writel(val & ~(DF_DCFG_CRT_EN | DF_DCFG_HSYNC_EN | DF_DCFG_VSYNC_EN |
+                       DF_DCFG_DAC_BL_EN), par->df_regs + DF_DISPLAY_CFG);
+
+        gcfg = readl(par->dc_regs + DC_GENERAL_CFG);
+        gcfg &= ~(DC_GCFG_CMPE | DC_GCFG_DECE);
+        writel(gcfg, par->dc_regs + DC_GENERAL_CFG);
+
+        /* Turn off the TGEN */
+        val = readl(par->dc_regs + DC_DISPLAY_CFG);
+        val &= ~DC_DCFG_TGEN;
+        writel(val, par->dc_regs + DC_DISPLAY_CFG);
+
+        /* Wait 1000 usecs to ensure that the TGEN is clear */
+        udelay(1000);
+
+        /* Turn off the FIFO loader */
+
+        gcfg &= ~DC_GCFG_DFLE;
+        writel(gcfg, par->dc_regs + DC_GENERAL_CFG);
+
+        /* Lastly, wait for the GP to go idle */
+
+        do {
+                val = readl(par->gp_regs + GP_BLT_STATUS);
+        } while ((val & GP_BS_BLT_BUSY) || !(val & GP_BS_CB_EMPTY));
+}
+
+static void lx_graphics_enable(struct fb_info *info)
+{
+        struct lxfb_par *par = info->par;
+        u32 temp, config;
+
+        /* Set the video request register */
+        writel(0, par->df_regs + DF_VIDEO_REQUEST);
+
+        /* Set up the polarities */
+
+        config = readl(par->df_regs + DF_DISPLAY_CFG);
+
+        config &= ~(DF_DCFG_CRT_SYNC_SKW_MASK | DF_DCFG_PWR_SEQ_DLY_MASK |
+                  DF_DCFG_CRT_HSYNC_POL     | DF_DCFG_CRT_VSYNC_POL);
+
+        config |= (DF_DCFG_CRT_SYNC_SKW_INIT | DF_DCFG_PWR_SEQ_DLY_INIT  |
+                   DF_DCFG_GV_PAL_BYP);
+
+        if (info->var.sync & FB_SYNC_HOR_HIGH_ACT)
+                config |= DF_DCFG_CRT_HSYNC_POL;
+
+        if (info->var.sync & FB_SYNC_VERT_HIGH_ACT)
+                config |= DF_DCFG_CRT_VSYNC_POL;
+
+        if (par->output & OUTPUT_PANEL) {
+                u32 msrlo, msrhi;
+
+                writel(DF_DEFAULT_TFT_PMTIM1,
+                       par->df_regs + DF_PANEL_TIM1);
+                writel(DF_DEFAULT_TFT_PMTIM2,
+                       par->df_regs + DF_PANEL_TIM2);
+                writel(DF_DEFAULT_TFT_DITHCTL,
+                       par->df_regs + DF_DITHER_CONTROL);
+
+                msrlo = DF_DEFAULT_TFT_PAD_SEL_LOW;
+                msrhi = DF_DEFAULT_TFT_PAD_SEL_HIGH;
+
+                wrmsr(MSR_LX_DF_PADSEL, msrlo, msrhi);
+        }
+
+        if (par->output & OUTPUT_CRT) {
+                config |= DF_DCFG_CRT_EN   | DF_DCFG_HSYNC_EN |
+                        DF_DCFG_VSYNC_EN | DF_DCFG_DAC_BL_EN;
+        }
+
+        writel(config, par->df_regs + DF_DISPLAY_CFG);
+
+        /* Turn the CRT dacs back on */
+
+        if (par->output & OUTPUT_CRT) {
+                temp = readl(par->df_regs + DF_MISC);
+                temp &= ~(DF_MISC_DAC_PWRDN  | DF_MISC_A_PWRDN);
+                writel(temp, par->df_regs + DF_MISC);
+        }
+
+        /* Turn the panel on (if it isn't already) */
+
+        if (par->output & OUTPUT_PANEL) {
+                temp = readl(par->df_regs + DF_FP_PM);
+
+                if (!(temp & 0x09))
+                        writel(temp | DF_FP_PM_P, par->df_regs + DF_FP_PM);
+        }
+
+        temp = readl(par->df_regs + DF_MISC);
+        temp = readl(par->df_regs + DF_DISPLAY_CFG);
+}
+
+unsigned int lx_framebuffer_size(void)
+{
+        unsigned int val;
+
+        /* The frame buffer size is reported by a VSM in VSA II */
+        /* Virtual Register Class    = 0x02                     */
+        /* VG_MEM_SIZE (1MB units)   = 0x00                     */
+
+        outw(0xFC53, 0xAC1C);
+        outw(0x0200, 0xAC1C);
+
+        val = (unsigned int)(inw(0xAC1E)) & 0xFE;
+        return (val << 20);
+}
+
+void lx_set_mode(struct fb_info *info)
+{
+        struct lxfb_par *par = info->par;
+        u64 msrval;
+
+        unsigned int max, dv, val, size;
+
+        unsigned int gcfg, dcfg;
+        int hactive, hblankstart, hsyncstart, hsyncend, hblankend, htotal;
+        int vactive, vblankstart, vsyncstart, vsyncend, vblankend, vtotal;
+
+        /* Unlock the DC registers */
+        writel(DC_UNLOCK_CODE, par->dc_regs + DC_UNLOCK);
+
+        lx_graphics_disable(info);
+
+        lx_set_clock(info);
+
+        /* Set output mode */
+
+        rdmsrl(MSR_LX_DF_GLCONFIG, msrval);
+        msrval &= ~DF_CONFIG_OUTPUT_MASK;
+
+        if (par->output & OUTPUT_PANEL) {
+                msrval |= DF_OUTPUT_PANEL;
+
+                if (par->output & OUTPUT_CRT)
+                        msrval |= DF_SIMULTANEOUS_CRT_AND_FP;
+                else
+                        msrval &= ~DF_SIMULTANEOUS_CRT_AND_FP;
+        } else {
+                msrval |= DF_OUTPUT_CRT;
+        }
+
+        wrmsrl(MSR_LX_DF_GLCONFIG, msrval);
+
+        /* Clear the various buffers */
+        /* FIXME:  Adjust for panning here */
+
+        writel(0, par->dc_regs + DC_FB_START);
+        writel(0, par->dc_regs + DC_CB_START);
+        writel(0, par->dc_regs + DC_CURSOR_START);
+
+        /* FIXME: Add support for interlacing */
+        /* FIXME: Add support for scaling */
+
+        val = readl(par->dc_regs + DC_GENLCK_CTRL);
+        val &= ~(DC_GC_ALPHA_FLICK_ENABLE |
+                 DC_GC_FLICKER_FILTER_ENABLE | DC_GC_FLICKER_FILTER_MASK);
+
+        /* Default scaling params */
+
+        writel((0x4000 << 16) | 0x4000, par->dc_regs + DC_GFX_SCALE);
+        writel(0, par->dc_regs + DC_IRQ_FILT_CTL);
+        writel(val, par->dc_regs + DC_GENLCK_CTRL);
+
+        /* FIXME:  Support compression */
+
+        if (info->fix.line_length > 4096)
+                dv = DC_DV_LINE_SIZE_8192;
+        else if (info->fix.line_length > 2048)
+                dv = DC_DV_LINE_SIZE_4096;
+        else if (info->fix.line_length > 1024)
+                dv = DC_DV_LINE_SIZE_2048;
+        else
+                dv = DC_DV_LINE_SIZE_1024;
+
+        max = info->fix.line_length * info->var.yres;
+        max = (max + 0x3FF) & 0xFFFFFC00;
+
+        writel(max | DC_DV_TOP_ENABLE, par->dc_regs + DC_DV_TOP);
+
+        val = readl(par->dc_regs + DC_DV_CTL) & ~DC_DV_LINE_SIZE_MASK;
+        writel(val | dv, par->dc_regs + DC_DV_CTL);
+
+        size = info->var.xres * (info->var.bits_per_pixel >> 3);
+
+        writel(info->fix.line_length >> 3, par->dc_regs + DC_GRAPHICS_PITCH);
+        writel((size + 7) >> 3, par->dc_regs + DC_LINE_SIZE);
+
+        /* Set default watermark values */
+
+        rdmsrl(MSR_LX_DC_SPARE, msrval);
+
+        msrval &= ~(DC_SPARE_DISABLE_CFIFO_HGO | DC_SPARE_VFIFO_ARB_SELECT |
+                    DC_SPARE_LOAD_WM_LPEN_MASK | DC_SPARE_WM_LPEN_OVRD |
+                    DC_SPARE_DISABLE_INIT_VID_PRI | DC_SPARE_DISABLE_VFIFO_WM);
+        msrval |= DC_SPARE_DISABLE_VFIFO_WM | DC_SPARE_DISABLE_INIT_VID_PRI;
+        wrmsrl(MSR_LX_DC_SPARE, msrval);
+
+        gcfg = DC_GCFG_DFLE;   /* Display fifo enable */
+        gcfg |= 0xB600;         /* Set default priority */
+        gcfg |= DC_GCFG_FDTY;  /* Set the frame dirty mode */
+
+        dcfg  = DC_DCFG_VDEN;  /* Enable video data */
+        dcfg |= DC_DCFG_GDEN;  /* Enable graphics */
+        dcfg |= DC_DCFG_TGEN;  /* Turn on the timing generator */
+        dcfg |= DC_DCFG_TRUP;  /* Update timings immediately */
+        dcfg |= DC_DCFG_PALB;  /* Palette bypass in > 8 bpp modes */
+        dcfg |= DC_DCFG_VISL;
+        dcfg |= DC_DCFG_DCEN;  /* Always center the display */
+
+        /* Set the current BPP mode */
+
+        switch (info->var.bits_per_pixel) {
+        case 8:
+                dcfg |= DC_DCFG_DISP_MODE_8BPP;
+                break;
+
+        case 16:
+                dcfg |= DC_DCFG_DISP_MODE_16BPP | DC_DCFG_16BPP;
+                break;
+
+        case 32:
+        case 24:
+                dcfg |= DC_DCFG_DISP_MODE_24BPP;
+                break;
+        }
+
+        /* Now - set up the timings */
+
+        hactive = info->var.xres;
+        hblankstart = hactive;
+        hsyncstart = hblankstart + info->var.right_margin;
+        hsyncend =  hsyncstart + info->var.hsync_len;
+        hblankend = hsyncend + info->var.left_margin;
+        htotal = hblankend;
+
+        vactive = info->var.yres;
+        vblankstart = vactive;
+        vsyncstart = vblankstart + info->var.lower_margin;
+        vsyncend =  vsyncstart + info->var.vsync_len;
+        vblankend = vsyncend + info->var.upper_margin;
+        vtotal = vblankend;
+
+        writel((hactive - 1) | ((htotal - 1) << 16),
+               par->dc_regs + DC_H_ACTIVE_TIMING);
+        writel((hblankstart - 1) | ((hblankend - 1) << 16),
+               par->dc_regs + DC_H_BLANK_TIMING);
+        writel((hsyncstart - 1) | ((hsyncend - 1) << 16),
+               par->dc_regs + DC_H_SYNC_TIMING);
+
+        writel((vactive - 1) | ((vtotal - 1) << 16),
+               par->dc_regs + DC_V_ACTIVE_TIMING);
+
+        writel((vblankstart - 1) | ((vblankend - 1) << 16),
+               par->dc_regs + DC_V_BLANK_TIMING);
+
+        writel((vsyncstart - 1)  | ((vsyncend - 1) << 16),
+               par->dc_regs + DC_V_SYNC_TIMING);
+
+        writel( (info->var.xres - 1) << 16 | (info->var.yres - 1),
+                par->dc_regs + DC_FB_ACTIVE);
+
+        /* And re-enable the graphics output */
+        lx_graphics_enable(info);
+
+        /* Write the two main configuration registers */
+        writel(dcfg, par->dc_regs + DC_DISPLAY_CFG);
+        writel(0, par->dc_regs + DC_ARB_CFG);
+        writel(gcfg, par->dc_regs + DC_GENERAL_CFG);
+
+        /* Lock the DC registers */
+        writel(0, par->dc_regs + DC_UNLOCK);
+}
+
+void lx_set_palette_reg(struct fb_info *info, unsigned regno,
+                        unsigned red, unsigned green, unsigned blue)
+{
+        struct lxfb_par *par = info->par;
+        int val;
+
+        /* Hardware palette is in RGB 8-8-8 format. */
+
+        val  = (red   << 8) & 0xff0000;
+        val |= (green)      & 0x00ff00;
+        val |= (blue  >> 8) & 0x0000ff;
+
+        writel(regno, par->dc_regs + DC_PAL_ADDRESS);
+        writel(val, par->dc_regs + DC_PAL_DATA);
+}
+
+int lx_blank_display(struct fb_info *info, int blank_mode)
+{
+        struct lxfb_par *par = info->par;
+        u32 dcfg, fp_pm;
+        int blank, hsync, vsync;
+
+        /* CRT power saving modes. */
+        switch (blank_mode) {
+        case FB_BLANK_UNBLANK:
+                blank = 0; hsync = 1; vsync = 1;
+                break;
+        case FB_BLANK_NORMAL:
+                blank = 1; hsync = 1; vsync = 1;
+                break;
+        case FB_BLANK_VSYNC_SUSPEND:
+                blank = 1; hsync = 1; vsync = 0;
+                break;
+        case FB_BLANK_HSYNC_SUSPEND:
+                blank = 1; hsync = 0; vsync = 1;
+                break;
+        case FB_BLANK_POWERDOWN:
+                blank = 1; hsync = 0; vsync = 0;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        dcfg = readl(par->df_regs + DF_DISPLAY_CFG);
+        dcfg &= ~(DF_DCFG_DAC_BL_EN
+                  | DF_DCFG_HSYNC_EN | DF_DCFG_VSYNC_EN);
+        if (!blank)
+                dcfg |= DF_DCFG_DAC_BL_EN;
+        if (hsync)
+                dcfg |= DF_DCFG_HSYNC_EN;
+        if (vsync)
+                dcfg |= DF_DCFG_VSYNC_EN;
+        writel(dcfg, par->df_regs + DF_DISPLAY_CFG);
+
+        /* Power on/off flat panel */
+
+        if (par->output & OUTPUT_PANEL) {
+                fp_pm = readl(par->df_regs + DF_FP_PM);
+                if (blank_mode == FB_BLANK_POWERDOWN)
+                        fp_pm &= ~DF_FP_PM_P;
+                else
+                        fp_pm |= DF_FP_PM_P;
+                writel(fp_pm, par->df_regs + DF_FP_PM);
+        }
+
+        return 0;
+}
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index ed3426062a8b..8a4c6470d799 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -474,6 +474,7 @@ static void schedule_palette_update(struct s3c2410fb_info *fbi,
 {
         unsigned long flags;
         unsigned long irqen;
+        void __iomem *regs = fbi->io;
 
         local_irq_save(flags);
 
@@ -483,9 +484,9 @@ static void schedule_palette_update(struct s3c2410fb_info *fbi,
                 fbi->palette_ready = 1;
 
                 /* enable IRQ */
-                irqen = readl(S3C2410_LCDINTMSK);
+                irqen = readl(regs + S3C2410_LCDINTMSK);
                 irqen &= ~S3C2410_LCDINT_FRSYNC;
-                writel(irqen, S3C2410_LCDINTMSK);
+                writel(irqen, regs + S3C2410_LCDINTMSK);
         }
 
         local_irq_restore(flags);
@@ -680,6 +681,7 @@ static inline void modify_gpio(void __iomem *reg,
 static int s3c2410fb_init_registers(struct s3c2410fb_info *fbi)
 {
         unsigned long flags;
+        void __iomem *regs = fbi->io;
 
         /* Initialise LCD with values from haret */
 
@@ -694,25 +696,25 @@ static int s3c2410fb_init_registers(struct s3c2410fb_info *fbi)
 
         local_irq_restore(flags);
 
-        writel(fbi->regs.lcdcon1, S3C2410_LCDCON1);
-        writel(fbi->regs.lcdcon2, S3C2410_LCDCON2);
-        writel(fbi->regs.lcdcon3, S3C2410_LCDCON3);
-        writel(fbi->regs.lcdcon4, S3C2410_LCDCON4);
-        writel(fbi->regs.lcdcon5, S3C2410_LCDCON5);
+        writel(fbi->regs.lcdcon1, regs + S3C2410_LCDCON1);
+        writel(fbi->regs.lcdcon2, regs + S3C2410_LCDCON2);
+        writel(fbi->regs.lcdcon3, regs + S3C2410_LCDCON3);
+        writel(fbi->regs.lcdcon4, regs + S3C2410_LCDCON4);
+        writel(fbi->regs.lcdcon5, regs + S3C2410_LCDCON5);
 
         s3c2410fb_set_lcdaddr(fbi);
 
         dprintk("LPCSEL    = 0x%08lx\n", mach_info->lpcsel);
-        writel(mach_info->lpcsel, S3C2410_LPCSEL);
+        writel(mach_info->lpcsel, regs + S3C2410_LPCSEL);
 
-        dprintk("replacing TPAL %08x\n", readl(S3C2410_TPAL));
+        dprintk("replacing TPAL %08x\n", readl(regs + S3C2410_TPAL));
 
         /* ensure temporary palette disabled */
-        writel(0x00, S3C2410_TPAL);
+        writel(0x00, regs + S3C2410_TPAL);
 
         /* Enable video by setting the ENVID bit to 1 */
         fbi->regs.lcdcon1 |= S3C2410_LCDCON1_ENVID;
-        writel(fbi->regs.lcdcon1, S3C2410_LCDCON1);
+        writel(fbi->regs.lcdcon1, regs + S3C2410_LCDCON1);
         return 0;
 }
 
@@ -720,6 +722,7 @@ static void s3c2410fb_write_palette(struct s3c2410fb_info *fbi)
 {
         unsigned int i;
         unsigned long ent;
+        void __iomem *regs = fbi->io;
 
         fbi->palette_ready = 0;
 
@@ -727,14 +730,14 @@ static void s3c2410fb_write_palette(struct s3c2410fb_info *fbi)
                 if ((ent = fbi->palette_buffer[i]) == PALETTE_BUFF_CLEAR)
                         continue;
 
-                writel(ent, S3C2410_TFTPAL(i));
+                writel(ent, regs + S3C2410_TFTPAL(i));
 
                 /* it seems the only way to know exactly
                  * if the palette wrote ok, is to check
                  * to see if the value verifies ok
                  */
 
-                if (readw(S3C2410_TFTPAL(i)) == ent)
+                if (readw(regs + S3C2410_TFTPAL(i)) == ent)
                         fbi->palette_buffer[i] = PALETTE_BUFF_CLEAR;
                 else
                         fbi->palette_ready = 1;   /* retry */
@@ -744,14 +747,15 @@ static void s3c2410fb_write_palette(struct s3c2410fb_info *fbi)
 static irqreturn_t s3c2410fb_irq(int irq, void *dev_id)
 {
         struct s3c2410fb_info *fbi = dev_id;
-        unsigned long lcdirq = readl(S3C2410_LCDINTPND);
+        void __iomem *regs = fbi->io;
+        unsigned long lcdirq = readl(regs + S3C2410_LCDINTPND);
 
         if (lcdirq & S3C2410_LCDINT_FRSYNC) {
                 if (fbi->palette_ready)
                         s3c2410fb_write_palette(fbi);
 
-                writel(S3C2410_LCDINT_FRSYNC, S3C2410_LCDINTPND);
-                writel(S3C2410_LCDINT_FRSYNC, S3C2410_LCDSRCPND);
+                writel(S3C2410_LCDINT_FRSYNC, regs + S3C2410_LCDINTPND);
+                writel(S3C2410_LCDINT_FRSYNC, regs + S3C2410_LCDSRCPND);
         }
 
         return IRQ_HANDLED;
@@ -764,9 +768,11 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
         struct s3c2410fb_info *info;
         struct fb_info     *fbinfo;
         struct s3c2410fb_hw *mregs;
+        struct resource *res;
         int ret;
         int irq;
         int i;
+        int size;
         u32 lcdcon1;
 
         mach_info = pdev->dev.platform_data;
@@ -788,11 +794,32 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
-
         info = fbinfo->par;
         info->fb = fbinfo;
         info->dev = &pdev->dev;
 
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (res == NULL) {
+                dev_err(&pdev->dev, "failed to get memory registersn");
+                ret = -ENXIO;
+                goto dealloc_fb;
+        }
+
+        size = (res->end - res->start)+1;
+        info->mem = request_mem_region(res->start, size, pdev->name);
+        if (info->mem == NULL) {
+                dev_err(&pdev->dev, "failed to get memory region\n");
+                ret = -ENOENT;
+                goto dealloc_fb;
+        }
+
+        info->io = ioremap(res->start, size);
+        if (info->io == NULL) {
+                dev_err(&pdev->dev, "ioremap() of registers failed\n");
+                ret = -ENXIO;
+                goto release_mem;
+        }
+
         platform_set_drvdata(pdev, fbinfo);
 
         dprintk("devinit\n");
@@ -803,8 +830,8 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
 
         /* Stop the video and unset ENVID if set */
         info->regs.lcdcon1 &= ~S3C2410_LCDCON1_ENVID;
-        lcdcon1 = readl(S3C2410_LCDCON1);
-        writel(lcdcon1 & ~S3C2410_LCDCON1_ENVID, S3C2410_LCDCON1);
+        lcdcon1 = readl(info->io + S3C2410_LCDCON1);
+        writel(lcdcon1 & ~S3C2410_LCDCON1_ENVID, info->io + S3C2410_LCDCON1);
 
         info->mach_info             = pdev->dev.platform_data;
 
@@ -855,19 +882,11 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
         for (i = 0; i < 256; i++)
                 info->palette_buffer[i] = PALETTE_BUFF_CLEAR;
 
-        if (!request_mem_region((unsigned long)S3C24XX_VA_LCD, SZ_1M, "s3c2410-lcd")) {
-                ret = -EBUSY;
-                goto dealloc_fb;
-        }
-
-
-        dprintk("got LCD region\n");
-
         ret = request_irq(irq, s3c2410fb_irq, IRQF_DISABLED, pdev->name, info);
         if (ret) {
                 dev_err(&pdev->dev, "cannot get irq %d - err %d\n", irq, ret);
                 ret = -EBUSY;
-                goto release_mem;
+                goto release_regs;
         }
 
         info->clk = clk_get(NULL, "lcd");
@@ -889,6 +908,7 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
                 ret = -ENOMEM;
                 goto release_clock;
         }
+
         dprintk("got video memory\n");
 
         ret = s3c2410fb_init_registers(info);
@@ -916,8 +936,11 @@ release_clock:
         clk_put(info->clk);
 release_irq:
         free_irq(irq,info);
+release_regs:
+        iounmap(info->io);
 release_mem:
-        release_mem_region((unsigned long)S3C24XX_VA_LCD, S3C24XX_SZ_LCD);
+        release_resource(info->mem);
+        kfree(info->mem);
 dealloc_fb:
         framebuffer_release(fbinfo);
         return ret;
@@ -935,7 +958,7 @@ static void s3c2410fb_stop_lcd(struct s3c2410fb_info *fbi)
         local_irq_save(flags);
 
         fbi->regs.lcdcon1 &= ~S3C2410_LCDCON1_ENVID;
-        writel(fbi->regs.lcdcon1, S3C2410_LCDCON1);
+        writel(fbi->regs.lcdcon1, fbi->io + S3C2410_LCDCON1);
 
         local_irq_restore(flags);
 }
@@ -962,7 +985,10 @@ static int s3c2410fb_remove(struct platform_device *pdev)
 
         irq = platform_get_irq(pdev, 0);
         free_irq(irq,info);
-        release_mem_region((unsigned long)S3C24XX_VA_LCD, S3C24XX_SZ_LCD);
+
+        release_resource(info->mem);
+        kfree(info->mem);
+        iounmap(info->io);
         unregister_framebuffer(fbinfo);
 
         return 0;
diff --git a/drivers/video/s3c2410fb.h b/drivers/video/s3c2410fb.h
index f3f8a8e15012..17c7915b7acd 100644
--- a/drivers/video/s3c2410fb.h
+++ b/drivers/video/s3c2410fb.h
@@ -30,6 +30,9 @@ struct s3c2410fb_info {
         struct device           *dev;
         struct clk              *clk;
 
+        struct resource         *mem;
+        void __iomem            *io;
+
         struct s3c2410fb_mach_info *mach_info;
 
         /* raw memory addresses */
diff --git a/drivers/video/tx3912fb.c b/drivers/video/tx3912fb.c
deleted file mode 100644
index e6f7c78da68b..000000000000
--- a/drivers/video/tx3912fb.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- *  drivers/video/tx3912fb.c
- *
- *  Copyright (C) 1999 Harald Koerfgen
- *  Copyright (C) 2001 Steven Hill (sjhill@realitydiluted.com)
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file COPYING in the main directory of this archive for
- * more details.
- *
- *  Framebuffer for LCD controller in TMPR3912/05 and PR31700 processors
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/pm.h>
-#include <linux/fb.h>
-#include <asm/io.h>
-#include <asm/bootinfo.h>
-#include <asm/uaccess.h>
-#include <asm/tx3912.h>
-#include <video/tx3912.h>
-
-/*
- * Frame buffer, palette and console structures
- */
-static struct fb_info fb_info;
-static u32 cfb8[16];
-
-static struct fb_fix_screeninfo tx3912fb_fix __initdata = {
-        .id =           "tx3912fb",
-        .smem_len =     ((240 * 320)/2),
-        .type =         FB_TYPE_PACKED_PIXELS,
-        .visual =       FB_VISUAL_TRUECOLOR, 
-        .xpanstep =     1,
-        .ypanstep =     1,
-        .ywrapstep =    1,
-        .accel =        FB_ACCEL_NONE,
-};
-
-static struct fb_var_screeninfo tx3912fb_var = {
-        .xres =         240,
-        .yres =         320,
-        .xres_virtual = 240,
-        .yres_virtual = 320,
-        .bits_per_pixel =4,
-        .red =          { 0, 4, 0 },    /* ??? */
-        .green =        { 0, 4, 0 },
-        .blue =         { 0, 4, 0 },
-        .activate =     FB_ACTIVATE_NOW,
-        .width =        -1,
-        .height =       -1,
-        .pixclock =     20000,
-        .left_margin =  64,
-        .right_margin = 64,
-        .upper_margin = 32,
-        .lower_margin = 32,
-        .hsync_len =    64,
-        .vsync_len =    2,
-        .vmode =        FB_VMODE_NONINTERLACED,
-};
-
-/*
- * Interface used by the world
- */
-int tx3912fb_init(void);
-
-static int tx3912fb_setcolreg(u_int regno, u_int red, u_int green,
-                              u_int blue, u_int transp,
-                              struct fb_info *info);
-
-/*
- * Macros
- */
-#define get_line_length(xres_virtual, bpp) \
-                (u_long) (((int) xres_virtual * (int) bpp + 7) >> 3)
-
-/*
- * Frame buffer operations structure used by console driver
- */
-static struct fb_ops tx3912fb_ops = {
-        .owner          = THIS_MODULE,
-        .fb_setcolreg   = tx3912fb_setcolreg,
-        .fb_fillrect    = cfb_fillrect,
-        .fb_copyarea    = cfb_copyarea,
-        .fb_imageblit   = cfb_imageblit,
-};
-
-static int tx3912fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
-{
-        /*
-         * Memory limit
-         */
-        line_length =
-            get_line_length(var->xres_virtual, var->bits_per_pixel);
-        if ((line_length * var->yres_virtual) > info->fix.smem_len)
-                return -ENOMEM;
-
-        return 0;
-}
-
-static int tx3912fb_set_par(struct fb_info *info)
-{
-        u_long tx3912fb_paddr = 0;
-
-        /* Disable the video logic */
-        outl(inl(TX3912_VIDEO_CTRL1) &
-             ~(TX3912_VIDEO_CTRL1_ENVID | TX3912_VIDEO_CTRL1_DISPON),
-             TX3912_VIDEO_CTRL1);
-        udelay(200);
-
-        /* Set start address for DMA transfer */
-        outl(tx3912fb_paddr, TX3912_VIDEO_CTRL3);
-
-        /* Set end address for DMA transfer */
-        outl((tx3912fb_paddr + tx3912fb_fix.smem_len + 1), TX3912_VIDEO_CTRL4);
-
-        /* Set the pixel depth */
-        switch (info->var.bits_per_pixel) {
-        case 1:
-                /* Monochrome */
-                outl(inl(TX3912_VIDEO_CTRL1) &
-                     ~TX3912_VIDEO_CTRL1_BITSEL_MASK, TX3912_VIDEO_CTRL1);
-                info->fix.visual = FB_VISUAL_MONO10;
-                break;
-        case 4:
-                /* 4-bit gray */
-                outl(inl(TX3912_VIDEO_CTRL1) &
-                     ~TX3912_VIDEO_CTRL1_BITSEL_MASK, TX3912_VIDEO_CTRL1);
-                outl(inl(TX3912_VIDEO_CTRL1) |
-                     TX3912_VIDEO_CTRL1_BITSEL_4BIT_GRAY,
-                     TX3912_VIDEO_CTRL1);
-                info->fix.visual = FB_VISUAL_TRUECOLOR;
-                break;
-        case 8:
-                /* 8-bit color */
-                outl(inl(TX3912_VIDEO_CTRL1) &
-                     ~TX3912_VIDEO_CTRL1_BITSEL_MASK, TX3912_VIDEO_CTRL1);
-                outl(inl(TX3912_VIDEO_CTRL1) |
-                     TX3912_VIDEO_CTRL1_BITSEL_8BIT_COLOR,
-                     TX3912_VIDEO_CTRL1);
-                info->fix.visual = FB_VISUAL_TRUECOLOR;
-                break;
-        case 2:
-        default:
-                /* 2-bit gray */
-                outl(inl(TX3912_VIDEO_CTRL1) &
-                     ~TX3912_VIDEO_CTRL1_BITSEL_MASK, TX3912_VIDEO_CTRL1);
-                outl(inl(TX3912_VIDEO_CTRL1) |
-                     TX3912_VIDEO_CTRL1_BITSEL_2BIT_GRAY,
-                     TX3912_VIDEO_CTRL1);
-                info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
-                break;
-        }
-
-        /* Enable the video clock */
-        outl(inl(TX3912_CLK_CTRL) | TX3912_CLK_CTRL_ENVIDCLK,
-             TX3912_CLK_CTRL);
-
-        /* Unfreeze video logic and enable DF toggle */
-        outl(inl(TX3912_VIDEO_CTRL1) &
-             ~(TX3912_VIDEO_CTRL1_ENFREEZEFRAME |
-               TX3912_VIDEO_CTRL1_DFMODE)
-             , TX3912_VIDEO_CTRL1);
-        udelay(200);
-
-        /* Enable the video logic */
-        outl(inl(TX3912_VIDEO_CTRL1) |
-             (TX3912_VIDEO_CTRL1_ENVID | TX3912_VIDEO_CTRL1_DISPON),
-             TX3912_VIDEO_CTRL1);
-
-        info->fix.line_length = get_line_length(var->xres_virtual,
-                                            var->bits_per_pixel);
-}
-
-/*
- * Set a single color register
- */
-static int tx3912fb_setcolreg(u_int regno, u_int red, u_int green,
-                              u_int blue, u_int transp,
-                              struct fb_info *info)
-{
-        if (regno > 255)
-                return 1;
-
-        if (regno < 16)
-                ((u32 *)(info->pseudo_palette))[regno] = ((red & 0xe000) >> 8)
-                    | ((green & 0xe000) >> 11)
-                    | ((blue & 0xc000) >> 14);
-        return 0;
-}
-
-int __init tx3912fb_setup(char *options);
-
-/*
- * Initialization of the framebuffer
- */
-int __init tx3912fb_init(void)
-{
-        u_long tx3912fb_paddr = 0;
-        int size = (info->var.bits_per_pixel == 8) ? 256 : 16;
-        char *option = NULL;
-
-        if (fb_get_options("tx3912fb", &option))
-                return -ENODEV;
-        tx3912fb_setup(option);
-
-        /* Disable the video logic */
-        outl(inl(TX3912_VIDEO_CTRL1) &
-             ~(TX3912_VIDEO_CTRL1_ENVID | TX3912_VIDEO_CTRL1_DISPON),
-             TX3912_VIDEO_CTRL1);
-        udelay(200);
-
-        /* Set start address for DMA transfer */
-        outl(tx3912fb_paddr, TX3912_VIDEO_CTRL3);
-
-        /* Set end address for DMA transfer */
-        outl((tx3912fb_paddr + tx3912fb_fix.smem_len + 1), TX3912_VIDEO_CTRL4);
-
-        /* Set the pixel depth */
-        switch (tx3912fb_var.bits_per_pixel) {
-        case 1:
-                /* Monochrome */
-                outl(inl(TX3912_VIDEO_CTRL1) &
-                     ~TX3912_VIDEO_CTRL1_BITSEL_MASK, TX3912_VIDEO_CTRL1);
-                tx3912fb_fix.visual = FB_VISUAL_MONO10;
-                break;
-        case 4:
-                /* 4-bit gray */
-                outl(inl(TX3912_VIDEO_CTRL1) &
-                     ~TX3912_VIDEO_CTRL1_BITSEL_MASK, TX3912_VIDEO_CTRL1);
-                outl(inl(TX3912_VIDEO_CTRL1) |
-                     TX3912_VIDEO_CTRL1_BITSEL_4BIT_GRAY,
-                     TX3912_VIDEO_CTRL1);
-                tx3912fb_fix.visual = FB_VISUAL_TRUECOLOR;
-                tx3912fb_fix.grayscale = 1;
-                break;
-        case 8:
-                /* 8-bit color */
-                outl(inl(TX3912_VIDEO_CTRL1) &
-                     ~TX3912_VIDEO_CTRL1_BITSEL_MASK, TX3912_VIDEO_CTRL1);
-                outl(inl(TX3912_VIDEO_CTRL1) |
-                     TX3912_VIDEO_CTRL1_BITSEL_8BIT_COLOR,
-                     TX3912_VIDEO_CTRL1);
-                tx3912fb_fix.visual = FB_VISUAL_TRUECOLOR;
-                break;
-        case 2:
-        default:
-                /* 2-bit gray */
-                outl(inl(TX3912_VIDEO_CTRL1) &
-                     ~TX3912_VIDEO_CTRL1_BITSEL_MASK, TX3912_VIDEO_CTRL1);
-                outl(inl(TX3912_VIDEO_CTRL1) |
-                     TX3912_VIDEO_CTRL1_BITSEL_2BIT_GRAY,
-                     TX3912_VIDEO_CTRL1);
-                tx3912fb_fix.visual = FB_VISUAL_PSEUDOCOLOR;
-                tx3912fb_fix.grayscale = 1;
-                break;
-        }
-
-        /* Enable the video clock */
-        outl(inl(TX3912_CLK_CTRL) | TX3912_CLK_CTRL_ENVIDCLK,
-                TX3912_CLK_CTRL);
-
-        /* Unfreeze video logic and enable DF toggle */
-        outl(inl(TX3912_VIDEO_CTRL1) &
-                ~(TX3912_VIDEO_CTRL1_ENFREEZEFRAME | TX3912_VIDEO_CTRL1_DFMODE),
-                TX3912_VIDEO_CTRL1);
-        udelay(200);
-
-        /* Clear the framebuffer */
-        memset((void *) tx3912fb_fix.smem_start, 0xff, tx3912fb_fix.smem_len);
-        udelay(200);
-
-        /* Enable the video logic */
-        outl(inl(TX3912_VIDEO_CTRL1) |
-                (TX3912_VIDEO_CTRL1_ENVID | TX3912_VIDEO_CTRL1_DISPON),
-                TX3912_VIDEO_CTRL1);
-
-        /*
-         * Memory limit
-         */
-        tx3912fb_fix.line_length =
-            get_line_length(tx3912fb_var.xres_virtual, tx3912fb_var.bits_per_pixel);
-        if ((tx3912fb_fix.line_length * tx3912fb_var.yres_virtual) > tx3912fb_fix.smem_len)
-                return -ENOMEM;
-
-        fb_info.fbops = &tx3912fb_ops;
-        fb_info.var = tx3912fb_var;
-        fb_info.fix = tx3912fb_fix;
-        fb_info.pseudo_palette = cfb8;
-        fb_info.flags = FBINFO_DEFAULT;
-
-        /* Clear the framebuffer */
-        memset((void *) fb_info.fix.smem_start, 0xff, fb_info.fix.smem_len);
-        udelay(200);
-
-        fb_alloc_cmap(&info->cmap, size, 0);
-
-        if (register_framebuffer(&fb_info) < 0)
-                return -1;
-
-        printk(KERN_INFO "fb%d: TX3912 frame buffer using %uKB.\n",
-               fb_info.node, (u_int) (fb_info.fix.smem_len >> 10));
-        return 0;
-}
-
-int __init tx3912fb_setup(char *options)
-{
-        char *this_opt;
-
-        if (!options || !*options)
-                return 0;
-
-        while ((this_opt = strsep(&options, ","))) {
-                if (!strncmp(options, "bpp:", 4))       
-                        tx3912fb_var.bits_per_pixel = simple_strtoul(options+4, NULL, 0);
-        }       
-        return 0;
-}
-
-module_init(tx3912fb_init);
-MODULE_LICENSE("GPL");
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index 1d29a89a86b4..6ef9733a18d4 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -79,7 +79,7 @@
 /*
  * Here are the default fb_fix_screeninfo and fb_var_screeninfo structures
  */
-static struct fb_fix_screeninfo xilinx_fb_fix __initdata = {
+static struct fb_fix_screeninfo xilinx_fb_fix = {
         .id =           "Xilinx",
         .type =         FB_TYPE_PACKED_PIXELS,
         .visual =       FB_VISUAL_TRUECOLOR,
@@ -88,7 +88,7 @@ static struct fb_fix_screeninfo xilinx_fb_fix __initdata = {
         .accel =        FB_ACCEL_NONE
 };
 
-static struct fb_var_screeninfo xilinx_fb_var __initdata = {
+static struct fb_var_screeninfo xilinx_fb_var = {
         .xres =                 XRES,
         .yres =                 YRES,
         .xres_virtual =         XRES_VIRTUAL,
@@ -212,11 +212,6 @@ xilinxfb_drv_probe(struct device *dev)
         pdev = to_platform_device(dev);
         pdata = pdev->dev.platform_data;
 
-        if (pdata == NULL) {
-                printk(KERN_ERR "Couldn't find platform data.\n");
-                return -EFAULT;
-        }
-
         drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL);
         if (!drvdata) {
                 printk(KERN_ERR "Couldn't allocate device private record\n");
@@ -258,11 +253,9 @@ xilinxfb_drv_probe(struct device *dev)
         xilinx_fb_out_be32(drvdata, REG_FB_ADDR, drvdata->fb_phys);
 
         /* Turn on the display */
-        if (pdata->rotate_screen) {
-                drvdata->reg_ctrl_default = REG_CTRL_ENABLE | REG_CTRL_ROTATE;
-        } else {
-                drvdata->reg_ctrl_default = REG_CTRL_ENABLE;
-        }
+        drvdata->reg_ctrl_default = REG_CTRL_ENABLE;
+        if (pdata && pdata->rotate_screen)
+                drvdata->reg_ctrl_default |= REG_CTRL_ROTATE;
         xilinx_fb_out_be32(drvdata, REG_CTRL, drvdata->reg_ctrl_default);
 
         /* Fill struct fb_info */
@@ -281,8 +274,10 @@ xilinxfb_drv_probe(struct device *dev)
         }
 
         drvdata->info.flags = FBINFO_DEFAULT;
-        xilinx_fb_var.height = pdata->screen_height_mm;
-        xilinx_fb_var.width = pdata->screen_width_mm;
+        if (pdata) {
+                xilinx_fb_var.height = pdata->screen_height_mm;
+                xilinx_fb_var.width = pdata->screen_width_mm;
+        }
         drvdata->info.var = xilinx_fb_var;
 
         /* Register new frame buffer */
diff --git a/fs/afs/flock.c b/fs/afs/flock.c
index 4f77f3caee97..af6952e39a18 100644
--- a/fs/afs/flock.c
+++ b/fs/afs/flock.c
@@ -19,6 +19,7 @@ static void afs_fl_copy_lock(struct file_lock *new, struct file_lock *fl);
 static void afs_fl_release_private(struct file_lock *fl);
 
 static struct workqueue_struct *afs_lock_manager;
+static DEFINE_MUTEX(afs_lock_manager_mutex);
 
 static struct file_lock_operations afs_lock_ops = {
         .fl_copy_lock           = afs_fl_copy_lock,
@@ -30,12 +31,20 @@ static struct file_lock_operations afs_lock_ops = {
  */
 static int afs_init_lock_manager(void)
 {
+        int ret;
+
+        ret = 0;
         if (!afs_lock_manager) {
-                afs_lock_manager = create_singlethread_workqueue("kafs_lockd");
-                if (!afs_lock_manager)
-                        return -ENOMEM;
+                mutex_lock(&afs_lock_manager_mutex);
+                if (!afs_lock_manager) {
+                        afs_lock_manager =
+                                create_singlethread_workqueue("kafs_lockd");
+                        if (!afs_lock_manager)
+                                ret = -ENOMEM;
+                }
+                mutex_unlock(&afs_lock_manager_mutex);
         }
-        return 0;
+        return ret;
 }
 
 /*
@@ -68,6 +77,29 @@ static void afs_schedule_lock_extension(struct afs_vnode *vnode)
 }
 
 /*
+ * grant one or more locks (readlocks are allowed to jump the queue if the
+ * first lock in the queue is itself a readlock)
+ * - the caller must hold the vnode lock
+ */
+static void afs_grant_locks(struct afs_vnode *vnode, struct file_lock *fl)
+{
+        struct file_lock *p, *_p;
+
+        list_move_tail(&fl->fl_u.afs.link, &vnode->granted_locks);
+        if (fl->fl_type == F_RDLCK) {
+                list_for_each_entry_safe(p, _p, &vnode->pending_locks,
+                                         fl_u.afs.link) {
+                        if (p->fl_type == F_RDLCK) {
+                                p->fl_u.afs.state = AFS_LOCK_GRANTED;
+                                list_move_tail(&p->fl_u.afs.link,
+                                               &vnode->granted_locks);
+                                wake_up(&p->fl_wait);
+                        }
+                }
+        }
+}
+
+/*
  * do work for a lock, including:
  * - probing for a lock we're waiting on but didn't get immediately
  * - extending a lock that's close to timing out
@@ -172,8 +204,7 @@ void afs_lock_work(struct work_struct *work)
                                        struct file_lock, fl_u.afs.link) == fl) {
                                 fl->fl_u.afs.state = ret;
                                 if (ret == AFS_LOCK_GRANTED)
-                                        list_move_tail(&fl->fl_u.afs.link,
-                                                       &vnode->granted_locks);
+                                        afs_grant_locks(vnode, fl);
                                 else
                                         list_del_init(&fl->fl_u.afs.link);
                                 wake_up(&fl->fl_wait);
@@ -258,49 +289,50 @@ static int afs_do_setlk(struct file *file, struct file_lock *fl)
 
         spin_lock(&vnode->lock);
 
-        if (list_empty(&vnode->pending_locks)) {
-                /* if there's no-one else with a lock on this vnode, then we
-                 * need to ask the server for a lock */
-                if (list_empty(&vnode->granted_locks)) {
-                        _debug("not locked");
-                        ASSERTCMP(vnode->flags &
-                                  ((1 << AFS_VNODE_LOCKING) |
-                                   (1 << AFS_VNODE_READLOCKED) |
-                                   (1 << AFS_VNODE_WRITELOCKED)), ==, 0);
-                        list_add_tail(&fl->fl_u.afs.link, &vnode->pending_locks);
-                        set_bit(AFS_VNODE_LOCKING, &vnode->flags);
-                        spin_unlock(&vnode->lock);
+        /* if we've already got a readlock on the server then we can instantly
+         * grant another readlock, irrespective of whether there are any
+         * pending writelocks */
+        if (type == AFS_LOCK_READ &&
+            vnode->flags & (1 << AFS_VNODE_READLOCKED)) {
+                _debug("instant readlock");
+                ASSERTCMP(vnode->flags &
+                          ((1 << AFS_VNODE_LOCKING) |
+                           (1 << AFS_VNODE_WRITELOCKED)), ==, 0);
+                ASSERT(!list_empty(&vnode->granted_locks));
+                goto sharing_existing_lock;
+        }
 
-                        ret = afs_vnode_set_lock(vnode, key, type);
-                        clear_bit(AFS_VNODE_LOCKING, &vnode->flags);
-                        switch (ret) {
-                        case 0:
-                                goto acquired_server_lock;
-                        case -EWOULDBLOCK:
-                                spin_lock(&vnode->lock);
-                                ASSERT(list_empty(&vnode->granted_locks));
-                                ASSERTCMP(vnode->pending_locks.next, ==,
-                                          &fl->fl_u.afs.link);
-                                goto wait;
-                        default:
-                                spin_lock(&vnode->lock);
-                                list_del_init(&fl->fl_u.afs.link);
-                                spin_unlock(&vnode->lock);
-                                goto error;
-                        }
-                }
+        /* if there's no-one else with a lock on this vnode, then we need to
+         * ask the server for a lock */
+        if (list_empty(&vnode->pending_locks) &&
+            list_empty(&vnode->granted_locks)) {
+                _debug("not locked");
+                ASSERTCMP(vnode->flags &
+                          ((1 << AFS_VNODE_LOCKING) |
+                           (1 << AFS_VNODE_READLOCKED) |
+                           (1 << AFS_VNODE_WRITELOCKED)), ==, 0);
+                list_add_tail(&fl->fl_u.afs.link, &vnode->pending_locks);
+                set_bit(AFS_VNODE_LOCKING, &vnode->flags);
+                spin_unlock(&vnode->lock);
 
-                /* if we've already got a readlock on the server and no waiting
-                 * writelocks, then we might be able to instantly grant another
-                 * readlock */
-                if (type == AFS_LOCK_READ &&
-                    vnode->flags & (1 << AFS_VNODE_READLOCKED)) {
-                        _debug("instant readlock");
-                        ASSERTCMP(vnode->flags &
-                                  ((1 << AFS_VNODE_LOCKING) |
-                                   (1 << AFS_VNODE_WRITELOCKED)), ==, 0);
-                        ASSERT(!list_empty(&vnode->granted_locks));
-                        goto sharing_existing_lock;
+                ret = afs_vnode_set_lock(vnode, key, type);
+                clear_bit(AFS_VNODE_LOCKING, &vnode->flags);
+                switch (ret) {
+                case 0:
+                        _debug("acquired");
+                        goto acquired_server_lock;
+                case -EWOULDBLOCK:
+                        _debug("would block");
+                        spin_lock(&vnode->lock);
+                        ASSERT(list_empty(&vnode->granted_locks));
+                        ASSERTCMP(vnode->pending_locks.next, ==,
+                                  &fl->fl_u.afs.link);
+                        goto wait;
+                default:
+                        spin_lock(&vnode->lock);
+                        list_del_init(&fl->fl_u.afs.link);
+                        spin_unlock(&vnode->lock);
+                        goto error;
                 }
         }
 
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 750c46f7d893..78beb096f57d 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -1544,7 +1544,7 @@ int ext4_ext_walk_space(struct inode *inode, unsigned long block,
 
 static void
 ext4_ext_put_in_cache(struct inode *inode, __u32 block,
-                        __u32 len, __u32 start, int type)
+                        __u32 len, ext4_fsblk_t start, int type)
 {
         struct ext4_ext_cache *cex;
         BUG_ON(len == 0);
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 1a5e8e893d75..773421130116 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -508,7 +508,7 @@ static int gfs2_setlease(struct file *file, long arg, struct file_lock **fl)
          */
         if (!sdp->sd_args.ar_localflocks)
                 return -EINVAL;
-        return setlease(file, arg, fl);
+        return generic_setlease(file, arg, fl);
 }
 
 /**
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index 95c72aa81867..043b470fd3b6 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -846,6 +846,15 @@ root_found:
                 goto out_no_root;
         if (!inode->i_op)
                 goto out_bad_root;
+
+        /* Make sure the root inode is a directory */
+        if (!S_ISDIR(inode->i_mode)) {
+                printk(KERN_WARNING
+                        "isofs_fill_super: root inode is not a directory. "
+                        "Corrupted media?\n");
+                goto out_iput;
+        }
+
         /* get the root dentry */
         s->s_root = d_alloc_root(inode);
         if (!(s->s_root))
diff --git a/fs/locks.c b/fs/locks.c
index 310510637247..50857d2d3404 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1324,7 +1324,7 @@ int fcntl_getlease(struct file *filp)
 }
 
 /**
- *      setlease        -       sets a lease on an open file
+ *      generic_setlease        -       sets a lease on an open file
  *      @filp: file pointer
  *      @arg: type of lease to obtain
  *      @flp: input - file_lock to use, output - file_lock inserted
@@ -1334,7 +1334,7 @@ int fcntl_getlease(struct file *filp)
  *
  *      Called with kernel lock held.
  */
-int setlease(struct file *filp, long arg, struct file_lock **flp)
+int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
 {
         struct file_lock *fl, **before, **my_before = NULL, *lease;
         struct dentry *dentry = filp->f_path.dentry;
@@ -1419,7 +1419,7 @@ int setlease(struct file *filp, long arg, struct file_lock **flp)
 out:
         return error;
 }
-EXPORT_SYMBOL(setlease);
+EXPORT_SYMBOL(generic_setlease);
 
  /**
  *      vfs_setlease        -       sets a lease on an open file
@@ -1456,7 +1456,7 @@ int vfs_setlease(struct file *filp, long arg, struct file_lock **lease)
         if (filp->f_op && filp->f_op->setlease)
                 error = filp->f_op->setlease(filp, arg, lease);
         else
-                error = setlease(filp, arg, lease);
+                error = generic_setlease(filp, arg, lease);
         unlock_kernel();
 
         return error;
diff --git a/fs/ncpfs/ncplib_kernel.c b/fs/ncpfs/ncplib_kernel.c
index 551e0bac7aac..df6d60bdfcd3 100644
--- a/fs/ncpfs/ncplib_kernel.c
+++ b/fs/ncpfs/ncplib_kernel.c
@@ -726,9 +726,6 @@ ncp_del_file_or_subdir2(struct ncp_server *server,
         __le32 dirent;
 
         if (!inode) {
-#ifdef CONFIG_NCPFS_DEBUGDENTRY
-                PRINTK("ncpfs: ncpdel2: dentry->d_inode == NULL\n");
-#endif
                 return 0xFF;    /* Any error */
         }
         volnum = NCP_FINFO(inode)->volNumber;
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 2d295dda4c1d..cba899a3494e 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -564,9 +564,10 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
 
         /* flags */
         err = get_int(&mesg, &an_int);
-        if (err == -ENOENT)
+        if (err == -ENOENT) {
+                err = 0;
                 set_bit(CACHE_NEGATIVE, &exp.h.flags);
-        else {
+        } else {
                 if (err || an_int < 0) goto out;        
                 exp.ex_flags= an_int;
         
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index 2cf9a9a2d89c..2ccffde81b84 100644
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -138,7 +138,7 @@ idtoname_request(struct cache_detail *cd, struct cache_head *ch, char **bpp,
         char idstr[11];
 
         qword_add(bpp, blen, ent->authname);
-        snprintf(idstr, sizeof(idstr), "%d", ent->id);
+        snprintf(idstr, sizeof(idstr), "%u", ent->id);
         qword_add(bpp, blen, ent->type == IDMAP_TYPE_GROUP ? "group" : "user");
         qword_add(bpp, blen, idstr);
 
@@ -165,7 +165,7 @@ idtoname_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h)
                 return 0;
         }
         ent = container_of(h, struct ent, h);
-        seq_printf(m, "%s %s %d", ent->authname,
+        seq_printf(m, "%s %s %u", ent->authname,
                         ent->type == IDMAP_TYPE_GROUP ? "group" : "user",
                         ent->id);
         if (test_bit(CACHE_VALID, &h->flags))
@@ -349,7 +349,7 @@ nametoid_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h)
                         ent->type == IDMAP_TYPE_GROUP ? "group" : "user",
                         ent->name);
         if (test_bit(CACHE_VALID, &h->flags))
-                seq_printf(m, " %d", ent->id);
+                seq_printf(m, " %u", ent->id);
         seq_printf(m, "\n");
         return 0;
 }
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 3c627128e205..29b7e63cb32c 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -100,7 +100,15 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o
                 status = nfsd_create_v3(rqstp, current_fh, open->op_fname.data,
                                         open->op_fname.len, &open->op_iattr,
                                         &resfh, open->op_createmode,
-                                        (u32 *)open->op_verf.data, &open->op_truncate, &created);
+                                        (u32 *)open->op_verf.data,
+                                        &open->op_truncate, &created);
+
+                /* If we ever decide to use different attrs to store the
+                 * verifier in nfsd_create_v3, then we'll need to change this
+                 */
+                if (open->op_createmode == NFS4_CREATE_EXCLUSIVE && status == 0)
+                        open->op_bmval[1] |= (FATTR4_WORD1_TIME_ACCESS |
+                                                FATTR4_WORD1_TIME_MODIFY);
         } else {
                 status = nfsd_lookup(rqstp, current_fh,
                                      open->op_fname.data, open->op_fname.len, &resfh);
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index ee96a897a29e..a0c2b253818b 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1309,7 +1309,10 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp,
 
         if (createmode == NFS3_CREATE_EXCLUSIVE) {
                 /* solaris7 gets confused (bugid 4218508) if these have
-                 * the high bit set, so just clear the high bits.
+                 * the high bit set, so just clear the high bits. If this is
+                 * ever changed to use different attrs for storing the
+                 * verifier, then do_open_lookup() will also need to be fixed
+                 * accordingly.
                  */
                 v_mtime = verifier[0]&0x7fffffff;
                 v_atime = verifier[1]&0x7fffffff;
diff --git a/fs/open.c b/fs/open.c
index e27c205364d3..1d9e5e98bf4e 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -256,24 +256,26 @@ static long do_sys_truncate(const char __user * path, loff_t length)
         if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
                 goto dput_and_out;
 
-        /*
-         * Make sure that there are no leases.
-         */
-        error = break_lease(inode, FMODE_WRITE);
+        error = get_write_access(inode);
         if (error)
                 goto dput_and_out;
 
-        error = get_write_access(inode);
+        /*
+         * Make sure that there are no leases.  get_write_access() protects
+         * against the truncate racing with a lease-granting setlease().
+         */
+        error = break_lease(inode, FMODE_WRITE);
         if (error)
-                goto dput_and_out;
+                goto put_write_and_out;
 
         error = locks_verify_truncate(inode, NULL, length);
         if (!error) {
                 DQUOT_INIT(inode);
                 error = do_truncate(nd.dentry, length, 0, NULL);
         }
-        put_write_access(inode);
 
+put_write_and_out:
+        put_write_access(inode);
 dput_and_out:
         path_release(&nd);
 out:
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 3c77d5a64e7c..19489b0d5554 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -927,7 +927,7 @@ static const struct file_operations proc_pid_sched_operations = {
         .read           = seq_read,
         .write          = sched_write,
         .llseek         = seq_lseek,
-        .release        = seq_release,
+        .release        = single_release,
 };
 
 #endif
diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c
index cad2b7ace630..237fe8b8e819 100644
--- a/fs/ramfs/file-nommu.c
+++ b/fs/ramfs/file-nommu.c
@@ -295,5 +295,10 @@ unsigned long ramfs_nommu_get_unmapped_area(struct file *file,
  */
 int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma)
 {
-        return vma->vm_flags & VM_SHARED ? 0 : -ENOSYS;
+        if (!(vma->vm_flags & VM_SHARED))
+                return -ENOSYS;
+
+        file_accessed(file);
+        vma->vm_ops = &generic_file_vm_ops;
+        return 0;
 }
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 0d2c41666cd2..1652b2c665bb 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1127,13 +1127,15 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
         }
 
         inode->i_uid = le32_to_cpu(fe->uid);
-        if (inode->i_uid == -1 || UDF_QUERY_FLAG(inode->i_sb,
-                                                 UDF_FLAG_UID_IGNORE))
+        if (inode->i_uid == -1 ||
+            UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_UID_IGNORE) ||
+            UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_UID_SET))
                 inode->i_uid = UDF_SB(inode->i_sb)->s_uid;
 
         inode->i_gid = le32_to_cpu(fe->gid);
-        if (inode->i_gid == -1 || UDF_QUERY_FLAG(inode->i_sb,
-                                                 UDF_FLAG_GID_IGNORE))
+        if (inode->i_gid == -1 ||
+            UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_GID_IGNORE) ||
+            UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_GID_SET))
                 inode->i_gid = UDF_SB(inode->i_sb)->s_gid;
 
         inode->i_nlink = le16_to_cpu(fe->fileLinkCount);
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 7b30964665db..382be7be5ae3 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -366,11 +366,13 @@ static int udf_parse_options(char *options, struct udf_options *uopt)
                         if (match_int(args, &option))
                                 return 0;
                         uopt->gid = option;
+                        uopt->flags |= (1 << UDF_FLAG_GID_SET);
                         break;
                 case Opt_uid:
                         if (match_int(args, &option))
                                 return 0;
                         uopt->uid = option;
+                        uopt->flags |= (1 << UDF_FLAG_UID_SET);
                         break;
                 case Opt_umask:
                         if (match_octal(args, &option))
diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h
index 3e937d3fb8f9..3c2982017c6d 100644
--- a/fs/udf/udf_sb.h
+++ b/fs/udf/udf_sb.h
@@ -24,6 +24,8 @@
 #define UDF_FLAG_UID_IGNORE     12    /* use sb uid instead of on disk uid */
 #define UDF_FLAG_GID_FORGET     13
 #define UDF_FLAG_GID_IGNORE     14
+#define UDF_FLAG_UID_SET        15
+#define UDF_FLAG_GID_SET        16
 
 #define UDF_PART_FLAG_UNALLOC_BITMAP    0x0001
 #define UDF_PART_FLAG_UNALLOC_TABLE     0x0002
diff --git a/include/asm-alpha/thread_info.h b/include/asm-alpha/thread_info.h
index 48a22e3e6f32..fb3185196298 100644
--- a/include/asm-alpha/thread_info.h
+++ b/include/asm-alpha/thread_info.h
@@ -67,28 +67,24 @@ register struct thread_info *__current_thread_info __asm__("$8");
  * TIF_SYSCALL_TRACE is known to be 0 via blbs.
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_POLLING_NRFLAG      4       /* poll_idle is polling NEED_RESCHED */
-#define TIF_DIE_IF_KERNEL       5       /* dik recursion lock */
-#define TIF_UAC_NOPRINT         6       /* see sysinfo.h */
-#define TIF_UAC_NOFIX           7
-#define TIF_UAC_SIGBUS          8
-#define TIF_MEMDIE              9
-#define TIF_RESTORE_SIGMASK     10      /* restore signal mask in do_signal */
+#define TIF_SIGPENDING          1       /* signal pending */
+#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
+#define TIF_POLLING_NRFLAG      3       /* poll_idle is polling NEED_RESCHED */
+#define TIF_DIE_IF_KERNEL       4       /* dik recursion lock */
+#define TIF_UAC_NOPRINT         5       /* see sysinfo.h */
+#define TIF_UAC_NOFIX           6
+#define TIF_UAC_SIGBUS          7
+#define TIF_MEMDIE              8
+#define TIF_RESTORE_SIGMASK     9       /* restore signal mask in do_signal */
 
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
 #define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
 
 /* Work to do on interrupt/exception return.  */
-#define _TIF_WORK_MASK          (_TIF_NOTIFY_RESUME     \
-                                 | _TIF_SIGPENDING      \
-                                 | _TIF_NEED_RESCHED)
+#define _TIF_WORK_MASK          (_TIF_SIGPENDING | _TIF_NEED_RESCHED)
 
 /* Work to do on any return to userspace.  */
 #define _TIF_ALLWORK_MASK       (_TIF_WORK_MASK         \
diff --git a/include/asm-arm/thread_info.h b/include/asm-arm/thread_info.h
index 69c65d56a6ac..41784357a204 100644
--- a/include/asm-arm/thread_info.h
+++ b/include/asm-arm/thread_info.h
@@ -134,22 +134,19 @@ extern void iwmmxt_task_switch(struct thread_info *);
 /*
  * thread information flags:
  *  TIF_SYSCALL_TRACE   - syscall trace active
- *  TIF_NOTIFY_RESUME   - resumption notification requested
  *  TIF_SIGPENDING      - signal pending
  *  TIF_NEED_RESCHED    - rescheduling necessary
  *  TIF_USEDFPU         - FPU was used by this task this quantum (SMP)
  *  TIF_POLLING_NRFLAG  - true if poll_idle() is polling TIF_NEED_RESCHED
  */
-#define TIF_NOTIFY_RESUME       0
-#define TIF_SIGPENDING          1
-#define TIF_NEED_RESCHED        2
+#define TIF_SIGPENDING          0
+#define TIF_NEED_RESCHED        1
 #define TIF_SYSCALL_TRACE       8
 #define TIF_POLLING_NRFLAG      16
 #define TIF_USING_IWMMXT        17
 #define TIF_MEMDIE              18
 #define TIF_FREEZE              19
 
-#define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
 #define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
diff --git a/include/asm-arm26/a.out.h b/include/asm-arm26/a.out.h
deleted file mode 100644
index 7167f54ae3fc..000000000000
--- a/include/asm-arm26/a.out.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef __ARM_A_OUT_H__
-#define __ARM_A_OUT_H__
-
-#include <linux/personality.h>
-#include <asm/types.h>
-
-struct exec
-{
-  __u32 a_info;         /* Use macros N_MAGIC, etc for access */
-  __u32 a_text;         /* length of text, in bytes */
-  __u32 a_data;         /* length of data, in bytes */
-  __u32 a_bss;          /* length of uninitialized data area for file, in bytes */
-  __u32 a_syms;         /* length of symbol table data in file, in bytes */
-  __u32 a_entry;        /* start address */
-  __u32 a_trsize;       /* length of relocation info for text, in bytes */
-  __u32 a_drsize;       /* length of relocation info for data, in bytes */
-};
-
-/*
- * This is always the same
- */
-#define N_TXTADDR(a)    (0x00008000)
-
-#define N_TRSIZE(a)     ((a).a_trsize)
-#define N_DRSIZE(a)     ((a).a_drsize)
-#define N_SYMSIZE(a)    ((a).a_syms)
-
-#define M_ARM 103
-
-#ifdef __KERNEL__
-#define STACK_TOP       TASK_SIZE
-#define STACK_TOP_MAX   STACK_TOP
-#endif
-
-#ifndef LIBRARY_START_TEXT
-#define LIBRARY_START_TEXT      (0x00c00000)
-#endif
-
-#endif /* __A_OUT_GNU_H__ */
diff --git a/include/asm-arm26/assembler.h b/include/asm-arm26/assembler.h
deleted file mode 100644
index bb507a9a4a55..000000000000
--- a/include/asm-arm26/assembler.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * linux/include/asm-arm26/assembler.h
- *
- * This file contains arm architecture specific defines
- * for the different processors.
- *
- * Do not include any C declarations in this file - it is included by
- * assembler source.
- */
-#ifndef __ASSEMBLY__
-#error "Only include this from assembly code"
-#endif
-
-/*
- * Endian independent macros for shifting bytes within registers.
- */
-#define pull            lsr
-#define push            lsl
-#define byte(x)         (x*8)
-
-#ifdef __STDC__
-#define LOADREGS(cond, base, reglist...)\
-        ldm##cond       base,reglist^
-
-#define RETINSTR(instr, regs...)\
-        instr##s        regs
-#else
-#define LOADREGS(cond, base, reglist...)\
-        ldm/**/cond     base,reglist^
-
-#define RETINSTR(instr, regs...)\
-        instr/**/s      regs
-#endif
-
-#define MODENOP\
-        mov     r0, r0
-
-#define MODE(savereg,tmpreg,mode) \
-        mov     savereg, pc; \
-        bic     tmpreg, savereg, $0x0c000003; \
-        orr     tmpreg, tmpreg, $mode; \
-        teqp    tmpreg, $0
-
-#define RESTOREMODE(savereg) \
-        teqp    savereg, $0
-
-#define SAVEIRQS(tmpreg)
-
-#define RESTOREIRQS(tmpreg)
-
-#define DISABLEIRQS(tmpreg)\
-        teqp    pc, $0x08000003
-
-#define ENABLEIRQS(tmpreg)\
-        teqp    pc, $0x00000003
-
-#define USERMODE(tmpreg)\
-        teqp    pc, $0x00000000;\
-        mov     r0, r0
-
-#define SVCMODE(tmpreg)\
-        teqp    pc, $0x00000003;\
-        mov     r0, r0
-
-
-/*
- * Save the current IRQ state and disable IRQs
- * Note that this macro assumes FIQs are enabled, and
- * that the processor is in SVC mode.
- */
-        .macro  save_and_disable_irqs, oldcpsr, temp
-  mov \oldcpsr, pc
-  orr \temp, \oldcpsr, #0x08000000
-  teqp \temp, #0
-  .endm
-
-/*
- * Restore interrupt state previously stored in
- * a register
- * ** Actually do nothing on Arc - hope that the caller uses a MOVS PC soon
- * after!
- */
-        .macro  restore_irqs, oldcpsr
-  @ This be restore_irqs
-  .endm
-
-/*
- * These two are used to save LR/restore PC over a user-based access.
- * The old 26-bit architecture requires that we save lr (R14)
- */
-        .macro  save_lr
-        str     lr, [sp, #-4]!
-        .endm
-
-        .macro  restore_pc
-        ldmfd   sp!, {pc}^
-        .endm
-
-#define USER(x...)                              \
-9999:   x;                                      \
-        .section __ex_table,"a";                \
-        .align  3;                              \
-        .long   9999b,9001f;                    \
-        .previous
-
-
diff --git a/include/asm-arm26/atomic.h b/include/asm-arm26/atomic.h
deleted file mode 100644
index d6dd42374cf3..000000000000
--- a/include/asm-arm26/atomic.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *  linux/include/asm-arm26/atomic.h
- *
- *  Copyright (c) 1996 Russell King.
- *  Modified for arm26 by Ian Molton
- *
- * 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.
- *
- *  Changelog:
- *   25-11-2004 IM      Updated for 2.6.9
- *   27-06-1996 RMK     Created
- *   13-04-1997 RMK     Made functions atomic!
- *   07-12-1997 RMK     Upgraded for v2.1.
- *   26-08-1998 PJB     Added #ifdef __KERNEL__
- *
- *  FIXME - its probably worth seeing what these compile into...
- */
-#ifndef __ASM_ARM_ATOMIC_H
-#define __ASM_ARM_ATOMIC_H
-
-#ifdef CONFIG_SMP
-#error SMP is NOT supported
-#endif
-
-typedef struct { volatile int counter; } atomic_t;
-
-#define ATOMIC_INIT(i)  { (i) }
-
-#ifdef __KERNEL__
-#include <asm/system.h>
-
-#define atomic_read(v) ((v)->counter)
-#define atomic_set(v,i) (((v)->counter) = (i))
-
-static inline int atomic_add_return(int i, atomic_t *v)
-{
-        unsigned long flags;
-        int val;
-
-        local_irq_save(flags);
-        val = v->counter;
-        v->counter = val += i;
-        local_irq_restore(flags);
-
-        return val;
-}
-
-static inline int atomic_sub_return(int i, atomic_t *v)
-{
-        unsigned long flags;
-        int val;
-
-        local_irq_save(flags);
-        val = v->counter;
-        v->counter = val -= i;
-        local_irq_restore(flags);
-
-        return val;
-}
-
-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
-{
-        int ret;
-        unsigned long flags;
-
-        local_irq_save(flags);
-        ret = v->counter;
-        if (likely(ret == old))
-                v->counter = new;
-        local_irq_restore(flags);
-
-        return ret;
-}
-
-#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
-
-static inline int atomic_add_unless(atomic_t *v, int a, int u)
-{
-        int ret;
-        unsigned long flags;
-
-        local_irq_save(flags);
-        ret = v->counter;
-        if (ret != u)
-                v->counter += a;
-        local_irq_restore(flags);
-
-        return ret != u;
-}
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-
-static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        *addr &= ~mask;
-        local_irq_restore(flags);
-}
-
-#define atomic_add(i, v)        (void) atomic_add_return(i, v)
-#define atomic_inc(v)           (void) atomic_add_return(1, v)
-#define atomic_sub(i, v)        (void) atomic_sub_return(i, v)
-#define atomic_dec(v)           (void) atomic_sub_return(1, v)
-
-#define atomic_inc_and_test(v)  (atomic_add_return(1, v) == 0)
-#define atomic_dec_and_test(v)  (atomic_sub_return(1, v) == 0)
-#define atomic_inc_return(v)    (atomic_add_return(1, v))
-#define atomic_dec_return(v)    (atomic_sub_return(1, v))
-
-#define atomic_add_negative(i,v) (atomic_add_return(i, v) < 0)
-
-/* Atomic operations are already serializing on ARM26 */
-#define smp_mb__before_atomic_dec()     barrier()
-#define smp_mb__after_atomic_dec()      barrier()
-#define smp_mb__before_atomic_inc()     barrier()
-#define smp_mb__after_atomic_inc()      barrier()
-
-#include <asm-generic/atomic.h>
-#endif
-#endif
diff --git a/include/asm-arm26/auxvec.h b/include/asm-arm26/auxvec.h
deleted file mode 100644
index c0536f6b29a7..000000000000
--- a/include/asm-arm26/auxvec.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __ASMARM_AUXVEC_H
-#define __ASMARM_AUXVEC_H
-
-#endif
diff --git a/include/asm-arm26/bitops.h b/include/asm-arm26/bitops.h
deleted file mode 100644
index 19a69573a654..000000000000
--- a/include/asm-arm26/bitops.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright 1995, Russell King.
- *
- * Based on the arm32 version by RMK (and others). Their copyrights apply to
- * Those parts.
- * Modified for arm26 by Ian Molton on 25/11/04
- *
- * bit 0 is the LSB of an "unsigned long" quantity.
- *
- * Please note that the code in this file should never be included
- * from user space.  Many of these are not implemented in assembler
- * since they would be too costly.  Also, they require privileged
- * instructions (which are not available from user mode) to ensure
- * that they are atomic.
- */
-
-#ifndef __ASM_ARM_BITOPS_H
-#define __ASM_ARM_BITOPS_H
-
-#ifdef __KERNEL__
-
-#include <linux/compiler.h>
-#include <asm/system.h>
-
-#define smp_mb__before_clear_bit()      do { } while (0)
-#define smp_mb__after_clear_bit()       do { } while (0)
-
-/*
- * These functions are the basis of our bit ops.
- *
- * First, the atomic bitops. These use native endian.
- */
-static inline void ____atomic_set_bit(unsigned int bit, volatile unsigned long *p)
-{
-        unsigned long flags;
-        unsigned long mask = 1UL << (bit & 31);
-
-        p += bit >> 5;
-
-        local_irq_save(flags);
-        *p |= mask;
-        local_irq_restore(flags);
-}
-
-static inline void ____atomic_clear_bit(unsigned int bit, volatile unsigned long *p)
-{
-        unsigned long flags;
-        unsigned long mask = 1UL << (bit & 31);
-
-        p += bit >> 5;
-
-        local_irq_save(flags);
-        *p &= ~mask;
-        local_irq_restore(flags);
-}
-
-static inline void ____atomic_change_bit(unsigned int bit, volatile unsigned long *p)
-{
-        unsigned long flags;
-        unsigned long mask = 1UL << (bit & 31);
-
-        p += bit >> 5;
-
-        local_irq_save(flags);
-        *p ^= mask;
-        local_irq_restore(flags);
-}
-
-static inline int
-____atomic_test_and_set_bit(unsigned int bit, volatile unsigned long *p)
-{
-        unsigned long flags;
-        unsigned int res;
-        unsigned long mask = 1UL << (bit & 31);
-
-        p += bit >> 5;
-
-        local_irq_save(flags);
-        res = *p;
-        *p = res | mask;
-        local_irq_restore(flags);
-
-        return res & mask;
-}
-
-static inline int
-____atomic_test_and_clear_bit(unsigned int bit, volatile unsigned long *p)
-{
-        unsigned long flags;
-        unsigned int res;
-        unsigned long mask = 1UL << (bit & 31);
-
-        p += bit >> 5;
-
-        local_irq_save(flags);
-        res = *p;
-        *p = res & ~mask;
-        local_irq_restore(flags);
-
-        return res & mask;
-}
-
-static inline int
-____atomic_test_and_change_bit(unsigned int bit, volatile unsigned long *p)
-{
-        unsigned long flags;
-        unsigned int res;
-        unsigned long mask = 1UL << (bit & 31);
-
-        p += bit >> 5;
-
-        local_irq_save(flags);
-        res = *p;
-        *p = res ^ mask;
-        local_irq_restore(flags);
-
-        return res & mask;
-}
-
-#include <asm-generic/bitops/non-atomic.h>
-
-/*
- * Little endian assembly bitops.  nr = 0 -> byte 0 bit 0.
- */
-extern void _set_bit_le(int nr, volatile unsigned long * p);
-extern void _clear_bit_le(int nr, volatile unsigned long * p);
-extern void _change_bit_le(int nr, volatile unsigned long * p);
-extern int _test_and_set_bit_le(int nr, volatile unsigned long * p);
-extern int _test_and_clear_bit_le(int nr, volatile unsigned long * p);
-extern int _test_and_change_bit_le(int nr, volatile unsigned long * p);
-extern int _find_first_zero_bit_le(const unsigned long * p, unsigned size);
-extern int _find_next_zero_bit_le(void * p, int size, int offset);
-extern int _find_first_bit_le(const unsigned long *p, unsigned size);
-extern int _find_next_bit_le(const unsigned long *p, int size, int offset);
-
-/*
- * The __* form of bitops are non-atomic and may be reordered.
- */
-#define ATOMIC_BITOP_LE(name,nr,p)              \
-        (__builtin_constant_p(nr) ?             \
-         ____atomic_##name(nr, p) :             \
-         _##name##_le(nr,p))
-
-#define NONATOMIC_BITOP(name,nr,p)              \
-        (____nonatomic_##name(nr, p))
-
-/*
- * These are the little endian, atomic definitions.
- */
-#define set_bit(nr,p)                   ATOMIC_BITOP_LE(set_bit,nr,p)
-#define clear_bit(nr,p)                 ATOMIC_BITOP_LE(clear_bit,nr,p)
-#define change_bit(nr,p)                ATOMIC_BITOP_LE(change_bit,nr,p)
-#define test_and_set_bit(nr,p)          ATOMIC_BITOP_LE(test_and_set_bit,nr,p)
-#define test_and_clear_bit(nr,p)        ATOMIC_BITOP_LE(test_and_clear_bit,nr,p)
-#define test_and_change_bit(nr,p)       ATOMIC_BITOP_LE(test_and_change_bit,nr,p)
-#define find_first_zero_bit(p,sz)       _find_first_zero_bit_le(p,sz)
-#define find_next_zero_bit(p,sz,off)    _find_next_zero_bit_le(p,sz,off)
-#define find_first_bit(p,sz)            _find_first_bit_le(p,sz)
-#define find_next_bit(p,sz,off)         _find_next_bit_le(p,sz,off)
-
-#define WORD_BITOFF_TO_LE(x)            ((x))
-
-#include <asm-generic/bitops/ffz.h>
-#include <asm-generic/bitops/__ffs.h>
-#include <asm-generic/bitops/fls.h>
-#include <asm-generic/bitops/fls64.h>
-#include <asm-generic/bitops/ffs.h>
-#include <asm-generic/bitops/sched.h>
-#include <asm-generic/bitops/hweight.h>
-
-/*
- * Ext2 is defined to use little-endian byte ordering.
- * These do not need to be atomic.
- */
-#define ext2_set_bit(nr,p)                      \
-                __test_and_set_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
-#define ext2_set_bit_atomic(lock,nr,p)          \
-                test_and_set_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
-#define ext2_clear_bit(nr,p)                    \
-                __test_and_clear_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
-#define ext2_clear_bit_atomic(lock,nr,p)        \
-                test_and_clear_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
-#define ext2_test_bit(nr,p)                     \
-                test_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
-#define ext2_find_first_zero_bit(p,sz)          \
-                _find_first_zero_bit_le(p,sz)
-#define ext2_find_next_zero_bit(p,sz,off)       \
-                _find_next_zero_bit_le(p,sz,off)
-
-/*
- * Minix is defined to use little-endian byte ordering.
- * These do not need to be atomic.
- */
-#define minix_set_bit(nr,p)                     \
-                __set_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
-#define minix_test_bit(nr,p)                    \
-                test_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
-#define minix_test_and_set_bit(nr,p)            \
-                __test_and_set_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
-#define minix_test_and_clear_bit(nr,p)          \
-                __test_and_clear_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
-#define minix_find_first_zero_bit(p,sz)         \
-                _find_first_zero_bit_le((unsigned long *)(p),sz)
-
-#endif /* __KERNEL__ */
-
-#endif /* _ARM_BITOPS_H */
diff --git a/include/asm-arm26/bug.h b/include/asm-arm26/bug.h
deleted file mode 100644
index 8545d58b0475..000000000000
--- a/include/asm-arm26/bug.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _ASMARM_BUG_H
-#define _ASMARM_BUG_H
-
-
-#ifdef CONFIG_BUG
-#ifdef CONFIG_DEBUG_BUGVERBOSE
-extern volatile void __bug(const char *file, int line, void *data);
-/* give file/line information */
-#define BUG()           __bug(__FILE__, __LINE__, NULL)
-#else
-#define BUG()           (*(int *)0 = 0)
-#endif
-
-#define HAVE_ARCH_BUG
-#endif
-
-#include <asm-generic/bug.h>
-
-#endif
diff --git a/include/asm-arm26/bugs.h b/include/asm-arm26/bugs.h
deleted file mode 100644
index e99ac2e46d7f..000000000000
--- a/include/asm-arm26/bugs.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- *  linux/include/asm-arm26/bugs.h
- *
- *  Copyright (C) 1995  Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_BUGS_H
-#define __ASM_BUGS_H
-
-#define check_bugs() cpu_check_bugs()
-
-#endif
diff --git a/include/asm-arm26/byteorder.h b/include/asm-arm26/byteorder.h
deleted file mode 100644
index 0b4af9ac76e9..000000000000
--- a/include/asm-arm26/byteorder.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  linux/include/asm-arm/byteorder.h
- *
- * ARM Endian-ness.  In little endian mode, the data bus is connected such
- * that byte accesses appear as:
- *  0 = d0...d7, 1 = d8...d15, 2 = d16...d23, 3 = d24...d31
- * and word accesses (data or instruction) appear as:
- *  d0...d31
- *
- */
-#ifndef __ASM_ARM_BYTEORDER_H
-#define __ASM_ARM_BYTEORDER_H
-
-#include <asm/types.h>
-
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
-
-#include <linux/byteorder/little_endian.h>
-
-#endif
-
diff --git a/include/asm-arm26/cache.h b/include/asm-arm26/cache.h
deleted file mode 100644
index 8c3abcf728fe..000000000000
--- a/include/asm-arm26/cache.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- *  linux/include/asm-arm26/cache.h
- */
-#ifndef __ASMARM_CACHE_H
-#define __ASMARM_CACHE_H
-
-#define        L1_CACHE_SHIFT  5
-#define        L1_CACHE_BYTES  (1 << L1_CACHE_SHIFT)
-#define        L1_CACHE_ALIGN(x)       (((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1))
-#define        SMP_CACHE_BYTES L1_CACHE_BYTES
-
-#endif
diff --git a/include/asm-arm26/cacheflush.h b/include/asm-arm26/cacheflush.h
deleted file mode 100644
index 14ae15b6faab..000000000000
--- a/include/asm-arm26/cacheflush.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  linux/include/asm-arm/cacheflush.h
- *
- *  Copyright (C) 2000-2002 Russell King
- *  Copyright (C) 2003 Ian Molton
- *
- * 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.
- *
- * ARM26 cache 'functions'
- *
- */
-
-#ifndef _ASMARM_CACHEFLUSH_H
-#define _ASMARM_CACHEFLUSH_H
-
-#if 1     //FIXME - BAD INCLUDES!!!
-#include <linux/sched.h>
-#include <linux/mm.h>
-#endif
-
-#define flush_cache_all()                       do { } while (0)
-#define flush_cache_mm(mm)                      do { } while (0)
-#define flush_cache_dup_mm(mm)                  do { } while (0)
-#define flush_cache_range(vma,start,end)        do { } while (0)
-#define flush_cache_page(vma,vmaddr,pfn)        do { } while (0)
-#define flush_cache_vmap(start, end)            do { } while (0)
-#define flush_cache_vunmap(start, end)          do { } while (0)
-
-#define invalidate_dcache_range(start,end)      do { } while (0)
-#define clean_dcache_range(start,end)           do { } while (0)
-#define flush_dcache_range(start,end)           do { } while (0)
-#define flush_dcache_page(page)                 do { } while (0)
-#define flush_dcache_mmap_lock(mapping)         do { } while (0)
-#define flush_dcache_mmap_unlock(mapping)       do { } while (0)
-#define clean_dcache_entry(_s)                  do { } while (0)
-#define clean_cache_entry(_start)               do { } while (0)
-
-#define flush_icache_user_range(start,end, bob, fred) do { } while (0)
-#define flush_icache_range(start,end)           do { } while (0)
-#define flush_icache_page(vma,page)             do { } while (0)
-
-#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
-        memcpy(dst, src, len)
-#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
-        memcpy(dst, src, len)
-
-/* DAG: ARM3 will flush cache on MEMC updates anyway? so don't bother */
-/* IM : Yes, it will, but only if setup to do so (we do this). */
-#define clean_cache_area(_start,_size)          do { } while (0)
-
-#endif
diff --git a/include/asm-arm26/checksum.h b/include/asm-arm26/checksum.h
deleted file mode 100644
index f2b4b0a403bd..000000000000
--- a/include/asm-arm26/checksum.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *  linux/include/asm-arm/checksum.h
- *
- * IP checksum routines
- *
- * Copyright (C) Original authors of ../asm-i386/checksum.h
- * Copyright (C) 1996-1999 Russell King
- */
-#ifndef __ASM_ARM_CHECKSUM_H
-#define __ASM_ARM_CHECKSUM_H
-
-#include <linux/in6.h>
-
-/*
- * computes the checksum of a memory block at buff, length len,
- * and adds in "sum" (32-bit)
- *
- * returns a 32-bit number suitable for feeding into itself
- * or csum_tcpudp_magic
- *
- * this function must be called with even lengths, except
- * for the last fragment, which may be odd
- *
- * it's best to have buff aligned on a 32-bit boundary
- */
-__wsum csum_partial(const void *buff, int len, __wsum sum);
-
-/*
- * the same as csum_partial, but copies from src while it
- * checksums, and handles user-space pointer exceptions correctly, when needed.
- *
- * here even more important to align src and dst on a 32-bit (or even
- * better 64-bit) boundary
- */
-
-__wsum
-csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
-
-__wsum
-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
-
-/*
- *      This is a version of ip_compute_csum() optimized for IP headers,
- *      which always checksum on 4 octet boundaries.
- */
-static inline __sum16
-ip_fast_csum(const void *iph, unsigned int ihl)
-{
-        unsigned int sum, tmp1;
-
-        __asm__ __volatile__(
-        "ldr    %0, [%1], #4            @ ip_fast_csum          \n\
-        ldr     %3, [%1], #4                                    \n\
-        sub     %2, %2, #5                                      \n\
-        adds    %0, %0, %3                                      \n\
-        ldr     %3, [%1], #4                                    \n\
-        adcs    %0, %0, %3                                      \n\
-        ldr     %3, [%1], #4                                    \n\
-1:      adcs    %0, %0, %3                                      \n\
-        ldr     %3, [%1], #4                                    \n\
-        tst     %2, #15                 @ do this carefully     \n\
-        subne   %2, %2, #1              @ without destroying    \n\
-        bne     1b                      @ the carry flag        \n\
-        adcs    %0, %0, %3                                      \n\
-        adc     %0, %0, #0                                      \n\
-        adds    %0, %0, %0, lsl #16                             \n\
-        addcs   %0, %0, #0x10000                                \n\
-        mvn     %0, %0                                          \n\
-        mov     %0, %0, lsr #16"
-        : "=r" (sum), "=r" (iph), "=r" (ihl), "=r" (tmp1)
-        : "1" (iph), "2" (ihl)
-        : "cc");
-        return (__force __sum16)sum;
-}
-
-/*
- *      Fold a partial checksum without adding pseudo headers
- */
-static inline __sum16 csum_fold(__wsum sum)
-{
-        __asm__(
-        "adds   %0, %1, %1, lsl #16     @ csum_fold             \n\
-        addcs   %0, %0, #0x10000"
-        : "=r" (sum)
-        : "r" (sum)
-        : "cc");
-        return (__force __sum16)(~(__force u32)sum >> 16);
-}
-
-static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
-                   unsigned short proto, __wsum sum)
-{
-        __asm__(
-        "adds   %0, %1, %2              @ csum_tcpudp_nofold    \n\
-        adcs    %0, %0, %3                                      \n\
-        adcs    %0, %0, %4                                      \n\
-        adcs    %0, %0, %5                                      \n\
-        adc     %0, %0, #0"
-        : "=&r"(sum)
-        : "r" (sum), "r" (daddr), "r" (saddr), "r" (htons(len)), "Ir" (htons(proto))
-        : "cc");
-        return sum;
-}       
-/*
- * computes the checksum of the TCP/UDP pseudo-header
- * returns a 16-bit checksum, already complemented
- */
-static inline __sum16
-csum_tcpudp_magic(__be32 saddr, __be32 daddr, unsigned short len,
-                  unsigned short proto, __wsum sum)
-{
-        __asm__(
-        "adds   %0, %1, %2              @ csum_tcpudp_magic     \n\
-        adcs    %0, %0, %3                                      \n\
-        adcs    %0, %0, %4                                      \n\
-        adcs    %0, %0, %5                                      \n\
-        adc     %0, %0, #0                                      \n\
-        adds    %0, %0, %0, lsl #16                             \n\
-        addcs   %0, %0, #0x10000                                \n\
-        mvn     %0, %0"
-        : "=&r"(sum)
-        : "r" (sum), "r" (daddr), "r" (saddr), "r" (htons(len)), "Ir" (htons(proto))
-        : "cc");
-        return (__force __sum16)((__force u32)sum >> 16);
-}
-
-
-/*
- * this routine is used for miscellaneous IP-like checksums, mainly
- * in icmp.c
- */
-static inline __sum16
-ip_compute_csum(const void *buff, int len)
-{
-        return csum_fold(csum_partial(buff, len, 0));
-}
-
-#define _HAVE_ARCH_IPV6_CSUM
-extern __wsum
-__csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr, __be32 len,
-                __be32 proto, __wsum sum);
-
-static inline __sum16
-csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr, __u32 len,
-                unsigned short proto, __wsum sum)
-{
-        return csum_fold(__csum_ipv6_magic(saddr, daddr, htonl(len),
-                                           htonl(proto), sum));
-}
-#endif
diff --git a/include/asm-arm26/constants.h b/include/asm-arm26/constants.h
deleted file mode 100644
index 0d0b14415563..000000000000
--- a/include/asm-arm26/constants.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef __ASM_OFFSETS_H__
-#define __ASM_OFFSETS_H__
-/*
- * DO NOT MODIFY.
- *
- * This file was generated by arch/arm26/Makefile
- *
- */
-
-#define TSK_ACTIVE_MM 96 /* offsetof(struct task_struct, active_mm) */
-
-#define VMA_VM_MM 0 /* offsetof(struct vm_area_struct, vm_mm) */
-#define VMA_VM_FLAGS 20 /* offsetof(struct vm_area_struct, vm_flags) */
-
-#define VM_EXEC 4 /* VM_EXEC */
-
-
-#define PAGE_PRESENT 1 /* L_PTE_PRESENT */
-#define PAGE_READONLY 95 /* PAGE_READONLY */
-#define PAGE_NOT_USER 3 /* PAGE_NONE */
-#define PAGE_OLD 3 /* PAGE_NONE */
-#define PAGE_CLEAN 128 /* L_PTE_DIRTY */
-
-#define PAGE_SZ 32768 /* PAGE_SIZE */
-
-#define SYS_ERROR0 10420224 /* 0x9f0000 */
-
-#endif
diff --git a/include/asm-arm26/cputime.h b/include/asm-arm26/cputime.h
deleted file mode 100644
index d2783a9e47b3..000000000000
--- a/include/asm-arm26/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ARM26_CPUTIME_H
-#define __ARM26_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __ARM26_CPUTIME_H */
diff --git a/include/asm-arm26/current.h b/include/asm-arm26/current.h
deleted file mode 100644
index 75d21e2a3ff7..000000000000
--- a/include/asm-arm26/current.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _ASMARM_CURRENT_H
-#define _ASMARM_CURRENT_H
-
-#include <linux/thread_info.h>
-
-static inline struct task_struct *get_current(void) __attribute_const__;
-
-static inline struct task_struct *get_current(void)
-{
-        return current_thread_info()->task;
-}
-
-#define current (get_current())
-
-#endif /* _ASMARM_CURRENT_H */
diff --git a/include/asm-arm26/delay.h b/include/asm-arm26/delay.h
deleted file mode 100644
index 40fbf7bbe6c2..000000000000
--- a/include/asm-arm26/delay.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __ASM_ARM_DELAY_H
-#define __ASM_ARM_DELAY_H
-
-/*
- * Copyright (C) 1995 Russell King
- *
- * Delay routines, using a pre-computed "loops_per_second" value.
- */
-
-extern void __delay(int loops);
-
-/*
- * division by multiplication: you don't have to worry about
- * loss of precision.
- *
- * Use only for very small delays ( < 1 msec).  Should probably use a
- * lookup table, really, as the multiplications take much too long with
- * short delays.  This is a "reasonable" implementation, though (and the
- * first constant multiplications gets optimized away if the delay is
- * a constant)
- *
- * FIXME - lets improve it then...
- */
-extern void udelay(unsigned long usecs);
-
-static inline unsigned long muldiv(unsigned long a, unsigned long b, unsigned long c)
-{
-        return a * b / c;
-}
-
-        
-
-#endif /* defined(_ARM_DELAY_H) */
-
diff --git a/include/asm-arm26/device.h b/include/asm-arm26/device.h
deleted file mode 100644
index d8f9872b0e2d..000000000000
--- a/include/asm-arm26/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-
diff --git a/include/asm-arm26/div64.h b/include/asm-arm26/div64.h
deleted file mode 100644
index 6cd978cefb28..000000000000
--- a/include/asm-arm26/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/include/asm-arm26/dma.h b/include/asm-arm26/dma.h
deleted file mode 100644
index 4326ba85eb72..000000000000
--- a/include/asm-arm26/dma.h
+++ /dev/null
@@ -1,183 +0,0 @@
-#ifndef __ASM_ARM_DMA_H
-#define __ASM_ARM_DMA_H
-
-typedef unsigned int dmach_t;
-
-#include <linux/spinlock.h>
-#include <asm/system.h>
-#include <asm/memory.h>
-#include <asm/scatterlist.h>
-
-// FIXME - do we really need this? arm26 cant do 'proper' DMA
-
-typedef struct dma_struct dma_t;
-typedef unsigned int dmamode_t;
-
-struct dma_ops {
-        int     (*request)(dmach_t, dma_t *);           /* optional */
-        void    (*free)(dmach_t, dma_t *);              /* optional */
-        void    (*enable)(dmach_t, dma_t *);            /* mandatory */
-        void    (*disable)(dmach_t, dma_t *);           /* mandatory */
-        int     (*residue)(dmach_t, dma_t *);           /* optional */
-        int     (*setspeed)(dmach_t, dma_t *, int);     /* optional */
-        char    *type;
-};
-
-struct dma_struct {
-        struct scatterlist buf;         /* single DMA                   */
-        int             sgcount;        /* number of DMA SG             */
-        struct scatterlist *sg;         /* DMA Scatter-Gather List      */
-
-        unsigned int    active:1;       /* Transfer active              */
-        unsigned int    invalid:1;      /* Address/Count changed        */
-        unsigned int    using_sg:1;     /* using scatter list?          */
-        dmamode_t       dma_mode;       /* DMA mode                     */
-        int             speed;          /* DMA speed                    */
-
-        unsigned int    lock;           /* Device is allocated          */
-        const char      *device_id;     /* Device name                  */
-
-        unsigned int    dma_base;       /* Controller base address      */
-        int             dma_irq;        /* Controller IRQ               */
-        int             state;          /* Controller state             */
-        struct scatterlist cur_sg;      /* Current controller buffer    */
-
-        struct dma_ops  *d_ops;
-};
-
-/* Prototype: void arch_dma_init(dma)
- * Purpose  : Initialise architecture specific DMA
- * Params   : dma - pointer to array of DMA structures
- */
-extern void arch_dma_init(dma_t *dma);
-
-extern void isa_init_dma(dma_t *dma);
-
-
-#define MAX_DMA_ADDRESS         0x03000000
-#define MAX_DMA_CHANNELS        3
-
-/* ARC */
-#define DMA_VIRTUAL_FLOPPY0     0
-#define DMA_VIRTUAL_FLOPPY1     1
-#define DMA_VIRTUAL_SOUND       2
-
-/* A5K */
-#define DMA_FLOPPY              0
-
-/*
- * DMA modes
- */
-#define DMA_MODE_MASK   3
-
-#define DMA_MODE_READ    0
-#define DMA_MODE_WRITE   1
-#define DMA_MODE_CASCADE 2
-#define DMA_AUTOINIT     4
-
-extern spinlock_t  dma_spin_lock;
-
-static inline unsigned long claim_dma_lock(void)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&dma_spin_lock, flags);
-        return flags;
-}
-
-static inline void release_dma_lock(unsigned long flags)
-{
-        spin_unlock_irqrestore(&dma_spin_lock, flags);
-}
-
-/* Clear the 'DMA Pointer Flip Flop'.
- * Write 0 for LSB/MSB, 1 for MSB/LSB access.
- */
-#define clear_dma_ff(channel)
-
-/* Set only the page register bits of the transfer address.
- *
- * NOTE: This is an architecture specific function, and should
- *       be hidden from the drivers
- */
-extern void set_dma_page(dmach_t channel, char pagenr);
-
-/* Request a DMA channel
- *
- * Some architectures may need to do allocate an interrupt
- */
-extern int  request_dma(dmach_t channel, const char * device_id);
-
-/* Free a DMA channel
- *
- * Some architectures may need to do free an interrupt
- */
-extern void free_dma(dmach_t channel);
-
-/* Enable DMA for this channel
- *
- * On some architectures, this may have other side effects like
- * enabling an interrupt and setting the DMA registers.
- */
-extern void enable_dma(dmach_t channel);
-
-/* Disable DMA for this channel
- *
- * On some architectures, this may have other side effects like
- * disabling an interrupt or whatever.
- */
-extern void disable_dma(dmach_t channel);
-
-/* Test whether the specified channel has an active DMA transfer
- */
-extern int dma_channel_active(dmach_t channel);
-
-/* Set the DMA scatter gather list for this channel
- *
- * This should not be called if a DMA channel is enabled,
- * especially since some DMA architectures don't update the
- * DMA address immediately, but defer it to the enable_dma().
- */
-extern void set_dma_sg(dmach_t channel, struct scatterlist *sg, int nr_sg);
-
-/* Set the DMA address for this channel
- *
- * This should not be called if a DMA channel is enabled,
- * especially since some DMA architectures don't update the
- * DMA address immediately, but defer it to the enable_dma().
- */
-extern void set_dma_addr(dmach_t channel, unsigned long physaddr);
-
-/* Set the DMA byte count for this channel
- *
- * This should not be called if a DMA channel is enabled,
- * especially since some DMA architectures don't update the
- * DMA count immediately, but defer it to the enable_dma().
- */
-extern void set_dma_count(dmach_t channel, unsigned long count);
-
-/* Set the transfer direction for this channel
- *
- * This should not be called if a DMA channel is enabled,
- * especially since some DMA architectures don't update the
- * DMA transfer direction immediately, but defer it to the
- * enable_dma().
- */
-extern void set_dma_mode(dmach_t channel, dmamode_t mode);
-
-/* Set the transfer speed for this channel
- */
-extern void set_dma_speed(dmach_t channel, int cycle_ns);
-
-/* Get DMA residue count. After a DMA transfer, this
- * should return zero. Reading this while a DMA transfer is
- * still in progress will return unpredictable results.
- * If called before the channel has been used, it may return 1.
- * Otherwise, it returns the number of _bytes_ left to transfer.
- */
-extern int  get_dma_residue(dmach_t channel);
-
-#ifndef NO_DMA
-#define NO_DMA  255
-#endif
-
-#endif /* _ARM_DMA_H */
diff --git a/include/asm-arm26/ecard.h b/include/asm-arm26/ecard.h
deleted file mode 100644
index 66691939c3c1..000000000000
--- a/include/asm-arm26/ecard.h
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * linux/include/asm-arm26/ecard.h
- *
- * definitions for expansion cards
- *
- * This is a new system as from Linux 1.2.3
- *
- * Changelog:
- *  11-12-1996  RMK     Further minor improvements
- *  12-09-1997  RMK     Added interrupt enable/disable for card level
- *  18-05-2003  IM      Adjusted for ARM26
- *
- * Reference: Acorns Risc OS 3 Programmers Reference Manuals.
- */
-
-#ifndef __ASM_ECARD_H
-#define __ASM_ECARD_H
-
-/*
- * Currently understood cards (but not necessarily
- * supported):
- *                        Manufacturer  Product ID
- */
-#define MANU_ACORN              0x0000
-#define PROD_ACORN_SCSI                 0x0002
-#define PROD_ACORN_ETHER1               0x0003
-#define PROD_ACORN_MFM                  0x000b
-
-#define MANU_CCONCEPTS          0x0009
-#define PROD_CCONCEPTS_COLOURCARD       0x0050
-
-#define MANU_ANT2               0x0011
-#define PROD_ANT_ETHER3                 0x00a4
-
-#define MANU_ATOMWIDE           0x0017
-#define PROD_ATOMWIDE_3PSERIAL          0x0090
-
-#define MANU_IRLAM_INSTRUMENTS  0x001f
-#define MANU_IRLAM_INSTRUMENTS_ETHERN   0x5678
-
-#define MANU_OAK                0x0021
-#define PROD_OAK_SCSI                   0x0058
-
-#define MANU_MORLEY             0x002b
-#define PROD_MORLEY_SCSI_UNCACHED       0x0067
-
-#define MANU_CUMANA             0x003a
-#define PROD_CUMANA_SCSI_2              0x003a
-#define PROD_CUMANA_SCSI_1              0x00a0
-
-#define MANU_ICS                0x003c
-#define PROD_ICS_IDE                    0x00ae
-
-#define MANU_ICS2               0x003d
-#define PROD_ICS2_IDE                   0x00ae
-
-#define MANU_SERPORT            0x003f
-#define PROD_SERPORT_DSPORT             0x00b9
-
-#define MANU_ARXE               0x0041
-#define PROD_ARXE_SCSI                  0x00be
-
-#define MANU_I3                 0x0046
-#define PROD_I3_ETHERLAN500             0x00d4
-#define PROD_I3_ETHERLAN600             0x00ec
-#define PROD_I3_ETHERLAN600A            0x011e
-
-#define MANU_ANT                0x0053
-#define PROD_ANT_ETHERM                 0x00d8
-#define PROD_ANT_ETHERB                 0x00e4
-
-#define MANU_ALSYSTEMS          0x005b
-#define PROD_ALSYS_SCSIATAPI            0x0107
-
-#define MANU_MCS                0x0063
-#define PROD_MCS_CONNECT32              0x0125
-
-#define MANU_EESOX              0x0064
-#define PROD_EESOX_SCSI2                0x008c
-
-#define MANU_YELLOWSTONE        0x0096
-#define PROD_YELLOWSTONE_RAPIDE32       0x0120
-
-#define MANU_SIMTEC             0x005f
-#define PROD_SIMTEC_IDE8                0x0130
-#define PROD_SIMTEC_IDE16               0x0131
-
-
-#ifdef ECARD_C
-#define CONST
-#else
-#define CONST const
-#endif
-
-#define MAX_ECARDS      4
-
-typedef enum {                          /* Cards address space          */
-        ECARD_IOC,
-        ECARD_MEMC,
-        ECARD_EASI
-} card_type_t;
-
-typedef enum {                          /* Speed for ECARD_IOC space    */
-        ECARD_SLOW       = 0,
-        ECARD_MEDIUM     = 1,
-        ECARD_FAST       = 2,
-        ECARD_SYNC       = 3
-} card_speed_t;
-
-struct ecard_id {                       /* Card ID structure            */
-        unsigned short  manufacturer;
-        unsigned short  product;
-        void            *data;
-};
-
-struct in_ecid {                        /* Packed card ID information   */
-        unsigned short  product;        /* Product code                 */
-        unsigned short  manufacturer;   /* Manufacturer code            */
-        unsigned char   id:4;           /* Simple ID                    */
-        unsigned char   cd:1;           /* Chunk dir present            */
-        unsigned char   is:1;           /* Interrupt status pointers    */
-        unsigned char   w:2;            /* Width                        */
-        unsigned char   country;        /* Country                      */
-        unsigned char   irqmask;        /* IRQ mask                     */
-        unsigned char   fiqmask;        /* FIQ mask                     */
-        unsigned long   irqoff;         /* IRQ offset                   */
-        unsigned long   fiqoff;         /* FIQ offset                   */
-};
-
-typedef struct expansion_card ecard_t;
-typedef unsigned long *loader_t;
-
-typedef struct {                        /* Card handler routines        */
-        void (*irqenable)(ecard_t *ec, int irqnr);
-        void (*irqdisable)(ecard_t *ec, int irqnr);
-        int  (*irqpending)(ecard_t *ec);
-        void (*fiqenable)(ecard_t *ec, int fiqnr);
-        void (*fiqdisable)(ecard_t *ec, int fiqnr);
-        int  (*fiqpending)(ecard_t *ec);
-} expansioncard_ops_t;
-
-#define ECARD_NUM_RESOURCES     (6)
-
-#define ECARD_RES_IOCSLOW       (0)
-#define ECARD_RES_IOCMEDIUM     (1)
-#define ECARD_RES_IOCFAST       (2)
-#define ECARD_RES_IOCSYNC       (3)
-#define ECARD_RES_MEMC          (4)
-#define ECARD_RES_EASI          (5)
-
-#define ecard_resource_start(ec,nr)     ((ec)->resource[nr].start)
-#define ecard_resource_end(ec,nr)       ((ec)->resource[nr].end)
-#define ecard_resource_len(ec,nr)       ((ec)->resource[nr].end - \
-                                         (ec)->resource[nr].start + 1)
-
-/*
- * This contains all the info needed on an expansion card
- */
-struct expansion_card {
-        struct expansion_card  *next;
-
-        struct device           dev;
-        struct resource         resource[ECARD_NUM_RESOURCES];
-
-        /* Public data */
-        volatile unsigned char *irqaddr;     /* address of IRQ register */
-        volatile unsigned char *fiqaddr;     /* address of FIQ register */
-        unsigned char           irqmask;     /* IRQ mask */
-        unsigned char           fiqmask;     /* FIQ mask */
-        unsigned char           claimed;     /* Card claimed? */
-
-        void                    *irq_data;   /* Data for use for IRQ by card */
-        void                    *fiq_data;   /* Data for use for FIQ by card */
-        const expansioncard_ops_t *ops;      /* Enable/Disable Ops for card */
-
-        CONST unsigned int      slot_no;     /* Slot number */
-        CONST unsigned int      dma;         /* DMA number (for request_dma) */
-        CONST unsigned int      irq;         /* IRQ number (for request_irq) */
-        CONST unsigned int      fiq;         /* FIQ number (for request_irq) */
-        CONST card_type_t       type;        /* Type of card */
-        CONST struct in_ecid    cid;         /* Card Identification */
-
-        /* Private internal data */
-        const char              *card_desc;  /* Card description */
-        CONST unsigned int      podaddr;     /* Base Linux address for card */
-        CONST loader_t          loader;      /* loader program */
-        u64                     dma_mask;
-};
-
-struct in_chunk_dir {
-        unsigned int start_offset;
-        union {
-                unsigned char string[256];
-                unsigned char data[1];
-        } d;
-};
-
-/*
- * ecard_claim: claim an expansion card entry
- * FIXME - are these atomic / called with interrupts off ?
- */
-#define ecard_claim(ec) ((ec)->claimed = 1)
-
-/*
- * ecard_release: release an expansion card entry
- */
-#define ecard_release(ec) ((ec)->claimed = 0)
-
-/*
- * Read a chunk from an expansion card
- * cd : where to put read data
- * ec : expansion card info struct
- * id : id number to find
- * num: (n+1)'th id to find.
- */
-extern int ecard_readchunk (struct in_chunk_dir *cd, struct expansion_card *ec, int id, int num);
-
-/*
- * Obtain the address of a card
- */
-extern unsigned int ecard_address (struct expansion_card *ec, card_type_t card_type, card_speed_t speed);
-
-#ifdef ECARD_C
-/* Definitions internal to ecard.c - for it's use only!!
- *
- * External expansion card header as read from the card
- */
-struct ex_ecid {
-        unsigned char   r_irq:1;
-        unsigned char   r_zero:1;
-        unsigned char   r_fiq:1;
-        unsigned char   r_id:4;
-        unsigned char   r_a:1;
-
-        unsigned char   r_cd:1;
-        unsigned char   r_is:1;
-        unsigned char   r_w:2;
-        unsigned char   r_r1:4;
-
-        unsigned char   r_r2:8;
-
-        unsigned char   r_prod[2];
-
-        unsigned char   r_manu[2];
-
-        unsigned char   r_country;
-
-        unsigned char   r_irqmask;
-        unsigned char   r_irqoff[3];
-
-        unsigned char   r_fiqmask;
-        unsigned char   r_fiqoff[3];
-};
-
-/*
- * Chunk directory entry as read from the card
- */
-struct ex_chunk_dir {
-        unsigned char r_id;
-        unsigned char r_len[3];
-        unsigned long r_start;
-        union {
-                char string[256];
-                char data[1];
-        } d;
-#define c_id(x)         ((x)->r_id)
-#define c_len(x)        ((x)->r_len[0]|((x)->r_len[1]<<8)|((x)->r_len[2]<<16))
-#define c_start(x)      ((x)->r_start)
-};
-
-#endif
-
-extern struct bus_type ecard_bus_type;
-
-#define ECARD_DEV(_d)   container_of((_d), struct expansion_card, dev)
-
-struct ecard_driver {
-        int                     (*probe)(struct expansion_card *, const struct ecard_id *id);
-        void                    (*remove)(struct expansion_card *);
-        void                    (*shutdown)(struct expansion_card *);
-        const struct ecard_id   *id_table;
-        unsigned int            id;
-        struct device_driver    drv;
-};
-
-#define ECARD_DRV(_d)   container_of((_d), struct ecard_driver, drv)
-
-#define ecard_set_drvdata(ec,data)      dev_set_drvdata(&(ec)->dev, (data))
-#define ecard_get_drvdata(ec)           dev_get_drvdata(&(ec)->dev)
-
-int ecard_register_driver(struct ecard_driver *);
-void ecard_remove_driver(struct ecard_driver *);
-
-#endif
diff --git a/include/asm-arm26/elf.h b/include/asm-arm26/elf.h
deleted file mode 100644
index 5a47fdb3015d..000000000000
--- a/include/asm-arm26/elf.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef __ASMARM_ELF_H
-#define __ASMARM_ELF_H
-
-/*
- * ELF register definitions..
- */
-
-#include <asm/ptrace.h>
-#include <asm/procinfo.h>
-
-//FIXME - is it always 32K ?
-
-#define ELF_EXEC_PAGESIZE       32768
-#define SET_PERSONALITY(ex,ibcs2) set_personality(PER_LINUX)
-
-typedef unsigned long elf_greg_t;
-typedef unsigned long elf_freg_t[3];
-
-#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-
-typedef struct { void *null; } elf_fpregset_t;
-
-/*
- * This is used to ensure we don't load something for the wrong architecture.
- * We can only execute 26-bit code.
- */
-
-#define EM_ARM  40
-#define EF_ARM_APCS26 0x08
-
-//#define elf_check_arch(x) ( ((x)->e_machine == EM_ARM) && ((x)->e_flags & EF_ARM_APCS26) )      FIXME!!!!! - this looks OK, but the flags seem to be wrong.
-#define elf_check_arch(x) (1)
-
-/*
- * These are used to set parameters in the core dumps.
- */
-#define ELF_CLASS       ELFCLASS32
-#define ELF_DATA        ELFDATA2LSB
-#define ELF_ARCH        EM_ARM
-
-#define USE_ELF_CORE_DUMP
-
-/* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
-   use of this is to invoke "./ld.so someprog" to test out a new version of
-   the loader.  We need to make sure that it is out of the way of the program
-   that it will "exec", and that there is sufficient room for the brk.  */
-
-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
-
-/* When the program starts, a1 contains a pointer to a function to be 
-   registered with atexit, as per the SVR4 ABI.  A value of 0 means we 
-   have no such handler.  */
-#define ELF_PLAT_INIT(_r, load_addr)    (_r)->ARM_r0 = 0
-
-/* This yields a mask that user programs can use to figure out what
-   instruction set this cpu supports. */
-
-extern unsigned int elf_hwcap;
-#define ELF_HWCAP       (elf_hwcap)
-
-/* This yields a string that ld.so will use to load implementation
-   specific libraries for optimization.  This is more specific in
-   intent than poking at uname or /proc/cpuinfo. */
-
-/* For now we just provide a fairly general string that describes the
-   processor family.  This could be made more specific later if someone
-   implemented optimisations that require it.  26-bit CPUs give you
-   "v1l" for ARM2 (no SWP) and "v2l" for anything else (ARM1 isn't
-   supported).
- */
-
-#define ELF_PLATFORM_SIZE 8
-extern char elf_platform[];
-#define ELF_PLATFORM    (elf_platform)
-
-#endif
diff --git a/include/asm-arm26/emergency-restart.h b/include/asm-arm26/emergency-restart.h
deleted file mode 100644
index 108d8c48e42e..000000000000
--- a/include/asm-arm26/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/include/asm-arm26/errno.h b/include/asm-arm26/errno.h
deleted file mode 100644
index 6e60f0612bb6..000000000000
--- a/include/asm-arm26/errno.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ARM_ERRNO_H
-#define _ARM_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif
diff --git a/include/asm-arm26/fb.h b/include/asm-arm26/fb.h
deleted file mode 100644
index c7df38030992..000000000000
--- a/include/asm-arm26/fb.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_FB_H_
-#define _ASM_FB_H_
-#include <linux/fb.h>
-
-#define fb_pgprotect(...) do {} while (0)
-
-static inline int fb_is_primary_device(struct fb_info *info)
-{
-        return 0;
-}
-
-#endif /* _ASM_FB_H_ */
diff --git a/include/asm-arm26/fcntl.h b/include/asm-arm26/fcntl.h
deleted file mode 100644
index d85995e7459e..000000000000
--- a/include/asm-arm26/fcntl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _ARM_FCNTL_H
-#define _ARM_FCNTL_H
-
-/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
-   located on an ext2 file system */
-#define O_DIRECTORY      040000 /* must be a directory */
-#define O_NOFOLLOW      0100000 /* don't follow links */
-#define O_DIRECT        0200000 /* direct disk access hint - currently ignored */
-#define O_LARGEFILE     0400000
-
-#include <asm-generic/fcntl.h>
-
-#endif
diff --git a/include/asm-arm26/fiq.h b/include/asm-arm26/fiq.h
deleted file mode 100644
index a3bad09e825c..000000000000
--- a/include/asm-arm26/fiq.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  linux/include/asm-arm/fiq.h
- *
- * Support for FIQ on ARM architectures.
- * Written by Philip Blundell <philb@gnu.org>, 1998
- * Re-written by Russell King
- */
-
-#ifndef __ASM_FIQ_H
-#define __ASM_FIQ_H
-
-#include <asm/ptrace.h>
-
-struct fiq_handler {
-        struct fiq_handler *next;
-        /* Name
-         */
-        const char *name;
-        /* Called to ask driver to relinquish/
-         * reacquire FIQ
-         * return zero to accept, or -<errno>
-         */
-        int (*fiq_op)(void *, int relinquish);
-        /* data for the relinquish/reacquire functions
-         */
-        void *dev_id;
-};
-
-extern int claim_fiq(struct fiq_handler *f);
-extern void release_fiq(struct fiq_handler *f);
-extern void set_fiq_handler(void *start, unsigned int length);
-extern void set_fiq_regs(struct pt_regs *regs);
-extern void get_fiq_regs(struct pt_regs *regs);
-extern void enable_fiq(int fiq);
-extern void disable_fiq(int fiq);
-
-#endif
diff --git a/include/asm-arm26/floppy.h b/include/asm-arm26/floppy.h
deleted file mode 100644
index efb732165a4f..000000000000
--- a/include/asm-arm26/floppy.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *  linux/include/asm-arm/floppy.h
- *
- *  Copyright (C) 1996-2000 Russell King
- *
- * 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.
- *
- *  Note that we don't touch FLOPPY_DMA nor FLOPPY_IRQ here
- */
-#ifndef __ASM_ARM_FLOPPY_H
-#define __ASM_ARM_FLOPPY_H
-
-#define fd_outb(val,port)                       \
-        do {                                    \
-                if ((port) == FD_DOR)           \
-                        fd_setdor((val));       \
-                else                            \
-                        outb((val),(port));     \
-        } while(0)
-
-#define fd_inb(port)            inb((port))
-#define fd_request_irq()        request_irq(IRQ_FLOPPYDISK,floppy_interrupt,\
-                                        IRQF_DISABLED,"floppy",NULL)
-#define fd_free_irq()           free_irq(IRQ_FLOPPYDISK,NULL)
-#define fd_disable_irq()        disable_irq(IRQ_FLOPPYDISK)
-#define fd_enable_irq()         enable_irq(IRQ_FLOPPYDISK)
-
-#define fd_request_dma()        request_dma(DMA_FLOPPY,"floppy")
-#define fd_free_dma()           free_dma(DMA_FLOPPY)
-#define fd_disable_dma()        disable_dma(DMA_FLOPPY)
-#define fd_enable_dma()         enable_dma(DMA_FLOPPY)
-#define fd_clear_dma_ff()       clear_dma_ff(DMA_FLOPPY)
-#define fd_set_dma_mode(mode)   set_dma_mode(DMA_FLOPPY, (mode))
-#define fd_set_dma_addr(addr)   set_dma_addr(DMA_FLOPPY, virt_to_bus((addr)))
-#define fd_set_dma_count(len)   set_dma_count(DMA_FLOPPY, (len))
-#define fd_cacheflush(addr,sz)
-
-/* need to clean up dma.h */
-#define DMA_FLOPPYDISK          DMA_FLOPPY
-
-/* Floppy_selects is the list of DOR's to select drive fd
- *
- * On initialisation, the floppy list is scanned, and the drives allocated
- * in the order that they are found.  This is done by seeking the drive
- * to a non-zero track, and then restoring it to track 0.  If an error occurs,
- * then there is no floppy drive present.       [to be put back in again]
- */
-static unsigned char floppy_selects[2][4] =
-{
-        { 0x10, 0x21, 0x23, 0x33 },
-        { 0x10, 0x21, 0x23, 0x33 }
-};
-
-#define fd_setdor(dor)                                                          \
-do {                                                                            \
-        int new_dor = (dor);                                                    \
-        if (new_dor & 0xf0)                                                     \
-                new_dor = (new_dor & 0x0c) | floppy_selects[fdc][new_dor & 3];  \
-        else                                                                    \
-                new_dor &= 0x0c;                                                \
-        outb(new_dor, FD_DOR);                                                  \
-} while (0)
-
-/*
- * Someday, we'll automatically detect which drives are present...
- */
-static inline void fd_scandrives (void)
-{
-#if 0
-        int floppy, drive_count;
-
-        fd_disable_irq();
-        raw_cmd = &default_raw_cmd;
-        raw_cmd->flags = FD_RAW_SPIN | FD_RAW_NEED_SEEK;
-        raw_cmd->track = 0;
-        raw_cmd->rate = ?;
-        drive_count = 0;
-        for (floppy = 0; floppy < 4; floppy ++) {
-                current_drive = drive_count;
-                /*
-                 * Turn on floppy motor
-                 */
-                if (start_motor(redo_fd_request))
-                        continue;
-                /*
-                 * Set up FDC
-                 */
-                fdc_specify();
-                /*
-                 * Tell FDC to recalibrate
-                 */
-                output_byte(FD_RECALIBRATE);
-                LAST_OUT(UNIT(floppy));
-                /* wait for command to complete */
-                if (!successful) {
-                        int i;
-                        for (i = drive_count; i < 3; i--)
-                                floppy_selects[fdc][i] = floppy_selects[fdc][i + 1];
-                        floppy_selects[fdc][3] = 0;
-                        floppy -= 1;
-                } else
-                        drive_count++;
-        }
-#else
-        floppy_selects[0][0] = 0x10;
-        floppy_selects[0][1] = 0x21;
-        floppy_selects[0][2] = 0x23;
-        floppy_selects[0][3] = 0x33;
-#endif
-}
-
-#define FDC1 (0x3f0)
-
-#define FLOPPY0_TYPE 4
-#define FLOPPY1_TYPE 4
-
-#define N_FDC 1
-#define N_DRIVE 4
-
-#define FLOPPY_MOTOR_MASK 0xf0
-
-#define CROSS_64KB(a,s) (0)
-
-/*
- * This allows people to reverse the order of
- * fd0 and fd1, in case their hardware is
- * strangely connected (as some RiscPCs
- * and A5000s seem to be).
- */
-static void driveswap(int *ints, int dummy, int dummy2)
-{
-        floppy_selects[0][0] ^= floppy_selects[0][1];
-        floppy_selects[0][1] ^= floppy_selects[0][0];
-        floppy_selects[0][0] ^= floppy_selects[0][1];
-}
-
-#define EXTRA_FLOPPY_PARAMS ,{ "driveswap", &driveswap, NULL, 0, 0 }
-        
-#endif
diff --git a/include/asm-arm26/fpstate.h b/include/asm-arm26/fpstate.h
deleted file mode 100644
index 785749b3c5ab..000000000000
--- a/include/asm-arm26/fpstate.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  linux/include/asm-arm/fpstate.h
- *
- *  Copyright (C) 1995 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __ASM_ARM_FPSTATE_H
-#define __ASM_ARM_FPSTATE_H
-
-#define FP_SIZE 35
-
-struct fp_hard_struct {
-        unsigned int save[FP_SIZE];             /* as yet undefined */
-};
-
-struct fp_soft_struct {
-        unsigned int save[FP_SIZE];             /* undefined information */
-};
-
-union fp_state {
-        struct fp_hard_struct   hard;
-        struct fp_soft_struct   soft;
-};
-
-#endif
diff --git a/include/asm-arm26/futex.h b/include/asm-arm26/futex.h
deleted file mode 100644
index 6a332a9f099c..000000000000
--- a/include/asm-arm26/futex.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_FUTEX_H
-#define _ASM_FUTEX_H
-
-#include <asm-generic/futex.h>
-
-#endif
diff --git a/include/asm-arm26/hardirq.h b/include/asm-arm26/hardirq.h
deleted file mode 100644
index e717742ffce0..000000000000
--- a/include/asm-arm26/hardirq.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __ASM_HARDIRQ_H
-#define __ASM_HARDIRQ_H
-
-#include <linux/cache.h>
-#include <linux/threads.h>
-#include <asm/irq.h>
-
-typedef struct {
-        unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h>  /* Standard mappings for irq_cpustat_t above */
-
-#define HARDIRQ_BITS    8
-
-/*
- * The hardirq mask has to be large enough to have space
- * for potentially all IRQ sources in the system nesting
- * on a single CPU:
- */
-#if (1 << HARDIRQ_BITS) < NR_IRQS
-# error HARDIRQ_BITS is too low!
-#endif
-
-#ifndef CONFIG_SMP
-
-extern asmlinkage void __do_softirq(void);
-
-#endif
-
-
-#endif /* __ASM_HARDIRQ_H */
diff --git a/include/asm-arm26/hardware.h b/include/asm-arm26/hardware.h
deleted file mode 100644
index 801df0bde8b7..000000000000
--- a/include/asm-arm26/hardware.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *  linux/include/asm-arm/arch-arc/hardware.h
- *
- *  Copyright (C) 1996-1999 Russell King.
- *
- * 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 file contains the hardware definitions of the
- *  Acorn Archimedes/A5000 machines.
- *
- *  Modifications:
- *   04-04-1998 PJB/RMK Merged arc and a5k versions
- */
-#ifndef __ASM_HARDWARE_H
-#define __ASM_HARDWARE_H
-
-
-
-/*
- * What hardware must be present - these can be tested by the kernel
- * source.
- */
-#define HAS_IOC
-#define HAS_MEMC
-#define HAS_VIDC
-
-#define VDMA_ALIGNMENT  PAGE_SIZE
-#define VDMA_XFERSIZE   16
-#define VDMA_INIT       0
-#define VDMA_START      1
-#define VDMA_END        2
-
-#ifndef __ASSEMBLY__
-extern void memc_write(unsigned int reg, unsigned long val);
-
-#define video_set_dma(start,end,offset)                         \
-do {                                                            \
-        memc_write (VDMA_START, (start >> 2));                  \
-        memc_write (VDMA_END, (end - VDMA_XFERSIZE) >> 2);      \
-        memc_write (VDMA_INIT, (offset >> 2));                  \
-} while (0)
-#endif
-
-
-/* Hardware addresses of major areas.
- *  *_START is the physical address
- *  *_SIZE  is the size of the region
- *  *_BASE  is the virtual address
- */
-#define IO_START                0x03000000
-#define IO_SIZE                 0x01000000
-#define IO_BASE                 0x03000000
-
-/*
- * Screen mapping information
- */
-#define SCREEN_START            0x02000000
-#define SCREEN_END              0x02078000
-#define SCREEN_SIZE             0x00078000
-#define SCREEN_BASE             0x02000000
-
-
-#define EXPMASK_BASE            0x03360000
-#define IOEB_BASE               0x03350000
-#define VIDC_BASE               0x03400000
-#define LATCHA_BASE             0x03250040
-#define LATCHB_BASE             0x03250018
-#define IOC_BASE                0x03200000
-#define FLOPPYDMA_BASE          0x0302a000
-#define PCIO_BASE               0x03010000
-
-// FIXME - are the below correct?
-#define PODSLOT_IOC0_BASE       0x03240000
-#define PODSLOT_IOC_SIZE        (1 << 14)
-#define PODSLOT_MEMC_BASE       0x03000000
-#define PODSLOT_MEMC_SIZE       (1 << 14)
-
-#define vidc_writel(val)        __raw_writel(val, VIDC_BASE)
-
-#ifndef __ASSEMBLY__
-
-/*
- * for use with inb/outb
- */
-#define IOEB_VID_CTL            (IOEB_BASE + 0x48)
-#define IOEB_PRESENT            (IOEB_BASE + 0x50)
-#define IOEB_PSCLR              (IOEB_BASE + 0x58)
-#define IOEB_MONTYPE            (IOEB_BASE + 0x70)
-
-//FIXME - These adresses are weird - ISTR some weirdo address shifting stuff was going on here...
-#define IO_EC_IOC_BASE          0x80090000
-#define IO_EC_MEMC_BASE         0x80000000
-
-#ifdef CONFIG_ARCH_ARC
-/* A680 hardware */
-#define WD1973_BASE             0x03290000
-#define WD1973_LATCH            0x03350000
-#define Z8530_BASE              0x032b0008
-#define SCSI_BASE               0x03100000
-#endif
-
-#endif
-
-#define EXPMASK_STATUS          (EXPMASK_BASE + 0x00)
-#define EXPMASK_ENABLE          (EXPMASK_BASE + 0x04)
-
-#endif
diff --git a/include/asm-arm26/ide.h b/include/asm-arm26/ide.h
deleted file mode 100644
index db804d751df9..000000000000
--- a/include/asm-arm26/ide.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  linux/include/asm-arm/ide.h
- *
- *  Copyright (C) 1994-1996  Linus Torvalds & authors
- */
-
-/*
- *  This file contains the i386 architecture specific IDE code.
- */
-
-#ifndef __ASMARM_IDE_H
-#define __ASMARM_IDE_H
-
-#ifdef __KERNEL__
-
-#ifndef MAX_HWIFS
-#define MAX_HWIFS       4
-#endif
-
-#include <asm/irq.h>
-#include <asm/mach-types.h>
-
-/* JMA 18.05.03 these will never be needed, but the kernel needs them to compile */
-#define __ide_mm_insw(port,addr,len)    readsw(port,addr,len)
-#define __ide_mm_insl(port,addr,len)    readsl(port,addr,len)
-#define __ide_mm_outsw(port,addr,len)   writesw(port,addr,len)
-#define __ide_mm_outsl(port,addr,len)   writesl(port,addr,len)
-
-#define IDE_ARCH_OBSOLETE_INIT
-#define ide_default_io_ctl(base)        (0)
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASMARM_IDE_H */
diff --git a/include/asm-arm26/io.h b/include/asm-arm26/io.h
deleted file mode 100644
index a5a7a4d5e09c..000000000000
--- a/include/asm-arm26/io.h
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- *  linux/include/asm-arm/io.h
- *
- *  Copyright (C) 1996-2000 Russell King
- *
- * 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.
- *
- * Modifications:
- *  16-Sep-1996 RMK     Inlined the inx/outx functions & optimised for both
- *                      constant addresses and variable addresses.
- *  04-Dec-1997 RMK     Moved a lot of this stuff to the new architecture
- *                      specific IO header files.
- *  27-Mar-1999 PJB     Second parameter of memcpy_toio is const..
- *  04-Apr-1999 PJB     Added check_signature.
- *  12-Dec-1999 RMK     More cleanups
- *  18-Jun-2000 RMK     Removed virt_to_* and friends definitions
- */
-#ifndef __ASM_ARM_IO_H
-#define __ASM_ARM_IO_H
-
-#ifdef __KERNEL__
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-#include <asm/memory.h>
-#include <asm/hardware.h>
-
-/*
- * Generic IO read/write.  These perform native-endian accesses.  Note
- * that some architectures will want to re-define __raw_{read,write}w.
- */
-extern void __raw_writesb(unsigned int addr, const void *data, int bytelen);
-extern void __raw_writesw(unsigned int addr, const void *data, int wordlen);
-extern void __raw_writesl(unsigned int addr, const void *data, int longlen);
-
-extern void __raw_readsb(unsigned int addr, void *data, int bytelen);
-extern void __raw_readsw(unsigned int addr, void *data, int wordlen);
-extern void __raw_readsl(unsigned int addr, void *data, int longlen);
-
-#define __raw_writeb(v,a)       (*(volatile unsigned char  *)(a) = (v))
-#define __raw_writew(v,a)       (*(volatile unsigned short *)(a) = (v))
-#define __raw_writel(v,a)       (*(volatile unsigned int   *)(a) = (v))
-
-#define __raw_readb(a)          (*(volatile unsigned char  *)(a))
-#define __raw_readw(a)          (*(volatile unsigned short *)(a))
-#define __raw_readl(a)          (*(volatile unsigned int   *)(a))
-
-
-/*
- * Bad read/write accesses...
- */
-extern void __readwrite_bug(const char *fn);
-
-/*
- * Now, pick up the machine-defined IO definitions
- */
-
-#define IO_SPACE_LIMIT 0xffffffff
-
-/*
- * GCC is totally crap at loading/storing data.  We try to persuade it
- * to do the right thing by using these whereever possible instead of
- * the above.
- */
-#define __arch_base_getb(b,o)                   \
- ({                                             \
-        unsigned int v, r = (b);                \
-        __asm__ __volatile__(                   \
-                "ldrb   %0, [%1, %2]"           \
-                : "=r" (v)                      \
-                : "r" (r), "Ir" (o));           \
-        v;                                      \
- })
-
-#define __arch_base_getl(b,o)                   \
- ({                                             \
-        unsigned int v, r = (b);                \
-        __asm__ __volatile__(                   \
-                "ldr    %0, [%1, %2]"           \
-                : "=r" (v)                      \
-                : "r" (r), "Ir" (o));           \
-        v;                                      \
- })
-
-#define __arch_base_putb(v,b,o)                 \
- ({                                             \
-        unsigned int r = (b);                   \
-        __asm__ __volatile__(                   \
-                "strb   %0, [%1, %2]"           \
-                :                               \
-                : "r" (v), "r" (r), "Ir" (o));  \
- })
-
-#define __arch_base_putl(v,b,o)                 \
- ({                                             \
-        unsigned int r = (b);                   \
-        __asm__ __volatile__(                   \
-                "str    %0, [%1, %2]"           \
-                :                               \
-                : "r" (v), "r" (r), "Ir" (o));  \
- })
-
-/*
- * We use two different types of addressing - PC style addresses, and ARM
- * addresses.  PC style accesses the PC hardware with the normal PC IO
- * addresses, eg 0x3f8 for serial#1.  ARM addresses are 0x80000000+
- * and are translated to the start of IO.  Note that all addresses are
- * shifted left!
- */
-#define __PORT_PCIO(x)  (!((x) & 0x80000000))
-
-/*
- * Dynamic IO functions - let the compiler
- * optimize the expressions
- */
-static inline void __outb (unsigned int value, unsigned int port)
-{
-        unsigned long temp;
-        __asm__ __volatile__(
-        "tst    %2, #0x80000000\n\t"
-        "mov    %0, %4\n\t"
-        "addeq  %0, %0, %3\n\t"
-        "strb   %1, [%0, %2, lsl #2]    @ outb"
-        : "=&r" (temp)
-        : "r" (value), "r" (port), "Ir" (PCIO_BASE - IO_BASE), "Ir" (IO_BASE)
-        : "cc");
-}
-
-static inline void __outw (unsigned int value, unsigned int port)
-{
-        unsigned long temp;
-        __asm__ __volatile__(
-        "tst    %2, #0x80000000\n\t"
-        "mov    %0, %4\n\t"
-        "addeq  %0, %0, %3\n\t"
-        "str    %1, [%0, %2, lsl #2]    @ outw"
-        : "=&r" (temp)
-        : "r" (value|value<<16), "r" (port), "Ir" (PCIO_BASE - IO_BASE), "Ir" (IO_BASE)
-        : "cc");
-}
-
-static inline void __outl (unsigned int value, unsigned int port)
-{
-        unsigned long temp;
-        __asm__ __volatile__(
-        "tst    %2, #0x80000000\n\t"
-        "mov    %0, %4\n\t"
-        "addeq  %0, %0, %3\n\t"
-        "str    %1, [%0, %2, lsl #2]    @ outl"
-        : "=&r" (temp)
-        : "r" (value), "r" (port), "Ir" (PCIO_BASE - IO_BASE), "Ir" (IO_BASE)
-        : "cc");
-}
-
-#define DECLARE_DYN_IN(sz,fnsuffix,instr)                                       \
-static inline unsigned sz __in##fnsuffix (unsigned int port)            \
-{                                                                               \
-        unsigned long temp, value;                                              \
-        __asm__ __volatile__(                                                   \
-        "tst    %2, #0x80000000\n\t"                                            \
-        "mov    %0, %4\n\t"                                                     \
-        "addeq  %0, %0, %3\n\t"                                                 \
-        "ldr" instr "   %1, [%0, %2, lsl #2]    @ in" #fnsuffix                 \
-        : "=&r" (temp), "=r" (value)                                            \
-        : "r" (port), "Ir" (PCIO_BASE - IO_BASE), "Ir" (IO_BASE)                \
-        : "cc");                                                                \
-        return (unsigned sz)value;                                              \
-}
-
-static inline unsigned int __ioaddr (unsigned int port)                 \
-{                                                                               \
-        if (__PORT_PCIO(port))                                                  \
-                return (unsigned int)(PCIO_BASE + (port << 2));                 \
-        else                                                                    \
-                return (unsigned int)(IO_BASE + (port << 2));                   \
-}
-
-#define DECLARE_IO(sz,fnsuffix,instr)   \
-        DECLARE_DYN_IN(sz,fnsuffix,instr)
-
-DECLARE_IO(char,b,"b")
-DECLARE_IO(short,w,"")
-DECLARE_IO(int,l,"")
-
-#undef DECLARE_IO
-#undef DECLARE_DYN_IN
-
-/*
- * Constant address IO functions
- *
- * These have to be macros for the 'J' constraint to work -
- * +/-4096 immediate operand.
- */
-#define __outbc(value,port)                                                     \
-({                                                                              \
-        if (__PORT_PCIO((port)))                                                \
-                __asm__ __volatile__(                                           \
-                "strb   %0, [%1, %2]    @ outbc"                                \
-                : : "r" (value), "r" (PCIO_BASE), "Jr" ((port) << 2));          \
-        else                                                                    \
-                __asm__ __volatile__(                                           \
-                "strb   %0, [%1, %2]    @ outbc"                                \
-                : : "r" (value), "r" (IO_BASE), "r" ((port) << 2));             \
-})
-
-#define __inbc(port)                                                            \
-({                                                                              \
-        unsigned char result;                                                   \
-        if (__PORT_PCIO((port)))                                                \
-                __asm__ __volatile__(                                           \
-                "ldrb   %0, [%1, %2]    @ inbc"                                 \
-                : "=r" (result) : "r" (PCIO_BASE), "Jr" ((port) << 2));         \
-        else                                                                    \
-                __asm__ __volatile__(                                           \
-                "ldrb   %0, [%1, %2]    @ inbc"                                 \
-                : "=r" (result) : "r" (IO_BASE), "r" ((port) << 2));            \
-        result;                                                                 \
-})
-
-#define __outwc(value,port)                                                     \
-({                                                                              \
-        unsigned long v = value;                                                \
-        if (__PORT_PCIO((port)))                                                \
-                __asm__ __volatile__(                                           \
-                "str    %0, [%1, %2]    @ outwc"                                \
-                : : "r" (v|v<<16), "r" (PCIO_BASE), "Jr" ((port) << 2));        \
-        else                                                                    \
-                __asm__ __volatile__(                                           \
-                "str    %0, [%1, %2]    @ outwc"                                \
-                : : "r" (v|v<<16), "r" (IO_BASE), "r" ((port) << 2));           \
-})
-
-#define __inwc(port)                                                            \
-({                                                                              \
-        unsigned short result;                                                  \
-        if (__PORT_PCIO((port)))                                                \
-                __asm__ __volatile__(                                           \
-                "ldr    %0, [%1, %2]    @ inwc"                                 \
-                : "=r" (result) : "r" (PCIO_BASE), "Jr" ((port) << 2));         \
-        else                                                                    \
-                __asm__ __volatile__(                                           \
-                "ldr    %0, [%1, %2]    @ inwc"                                 \
-                : "=r" (result) : "r" (IO_BASE), "r" ((port) << 2));            \
-        result & 0xffff;                                                        \
-})
-
-#define __outlc(value,port)                                                     \
-({                                                                              \
-        unsigned long v = value;                                                \
-        if (__PORT_PCIO((port)))                                                \
-                __asm__ __volatile__(                                           \
-                "str    %0, [%1, %2]    @ outlc"                                \
-                : : "r" (v), "r" (PCIO_BASE), "Jr" ((port) << 2));              \
-        else                                                                    \
-                __asm__ __volatile__(                                           \
-                "str    %0, [%1, %2]    @ outlc"                                \
-                : : "r" (v), "r" (IO_BASE), "r" ((port) << 2));                 \
-})
-
-#define __inlc(port)                                                            \
-({                                                                              \
-        unsigned long result;                                                   \
-        if (__PORT_PCIO((port)))                                                \
-                __asm__ __volatile__(                                           \
-                "ldr    %0, [%1, %2]    @ inlc"                                 \
-                : "=r" (result) : "r" (PCIO_BASE), "Jr" ((port) << 2));         \
-        else                                                                    \
-                __asm__ __volatile__(                                           \
-                "ldr    %0, [%1, %2]    @ inlc"                                 \
-                : "=r" (result) : "r" (IO_BASE), "r" ((port) << 2));            \
-        result;                                                                 \
-})
-
-#define __ioaddrc(port)                                                         \
-({                                                                              \
-        unsigned long addr;                                                     \
-        if (__PORT_PCIO((port)))                                                \
-                addr = PCIO_BASE + ((port) << 2);                               \
-        else                                                                    \
-                addr = IO_BASE + ((port) << 2);                                 \
-        addr;                                                                   \
-})
-
-#define inb(p)          (__builtin_constant_p((p)) ? __inbc(p)    : __inb(p))
-#define inw(p)          (__builtin_constant_p((p)) ? __inwc(p)    : __inw(p))
-#define inl(p)          (__builtin_constant_p((p)) ? __inlc(p)    : __inl(p))
-#define outb(v,p)       (__builtin_constant_p((p)) ? __outbc(v,p) : __outb(v,p))
-#define outw(v,p)       (__builtin_constant_p((p)) ? __outwc(v,p) : __outw(v,p))
-#define outl(v,p)       (__builtin_constant_p((p)) ? __outlc(v,p) : __outl(v,p))
-#define __ioaddr(p)     (__builtin_constant_p((p)) ? __ioaddr(p)  : __ioaddrc(p))
-
-/* JMA 18.02.03 added sb,sl from arm/io.h, changing io to ioaddr */
-
-#define outsb(p,d,l)            __raw_writesb(__ioaddr(p),d,l)
-#define outsw(p,d,l)            __raw_writesw(__ioaddr(p),d,l)
-#define outsl(p,d,l)            __raw_writesl(__ioaddr(p),d,l)
-
-#define insb(p,d,l)             __raw_readsb(__ioaddr(p),d,l)
-#define insw(p,d,l)             __raw_readsw(__ioaddr(p),d,l)
-#define insl(p,d,l)             __raw_readsl(__ioaddr(p),d,l)
-
-#define insw(p,d,l)     __raw_readsw(__ioaddr(p),d,l)
-#define outsw(p,d,l)    __raw_writesw(__ioaddr(p),d,l)
-
-#define readb(c)                        (__readwrite_bug("readb"),0)
-#define readw(c)                        (__readwrite_bug("readw"),0)
-#define readl(c)                        (__readwrite_bug("readl"),0)
-#define readb_relaxed(addr)             readb(addr)
-#define readw_relaxed(addr)             readw(addr)
-#define readl_relaxed(addr)             readl(addr)
-#define writeb(v,c)                     __readwrite_bug("writeb")
-#define writew(v,c)                     __readwrite_bug("writew")
-#define writel(v,c)                     __readwrite_bug("writel")
-
-#define readsw(p,d,l)                 (__readwrite_bug("readsw"),0)
-#define readsl(p,d,l)                 (__readwrite_bug("readsl"),0)
-#define writesw(p,d,l)                        __readwrite_bug("writesw")
-#define writesl(p,d,l)                        __readwrite_bug("writesl")
-
-#define mmiowb()
-
-/* the following macro is deprecated */
-#define ioaddr(port)                    __ioaddr((port))
-
-/*
- * No ioremap support here.
- */
-#define __arch_ioremap(c,s,f,a)   ((void *)(c))
-#define __arch_iounmap(c)       do { }  while (0)
-
-
-#if defined(__arch_putb) || defined(__arch_putw) || defined(__arch_putl) || \
-    defined(__arch_getb) || defined(__arch_getw) || defined(__arch_getl)
-#warning machine class uses old __arch_putw or __arch_getw
-#endif
-
-/*
- *  IO port access primitives
- *  -------------------------
- *
- * The ARM doesn't have special IO access instructions; all IO is memory
- * mapped.  Note that these are defined to perform little endian accesses
- * only.  Their primary purpose is to access PCI and ISA peripherals.
- *
- * Note that for a big endian machine, this implies that the following
- * big endian mode connectivity is in place, as described by numerious
- * ARM documents:
- *
- *    PCI:  D0-D7   D8-D15 D16-D23 D24-D31
- *    ARM: D24-D31 D16-D23  D8-D15  D0-D7
- *
- * The machine specific io.h include defines __io to translate an "IO"
- * address to a memory address.
- *
- * Note that we prevent GCC re-ordering or caching values in expressions
- * by introducing sequence points into the in*() definitions.  Note that
- * __raw_* do not guarantee this behaviour.
- */
-/*
-#define outsb(p,d,l)            __raw_writesb(__io(p),d,l)
-#define outsw(p,d,l)            __raw_writesw(__io(p),d,l)
-
-#define insb(p,d,l)             __raw_readsb(__io(p),d,l)
-#define insw(p,d,l)             __raw_readsw(__io(p),d,l)
-*/
-#define outb_p(val,port)        outb((val),(port))
-#define outw_p(val,port)        outw((val),(port))
-#define inb_p(port)             inb((port))
-#define inw_p(port)             inw((port))
-#define inl_p(port)             inl((port))
-
-#define outsb_p(port,from,len)  outsb(port,from,len)
-#define outsw_p(port,from,len)  outsw(port,from,len)
-#define insb_p(port,to,len)     insb(port,to,len)
-#define insw_p(port,to,len)     insw(port,to,len)
-
-/*
- * String version of IO memory access ops:
- */
-extern void _memcpy_fromio(void *, unsigned long, size_t);
-extern void _memcpy_toio(unsigned long, const void *, size_t);
-extern void _memset_io(unsigned long, int, size_t);
-
-/*
- * ioremap and friends.
- *
- * ioremap takes a PCI memory address, as specified in
- * Documentation/IO-mapping.txt.
- */
-extern void * __ioremap(unsigned long, size_t, unsigned long, unsigned long);
-extern void __iounmap(void *addr);
-
-#ifndef __arch_ioremap
-#define ioremap(cookie,size)            __ioremap(cookie,size,0,1)
-#define ioremap_nocache(cookie,size)    __ioremap(cookie,size,0,1)
-#define iounmap(cookie)                 __iounmap(cookie)
-#else
-#define ioremap(cookie,size)            __arch_ioremap((cookie),(size),0,1)
-#define ioremap_nocache(cookie,size)    __arch_ioremap((cookie),(size),0,1)
-#define iounmap(cookie)                 __arch_iounmap(cookie)
-#endif
-
-/*
- * DMA-consistent mapping functions.  These allocate/free a region of
- * uncached, unwrite-buffered mapped memory space for use with DMA
- * devices.  This is the "generic" version.  The PCI specific version
- * is in pci.h
- */
-extern void *consistent_alloc(int gfp, size_t size, dma_addr_t *handle);
-extern void consistent_free(void *vaddr, size_t size, dma_addr_t handle);
-extern void consistent_sync(void *vaddr, size_t size, int rw);
-
-/*
- * can the hardware map this into one segment or not, given no other
- * constraints.
- */
-#define BIOVEC_MERGEABLE(vec1, vec2)    \
-        ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2)))
-
-/*
- * Convert a physical pointer to a virtual kernel pointer for /dev/mem
- * access
- */
-#define xlate_dev_mem_ptr(p)    __va(p)
-
-/*
- * Convert a virtual cached pointer to an uncached pointer
- */
-#define xlate_dev_kmem_ptr(p)   p
-
-#endif  /* __KERNEL__ */
-#endif  /* __ASM_ARM_IO_H */
diff --git a/include/asm-arm26/ioc.h b/include/asm-arm26/ioc.h
deleted file mode 100644
index b3b46ef65943..000000000000
--- a/include/asm-arm26/ioc.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  linux/include/asm-arm/hardware/ioc.h
- *
- *  Copyright (C) Russell King
- *
- * 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.
- *
- *  Use these macros to read/write the IOC.  All it does is perform the actual
- *  read/write.
- */
-#ifndef __ASMARM_HARDWARE_IOC_H
-#define __ASMARM_HARDWARE_IOC_H
-
-#ifndef __ASSEMBLY__
-
-/*
- * We use __raw_base variants here so that we give the compiler the
- * chance to keep IOC_BASE in a register.
- */
-#define ioc_readb(off)          __raw_readb(IOC_BASE + (off))
-#define ioc_writeb(val,off)     __raw_writeb(val, IOC_BASE + (off))
-
-#endif
-
-#define IOC_CONTROL     (0x00)
-#define IOC_KARTTX      (0x04)
-#define IOC_KARTRX      (0x04)
-
-#define IOC_IRQSTATA    (0x10)
-#define IOC_IRQREQA     (0x14)
-#define IOC_IRQCLRA     (0x14)
-#define IOC_IRQMASKA    (0x18)
-
-#define IOC_IRQSTATB    (0x20)
-#define IOC_IRQREQB     (0x24)
-#define IOC_IRQMASKB    (0x28)
-
-#define IOC_FIQSTAT     (0x30)
-#define IOC_FIQREQ      (0x34)
-#define IOC_FIQMASK     (0x38)
-
-#define IOC_T0CNTL      (0x40)
-#define IOC_T0LTCHL     (0x40)
-#define IOC_T0CNTH      (0x44)
-#define IOC_T0LTCHH     (0x44)
-#define IOC_T0GO        (0x48)
-#define IOC_T0LATCH     (0x4c)
-
-#define IOC_T1CNTL      (0x50)
-#define IOC_T1LTCHL     (0x50)
-#define IOC_T1CNTH      (0x54)
-#define IOC_T1LTCHH     (0x54)
-#define IOC_T1GO        (0x58)
-#define IOC_T1LATCH     (0x5c)
-
-#define IOC_T2CNTL      (0x60)
-#define IOC_T2LTCHL     (0x60)
-#define IOC_T2CNTH      (0x64)
-#define IOC_T2LTCHH     (0x64)
-#define IOC_T2GO        (0x68)
-#define IOC_T2LATCH     (0x6c)
-
-#define IOC_T3CNTL      (0x70)
-#define IOC_T3LTCHL     (0x70)
-#define IOC_T3CNTH      (0x74)
-#define IOC_T3LTCHH     (0x74)
-#define IOC_T3GO        (0x78)
-#define IOC_T3LATCH     (0x7c)
-
-#endif
diff --git a/include/asm-arm26/ioctl.h b/include/asm-arm26/ioctl.h
deleted file mode 100644
index b279fe06dfe5..000000000000
--- a/include/asm-arm26/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/include/asm-arm26/ioctls.h b/include/asm-arm26/ioctls.h
deleted file mode 100644
index 8a3296200be1..000000000000
--- a/include/asm-arm26/ioctls.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef __ASM_ARM_IOCTLS_H
-#define __ASM_ARM_IOCTLS_H
-
-#include <asm/ioctl.h>
-
-/* 0x54 is just a magic number to make these relatively unique ('T') */
-
-#define TCGETS          0x5401
-#define TCSETS          0x5402
-#define TCSETSW         0x5403
-#define TCSETSF         0x5404
-#define TCGETA          0x5405
-#define TCSETA          0x5406
-#define TCSETAW         0x5407
-#define TCSETAF         0x5408
-#define TCSBRK          0x5409
-#define TCXONC          0x540A
-#define TCFLSH          0x540B
-#define TIOCEXCL        0x540C
-#define TIOCNXCL        0x540D
-#define TIOCSCTTY       0x540E
-#define TIOCGPGRP       0x540F
-#define TIOCSPGRP       0x5410
-#define TIOCOUTQ        0x5411
-#define TIOCSTI         0x5412
-#define TIOCGWINSZ      0x5413
-#define TIOCSWINSZ      0x5414
-#define TIOCMGET        0x5415
-#define TIOCMBIS        0x5416
-#define TIOCMBIC        0x5417
-#define TIOCMSET        0x5418
-#define TIOCGSOFTCAR    0x5419
-#define TIOCSSOFTCAR    0x541A
-#define FIONREAD        0x541B
-#define TIOCINQ         FIONREAD
-#define TIOCLINUX       0x541C
-#define TIOCCONS        0x541D
-#define TIOCGSERIAL     0x541E
-#define TIOCSSERIAL     0x541F
-#define TIOCPKT         0x5420
-#define FIONBIO         0x5421
-#define TIOCNOTTY       0x5422
-#define TIOCSETD        0x5423
-#define TIOCGETD        0x5424
-#define TCSBRKP         0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT  0x5426  /* For debugging only */
-#define TIOCSBRK        0x5427  /* BSD compatibility */
-#define TIOCCBRK        0x5428  /* BSD compatibility */
-#define TIOCGSID        0x5429  /* Return the session ID of FD */
-#define TCGETS2         _IOR('T',0x2A, struct termios2)
-#define TCSETS2         _IOW('T',0x2B, struct termios2)
-#define TCSETSW2        _IOW('T',0x2C, struct termios2)
-#define TCSETSF2        _IOW('T',0x2D, struct termios2)
-#define TIOCGPTN        _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
-#define TIOCSPTLCK      _IOW('T',0x31, int)  /* Lock/unlock Pty */
-
-#define FIONCLEX        0x5450  /* these numbers need to be adjusted. */
-#define FIOCLEX         0x5451
-#define FIOASYNC        0x5452
-#define TIOCSERCONFIG   0x5453
-#define TIOCSERGWILD    0x5454
-#define TIOCSERSWILD    0x5455
-#define TIOCGLCKTRMIOS  0x5456
-#define TIOCSLCKTRMIOS  0x5457
-#define TIOCSERGSTRUCT  0x5458 /* For debugging only */
-#define TIOCSERGETLSR   0x5459 /* Get line status register */
-#define TIOCSERGETMULTI 0x545A /* Get multiport config  */
-#define TIOCSERSETMULTI 0x545B /* Set multiport config */
-
-#define TIOCMIWAIT      0x545C  /* wait for a change on serial input line(s) */
-#define TIOCGICOUNT     0x545D  /* read serial port inline interrupt counts */
-#define FIOQSIZE        0x545E
-
-/* Used for packet mode */
-#define TIOCPKT_DATA             0
-#define TIOCPKT_FLUSHREAD        1
-#define TIOCPKT_FLUSHWRITE       2
-#define TIOCPKT_STOP             4
-#define TIOCPKT_START            8
-#define TIOCPKT_NOSTOP          16
-#define TIOCPKT_DOSTOP          32
-
-#define TIOCSER_TEMT    0x01    /* Transmitter physically empty */
-
-#endif
diff --git a/include/asm-arm26/ipc.h b/include/asm-arm26/ipc.h
deleted file mode 100644
index a46e3d9c2a3f..000000000000
--- a/include/asm-arm26/ipc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
diff --git a/include/asm-arm26/ipcbuf.h b/include/asm-arm26/ipcbuf.h
deleted file mode 100644
index 97683975f7df..000000000000
--- a/include/asm-arm26/ipcbuf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __ASMARM_IPCBUF_H
-#define __ASMARM_IPCBUF_H
-
-/*
- * The ipc64_perm structure for arm architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 32-bit mode_t and seq
- * - 2 miscellaneous 32-bit values
- */
-
-struct ipc64_perm
-{
-        __kernel_key_t          key;
-        __kernel_uid32_t        uid;
-        __kernel_gid32_t        gid;
-        __kernel_uid32_t        cuid;
-        __kernel_gid32_t        cgid;
-        __kernel_mode_t         mode;
-        unsigned short          __pad1;
-        unsigned short          seq;
-        unsigned short          __pad2;
-        unsigned long           __unused1;
-        unsigned long           __unused2;
-};
-
-#endif /* __ASMARM_IPCBUF_H */
diff --git a/include/asm-arm26/irq.h b/include/asm-arm26/irq.h
deleted file mode 100644
index 52971b49ed3b..000000000000
--- a/include/asm-arm26/irq.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef __ASM_ARM_IRQ_H
-#define __ASM_ARM_IRQ_H
-
-#include <asm/sysirq.h>
-
-#ifndef NR_IRQS
-#define NR_IRQS 128
-#endif
-
-
-/* JMA 18.05.02 Copied off arch/arm/irq.h */
-#ifndef irq_canonicalize
-#define irq_canonicalize(i)     (i)
-#endif
-
-
-/*
- * Use this value to indicate lack of interrupt
- * capability
- */
-#ifndef NO_IRQ
-#define NO_IRQ  ((unsigned int)(-1))
-#endif
-
-struct irqaction;
-
-#define __IRQT_FALEDGE  (1 << 0)
-#define __IRQT_RISEDGE  (1 << 1)
-#define __IRQT_LOWLVL   (1 << 2)
-#define __IRQT_HIGHLVL  (1 << 3)
-
-#define IRQT_NOEDGE     (0)
-#define IRQT_RISING     (__IRQT_RISEDGE)
-#define IRQT_FALLING    (__IRQT_FALEDGE)
-#define IRQT_BOTHEDGE   (__IRQT_RISEDGE|__IRQT_FALEDGE)
-#define IRQT_LOW        (__IRQT_LOWLVL)
-#define IRQT_HIGH       (__IRQT_HIGHLVL)
-#define IRQT_PROBE      (1 << 4)
-
-int set_irq_type(unsigned int irq, unsigned int type);
-
-#endif
-
diff --git a/include/asm-arm26/irqchip.h b/include/asm-arm26/irqchip.h
deleted file mode 100644
index 6a007a954098..000000000000
--- a/include/asm-arm26/irqchip.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *  linux/include/asm-arm/mach/irq.h
- *
- *  Copyright (C) 1995-2000 Russell King.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_ARM_MACH_IRQ_H
-#define __ASM_ARM_MACH_IRQ_H
-
-struct irqdesc;
-struct pt_regs;
-struct seq_file;
-
-typedef void (*irq_handler_t)(unsigned int, struct irqdesc *, struct pt_regs *);
-typedef void (*irq_control_t)(unsigned int);
-
-struct irqchip {
-        /*
-         * Acknowledge the IRQ.
-         * If this is a level-based IRQ, then it is expected to mask the IRQ
-         * as well.
-         */
-        void (*ack)(unsigned int);
-        /*
-         * Mask the IRQ in hardware.
-         */
-        void (*mask)(unsigned int);
-        /*
-         * Unmask the IRQ in hardware.
-         */
-        void (*unmask)(unsigned int);
-        /*
-         * Re-run the IRQ
-         */
-        void (*rerun)(unsigned int);
-        /*
-         * Set the type of the IRQ.
-         */
-        int (*type)(unsigned int, unsigned int);
-};
-
-struct irqdesc {
-        irq_handler_t   handle;
-        struct irqchip  *chip;
-        struct irqaction *action;
-
-        unsigned int    enabled  : 1;           /* IRQ is currently enabled   */
-        unsigned int    triggered: 1;           /* IRQ has occurred           */
-        unsigned int    running  : 1;           /* IRQ is running             */
-        unsigned int    pending  : 1;           /* IRQ is pending             */
-        unsigned int    probing  : 1;           /* IRQ in use for a probe     */
-        unsigned int    probe_ok : 1;           /* IRQ can be used for probe  */
-        unsigned int    valid    : 1;           /* IRQ claimable              */
-        unsigned int    noautoenable : 1;       /* don't automatically enable IRQ */
-        unsigned int    unused   :23;
-        unsigned int    depth;                  /* disable depth              */
-
-        /*
-         * IRQ lock detection
-         */
-        unsigned int    lck_cnt;
-        unsigned int    lck_pc;
-        unsigned int    lck_jif;
-};
-
-extern struct irqdesc irq_desc[];
-
-/*
- * This is internal.  Do not use it.
- */
-extern void (*init_arch_irq)(void);
-extern void init_FIQ(void);
-extern int show_fiq_list(struct seq_file *, void *);
-void __set_irq_handler(unsigned int irq, irq_handler_t, int);
-
-/*
- * External stuff.
- */
-#define set_irq_handler(irq,handler)            __set_irq_handler(irq,handler,0)
-#define set_irq_chained_handler(irq,handler)    __set_irq_handler(irq,handler,1)
-
-void set_irq_chip(unsigned int irq, struct irqchip *);
-void set_irq_flags(unsigned int irq, unsigned int flags);
-
-#define IRQF_VALID      (1 << 0)
-#define IRQF_PROBE      (1 << 1)
-#define IRQF_NOAUTOEN   (1 << 2)
-
-/*
- * Built-in IRQ handlers.
- */
-void do_level_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs);
-void do_edge_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs);
-void do_simple_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs);
-void do_bad_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs);
-void dummy_mask_unmask_irq(unsigned int irq);
-
-#endif
diff --git a/include/asm-arm26/kdebug.h b/include/asm-arm26/kdebug.h
deleted file mode 100644
index 6ece1b037665..000000000000
--- a/include/asm-arm26/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kdebug.h>
diff --git a/include/asm-arm26/kmap_types.h b/include/asm-arm26/kmap_types.h
deleted file mode 100644
index d5da712b723c..000000000000
--- a/include/asm-arm26/kmap_types.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __ARM_KMAP_TYPES_H
-#define __ARM_KMAP_TYPES_H
-
-/*
- * This is the "bare minimum".  AIO seems to require this.
- */
-enum km_type {
-        KM_IRQ0,
-        KM_USER1
-};
-
-#endif
diff --git a/include/asm-arm26/leds.h b/include/asm-arm26/leds.h
deleted file mode 100644
index 12290ea55801..000000000000
--- a/include/asm-arm26/leds.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  linux/include/asm-arm/leds.h
- *
- *  Copyright (C) 1998 Russell King
- *
- * 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.
- *
- *  Event-driven interface for LEDs on machines
- *  Added led_start and led_stop- Alex Holden, 28th Dec 1998.
- */
-#ifndef ASM_ARM_LEDS_H
-#define ASM_ARM_LEDS_H
-
-
-typedef enum {
-        led_idle_start,
-        led_idle_end,
-        led_timer,
-        led_start,
-        led_stop,
-        led_claim,              /* override idle & timer leds */
-        led_release,            /* restore idle & timer leds */
-        led_start_timer_mode,
-        led_stop_timer_mode,
-        led_green_on,
-        led_green_off,
-        led_amber_on,
-        led_amber_off,
-        led_red_on,
-        led_red_off,
-        led_blue_on,
-        led_blue_off,
-        /*
-         * I want this between led_timer and led_start, but
-         * someone has decided to export this to user space
-         */
-        led_halted
-} led_event_t;
-
-/* Use this routine to handle LEDs */
-
-#ifdef CONFIG_LEDS
-extern void (*leds_event)(led_event_t);
-#else
-#define leds_event(e)
-#endif
-
-#endif
diff --git a/include/asm-arm26/limits.h b/include/asm-arm26/limits.h
deleted file mode 100644
index 08d8c6600804..000000000000
--- a/include/asm-arm26/limits.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __ASM_PIPE_H
-#define __ASM_PIPE_H
-
-#ifndef PAGE_SIZE
-#include <asm/page.h>
-#endif
-
-#define PIPE_BUF        PAGE_SIZE
-
-#endif
-
diff --git a/include/asm-arm26/linkage.h b/include/asm-arm26/linkage.h
deleted file mode 100644
index dbe4b4e31a5b..000000000000
--- a/include/asm-arm26/linkage.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_LINKAGE_H
-#define __ASM_LINKAGE_H
-
-#define __ALIGN .align 0
-#define __ALIGN_STR ".align 0"
-
-#endif
diff --git a/include/asm-arm26/local.h b/include/asm-arm26/local.h
deleted file mode 100644
index 6759e9183cef..000000000000
--- a/include/asm-arm26/local.h
+++ /dev/null
@@ -1,2 +0,0 @@
-//FIXME - nicked from arm32 - check it is correct...
-#include <asm-generic/local.h>
diff --git a/include/asm-arm26/locks.h b/include/asm-arm26/locks.h
deleted file mode 100644
index 81b3bda2ed00..000000000000
--- a/include/asm-arm26/locks.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- *  linux/include/asm-arm/proc-armo/locks.h
- *
- *  Copyright (C) 2000 Russell King
- *  Fixes for 26 bit machines, (C) 2000 Dave Gilbert
- *
- * 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.
- *
- *  Interrupt safe locking assembler. 
- */
-#ifndef __ASM_PROC_LOCKS_H
-#define __ASM_PROC_LOCKS_H
-
-/* Decrements by 1, fails if value < 0 */
-#define __down_op(ptr,fail)                     \
-        ({                                      \
-        __asm__ __volatile__ (                  \
-        "@ atomic down operation\n"             \
-"       mov     ip, pc\n"                       \
-"       orr     lr, ip, #0x08000000\n"          \
-"       teqp    lr, #0\n"                       \
-"       ldr     lr, [%0]\n"                     \
-"       and     ip, ip, #0x0c000003\n"          \
-"       subs    lr, lr, #1\n"                   \
-"       str     lr, [%0]\n"                     \
-"       orrmi   ip, ip, #0x80000000     @ set N\n" \
-"       teqp    ip, #0\n"                       \
-"       movmi   ip, %0\n"                       \
-"       blmi    " #fail                         \
-        :                                       \
-        : "r" (ptr)                             \
-        : "ip", "lr", "cc");                    \
-        })
-
-#define __down_op_ret(ptr,fail)                 \
-        ({                                      \
-                unsigned int result;            \
-        __asm__ __volatile__ (                  \
-"       @ down_op_ret\n"                        \
-"       mov     ip, pc\n"                       \
-"       orr     lr, ip, #0x08000000\n"          \
-"       teqp    lr, #0\n"                       \
-"       ldr     lr, [%1]\n"                     \
-"       and     ip, ip, #0x0c000003\n"          \
-"       subs    lr, lr, #1\n"                   \
-"       str     lr, [%1]\n"                     \
-"       orrmi   ip, ip, #0x80000000     @ set N\n" \
-"       teqp    ip, #0\n"                       \
-"       movmi   ip, %1\n"                       \
-"       movpl   ip, #0\n"                       \
-"       blmi    " #fail "\n"                    \
-"       mov     %0, ip"                         \
-        : "=&r" (result)                        \
-        : "r" (ptr)                             \
-        : "ip", "lr", "cc");                    \
-        result;                                 \
-        })
-
-#define __up_op(ptr,wake)                       \
-        ({                                      \
-        __asm__ __volatile__ (                  \
-        "@ up_op\n"                             \
-"       mov     ip, pc\n"                       \
-"       orr     lr, ip, #0x08000000\n"          \
-"       teqp    lr, #0\n"                       \
-"       ldr     lr, [%0]\n"                     \
-"       and     ip, ip, #0x0c000003\n"          \
-"       adds    lr, lr, #1\n"                   \
-"       str     lr, [%0]\n"                     \
-"       orrle   ip, ip, #0x80000000     @ set N - should this be mi ??? DAG ! \n" \
-"       teqp    ip, #0\n"                       \
-"       movmi   ip, %0\n"                       \
-"       blmi    " #wake                         \
-        :                                       \
-        : "r" (ptr)                             \
-        : "ip", "lr", "cc");                    \
-        })
-
-/*
- * The value 0x01000000 supports up to 128 processors and
- * lots of processes.  BIAS must be chosen such that sub'ing
- * BIAS once per CPU will result in the long remaining
- * negative.
- */
-#define RW_LOCK_BIAS      0x01000000
-#define RW_LOCK_BIAS_STR "0x01000000"
-
-/* Decrements by RW_LOCK_BIAS rather than 1, fails if value != 0 */
-#define __down_op_write(ptr,fail)               \
-        ({                                      \
-        __asm__ __volatile__(                   \
-        "@ down_op_write\n"                     \
-"       mov     ip, pc\n"                       \
-"       orr     lr, ip, #0x08000000\n"          \
-"       teqp    lr, #0\n"                       \
-"       and     ip, ip, #0x0c000003\n"          \
-\
-"       ldr     lr, [%0]\n"                     \
-"       subs    lr, lr, %1\n"                   \
-"       str     lr, [%0]\n"                     \
-\
-" orreq ip, ip, #0x40000000 @ set Z \n"\
-"       teqp    ip, #0\n"                       \
-"       movne   ip, %0\n"                       \
-"       blne    " #fail                         \
-        :                                       \
-        : "r" (ptr), "I" (RW_LOCK_BIAS)         \
-        : "ip", "lr", "cc");                    \
-        })
-
-/* Increments by RW_LOCK_BIAS, wakes if value >= 0 */
-#define __up_op_write(ptr,wake)                 \
-        ({                                      \
-        __asm__ __volatile__(                   \
-        "@ up_op_read\n"                        \
-"       mov     ip, pc\n"                       \
-"       orr     lr, ip, #0x08000000\n"          \
-"       teqp    lr, #0\n"                       \
-\
-"       ldr     lr, [%0]\n"                     \
-"       and     ip, ip, #0x0c000003\n"          \
-"       adds    lr, lr, %1\n"                   \
-"       str     lr, [%0]\n"                     \
-\
-" orrcs ip, ip, #0x20000000 @ set C\n" \
-"       teqp    ip, #0\n"                       \
-"       movcs   ip, %0\n"                       \
-"       blcs    " #wake                         \
-        :                                       \
-        : "r" (ptr), "I" (RW_LOCK_BIAS)         \
-        : "ip", "lr", "cc");                    \
-        })
-
-#define __down_op_read(ptr,fail)                \
-        __down_op(ptr, fail)
-
-#define __up_op_read(ptr,wake)                  \
-        ({                                      \
-        __asm__ __volatile__(                   \
-        "@ up_op_read\n"                        \
-"       mov     ip, pc\n"                       \
-"       orr     lr, ip, #0x08000000\n"          \
-"       teqp    lr, #0\n"                       \
-\
-"       ldr     lr, [%0]\n"                     \
-"       and     ip, ip, #0x0c000003\n"          \
-"       adds    lr, lr, %1\n"                   \
-"       str     lr, [%0]\n"                     \
-\
-" orreq ip, ip, #0x40000000 @ Set Z \n" \
-"       teqp    ip, #0\n"                       \
-"       moveq   ip, %0\n"                       \
-"       bleq    " #wake                         \
-        :                                       \
-        : "r" (ptr), "I" (1)                    \
-        : "ip", "lr", "cc");                    \
-        })
-
-#endif
diff --git a/include/asm-arm26/mach-types.h b/include/asm-arm26/mach-types.h
deleted file mode 100644
index 0aeaedcbac96..000000000000
--- a/include/asm-arm26/mach-types.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Unlike ARM32 this is NOT automatically generated. DONT delete it
- * Instead, consider FIXME-ing it so its auto-detected.
- */
-
-#ifndef __ASM_ARM_MACH_TYPE_H
-#define __ASM_ARM_MACH_TYPE_H
-
-
-#ifndef __ASSEMBLY__
-extern unsigned int __machine_arch_type;
-#endif
-
-#define MACH_TYPE_ARCHIMEDES           10
-#define MACH_TYPE_A5K                  11
-
-#ifdef CONFIG_ARCH_ARC
-# define machine_arch_type              MACH_TYPE_ARCHIMEDES
-# define machine_is_archimedes()        (machine_arch_type == MACH_TYPE_ARCHIMEDES)
-#else
-# define machine_is_archimedes()        (0)
-#endif
-
-#ifdef CONFIG_ARCH_A5K
-# define machine_arch_type              MACH_TYPE_A5K
-# define machine_is_a5k()               (machine_arch_type == MACH_TYPE_A5K)
-#else
-# define machine_is_a5k()       (0)
-#endif
-
-#ifndef machine_arch_type
-#error Unknown machine type
-#define machine_arch_type       __machine_arch_type
-#endif
-
-#endif
diff --git a/include/asm-arm26/map.h b/include/asm-arm26/map.h
deleted file mode 100644
index 6e12a7fa5c5d..000000000000
--- a/include/asm-arm26/map.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  linux/include/asm-arm/map.h
- *
- *  Copyright (C) 1999-2000 Russell King
- *
- * 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.
- *
- *  Page table mapping constructs and function prototypes
- */
-struct map_desc {
-        unsigned long virtual;
-        unsigned long physical;
-        unsigned long length;
-        unsigned int type;
-};
-
-struct meminfo;
-
-extern void create_memmap_holes(struct meminfo *);
-extern void memtable_init(struct meminfo *);
-extern void iotable_init(struct map_desc *);
-extern void setup_io_desc(void);
diff --git a/include/asm-arm26/mc146818rtc.h b/include/asm-arm26/mc146818rtc.h
deleted file mode 100644
index a234130db8f1..000000000000
--- a/include/asm-arm26/mc146818rtc.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-#include <asm/irq.h>
-#include <asm/io.h>
-
-#ifndef RTC_PORT
-#define RTC_PORT(x)     (0x70 + (x))
-#define RTC_ALWAYS_BCD  1       /* RTC operates in binary mode */
-#endif
-
-/*
- * The yet supported machines all access the RTC index register via
- * an ISA port access but the way to access the date register differs ...
- */
-#define CMOS_READ(addr) ({ \
-outb_p((addr),RTC_PORT(0)); \
-inb_p(RTC_PORT(1)); \
-})
-#define CMOS_WRITE(val, addr) ({ \
-outb_p((addr),RTC_PORT(0)); \
-outb_p((val),RTC_PORT(1)); \
-})
-
-#endif /* _ASM_MC146818RTC_H */
diff --git a/include/asm-arm26/memory.h b/include/asm-arm26/memory.h
deleted file mode 100644
index 7c1e5be39060..000000000000
--- a/include/asm-arm26/memory.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *  linux/include/asm-arm26/memory.h
- *
- *  Copyright (C) 2000-2002 Russell King
- *
- * 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.
- *
- *  Note: this file should not be included by non-asm/.h files
- */
-#ifndef __ASM_ARM_MEMORY_H
-#define __ASM_ARM_MEMORY_H
-
-/*
- * User space: 26MB
- */
-#define TASK_SIZE       (0x01a00000UL)
-
-/*
- * This decides where the kernel will search for a free chunk of vm
- * space during mmap's.
- */
-#define TASK_UNMAPPED_BASE (TASK_SIZE / 3)
-
-/*
- * Page offset: 32MB
- */
-#define PAGE_OFFSET     (0x02000000UL)
-#define PHYS_OFFSET     (0x02000000UL)
-
-#define PHYS_TO_NID(addr)       (0)
-
-/*
- * PFNs are used to describe any physical page; this means
- * PFN 0 == physical address 0.
- *
- * This is the PFN of the first RAM page in the kernel
- * direct-mapped view.  We assume this is the first page
- * of RAM in the mem_map as well.
- */
-#define PHYS_PFN_OFFSET (PHYS_OFFSET >> PAGE_SHIFT)
-
-/*
- * These are *only* valid on the kernel direct mapped RAM memory.
- */
-static inline unsigned long virt_to_phys(void *x)
-{
-        return (unsigned long)x;
-}
-
-static inline void *phys_to_virt(unsigned long x)
-{
-        return (void *)((unsigned long)x);
-}
-
-#define __pa(x)                 (unsigned long)(x)
-#define __va(x)                 ((void *)(unsigned long)(x))
-
-/*
- * Virtual <-> DMA view memory address translations
- * Again, these are *only* valid on the kernel direct mapped RAM
- * memory.  Use of these is *deprecated*.
- */
-#define virt_to_bus(x)          ((unsigned long)(x))
-#define bus_to_virt(x)          ((void *)((unsigned long)(x)))
-
-/*
- * Conversion between a struct page and a physical address.
- *
- * Note: when converting an unknown physical address to a
- * struct page, the resulting pointer must be validated
- * using VALID_PAGE().  It must return an invalid struct page
- * for any physical address not corresponding to a system
- * RAM address.
- *
- *  page_to_pfn(page)   convert a struct page * to a PFN number
- *  pfn_to_page(pfn)    convert a _valid_ PFN number to struct page *
- *  pfn_valid(pfn)      indicates whether a PFN number is valid
- *
- *  virt_to_page(k)     convert a _valid_ virtual address to struct page *
- *  virt_addr_valid(k)  indicates whether a virtual address is valid
- */
-#define ARCH_PFN_OFFSET         (PHYS_PFN_OFFSET)
-#define pfn_valid(pfn)          ((pfn) >= PHYS_PFN_OFFSET && (pfn) < (PHYS_PFN_OFFSET + max_mapnr))
-
-#define virt_to_page(kaddr)     (pfn_to_page(__pa(kaddr) >> PAGE_SHIFT))
-#define virt_addr_valid(kaddr)  ((int)(kaddr) >= PAGE_OFFSET && (int)(kaddr) < (unsigned long)high_memory)
-
-/*
- * For BIO.  "will die".  Kill me when bio_to_phys() and bvec_to_phys() die.
- */
-#define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
-
-/*
- * We should really eliminate virt_to_bus() here - it's deprecated.
- */
-#define page_to_bus(page)       (page_address(page))
-
-#include <asm-generic/memory_model.h>
-#endif
diff --git a/include/asm-arm26/mman.h b/include/asm-arm26/mman.h
deleted file mode 100644
index 4000a6c1b76b..000000000000
--- a/include/asm-arm26/mman.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __ARM_MMAN_H__
-#define __ARM_MMAN_H__
-
-#include <asm-generic/mman.h>
-
-#define MAP_GROWSDOWN   0x0100          /* stack-like segment */
-#define MAP_DENYWRITE   0x0800          /* ETXTBSY */
-#define MAP_EXECUTABLE  0x1000          /* mark it as an executable */
-#define MAP_LOCKED      0x2000          /* pages are locked */
-#define MAP_NORESERVE   0x4000          /* don't check for reservations */
-#define MAP_POPULATE    0x8000          /* populate (prefault) page tables */
-#define MAP_NONBLOCK    0x10000         /* do not block on IO */
-
-#define MCL_CURRENT     1               /* lock all current mappings */
-#define MCL_FUTURE      2               /* lock all future mappings */
-
-#endif /* __ARM_MMAN_H__ */
diff --git a/include/asm-arm26/mmu.h b/include/asm-arm26/mmu.h
deleted file mode 100644
index 9b8d3d781a1e..000000000000
--- a/include/asm-arm26/mmu.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __ARM_MMU_H
-#define __ARM_MMU_H
-
-/*
- * The ARM doesn't have a mmu context
- */
-typedef struct { } mm_context_t;
-
-#endif
diff --git a/include/asm-arm26/mmu_context.h b/include/asm-arm26/mmu_context.h
deleted file mode 100644
index 16c821f81b8d..000000000000
--- a/include/asm-arm26/mmu_context.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  linux/include/asm-arm/mmu_context.h
- *
- *  Copyright (C) 1996 Russell King.
- *
- * 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.
- *
- *  Changelog:
- *   27-06-1996 RMK     Created
- */
-#ifndef __ASM_ARM_MMU_CONTEXT_H
-#define __ASM_ARM_MMU_CONTEXT_H
-
-#include <asm-generic/mm_hooks.h>
-
-#define init_new_context(tsk,mm)        0
-#define destroy_context(mm)             do { } while(0)
-
-/*
- * This is called when "tsk" is about to enter lazy TLB mode.
- *
- * mm:  describes the currently active mm context
- * tsk: task which is entering lazy tlb
- * cpu: cpu number which is entering lazy tlb
- *
- * tsk->mm will be NULL
- */
-static inline void
-enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
-{
-}
-
-/*
- * This is the actual mm switch as far as the scheduler
- * is concerned.  No registers are touched.
- */
-static inline void
-switch_mm(struct mm_struct *prev, struct mm_struct *next,
-          struct task_struct *tsk)
-{
-        cpu_switch_mm(next->pgd, next);
-}
-
-#define deactivate_mm(tsk,mm)   do { } while (0)
-
-static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
-{
-        cpu_switch_mm(next->pgd, next);
-}
-
-#endif
diff --git a/include/asm-arm26/module.h b/include/asm-arm26/module.h
deleted file mode 100644
index 1157f178daec..000000000000
--- a/include/asm-arm26/module.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_ARM_MODULE_H
-#define _ASM_ARM_MODULE_H
-/*
- * This file contains the arm architecture specific module code.
- */
-
-#endif /* _ASM_ARM_MODULE_H */
diff --git a/include/asm-arm26/msgbuf.h b/include/asm-arm26/msgbuf.h
deleted file mode 100644
index 33b35b946eaa..000000000000
--- a/include/asm-arm26/msgbuf.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _ASMARM_MSGBUF_H
-#define _ASMARM_MSGBUF_H
-
-/* 
- * The msqid64_ds structure for arm architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct msqid64_ds {
-        struct ipc64_perm msg_perm;
-        __kernel_time_t msg_stime;      /* last msgsnd time */
-        unsigned long   __unused1;
-        __kernel_time_t msg_rtime;      /* last msgrcv time */
-        unsigned long   __unused2;
-        __kernel_time_t msg_ctime;      /* last change time */
-        unsigned long   __unused3;
-        unsigned long  msg_cbytes;      /* current number of bytes on queue */
-        unsigned long  msg_qnum;        /* number of messages in queue */
-        unsigned long  msg_qbytes;      /* max number of bytes on queue */
-        __kernel_pid_t msg_lspid;       /* pid of last msgsnd */
-        __kernel_pid_t msg_lrpid;       /* last receive pid */
-        unsigned long  __unused4;
-        unsigned long  __unused5;
-};
-
-#endif /* _ASMARM_MSGBUF_H */
diff --git a/include/asm-arm26/namei.h b/include/asm-arm26/namei.h
deleted file mode 100644
index 3f5d340110eb..000000000000
--- a/include/asm-arm26/namei.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 
- * linux/include/asm-arm26/namei.h
- *
- * Routines to handle famous /usr/gnemul
- * Derived from the Sparc version of this file
- *
- * Included from linux/fs/namei.c
- */
-
-#ifndef __ASMARM_NAMEI_H
-#define __ASMARM_NAMEI_H
-
-#define ARM_BSD_EMUL "usr/gnemul/bsd/"
-
-static inline char *__emul_prefix(void)
-{
-        switch (current->personality) {
-        case PER_BSD:
-                return ARM_BSD_EMUL;
-        default:
-                return NULL;
-        }
-}
-
-#endif /* __ASMARM_NAMEI_H */
diff --git a/include/asm-arm26/oldlatches.h b/include/asm-arm26/oldlatches.h
deleted file mode 100644
index bc87089b2152..000000000000
--- a/include/asm-arm26/oldlatches.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  linux/include/asm-arm/arch-arc/oldlatches.h
- *
- *  Copyright (C) 1996 Russell King, Dave Gilbert
- *
- * 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.
- *
- *  Modifications:
- *   04-04-1998 PJB/RMK Merged arc and a5k versions
- */
-#ifndef _ASM_ARCH_OLDLATCH_H
-#define _ASM_ARCH_OLDLATCH_H
-
-#define LATCHA_FDSEL0    (1<<0)
-#define LATCHA_FDSEL1    (1<<1)
-#define LATCHA_FDSEL2    (1<<2)
-#define LATCHA_FDSEL3    (1<<3)
-#define LATCHA_FDSELALL  (0xf)
-#define LATCHA_SIDESEL   (1<<4)
-#define LATCHA_MOTOR     (1<<5)
-#define LATCHA_INUSE     (1<<6)
-#define LATCHA_CHANGERST (1<<7)
-
-#define LATCHB_FDCDENSITY  (1<<1)
-#define LATCHB_FDCRESET    (1<<3)
-#define LATCHB_PRINTSTROBE (1<<4)
-
-/* newval=(oldval & mask)|newdata */
-void oldlatch_bupdate(unsigned char mask,unsigned char newdata);
-
-/* newval=(oldval & mask)|newdata */
-void oldlatch_aupdate(unsigned char mask,unsigned char newdata);
-
-#endif
-
diff --git a/include/asm-arm26/page.h b/include/asm-arm26/page.h
deleted file mode 100644
index fa19de28fda0..000000000000
--- a/include/asm-arm26/page.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef _ASMARM_PAGE_H
-#define _ASMARM_PAGE_H
-
-
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-
-extern void __clear_user_page(void *p, unsigned long user);
-extern void __copy_user_page(void *to, const void *from, unsigned long user);
-extern void copy_page(void *to, const void *from);
-
-//FIXME these may be wrong on ARM26
-#define clear_user_page(addr,vaddr,pg)                  \
-        do {                                            \
-                preempt_disable();                      \
-                __clear_user_page(addr, vaddr); \
-                preempt_enable();                       \
-        } while (0)
-
-#define copy_user_page(to,from,vaddr,pg)                \
-        do {                                            \
-                preempt_disable();                      \
-                __copy_user_page(to, from, vaddr);      \
-                preempt_enable();                       \
-        } while (0)
-
-#define clear_page(page)        memzero((void *)(page), PAGE_SIZE)
-#define copy_page(to, from)  __copy_user_page(to, from, 0);
-
-#undef STRICT_MM_TYPECHECKS
-
-#ifdef STRICT_MM_TYPECHECKS
-/*
- * These are used to make use of C type-checking..
- */
-typedef struct { unsigned long pgd; } pgd_t;
-typedef struct { unsigned long pte; } pte_t;
-typedef struct { unsigned long pmd; } pmd_t;
-typedef struct { unsigned long pgprot; } pgprot_t;
-
-#define pgd_val(x)      ((x).pgd)
-#define pte_val(x)      ((x).pte)
-#define pmd_val(x)      ((x).pmd)
-#define pgprot_val(x)   ((x).pgprot)
-
-#define __pte(x)        ((pte_t) { (x) } )
-#define __pmd(x)        ((pmd_t) { (x) } )
-#define __pgprot(x)     ((pgprot_t) { (x) } )
-
-#else
-/*
- * .. while these make it easier on the compiler
- */
-typedef unsigned long pgd_t;
-typedef unsigned long pte_t;
-typedef unsigned long pmd_t;
-typedef unsigned long pgprot_t;
-
-//FIXME - should these cast to unsigned long?
-#define pgd_val(x)      (x)
-#define pte_val(x)      (x)
-#define pmd_val(x)      (x)
-#define pgprot_val(x)   (x)
-
-#define __pte(x)        (x)
-#define __pmd(x)        (x)
-#define __pgprot(x)     (x)
-
-#endif /* STRICT_MM_TYPECHECKS */
-#endif /* !__ASSEMBLY__ */
-#endif /* __KERNEL__ */
-
-/* PAGE_SHIFT determines the page size.  This is configurable. */
-#if defined(CONFIG_PAGESIZE_16)
-#define PAGE_SHIFT      14              /* 16K */
-#else           /* default */
-#define PAGE_SHIFT      15              /* 32K */
-#endif
-
-#define EXEC_PAGESIZE   32768
-
-#define PAGE_SIZE               (1UL << PAGE_SHIFT)
-#define PAGE_MASK               (~(PAGE_SIZE-1))
-
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)        (((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-
-#include <asm/memory.h>
-
-#endif /* !__ASSEMBLY__ */
-
-#define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_EXEC | \
-                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-
-#endif /* __KERNEL__ */
-
-#include <asm-generic/page.h>
-
-#endif
diff --git a/include/asm-arm26/param.h b/include/asm-arm26/param.h
deleted file mode 100644
index 6b1e52df542e..000000000000
--- a/include/asm-arm26/param.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  linux/include/asm-arm/param.h
- *
- *  Copyright (C) 1995-1999 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_PARAM_H
-#define __ASM_PARAM_H
-
-#ifndef __KERNEL_HZ
-#define __KERNEL_HZ     100
-#endif
-
-#ifdef __KERNEL__
-# define HZ             __KERNEL_HZ     /* Internal kernel timer frequency */
-# define USER_HZ        100             /* User interfaces are in "ticks" */
-# define CLOCKS_PER_SEC (USER_HZ)       /* like times() */
-#else
-# define HZ             100
-#endif
-
-#ifndef NOGROUP
-#define NOGROUP         (-1)
-#endif
-
-/* max length of hostname */
-#define MAXHOSTNAMELEN  64
-
-#endif
-
diff --git a/include/asm-arm26/parport.h b/include/asm-arm26/parport.h
deleted file mode 100644
index f2f90c76ddd1..000000000000
--- a/include/asm-arm26/parport.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *  linux/include/asm-arm/parport.h: ARM-specific parport initialisation
- *
- *  Copyright (C) 1999, 2000  Tim Waugh <tim@cyberelk.demon.co.uk>
- *
- * This file should only be included by drivers/parport/parport_pc.c.
- */
-
-#ifndef __ASMARM_PARPORT_H
-#define __ASMARM_PARPORT_H
-
-static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma);
-static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)
-{
-        return parport_pc_find_isa_ports (autoirq, autodma);
-}
-
-#endif /* !(_ASMARM_PARPORT_H) */
diff --git a/include/asm-arm26/pci.h b/include/asm-arm26/pci.h
deleted file mode 100644
index 6ac67ed7718c..000000000000
--- a/include/asm-arm26/pci.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Should not be needed. IDE stupidity */
-/* JMA 18.05.03 - is kinda needed, if only to tell it we don't have a PCI bus */
-
-#define PCI_DMA_BUS_IS_PHYS             0
-#define pcibios_scan_all_fns(a, b)      0
-
diff --git a/include/asm-arm26/percpu.h b/include/asm-arm26/percpu.h
deleted file mode 100644
index b4e32d8ec072..000000000000
--- a/include/asm-arm26/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ARM_PERCPU
-#define __ARM_PERCPU
-
-#include <asm-generic/percpu.h>
-
-#endif
diff --git a/include/asm-arm26/pgalloc.h b/include/asm-arm26/pgalloc.h
deleted file mode 100644
index 7725af3ddb4d..000000000000
--- a/include/asm-arm26/pgalloc.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  linux/include/asm-arm/pgalloc.h
- *
- *  Copyright (C) 2000-2001 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef _ASMARM_PGALLOC_H
-#define _ASMARM_PGALLOC_H
-
-#include <asm/processor.h>
-#include <asm/cacheflush.h>
-#include <asm/tlbflush.h>
-#include <linux/slab.h>
-
-extern struct kmem_cache *pte_cache;
-
-static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr){
-        return kmem_cache_alloc(pte_cache, GFP_KERNEL);
-}
-
-static inline void pte_free_kernel(pte_t *pte){
-        if (pte)
-                kmem_cache_free(pte_cache, pte);
-}
-
-/*
- * Populate the pmdp entry with a pointer to the pte.  This pmd is part
- * of the mm address space.
- *
- * If 'mm' is the init tasks mm, then we are doing a vmalloc, and we
- * need to set stuff up correctly for it.
- */
-static inline void
-pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
-{
-//FIXME - is this doing the right thing?
-        set_pmd(pmdp, (unsigned long)ptep | 1/*FIXME _PMD_PRESENT*/);
-}
-
-/*
- * FIXME - We use the old 2.5.5-rmk1 hack for this.
- * This is not truly correct, but should be functional.
- */
-#define pte_alloc_one(mm,addr)  ((struct page *)pte_alloc_one_kernel(mm,addr))
-#define pte_free(pte)           pte_free_kernel((pte_t *)pte)
-#define pmd_populate(mm,pmdp,ptep) pmd_populate_kernel(mm,pmdp,(pte_t *)ptep)
-
-/*
- * Since we have only two-level page tables, these are trivial
- * 
- * trick __pmd_alloc into optimising away. The actual value is irrelevant though as it
- * is thrown away. It just cant be zero. -IM
- */
-
-#define pmd_alloc_one(mm,addr)          ({ BUG(); ((pmd_t *)2); })
-#define pmd_free(pmd)                   do { } while (0)
-#define pgd_populate(mm,pmd,pte)        BUG()
-
-extern pgd_t *get_pgd_slow(struct mm_struct *mm);
-extern void free_pgd_slow(pgd_t *pgd);
-
-#define pgd_alloc(mm)                   get_pgd_slow(mm)
-#define pgd_free(pgd)                   free_pgd_slow(pgd)
-
-#define check_pgt_cache()               do { } while (0)
-
-#endif
diff --git a/include/asm-arm26/pgtable.h b/include/asm-arm26/pgtable.h
deleted file mode 100644
index 55a1a697d12b..000000000000
--- a/include/asm-arm26/pgtable.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- *  linux/include/asm-arm26/pgtable.h
- *
- *  Copyright (C) 2000-2002 Russell King
- *  Copyright (C) 2003 Ian Molton
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef _ASMARM_PGTABLE_H
-#define _ASMARM_PGTABLE_H
-
-#include <asm-generic/4level-fixup.h>
-
-#include <asm/memory.h>
-
-/*
- * The table below defines the page protection levels that we insert into our
- * Linux page table version.  These get translated into the best that the
- * architecture can perform.  Note that on most ARM hardware:
- *  1) We cannot do execute protection
- *  2) If we could do execute protection, then read is implied
- *  3) write implies read permissions
- */
-#define __P000  PAGE_NONE
-#define __P001  PAGE_READONLY
-#define __P010  PAGE_COPY
-#define __P011  PAGE_COPY
-#define __P100  PAGE_READONLY
-#define __P101  PAGE_READONLY
-#define __P110  PAGE_COPY
-#define __P111  PAGE_COPY
-
-#define __S000  PAGE_NONE
-#define __S001  PAGE_READONLY
-#define __S010  PAGE_SHARED
-#define __S011  PAGE_SHARED
-#define __S100  PAGE_READONLY
-#define __S101  PAGE_READONLY
-#define __S110  PAGE_SHARED
-#define __S111  PAGE_SHARED
-
-/*
- * PMD_SHIFT determines the size of the area a second-level page table can map
- * PGDIR_SHIFT determines what a third-level page table entry can map
- */
-#define PGD_SHIFT               25
-#define PMD_SHIFT               20
-
-#define PGD_SIZE                (1UL << PGD_SHIFT)
-#define PGD_MASK                (~(PGD_SIZE-1))
-#define PMD_SIZE                (1UL << PMD_SHIFT)
-#define PMD_MASK                (~(PMD_SIZE-1))
-
-/* The kernel likes to use these names for the above (ick) */
-#define PGDIR_SIZE PGD_SIZE
-#define PGDIR_MASK PGD_MASK
-
-#define PTRS_PER_PGD            32
-#define PTRS_PER_PMD            1
-#define PTRS_PER_PTE            32
-
-/*
- * This is the lowest virtual address we can permit any user space
- * mapping to be mapped at.  This is particularly important for
- * non-high vector CPUs.
- */
-#define FIRST_USER_ADDRESS      PAGE_SIZE
-
-#define FIRST_USER_PGD_NR       1
-#define USER_PTRS_PER_PGD       ((TASK_SIZE/PGD_SIZE) - FIRST_USER_PGD_NR)
-
-// FIXME - WTF?
-#define LIBRARY_TEXT_START      0x0c000000
-
-
-
-#ifndef __ASSEMBLY__
-extern void __pte_error(const char *file, int line, unsigned long val);
-extern void __pmd_error(const char *file, int line, unsigned long val);
-extern void __pgd_error(const char *file, int line, unsigned long val);
-
-#define pte_ERROR(pte)          __pte_error(__FILE__, __LINE__, pte_val(pte))
-#define pmd_ERROR(pmd)          __pmd_error(__FILE__, __LINE__, pmd_val(pmd))
-#define pgd_ERROR(pgd)          __pgd_error(__FILE__, __LINE__, pgd_val(pgd))
-
-/*
- * ZERO_PAGE is a global shared page that is always zero: used
- * for zero-mapped memory areas etc..
- */
-extern struct page *empty_zero_page;
-#define ZERO_PAGE(vaddr)        (empty_zero_page)
-
-#define pte_pfn(pte)            (pte_val(pte) >> PAGE_SHIFT)
-#define pte_page(pte)           (pfn_to_page(pte_pfn(pte)))
-#define pfn_pte(pfn,prot)       (__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)))
-#define pages_to_mb(x)          ((x) >> (20 - PAGE_SHIFT))
-#define mk_pte(page,prot)       pfn_pte(page_to_pfn(page),prot)
-
-/*
- * Terminology: PGD = Page Directory, PMD = Page Middle Directory,
- *              PTE = Page Table Entry
- *
- * on arm26 we have no 2nd level page table. we simulate this by removing the
- * PMD.
- *
- * pgd_none is 0 to prevernt pmd_alloc() calling __pmd_alloc(). This causes it
- * to return pmd_offset(pgd,addr) which is a pointer to the pgd (IOW, a no-op).
- *
- * however, to work this way, whilst we are allocating 32 pgds, containing 32
- * PTEs, the actual work is done on the PMDs, thus:
- *
- * instead of  mm->pgd->pmd->pte
- * we have     mm->pgdpmd->pte
- *
- * IOW, think of PGD operations and PMD ones as being the same thing, just
- * that PGD stuff deals with the mm_struct side of things, wheras PMD stuff
- * deals with the pte side of things.
- *
- * additionally, we store some bits in the PGD and PTE pointers: 
- * PGDs:
- *   o The lowest (1) bit of the PGD is to determine if it is present or swap.
- *   o The 2nd bit of the PGD is unused and must be zero.
- *   o The top 6 bits of the PGD must be zero. 
- * PTEs:
- *   o The lower 5 bits of a pte are flags. bit 1 is the 'present' flag. The
- *     others determine the pages attributes.
- *
- * the pgd_val, pmd_val, and pte_val macros seem to be private to our code.
- * They get the RAW value of the PGD/PMD/PTE entry, including our flags
- * encoded into the pointers.
- * 
- * The pgd_offset, pmd_offset, and pte_offset macros are used by the kernel,
- * so they shouldnt have our flags attached.
- *
- * If you understood that, feel free to explain it to me...
- *
- */
-
-#define _PMD_PRESENT     (0x01)
-
-/* These definitions allow us to optimise out stuff like pmd_alloc() */
-#define pgd_none(pgd)           (0) 
-#define pgd_bad(pgd)            (0)
-#define pgd_present(pgd)        (1)
-#define pgd_clear(pgdp)         do { } while (0)
-
-/* Whilst these handle our actual 'page directory' (the agglomeration of pgd and pmd)
- */
-#define pmd_none(pmd)           (!pmd_val(pmd))
-#define pmd_bad(pmd)            ((pmd_val(pmd) & 0xfc000002))
-#define pmd_present(pmd)        (pmd_val(pmd) & _PMD_PRESENT)
-#define set_pmd(pmd_ptr, pmd)   ((*(pmd_ptr)) = (pmd))
-#define pmd_clear(pmdp)         set_pmd(pmdp, __pmd(0))
-
-/* and these handle our pte tables */
-#define pte_none(pte)           (!pte_val(pte))
-#define pte_present(pte)        (pte_val(pte) & _PAGE_PRESENT)
-#define set_pte(pte_ptr, pte)   ((*(pte_ptr)) = (pte))
-#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
-#define pte_clear(mm,addr,ptep) set_pte_at((mm),(addr),(ptep), __pte(0))
-
-/* macros to ease the getting of pointers to stuff... */
-#define pgd_offset(mm, addr)    ((pgd_t *)(mm)->pgd        + __pgd_index(addr))
-#define pmd_offset(pgd, addr)   ((pmd_t *)(pgd))
-#define pte_offset(pmd, addr)   ((pte_t *)pmd_page(*(pmd)) + __pte_index(addr))
-
-/* there is no __pmd_index as we dont use pmds */
-#define __pgd_index(addr)       ((addr) >> PGD_SHIFT)
-#define __pte_index(addr)       (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-
-
-/* Keep the kernel happy */
-#define pgd_index(addr)         __pgd_index(addr)
-#define pgd_offset_k(addr)      (pgd_offset(&init_mm, addr))
-
-/*
- * The vmalloc() routines leaves a hole of 4kB between each vmalloced
- * area for the same reason. ;) FIXME: surely 1 page not 4k ?
- */
-#define VMALLOC_START     0x01a00000
-#define VMALLOC_END       0x01c00000
-
-/* Is pmd_page supposed to return a pointer to a page in some arches? ours seems to
- * return a pointer to memory (no special alignment)
- */
-#define pmd_page(pmd)  ((struct page *)(pmd_val((pmd)) & ~_PMD_PRESENT))
-#define pmd_page_vaddr(pmd) ((pte_t *)(pmd_val((pmd)) & ~_PMD_PRESENT))
-
-#define pte_offset_kernel(dir,addr)     (pmd_page_vaddr(*(dir)) + __pte_index(addr))
-
-#define pte_offset_map(dir,addr)        (pmd_page_vaddr(*(dir)) + __pte_index(addr))
-#define pte_offset_map_nested(dir,addr) (pmd_page_vaddr(*(dir)) + __pte_index(addr))
-#define pte_unmap(pte)                  do { } while (0)
-#define pte_unmap_nested(pte)           do { } while (0)
-
-
-#define _PAGE_PRESENT   0x01
-#define _PAGE_READONLY  0x02
-#define _PAGE_NOT_USER  0x04
-#define _PAGE_OLD       0x08
-#define _PAGE_CLEAN     0x10
-
-// an old page has never been read.
-// a clean page has never been written.
-
-/*                               -- present --   -- !dirty --  --- !write ---   ---- !user --- */
-#define PAGE_NONE       __pgprot(_PAGE_PRESENT | _PAGE_CLEAN | _PAGE_READONLY | _PAGE_NOT_USER)
-#define PAGE_SHARED     __pgprot(_PAGE_PRESENT | _PAGE_CLEAN                                  )
-#define PAGE_COPY       __pgprot(_PAGE_PRESENT | _PAGE_CLEAN | _PAGE_READONLY                 )
-#define PAGE_READONLY   __pgprot(_PAGE_PRESENT | _PAGE_CLEAN | _PAGE_READONLY                 )
-#define PAGE_KERNEL     __pgprot(_PAGE_PRESENT                                | _PAGE_NOT_USER)
-
-#define _PAGE_CHG_MASK  (PAGE_MASK | _PAGE_OLD | _PAGE_CLEAN)
-
-/*
- * The following only work if pte_present() is true.
- * Undefined behaviour if not..
- */
-#define pte_write(pte)                  (!(pte_val(pte) & _PAGE_READONLY))
-#define pte_dirty(pte)                  (!(pte_val(pte) & _PAGE_CLEAN))
-#define pte_young(pte)                  (!(pte_val(pte) & _PAGE_OLD))
-//ONLY when !pte_present() I think. nicked from arm32 (FIXME!)
-#define pte_file(pte)                   (!(pte_val(pte) & _PAGE_OLD))
-
-#define PTE_BIT_FUNC(fn,op)                     \
-static inline pte_t pte_##fn(pte_t pte) { pte_val(pte) op; return pte; }
-
-PTE_BIT_FUNC(wrprotect, |=  _PAGE_READONLY);
-PTE_BIT_FUNC(mkwrite,   &= ~_PAGE_READONLY);
-PTE_BIT_FUNC(mkclean,   |=  _PAGE_CLEAN);
-PTE_BIT_FUNC(mkdirty,   &= ~_PAGE_CLEAN);
-PTE_BIT_FUNC(mkold,     |=  _PAGE_OLD);
-PTE_BIT_FUNC(mkyoung,   &= ~_PAGE_OLD);
-
-/*
- * We don't store cache state bits in the page table here. FIXME - or do we?
- */
-#define pgprot_noncached(prot)  (prot)
-#define pgprot_writecombine(prot) (prot) //FIXME - is a no-op?
-
-extern void pgtable_cache_init(void);
-
-//FIXME - nicked from arm32 and brutally hacked. probably wrong.
-#define pte_to_pgoff(x) (pte_val(x) >> 2)
-#define pgoff_to_pte(x) __pte(((x) << 2) & ~_PAGE_OLD)
-
-//FIXME - next line borrowed from arm32. is it right?
-#define PTE_FILE_MAX_BITS       30
-
-
-static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
-{
-        pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot);
-        return pte;
-}
-
-extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-
-/* Encode and decode a swap entry.
- *
- * We support up to 32GB of swap on 4k machines
- */
-#define __swp_type(x)           (((x).val >> 2) & 0x7f)
-#define __swp_offset(x)         ((x).val >> 9)
-#define __swp_entry(type,offset) ((swp_entry_t) { ((type) << 2) | ((offset) << 9) })
-#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
-#define __swp_entry_to_pte(swp) ((pte_t) { (swp).val })
-
-/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
-/* FIXME: this is not correct */
-#define kern_addr_valid(addr)   (1)
-
-/*
- * Conversion functions: convert a page and protection to a page entry,
- * and a page entry and page directory to the page they refer to.
- */
-static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
-{
-        pte_t pte;
-        pte_val(pte) = physpage | pgprot_val(pgprot);
-        return pte;
-}
-
-
-#include <asm-generic/pgtable.h>
-
-/*
- * remap a physical page `pfn' of size `size' with page protection `prot'
- * into virtual address `from'
- */
-#define io_remap_pfn_range(vma,from,pfn,size,prot) \
-                remap_pfn_range(vma, from, pfn, size, prot)
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* _ASMARM_PGTABLE_H */
diff --git a/include/asm-arm26/poll.h b/include/asm-arm26/poll.h
deleted file mode 100644
index 1170e7065f6a..000000000000
--- a/include/asm-arm26/poll.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __ASMARM_POLL_H
-#define __ASMARM_POLL_H
-
-#include <asm-generic/poll.h>
-
-#undef POLLREMOVE
-
-#endif
diff --git a/include/asm-arm26/posix_types.h b/include/asm-arm26/posix_types.h
deleted file mode 100644
index f8d1eb4f4cb1..000000000000
--- a/include/asm-arm26/posix_types.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  linux/include/asm-arm/posix_types.h
- *
- *  Copyright (C) 1996-1998 Russell King.
- *
- * 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.
- *
- *  Changelog:
- *   27-06-1996 RMK     Created
- */
-#ifndef __ARCH_ARM_POSIX_TYPES_H
-#define __ARCH_ARM_POSIX_TYPES_H
-
-/*
- * This file is generally used by user-level software, so you need to
- * be a little careful about namespace pollution etc.  Also, we cannot
- * assume GCC is being used.
- */
-
-typedef unsigned long           __kernel_ino_t;
-typedef unsigned short          __kernel_mode_t;
-typedef unsigned short          __kernel_nlink_t;
-typedef long                    __kernel_off_t;
-typedef int                     __kernel_pid_t;
-typedef unsigned short          __kernel_ipc_pid_t;
-typedef unsigned short          __kernel_uid_t;
-typedef unsigned short          __kernel_gid_t;
-typedef unsigned int            __kernel_size_t;
-typedef int                     __kernel_ssize_t;
-typedef int                     __kernel_ptrdiff_t;
-typedef long                    __kernel_time_t;
-typedef long                    __kernel_suseconds_t;
-typedef long                    __kernel_clock_t;
-typedef int                     __kernel_timer_t;
-typedef int                     __kernel_clockid_t;
-typedef int                     __kernel_daddr_t;
-typedef char *                  __kernel_caddr_t;
-typedef unsigned short          __kernel_uid16_t;
-typedef unsigned short          __kernel_gid16_t;
-typedef unsigned int            __kernel_uid32_t;
-typedef unsigned int            __kernel_gid32_t;
-
-typedef unsigned short          __kernel_old_uid_t;
-typedef unsigned short          __kernel_old_gid_t;
-typedef unsigned short          __kernel_old_dev_t;
-
-#ifdef __GNUC__
-typedef long long               __kernel_loff_t;
-#endif
-
-typedef struct {
-#if defined(__KERNEL__) || defined(__USE_ALL)
-        int     val[2];
-#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
-        int     __val[2];
-#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
-} __kernel_fsid_t;
-
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
-
-#undef  __FD_SET
-#define __FD_SET(fd, fdsetp) \
-                (((fd_set *)(fdsetp))->fds_bits[(fd) >> 5] |= (1<<((fd) & 31)))
-
-#undef  __FD_CLR
-#define __FD_CLR(fd, fdsetp) \
-                (((fd_set *)(fdsetp))->fds_bits[(fd) >> 5] &= ~(1<<((fd) & 31)))
-
-#undef  __FD_ISSET
-#define __FD_ISSET(fd, fdsetp) \
-                ((((fd_set *)(fdsetp))->fds_bits[(fd) >> 5] & (1<<((fd) & 31))) != 0)
-
-#undef  __FD_ZERO
-#define __FD_ZERO(fdsetp) \
-                (memset ((fdsetp), 0, sizeof (*(fd_set *)(fdsetp))))
-
-#endif
-
-#endif
diff --git a/include/asm-arm26/proc-fns.h b/include/asm-arm26/proc-fns.h
deleted file mode 100644
index a83100454055..000000000000
--- a/include/asm-arm26/proc-fns.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  linux/include/asm-arm26/proc-fns.h
- *
- *  Copyright (C) 2000 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASSEMBLY__
-
-#include <asm/page.h>
-
-/*
- * Don't change this structure - ASM code
- * relies on it.
- */
-extern struct processor {
-        /* check for any bugs */
-        void (*_check_bugs)(void);
-        /* Set up any processor specifics */
-        void (*_proc_init)(void);
-        /* Disable any processor specifics */
-        void (*_proc_fin)(void);
-        /* set the MEMC hardware mappings */
-        void (*_set_pgd)(pgd_t *pgd);
-        /* XCHG */
-        unsigned long (*_xchg_1)(unsigned long x, volatile void *ptr);
-        unsigned long (*_xchg_4)(unsigned long x, volatile void *ptr);
-} processor;
-
-extern const struct processor arm2_processor_functions;
-extern const struct processor arm250_processor_functions;
-extern const struct processor arm3_processor_functions;
-
-#define cpu_check_bugs()                        processor._check_bugs()
-#define cpu_proc_init()                         processor._proc_init()
-#define cpu_proc_fin()                          processor._proc_fin()
-#define cpu_do_idle()                           do { } while (0)
-#define cpu_switch_mm(pgd,mm)                   processor._set_pgd(pgd)
-#define cpu_xchg_1(x,ptr)                       processor._xchg_1(x,ptr)
-#define cpu_xchg_4(x,ptr)                       processor._xchg_4(x,ptr)
-
-
-//FIXME - these shouldnt be in proc-fn.h
-extern void cpu_memc_update_all(pgd_t *pgd);
-extern void cpu_memc_update_entry(pgd_t *pgd, unsigned long phys_pte, unsigned long log_addr);
-
-#endif
diff --git a/include/asm-arm26/processor.h b/include/asm-arm26/processor.h
deleted file mode 100644
index 1d2d5f7b467b..000000000000
--- a/include/asm-arm26/processor.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  linux/include/asm-arm26/processor.h
- *
- *  Copyright (C) 1995 Russell King
- *  Copyright (C) 2003 Ian Molton
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __ASM_ARM_PROCESSOR_H
-#define __ASM_ARM_PROCESSOR_H
-
-/*
- * Default implementation of macro that returns current
- * instruction pointer ("program counter").
- */
-#define current_text_addr() ({ __label__ _l; _l: &&_l;})
-
-#ifdef __KERNEL__
-
-#include <asm/atomic.h>
-#include <asm/ptrace.h>
-#include <linux/string.h>
-
-#define KERNEL_STACK_SIZE 4096
-
-typedef struct {
-        void (*put_byte)(void);               /* Special calling convention */
-        void (*get_byte)(void);               /* Special calling convention */
-        void (*put_half)(void);               /* Special calling convention */
-        void (*get_half)(void);               /* Special calling convention */
-        void (*put_word)(void);               /* Special calling convention */
-        void (*get_word)(void);               /* Special calling convention */
-        void (*put_dword)(void);              /* Special calling convention */
-        unsigned long (*copy_from_user)(void *to, const void *from, unsigned long sz);
-        unsigned long (*copy_to_user)(void *to, const void *from, unsigned long sz);
-        unsigned long (*clear_user)(void *addr, unsigned long sz);
-        unsigned long (*strncpy_from_user)(char *to, const char *from, unsigned long sz);
-        unsigned long (*strnlen_user)(const char *s, long n);
-} uaccess_t;
-
-extern uaccess_t uaccess_user, uaccess_kernel;
-
-#define EXTRA_THREAD_STRUCT                     \
-        uaccess_t       *uaccess;         /* User access functions*/
-
-#define EXTRA_THREAD_STRUCT_INIT                \
-        .uaccess        = &uaccess_kernel,
-
-// FIXME?!!
-
-#define start_thread(regs,pc,sp)                                        \
-({                                                                      \
-        unsigned long *stack = (unsigned long *)sp;                     \
-        set_fs(USER_DS);                                                \
-        memzero(regs->uregs, sizeof (regs->uregs));                     \
-        regs->ARM_pc = pc | ~0xfc000003;        /* pc */                \
-        regs->ARM_sp = sp;              /* sp */                        \
-        regs->ARM_r2 = stack[2];        /* r2 (envp) */                 \
-        regs->ARM_r1 = stack[1];        /* r1 (argv) */                 \
-        regs->ARM_r0 = stack[0];        /* r0 (argc) */                 \
-})
-
-#define KSTK_EIP(tsk)   (((unsigned long *)(4096+(unsigned long)(tsk)))[1020])
-#define KSTK_ESP(tsk)   (((unsigned long *)(4096+(unsigned long)(tsk)))[1018])
-
-struct debug_entry {
-        u32                     address;
-        u32                     insn;
-};
-
-struct debug_info {
-        int                     nsaved;
-        struct debug_entry      bp[2];
-};
-
-struct thread_struct {
-                                                        /* fault info     */
-        unsigned long                   address;
-        unsigned long                   trap_no;
-        unsigned long                   error_code;
-                                                        /* debugging      */
-        struct debug_info               debug;
-        EXTRA_THREAD_STRUCT
-};
-
-#define INIT_THREAD  { \
-EXTRA_THREAD_STRUCT_INIT \
-}
-
-/* Forward declaration, a strange C thing */
-struct task_struct;
-
-/* Free all resources held by a thread. */
-extern void release_thread(struct task_struct *);
-
-unsigned long get_wchan(struct task_struct *p);
-
-#define cpu_relax()                     barrier()
-
-/* Prepare to copy thread state - unlazy all lazy status */
-#define prepare_to_copy(tsk)    do { } while (0)
-
-/*
- * Create a new kernel thread
- */
-extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
-
-#endif
-
-#endif /* __ASM_ARM_PROCESSOR_H */
diff --git a/include/asm-arm26/procinfo.h b/include/asm-arm26/procinfo.h
deleted file mode 100644
index b28624db69ff..000000000000
--- a/include/asm-arm26/procinfo.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  linux/include/asm-arm/procinfo.h
- *
- *  Copyright (C) 1996-1999 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_PROCINFO_H
-#define __ASM_PROCINFO_H
-
-#ifndef __ASSEMBLY__
-
-//struct processor;
-//struct cpu_user_fns;
-
-struct proc_info_item {
-        const char       *manufacturer;
-        const char       *cpu_name;
-};
-
-/*
- * Note!  struct processor is always defined if we're
- * using MULTI_CPU, otherwise this entry is unused,
- * but still exists.
- *
- * NOTE! The following structure is defined by assembly
- * language, NOT C code.  For more information, check:
- *  arch/arm/mm/proc-*.S and arch/arm/kernel/head-armv.S
- */
-struct proc_info_list {
-        unsigned int            cpu_val;
-        unsigned int            cpu_mask;
-        const char              *arch_name;
-        const char              *elf_name;
-        unsigned int            elf_hwcap;
-        struct proc_info_item   *info;
-        struct processor        *proc;
-};
-
-#endif  /* __ASSEMBLY__ */
-
-#define PROC_INFO_SZ    48
-
-#define HWCAP_SWP       1
-#define HWCAP_HALF      2
-#define HWCAP_THUMB     4
-#define HWCAP_26BIT     8       /* Play it safe */
-#define HWCAP_FAST_MULT 16
-#define HWCAP_FPA       32
-#define HWCAP_VFP       64
-#define HWCAP_EDSP      128
-#define HWCAP_JAVA      256
-
-#endif
diff --git a/include/asm-arm26/ptrace.h b/include/asm-arm26/ptrace.h
deleted file mode 100644
index 6a46b5ae1156..000000000000
--- a/include/asm-arm26/ptrace.h
+++ /dev/null
@@ -1,104 +0,0 @@
-#ifndef __ASM_ARM_PTRACE_H
-#define __ASM_ARM_PTRACE_H
-
-#define PTRACE_GETREGS          12
-#define PTRACE_SETREGS          13
-#define PTRACE_GETFPREGS        14
-#define PTRACE_SETFPREGS        15
-#define PTRACE_OLDSETOPTIONS    21
-
-/* options set using PTRACE_SETOPTIONS */
-#define PTRACE_O_TRACESYSGOOD   0x00000001
-
-#define MODE_USR26      0x00000000
-#define MODE_FIQ26      0x00000001
-#define MODE_IRQ26      0x00000002
-#define MODE_SVC26      0x00000003
-#define MODE_MASK       0x00000003
-
-#define PSR_F_BIT       0x04000000
-#define PSR_I_BIT       0x08000000
-#define PSR_V_BIT       0x10000000
-#define PSR_C_BIT       0x20000000
-#define PSR_Z_BIT       0x40000000
-#define PSR_N_BIT       0x80000000
-
-#define PCMASK          0xfc000003
-
-
-#ifndef __ASSEMBLY__
-
-#define pc_pointer(v) ((v) & ~PCMASK)   /* convert v to pc type address */
-#define instruction_pointer(regs) (pc_pointer((regs)->ARM_pc)) /* get pc */
-#define profile_pc(regs) instruction_pointer(regs)
-
-/* this struct defines the way the registers are stored on the
-   stack during a system call. */
-
-struct pt_regs {
-        long uregs[17];
-};
-
-#define ARM_pc          uregs[15]
-#define ARM_lr          uregs[14]
-#define ARM_sp          uregs[13]
-#define ARM_ip          uregs[12]
-#define ARM_fp          uregs[11]
-#define ARM_r10         uregs[10]
-#define ARM_r9          uregs[9]
-#define ARM_r8          uregs[8]
-#define ARM_r7          uregs[7]
-#define ARM_r6          uregs[6]
-#define ARM_r5          uregs[5]
-#define ARM_r4          uregs[4]
-#define ARM_r3          uregs[3]
-#define ARM_r2          uregs[2]
-#define ARM_r1          uregs[1]
-#define ARM_r0          uregs[0]
-#define ARM_ORIG_r0     uregs[16]
-
-#ifdef __KERNEL__
-
-#define processor_mode(regs) \
-        ((regs)->ARM_pc & MODE_MASK)
-
-#define user_mode(regs) \
-        (processor_mode(regs) == MODE_USR26)
-
-#define interrupts_enabled(regs) \
-        (!((regs)->ARM_pc & PSR_I_BIT))
-
-#define fast_interrupts_enabled(regs) \
-        (!((regs)->ARM_pc & PSR_F_BIT))
-
-#define condition_codes(regs) \
-        ((regs)->ARM_pc & (PSR_V_BIT|PSR_C_BIT|PSR_Z_BIT|PSR_N_BIT))
-
-/* Are the current registers suitable for user mode?
- * (used to maintain security in signal handlers)
- */
-static inline int valid_user_regs(struct pt_regs *regs)
-{
-        if (user_mode(regs) &&
-            (regs->ARM_pc & (PSR_F_BIT | PSR_I_BIT)) == 0)
-                return 1;
-
-        /*
-         * force it to be something sensible
-         */
-        regs->ARM_pc &= ~(MODE_MASK | PSR_F_BIT | PSR_I_BIT);
-
-        return 0;
-}
-
-extern void show_regs(struct pt_regs *);
-
-#define predicate(x)    (x & 0xf0000000)
-#define PREDICATE_ALWAYS        0xe0000000
-
-#endif  /* __KERNEL__ */
-
-#endif  /* __ASSEMBLY__ */
-
-#endif
-
diff --git a/include/asm-arm26/resource.h b/include/asm-arm26/resource.h
deleted file mode 100644
index 734b581b5b6a..000000000000
--- a/include/asm-arm26/resource.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ARM_RESOURCE_H
-#define _ARM_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif
diff --git a/include/asm-arm26/scatterlist.h b/include/asm-arm26/scatterlist.h
deleted file mode 100644
index d9c056c7784e..000000000000
--- a/include/asm-arm26/scatterlist.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef _ASMARM_SCATTERLIST_H
-#define _ASMARM_SCATTERLIST_H
-
-#include <asm/types.h>
-
-struct scatterlist {
-        struct page     *page;          /* buffer page                   */
-        unsigned int    offset;         /* buffer offset                 */
-        dma_addr_t      dma_address;    /* dma address                   */
-        unsigned int    length;         /* length                        */
-        char            *__address;     /* for set_dma_addr              */
-};
-
-/*
- * These macros should be used after a pci_map_sg call has been done
- * to get bus addresses of each of the SG entries and their lengths.
- * You should only work with the number of sg entries pci_map_sg
- * returns, or alternatively stop on the first sg_dma_len(sg) which
- * is 0.
- */
-#define sg_dma_address(sg)      ((sg)->dma_address)
-#define sg_dma_len(sg)          ((sg)->length)
-
-#define ISA_DMA_THRESHOLD (0xffffffff)
-
-#endif /* _ASMARM_SCATTERLIST_H */
diff --git a/include/asm-arm26/sections.h b/include/asm-arm26/sections.h
deleted file mode 100644
index 10b6370efad0..000000000000
--- a/include/asm-arm26/sections.h
+++ /dev/null
@@ -1,2 +0,0 @@
-//FIXME - nicked from arm32 - check its correct.
-#include <asm-generic/sections.h>
diff --git a/include/asm-arm26/segment.h b/include/asm-arm26/segment.h
deleted file mode 100644
index 9e24c21f6304..000000000000
--- a/include/asm-arm26/segment.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __ASM_ARM_SEGMENT_H
-#define __ASM_ARM_SEGMENT_H
-
-#define __KERNEL_CS   0x0
-#define __KERNEL_DS   0x0
-
-#define __USER_CS     0x1
-#define __USER_DS     0x1
-
-#endif /* __ASM_ARM_SEGMENT_H */
-
diff --git a/include/asm-arm26/semaphore-helper.h b/include/asm-arm26/semaphore-helper.h
deleted file mode 100644
index 1d7f1987edb9..000000000000
--- a/include/asm-arm26/semaphore-helper.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#ifndef ASMARM_SEMAPHORE_HELPER_H
-#define ASMARM_SEMAPHORE_HELPER_H
-
-/*
- * These two _must_ execute atomically wrt each other.
- */
-static inline void wake_one_more(struct semaphore * sem)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&semaphore_wake_lock, flags);
-        if (atomic_read(&sem->count) <= 0)
-                sem->waking++;
-        spin_unlock_irqrestore(&semaphore_wake_lock, flags);
-}
-
-static inline int waking_non_zero(struct semaphore *sem)
-{
-        unsigned long flags;
-        int ret = 0;
-
-        spin_lock_irqsave(&semaphore_wake_lock, flags);
-        if (sem->waking > 0) {
-                sem->waking--;
-                ret = 1;
-        }
-        spin_unlock_irqrestore(&semaphore_wake_lock, flags);
-        return ret;
-}
-
-/*
- * waking non zero interruptible
- *      1       got the lock
- *      0       go to sleep
- *      -EINTR  interrupted
- *
- * We must undo the sem->count down_interruptible() increment while we are
- * protected by the spinlock in order to make this atomic_inc() with the
- * atomic_read() in wake_one_more(), otherwise we can race. -arca
- */
-static inline int waking_non_zero_interruptible(struct semaphore *sem,
-                                                struct task_struct *tsk)
-{
-        unsigned long flags;
-        int ret = 0;
-
-        spin_lock_irqsave(&semaphore_wake_lock, flags);
-        if (sem->waking > 0) {
-                sem->waking--;
-                ret = 1;
-        } else if (signal_pending(tsk)) {
-                atomic_inc(&sem->count);
-                ret = -EINTR;
-        }
-        spin_unlock_irqrestore(&semaphore_wake_lock, flags);
-        return ret;     
-}
-
-/*
- * waking_non_zero_try_lock:
- *      1       failed to lock
- *      0       got the lock
- *
- * We must undo the sem->count down_interruptible() increment while we are
- * protected by the spinlock in order to make this atomic_inc() with the
- * atomic_read() in wake_one_more(), otherwise we can race. -arca
- */
-static inline int waking_non_zero_trylock(struct semaphore *sem)
-{
-        unsigned long flags;
-        int ret = 1;
-
-        spin_lock_irqsave(&semaphore_wake_lock, flags);
-        if (sem->waking <= 0)
-                atomic_inc(&sem->count);
-        else {
-                sem->waking--;
-                ret = 0;
-        }
-        spin_unlock_irqrestore(&semaphore_wake_lock, flags);
-        return ret;
-}
-
-#endif
diff --git a/include/asm-arm26/semaphore.h b/include/asm-arm26/semaphore.h
deleted file mode 100644
index 1fda54375ed8..000000000000
--- a/include/asm-arm26/semaphore.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * linux/include/asm-arm26/semaphore.h
- */
-#ifndef __ASM_ARM_SEMAPHORE_H
-#define __ASM_ARM_SEMAPHORE_H
-
-#include <linux/linkage.h>
-#include <linux/spinlock.h>
-#include <linux/wait.h>
-#include <linux/rwsem.h>
-
-#include <asm/atomic.h>
-#include <asm/locks.h>
-
-struct semaphore {
-        atomic_t count;
-        int sleepers;
-        wait_queue_head_t wait;
-};
-
-#define __SEMAPHORE_INIT(name, n)                                       \
-{                                                                       \
-        .count          = ATOMIC_INIT(n),                               \
-        .sleepers       = 0,                                            \
-        .wait           = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait),   \
-}
-
-#define __DECLARE_SEMAPHORE_GENERIC(name,count) \
-        struct semaphore name = __SEMAPHORE_INIT(name,count)
-
-#define DECLARE_MUTEX(name)             __DECLARE_SEMAPHORE_GENERIC(name,1)
-#define DECLARE_MUTEX_LOCKED(name)      __DECLARE_SEMAPHORE_GENERIC(name,0)
-
-static inline void sema_init(struct semaphore *sem, int val)
-{
-        atomic_set(&sem->count, val);
-        sem->sleepers = 0;
-        init_waitqueue_head(&sem->wait);
-}
-
-static inline void init_MUTEX(struct semaphore *sem)
-{
-        sema_init(sem, 1);
-}
-
-static inline void init_MUTEX_LOCKED(struct semaphore *sem)
-{
-        sema_init(sem, 0);
-}
-
-/*
- * special register calling convention
- */
-asmlinkage void __down_failed(void);
-asmlinkage int  __down_interruptible_failed(void);
-asmlinkage int  __down_trylock_failed(void);
-asmlinkage void __up_wakeup(void);
-
-extern void __down(struct semaphore * sem);
-extern int  __down_interruptible(struct semaphore * sem);
-extern int  __down_trylock(struct semaphore * sem);
-extern void __up(struct semaphore * sem);
-
-/*
- * This is ugly, but we want the default case to fall through.
- * "__down" is the actual routine that waits...
- */
-static inline void down(struct semaphore * sem)
-{
-        might_sleep();
-        __down_op(sem, __down_failed);
-}
-
-/*
- * This is ugly, but we want the default case to fall through.
- * "__down_interruptible" is the actual routine that waits...
- */
-static inline int down_interruptible (struct semaphore * sem)
-{
-        might_sleep();
-        return __down_op_ret(sem, __down_interruptible_failed);
-}
-
-static inline int down_trylock(struct semaphore *sem)
-{
-        return __down_op_ret(sem, __down_trylock_failed);
-}
-
-/*
- * Note! This is subtle. We jump to wake people up only if
- * the semaphore was negative (== somebody was waiting on it).
- * The default case (no contention) will result in NO
- * jumps for both down() and up().
- */
-static inline void up(struct semaphore * sem)
-{
-        __up_op(sem, __up_wakeup);
-}
-
-#endif
diff --git a/include/asm-arm26/sembuf.h b/include/asm-arm26/sembuf.h
deleted file mode 100644
index 1c0283954289..000000000000
--- a/include/asm-arm26/sembuf.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _ASMARM_SEMBUF_H
-#define _ASMARM_SEMBUF_H
-
-/* 
- * The semid64_ds structure for arm architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct semid64_ds {
-        struct ipc64_perm sem_perm;             /* permissions .. see ipc.h */
-        __kernel_time_t sem_otime;              /* last semop time */
-        unsigned long   __unused1;
-        __kernel_time_t sem_ctime;              /* last change time */
-        unsigned long   __unused2;
-        unsigned long   sem_nsems;              /* no. of semaphores in array */
-        unsigned long   __unused3;
-        unsigned long   __unused4;
-};
-
-#endif /* _ASMARM_SEMBUF_H */
diff --git a/include/asm-arm26/serial.h b/include/asm-arm26/serial.h
deleted file mode 100644
index dd86a716cb0b..000000000000
--- a/include/asm-arm26/serial.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  linux/include/asm-arm/serial.h
- *
- *  Copyright (C) 1996 Russell King.
- *
- * 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.
- *
- *  Changelog:
- *   15-10-1996 RMK     Created
- */
-
-#ifndef __ASM_SERIAL_H
-#define __ASM_SERIAL_H
-
-
-/*
- * This assumes you have a 1.8432 MHz clock for your UART.
- *
- * It'd be nice if someone built a serial card with a 24.576 MHz
- * clock, since the 16550A is capable of handling a top speed of 1.5
- * megabits/second; but this requires the faster clock.
- */
-#define BASE_BAUD (1843200 / 16)
-
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
-
-#if defined(CONFIG_ARCH_A5K)
-     /* UART CLK        PORT  IRQ     FLAGS        */
-
-#define SERIAL_PORT_DFNS                                                \
-        { 0, BASE_BAUD, 0x3F8, 10, STD_COM_FLAGS },     /* ttyS0 */     \
-        { 0, BASE_BAUD, 0x2F8, 10, STD_COM_FLAGS },     /* ttyS1 */
-
-#else
-
-#define SERIAL_PORT_DFNS                                                \
-        { 0, BASE_BAUD, 0    ,  0, STD_COM_FLAGS },     /* ttyS0 */     \
-        { 0, BASE_BAUD, 0    ,  0, STD_COM_FLAGS },     /* ttyS1 */
-
-#endif
-
-#endif
diff --git a/include/asm-arm26/setup.h b/include/asm-arm26/setup.h
deleted file mode 100644
index e82562306475..000000000000
--- a/include/asm-arm26/setup.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *  linux/include/asm/setup.h
- *
- *  Copyright (C) 1997-1999 Russell King
- *
- * 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.
- *
- *  Structure passed to kernel to tell it about the
- *  hardware it's running on.  See Documentation/arm/Setup
- *  for more info.
- */
-#ifndef __ASMARM_SETUP_H
-#define __ASMARM_SETUP_H
-
-#define COMMAND_LINE_SIZE 1024
-
-#ifdef __KERNEL__
-
-/* The list ends with an ATAG_NONE node. */
-#define ATAG_NONE       0x00000000
-
-struct tag_header {
-        u32 size;
-        u32 tag;
-};
-
-/* The list must start with an ATAG_CORE node */
-#define ATAG_CORE       0x54410001
-
-struct tag_core {
-        u32 flags;              /* bit 0 = read-only */
-        u32 pagesize;
-        u32 rootdev;
-};
-
-/* it is allowed to have multiple ATAG_MEM nodes */
-#define ATAG_MEM        0x54410002
-
-struct tag_mem32 {
-        u32     size;
-        u32     start;  /* physical start address */
-};
-
-/* VGA text type displays */
-#define ATAG_VIDEOTEXT  0x54410003
-
-struct tag_videotext {
-        u8              x;
-        u8              y;
-        u16             video_page;
-        u8              video_mode;
-        u8              video_cols;
-        u16             video_ega_bx;
-        u8              video_lines;
-        u8              video_isvga;
-        u16             video_points;
-};
-
-/* describes how the ramdisk will be used in kernel */
-#define ATAG_RAMDISK    0x54410004
-
-struct tag_ramdisk {
-        u32 flags;      /* bit 0 = load, bit 1 = prompt */
-        u32 size;       /* decompressed ramdisk size in _kilo_ bytes */
-        u32 start;      /* starting block of floppy-based RAM disk image */
-};
-
-/* describes where the compressed ramdisk image lives */
-/*
- * this one accidentally used virtual addresses - as such,
- * it's deprecated.
- */
-#define ATAG_INITRD     0x54410005
-
-/* describes where the compressed ramdisk image lives */
-#define ATAG_INITRD2    0x54420005
-
-struct tag_initrd {
-        u32 start;      /* physical start address */
-        u32 size;       /* size of compressed ramdisk image in bytes */
-};
-
-/* board serial number. "64 bits should be enough for everybody" */
-#define ATAG_SERIAL     0x54410006
-
-struct tag_serialnr {
-        u32 low;
-        u32 high;
-};
-
-/* board revision */
-#define ATAG_REVISION   0x54410007
-
-struct tag_revision {
-        u32 rev;
-};
-
-/* initial values for vesafb-type framebuffers. see struct screen_info
- * in include/linux/tty.h
- */
-#define ATAG_VIDEOLFB   0x54410008
-
-struct tag_videolfb {
-        u16             lfb_width;
-        u16             lfb_height;
-        u16             lfb_depth;
-        u16             lfb_linelength;
-        u32             lfb_base;
-        u32             lfb_size;
-        u8              red_size;
-        u8              red_pos;
-        u8              green_size;
-        u8              green_pos;
-        u8              blue_size;
-        u8              blue_pos;
-        u8              rsvd_size;
-        u8              rsvd_pos;
-};
-
-/* command line: \0 terminated string */
-#define ATAG_CMDLINE    0x54410009
-
-struct tag_cmdline {
-        char    cmdline[1];     /* this is the minimum size */
-};
-
-/* acorn RiscPC specific information */
-#define ATAG_ACORN      0x41000101
-
-struct tag_acorn {
-        u32 memc_control_reg;
-        u32 vram_pages;
-        u8 sounddefault;
-        u8 adfsdrives;
-};
-
-/* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */
-#define ATAG_MEMCLK     0x41000402
-
-struct tag_memclk {
-        u32 fmemclk;
-};
-
-struct tag {
-        struct tag_header hdr;
-        union {
-                struct tag_core         core;
-                struct tag_mem32        mem;
-                struct tag_videotext    videotext;
-                struct tag_ramdisk      ramdisk;
-                struct tag_initrd       initrd;
-                struct tag_serialnr     serialnr;
-                struct tag_revision     revision;
-                struct tag_videolfb     videolfb;
-                struct tag_cmdline      cmdline;
-
-                /*
-                 * Acorn specific
-                 */
-                struct tag_acorn        acorn;
-
-                /*
-                 * DC21285 specific
-                 */
-                struct tag_memclk       memclk;
-        } u;
-};
-
-struct tagtable {
-        u32 tag;
-        int (*parse)(const struct tag *);
-};
-
-#define __tag __used __attribute__((__section__(".taglist")))
-#define __tagtable(tag, fn) \
-static struct tagtable __tagtable_##fn __tag = { tag, fn }
-
-#define tag_member_present(tag,member)                          \
-        ((unsigned long)(&((struct tag *)0L)->member + 1)       \
-                <= (tag)->hdr.size * 4)
-
-#define tag_next(t)     ((struct tag *)((u32 *)(t) + (t)->hdr.size))
-#define tag_size(type)  ((sizeof(struct tag_header) + sizeof(struct type)) >> 2)
-
-#define for_each_tag(t,base)            \
-        for (t = base; t->hdr.size; t = tag_next(t))
-
-/*
- * Memory map description
- */
-#define NR_BANKS 8
-
-struct meminfo {
-        int nr_banks;
-        unsigned long end;
-        struct {
-                unsigned long start;
-                unsigned long size;
-                int           node;
-        } bank[NR_BANKS];
-};
-
-extern struct meminfo meminfo;
-
-#endif  /*  __KERNEL__  */
-
-#endif
diff --git a/include/asm-arm26/shmbuf.h b/include/asm-arm26/shmbuf.h
deleted file mode 100644
index 2e5c67ba1c97..000000000000
--- a/include/asm-arm26/shmbuf.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _ASMARM_SHMBUF_H
-#define _ASMARM_SHMBUF_H
-
-/* 
- * The shmid64_ds structure for arm architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct shmid64_ds {
-        struct ipc64_perm       shm_perm;       /* operation perms */
-        size_t                  shm_segsz;      /* size of segment (bytes) */
-        __kernel_time_t         shm_atime;      /* last attach time */
-        unsigned long           __unused1;
-        __kernel_time_t         shm_dtime;      /* last detach time */
-        unsigned long           __unused2;
-        __kernel_time_t         shm_ctime;      /* last change time */
-        unsigned long           __unused3;
-        __kernel_pid_t          shm_cpid;       /* pid of creator */
-        __kernel_pid_t          shm_lpid;       /* pid of last operator */
-        unsigned long           shm_nattch;     /* no. of current attaches */
-        unsigned long           __unused4;
-        unsigned long           __unused5;
-};
-
-struct shminfo64 {
-        unsigned long   shmmax;
-        unsigned long   shmmin;
-        unsigned long   shmmni;
-        unsigned long   shmseg;
-        unsigned long   shmall;
-        unsigned long   __unused1;
-        unsigned long   __unused2;
-        unsigned long   __unused3;
-        unsigned long   __unused4;
-};
-
-#endif /* _ASMARM_SHMBUF_H */
diff --git a/include/asm-arm26/shmparam.h b/include/asm-arm26/shmparam.h
deleted file mode 100644
index d3748686631e..000000000000
--- a/include/asm-arm26/shmparam.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _ASMARM_SHMPARAM_H
-#define _ASMARM_SHMPARAM_H
-
-#ifndef SHMMAX
-#define SHMMAX          0x003fa000
-#endif
-
-/*
- * This should be the size of the virtually indexed cache/ways,
- * or page size, whichever is greater since the cache aliases
- * every size/ways bytes.
- */
-#define SHMLBA PAGE_SIZE                 /* attach addr a multiple of this */
-
-#endif /* _ASMARM_SHMPARAM_H */
diff --git a/include/asm-arm26/sigcontext.h b/include/asm-arm26/sigcontext.h
deleted file mode 100644
index 013ad2074fc7..000000000000
--- a/include/asm-arm26/sigcontext.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _ASMARM_SIGCONTEXT_H
-#define _ASMARM_SIGCONTEXT_H
-
-/*
- * Signal context structure - contains all info to do with the state
- * before the signal handler was invoked.  Note: only add new entries
- * to the end of the structure.
- */
-struct sigcontext {
-        unsigned long trap_no;
-        unsigned long error_code;
-        unsigned long oldmask;
-        unsigned long arm_r0;
-        unsigned long arm_r1;
-        unsigned long arm_r2;
-        unsigned long arm_r3;
-        unsigned long arm_r4;
-        unsigned long arm_r5;
-        unsigned long arm_r6;
-        unsigned long arm_r7;
-        unsigned long arm_r8;
-        unsigned long arm_r9;
-        unsigned long arm_r10;
-        unsigned long arm_fp;
-        unsigned long arm_ip;
-        unsigned long arm_sp;
-        unsigned long arm_lr;
-        unsigned long arm_pc;
-        unsigned long fault_address;
-};
-
-
-#endif
diff --git a/include/asm-arm26/siginfo.h b/include/asm-arm26/siginfo.h
deleted file mode 100644
index 5e21852e6039..000000000000
--- a/include/asm-arm26/siginfo.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASMARM_SIGINFO_H
-#define _ASMARM_SIGINFO_H
-
-#include <asm-generic/siginfo.h>
-
-#endif
diff --git a/include/asm-arm26/signal.h b/include/asm-arm26/signal.h
deleted file mode 100644
index 967ba4947e40..000000000000
--- a/include/asm-arm26/signal.h
+++ /dev/null
@@ -1,176 +0,0 @@
-#ifndef _ASMARM_SIGNAL_H
-#define _ASMARM_SIGNAL_H
-
-#include <linux/types.h>
-
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-
-#ifdef __KERNEL__
-/* Most things should be clean enough to redefine this at will, if care
-   is taken to make libc match.  */
-
-#define _NSIG           64
-#define _NSIG_BPW       32
-#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
-
-typedef unsigned long old_sigset_t;             /* at least 32 bits */
-
-typedef struct {
-        unsigned long sig[_NSIG_WORDS];
-} sigset_t;
-
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-#define NSIG            32
-typedef unsigned long sigset_t;
-
-#endif /* __KERNEL__ */
-
-#define SIGHUP           1
-#define SIGINT           2
-#define SIGQUIT          3
-#define SIGILL           4
-#define SIGTRAP          5
-#define SIGABRT          6
-#define SIGIOT           6
-#define SIGBUS           7
-#define SIGFPE           8
-#define SIGKILL          9
-#define SIGUSR1         10
-#define SIGSEGV         11
-#define SIGUSR2         12
-#define SIGPIPE         13
-#define SIGALRM         14
-#define SIGTERM         15
-#define SIGSTKFLT       16
-#define SIGCHLD         17
-#define SIGCONT         18
-#define SIGSTOP         19
-#define SIGTSTP         20
-#define SIGTTIN         21
-#define SIGTTOU         22
-#define SIGURG          23
-#define SIGXCPU         24
-#define SIGXFSZ         25
-#define SIGVTALRM       26
-#define SIGPROF         27
-#define SIGWINCH        28
-#define SIGIO           29
-#define SIGPOLL         SIGIO
-/*
-#define SIGLOST         29
-*/
-#define SIGPWR          30
-#define SIGSYS          31
-#define SIGUNUSED       31
-
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN        32
-#define SIGRTMAX        _NSIG
-
-#define SIGSWI          32
-
-/*
- * SA_FLAGS values:
- *
- * SA_NOCLDSTOP         flag to turn off SIGCHLD when children stop.
- * SA_NOCLDWAIT         flag on SIGCHLD to inhibit zombies.
- * SA_SIGINFO           deliver the signal with SIGINFO structs
- * SA_THIRTYTWO         delivers the signal in 32-bit mode, even if the task 
- *                      is running in 26-bit.
- * SA_ONSTACK           allows alternate signal stacks (see sigaltstack(2)).
- * SA_RESTART           flag to get restarting signals (which were the default long ago)
- * SA_NODEFER           prevents the current signal from being masked in the handler.
- * SA_RESETHAND         clears the handler when the signal is delivered.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_NOCLDSTOP    0x00000001
-#define SA_NOCLDWAIT    0x00000002 /* not supported yet */
-#define SA_SIGINFO      0x00000004
-#define SA_THIRTYTWO    0x02000000
-#define SA_RESTORER     0x04000000
-#define SA_ONSTACK      0x08000000
-#define SA_RESTART      0x10000000
-#define SA_NODEFER      0x40000000
-#define SA_RESETHAND    0x80000000
-
-#define SA_NOMASK       SA_NODEFER
-#define SA_ONESHOT      SA_RESETHAND
-
-
-/* 
- * sigaltstack controls
- */
-#define SS_ONSTACK      1
-#define SS_DISABLE      2
-
-#define MINSIGSTKSZ     2048
-#define SIGSTKSZ        8192
-
-#ifdef __KERNEL__
-#define SA_IRQNOMASK            0x08000000
-#endif
-
-#include <asm-generic/signal.h>
-
-#ifdef __KERNEL__
-struct old_sigaction {
-        __sighandler_t sa_handler;
-        old_sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-};
-
-struct sigaction {
-        __sighandler_t sa_handler;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-        sigset_t sa_mask;               /* mask last for extensibility */
-};
-
-struct k_sigaction {
-        struct sigaction sa;
-};
-
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-struct sigaction {
-        union {
-          __sighandler_t _sa_handler;
-          void (*_sa_sigaction)(int, struct siginfo *, void *);
-        } _u;
-        sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-};
-
-#define sa_handler      _u._sa_handler
-#define sa_sigaction    _u._sa_sigaction
-
-#endif /* __KERNEL__ */
-
-typedef struct sigaltstack {
-        void *ss_sp;
-        int ss_flags;
-        size_t ss_size;
-} stack_t;
-
-#ifdef __KERNEL__
-#include <asm/sigcontext.h>
-
-#define sigmask(sig)    (1UL << ((sig) - 1))
-#endif
-
-
-#ifdef __KERNEL__
-#include <asm/sigcontext.h>
-#define ptrace_signal_deliver(regs, cookie) do { } while (0)
-#endif
-
-
-#endif
diff --git a/include/asm-arm26/sizes.h b/include/asm-arm26/sizes.h
deleted file mode 100644
index f8d92ca12040..000000000000
--- a/include/asm-arm26/sizes.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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
- */
-/* DO NOT EDIT!! - this file automatically generated
- *                 from .s file by awk -f s2h.awk
- */
-/*  Size defintions
- *  Copyright (C) ARM Limited 1998. All rights reserved.
- */
-
-#ifndef __sizes_h
-#define __sizes_h                       1
-
-/* handy sizes */
-#define SZ_1K                           0x00000400
-#define SZ_4K                           0x00001000
-#define SZ_8K                           0x00002000
-#define SZ_16K                          0x00004000
-#define SZ_64K                          0x00010000
-#define SZ_128K                         0x00020000
-#define SZ_256K                         0x00040000
-#define SZ_512K                         0x00080000
-
-#define SZ_1M                           0x00100000
-#define SZ_2M                           0x00200000
-#define SZ_4M                           0x00400000
-#define SZ_8M                           0x00800000
-#define SZ_16M                          0x01000000
-#define SZ_32M                          0x02000000
-#define SZ_64M                          0x04000000
-#define SZ_128M                         0x08000000
-#define SZ_256M                         0x10000000
-#define SZ_512M                         0x20000000
-
-#define SZ_1G                           0x40000000
-#define SZ_2G                           0x80000000
-
-#endif
-
-/*         END */
diff --git a/include/asm-arm26/smp.h b/include/asm-arm26/smp.h
deleted file mode 100644
index 38349ec8b61b..000000000000
--- a/include/asm-arm26/smp.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __ASM_SMP_H
-#define __ASM_SMP_H
-
-
-#ifdef CONFIG_SMP
-#error SMP not supported
-#endif
-
-#endif
diff --git a/include/asm-arm26/socket.h b/include/asm-arm26/socket.h
deleted file mode 100644
index 65a1a64bf934..000000000000
--- a/include/asm-arm26/socket.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef _ASMARM_SOCKET_H
-#define _ASMARM_SOCKET_H
-
-#include <asm/sockios.h>
-
-/* For setsockopt(2) */
-#define SOL_SOCKET      1
-
-#define SO_DEBUG        1
-#define SO_REUSEADDR    2
-#define SO_TYPE         3
-#define SO_ERROR        4
-#define SO_DONTROUTE    5
-#define SO_BROADCAST    6
-#define SO_SNDBUF       7
-#define SO_RCVBUF       8
-#define SO_SNDBUFFORCE  32
-#define SO_RCVBUFFORCE  33
-#define SO_KEEPALIVE    9
-#define SO_OOBINLINE    10
-#define SO_NO_CHECK     11
-#define SO_PRIORITY     12
-#define SO_LINGER       13
-#define SO_BSDCOMPAT    14
-/* To add :#define SO_REUSEPORT 15 */
-#define SO_PASSCRED     16
-#define SO_PEERCRED     17
-#define SO_RCVLOWAT     18
-#define SO_SNDLOWAT     19
-#define SO_RCVTIMEO     20
-#define SO_SNDTIMEO     21
-
-/* Security levels - as per NRL IPv6 - don't actually do anything */
-#define SO_SECURITY_AUTHENTICATION              22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT        23
-#define SO_SECURITY_ENCRYPTION_NETWORK          24
-
-#define SO_BINDTODEVICE 25
-
-/* Socket filtering */
-#define SO_ATTACH_FILTER        26
-#define SO_DETACH_FILTER        27
-
-#define SO_PEERNAME             28
-#define SO_TIMESTAMP            29
-#define SCM_TIMESTAMP           SO_TIMESTAMP
-
-#define SO_ACCEPTCONN           30
-
-#define SO_PEERSEC              31
-#define SO_PASSSEC              34
-#define SO_TIMESTAMPNS          35
-#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
-
-#endif /* _ASM_SOCKET_H */
diff --git a/include/asm-arm26/sockios.h b/include/asm-arm26/sockios.h
deleted file mode 100644
index a2588a2512df..000000000000
--- a/include/asm-arm26/sockios.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __ARCH_ARM_SOCKIOS_H
-#define __ARCH_ARM_SOCKIOS_H
-
-/* Socket-level I/O control calls. */
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906          /* Get stamp (timeval) */
-#define SIOCGSTAMPNS    0x8907          /* Get stamp (timespec) */
-
-#endif
diff --git a/include/asm-arm26/spinlock.h b/include/asm-arm26/spinlock.h
deleted file mode 100644
index e92e81deb4fd..000000000000
--- a/include/asm-arm26/spinlock.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SPINLOCK_H
-#define __ASM_SPINLOCK_H
-
-#error ARM architecture does not support SMP spin locks
-
-#endif /* __ASM_SPINLOCK_H */
diff --git a/include/asm-arm26/stat.h b/include/asm-arm26/stat.h
deleted file mode 100644
index e4abc4fa0850..000000000000
--- a/include/asm-arm26/stat.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef _ASMARM_STAT_H
-#define _ASMARM_STAT_H
-
-struct __old_kernel_stat {
-        unsigned short st_dev;
-        unsigned short st_ino;
-        unsigned short st_mode;
-        unsigned short st_nlink;
-        unsigned short st_uid;
-        unsigned short st_gid;
-        unsigned short st_rdev;
-        unsigned long  st_size;
-        unsigned long  st_atime;
-        unsigned long  st_mtime;
-        unsigned long  st_ctime;
-};
-
-struct stat {
-        unsigned short st_dev;
-        unsigned short __pad1;
-        unsigned long st_ino;
-        unsigned short st_mode;
-        unsigned short st_nlink;
-        unsigned short st_uid;
-        unsigned short st_gid;
-        unsigned short st_rdev;
-        unsigned short __pad2;
-        unsigned long  st_size;
-        unsigned long  st_blksize;
-        unsigned long  st_blocks;
-        unsigned long  st_atime;
-        unsigned long  st_atime_nsec;
-        unsigned long  st_mtime;
-        unsigned long  st_mtime_nsec;
-        unsigned long  st_ctime;
-        unsigned long  st_ctime_nsec;
-        unsigned long  __unused4;
-        unsigned long  __unused5;
-};
-
-/* This matches struct stat64 in glibc2.1, hence the absolutely
- * insane amounts of padding around dev_t's.
- */
-struct stat64 {
-        unsigned long long  st_dev;
-        unsigned char   __pad0[4];
-
-#define STAT64_HAS_BROKEN_ST_INO        1
-        unsigned long   __st_ino;
-        unsigned int    st_mode;
-        unsigned int    st_nlink;
-
-        unsigned long   st_uid;
-        unsigned long   st_gid;
-
-        unsigned long long  st_rdev;
-        unsigned char   __pad3[4];
-
-        long long       st_size;
-        unsigned long   st_blksize;
-
-        unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
-        unsigned long   __pad4;         /* Future possible st_blocks hi bits */
-
-        unsigned long   st_atime;
-        unsigned long   st_atime_nsec;
-
-        unsigned long   st_mtime;
-        unsigned long   st_mtime_nsec;
-
-        unsigned long   st_ctime;
-        unsigned long   st_ctime_nsec;
-
-        unsigned long long      st_ino;
-};
-
-#endif
diff --git a/include/asm-arm26/statfs.h b/include/asm-arm26/statfs.h
deleted file mode 100644
index 776dbc8f7623..000000000000
--- a/include/asm-arm26/statfs.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _ASMARM_STATFS_H
-#define _ASMARM_STATFS_H
-
-//FIXME - this may not be appropriate for arm26. check it out.
-
-#include <asm-generic/statfs.h>
-
-#endif
diff --git a/include/asm-arm26/string.h b/include/asm-arm26/string.h
deleted file mode 100644
index 2a8ab162412f..000000000000
--- a/include/asm-arm26/string.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef __ASM_ARM_STRING_H
-#define __ASM_ARM_STRING_H
-
-/*
- * We don't do inline string functions, since the
- * optimised inline asm versions are not small.
- */
-
-#define __HAVE_ARCH_STRRCHR
-extern char * strrchr(const char * s, int c);
-
-#define __HAVE_ARCH_STRCHR
-extern char * strchr(const char * s, int c);
-
-#define __HAVE_ARCH_MEMCPY
-extern void * memcpy(void *, const void *, __kernel_size_t);
-
-#define __HAVE_ARCH_MEMMOVE
-extern void * memmove(void *, const void *, __kernel_size_t);
-
-#define __HAVE_ARCH_MEMCHR
-extern void * memchr(const void *, int, __kernel_size_t);
-
-#define __HAVE_ARCH_MEMZERO
-#define __HAVE_ARCH_MEMSET
-extern void * memset(void *, int, __kernel_size_t);
-
-extern void __memzero(void *ptr, __kernel_size_t n);
-
-#define memset(p,v,n)                                                   \
-        ({                                                              \
-                if ((n) != 0) {                                         \
-                        if (__builtin_constant_p((v)) && (v) == 0)      \
-                                __memzero((p),(n));                     \
-                        else                                            \
-                                memset((p),(v),(n));                    \
-                }                                                       \
-                (p);                                                    \
-        })
-
-#define memzero(p,n) ({ if ((n) != 0) __memzero((p),(n)); (p); })
-
-#endif
diff --git a/include/asm-arm26/suspend.h b/include/asm-arm26/suspend.h
deleted file mode 100644
index 5e4c1cc0c19d..000000000000
--- a/include/asm-arm26/suspend.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifdef _ASMARM_SUSPEND_H
-#define _ASMARM_SUSPEND_H
-
-#endif
diff --git a/include/asm-arm26/sysirq.h b/include/asm-arm26/sysirq.h
deleted file mode 100644
index 81dca90d9a3f..000000000000
--- a/include/asm-arm26/sysirq.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  linux/include/asm-arm/arch-arc/irqs.h
- *
- *  Copyright (C) 1996 Russell King, Dave Gilbert
- *
- * 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.
- *
- *  Modifications:
- *   04-04-1998 PJB     Merged arc and a5k versions
- */
-
-
-#if defined(CONFIG_ARCH_A5K)
-#define IRQ_PRINTER             0
-#define IRQ_BATLOW              1
-#define IRQ_FLOPPYINDEX         2
-#define IRQ_FLOPPYDISK          12
-#elif defined(CONFIG_ARCH_ARC)
-#define IRQ_PRINTERBUSY         0
-#define IRQ_SERIALRING          1
-#define IRQ_PRINTERACK          2
-#define IRQ_FLOPPYCHANGED       12
-#endif
-
-#define IRQ_VSYNCPULSE          3
-#define IRQ_POWERON             4
-#define IRQ_TIMER0              5
-#define IRQ_TIMER1              6
-#define IRQ_IMMEDIATE           7
-#define IRQ_EXPCARDFIQ          8
-#define IRQ_SOUNDCHANGE         9
-#define IRQ_SERIALPORT          10
-#define IRQ_HARDDISK            11
-#define IRQ_EXPANSIONCARD       13
-#define IRQ_KEYBOARDTX          14
-#define IRQ_KEYBOARDRX          15
-
-#if defined(CONFIG_ARCH_A5K)
-#define FIQ_SERIALPORT          4
-#elif defined(CONFIG_ARCH_ARC)
-#define FIQ_FLOPPYIRQ           1
-#define FIQ_FD1772              FIQ_FLOPPYIRQ
-#endif
-
-#define FIQ_FLOPPYDATA          0
-#define FIQ_ECONET              2
-#define FIQ_EXPANSIONCARD       6
-#define FIQ_FORCE               7
-
-#define IRQ_TIMER               IRQ_TIMER0
-
-/*
- * This is the offset of the FIQ "IRQ" numbers
- */
-#define FIQ_START               64
-
-#define irq_cannonicalize(i)    (i)
-
diff --git a/include/asm-arm26/system.h b/include/asm-arm26/system.h
deleted file mode 100644
index e09da5ff1f54..000000000000
--- a/include/asm-arm26/system.h
+++ /dev/null
@@ -1,247 +0,0 @@
-#ifndef __ASM_ARM_SYSTEM_H
-#define __ASM_ARM_SYSTEM_H
-
-#ifdef __KERNEL__
-
-
-/*
- * This is used to ensure the compiler did actually allocate the register we
- * asked it for some inline assembly sequences.  Apparently we can't trust
- * the compiler from one version to another so a bit of paranoia won't hurt.
- * This string is meant to be concatenated with the inline asm string and
- * will cause compilation to stop on mismatch. (From ARM32 - may come in handy)
- */
-#define __asmeq(x, y)  ".ifnc " x "," y " ; .err ; .endif\n\t"
-
-#ifndef __ASSEMBLY__
-
-#include <linux/linkage.h>
-
-struct thread_info;
-struct task_struct;
-
-#if 0
-/* information about the system we're running on */
-extern unsigned int system_rev;
-extern unsigned int system_serial_low;
-extern unsigned int system_serial_high;
-extern unsigned int mem_fclk_21285;
-
-FIXME - sort this
-/*
- * We need to turn the caches off before calling the reset vector - RiscOS
- * messes up if we don't
- */
-#define proc_hard_reset()       cpu_proc_fin()
-
-#endif
-
-struct pt_regs;
-
-void die(const char *msg, struct pt_regs *regs, int err)
-                __attribute__((noreturn));
-
-void die_if_kernel(const char *str, struct pt_regs *regs, int err);
-
-void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int,
-                                       struct pt_regs *),
-                     int sig, const char *name);
-
-#include <asm/proc-fns.h>
-
-#define xchg(ptr,x) \
-        ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-
-extern asmlinkage void __backtrace(void);
-
-#define set_cr(x)                                       \
-        __asm__ __volatile__(                           \
-        "mcr    p15, 0, %0, c1, c0, 0   @ set CR"       \
-        : : "r" (x) : "cc")
-
-#define get_cr()                                        \
-        ({                                              \
-        unsigned int __val;                             \
-        __asm__ __volatile__(                           \
-        "mrc    p15, 0, %0, c1, c0, 0   @ get CR"       \
-        : "=r" (__val) : : "cc");                       \
-        __val;                                          \
-        })
-
-extern unsigned long cr_no_alignment;   /* defined in entry-armv.S */
-extern unsigned long cr_alignment;      /* defined in entry-armv.S */
-
-#define UDBG_UNDEFINED  (1 << 0)
-#define UDBG_SYSCALL    (1 << 1)
-#define UDBG_BADABORT   (1 << 2)
-#define UDBG_SEGV       (1 << 3)
-#define UDBG_BUS        (1 << 4)
-
-extern unsigned int user_debug;
-
-#define vectors_base()  (0)
-
-#define mb() __asm__ __volatile__ ("" : : : "memory")
-#define rmb() mb()
-#define wmb() mb()
-#define nop() __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t");
-
-#define read_barrier_depends() do { } while(0)
-#define set_mb(var, value)  do { var = value; mb(); } while (0)
-
-/*
- * We assume knowledge of how
- * spin_unlock_irq() and friends are implemented.  This avoids
- * us needlessly decrementing and incrementing the preempt count.
- */
-#define prepare_arch_switch(next)       local_irq_enable()
-#define finish_arch_switch(prev)        spin_unlock(&(rq)->lock)
-
-/*
- * switch_to(prev, next) should switch from task `prev' to `next'
- * `prev' will never be the same as `next'.  schedule() itself
- * contains the memory barrier to tell GCC not to cache `current'.
- */
-extern struct task_struct *__switch_to(struct task_struct *, struct thread_info *, struct thread_info *);
-
-#define switch_to(prev,next,last)                                       \
-do {                                                                    \
-        last = __switch_to(prev,task_thread_info(prev),task_thread_info(next)); \
-} while (0)
-
-/*
- * Save the current interrupt enable state & disable IRQs
- */
-#define local_irq_save(x)                               \
-        do {                                            \
-          unsigned long temp;                           \
-          __asm__ __volatile__(                         \
-"       mov     %0, pc          @ save_flags_cli\n"     \
-"       orr     %1, %0, #0x08000000\n"                  \
-"       and     %0, %0, #0x0c000000\n"                  \
-"       teqp    %1, #0\n"                               \
-          : "=r" (x), "=r" (temp)                       \
-          :                                             \
-          : "memory");                                  \
-        } while (0)
-
-/*
- * Enable IRQs  (sti)
- */
-#define local_irq_enable()                                      \
-        do {                                    \
-          unsigned long temp;                   \
-          __asm__ __volatile__(                 \
-"       mov     %0, pc          @ sti\n"        \
-"       bic     %0, %0, #0x08000000\n"          \
-"       teqp    %0, #0\n"                       \
-          : "=r" (temp)                         \
-          :                                     \
-          : "memory");                          \
-        } while(0)
-
-/*
- * Disable IRQs (cli)
- */
-#define local_irq_disable()                                     \
-        do {                                    \
-          unsigned long temp;                   \
-          __asm__ __volatile__(                 \
-"       mov     %0, pc          @ cli\n"        \
-"       orr     %0, %0, #0x08000000\n"          \
-"       teqp    %0, #0\n"                       \
-          : "=r" (temp)                         \
-          :                                     \
-          : "memory");                          \
-        } while(0)
-
-/* Enable FIQs (stf) */
-
-#define __stf() do {                            \
-        unsigned long temp;                     \
-        __asm__ __volatile__(                   \
-"       mov     %0, pc          @ stf\n"        \
-"       bic     %0, %0, #0x04000000\n"          \
-"       teqp    %0, #0\n"                       \
-        : "=r" (temp));                         \
-    } while(0)
-
-/* Disable FIQs  (clf) */
-
-#define __clf() do {                            \
-        unsigned long temp;                     \
-        __asm__ __volatile__(                   \
-"       mov     %0, pc          @ clf\n"        \
-"       orr     %0, %0, #0x04000000\n"          \
-"       teqp    %0, #0\n"                       \
-        : "=r" (temp));                         \
-    } while(0)
-
-
-/*
- * Save the current interrupt enable state.
- */
-#define local_save_flags(x)                             \
-        do {                                    \
-          __asm__ __volatile__(                 \
-"       mov     %0, pc          @ save_flags\n" \
-"       and     %0, %0, #0x0c000000\n"          \
-          : "=r" (x));                          \
-        } while (0)
-
-
-/*
- * restore saved IRQ & FIQ state
- */
-#define local_irq_restore(x)                            \
-        do {                                            \
-          unsigned long temp;                           \
-          __asm__ __volatile__(                         \
-"       mov     %0, pc          @ restore_flags\n"      \
-"       bic     %0, %0, #0x0c000000\n"                  \
-"       orr     %0, %0, %1\n"                           \
-"       teqp    %0, #0\n"                               \
-          : "=&r" (temp)                                \
-          : "r" (x)                                     \
-          : "memory");                                  \
-        } while (0)
-
-
-#ifdef CONFIG_SMP
-#error SMP not supported
-#endif
-
-#define smp_mb()                barrier()
-#define smp_rmb()               barrier()
-#define smp_wmb()               barrier()
-#define smp_read_barrier_depends()              do { } while(0)
-
-#define clf()                   __clf()
-#define stf()                   __stf()
-
-#define irqs_disabled()                 \
-({                                      \
-        unsigned long flags;            \
-        local_save_flags(flags);        \
-        flags & PSR_I_BIT;              \
-})
-
-static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size)
-{
-        extern void __bad_xchg(volatile void *, int);
-
-        switch (size) {
-                case 1: return cpu_xchg_1(x, ptr);
-                case 4: return cpu_xchg_4(x, ptr);
-                default: __bad_xchg(ptr, size);
-        }
-        return 0;
-}
-
-#endif /* __ASSEMBLY__ */
-
-#define arch_align_stack(x) (x)
-
-#endif /* __KERNEL__ */
-
-#endif
diff --git a/include/asm-arm26/termbits.h b/include/asm-arm26/termbits.h
deleted file mode 100644
index 48d2f5c7bcb8..000000000000
--- a/include/asm-arm26/termbits.h
+++ /dev/null
@@ -1,196 +0,0 @@
-#ifndef __ASM_ARM_TERMBITS_H
-#define __ASM_ARM_TERMBITS_H
-
-typedef unsigned char   cc_t;
-typedef unsigned int    speed_t;
-typedef unsigned int    tcflag_t;
-
-#define NCCS 19
-struct termios {
-        tcflag_t c_iflag;               /* input mode flags */
-        tcflag_t c_oflag;               /* output mode flags */
-        tcflag_t c_cflag;               /* control mode flags */
-        tcflag_t c_lflag;               /* local mode flags */
-        cc_t c_line;                    /* line discipline */
-        cc_t c_cc[NCCS];                /* control characters */
-};
-
-struct termios2 {
-        tcflag_t c_iflag;               /* input mode flags */
-        tcflag_t c_oflag;               /* output mode flags */
-        tcflag_t c_cflag;               /* control mode flags */
-        tcflag_t c_lflag;               /* local mode flags */
-        cc_t c_line;                    /* line discipline */
-        cc_t c_cc[NCCS];                /* control characters */
-        speed_t c_ispeed;               /* input speed */
-        speed_t c_ospeed;               /* output speed */
-};
-
-struct ktermios {
-        tcflag_t c_iflag;               /* input mode flags */
-        tcflag_t c_oflag;               /* output mode flags */
-        tcflag_t c_cflag;               /* control mode flags */
-        tcflag_t c_lflag;               /* local mode flags */
-        cc_t c_line;                    /* line discipline */
-        cc_t c_cc[NCCS];                /* control characters */
-        speed_t c_ispeed;               /* input speed */
-        speed_t c_ospeed;               /* output speed */
-};
-
-/* c_cc characters */
-#define VINTR 0
-#define VQUIT 1
-#define VERASE 2
-#define VKILL 3
-#define VEOF 4
-#define VTIME 5
-#define VMIN 6
-#define VSWTC 7
-#define VSTART 8
-#define VSTOP 9
-#define VSUSP 10
-#define VEOL 11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE 14
-#define VLNEXT 15
-#define VEOL2 16
-
-/* c_iflag bits */
-#define IGNBRK  0000001
-#define BRKINT  0000002
-#define IGNPAR  0000004
-#define PARMRK  0000010
-#define INPCK   0000020
-#define ISTRIP  0000040
-#define INLCR   0000100
-#define IGNCR   0000200
-#define ICRNL   0000400
-#define IUCLC   0001000
-#define IXON    0002000
-#define IXANY   0004000
-#define IXOFF   0010000
-#define IMAXBEL 0020000
-#define IUTF8   0040000
-
-/* c_oflag bits */
-#define OPOST   0000001
-#define OLCUC   0000002
-#define ONLCR   0000004
-#define OCRNL   0000010
-#define ONOCR   0000020
-#define ONLRET  0000040
-#define OFILL   0000100
-#define OFDEL   0000200
-#define NLDLY   0000400
-#define   NL0   0000000
-#define   NL1   0000400
-#define CRDLY   0003000
-#define   CR0   0000000
-#define   CR1   0001000
-#define   CR2   0002000
-#define   CR3   0003000
-#define TABDLY  0014000
-#define   TAB0  0000000
-#define   TAB1  0004000
-#define   TAB2  0010000
-#define   TAB3  0014000
-#define   XTABS 0014000
-#define BSDLY   0020000
-#define   BS0   0000000
-#define   BS1   0020000
-#define VTDLY   0040000
-#define   VT0   0000000
-#define   VT1   0040000
-#define FFDLY   0100000
-#define   FF0   0000000
-#define   FF1   0100000
-
-/* c_cflag bit meaning */
-#define CBAUD   0010017
-#define  B0     0000000         /* hang up */
-#define  B50    0000001
-#define  B75    0000002
-#define  B110   0000003
-#define  B134   0000004
-#define  B150   0000005
-#define  B200   0000006
-#define  B300   0000007
-#define  B600   0000010
-#define  B1200  0000011
-#define  B1800  0000012
-#define  B2400  0000013
-#define  B4800  0000014
-#define  B9600  0000015
-#define  B19200 0000016
-#define  B38400 0000017
-#define EXTA B19200
-#define EXTB B38400
-#define CSIZE   0000060
-#define   CS5   0000000
-#define   CS6   0000020
-#define   CS7   0000040
-#define   CS8   0000060
-#define CSTOPB  0000100
-#define CREAD   0000200
-#define PARENB  0000400
-#define PARODD  0001000
-#define HUPCL   0002000
-#define CLOCAL  0004000
-#define CBAUDEX 0010000
-#define   BOTHER  0010000
-#define    B57600 0010001
-#define   B115200 0010002
-#define   B230400 0010003
-#define   B460800 0010004
-#define   B500000 0010005
-#define   B576000 0010006
-#define   B921600 0010007
-#define  B1000000 0010010
-#define  B1152000 0010011
-#define  B1500000 0010012
-#define  B2000000 0010013
-#define  B2500000 0010014
-#define  B3000000 0010015
-#define  B3500000 0010016
-#define  B4000000 0010017
-#define CIBAUD    002003600000          /* input baud rate */
-#define CMSPAR    010000000000          /* mark or space (stick) parity */
-#define CRTSCTS   020000000000          /* flow control */
-
-#define IBSHIFT   16            /* Shift from CBAUD to CIBAUD */
-
-/* c_lflag bits */
-#define ISIG    0000001
-#define ICANON  0000002
-#define XCASE   0000004
-#define ECHO    0000010
-#define ECHOE   0000020
-#define ECHOK   0000040
-#define ECHONL  0000100
-#define NOFLSH  0000200
-#define TOSTOP  0000400
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE  0004000
-#define FLUSHO  0010000
-#define PENDIN  0040000
-#define IEXTEN  0100000
-
-/* tcflow() and TCXONC use these */
-#define TCOOFF          0
-#define TCOON           1
-#define TCIOFF          2
-#define TCION           3
-
-/* tcflush() and TCFLSH use these */
-#define TCIFLUSH        0
-#define TCOFLUSH        1
-#define TCIOFLUSH       2
-
-/* tcsetattr uses these */
-#define TCSANOW         0
-#define TCSADRAIN       1
-#define TCSAFLUSH       2
-
-#endif  /* __ASM_ARM_TERMBITS_H */
diff --git a/include/asm-arm26/termios.h b/include/asm-arm26/termios.h
deleted file mode 100644
index 293e3f1bc3f2..000000000000
--- a/include/asm-arm26/termios.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef __ASM_ARM_TERMIOS_H
-#define __ASM_ARM_TERMIOS_H
-
-#include <asm/termbits.h>
-#include <asm/ioctls.h>
-
-struct winsize {
-        unsigned short ws_row;
-        unsigned short ws_col;
-        unsigned short ws_xpixel;
-        unsigned short ws_ypixel;
-};
-
-#define NCC 8
-struct termio {
-        unsigned short c_iflag;         /* input mode flags */
-        unsigned short c_oflag;         /* output mode flags */
-        unsigned short c_cflag;         /* control mode flags */
-        unsigned short c_lflag;         /* local mode flags */
-        unsigned char c_line;           /* line discipline */
-        unsigned char c_cc[NCC];        /* control characters */
-};
-
-#ifdef __KERNEL__
-/*      intr=^C         quit=^|         erase=del       kill=^U
-        eof=^D          vtime=\0        vmin=\1         sxtc=\0
-        start=^Q        stop=^S         susp=^Z         eol=\0
-        reprint=^R      discard=^U      werase=^W       lnext=^V
-        eol2=\0
-*/
-#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
-#endif
-
-/* modem lines */
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
-#ifdef __KERNEL__
-
-/*
- * Translate a "termio" structure into a "termios". Ugh.
- */
-#define SET_LOW_TERMIOS_BITS(termios, termio, x) {              \
-        unsigned short __tmp;                                   \
-        get_user(__tmp,&(termio)->x);                           \
-        *(unsigned short *) &(termios)->x = __tmp;              \
-}
-
-#define user_termio_to_kernel_termios(termios, termio) \
-({ \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_iflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_oflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_cflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_lflag); \
-        copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
-})
-
-/*
- * Translate a "termios" structure into a "termio". Ugh.
- */
-#define kernel_termios_to_user_termio(termio, termios) \
-({ \
-        put_user((termios)->c_iflag, &(termio)->c_iflag); \
-        put_user((termios)->c_oflag, &(termio)->c_oflag); \
-        put_user((termios)->c_cflag, &(termio)->c_cflag); \
-        put_user((termios)->c_lflag, &(termio)->c_lflag); \
-        put_user((termios)->c_line,  &(termio)->c_line); \
-        copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
-})
-
-#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
-#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
-#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
-
-#endif  /* __KERNEL__ */
-
-#endif  /* __ASM_ARM_TERMIOS_H */
diff --git a/include/asm-arm26/thread_info.h b/include/asm-arm26/thread_info.h
deleted file mode 100644
index 9b367ebe515d..000000000000
--- a/include/asm-arm26/thread_info.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *  linux/include/asm-arm26/thread_info.h
- *
- *  Copyright (C) 2002 Russell King.
- *  Copyright (C) 2003 Ian Molton.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_ARM_THREAD_INFO_H
-#define __ASM_ARM_THREAD_INFO_H
-
-#ifdef __KERNEL__
-
-#ifndef __ASSEMBLY__
-
-struct task_struct;
-struct exec_domain;
-
-#include <linux/compiler.h>
-#include <asm/fpstate.h>
-#include <asm/ptrace.h>
-#include <asm/types.h>
-
-typedef unsigned long mm_segment_t;
-
-struct cpu_context_save {
-        __u32   r4;
-        __u32   r5;
-        __u32   r6;
-        __u32   r7;
-        __u32   r8;
-        __u32   r9;
-        __u32   sl;
-        __u32   fp;
-        __u32   sp;
-        __u32   pc;
-};
-
-/*
- * low level task data that entry.S needs immediate access to.
- * We assume cpu_context follows immedately after cpu_domain.
- */
-struct thread_info {
-        unsigned long           flags;          /* low level flags */
-        int                     preempt_count;  /* 0 => preemptable, <0 => bug */
-        mm_segment_t            addr_limit;     /* address limit */
-        struct task_struct      *task;          /* main task structure */
-        struct exec_domain      *exec_domain;   /* execution domain */
-        __u32                   cpu;            /* cpu */
-        struct cpu_context_save cpu_context;    /* cpu context */
-        struct restart_block    restart_block;
-        union fp_state          fpstate;
-};
-
-#define INIT_THREAD_INFO(tsk)                   \
-{                                               \
-        .task           &tsk,                   \
-        .exec_domain    &default_exec_domain,   \
-        .flags          0,                      \
-        .preempt_count  0,                      \
-        .addr_limit     KERNEL_DS,              \
-        .restart_block  = {                             \
-                .fn     = do_no_restart_syscall,        \
-        },                                              \
-}
-
-#define init_thread_info        (init_thread_union.thread_info)
-#define init_stack              (init_thread_union.stack)
-
-/*
- * how to get the thread information struct from C
- */
-static inline struct thread_info *current_thread_info(void) __attribute_const__;
-
-static inline struct thread_info *current_thread_info(void)
-{
-        register unsigned long sp asm ("sp");
-        return (struct thread_info *)(sp & ~0x1fff);
-}
-
-#define THREAD_SIZE     PAGE_SIZE
-#define task_pt_regs(task) ((struct pt_regs *)(task_stack_page(task) + THREAD_SIZE - 8) - 1)
-
-extern struct thread_info *alloc_thread_info(struct task_struct *task);
-extern void free_thread_info(struct thread_info *);
-
-#define thread_saved_pc(tsk)    \
-        ((unsigned long)(pc_pointer(task_thread_info(tsk)->cpu_context.pc)))
-#define thread_saved_fp(tsk)    \
-        ((unsigned long)(task_thread_info(tsk)->cpu_context.fp))
-
-#else /* !__ASSEMBLY__ */
-
-#define TI_FLAGS        0
-#define TI_PREEMPT      4
-#define TI_ADDR_LIMIT   8
-#define TI_TASK         12
-#define TI_EXEC_DOMAIN  16
-#define TI_CPU          20
-#define TI_CPU_SAVE     24
-#define TI_RESTART_BLOCK 28
-#define TI_FPSTATE      68
-
-#endif
-
-#define PREEMPT_ACTIVE  0x04000000
-
-/*
- * thread information flags:
- *  TIF_SYSCALL_TRACE   - syscall trace active
- *  TIF_NOTIFY_RESUME   - resumption notification requested
- *  TIF_SIGPENDING      - signal pending
- *  TIF_NEED_RESCHED    - rescheduling necessary
- *  TIF_USEDFPU         - FPU was used by this task this quantum (SMP)
- *  TIF_POLLING_NRFLAG  - true if poll_idle() is polling TIF_NEED_RESCHED
- */
-#define TIF_NOTIFY_RESUME       0
-#define TIF_SIGPENDING          1
-#define TIF_NEED_RESCHED        2
-#define TIF_SYSCALL_TRACE       8
-#define TIF_USED_FPU            16
-#define TIF_POLLING_NRFLAG      17
-#define TIF_MEMDIE              18
-
-#define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
-#define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
-#define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
-#define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
-#define _TIF_USED_FPU           (1 << TIF_USED_FPU)
-#define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
-
-/*
- * Change these and you break ASM code in entry-common.S
- */
-#define _TIF_WORK_MASK          0x000000ff
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_ARM_THREAD_INFO_H */
diff --git a/include/asm-arm26/timex.h b/include/asm-arm26/timex.h
deleted file mode 100644
index 68322fbc1aed..000000000000
--- a/include/asm-arm26/timex.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  linux/include/asm-arm/timex.h
- *
- *  Copyright (C) 1997,1998 Russell King
- *
- * 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.
- *
- *  Architecture Specific TIME specifications
- */
-#ifndef _ASMARM_TIMEX_H
-#define _ASMARM_TIMEX_H
-
-/*
- * On the RiscPC, the clock ticks at 2MHz.
- */
-#define CLOCK_TICK_RATE         2000000
-
-/* IS THAT RIGHT ON A5000? FIXME */
-
-typedef unsigned long cycles_t;
-
-static inline cycles_t get_cycles (void)
-{
-        return 0;
-}
-
-#endif
diff --git a/include/asm-arm26/tlb.h b/include/asm-arm26/tlb.h
deleted file mode 100644
index 08ddd85b8d35..000000000000
--- a/include/asm-arm26/tlb.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef __ASMARM_TLB_H
-#define __ASMARM_TLB_H
-
-#include <asm/pgalloc.h>
-#include <asm/tlbflush.h>
-
-/*
- * TLB handling.  This allows us to remove pages from the page
- * tables, and efficiently handle the TLB issues.
- */
-struct mmu_gather {
-        struct mm_struct        *mm;
-        unsigned int            need_flush;
-        unsigned int            fullmm;
-};
-
-DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
-
-static inline struct mmu_gather *
-tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
-{
-        struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);
-
-        tlb->mm = mm;
-        tlb->need_flush = 0;
-        tlb->fullmm = full_mm_flush;
-
-        return tlb;
-}
-
-static inline void
-tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
-{
-        if (tlb->need_flush)
-                flush_tlb_mm(tlb->mm);
-
-        /* keep the page table cache within bounds */
-        check_pgt_cache();
-
-        put_cpu_var(mmu_gathers);
-}
-
-#define tlb_remove_tlb_entry(tlb,ptep,address)  do { } while (0)
-//#define tlb_start_vma(tlb,vma)                  do { } while (0)
-//FIXME - ARM32 uses this now that things changed in the kernel. seems like it may be pointless on arm26, however to get things compiling...
-#define tlb_start_vma(tlb,vma)                                          \
-        do {                                                            \
-                if (!tlb->fullmm)                                       \
-                        flush_cache_range(vma, vma->vm_start, vma->vm_end); \
-        } while (0)
-#define tlb_end_vma(tlb,vma)                    do { } while (0)
-
-static inline void
-tlb_remove_page(struct mmu_gather *tlb, struct page *page)
-{
-        tlb->need_flush = 1;
-        free_page_and_swap_cache(page);
-}
-
-#define pte_free_tlb(tlb,ptep)          pte_free(ptep)
-#define pmd_free_tlb(tlb,pmdp)          pmd_free(pmdp)
-
-#endif
diff --git a/include/asm-arm26/tlbflush.h b/include/asm-arm26/tlbflush.h
deleted file mode 100644
index f79c1cbf4f69..000000000000
--- a/include/asm-arm26/tlbflush.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef __ASMARM_TLBFLUSH_H
-#define __ASMARM_TLBFLUSH_H
-
-/*
- * TLB flushing:
- *
- *  - flush_tlb_all() flushes all processes TLBs
- *  - flush_tlb_mm(mm) flushes the specified mm context TLB's
- *  - flush_tlb_page(vma, vmaddr) flushes one page
- *  - flush_tlb_range(vma, start, end) flushes a range of pages
- */
-
-#define flush_tlb_all()                         memc_update_all()
-#define flush_tlb_mm(mm)                        memc_update_mm(mm)
-#define flush_tlb_page(vma, vmaddr)             do { printk("flush_tlb_page\n");} while (0)  // IS THIS RIGHT?
-#define flush_tlb_range(vma,start,end)          \
-                do { memc_update_mm(vma->vm_mm); (void)(start); (void)(end); } while (0)
-#define flush_tlb_pgtables(mm,start,end)        do { printk("flush_tlb_pgtables\n");} while (0)
-#define flush_tlb_kernel_range(s,e)             do { printk("flush_tlb_range\n");} while (0)
-
-/*
- * The following handle the weird MEMC chip
- */
-static inline void memc_update_all(void)
-{
-        struct task_struct *p;
-        cpu_memc_update_all(init_mm.pgd);
-        for_each_process(p) {
-                if (!p->mm)
-                        continue;
-                cpu_memc_update_all(p->mm->pgd);
-        }
-        processor._set_pgd(current->active_mm->pgd);
-}
-
-static inline void memc_update_mm(struct mm_struct *mm)
-{
-        cpu_memc_update_all(mm->pgd);
-
-        if (mm == current->active_mm)
-                processor._set_pgd(mm->pgd);
-}
-
-static inline void
-memc_clear(struct mm_struct *mm, struct page *page)
-{
-        cpu_memc_update_entry(mm->pgd, (unsigned long) page_address(page), 0);
-
-        if (mm == current->active_mm)
-                processor._set_pgd(mm->pgd);
-}
-
-static inline void
-memc_update_addr(struct mm_struct *mm, pte_t pte, unsigned long vaddr)
-{
-        cpu_memc_update_entry(mm->pgd, pte_val(pte), vaddr);
-
-        if (mm == current->active_mm)
-                processor._set_pgd(mm->pgd);
-}
-
-static inline void
-update_mmu_cache(struct vm_area_struct *vma, unsigned long addr, pte_t pte)
-{
-        struct mm_struct *mm = vma->vm_mm;
-printk("update_mmu_cache\n");
-        memc_update_addr(mm, pte, addr);
-}
-
-#endif
diff --git a/include/asm-arm26/topology.h b/include/asm-arm26/topology.h
deleted file mode 100644
index accbd7cad9b5..000000000000
--- a/include/asm-arm26/topology.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_ARM_TOPOLOGY_H
-#define _ASM_ARM_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* _ASM_ARM_TOPOLOGY_H */
diff --git a/include/asm-arm26/types.h b/include/asm-arm26/types.h
deleted file mode 100644
index 81bd357ada02..000000000000
--- a/include/asm-arm26/types.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef __ASM_ARM_TYPES_H
-#define __ASM_ARM_TYPES_H
-
-#ifndef __ASSEMBLY__
-
-typedef unsigned short umode_t;
-
-/*
- * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
- * header files exported to user space
- */
-
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
-
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
-
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
-#endif
-
-#endif /* __ASSEMBLY__ */
-
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-
-#define BITS_PER_LONG 32
-
-#ifndef __ASSEMBLY__
-
-typedef signed char s8;
-typedef unsigned char u8;
-
-typedef signed short s16;
-typedef unsigned short u16;
-
-typedef signed int s32;
-typedef unsigned int u32;
-
-typedef signed long long s64;
-typedef unsigned long long u64;
-
-/* Dma addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
-typedef u32 dma64_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
-
-#endif
diff --git a/include/asm-arm26/uaccess-asm.h b/include/asm-arm26/uaccess-asm.h
deleted file mode 100644
index ade76ec02995..000000000000
--- a/include/asm-arm26/uaccess-asm.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *  linux/include/asm-arm/proc-armo/uaccess.h
- *
- *  Copyright (C) 1996 Russell King
- *
- * 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.
- */
-
-/*
- * The fs functions are implemented on the ARM2 and ARM3 architectures
- * manually.
- * Use *_user functions to access user memory with faulting behaving
- *   as though the user is accessing the memory.
- * Use set_fs(get_ds()) and then the *_user functions to allow them to
- *   access kernel memory.
- */
-
-/*
- * These are the values used to represent the user `fs' and the kernel `ds'
- * FIXME - the KERNEL_DS should end at 0x03000000 but we want to access ROM at
- * 0x03400000. ideally we want to forbid access to the IO space inbetween.
- */
-#define KERNEL_DS       0x03FFFFFF
-#define USER_DS         0x02000000
-
-extern uaccess_t uaccess_user, uaccess_kernel;
-
-static inline void set_fs (mm_segment_t fs)
-{
-        current_thread_info()->addr_limit = fs;
-        current->thread.uaccess = (fs == USER_DS ? &uaccess_user : &uaccess_kernel);
-}
-
-#define __range_ok(addr,size) ({                                        \
-        unsigned long flag, roksum;                                     \
-        __asm__ __volatile__("subs %1, %0, %3; cmpcs %1, %2; movcs %0, #0" \
-                : "=&r" (flag), "=&r" (roksum)                          \
-                : "r" (addr), "Ir" (size), "0" (current_thread_info()->addr_limit)      \
-                : "cc");                                                \
-        flag; })
-
-#define __addr_ok(addr) ({                                              \
-        unsigned long flag;                                             \
-        __asm__ __volatile__("cmp %2, %0; movlo %0, #0"                 \
-                : "=&r" (flag)                                          \
-                : "0" (current_thread_info()->addr_limit), "r" (addr)   \
-                : "cc");                                                \
-        (flag == 0); })
-
-#define __put_user_asm_byte(x,addr,err)                                 \
-        __asm__ __volatile__(                                           \
-        "       mov     r0, %1\n"                                       \
-        "       mov     r1, %2\n"                                       \
-        "       mov     r2, %0\n"                                       \
-        "       mov     lr, pc\n"                                       \
-        "       mov     pc, %3\n"                                       \
-        "       mov     %0, r2\n"                                       \
-        : "=r" (err)                                                    \
-        : "r" (x), "r" (addr), "r" (current->thread.uaccess->put_byte), \
-          "0" (err)                                                     \
-        : "r0", "r1", "r2", "lr")
-
-#define __put_user_asm_half(x,addr,err)                                 \
-        __asm__ __volatile__(                                           \
-        "       mov     r0, %1\n"                                       \
-        "       mov     r1, %2\n"                                       \
-        "       mov     r2, %0\n"                                       \
-        "       mov     lr, pc\n"                                       \
-        "       mov     pc, %3\n"                                       \
-        "       mov     %0, r2\n"                                       \
-        : "=r" (err)                                                    \
-        : "r" (x), "r" (addr), "r" (current->thread.uaccess->put_half), \
-          "0" (err)                                                     \
-        : "r0", "r1", "r2", "lr")
-
-#define __put_user_asm_word(x,addr,err)                                 \
-        __asm__ __volatile__(                                           \
-        "       mov     r0, %1\n"                                       \
-        "       mov     r1, %2\n"                                       \
-        "       mov     r2, %0\n"                                       \
-        "       mov     lr, pc\n"                                       \
-        "       mov     pc, %3\n"                                       \
-        "       mov     %0, r2\n"                                       \
-        : "=r" (err)                                                    \
-        : "r" (x), "r" (addr), "r" (current->thread.uaccess->put_word), \
-          "0" (err)                                                     \
-        : "r0", "r1", "r2", "lr")
-
-#define __put_user_asm_dword(x,addr,err)                                 \
-        __asm__ __volatile__(                                           \
-        "       mov     r0, %1\n"                                       \
-        "       mov     r1, %2\n"                                       \
-        "       mov     r2, %0\n"                                       \
-        "       mov     lr, pc\n"                                       \
-        "       mov     pc, %3\n"                                       \
-        "       mov     %0, r2\n"                                       \
-        : "=r" (err)                                                    \
-        : "r" (x), "r" (addr), "r" (current->thread.uaccess->put_dword), \
-          "0" (err)                                                     \
-        : "r0", "r1", "r2", "lr")
-
-#define __get_user_asm_byte(x,addr,err)                                 \
-        __asm__ __volatile__(                                           \
-        "       mov     r0, %2\n"                                       \
-        "       mov     r1, %0\n"                                       \
-        "       mov     lr, pc\n"                                       \
-        "       mov     pc, %3\n"                                       \
-        "       mov     %0, r1\n"                                       \
-        "       mov     %1, r0\n"                                       \
-        : "=r" (err), "=r" (x)                                          \
-        : "r" (addr), "r" (current->thread.uaccess->get_byte), "0" (err)        \
-        : "r0", "r1", "r2", "lr")
-
-#define __get_user_asm_half(x,addr,err)                                 \
-        __asm__ __volatile__(                                           \
-        "       mov     r0, %2\n"                                       \
-        "       mov     r1, %0\n"                                       \
-        "       mov     lr, pc\n"                                       \
-        "       mov     pc, %3\n"                                       \
-        "       mov     %0, r1\n"                                       \
-        "       mov     %1, r0\n"                                       \
-        : "=r" (err), "=r" (x)                                          \
-        : "r" (addr), "r" (current->thread.uaccess->get_half), "0" (err)        \
-        : "r0", "r1", "r2", "lr")
-
-#define __get_user_asm_word(x,addr,err)                                 \
-        __asm__ __volatile__(                                           \
-        "       mov     r0, %2\n"                                       \
-        "       mov     r1, %0\n"                                       \
-        "       mov     lr, pc\n"                                       \
-        "       mov     pc, %3\n"                                       \
-        "       mov     %0, r1\n"                                       \
-        "       mov     %1, r0\n"                                       \
-        : "=r" (err), "=r" (x)                                          \
-        : "r" (addr), "r" (current->thread.uaccess->get_word), "0" (err)        \
-        : "r0", "r1", "r2", "lr")
-
-#define __do_copy_from_user(to,from,n)                                  \
-        (n) = current->thread.uaccess->copy_from_user((to),(from),(n))
-
-#define __do_copy_to_user(to,from,n)                                    \
-        (n) = current->thread.uaccess->copy_to_user((to),(from),(n))
-
-#define __do_clear_user(addr,sz)                                        \
-        (sz) = current->thread.uaccess->clear_user((addr),(sz))
-
-#define __do_strncpy_from_user(dst,src,count,res)                       \
-        (res) = current->thread.uaccess->strncpy_from_user(dst,src,count)
-
-#define __do_strnlen_user(s,n,res)                                      \
-        (res) = current->thread.uaccess->strnlen_user(s,n)
diff --git a/include/asm-arm26/uaccess.h b/include/asm-arm26/uaccess.h
deleted file mode 100644
index d64ed84cb2d3..000000000000
--- a/include/asm-arm26/uaccess.h
+++ /dev/null
@@ -1,293 +0,0 @@
-#ifndef _ASMARM_UACCESS_H
-#define _ASMARM_UACCESS_H
-
-/*
- * User space memory access functions
- */
-#include <linux/sched.h>
-#include <asm/errno.h>
-
-#define VERIFY_READ 0
-#define VERIFY_WRITE 1
-
-/*
- * The exception table consists of pairs of addresses: the first is the
- * address of an instruction that is allowed to fault, and the second is
- * the address at which the program should continue.  No registers are
- * modified, so it is entirely up to the continuation code to figure out
- * what to do.
- *
- * All the routines below use bits of fixup code that are out of line
- * with the main instruction path.  This means when everything is well,
- * we don't even have to jump over them.  Further, they do not intrude
- * on our cache or tlb entries.
- */
-
-struct exception_table_entry
-{
-        unsigned long insn, fixup;
-};
-
-/* Returns 0 if exception not found and fixup otherwise.  */
-extern unsigned long search_exception_table(unsigned long);
-extern int fixup_exception(struct pt_regs *regs);
-
-#define get_ds()        (KERNEL_DS)
-#define get_fs()        (current_thread_info()->addr_limit)
-#define segment_eq(a,b) ((a) == (b))
-
-#include <asm/uaccess-asm.h>
-
-#define access_ok(type,addr,size)       (__range_ok(addr,size) == 0)
-
-/*
- * Single-value transfer routines.  They automatically use the right
- * size if we just have the right pointer type.  Note that the functions
- * which read from user space (*get_*) need to take care not to leak
- * kernel data even if the calling code is buggy and fails to check
- * the return value.  This means zeroing out the destination variable
- * or buffer on error.  Normally this is done out of line by the
- * fixup code, but there are a few places where it intrudes on the
- * main code path.  When we only write to user space, there is no
- * problem.
- *
- * The "__xxx" versions of the user access functions do not verify the
- * address space - it must have been done previously with a separate
- * "access_ok()" call.
- *
- * The "xxx_error" versions set the third argument to EFAULT if an
- * error occurs, and leave it unchanged on success.  Note that these
- * versions are void (ie, don't return a value as such).
- */
-
-extern int __get_user_1(void *);
-extern int __get_user_2(void *);
-extern int __get_user_4(void *);
-extern int __get_user_8(void *);
-extern int __get_user_bad(void);
-
-#define __get_user_x(__r1,__p,__e,__s,__i...)                           \
-           __asm__ __volatile__ ("bl    __get_user_" #__s               \
-                : "=&r" (__e), "=r" (__r1)                              \
-                : "0" (__p)                                             \
-                : __i)
-
-#define get_user(x,p)                                                   \
-        ({                                                              \
-                register const typeof(*(p)) *__p asm("r0") = (p);       \
-                register typeof(*(p)) __r1 asm("r1");                   \
-                register int __e asm("r0");                             \
-                switch (sizeof(*(p))) {                                 \
-                case 1:                                                 \
-                        __get_user_x(__r1, __p, __e, 1, "lr");          \
-                        break;                                          \
-                case 2:                                                 \
-                        __get_user_x(__r1, __p, __e, 2, "r2", "lr");    \
-                        break;                                          \
-                case 4:                                                 \
-                        __get_user_x(__r1, __p, __e, 4, "lr");          \
-                        break;                                          \
-                case 8:                                                 \
-                        __get_user_x(__r1, __p, __e, 8, "lr");          \
-                        break;                                          \
-                default: __e = __get_user_bad(); break;                 \
-                }                                                       \
-                x = __r1;                                               \
-                __e;                                                    \
-        })
-
-
-#define __get_user(x,ptr)                                               \
-({                                                                      \
-        long __gu_err = 0;                                              \
-        __get_user_err((x),(ptr),__gu_err);                             \
-        __gu_err;                                                       \
-})
-
-#define __get_user_error(x,ptr,err)                                     \
-({                                                                      \
-        __get_user_err((x),(ptr),err);                                  \
-        (void) 0;                                                       \
-})
-
-#define __get_user_err(x,ptr,err)                                       \
-do {                                                                    \
-        unsigned long __gu_addr = (unsigned long)(ptr);                 \
-        unsigned long __gu_val;                                         \
-        switch (sizeof(*(ptr))) {                                       \
-        case 1: __get_user_asm_byte(__gu_val,__gu_addr,err);    break;  \
-        case 2: __get_user_asm_half(__gu_val,__gu_addr,err);    break;  \
-        case 4: __get_user_asm_word(__gu_val,__gu_addr,err);    break;  \
-        default: (__gu_val) = __get_user_bad();                         \
-        }                                                               \
-        (x) = (__typeof__(*(ptr)))__gu_val;                             \
-} while (0)
-
-extern int __put_user_1(void *, unsigned int);
-extern int __put_user_2(void *, unsigned int);
-extern int __put_user_4(void *, unsigned int);
-extern int __put_user_8(void *, unsigned long long);
-extern int __put_user_bad(void);
-
-#define __put_user_x(__r1,__p,__e,__s)                                  \
-           __asm__ __volatile__ (                                       \
-                __asmeq("%0", "r0") __asmeq("%2", "r1")                 \
-                "bl     __put_user_" #__s                               \
-                : "=&r" (__e)                                           \
-                : "0" (__p), "r" (__r1)                                 \
-                : "ip", "lr", "cc")
-
-#define put_user(x,p)                                                   \
-        ({                                                              \
-                register const typeof(*(p)) __r1 asm("r1") = (x);       \
-                register const typeof(*(p)) *__p asm("r0") = (p);       \
-                register int __e asm("r0");                             \
-                switch (sizeof(*(__p))) {                               \
-                case 1:                                                 \
-                        __put_user_x(__r1, __p, __e, 1);                \
-                        break;                                          \
-                case 2:                                                 \
-                        __put_user_x(__r1, __p, __e, 2);                \
-                        break;                                          \
-                case 4:                                                 \
-                        __put_user_x(__r1, __p, __e, 4);                \
-                        break;                                          \
-                case 8:                                                 \
-                        __put_user_x(__r1, __p, __e, 8);                \
-                        break;                                          \
-                default: __e = __put_user_bad(); break;                 \
-                }                                                       \
-                __e;                                                    \
-        })
-
-#if 0
-/*********************   OLD METHOD *******************/
-#define __put_user_x(__r1,__p,__e,__s,__i...)                           \
-           __asm__ __volatile__ ("bl    __put_user_" #__s               \
-                : "=&r" (__e)                                           \
-                : "0" (__p), "r" (__r1)                                 \
-                : __i)
-
-#define put_user(x,p)                                                   \
-        ({                                                              \
-                register const typeof(*(p)) __r1 asm("r1") = (x);       \
-                register const typeof(*(p)) *__p asm("r0") = (p);       \
-                register int __e asm("r0");                             \
-                switch (sizeof(*(p))) {                                 \
-                case 1:                                                 \
-                        __put_user_x(__r1, __p, __e, 1, "r2", "lr");    \
-                        break;                                          \
-                case 2:                                                 \
-                        __put_user_x(__r1, __p, __e, 2, "r2", "lr");    \
-                        break;                                          \
-                case 4:                                                 \
-                        __put_user_x(__r1, __p, __e, 4, "r2", "lr");    \
-                        break;                                          \
-                case 8:                                                 \
-                        __put_user_x(__r1, __p, __e, 8, "r2", "ip", "lr");      \
-                        break;                                          \
-                default: __e = __put_user_bad(); break;                 \
-                }                                                       \
-                __e;                                                    \
-        })
-/*************************************************/
-#endif
-
-#define __put_user(x,ptr)                                               \
-({                                                                      \
-        long __pu_err = 0;                                              \
-        __put_user_err((x),(ptr),__pu_err);                             \
-        __pu_err;                                                       \
-})
-
-#define __put_user_error(x,ptr,err)                                     \
-({                                                                      \
-        __put_user_err((x),(ptr),err);                                  \
-        (void) 0;                                                       \
-})
-
-#define __put_user_err(x,ptr,err)                                       \
-do {                                                                    \
-        unsigned long __pu_addr = (unsigned long)(ptr);                 \
-        __typeof__(*(ptr)) __pu_val = (x);                              \
-        switch (sizeof(*(ptr))) {                                       \
-        case 1: __put_user_asm_byte(__pu_val,__pu_addr,err);    break;  \
-        case 2: __put_user_asm_half(__pu_val,__pu_addr,err);    break;  \
-        case 4: __put_user_asm_word(__pu_val,__pu_addr,err);    break;  \
-        case 8: __put_user_asm_dword(__pu_val,__pu_addr,err);   break;  \
-        default: __put_user_bad();                                      \
-        }                                                               \
-} while (0)
-
-static __inline__ unsigned long copy_from_user(void *to, const void *from, unsigned long n)
-{
-        if (access_ok(VERIFY_READ, from, n))
-                __do_copy_from_user(to, from, n);
-        else /* security hole - plug it */
-                memzero(to, n);
-        return n;
-}
-
-static __inline__ unsigned long __copy_from_user(void *to, const void *from, unsigned long n)
-{
-        __do_copy_from_user(to, from, n);
-        return n;
-}
-
-static __inline__ unsigned long copy_to_user(void *to, const void *from, unsigned long n)
-{
-        if (access_ok(VERIFY_WRITE, to, n))
-                __do_copy_to_user(to, from, n);
-        return n;
-}
-
-static __inline__ unsigned long __copy_to_user(void *to, const void *from, unsigned long n)
-{
-        __do_copy_to_user(to, from, n);
-        return n;
-}
-
-#define __copy_to_user_inatomic __copy_to_user
-#define __copy_from_user_inatomic __copy_from_user
-
-static __inline__ unsigned long clear_user (void *to, unsigned long n)
-{
-        if (access_ok(VERIFY_WRITE, to, n))
-                __do_clear_user(to, n);
-        return n;
-}
-
-static __inline__ unsigned long __clear_user (void *to, unsigned long n)
-{
-        __do_clear_user(to, n);
-        return n;
-}
-
-static __inline__ long strncpy_from_user (char *dst, const char *src, long count)
-{
-        long res = -EFAULT;
-        if (access_ok(VERIFY_READ, src, 1))
-                __do_strncpy_from_user(dst, src, count, res);
-        return res;
-}
-
-static __inline__ long __strncpy_from_user (char *dst, const char *src, long count)
-{
-        long res;
-        __do_strncpy_from_user(dst, src, count, res);
-        return res;
-}
-
-#define strlen_user(s)  strnlen_user(s, ~0UL >> 1)
-
-static inline long strnlen_user(const char *s, long n)
-{
-        unsigned long res = 0;
-
-        if (__addr_ok(s))
-                __do_strnlen_user(s, n, res);
-
-        return res;
-}
-
-#endif /* _ASMARM_UACCESS_H */
diff --git a/include/asm-arm26/ucontext.h b/include/asm-arm26/ucontext.h
deleted file mode 100644
index f853130137cc..000000000000
--- a/include/asm-arm26/ucontext.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASMARM_UCONTEXT_H
-#define _ASMARM_UCONTEXT_H
-
-struct ucontext {
-        unsigned long     uc_flags;
-        struct ucontext  *uc_link;
-        stack_t           uc_stack;
-        struct sigcontext uc_mcontext;
-        sigset_t          uc_sigmask;   /* mask last for extensibility */
-};
-
-#endif /* !_ASMARM_UCONTEXT_H */
diff --git a/include/asm-arm26/unaligned.h b/include/asm-arm26/unaligned.h
deleted file mode 100644
index d992782089fd..000000000000
--- a/include/asm-arm26/unaligned.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef __ASM_ARM_UNALIGNED_H
-#define __ASM_ARM_UNALIGNED_H
-
-#include <asm/types.h>
-
-extern int __bug_unaligned_x(void *ptr);
-
-/*
- * What is the most efficient way of loading/storing an unaligned value?
- *
- * That is the subject of this file.  Efficiency here is defined as
- * minimum code size with minimum register usage for the common cases.
- * It is currently not believed that long longs are common, so we
- * trade efficiency for the chars, shorts and longs against the long
- * longs.
- *
- * Current stats with gcc 2.7.2.2 for these functions:
- *
- *      ptrsize get:    code    regs    put:    code    regs
- *      1               1       1               1       2
- *      2               3       2               3       2
- *      4               7       3               7       3
- *      8               20      6               16      6
- *
- * gcc 2.95.1 seems to code differently:
- *
- *      ptrsize get:    code    regs    put:    code    regs
- *      1               1       1               1       2
- *      2               3       2               3       2
- *      4               7       4               7       4
- *      8               19      8               15      6
- *
- * which may or may not be more efficient (depending upon whether
- * you can afford the extra registers).  Hopefully the gcc 2.95
- * is inteligent enough to decide if it is better to use the
- * extra register, but evidence so far seems to suggest otherwise.
- *
- * Unfortunately, gcc is not able to optimise the high word
- * out of long long >> 32, or the low word from long long << 32
- */
-
-#define __get_unaligned_2_le(__p)                                       \
-        (__p[0] | __p[1] << 8)
-
-#define __get_unaligned_4_le(__p)                                       \
-        (__p[0] | __p[1] << 8 | __p[2] << 16 | __p[3] << 24)
-
-#define __get_unaligned_le(ptr)                                 \
-        ({                                                      \
-                __typeof__(*(ptr)) __v;                         \
-                __u8 *__p = (__u8 *)(ptr);                      \
-                switch (sizeof(*(ptr))) {                       \
-                case 1: __v = *(ptr);                   break;  \
-                case 2: __v = __get_unaligned_2_le(__p);        break;  \
-                case 4: __v = __get_unaligned_4_le(__p);        break;  \
-                case 8: {                                       \
-                                unsigned int __v1, __v2;        \
-                                __v2 = __get_unaligned_4_le((__p+4)); \
-                                __v1 = __get_unaligned_4_le(__p);       \
-                                __v = ((unsigned long long)__v2 << 32 | __v1);  \
-                        }                                       \
-                        break;                                  \
-                default: __v = __bug_unaligned_x(__p);  break;  \
-                }                                               \
-                __v;                                            \
-        })
-
-static inline void __put_unaligned_2_le(__u32 __v, register __u8 *__p)
-{
-        *__p++ = __v;
-        *__p++ = __v >> 8;
-}
-
-static inline void __put_unaligned_4_le(__u32 __v, register __u8 *__p)
-{
-        __put_unaligned_2_le(__v >> 16, __p + 2);
-        __put_unaligned_2_le(__v, __p);
-}
-
-static inline void __put_unaligned_8_le(const unsigned long long __v, register __u8 *__p)
-{
-        /*
-         * tradeoff: 8 bytes of stack for all unaligned puts (2
-         * instructions), or an extra register in the long long
-         * case - go for the extra register.
-         */
-        __put_unaligned_4_le(__v >> 32, __p+4);
-        __put_unaligned_4_le(__v, __p);
-}
-
-/*
- * Try to store an unaligned value as efficiently as possible.
- */
-#define __put_unaligned_le(val,ptr)                                     \
-        ({                                                      \
-                switch (sizeof(*(ptr))) {                       \
-                case 1:                                         \
-                        *(ptr) = (val);                         \
-                        break;                                  \
-                case 2: __put_unaligned_2_le((val),(__u8 *)(ptr));      \
-                        break;                                  \
-                case 4: __put_unaligned_4_le((val),(__u8 *)(ptr));      \
-                        break;                                  \
-                case 8: __put_unaligned_8_le((val),(__u8 *)(ptr)); \
-                        break;                                  \
-                default: __bug_unaligned_x(ptr);                \
-                        break;                                  \
-                }                                               \
-                (void) 0;                                       \
-        })
-
-/*
- * Select endianness
- */
-#define get_unaligned   __get_unaligned_le
-#define put_unaligned   __put_unaligned_le
-
-#endif
diff --git a/include/asm-arm26/uncompress.h b/include/asm-arm26/uncompress.h
deleted file mode 100644
index df2cba816a4e..000000000000
--- a/include/asm-arm26/uncompress.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *  linux/include/asm-arm/arch-arc/uncompress.h
- *
- *  Copyright (C) 1996 Russell King
- *
- * 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.
- */
-#define VIDMEM ((char *)0x02000000)
- 
-int video_num_columns, video_num_lines, video_size_row;
-int white, bytes_per_char_h;
-extern unsigned long con_charconvtable[256];
-
-struct param_struct {
-        unsigned long page_size;
-        unsigned long nr_pages;
-        unsigned long ramdisk_size;
-        unsigned long mountrootrdonly;
-        unsigned long rootdev;
-        unsigned long video_num_cols;
-        unsigned long video_num_rows;
-        unsigned long video_x;
-        unsigned long video_y;
-        unsigned long memc_control_reg;
-        unsigned char sounddefault;
-        unsigned char adfsdrives;
-        unsigned char bytes_per_char_h;
-        unsigned char bytes_per_char_v;
-        unsigned long unused[256/4-11];
-};
-
-static struct param_struct *params = (struct param_struct *)0x0207c000;
- 
-/*
- * This does not append a newline
- */
-static void puts(const char *s)
-{
-        extern void ll_write_char(char *, unsigned long);
-        int x,y;
-        unsigned char c;
-        char *ptr;
-
-        x = params->video_x;
-        y = params->video_y;
-
-        while ( ( c = *(unsigned char *)s++ ) != '\0' ) {
-                if ( c == '\n' ) {
-                        x = 0;
-                        if ( ++y >= video_num_lines ) {
-                                y--;
-                        }
-                } else {
-                        ptr = VIDMEM + ((y*video_num_columns*params->bytes_per_char_v+x)*bytes_per_char_h);
-                        ll_write_char(ptr, c|(white<<16));
-                        if ( ++x >= video_num_columns ) {
-                                x = 0;
-                                if ( ++y >= video_num_lines ) {
-                                        y--;
-                                }
-                        }
-                }
-        }
-
-        params->video_x = x;
-        params->video_y = y;
-}
-
-static void error(char *x);
-
-/*
- * Setup for decompression
- */
-static void arch_decomp_setup(void)
-{
-        int i;
-        
-        video_num_lines = params->video_num_rows;
-        video_num_columns = params->video_num_cols;
-        bytes_per_char_h = params->bytes_per_char_h;
-        video_size_row = video_num_columns * bytes_per_char_h;
-        if (bytes_per_char_h == 4)
-                for (i = 0; i < 256; i++)
-                        con_charconvtable[i] =
-                                (i & 128 ? 1 << 0  : 0) |
-                                (i & 64  ? 1 << 4  : 0) |
-                                (i & 32  ? 1 << 8  : 0) |
-                                (i & 16  ? 1 << 12 : 0) |
-                                (i & 8   ? 1 << 16 : 0) |
-                                (i & 4   ? 1 << 20 : 0) |
-                                (i & 2   ? 1 << 24 : 0) |
-                                (i & 1   ? 1 << 28 : 0);
-        else
-                for (i = 0; i < 16; i++)
-                        con_charconvtable[i] =
-                                (i & 8   ? 1 << 0  : 0) |
-                                (i & 4   ? 1 << 8  : 0) |
-                                (i & 2   ? 1 << 16 : 0) |
-                                (i & 1   ? 1 << 24 : 0);
-
-        white = bytes_per_char_h == 8 ? 0xfc : 7;
-
-        if (params->nr_pages * params->page_size < 4096*1024) error("<4M of mem\n");
-}
-
-/*
- * nothing to do
- */
-#define arch_decomp_wdog()
diff --git a/include/asm-arm26/unistd.h b/include/asm-arm26/unistd.h
deleted file mode 100644
index 4c3b919177e5..000000000000
--- a/include/asm-arm26/unistd.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- *  linux/include/asm-arm/unistd.h
- *
- *  Copyright (C) 2001-2003 Russell King
- *  Modified 25/11/04 Ian Molton for arm26.
- *
- * 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.
- *
- * Please forward _all_ changes to this file to spyro@f2s.com
- * no matter what the change is.  Thanks!
- */
-#ifndef __ASM_ARM_UNISTD_H
-#define __ASM_ARM_UNISTD_H
-
-#define __NR_SYSCALL_BASE       0x900000
-
-/*
- * This file contains the system call numbers.
- */
-
-#define __NR_restart_syscall            (__NR_SYSCALL_BASE+  0)
-#define __NR_exit                       (__NR_SYSCALL_BASE+  1)
-#define __NR_fork                       (__NR_SYSCALL_BASE+  2)
-#define __NR_read                       (__NR_SYSCALL_BASE+  3)
-#define __NR_write                      (__NR_SYSCALL_BASE+  4)
-#define __NR_open                       (__NR_SYSCALL_BASE+  5)
-#define __NR_close                      (__NR_SYSCALL_BASE+  6)
-                                        /* 7 was sys_waitpid */
-#define __NR_creat                      (__NR_SYSCALL_BASE+  8)
-#define __NR_link                       (__NR_SYSCALL_BASE+  9)
-#define __NR_unlink                     (__NR_SYSCALL_BASE+ 10)
-#define __NR_execve                     (__NR_SYSCALL_BASE+ 11)
-#define __NR_chdir                      (__NR_SYSCALL_BASE+ 12)
-#define __NR_time                       (__NR_SYSCALL_BASE+ 13)
-#define __NR_mknod                      (__NR_SYSCALL_BASE+ 14)
-#define __NR_chmod                      (__NR_SYSCALL_BASE+ 15)
-#define __NR_lchown                     (__NR_SYSCALL_BASE+ 16)
-                                        /* 17 was sys_break */
-                                        /* 18 was sys_stat */
-#define __NR_lseek                      (__NR_SYSCALL_BASE+ 19)
-#define __NR_getpid                     (__NR_SYSCALL_BASE+ 20)
-#define __NR_mount                      (__NR_SYSCALL_BASE+ 21)
-#define __NR_umount                     (__NR_SYSCALL_BASE+ 22)
-#define __NR_setuid                     (__NR_SYSCALL_BASE+ 23)
-#define __NR_getuid                     (__NR_SYSCALL_BASE+ 24)
-#define __NR_stime                      (__NR_SYSCALL_BASE+ 25)
-#define __NR_ptrace                     (__NR_SYSCALL_BASE+ 26)
-#define __NR_alarm                      (__NR_SYSCALL_BASE+ 27)
-                                        /* 28 was sys_fstat */
-#define __NR_pause                      (__NR_SYSCALL_BASE+ 29)
-#define __NR_utime                      (__NR_SYSCALL_BASE+ 30)
-                                        /* 31 was sys_stty */
-                                        /* 32 was sys_gtty */
-#define __NR_access                     (__NR_SYSCALL_BASE+ 33)
-#define __NR_nice                       (__NR_SYSCALL_BASE+ 34)
-                                        /* 35 was sys_ftime */
-#define __NR_sync                       (__NR_SYSCALL_BASE+ 36)
-#define __NR_kill                       (__NR_SYSCALL_BASE+ 37)
-#define __NR_rename                     (__NR_SYSCALL_BASE+ 38)
-#define __NR_mkdir                      (__NR_SYSCALL_BASE+ 39)
-#define __NR_rmdir                      (__NR_SYSCALL_BASE+ 40)
-#define __NR_dup                        (__NR_SYSCALL_BASE+ 41)
-#define __NR_pipe                       (__NR_SYSCALL_BASE+ 42)
-#define __NR_times                      (__NR_SYSCALL_BASE+ 43)
-                                        /* 44 was sys_prof */
-#define __NR_brk                        (__NR_SYSCALL_BASE+ 45)
-#define __NR_setgid                     (__NR_SYSCALL_BASE+ 46)
-#define __NR_getgid                     (__NR_SYSCALL_BASE+ 47)
-                                        /* 48 was sys_signal */
-#define __NR_geteuid                    (__NR_SYSCALL_BASE+ 49)
-#define __NR_getegid                    (__NR_SYSCALL_BASE+ 50)
-#define __NR_acct                       (__NR_SYSCALL_BASE+ 51)
-#define __NR_umount2                    (__NR_SYSCALL_BASE+ 52)
-                                        /* 53 was sys_lock */
-#define __NR_ioctl                      (__NR_SYSCALL_BASE+ 54)
-#define __NR_fcntl                      (__NR_SYSCALL_BASE+ 55)
-                                        /* 56 was sys_mpx */
-#define __NR_setpgid                    (__NR_SYSCALL_BASE+ 57)
-                                        /* 58 was sys_ulimit */
-                                        /* 59 was sys_olduname */
-#define __NR_umask                      (__NR_SYSCALL_BASE+ 60)
-#define __NR_chroot                     (__NR_SYSCALL_BASE+ 61)
-#define __NR_ustat                      (__NR_SYSCALL_BASE+ 62)
-#define __NR_dup2                       (__NR_SYSCALL_BASE+ 63)
-#define __NR_getppid                    (__NR_SYSCALL_BASE+ 64)
-#define __NR_getpgrp                    (__NR_SYSCALL_BASE+ 65)
-#define __NR_setsid                     (__NR_SYSCALL_BASE+ 66)
-#define __NR_sigaction                  (__NR_SYSCALL_BASE+ 67)
-                                        /* 68 was sys_sgetmask */
-                                        /* 69 was sys_ssetmask */
-#define __NR_setreuid                   (__NR_SYSCALL_BASE+ 70)
-#define __NR_setregid                   (__NR_SYSCALL_BASE+ 71)
-#define __NR_sigsuspend                 (__NR_SYSCALL_BASE+ 72)
-#define __NR_sigpending                 (__NR_SYSCALL_BASE+ 73)
-#define __NR_sethostname                (__NR_SYSCALL_BASE+ 74)
-#define __NR_setrlimit                  (__NR_SYSCALL_BASE+ 75)
-#define __NR_getrlimit                  (__NR_SYSCALL_BASE+ 76) /* Back compat 2GB limited rlimit */
-#define __NR_getrusage                  (__NR_SYSCALL_BASE+ 77)
-#define __NR_gettimeofday               (__NR_SYSCALL_BASE+ 78)
-#define __NR_settimeofday               (__NR_SYSCALL_BASE+ 79)
-#define __NR_getgroups                  (__NR_SYSCALL_BASE+ 80)
-#define __NR_setgroups                  (__NR_SYSCALL_BASE+ 81)
-#define __NR_select                     (__NR_SYSCALL_BASE+ 82)
-#define __NR_symlink                    (__NR_SYSCALL_BASE+ 83)
-                                        /* 84 was sys_lstat */
-#define __NR_readlink                   (__NR_SYSCALL_BASE+ 85)
-#define __NR_uselib                     (__NR_SYSCALL_BASE+ 86)
-#define __NR_swapon                     (__NR_SYSCALL_BASE+ 87)
-#define __NR_reboot                     (__NR_SYSCALL_BASE+ 88)
-#define __NR_readdir                    (__NR_SYSCALL_BASE+ 89)
-#define __NR_mmap                       (__NR_SYSCALL_BASE+ 90)
-#define __NR_munmap                     (__NR_SYSCALL_BASE+ 91)
-#define __NR_truncate                   (__NR_SYSCALL_BASE+ 92)
-#define __NR_ftruncate                  (__NR_SYSCALL_BASE+ 93)
-#define __NR_fchmod                     (__NR_SYSCALL_BASE+ 94)
-#define __NR_fchown                     (__NR_SYSCALL_BASE+ 95)
-#define __NR_getpriority                (__NR_SYSCALL_BASE+ 96)
-#define __NR_setpriority                (__NR_SYSCALL_BASE+ 97)
-                                        /* 98 was sys_profil */
-#define __NR_statfs                     (__NR_SYSCALL_BASE+ 99)
-#define __NR_fstatfs                    (__NR_SYSCALL_BASE+100)
-                                        /* 101 was sys_ioperm */
-#define __NR_socketcall                 (__NR_SYSCALL_BASE+102)
-#define __NR_syslog                     (__NR_SYSCALL_BASE+103)
-#define __NR_setitimer                  (__NR_SYSCALL_BASE+104)
-#define __NR_getitimer                  (__NR_SYSCALL_BASE+105)
-#define __NR_stat                       (__NR_SYSCALL_BASE+106)
-#define __NR_lstat                      (__NR_SYSCALL_BASE+107)
-#define __NR_fstat                      (__NR_SYSCALL_BASE+108)
-                                        /* 109 was sys_uname */
-                                        /* 110 was sys_iopl */
-#define __NR_vhangup                    (__NR_SYSCALL_BASE+111)
-                                        /* 112 was sys_idle */
-#define __NR_syscall                    (__NR_SYSCALL_BASE+113) /* syscall to call a syscall! */
-#define __NR_wait4                      (__NR_SYSCALL_BASE+114)
-#define __NR_swapoff                    (__NR_SYSCALL_BASE+115)
-#define __NR_sysinfo                    (__NR_SYSCALL_BASE+116)
-#define __NR_ipc                        (__NR_SYSCALL_BASE+117)
-#define __NR_fsync                      (__NR_SYSCALL_BASE+118)
-#define __NR_sigreturn                  (__NR_SYSCALL_BASE+119)
-#define __NR_clone                      (__NR_SYSCALL_BASE+120)
-#define __NR_setdomainname              (__NR_SYSCALL_BASE+121)
-#define __NR_uname                      (__NR_SYSCALL_BASE+122)
-                                        /* 123 was sys_modify_ldt */
-#define __NR_adjtimex                   (__NR_SYSCALL_BASE+124)
-#define __NR_mprotect                   (__NR_SYSCALL_BASE+125)
-#define __NR_sigprocmask                (__NR_SYSCALL_BASE+126)
-                                        /* 127 was sys_create_module */
-#define __NR_init_module                (__NR_SYSCALL_BASE+128)
-#define __NR_delete_module              (__NR_SYSCALL_BASE+129)
-                                        /* 130 was sys_get_kernel_syms */
-#define __NR_quotactl                   (__NR_SYSCALL_BASE+131)
-#define __NR_getpgid                    (__NR_SYSCALL_BASE+132)
-#define __NR_fchdir                     (__NR_SYSCALL_BASE+133)
-#define __NR_bdflush                    (__NR_SYSCALL_BASE+134)
-#define __NR_sysfs                      (__NR_SYSCALL_BASE+135)
-#define __NR_personality                (__NR_SYSCALL_BASE+136)
-                                        /* 137 was sys_afs_syscall */
-#define __NR_setfsuid                   (__NR_SYSCALL_BASE+138)
-#define __NR_setfsgid                   (__NR_SYSCALL_BASE+139)
-#define __NR__llseek                    (__NR_SYSCALL_BASE+140)
-#define __NR_getdents                   (__NR_SYSCALL_BASE+141)
-#define __NR__newselect                 (__NR_SYSCALL_BASE+142)
-#define __NR_flock                      (__NR_SYSCALL_BASE+143)
-#define __NR_msync                      (__NR_SYSCALL_BASE+144)
-#define __NR_readv                      (__NR_SYSCALL_BASE+145)
-#define __NR_writev                     (__NR_SYSCALL_BASE+146)
-#define __NR_getsid                     (__NR_SYSCALL_BASE+147)
-#define __NR_fdatasync                  (__NR_SYSCALL_BASE+148)
-#define __NR__sysctl                    (__NR_SYSCALL_BASE+149)
-#define __NR_mlock                      (__NR_SYSCALL_BASE+150)
-#define __NR_munlock                    (__NR_SYSCALL_BASE+151)
-#define __NR_mlockall                   (__NR_SYSCALL_BASE+152)
-#define __NR_munlockall                 (__NR_SYSCALL_BASE+153)
-#define __NR_sched_setparam             (__NR_SYSCALL_BASE+154)
-#define __NR_sched_getparam             (__NR_SYSCALL_BASE+155)
-#define __NR_sched_setscheduler         (__NR_SYSCALL_BASE+156)
-#define __NR_sched_getscheduler         (__NR_SYSCALL_BASE+157)
-#define __NR_sched_yield                (__NR_SYSCALL_BASE+158)
-#define __NR_sched_get_priority_max     (__NR_SYSCALL_BASE+159)
-#define __NR_sched_get_priority_min     (__NR_SYSCALL_BASE+160)
-#define __NR_sched_rr_get_interval      (__NR_SYSCALL_BASE+161)
-#define __NR_nanosleep                  (__NR_SYSCALL_BASE+162)
-#define __NR_mremap                     (__NR_SYSCALL_BASE+163)
-#define __NR_setresuid                  (__NR_SYSCALL_BASE+164)
-#define __NR_getresuid                  (__NR_SYSCALL_BASE+165)
-                                        /* 166 was sys_vm86 */
-                                        /* 167 was sys_query_module */
-#define __NR_poll                       (__NR_SYSCALL_BASE+168)
-#define __NR_nfsservctl                 (__NR_SYSCALL_BASE+169)
-#define __NR_setresgid                  (__NR_SYSCALL_BASE+170)
-#define __NR_getresgid                  (__NR_SYSCALL_BASE+171)
-#define __NR_prctl                      (__NR_SYSCALL_BASE+172)
-#define __NR_rt_sigreturn               (__NR_SYSCALL_BASE+173)
-#define __NR_rt_sigaction               (__NR_SYSCALL_BASE+174)
-#define __NR_rt_sigprocmask             (__NR_SYSCALL_BASE+175)
-#define __NR_rt_sigpending              (__NR_SYSCALL_BASE+176)
-#define __NR_rt_sigtimedwait            (__NR_SYSCALL_BASE+177)
-#define __NR_rt_sigqueueinfo            (__NR_SYSCALL_BASE+178)
-#define __NR_rt_sigsuspend              (__NR_SYSCALL_BASE+179)
-#define __NR_pread64                    (__NR_SYSCALL_BASE+180)
-#define __NR_pwrite64                   (__NR_SYSCALL_BASE+181)
-#define __NR_chown                      (__NR_SYSCALL_BASE+182)
-#define __NR_getcwd                     (__NR_SYSCALL_BASE+183)
-#define __NR_capget                     (__NR_SYSCALL_BASE+184)
-#define __NR_capset                     (__NR_SYSCALL_BASE+185)
-#define __NR_sigaltstack                (__NR_SYSCALL_BASE+186)
-#define __NR_sendfile                   (__NR_SYSCALL_BASE+187)
-                                        /* 188 reserved */
-                                        /* 189 reserved */
-#define __NR_vfork                      (__NR_SYSCALL_BASE+190)
-#define __NR_ugetrlimit                 (__NR_SYSCALL_BASE+191) /* SuS compliant getrlimit */
-#define __NR_mmap2                      (__NR_SYSCALL_BASE+192)
-#define __NR_truncate64                 (__NR_SYSCALL_BASE+193)
-#define __NR_ftruncate64                (__NR_SYSCALL_BASE+194)
-#define __NR_stat64                     (__NR_SYSCALL_BASE+195)
-#define __NR_lstat64                    (__NR_SYSCALL_BASE+196)
-#define __NR_fstat64                    (__NR_SYSCALL_BASE+197)
-#define __NR_lchown32                   (__NR_SYSCALL_BASE+198)
-#define __NR_getuid32                   (__NR_SYSCALL_BASE+199)
-#define __NR_getgid32                   (__NR_SYSCALL_BASE+200)
-#define __NR_geteuid32                  (__NR_SYSCALL_BASE+201)
-#define __NR_getegid32                  (__NR_SYSCALL_BASE+202)
-#define __NR_setreuid32                 (__NR_SYSCALL_BASE+203)
-#define __NR_setregid32                 (__NR_SYSCALL_BASE+204)
-#define __NR_getgroups32                (__NR_SYSCALL_BASE+205)
-#define __NR_setgroups32                (__NR_SYSCALL_BASE+206)
-#define __NR_fchown32                   (__NR_SYSCALL_BASE+207)
-#define __NR_setresuid32                (__NR_SYSCALL_BASE+208)
-#define __NR_getresuid32                (__NR_SYSCALL_BASE+209)
-#define __NR_setresgid32                (__NR_SYSCALL_BASE+210)
-#define __NR_getresgid32                (__NR_SYSCALL_BASE+211)
-#define __NR_chown32                    (__NR_SYSCALL_BASE+212)
-#define __NR_setuid32                   (__NR_SYSCALL_BASE+213)
-#define __NR_setgid32                   (__NR_SYSCALL_BASE+214)
-#define __NR_setfsuid32                 (__NR_SYSCALL_BASE+215)
-#define __NR_setfsgid32                 (__NR_SYSCALL_BASE+216)
-#define __NR_getdents64                 (__NR_SYSCALL_BASE+217)
-#define __NR_pivot_root                 (__NR_SYSCALL_BASE+218)
-#define __NR_mincore                    (__NR_SYSCALL_BASE+219)
-#define __NR_madvise                    (__NR_SYSCALL_BASE+220)
-#define __NR_fcntl64                    (__NR_SYSCALL_BASE+221)
-                                        /* 222 for tux */
-                                        /* 223 is unused */
-#define __NR_gettid                     (__NR_SYSCALL_BASE+224)
-#define __NR_readahead                  (__NR_SYSCALL_BASE+225)
-#define __NR_setxattr                   (__NR_SYSCALL_BASE+226)
-#define __NR_lsetxattr                  (__NR_SYSCALL_BASE+227)
-#define __NR_fsetxattr                  (__NR_SYSCALL_BASE+228)
-#define __NR_getxattr                   (__NR_SYSCALL_BASE+229)
-#define __NR_lgetxattr                  (__NR_SYSCALL_BASE+230)
-#define __NR_fgetxattr                  (__NR_SYSCALL_BASE+231)
-#define __NR_listxattr                  (__NR_SYSCALL_BASE+232)
-#define __NR_llistxattr                 (__NR_SYSCALL_BASE+233)
-#define __NR_flistxattr                 (__NR_SYSCALL_BASE+234)
-#define __NR_removexattr                (__NR_SYSCALL_BASE+235)
-#define __NR_lremovexattr               (__NR_SYSCALL_BASE+236)
-#define __NR_fremovexattr               (__NR_SYSCALL_BASE+237)
-#define __NR_tkill                      (__NR_SYSCALL_BASE+238)
-#define __NR_sendfile64                 (__NR_SYSCALL_BASE+239)
-#define __NR_futex                      (__NR_SYSCALL_BASE+240)
-#define __NR_sched_setaffinity          (__NR_SYSCALL_BASE+241)
-#define __NR_sched_getaffinity          (__NR_SYSCALL_BASE+242)
-#define __NR_io_setup                   (__NR_SYSCALL_BASE+243)
-#define __NR_io_destroy                 (__NR_SYSCALL_BASE+244)
-#define __NR_io_getevents               (__NR_SYSCALL_BASE+245)
-#define __NR_io_submit                  (__NR_SYSCALL_BASE+246)
-#define __NR_io_cancel                  (__NR_SYSCALL_BASE+247)
-#define __NR_exit_group                 (__NR_SYSCALL_BASE+248)
-#define __NR_lookup_dcookie             (__NR_SYSCALL_BASE+249)
-#define __NR_epoll_create               (__NR_SYSCALL_BASE+250)
-#define __NR_epoll_ctl                  (__NR_SYSCALL_BASE+251)
-#define __NR_epoll_wait                 (__NR_SYSCALL_BASE+252)
-#define __NR_remap_file_pages           (__NR_SYSCALL_BASE+253)
-                                        /* 254 for set_thread_area */
-                                        /* 255 for get_thread_area */
-                                        /* 256 for set_tid_address */
-#define __NR_timer_create               (__NR_SYSCALL_BASE+257)
-#define __NR_timer_settime              (__NR_SYSCALL_BASE+258)
-#define __NR_timer_gettime              (__NR_SYSCALL_BASE+259)
-#define __NR_timer_getoverrun           (__NR_SYSCALL_BASE+260)
-#define __NR_timer_delete               (__NR_SYSCALL_BASE+261)
-#define __NR_clock_settime              (__NR_SYSCALL_BASE+262)
-#define __NR_clock_gettime              (__NR_SYSCALL_BASE+263)
-#define __NR_clock_getres               (__NR_SYSCALL_BASE+264)
-#define __NR_clock_nanosleep            (__NR_SYSCALL_BASE+265)
-#define __NR_statfs64                   (__NR_SYSCALL_BASE+266)
-#define __NR_fstatfs64                  (__NR_SYSCALL_BASE+267)
-#define __NR_tgkill                     (__NR_SYSCALL_BASE+268)
-#define __NR_utimes                     (__NR_SYSCALL_BASE+269)
-#define __NR_fadvise64_64               (__NR_SYSCALL_BASE+270)
-#define __NR_pciconfig_iobase           (__NR_SYSCALL_BASE+271)
-#define __NR_pciconfig_read             (__NR_SYSCALL_BASE+272)
-#define __NR_pciconfig_write            (__NR_SYSCALL_BASE+273)
-#define __NR_mq_open                    (__NR_SYSCALL_BASE+274)
-#define __NR_mq_unlink                  (__NR_SYSCALL_BASE+275)
-#define __NR_mq_timedsend               (__NR_SYSCALL_BASE+276)
-#define __NR_mq_timedreceive            (__NR_SYSCALL_BASE+277)
-#define __NR_mq_notify                  (__NR_SYSCALL_BASE+278)
-#define __NR_mq_getsetattr              (__NR_SYSCALL_BASE+279)
-#define __NR_waitid                     (__NR_SYSCALL_BASE+280)
-
-/*
- * The following SWIs are ARM private. FIXME - make appropriate for arm26
- */
-#define __ARM_NR_BASE                   (__NR_SYSCALL_BASE+0x0f0000)
-#define __ARM_NR_breakpoint             (__ARM_NR_BASE+1)
-#define __ARM_NR_cacheflush             (__ARM_NR_BASE+2)
-#define __ARM_NR_usr26                  (__ARM_NR_BASE+3)
-
-#ifdef __KERNEL__
-
-#define __ARCH_WANT_IPC_PARSE_VERSION
-#define __ARCH_WANT_OLD_READDIR
-#define __ARCH_WANT_STAT64
-#define __ARCH_WANT_SYS_ALARM
-#define __ARCH_WANT_SYS_GETHOSTNAME
-#define __ARCH_WANT_SYS_PAUSE
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_SYS_UTIME
-#define __ARCH_WANT_SYS_SOCKETCALL
-#define __ARCH_WANT_SYS_FADVISE64
-#define __ARCH_WANT_SYS_GETPGRP
-#define __ARCH_WANT_SYS_LLSEEK
-#define __ARCH_WANT_SYS_NICE
-#define __ARCH_WANT_SYS_OLD_GETRLIMIT
-#define __ARCH_WANT_SYS_OLDUMOUNT
-#define __ARCH_WANT_SYS_SIGPENDING
-#define __ARCH_WANT_SYS_SIGPROCMASK
-#define __ARCH_WANT_SYS_RT_SIGACTION
-
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_ARM_UNISTD_H */
diff --git a/include/asm-arm26/user.h b/include/asm-arm26/user.h
deleted file mode 100644
index 3e8b0f879159..000000000000
--- a/include/asm-arm26/user.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#ifndef _ARM_USER_H
-#define _ARM_USER_H
-
-#include <asm/page.h>
-#include <asm/ptrace.h>
-/* Core file format: The core file is written in such a way that gdb
-   can understand it and provide useful information to the user (under
-   linux we use the 'trad-core' bfd).  There are quite a number of
-   obstacles to being able to view the contents of the floating point
-   registers, and until these are solved you will not be able to view the
-   contents of them.  Actually, you can read in the core file and look at
-   the contents of the user struct to find out what the floating point
-   registers contain.
-   The actual file contents are as follows:
-   UPAGE: 1 page consisting of a user struct that tells gdb what is present
-   in the file.  Directly after this is a copy of the task_struct, which
-   is currently not used by gdb, but it may come in useful at some point.
-   All of the registers are stored as part of the upage.  The upage should
-   always be only one page.
-   DATA: The data area is stored.  We use current->end_text to
-   current->brk to pick up all of the user variables, plus any memory
-   that may have been malloced.  No attempt is made to determine if a page
-   is demand-zero or if a page is totally unused, we just cover the entire
-   range.  All of the addresses are rounded in such a way that an integral
-   number of pages is written.
-   STACK: We need the stack information in order to get a meaningful
-   backtrace.  We need to write the data from (esp) to
-   current->start_stack, so we round each of these off in order to be able
-   to write an integer number of pages.
-   The minimum core file size is 3 pages, or 12288 bytes.
-*/
-
-struct user_fp {
-        struct fp_reg {
-                unsigned int sign1:1;
-                unsigned int unused:15;
-                unsigned int sign2:1;
-                unsigned int exponent:14;
-                unsigned int j:1;
-                unsigned int mantissa1:31;
-                unsigned int mantissa0:32;
-        } fpregs[8];
-        unsigned int fpsr:32;
-        unsigned int fpcr:32;
-        unsigned char ftype[8];
-        unsigned int init_flag;
-};
-
-/* When the kernel dumps core, it starts by dumping the user struct -
-   this will be used by gdb to figure out where the data and stack segments
-   are within the file, and what virtual addresses to use. */
-struct user{
-/* We start with the registers, to mimic the way that "memory" is returned
-   from the ptrace(3,...) function.  */
-  struct pt_regs regs;          /* Where the registers are actually stored */
-/* ptrace does not yet supply these.  Someday.... */
-  int u_fpvalid;                /* True if math co-processor being used. */
-                                /* for this mess. Not yet used. */
-/* The rest of this junk is to help gdb figure out what goes where */
-  unsigned long int u_tsize;    /* Text segment size (pages). */
-  unsigned long int u_dsize;    /* Data segment size (pages). */
-  unsigned long int u_ssize;    /* Stack segment size (pages). */
-  unsigned long start_code;     /* Starting virtual address of text. */
-  unsigned long start_stack;    /* Starting virtual address of stack area.
-                                   This is actually the bottom of the stack,
-                                   the top of the stack is always found in the
-                                   esp register.  */
-  long int signal;              /* Signal that caused the core dump. */
-  int reserved;                 /* No longer used */
-  struct pt_regs * u_ar0;       /* Used by gdb to help find the values for */
-                                /* the registers. */
-  unsigned long magic;          /* To uniquely identify a core file */
-  char u_comm[32];              /* User command that was responsible */
-  int u_debugreg[8];
-  struct user_fp u_fp;          /* FP state */
-  struct user_fp_struct * u_fp0;/* Used by gdb to help find the values for */
-                                /* the FP registers. */
-};
-#define NBPG PAGE_SIZE
-#define UPAGES 1
-#define HOST_TEXT_START_ADDR (u.start_code)
-#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
-
-#endif /* _ARM_USER_H */
diff --git a/include/asm-arm26/xor.h b/include/asm-arm26/xor.h
deleted file mode 100644
index e7c4cf58bed1..000000000000
--- a/include/asm-arm26/xor.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *  linux/include/asm-arm/xor.h
- *
- *  Copyright (C) 2001 Russell King
- *
- * 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 <asm-generic/xor.h>
-
-#define __XOR(a1, a2) a1 ^= a2
-
-#define GET_BLOCK_2(dst) \
-        __asm__("ldmia  %0, {%1, %2}" \
-                : "=r" (dst), "=r" (a1), "=r" (a2) \
-                : "0" (dst))
-
-#define GET_BLOCK_4(dst) \
-        __asm__("ldmia  %0, {%1, %2, %3, %4}" \
-                : "=r" (dst), "=r" (a1), "=r" (a2), "=r" (a3), "=r" (a4) \
-                : "0" (dst))
-
-#define XOR_BLOCK_2(src) \
-        __asm__("ldmia  %0!, {%1, %2}" \
-                : "=r" (src), "=r" (b1), "=r" (b2) \
-                : "0" (src)); \
-        __XOR(a1, b1); __XOR(a2, b2);
-
-#define XOR_BLOCK_4(src) \
-        __asm__("ldmia  %0!, {%1, %2, %3, %4}" \
-                : "=r" (src), "=r" (b1), "=r" (b2), "=r" (b3), "=r" (b4) \
-                : "0" (src)); \
-        __XOR(a1, b1); __XOR(a2, b2); __XOR(a3, b3); __XOR(a4, b4)
-
-#define PUT_BLOCK_2(dst) \
-        __asm__ __volatile__("stmia     %0!, {%2, %3}" \
-                : "=r" (dst) \
-                : "0" (dst), "r" (a1), "r" (a2))
-
-#define PUT_BLOCK_4(dst) \
-        __asm__ __volatile__("stmia     %0!, {%2, %3, %4, %5}" \
-                : "=r" (dst) \
-                : "0" (dst), "r" (a1), "r" (a2), "r" (a3), "r" (a4))
-
-static void
-xor_arm4regs_2(unsigned long bytes, unsigned long *p1, unsigned long *p2)
-{
-        unsigned int lines = bytes / sizeof(unsigned long) / 4;
-        register unsigned int a1 __asm__("r4");
-        register unsigned int a2 __asm__("r5");
-        register unsigned int a3 __asm__("r6");
-        register unsigned int a4 __asm__("r7");
-        register unsigned int b1 __asm__("r8");
-        register unsigned int b2 __asm__("r9");
-        register unsigned int b3 __asm__("ip");
-        register unsigned int b4 __asm__("lr");
-
-        do {
-                GET_BLOCK_4(p1);
-                XOR_BLOCK_4(p2);
-                PUT_BLOCK_4(p1);
-        } while (--lines);
-}
-
-static void
-xor_arm4regs_3(unsigned long bytes, unsigned long *p1, unsigned long *p2,
-                unsigned long *p3)
-{
-        unsigned int lines = bytes / sizeof(unsigned long) / 4;
-        register unsigned int a1 __asm__("r4");
-        register unsigned int a2 __asm__("r5");
-        register unsigned int a3 __asm__("r6");
-        register unsigned int a4 __asm__("r7");
-        register unsigned int b1 __asm__("r8");
-        register unsigned int b2 __asm__("r9");
-        register unsigned int b3 __asm__("ip");
-        register unsigned int b4 __asm__("lr");
-
-        do {
-                GET_BLOCK_4(p1);
-                XOR_BLOCK_4(p2);
-                XOR_BLOCK_4(p3);
-                PUT_BLOCK_4(p1);
-        } while (--lines);
-}
-
-static void
-xor_arm4regs_4(unsigned long bytes, unsigned long *p1, unsigned long *p2,
-                unsigned long *p3, unsigned long *p4)
-{
-        unsigned int lines = bytes / sizeof(unsigned long) / 2;
-        register unsigned int a1 __asm__("r8");
-        register unsigned int a2 __asm__("r9");
-        register unsigned int b1 __asm__("ip");
-        register unsigned int b2 __asm__("lr");
-
-        do {
-                GET_BLOCK_2(p1);
-                XOR_BLOCK_2(p2);
-                XOR_BLOCK_2(p3);
-                XOR_BLOCK_2(p4);
-                PUT_BLOCK_2(p1);
-        } while (--lines);
-}
-
-static void
-xor_arm4regs_5(unsigned long bytes, unsigned long *p1, unsigned long *p2,
-                unsigned long *p3, unsigned long *p4, unsigned long *p5)
-{
-        unsigned int lines = bytes / sizeof(unsigned long) / 2;
-        register unsigned int a1 __asm__("r8");
-        register unsigned int a2 __asm__("r9");
-        register unsigned int b1 __asm__("ip");
-        register unsigned int b2 __asm__("lr");
-
-        do {
-                GET_BLOCK_2(p1);
-                XOR_BLOCK_2(p2);
-                XOR_BLOCK_2(p3);
-                XOR_BLOCK_2(p4);
-                XOR_BLOCK_2(p5);
-                PUT_BLOCK_2(p1);
-        } while (--lines);
-}
-
-static struct xor_block_template xor_block_arm4regs = {
-        .name   = "arm4regs",
-        .do_2   = xor_arm4regs_2,
-        .do_3   = xor_arm4regs_3,
-        .do_4   = xor_arm4regs_4,
-        .do_5   = xor_arm4regs_5,
-};
-
-#undef XOR_TRY_TEMPLATES
-#define XOR_TRY_TEMPLATES                       \
-        do {                                    \
-                xor_speed(&xor_block_arm4regs); \
-                xor_speed(&xor_block_8regs);    \
-                xor_speed(&xor_block_32regs);   \
-        } while (0)
diff --git a/include/asm-avr32/bug.h b/include/asm-avr32/bug.h
index afdcd79a2966..331d45bab18f 100644
--- a/include/asm-avr32/bug.h
+++ b/include/asm-avr32/bug.h
@@ -57,7 +57,7 @@
 
 #define WARN_ON(condition)                                                      \
         ({                                                              \
-                typeof(condition) __ret_warn_on = (condition);          \
+                int __ret_warn_on = !!(condition);                      \
                 if (unlikely(__ret_warn_on))                            \
                         _BUG_OR_WARN(BUGFLAG_WARNING);                  \
                 unlikely(__ret_warn_on);                                \
diff --git a/include/asm-avr32/thread_info.h b/include/asm-avr32/thread_info.h
index a2e606dd4f4a..17dacf3f36d3 100644
--- a/include/asm-avr32/thread_info.h
+++ b/include/asm-avr32/thread_info.h
@@ -74,20 +74,18 @@ static inline struct thread_info *current_thread_info(void)
  * - other flags in MSW
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_POLLING_NRFLAG      4       /* true if poll_idle() is polling
+#define TIF_SIGPENDING          1       /* signal pending */
+#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
+#define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling
                                            TIF_NEED_RESCHED */
-#define TIF_BREAKPOINT          5       /* true if we should break after return */
-#define TIF_SINGLE_STEP         6       /* single step after next break */
-#define TIF_MEMDIE              7
-#define TIF_RESTORE_SIGMASK     8       /* restore signal mask in do_signal */
-#define TIF_CPU_GOING_TO_SLEEP  9       /* CPU is entering sleep 0 mode */
+#define TIF_BREAKPOINT          4       /* true if we should break after return */
+#define TIF_SINGLE_STEP         5       /* single step after next break */
+#define TIF_MEMDIE              6
+#define TIF_RESTORE_SIGMASK     7       /* restore signal mask in do_signal */
+#define TIF_CPU_GOING_TO_SLEEP  8       /* CPU is entering sleep 0 mode */
 #define TIF_USERSPACE           31      /* true if FS sets userspace */
 
 #define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
 #define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
diff --git a/include/asm-blackfin/thread_info.h b/include/asm-blackfin/thread_info.h
index 34d3c2eec949..15b99cf4f50b 100644
--- a/include/asm-blackfin/thread_info.h
+++ b/include/asm-blackfin/thread_info.h
@@ -118,18 +118,16 @@ static inline struct thread_info *current_thread_info(void)
  * thread information flag bit numbers
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_POLLING_NRFLAG      4       /* true if poll_idle() is polling
+#define TIF_SIGPENDING          1       /* signal pending */
+#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
+#define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling
                                            TIF_NEED_RESCHED */
-#define TIF_MEMDIE              5
-#define TIF_RESTORE_SIGMASK     6       /* restore signal mask in do_signal() */
-#define TIF_FREEZE              7       /* is freezing for suspend */
+#define TIF_MEMDIE              4
+#define TIF_RESTORE_SIGMASK     5       /* restore signal mask in do_signal() */
+#define TIF_FREEZE              6       /* is freezing for suspend */
 
 /* as above, but as bit values */
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
diff --git a/include/asm-cris/thread_info.h b/include/asm-cris/thread_info.h
index 7ad853c3f74e..fde39f6c49c7 100644
--- a/include/asm-cris/thread_info.h
+++ b/include/asm-cris/thread_info.h
@@ -79,14 +79,12 @@ struct thread_info {
  * - other flags in MSW
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
+#define TIF_SIGPENDING          1       /* signal pending */
+#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
 #define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              17
 
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
diff --git a/include/asm-frv/mb86943a.h b/include/asm-frv/mb86943a.h
index b89fd0b56bb3..e87ef924bfb4 100644
--- a/include/asm-frv/mb86943a.h
+++ b/include/asm-frv/mb86943a.h
@@ -36,4 +36,7 @@
 #define __reg_MB86943_pci_sl_io_base    *(volatile uint32_t *) (__region_CS1 + 0x70)
 #define __reg_MB86943_pci_sl_mem_base   *(volatile uint32_t *) (__region_CS1 + 0x78)
 
+#define __reg_MB86943_pci_arbiter       *(volatile uint32_t *) (__region_CS2 + 0x01300014)
+#define MB86943_PCIARB_EN               0x00000001
+
 #endif /* _ASM_MB86943A_H */
diff --git a/include/asm-frv/thread_info.h b/include/asm-frv/thread_info.h
index d881f518e6a9..cc5433e78b52 100644
--- a/include/asm-frv/thread_info.h
+++ b/include/asm-frv/thread_info.h
@@ -108,18 +108,16 @@ register struct thread_info *__current_thread_info asm("gr15");
  * - other flags in MSW
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_SINGLESTEP          4       /* restore singlestep on return to user mode */
-#define TIF_IRET                5       /* return with iret */
-#define TIF_RESTORE_SIGMASK     6       /* restore signal mask in do_signal() */
+#define TIF_SIGPENDING          1       /* signal pending */
+#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
+#define TIF_SINGLESTEP          3       /* restore singlestep on return to user mode */
+#define TIF_IRET                4       /* return with iret */
+#define TIF_RESTORE_SIGMASK     5       /* restore signal mask in do_signal() */
 #define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              17      /* OOM killer killed process */
 #define TIF_FREEZE              18      /* freezing for suspend */
 
 #define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
 #define _TIF_SINGLESTEP         (1 << TIF_SINGLESTEP)
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 344e3091af24..d56fedbb457a 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -33,7 +33,7 @@ struct bug_entry {
 
 #ifndef HAVE_ARCH_WARN_ON
 #define WARN_ON(condition) ({                                           \
-        typeof(condition) __ret_warn_on = (condition);                  \
+        int __ret_warn_on = !!(condition);                              \
         if (unlikely(__ret_warn_on)) {                                  \
                 printk("WARNING: at %s:%d %s()\n", __FILE__,            \
                         __LINE__, __FUNCTION__);                        \
@@ -54,7 +54,7 @@ struct bug_entry {
 
 #ifndef HAVE_ARCH_WARN_ON
 #define WARN_ON(condition) ({                                           \
-        typeof(condition) __ret_warn_on = (condition);                  \
+        int __ret_warn_on = !!(condition);                              \
         unlikely(__ret_warn_on);                                        \
 })
 #endif
@@ -62,7 +62,7 @@ struct bug_entry {
 
 #define WARN_ON_ONCE(condition) ({                              \
         static int __warned;                                    \
-        typeof(condition) __ret_warn_once = (condition);        \
+        int __ret_warn_once = !!(condition);                    \
                                                                 \
         if (unlikely(__ret_warn_once))                          \
                 if (WARN_ON(!__warned))                         \
diff --git a/include/asm-generic/unaligned.h b/include/asm-generic/unaligned.h
index 16a466e50681..2fe1b2e67f01 100644
--- a/include/asm-generic/unaligned.h
+++ b/include/asm-generic/unaligned.h
@@ -79,24 +79,24 @@ static inline void __ustw(__u16 val, __u16 *addr)
 
 #define __get_unaligned(ptr, size) ({           \
         const void *__gu_p = ptr;               \
-        __u64 val;                              \
+        __u64 __val;                            \
         switch (size) {                         \
         case 1:                                 \
-                val = *(const __u8 *)__gu_p;    \
+                __val = *(const __u8 *)__gu_p;  \
                 break;                          \
         case 2:                                 \
-                val = __uldw(__gu_p);           \
+                __val = __uldw(__gu_p);         \
                 break;                          \
         case 4:                                 \
-                val = __uldl(__gu_p);           \
+                __val = __uldl(__gu_p);         \
                 break;                          \
         case 8:                                 \
-                val = __uldq(__gu_p);           \
+                __val = __uldq(__gu_p);         \
                 break;                          \
         default:                                \
                 bad_unaligned_access_length();  \
         };                                      \
-        (__force __typeof__(*(ptr)))val;        \
+        (__force __typeof__(*(ptr)))__val;      \
 })
 
 #define __put_unaligned(val, ptr, size)         \
diff --git a/include/asm-h8300/thread_info.h b/include/asm-h8300/thread_info.h
index aee4009a498e..27bb95e2944c 100644
--- a/include/asm-h8300/thread_info.h
+++ b/include/asm-h8300/thread_info.h
@@ -86,17 +86,15 @@ static inline struct thread_info *current_thread_info(void)
  * thread information flag bit numbers
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_POLLING_NRFLAG      4       /* true if poll_idle() is polling
+#define TIF_SIGPENDING          1       /* signal pending */
+#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
+#define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling
                                            TIF_NEED_RESCHED */
-#define TIF_MEMDIE              5
-#define TIF_RESTORE_SIGMASK     6       /* restore signal mask in do_signal() */
+#define TIF_MEMDIE              4
+#define TIF_RESTORE_SIGMASK     5       /* restore signal mask in do_signal() */
 
 /* as above, but as bit values */
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
diff --git a/include/asm-i386/serial.h b/include/asm-i386/serial.h
index 57a4306cdf63..bd67480ca109 100644
--- a/include/asm-i386/serial.h
+++ b/include/asm-i386/serial.h
@@ -11,3 +11,19 @@
  * megabits/second; but this requires the faster clock.
  */
 #define BASE_BAUD ( 1843200 / 16 )
+
+/* Standard COM flags (except for COM4, because of the 8514 problem) */
+#ifdef CONFIG_SERIAL_DETECT_IRQ
+#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
+#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)
+#else
+#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
+#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
+#endif
+
+#define SERIAL_PORT_DFNS                        \
+        /* UART CLK   PORT IRQ     FLAGS        */                      \
+        { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS },      /* ttyS0 */     \
+        { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS },      /* ttyS1 */     \
+        { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS },      /* ttyS2 */     \
+        { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS },     /* ttyS3 */
diff --git a/include/asm-i386/thread_info.h b/include/asm-i386/thread_info.h
index 54424e045e01..22a8cbcd35e2 100644
--- a/include/asm-i386/thread_info.h
+++ b/include/asm-i386/thread_info.h
@@ -124,15 +124,14 @@ static inline struct thread_info *current_thread_info(void)
  * - other flags in MSW
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_SINGLESTEP          4       /* restore singlestep on return to user mode */
-#define TIF_IRET                5       /* return with iret */
-#define TIF_SYSCALL_EMU         6       /* syscall emulation active */
-#define TIF_SYSCALL_AUDIT       7       /* syscall auditing active */
-#define TIF_SECCOMP             8       /* secure computing */
-#define TIF_RESTORE_SIGMASK     9       /* restore signal mask in do_signal() */
+#define TIF_SIGPENDING          1       /* signal pending */
+#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
+#define TIF_SINGLESTEP          3       /* restore singlestep on return to user mode */
+#define TIF_IRET                4       /* return with iret */
+#define TIF_SYSCALL_EMU         5       /* syscall emulation active */
+#define TIF_SYSCALL_AUDIT       6       /* syscall auditing active */
+#define TIF_SECCOMP             7       /* secure computing */
+#define TIF_RESTORE_SIGMASK     8       /* restore signal mask in do_signal() */
 #define TIF_MEMDIE              16
 #define TIF_DEBUG               17      /* uses debug registers */
 #define TIF_IO_BITMAP           18      /* uses I/O bitmap */
@@ -140,7 +139,6 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_NOTSC               20      /* TSC is not accessible in userland */
 
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_SINGLESTEP         (1<<TIF_SINGLESTEP)
diff --git a/include/asm-ia64/thread_info.h b/include/asm-ia64/thread_info.h
index 7d0241db622b..d16031e72efa 100644
--- a/include/asm-ia64/thread_info.h
+++ b/include/asm-ia64/thread_info.h
@@ -79,13 +79,13 @@ struct thread_info {
  * - pending work-to-be-done flags are in least-significant 16 bits, other flags
  *   in top 16 bits
  */
-#define TIF_NOTIFY_RESUME       0       /* resumption notification requested */
-#define TIF_SIGPENDING          1       /* signal pending */
-#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
-#define TIF_SYSCALL_TRACE       3       /* syscall trace active */
-#define TIF_SYSCALL_AUDIT       4       /* syscall auditing active */
-#define TIF_SINGLESTEP          5       /* restore singlestep on return to user mode */
-#define TIF_RESTORE_SIGMASK     6       /* restore signal mask in do_signal() */
+#define TIF_SIGPENDING          0       /* signal pending */
+#define TIF_NEED_RESCHED        1       /* rescheduling necessary */
+#define TIF_SYSCALL_TRACE       2       /* syscall trace active */
+#define TIF_SYSCALL_AUDIT       3       /* syscall auditing active */
+#define TIF_SINGLESTEP          4       /* restore singlestep on return to user mode */
+#define TIF_RESTORE_SIGMASK     5       /* restore signal mask in do_signal() */
+#define TIF_PERFMON_WORK        6       /* work for pfm_handle_work() */
 #define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              17
 #define TIF_MCA_INIT            18      /* this task is processing MCA or INIT */
@@ -96,8 +96,8 @@ struct thread_info {
 #define _TIF_SYSCALL_AUDIT      (1 << TIF_SYSCALL_AUDIT)
 #define _TIF_SINGLESTEP         (1 << TIF_SINGLESTEP)
 #define _TIF_SYSCALL_TRACEAUDIT (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP)
-#define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
 #define _TIF_RESTORE_SIGMASK    (1 << TIF_RESTORE_SIGMASK)
+#define _TIF_PERFMON_WORK       (1 << TIF_PERFMON_WORK)
 #define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
 #define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
@@ -106,7 +106,9 @@ struct thread_info {
 #define _TIF_FREEZE             (1 << TIF_FREEZE)
 
 /* "work to do on user-return" bits */
-#define TIF_ALLWORK_MASK        (_TIF_NOTIFY_RESUME|_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_RESTORE_SIGMASK)
+#define TIF_ALLWORK_MASK        (_TIF_SIGPENDING|_TIF_PERFMON_WORK|_TIF_SYSCALL_AUDIT|\
+                                 _TIF_NEED_RESCHED| _TIF_SYSCALL_TRACE|\
+                                 _TIF_RESTORE_SIGMASK)
 /* like TIF_ALLWORK_BITS but sans TIF_SYSCALL_TRACE or TIF_SYSCALL_AUDIT */
 #define TIF_WORK_MASK           (TIF_ALLWORK_MASK&~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT))
 
diff --git a/include/asm-m32r/thread_info.h b/include/asm-m32r/thread_info.h
index 22aff3222d22..b7ccc3e68604 100644
--- a/include/asm-m32r/thread_info.h
+++ b/include/asm-m32r/thread_info.h
@@ -146,17 +146,15 @@ static inline unsigned int get_thread_fault_code(void)
  * - other flags in MSW
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_SINGLESTEP          4       /* restore singlestep on return to user mode */
-#define TIF_IRET                5       /* return with iret */
+#define TIF_SIGPENDING          1       /* signal pending */
+#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
+#define TIF_SINGLESTEP          3       /* restore singlestep on return to user mode */
+#define TIF_IRET                4       /* return with iret */
 #define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling TIF_NEED_RESCHED */
                                         /* 31..28 fault code */
 #define TIF_MEMDIE              17
 
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_SINGLESTEP         (1<<TIF_SINGLESTEP)
diff --git a/include/asm-m68knommu/thread_info.h b/include/asm-m68knommu/thread_info.h
index b8f009edf2b2..95996d978bed 100644
--- a/include/asm-m68knommu/thread_info.h
+++ b/include/asm-m68knommu/thread_info.h
@@ -83,16 +83,14 @@ static inline struct thread_info *current_thread_info(void)
  * thread information flag bit numbers
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_POLLING_NRFLAG      4       /* true if poll_idle() is polling
+#define TIF_SIGPENDING          1       /* signal pending */
+#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
+#define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling
                                            TIF_NEED_RESCHED */
-#define TIF_MEMDIE              5
+#define TIF_MEMDIE              4
 
 /* as above, but as bit values */
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
diff --git a/include/asm-mips/a.out.h b/include/asm-mips/a.out.h
index 1ad60ba186d0..bf55a5b34bef 100644
--- a/include/asm-mips/a.out.h
+++ b/include/asm-mips/a.out.h
@@ -38,7 +38,8 @@ struct exec
 #define STACK_TOP       TASK_SIZE
 #endif
 #ifdef CONFIG_64BIT
-#define STACK_TOP       (current->thread.mflags & MF_32BIT_ADDR ? TASK_SIZE32 : TASK_SIZE)
+#define STACK_TOP       \
+      (test_thread_flag(TIF_32BIT_ADDR) ? TASK_SIZE32 : TASK_SIZE)
 #endif
 #define STACK_TOP_MAX   TASK_SIZE
 
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index 087126a5faf9..c0f052b37b9e 100644
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -86,16 +86,6 @@
 #define  MACH_COBALT_27         0       /* Proto "27" hardware          */
 
 /*
- * Valid machtype for group NEC DDB
- */
-#define MACH_GROUP_NEC_DDB      8       /* NEC DDB                      */
-#define  MACH_NEC_DDB5074       0       /* NEC DDB Vrc-5074 */
-#define  MACH_NEC_DDB5476       1       /* NEC DDB Vrc-5476 */
-#define  MACH_NEC_DDB5477       2       /* NEC DDB Vrc-5477 */
-#define  MACH_NEC_ROCKHOPPER    3       /* Rockhopper base board */
-#define  MACH_NEC_ROCKHOPPERII  4       /* Rockhopper II base board */
-
-/*
  * Valid machtype for group BAGET
  */
 #define MACH_GROUP_BAGET        9       /* Baget                        */
@@ -145,9 +135,6 @@
 #define  MACH_TOSHIBA_RBTX4937  5
 #define  MACH_TOSHIBA_RBTX4938  6
 
-#define GROUP_TOSHIBA_NAMES     { "Pallas", "TopasCE", "JMR", "JMR TX3927", \
-                                  "RBTX4927", "RBTX4937" }
-
 /*
  * Valid machtype for group Alchemy
  */
diff --git a/include/asm-mips/ddb5xxx/ddb5477.h b/include/asm-mips/ddb5xxx/ddb5477.h
deleted file mode 100644
index 6cf177caf6d5..000000000000
--- a/include/asm-mips/ddb5xxx/ddb5477.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/***********************************************************************
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- * include/asm-mips/ddb5xxx/ddb5477.h
- *     DDB 5477 specific definitions and macros.
- *
- * 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.
- *
- ***********************************************************************
- */
-
-#ifndef __ASM_DDB5XXX_DDB5477_H
-#define __ASM_DDB5XXX_DDB5477_H
-
-#include <irq.h>
-
-/*
- * This contains macros that are specific to DDB5477 or renamed from
- * DDB5476.
- */
-
-/*
- * renamed PADRs
- */
-#define DDB_LCS0        DDB_DCS2
-#define DDB_LCS1        DDB_DCS3
-#define DDB_LCS2        DDB_DCS4
-#define DDB_VRC5477     DDB_INTCS
-
-/*
- * New CPU interface registers
- */
-#define DDB_INTCTRL0    0x0400  /* Interrupt Control 0 */
-#define DDB_INTCTRL1    0x0404  /* Interrupt Control 1 */
-#define DDB_INTCTRL2    0x0408  /* Interrupt Control 2 */
-#define DDB_INTCTRL3    0x040c  /* Interrupt Control 3 */
-
-#define DDB_INT0STAT    0x0420  /* INT0 Status [R] */
-#define DDB_INT1STAT    0x0428  /* INT1 Status [R] */
-#define DDB_INT2STAT    0x0430  /* INT2 Status [R] */
-#define DDB_INT3STAT    0x0438  /* INT3 Status [R] */
-#define DDB_INT4STAT    0x0440  /* INT4 Status [R] */
-#define DDB_NMISTAT     0x0450  /* NMI Status [R] */
-
-#define DDB_INTCLR32    0x0468  /* Interrupt Clear */
-
-#define DDB_INTPPES0    0x0470  /* PCI0 Interrupt Control */
-#define DDB_INTPPES1    0x0478  /* PCI1 Interrupt Control */
-
-#undef  DDB_CPUSTAT             /* duplicate in Vrc-5477 */
-#define DDB_CPUSTAT     0x0480  /* CPU Status [R] */
-#define DDB_BUSCTRL     0x0488  /* Internal Bus Control */
-
-
-/*
- * Timer registers
- */
-#define DDB_REFCTRL_L   DDB_T0CTRL
-#define DDB_REFCTRL_H   (DDB_T0CTRL+4)
-#define DDB_REFCNTR     DDB_T0CNTR
-#define DDB_SPT0CTRL_L  DDB_T1CTRL
-#define DDB_SPT0CTRL_H  (DDB_T1CTRL+4)
-#define DDB_SPT1CTRL_L  DDB_T2CTRL
-#define DDB_SPT1CTRL_H  (DDB_T2CTRL+4)
-#define DDB_SPT1CNTR    DDB_T1CTRL
-#define DDB_WDTCTRL_L   DDB_T3CTRL
-#define DDB_WDTCTRL_H   (DDB_T3CTRL+4)
-#define DDB_WDTCNTR     DDB_T3CNTR
-
-/*
- * DMA registers are moved.  We don't care about it for now. TODO.
- */
-
-/*
- * BARs for ext PCI (PCI0)
- */
-#undef  DDB_BARC
-#undef  DDB_BARB
-
-#define DDB_BARC0       0x0210  /* PCI0 Control */
-#define DDB_BARM010     0x0218  /* PCI0 SDRAM bank01 */
-#define DDB_BARM230     0x0220  /* PCI0 SDRAM bank23 */
-#define DDB_BAR00       0x0240  /* PCI0 LDCS0 */
-#define DDB_BAR10       0x0248  /* PCI0 LDCS1 */
-#define DDB_BAR20       0x0250  /* PCI0 LDCS2 */
-#define DDB_BAR30       0x0258  /* PCI0 LDCS3 */
-#define DDB_BAR40       0x0260  /* PCI0 LDCS4 */
-#define DDB_BAR50       0x0268  /* PCI0 LDCS5 */
-#define DDB_BARB0       0x0280  /* PCI0 BOOT */
-#define DDB_BARP00      0x0290  /* PCI0 for IOPCI Window0 */
-#define DDB_BARP10      0x0298  /* PCI0 for IOPCI Window1 */
-
-/*
- * BARs for IOPIC (PCI1)
- */
-#define DDB_BARC1       0x0610  /* PCI1 Control */
-#define DDB_BARM011     0x0618  /* PCI1 SDRAM bank01 */
-#define DDB_BARM231     0x0620  /* PCI1 SDRAM bank23 */
-#define DDB_BAR01       0x0640  /* PCI1 LDCS0 */
-#define DDB_BAR11       0x0648  /* PCI1 LDCS1 */
-#define DDB_BAR21       0x0650  /* PCI1 LDCS2 */
-#define DDB_BAR31       0x0658  /* PCI1 LDCS3 */
-#define DDB_BAR41       0x0660  /* PCI1 LDCS4 */
-#define DDB_BAR51       0x0668  /* PCI1 LDCS5 */
-#define DDB_BARB1       0x0680  /* PCI1 BOOT */
-#define DDB_BARP01      0x0690  /* PCI1 for ext PCI Window0 */
-#define DDB_BARP11      0x0698  /* PCI1 for ext PCI Window1 */
-
-/*
- * Other registers for ext PCI (PCI0)
- */
-#define DDB_PCIINIT00   0x02f0  /* PCI0 Initiator 0 */
-#define DDB_PCIINIT10   0x02f8  /* PCI0 Initiator 1 */
-
-#define DDB_PCISWP0     0x02b0  /* PCI0 Swap */
-#define DDB_PCIERR0     0x02b8  /* PCI0 Error */
-
-#define DDB_PCICTL0_L   0x02e0  /* PCI0 Control-L */
-#define DDB_PCICTL0_H   0x02e4  /* PCI0 Control-H */
-#define DDB_PCIARB0_L   0x02e8  /* PCI0 Arbitration-L */
-#define DDB_PCIARB0_H   0x02ec  /* PCI0 Arbitration-H */
-
-/*
- * Other registers for IOPCI (PCI1)
- */
-#define DDB_IOPCIW0     0x00d0  /* PCI Address Window 0 [R/W] */
-#define DDB_IOPCIW1     0x00d8  /* PCI Address Window 1 [R/W] */
-
-#define DDB_PCIINIT01   0x06f0  /* PCI1 Initiator 0 */
-#define DDB_PCIINIT11   0x06f8  /* PCI1 Initiator 1 */
-
-#define DDB_PCISWP1     0x06b0  /* PCI1 Swap */
-#define DDB_PCIERR1     0x06b8  /* PCI1 Error */
-
-#define DDB_PCICTL1_L   0x06e0  /* PCI1 Control-L */
-#define DDB_PCICTL1_H   0x06e4  /* PCI1 Control-H */
-#define DDB_PCIARB1_L   0x06e8  /* PCI1 Arbitration-L */
-#define DDB_PCIARB1_H   0x06ec  /* PCI1 Arbitration-H */
-
-/*
- * Local Bus
- */
-#define DDB_LCST0       0x0110  /* LB Chip Select Timing 0 */
-#define DDB_LCST1       0x0118  /* LB Chip Select Timing 1 */
-#undef DDB_LCST2
-#define DDB_LCST2       0x0120  /* LB Chip Select Timing 2 */
-#undef DDB_LCST3
-#undef DDB_LCST4
-#undef DDB_LCST5
-#undef DDB_LCST6
-#undef DDB_LCST7
-#undef DDB_LCST8
-#define DDB_ERRADR      0x0150  /* Error Address Register */
-#define DDB_ERRCS       0x0160
-#define DDB_BTM         0x0170  /* Boot Time Mode value */
-
-/*
- * MISC registers
- */
-#define DDB_GIUFUNSEL   0x4040  /* select dual-func pins */
-#define DDB_PIBMISC     0x0750  /* USB buffer enable / power saving */
-
-/*
- *  Memory map (physical address)
- *
- *  Note most of the following address must be properly aligned by the
- *  corresponding size.  For example, if PCI_IO_SIZE is 16MB, then
- *  PCI_IO_BASE must be aligned along 16MB boundary.
- */
-
-/* the actual ram size is detected at run-time */
-#define DDB_SDRAM_BASE          0x00000000
-#define DDB_MAX_SDRAM_SIZE      0x08000000      /* less than 128MB */
-
-#define DDB_PCI0_MEM_BASE       0x08000000
-#define DDB_PCI0_MEM_SIZE       0x08000000      /* 128 MB */
-
-#define DDB_PCI1_MEM_BASE       0x10000000
-#define DDB_PCI1_MEM_SIZE       0x08000000      /* 128 MB */
-
-#define DDB_PCI0_CONFIG_BASE    0x18000000
-#define DDB_PCI0_CONFIG_SIZE    0x01000000      /* 16 MB */
-
-#define DDB_PCI1_CONFIG_BASE    0x19000000
-#define DDB_PCI1_CONFIG_SIZE    0x01000000      /* 16 MB */
-
-#define DDB_PCI_IO_BASE         0x1a000000      /* we concatenate two IOs */
-#define DDB_PCI0_IO_BASE        0x1a000000
-#define DDB_PCI0_IO_SIZE        0x01000000      /* 16 MB */
-#define DDB_PCI1_IO_BASE        0x1b000000
-#define DDB_PCI1_IO_SIZE        0x01000000      /* 16 MB */
-
-#define DDB_LCS0_BASE           0x1c000000      /* flash memory */
-#define DDB_LCS0_SIZE           0x01000000      /* 16 MB */
-
-#define DDB_LCS1_BASE           0x1d000000      /* misc */
-#define DDB_LCS1_SIZE           0x01000000      /* 16 MB */
-
-#define DDB_LCS2_BASE           0x1e000000      /* Mezzanine */
-#define DDB_LCS2_SIZE           0x01000000      /* 16 MB */
-
-#define DDB_VRC5477_BASE        0x1fa00000      /* VRC5477 control regs */
-#define DDB_VRC5477_SIZE        0x00200000      /* 2MB */
-
-#define DDB_BOOTCS_BASE         0x1fc00000      /* Boot ROM / EPROM /Flash */
-#define DDB_BOOTCS_SIZE         0x00200000      /* 2 MB - doc says 4MB */
-
-#define DDB_LED                 DDB_LCS1_BASE + 0x10000
-
-
-/*
- * DDB5477 specific functions
- */
-#ifndef __ASSEMBLY__
-extern void ddb5477_irq_setup(void);
-
-/* route irq to cpu int pin */
-extern void ll_vrc5477_irq_route(int vrc5477_irq, int ip);
-
-/* low-level routine for enabling vrc5477 irq, bypassing high-level */
-extern void ll_vrc5477_irq_enable(int vrc5477_irq);
-extern void ll_vrc5477_irq_disable(int vrc5477_irq);
-#endif /* !__ASSEMBLY__ */
-
-/* PCI intr ack share PCIW0 with PCI IO */
-#define DDB_PCI_IACK_BASE       DDB_PCI_IO_BASE
-
-/*
- * Interrupt mapping
- *
- * We have three interrupt controllers:
- *
- *   . CPU itself - 8 sources
- *   . i8259 - 16 sources
- *   . vrc5477 - 32 sources
- *
- *  They connected as follows:
- *    all vrc5477 interrupts are routed to cpu IP2 (by software setting)
- *    all i8359 are routed to INTC in vrc5477 (by hardware connection)
- *
- *  All VRC5477 PCI interrupts are level-triggered (no ack needed).
- *  All PCI irq but INTC are active low.
- */
-
-/*
- * irq number block assignment
- */
-
-#define NUM_CPU_IRQ             8
-#define NUM_VRC5477_IRQ         32
-
-#define CPU_IRQ_BASE            MIPS_CPU_IRQ_BASE
-#define VRC5477_IRQ_BASE        (CPU_IRQ_BASE + NUM_CPU_IRQ)
-
-/*
- * vrc5477 irq defs
- */
-
-#define VRC5477_IRQ_CPCE        (0 + VRC5477_IRQ_BASE)  /* cpu parity error */
-#define VRC5477_IRQ_CNTD        (1 + VRC5477_IRQ_BASE)  /* cpu no target */
-#define VRC5477_IRQ_I2C         (2 + VRC5477_IRQ_BASE)  /* I2C */
-#define VRC5477_IRQ_DMA         (3 + VRC5477_IRQ_BASE)  /* DMA */
-#define VRC5477_IRQ_UART0       (4 + VRC5477_IRQ_BASE)
-#define VRC5477_IRQ_WDOG        (5 + VRC5477_IRQ_BASE)  /* watchdog timer */
-#define VRC5477_IRQ_SPT1        (6 + VRC5477_IRQ_BASE)    /* special purpose timer 1 */
-#define VRC5477_IRQ_LBRT        (7 + VRC5477_IRQ_BASE)  /* local bus read timeout */
-#define VRC5477_IRQ_INTA        (8 + VRC5477_IRQ_BASE)  /* PCI INT #A */
-#define VRC5477_IRQ_INTB        (9 + VRC5477_IRQ_BASE)  /* PCI INT #B */
-#define VRC5477_IRQ_INTC        (10 + VRC5477_IRQ_BASE) /* PCI INT #C */
-#define VRC5477_IRQ_INTD        (11 + VRC5477_IRQ_BASE) /* PCI INT #D */
-#define VRC5477_IRQ_INTE        (12 + VRC5477_IRQ_BASE) /* PCI INT #E */
-#define VRC5477_IRQ_RESERVED_13 (13 + VRC5477_IRQ_BASE) /* reserved  */
-#define VRC5477_IRQ_PCIS        (14 + VRC5477_IRQ_BASE) /* PCI SERR #  */
-#define VRC5477_IRQ_PCI         (15 + VRC5477_IRQ_BASE) /* PCI internal error */
-#define VRC5477_IRQ_IOPCI_INTA  (16 + VRC5477_IRQ_BASE)      /* USB-H */
-#define VRC5477_IRQ_IOPCI_INTB  (17 + VRC5477_IRQ_BASE)      /* USB-P */
-#define VRC5477_IRQ_IOPCI_INTC  (18 + VRC5477_IRQ_BASE)      /* AC97 */
-#define VRC5477_IRQ_IOPCI_INTD  (19 + VRC5477_IRQ_BASE)      /* Reserved */
-#define VRC5477_IRQ_UART1       (20 + VRC5477_IRQ_BASE)
-#define VRC5477_IRQ_SPT0        (21 + VRC5477_IRQ_BASE)      /* special purpose timer 0 */
-#define VRC5477_IRQ_GPT0        (22 + VRC5477_IRQ_BASE)      /* general purpose timer 0 */
-#define VRC5477_IRQ_GPT1        (23 + VRC5477_IRQ_BASE)      /* general purpose timer 1 */
-#define VRC5477_IRQ_GPT2        (24 + VRC5477_IRQ_BASE)      /* general purpose timer 2 */
-#define VRC5477_IRQ_GPT3        (25 + VRC5477_IRQ_BASE)      /* general purpose timer 3 */
-#define VRC5477_IRQ_GPIO        (26 + VRC5477_IRQ_BASE)
-#define VRC5477_IRQ_SIO0        (27 + VRC5477_IRQ_BASE)
-#define VRC5477_IRQ_SIO1        (28 + VRC5477_IRQ_BASE)
-#define VRC5477_IRQ_RESERVED_29 (29 + VRC5477_IRQ_BASE)      /* reserved */
-#define VRC5477_IRQ_IOPCISERR   (30 + VRC5477_IRQ_BASE)      /* IO PCI SERR # */
-#define VRC5477_IRQ_IOPCI       (31 + VRC5477_IRQ_BASE)
-
-/*
- * i2859 irq assignment
- */
-#define I8259_IRQ_RESERVED_0    (0 + I8259A_IRQ_BASE)
-#define I8259_IRQ_KEYBOARD      (1 + I8259A_IRQ_BASE)   /* M1543 default */
-#define I8259_IRQ_CASCADE       (2 + I8259A_IRQ_BASE)
-#define I8259_IRQ_UART_B        (3 + I8259A_IRQ_BASE)   /* M1543 default, may conflict with RTC according to schematic diagram  */
-#define I8259_IRQ_UART_A        (4 + I8259A_IRQ_BASE)   /* M1543 default */
-#define I8259_IRQ_PARALLEL      (5 + I8259A_IRQ_BASE)   /* M1543 default */
-#define I8259_IRQ_RESERVED_6    (6 + I8259A_IRQ_BASE)
-#define I8259_IRQ_RESERVED_7    (7 + I8259A_IRQ_BASE)
-#define I8259_IRQ_RTC           (8 + I8259A_IRQ_BASE)   /* who set this? */
-#define I8259_IRQ_USB           (9 + I8259A_IRQ_BASE)   /* ddb_setup */
-#define I8259_IRQ_PMU           (10 + I8259A_IRQ_BASE)  /* ddb_setup */
-#define I8259_IRQ_RESERVED_11   (11 + I8259A_IRQ_BASE)
-#define I8259_IRQ_RESERVED_12   (12 + I8259A_IRQ_BASE)  /* m1543_irq_setup */
-#define I8259_IRQ_RESERVED_13   (13 + I8259A_IRQ_BASE)
-#define I8259_IRQ_HDC1          (14 + I8259A_IRQ_BASE)  /* default and ddb_setup */
-#define I8259_IRQ_HDC2          (15 + I8259A_IRQ_BASE)  /* default */
-
-
-/*
- * misc
- */
-#define VRC5477_I8259_CASCADE   (VRC5477_IRQ_INTC - VRC5477_IRQ_BASE)
-#define CPU_VRC5477_CASCADE     2
-
-/*
- * debug routines
- */
-#ifndef __ASSEMBLY__
-#if defined(CONFIG_RUNTIME_DEBUG)
-extern void vrc5477_show_pdar_regs(void);
-extern void vrc5477_show_pci_regs(void);
-extern void vrc5477_show_bar_regs(void);
-extern void vrc5477_show_int_regs(void);
-extern void vrc5477_show_all_regs(void);
-#endif
-
-/*
- * RAM size
- */
-extern int board_ram_size;
-#endif /* !__ASSEMBLY__ */
-
-#endif /* __ASM_DDB5XXX_DDB5477_H */
diff --git a/include/asm-mips/ddb5xxx/ddb5xxx.h b/include/asm-mips/ddb5xxx/ddb5xxx.h
deleted file mode 100644
index e97fcc8d548b..000000000000
--- a/include/asm-mips/ddb5xxx/ddb5xxx.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- * Copyright (C) 2000 Geert Uytterhoeven <geert@sonycom.com>
- *                    Sony Software Development Center Europe (SDCE), Brussels
- *
- * include/asm-mips/ddb5xxx/ddb5xxx.h
- *     Common header for all NEC DDB 5xxx boards, including 5074, 5476, 5477.
- *
- * 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.
- *
- */
-
-#ifndef __ASM_DDB5XXX_DDB5XXX_H
-#define __ASM_DDB5XXX_DDB5XXX_H
-
-#include <linux/types.h>
-
-/*
- *  This file is based on the following documentation:
- *
- *      NEC Vrc 5074 System Controller Data Sheet, June 1998
- *
- * [jsun] It is modified so that this file only contains the macros
- * that are true for all DDB 5xxx boards.  The modification is based on
- *
- *      uPD31577(VRC5477) VR5432-SDRAM/PCI Bridge (Luke)
- *      Preliminary Specification Decoment, Rev 1.1, 27 Dec, 2000
- *
- */
-
-
-#define DDB_BASE                0xbfa00000
-#define DDB_SIZE                0x00200000              /* 2 MB */
-
-
-/*
- *  Physical Device Address Registers (PDARs)
- */
-
-#define DDB_SDRAM0      0x0000  /* SDRAM Bank 0 [R/W] */
-#define DDB_SDRAM1      0x0008  /* SDRAM Bank 1 [R/W] */
-#define DDB_DCS2        0x0010  /* Device Chip-Select 2 [R/W] */
-#define DDB_DCS3        0x0018  /* Device Chip-Select 3 [R/W] */
-#define DDB_DCS4        0x0020  /* Device Chip-Select 4 [R/W] */
-#define DDB_DCS5        0x0028  /* Device Chip-Select 5 [R/W] */
-#define DDB_DCS6        0x0030  /* Device Chip-Select 6 [R/W] */
-#define DDB_DCS7        0x0038  /* Device Chip-Select 7 [R/W] */
-#define DDB_DCS8        0x0040  /* Device Chip-Select 8 [R/W] */
-#define DDB_PCIW0       0x0060  /* PCI Address Window 0 [R/W] */
-#define DDB_PCIW1       0x0068  /* PCI Address Window 1 [R/W] */
-#define DDB_INTCS       0x0070  /* Controller Internal Registers and Devices */
-                                /* [R/W] */
-#define DDB_BOOTCS      0x0078  /* Boot ROM Chip-Select [R/W] */
-/* Vrc5477 has two more, IOPCIW0, IOPCIW1 */
-
-/*
- *  CPU Interface Registers
- */
-#define DDB_CPUSTAT     0x0080  /* CPU Status [R/W] */
-#define DDB_INTCTRL     0x0088  /* Interrupt Control [R/W] */
-#define DDB_INTSTAT0    0x0090  /* Interrupt Status 0 [R] */
-#define DDB_INTSTAT1    0x0098  /* Interrupt Status 1 and CPU Interrupt */
-                                /* Enable [R/W] */
-#define DDB_INTCLR      0x00A0  /* Interrupt Clear [R/W] */
-#define DDB_INTPPES     0x00A8  /* PCI Interrupt Control [R/W] */
-
-
-/*
- *  Memory-Interface Registers
- */
-#define DDB_MEMCTRL     0x00C0  /* Memory Control */
-#define DDB_ACSTIME     0x00C8  /* Memory Access Timing [R/W] */
-#define DDB_CHKERR      0x00D0  /* Memory Check Error Status [R] */
-
-
-/*
- *  PCI-Bus Registers
- */
-#define DDB_PCICTRL     0x00E0  /* PCI Control [R/W] */
-#define DDB_PCIARB      0x00E8  /* PCI Arbiter [R/W] */
-#define DDB_PCIINIT0    0x00F0  /* PCI Master (Initiator) 0 [R/W] */
-#define DDB_PCIINIT1    0x00F8  /* PCI Master (Initiator) 1 [R/W] */
-#define DDB_PCIERR      0x00B8  /* PCI Error [R/W] */
-
-
-/*
- *  Local-Bus Registers
- */
-#define DDB_LCNFG       0x0100  /* Local Bus Configuration [R/W] */
-#define DDB_LCST2       0x0110  /* Local Bus Chip-Select Timing 2 [R/W] */
-#define DDB_LCST3       0x0118  /* Local Bus Chip-Select Timing 3 [R/W] */
-#define DDB_LCST4       0x0120  /* Local Bus Chip-Select Timing 4 [R/W] */
-#define DDB_LCST5       0x0128  /* Local Bus Chip-Select Timing 5 [R/W] */
-#define DDB_LCST6       0x0130  /* Local Bus Chip-Select Timing 6 [R/W] */
-#define DDB_LCST7       0x0138  /* Local Bus Chip-Select Timing 7 [R/W] */
-#define DDB_LCST8       0x0140  /* Local Bus Chip-Select Timing 8 [R/W] */
-#define DDB_DCSFN       0x0150  /* Device Chip-Select Muxing and Output */
-                                /* Enables [R/W] */
-#define DDB_DCSIO       0x0158  /* Device Chip-Selects As I/O Bits [R/W] */
-#define DDB_BCST        0x0178  /* Local Boot Chip-Select Timing [R/W] */
-
-
-/*
- *  DMA Registers
- */
-#define DDB_DMACTRL0    0x0180  /* DMA Control 0 [R/W] */
-#define DDB_DMASRCA0    0x0188  /* DMA Source Address 0 [R/W] */
-#define DDB_DMADESA0    0x0190  /* DMA Destination Address 0 [R/W] */
-#define DDB_DMACTRL1    0x0198  /* DMA Control 1 [R/W] */
-#define DDB_DMASRCA1    0x01A0  /* DMA Source Address 1 [R/W] */
-#define DDB_DMADESA1    0x01A8  /* DMA Destination Address 1 [R/W] */
-
-
-/*
- *  Timer Registers
- */
-#define DDB_T0CTRL      0x01C0  /* SDRAM Refresh Control [R/W] */
-#define DDB_T0CNTR      0x01C8  /* SDRAM Refresh Counter [R/W] */
-#define DDB_T1CTRL      0x01D0  /* CPU-Bus Read Time-Out Control [R/W] */
-#define DDB_T1CNTR      0x01D8  /* CPU-Bus Read Time-Out Counter [R/W] */
-#define DDB_T2CTRL      0x01E0  /* General-Purpose Timer Control [R/W] */
-#define DDB_T2CNTR      0x01E8  /* General-Purpose Timer Counter [R/W] */
-#define DDB_T3CTRL      0x01F0  /* Watchdog Timer Control [R/W] */
-#define DDB_T3CNTR      0x01F8  /* Watchdog Timer Counter [R/W] */
-
-
-/*
- *  PCI Configuration Space Registers
- */
-#define DDB_PCI_BASE    0x0200
-
-#define DDB_VID         0x0200  /* PCI Vendor ID [R] */
-#define DDB_DID         0x0202  /* PCI Device ID [R] */
-#define DDB_PCICMD      0x0204  /* PCI Command [R/W] */
-#define DDB_PCISTS      0x0206  /* PCI Status [R/W] */
-#define DDB_REVID       0x0208  /* PCI Revision ID [R] */
-#define DDB_CLASS       0x0209  /* PCI Class Code [R] */
-#define DDB_CLSIZ       0x020C  /* PCI Cache Line Size [R/W] */
-#define DDB_MLTIM       0x020D  /* PCI Latency Timer [R/W] */
-#define DDB_HTYPE       0x020E  /* PCI Header Type [R] */
-#define DDB_BIST        0x020F  /* BIST [R] (unimplemented) */
-#define DDB_BARC        0x0210  /* PCI Base Address Register Control [R/W] */
-#define DDB_BAR0        0x0218  /* PCI Base Address Register 0 [R/W] */
-#define DDB_BAR1        0x0220  /* PCI Base Address Register 1 [R/W] */
-#define DDB_CIS         0x0228  /* PCI Cardbus CIS Pointer [R] */
-                                /* (unimplemented) */
-#define DDB_SSVID       0x022C  /* PCI Sub-System Vendor ID [R/W] */
-#define DDB_SSID        0x022E  /* PCI Sub-System ID [R/W] */
-#define DDB_ROM         0x0230  /* Expansion ROM Base Address [R] */
-                                /* (unimplemented) */
-#define DDB_INTLIN      0x023C  /* PCI Interrupt Line [R/W] */
-#define DDB_INTPIN      0x023D  /* PCI Interrupt Pin [R] */
-#define DDB_MINGNT      0x023E  /* PCI Min_Gnt [R] (unimplemented) */
-#define DDB_MAXLAT      0x023F  /* PCI Max_Lat [R] (unimplemented) */
-#define DDB_BAR2        0x0240  /* PCI Base Address Register 2 [R/W] */
-#define DDB_BAR3        0x0248  /* PCI Base Address Register 3 [R/W] */
-#define DDB_BAR4        0x0250  /* PCI Base Address Register 4 [R/W] */
-#define DDB_BAR5        0x0258  /* PCI Base Address Register 5 [R/W] */
-#define DDB_BAR6        0x0260  /* PCI Base Address Register 6 [R/W] */
-#define DDB_BAR7        0x0268  /* PCI Base Address Register 7 [R/W] */
-#define DDB_BAR8        0x0270  /* PCI Base Address Register 8 [R/W] */
-#define DDB_BARB        0x0278  /* PCI Base Address Register BOOT [R/W] */
-
-
-/*
- *  Nile 4 Register Access
- */
-
-static inline void ddb_sync(void)
-{
-    volatile u32 *p = (volatile u32 *)0xbfc00000;
-    (void)(*p);
-}
-
-static inline void ddb_out32(u32 offset, u32 val)
-{
-    *(volatile u32 *)(DDB_BASE+offset) = val;
-    ddb_sync();
-}
-
-static inline u32 ddb_in32(u32 offset)
-{
-    u32 val = *(volatile u32 *)(DDB_BASE+offset);
-    ddb_sync();
-    return val;
-}
-
-static inline void ddb_out16(u32 offset, u16 val)
-{
-    *(volatile u16 *)(DDB_BASE+offset) = val;
-    ddb_sync();
-}
-
-static inline u16 ddb_in16(u32 offset)
-{
-    u16 val = *(volatile u16 *)(DDB_BASE+offset);
-    ddb_sync();
-    return val;
-}
-
-static inline void ddb_out8(u32 offset, u8 val)
-{
-    *(volatile u8 *)(DDB_BASE+offset) = val;
-    ddb_sync();
-}
-
-static inline u8 ddb_in8(u32 offset)
-{
-    u8 val = *(volatile u8 *)(DDB_BASE+offset);
-    ddb_sync();
-    return val;
-}
-
-
-/*
- *  Physical Device Address Registers
- */
-
-extern u32
-ddb_calc_pdar(u32 phys, u32 size, int width, int on_memory_bus, int pci_visible);
-extern void
-ddb_set_pdar(u32 pdar, u32 phys, u32 size, int width,
-             int on_memory_bus, int pci_visible);
-
-/*
- *  PCI Master Registers
- */
-
-#define DDB_PCICMD_IACK         0       /* PCI Interrupt Acknowledge */
-#define DDB_PCICMD_IO           1       /* PCI I/O Space */
-#define DDB_PCICMD_MEM          3       /* PCI Memory Space */
-#define DDB_PCICMD_CFG          5       /* PCI Configuration Space */
-
-/*
- * additional options for pci init reg (no shifting needed)
- */
-#define DDB_PCI_CFGTYPE1     0x200   /* for pci init0/1 regs */
-#define DDB_PCI_ACCESS_32    0x10    /* for pci init0/1 regs */
-
-
-extern void ddb_set_pmr(u32 pmr, u32 type, u32 addr, u32 options);
-
-/*
- * we need to reset pci bus when we start up and shutdown
- */
-extern void ddb_pci_reset_bus(void);
-
-
-/*
- * include the board dependent part
- */
-#if defined(CONFIG_DDB5477)
-#include <asm/ddb5xxx/ddb5477.h>
-#else
-#error "Unknown DDB board!"
-#endif
-
-#endif /* __ASM_DDB5XXX_DDB5XXX_H */
diff --git a/include/asm-mips/elf.h b/include/asm-mips/elf.h
index ebd6bfb19d66..e7d95d48177d 100644
--- a/include/asm-mips/elf.h
+++ b/include/asm-mips/elf.h
@@ -265,7 +265,7 @@ do {									\
 #ifdef CONFIG_MIPS32_N32
 #define __SET_PERSONALITY32_N32()                                       \
         do {                                                            \
-                current->thread.mflags |= MF_N32;                       \
+                set_thread_flag(TIF_32BIT_ADDR);                        \
                 current->thread.abi = &mips_abi_n32;                    \
         } while (0)
 #else
@@ -276,7 +276,8 @@ do {									\
 #ifdef CONFIG_MIPS32_O32
 #define __SET_PERSONALITY32_O32()                                       \
         do {                                                            \
-                current->thread.mflags |= MF_O32;                       \
+                set_thread_flag(TIF_32BIT_REGS);                        \
+                set_thread_flag(TIF_32BIT_ADDR);                        \
                 current->thread.abi = &mips_abi_32;                     \
         } while (0)
 #else
@@ -299,13 +300,13 @@ do {									\
 
 #define SET_PERSONALITY(ex, ibcs2)                                      \
 do {                                                                    \
-        current->thread.mflags &= ~MF_ABI_MASK;                         \
+        clear_thread_flag(TIF_32BIT_REGS);                              \
+        clear_thread_flag(TIF_32BIT_ADDR);                              \
+                                                                        \
         if ((ex).e_ident[EI_CLASS] == ELFCLASS32)                       \
                 __SET_PERSONALITY32(ex);                                \
-        else {                                                          \
-                current->thread.mflags |= MF_N64;                       \
+        else                                                            \
                 current->thread.abi = &mips_abi;                        \
-        }                                                               \
                                                                         \
         if (ibcs2)                                                      \
                 set_personality(PER_SVR4);                              \
diff --git a/include/asm-mips/hazards.h b/include/asm-mips/hazards.h
index d9119f43f9aa..918a4894b587 100644
--- a/include/asm-mips/hazards.h
+++ b/include/asm-mips/hazards.h
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2003, 2004 Ralf Baechle <ralf@linux-mips.org>
+ * Copyright (C) 2003, 04, 07 Ralf Baechle <ralf@linux-mips.org>
  * Copyright (C) MIPS Technologies, Inc.
  *   written by Ralf Baechle <ralf@linux-mips.org>
  */
@@ -23,6 +23,11 @@ static inline void name(void)						\
         __asm__ __volatile__ (#name);                                   \
 }
 
+/*
+ * MIPS R2 instruction hazard barrier.   Needs to be called as a subroutine.
+ */
+extern void mips_ihb(void);
+
 #endif
 
 ASMMACRO(_ssnop,
diff --git a/include/asm-mips/mach-tx49xx/cpu-feature-overrides.h b/include/asm-mips/mach-tx49xx/cpu-feature-overrides.h
new file mode 100644
index 000000000000..275eaf92c748
--- /dev/null
+++ b/include/asm-mips/mach-tx49xx/cpu-feature-overrides.h
@@ -0,0 +1,23 @@
+#ifndef __ASM_MACH_TX49XX_CPU_FEATURE_OVERRIDES_H
+#define __ASM_MACH_TX49XX_CPU_FEATURE_OVERRIDES_H
+
+#define cpu_has_llsc    1
+#define cpu_has_64bits  1
+#define cpu_has_inclusive_pcaches       0
+
+#define cpu_has_mips16          0
+#define cpu_has_mdmx            0
+#define cpu_has_mips3d          0
+#define cpu_has_smartmips       0
+#define cpu_has_vtag_icache     0
+#define cpu_has_ic_fills_f_dc   0
+#define cpu_has_dsp     0
+#define cpu_has_mipsmt  0
+#define cpu_has_userlocal       0
+
+#define cpu_has_mips32r1        0
+#define cpu_has_mips32r2        0
+#define cpu_has_mips64r1        0
+#define cpu_has_mips64r2        0
+
+#endif /* __ASM_MACH_TX49XX_CPU_FEATURE_OVERRIDES_H */
diff --git a/include/asm-mips/mach-tx49xx/kmalloc.h b/include/asm-mips/mach-tx49xx/kmalloc.h
new file mode 100644
index 000000000000..913ff196259d
--- /dev/null
+++ b/include/asm-mips/mach-tx49xx/kmalloc.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_MACH_TX49XX_KMALLOC_H
+#define __ASM_MACH_TX49XX_KMALLOC_H
+
+/*
+ * All happy, no need to define ARCH_KMALLOC_MINALIGN
+ */
+
+#endif /* __ASM_MACH_TX49XX_KMALLOC_H */
diff --git a/include/asm-mips/mips-boards/generic.h b/include/asm-mips/mips-boards/generic.h
index c8ebcc3e1267..d58977483534 100644
--- a/include/asm-mips/mips-boards/generic.h
+++ b/include/asm-mips/mips-boards/generic.h
@@ -67,6 +67,7 @@
 #define MIPS_REVISION_CORID_CORE_FPGAR2    8
 #define MIPS_REVISION_CORID_CORE_FPGA3     9
 #define MIPS_REVISION_CORID_CORE_24K       10
+#define MIPS_REVISION_CORID_CORE_FPGA4     11
 
 /**** Artificial corid defines ****/
 /*
diff --git a/include/asm-mips/mips_mt.h b/include/asm-mips/mips_mt.h
index 8045abc78d0f..ac7935203f89 100644
--- a/include/asm-mips/mips_mt.h
+++ b/include/asm-mips/mips_mt.h
@@ -8,6 +8,12 @@
 
 #include <linux/cpumask.h>
 
+/*
+ * How many VPEs and TCs is Linux allowed to use?  0 means no limit.
+ */
+extern int tclimit;
+extern int vpelimit;
+
 extern cpumask_t mt_fpu_cpumask;
 extern unsigned long mt_fpemul_threshold;
 
diff --git a/include/asm-mips/pmon.h b/include/asm-mips/pmon.h
index 260f3448ccf1..6ad519189ce2 100644
--- a/include/asm-mips/pmon.h
+++ b/include/asm-mips/pmon.h
@@ -22,7 +22,7 @@ struct callvectors {
         char*   (*gets) (char*);
         union {
                 int     (*smpfork) (unsigned long cp, char *sp);
-                int     (*cpustart) (long, long, long, long);
+                int     (*cpustart) (long, void (*)(void), void *, long);
         } _s;
         int     (*semlock) (int sem);
         void    (*semunlock) (int sem);
diff --git a/include/asm-mips/processor.h b/include/asm-mips/processor.h
index 1d8b9a8ae324..83bc94534084 100644
--- a/include/asm-mips/processor.h
+++ b/include/asm-mips/processor.h
@@ -62,8 +62,9 @@ extern unsigned int vced_count, vcei_count;
  * This decides where the kernel will search for a free chunk of vm
  * space during mmap's.
  */
-#define TASK_UNMAPPED_BASE      ((current->thread.mflags & MF_32BIT_ADDR) ? \
-        PAGE_ALIGN(TASK_SIZE32 / 3) : PAGE_ALIGN(TASK_SIZE / 3))
+#define TASK_UNMAPPED_BASE                                              \
+        (test_thread_flag(TIF_32BIT_ADDR) ?                             \
+                PAGE_ALIGN(TASK_SIZE32 / 3) : PAGE_ALIGN(TASK_SIZE / 3))
 #endif
 
 #define NUM_FPU_REGS    32
@@ -132,22 +133,11 @@ struct thread_struct {
         unsigned long cp0_baduaddr;     /* Last kernel fault accessing USEG */
         unsigned long error_code;
         unsigned long trap_no;
-#define MF_FIXADE       1               /* Fix address errors in software */
-#define MF_LOGADE       2               /* Log address errors to syslog */
-#define MF_32BIT_REGS   4               /* also implies 16/32 fprs */
-#define MF_32BIT_ADDR   8               /* 32-bit address space (o32/n32) */
-#define MF_FPUBOUND     0x10            /* thread bound to FPU-full CPU set */
-        unsigned long mflags;
         unsigned long irix_trampoline;  /* Wheee... */
         unsigned long irix_oldctx;
         struct mips_abi *abi;
 };
 
-#define MF_ABI_MASK     (MF_32BIT_REGS | MF_32BIT_ADDR)
-#define MF_O32          (MF_32BIT_REGS | MF_32BIT_ADDR)
-#define MF_N32          MF_32BIT_ADDR
-#define MF_N64          0
-
 #ifdef CONFIG_MIPS_MT_FPAFF
 #define FPAFF_INIT                                              \
         .emulated_fp                    = 0,                    \
@@ -200,10 +190,6 @@ struct thread_struct {
         .cp0_baduaddr           = 0,                            \
         .error_code             = 0,                            \
         .trap_no                = 0,                            \
-        /*                                                      \
-         * For now the default is to fix address errors         \
-         */                                                     \
-        .mflags                 = MF_FIXADE,                    \
         .irix_trampoline        = 0,                            \
         .irix_oldctx            = 0,                            \
 }
diff --git a/include/asm-mips/seccomp.h b/include/asm-mips/seccomp.h
new file mode 100644
index 000000000000..36ed44070256
--- /dev/null
+++ b/include/asm-mips/seccomp.h
@@ -0,0 +1,37 @@
+#ifndef __ASM_SECCOMP_H
+
+#include <linux/thread_info.h>
+#include <linux/unistd.h>
+
+#define __NR_seccomp_read __NR_read
+#define __NR_seccomp_write __NR_write
+#define __NR_seccomp_exit __NR_exit
+#define __NR_seccomp_sigreturn __NR_rt_sigreturn
+
+/*
+ * Kludge alert:
+ *
+ * The generic seccomp code currently allows only a single compat ABI.  Until
+ * this is fixed we priorize O32 as the compat ABI over N32.
+ */
+#ifdef CONFIG_MIPS32_O32
+
+#define TIF_32BIT TIF_32BIT_REGS
+
+#define __NR_seccomp_read_32            4003
+#define __NR_seccomp_write_32           4004
+#define __NR_seccomp_exit_32            4001
+#define __NR_seccomp_sigreturn_32       4193    /* rt_sigreturn */
+
+#elif defined(CONFIG_MIPS32_N32)
+
+#define TIF_32BIT _TIF_32BIT_ADDR
+
+#define __NR_seccomp_read_32            6000
+#define __NR_seccomp_write_32           6001
+#define __NR_seccomp_exit_32            6058
+#define __NR_seccomp_sigreturn_32       6211    /* rt_sigreturn */
+
+#endif /* CONFIG_MIPS32_O32 */
+
+#endif /* __ASM_SECCOMP_H */
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h
index 8d0b1cd4a45e..357251f42518 100644
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
@@ -46,10 +46,12 @@ struct task_struct;
 
 #define __mips_mt_fpaff_switch_to(prev)                                 \
 do {                                                                    \
+        struct thread_info *__prev_ti = task_thread_info(prev);         \
+                                                                        \
         if (cpu_has_fpu &&                                              \
-            (prev->thread.mflags & MF_FPUBOUND) &&                      \
-             (!(KSTK_STATUS(prev) & ST0_CU1))) {                        \
-                prev->thread.mflags &= ~MF_FPUBOUND;                    \
+            test_ti_thread_flag(__prev_ti, TIF_FPUBOUND) &&             \
+            (!(KSTK_STATUS(prev) & ST0_CU1))) {                         \
+                clear_ti_thread_flag(__prev_ti, TIF_FPUBOUND);          \
                 prev->cpus_allowed = prev->thread.user_cpus_allowed;    \
         }                                                               \
         next->thread.emulated_fp = 0;                                   \
diff --git a/include/asm-mips/thread_info.h b/include/asm-mips/thread_info.h
index fbcda8204473..b2772df1a1bd 100644
--- a/include/asm-mips/thread_info.h
+++ b/include/asm-mips/thread_info.h
@@ -46,7 +46,7 @@ struct thread_info {
 {                                               \
         .task           = &tsk,                 \
         .exec_domain    = &default_exec_domain, \
-        .flags          = 0,                    \
+        .flags          = _TIF_FIXADE,          \
         .cpu            = 0,                    \
         .preempt_count  = 1,                    \
         .addr_limit     = KERNEL_DS,            \
@@ -87,9 +87,8 @@ register struct thread_info *__current_thread_info __asm__("$28");
 ({                                                              \
         struct thread_info *ret;                                \
                                                                 \
-        ret = kmalloc(THREAD_SIZE, GFP_KERNEL);                 \
-        if (ret)                                                \
-                memset(ret, 0, THREAD_SIZE);                    \
+        ret = kzalloc(THREAD_SIZE, GFP_KERNEL);                 \
+                                                                \
         ret;                                                    \
 })
 #else
@@ -109,20 +108,23 @@ register struct thread_info *__current_thread_info __asm__("$28");
  * - pending work-to-be-done flags are in LSW
  * - other flags in MSW
  */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_SYSCALL_AUDIT       4       /* syscall auditing active */
-#define TIF_SECCOMP             5       /* secure computing */
+#define TIF_SIGPENDING          1       /* signal pending */
+#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
+#define TIF_SYSCALL_AUDIT       3       /* syscall auditing active */
+#define TIF_SECCOMP             4       /* secure computing */
 #define TIF_RESTORE_SIGMASK     9       /* restore signal mask in do_signal() */
 #define TIF_USEDFPU             16      /* FPU was used by this task this quantum (SMP) */
 #define TIF_POLLING_NRFLAG      17      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              18
 #define TIF_FREEZE              19
+#define TIF_FIXADE              20      /* Fix address errors in software */
+#define TIF_LOGADE              21      /* Log address errors to syslog */
+#define TIF_32BIT_REGS          22      /* also implies 16/32 fprs */
+#define TIF_32BIT_ADDR          23      /* 32-bit address space (o32/n32) */
+#define TIF_FPUBOUND            24      /* thread bound to FPU-full CPU set */
 #define TIF_SYSCALL_TRACE       31      /* syscall trace active */
 
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_SYSCALL_AUDIT      (1<<TIF_SYSCALL_AUDIT)
@@ -131,6 +133,11 @@ register struct thread_info *__current_thread_info __asm__("$28");
 #define _TIF_USEDFPU            (1<<TIF_USEDFPU)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
 #define _TIF_FREEZE             (1<<TIF_FREEZE)
+#define _TIF_FIXADE             (1<<TIF_FIXADE)
+#define _TIF_LOGADE             (1<<TIF_LOGADE)
+#define _TIF_32BIT_REGS         (1<<TIF_32BIT_REGS)
+#define _TIF_32BIT_ADDR         (1<<TIF_32BIT_ADDR)
+#define _TIF_FPUBOUND           (1<<TIF_FPUBOUND)
 
 /* work to do on interrupt/exception return */
 #define _TIF_WORK_MASK          (0x0000ffef & ~_TIF_SECCOMP)
diff --git a/include/asm-mips/tx3912.h b/include/asm-mips/tx3912.h
deleted file mode 100644
index d709d87363d0..000000000000
--- a/include/asm-mips/tx3912.h
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- *  include/asm-mips/tx3912.h
- *
- *  Copyright (C) 2001 Steven J. Hill (sjhill@realitydiluted.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.
- *
- *  Registers for TMPR3912/05 and PR31700 processors
- */
-#ifndef _TX3912_H_
-#define _TX3912_H_
-
-/*****************************************************************************
- *      Clock Subsystem                                                      *
- *      ---------------                                                      *
- *      Chapter 6 in Philips PR31700 and Toshiba TMPR3905/12 User Manuals    *
- *****************************************************************************/
-#define TX3912_CLK_CTRL                                 0x01c0
-
-/*
- * Clock control register values
- */
-#define TX3912_CLK_CTRL_CHICLKDIV_MASK                  0xff000000
-#define TX3912_CLK_CTRL_ENCLKTEST                       0x00800000
-#define TX3912_CLK_CTRL_CLKTESTSELSIB                   0x00400000
-#define TX3912_CLK_CTRL_CHIMCLKSEL                      0x00200000
-#define TX3912_CLK_CTRL_CHICLKDIR                       0x00100000
-#define TX3912_CLK_CTRL_ENCHIMCLK                       0x00080000
-#define TX3912_CLK_CTRL_ENVIDCLK                        0x00040000
-#define TX3912_CLK_CTRL_ENMBUSCLK                       0x00020000
-#define TX3912_CLK_CTRL_ENSPICLK                        0x00010000
-#define TX3912_CLK_CTRL_ENTIMERCLK                      0x00008000
-#define TX3912_CLK_CTRL_ENFASTTIMERCLK                  0x00004000
-#define TX3912_CLK_CTRL_SIBMCLKDIR                      0x00002000
-#define TX3912_CLK_CTRL_reserved1                       0x00001000
-#define TX3912_CLK_CTRL_ENSIBMCLK                       0x00000800
-#define TX3912_CLK_CTRL_SIBMCLKDIV_6                    0x00000600
-#define TX3912_CLK_CTRL_SIBMCLKDIV_5                    0x00000500
-#define TX3912_CLK_CTRL_SIBMCLKDIV_4                    0x00000400
-#define TX3912_CLK_CTRL_SIBMCLKDIV_3                    0x00000300
-#define TX3912_CLK_CTRL_SIBMCLKDIV_2                    0x00000200
-#define TX3912_CLK_CTRL_SIBMCLKDIV_1                    0x00000100
-#define TX3912_CLK_CTRL_CSERSEL                         0x00000080
-#define TX3912_CLK_CTRL_CSERDIV_6                       0x00000060
-#define TX3912_CLK_CTRL_CSERDIV_5                       0x00000050
-#define TX3912_CLK_CTRL_CSERDIV_4                       0x00000040
-#define TX3912_CLK_CTRL_CSERDIV_3                       0x00000030
-#define TX3912_CLK_CTRL_CSERDIV_2                       0x00000020
-#define TX3912_CLK_CTRL_CSERDIV_1                       0x00000010
-#define TX3912_CLK_CTRL_ENCSERCLK                       0x00000008
-#define TX3912_CLK_CTRL_ENIRCLK                         0x00000004
-#define TX3912_CLK_CTRL_ENUARTACLK                      0x00000002
-#define TX3912_CLK_CTRL_ENUARTBCLK                      0x00000001
-
-
-/*****************************************************************************
- *      Interrupt Subsystem                                                  *
- *      -------------------                                                  *
- *      Chapter 8 in Philips PR31700 and Toshiba TMPR3905/12 User Manuals    *
- *****************************************************************************/
-#define TX3912_INT1_CLEAR                               0x0100
-#define TX3912_INT2_CLEAR                               0x0104
-#define TX3912_INT3_CLEAR                               0x0108
-#define TX3912_INT4_CLEAR                               0x010c
-#define TX3912_INT5_CLEAR                               0x0110
-#define TX3912_INT1_ENABLE                              0x0118
-#define TX3912_INT2_ENABLE                              0x011c
-#define TX3912_INT3_ENABLE                              0x0120
-#define TX3912_INT4_ENABLE                              0x0124
-#define TX3912_INT5_ENABLE                              0x0128
-#define TX3912_INT6_ENABLE                              0x012c
-#define TX3912_INT1_STATUS                              0x0100
-#define TX3912_INT2_STATUS                              0x0104
-#define TX3912_INT3_STATUS                              0x0108
-#define TX3912_INT4_STATUS                              0x010c
-#define TX3912_INT5_STATUS                              0x0110
-#define TX3912_INT6_STATUS                              0x0114
-
-/*
- * Interrupt 2 register values
- */
-#define TX3912_INT2_UARTARXINT                          0x80000000
-#define TX3912_INT2_UARTARXOVERRUNINT                   0x40000000
-#define TX3912_INT2_UARTAFRAMEERRINT                    0x20000000
-#define TX3912_INT2_UARTABREAKINT                       0x10000000
-#define TX3912_INT2_UARTAPARITYINT                      0x08000000
-#define TX3912_INT2_UARTATXINT                          0x04000000
-#define TX3912_INT2_UARTATXOVERRUNINT                   0x02000000
-#define TX3912_INT2_UARTAEMPTYINT                       0x01000000
-#define TX3912_INT2_UARTADMAFULLINT                     0x00800000
-#define TX3912_INT2_UARTADMAHALFINT                     0x00400000
-#define TX3912_INT2_UARTBRXINT                          0x00200000
-#define TX3912_INT2_UARTBRXOVERRUNINT                   0x00100000
-#define TX3912_INT2_UARTBFRAMEERRINT                    0x00080000
-#define TX3912_INT2_UARTBBREAKINT                       0x00040000
-#define TX3912_INT2_UARTBPARITYINT                      0x00020000
-#define TX3912_INT2_UARTBTXINT                          0x00010000
-#define TX3912_INT2_UARTBTXOVERRUNINT                   0x00008000
-#define TX3912_INT2_UARTBEMPTYINT                       0x00004000
-#define TX3912_INT2_UARTBDMAFULLINT                     0x00002000
-#define TX3912_INT2_UARTBDMAHALFINT                     0x00001000
-#define TX3912_INT2_UARTA_RX_BITS                       0xf8000000
-#define TX3912_INT2_UARTA_TX_BITS                       0x07c00000
-#define TX3912_INT2_UARTB_RX_BITS                       0x003e0000
-#define TX3912_INT2_UARTB_TX_BITS                       0x0001f000
-
-/*
- * Interrupt 5 register values
- */
-#define TX3912_INT5_RTCINT                              0x80000000
-#define TX3912_INT5_ALARMINT                            0x40000000
-#define TX3912_INT5_PERINT                              0x20000000
-#define TX3912_INT5_STPTIMERINT                         0x10000000
-#define TX3912_INT5_POSPWRINT                           0x08000000
-#define TX3912_INT5_NEGPWRINT                           0x04000000
-#define TX3912_INT5_POSPWROKINT                         0x02000000
-#define TX3912_INT5_NEGPWROKINT                         0x01000000
-#define TX3912_INT5_POSONBUTINT                         0x00800000
-#define TX3912_INT5_NEGONBUTINT                         0x00400000
-#define TX3912_INT5_SPIBUFAVAILINT                      0x00200000
-#define TX3912_INT5_SPIERRINT                           0x00100000
-#define TX3912_INT5_SPIRCVINT                           0x00080000
-#define TX3912_INT5_SPIEMPTYINT                         0x00040000
-#define TX3912_INT5_IRCONSMINT                          0x00020000
-#define TX3912_INT5_CARSTINT                            0x00010000
-#define TX3912_INT5_POSCARINT                           0x00008000
-#define TX3912_INT5_NEGCARINT                           0x00004000
-#define TX3912_INT5_IOPOSINT6                           0x00002000
-#define TX3912_INT5_IOPOSINT5                           0x00001000
-#define TX3912_INT5_IOPOSINT4                           0x00000800
-#define TX3912_INT5_IOPOSINT3                           0x00000400
-#define TX3912_INT5_IOPOSINT2                           0x00000200
-#define TX3912_INT5_IOPOSINT1                           0x00000100
-#define TX3912_INT5_IOPOSINT0                           0x00000080
-#define TX3912_INT5_IONEGINT6                           0x00000040
-#define TX3912_INT5_IONEGINT5                           0x00000020
-#define TX3912_INT5_IONEGINT4                           0x00000010
-#define TX3912_INT5_IONEGINT3                           0x00000008
-#define TX3912_INT5_IONEGINT2                           0x00000004
-#define TX3912_INT5_IONEGINT1                           0x00000002
-#define TX3912_INT5_IONEGINT0                           0x00000001
-
-/*
- * Interrupt 6 status register values
- */
-#define TX3912_INT6_STATUS_IRQHIGH                      0x80000000
-#define TX3912_INT6_STATUS_IRQLOW                       0x40000000
-#define TX3912_INT6_STATUS_reserved6                    0x3fffffc0
-#define TX3912_INT6_STATUS_INTVEC_POSNEGPWROKINT        0x0000003c
-#define TX3912_INT6_STATUS_INTVEC_ALARMINT              0x00000038
-#define TX3912_INT6_STATUS_INTVEC_PERINT                0x00000034
-#define TX3912_INT6_STATUS_INTVEC_reserved5             0x00000030
-#define TX3912_INT6_STATUS_INTVEC_UARTARXINT            0x0000002c
-#define TX3912_INT6_STATUS_INTVEC_UARTBRXINT            0x00000028
-#define TX3912_INT6_STATUS_INTVEC_reserved4             0x00000024
-#define TX3912_INT6_STATUS_INTVEC_IOPOSINT65            0x00000020
-#define TX3912_INT6_STATUS_INTVEC_reserved3             0x0000001c
-#define TX3912_INT6_STATUS_INTVEC_IONEGINT65            0x00000018
-#define TX3912_INT6_STATUS_INTVEC_reserved2             0x00000014
-#define TX3912_INT6_STATUS_INTVEC_SNDDMACNTINT          0x00000010
-#define TX3912_INT6_STATUS_INTVEC_TELDMACNTINT          0x0000000c
-#define TX3912_INT6_STATUS_INTVEC_CHIDMACNTINT          0x00000008
-#define TX3912_INT6_STATUS_INTVEC_IOPOSNEGINT0          0x00000004
-#define TX3912_INT6_STATUS_INTVEC_STDHANDLER            0x00000000
-#define TX3912_INT6_STATUS_reserved1                    0x00000003
-
-/*
- * Interrupt 6 enable register values
- */
-#define TX3912_INT6_ENABLE_reserved5                    0xfff80000
-#define TX3912_INT6_ENABLE_GLOBALEN                     0x00040000
-#define TX3912_INT6_ENABLE_IRQPRITEST                   0x00020000
-#define TX3912_INT6_ENABLE_IRQTEST                      0x00010000
-#define TX3912_INT6_ENABLE_PRIORITYMASK_POSNEGPWROKINT  0x00008000
-#define TX3912_INT6_ENABLE_PRIORITYMASK_ALARMINT        0x00004000
-#define TX3912_INT6_ENABLE_PRIORITYMASK_PERINT          0x00002000
-#define TX3912_INT6_ENABLE_PRIORITYMASK_reserved4       0x00001000
-#define TX3912_INT6_ENABLE_PRIORITYMASK_UARTARXINT      0x00000800
-#define TX3912_INT6_ENABLE_PRIORITYMASK_UARTBRXINT      0x00000400
-#define TX3912_INT6_ENABLE_PRIORITYMASK_reserved3       0x00000200
-#define TX3912_INT6_ENABLE_PRIORITYMASK_IOPOSINT65      0x00000100
-#define TX3912_INT6_ENABLE_PRIORITYMASK_reserved2       0x00000080
-#define TX3912_INT6_ENABLE_PRIORITYMASK_IONEGINT65      0x00000040
-#define TX3912_INT6_ENABLE_PRIORITYMASK_reserved1       0x00000020
-#define TX3912_INT6_ENABLE_PRIORITYMASK_SNDDMACNTINT    0x00000010
-#define TX3912_INT6_ENABLE_PRIORITYMASK_TELDMACNTINT    0x00000008
-#define TX3912_INT6_ENABLE_PRIORITYMASK_CHIDMACNTINT    0x00000004
-#define TX3912_INT6_ENABLE_PRIORITYMASK_IOPOSNEGINT0    0x00000002
-#define TX3912_INT6_ENABLE_PRIORITYMASK_STDHANDLER      0x00000001
-#define TX3912_INT6_ENABLE_HIGH_PRIORITY                0x0000ffff
-
-
-/*****************************************************************************
- *      Power Subsystem                                                      *
- *      ---------------                                                      *
- *      Chapter 11 in Philips PR31700 User Manual                            *
- *      Chapter 12 in Toshiba TMPR3905/12 User Manual                        *
- *****************************************************************************/
-#define TX3912_POWER_CTRL                               0x01c4
-
-/*
- * Power control register values
- */
-#define TX3912_POWER_CTRL_ONBUTN                        0x80000000
-#define TX3912_POWER_CTRL_PWRINT                        0x40000000
-#define TX3912_POWER_CTRL_PWROK                         0x20000000
-#define TX3912_POWER_CTRL_VIDRF_MASK                    0x18000000
-#define TX3912_POWER_CTRL_SLOWBUS                       0x04000000
-#define TX3912_POWER_CTRL_DIVMOD                        0x02000000
-#define TX3912_POWER_CTRL_reserved2                     0x01ff0000
-#define TX3912_POWER_CTRL_STPTIMERVAL_MASK              0x0000f000
-#define TX3912_POWER_CTRL_ENSTPTIMER                    0x00000800
-#define TX3912_POWER_CTRL_ENFORCESHUTDWN                0x00000400
-#define TX3912_POWER_CTRL_FORCESHUTDWN                  0x00000200
-#define TX3912_POWER_CTRL_FORCESHUTDWNOCC               0x00000100
-#define TX3912_POWER_CTRL_SELC2MS                       0x00000080
-#define TX3912_POWER_CTRL_reserved1                     0x00000040
-#define TX3912_POWER_CTRL_BPDBVCC3                      0x00000020
-#define TX3912_POWER_CTRL_STOPCPU                       0x00000010
-#define TX3912_POWER_CTRL_DBNCONBUTN                    0x00000008
-#define TX3912_POWER_CTRL_COLDSTART                     0x00000004
-#define TX3912_POWER_CTRL_PWRCS                         0x00000002
-#define TX3912_POWER_CTRL_VCCON                         0x00000001
-
-
-/*****************************************************************************
- *      Timer Subsystem                                                      *
- *      ---------------                                                      *
- *      Chapter 14 in Philips PR31700 User Manual                            *
- *      Chapter 15 in Toshiba TMPR3905/12 User Manual                        *
- *****************************************************************************/
-#define TX3912_RTC_HIGH                                 0x0140
-#define TX3912_RTC_LOW                                  0x0144
-#define TX3912_RTC_ALARM_HIGH                           0x0148
-#define TX3912_RTC_ALARM_LOW                            0x014c
-#define TX3912_TIMER_CTRL                               0x0150
-#define TX3912_TIMER_PERIOD                             0x0154
-
-/*
- * Timer control register values
- */
-#define TX3912_TIMER_CTRL_FREEZEPRE                     0x00000080
-#define TX3912_TIMER_CTRL_FREEZERTC                     0x00000040
-#define TX3912_TIMER_CTRL_FREEZETIMER                   0x00000020
-#define TX3912_TIMER_CTRL_ENPERTIMER                    0x00000010
-#define TX3912_TIMER_CTRL_RTCCLEAR                      0x00000008
-#define TX3912_TIMER_CTRL_TESTC8MS                      0x00000004
-#define TX3912_TIMER_CTRL_ENTESTCLK                     0x00000002
-#define TX3912_TIMER_CTRL_ENRTCTST                      0x00000001
-
-/*
- * The periodic timer has granularity of 868 nanoseconds which
- * results in a count of (1.152 x 10^6 / 100) in order to achieve
- * a 10 millisecond periodic system clock.
- */
-#define TX3912_SYS_TIMER_VALUE                          (1152000/HZ)
-
-
-/*****************************************************************************
- *      UART Subsystem                                                       *
- *      --------------                                                       *
- *      Chapter 15 in Philips PR31700 User Manual                            *
- *      Chapter 16 in Toshiba TMPR3905/12 User Manual                        *
- *****************************************************************************/
-#define TX3912_UARTA_CTRL1                              0x00b0
-#define TX3912_UARTA_CTRL2                              0x00b4
-#define TX3912_UARTA_DMA_CTRL1                          0x00b8
-#define TX3912_UARTA_DMA_CTRL2                          0x00bc
-#define TX3912_UARTA_DMA_CNT                            0x00c0
-#define TX3912_UARTA_DATA                               0x00c4
-#define TX3912_UARTB_CTRL1                              0x00c8
-#define TX3912_UARTB_CTRL2                              0x00cc
-#define TX3912_UARTB_DMA_CTRL1                          0x00d0
-#define TX3912_UARTB_DMA_CTRL2                          0x00d4
-#define TX3912_UARTB_DMA_CNT                            0x00d8
-#define TX3912_UARTB_DATA                               0x00dc
-
-/*
- * UART Control Register 1 values
- */
-#define TX3912_UART_CTRL1_UARTON                        0x80000000
-#define TX3912_UART_CTRL1_EMPTY                         0x40000000
-#define TX3912_UART_CTRL1_PRXHOLDFULL                   0x20000000
-#define TX3912_UART_CTRL1_RXHOLDFULL                    0x10000000
-#define TX3912_UART_CTRL1_reserved1                     0x0fff0000
-#define TX3912_UART_CTRL1_ENDMARX                       0x00008000
-#define TX3912_UART_CTRL1_ENDMATX                       0x00004000
-#define TX3912_UART_CTRL1_TESTMODE                      0x00002000
-#define TX3912_UART_CTRL1_ENBREAKHALT                   0x00001000
-#define TX3912_UART_CTRL1_ENDMATEST                     0x00000800
-#define TX3912_UART_CTRL1_ENDMALOOP                     0x00000400
-#define TX3912_UART_CTRL1_PULSEOPT1                     0x00000200
-#define TX3912_UART_CTRL1_PULSEOPT1                     0x00000100
-#define TX3912_UART_CTRL1_DTINVERT                      0x00000080
-#define TX3912_UART_CTRL1_DISTXD                        0x00000040
-#define TX3912_UART_CTRL1_TWOSTOP                       0x00000020
-#define TX3912_UART_CTRL1_LOOPBACK                      0x00000010
-#define TX3912_UART_CTRL1_BIT_7                         0x00000008
-#define TX3912_UART_CTRL1_EVENPARITY                    0x00000004
-#define TX3912_UART_CTRL1_ENPARITY                      0x00000002
-#define TX3912_UART_CTRL1_ENUART                        0x00000001
-
-/*
- * UART Control Register 2 values
- */
-#define TX3912_UART_CTRL2_B230400                       0x0000  /*   0 */
-#define TX3912_UART_CTRL2_B115200                       0x0001  /*   1 */
-#define TX3912_UART_CTRL2_B76800                        0x0002  /*   2 */
-#define TX3912_UART_CTRL2_B57600                        0x0003  /*   3 */
-#define TX3912_UART_CTRL2_B38400                        0x0005  /*   5 */
-#define TX3912_UART_CTRL2_B19200                        0x000b  /*  11 */
-#define TX3912_UART_CTRL2_B9600                         0x0016  /*  22 */
-#define TX3912_UART_CTRL2_B4800                         0x002f  /*  47 */
-#define TX3912_UART_CTRL2_B2400                         0x005f  /*  95 */
-#define TX3912_UART_CTRL2_B1200                         0x00bf  /* 191 */
-#define TX3912_UART_CTRL2_B600                          0x017f  /* 383 */
-#define TX3912_UART_CTRL2_B300                          0x02ff  /* 767 */
-
-/*****************************************************************************
- *      Video Subsystem                                                      *
- *      ---------------                                                      *
- *      Chapter 16 in Philips PR31700 User Manual                            *
- *      Chapter 17 in Toshiba TMPR3905/12 User Manual                        *
- *****************************************************************************/
-#define TX3912_VIDEO_CTRL1                              0x0028
-#define TX3912_VIDEO_CTRL2                              0x002c
-#define TX3912_VIDEO_CTRL3                              0x0030
-#define TX3912_VIDEO_CTRL4                              0x0034
-#define TX3912_VIDEO_CTRL5                              0x0038
-#define TX3912_VIDEO_CTRL6                              0x003c
-#define TX3912_VIDEO_CTRL7                              0x0040
-#define TX3912_VIDEO_CTRL8                              0x0044
-#define TX3912_VIDEO_CTRL9                              0x0048
-#define TX3912_VIDEO_CTRL10                             0x004c
-#define TX3912_VIDEO_CTRL11                             0x0050
-#define TX3912_VIDEO_CTRL12                             0x0054
-#define TX3912_VIDEO_CTRL13                             0x0058
-#define TX3912_VIDEO_CTRL14                             0x005c
-
-/*
- * Video Control Register 1 values
- */
-#define TX3912_VIDEO_CTRL1_LINECNT                      0xffc00000
-#define TX3912_VIDEO_CTRL1_LOADDLY                      0x00200000
-#define TX3912_VIDEO_CTRL1_BAUDVAL                      0x001f0000
-#define TX3912_VIDEO_CTRL1_VIDDONEVAL                   0x0000fe00
-#define TX3912_VIDEO_CTRL1_ENFREEZEFRAME                0x00000100
-#define TX3912_VIDEO_CTRL1_BITSEL_MASK                  0x000000c0
-#define TX3912_VIDEO_CTRL1_BITSEL_8BIT_COLOR            0x000000c0
-#define TX3912_VIDEO_CTRL1_BITSEL_4BIT_GRAY             0x00000080
-#define TX3912_VIDEO_CTRL1_BITSEL_2BIT_GRAY             0x00000040
-#define TX3912_VIDEO_CTRL1_DISPSPLIT                    0x00000020
-#define TX3912_VIDEO_CTRL1_DISP8                        0x00000010
-#define TX3912_VIDEO_CTRL1_DFMODE                       0x00000008
-#define TX3912_VIDEO_CTRL1_INVVID                       0x00000004
-#define TX3912_VIDEO_CTRL1_DISPON                       0x00000002
-#define TX3912_VIDEO_CTRL1_ENVID                        0x00000001
-
-#endif  /* _TX3912_H_ */
diff --git a/include/asm-mips/tx4927/toshiba_rbtx4927.h b/include/asm-mips/tx4927/toshiba_rbtx4927.h
index 94bef03d9635..5dc40a867774 100644
--- a/include/asm-mips/tx4927/toshiba_rbtx4927.h
+++ b/include/asm-mips/tx4927/toshiba_rbtx4927.h
@@ -52,4 +52,6 @@
 #define RBTX4927_RTL_8019_BASE (0x1c020280-TBTX4927_ISA_IO_OFFSET)
 #define RBTX4927_RTL_8019_IRQ  (29)
 
+int toshiba_rbtx4927_irq_nested(int sw_irq);
+
 #endif /* __ASM_TX4927_TOSHIBA_RBTX4927_H */
diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h
index ed16de0a6398..fa9a587b3bf1 100644
--- a/include/asm-mips/unistd.h
+++ b/include/asm-mips/unistd.h
@@ -340,16 +340,17 @@
 #define __NR_signalfd                   (__NR_Linux + 317)
 #define __NR_timerfd                    (__NR_Linux + 318)
 #define __NR_eventfd                    (__NR_Linux + 319)
+#define __NR_fallocate                  (__NR_Linux + 320)
 
 /*
  * Offset of the last Linux o32 flavoured syscall
  */
-#define __NR_Linux_syscalls             319
+#define __NR_Linux_syscalls             320
 
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
 
 #define __NR_O32_Linux                  4000
-#define __NR_O32_Linux_syscalls         319
+#define __NR_O32_Linux_syscalls         320
 
 #if _MIPS_SIM == _MIPS_SIM_ABI64
 
@@ -636,16 +637,17 @@
 #define __NR_signalfd                   (__NR_Linux + 276)
 #define __NR_timerfd                    (__NR_Linux + 277)
 #define __NR_eventfd                    (__NR_Linux + 278)
+#define __NR_fallocate                  (__NR_Linux + 279)
 
 /*
  * Offset of the last Linux 64-bit flavoured syscall
  */
-#define __NR_Linux_syscalls             278
+#define __NR_Linux_syscalls             279
 
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
 
 #define __NR_64_Linux                   5000
-#define __NR_64_Linux_syscalls          278
+#define __NR_64_Linux_syscalls          279
 
 #if _MIPS_SIM == _MIPS_SIM_NABI32
 
@@ -936,16 +938,17 @@
 #define __NR_signalfd                   (__NR_Linux + 280)
 #define __NR_timerfd                    (__NR_Linux + 281)
 #define __NR_eventfd                    (__NR_Linux + 282)
+#define __NR_fallocate                  (__NR_Linux + 283)
 
 /*
  * Offset of the last N32 flavoured syscall
  */
-#define __NR_Linux_syscalls             282
+#define __NR_Linux_syscalls             283
 
 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
 
 #define __NR_N32_Linux                  6000
-#define __NR_N32_Linux_syscalls         282
+#define __NR_N32_Linux_syscalls         283
 
 #ifdef __KERNEL__
 
diff --git a/include/asm-mips/war.h b/include/asm-mips/war.h
index 2883ccc69ed0..c0715d0a6b28 100644
--- a/include/asm-mips/war.h
+++ b/include/asm-mips/war.h
@@ -182,9 +182,8 @@
  * exceptions.
  */
 #if defined(CONFIG_BASLER_EXCITE) || defined(CONFIG_MIPS_ATLAS) || \
-    defined(CONFIG_MIPS_MALTA) || defined(CONFIG_MOMENCO_OCELOT) || \
-    defined(CONFIG_PMC_YOSEMITE) || defined(CONFIG_SGI_IP32) || \
-    defined(CONFIG_WR_PPMC)
+    defined(CONFIG_MIPS_MALTA) || defined(CONFIG_PMC_YOSEMITE) || \
+    defined(CONFIG_SGI_IP32) || defined(CONFIG_WR_PPMC)
 #define ICACHE_REFILLS_WORKAROUND_WAR   1
 #endif
 
diff --git a/include/asm-parisc/bug.h b/include/asm-parisc/bug.h
index 83ba510ed5d8..8cfc553fc837 100644
--- a/include/asm-parisc/bug.h
+++ b/include/asm-parisc/bug.h
@@ -74,7 +74,7 @@
 
 
 #define WARN_ON(x) ({                                           \
-        typeof(x) __ret_warn_on = (x);                          \
+        int __ret_warn_on = !!(x);                              \
         if (__builtin_constant_p(__ret_warn_on)) {              \
                 if (__ret_warn_on)                              \
                         __WARN();                               \
diff --git a/include/asm-parisc/thread_info.h b/include/asm-parisc/thread_info.h
index 949314cf6188..2d9c7500867b 100644
--- a/include/asm-parisc/thread_info.h
+++ b/include/asm-parisc/thread_info.h
@@ -56,23 +56,21 @@ struct thread_info {
  * thread information flags
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_POLLING_NRFLAG      4       /* true if poll_idle() is polling TIF_NEED_RESCHED */
-#define TIF_32BIT               5       /* 32 bit binary */
-#define TIF_MEMDIE              6
-#define TIF_RESTORE_SIGMASK     7       /* restore saved signal mask */
+#define TIF_SIGPENDING          1       /* signal pending */
+#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
+#define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling TIF_NEED_RESCHED */
+#define TIF_32BIT               4       /* 32 bit binary */
+#define TIF_MEMDIE              5
+#define TIF_RESTORE_SIGMASK     6       /* restore saved signal mask */
 
 #define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
 #define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
 #define _TIF_32BIT              (1 << TIF_32BIT)
 #define _TIF_RESTORE_SIGMASK    (1 << TIF_RESTORE_SIGMASK)
 
-#define _TIF_USER_WORK_MASK     (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING | \
+#define _TIF_USER_WORK_MASK     (_TIF_SIGPENDING | \
                                  _TIF_NEED_RESCHED | _TIF_RESTORE_SIGMASK)
 
 #endif /* __KERNEL__ */
diff --git a/include/asm-powerpc/bug.h b/include/asm-powerpc/bug.h
index a248b8bd4d7c..e55d1f66b86f 100644
--- a/include/asm-powerpc/bug.h
+++ b/include/asm-powerpc/bug.h
@@ -93,7 +93,7 @@
 } while (0)
 
 #define WARN_ON(x) ({                                           \
-        typeof(x) __ret_warn_on = (x);                          \
+        int __ret_warn_on = !!(x);                              \
         if (__builtin_constant_p(__ret_warn_on)) {              \
                 if (__ret_warn_on)                              \
                         __WARN();                               \
diff --git a/include/asm-powerpc/thread_info.h b/include/asm-powerpc/thread_info.h
index 9d9aeca8ad22..40d5f98c44fc 100644
--- a/include/asm-powerpc/thread_info.h
+++ b/include/asm-powerpc/thread_info.h
@@ -107,28 +107,26 @@ static inline struct thread_info *current_thread_info(void)
  * thread information flag bit numbers
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_POLLING_NRFLAG      4       /* true if poll_idle() is polling
+#define TIF_SIGPENDING          1       /* signal pending */
+#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
+#define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling
                                            TIF_NEED_RESCHED */
-#define TIF_32BIT               5       /* 32 bit binary */
-#define TIF_PERFMON_WORK        6       /* work for pfm_handle_work() */
-#define TIF_PERFMON_CTXSW       7       /* perfmon needs ctxsw calls */
-#define TIF_SYSCALL_AUDIT       8       /* syscall auditing active */
-#define TIF_SINGLESTEP          9       /* singlestepping active */
-#define TIF_MEMDIE              10
-#define TIF_SECCOMP             11      /* secure computing */
-#define TIF_RESTOREALL          12      /* Restore all regs (implies NOERROR) */
-#define TIF_NOERROR             14      /* Force successful syscall return */
-#define TIF_RESTORE_SIGMASK     15      /* Restore signal mask in do_signal */
-#define TIF_FREEZE              16      /* Freezing for suspend */
-#define TIF_RUNLATCH            17      /* Is the runlatch enabled? */
-#define TIF_ABI_PENDING         18      /* 32/64 bit switch needed */
+#define TIF_32BIT               4       /* 32 bit binary */
+#define TIF_PERFMON_WORK        5       /* work for pfm_handle_work() */
+#define TIF_PERFMON_CTXSW       6       /* perfmon needs ctxsw calls */
+#define TIF_SYSCALL_AUDIT       7       /* syscall auditing active */
+#define TIF_SINGLESTEP          8       /* singlestepping active */
+#define TIF_MEMDIE              9
+#define TIF_SECCOMP             10      /* secure computing */
+#define TIF_RESTOREALL          11      /* Restore all regs (implies NOERROR) */
+#define TIF_NOERROR             12      /* Force successful syscall return */
+#define TIF_RESTORE_SIGMASK     13      /* Restore signal mask in do_signal */
+#define TIF_FREEZE              14      /* Freezing for suspend */
+#define TIF_RUNLATCH            15      /* Is the runlatch enabled? */
+#define TIF_ABI_PENDING         16      /* 32/64 bit switch needed */
 
 /* as above, but as bit values */
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
@@ -146,7 +144,7 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_ABI_PENDING        (1<<TIF_ABI_PENDING)
 #define _TIF_SYSCALL_T_OR_A     (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP)
 
-#define _TIF_USER_WORK_MASK     (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING | \
+#define _TIF_USER_WORK_MASK     ( _TIF_SIGPENDING | \
                                  _TIF_NEED_RESCHED | _TIF_RESTORE_SIGMASK)
 #define _TIF_PERSYSCALL_MASK    (_TIF_RESTOREALL|_TIF_NOERROR)
 
diff --git a/include/asm-ppc/mv64x60.h b/include/asm-ppc/mv64x60.h
index db3776f18198..2963d6aa3ea5 100644
--- a/include/asm-ppc/mv64x60.h
+++ b/include/asm-ppc/mv64x60.h
@@ -120,14 +120,6 @@ extern spinlock_t mv64x60_lock;
 
 #define MV64x60_64BIT_WIN_COUNT                 24
 
-/* Watchdog Platform Device, Driver Data */
-#define MV64x60_WDT_NAME                        "wdt"
-
-struct mv64x60_wdt_pdata {
-        int     timeout;        /* watchdog expiry in seconds, default 10 */
-        int     bus_clk;        /* bus clock in MHz, default 133 */
-};
-
 /*
  * Define a structure that's used to pass in config information to the
  * core routines.
diff --git a/include/asm-s390/bug.h b/include/asm-s390/bug.h
index 838684dc6d35..384e3621e341 100644
--- a/include/asm-s390/bug.h
+++ b/include/asm-s390/bug.h
@@ -50,7 +50,7 @@
 #define BUG()   __EMIT_BUG(0)
 
 #define WARN_ON(x) ({                                   \
-        typeof(x) __ret_warn_on = (x);                  \
+        int __ret_warn_on = !!(x);                      \
         if (__builtin_constant_p(__ret_warn_on)) {      \
                 if (__ret_warn_on)                      \
                         __EMIT_BUG(BUGFLAG_WARNING);    \
diff --git a/include/asm-sh/bug.h b/include/asm-sh/bug.h
index 46f925c815ac..a78d482e8b2f 100644
--- a/include/asm-sh/bug.h
+++ b/include/asm-sh/bug.h
@@ -61,7 +61,7 @@ do {							\
 } while (0)
 
 #define WARN_ON(x) ({                                           \
-        typeof(x) __ret_warn_on = (x);                          \
+        int __ret_warn_on = !!(x);                              \
         if (__builtin_constant_p(__ret_warn_on)) {              \
                 if (__ret_warn_on)                              \
                         __WARN();                               \
diff --git a/include/asm-sh/bugs.h b/include/asm-sh/bugs.h
index aeee8da9c54f..b66139ff73fc 100644
--- a/include/asm-sh/bugs.h
+++ b/include/asm-sh/bugs.h
@@ -29,7 +29,7 @@ static void __init check_bugs(void)
                 *p++ = '2';
                 *p++ = 'a';
                 break;
-        case CPU_SH7705 ... CPU_SH7300:
+        case CPU_SH7705 ... CPU_SH7729:
                 *p++ = '3';
                 break;
         case CPU_SH7750 ... CPU_SH4_501:
@@ -39,7 +39,7 @@ static void __init check_bugs(void)
                 *p++ = '4';
                 *p++ = 'a';
                 break;
-        case CPU_SH73180 ... CPU_SH7722:
+        case CPU_SH7343 ... CPU_SH7722:
                 *p++ = '4';
                 *p++ = 'a';
                 *p++ = 'l';
diff --git a/include/asm-sh/cpu-sh3/freq.h b/include/asm-sh/cpu-sh3/freq.h
index 273f3229785c..0a054b53b9de 100644
--- a/include/asm-sh/cpu-sh3/freq.h
+++ b/include/asm-sh/cpu-sh3/freq.h
@@ -10,11 +10,7 @@
 #ifndef __ASM_CPU_SH3_FREQ_H
 #define __ASM_CPU_SH3_FREQ_H
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7300)
-#define FRQCR                   0xa415ff80
-#else
 #define FRQCR                   0xffffff80
-#endif
 #define MIN_DIVISOR_NR          0
 #define MAX_DIVISOR_NR          4
 
diff --git a/include/asm-sh/cpu-sh3/mmu_context.h b/include/asm-sh/cpu-sh3/mmu_context.h
index 4704e86dff5b..b20786d42d09 100644
--- a/include/asm-sh/cpu-sh3/mmu_context.h
+++ b/include/asm-sh/cpu-sh3/mmu_context.h
@@ -30,7 +30,6 @@
 #if defined(CONFIG_CPU_SUBTYPE_SH7707) || \
     defined(CONFIG_CPU_SUBTYPE_SH7709) || \
     defined(CONFIG_CPU_SUBTYPE_SH7706) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7300) || \
     defined(CONFIG_CPU_SUBTYPE_SH7705) || \
     defined(CONFIG_CPU_SUBTYPE_SH7712) || \
     defined(CONFIG_CPU_SUBTYPE_SH7710)
diff --git a/include/asm-sh/cpu-sh3/timer.h b/include/asm-sh/cpu-sh3/timer.h
index 4928b08f9d19..b6c2020a2ad3 100644
--- a/include/asm-sh/cpu-sh3/timer.h
+++ b/include/asm-sh/cpu-sh3/timer.h
@@ -19,7 +19,6 @@
  *      SH7729R
  *      SH7710
  *      SH7720
- *      SH7300
  *      SH7710
  * ---------------------------------------------------------------------------
  */
@@ -28,7 +27,7 @@
 #define TMU_TOCR        0xfffffe90      /* Byte access */
 #endif
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7710)
+#if defined(CONFIG_CPU_SUBTYPE_SH7710)
 #define TMU_012_TSTR    0xa412fe92      /* Byte access */
 
 #define TMU0_TCOR       0xa412fe94      /* Long access */
diff --git a/include/asm-sh/cpu-sh4/freq.h b/include/asm-sh/cpu-sh4/freq.h
index 026025b51cea..dc1d32a86374 100644
--- a/include/asm-sh/cpu-sh4/freq.h
+++ b/include/asm-sh/cpu-sh4/freq.h
@@ -10,7 +10,7 @@
 #ifndef __ASM_CPU_SH4_FREQ_H
 #define __ASM_CPU_SH4_FREQ_H
 
-#if defined(CONFIG_CPU_SUBTYPE_SH73180) || defined(CONFIG_CPU_SUBTYPE_SH7722)
+#if defined(CONFIG_CPU_SUBTYPE_SH7722)
 #define FRQCR                   0xa4150000
 #define VCLKCR                  0xa4150004
 #define SCLKACR                 0xa4150008
diff --git a/include/asm-sh/dma-mapping.h b/include/asm-sh/dma-mapping.h
index d3bc7818bbbe..6f492ac3fa13 100644
--- a/include/asm-sh/dma-mapping.h
+++ b/include/asm-sh/dma-mapping.h
@@ -69,11 +69,11 @@ static inline dma_addr_t dma_map_single(struct device *dev,
 {
 #if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT)
         if (dev->bus == &pci_bus_type)
-                return virt_to_bus(ptr);
+                return virt_to_phys(ptr);
 #endif
         dma_cache_sync(dev, ptr, size, dir);
 
-        return virt_to_bus(ptr);
+        return virt_to_phys(ptr);
 }
 
 #define dma_unmap_single(dev, addr, size, dir)  do { } while (0)
@@ -116,7 +116,7 @@ static inline void dma_sync_single(struct device *dev, dma_addr_t dma_handle,
         if (dev->bus == &pci_bus_type)
                 return;
 #endif
-        dma_cache_sync(dev, bus_to_virt(dma_handle), size, dir);
+        dma_cache_sync(dev, phys_to_virt(dma_handle), size, dir);
 }
 
 static inline void dma_sync_single_range(struct device *dev,
@@ -128,7 +128,7 @@ static inline void dma_sync_single_range(struct device *dev,
         if (dev->bus == &pci_bus_type)
                 return;
 #endif
-        dma_cache_sync(dev, bus_to_virt(dma_handle) + offset, size, dir);
+        dma_cache_sync(dev, phys_to_virt(dma_handle) + offset, size, dir);
 }
 
 static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg,
diff --git a/include/asm-sh/dma.h b/include/asm-sh/dma.h
index 6034d4a29e73..4c75b70b6414 100644
--- a/include/asm-sh/dma.h
+++ b/include/asm-sh/dma.h
@@ -111,6 +111,7 @@ struct dma_info {
 
         struct list_head list;
         int first_channel_nr;
+        int first_vchannel_nr;
 };
 
 struct dma_chan_caps {
diff --git a/include/asm-sh/fixmap.h b/include/asm-sh/fixmap.h
index 458e9fa59545..8a566177ad96 100644
--- a/include/asm-sh/fixmap.h
+++ b/include/asm-sh/fixmap.h
@@ -46,6 +46,9 @@
  * fix-mapped?
  */
 enum fixed_addresses {
+#define FIX_N_COLOURS 16
+        FIX_CMAP_BEGIN,
+        FIX_CMAP_END = FIX_CMAP_BEGIN + FIX_N_COLOURS,
 #ifdef CONFIG_HIGHMEM
         FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
         FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
@@ -53,8 +56,8 @@ enum fixed_addresses {
         __end_of_fixed_addresses
 };
 
-extern void __set_fixmap (enum fixed_addresses idx,
-                                        unsigned long phys, pgprot_t flags);
+extern void __set_fixmap(enum fixed_addresses idx,
+                         unsigned long phys, pgprot_t flags);
 
 #define set_fixmap(idx, phys) \
                 __set_fixmap(idx, phys, PAGE_KERNEL)
@@ -106,5 +109,4 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr)
         BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START);
         return __virt_to_fix(vaddr);
 }
-
 #endif
diff --git a/include/asm-sh/floppy.h b/include/asm-sh/floppy.h
index dc1ad464fa32..3b59b3af777b 100644
--- a/include/asm-sh/floppy.h
+++ b/include/asm-sh/floppy.h
@@ -181,7 +181,7 @@ static void _fd_chose_dma_mode(char *addr, unsigned long size)
 {
         if(can_use_virtual_dma == 2) {
                 if((unsigned int) addr >= (unsigned int) high_memory ||
-                   virt_to_bus(addr) >= 0x10000000)
+                   virt_to_phys(addr) >= 0x10000000)
                         use_virtual_dma = 1;
                 else
                         use_virtual_dma = 0;
@@ -219,7 +219,7 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io)
         doing_pdma = 0;
         clear_dma_ff(FLOPPY_DMA);
         set_dma_mode(FLOPPY_DMA,mode);
-        set_dma_addr(FLOPPY_DMA,virt_to_bus(addr));
+        set_dma_addr(FLOPPY_DMA,virt_to_phys(addr));
         set_dma_count(FLOPPY_DMA,size);
         enable_dma(FLOPPY_DMA);
         return 0;
diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h
index aa80930ce8e4..e6a1877dcb20 100644
--- a/include/asm-sh/io.h
+++ b/include/asm-sh/io.h
@@ -241,10 +241,6 @@ static inline void *phys_to_virt(unsigned long address)
 #define virt_to_phys(address)   ((unsigned long)(address))
 #endif
 
-#define virt_to_bus virt_to_phys
-#define bus_to_virt phys_to_virt
-#define page_to_bus page_to_phys
-
 /*
  * readX/writeX() are used to access memory mapped devices. On some
  * architectures the memory mapped IO stuff needs to be accessed
diff --git a/include/asm-sh/pgtable.h b/include/asm-sh/pgtable.h
index 22efffe45019..e3fae12c0e49 100644
--- a/include/asm-sh/pgtable.h
+++ b/include/asm-sh/pgtable.h
@@ -55,11 +55,7 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 
 #define PTE_PHYS_MASK           (0x20000000 - PAGE_SIZE)
 
-/*
- * First 1MB map is used by fixed purpose.
- * Currently only 4-entry (16kB) is used (see arch/sh/mm/cache.c)
- */
-#define VMALLOC_START   (P3SEG+0x00100000)
+#define VMALLOC_START   (P3SEG)
 #define VMALLOC_END     (FIXADDR_START-2*PAGE_SIZE)
 
 /*
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
index 2252e75daa26..26d52174f4b4 100644
--- a/include/asm-sh/processor.h
+++ b/include/asm-sh/processor.h
@@ -45,7 +45,7 @@ enum cpu_type {
         CPU_SH7705, CPU_SH7706, CPU_SH7707,
         CPU_SH7708, CPU_SH7708S, CPU_SH7708R,
         CPU_SH7709, CPU_SH7709A, CPU_SH7710, CPU_SH7712,
-        CPU_SH7729, CPU_SH7300,
+        CPU_SH7729,
 
         /* SH-4 types */
         CPU_SH7750, CPU_SH7750S, CPU_SH7750R, CPU_SH7751, CPU_SH7751R,
@@ -55,7 +55,7 @@ enum cpu_type {
         CPU_SH7770, CPU_SH7780, CPU_SH7781, CPU_SH7785, CPU_SHX3,
 
         /* SH4AL-DSP types */
-        CPU_SH73180, CPU_SH7343, CPU_SH7722,
+        CPU_SH7343, CPU_SH7722,
 
         /* Unknown subtype */
         CPU_SH_NONE
diff --git a/include/asm-sh/se7300.h b/include/asm-sh/se7300.h
deleted file mode 100644
index 4e24edccb30d..000000000000
--- a/include/asm-sh/se7300.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef __ASM_SH_HITACHI_SE7300_H
-#define __ASM_SH_HITACHI_SE7300_H
-
-/*
- * linux/include/asm-sh/se/se7300.h
- *
- * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
- *
- * SH-Mobile SolutionEngine 7300 support
- */
-
-/* Box specific addresses.  */
-
-/* Area 0 */
-#define PA_ROM          0x00000000      /* EPROM */
-#define PA_ROM_SIZE     0x00400000      /* EPROM size 4M byte(Actually 2MB) */
-#define PA_FROM         0x00400000      /* Flash ROM */
-#define PA_FROM_SIZE    0x00400000      /* Flash size 4M byte */
-#define PA_SRAM         0x00800000      /* SRAM */
-#define PA_FROM_SIZE    0x00400000      /* SRAM size 4M byte */
-/* Area 1 */
-#define PA_EXT1         0x04000000
-#define PA_EXT1_SIZE    0x04000000
-/* Area 2 */
-#define PA_EXT2         0x08000000
-#define PA_EXT2_SIZE    0x04000000
-/* Area 3 */
-#define PA_SDRAM        0x0c000000
-#define PA_SDRAM_SIZE   0x04000000
-/* Area 4 */
-#define PA_PCIC         0x10000000      /* MR-SHPC-01 PCMCIA */
-#define PA_MRSHPC       0xb03fffe0      /* MR-SHPC-01 PCMCIA controller */
-#define PA_MRSHPC_MW1   0xb0400000      /* MR-SHPC-01 memory window base */
-#define PA_MRSHPC_MW2   0xb0500000      /* MR-SHPC-01 attribute window base */
-#define PA_MRSHPC_IO    0xb0600000      /* MR-SHPC-01 I/O window base */
-#define MRSHPC_OPTION   (PA_MRSHPC + 6)
-#define MRSHPC_CSR      (PA_MRSHPC + 8)
-#define MRSHPC_ISR      (PA_MRSHPC + 10)
-#define MRSHPC_ICR      (PA_MRSHPC + 12)
-#define MRSHPC_CPWCR    (PA_MRSHPC + 14)
-#define MRSHPC_MW0CR1   (PA_MRSHPC + 16)
-#define MRSHPC_MW1CR1   (PA_MRSHPC + 18)
-#define MRSHPC_IOWCR1   (PA_MRSHPC + 20)
-#define MRSHPC_MW0CR2   (PA_MRSHPC + 22)
-#define MRSHPC_MW1CR2   (PA_MRSHPC + 24)
-#define MRSHPC_IOWCR2   (PA_MRSHPC + 26)
-#define MRSHPC_CDCR     (PA_MRSHPC + 28)
-#define MRSHPC_PCIC_INFO (PA_MRSHPC + 30)
-#define PA_LED          0xb0800000      /* LED */
-#define PA_DIPSW        0xb0900000      /* Dip switch 31 */
-#define PA_EPLD_MODESET 0xb0a00000      /* FPGA Mode set register */
-#define PA_EPLD_ST1     0xb0a80000      /* FPGA Interrupt status register1 */
-#define PA_EPLD_ST2     0xb0ac0000      /* FPGA Interrupt status register2 */
-/* Area 5 */
-#define PA_EXT5         0x14000000
-#define PA_EXT5_SIZE    0x04000000
-/* Area 6 */
-#define PA_LCD1         0xb8000000
-#define PA_LCD2         0xb8800000
-
-#define __IO_PREFIX     sh7300se
-#include <asm/io_generic.h>
-
-#endif  /* __ASM_SH_HITACHI_SE7300_H */
diff --git a/include/asm-sh/se73180.h b/include/asm-sh/se73180.h
deleted file mode 100644
index 907c062b4c9a..000000000000
--- a/include/asm-sh/se73180.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef __ASM_SH_SE73180_H
-#define __ASM_SH_SE73180_H
-
-/*
- * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
- *
- * SH-Mobile SolutionEngine 73180 support
- */
-
-/* Box specific addresses.  */
-
-/* Area 0 */
-#define PA_ROM          0x00000000      /* EPROM */
-#define PA_ROM_SIZE     0x00400000      /* EPROM size 4M byte(Actually 2MB) */
-#define PA_FROM         0x00400000      /* Flash ROM */
-#define PA_FROM_SIZE    0x00400000      /* Flash size 4M byte */
-#define PA_SRAM         0x00800000      /* SRAM */
-#define PA_FROM_SIZE    0x00400000      /* SRAM size 4M byte */
-/* Area 1 */
-#define PA_EXT1         0x04000000
-#define PA_EXT1_SIZE    0x04000000
-/* Area 2 */
-#define PA_EXT2         0x08000000
-#define PA_EXT2_SIZE    0x04000000
-/* Area 3 */
-#define PA_SDRAM        0x0c000000
-#define PA_SDRAM_SIZE   0x04000000
-/* Area 4 */
-#define PA_PCIC         0x10000000      /* MR-SHPC-01 PCMCIA */
-#define PA_MRSHPC       0xb03fffe0      /* MR-SHPC-01 PCMCIA controller */
-#define PA_MRSHPC_MW1   0xb0400000      /* MR-SHPC-01 memory window base */
-#define PA_MRSHPC_MW2   0xb0500000      /* MR-SHPC-01 attribute window base */
-#define PA_MRSHPC_IO    0xb0600000      /* MR-SHPC-01 I/O window base */
-#define MRSHPC_OPTION   (PA_MRSHPC + 6)
-#define MRSHPC_CSR      (PA_MRSHPC + 8)
-#define MRSHPC_ISR      (PA_MRSHPC + 10)
-#define MRSHPC_ICR      (PA_MRSHPC + 12)
-#define MRSHPC_CPWCR    (PA_MRSHPC + 14)
-#define MRSHPC_MW0CR1   (PA_MRSHPC + 16)
-#define MRSHPC_MW1CR1   (PA_MRSHPC + 18)
-#define MRSHPC_IOWCR1   (PA_MRSHPC + 20)
-#define MRSHPC_MW0CR2   (PA_MRSHPC + 22)
-#define MRSHPC_MW1CR2   (PA_MRSHPC + 24)
-#define MRSHPC_IOWCR2   (PA_MRSHPC + 26)
-#define MRSHPC_CDCR     (PA_MRSHPC + 28)
-#define MRSHPC_PCIC_INFO (PA_MRSHPC + 30)
-#define PA_LED          0xb0C00000      /* LED */
-#define LED_SHIFT       0
-#define PA_DIPSW        0xb0900000      /* Dip switch 31 */
-#define PA_EPLD_MODESET 0xb0a00000      /* FPGA Mode set register */
-#define PA_EPLD_ST1     0xb0a80000      /* FPGA Interrupt status register1 */
-#define PA_EPLD_ST2     0xb0ac0000      /* FPGA Interrupt status register2 */
-/* Area 5 */
-#define PA_EXT5         0x14000000
-#define PA_EXT5_SIZE    0x04000000
-/* Area 6 */
-#define PA_LCD1         0xb8000000
-#define PA_LCD2         0xb8800000
-
-#define __IO_PREFIX     sh73180se
-#include <asm/io_generic.h>
-
-/* arch/sh/boards/se/73180/irq.c */
-int shmse_irq_demux(int irq);
-
-#endif  /* __ASM_SH_SE73180_H */
diff --git a/include/asm-sh/thread_info.h b/include/asm-sh/thread_info.h
index 31d55e3782d5..1f7e1deb8d92 100644
--- a/include/asm-sh/thread_info.h
+++ b/include/asm-sh/thread_info.h
@@ -107,18 +107,16 @@ static inline struct thread_info *current_thread_info(void)
  * - other flags in MSW
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_RESTORE_SIGMASK     4       /* restore signal mask in do_signal() */
-#define TIF_SINGLESTEP          5       /* singlestepping active */
+#define TIF_SIGPENDING          1       /* signal pending */
+#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
+#define TIF_RESTORE_SIGMASK     3       /* restore signal mask in do_signal() */
+#define TIF_SINGLESTEP          4       /* singlestepping active */
 #define TIF_USEDFPU             16      /* FPU was used by this task this quantum (SMP) */
 #define TIF_POLLING_NRFLAG      17      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              18
 #define TIF_FREEZE              19
 
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
diff --git a/include/asm-sh/ubc.h b/include/asm-sh/ubc.h
index 38d46e01b846..56f4e30dc49c 100644
--- a/include/asm-sh/ubc.h
+++ b/include/asm-sh/ubc.h
@@ -15,8 +15,7 @@
 #include <asm/cpu/ubc.h>
 
 /* User Break Controller */
-#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7300)
+#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709)
 #define UBC_TYPE_SH7729 (current_cpu_data.type == CPU_SH7729)
 #else
 #define UBC_TYPE_SH7729 0
diff --git a/include/asm-sh64/dma-mapping.h b/include/asm-sh64/dma-mapping.h
index c7c0f059cdc4..d505f357f819 100644
--- a/include/asm-sh64/dma-mapping.h
+++ b/include/asm-sh64/dma-mapping.h
@@ -51,11 +51,11 @@ static inline dma_addr_t dma_map_single(struct device *dev,
 {
 #if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT)
         if (dev->bus == &pci_bus_type)
-                return virt_to_bus(ptr);
+                return virt_to_phys(ptr);
 #endif
         dma_cache_sync(dev, ptr, size, dir);
 
-        return virt_to_bus(ptr);
+        return virt_to_phys(ptr);
 }
 
 #define dma_unmap_single(dev, addr, size, dir)  do { } while (0)
@@ -98,7 +98,7 @@ static inline void dma_sync_single(struct device *dev, dma_addr_t dma_handle,
         if (dev->bus == &pci_bus_type)
                 return;
 #endif
-        dma_cache_sync(dev, bus_to_virt(dma_handle), size, dir);
+        dma_cache_sync(dev, phys_to_virt(dma_handle), size, dir);
 }
 
 static inline void dma_sync_single_range(struct device *dev,
@@ -110,7 +110,7 @@ static inline void dma_sync_single_range(struct device *dev,
         if (dev->bus == &pci_bus_type)
                 return;
 #endif
-        dma_cache_sync(dev, bus_to_virt(dma_handle) + offset, size, dir);
+        dma_cache_sync(dev, phys_to_virt(dma_handle) + offset, size, dir);
 }
 
 static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg,
diff --git a/include/asm-sh64/io.h b/include/asm-sh64/io.h
index 14d8e7b4bf4b..1f37b6931922 100644
--- a/include/asm-sh64/io.h
+++ b/include/asm-sh64/io.h
@@ -31,10 +31,6 @@
 #include <asm/page.h>
 #include <asm-generic/iomap.h>
 
-#define virt_to_bus virt_to_phys
-#define bus_to_virt phys_to_virt
-#define page_to_bus page_to_phys
-
 /*
  * Nothing overly special here.. instead of doing the same thing
  * over and over again, we just define a set of sh64_in/out functions
diff --git a/include/asm-sparc64/dma-mapping.h b/include/asm-sparc64/dma-mapping.h
index 0a1006692bb2..a72a5f271f31 100644
--- a/include/asm-sparc64/dma-mapping.h
+++ b/include/asm-sparc64/dma-mapping.h
@@ -127,6 +127,13 @@ static inline int dma_mapping_error(dma_addr_t dma_addr)
         return (dma_addr == DMA_ERROR_CODE);
 }
 
+static inline int dma_get_cache_alignment(void)
+{
+        /* no easy way to get cache size on all processors, so return
+         * the maximum possible, to be safe */
+        return (1 << INTERNODE_CACHE_SHIFT);
+}
+
 #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
 #define dma_is_consistent(d, h) (1)
diff --git a/include/asm-v850/thread_info.h b/include/asm-v850/thread_info.h
index 82b8f2846207..1a9e6ae0c5fd 100644
--- a/include/asm-v850/thread_info.h
+++ b/include/asm-v850/thread_info.h
@@ -77,16 +77,14 @@ struct thread_info {
  * thread information flag bit numbers
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_POLLING_NRFLAG      4       /* true if poll_idle() is polling
+#define TIF_SIGPENDING          1       /* signal pending */
+#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
+#define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling
                                            TIF_NEED_RESCHED */
-#define TIF_MEMDIE              5
+#define TIF_MEMDIE              4
 
 /* as above, but as bit values */
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
diff --git a/include/asm-x86_64/serial.h b/include/asm-x86_64/serial.h
index 8ebd765c674a..b0496e0d72a6 100644
--- a/include/asm-x86_64/serial.h
+++ b/include/asm-x86_64/serial.h
@@ -11,3 +11,19 @@
  * megabits/second; but this requires the faster clock.
  */
 #define BASE_BAUD ( 1843200 / 16 )
+
+/* Standard COM flags (except for COM4, because of the 8514 problem) */
+#ifdef CONFIG_SERIAL_DETECT_IRQ
+#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
+#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)
+#else
+#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
+#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
+#endif
+
+#define SERIAL_PORT_DFNS                        \
+        /* UART CLK   PORT IRQ     FLAGS        */                      \
+        { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS },      /* ttyS0 */     \
+        { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS },      /* ttyS1 */     \
+        { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS },      /* ttyS2 */     \
+        { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS },     /* ttyS3 */
diff --git a/include/asm-x86_64/tce.h b/include/asm-x86_64/tce.h
index dbb047febc5e..cd955d3d112f 100644
--- a/include/asm-x86_64/tce.h
+++ b/include/asm-x86_64/tce.h
@@ -41,8 +41,8 @@ struct iommu_table;
 extern void tce_build(struct iommu_table *tbl, unsigned long index,
         unsigned int npages, unsigned long uaddr, int direction);
 extern void tce_free(struct iommu_table *tbl, long index, unsigned int npages);
-extern void* alloc_tce_table(void);
-extern void free_tce_table(void *tbl);
-extern int build_tce_table(struct pci_dev *dev, void __iomem *bbar);
+extern void * __init alloc_tce_table(void);
+extern void __init free_tce_table(void *tbl);
+extern int __init build_tce_table(struct pci_dev *dev, void __iomem *bbar);
 
 #endif /* _ASM_X86_64_TCE_H */
diff --git a/include/asm-x86_64/thread_info.h b/include/asm-x86_64/thread_info.h
index 33c72ef15a0c..beae2bfb62ca 100644
--- a/include/asm-x86_64/thread_info.h
+++ b/include/asm-x86_64/thread_info.h
@@ -107,7 +107,6 @@ static inline struct thread_info *stack_thread_info(void)
  * Warning: layout of LSW is hardcoded in entry.S
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
 #define TIF_SIGPENDING          2       /* signal pending */
 #define TIF_NEED_RESCHED        3       /* rescheduling necessary */
 #define TIF_SINGLESTEP          4       /* reenable singlestep on user return*/
@@ -126,7 +125,6 @@ static inline struct thread_info *stack_thread_info(void)
 #define TIF_FREEZE              23      /* is freezing for suspend */
 
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_SINGLESTEP         (1<<TIF_SINGLESTEP)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
diff --git a/include/asm-xtensa/thread_info.h b/include/asm-xtensa/thread_info.h
index 3fa29799b435..52c958285bcb 100644
--- a/include/asm-xtensa/thread_info.h
+++ b/include/asm-xtensa/thread_info.h
@@ -110,17 +110,15 @@ static inline struct thread_info *current_thread_info(void)
  * - other flags in MSW
  */
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_SINGLESTEP          4       /* restore singlestep on return to user mode */
-#define TIF_IRET                5       /* return with iret */
-#define TIF_MEMDIE              6
-#define TIF_RESTORE_SIGMASK     7       /* restore signal mask in do_signal() */
+#define TIF_SIGPENDING          1       /* signal pending */
+#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
+#define TIF_SINGLESTEP          3       /* restore singlestep on return to user mode */
+#define TIF_IRET                4       /* return with iret */
+#define TIF_MEMDIE              5
+#define TIF_RESTORE_SIGMASK     6       /* restore signal mask in do_signal() */
 #define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_SINGLESTEP         (1<<TIF_SINGLESTEP)
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index bcf875e844fe..ad7f71a81b0a 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -137,6 +137,7 @@ header-y += radeonfb.h
 header-y += raw.h
 header-y += resource.h
 header-y += rose.h
+header-y += serial_reg.h
 header-y += smbno.h
 header-y += snmp.h
 header-y += sockios.h
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h
index 93e4c3a6d190..50839fe9e39e 100644
--- a/include/linux/dvb/video.h
+++ b/include/linux/dvb/video.h
@@ -29,6 +29,7 @@
 #ifdef __KERNEL__
 #include <linux/types.h>
 #else
+#include <asm/types.h>
 #include <stdint.h>
 #include <time.h>
 #endif
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 3a632244f31b..23ccea811297 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -270,8 +270,6 @@ u32 ethtool_op_get_sg(struct net_device *dev);
 int ethtool_op_set_sg(struct net_device *dev, u32 data);
 u32 ethtool_op_get_tso(struct net_device *dev);
 int ethtool_op_set_tso(struct net_device *dev, u32 data);
-int ethtool_op_get_perm_addr(struct net_device *dev, 
-                             struct ethtool_perm_addr *addr, u8 *data);
 u32 ethtool_op_get_ufo(struct net_device *dev);
 int ethtool_op_set_ufo(struct net_device *dev, u32 data);
 
@@ -309,7 +307,6 @@ int ethtool_op_set_ufo(struct net_device *dev, u32 data);
  * get_strings: Return a set of strings that describe the requested objects 
  * phys_id: Identify the device
  * get_stats: Return statistics about the device
- * get_perm_addr: Gets the permanent hardware address
  * 
  * Description:
  *
@@ -368,7 +365,6 @@ struct ethtool_ops {
         int     (*phys_id)(struct net_device *, u32);
         int     (*get_stats_count)(struct net_device *);
         void    (*get_ethtool_stats)(struct net_device *, struct ethtool_stats *, u64 *);
-        int     (*get_perm_addr)(struct net_device *, struct ethtool_perm_addr *, u8 *);
         int     (*begin)(struct net_device *);
         void    (*complete)(struct net_device *);
         u32     (*get_ufo)(struct net_device *);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index d33beadd9a43..6bf139562947 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -878,7 +878,7 @@ extern int vfs_cancel_lock(struct file *filp, struct file_lock *fl);
 extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl);
 extern int __break_lease(struct inode *inode, unsigned int flags);
 extern void lease_get_mtime(struct inode *, struct timespec *time);
-extern int setlease(struct file *, long, struct file_lock **);
+extern int generic_setlease(struct file *, long, struct file_lock **);
 extern int vfs_setlease(struct file *, long, struct file_lock **);
 extern int lease_modify(struct file_lock **, int);
 extern int lock_may_read(struct inode *, loff_t start, unsigned long count);
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 0c37a737a2b2..2a32f2fd940d 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -156,10 +156,14 @@ struct i2c_driver {
  * @name: Indicates the type of the device, usually a chip name that's
  *      generic enough to hide second-sourcing and compatible revisions.
  * @adapter: manages the bus segment hosting this I2C device
+ * @driver: device's driver, hence pointer to access routines
+ * @usage_count: counts current number of users of this client
  * @dev: Driver model device node for the slave.
  * @irq: indicates the IRQ generated by this device (if any)
  * @driver_name: Identifies new-style driver used with this device; also
  *      used as the module name for hotplug/coldplug modprobe support.
+ * @list: list of active/busy clients
+ * @released: used to synchronize client releases & detaches and references
  *
  * An i2c_client identifies a single device (i.e. chip) connected to an
  * i2c bus. The behaviour exposed to Linux is defined by the driver
diff --git a/include/linux/init.h b/include/linux/init.h
index f0d0e3295a9b..1a4a283d19a9 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -114,7 +114,7 @@ void prepare_namespace(void);
  *
  * This only exists for built-in code, not for modules.
  */
-#define pure_initcall(fn)               __define_initcall("0",fn,1)
+#define pure_initcall(fn)               __define_initcall("0",fn,0)
 
 #define core_initcall(fn)               __define_initcall("1",fn,1)
 #define core_initcall_sync(fn)          __define_initcall("1s",fn,1s)
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 97983dc9df13..4ca60c3320fb 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -219,7 +219,6 @@ enum {
 #include <linux/tcp.h>
 #include <linux/udp.h>
 
-#include <net/if_inet6.h>       /* struct ipv6_mc_socklist */
 #include <net/inet_sock.h>
 
 static inline struct ipv6hdr *ipv6_hdr(const struct sk_buff *skb)
@@ -273,6 +272,10 @@ struct tcp6_request_sock {
         struct inet6_request_sock tcp6rsk_inet6;
 };
 
+struct ipv6_mc_socklist;
+struct ipv6_ac_socklist;
+struct ipv6_fl_socklist;
+
 /**
  * struct ipv6_pinfo - ipv6 private area
  *
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 44657197fcb0..efc88538b2ba 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -140,6 +140,7 @@ struct irq_chip {
  * @wake_depth:         enable depth, for multiple set_irq_wake() callers
  * @irq_count:          stats field to detect stalled irqs
  * @irqs_unhandled:     stats field for spurious unhandled interrupts
+ * @last_unhandled:     aging timer for unhandled count
  * @lock:               locking for SMP
  * @affinity:           IRQ affinity on SMP
  * @cpu:                cpu index useful for balancing
diff --git a/include/linux/kdebug.h b/include/linux/kdebug.h
index 5db38d6d8b92..ed815090b3bc 100644
--- a/include/linux/kdebug.h
+++ b/include/linux/kdebug.h
@@ -3,6 +3,8 @@
 
 #include <asm/kdebug.h>
 
+struct notifier_block;
+
 struct die_args {
         struct pt_regs *regs;
         const char *str;
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index aa2fe22b1baa..949706c33622 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -56,6 +56,9 @@ enum kobject_action {
         KOBJ_MAX
 };
 
+/* The list of strings defining the valid kobject actions as specified above */
+extern const char *kobject_actions[];
+
 struct kobject {
         const char              * k_name;
         char                    name[KOBJ_NAME_LEN];
@@ -108,9 +111,15 @@ struct kobj_type {
         struct attribute        ** default_attrs;
 };
 
+struct kset_uevent_ops {
+        int (*filter)(struct kset *kset, struct kobject *kobj);
+        const char *(*name)(struct kset *kset, struct kobject *kobj);
+        int (*uevent)(struct kset *kset, struct kobject *kobj, char **envp,
+                        int num_envp, char *buffer, int buffer_size);
+};
 
-/**
- *      kset - a set of kobjects of a specific type, belonging
+/*
+ *      struct kset - a set of kobjects of a specific type, belonging
  *      to a specific subsystem.
  *
  *      All kobjects of a kset should be embedded in an identical 
@@ -126,13 +135,6 @@ struct kobj_type {
  *      supress the event generation or add subsystem specific
  *      variables carried with the event.
  */
-struct kset_uevent_ops {
-        int (*filter)(struct kset *kset, struct kobject *kobj);
-        const char *(*name)(struct kset *kset, struct kobject *kobj);
-        int (*uevent)(struct kset *kset, struct kobject *kobj, char **envp,
-                        int num_envp, char *buffer, int buffer_size);
-};
-
 struct kset {
         struct kobj_type        * ktype;
         struct list_head        list;
@@ -173,7 +175,7 @@ static inline struct kobj_type * get_ktype(struct kobject * k)
 extern struct kobject * kset_find_obj(struct kset *, const char *);
 
 
-/**
+/*
  * Use this when initializing an embedded kset with no other 
  * fields to initialize.
  */
@@ -198,7 +200,7 @@ extern struct kset kernel_subsys;
 /* The global /sys/hypervisor/ subsystem  */
 extern struct kset hypervisor_subsys;
 
-/**
+/*
  * Helpers for setting the kset of registered objects.
  * Often, a registered object belongs to a kset embedded in a 
  * subsystem. These do no magic, just make the resulting code
@@ -233,7 +235,7 @@ extern struct kset hypervisor_subsys;
 /**
  *      subsys_set_kset(obj,subsys) - set kset for subsystem
  *      @obj:           ptr to some object type.
- *      @subsys:        a subsystem object (not a ptr).
+ *      @_subsys:       a subsystem object (not a ptr).
  *
  *      Can be used for any object type with an embedded ->subsys.
  *      Sets the kset of @obj's kobject to @subsys.kset. This makes
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index da8eb8ad9e9b..3ea68cd3b61f 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -120,7 +120,6 @@ enum zone_type {
          * ---------------------------
          * parisc, ia64, sparc  <4G
          * s390                 <2G
-         * arm26                <48M
          * arm                  Various
          * alpha                Unlimited or 0-16MB.
          *
diff --git a/include/linux/mv643xx.h b/include/linux/mv643xx.h
index b021b3a2b65a..9c8049005052 100644
--- a/include/linux/mv643xx.h
+++ b/include/linux/mv643xx.h
@@ -1302,4 +1302,12 @@ struct mv643xx_eth_platform_data {
         u8              mac_addr[6];    /* mac address if non-zero*/
 };
 
+/* Watchdog Platform Device, Driver Data */
+#define MV64x60_WDT_NAME                        "mv64x60_wdt"
+
+struct mv64x60_wdt_pdata {
+        int     timeout;        /* watchdog expiry in seconds, default 10 */
+        int     bus_clk;        /* bus clock in MHz, default 133 */
+};
+
 #endif /* __ASM_MV643XX_H */
diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index be3f2bb6fcf3..fad7ff17e468 100644
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -157,6 +157,19 @@ extern int __srcu_notifier_call_chain(struct srcu_notifier_head *nh,
  */
 #define NOTIFY_STOP             (NOTIFY_OK|NOTIFY_STOP_MASK)
 
+/* Encapsulate (negative) errno value (in particular, NOTIFY_BAD <=> EPERM). */
+static inline int notifier_from_errno(int err)
+{
+        return NOTIFY_STOP_MASK | (NOTIFY_OK - err);
+}
+
+/* Restore (negative) errno value from notify return value. */
+static inline int notifier_to_errno(int ret)
+{
+        ret &= ~NOTIFY_STOP_MASK;
+        return ret > NOTIFY_OK ? NOTIFY_OK - ret : 0;
+}
+
 /*
  *      Declared notifiers so far. I can imagine quite a few more chains
  *      over time (eg laptop power reset chains, reboot chain (to clean 
diff --git a/include/linux/pci.h b/include/linux/pci.h
index d8f8a3a96644..e7d8d4e19a53 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -534,7 +534,7 @@ static inline int pci_write_config_dword(struct pci_dev *dev, int where, u32 val
 
 int __must_check pci_enable_device(struct pci_dev *dev);
 int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask);
-int __must_check __pci_reenable_device(struct pci_dev *);
+int __must_check pci_reenable_device(struct pci_dev *);
 int __must_check pcim_enable_device(struct pci_dev *pdev);
 void pcim_pin_device(struct pci_dev *pdev);
 
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 69d68117bdac..07fc57429b58 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -611,7 +611,6 @@
 #define PCI_DEVICE_ID_NEC_CBUS_3        0x003b
 #define PCI_DEVICE_ID_NEC_NAPCCARD      0x003e
 #define PCI_DEVICE_ID_NEC_PCX2          0x0046 /* PowerVR */
-#define PCI_DEVICE_ID_NEC_NILE4         0x005a
 #define PCI_DEVICE_ID_NEC_VRC5476       0x009b
 #define PCI_DEVICE_ID_NEC_VRC4173       0x00a5
 #define PCI_DEVICE_ID_NEC_VRC5477_AC97  0x00a6
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index ce256438e619..93c27f71122a 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -134,8 +134,8 @@ typedef struct skb_frag_struct skb_frag_t;
 
 struct skb_frag_struct {
         struct page *page;
-        __u16 page_offset;
-        __u16 size;
+        __u32 page_offset;
+        __u32 size;
 };
 
 /* This data is invariant across clones and lives at
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 302b81d1d117..002a3cddbdd5 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -77,6 +77,7 @@ struct spi_device {
 #define SPI_CS_HIGH     0x04                    /* chipselect active high? */
 #define SPI_LSB_FIRST   0x08                    /* per-word bits-on-wire */
 #define SPI_3WIRE       0x10                    /* SI/SO signals shared */
+#define SPI_LOOP        0x20                    /* loopback mode */
         u8                      bits_per_word;
         int                     irq;
         void                    *controller_state;
@@ -138,6 +139,32 @@ struct spi_message;
 
 
 
+/**
+ * struct spi_driver - Host side "protocol" driver
+ * @probe: Binds this driver to the spi device.  Drivers can verify
+ *      that the device is actually present, and may need to configure
+ *      characteristics (such as bits_per_word) which weren't needed for
+ *      the initial configuration done during system setup.
+ * @remove: Unbinds this driver from the spi device
+ * @shutdown: Standard shutdown callback used during system state
+ *      transitions such as powerdown/halt and kexec
+ * @suspend: Standard suspend callback used during system state transitions
+ * @resume: Standard resume callback used during system state transitions
+ * @driver: SPI device drivers should initialize the name and owner
+ *      field of this structure.
+ *
+ * This represents the kind of device driver that uses SPI messages to
+ * interact with the hardware at the other end of a SPI link.  It's called
+ * a "protocol" driver because it works through messages rather than talking
+ * directly to SPI hardware (which is what the underlying SPI controller
+ * driver does to pass those messages).  These protocols are defined in the
+ * specification for the device(s) supported by the driver.
+ *
+ * As a rule, those device protocols represent the lowest level interface
+ * supported by a driver, and it will support upper level interfaces too.
+ * Examples of such upper levels include frameworks like MTD, networking,
+ * MMC, RTC, filesystem character device nodes, and hardware monitoring.
+ */
 struct spi_driver {
         int                     (*probe)(struct spi_device *spi);
         int                     (*remove)(struct spi_device *spi);
@@ -667,7 +694,37 @@ static inline ssize_t spi_w8r16(struct spi_device *spi, u8 cmd)
  * parport adapters, or microcontrollers acting as USB-to-SPI bridges.
  */
 
-/* board-specific information about each SPI device */
+/**
+ * struct spi_board_info - board-specific template for a SPI device
+ * @modalias: Initializes spi_device.modalias; identifies the driver.
+ * @platform_data: Initializes spi_device.platform_data; the particular
+ *      data stored there is driver-specific.
+ * @controller_data: Initializes spi_device.controller_data; some
+ *      controllers need hints about hardware setup, e.g. for DMA.
+ * @irq: Initializes spi_device.irq; depends on how the board is wired.
+ * @max_speed_hz: Initializes spi_device.max_speed_hz; based on limits
+ *      from the chip datasheet and board-specific signal quality issues.
+ * @bus_num: Identifies which spi_master parents the spi_device; unused
+ *      by spi_new_device(), and otherwise depends on board wiring.
+ * @chip_select: Initializes spi_device.chip_select; depends on how
+ *      the board is wired.
+ * @mode: Initializes spi_device.mode; based on the chip datasheet, board
+ *      wiring (some devices support both 3WIRE and standard modes), and
+ *      possibly presence of an inverter in the chipselect path.
+ *
+ * When adding new SPI devices to the device tree, these structures serve
+ * as a partial device template.  They hold information which can't always
+ * be determined by drivers.  Information that probe() can establish (such
+ * as the default transfer wordsize) is not included here.
+ *
+ * These structures are used in two places.  Their primary role is to
+ * be stored in tables of board-specific device descriptors, which are
+ * declared early in board initialization and then used (much later) to
+ * populate a controller's device tree after the that controller's driver
+ * initializes.  A secondary (and atypical) role is as a parameter to
+ * spi_new_device() call, which happens after those controller drivers
+ * are active in some dynamic board configuration models.
+ */
 struct spi_board_info {
         /* the device name and module name are coupled, like platform_bus;
          * "modalias" is normally the driver name.
diff --git a/include/linux/spi/spidev.h b/include/linux/spi/spidev.h
index 7d700be57490..c93ef9d42a01 100644
--- a/include/linux/spi/spidev.h
+++ b/include/linux/spi/spidev.h
@@ -35,6 +35,10 @@
 #define SPI_MODE_2              (SPI_CPOL|0)
 #define SPI_MODE_3              (SPI_CPOL|SPI_CPHA)
 
+#define SPI_CS_HIGH             0x04
+#define SPI_LSB_FIRST           0x08
+#define SPI_3WIRE               0x10
+#define SPI_LOOP                0x20
 
 /*---------------------------------------------------------------------------*/
 
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 47f1c53332ce..483050c924c3 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -62,7 +62,7 @@ enum
         CTL_KERN=1,             /* General kernel info and control */
         CTL_VM=2,               /* VM management */
         CTL_NET=3,              /* Networking */
-        /* was CTL_PROC */
+        CTL_PROC=4,             /* removal breaks strace(1) compilation */
         CTL_FS=5,               /* Filesystems */
         CTL_DEBUG=6,            /* Debugging */
         CTL_DEV=7,              /* Devices */
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 7a60946df3b6..4f33a58fa9d1 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -94,6 +94,7 @@ enum usb_interface_condition {
  *      endpoint configurations.  They will be in no particular order.
  * @num_altsetting: number of altsettings defined.
  * @cur_altsetting: the current altsetting.
+ * @intf_assoc: interface association descriptor
  * @driver: the USB driver that is bound to this interface.
  * @minor: the minor number assigned to this interface, if this
  *      interface is bound to a driver that uses the USB major number.
@@ -213,6 +214,7 @@ struct usb_interface_cache {
  * @desc: the device's configuration descriptor.
  * @string: pointer to the cached version of the iConfiguration string, if
  *      present for this configuration.
+ * @intf_assoc: list of any interface association descriptors in this config
  * @interface: array of pointers to usb_interface structures, one for each
  *      interface in the configuration.  The number of interfaces is stored
  *      in desc.bNumInterfaces.  These pointers are valid only while the
diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index 6de1e9e35c73..0864a775de24 100644
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -12,37 +12,8 @@ extern void unix_gc(void);
 
 #define UNIX_HASH_SIZE  256
 
-extern struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
-extern spinlock_t unix_table_lock;
-
 extern atomic_t unix_tot_inflight;
 
-static inline struct sock *first_unix_socket(int *i)
-{
-        for (*i = 0; *i <= UNIX_HASH_SIZE; (*i)++) {
-                if (!hlist_empty(&unix_socket_table[*i]))
-                        return __sk_head(&unix_socket_table[*i]);
-        }
-        return NULL;
-}
-
-static inline struct sock *next_unix_socket(int *i, struct sock *s)
-{
-        struct sock *next = sk_next(s);
-        /* More in this chain? */
-        if (next)
-                return next;
-        /* Look for next non-empty chain. */
-        for ((*i)++; *i <= UNIX_HASH_SIZE; (*i)++) {
-                if (!hlist_empty(&unix_socket_table[*i]))
-                        return __sk_head(&unix_socket_table[*i]);
-        }
-        return NULL;
-}
-
-#define forall_unix_sockets(i, s) \
-        for (s = first_unix_socket(&(i)); s; s = next_unix_socket(&(i),(s)))
-
 struct unix_address {
         atomic_t        refcnt;
         int             len;
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 87df4e87622d..70e70f5d3dd6 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -34,7 +34,7 @@
 /* L2CAP socket address */
 struct sockaddr_l2 {
         sa_family_t     l2_family;
-        unsigned short  l2_psm;
+        __le16          l2_psm;
         bdaddr_t        l2_bdaddr;
 };
 
@@ -76,32 +76,32 @@ struct l2cap_conninfo {
 
 /* L2CAP structures */
 struct l2cap_hdr {
-        __u16      len;
-        __u16      cid;
+        __le16     len;
+        __le16     cid;
 } __attribute__ ((packed));
 #define L2CAP_HDR_SIZE          4
 
 struct l2cap_cmd_hdr {
         __u8       code;
         __u8       ident;
-        __u16      len;
+        __le16     len;
 } __attribute__ ((packed));
 #define L2CAP_CMD_HDR_SIZE      4
 
 struct l2cap_cmd_rej {
-        __u16      reason;
+        __le16     reason;
 } __attribute__ ((packed));
 
 struct l2cap_conn_req {
-        __u16      psm;
-        __u16      scid;
+        __le16     psm;
+        __le16     scid;
 } __attribute__ ((packed));
 
 struct l2cap_conn_rsp {
-        __u16      dcid;
-        __u16      scid;
-        __u16      result;
-        __u16      status;
+        __le16     dcid;
+        __le16     scid;
+        __le16     result;
+        __le16     status;
 } __attribute__ ((packed));
 
 /* connect result */
@@ -117,15 +117,15 @@ struct l2cap_conn_rsp {
 #define L2CAP_CS_AUTHOR_PEND  0x0002
 
 struct l2cap_conf_req {
-        __u16      dcid;
-        __u16      flags;
+        __le16     dcid;
+        __le16     flags;
         __u8       data[0];
 } __attribute__ ((packed));
 
 struct l2cap_conf_rsp {
-        __u16      scid;
-        __u16      flags;
-        __u16      result;
+        __le16     scid;
+        __le16     flags;
+        __le16     result;
         __u8       data[0];
 } __attribute__ ((packed));
 
@@ -149,23 +149,23 @@ struct l2cap_conf_opt {
 #define L2CAP_CONF_MAX_SIZE     22
 
 struct l2cap_disconn_req {
-        __u16      dcid;
-        __u16      scid;
+        __le16     dcid;
+        __le16     scid;
 } __attribute__ ((packed));
 
 struct l2cap_disconn_rsp {
-        __u16      dcid;
-        __u16      scid;
+        __le16     dcid;
+        __le16     scid;
 } __attribute__ ((packed));
 
 struct l2cap_info_req {
-        __u16       type;
+        __le16      type;
         __u8        data[0];
 } __attribute__ ((packed));
 
 struct l2cap_info_rsp {
-        __u16       type;
-        __u16       result;
+        __le16      type;
+        __le16      result;
         __u8        data[0];
 } __attribute__ ((packed));
 
@@ -207,7 +207,7 @@ struct l2cap_conn {
 
 struct l2cap_pinfo {
         struct bt_sock  bt;
-        __u16           psm;
+        __le16          psm;
         __u16           dcid;
         __u16           scid;
 
@@ -225,7 +225,7 @@ struct l2cap_pinfo {
 
         __u8            ident;
 
-        __u16           sport;
+        __le16          sport;
 
         struct l2cap_conn       *conn;
         struct sock             *next_c;
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 46b9dce82f6e..9059e0ed7fe3 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -17,6 +17,7 @@
 
 #include <linux/ipv6.h>
 #include <linux/hardirq.h>
+#include <net/if_inet6.h>
 #include <net/ndisc.h>
 #include <net/flow.h>
 #include <net/snmp.h>
diff --git a/include/net/netfilter/ipv6/nf_conntrack_ipv6.h b/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
index 5a8965904377..070d12cb4634 100644
--- a/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
+++ b/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
@@ -7,9 +7,6 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6;
 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6;
 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6;
 
-extern int nf_ct_ipv6_skip_exthdr(const struct sk_buff *skb, int start,
-                                  u8 *nexthdrp, int len);
-
 extern int nf_ct_frag6_init(void);
 extern void nf_ct_frag6_cleanup(void);
 extern struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb);
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 8b404b1ef7c8..c209361ab74a 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -660,7 +660,7 @@ struct tcp_congestion_ops {
         /* new value of cwnd after loss (optional) */
         u32  (*undo_cwnd)(struct sock *sk);
         /* hook for packet ack accounting (optional) */
-        void (*pkts_acked)(struct sock *sk, u32 num_acked, ktime_t last);
+        void (*pkts_acked)(struct sock *sk, u32 num_acked, s32 rtt_us);
         /* get info for inet_diag (optional) */
         void (*get_info)(struct sock *sk, u32 ext, struct sk_buff *skb);
 
diff --git a/include/video/tx3912.h b/include/video/tx3912.h
deleted file mode 100644
index 6b6d006038c2..000000000000
--- a/include/video/tx3912.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * linux/include/video/tx3912.h
- *
- * Copyright (C) 2001 Steven Hill (sjhill@realitydiluted.com)
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file COPYING in the main directory of this archive for
- * more details.
- *
- * Includes for TMPR3912/05 and PR31700 LCD controller registers
- */
-#include <asm/tx3912.h>
-
-#define VidCtrl1        REG_AT(0x028)
-#define VidCtrl2        REG_AT(0x02C)
-#define VidCtrl3        REG_AT(0x030)
-#define VidCtrl4        REG_AT(0x034)
-#define VidCtrl5        REG_AT(0x038)
-#define VidCtrl6        REG_AT(0x03C)
-#define VidCtrl7        REG_AT(0x040)
-#define VidCtrl8        REG_AT(0x044)
-#define VidCtrl9        REG_AT(0x048)
-#define VidCtrl10       REG_AT(0x04C)
-#define VidCtrl11       REG_AT(0x050)
-#define VidCtrl12       REG_AT(0x054)
-#define VidCtrl13       REG_AT(0x058)
-#define VidCtrl14       REG_AT(0x05C)
-
-/* Video Control 1 Register */
-#define LINECNT         0xffc00000
-#define LINECNT_SHIFT   22
-#define LOADDLY         BIT(21)
-#define BAUDVAL         (BIT(20) | BIT(19) | BIT(18) | BIT(17) | BIT(16))
-#define BAUDVAL_SHIFT   16
-#define VIDDONEVAL      (BIT(15) | BIT(14) | BIT(13) | BIT(12) | BIT(11) | BIT(10) | BIT(9))
-#define VIDDONEVAL_SHIFT  9
-#define ENFREEZEFRAME   BIT(8)
-#define TX3912_VIDCTRL1_BITSEL_MASK     0x000000c0
-#define TX3912_VIDCTRL1_2BIT_GRAY       0x00000040
-#define TX3912_VIDCTRL1_4BIT_GRAY       0x00000080
-#define TX3912_VIDCTRL1_8BIT_COLOR      0x000000c0
-#define BITSEL_SHIFT    6
-#define DISPSPLIT       BIT(5)
-#define DISP8           BIT(4)
-#define DFMODE          BIT(3)
-#define INVVID          BIT(2)
-#define DISPON          BIT(1)
-#define ENVID           BIT(0)
-
-/* Video Control 2 Register */
-#define VIDRATE_MASK    0xffc00000
-#define VIDRATE_SHIFT   22
-#define HORZVAL_MASK    0x001ff000
-#define HORZVAL_SHIFT   12
-#define LINEVAL_MASK    0x000001ff
-
-/* Video Control 3 Register */
-#define TX3912_VIDCTRL3_VIDBANK_MASK    0xfff00000
-#define TX3912_VIDCTRL3_VIDBASEHI_MASK  0x000ffff0
-
-/* Video Control 4 Register */
-#define TX3912_VIDCTRL4_VIDBASELO_MASK  0x000ffff0
diff --git a/init/Kconfig b/init/Kconfig
index e2056828dc64..96b54595f1dc 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -7,7 +7,7 @@ config DEFCONFIG_LIST
         default "/boot/config-$UNAME_RELEASE"
         default "arch/$ARCH/defconfig"
 
-menu "Code maturity level options"
+menu "General setup"
 
 config EXPERIMENTAL
         bool "Prompt for development and/or incomplete code/drivers"
@@ -61,9 +61,6 @@ config INIT_ENV_ARG_LIMIT
           Maximum of each of the number of arguments and environment
           variables passed to init from the kernel command line.
 
-endmenu
-
-menu "General setup"
 
 config LOCALVERSION
         string "Local version - append to kernel release"
@@ -340,7 +337,7 @@ endif
 config CC_OPTIMIZE_FOR_SIZE
         bool "Optimize for size (Look out for broken compilers!)"
         default y
-        depends on ARM || H8300 || EXPERIMENTAL
+        depends on ARM || H8300 || SUPERH || EXPERIMENTAL
         help
           Enabling this option will pass "-Os" instead of "-O2" to gcc
           resulting in a smaller kernel.
@@ -468,25 +465,19 @@ config FUTEX
           run glibc-based applications correctly.
 
 config ANON_INODES
-        bool "Enable anonymous inode source" if EMBEDDED
-        default y
-        help
-          Anonymous inode source for pseudo-files like epoll, signalfd,
-          timerfd and eventfd.
-
-          If unsure, say Y.
+        bool
 
 config EPOLL
         bool "Enable eventpoll support" if EMBEDDED
         default y
-        depends on ANON_INODES
+        select ANON_INODES
         help
           Disabling this option will cause the kernel to be built without
           support for epoll family of system calls.
 
 config SIGNALFD
         bool "Enable signalfd() system call" if EMBEDDED
-        depends on ANON_INODES
+        select ANON_INODES
         default y
         help
           Enable the signalfd() system call that allows to receive signals
@@ -496,7 +487,7 @@ config SIGNALFD
 
 config TIMERFD
         bool "Enable timerfd() system call" if EMBEDDED
-        depends on ANON_INODES
+        select ANON_INODES
         default y
         help
           Enable the timerfd() system call that allows to receive timer
@@ -506,7 +497,7 @@ config TIMERFD
 
 config EVENTFD
         bool "Enable eventfd() system call" if EMBEDDED
-        depends on ANON_INODES
+        select ANON_INODES
         default y
         help
           Enable the eventfd() system call that allows to receive both
diff --git a/ipc/shm.c b/ipc/shm.c
index d0259e3ad1c0..a86a3a5c8a19 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -268,7 +268,9 @@ static int shm_mmap(struct file * file, struct vm_area_struct * vma)
         if (ret != 0)
                 return ret;
         sfd->vm_ops = vma->vm_ops;
+#ifdef CONFIG_MMU
         BUG_ON(!sfd->vm_ops->fault);
+#endif
         vma->vm_ops = &shm_vm_ops;
         shm_open(vma);
 
@@ -714,7 +716,7 @@ asmlinkage long sys_shmctl (int shmid, int cmd, struct shmid_ds __user *buf)
                         struct user_struct * user = current->user;
                         if (!is_file_hugepages(shp->shm_file)) {
                                 err = shmem_lock(shp->shm_file, 1, user);
-                                if (!err) {
+                                if (!err && !(shp->shm_perm.mode & SHM_LOCKED)){
                                         shp->shm_perm.mode |= SHM_LOCKED;
                                         shp->mlock_user = user;
                                 }
diff --git a/kernel/futex.c b/kernel/futex.c
index a12425051ee9..3415e9ad1391 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2060,8 +2060,10 @@ asmlinkage long sys_futex(u32 __user *uaddr, int op, u32 val,
         }
         /*
          * requeue parameter in 'utime' if cmd == FUTEX_REQUEUE.
+         * number of waiters to wake in 'utime' if cmd == FUTEX_WAKE_OP.
          */
-        if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE)
+        if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE ||
+            cmd == FUTEX_WAKE_OP)
                 val2 = (u32) (unsigned long) utime;
 
         return do_futex(uaddr, op, val, tp, uaddr2, val2, val3);
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index 5bfeaed7e487..c38272746887 100644
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -62,6 +62,15 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
          */
         desc->chip->enable(irq);
 
+        /*
+         * Temporary hack to figure out more about the problem, which
+         * is causing the ancient network cards to die.
+         */
+        if (desc->handle_irq != handle_edge_irq) {
+                WARN_ON_ONCE(1);
+                return;
+        }
+
         if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
                 desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;
 
diff --git a/kernel/kthread.c b/kernel/kthread.c
index a404f7ee7395..dcfe724300eb 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -214,23 +214,15 @@ int kthread_stop(struct task_struct *k)
 }
 EXPORT_SYMBOL(kthread_stop);
 
-
-static noinline __init_refok void kthreadd_setup(void)
+int kthreadd(void *unused)
 {
         struct task_struct *tsk = current;
 
+        /* Setup a clean context for our children to inherit. */
         set_task_comm(tsk, "kthreadd");
-
         ignore_signals(tsk);
-
         set_user_nice(tsk, -5);
         set_cpus_allowed(tsk, CPU_MASK_ALL);
-}
-
-int kthreadd(void *unused)
-{
-        /* Setup a clean context for our children to inherit. */
-        kthreadd_setup();
 
         current->flags |= PF_NOFREEZE;
 
diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
index 9f17af4a2490..c851b2dcc685 100644
--- a/kernel/lockdep_proc.c
+++ b/kernel/lockdep_proc.c
@@ -346,7 +346,7 @@ static const struct file_operations proc_lockdep_stats_operations = {
         .open           = lockdep_stats_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
-        .release        = seq_release,
+        .release        = single_release,
 };
 
 #ifdef CONFIG_LOCK_STAT
diff --git a/kernel/params.c b/kernel/params.c
index effbaaedd7f3..4e57732fcfb4 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -567,7 +567,12 @@ static void __init kernel_param_sysfs_setup(const char *name,
         kobject_set_name(&mk->kobj, name);
         kobject_init(&mk->kobj);
         ret = kobject_add(&mk->kobj);
-        BUG_ON(ret < 0);
+        if (ret) {
+                printk(KERN_ERR "Module '%s' failed to be added to sysfs, "
+                      "error number %d\n", name, ret);
+                printk(KERN_ERR "The system will be unstable now.\n");
+                return;
+        }
         param_sysfs_setup(mk, kparam, num_params, name_skip);
         kobject_uevent(&mk->kobj, KOBJ_ADD);
 }
diff --git a/kernel/relay.c b/kernel/relay.c
index 510fbbd7b500..ad855017bc59 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1,7 +1,7 @@
 /*
  * Public API and common code for kernel->userspace relay file support.
  *
- * See Documentation/filesystems/relayfs.txt for an overview of relayfs.
+ * See Documentation/filesystems/relay.txt for an overview.
  *
  * Copyright (C) 2002-2005 - Tom Zanussi (zanussi@us.ibm.com), IBM Corp
  * Copyright (C) 1999-2005 - Karim Yaghmour (karim@opersys.com)
@@ -426,6 +426,7 @@ static struct rchan_buf *relay_open_buf(struct rchan *chan, unsigned int cpu)
 
 free_buf:
         relay_destroy_buf(buf);
+        buf = NULL;
 free_name:
         kfree(tmpname);
 end:
diff --git a/kernel/sched.c b/kernel/sched.c
index 5c51d7e5dcc1..238a76957e86 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1678,8 +1678,8 @@ void fastcall wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
 #ifdef CONFIG_PREEMPT_NOTIFIERS
 
 /**
- * preempt_notifier_register - tell me when current is being being preempted
- *                         and rescheduled
+ * preempt_notifier_register - tell me when current is being being preempted & rescheduled
+ * @notifier: notifier struct to register
  */
 void preempt_notifier_register(struct preempt_notifier *notifier)
 {
@@ -1689,6 +1689,7 @@ EXPORT_SYMBOL_GPL(preempt_notifier_register);
 
 /**
  * preempt_notifier_unregister - no longer interested in preemption notifications
+ * @notifier: notifier struct to unregister
  *
  * This is safe to call from within a preemption notifier.
  */
@@ -1735,6 +1736,7 @@ fire_sched_out_preempt_notifiers(struct task_struct *curr,
 /**
  * prepare_task_switch - prepare to switch tasks
  * @rq: the runqueue preparing to switch
+ * @prev: the current task that is being switched out
  * @next: the task we are going to switch to.
  *
  * This is called with the rq lock held and interrupts off. It must
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index 42970f723a97..0eca442b7792 100644
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -200,7 +200,7 @@ static struct file_operations sched_debug_fops = {
         .open           = sched_debug_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
-        .release        = seq_release,
+        .release        = single_release,
 };
 
 static int __init init_sched_debug_procfs(void)
diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index e5edc3a22a08..fdb2e03d4fe0 100644
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -267,7 +267,7 @@ static struct file_operations timer_list_fops = {
         .open           = timer_list_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
-        .release        = seq_release,
+        .release        = single_release,
 };
 
 static int __init init_timer_list_procfs(void)
diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
index 8ed62fda16c6..3c38fb5eae1b 100644
--- a/kernel/time/timer_stats.c
+++ b/kernel/time/timer_stats.c
@@ -399,7 +399,7 @@ static struct file_operations tstats_fops = {
         .read           = seq_read,
         .write          = tstats_write,
         .llseek         = seq_lseek,
-        .release        = seq_release,
+        .release        = single_release,
 };
 
 void __init init_timer_stats(void)
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index f3e0c2abcbd0..50a94eee4d92 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -349,7 +349,7 @@ config DEBUG_HIGHMEM
 config DEBUG_BUGVERBOSE
         bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EMBEDDED
         depends on BUG
-        depends on ARM || ARM26 || AVR32 || M32R || M68K || SPARC32 || SPARC64 || FRV || SUPERH || GENERIC_BUG || BFIN
+        depends on ARM || AVR32 || M32R || M68K || SPARC32 || SPARC64 || FRV || SUPERH || GENERIC_BUG || BFIN
         default !EMBEDDED
         help
           Say Y here to make BUG() panics output the file name and line number
diff --git a/lib/Makefile b/lib/Makefile
index 614966387402..d9e5f1cd0bfb 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,7 +2,7 @@
 # Makefile for some libs needed in the kernel.
 #
 
-lib-y := ctype.o string.o vsprintf.o cmdline.o \
+lib-y := ctype.o string.o vsprintf.o kasprintf.o cmdline.o \
          rbtree.o radix-tree.o dump_stack.o \
          idr.o int_sqrt.o bitmap.o extable.o prio_tree.o \
          sha1.o irq_regs.o reciprocal_div.o argv_split.o
diff --git a/lib/idr.c b/lib/idr.c
index ffd61941e75d..d0f1acdbfa3a 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -405,7 +405,7 @@ EXPORT_SYMBOL(idr_remove);
  */
 void idr_remove_all(struct idr *idp)
 {
-        int n, id, max, error = 0;
+        int n, id, max;
         struct idr_layer *p;
         struct idr_layer *pa[MAX_LEVEL];
         struct idr_layer **paa = &pa[0];
@@ -415,7 +415,7 @@ void idr_remove_all(struct idr *idp)
         max = 1 << n;
 
         id = 0;
-        while (id < max && !error) {
+        while (id < max) {
                 while (n > IDR_BITS && p) {
                         n -= IDR_BITS;
                         *paa++ = p;
diff --git a/lib/kasprintf.c b/lib/kasprintf.c
new file mode 100644
index 000000000000..c5ff1fd10030
--- /dev/null
+++ b/lib/kasprintf.c
@@ -0,0 +1,44 @@
+/*
+ *  linux/lib/kasprintf.c
+ *
+ *  Copyright (C) 1991, 1992  Linus Torvalds
+ */
+
+#include <stdarg.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/string.h>
+
+/* Simplified asprintf. */
+char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
+{
+        unsigned int len;
+        char *p;
+        va_list aq;
+
+        va_copy(aq, ap);
+        len = vsnprintf(NULL, 0, fmt, aq);
+        va_end(aq);
+
+        p = kmalloc(len+1, gfp);
+        if (!p)
+                return NULL;
+
+        vsnprintf(p, len+1, fmt, ap);
+
+        return p;
+}
+EXPORT_SYMBOL(kvasprintf);
+
+char *kasprintf(gfp_t gfp, const char *fmt, ...)
+{
+        va_list ap;
+        char *p;
+
+        va_start(ap, fmt);
+        p = kvasprintf(gfp, fmt, ap);
+        va_end(ap);
+
+        return p;
+}
+EXPORT_SYMBOL(kasprintf);
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 6a80c784a8fb..df02814699d7 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -25,14 +25,6 @@
 #define BUFFER_SIZE     2048    /* buffer for the variables */
 #define NUM_ENVP        32      /* number of env pointers */
 
-#if defined(CONFIG_HOTPLUG)
-u64 uevent_seqnum;
-char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
-static DEFINE_SPINLOCK(sequence_lock);
-#if defined(CONFIG_NET)
-static struct sock *uevent_sock;
-#endif
-
 /* the strings here must match the enum in include/linux/kobject.h */
 const char *kobject_actions[] = {
         "add",
@@ -43,6 +35,14 @@ const char *kobject_actions[] = {
         "offline",
 };
 
+#if defined(CONFIG_HOTPLUG)
+u64 uevent_seqnum;
+char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
+static DEFINE_SPINLOCK(sequence_lock);
+#if defined(CONFIG_NET)
+static struct sock *uevent_sock;
+#endif
+
 /**
  * kobject_uevent_env - send an uevent with environmental data
  *
diff --git a/lib/lzo/lzo1x_compress.c b/lib/lzo/lzo1x_compress.c
index c935f00073e9..a6040990a62e 100644
--- a/lib/lzo/lzo1x_compress.c
+++ b/lib/lzo/lzo1x_compress.c
@@ -32,13 +32,13 @@ _lzo1x_1_do_compress(const unsigned char *in, size_t in_len,
         ip += 4;
 
         for (;;) {
-                dindex = ((0x21 * DX3(ip, 5, 5, 6)) >> 5) & D_MASK;
+                dindex = ((size_t)(0x21 * DX3(ip, 5, 5, 6)) >> 5) & D_MASK;
                 m_pos = dict[dindex];
 
                 if (m_pos < in)
                         goto literal;
 
-                if (ip == m_pos || (ip - m_pos) > M4_MAX_OFFSET)
+                if (ip == m_pos || ((size_t)(ip - m_pos) > M4_MAX_OFFSET))
                         goto literal;
 
                 m_off = ip - m_pos;
@@ -51,7 +51,7 @@ _lzo1x_1_do_compress(const unsigned char *in, size_t in_len,
                 if (m_pos < in)
                         goto literal;
 
-                if (ip == m_pos || (ip - m_pos) > M4_MAX_OFFSET)
+                if (ip == m_pos || ((size_t)(ip - m_pos) > M4_MAX_OFFSET))
                         goto literal;
 
                 m_off = ip - m_pos;
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 6b6734df6d2d..7b481cea54ae 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -978,38 +978,3 @@ int sscanf(const char * buf, const char * fmt, ...)
 }
 
 EXPORT_SYMBOL(sscanf);
-
-
-/* Simplified asprintf. */
-char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
-{
-        unsigned int len;
-        char *p;
-        va_list aq;
-
-        va_copy(aq, ap);
-        len = vsnprintf(NULL, 0, fmt, aq);
-        va_end(aq);
-
-        p = kmalloc(len+1, gfp);
-        if (!p)
-                return NULL;
-
-        vsnprintf(p, len+1, fmt, ap);
-
-        return p;
-}
-EXPORT_SYMBOL(kvasprintf);
-
-char *kasprintf(gfp_t gfp, const char *fmt, ...)
-{
-        va_list ap;
-        char *p;
-
-        va_start(ap, fmt);
-        p = kvasprintf(gfp, fmt, ap);
-        va_end(ap);
-
-        return p;
-}
-EXPORT_SYMBOL(kasprintf);
diff --git a/mm/filemap.c b/mm/filemap.c
index 49a6fe375d01..6cf700d41844 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -843,7 +843,7 @@ static void shrink_readahead_size_eio(struct file *filp,
 /**
  * do_generic_mapping_read - generic file read routine
  * @mapping:    address_space to be read
- * @_ra:        file's readahead state
+ * @ra:         file's readahead state
  * @filp:       the file to read
  * @ppos:       current file position
  * @desc:       read_descriptor
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 10367654ae77..f9b82ad5047f 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -157,7 +157,7 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
         }
 
 #ifdef DEBUG
-        printk(KERN_DEBUG "OOMkill: task %d (%s) got %d points\n",
+        printk(KERN_DEBUG "OOMkill: task %d (%s) got %lu points\n",
         p->pid, p->comm, points);
 #endif
         return points;
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 0bd4d82ddfff..3da85b81dabb 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1350,6 +1350,10 @@ nofail_alloc:
                 if (page)
                         goto got_pg;
 
+                /* The OOM killer will not help higher order allocs so fail */
+                if (order > PAGE_ALLOC_COSTLY_ORDER)
+                        goto nopage;
+
                 out_of_memory(zonelist, gfp_mask, order);
                 goto restart;
         }
diff --git a/mm/slub.c b/mm/slub.c
index 9b2d6178d06c..6c6d74ff0694 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1131,6 +1131,7 @@ static void __free_slab(struct kmem_cache *s, struct page *page)
                 slab_pad_check(s, page);
                 for_each_object(p, s, page_address(page))
                         check_object(s, page, p, 0);
+                ClearSlabDebug(page);
         }
 
         mod_zone_page_state(page_zone(page),
@@ -1169,7 +1170,6 @@ static void discard_slab(struct kmem_cache *s, struct page *page)
 
         atomic_long_dec(&n->nr_slabs);
         reset_page_mapcount(page);
-        ClearSlabDebug(page);
         __ClearPageSlab(page);
         free_slab(s, page);
 }
@@ -1656,6 +1656,7 @@ static void __always_inline slab_free(struct kmem_cache *s,
         unsigned long flags;
 
         local_irq_save(flags);
+        debug_check_no_locks_freed(object, s->objsize);
         if (likely(page == s->cpu_slab[smp_processor_id()] &&
                                                 !SlabDebug(page))) {
                 object[page->offset] = page->lockless_freelist;
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 4d2aa4dd42ac..4bab322c9f8f 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -668,9 +668,6 @@ int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 if (real_dev->do_ioctl && netif_device_present(real_dev))
                         err = real_dev->do_ioctl(real_dev, &ifrr, cmd);
                 break;
-
-        case SIOCETHTOOL:
-                err = dev_ethtool(&ifrr);
         }
 
         if (!err)
diff --git a/net/9p/conv.c b/net/9p/conv.c
index 37451178e761..f2a041cb508a 100644
--- a/net/9p/conv.c
+++ b/net/9p/conv.c
@@ -763,6 +763,7 @@ struct p9_fcall *p9_create_twrite(u32 fid, u64 offset, u32 count,
         if (err) {
                 kfree(fc);
                 fc = ERR_PTR(err);
+                goto error;
         }
 
         if (buf_check_overflow(bufp)) {
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 670ff95ca64b..c4e4ce4ebb2b 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -353,7 +353,7 @@ static inline int l2cap_send_cmd(struct l2cap_conn *conn, u8 ident, u8 code, u16
 }
 
 /* ---- Socket interface ---- */
-static struct sock *__l2cap_get_sock_by_addr(u16 psm, bdaddr_t *src)
+static struct sock *__l2cap_get_sock_by_addr(__le16 psm, bdaddr_t *src)
 {
         struct sock *sk;
         struct hlist_node *node;
@@ -368,7 +368,7 @@ found:
 /* Find socket with psm and source bdaddr.
  * Returns closest match.
  */
-static struct sock *__l2cap_get_sock_by_psm(int state, u16 psm, bdaddr_t *src)
+static struct sock *__l2cap_get_sock_by_psm(int state, __le16 psm, bdaddr_t *src)
 {
         struct sock *sk = NULL, *sk1 = NULL;
         struct hlist_node *node;
@@ -392,7 +392,7 @@ static struct sock *__l2cap_get_sock_by_psm(int state, u16 psm, bdaddr_t *src)
 
 /* Find socket with given address (psm, src).
  * Returns locked socket */
-static inline struct sock *l2cap_get_sock_by_psm(int state, u16 psm, bdaddr_t *src)
+static inline struct sock *l2cap_get_sock_by_psm(int state, __le16 psm, bdaddr_t *src)
 {
         struct sock *s;
         read_lock(&l2cap_sk_list.lock);
@@ -586,7 +586,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_
                 goto done;
         }
 
-        if (la->l2_psm > 0 && btohs(la->l2_psm) < 0x1001 &&
+        if (la->l2_psm && btohs(la->l2_psm) < 0x1001 &&
                                 !capable(CAP_NET_BIND_SERVICE)) {
                 err = -EACCES;
                 goto done;
@@ -748,7 +748,7 @@ static int l2cap_sock_listen(struct socket *sock, int backlog)
                 write_lock_bh(&l2cap_sk_list.lock);
 
                 for (psm = 0x1001; psm < 0x1100; psm += 2)
-                        if (!__l2cap_get_sock_by_addr(psm, src)) {
+                        if (!__l2cap_get_sock_by_addr(htobs(psm), src)) {
                                 l2cap_pi(sk)->psm   = htobs(psm);
                                 l2cap_pi(sk)->sport = htobs(psm);
                                 err = 0;
@@ -873,7 +873,7 @@ static inline int l2cap_do_send(struct sock *sk, struct msghdr *msg, int len)
         lh->len = cpu_to_le16(len + (hlen - L2CAP_HDR_SIZE));
 
         if (sk->sk_type == SOCK_DGRAM)
-                put_unaligned(l2cap_pi(sk)->psm, (u16 *) skb_put(skb, 2));
+                put_unaligned(l2cap_pi(sk)->psm, (__le16 *) skb_put(skb, 2));
 
         if (memcpy_fromiovec(skb_put(skb, count), msg->msg_iov, count)) {
                 err = -EFAULT;
@@ -1256,11 +1256,11 @@ static inline int l2cap_get_conf_opt(void **ptr, int *type, int *olen, unsigned
                 break;
 
         case 2:
-                *val = __le16_to_cpu(*((u16 *)opt->val));
+                *val = __le16_to_cpu(*((__le16 *)opt->val));
                 break;
 
         case 4:
-                *val = __le32_to_cpu(*((u32 *)opt->val));
+                *val = __le32_to_cpu(*((__le32 *)opt->val));
                 break;
 
         default:
@@ -1287,11 +1287,11 @@ static void l2cap_add_conf_opt(void **ptr, u8 type, u8 len, unsigned long val)
                 break;
 
         case 2:
-                *((u16 *) opt->val) = cpu_to_le16(val);
+                *((__le16 *) opt->val) = cpu_to_le16(val);
                 break;
 
         case 4:
-                *((u32 *) opt->val) = cpu_to_le32(val);
+                *((__le32 *) opt->val) = cpu_to_le32(val);
                 break;
 
         default:
@@ -1406,7 +1406,7 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd
         int result = 0, status = 0;
 
         u16 dcid = 0, scid = __le16_to_cpu(req->scid);
-        u16 psm  = req->psm;
+        __le16 psm  = req->psm;
 
         BT_DBG("psm 0x%2.2x scid 0x%4.4x", psm, scid);
 
@@ -1530,7 +1530,7 @@ static inline int l2cap_connect_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hd
         return 0;
 }
 
-static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd, u8 *data)
+static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd, u16 cmd_len, u8 *data)
 {
         struct l2cap_conf_req *req = (struct l2cap_conf_req *) data;
         u16 dcid, flags;
@@ -1550,7 +1550,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
                 goto unlock;
 
         /* Reject if config buffer is too small. */
-        len = cmd->len - sizeof(*req);
+        len = cmd_len - sizeof(*req);
         if (l2cap_pi(sk)->conf_len + len > sizeof(l2cap_pi(sk)->conf_req)) {
                 l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP,
                                 l2cap_build_conf_rsp(sk, rsp,
@@ -1748,15 +1748,16 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn, struct sk_buff *sk
         l2cap_raw_recv(conn, skb);
 
         while (len >= L2CAP_CMD_HDR_SIZE) {
+                u16 cmd_len;
                 memcpy(&cmd, data, L2CAP_CMD_HDR_SIZE);
                 data += L2CAP_CMD_HDR_SIZE;
                 len  -= L2CAP_CMD_HDR_SIZE;
 
-                cmd.len = __le16_to_cpu(cmd.len);
+                cmd_len = le16_to_cpu(cmd.len);
 
-                BT_DBG("code 0x%2.2x len %d id 0x%2.2x", cmd.code, cmd.len, cmd.ident);
+                BT_DBG("code 0x%2.2x len %d id 0x%2.2x", cmd.code, cmd_len, cmd.ident);
 
-                if (cmd.len > len || !cmd.ident) {
+                if (cmd_len > len || !cmd.ident) {
                         BT_DBG("corrupted command");
                         break;
                 }
@@ -1775,7 +1776,7 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn, struct sk_buff *sk
                         break;
 
                 case L2CAP_CONF_REQ:
-                        err = l2cap_config_req(conn, &cmd, data);
+                        err = l2cap_config_req(conn, &cmd, cmd_len, data);
                         break;
 
                 case L2CAP_CONF_RSP:
@@ -1791,7 +1792,7 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn, struct sk_buff *sk
                         break;
 
                 case L2CAP_ECHO_REQ:
-                        l2cap_send_cmd(conn, cmd.ident, L2CAP_ECHO_RSP, cmd.len, data);
+                        l2cap_send_cmd(conn, cmd.ident, L2CAP_ECHO_RSP, cmd_len, data);
                         break;
 
                 case L2CAP_ECHO_RSP:
@@ -1820,8 +1821,8 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn, struct sk_buff *sk
                         l2cap_send_cmd(conn, cmd.ident, L2CAP_COMMAND_REJ, sizeof(rej), &rej);
                 }
 
-                data += cmd.len;
-                len  -= cmd.len;
+                data += cmd_len;
+                len  -= cmd_len;
         }
 
         kfree_skb(skb);
@@ -1863,7 +1864,7 @@ done:
         return 0;
 }
 
-static inline int l2cap_conless_channel(struct l2cap_conn *conn, u16 psm, struct sk_buff *skb)
+static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, struct sk_buff *skb)
 {
         struct sock *sk;
 
@@ -1893,7 +1894,8 @@ done:
 static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)
 {
         struct l2cap_hdr *lh = (void *) skb->data;
-        u16 cid, psm, len;
+        u16 cid, len;
+        __le16 psm;
 
         skb_pull(skb, L2CAP_HDR_SIZE);
         cid = __le16_to_cpu(lh->cid);
@@ -1907,7 +1909,7 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)
                 break;
 
         case 0x0002:
-                psm = get_unaligned((u16 *) skb->data);
+                psm = get_unaligned((__le16 *) skb->data);
                 skb_pull(skb, 2);
                 l2cap_conless_channel(conn, psm, skb);
                 break;
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 23ba61a13bdd..22a832098d44 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -267,7 +267,7 @@ static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
 out:
         write_unlock_bh(&rfcomm_dev_lock);
 
-        if (err) {
+        if (err < 0) {
                 kfree(dev);
                 return err;
         }
@@ -275,9 +275,10 @@ out:
         dev->tty_dev = tty_register_device(rfcomm_tty_driver, dev->id, NULL);
 
         if (IS_ERR(dev->tty_dev)) {
+                err = PTR_ERR(dev->tty_dev);
                 list_del(&dev->list);
                 kfree(dev);
-                return PTR_ERR(dev->tty_dev);
+                return err;
         }
 
         return dev->id;
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 7b4ce9113be2..b40dada002bf 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -29,35 +29,24 @@
  * Determine initial path cost based on speed.
  * using recommendations from 802.1d standard
  *
- * Need to simulate user ioctl because not all device's that support
- * ethtool, use ethtool_ops.  Also, since driver might sleep need to
- * not be holding any locks.
+ * Since driver might sleep need to not be holding any locks.
  */
 static int port_cost(struct net_device *dev)
 {
-        struct ethtool_cmd ecmd = { ETHTOOL_GSET };
-        struct ifreq ifr;
-        mm_segment_t old_fs;
-        int err;
-
-        strncpy(ifr.ifr_name, dev->name, IFNAMSIZ);
-        ifr.ifr_data = (void __user *) &ecmd;
-
-        old_fs = get_fs();
-        set_fs(KERNEL_DS);
-        err = dev_ethtool(&ifr);
-        set_fs(old_fs);
-
-        if (!err) {
-                switch(ecmd.speed) {
-                case SPEED_100:
-                        return 19;
-                case SPEED_1000:
-                        return 4;
-                case SPEED_10000:
-                        return 2;
-                case SPEED_10:
-                        return 100;
+        if (dev->ethtool_ops->get_settings) {
+                struct ethtool_cmd ecmd = { ETHTOOL_GSET };
+                int err = dev->ethtool_ops->get_settings(dev, &ecmd);
+                if (!err) {
+                        switch(ecmd.speed) {
+                        case SPEED_100:
+                                return 19;
+                        case SPEED_1000:
+                                return 4;
+                        case SPEED_10000:
+                                return 2;
+                        case SPEED_10:
+                                return 100;
+                        }
                 }
         }
 
diff --git a/net/core/dev.c b/net/core/dev.c
index ee4035571c21..6cc8a70350ac 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -817,7 +817,9 @@ int dev_alloc_name(struct net_device *dev, const char *name)
  */
 int dev_change_name(struct net_device *dev, char *newname)
 {
+        char oldname[IFNAMSIZ];
         int err = 0;
+        int ret;
 
         ASSERT_RTNL();
 
@@ -827,6 +829,8 @@ int dev_change_name(struct net_device *dev, char *newname)
         if (!dev_valid_name(newname))
                 return -EINVAL;
 
+        memcpy(oldname, dev->name, IFNAMSIZ);
+
         if (strchr(newname, '%')) {
                 err = dev_alloc_name(dev, newname);
                 if (err < 0)
@@ -838,10 +842,28 @@ int dev_change_name(struct net_device *dev, char *newname)
         else
                 strlcpy(dev->name, newname, IFNAMSIZ);
 
+rollback:
         device_rename(&dev->dev, dev->name);
+
+        write_lock_bh(&dev_base_lock);
         hlist_del(&dev->name_hlist);
         hlist_add_head(&dev->name_hlist, dev_name_hash(dev->name));
-        raw_notifier_call_chain(&netdev_chain, NETDEV_CHANGENAME, dev);
+        write_unlock_bh(&dev_base_lock);
+
+        ret = raw_notifier_call_chain(&netdev_chain, NETDEV_CHANGENAME, dev);
+        ret = notifier_to_errno(ret);
+
+        if (ret) {
+                if (err) {
+                        printk(KERN_ERR
+                               "%s: name change rollback failed: %d.\n",
+                               dev->name, ret);
+                } else {
+                        err = ret;
+                        memcpy(dev->name, oldname, IFNAMSIZ);
+                        goto rollback;
+                }
+        }
 
         return err;
 }
@@ -1054,20 +1076,43 @@ int dev_close(struct net_device *dev)
 int register_netdevice_notifier(struct notifier_block *nb)
 {
         struct net_device *dev;
+        struct net_device *last;
         int err;
 
         rtnl_lock();
         err = raw_notifier_chain_register(&netdev_chain, nb);
-        if (!err) {
-                for_each_netdev(dev) {
-                        nb->notifier_call(nb, NETDEV_REGISTER, dev);
+        if (err)
+                goto unlock;
 
-                        if (dev->flags & IFF_UP)
-                                nb->notifier_call(nb, NETDEV_UP, dev);
-                }
+        for_each_netdev(dev) {
+                err = nb->notifier_call(nb, NETDEV_REGISTER, dev);
+                err = notifier_to_errno(err);
+                if (err)
+                        goto rollback;
+
+                if (!(dev->flags & IFF_UP))
+                        continue;
+
+                nb->notifier_call(nb, NETDEV_UP, dev);
         }
+
+unlock:
         rtnl_unlock();
         return err;
+
+rollback:
+        last = dev;
+        for_each_netdev(dev) {
+                if (dev == last)
+                        break;
+
+                if (dev->flags & IFF_UP) {
+                        nb->notifier_call(nb, NETDEV_GOING_DOWN, dev);
+                        nb->notifier_call(nb, NETDEV_DOWN, dev);
+                }
+                nb->notifier_call(nb, NETDEV_UNREGISTER, dev);
+        }
+        goto unlock;
 }
 
 /**
@@ -2718,9 +2763,11 @@ int __dev_addr_add(struct dev_addr_list **list, int *count,
 /**
  *      dev_unicast_delete      - Release secondary unicast address.
  *      @dev: device
+ *      @addr: address to delete
+ *      @alen: length of @addr
  *
  *      Release reference to a secondary unicast address and remove it
- *      from the device if the reference count drop to zero.
+ *      from the device if the reference count drops to zero.
  *
  *      The caller must hold the rtnl_mutex.
  */
@@ -2742,6 +2789,8 @@ EXPORT_SYMBOL(dev_unicast_delete);
 /**
  *      dev_unicast_add         - add a secondary unicast address
  *      @dev: device
+ *      @addr: address to delete
+ *      @alen: length of @addr
  *
  *      Add a secondary unicast address to the device or increase
  *      the reference count if it already exists.
@@ -3333,7 +3382,7 @@ int register_netdevice(struct net_device *dev)
 
         if (!dev_valid_name(dev->name)) {
                 ret = -EINVAL;
-                goto out;
+                goto err_uninit;
         }
 
         dev->ifindex = dev_new_index();
@@ -3347,7 +3396,7 @@ int register_netdevice(struct net_device *dev)
                         = hlist_entry(p, struct net_device, name_hlist);
                 if (!strncmp(d->name, dev->name, IFNAMSIZ)) {
                         ret = -EEXIST;
-                        goto out;
+                        goto err_uninit;
                 }
         }
 
@@ -3407,7 +3456,7 @@ int register_netdevice(struct net_device *dev)
 
         ret = netdev_register_sysfs(dev);
         if (ret)
-                goto out;
+                goto err_uninit;
         dev->reg_state = NETREG_REGISTERED;
 
         /*
@@ -3426,12 +3475,18 @@ int register_netdevice(struct net_device *dev)
         write_unlock_bh(&dev_base_lock);
 
         /* Notify protocols, that a new device appeared. */
-        raw_notifier_call_chain(&netdev_chain, NETDEV_REGISTER, dev);
-
-        ret = 0;
+        ret = raw_notifier_call_chain(&netdev_chain, NETDEV_REGISTER, dev);
+        ret = notifier_to_errno(ret);
+        if (ret)
+                unregister_netdevice(dev);
 
 out:
         return ret;
+
+err_uninit:
+        if (dev->uninit)
+                dev->uninit(dev);
+        goto out;
 }
 
 /**
@@ -3830,9 +3885,11 @@ static int dev_cpu_callback(struct notifier_block *nfb,
 
 #ifdef CONFIG_NET_DMA
 /**
- * net_dma_rebalance -
- * This is called when the number of channels allocated to the net_dma_client
- * changes.  The net_dma_client tries to have one DMA channel per CPU.
+ * net_dma_rebalance - try to maintain one DMA channel per CPU
+ * @net_dma: DMA client and associated data (lock, channels, channel_mask)
+ *
+ * This is called when the number of channels allocated to the net_dma client
+ * changes.  The net_dma client tries to have one DMA channel per CPU.
  */
 
 static void net_dma_rebalance(struct net_dma *net_dma)
@@ -3869,7 +3926,7 @@ static void net_dma_rebalance(struct net_dma *net_dma)
  * netdev_dma_event - event callback for the net_dma_client
  * @client: should always be net_dma_client
  * @chan: DMA channel for the event
- * @event: event type
+ * @state: DMA state to be handled
  */
 static enum dma_state_client
 netdev_dma_event(struct dma_client *client, struct dma_chan *chan,
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 0b531e98ec33..2ab0a60046a5 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -3,10 +3,12 @@
  * Copyright (c) 2003 Matthew Wilcox <matthew@wil.cx>
  *
  * This file is where we call all the ethtool_ops commands to get
- * the information ethtool needs.  We fall back to calling do_ioctl()
- * for drivers which haven't been converted to ethtool_ops yet.
+ * the information ethtool needs.
  *
- * It's GPL, stupid.
+ * 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/module.h>
@@ -93,18 +95,6 @@ int ethtool_op_set_tso(struct net_device *dev, u32 data)
         return 0;
 }
 
-int ethtool_op_get_perm_addr(struct net_device *dev, struct ethtool_perm_addr *addr, u8 *data)
-{
-        unsigned char len = dev->addr_len;
-        if ( addr->size < len )
-                return -ETOOSMALL;
-
-        addr->size = len;
-        memcpy(data, dev->perm_addr, len);
-        return 0;
-}
-
-
 u32 ethtool_op_get_ufo(struct net_device *dev)
 {
         return (dev->features & NETIF_F_UFO) != 0;
@@ -777,34 +767,20 @@ static int ethtool_get_stats(struct net_device *dev, void __user *useraddr)
 static int ethtool_get_perm_addr(struct net_device *dev, void __user *useraddr)
 {
         struct ethtool_perm_addr epaddr;
-        u8 *data;
-        int ret;
-
-        if (!dev->ethtool_ops->get_perm_addr)
-                return -EOPNOTSUPP;
 
-        if (copy_from_user(&epaddr,useraddr,sizeof(epaddr)))
+        if (copy_from_user(&epaddr, useraddr, sizeof(epaddr)))
                 return -EFAULT;
 
-        data = kmalloc(epaddr.size, GFP_USER);
-        if (!data)
-                return -ENOMEM;
-
-        ret = dev->ethtool_ops->get_perm_addr(dev,&epaddr,data);
-        if (ret)
-                return ret;
+        if (epaddr.size < dev->addr_len)
+                return -ETOOSMALL;
+        epaddr.size = dev->addr_len;
 
-        ret = -EFAULT;
         if (copy_to_user(useraddr, &epaddr, sizeof(epaddr)))
-                goto out;
+                return -EFAULT;
         useraddr += sizeof(epaddr);
-        if (copy_to_user(useraddr, data, epaddr.size))
-                goto out;
-        ret = 0;
-
- out:
-        kfree(data);
-        return ret;
+        if (copy_to_user(useraddr, dev->perm_addr, epaddr.size))
+                return -EFAULT;
+        return 0;
 }
 
 /* The main entry point in this file.  Called from net/core/dev.c */
@@ -821,7 +797,7 @@ int dev_ethtool(struct ifreq *ifr)
                 return -ENODEV;
 
         if (!dev->ethtool_ops)
-                goto ioctl;
+                return -EOPNOTSUPP;
 
         if (copy_from_user(&ethcmd, useraddr, sizeof (ethcmd)))
                 return -EFAULT;
@@ -960,7 +936,7 @@ int dev_ethtool(struct ifreq *ifr)
                 rc = ethtool_set_gso(dev, useraddr);
                 break;
         default:
-                rc =  -EOPNOTSUPP;
+                rc = -EOPNOTSUPP;
         }
 
         if (dev->ethtool_ops->complete)
@@ -970,20 +946,10 @@ int dev_ethtool(struct ifreq *ifr)
                 netdev_features_change(dev);
 
         return rc;
-
- ioctl:
-        /* Keep existing behaviour for the moment.       */
-        if (!capable(CAP_NET_ADMIN))
-                return -EPERM;
-
-        if (dev->do_ioctl)
-                return dev->do_ioctl(dev, ifr, SIOCETHTOOL);
-        return -EOPNOTSUPP;
 }
 
 EXPORT_SYMBOL(dev_ethtool);
 EXPORT_SYMBOL(ethtool_op_get_link);
-EXPORT_SYMBOL_GPL(ethtool_op_get_perm_addr);
 EXPORT_SYMBOL(ethtool_op_get_sg);
 EXPORT_SYMBOL(ethtool_op_get_tso);
 EXPORT_SYMBOL(ethtool_op_get_tx_csum);
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index bca787fdbc51..7bae576ac115 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -567,7 +567,7 @@ static ssize_t pgctrl_write(struct file *file, const char __user * buf,
                 pktgen_run_all_threads();
 
         else
-                printk("pktgen: Unknown command: %s\n", data);
+                printk(KERN_WARNING "pktgen: Unknown command: %s\n", data);
 
         err = count;
 
@@ -908,14 +908,14 @@ static ssize_t pktgen_if_write(struct file *file,
         pg_result = &(pkt_dev->result[0]);
 
         if (count < 1) {
-                printk("pktgen: wrong command format\n");
+                printk(KERN_WARNING "pktgen: wrong command format\n");
                 return -EINVAL;
         }
 
         max = count - i;
         tmp = count_trail_chars(&user_buffer[i], max);
         if (tmp < 0) {
-                printk("pktgen: illegal format\n");
+                printk(KERN_WARNING "pktgen: illegal format\n");
                 return tmp;
         }
         i += tmp;
@@ -943,7 +943,7 @@ static ssize_t pktgen_if_write(struct file *file,
                 if (copy_from_user(tb, user_buffer, count))
                         return -EFAULT;
                 tb[count] = 0;
-                printk("pktgen: %s,%lu  buffer -:%s:-\n", name,
+                printk(KERN_DEBUG "pktgen: %s,%lu  buffer -:%s:-\n", name,
                        (unsigned long)count, tb);
         }
 
@@ -1248,7 +1248,7 @@ static ssize_t pktgen_if_write(struct file *file,
                         pkt_dev->cur_daddr = pkt_dev->daddr_min;
                 }
                 if (debug)
-                        printk("pktgen: dst_min set to: %s\n",
+                        printk(KERN_DEBUG "pktgen: dst_min set to: %s\n",
                                pkt_dev->dst_min);
                 i += len;
                 sprintf(pg_result, "OK: dst_min=%s", pkt_dev->dst_min);
@@ -1271,7 +1271,7 @@ static ssize_t pktgen_if_write(struct file *file,
                         pkt_dev->cur_daddr = pkt_dev->daddr_max;
                 }
                 if (debug)
-                        printk("pktgen: dst_max set to: %s\n",
+                        printk(KERN_DEBUG "pktgen: dst_max set to: %s\n",
                                pkt_dev->dst_max);
                 i += len;
                 sprintf(pg_result, "OK: dst_max=%s", pkt_dev->dst_max);
@@ -1294,7 +1294,7 @@ static ssize_t pktgen_if_write(struct file *file,
                 ipv6_addr_copy(&pkt_dev->cur_in6_daddr, &pkt_dev->in6_daddr);
 
                 if (debug)
-                        printk("pktgen: dst6 set to: %s\n", buf);
+                        printk(KERN_DEBUG "pktgen: dst6 set to: %s\n", buf);
 
                 i += len;
                 sprintf(pg_result, "OK: dst6=%s", buf);
@@ -1317,7 +1317,7 @@ static ssize_t pktgen_if_write(struct file *file,
                 ipv6_addr_copy(&pkt_dev->cur_in6_daddr,
                                &pkt_dev->min_in6_daddr);
                 if (debug)
-                        printk("pktgen: dst6_min set to: %s\n", buf);
+                        printk(KERN_DEBUG "pktgen: dst6_min set to: %s\n", buf);
 
                 i += len;
                 sprintf(pg_result, "OK: dst6_min=%s", buf);
@@ -1338,7 +1338,7 @@ static ssize_t pktgen_if_write(struct file *file,
                 fmt_ip6(buf, pkt_dev->max_in6_daddr.s6_addr);
 
                 if (debug)
-                        printk("pktgen: dst6_max set to: %s\n", buf);
+                        printk(KERN_DEBUG "pktgen: dst6_max set to: %s\n", buf);
 
                 i += len;
                 sprintf(pg_result, "OK: dst6_max=%s", buf);
@@ -1361,7 +1361,7 @@ static ssize_t pktgen_if_write(struct file *file,
                 ipv6_addr_copy(&pkt_dev->cur_in6_saddr, &pkt_dev->in6_saddr);
 
                 if (debug)
-                        printk("pktgen: src6 set to: %s\n", buf);
+                        printk(KERN_DEBUG "pktgen: src6 set to: %s\n", buf);
 
                 i += len;
                 sprintf(pg_result, "OK: src6=%s", buf);
@@ -1382,7 +1382,7 @@ static ssize_t pktgen_if_write(struct file *file,
                         pkt_dev->cur_saddr = pkt_dev->saddr_min;
                 }
                 if (debug)
-                        printk("pktgen: src_min set to: %s\n",
+                        printk(KERN_DEBUG "pktgen: src_min set to: %s\n",
                                pkt_dev->src_min);
                 i += len;
                 sprintf(pg_result, "OK: src_min=%s", pkt_dev->src_min);
@@ -1403,7 +1403,7 @@ static ssize_t pktgen_if_write(struct file *file,
                         pkt_dev->cur_saddr = pkt_dev->saddr_max;
                 }
                 if (debug)
-                        printk("pktgen: src_max set to: %s\n",
+                        printk(KERN_DEBUG "pktgen: src_max set to: %s\n",
                                pkt_dev->src_max);
                 i += len;
                 sprintf(pg_result, "OK: src_max=%s", pkt_dev->src_max);
@@ -1533,7 +1533,7 @@ static ssize_t pktgen_if_write(struct file *file,
                         pkt_dev->svlan_id = 0xffff;
 
                         if (debug)
-                                printk("pktgen: VLAN/SVLAN auto turned off\n");
+                                printk(KERN_DEBUG "pktgen: VLAN/SVLAN auto turned off\n");
                 }
                 return count;
         }
@@ -1548,10 +1548,10 @@ static ssize_t pktgen_if_write(struct file *file,
                         pkt_dev->vlan_id = value;  /* turn on VLAN */
 
                         if (debug)
-                                printk("pktgen: VLAN turned on\n");
+                                printk(KERN_DEBUG "pktgen: VLAN turned on\n");
 
                         if (debug && pkt_dev->nr_labels)
-                                printk("pktgen: MPLS auto turned off\n");
+                                printk(KERN_DEBUG "pktgen: MPLS auto turned off\n");
 
                         pkt_dev->nr_labels = 0;    /* turn off MPLS */
                         sprintf(pg_result, "OK: vlan_id=%u", pkt_dev->vlan_id);
@@ -1560,7 +1560,7 @@ static ssize_t pktgen_if_write(struct file *file,
                         pkt_dev->svlan_id = 0xffff;
 
                         if (debug)
-                                printk("pktgen: VLAN/SVLAN turned off\n");
+                                printk(KERN_DEBUG "pktgen: VLAN/SVLAN turned off\n");
                 }
                 return count;
         }
@@ -1605,10 +1605,10 @@ static ssize_t pktgen_if_write(struct file *file,
                         pkt_dev->svlan_id = value;  /* turn on SVLAN */
 
                         if (debug)
-                                printk("pktgen: SVLAN turned on\n");
+                                printk(KERN_DEBUG "pktgen: SVLAN turned on\n");
 
                         if (debug && pkt_dev->nr_labels)
-                                printk("pktgen: MPLS auto turned off\n");
+                                printk(KERN_DEBUG "pktgen: MPLS auto turned off\n");
 
                         pkt_dev->nr_labels = 0;    /* turn off MPLS */
                         sprintf(pg_result, "OK: svlan_id=%u", pkt_dev->svlan_id);
@@ -1617,7 +1617,7 @@ static ssize_t pktgen_if_write(struct file *file,
                         pkt_dev->svlan_id = 0xffff;
 
                         if (debug)
-                                printk("pktgen: VLAN/SVLAN turned off\n");
+                                printk(KERN_DEBUG "pktgen: VLAN/SVLAN turned off\n");
                 }
                 return count;
         }
@@ -1777,10 +1777,11 @@ static ssize_t pktgen_thread_write(struct file *file,
         i += len;
 
         if (debug)
-                printk("pktgen: t=%s, count=%lu\n", name, (unsigned long)count);
+                printk(KERN_DEBUG "pktgen: t=%s, count=%lu\n",
+                       name, (unsigned long)count);
 
         if (!t) {
-                printk("pktgen: ERROR: No thread\n");
+                printk(KERN_ERR "pktgen: ERROR: No thread\n");
                 ret = -EINVAL;
                 goto out;
         }
@@ -1891,8 +1892,8 @@ static void pktgen_mark_device(const char *ifname)
                 mutex_lock(&pktgen_thread_lock);
 
                 if (++i >= max_tries) {
-                        printk("pktgen_mark_device: timed out after waiting "
-                               "%d msec for device %s to be removed\n",
+                        printk(KERN_ERR "pktgen_mark_device: timed out after "
+                               "waiting %d msec for device %s to be removed\n",
                                msec_per_try * i, ifname);
                         break;
                 }
@@ -1962,15 +1963,15 @@ static int pktgen_setup_dev(struct pktgen_dev *pkt_dev, const char *ifname)
 
         odev = dev_get_by_name(ifname);
         if (!odev) {
-                printk("pktgen: no such netdevice: \"%s\"\n", ifname);
+                printk(KERN_ERR "pktgen: no such netdevice: \"%s\"\n", ifname);
                 return -ENODEV;
         }
 
         if (odev->type != ARPHRD_ETHER) {
-                printk("pktgen: not an ethernet device: \"%s\"\n", ifname);
+                printk(KERN_ERR "pktgen: not an ethernet device: \"%s\"\n", ifname);
                 err = -EINVAL;
         } else if (!netif_running(odev)) {
-                printk("pktgen: device is down: \"%s\"\n", ifname);
+                printk(KERN_ERR "pktgen: device is down: \"%s\"\n", ifname);
                 err = -ENETDOWN;
         } else {
                 pkt_dev->odev = odev;
@@ -1987,7 +1988,8 @@ static int pktgen_setup_dev(struct pktgen_dev *pkt_dev, const char *ifname)
 static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
 {
         if (!pkt_dev->odev) {
-                printk("pktgen: ERROR: pkt_dev->odev == NULL in setup_inject.\n");
+                printk(KERN_ERR "pktgen: ERROR: pkt_dev->odev == NULL in "
+                       "setup_inject.\n");
                 sprintf(pkt_dev->result,
                         "ERROR: pkt_dev->odev == NULL in setup_inject.\n");
                 return;
@@ -2049,7 +2051,8 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
                         }
                         rcu_read_unlock();
                         if (err)
-                                printk("pktgen: ERROR: IPv6 link address not availble.\n");
+                                printk(KERN_ERR "pktgen: ERROR: IPv6 link "
+                                       "address not availble.\n");
                 }
 #endif
         } else {
@@ -2156,8 +2159,7 @@ static inline int f_pick(struct pktgen_dev *pkt_dev)
 /* If there was already an IPSEC SA, we keep it as is, else
  * we go look for it ...
 */
-inline
-void get_ipsec_sa(struct pktgen_dev *pkt_dev, int flow)
+static void get_ipsec_sa(struct pktgen_dev *pkt_dev, int flow)
 {
         struct xfrm_state *x = pkt_dev->flows[flow].x;
         if (!x) {
@@ -2441,7 +2443,8 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev,
                         if (nhead >0) {
                                 ret = pskb_expand_head(skb, nhead, 0, GFP_ATOMIC);
                                 if (ret < 0) {
-                                        printk("Error expanding ipsec packet %d\n",ret);
+                                        printk(KERN_ERR "Error expanding "
+                                               "ipsec packet %d\n",ret);
                                         return 0;
                                 }
                         }
@@ -2450,7 +2453,8 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev,
                         skb_pull(skb, ETH_HLEN);
                         ret = pktgen_output_ipsec(skb, pkt_dev);
                         if (ret) {
-                                printk("Error creating ipsec packet %d\n",ret);
+                                printk(KERN_ERR "Error creating ipsec "
+                                       "packet %d\n",ret);
                                 kfree_skb(skb);
                                 return 0;
                         }
@@ -3184,8 +3188,8 @@ static int pktgen_stop_device(struct pktgen_dev *pkt_dev)
         int nr_frags = pkt_dev->skb ? skb_shinfo(pkt_dev->skb)->nr_frags : -1;
 
         if (!pkt_dev->running) {
-                printk("pktgen: interface: %s is already stopped\n",
-                       pkt_dev->odev->name);
+                printk(KERN_WARNING "pktgen: interface: %s is already "
+                       "stopped\n", pkt_dev->odev->name);
                 return -EINVAL;
         }
 
@@ -3360,7 +3364,8 @@ static __inline__ void pktgen_xmit(struct pktgen_dev *pkt_dev)
 
                         pkt_dev->skb = fill_packet(odev, pkt_dev);
                         if (pkt_dev->skb == NULL) {
-                                printk("pktgen: ERROR: couldn't allocate skb in fill_packet.\n");
+                                printk(KERN_ERR "pktgen: ERROR: couldn't "
+                                       "allocate skb in fill_packet.\n");
                                 schedule();
                                 pkt_dev->clone_count--; /* back out increment, OOM */
                                 goto out;
@@ -3565,7 +3570,8 @@ static int add_dev_to_thread(struct pktgen_thread *t,
         if_lock(t);
 
         if (pkt_dev->pg_thread) {
-                printk("pktgen: ERROR:  already assigned to a thread.\n");
+                printk(KERN_ERR "pktgen: ERROR: already assigned "
+                       "to a thread.\n");
                 rv = -EBUSY;
                 goto out;
         }
@@ -3590,7 +3596,7 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)
 
         pkt_dev = __pktgen_NN_threads(ifname, FIND);
         if (pkt_dev) {
-                printk("pktgen: ERROR: interface already used.\n");
+                printk(KERN_ERR "pktgen: ERROR: interface already used.\n");
                 return -EBUSY;
         }
 
@@ -3632,7 +3638,7 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)
 
         pkt_dev->entry = create_proc_entry(ifname, 0600, pg_proc_dir);
         if (!pkt_dev->entry) {
-                printk("pktgen: cannot create %s/%s procfs entry.\n",
+                printk(KERN_ERR "pktgen: cannot create %s/%s procfs entry.\n",
                        PG_PROC_DIR, ifname);
                 err = -EINVAL;
                 goto out2;
@@ -3665,7 +3671,8 @@ static int __init pktgen_create_thread(int cpu)
 
         t = kzalloc(sizeof(struct pktgen_thread), GFP_KERNEL);
         if (!t) {
-                printk("pktgen: ERROR: out of memory, can't create new thread.\n");
+                printk(KERN_ERR "pktgen: ERROR: out of memory, can't "
+                       "create new thread.\n");
                 return -ENOMEM;
         }
 
@@ -3678,7 +3685,8 @@ static int __init pktgen_create_thread(int cpu)
 
         p = kthread_create(pktgen_thread_worker, t, "kpktgend_%d", cpu);
         if (IS_ERR(p)) {
-                printk("pktgen: kernel_thread() failed for cpu %d\n", t->cpu);
+                printk(KERN_ERR "pktgen: kernel_thread() failed "
+                       "for cpu %d\n", t->cpu);
                 list_del(&t->th_list);
                 kfree(t);
                 return PTR_ERR(p);
@@ -3688,7 +3696,7 @@ static int __init pktgen_create_thread(int cpu)
 
         pe = create_proc_entry(t->tsk->comm, 0600, pg_proc_dir);
         if (!pe) {
-                printk("pktgen: cannot create %s/%s procfs entry.\n",
+                printk(KERN_ERR "pktgen: cannot create %s/%s procfs entry.\n",
                        PG_PROC_DIR, t->tsk->comm);
                 kthread_stop(p);
                 list_del(&t->th_list);
@@ -3727,7 +3735,8 @@ static int pktgen_remove_device(struct pktgen_thread *t,
         pr_debug("pktgen: remove_device pkt_dev=%p\n", pkt_dev);
 
         if (pkt_dev->running) {
-                printk("pktgen:WARNING: trying to remove a running interface, stopping it now.\n");
+                printk(KERN_WARNING "pktgen: WARNING: trying to remove a "
+                       "running interface, stopping it now.\n");
                 pktgen_stop_device(pkt_dev);
         }
 
@@ -3759,7 +3768,7 @@ static int __init pg_init(void)
         int cpu;
         struct proc_dir_entry *pe;
 
-        printk(version);
+        printk(KERN_INFO "%s", version);
 
         pg_proc_dir = proc_mkdir(PG_PROC_DIR, proc_net);
         if (!pg_proc_dir)
@@ -3768,8 +3777,8 @@ static int __init pg_init(void)
 
         pe = create_proc_entry(PGCTRL, 0600, pg_proc_dir);
         if (pe == NULL) {
-                printk("pktgen: ERROR: cannot create %s procfs entry.\n",
-                       PGCTRL);
+                printk(KERN_ERR "pktgen: ERROR: cannot create %s "
+                       "procfs entry.\n", PGCTRL);
                 proc_net_remove(PG_PROC_DIR);
                 return -EINVAL;
         }
@@ -3785,12 +3794,13 @@ static int __init pg_init(void)
 
                 err = pktgen_create_thread(cpu);
                 if (err)
-                        printk("pktgen: WARNING: Cannot create thread for cpu %d (%d)\n",
-                                        cpu, err);
+                        printk(KERN_WARNING "pktgen: WARNING: Cannot create "
+                               "thread for cpu %d (%d)\n", cpu, err);
         }
 
         if (list_empty(&pktgen_threads)) {
-                printk("pktgen: ERROR: Initialization failed for all threads\n");
+                printk(KERN_ERR "pktgen: ERROR: Initialization failed for "
+                       "all threads\n");
                 unregister_netdevice_notifier(&pktgen_notifier_block);
                 remove_proc_entry(PGCTRL, pg_proc_dir);
                 proc_net_remove(PG_PROC_DIR);
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 06eccca8cb5d..4756d5857abf 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -952,7 +952,9 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
         struct nlattr *linkinfo[IFLA_INFO_MAX+1];
         int err;
 
+#ifdef CONFIG_KMOD
 replay:
+#endif
         err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFLA_MAX, ifla_policy);
         if (err < 0)
                 return err;
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index f2a61ef2af9c..a4a620971ef0 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -1737,8 +1737,9 @@ static int dn_rt_cache_seq_open(struct inode *inode, struct file *file)
 {
         struct seq_file *seq;
         int rc = -ENOMEM;
-        struct dn_rt_cache_iter_state *s = kmalloc(sizeof(*s), GFP_KERNEL);
+        struct dn_rt_cache_iter_state *s;
 
+        s = kzalloc(sizeof(*s), GFP_KERNEL);
         if (!s)
                 goto out;
         rc = seq_open(file, &dn_rt_cache_seq_ops);
@@ -1746,7 +1747,6 @@ static int dn_rt_cache_seq_open(struct inode *inode, struct file *file)
                 goto out_kfree;
         seq             = file->private_data;
         seq->private    = s;
-        memset(s, 0, sizeof(*s));
 out:
         return rc;
 out_kfree:
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index abf6352f990f..5b77bdaa57dd 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1056,10 +1056,9 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,
         if (!in_dev) {
                 if (event == NETDEV_REGISTER) {
                         in_dev = inetdev_init(dev);
+                        if (!in_dev)
+                                return notifier_from_errno(-ENOMEM);
                         if (dev == &loopback_dev) {
-                                if (!in_dev)
-                                        panic("devinet: "
-                                              "Failed to create loopback\n");
                                 IN_DEV_CONF_SET(in_dev, NOXFRM, 1);
                                 IN_DEV_CONF_SET(in_dev, NOPOLICY, 1);
                         }
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index 251346828cb4..2f14745a9e1f 100644
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -513,11 +513,8 @@ void ip_options_undo(struct ip_options * opt)
 
 static struct ip_options *ip_options_get_alloc(const int optlen)
 {
-        struct ip_options *opt = kmalloc(sizeof(*opt) + ((optlen + 3) & ~3),
-                                         GFP_KERNEL);
-        if (opt)
-                memset(opt, 0, sizeof(*opt));
-        return opt;
+        return kzalloc(sizeof(struct ip_options) + ((optlen + 3) & ~3),
+                       GFP_KERNEL);
 }
 
 static int ip_options_get_finish(struct ip_options **optp,
diff --git a/net/ipv4/ipvs/ip_vs_xmit.c b/net/ipv4/ipvs/ip_vs_xmit.c
index 900ce29db382..666e080a74a3 100644
--- a/net/ipv4/ipvs/ip_vs_xmit.c
+++ b/net/ipv4/ipvs/ip_vs_xmit.c
@@ -128,7 +128,7 @@ ip_vs_dst_reset(struct ip_vs_dest *dest)
 #define IP_VS_XMIT(skb, rt)                             \
 do {                                                    \
         (skb)->ipvs_property = 1;                       \
-        (skb)->ip_summed = CHECKSUM_NONE;               \
+        skb_forward_csum(skb);                          \
         NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, (skb), NULL,  \
                 (rt)->u.dst.dev, dst_output);           \
 } while (0)
diff --git a/net/ipv4/tcp_bic.c b/net/ipv4/tcp_bic.c
index 519de091a94d..4586211e3757 100644
--- a/net/ipv4/tcp_bic.c
+++ b/net/ipv4/tcp_bic.c
@@ -206,7 +206,7 @@ static void bictcp_state(struct sock *sk, u8 new_state)
 /* Track delayed acknowledgment ratio using sliding window
  * ratio = (15*ratio + sample) / 16
  */
-static void bictcp_acked(struct sock *sk, u32 cnt, ktime_t last)
+static void bictcp_acked(struct sock *sk, u32 cnt, s32 rtt)
 {
         const struct inet_connection_sock *icsk = inet_csk(sk);
 
diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c
index d17da30d82d6..485d7ea35f75 100644
--- a/net/ipv4/tcp_cubic.c
+++ b/net/ipv4/tcp_cubic.c
@@ -246,38 +246,12 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd)
                 ca->cnt = 1;
 }
 
-
-/* Keep track of minimum rtt */
-static inline void measure_delay(struct sock *sk)
-{
-        const struct tcp_sock *tp = tcp_sk(sk);
-        struct bictcp *ca = inet_csk_ca(sk);
-        u32 delay;
-
-        /* No time stamp */
-        if (!(tp->rx_opt.saw_tstamp && tp->rx_opt.rcv_tsecr) ||
-             /* Discard delay samples right after fast recovery */
-            (s32)(tcp_time_stamp - ca->epoch_start) < HZ)
-                return;
-
-        delay = (tcp_time_stamp - tp->rx_opt.rcv_tsecr)<<3;
-        if (delay == 0)
-                delay = 1;
-
-        /* first time call or link delay decreases */
-        if (ca->delay_min == 0 || ca->delay_min > delay)
-                ca->delay_min = delay;
-}
-
 static void bictcp_cong_avoid(struct sock *sk, u32 ack,
                               u32 in_flight, int data_acked)
 {
         struct tcp_sock *tp = tcp_sk(sk);
         struct bictcp *ca = inet_csk_ca(sk);
 
-        if (data_acked)
-                measure_delay(sk);
-
         if (!tcp_is_cwnd_limited(sk, in_flight))
                 return;
 
@@ -334,17 +308,33 @@ static void bictcp_state(struct sock *sk, u8 new_state)
 /* Track delayed acknowledgment ratio using sliding window
  * ratio = (15*ratio + sample) / 16
  */
-static void bictcp_acked(struct sock *sk, u32 cnt, ktime_t last)
+static void bictcp_acked(struct sock *sk, u32 cnt, s32 rtt_us)
 {
         const struct inet_connection_sock *icsk = inet_csk(sk);
+        struct bictcp *ca = inet_csk_ca(sk);
+        u32 delay;
 
         if (cnt > 0 && icsk->icsk_ca_state == TCP_CA_Open) {
-                struct bictcp *ca = inet_csk_ca(sk);
                 cnt -= ca->delayed_ack >> ACK_RATIO_SHIFT;
                 ca->delayed_ack += cnt;
         }
-}
 
+        /* Some calls are for duplicates without timetamps */
+        if (rtt_us < 0)
+                return;
+
+        /* Discard delay samples right after fast recovery */
+        if ((s32)(tcp_time_stamp - ca->epoch_start) < HZ)
+                return;
+
+        delay = usecs_to_jiffies(rtt_us) << 3;
+        if (delay == 0)
+                delay = 1;
+
+        /* first time call or link delay decreases */
+        if (ca->delay_min == 0 || ca->delay_min > delay)
+                ca->delay_min = delay;
+}
 
 static struct tcp_congestion_ops cubictcp = {
         .init           = bictcp_init,
diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c
index 08a02e6045c9..b66556c0a5bd 100644
--- a/net/ipv4/tcp_htcp.c
+++ b/net/ipv4/tcp_htcp.c
@@ -76,12 +76,11 @@ static u32 htcp_cwnd_undo(struct sock *sk)
         return max(tp->snd_cwnd, (tp->snd_ssthresh << 7) / ca->beta);
 }
 
-static inline void measure_rtt(struct sock *sk)
+static inline void measure_rtt(struct sock *sk, u32 srtt)
 {
         const struct inet_connection_sock *icsk = inet_csk(sk);
         const struct tcp_sock *tp = tcp_sk(sk);
         struct htcp *ca = inet_csk_ca(sk);
-        u32 srtt = tp->srtt >> 3;
 
         /* keep track of minimum RTT seen so far, minRTT is zero at first */
         if (ca->minRTT > srtt || !ca->minRTT)
@@ -98,7 +97,7 @@ static inline void measure_rtt(struct sock *sk)
         }
 }
 
-static void measure_achieved_throughput(struct sock *sk, u32 pkts_acked, ktime_t last)
+static void measure_achieved_throughput(struct sock *sk, u32 pkts_acked, s32 rtt)
 {
         const struct inet_connection_sock *icsk = inet_csk(sk);
         const struct tcp_sock *tp = tcp_sk(sk);
@@ -108,6 +107,9 @@ static void measure_achieved_throughput(struct sock *sk, u32 pkts_acked, ktime_t
         if (icsk->icsk_ca_state == TCP_CA_Open)
                 ca->pkts_acked = pkts_acked;
 
+        if (rtt > 0)
+                measure_rtt(sk, usecs_to_jiffies(rtt));
+
         if (!use_bandwidth_switch)
                 return;
 
@@ -237,8 +239,6 @@ static void htcp_cong_avoid(struct sock *sk, u32 ack,
         if (tp->snd_cwnd <= tp->snd_ssthresh)
                 tcp_slow_start(tp);
         else {
-                measure_rtt(sk);
-
                 /* In dangerous area, increase slowly.
                  * In theory this is tp->snd_cwnd += alpha / tp->snd_cwnd
                  */
diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c
index cc5de6f69d46..64f1cbaf96e8 100644
--- a/net/ipv4/tcp_illinois.c
+++ b/net/ipv4/tcp_illinois.c
@@ -83,18 +83,16 @@ static void tcp_illinois_init(struct sock *sk)
 }
 
 /* Measure RTT for each ack. */
-static void tcp_illinois_acked(struct sock *sk, u32 pkts_acked, ktime_t last)
+static void tcp_illinois_acked(struct sock *sk, u32 pkts_acked, s32 rtt)
 {
         struct illinois *ca = inet_csk_ca(sk);
-        u32 rtt;
 
         ca->acked = pkts_acked;
 
-        if (ktime_equal(last, net_invalid_timestamp()))
+        /* dup ack, no rtt sample */
+        if (rtt < 0)
                 return;
 
-        rtt = ktime_to_us(net_timedelta(last));
-
         /* ignore bogus values, this prevents wraparound in alpha math */
         if (rtt > RTT_MAX)
                 rtt = RTT_MAX;
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index fec8a7a4dbaf..378ca8a086a3 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1851,19 +1851,22 @@ static inline u32 tcp_cwnd_min(const struct sock *sk)
 }
 
 /* Decrease cwnd each second ack. */
-static void tcp_cwnd_down(struct sock *sk)
+static void tcp_cwnd_down(struct sock *sk, int flag)
 {
         struct tcp_sock *tp = tcp_sk(sk);
         int decr = tp->snd_cwnd_cnt + 1;
 
-        tp->snd_cwnd_cnt = decr&1;
-        decr >>= 1;
+        if ((flag&FLAG_FORWARD_PROGRESS) ||
+            (IsReno(tp) && !(flag&FLAG_NOT_DUP))) {
+                tp->snd_cwnd_cnt = decr&1;
+                decr >>= 1;
 
-        if (decr && tp->snd_cwnd > tcp_cwnd_min(sk))
-                tp->snd_cwnd -= decr;
+                if (decr && tp->snd_cwnd > tcp_cwnd_min(sk))
+                        tp->snd_cwnd -= decr;
 
-        tp->snd_cwnd = min(tp->snd_cwnd, tcp_packets_in_flight(tp)+1);
-        tp->snd_cwnd_stamp = tcp_time_stamp;
+                tp->snd_cwnd = min(tp->snd_cwnd, tcp_packets_in_flight(tp)+1);
+                tp->snd_cwnd_stamp = tcp_time_stamp;
+        }
 }
 
 /* Nothing was retransmitted or returned timestamp is less
@@ -2060,7 +2063,7 @@ static void tcp_try_to_open(struct sock *sk, int flag)
                 }
                 tcp_moderate_cwnd(tp);
         } else {
-                tcp_cwnd_down(sk);
+                tcp_cwnd_down(sk, flag);
         }
 }
 
@@ -2109,7 +2112,10 @@ tcp_fastretrans_alert(struct sock *sk, u32 prior_snd_una,
 {
         struct inet_connection_sock *icsk = inet_csk(sk);
         struct tcp_sock *tp = tcp_sk(sk);
-        int is_dupack = (tp->snd_una == prior_snd_una && !(flag&FLAG_NOT_DUP));
+        int is_dupack = (tp->snd_una == prior_snd_una &&
+                         (!(flag&FLAG_NOT_DUP) ||
+                          ((flag&FLAG_DATA_SACKED) &&
+                           (tp->fackets_out > tp->reordering))));
 
         /* Some technical things:
          * 1. Reno does not count dupacks (sacked_out) automatically. */
@@ -2260,7 +2266,7 @@ tcp_fastretrans_alert(struct sock *sk, u32 prior_snd_una,
 
         if (is_dupack || tcp_head_timedout(sk))
                 tcp_update_scoreboard(sk);
-        tcp_cwnd_down(sk);
+        tcp_cwnd_down(sk, flag);
         tcp_xmit_retransmit_queue(sk);
 }
 
@@ -2490,12 +2496,23 @@ static int tcp_clean_rtx_queue(struct sock *sk, __s32 *seq_rtt_p)
                 tcp_ack_update_rtt(sk, acked, seq_rtt);
                 tcp_ack_packets_out(sk);
 
-                /* Is the ACK triggering packet unambiguous? */
-                if (acked & FLAG_RETRANS_DATA_ACKED)
-                        last_ackt = net_invalid_timestamp();
+                if (ca_ops->pkts_acked) {
+                        s32 rtt_us = -1;
+
+                        /* Is the ACK triggering packet unambiguous? */
+                        if (!(acked & FLAG_RETRANS_DATA_ACKED)) {
+                                /* High resolution needed and available? */
+                                if (ca_ops->flags & TCP_CONG_RTT_STAMP &&
+                                    !ktime_equal(last_ackt,
+                                                 net_invalid_timestamp()))
+                                        rtt_us = ktime_us_delta(ktime_get_real(),
+                                                                last_ackt);
+                                else if (seq_rtt > 0)
+                                        rtt_us = jiffies_to_usecs(seq_rtt);
+                        }
 
-                if (ca_ops->pkts_acked)
-                        ca_ops->pkts_acked(sk, pkts_acked, last_ackt);
+                        ca_ops->pkts_acked(sk, pkts_acked, rtt_us);
+                }
         }
 
 #if FASTRETRANS_DEBUG > 0
diff --git a/net/ipv4/tcp_lp.c b/net/ipv4/tcp_lp.c
index 80e140e3ec2d..e7f5ef92cbd8 100644
--- a/net/ipv4/tcp_lp.c
+++ b/net/ipv4/tcp_lp.c
@@ -260,13 +260,13 @@ static void tcp_lp_rtt_sample(struct sock *sk, u32 rtt)
  * newReno in increase case.
  * We work it out by following the idea from TCP-LP's paper directly
  */
-static void tcp_lp_pkts_acked(struct sock *sk, u32 num_acked, ktime_t last)
+static void tcp_lp_pkts_acked(struct sock *sk, u32 num_acked, s32 rtt_us)
 {
         struct tcp_sock *tp = tcp_sk(sk);
         struct lp *lp = inet_csk_ca(sk);
 
-        if (!ktime_equal(last, net_invalid_timestamp()))
-                tcp_lp_rtt_sample(sk,  ktime_to_us(net_timedelta(last)));
+        if (rtt_us > 0)
+                tcp_lp_rtt_sample(sk, rtt_us);
 
         /* calc inference */
         if (tcp_time_stamp > tp->rx_opt.rcv_tsecr)
diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c
index 914e0307f7af..b49dedcda52d 100644
--- a/net/ipv4/tcp_vegas.c
+++ b/net/ipv4/tcp_vegas.c
@@ -112,16 +112,16 @@ EXPORT_SYMBOL_GPL(tcp_vegas_init);
  *   o min-filter RTT samples from a much longer window (forever for now)
  *     to find the propagation delay (baseRTT)
  */
-void tcp_vegas_pkts_acked(struct sock *sk, u32 cnt, ktime_t last)
+void tcp_vegas_pkts_acked(struct sock *sk, u32 cnt, s32 rtt_us)
 {
         struct vegas *vegas = inet_csk_ca(sk);
         u32 vrtt;
 
-        if (ktime_equal(last, net_invalid_timestamp()))
+        if (rtt_us < 0)
                 return;
 
         /* Never allow zero rtt or baseRTT */
-        vrtt = ktime_to_us(net_timedelta(last)) + 1;
+        vrtt = rtt_us + 1;
 
         /* Filter to find propagation delay: */
         if (vrtt < vegas->baseRTT)
diff --git a/net/ipv4/tcp_vegas.h b/net/ipv4/tcp_vegas.h
index 502fa8183634..6c0eea2f8249 100644
--- a/net/ipv4/tcp_vegas.h
+++ b/net/ipv4/tcp_vegas.h
@@ -17,7 +17,7 @@ struct vegas {
 
 extern void tcp_vegas_init(struct sock *sk);
 extern void tcp_vegas_state(struct sock *sk, u8 ca_state);
-extern void tcp_vegas_pkts_acked(struct sock *sk, u32 cnt, ktime_t last);
+extern void tcp_vegas_pkts_acked(struct sock *sk, u32 cnt, s32 rtt_us);
 extern void tcp_vegas_cwnd_event(struct sock *sk, enum tcp_ca_event event);
 extern void tcp_vegas_get_info(struct sock *sk, u32 ext, struct sk_buff *skb);
 
diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c
index 7a55ddf86032..8fb2aee0b1a4 100644
--- a/net/ipv4/tcp_veno.c
+++ b/net/ipv4/tcp_veno.c
@@ -69,16 +69,16 @@ static void tcp_veno_init(struct sock *sk)
 }
 
 /* Do rtt sampling needed for Veno. */
-static void tcp_veno_pkts_acked(struct sock *sk, u32 cnt, ktime_t last)
+static void tcp_veno_pkts_acked(struct sock *sk, u32 cnt, s32 rtt_us)
 {
         struct veno *veno = inet_csk_ca(sk);
         u32 vrtt;
 
-        if (ktime_equal(last, net_invalid_timestamp()))
+        if (rtt_us < 0)
                 return;
 
         /* Never allow zero rtt or baseRTT */
-        vrtt = ktime_to_us(net_timedelta(last)) + 1;
+        vrtt = rtt_us + 1;
 
         /* Filter to find propagation delay: */
         if (vrtt < veno->basertt)
diff --git a/net/ipv4/tcp_westwood.c b/net/ipv4/tcp_westwood.c
index e61e09dd513e..20151d6a6241 100644
--- a/net/ipv4/tcp_westwood.c
+++ b/net/ipv4/tcp_westwood.c
@@ -100,11 +100,12 @@ static void westwood_filter(struct westwood *w, u32 delta)
  * Called after processing group of packets.
  * but all westwood needs is the last sample of srtt.
  */
-static void tcp_westwood_pkts_acked(struct sock *sk, u32 cnt, ktime_t last)
+static void tcp_westwood_pkts_acked(struct sock *sk, u32 cnt, s32 rtt)
 {
         struct westwood *w = inet_csk_ca(sk);
-        if (cnt > 0)
-                w->rtt = tcp_sk(sk)->srtt >> 3;
+
+        if (rtt > 0)
+                w->rtt = usecs_to_jiffies(rtt);
 }
 
 /*
diff --git a/net/ipv4/tcp_yeah.c b/net/ipv4/tcp_yeah.c
index c04b7c6ec702..c107fba7430e 100644
--- a/net/ipv4/tcp_yeah.c
+++ b/net/ipv4/tcp_yeah.c
@@ -58,7 +58,7 @@ static void tcp_yeah_init(struct sock *sk)
 }
 
 
-static void tcp_yeah_pkts_acked(struct sock *sk, u32 pkts_acked, ktime_t last)
+static void tcp_yeah_pkts_acked(struct sock *sk, u32 pkts_acked, s32 rtt_us)
 {
         const struct inet_connection_sock *icsk = inet_csk(sk);
         struct yeah *yeah = inet_csk_ca(sk);
@@ -66,7 +66,7 @@ static void tcp_yeah_pkts_acked(struct sock *sk, u32 pkts_acked, ktime_t last)
         if (icsk->icsk_ca_state == TCP_CA_Open)
                 yeah->pkts_acked = pkts_acked;
 
-        tcp_vegas_pkts_acked(sk, pkts_acked, last);
+        tcp_vegas_pkts_acked(sk, pkts_acked, rtt_us);
 }
 
 static void tcp_yeah_cong_avoid(struct sock *sk, u32 ack,
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 06012920912a..91ef3be5abad 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2256,14 +2256,14 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
         struct net_device *dev = (struct net_device *) data;
         struct inet6_dev *idev = __in6_dev_get(dev);
         int run_pending = 0;
+        int err;
 
         switch(event) {
         case NETDEV_REGISTER:
                 if (!idev && dev->mtu >= IPV6_MIN_MTU) {
                         idev = ipv6_add_dev(dev);
                         if (!idev)
-                                printk(KERN_WARNING "IPv6: add_dev failed for %s\n",
-                                        dev->name);
+                                return notifier_from_errno(-ENOMEM);
                 }
                 break;
         case NETDEV_UP:
@@ -2373,7 +2373,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
                                               NULL);
                         addrconf_sysctl_register(idev, &idev->cnf);
 #endif
-                        snmp6_register_dev(idev);
+                        err = snmp6_register_dev(idev);
+                        if (err)
+                                return notifier_from_errno(err);
                 }
                 break;
         }
diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c
index faaefb692298..3f82e9542eda 100644
--- a/net/ipv6/addrconf_core.c
+++ b/net/ipv6/addrconf_core.c
@@ -50,6 +50,9 @@ int __ipv6_addr_type(const struct in6_addr *addr)
         if ((st & htonl(0xFFC00000)) == htonl(0xFEC00000))
                 return (IPV6_ADDR_SITELOCAL | IPV6_ADDR_UNICAST |
                         IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_SITELOCAL));               /* addr-select 3.1 */
+        if ((st & htonl(0xFE000000)) == htonl(0xFC000000))
+                return (IPV6_ADDR_UNICAST |
+                        IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_GLOBAL));                  /* RFC 4193 */
 
         if ((addr->s6_addr32[0] | addr->s6_addr32[1]) == 0) {
                 if (addr->s6_addr32[2] == 0) {
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index 36df2218b669..3153e15e0f7c 100644
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -86,8 +86,8 @@ static int ipv6_print_conntrack(struct seq_file *s,
  *        - Note also special handling of AUTH header. Thanks to IPsec wizards.
  */
 
-int nf_ct_ipv6_skip_exthdr(const struct sk_buff *skb, int start, u8 *nexthdrp,
-                           int len)
+static int nf_ct_ipv6_skip_exthdr(const struct sk_buff *skb, int start,
+                                  u8 *nexthdrp, int len)
 {
         u8 nexthdr = *nexthdrp;
 
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 919de682b331..55ea80fac601 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1983,9 +1983,10 @@ static int rt6_mtu_change_route(struct rt6_info *rt, void *p_arg)
             !dst_metric_locked(&rt->u.dst, RTAX_MTU) &&
             (dst_mtu(&rt->u.dst) > arg->mtu ||
              (dst_mtu(&rt->u.dst) < arg->mtu &&
-              dst_mtu(&rt->u.dst) == idev->cnf.mtu6)))
+              dst_mtu(&rt->u.dst) == idev->cnf.mtu6))) {
                 rt->u.dst.metrics[RTAX_MTU-1] = arg->mtu;
-        rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(arg->mtu);
+                rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(arg->mtu);
+        }
         return 0;
 }
 
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 13c09bc32aa3..dee0d5fb39c5 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -380,6 +380,10 @@ void qdisc_tree_decrease_qlen(struct Qdisc *sch, unsigned int n)
                 return;
         while ((parentid = sch->parent)) {
                 sch = qdisc_lookup(sch->dev, TC_H_MAJ(parentid));
+                if (sch == NULL) {
+                        WARN_ON(parentid != TC_H_ROOT);
+                        return;
+                }
                 cops = sch->ops->cl_ops;
                 if (cops->qlen_notify) {
                         cl = cops->get(sch, parentid);
@@ -420,8 +424,6 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
                         unsigned long cl = cops->get(parent, classid);
                         if (cl) {
                                 err = cops->graft(parent, cl, new, old);
-                                if (new)
-                                        new->parent = classid;
                                 cops->put(parent, cl);
                         }
                 }
@@ -436,7 +438,8 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
  */
 
 static struct Qdisc *
-qdisc_create(struct net_device *dev, u32 handle, struct rtattr **tca, int *errp)
+qdisc_create(struct net_device *dev, u32 parent, u32 handle,
+           struct rtattr **tca, int *errp)
 {
         int err;
         struct rtattr *kind = tca[TCA_KIND-1];
@@ -482,6 +485,8 @@ qdisc_create(struct net_device *dev, u32 handle, struct rtattr **tca, int *errp)
                 goto err_out2;
         }
 
+        sch->parent = parent;
+
         if (handle == TC_H_INGRESS) {
                 sch->flags |= TCQ_F_INGRESS;
                 sch->stats_lock = &dev->ingress_lock;
@@ -758,9 +763,11 @@ create_n_graft:
         if (!(n->nlmsg_flags&NLM_F_CREATE))
                 return -ENOENT;
         if (clid == TC_H_INGRESS)
-                q = qdisc_create(dev, tcm->tcm_parent, tca, &err);
+                q = qdisc_create(dev, tcm->tcm_parent, tcm->tcm_parent,
+                                 tca, &err);
         else
-                q = qdisc_create(dev, tcm->tcm_handle, tca, &err);
+                q = qdisc_create(dev, tcm->tcm_parent, tcm->tcm_handle,
+                                 tca, &err);
         if (q == NULL) {
                 if (err == -EAGAIN)
                         goto replay;
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index 51f16b0af198..2d32fd27496e 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -158,9 +158,8 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch)
                         break;
                 case TC_ACT_RECLASSIFY:
                 case TC_ACT_OK:
-                case TC_ACT_UNSPEC:
-                default:
                         skb->tc_index = TC_H_MIN(res.classid);
+                default:
                         result = TC_ACT_OK;
                         break;
         }
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index 2d8c08493d6e..4a49db65772e 100644
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -38,9 +38,11 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
         struct prio_sched_data *q = qdisc_priv(sch);
         u32 band = skb->priority;
         struct tcf_result res;
+        int err;
 
         *qerr = NET_XMIT_BYPASS;
         if (TC_H_MAJ(skb->priority) != sch->handle) {
+                err = tc_classify(skb, q->filter_list, &res);
 #ifdef CONFIG_NET_CLS_ACT
                 switch (tc_classify(skb, q->filter_list, &res)) {
                 case TC_ACT_STOLEN:
@@ -49,11 +51,8 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
                 case TC_ACT_SHOT:
                         return NULL;
                 }
-
-                if (!q->filter_list ) {
-#else
-                if (!q->filter_list || tc_classify(skb, q->filter_list, &res)) {
 #endif
+                if (!q->filter_list || err < 0) {
                         if (TC_H_MAJ(band))
                                 band = 0;
                         band = q->prio2band[band&TC_PRIO_MAX];
@@ -239,11 +238,13 @@ static int prio_tune(struct Qdisc *sch, struct rtattr *opt)
         /* If we're multiqueue, make sure the number of incoming bands
          * matches the number of queues on the device we're associating with.
          * If the number of bands requested is zero, then set q->bands to
-         * dev->egress_subqueue_count.
+         * dev->egress_subqueue_count.  Also, the root qdisc must be the
+         * only one that is enabled for multiqueue, since it's the only one
+         * that interacts with the underlying device.
          */
         q->mq = RTA_GET_FLAG(tb[TCA_PRIO_MQ - 1]);
         if (q->mq) {
-                if (sch->handle != TC_H_ROOT)
+                if (sch->parent != TC_H_ROOT)
                         return -EINVAL;
                 if (netif_is_multiqueue(sch->dev)) {
                         if (q->bands == 0)
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 5adfdfd49d61..1d674e0848fa 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -423,6 +423,17 @@ struct link *tipc_link_create(struct bearer *b_ptr, const u32 peer,
                 return NULL;
         }
 
+        if (LINK_LOG_BUF_SIZE) {
+                char *pb = kmalloc(LINK_LOG_BUF_SIZE, GFP_ATOMIC);
+
+                if (!pb) {
+                        kfree(l_ptr);
+                        warn("Link creation failed, no memory for print buffer\n");
+                        return NULL;
+                }
+                tipc_printbuf_init(&l_ptr->print_buf, pb, LINK_LOG_BUF_SIZE);
+        }
+
         l_ptr->addr = peer;
         if_name = strchr(b_ptr->publ.name, ':') + 1;
         sprintf(l_ptr->name, "%u.%u.%u:%s-%u.%u.%u:",
@@ -432,8 +443,6 @@ struct link *tipc_link_create(struct bearer *b_ptr, const u32 peer,
                 tipc_zone(peer), tipc_cluster(peer), tipc_node(peer));
                 /* note: peer i/f is appended to link name by reset/activate */
         memcpy(&l_ptr->media_addr, media_addr, sizeof(*media_addr));
-        k_init_timer(&l_ptr->timer, (Handler)link_timeout, (unsigned long)l_ptr);
-        list_add_tail(&l_ptr->link_list, &b_ptr->links);
         l_ptr->checkpoint = 1;
         l_ptr->b_ptr = b_ptr;
         link_set_supervision_props(l_ptr, b_ptr->media->tolerance);
@@ -459,21 +468,14 @@ struct link *tipc_link_create(struct bearer *b_ptr, const u32 peer,
 
         l_ptr->owner = tipc_node_attach_link(l_ptr);
         if (!l_ptr->owner) {
+                if (LINK_LOG_BUF_SIZE)
+                        kfree(l_ptr->print_buf.buf);
                 kfree(l_ptr);
                 return NULL;
         }
 
-        if (LINK_LOG_BUF_SIZE) {
-                char *pb = kmalloc(LINK_LOG_BUF_SIZE, GFP_ATOMIC);
-
-                if (!pb) {
-                        kfree(l_ptr);
-                        warn("Link creation failed, no memory for print buffer\n");
-                        return NULL;
-                }
-                tipc_printbuf_init(&l_ptr->print_buf, pb, LINK_LOG_BUF_SIZE);
-        }
-
+        k_init_timer(&l_ptr->timer, (Handler)link_timeout, (unsigned long)l_ptr);
+        list_add_tail(&l_ptr->link_list, &b_ptr->links);
         tipc_k_signal((Handler)tipc_link_start, (unsigned long)l_ptr);
 
         dbg("tipc_link_create(): tolerance = %u,cont intv = %u, abort_limit = %u\n",
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 65ebccc0a698..a05c34260e70 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -118,14 +118,40 @@
 
 int sysctl_unix_max_dgram_qlen __read_mostly = 10;
 
-struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
-DEFINE_SPINLOCK(unix_table_lock);
+static struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
+static DEFINE_SPINLOCK(unix_table_lock);
 static atomic_t unix_nr_socks = ATOMIC_INIT(0);
 
 #define unix_sockets_unbound    (&unix_socket_table[UNIX_HASH_SIZE])
 
 #define UNIX_ABSTRACT(sk)       (unix_sk(sk)->addr->hash != UNIX_HASH_SIZE)
 
+static struct sock *first_unix_socket(int *i)
+{
+        for (*i = 0; *i <= UNIX_HASH_SIZE; (*i)++) {
+                if (!hlist_empty(&unix_socket_table[*i]))
+                        return __sk_head(&unix_socket_table[*i]);
+        }
+        return NULL;
+}
+
+static struct sock *next_unix_socket(int *i, struct sock *s)
+{
+        struct sock *next = sk_next(s);
+        /* More in this chain? */
+        if (next)
+                return next;
+        /* Look for next non-empty chain. */
+        for ((*i)++; *i <= UNIX_HASH_SIZE; (*i)++) {
+                if (!hlist_empty(&unix_socket_table[*i]))
+                        return __sk_head(&unix_socket_table[*i]);
+        }
+        return NULL;
+}
+
+#define forall_unix_sockets(i, s) \
+        for (s = first_unix_socket(&(i)); s; s = next_unix_socket(&(i),(s)))
+
 #ifdef CONFIG_SECURITY_NETWORK
 static void unix_get_secdata(struct scm_cookie *scm, struct sk_buff *skb)
 {
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index c3a4b0a18687..95a47304336d 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1299,7 +1299,8 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, struct flowi *fl,
                 xfrm_address_t *local  = saddr;
                 struct xfrm_tmpl *tmpl = &policy->xfrm_vec[i];
 
-                if (tmpl->mode == XFRM_MODE_TUNNEL) {
+                if (tmpl->mode == XFRM_MODE_TUNNEL ||
+                    tmpl->mode == XFRM_MODE_BEET) {
                         remote = &tmpl->id.daddr;
                         local = &tmpl->saddr;
                         family = tmpl->encap_family;
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 38f90ca75b1e..31be405efb55 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -611,7 +611,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
                               selector.
                          */
                         if (x->km.state == XFRM_STATE_VALID) {
-                                if (!xfrm_selector_match(&x->sel, fl, family) ||
+                                if (!xfrm_selector_match(&x->sel, fl, x->sel.family) ||
                                     !security_xfrm_state_pol_flow_match(x, pol, fl))
                                         continue;
                                 if (!best ||
@@ -623,7 +623,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
                                 acquire_in_progress = 1;
                         } else if (x->km.state == XFRM_STATE_ERROR ||
                                    x->km.state == XFRM_STATE_EXPIRED) {
-                                if (xfrm_selector_match(&x->sel, fl, family) &&
+                                if (xfrm_selector_match(&x->sel, fl, x->sel.family) &&
                                     security_xfrm_state_pol_flow_match(x, pol, fl))
                                         error = -ESRCH;
                         }
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index c06883bf620e..61339e17a0f5 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -322,6 +322,13 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info *
         x->props.family = p->family;
         memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr));
         x->props.flags = p->flags;
+
+        /*
+         * Set inner address family if the KM left it as zero.
+         * See comment in validate_tmpl.
+         */
+        if (!x->sel.family)
+                x->sel.family = p->family;
 }
 
 /*
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index ee58ded021d7..6c145d6e89de 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1121,6 +1121,7 @@ static int initexit_section_ref_ok(const char *name)
                 ".machvec",             /* ia64 + powerpc uses these */
                 ".machine.desc",
                 ".opd",                 /* See comment [OPD] */
+                "__dbe_table",
                 ".parainstructions",
                 ".pdr",
                 ".plt",                 /* seen on ARCH=um build on x86_64. Harmless */
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 0ae032f3876b..f00161ef99ed 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -792,7 +792,7 @@ int security_context_to_sid(char *scontext, u32 scontext_len, u32 *sid)
  * @scontext: security context
  * @scontext_len: length in bytes
  * @sid: security identifier, SID
- * @def_sid: default SID to assign on errror
+ * @def_sid: default SID to assign on error
  *
  * Obtains a SID associated with the security context that
  * has the string representation specified by @scontext.
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 866d4de8d4ab..af37cd09bddd 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -31,14 +31,6 @@ config SOUND_HAL2
           Say Y or M if you have an SGI Indy or Indigo2 system and want to be able to
           use its on-board A2 audio system.
 
-config SOUND_VRC5477
-        tristate "NEC Vrc5477 AC97 sound"
-        depends on SOUND_PRIME && DDB5477
-        help
-          Say Y here to enable sound support for the NEC Vrc5477 chip, an
-          integrated, multi-function controller chip for MIPS CPUs.  Works
-          with the AC97 codec.
-
 config SOUND_AU1550_AC97
         tristate "Au1550/Au1200 AC97 Sound"
         select SND_AC97_CODEC
diff --git a/sound/oss/Makefile b/sound/oss/Makefile
index 7a2f9ae7b7c5..1200670017bd 100644
--- a/sound/oss/Makefile
+++ b/sound/oss/Makefile
@@ -37,7 +37,6 @@ obj-$(CONFIG_SOUND_MSNDPIN)	+= msnd.o msnd_pinnacle.o
 obj-$(CONFIG_SOUND_VWSND)       += vwsnd.o
 obj-$(CONFIG_SOUND_ICH)         += i810_audio.o ac97_codec.o
 obj-$(CONFIG_SOUND_ES1371)      += es1371.o ac97_codec.o
-obj-$(CONFIG_SOUND_VRC5477)     += nec_vrc5477.o ac97_codec.o
 obj-$(CONFIG_SOUND_AU1550_AC97) += au1550_ac97.o ac97_codec.o
 obj-$(CONFIG_SOUND_TRIDENT)     += trident.o ac97_codec.o
 obj-$(CONFIG_SOUND_BCM_CS4297A) += swarm_cs4297a.o
diff --git a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c
deleted file mode 100644
index 27b4ba3aaa7c..000000000000
--- a/sound/oss/nec_vrc5477.c
+++ /dev/null
@@ -1,2060 +0,0 @@
-/***********************************************************************
- * Copyright 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * drivers/sound/nec_vrc5477.c
- *     AC97 sound dirver for NEC Vrc5477 chip (an integrated, 
- *     multi-function controller chip for MIPS CPUs)
- *
- * VRA support Copyright 2001 Bradley D. LaRonde <brad@ltc.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.
- ***********************************************************************
- */
-
-/*
- * This code is derived from ite8172.c, which is written by Steve Longerbeam.
- *
- * Features:
- *   Currently we only support the following capabilities:
- *      . mono output to PCM L/R (line out).
- *      . stereo output to PCM L/R (line out).
- *      . mono input from PCM L (line in).
- *      . stereo output from PCM (line in).
- *      . sampling rate at 48k or variable sampling rate 
- *      . support /dev/dsp, /dev/mixer devices, standard OSS devices.
- *      . only support 16-bit PCM format (hardware limit, no software
- *        translation) 
- *      . support duplex, but no trigger or realtime.
- *      
- *   Specifically the following are not supported:
- *      . app-set frag size.
- *      . mmap'ed buffer access
- */
-
-/* 
- * Original comments from ite8172.c file.
- */
-
-/*
- *
- * Notes:
- *
- *  1. Much of the OSS buffer allocation, ioctl's, and mmap'ing are
- *     taken, slightly modified or not at all, from the ES1371 driver,
- *     so refer to the credits in es1371.c for those. The rest of the
- *     code (probe, open, read, write, the ISR, etc.) is new.
- *  2. The following support is untested:
- *      * Memory mapping the audio buffers, and the ioctl controls that go
- *        with it.
- *      * S/PDIF output.
- *  3. The following is not supported:
- *      * I2S input.
- *      * legacy audio mode.
- *  4. Support for volume button interrupts is implemented but doesn't
- *     work yet.
- *
- *  Revision history
- *    02.08.2001  0.1   Initial release
- */
-
-#include <linux/module.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/ioport.h>
-#include <linux/sched.h>
-#include <linux/delay.h>
-#include <linux/sound.h>
-#include <linux/slab.h>
-#include <linux/soundcard.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/bitops.h>
-#include <linux/proc_fs.h>
-#include <linux/spinlock.h>
-#include <linux/smp_lock.h>
-#include <linux/ac97_codec.h>
-#include <linux/mutex.h>
-
-#include <asm/io.h>
-#include <asm/dma.h>
-#include <asm/uaccess.h>
-
-/* -------------------debug macros -------------------------------------- */
-/* #undef VRC5477_AC97_DEBUG */
-#define VRC5477_AC97_DEBUG
-
-#undef VRC5477_AC97_VERBOSE_DEBUG
-/* #define VRC5477_AC97_VERBOSE_DEBUG */
-
-#if defined(VRC5477_AC97_VERBOSE_DEBUG)
-#define VRC5477_AC97_DEBUG
-#endif
-
-#if defined(VRC5477_AC97_DEBUG)
-#define ASSERT(x)  if (!(x)) { \
-        panic("assertion failed at %s:%d: %s\n", __FILE__, __LINE__, #x); }
-#else
-#define ASSERT(x)
-#endif /* VRC5477_AC97_DEBUG */
-
-#if defined(VRC5477_AC97_VERBOSE_DEBUG)
-static u16 inTicket;            /* check sync between intr & write */
-static u16 outTicket;
-#endif
-
-/* --------------------------------------------------------------------- */
-
-#undef OSS_DOCUMENTED_MIXER_SEMANTICS
-
-static const unsigned sample_shift[] = { 0, 1, 1, 2 };
-
-#define         VRC5477_INT_CLR         0x0
-#define         VRC5477_INT_STATUS      0x0
-#define         VRC5477_CODEC_WR        0x4
-#define         VRC5477_CODEC_RD        0x8
-#define         VRC5477_CTRL            0x18
-#define         VRC5477_ACLINK_CTRL     0x1c
-#define         VRC5477_INT_MASK        0x24
-
-#define         VRC5477_DAC1_CTRL       0x30
-#define         VRC5477_DAC1L           0x34
-#define         VRC5477_DAC1_BADDR      0x38
-#define         VRC5477_DAC2_CTRL       0x3c
-#define         VRC5477_DAC2L           0x40
-#define         VRC5477_DAC2_BADDR      0x44
-#define         VRC5477_DAC3_CTRL       0x48
-#define         VRC5477_DAC3L           0x4c
-#define         VRC5477_DAC3_BADDR      0x50
-
-#define         VRC5477_ADC1_CTRL       0x54
-#define         VRC5477_ADC1L           0x58
-#define         VRC5477_ADC1_BADDR      0x5c
-#define         VRC5477_ADC2_CTRL       0x60
-#define         VRC5477_ADC2L           0x64
-#define         VRC5477_ADC2_BADDR      0x68
-#define         VRC5477_ADC3_CTRL       0x6c
-#define         VRC5477_ADC3L           0x70
-#define         VRC5477_ADC3_BADDR      0x74
-
-#define         VRC5477_CODEC_WR_RWC    (1 << 23)
-
-#define         VRC5477_CODEC_RD_RRDYA  (1 << 31)
-#define         VRC5477_CODEC_RD_RRDYD  (1 << 30)
-
-#define         VRC5477_ACLINK_CTRL_RST_ON      (1 << 15)
-#define         VRC5477_ACLINK_CTRL_RST_TIME    0x7f
-#define         VRC5477_ACLINK_CTRL_SYNC_ON     (1 << 30)
-#define         VRC5477_ACLINK_CTRL_CK_STOP_ON  (1 << 31)
-
-#define         VRC5477_CTRL_DAC2ENB            (1 << 15) 
-#define         VRC5477_CTRL_ADC2ENB            (1 << 14) 
-#define         VRC5477_CTRL_DAC1ENB            (1 << 13) 
-#define         VRC5477_CTRL_ADC1ENB            (1 << 12) 
-
-#define         VRC5477_INT_MASK_NMASK          (1 << 31) 
-#define         VRC5477_INT_MASK_DAC1END        (1 << 5) 
-#define         VRC5477_INT_MASK_DAC2END        (1 << 4) 
-#define         VRC5477_INT_MASK_DAC3END        (1 << 3) 
-#define         VRC5477_INT_MASK_ADC1END        (1 << 2) 
-#define         VRC5477_INT_MASK_ADC2END        (1 << 1) 
-#define         VRC5477_INT_MASK_ADC3END        (1 << 0) 
-
-#define         VRC5477_DMA_ACTIVATION          (1 << 31)
-#define         VRC5477_DMA_WIP                 (1 << 30)
-
-
-#define VRC5477_AC97_MODULE_NAME "NEC_Vrc5477_audio"
-#define PFX VRC5477_AC97_MODULE_NAME ": "
-
-/* --------------------------------------------------------------------- */
-
-struct vrc5477_ac97_state {
-        /* list of vrc5477_ac97 devices */
-        struct list_head devs;
-
-        /* the corresponding pci_dev structure */
-        struct pci_dev *dev;
-
-        /* soundcore stuff */
-        int dev_audio;
-
-        /* hardware resources */
-        unsigned long io;
-        unsigned int irq;
-
-#ifdef VRC5477_AC97_DEBUG
-        /* debug /proc entry */
-        struct proc_dir_entry *ps;
-        struct proc_dir_entry *ac97_ps;
-#endif /* VRC5477_AC97_DEBUG */
-
-        struct ac97_codec *codec;
-
-        unsigned dacChannels, adcChannels;
-        unsigned short dacRate, adcRate;
-        unsigned short extended_status;
-
-        spinlock_t lock;
-        struct mutex open_mutex;
-        mode_t open_mode;
-        wait_queue_head_t open_wait;
-
-        struct dmabuf {
-                void *lbuf, *rbuf;
-                dma_addr_t lbufDma, rbufDma;
-                unsigned bufOrder;
-                unsigned numFrag;
-                unsigned fragShift;
-                unsigned fragSize;      /* redundant */
-                unsigned fragTotalSize; /* = numFrag * fragSize(real)  */
-                unsigned nextIn;
-                unsigned nextOut;
-                int count;
-                unsigned error; /* over/underrun */
-                wait_queue_head_t wait;
-                /* OSS stuff */
-                unsigned stopped:1;
-                unsigned ready:1;
-        } dma_dac, dma_adc;
-
-        #define WORK_BUF_SIZE   2048
-        struct {
-                u16 lchannel;
-                u16 rchannel;
-        } workBuf[WORK_BUF_SIZE/4];
-};
-
-/* --------------------------------------------------------------------- */
-
-static LIST_HEAD(devs);
-
-/* --------------------------------------------------------------------- */
-
-static inline unsigned ld2(unsigned int x)
-{
-    unsigned r = 0;
-        
-    if (x >= 0x10000) {
-        x >>= 16;
-        r += 16;
-    }
-    if (x >= 0x100) {
-        x >>= 8;
-        r += 8;
-    }
-    if (x >= 0x10) {
-        x >>= 4;
-        r += 4;
-    }
-    if (x >= 4) {
-        x >>= 2;
-        r += 2;
-    }
-    if (x >= 2)
-        r++;
-    return r;
-}
-
-/* --------------------------------------------------------------------- */
-
-static u16 rdcodec(struct ac97_codec *codec, u8 addr)
-{
-        struct vrc5477_ac97_state *s = 
-                (struct vrc5477_ac97_state *)codec->private_data;
-        unsigned long flags;
-        u32 result;
-
-        spin_lock_irqsave(&s->lock, flags);
-
-        /* wait until we can access codec registers */
-        while (inl(s->io + VRC5477_CODEC_WR) & 0x80000000);
-
-        /* write the address and "read" command to codec */
-        addr = addr & 0x7f;
-        outl((addr << 16) | VRC5477_CODEC_WR_RWC, s->io + VRC5477_CODEC_WR);
-
-        /* get the return result */
-        udelay(100); /* workaround hardware bug */
-        while ( (result = inl(s->io + VRC5477_CODEC_RD)) & 
-                (VRC5477_CODEC_RD_RRDYA | VRC5477_CODEC_RD_RRDYD) ) {
-                /* we get either addr or data, or both */
-                if (result & VRC5477_CODEC_RD_RRDYA) {
-                        ASSERT(addr == ((result >> 16) & 0x7f) );
-                }
-                if (result & VRC5477_CODEC_RD_RRDYD) {
-                        break;
-                }
-        }
-
-        spin_unlock_irqrestore(&s->lock, flags);
-
-        return result & 0xffff;
-}
-
-
-static void wrcodec(struct ac97_codec *codec, u8 addr, u16 data)
-{
-        struct vrc5477_ac97_state *s = 
-                (struct vrc5477_ac97_state *)codec->private_data;
-        unsigned long flags;
-
-        spin_lock_irqsave(&s->lock, flags);
-
-        /* wait until we can access codec registers */
-        while (inl(s->io + VRC5477_CODEC_WR) & 0x80000000);
-
-        /* write the address and value to codec */
-        outl((addr << 16) | data, s->io + VRC5477_CODEC_WR);
-
-        spin_unlock_irqrestore(&s->lock, flags);
-}
-
-
-static void waitcodec(struct ac97_codec *codec)
-{
-        struct vrc5477_ac97_state *s = 
-                (struct vrc5477_ac97_state *)codec->private_data;
-
-        /* wait until we can access codec registers */
-        while (inl(s->io + VRC5477_CODEC_WR) & 0x80000000);
-}
-
-static int ac97_codec_not_present(struct ac97_codec *codec)
-{
-        struct vrc5477_ac97_state *s = 
-                (struct vrc5477_ac97_state *)codec->private_data;
-        unsigned long flags;
-        unsigned short count  = 0xffff; 
-
-        spin_lock_irqsave(&s->lock, flags);
-
-        /* wait until we can access codec registers */
-        do {
-               if (!(inl(s->io + VRC5477_CODEC_WR) & 0x80000000))
-                       break;
-        } while (--count);
-
-        if (count == 0) {
-                spin_unlock_irqrestore(&s->lock, flags);
-                return -1;
-        }
-
-        /* write 0 to reset */
-        outl((AC97_RESET << 16) | 0, s->io + VRC5477_CODEC_WR);
-
-        /* test whether we get a response from ac97 chip */
-        count  = 0xffff; 
-        do { 
-               if (!(inl(s->io + VRC5477_CODEC_WR) & 0x80000000))
-                       break;
-        } while (--count);
-
-        if (count == 0) {
-                spin_unlock_irqrestore(&s->lock, flags);
-                return -1;
-        }
-        spin_unlock_irqrestore(&s->lock, flags);
-        return 0;
-}
-
-/* --------------------------------------------------------------------- */
-
-static void vrc5477_ac97_delay(int msec)
-{
-        unsigned long tmo;
-        signed long tmo2;
-
-        if (in_interrupt())
-                return;
-    
-        tmo = jiffies + (msec*HZ)/1000;
-        for (;;) {
-                tmo2 = tmo - jiffies;
-                if (tmo2 <= 0)
-                        break;
-                schedule_timeout(tmo2);
-        }
-}
-
-
-static void set_adc_rate(struct vrc5477_ac97_state *s, unsigned rate)
-{
-        wrcodec(s->codec, AC97_PCM_LR_ADC_RATE, rate);
-        s->adcRate = rate;
-}
-
-
-static void set_dac_rate(struct vrc5477_ac97_state *s, unsigned rate)
-{
-        if(s->extended_status & AC97_EXTSTAT_VRA) {
-        wrcodec(s->codec, AC97_PCM_FRONT_DAC_RATE, rate);
-                s->dacRate = rdcodec(s->codec, AC97_PCM_FRONT_DAC_RATE);
-        }
-}
-
-static int ac97_codec_not_present(struct ac97_codec *codec)
-{
-        struct vrc5477_ac97_state *s =
-                (struct vrc5477_ac97_state *)codec->private_data;
-        unsigned long flags;
-        unsigned short count  = 0xffff;
-
-        spin_lock_irqsave(&s->lock, flags);
-
-        /* wait until we can access codec registers */
-        do {
-               if (!(inl(s->io + VRC5477_CODEC_WR) & 0x80000000))
-                       break;
-        } while (--count);
-
-        if (count == 0) {
-                spin_unlock_irqrestore(&s->lock, flags);
-                return -1;
-        }
-
-        /* write 0 to reset */
-        outl((AC97_RESET << 16) | 0, s->io + VRC5477_CODEC_WR);
-
-        /* test whether we get a response from ac97 chip */
-        count  = 0xffff;
-        do {
-               if (!(inl(s->io + VRC5477_CODEC_WR) & 0x80000000))
-                       break;
-        } while (--count);
-
-        if (count == 0) {
-                spin_unlock_irqrestore(&s->lock, flags);
-                return -1;
-        }
-        spin_unlock_irqrestore(&s->lock, flags);
-        return 0;
-}
-
-/* --------------------------------------------------------------------- */
-
-static inline void
-stop_dac(struct vrc5477_ac97_state *s)
-{
-        struct dmabuf* db = &s->dma_dac;
-        unsigned long flags;
-        u32 temp;
-    
-        spin_lock_irqsave(&s->lock, flags);
-
-        if (db->stopped) {
-                spin_unlock_irqrestore(&s->lock, flags);
-                return;
-        }
-
-        /* deactivate the dma */
-        outl(0, s->io + VRC5477_DAC1_CTRL);
-        outl(0, s->io + VRC5477_DAC2_CTRL);
-
-        /* wait for DAM completely stop */
-        while (inl(s->io + VRC5477_DAC1_CTRL) & VRC5477_DMA_WIP);
-        while (inl(s->io + VRC5477_DAC2_CTRL) & VRC5477_DMA_WIP);
-
-        /* disable dac slots in aclink */
-        temp = inl(s->io + VRC5477_CTRL);
-        temp &= ~ (VRC5477_CTRL_DAC1ENB | VRC5477_CTRL_DAC2ENB);
-        outl (temp, s->io + VRC5477_CTRL);
-
-        /* disable interrupts */
-        temp = inl(s->io + VRC5477_INT_MASK);
-        temp &= ~ (VRC5477_INT_MASK_DAC1END | VRC5477_INT_MASK_DAC2END); 
-        outl (temp, s->io + VRC5477_INT_MASK);
-
-        /* clear pending ones */
-        outl(VRC5477_INT_MASK_DAC1END | VRC5477_INT_MASK_DAC2END, 
-             s->io +  VRC5477_INT_CLR);
-    
-        db->stopped = 1;
-    
-        spin_unlock_irqrestore(&s->lock, flags);
-}       
-
-static void start_dac(struct vrc5477_ac97_state *s)
-{
-        struct dmabuf* db = &s->dma_dac;
-        unsigned long flags;
-        u32 dmaLength;
-        u32 temp;
-
-        spin_lock_irqsave(&s->lock, flags);
-
-        if (!db->stopped) {
-                spin_unlock_irqrestore(&s->lock, flags);
-                return;
-        }
-
-        /* we should have some data to do the DMA trasnfer */
-        ASSERT(db->count >= db->fragSize);
-
-        /* clear pending fales interrupts */
-        outl(VRC5477_INT_MASK_DAC1END | VRC5477_INT_MASK_DAC2END, 
-             s->io +  VRC5477_INT_CLR);
-
-        /* enable interrupts */
-        temp = inl(s->io + VRC5477_INT_MASK);
-        temp |= VRC5477_INT_MASK_DAC1END | VRC5477_INT_MASK_DAC2END;
-        outl(temp, s->io +  VRC5477_INT_MASK);
-
-        /* setup dma base addr */
-        outl(db->lbufDma + db->nextOut, s->io + VRC5477_DAC1_BADDR);
-        if (s->dacChannels == 1) {
-                outl(db->lbufDma + db->nextOut, s->io + VRC5477_DAC2_BADDR);
-        } else {
-                outl(db->rbufDma + db->nextOut, s->io + VRC5477_DAC2_BADDR);
-        }
-
-        /* set dma length, in the unit of 0x10 bytes */
-        dmaLength = db->fragSize >> 4;
-        outl(dmaLength, s->io + VRC5477_DAC1L);
-        outl(dmaLength, s->io + VRC5477_DAC2L);
-
-        /* activate dma */
-        outl(VRC5477_DMA_ACTIVATION, s->io + VRC5477_DAC1_CTRL);
-        outl(VRC5477_DMA_ACTIVATION, s->io + VRC5477_DAC2_CTRL);
-
-        /* enable dac slots - we should hear the music now! */
-        temp = inl(s->io + VRC5477_CTRL);
-        temp |= (VRC5477_CTRL_DAC1ENB | VRC5477_CTRL_DAC2ENB);
-        outl (temp, s->io + VRC5477_CTRL);
-
-        /* it is time to setup next dma transfer */
-        ASSERT(inl(s->io + VRC5477_DAC1_CTRL) & VRC5477_DMA_WIP);
-        ASSERT(inl(s->io + VRC5477_DAC2_CTRL) & VRC5477_DMA_WIP);
-
-        temp = db->nextOut + db->fragSize;
-        if (temp >= db->fragTotalSize) {
-                ASSERT(temp == db->fragTotalSize);
-                temp = 0;
-        }
-
-        outl(db->lbufDma + temp, s->io + VRC5477_DAC1_BADDR);
-        if (s->dacChannels == 1) {
-                outl(db->lbufDma + temp, s->io + VRC5477_DAC2_BADDR);
-        } else {
-                outl(db->rbufDma + temp, s->io + VRC5477_DAC2_BADDR);
-        }
-
-        db->stopped = 0;
-
-#if defined(VRC5477_AC97_VERBOSE_DEBUG)
-        outTicket = *(u16*)(db->lbuf+db->nextOut);
-        if (db->count > db->fragSize) {
-                ASSERT((u16)(outTicket+1) == *(u16*)(db->lbuf+temp));
-        }
-#endif
-
-        spin_unlock_irqrestore(&s->lock, flags);
-}       
-
-static inline void stop_adc(struct vrc5477_ac97_state *s)
-{
-        struct dmabuf* db = &s->dma_adc;
-        unsigned long flags;
-        u32 temp;
-    
-        spin_lock_irqsave(&s->lock, flags);
-
-        if (db->stopped) {
-                spin_unlock_irqrestore(&s->lock, flags);
-                return;
-        }
-
-        /* deactivate the dma */
-        outl(0, s->io + VRC5477_ADC1_CTRL);
-        outl(0, s->io + VRC5477_ADC2_CTRL);
-
-        /* disable adc slots in aclink */
-        temp = inl(s->io + VRC5477_CTRL);
-        temp &= ~ (VRC5477_CTRL_ADC1ENB | VRC5477_CTRL_ADC2ENB);
-        outl (temp, s->io + VRC5477_CTRL);
-
-        /* disable interrupts */
-        temp = inl(s->io + VRC5477_INT_MASK);
-        temp &= ~ (VRC5477_INT_MASK_ADC1END | VRC5477_INT_MASK_ADC2END); 
-        outl (temp, s->io + VRC5477_INT_MASK);
-
-        /* clear pending ones */
-        outl(VRC5477_INT_MASK_ADC1END | VRC5477_INT_MASK_ADC2END, 
-             s->io +  VRC5477_INT_CLR);
-    
-        db->stopped = 1;
-
-        spin_unlock_irqrestore(&s->lock, flags);
-}       
-
-static void start_adc(struct vrc5477_ac97_state *s)
-{
-        struct dmabuf* db = &s->dma_adc;
-        unsigned long flags;
-        u32 dmaLength;
-        u32 temp;
-
-        spin_lock_irqsave(&s->lock, flags);
-
-        if (!db->stopped) {
-                spin_unlock_irqrestore(&s->lock, flags);
-                return;
-        }
-
-        /* we should at least have some free space in the buffer */
-        ASSERT(db->count < db->fragTotalSize - db->fragSize * 2);
-
-        /* clear pending ones */
-        outl(VRC5477_INT_MASK_ADC1END | VRC5477_INT_MASK_ADC2END, 
-             s->io +  VRC5477_INT_CLR);
-
-        /* enable interrupts */
-        temp = inl(s->io + VRC5477_INT_MASK);
-        temp |= VRC5477_INT_MASK_ADC1END | VRC5477_INT_MASK_ADC2END;
-        outl(temp, s->io +  VRC5477_INT_MASK);
-
-        /* setup dma base addr */
-        outl(db->lbufDma + db->nextIn, s->io + VRC5477_ADC1_BADDR);
-        outl(db->rbufDma + db->nextIn, s->io + VRC5477_ADC2_BADDR);
-
-        /* setup dma length */
-        dmaLength = db->fragSize >> 4;
-        outl(dmaLength, s->io + VRC5477_ADC1L);
-        outl(dmaLength, s->io + VRC5477_ADC2L);
-
-        /* activate dma */
-        outl(VRC5477_DMA_ACTIVATION, s->io + VRC5477_ADC1_CTRL);
-        outl(VRC5477_DMA_ACTIVATION, s->io + VRC5477_ADC2_CTRL);
-
-        /* enable adc slots */
-        temp = inl(s->io + VRC5477_CTRL);
-        temp |= (VRC5477_CTRL_ADC1ENB | VRC5477_CTRL_ADC2ENB);
-        outl (temp, s->io + VRC5477_CTRL);
-
-        /* it is time to setup next dma transfer */
-        temp = db->nextIn + db->fragSize;
-        if (temp >= db->fragTotalSize) {
-                ASSERT(temp == db->fragTotalSize);
-                temp = 0;
-        }
-        outl(db->lbufDma + temp, s->io + VRC5477_ADC1_BADDR);
-        outl(db->rbufDma + temp, s->io + VRC5477_ADC2_BADDR);
-
-        db->stopped = 0;
-
-        spin_unlock_irqrestore(&s->lock, flags);
-}       
-
-/* --------------------------------------------------------------------- */
-
-#define DMABUF_DEFAULTORDER (16-PAGE_SHIFT)
-#define DMABUF_MINORDER 1
-
-static inline void dealloc_dmabuf(struct vrc5477_ac97_state *s,
-                                  struct dmabuf *db)
-{
-        if (db->lbuf) {
-                ASSERT(db->rbuf);
-                pci_free_consistent(s->dev, PAGE_SIZE << db->bufOrder,
-                                    db->lbuf, db->lbufDma);
-                pci_free_consistent(s->dev, PAGE_SIZE << db->bufOrder,
-                                    db->rbuf, db->rbufDma);
-                db->lbuf = db->rbuf = NULL;
-        }
-        db->nextIn = db->nextOut = 0;
-        db->ready = 0;
-}
-
-static int prog_dmabuf(struct vrc5477_ac97_state *s, 
-                       struct dmabuf *db,
-                       unsigned rate)
-{
-        int order;
-        unsigned bufsize;
-
-        if (!db->lbuf) {
-                ASSERT(!db->rbuf);
-
-                db->ready = 0;
-                for (order = DMABUF_DEFAULTORDER; 
-                     order >= DMABUF_MINORDER; 
-                     order--) {
-                        db->lbuf = pci_alloc_consistent(s->dev,
-                                                        PAGE_SIZE << order,
-                                                        &db->lbufDma);
-                        db->rbuf = pci_alloc_consistent(s->dev,
-                                                        PAGE_SIZE << order,
-                                                        &db->rbufDma);
-                        if (db->lbuf && db->rbuf) break;
-                        if (db->lbuf) {
-                            ASSERT(!db->rbuf);
-                            pci_free_consistent(s->dev, 
-                                                PAGE_SIZE << order,
-                                                db->lbuf,
-                                                db->lbufDma);
-                        }
-                }
-                if (!db->lbuf) {
-                        ASSERT(!db->rbuf);
-                        return -ENOMEM;
-                }
-
-                db->bufOrder = order;
-        }
-
-        db->count = 0;
-        db->nextIn = db->nextOut = 0;
-    
-        bufsize = PAGE_SIZE << db->bufOrder;
-        db->fragShift = ld2(rate * 2 / 100);
-        if (db->fragShift < 4) db->fragShift = 4;
-
-        db->numFrag = bufsize >> db->fragShift;
-        while (db->numFrag < 4 && db->fragShift > 4) {
-                db->fragShift--;
-                db->numFrag = bufsize >> db->fragShift;
-        }
-        db->fragSize = 1 << db->fragShift;
-        db->fragTotalSize = db->numFrag << db->fragShift;
-        memset(db->lbuf, 0, db->fragTotalSize);
-        memset(db->rbuf, 0, db->fragTotalSize);
-    
-        db->ready = 1;
-
-        return 0;
-}
-
-static inline int prog_dmabuf_adc(struct vrc5477_ac97_state *s)
-{
-    stop_adc(s);
-    return prog_dmabuf(s, &s->dma_adc, s->adcRate);
-}
-
-static inline int prog_dmabuf_dac(struct vrc5477_ac97_state *s)
-{
-    stop_dac(s);
-    return prog_dmabuf(s, &s->dma_dac, s->dacRate);
-}
-
-
-/* --------------------------------------------------------------------- */
-/* hold spinlock for the following! */
-
-static inline void vrc5477_ac97_adc_interrupt(struct vrc5477_ac97_state *s)
-{
-        struct dmabuf* adc = &s->dma_adc;
-        unsigned temp;
-
-        /* we need two frags avaiable because one is already being used
-         * and the other will be used when next interrupt happens.
-         */
-        if (adc->count >= adc->fragTotalSize - adc->fragSize) {
-                stop_adc(s);
-                adc->error++;
-                printk(KERN_INFO PFX "adc overrun\n");
-                return;
-        }
-
-        /* set the base addr for next DMA transfer */
-        temp = adc->nextIn + 2*adc->fragSize;
-        if (temp >= adc->fragTotalSize) {
-                ASSERT( (temp == adc->fragTotalSize) ||
-                             (temp == adc->fragTotalSize + adc->fragSize) );
-                temp -= adc->fragTotalSize;
-        }
-        outl(adc->lbufDma + temp, s->io + VRC5477_ADC1_BADDR);
-        outl(adc->rbufDma + temp, s->io + VRC5477_ADC2_BADDR);
-
-        /* adjust nextIn */
-        adc->nextIn += adc->fragSize;
-        if (adc->nextIn >= adc->fragTotalSize) {
-                ASSERT(adc->nextIn == adc->fragTotalSize);
-                adc->nextIn = 0;
-        }
-
-        /* adjust count */
-        adc->count += adc->fragSize;
-
-        /* wake up anybody listening */
-        if (waitqueue_active(&adc->wait)) {
-                wake_up_interruptible(&adc->wait);
-        }       
-}
-
-static inline void vrc5477_ac97_dac_interrupt(struct vrc5477_ac97_state *s)
-{
-        struct dmabuf* dac = &s->dma_dac;
-        unsigned temp;
-
-        /* next DMA transfer should already started */
-        // ASSERT(inl(s->io + VRC5477_DAC1_CTRL) & VRC5477_DMA_WIP);
-        // ASSERT(inl(s->io + VRC5477_DAC2_CTRL) & VRC5477_DMA_WIP);
-
-        /* let us set for next next DMA transfer */
-        temp = dac->nextOut + dac->fragSize*2;
-        if (temp >= dac->fragTotalSize) {
-                ASSERT( (temp == dac->fragTotalSize) || 
-                             (temp == dac->fragTotalSize + dac->fragSize) );
-                temp -= dac->fragTotalSize;
-        }
-        outl(dac->lbufDma + temp, s->io + VRC5477_DAC1_BADDR);
-        if (s->dacChannels == 1) {
-                outl(dac->lbufDma + temp, s->io + VRC5477_DAC2_BADDR);
-        } else {
-                outl(dac->rbufDma + temp, s->io + VRC5477_DAC2_BADDR);
-        }
-
-#if defined(VRC5477_AC97_VERBOSE_DEBUG)
-        if (*(u16*)(dac->lbuf +  dac->nextOut) != outTicket) {
-                printk("assert fail: - %d vs %d\n", 
-                        *(u16*)(dac->lbuf +  dac->nextOut),
-                        outTicket);
-                ASSERT(1 == 0);
-        }
-#endif
-
-        /* adjust nextOut pointer */
-        dac->nextOut += dac->fragSize;
-        if (dac->nextOut >= dac->fragTotalSize) {
-                ASSERT(dac->nextOut == dac->fragTotalSize);
-                dac->nextOut = 0;
-        }
-
-        /* adjust count */
-        dac->count -= dac->fragSize;
-        if (dac->count <=0 ) {
-                /* buffer under run */
-                dac->count = 0;
-                dac->nextIn = dac->nextOut;
-                stop_dac(s);
-        }
-
-#if defined(VRC5477_AC97_VERBOSE_DEBUG)
-        if (dac->count) {
-                outTicket ++;
-                ASSERT(*(u16*)(dac->lbuf +  dac->nextOut) == outTicket);
-        }
-#endif
-        
-        /* we cannot have both under run and someone is waiting on us */
-        ASSERT(! (waitqueue_active(&dac->wait) && (dac->count <= 0)) );
-
-        /* wake up anybody listening */
-        if (waitqueue_active(&dac->wait))
-                wake_up_interruptible(&dac->wait);
-}
-
-static irqreturn_t vrc5477_ac97_interrupt(int irq, void *dev_id)
-{
-        struct vrc5477_ac97_state *s = (struct vrc5477_ac97_state *)dev_id;
-        u32 irqStatus;
-        u32 adcInterrupts, dacInterrupts;
-
-        spin_lock(&s->lock);
-
-        /* get irqStatus and clear the detected ones */
-        irqStatus = inl(s->io + VRC5477_INT_STATUS);
-        outl(irqStatus, s->io + VRC5477_INT_CLR);
-
-        /* let us see what we get */
-        dacInterrupts = VRC5477_INT_MASK_DAC1END | VRC5477_INT_MASK_DAC2END;
-        adcInterrupts = VRC5477_INT_MASK_ADC1END | VRC5477_INT_MASK_ADC2END;
-        if (irqStatus & dacInterrupts) {
-                /* we should get both interrupts, but just in case ...  */
-                if (irqStatus & VRC5477_INT_MASK_DAC1END) {
-                        vrc5477_ac97_dac_interrupt(s);
-                }
-                if ( (irqStatus & dacInterrupts) != dacInterrupts ) {
-                        printk(KERN_WARNING "vrc5477_ac97 : dac interrupts not in sync!!!\n");
-                        stop_dac(s);
-                        start_dac(s);
-                }
-        } else if (irqStatus & adcInterrupts) {
-                /* we should get both interrupts, but just in case ...  */
-                if(irqStatus & VRC5477_INT_MASK_ADC1END) {
-                        vrc5477_ac97_adc_interrupt(s);
-                } 
-                if ( (irqStatus & adcInterrupts) != adcInterrupts ) {
-                        printk(KERN_WARNING "vrc5477_ac97 : adc interrupts not in sync!!!\n");
-                        stop_adc(s);
-                        start_adc(s);
-                }
-        }
-
-        spin_unlock(&s->lock);
-        return IRQ_HANDLED;
-}
-
-/* --------------------------------------------------------------------- */
-
-static int vrc5477_ac97_open_mixdev(struct inode *inode, struct file *file)
-{
-        int minor = iminor(inode);
-        struct list_head *list;
-        struct vrc5477_ac97_state *s;
-
-        for (list = devs.next; ; list = list->next) {
-                if (list == &devs)
-                        return -ENODEV;
-                s = list_entry(list, struct vrc5477_ac97_state, devs);
-                if (s->codec->dev_mixer == minor)
-                        break;
-        }
-        file->private_data = s;
-        return nonseekable_open(inode, file);
-}
-
-static int vrc5477_ac97_release_mixdev(struct inode *inode, struct file *file)
-{
-        return 0;
-}
-
-
-static int mixdev_ioctl(struct ac97_codec *codec, unsigned int cmd,
-                        unsigned long arg)
-{
-        return codec->mixer_ioctl(codec, cmd, arg);
-}
-
-static int vrc5477_ac97_ioctl_mixdev(struct inode *inode, struct file *file,
-                                     unsigned int cmd, unsigned long arg)
-{
-    struct vrc5477_ac97_state *s = 
-            (struct vrc5477_ac97_state *)file->private_data;
-    struct ac97_codec *codec = s->codec;
-
-    return mixdev_ioctl(codec, cmd, arg);
-}
-
-static /*const*/ struct file_operations vrc5477_ac97_mixer_fops = {
-        .owner          = THIS_MODULE,
-        .llseek         = no_llseek,
-        .ioctl          = vrc5477_ac97_ioctl_mixdev,
-        .open           = vrc5477_ac97_open_mixdev,
-        .release        = vrc5477_ac97_release_mixdev,
-};
-
-/* --------------------------------------------------------------------- */
-
-static int drain_dac(struct vrc5477_ac97_state *s, int nonblock)
-{
-        unsigned long flags;
-        int count, tmo;
-        
-        if (!s->dma_dac.ready)
-                return 0;
-
-        for (;;) {
-                spin_lock_irqsave(&s->lock, flags);
-                count = s->dma_dac.count;
-                spin_unlock_irqrestore(&s->lock, flags);
-                if (count <= 0)
-                        break;
-                if (signal_pending(current))
-                        break;
-                if (nonblock)
-                        return -EBUSY;
-                tmo = 1000 * count / s->dacRate / 2;
-                vrc5477_ac97_delay(tmo);
-        }
-        if (signal_pending(current))
-                return -ERESTARTSYS;
-        return 0;
-}
-
-/* --------------------------------------------------------------------- */
-
-static inline int
-copy_two_channel_adc_to_user(struct vrc5477_ac97_state *s, 
-                             char *buffer, 
-                             int copyCount)
-{
-        struct dmabuf *db = &s->dma_adc;
-        int bufStart = db->nextOut;
-        for (; copyCount > 0; ) {
-                int i;
-                int count = copyCount;
-                if (count > WORK_BUF_SIZE/2) count = WORK_BUF_SIZE/2;
-                for (i=0; i< count/2; i++) {
-                        s->workBuf[i].lchannel = 
-                                *(u16*)(db->lbuf + bufStart + i*2);
-                        s->workBuf[i].rchannel = 
-                                *(u16*)(db->rbuf + bufStart + i*2);
-                }
-                if (copy_to_user(buffer, s->workBuf, count*2)) {
-                        return -1;
-                }
-
-                copyCount -= count;
-                bufStart += count;
-                ASSERT(bufStart <= db->fragTotalSize);
-                buffer += count *2;
-        }
-        return 0;
-}
-
-/* return the total bytes that is copied */
-static inline int
-copy_adc_to_user(struct vrc5477_ac97_state *s,
-                 char * buffer,
-                 size_t count,
-                 int avail)
-{
-        struct dmabuf *db = &s->dma_adc;
-        int copyCount=0;
-        int copyFragCount=0;
-        int totalCopyCount = 0;
-        int totalCopyFragCount = 0;
-        unsigned long flags;
-
-        /* adjust count to signel channel byte count */
-        count >>= s->adcChannels - 1;
-
-        /* we may have to "copy" twice as ring buffer wraps around */
-        for (; (avail > 0) && (count > 0); ) {
-                /* determine max possible copy count for single channel */
-                copyCount = count;
-                if (copyCount > avail) {
-                        copyCount = avail;
-                }
-                if (copyCount + db->nextOut > db->fragTotalSize) {
-                        copyCount = db->fragTotalSize - db->nextOut;
-                        ASSERT((copyCount % db->fragSize) == 0);
-                }
-
-                copyFragCount = (copyCount-1) >> db->fragShift;
-                copyFragCount = (copyFragCount+1) << db->fragShift;
-                ASSERT(copyFragCount >= copyCount);
-
-                /* we copy differently based on adc channels */
-                if (s->adcChannels == 1) {
-                        if (copy_to_user(buffer, 
-                                         db->lbuf + db->nextOut, 
-                                         copyCount)) 
-                                return -1;
-                } else {
-                        /* *sigh* we have to mix two streams into one  */
-                        if (copy_two_channel_adc_to_user(s, buffer, copyCount))
-                                return -1;
-                }       
-
-                count -= copyCount;
-                totalCopyCount += copyCount;
-                avail -= copyFragCount;
-                totalCopyFragCount += copyFragCount;
-
-                buffer += copyCount << (s->adcChannels-1);
-
-                db->nextOut += copyFragCount;
-                if (db->nextOut >= db->fragTotalSize) {
-                        ASSERT(db->nextOut == db->fragTotalSize);
-                        db->nextOut = 0;
-                }
-
-                ASSERT((copyFragCount % db->fragSize) == 0);
-                ASSERT( (count == 0) || (copyCount == copyFragCount));
-        }
-
-        spin_lock_irqsave(&s->lock, flags);
-        db->count -= totalCopyFragCount;
-        spin_unlock_irqrestore(&s->lock, flags);
-
-        return totalCopyCount << (s->adcChannels-1);
-}
-
-static ssize_t 
-vrc5477_ac97_read(struct file *file, 
-                  char *buffer,
-                  size_t count, 
-                  loff_t *ppos)
-{
-        struct vrc5477_ac97_state *s = 
-                (struct vrc5477_ac97_state *)file->private_data;
-        struct dmabuf *db = &s->dma_adc;
-        ssize_t ret = 0;
-        unsigned long flags;
-        int copyCount;
-        size_t avail;
-
-        if (!access_ok(VERIFY_WRITE, buffer, count))
-                return -EFAULT;
-
-        ASSERT(db->ready);
-
-        while (count > 0) {
-                // wait for samples in capture buffer
-                do {
-                        spin_lock_irqsave(&s->lock, flags);
-                        if (db->stopped)
-                                start_adc(s);
-                        avail = db->count;
-                        spin_unlock_irqrestore(&s->lock, flags);
-                        if (avail <= 0) {
-                                if (file->f_flags & O_NONBLOCK) {
-                                        if (!ret)
-                                                ret = -EAGAIN;
-                                        return ret;
-                                }
-                                interruptible_sleep_on(&db->wait);
-                                if (signal_pending(current)) {
-                                        if (!ret)
-                                                ret = -ERESTARTSYS;
-                                        return ret;
-                                }
-                        }
-                } while (avail <= 0);
-
-                ASSERT( (avail % db->fragSize) == 0);
-                copyCount = copy_adc_to_user(s, buffer, count, avail);
-                if (copyCount <=0 ) {
-                        if (!ret) ret = -EFAULT;
-                        return ret;
-                }
-
-                count -= copyCount;
-                buffer += copyCount;
-                ret += copyCount;
-        } // while (count > 0)
-
-        return ret;
-}
-
-static inline int
-copy_two_channel_dac_from_user(struct vrc5477_ac97_state *s, 
-                               const char *buffer, 
-                               int copyCount)
-{
-        struct dmabuf *db = &s->dma_dac;
-        int bufStart = db->nextIn;
-
-        ASSERT(db->ready);
-
-        for (; copyCount > 0; ) {
-                int i;
-                int count = copyCount;
-                if (count > WORK_BUF_SIZE/2) count = WORK_BUF_SIZE/2;
-                if (copy_from_user(s->workBuf, buffer, count*2)) {
-                        return -1;
-                }
-                for (i=0; i< count/2; i++) {
-                        *(u16*)(db->lbuf + bufStart + i*2) = 
-                                s->workBuf[i].lchannel;
-                        *(u16*)(db->rbuf + bufStart + i*2) = 
-                                s->workBuf[i].rchannel;
-                }
-
-                copyCount -= count;
-                bufStart += count;
-                ASSERT(bufStart <= db->fragTotalSize);
-                buffer += count *2;
-        }
-        return 0;
-
-}
-
-/* return the total bytes that is copied */
-static inline int
-copy_dac_from_user(struct vrc5477_ac97_state *s, 
-                   const char *buffer, 
-                   size_t count, 
-                   int avail)
-{       
-        struct dmabuf *db = &s->dma_dac;
-        int copyCount=0;
-        int copyFragCount=0;
-        int totalCopyCount = 0;
-        int totalCopyFragCount = 0;
-        unsigned long flags;
-#if defined(VRC5477_AC97_VERBOSE_DEBUG)
-        int i;
-#endif
-
-        /* adjust count to signel channel byte count */
-        count >>= s->dacChannels - 1;
-
-        /* we may have to "copy" twice as ring buffer wraps around */
-        for (; (avail > 0) && (count > 0); ) {
-                /* determine max possible copy count for single channel */
-                copyCount = count;
-                if (copyCount > avail) {
-                        copyCount = avail;
-                }
-                if (copyCount + db->nextIn > db->fragTotalSize) {
-                        copyCount = db->fragTotalSize - db->nextIn;
-                        ASSERT(copyCount > 0);
-                }
-
-                copyFragCount = copyCount;
-                ASSERT(copyFragCount >= copyCount);
-
-                /* we copy differently based on the number channels */
-                if (s->dacChannels == 1) {
-                        if (copy_from_user(db->lbuf + db->nextIn,
-                                           buffer,
-                                           copyCount)) 
-                                return -1;
-                        /* fill gaps with 0 */
-                        memset(db->lbuf + db->nextIn + copyCount,
-                               0,
-                               copyFragCount - copyCount);
-                } else {
-                        /* we have demux the stream into two separate ones */
-                        if (copy_two_channel_dac_from_user(s, buffer, copyCount))
-                                return -1;
-                        /* fill gaps with 0 */
-                        memset(db->lbuf + db->nextIn + copyCount,
-                               0,
-                               copyFragCount - copyCount);
-                        memset(db->rbuf + db->nextIn + copyCount,
-                               0,
-                               copyFragCount - copyCount);
-                }
-
-#if defined(VRC5477_AC97_VERBOSE_DEBUG)
-                for (i=0; i< copyFragCount; i+= db->fragSize) {
-                        *(u16*)(db->lbuf + db->nextIn + i) = inTicket ++;
-                }
-#endif
-
-                count -= copyCount;
-                totalCopyCount += copyCount;
-                avail -= copyFragCount;
-                totalCopyFragCount += copyFragCount;
-
-                buffer += copyCount << (s->dacChannels - 1);
-
-                db->nextIn += copyFragCount;
-                if (db->nextIn >= db->fragTotalSize) {
-                        ASSERT(db->nextIn == db->fragTotalSize);
-                        db->nextIn = 0;
-                }
-
-                ASSERT( (count == 0) || (copyCount == copyFragCount));
-        }
-
-        spin_lock_irqsave(&s->lock, flags);
-        db->count += totalCopyFragCount;
-        if (db->stopped) {
-                start_dac(s);
-        }
-
-        /* nextIn should not be equal to nextOut unless we are full */
-        ASSERT( ( (db->count == db->fragTotalSize) && 
-                       (db->nextIn == db->nextOut) ) ||
-                     ( (db->count < db->fragTotalSize) &&
-                       (db->nextIn != db->nextOut) ) );
-
-        spin_unlock_irqrestore(&s->lock, flags);
-
-        return totalCopyCount << (s->dacChannels-1);
-
-}
-
-static ssize_t vrc5477_ac97_write(struct file *file, const char *buffer,
-                                  size_t count, loff_t *ppos)
-{
-        struct vrc5477_ac97_state *s = 
-                (struct vrc5477_ac97_state *)file->private_data;
-        struct dmabuf *db = &s->dma_dac;
-        ssize_t ret;
-        unsigned long flags;
-        int copyCount, avail;
-
-        if (!access_ok(VERIFY_READ, buffer, count))
-                return -EFAULT;
-        ret = 0;
-    
-        while (count > 0) {
-                // wait for space in playback buffer
-                do {
-                        spin_lock_irqsave(&s->lock, flags);
-                        avail = db->fragTotalSize - db->count;
-                        spin_unlock_irqrestore(&s->lock, flags);
-                        if (avail <= 0) {
-                                if (file->f_flags & O_NONBLOCK) {
-                                        if (!ret)
-                                                ret = -EAGAIN;
-                                        return ret;
-                                }
-                                interruptible_sleep_on(&db->wait);
-                                if (signal_pending(current)) {
-                                        if (!ret)
-                                                ret = -ERESTARTSYS;
-                                        return ret;
-                                }
-                        }
-                } while (avail <= 0);
-        
-                copyCount = copy_dac_from_user(s, buffer, count, avail);
-                if (copyCount < 0) {
-                        if (!ret) ret = -EFAULT;
-                        return ret;
-                }
-
-                count -= copyCount;
-                buffer += copyCount;
-                ret += copyCount;
-        } // while (count > 0)
-        
-        return ret;
-}
-
-/* No kernel lock - we have our own spinlock */
-static unsigned int vrc5477_ac97_poll(struct file *file,
-                                      struct poll_table_struct *wait)
-{
-        struct vrc5477_ac97_state *s = (struct vrc5477_ac97_state *)file->private_data;
-        unsigned long flags;
-        unsigned int mask = 0;
-
-        if (file->f_mode & FMODE_WRITE)
-                poll_wait(file, &s->dma_dac.wait, wait);
-        if (file->f_mode & FMODE_READ)
-                poll_wait(file, &s->dma_adc.wait, wait);
-        spin_lock_irqsave(&s->lock, flags);
-        if (file->f_mode & FMODE_READ) {
-                if (s->dma_adc.count >= (signed)s->dma_adc.fragSize)
-                        mask |= POLLIN | POLLRDNORM;
-        }
-        if (file->f_mode & FMODE_WRITE) {
-                if ((signed)s->dma_dac.fragTotalSize >=
-                    s->dma_dac.count + (signed)s->dma_dac.fragSize)
-                        mask |= POLLOUT | POLLWRNORM;
-        }
-        spin_unlock_irqrestore(&s->lock, flags);
-        return mask;
-}
-
-#ifdef VRC5477_AC97_DEBUG
-static struct ioctl_str_t {
-    unsigned int cmd;
-    const char* str;
-} ioctl_str[] = {
-    {SNDCTL_DSP_RESET, "SNDCTL_DSP_RESET"},
-    {SNDCTL_DSP_SYNC, "SNDCTL_DSP_SYNC"},
-    {SNDCTL_DSP_SPEED, "SNDCTL_DSP_SPEED"},
-    {SNDCTL_DSP_STEREO, "SNDCTL_DSP_STEREO"},
-    {SNDCTL_DSP_GETBLKSIZE, "SNDCTL_DSP_GETBLKSIZE"},
-    {SNDCTL_DSP_SETFMT, "SNDCTL_DSP_SETFMT"},
-    {SNDCTL_DSP_SAMPLESIZE, "SNDCTL_DSP_SAMPLESIZE"},
-    {SNDCTL_DSP_CHANNELS, "SNDCTL_DSP_CHANNELS"},
-    {SOUND_PCM_WRITE_CHANNELS, "SOUND_PCM_WRITE_CHANNELS"},
-    {SOUND_PCM_WRITE_FILTER, "SOUND_PCM_WRITE_FILTER"},
-    {SNDCTL_DSP_POST, "SNDCTL_DSP_POST"},
-    {SNDCTL_DSP_SUBDIVIDE, "SNDCTL_DSP_SUBDIVIDE"},
-    {SNDCTL_DSP_SETFRAGMENT, "SNDCTL_DSP_SETFRAGMENT"},
-    {SNDCTL_DSP_GETFMTS, "SNDCTL_DSP_GETFMTS"},
-    {SNDCTL_DSP_GETOSPACE, "SNDCTL_DSP_GETOSPACE"},
-    {SNDCTL_DSP_GETISPACE, "SNDCTL_DSP_GETISPACE"},
-    {SNDCTL_DSP_NONBLOCK, "SNDCTL_DSP_NONBLOCK"},
-    {SNDCTL_DSP_GETCAPS, "SNDCTL_DSP_GETCAPS"},
-    {SNDCTL_DSP_GETTRIGGER, "SNDCTL_DSP_GETTRIGGER"},
-    {SNDCTL_DSP_SETTRIGGER, "SNDCTL_DSP_SETTRIGGER"},
-    {SNDCTL_DSP_GETIPTR, "SNDCTL_DSP_GETIPTR"},
-    {SNDCTL_DSP_GETOPTR, "SNDCTL_DSP_GETOPTR"},
-    {SNDCTL_DSP_MAPINBUF, "SNDCTL_DSP_MAPINBUF"},
-    {SNDCTL_DSP_MAPOUTBUF, "SNDCTL_DSP_MAPOUTBUF"},
-    {SNDCTL_DSP_SETSYNCRO, "SNDCTL_DSP_SETSYNCRO"},
-    {SNDCTL_DSP_SETDUPLEX, "SNDCTL_DSP_SETDUPLEX"},
-    {SNDCTL_DSP_GETODELAY, "SNDCTL_DSP_GETODELAY"},
-    {SNDCTL_DSP_GETCHANNELMASK, "SNDCTL_DSP_GETCHANNELMASK"},
-    {SNDCTL_DSP_BIND_CHANNEL, "SNDCTL_DSP_BIND_CHANNEL"},
-    {OSS_GETVERSION, "OSS_GETVERSION"},
-    {SOUND_PCM_READ_RATE, "SOUND_PCM_READ_RATE"},
-    {SOUND_PCM_READ_CHANNELS, "SOUND_PCM_READ_CHANNELS"},
-    {SOUND_PCM_READ_BITS, "SOUND_PCM_READ_BITS"},
-    {SOUND_PCM_READ_FILTER, "SOUND_PCM_READ_FILTER"}
-};
-#endif    
-
-static int vrc5477_ac97_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg)
-{
-        struct vrc5477_ac97_state *s = (struct vrc5477_ac97_state *)file->private_data;
-        unsigned long flags;
-        audio_buf_info abinfo;
-        int count;
-        int val, ret;
-
-#ifdef VRC5477_AC97_DEBUG
-        for (count = 0; count < ARRAY_SIZE(ioctl_str); count++) {
-                if (ioctl_str[count].cmd == cmd)
-                        break;
-        }
-        if (count < ARRAY_SIZE(ioctl_str))
-                printk(KERN_INFO PFX "ioctl %s\n", ioctl_str[count].str);
-        else
-                printk(KERN_INFO PFX "ioctl unknown, 0x%x\n", cmd);
-#endif
-    
-        switch (cmd) {
-        case OSS_GETVERSION:
-                return put_user(SOUND_VERSION, (int *)arg);
-
-        case SNDCTL_DSP_SYNC:
-                if (file->f_mode & FMODE_WRITE)
-                        return drain_dac(s, file->f_flags & O_NONBLOCK);
-                return 0;
-                
-        case SNDCTL_DSP_SETDUPLEX:
-                return 0;
-
-        case SNDCTL_DSP_GETCAPS:
-                return put_user(DSP_CAP_DUPLEX, (int *)arg);
-                
-        case SNDCTL_DSP_RESET:
-                if (file->f_mode & FMODE_WRITE) {
-                        stop_dac(s);
-                        synchronize_irq(s->irq);
-                        s->dma_dac.count = 0;
-                        s->dma_dac.nextIn = s->dma_dac.nextOut = 0;
-                }
-                if (file->f_mode & FMODE_READ) {
-                        stop_adc(s);
-                        synchronize_irq(s->irq);
-                        s->dma_adc.count = 0;
-                        s->dma_adc.nextIn = s->dma_adc.nextOut = 0;
-                }
-                return 0;
-
-        case SNDCTL_DSP_SPEED:
-                if (get_user(val, (int *)arg))
-                        return -EFAULT;
-                if (val >= 0) {
-                        if (file->f_mode & FMODE_READ) {
-                                stop_adc(s);
-                                set_adc_rate(s, val);
-                                if ((ret = prog_dmabuf_adc(s)))
-                                        return ret;
-                        }
-                        if (file->f_mode & FMODE_WRITE) {
-                                stop_dac(s);
-                                set_dac_rate(s, val);
-                                if ((ret = prog_dmabuf_dac(s)))
-                                        return ret;
-                        }
-                }
-                return put_user((file->f_mode & FMODE_READ) ?
-                                s->adcRate : s->dacRate, (int *)arg);
-
-        case SNDCTL_DSP_STEREO:
-                if (get_user(val, (int *)arg))
-                        return -EFAULT;
-                if (file->f_mode & FMODE_READ) {
-                        stop_adc(s);
-                        if (val)
-                                s->adcChannels = 2;
-                        else
-                                s->adcChannels = 1;
-                        if ((ret = prog_dmabuf_adc(s)))
-                                return ret;
-                }
-                if (file->f_mode & FMODE_WRITE) {
-                        stop_dac(s);
-                        if (val)
-                                s->dacChannels = 2;
-                        else
-                                s->dacChannels = 1;
-                        if ((ret = prog_dmabuf_dac(s)))
-                                return ret;
-                }
-                return 0;
-
-        case SNDCTL_DSP_CHANNELS:
-                if (get_user(val, (int *)arg))
-                        return -EFAULT;
-                if (val != 0) {
-                        if ( (val != 1) && (val != 2)) val = 2;
-
-                        if (file->f_mode & FMODE_READ) {
-                                stop_adc(s);
-                                s->dacChannels = val;
-                                if ((ret = prog_dmabuf_adc(s)))
-                                        return ret;
-                        }
-                        if (file->f_mode & FMODE_WRITE) {
-                                stop_dac(s);
-                                s->dacChannels = val;
-                                if ((ret = prog_dmabuf_dac(s)))
-                                        return ret;
-                        }
-                }
-                return put_user(val, (int *)arg);
-                
-        case SNDCTL_DSP_GETFMTS: /* Returns a mask */
-                return put_user(AFMT_S16_LE, (int *)arg);
-                
-        case SNDCTL_DSP_SETFMT: /* Selects ONE fmt*/
-                if (get_user(val, (int *)arg))
-                        return -EFAULT;
-                if (val != AFMT_QUERY) {
-                        if (val != AFMT_S16_LE) return -EINVAL;
-                        if (file->f_mode & FMODE_READ) {
-                                stop_adc(s);
-                                if ((ret = prog_dmabuf_adc(s)))
-                                        return ret;
-                        }
-                        if (file->f_mode & FMODE_WRITE) {
-                                stop_dac(s);
-                                if ((ret = prog_dmabuf_dac(s)))
-                                        return ret;
-                        }
-                } else {
-                        val = AFMT_S16_LE;
-                }
-                return put_user(val, (int *)arg);
-                
-        case SNDCTL_DSP_POST:
-                return 0;
-
-        case SNDCTL_DSP_GETTRIGGER:
-        case SNDCTL_DSP_SETTRIGGER:
-                /* NO trigger */
-                return -EINVAL;
-
-        case SNDCTL_DSP_GETOSPACE:
-                if (!(file->f_mode & FMODE_WRITE))
-                        return -EINVAL;
-                abinfo.fragsize = s->dma_dac.fragSize << (s->dacChannels-1);
-                spin_lock_irqsave(&s->lock, flags);
-                count = s->dma_dac.count;
-                spin_unlock_irqrestore(&s->lock, flags);
-                abinfo.bytes = (s->dma_dac.fragTotalSize - count) << 
-                        (s->dacChannels-1);
-                abinfo.fragstotal = s->dma_dac.numFrag;
-                abinfo.fragments = abinfo.bytes >> s->dma_dac.fragShift >> 
-                        (s->dacChannels-1);      
-                return copy_to_user((void *)arg, &abinfo, sizeof(abinfo)) ? -EFAULT : 0;
-
-        case SNDCTL_DSP_GETISPACE:
-                if (!(file->f_mode & FMODE_READ))
-                        return -EINVAL;
-                abinfo.fragsize = s->dma_adc.fragSize << (s->adcChannels-1);
-                spin_lock_irqsave(&s->lock, flags);
-                count = s->dma_adc.count;
-                spin_unlock_irqrestore(&s->lock, flags);
-                if (count < 0)
-                        count = 0;
-                abinfo.bytes = count << (s->adcChannels-1);
-                abinfo.fragstotal = s->dma_adc.numFrag;
-                abinfo.fragments = (abinfo.bytes >> s->dma_adc.fragShift) >>
-                        (s->adcChannels-1);      
-                return copy_to_user((void *)arg, &abinfo, sizeof(abinfo)) ? -EFAULT : 0;
-                
-        case SNDCTL_DSP_NONBLOCK:
-                file->f_flags |= O_NONBLOCK;
-                return 0;
-
-        case SNDCTL_DSP_GETODELAY:
-                if (!(file->f_mode & FMODE_WRITE))
-                        return -EINVAL;
-                spin_lock_irqsave(&s->lock, flags);
-                count = s->dma_dac.count;
-                spin_unlock_irqrestore(&s->lock, flags);
-                return put_user(count, (int *)arg);
-
-        case SNDCTL_DSP_GETIPTR:
-        case SNDCTL_DSP_GETOPTR:
-                /* we cannot get DMA ptr */
-                return -EINVAL;
-
-        case SNDCTL_DSP_GETBLKSIZE:
-                if (file->f_mode & FMODE_WRITE)
-                        return put_user(s->dma_dac.fragSize << (s->dacChannels-1), (int *)arg);
-                else
-                        return put_user(s->dma_adc.fragSize << (s->adcChannels-1), (int *)arg);
-
-        case SNDCTL_DSP_SETFRAGMENT:
-                /* we ignore fragment size request */
-                return 0;
-
-        case SNDCTL_DSP_SUBDIVIDE:
-                /* what is this for? [jsun] */
-                return 0;
-
-        case SOUND_PCM_READ_RATE:
-                return put_user((file->f_mode & FMODE_READ) ?
-                                s->adcRate : s->dacRate, (int *)arg);
-
-        case SOUND_PCM_READ_CHANNELS:
-                if (file->f_mode & FMODE_READ)
-                        return put_user(s->adcChannels, (int *)arg);
-                else
-                        return put_user(s->dacChannels ? 2 : 1, (int *)arg);
-            
-        case SOUND_PCM_READ_BITS:
-                return put_user(16, (int *)arg);
-
-        case SOUND_PCM_WRITE_FILTER:
-        case SNDCTL_DSP_SETSYNCRO:
-        case SOUND_PCM_READ_FILTER:
-                return -EINVAL;
-        }
-
-        return mixdev_ioctl(s->codec, cmd, arg);
-}
-
-
-static int vrc5477_ac97_open(struct inode *inode, struct file *file)
-{
-        int minor = iminor(inode);
-        DECLARE_WAITQUEUE(wait, current);
-        unsigned long flags;
-        struct list_head *list;
-        struct vrc5477_ac97_state *s;
-        int ret=0;
-
-        nonseekable_open(inode, file);    
-        for (list = devs.next; ; list = list->next) {
-                if (list == &devs)
-                        return -ENODEV;
-                s = list_entry(list, struct vrc5477_ac97_state, devs);
-                if (!((s->dev_audio ^ minor) & ~0xf))
-                        break;
-        }
-        file->private_data = s;
-
-        /* wait for device to become free */
-        mutex_lock(&s->open_mutex);
-        while (s->open_mode & file->f_mode) {
-
-                if (file->f_flags & O_NONBLOCK) {
-                        mutex_unlock(&s->open_mutex);
-                        return -EBUSY;
-                }
-                add_wait_queue(&s->open_wait, &wait);
-                __set_current_state(TASK_INTERRUPTIBLE);
-                mutex_unlock(&s->open_mutex);
-                schedule();
-                remove_wait_queue(&s->open_wait, &wait);
-                set_current_state(TASK_RUNNING);
-                if (signal_pending(current))
-                        return -ERESTARTSYS;
-                mutex_lock(&s->open_mutex);
-        }
-
-        spin_lock_irqsave(&s->lock, flags);
-
-        if (file->f_mode & FMODE_READ) {
-                /* set default settings */
-                set_adc_rate(s, 48000);
-                s->adcChannels = 2;
-
-                ret = prog_dmabuf_adc(s);
-                if (ret) goto bailout;
-        }
-        if (file->f_mode & FMODE_WRITE) {
-                /* set default settings */
-                set_dac_rate(s, 48000);
-                s->dacChannels = 2;
-
-                ret = prog_dmabuf_dac(s);
-                if (ret) goto bailout;
-        }
-
-        s->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE);
-
- bailout:
-        spin_unlock_irqrestore(&s->lock, flags);
-
-        mutex_unlock(&s->open_mutex);
-        return ret;
-}
-
-static int vrc5477_ac97_release(struct inode *inode, struct file *file)
-{
-        struct vrc5477_ac97_state *s = 
-                (struct vrc5477_ac97_state *)file->private_data;
-
-        lock_kernel();
-        if (file->f_mode & FMODE_WRITE)
-                drain_dac(s, file->f_flags & O_NONBLOCK);
-        mutex_lock(&s->open_mutex);
-        if (file->f_mode & FMODE_WRITE) {
-                stop_dac(s);
-                dealloc_dmabuf(s, &s->dma_dac);
-        }
-        if (file->f_mode & FMODE_READ) {
-                stop_adc(s);
-                dealloc_dmabuf(s, &s->dma_adc);
-        }
-        s->open_mode &= (~file->f_mode) & (FMODE_READ|FMODE_WRITE);
-        mutex_unlock(&s->open_mutex);
-        wake_up(&s->open_wait);
-        unlock_kernel();
-        return 0;
-}
-
-static /*const*/ struct file_operations vrc5477_ac97_audio_fops = {
-        .owner          = THIS_MODULE,
-        .llseek         = no_llseek,
-        .read           = vrc5477_ac97_read,
-        .write          = vrc5477_ac97_write,
-        .poll           = vrc5477_ac97_poll,
-        .ioctl          = vrc5477_ac97_ioctl,
-        // .mmap        = vrc5477_ac97_mmap,
-        .open           = vrc5477_ac97_open,
-        .release        = vrc5477_ac97_release,
-};
-
-
-/* --------------------------------------------------------------------- */
-
-
-/* --------------------------------------------------------------------- */
-
-/*
- * for debugging purposes, we'll create a proc device that dumps the
- * CODEC chipstate
- */
-
-#ifdef VRC5477_AC97_DEBUG
-
-struct {
-       const char *regname;
-       unsigned regaddr;
-} vrc5477_ac97_regs[] = {
-        {"VRC5477_INT_STATUS", VRC5477_INT_STATUS},
-        {"VRC5477_CODEC_WR", VRC5477_CODEC_WR},
-        {"VRC5477_CODEC_RD", VRC5477_CODEC_RD},
-        {"VRC5477_CTRL", VRC5477_CTRL},
-        {"VRC5477_ACLINK_CTRL", VRC5477_ACLINK_CTRL},
-        {"VRC5477_INT_MASK", VRC5477_INT_MASK},
-        {"VRC5477_DAC1_CTRL", VRC5477_DAC1_CTRL},
-        {"VRC5477_DAC1L", VRC5477_DAC1L},
-        {"VRC5477_DAC1_BADDR", VRC5477_DAC1_BADDR},
-        {"VRC5477_DAC2_CTRL", VRC5477_DAC2_CTRL},
-        {"VRC5477_DAC2L", VRC5477_DAC2L},
-        {"VRC5477_DAC2_BADDR", VRC5477_DAC2_BADDR},
-        {"VRC5477_DAC3_CTRL", VRC5477_DAC3_CTRL},
-        {"VRC5477_DAC3L", VRC5477_DAC3L},
-        {"VRC5477_DAC3_BADDR", VRC5477_DAC3_BADDR},
-        {"VRC5477_ADC1_CTRL", VRC5477_ADC1_CTRL},
-        {"VRC5477_ADC1L", VRC5477_ADC1L},
-        {"VRC5477_ADC1_BADDR", VRC5477_ADC1_BADDR},
-        {"VRC5477_ADC2_CTRL", VRC5477_ADC2_CTRL},
-        {"VRC5477_ADC2L", VRC5477_ADC2L},
-        {"VRC5477_ADC2_BADDR", VRC5477_ADC2_BADDR},
-        {"VRC5477_ADC3_CTRL", VRC5477_ADC3_CTRL},
-        {"VRC5477_ADC3L", VRC5477_ADC3L},
-        {"VRC5477_ADC3_BADDR", VRC5477_ADC3_BADDR},
-        {NULL, 0x0}
-};
-
-static int proc_vrc5477_ac97_dump (char *buf, char **start, off_t fpos,
-                                   int length, int *eof, void *data)
-{
-        struct vrc5477_ac97_state *s;
-        int cnt, len = 0;
-
-        if (list_empty(&devs))
-                return 0;
-        s = list_entry(devs.next, struct vrc5477_ac97_state, devs);
-
-        /* print out header */
-        len += sprintf(buf + len, "\n\t\tVrc5477 Audio Debug\n\n");
-
-        // print out digital controller state
-        len += sprintf (buf + len, "NEC Vrc5477 Audio Controller registers\n");
-        len += sprintf (buf + len, "---------------------------------\n");
-        for (cnt=0; vrc5477_ac97_regs[cnt].regname != NULL; cnt++) {
-                len+= sprintf (buf + len, "%-20s = %08x\n",
-                               vrc5477_ac97_regs[cnt].regname,
-                               inl(s->io + vrc5477_ac97_regs[cnt].regaddr));
-        }
-   
-        /* print out driver state */
-        len += sprintf (buf + len, "NEC Vrc5477 Audio driver states\n");
-        len += sprintf (buf + len, "---------------------------------\n");
-        len += sprintf (buf + len, "dacChannels  = %d\n", s->dacChannels);
-        len += sprintf (buf + len, "adcChannels  = %d\n", s->adcChannels);
-        len += sprintf (buf + len, "dacRate  = %d\n", s->dacRate);
-        len += sprintf (buf + len, "adcRate  = %d\n", s->adcRate);
-
-        len += sprintf (buf + len, "dma_dac is %s ready\n",  
-                        s->dma_dac.ready? "" : "not");
-        if (s->dma_dac.ready) {
-                len += sprintf (buf + len, "dma_dac is %s stopped.\n",  
-                                s->dma_dac.stopped? "" : "not");
-                len += sprintf (buf + len, "dma_dac.fragSize = %x\n", 
-                                s->dma_dac.fragSize);
-                len += sprintf (buf + len, "dma_dac.fragShift = %x\n", 
-                                s->dma_dac.fragShift);
-                len += sprintf (buf + len, "dma_dac.numFrag = %x\n", 
-                                s->dma_dac.numFrag);
-                len += sprintf (buf + len, "dma_dac.fragTotalSize = %x\n", 
-                                s->dma_dac.fragTotalSize);
-                len += sprintf (buf + len, "dma_dac.nextIn = %x\n", 
-                                s->dma_dac.nextIn);
-                len += sprintf (buf + len, "dma_dac.nextOut = %x\n", 
-                                s->dma_dac.nextOut);
-                len += sprintf (buf + len, "dma_dac.count = %x\n", 
-                                s->dma_dac.count);
-        }
-
-        len += sprintf (buf + len, "dma_adc is %s ready\n",  
-                        s->dma_adc.ready? "" : "not");
-        if (s->dma_adc.ready) {
-                len += sprintf (buf + len, "dma_adc is %s stopped.\n",  
-                                s->dma_adc.stopped? "" : "not");
-                len += sprintf (buf + len, "dma_adc.fragSize = %x\n", 
-                                s->dma_adc.fragSize);
-                len += sprintf (buf + len, "dma_adc.fragShift = %x\n", 
-                                s->dma_adc.fragShift);
-                len += sprintf (buf + len, "dma_adc.numFrag = %x\n", 
-                                s->dma_adc.numFrag);
-                len += sprintf (buf + len, "dma_adc.fragTotalSize = %x\n", 
-                                s->dma_adc.fragTotalSize);
-                len += sprintf (buf + len, "dma_adc.nextIn = %x\n", 
-                                s->dma_adc.nextIn);
-                len += sprintf (buf + len, "dma_adc.nextOut = %x\n", 
-                                s->dma_adc.nextOut);
-                len += sprintf (buf + len, "dma_adc.count = %x\n", 
-                                s->dma_adc.count);
-        }
-         
-        /* print out CODEC state */
-        len += sprintf (buf + len, "\nAC97 CODEC registers\n");
-        len += sprintf (buf + len, "----------------------\n");
-        for (cnt=0; cnt <= 0x7e; cnt = cnt +2)
-                len+= sprintf (buf + len, "reg %02x = %04x\n",
-                               cnt, rdcodec(s->codec, cnt));
-
-        if (fpos >=len){
-                *start = buf;
-                *eof =1;
-                return 0;
-        }
-        *start = buf + fpos;
-        if ((len -= fpos) > length)
-                return length;
-        *eof =1;
-        return len;
-
-}
-#endif /* VRC5477_AC97_DEBUG */
-
-/* --------------------------------------------------------------------- */
-
-/* maximum number of devices; only used for command line params */
-#define NR_DEVICE 5
-
-static unsigned int devindex;
-
-MODULE_AUTHOR("Monta Vista Software, jsun@mvista.com or jsun@junsun.net");
-MODULE_DESCRIPTION("NEC Vrc5477 audio (AC97) Driver");
-MODULE_LICENSE("GPL");
-
-static int __devinit vrc5477_ac97_probe(struct pci_dev *pcidev,
-                                        const struct pci_device_id *pciid)
-{
-        struct vrc5477_ac97_state *s;
-#ifdef VRC5477_AC97_DEBUG
-        char proc_str[80];
-#endif
-
-        if (pcidev->irq == 0) 
-                return -1;
-
-        if (!(s = kzalloc(sizeof(struct vrc5477_ac97_state), GFP_KERNEL))) {
-                printk(KERN_ERR PFX "alloc of device struct failed\n");
-                return -1;
-        }
-
-        init_waitqueue_head(&s->dma_adc.wait);
-        init_waitqueue_head(&s->dma_dac.wait);
-        init_waitqueue_head(&s->open_wait);
-        mutex_init(&s->open_mutex);
-        spin_lock_init(&s->lock);
-
-        s->dev = pcidev;
-        s->io = pci_resource_start(pcidev, 0);
-        s->irq = pcidev->irq;
-        
-        s->codec = ac97_alloc_codec();
-
-        s->codec->private_data = s;
-        s->codec->id = 0;
-        s->codec->codec_read = rdcodec;
-        s->codec->codec_write = wrcodec;
-        s->codec->codec_wait = waitcodec;
-
-        /* setting some other default values such as
-         * adcChannels, adcRate is done in open() so that
-         * no persistent state across file opens.
-         */
-
-        /* test if get response from ac97, if not return */
-        if (ac97_codec_not_present(s->codec)) {
-                printk(KERN_ERR PFX "no ac97 codec\n");
-                goto err_region;
-
-        }
-
-        /* test if get response from ac97, if not return */
-        if (ac97_codec_not_present(&(s->codec))) {
-                printk(KERN_ERR PFX "no ac97 codec\n");
-                goto err_region;
-
-        }
-
-        if (!request_region(s->io, pci_resource_len(pcidev,0),
-                            VRC5477_AC97_MODULE_NAME)) {
-                printk(KERN_ERR PFX "io ports %#lx->%#lx in use\n",
-                       s->io, s->io + pci_resource_len(pcidev,0)-1);
-                goto err_region;
-        }
-        if (request_irq(s->irq, vrc5477_ac97_interrupt, IRQF_DISABLED,
-                        VRC5477_AC97_MODULE_NAME, s)) {
-                printk(KERN_ERR PFX "irq %u in use\n", s->irq);
-                goto err_irq;
-        }
-
-        printk(KERN_INFO PFX "IO at %#lx, IRQ %d\n", s->io, s->irq);
-
-        /* register devices */
-        if ((s->dev_audio = register_sound_dsp(&vrc5477_ac97_audio_fops, -1)) < 0)
-                goto err_dev1;
-        if ((s->codec->dev_mixer =
-             register_sound_mixer(&vrc5477_ac97_mixer_fops, -1)) < 0)
-                goto err_dev2;
-
-#ifdef VRC5477_AC97_DEBUG
-        /* initialize the debug proc device */
-        s->ps = create_proc_read_entry(VRC5477_AC97_MODULE_NAME, 0, NULL,
-                                       proc_vrc5477_ac97_dump, NULL);
-#endif /* VRC5477_AC97_DEBUG */
-        
-        /* enable pci io and bus mastering */
-        if (pci_enable_device(pcidev))
-                goto err_dev3;
-        pci_set_master(pcidev);
-
-        /* cold reset the AC97 */
-        outl(VRC5477_ACLINK_CTRL_RST_ON | VRC5477_ACLINK_CTRL_RST_TIME,
-             s->io + VRC5477_ACLINK_CTRL);
-        while (inl(s->io + VRC5477_ACLINK_CTRL) & VRC5477_ACLINK_CTRL_RST_ON);
-
-        /* codec init */
-        if (!ac97_probe_codec(s->codec))
-                goto err_dev3;
-
-#ifdef VRC5477_AC97_DEBUG
-        sprintf(proc_str, "driver/%s/%d/ac97", 
-                VRC5477_AC97_MODULE_NAME, s->codec->id);
-        s->ac97_ps = create_proc_read_entry (proc_str, 0, NULL,
-                                             ac97_read_proc, s->codec);
-        /* TODO : why this proc file does not show up? */
-#endif
-
-        /* Try to enable variable rate audio mode. */
-        wrcodec(s->codec, AC97_EXTENDED_STATUS,
-                rdcodec(s->codec, AC97_EXTENDED_STATUS) | AC97_EXTSTAT_VRA);
-        /* Did we enable it? */
-        if(rdcodec(s->codec, AC97_EXTENDED_STATUS) & AC97_EXTSTAT_VRA)
-                s->extended_status |= AC97_EXTSTAT_VRA;
-        else {
-                s->dacRate = 48000;
-                printk(KERN_INFO PFX "VRA mode not enabled; rate fixed at %d.",
-                        s->dacRate);
-        }
-
-        /* let us get the default volumne louder */
-        wrcodec(s->codec, 0x2, 0x1010); /* master volume, middle */
-        wrcodec(s->codec, 0xc, 0x10);           /* phone volume, middle */
-        // wrcodec(s->codec, 0xe, 0x10);                /* misc volume, middle */
-        wrcodec(s->codec, 0x10, 0x8000);        /* line-in 2 line-out disable */
-        wrcodec(s->codec, 0x18, 0x0707);        /* PCM out (line out) middle */
-
-
-        /* by default we select line in the input */
-        wrcodec(s->codec, 0x1a, 0x0404);
-        wrcodec(s->codec, 0x1c, 0x0f0f);
-        wrcodec(s->codec, 0x1e, 0x07);
-
-        /* enable the master interrupt but disable all others */
-        outl(VRC5477_INT_MASK_NMASK, s->io + VRC5477_INT_MASK);
-
-        /* store it in the driver field */
-        pci_set_drvdata(pcidev, s);
-        pcidev->dma_mask = 0xffffffff;
-        /* put it into driver list */
-        list_add_tail(&s->devs, &devs);
-        /* increment devindex */
-        if (devindex < NR_DEVICE-1)
-                devindex++;
-        return 0;
-
- err_dev3:
-        unregister_sound_mixer(s->codec->dev_mixer);
- err_dev2:
-        unregister_sound_dsp(s->dev_audio);
- err_dev1:
-        printk(KERN_ERR PFX "cannot register misc device\n");
-        free_irq(s->irq, s);
- err_irq:
-        release_region(s->io, pci_resource_len(pcidev,0));
- err_region:
-        ac97_release_codec(codec);
-        kfree(s);
-        return -1;
-}
-
-static void __devexit vrc5477_ac97_remove(struct pci_dev *dev)
-{
-        struct vrc5477_ac97_state *s = pci_get_drvdata(dev);
-
-        if (!s)
-                return;
-        list_del(&s->devs);
-
-#ifdef VRC5477_AC97_DEBUG
-        if (s->ps)
-                remove_proc_entry(VRC5477_AC97_MODULE_NAME, NULL);
-#endif /* VRC5477_AC97_DEBUG */
-
-        synchronize_irq();
-        free_irq(s->irq, s);
-        release_region(s->io, pci_resource_len(dev,0));
-        unregister_sound_dsp(s->dev_audio);
-        unregister_sound_mixer(s->codec->dev_mixer);
-        ac97_release_codec(s->codec);
-        kfree(s);
-        pci_set_drvdata(dev, NULL);
-}
-
-
-static struct pci_device_id id_table[] = {
-    { PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_VRC5477_AC97, 
-      PCI_ANY_ID, PCI_ANY_ID, 0, 0 },
-    { 0, }
-};
-
-MODULE_DEVICE_TABLE(pci, id_table);
-
-static struct pci_driver vrc5477_ac97_driver = {
-        .name           = VRC5477_AC97_MODULE_NAME,
-        .id_table       = id_table,
-        .probe          = vrc5477_ac97_probe,
-        .remove         = __devexit_p(vrc5477_ac97_remove)
-};
-
-static int __init init_vrc5477_ac97(void)
-{
-        printk("Vrc5477 AC97 driver: version v0.2 time " __TIME__ " " __DATE__ " by Jun Sun\n");
-        return pci_register_driver(&vrc5477_ac97_driver);
-}
-
-static void __exit cleanup_vrc5477_ac97(void)
-{
-        printk(KERN_INFO PFX "unloading\n");
-        pci_unregister_driver(&vrc5477_ac97_driver);
-}
-
-module_init(init_vrc5477_ac97);
-module_exit(cleanup_vrc5477_ac97);
-
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 6523ba07db96..188c7cf21b82 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -781,6 +781,8 @@ static struct pci_device_id snd_bt87x_ids[] = {
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, 0x0070, 0x13eb, 32000),
         /* Viewcast Osprey 200 */
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0xff01, 44100),
+        /* Viewcast Osprey 440 (rate is configurable via gpio) */
+        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0xff07, 32000),
         /* ATI TV-Wonder */
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1002, 0x0001, 32000),
         /* Leadtek Winfast tv 2000xp delux */
diff --git a/sound/sh/aica.h b/sound/sh/aica.h
index 8c11e3d10a50..d098baaa0116 100644
--- a/sound/sh/aica.h
+++ b/sound/sh/aica.h
@@ -52,7 +52,7 @@
 #define AICA_CHANNEL1_OFFSET 0x21000
 #define CHANNEL_OFFSET 0x10000
 
-#define AICA_DMA_CHANNEL 0
+#define AICA_DMA_CHANNEL 5
 #define AICA_DMA_MODE 5
 
 #define SND_AICA_DRIVER "AICA"