Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

166 files changed, 2534 insertions, 3060 deletions

diff --git a/arch/alpha/lib/checksum.c b/arch/alpha/lib/checksum.c
index 89044e6385fe..ab3761c437a8 100644
--- a/arch/alpha/lib/checksum.c
+++ b/arch/alpha/lib/checksum.c
@@ -41,28 +41,25 @@ static inline unsigned short from64to16(unsigned long x)
  * computes the checksum of the TCP/UDP pseudo-header
  * returns a 16-bit checksum, already complemented.
  */
-unsigned short int csum_tcpudp_magic(unsigned long saddr,
-                                   unsigned long daddr,
+__sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
                                    unsigned short len,
                                    unsigned short proto,
-                                   unsigned int sum)
+                                   __wsum sum)
 {
-        return ~from64to16(saddr + daddr + sum +
-                ((unsigned long) ntohs(len) << 16) +
-                ((unsigned long) proto << 8));
+        return (__force __sum16)~from64to16(
+                (__force u64)saddr + (__force u64)daddr +
+                (__force u64)sum + ((len + proto) << 8));
 }
 
-unsigned int csum_tcpudp_nofold(unsigned long saddr,
-                                   unsigned long daddr,
+__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
                                    unsigned short len,
                                    unsigned short proto,
-                                   unsigned int sum)
+                                   __wsum sum)
 {
         unsigned long result;
 
-        result = (saddr + daddr + sum +
-                  ((unsigned long) ntohs(len) << 16) +
-                  ((unsigned long) proto << 8));
+        result = (__force u64)saddr + (__force u64)daddr +
+                 (__force u64)sum + ((len + proto) << 8);
 
         /* Fold down to 32-bits so we don't lose in the typedef-less 
            network stack.  */
@@ -70,7 +67,7 @@ unsigned int csum_tcpudp_nofold(unsigned long saddr,
         result = (result & 0xffffffff) + (result >> 32);
         /* 33 to 32 */
         result = (result & 0xffffffff) + (result >> 32);
-        return result;
+        return (__force __wsum)result;
 }
 
 /*
@@ -146,9 +143,9 @@ out:
  *      This is a version of ip_compute_csum() optimized for IP headers,
  *      which always checksum on 4 octet boundaries.
  */
-unsigned short ip_fast_csum(unsigned char * iph, unsigned int ihl)
+__sum16 ip_fast_csum(const void *iph, unsigned int ihl)
 {
-        return ~do_csum(iph,ihl*4);
+        return (__force __sum16)~do_csum(iph,ihl*4);
 }
 
 /*
@@ -163,15 +160,15 @@ unsigned short ip_fast_csum(unsigned char * iph, unsigned int ihl)
  *
  * it's best to have buff aligned on a 32-bit boundary
  */
-unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum)
+__wsum csum_partial(const void *buff, int len, __wsum sum)
 {
         unsigned long result = do_csum(buff, len);
 
         /* add in old sum, and carry.. */
-        result += sum;
+        result += (__force u32)sum;
         /* 32+c bits -> 32 bits */
         result = (result & 0xffffffff) + (result >> 32);
-        return result;
+        return (__force __wsum)result;
 }
 
 EXPORT_SYMBOL(csum_partial);
@@ -180,7 +177,7 @@ EXPORT_SYMBOL(csum_partial);
  * this routine is used for miscellaneous IP-like checksums, mainly
  * in icmp.c
  */
-unsigned short ip_compute_csum(unsigned char * buff, int len)
+__sum16 ip_compute_csum(const void *buff, int len)
 {
-        return ~from64to16(do_csum(buff,len));
+        return (__force __sum16)~from64to16(do_csum(buff,len));
 }
diff --git a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c
index a37948f3037a..4ca75c74ce90 100644
--- a/arch/alpha/lib/csum_partial_copy.c
+++ b/arch/alpha/lib/csum_partial_copy.c
@@ -329,11 +329,11 @@ csum_partial_cfu_unaligned(const unsigned long __user * src,
         return checksum;
 }
 
-static unsigned int
-do_csum_partial_copy_from_user(const char __user *src, char *dst, int len,
-                               unsigned int sum, int *errp)
+__wsum
+csum_partial_copy_from_user(const void __user *src, void *dst, int len,
+                               __wsum sum, int *errp)
 {
-        unsigned long checksum = (unsigned) sum;
+        unsigned long checksum = (__force u32) sum;
         unsigned long soff = 7 & (unsigned long) src;
         unsigned long doff = 7 & (unsigned long) dst;
 
@@ -367,25 +367,12 @@ do_csum_partial_copy_from_user(const char __user *src, char *dst, int len,
                 }
                 checksum = from64to16 (checksum);
         }
-        return checksum;
-}
-
-unsigned int
-csum_partial_copy_from_user(const char __user *src, char *dst, int len,
-                            unsigned int sum, int *errp)
-{
-        if (!access_ok(VERIFY_READ, src, len)) {
-                *errp = -EFAULT;
-                memset(dst, 0, len);
-                return sum;
-        }
-
-        return do_csum_partial_copy_from_user(src, dst, len, sum, errp);
+        return (__force __wsum)checksum;
 }
 
-unsigned int
-csum_partial_copy_nocheck(const char __user *src, char *dst, int len,
-                          unsigned int sum)
+__wsum
+csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
 {
-        return do_csum_partial_copy_from_user(src, dst, len, sum, NULL);
+        return csum_partial_copy_from_user((__force const void __user *)src,
+                        dst, len, sum, NULL);
 }
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index adb05de40e24..ce00c570459d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -879,6 +879,8 @@ endif
 
 source "drivers/scsi/Kconfig"
 
+source "drivers/ata/Kconfig"
+
 source "drivers/md/Kconfig"
 
 source "drivers/message/fusion/Kconfig"
diff --git a/arch/arm/configs/assabet_defconfig b/arch/arm/configs/assabet_defconfig
index 089c9d598409..b1cd331aaecf 100644
--- a/arch/arm/configs/assabet_defconfig
+++ b/arch/arm/configs/assabet_defconfig
@@ -184,6 +184,7 @@ CONFIG_BINFMT_ELF=y
 # Power management options
 #
 CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
 # CONFIG_APM is not set
 
 #
diff --git a/arch/arm/configs/cerfcube_defconfig b/arch/arm/configs/cerfcube_defconfig
index f81a60005cd3..09b7acd7f647 100644
--- a/arch/arm/configs/cerfcube_defconfig
+++ b/arch/arm/configs/cerfcube_defconfig
@@ -194,6 +194,7 @@ CONFIG_BINFMT_ELF=y
 # Power management options
 #
 CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
 # CONFIG_APM is not set
 
 #
diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig
index 3c3461e83398..c41c04fa5020 100644
--- a/arch/arm/configs/corgi_defconfig
+++ b/arch/arm/configs/corgi_defconfig
@@ -208,6 +208,7 @@ CONFIG_BINFMT_MISC=m
 # Power management options
 #
 CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
 CONFIG_APM=y
 
 #
diff --git a/arch/arm/configs/h3600_defconfig b/arch/arm/configs/h3600_defconfig
index 7a0da0b7facb..8f986e9f1c62 100644
--- a/arch/arm/configs/h3600_defconfig
+++ b/arch/arm/configs/h3600_defconfig
@@ -194,6 +194,7 @@ CONFIG_BINFMT_ELF=y
 # Power management options
 #
 CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
 # CONFIG_APM is not set
 
 #
diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig
index d1ba7fdde818..692ab57ba1ca 100644
--- a/arch/arm/configs/integrator_defconfig
+++ b/arch/arm/configs/integrator_defconfig
@@ -190,6 +190,7 @@ CONFIG_BINFMT_ELF=y
 # Power management options
 #
 CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
 # CONFIG_APM is not set
 
 #
diff --git a/arch/arm/configs/jornada720_defconfig b/arch/arm/configs/jornada720_defconfig
index ad1048db96fb..80a6fd97eb32 100644
--- a/arch/arm/configs/jornada720_defconfig
+++ b/arch/arm/configs/jornada720_defconfig
@@ -182,6 +182,7 @@ CONFIG_BINFMT_AOUT=m
 # Power management options
 #
 CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
 # CONFIG_APM is not set
 
 #
diff --git a/arch/arm/configs/lart_defconfig b/arch/arm/configs/lart_defconfig
index c3a932844160..a1cc34f25602 100644
--- a/arch/arm/configs/lart_defconfig
+++ b/arch/arm/configs/lart_defconfig
@@ -180,6 +180,7 @@ CONFIG_BINFMT_AOUT=y
 # Power management options
 #
 CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
 CONFIG_APM=m
 
 #
diff --git a/arch/arm/configs/neponset_defconfig b/arch/arm/configs/neponset_defconfig
index 3d35255c64ed..df8168e57b7c 100644
--- a/arch/arm/configs/neponset_defconfig
+++ b/arch/arm/configs/neponset_defconfig
@@ -190,6 +190,7 @@ CONFIG_BINFMT_AOUT=y
 # Power management options
 #
 CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
 CONFIG_APM=y
 
 #
diff --git a/arch/arm/configs/simpad_defconfig b/arch/arm/configs/simpad_defconfig
index 2e5a616cc98d..140056a3507f 100644
--- a/arch/arm/configs/simpad_defconfig
+++ b/arch/arm/configs/simpad_defconfig
@@ -180,6 +180,7 @@ CONFIG_BINFMT_MISC=m
 # Power management options
 #
 CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
 CONFIG_APM=y
 
 #
diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig
index d1ace3abfd8a..bd03238968c1 100644
--- a/arch/arm/configs/spitz_defconfig
+++ b/arch/arm/configs/spitz_defconfig
@@ -207,6 +207,7 @@ CONFIG_BINFMT_MISC=m
 # Power management options
 #
 CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
 CONFIG_APM=y
 
 #
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index a07d202143c3..070bcb7a6306 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -451,6 +451,7 @@ int smp_call_function(void (*func)(void *info), void *info, int retry,
         return smp_call_function_on_cpu(func, info, retry, wait,
                                         cpu_online_map);
 }
+EXPORT_SYMBOL_GPL(smp_call_function);
 
 void show_ipi_list(struct seq_file *p)
 {
diff --git a/arch/arm/mach-ebsa110/io.c b/arch/arm/mach-ebsa110/io.c
index c648bfb676a1..db38afb2aa88 100644
--- a/arch/arm/mach-ebsa110/io.c
+++ b/arch/arm/mach-ebsa110/io.c
@@ -28,7 +28,7 @@
 #include <asm/io.h>
 #include <asm/page.h>
 
-static void __iomem *__isamem_convert_addr(void __iomem *addr)
+static void __iomem *__isamem_convert_addr(const volatile void __iomem *addr)
 {
         u32 ret, a = (u32 __force) addr;
 
@@ -63,7 +63,7 @@ static void __iomem *__isamem_convert_addr(void __iomem *addr)
 /*
  * read[bwl] and write[bwl]
  */
-u8 __readb(void __iomem *addr)
+u8 __readb(const volatile void __iomem *addr)
 {
         void __iomem *a = __isamem_convert_addr(addr);
         u32 ret;
@@ -75,7 +75,7 @@ u8 __readb(void __iomem *addr)
         return ret;
 }
 
-u16 __readw(void __iomem *addr)
+u16 __readw(const volatile void __iomem *addr)
 {
         void __iomem *a = __isamem_convert_addr(addr);
 
@@ -85,7 +85,7 @@ u16 __readw(void __iomem *addr)
         return __raw_readw(a);
 }
 
-u32 __readl(void __iomem *addr)
+u32 __readl(const volatile void __iomem *addr)
 {
         void __iomem *a = __isamem_convert_addr(addr);
         u32 ret;
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
index 57f23b465392..e316bd93313f 100644
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
@@ -133,7 +133,7 @@ config IXP4XX_INDIRECT_PCI
              into the kernel and we can use the standard read[bwl]/write[bwl]
              macros. This is the preferred method due to speed but it
              limits the system to just 64MB of PCI memory. This can be 
-             problamatic if using video cards and other memory-heavy devices.
+             problematic if using video cards and other memory-heavy devices.
           
           2) If > 64MB of memory space is required, the IXP4xx can be 
              configured to use indirect registers to access PCI This allows 
diff --git a/arch/arm/mach-lh7a40x/Kconfig b/arch/arm/mach-lh7a40x/Kconfig
index 147b01928a9b..6f4c6a1798c1 100644
--- a/arch/arm/mach-lh7a40x/Kconfig
+++ b/arch/arm/mach-lh7a40x/Kconfig
@@ -8,7 +8,7 @@ config MACH_KEV7A400
         help
           Say Y here if you are using the Sharp KEV7A400 development
           board.  This hardware is discontinued, so I'd be very
-          suprised if you wanted this option.
+          surprised if you wanted this option.
 
 config MACH_LPD7A400
         bool "LPD7A400 Card Engine"
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 63965c78de8c..9aa26b99045d 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -91,7 +91,7 @@ config SMDK2440_CPU2442
 config MACH_S3C2413
         bool
         help
-          Internal node for S3C2413 verison of SMDK2413, so that
+          Internal node for S3C2413 version of SMDK2413, so that
           machine_is_s3c2413() will work when MACH_SMDK2413 is
           selected
 
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index c0bfb8212b77..b09a19f87d68 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -197,7 +197,7 @@ config CPU_ARM940T
         select CPU_CP15_MPU
         help
           ARM940T is a member of the ARM9TDMI family of general-
-          purpose microprocessors with MPU and seperate 4KB
+          purpose microprocessors with MPU and separate 4KB
           instruction and 4KB data cases, each with a 4-word line
           length.
 
diff --git a/arch/arm/mm/consistent.c b/arch/arm/mm/consistent.c
index 50e6b6bfb2e2..b797217e82be 100644
--- a/arch/arm/mm/consistent.c
+++ b/arch/arm/mm/consistent.c
@@ -476,6 +476,9 @@ core_initcall(consistent_init);
 
 /*
  * Make an area consistent for devices.
+ * Note: Drivers should NOT use this function directly, as it will break
+ * platforms with CONFIG_DMABOUNCE.
+ * Use the driver DMA support - see dma-mapping.h (dma_sync_*)
  */
 void consistent_sync(void *vaddr, size_t size, int direction)
 {
diff --git a/arch/cris/arch-v10/Kconfig b/arch/cris/arch-v10/Kconfig
index 44eb1b9accb3..c7ea9efd0104 100644
--- a/arch/cris/arch-v10/Kconfig
+++ b/arch/cris/arch-v10/Kconfig
@@ -323,7 +323,7 @@ config ETRAX_DEF_R_WAITSTATES
         depends on ETRAX_ARCH_V10
         default "95a6"
         help
-          Waitstates for SRAM, Flash and peripherials (not DRAM).  95f8 is a
+          Waitstates for SRAM, Flash and peripherals (not DRAM).  95f8 is a
           good choice for most Axis products...
 
 config ETRAX_DEF_R_BUS_CONFIG
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig
index 734d5f3a5304..e7e724bc0ba6 100644
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -839,7 +839,7 @@ config ETRAX_DS1302_TRICKLE_CHARGE
         default "0"
         help
           This controls the initial value of the trickle charge register.
-          0 = disabled (use this if you are unsure or have a non rechargable battery)
+          0 = disabled (use this if you are unsure or have a non rechargeable battery)
           Otherwise the following values can be OR:ed together to control the
           charge current:
           1 = 2kohm, 2 = 4kohm, 3 = 4kohm
diff --git a/arch/cris/arch-v10/drivers/eeprom.c b/arch/cris/arch-v10/drivers/eeprom.c
index 6e1f191a71e3..284ebfda03f0 100644
--- a/arch/cris/arch-v10/drivers/eeprom.c
+++ b/arch/cris/arch-v10/drivers/eeprom.c
@@ -1,7 +1,7 @@
 /*!*****************************************************************************
 *!
-*!  Implements an interface for i2c compatible eeproms to run under linux.
-*!  Supports 2k, 8k(?) and 16k. Uses adaptive timing adjustents by
+*!  Implements an interface for i2c compatible eeproms to run under Linux.
+*!  Supports 2k, 8k(?) and 16k. Uses adaptive timing adjustments by
 *!  Johan.Adolfsson@axis.com
 *!
 *!  Probing results:
@@ -51,7 +51,7 @@
 *!  Revision 1.8  2001/06/15 13:24:29  jonashg
 *!  * Added verification of pointers from userspace in read and write.
 *!  * Made busy counter volatile.
-*!  * Added define for inital write delay.
+*!  * Added define for initial write delay.
 *!  * Removed warnings by using loff_t instead of unsigned long.
 *!
 *!  Revision 1.7  2001/06/14 15:26:54  jonashg
diff --git a/arch/cris/arch-v10/drivers/i2c.c b/arch/cris/arch-v10/drivers/i2c.c
index 6114596c3b33..092c724a645f 100644
--- a/arch/cris/arch-v10/drivers/i2c.c
+++ b/arch/cris/arch-v10/drivers/i2c.c
@@ -47,7 +47,7 @@
 *! Update Port B register and shadow even when running with hardware support
 *!   to avoid glitches when reading bits
 *! Never set direction to out in i2c_inbyte
-*! Removed incorrect clock togling at end of i2c_inbyte
+*! Removed incorrect clock toggling at end of i2c_inbyte
 *!
 *! Revision 1.8  2002/08/13 06:31:53  starvik
 *! Made SDA and SCL line configurable
diff --git a/arch/cris/arch-v10/kernel/kgdb.c b/arch/cris/arch-v10/kernel/kgdb.c
index 34528da98817..07628a13c6c4 100644
--- a/arch/cris/arch-v10/kernel/kgdb.c
+++ b/arch/cris/arch-v10/kernel/kgdb.c
@@ -33,7 +33,7 @@
 *!
 *! Revision 1.2  2002/11/19 14:35:24  starvik
 *! Changes from linux 2.4
-*! Changed struct initializer syntax to the currently prefered notation
+*! Changed struct initializer syntax to the currently preferred notation
 *!
 *! Revision 1.1  2001/12/17 13:59:27  bjornw
 *! Initial revision
diff --git a/arch/cris/arch-v10/lib/old_checksum.c b/arch/cris/arch-v10/lib/old_checksum.c
index 22a6f0aa9cef..497634a64829 100644
--- a/arch/cris/arch-v10/lib/old_checksum.c
+++ b/arch/cris/arch-v10/lib/old_checksum.c
@@ -47,39 +47,41 @@
 
 #include <asm/delay.h>
 
-unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum)
+__wsum csum_partial(const void *p, int len, __wsum __sum)
 {
-  /*
-   * Experiments with ethernet and slip connections show that buff
-   * is aligned on either a 2-byte or 4-byte boundary.
-   */
-  const unsigned char *endMarker = buff + len;
-  const unsigned char *marker = endMarker - (len % 16);
+        u32 sum = (__force u32)__sum;
+        const u16 *buff = p;
+        /*
+        * Experiments with ethernet and slip connections show that buff
+        * is aligned on either a 2-byte or 4-byte boundary.
+        */
+        const void *endMarker = p + len;
+        const void *marker = endMarker - (len % 16);
 #if 0
-  if((int)buff & 0x3)
-    printk("unaligned buff %p\n", buff);
-  __delay(900); /* extra delay of 90 us to test performance hit */
+        if((int)buff & 0x3)
+                printk("unaligned buff %p\n", buff);
+        __delay(900); /* extra delay of 90 us to test performance hit */
 #endif
-  BITON;
-  while (buff < marker) {
-    sum += *((unsigned short *)buff)++;
-    sum += *((unsigned short *)buff)++;
-    sum += *((unsigned short *)buff)++;
-    sum += *((unsigned short *)buff)++;
-    sum += *((unsigned short *)buff)++;
-    sum += *((unsigned short *)buff)++;
-    sum += *((unsigned short *)buff)++;
-    sum += *((unsigned short *)buff)++;
-  }
-  marker = endMarker - (len % 2);
-  while(buff < marker) {
-    sum += *((unsigned short *)buff)++;
-  }
-  if(endMarker - buff > 0) {
-    sum += *buff;                 /* add extra byte seperately */
-  }
-  BITOFF;
-  return(sum);
+        BITON;
+        while (buff < marker) {
+                sum += *buff++;
+                sum += *buff++;
+                sum += *buff++;
+                sum += *buff++;
+                sum += *buff++;
+                sum += *buff++;
+                sum += *buff++;
+                sum += *buff++;
+        }
+        marker = endMarker - (len % 2);
+        while (buff < marker)
+                sum += *buff++;
+
+        if (endMarker > buff)
+                sum += *(const u8 *)buff;       /* add extra byte seperately */
+
+        BITOFF;
+        return (__force __wsum)sum;
 }
 
 EXPORT_SYMBOL(csum_partial);
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index a33097f95362..f64624fc4504 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -88,7 +88,7 @@ config ETRAX_SERIAL_PORT0_DMA7_IN
         help
           Enables the DMA7 input channel for ser0 (ttyS0).
           If you do not enable DMA, an interrupt for each character will be
-          used when receiveing data.
+          used when receiving data.
           Normally you want to use DMA, unless you use the DMA channel for
           something else.
 
@@ -157,7 +157,7 @@ config ETRAX_SERIAL_PORT1_DMA5_IN
         help
           Enables the DMA5 input channel for ser1 (ttyS1).
           If you do not enable DMA, an interrupt for each character will be
-          used when receiveing data.
+          used when receiving data.
           Normally you want this on, unless you use the DMA channel for
           something else.
 
@@ -228,7 +228,7 @@ config ETRAX_SERIAL_PORT2_DMA3_IN
         help
           Enables the DMA3 input channel for ser2 (ttyS2).
           If you do not enable DMA, an interrupt for each character will be
-          used when receiveing data.
+          used when receiving data.
           Normally you want to use DMA, unless you use the DMA channel for
           something else.
 
@@ -297,7 +297,7 @@ config ETRAX_SERIAL_PORT3_DMA9_IN
         help
           Enables the DMA9 input channel for ser3 (ttyS3).
           If you do not enable DMA, an interrupt for each character will be
-          used when receiveing data.
+          used when receiving data.
           Normally you want to use DMA, unless you use the DMA channel for
           something else.
 
diff --git a/arch/frv/lib/checksum.c b/arch/frv/lib/checksum.c
index 20e7dfc474ef..44e16d59bc10 100644
--- a/arch/frv/lib/checksum.c
+++ b/arch/frv/lib/checksum.c
@@ -32,7 +32,6 @@
    of the assembly has to go. */
 
 #include <net/checksum.h>
-#include <asm/checksum.h>
 #include <linux/module.h>
 
 static inline unsigned short from32to16(unsigned long x)
@@ -105,15 +104,15 @@ out:
  *
  * it's best to have buff aligned on a 32-bit boundary
  */
-unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum)
+__wsum csum_partial(const void *buff, int len, __wsum sum)
 {
         unsigned int result = do_csum(buff, len);
 
         /* add in old sum, and carry.. */
-        result += sum;
-        if (sum > result)
+        result += (__force u32)sum;
+        if ((__force u32)sum > result)
                 result += 1;
-        return result;
+        return (__force __wsum)result;
 }
 
 EXPORT_SYMBOL(csum_partial);
@@ -122,9 +121,9 @@ EXPORT_SYMBOL(csum_partial);
  * this routine is used for miscellaneous IP-like checksums, mainly
  * in icmp.c
  */
-unsigned short ip_compute_csum(const unsigned char * buff, int len)
+__sum16 ip_compute_csum(const void *buff, int len)
 {
-        return ~do_csum(buff, len);
+        return (__force __sum16)~do_csum(buff, len);
 }
 
 EXPORT_SYMBOL(ip_compute_csum);
@@ -132,9 +131,9 @@ EXPORT_SYMBOL(ip_compute_csum);
 /*
  * copy from fs while checksumming, otherwise like csum_partial
  */
-unsigned int
-csum_partial_copy_from_user(const char __user *src, char *dst,
-                            int len, int sum, int *csum_err)
+__wsum
+csum_partial_copy_from_user(const void __user *src, void *dst,
+                            int len, __wsum sum, int *csum_err)
 {
         int rem;
 
@@ -157,11 +156,11 @@ EXPORT_SYMBOL(csum_partial_copy_from_user);
 /*
  * copy from ds while checksumming, otherwise like csum_partial
  */
-unsigned int
-csum_partial_copy(const char *src, char *dst, int len, int sum)
+__wsum
+csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
 {
         memcpy(dst, src, len);
         return csum_partial(dst, len, sum);
 }
 
-EXPORT_SYMBOL(csum_partial_copy);
+EXPORT_SYMBOL(csum_partial_copy_nocheck);
diff --git a/arch/h8300/kernel/h8300_ksyms.c b/arch/h8300/kernel/h8300_ksyms.c
index 9b4be053de3c..d1b15267ac81 100644
--- a/arch/h8300/kernel/h8300_ksyms.c
+++ b/arch/h8300/kernel/h8300_ksyms.c
@@ -39,7 +39,7 @@ EXPORT_SYMBOL(enable_irq);
 EXPORT_SYMBOL(disable_irq);
 
 /* Networking helper routines. */
-EXPORT_SYMBOL(csum_partial_copy);
+EXPORT_SYMBOL(csum_partial_copy_nocheck);
 
 /* The following are special because they're not called
    explicitly (the C compiler generates them).  Fortunately,
diff --git a/arch/h8300/lib/checksum.c b/arch/h8300/lib/checksum.c
index 5aa688d9242d..bdc5b032acd6 100644
--- a/arch/h8300/lib/checksum.c
+++ b/arch/h8300/lib/checksum.c
@@ -96,9 +96,9 @@ out:
  *      This is a version of ip_compute_csum() optimized for IP headers,
  *      which always checksum on 4 octet boundaries.
  */
-unsigned short ip_fast_csum(unsigned char * iph, unsigned int ihl)
+__sum16 ip_fast_csum(const void *iph, unsigned int ihl)
 {
-        return ~do_csum(iph,ihl*4);
+        return (__force __sum16)~do_csum(iph,ihl*4);
 }
 
 /*
@@ -113,15 +113,19 @@ unsigned short ip_fast_csum(unsigned char * iph, unsigned int ihl)
  *
  * it's best to have buff aligned on a 32-bit boundary
  */
-unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum)
+/*
+ * Egads...  That thing apparently assumes that *all* checksums it ever sees will
+ * be folded.  Very likely a bug.
+ */
+__wsum csum_partial(const void *buff, int len, __wsum sum)
 {
         unsigned int result = do_csum(buff, len);
 
         /* add in old sum, and carry.. */
-        result += sum;
+        result += (__force u32)sum;
         /* 16+c bits -> 16 bits */
         result = (result & 0xffff) + (result >> 16);
-        return result;
+        return (__force __wsum)result;
 }
 
 EXPORT_SYMBOL(csum_partial);
@@ -130,20 +134,21 @@ EXPORT_SYMBOL(csum_partial);
  * this routine is used for miscellaneous IP-like checksums, mainly
  * in icmp.c
  */
-unsigned short ip_compute_csum(const unsigned char * buff, int len)
+__sum16 ip_compute_csum(const void *buff, int len)
 {
-        return ~do_csum(buff,len);
+        return (__force __sum16)~do_csum(buff,len);
 }
 
 /*
  * copy from fs while checksumming, otherwise like csum_partial
  */
 
-unsigned int
-csum_partial_copy_from_user(const char *src, char *dst, int len, int sum, int *csum_err)
+__wsum
+csum_partial_copy_from_user(const void __user *src, void *dst, int len,
+                            __wsum sum, int *csum_err)
 {
         if (csum_err) *csum_err = 0;
-        memcpy(dst, src, len);
+        memcpy(dst, (__force const void *)src, len);
         return csum_partial(dst, len, sum);
 }
 
@@ -151,8 +156,8 @@ csum_partial_copy_from_user(const char *src, char *dst, int len, int sum, int *c
  * copy from ds while checksumming, otherwise like csum_partial
  */
 
-unsigned int
-csum_partial_copy(const char *src, char *dst, int len, int sum)
+__wsum
+csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
 {
         memcpy(dst, src, len);
         return csum_partial(dst, len, sum);
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index d12fb97a5337..c8f96cff07c6 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -333,7 +333,7 @@ acpi_parse_ioapic(acpi_table_entry_header * header, const unsigned long end)
 /*
  * Parse Interrupt Source Override for the ACPI SCI
  */
-static void acpi_sci_ioapic_setup(u32 bus_irq, u32 gsi, u16 polarity, u16 trigger)
+static void acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger)
 {
         if (trigger == 0)       /* compatible SCI trigger is level */
                 trigger = 3;
@@ -353,13 +353,13 @@ static void acpi_sci_ioapic_setup(u32 bus_irq, u32 gsi, u16 polarity, u16 trigge
          * If GSI is < 16, this will update its flags,
          * else it will create a new mp_irqs[] entry.
          */
-        mp_override_legacy_irq(bus_irq, polarity, trigger, gsi);
+        mp_override_legacy_irq(gsi, polarity, trigger, gsi);
 
         /*
          * stash over-ride to indicate we've been here
          * and for later update of acpi_fadt
          */
-        acpi_sci_override_gsi = bus_irq;
+        acpi_sci_override_gsi = gsi;
         return;
 }
 
@@ -377,7 +377,7 @@ acpi_parse_int_src_ovr(acpi_table_entry_header * header,
         acpi_table_print_madt_entry(header);
 
         if (intsrc->bus_irq == acpi_fadt.sci_int) {
-                acpi_sci_ioapic_setup(intsrc->bus_irq, intsrc->global_irq,
+                acpi_sci_ioapic_setup(intsrc->global_irq,
                                       intsrc->flags.polarity,
                                       intsrc->flags.trigger);
                 return 0;
@@ -880,7 +880,7 @@ static int __init acpi_parse_madt_ioapic_entries(void)
          * pretend we got one so we can set the SCI flags.
          */
         if (!acpi_sci_override_gsi)
-                acpi_sci_ioapic_setup(acpi_fadt.sci_int, acpi_fadt.sci_int, 0, 0);
+                acpi_sci_ioapic_setup(acpi_fadt.sci_int, 0, 0);
 
         /* Fill in identity legacy mapings where no override */
         mp_config_acpi_legacy_irqs();
diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c
index fde8bea85cee..ab0c327e79dc 100644
--- a/arch/i386/kernel/cpuid.c
+++ b/arch/i386/kernel/cpuid.c
@@ -156,14 +156,14 @@ static struct file_operations cpuid_fops = {
         .open = cpuid_open,
 };
 
-static int cpuid_class_device_create(int i)
+static int cpuid_device_create(int i)
 {
         int err = 0;
-        struct class_device *class_err;
+        struct device *dev;
 
-        class_err = class_device_create(cpuid_class, NULL, MKDEV(CPUID_MAJOR, i), NULL, "cpu%d",i);
-        if (IS_ERR(class_err))
-                err = PTR_ERR(class_err);
+        dev = device_create(cpuid_class, NULL, MKDEV(CPUID_MAJOR, i), "cpu%d",i);
+        if (IS_ERR(dev))
+                err = PTR_ERR(dev);
         return err;
 }
 
@@ -174,10 +174,10 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long ac
 
         switch (action) {
         case CPU_ONLINE:
-                cpuid_class_device_create(cpu);
+                cpuid_device_create(cpu);
                 break;
         case CPU_DEAD:
-                class_device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, cpu));
+                device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, cpu));
                 break;
         }
         return NOTIFY_OK;
@@ -206,7 +206,7 @@ static int __init cpuid_init(void)
                 goto out_chrdev;
         }
         for_each_online_cpu(i) {
-                err = cpuid_class_device_create(i);
+                err = cpuid_device_create(i);
                 if (err != 0) 
                         goto out_class;
         }
@@ -218,7 +218,7 @@ static int __init cpuid_init(void)
 out_class:
         i = 0;
         for_each_online_cpu(i) {
-                class_device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, i));
+                device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, i));
         }
         class_destroy(cpuid_class);
 out_chrdev:
@@ -232,7 +232,7 @@ static void __exit cpuid_exit(void)
         int cpu = 0;
 
         for_each_online_cpu(cpu)
-                class_device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, cpu));
+                device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, cpu));
         class_destroy(cpuid_class);
         unregister_chrdev(CPUID_MAJOR, "cpu/cpuid");
         unregister_hotcpu_notifier(&cpuid_class_cpu_notifier);
diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c
index d535cdbbfd25..a773f776c9ea 100644
--- a/arch/i386/kernel/msr.c
+++ b/arch/i386/kernel/msr.c
@@ -239,14 +239,14 @@ static struct file_operations msr_fops = {
         .open = msr_open,
 };
 
-static int msr_class_device_create(int i)
+static int msr_device_create(int i)
 {
         int err = 0;
-        struct class_device *class_err;
+        struct device *dev;
 
-        class_err = class_device_create(msr_class, NULL, MKDEV(MSR_MAJOR, i), NULL, "msr%d",i);
-        if (IS_ERR(class_err)) 
-                err = PTR_ERR(class_err);
+        dev = device_create(msr_class, NULL, MKDEV(MSR_MAJOR, i), "msr%d",i);
+        if (IS_ERR(dev))
+                err = PTR_ERR(dev);
         return err;
 }
 
@@ -258,10 +258,10 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
 
         switch (action) {
         case CPU_ONLINE:
-                msr_class_device_create(cpu);
+                msr_device_create(cpu);
                 break;
         case CPU_DEAD:
-                class_device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
+                device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
                 break;
         }
         return NOTIFY_OK;
@@ -290,7 +290,7 @@ static int __init msr_init(void)
                 goto out_chrdev;
         }
         for_each_online_cpu(i) {
-                err = msr_class_device_create(i);
+                err = msr_device_create(i);
                 if (err != 0)
                         goto out_class;
         }
@@ -302,7 +302,7 @@ static int __init msr_init(void)
 out_class:
         i = 0;
         for_each_online_cpu(i)
-                class_device_destroy(msr_class, MKDEV(MSR_MAJOR, i));
+                device_destroy(msr_class, MKDEV(MSR_MAJOR, i));
         class_destroy(msr_class);
 out_chrdev:
         unregister_chrdev(MSR_MAJOR, "cpu/msr");
@@ -314,7 +314,7 @@ static void __exit msr_exit(void)
 {
         int cpu = 0;
         for_each_online_cpu(cpu)
-                class_device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
+                device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
         class_destroy(msr_class);
         unregister_chrdev(MSR_MAJOR, "cpu/msr");
         unregister_hotcpu_notifier(&msr_class_cpu_notifier);
diff --git a/arch/i386/kernel/pci-dma.c b/arch/i386/kernel/pci-dma.c
index 25fe66853934..5c8c6ef1fc5e 100644
--- a/arch/i386/kernel/pci-dma.c
+++ b/arch/i386/kernel/pci-dma.c
@@ -75,7 +75,7 @@ EXPORT_SYMBOL(dma_free_coherent);
 int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
                                 dma_addr_t device_addr, size_t size, int flags)
 {
-        void __iomem *mem_base;
+        void __iomem *mem_base = NULL;
         int pages = size >> PAGE_SHIFT;
         int bitmap_size = (pages + 31)/32;
 
@@ -114,6 +114,8 @@ int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
  free1_out:
         kfree(dev->dma_mem->bitmap);
  out:
+        if (mem_base)
+                iounmap(mem_base);
         return 0;
 }
 EXPORT_SYMBOL(dma_declare_coherent_memory);
diff --git a/arch/i386/pci/common.c b/arch/i386/pci/common.c
index cdfcf971098b..53ca6e897984 100644
--- a/arch/i386/pci/common.c
+++ b/arch/i386/pci/common.c
@@ -20,7 +20,7 @@
 unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
                                 PCI_PROBE_MMCONF;
 
-int pci_bf_sort;
+static int pci_bf_sort;
 int pci_routeirq;
 int pcibios_last_bus = -1;
 unsigned long pirq_table_addr;
diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c
index c1949ff38d61..cde1170b01a1 100644
--- a/arch/i386/pci/fixup.c
+++ b/arch/i386/pci/fixup.c
@@ -74,52 +74,6 @@ static void __devinit  pci_fixup_ncr53c810(struct pci_dev *d)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, pci_fixup_ncr53c810);
 
-static void __devinit pci_fixup_ide_bases(struct pci_dev *d)
-{
-        int i;
-
-        /*
-         * PCI IDE controllers use non-standard I/O port decoding, respect it.
-         */
-        if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE)
-                return;
-        DBG("PCI: IDE base address fixup for %s\n", pci_name(d));
-        for(i=0; i<4; i++) {
-                struct resource *r = &d->resource[i];
-                if ((r->start & ~0x80) == 0x374) {
-                        r->start |= 2;
-                        r->end = r->start;
-                }
-        }
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
-
-static void __devinit  pci_fixup_ide_trash(struct pci_dev *d)
-{
-        int i;
-
-        /*
-         * Runs the fixup only for the first IDE controller
-         * (Shai Fultheim - shai@ftcon.com)
-         */
-        static int called = 0;
-        if (called)
-                return;
-        called = 1;
-
-        /*
-         * There exist PCI IDE controllers which have utter garbage
-         * in first four base registers. Ignore that.
-         */
-        DBG("PCI: IDE base address trash cleared for %s\n", pci_name(d));
-        for(i=0; i<4; i++)
-                d->resource[i].start = d->resource[i].end = d->resource[i].flags = 0;
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513, pci_fixup_ide_trash);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_10, pci_fixup_ide_trash);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_11, pci_fixup_ide_trash);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_9, pci_fixup_ide_trash);
-
 static void __devinit  pci_fixup_latency(struct pci_dev *d)
 {
         /*
diff --git a/arch/i386/pci/i386.c b/arch/i386/pci/i386.c
index 98580292f0d4..43005f044424 100644
--- a/arch/i386/pci/i386.c
+++ b/arch/i386/pci/i386.c
@@ -104,16 +104,24 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
         /* Depth-First Search on bus tree */
         list_for_each_entry(bus, bus_list, node) {
                 if ((dev = bus->self)) {
-                        for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {
+                        for (idx = PCI_BRIDGE_RESOURCES;
+                            idx < PCI_NUM_RESOURCES; idx++) {
                                 r = &dev->resource[idx];
                                 if (!r->flags)
                                         continue;
                                 pr = pci_find_parent_resource(dev, r);
-                                if (!r->start || !pr || request_resource(pr, r) < 0) {
-                                        printk(KERN_ERR "PCI: Cannot allocate resource region %d of bridge %s\n", idx, pci_name(dev));
-                                        /* Something is wrong with the region.
-                                           Invalidate the resource to prevent child
-                                           resource allocations in this range. */
+                                if (!r->start || !pr ||
+                                    request_resource(pr, r) < 0) {
+                                        printk(KERN_ERR "PCI: Cannot allocate "
+                                                "resource region %d "
+                                                "of bridge %s\n",
+                                                idx, pci_name(dev));
+                                        /*
+                                         * Something is wrong with the region.
+                                         * Invalidate the resource to prevent
+                                         * child resource allocations in this
+                                         * range.
+                                         */
                                         r->flags = 0;
                                 }
                         }
@@ -131,7 +139,7 @@ static void __init pcibios_allocate_resources(int pass)
 
         for_each_pci_dev(dev) {
                 pci_read_config_word(dev, PCI_COMMAND, &command);
-                for(idx = 0; idx < 6; idx++) {
+                for (idx = 0; idx < PCI_ROM_RESOURCE; idx++) {
                         r = &dev->resource[idx];
                         if (r->parent)          /* Already allocated */
                                 continue;
@@ -142,11 +150,15 @@ static void __init pcibios_allocate_resources(int pass)
                         else
                                 disabled = !(command & PCI_COMMAND_MEMORY);
                         if (pass == disabled) {
-                                DBG("PCI: Resource %08lx-%08lx (f=%lx, d=%d, p=%d)\n",
+                                DBG("PCI: Resource %08lx-%08lx "
+                                    "(f=%lx, d=%d, p=%d)\n",
                                     r->start, r->end, r->flags, disabled, pass);
                                 pr = pci_find_parent_resource(dev, r);
                                 if (!pr || request_resource(pr, r) < 0) {
-                                        printk(KERN_ERR "PCI: Cannot allocate resource region %d of device %s\n", idx, pci_name(dev));
+                                        printk(KERN_ERR "PCI: Cannot allocate "
+                                                "resource region %d "
+                                                "of device %s\n",
+                                                idx, pci_name(dev));
                                         /* We'll assign a new address later */
                                         r->end -= r->start;
                                         r->start = 0;
@@ -156,12 +168,16 @@ static void __init pcibios_allocate_resources(int pass)
                 if (!pass) {
                         r = &dev->resource[PCI_ROM_RESOURCE];
                         if (r->flags & IORESOURCE_ROM_ENABLE) {
-                                /* Turn the ROM off, leave the resource region, but keep it unregistered. */
+                                /* Turn the ROM off, leave the resource region,
+                                 * but keep it unregistered. */
                                 u32 reg;
-                                DBG("PCI: Switching off ROM of %s\n", pci_name(dev));
+                                DBG("PCI: Switching off ROM of %s\n",
+                                        pci_name(dev));
                                 r->flags &= ~IORESOURCE_ROM_ENABLE;
-                                pci_read_config_dword(dev, dev->rom_base_reg, &reg);
-                                pci_write_config_dword(dev, dev->rom_base_reg, reg & ~PCI_ROM_ADDRESS_ENABLE);
+                                pci_read_config_dword(dev,
+                                                dev->rom_base_reg, &reg);
+                                pci_write_config_dword(dev, dev->rom_base_reg,
+                                                reg & ~PCI_ROM_ADDRESS_ENABLE);
                         }
                 }
         }
@@ -173,9 +189,11 @@ static int __init pcibios_assign_resources(void)
         struct resource *r, *pr;
 
         if (!(pci_probe & PCI_ASSIGN_ROMS)) {
-                /* Try to use BIOS settings for ROMs, otherwise let
-                   pci_assign_unassigned_resources() allocate the new
-                   addresses. */
+                /*
+                 * Try to use BIOS settings for ROMs, otherwise let
+                 * pci_assign_unassigned_resources() allocate the new
+                 * addresses.
+                 */
                 for_each_pci_dev(dev) {
                         r = &dev->resource[PCI_ROM_RESOURCE];
                         if (!r->flags || !r->start)
@@ -215,9 +233,9 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask)
 
         pci_read_config_word(dev, PCI_COMMAND, &cmd);
         old_cmd = cmd;
-        for(idx = 0; idx < PCI_NUM_RESOURCES; idx++) {
+        for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) {
                 /* Only set up the requested stuff */
-                if (!(mask & (1<<idx)))
+                if (!(mask & (1 << idx)))
                         continue;
 
                 r = &dev->resource[idx];
@@ -227,7 +245,9 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask)
                                 (!(r->flags & IORESOURCE_ROM_ENABLE)))
                         continue;
                 if (!r->start && r->end) {
-                        printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));
+                        printk(KERN_ERR "PCI: Device %s not available "
+                                "because of resource collisions\n",
+                                pci_name(dev));
                         return -EINVAL;
                 }
                 if (r->flags & IORESOURCE_IO)
@@ -236,7 +256,8 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask)
                         cmd |= PCI_COMMAND_MEMORY;
         }
         if (cmd != old_cmd) {
-                printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd);
+                printk("PCI: Enabling device %s (%04x -> %04x)\n",
+                        pci_name(dev), old_cmd, cmd);
                 pci_write_config_word(dev, PCI_COMMAND, cmd);
         }
         return 0;
@@ -258,7 +279,8 @@ void pcibios_set_master(struct pci_dev *dev)
                 lat = pcibios_max_latency;
         else
                 return;
-        printk(KERN_DEBUG "PCI: Setting latency timer of device %s to %d\n", pci_name(dev), lat);
+        printk(KERN_DEBUG "PCI: Setting latency timer of device %s to %d\n",
+                pci_name(dev), lat);
         pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
 }
 
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c
index 69163998adeb..e65551cd8216 100644
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
@@ -543,6 +543,12 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
                 case PCI_DEVICE_ID_INTEL_ICH8_2:
                 case PCI_DEVICE_ID_INTEL_ICH8_3:
                 case PCI_DEVICE_ID_INTEL_ICH8_4:
+                case PCI_DEVICE_ID_INTEL_ICH9_0:
+                case PCI_DEVICE_ID_INTEL_ICH9_1:
+                case PCI_DEVICE_ID_INTEL_ICH9_2:
+                case PCI_DEVICE_ID_INTEL_ICH9_3:
+                case PCI_DEVICE_ID_INTEL_ICH9_4:
+                case PCI_DEVICE_ID_INTEL_ICH9_5:
                         r->name = "PIIX/ICH";
                         r->get = pirq_piix_get;
                         r->set = pirq_piix_set;
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index db8e1fcfa047..14691cda05c3 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -75,7 +75,7 @@
 ** If a device prefetches beyond the end of a valid pdir entry, it will cause
 ** a hard failure, ie. MCA.  Version 3.0 and later of the zx1 LBA should
 ** disconnect on 4k boundaries and prevent such issues.  If the device is
-** particularly agressive, this option will keep the entire pdir valid such
+** particularly aggressive, this option will keep the entire pdir valid such
 ** that prefetching will hit a valid address.  This could severely impact
 ** error containment, and is therefore off by default.  The page that is
 ** used for spill-over is poisoned, so that should help debugging somewhat.
@@ -258,10 +258,10 @@ static u64 prefetch_spill_page;
 
 /*
 ** DMA_CHUNK_SIZE is used by the SCSI mid-layer to break up
-** (or rather not merge) DMA's into managable chunks.
+** (or rather not merge) DMAs into manageable chunks.
 ** On parisc, this is more of the software/tuning constraint
-** rather than the HW. I/O MMU allocation alogorithms can be
-** faster with smaller size is (to some degree).
+** rather than the HW. I/O MMU allocation algorithms can be
+** faster with smaller sizes (to some degree).
 */
 #define DMA_CHUNK_SIZE  (BITS_PER_LONG*iovp_size)
 
diff --git a/arch/ia64/lib/checksum.c b/arch/ia64/lib/checksum.c
index beb11721d9f5..4411d9baeb21 100644
--- a/arch/ia64/lib/checksum.c
+++ b/arch/ia64/lib/checksum.c
@@ -33,32 +33,32 @@ from64to16 (unsigned long x)
  * computes the checksum of the TCP/UDP pseudo-header
  * returns a 16-bit checksum, already complemented.
  */
-unsigned short int
-csum_tcpudp_magic (unsigned long saddr, unsigned long daddr, unsigned short len,
-                   unsigned short proto, unsigned int sum)
+__sum16
+csum_tcpudp_magic (__be32 saddr, __be32 daddr, unsigned short len,
+                   unsigned short proto, __wsum sum)
 {
-        return ~from64to16(saddr + daddr + sum + ((unsigned long) ntohs(len) << 16) +
-                           ((unsigned long) proto << 8));
+        return (__force __sum16)~from64to16(
+                (__force u64)saddr + (__force u64)daddr +
+                (__force u64)sum + ((len + proto) << 8));
 }
 
 EXPORT_SYMBOL(csum_tcpudp_magic);
 
-unsigned int
-csum_tcpudp_nofold (unsigned long saddr, unsigned long daddr, unsigned short len,
-                    unsigned short proto, unsigned int sum)
+__wsum
+csum_tcpudp_nofold (__be32 saddr, __be32 daddr, unsigned short len,
+                    unsigned short proto, __wsum sum)
 {
         unsigned long result;
 
-        result = (saddr + daddr + sum +
-                  ((unsigned long) ntohs(len) << 16) +
-                  ((unsigned long) proto << 8));
+        result = (__force u64)saddr + (__force u64)daddr +
+                 (__force u64)sum + ((len + proto) << 8);
 
         /* Fold down to 32-bits so we don't lose in the typedef-less network stack.  */
         /* 64 to 33 */
         result = (result & 0xffffffff) + (result >> 32);
         /* 33 to 32 */
         result = (result & 0xffffffff) + (result >> 32);
-        return result;
+        return (__force __wsum)result;
 }
 
 extern unsigned long do_csum (const unsigned char *, long);
@@ -75,16 +75,15 @@ extern unsigned long do_csum (const unsigned char *, long);
  *
  * it's best to have buff aligned on a 32-bit boundary
  */
-unsigned int
-csum_partial (const unsigned char * buff, int len, unsigned int sum)
+__wsum csum_partial(const void *buff, int len, __wsum sum)
 {
-        unsigned long result = do_csum(buff, len);
+        u64 result = do_csum(buff, len);
 
         /* add in old sum, and carry.. */
-        result += sum;
+        result += (__force u32)sum;
         /* 32+c bits -> 32 bits */
         result = (result & 0xffffffff) + (result >> 32);
-        return result;
+        return (__force __wsum)result;
 }
 
 EXPORT_SYMBOL(csum_partial);
@@ -93,10 +92,9 @@ EXPORT_SYMBOL(csum_partial);
  * this routine is used for miscellaneous IP-like checksums, mainly
  * in icmp.c
  */
-unsigned short
-ip_compute_csum (unsigned char * buff, int len)
+__sum16 ip_compute_csum (const void *buff, int len)
 {
-        return ~do_csum(buff,len);
+        return (__force __sum16)~do_csum(buff,len);
 }
 
 EXPORT_SYMBOL(ip_compute_csum);
diff --git a/arch/ia64/lib/csum_partial_copy.c b/arch/ia64/lib/csum_partial_copy.c
index 36866e8a5d2b..503dfe6d1450 100644
--- a/arch/ia64/lib/csum_partial_copy.c
+++ b/arch/ia64/lib/csum_partial_copy.c
@@ -104,9 +104,9 @@ out:
  */
 extern unsigned long do_csum(const unsigned char *, long);
 
-static unsigned int
-do_csum_partial_copy_from_user (const unsigned char __user *src, unsigned char *dst,
-                                int len, unsigned int psum, int *errp)
+__wsum
+csum_partial_copy_from_user(const void __user *src, void *dst,
+                                int len, __wsum psum, int *errp)
 {
         unsigned long result;
 
@@ -122,30 +122,17 @@ do_csum_partial_copy_from_user (const unsigned char __user *src, unsigned char *
         result = do_csum(dst, len);
 
         /* add in old sum, and carry.. */
-        result += psum;
+        result += (__force u32)psum;
         /* 32+c bits -> 32 bits */
         result = (result & 0xffffffff) + (result >> 32);
-        return result;
-}
-
-unsigned int
-csum_partial_copy_from_user (const unsigned char __user *src, unsigned char *dst,
-                             int len, unsigned int sum, int *errp)
-{
-        if (!access_ok(VERIFY_READ, src, len)) {
-                *errp = -EFAULT;
-                memset(dst, 0, len);
-                return sum;
-        }
-
-        return do_csum_partial_copy_from_user(src, dst, len, sum, errp);
+        return (__force __wsum)result;
 }
 
-unsigned int
-csum_partial_copy_nocheck(const unsigned char __user *src, unsigned char *dst,
-                          int len, unsigned int sum)
+__wsum
+csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
 {
-        return do_csum_partial_copy_from_user(src, dst, len, sum, NULL);
+        return csum_partial_copy_from_user((__force const void __user *)src,
+                                           dst, len, sum, NULL);
 }
 
 EXPORT_SYMBOL(csum_partial_copy_nocheck);
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index b30be7c48ba8..f4edfbf27134 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -469,10 +469,11 @@ pcibios_fixup_resources(struct pci_dev *dev, int start, int limit)
         }
 }
 
-static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev)
+void __devinit pcibios_fixup_device_resources(struct pci_dev *dev)
 {
         pcibios_fixup_resources(dev, 0, PCI_BRIDGE_RESOURCES);
 }
+EXPORT_SYMBOL_GPL(pcibios_fixup_device_resources);
 
 static void __devinit pcibios_fixup_bridge_resources(struct pci_dev *dev)
 {
@@ -493,6 +494,7 @@ pcibios_fixup_bus (struct pci_bus *b)
         }
         list_for_each_entry(dev, &b->devices, bus_list)
                 pcibios_fixup_device_resources(dev);
+        platform_pci_fixup_bus(b);
 
         return;
 }
@@ -738,75 +740,44 @@ int ia64_pci_legacy_write(struct pci_bus *bus, u16 port, u32 val, u8 size)
         return ret;
 }
 
+/* It's defined in drivers/pci/pci.c */
+extern u8 pci_cache_line_size;
+
 /**
- * pci_cacheline_size - determine cacheline size for PCI devices
- * @dev: void
+ * set_pci_cacheline_size - determine cacheline size for PCI devices
  *
  * We want to use the line-size of the outer-most cache.  We assume
  * that this line-size is the same for all CPUs.
  *
  * Code mostly taken from arch/ia64/kernel/palinfo.c:cache_info().
- *
- * RETURNS: An appropriate -ERRNO error value on eror, or zero for success.
  */
-static unsigned long
-pci_cacheline_size (void)
+static void __init set_pci_cacheline_size(void)
 {
         u64 levels, unique_caches;
         s64 status;
         pal_cache_config_info_t cci;
-        static u8 cacheline_size;
-
-        if (cacheline_size)
-                return cacheline_size;
 
         status = ia64_pal_cache_summary(&levels, &unique_caches);
         if (status != 0) {
-                printk(KERN_ERR "%s: ia64_pal_cache_summary() failed (status=%ld)\n",
-                       __FUNCTION__, status);
-                return SMP_CACHE_BYTES;
+                printk(KERN_ERR "%s: ia64_pal_cache_summary() failed "
+                        "(status=%ld)\n", __FUNCTION__, status);
+                return;
         }
 
-        status = ia64_pal_cache_config_info(levels - 1, /* cache_type (data_or_unified)= */ 2,
-                                            &cci);
+        status = ia64_pal_cache_config_info(levels - 1,
+                                /* cache_type (data_or_unified)= */ 2, &cci);
         if (status != 0) {
-                printk(KERN_ERR "%s: ia64_pal_cache_config_info() failed (status=%ld)\n",
-                       __FUNCTION__, status);
-                return SMP_CACHE_BYTES;
+                printk(KERN_ERR "%s: ia64_pal_cache_config_info() failed "
+                        "(status=%ld)\n", __FUNCTION__, status);
+                return;
         }
-        cacheline_size = 1 << cci.pcci_line_size;
-        return cacheline_size;
+        pci_cache_line_size = (1 << cci.pcci_line_size) / 4;
 }
 
-/**
- * pcibios_prep_mwi - helper function for drivers/pci/pci.c:pci_set_mwi()
- * @dev: the PCI device for which MWI is enabled
- *
- * For ia64, we can get the cacheline sizes from PAL.
- *
- * RETURNS: An appropriate -ERRNO error value on eror, or zero for success.
- */
-int
-pcibios_prep_mwi (struct pci_dev *dev)
-{
-        unsigned long desired_linesize, current_linesize;
-        int rc = 0;
-        u8 pci_linesize;
-
-        desired_linesize = pci_cacheline_size();
-
-        pci_read_config_byte(dev, PCI_CACHE_LINE_SIZE, &pci_linesize);
-        current_linesize = 4 * pci_linesize;
-        if (desired_linesize != current_linesize) {
-                printk(KERN_WARNING "PCI: slot %s has incorrect PCI cache line size of %lu bytes,",
-                       pci_name(dev), current_linesize);
-                if (current_linesize > desired_linesize) {
-                        printk(" expected %lu bytes instead\n", desired_linesize);
-                        rc = -EINVAL;
-                } else {
-                        printk(" correcting to %lu\n", desired_linesize);
-                        pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, desired_linesize / 4);
-                }
-        }
-        return rc;
+static int __init pcibios_init(void)
+{
+        set_pci_cacheline_size();
+        return 0;
 }
+
+subsys_initcall(pcibios_init);
diff --git a/arch/ia64/sn/kernel/Makefile b/arch/ia64/sn/kernel/Makefile
index 2d78f34dd763..0a59371d3475 100644
--- a/arch/ia64/sn/kernel/Makefile
+++ b/arch/ia64/sn/kernel/Makefile
@@ -4,13 +4,14 @@
 # License.  See the file "COPYING" in the main directory of this archive
 # for more details.
 #
-# Copyright (C) 1999,2001-2005 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (C) 1999,2001-2006 Silicon Graphics, Inc.  All Rights Reserved.
 #
 
 CPPFLAGS += -I$(srctree)/arch/ia64/sn/include
 
 obj-y                           += setup.o bte.o bte_error.o irq.o mca.o idle.o \
-                                   huberror.o io_init.o iomv.o klconflib.o pio_phys.o \
+                                   huberror.o io_acpi_init.o io_common.o \
+                                   io_init.o iomv.o klconflib.o pio_phys.o \
                                    sn2/
 obj-$(CONFIG_IA64_GENERIC)      += machvec.o
 obj-$(CONFIG_SGI_TIOCX)         += tiocx.o
diff --git a/arch/ia64/sn/kernel/io_acpi_init.c b/arch/ia64/sn/kernel/io_acpi_init.c
new file mode 100644
index 000000000000..99d7f278612a
--- /dev/null
+++ b/arch/ia64/sn/kernel/io_acpi_init.c
@@ -0,0 +1,231 @@
+/*
+ * 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) 2006 Silicon Graphics, Inc. All rights reserved.
+ */
+
+#include <asm/sn/types.h>
+#include <asm/sn/addrs.h>
+#include <asm/sn/pcidev.h>
+#include <asm/sn/pcibus_provider_defs.h>
+#include <asm/sn/sn_sal.h>
+#include "xtalk/hubdev.h"
+#include <linux/acpi.h>
+
+
+/*
+ * The code in this file will only be executed when running with
+ * a PROM that has ACPI IO support. (i.e., SN_ACPI_BASE_SUPPORT() == 1)
+ */
+
+
+/*
+ * This value must match the UUID the PROM uses
+ * (io/acpi/defblk.c) when building a vendor descriptor.
+ */
+struct acpi_vendor_uuid sn_uuid = {
+        .subtype = 0,
+        .data   = { 0x2c, 0xc6, 0xa6, 0xfe, 0x9c, 0x44, 0xda, 0x11,
+                    0xa2, 0x7c, 0x08, 0x00, 0x69, 0x13, 0xea, 0x51 },
+};
+
+/*
+ * Perform the early IO init in PROM.
+ */
+static s64
+sal_ioif_init(u64 *result)
+{
+        struct ia64_sal_retval isrv = {0,0,0,0};
+
+        SAL_CALL_NOLOCK(isrv,
+                        SN_SAL_IOIF_INIT, 0, 0, 0, 0, 0, 0, 0);
+        *result = isrv.v0;
+        return isrv.status;
+}
+
+/*
+ * sn_hubdev_add - The 'add' function of the acpi_sn_hubdev_driver.
+ *                 Called for every "SGIHUB" or "SGITIO" device defined
+ *                 in the ACPI namespace.
+ */
+static int __init
+sn_hubdev_add(struct acpi_device *device)
+{
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        u64 addr;
+        struct hubdev_info *hubdev;
+        struct hubdev_info *hubdev_ptr;
+        int i;
+        u64 nasid;
+        struct acpi_resource *resource;
+        int ret = 0;
+        acpi_status status;
+        struct acpi_resource_vendor_typed *vendor;
+        extern void sn_common_hubdev_init(struct hubdev_info *);
+
+        status = acpi_get_vendor_resource(device->handle, METHOD_NAME__CRS,
+                                          &sn_uuid, &buffer);
+        if (ACPI_FAILURE(status)) {
+                printk(KERN_ERR
+                       "sn_hubdev_add: acpi_get_vendor_resource() failed: %d\n",
+                        status);
+                return 1;
+        }
+
+        resource = buffer.pointer;
+        vendor = &resource->data.vendor_typed;
+        if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !=
+            sizeof(struct hubdev_info *)) {
+                printk(KERN_ERR
+                       "sn_hubdev_add: Invalid vendor data length: %d\n",
+                        vendor->byte_length);
+                ret = 1;
+                goto exit;
+        }
+
+        memcpy(&addr, vendor->byte_data, sizeof(struct hubdev_info *));
+        hubdev_ptr = __va((struct hubdev_info *) addr);
+
+        nasid = hubdev_ptr->hdi_nasid;
+        i = nasid_to_cnodeid(nasid);
+        hubdev = (struct hubdev_info *)(NODEPDA(i)->pdinfo);
+        *hubdev = *hubdev_ptr;
+        sn_common_hubdev_init(hubdev);
+
+exit:
+        kfree(buffer.pointer);
+        return ret;
+}
+
+/*
+ * sn_get_bussoft_ptr() - The pcibus_bussoft pointer is found in
+ *                        the ACPI Vendor resource for this bus.
+ */
+static struct pcibus_bussoft *
+sn_get_bussoft_ptr(struct pci_bus *bus)
+{
+        u64 addr;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        acpi_handle handle;
+        struct pcibus_bussoft *prom_bussoft_ptr;
+        struct acpi_resource *resource;
+        acpi_status status;
+        struct acpi_resource_vendor_typed *vendor;
+
+
+        handle = PCI_CONTROLLER(bus)->acpi_handle;
+        status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS,
+                                          &sn_uuid, &buffer);
+        if (ACPI_FAILURE(status)) {
+                printk(KERN_ERR "get_acpi_pcibus_ptr: "
+                       "get_acpi_bussoft_info() failed: %d\n",
+                       status);
+                return NULL;
+        }
+        resource = buffer.pointer;
+        vendor = &resource->data.vendor_typed;
+
+        if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !=
+             sizeof(struct pcibus_bussoft *)) {
+                printk(KERN_ERR
+                       "get_acpi_bussoft_ptr: Invalid vendor data "
+                       "length %d\n", vendor->byte_length);
+                kfree(buffer.pointer);
+                return NULL;
+        }
+        memcpy(&addr, vendor->byte_data, sizeof(struct pcibus_bussoft *));
+        prom_bussoft_ptr = __va((struct pcibus_bussoft *) addr);
+        kfree(buffer.pointer);
+
+        return prom_bussoft_ptr;
+}
+
+/*
+ * sn_acpi_bus_fixup
+ */
+void
+sn_acpi_bus_fixup(struct pci_bus *bus)
+{
+        struct pci_dev *pci_dev = NULL;
+        struct pcibus_bussoft *prom_bussoft_ptr;
+        extern void sn_common_bus_fixup(struct pci_bus *,
+                                        struct pcibus_bussoft *);
+
+        if (!bus->parent) {     /* If root bus */
+                prom_bussoft_ptr = sn_get_bussoft_ptr(bus);
+                if (prom_bussoft_ptr == NULL) {
+                        printk(KERN_ERR
+                               "sn_pci_fixup_bus: 0x%04x:0x%02x Unable to "
+                               "obtain prom_bussoft_ptr\n",
+                               pci_domain_nr(bus), bus->number);
+                        return;
+                }
+                sn_common_bus_fixup(bus, prom_bussoft_ptr);
+        }
+        list_for_each_entry(pci_dev, &bus->devices, bus_list) {
+                sn_pci_fixup_slot(pci_dev);
+        }
+}
+
+/*
+ * sn_acpi_slot_fixup - Perform any SN specific slot fixup.
+ *                      At present there does not appear to be
+ *                      any generic way to handle a ROM image
+ *                      that has been shadowed by the PROM, so
+ *                      we pass a pointer to it within the
+ *                      pcidev_info structure.
+ */
+
+void
+sn_acpi_slot_fixup(struct pci_dev *dev, struct pcidev_info *pcidev_info)
+{
+        void __iomem *addr;
+        size_t size;
+
+        if (pcidev_info->pdi_pio_mapped_addr[PCI_ROM_RESOURCE]) {
+                /*
+                 * A valid ROM image exists and has been shadowed by the
+                 * PROM. Setup the pci_dev ROM resource to point to
+                 * the shadowed copy.
+                 */
+                size = dev->resource[PCI_ROM_RESOURCE].end -
+                                dev->resource[PCI_ROM_RESOURCE].start;
+                addr =
+                     ioremap(pcidev_info->pdi_pio_mapped_addr[PCI_ROM_RESOURCE],
+                             size);
+                dev->resource[PCI_ROM_RESOURCE].start = (unsigned long) addr;
+                dev->resource[PCI_ROM_RESOURCE].end =
+                                                (unsigned long) addr + size;
+                dev->resource[PCI_ROM_RESOURCE].flags |= IORESOURCE_ROM_BIOS_COPY;
+        }
+}
+
+static struct acpi_driver acpi_sn_hubdev_driver = {
+        .name = "SGI HUBDEV Driver",
+        .ids = "SGIHUB,SGITIO",
+        .ops = {
+                .add = sn_hubdev_add,
+                },
+};
+
+
+/*
+ * sn_io_acpi_init - PROM has ACPI support for IO, defining at a minimum the
+ *                   nodes and root buses in the DSDT. As a result, bus scanning
+ *                   will be initiated by the Linux ACPI code.
+ */
+
+void __init
+sn_io_acpi_init(void)
+{
+        u64 result;
+        s64 status;
+
+        acpi_bus_register_driver(&acpi_sn_hubdev_driver);
+        status = sal_ioif_init(&result);
+        if (status || result)
+                panic("sal_ioif_init failed: [%lx] %s\n",
+                      status, ia64_sal_strerror(status));
+}
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c
new file mode 100644
index 000000000000..d4dd8f4b6b8d
--- /dev/null
+++ b/arch/ia64/sn/kernel/io_common.c
@@ -0,0 +1,613 @@
+/*
+ * 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) 2006 Silicon Graphics, Inc. All rights reserved.
+ */
+
+#include <linux/bootmem.h>
+#include <asm/sn/types.h>
+#include <asm/sn/addrs.h>
+#include <asm/sn/sn_feature_sets.h>
+#include <asm/sn/geo.h>
+#include <asm/sn/io.h>
+#include <asm/sn/l1.h>
+#include <asm/sn/module.h>
+#include <asm/sn/pcibr_provider.h>
+#include <asm/sn/pcibus_provider_defs.h>
+#include <asm/sn/pcidev.h>
+#include <asm/sn/simulator.h>
+#include <asm/sn/sn_sal.h>
+#include <asm/sn/tioca_provider.h>
+#include <asm/sn/tioce_provider.h>
+#include "xtalk/hubdev.h"
+#include "xtalk/xwidgetdev.h"
+#include <linux/acpi.h>
+#include <asm/sn/sn2/sn_hwperf.h>
+#include <asm/sn/acpi.h>
+
+extern void sn_init_cpei_timer(void);
+extern void register_sn_procfs(void);
+extern void sn_acpi_bus_fixup(struct pci_bus *);
+extern void sn_bus_fixup(struct pci_bus *);
+extern void sn_acpi_slot_fixup(struct pci_dev *, struct pcidev_info *);
+extern void sn_more_slot_fixup(struct pci_dev *, struct pcidev_info *);
+extern void sn_legacy_pci_window_fixup(struct pci_controller *, u64, u64);
+extern void sn_io_acpi_init(void);
+extern void sn_io_init(void);
+
+
+static struct list_head sn_sysdata_list;
+
+/* sysdata list struct */
+struct sysdata_el {
+        struct list_head entry;
+        void *sysdata;
+};
+
+int sn_ioif_inited;             /* SN I/O infrastructure initialized? */
+
+struct sn_pcibus_provider *sn_pci_provider[PCIIO_ASIC_MAX_TYPES];       /* indexed by asic type */
+
+/*
+ * Hooks and struct for unsupported pci providers
+ */
+
+static dma_addr_t
+sn_default_pci_map(struct pci_dev *pdev, unsigned long paddr, size_t size, int type)
+{
+        return 0;
+}
+
+static void
+sn_default_pci_unmap(struct pci_dev *pdev, dma_addr_t addr, int direction)
+{
+        return;
+}
+
+static void *
+sn_default_pci_bus_fixup(struct pcibus_bussoft *soft, struct pci_controller *controller)
+{
+        return NULL;
+}
+
+static struct sn_pcibus_provider sn_pci_default_provider = {
+        .dma_map = sn_default_pci_map,
+        .dma_map_consistent = sn_default_pci_map,
+        .dma_unmap = sn_default_pci_unmap,
+        .bus_fixup = sn_default_pci_bus_fixup,
+};
+
+/*
+ * Retrieve the DMA Flush List given nasid, widget, and device.
+ * This list is needed to implement the WAR - Flush DMA data on PIO Reads.
+ */
+static inline u64
+sal_get_device_dmaflush_list(u64 nasid, u64 widget_num, u64 device_num,
+                             u64 address)
+{
+        struct ia64_sal_retval ret_stuff;
+        ret_stuff.status = 0;
+        ret_stuff.v0 = 0;
+
+        SAL_CALL_NOLOCK(ret_stuff,
+                        (u64) SN_SAL_IOIF_GET_DEVICE_DMAFLUSH_LIST,
+                        (u64) nasid, (u64) widget_num,
+                        (u64) device_num, (u64) address, 0, 0, 0);
+        return ret_stuff.status;
+}
+
+/*
+ * Retrieve the pci device information given the bus and device|function number.
+ */
+static inline u64
+sal_get_pcidev_info(u64 segment, u64 bus_number, u64 devfn, u64 pci_dev,
+                    u64 sn_irq_info)
+{
+        struct ia64_sal_retval ret_stuff;
+        ret_stuff.status = 0;
+        ret_stuff.v0 = 0;
+
+        SAL_CALL_NOLOCK(ret_stuff,
+                        (u64) SN_SAL_IOIF_GET_PCIDEV_INFO,
+                        (u64) segment, (u64) bus_number, (u64) devfn,
+                        (u64) pci_dev,
+                        sn_irq_info, 0, 0);
+        return ret_stuff.v0;
+}
+
+/*
+ * sn_pcidev_info_get() - Retrieve the pcidev_info struct for the specified
+ *                        device.
+ */
+inline struct pcidev_info *
+sn_pcidev_info_get(struct pci_dev *dev)
+{
+        struct pcidev_info *pcidev;
+
+        list_for_each_entry(pcidev,
+                            &(SN_PLATFORM_DATA(dev)->pcidev_info), pdi_list) {
+                if (pcidev->pdi_linux_pcidev == dev)
+                        return pcidev;
+        }
+        return NULL;
+}
+
+/* Older PROM flush WAR
+ *
+ * 01/16/06 -- This war will be in place until a new official PROM is released.
+ * Additionally note that the struct sn_flush_device_war also has to be
+ * removed from arch/ia64/sn/include/xtalk/hubdev.h
+ */
+static u8 war_implemented = 0;
+
+static s64 sn_device_fixup_war(u64 nasid, u64 widget, int device,
+                               struct sn_flush_device_common *common)
+{
+        struct sn_flush_device_war *war_list;
+        struct sn_flush_device_war *dev_entry;
+        struct ia64_sal_retval isrv = {0,0,0,0};
+
+        if (!war_implemented) {
+                printk(KERN_WARNING "PROM version < 4.50 -- implementing old "
+                       "PROM flush WAR\n");
+                war_implemented = 1;
+        }
+
+        war_list = kzalloc(DEV_PER_WIDGET * sizeof(*war_list), GFP_KERNEL);
+        if (!war_list)
+                BUG();
+
+        SAL_CALL_NOLOCK(isrv, SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST,
+                        nasid, widget, __pa(war_list), 0, 0, 0 ,0);
+        if (isrv.status)
+                panic("sn_device_fixup_war failed: %s\n",
+                      ia64_sal_strerror(isrv.status));
+
+        dev_entry = war_list + device;
+        memcpy(common,dev_entry, sizeof(*common));
+        kfree(war_list);
+
+        return isrv.status;
+}
+
+/*
+ * sn_common_hubdev_init() - This routine is called to initialize the HUB data
+ *                           structure for each node in the system.
+ */
+void __init
+sn_common_hubdev_init(struct hubdev_info *hubdev)
+{
+
+        struct sn_flush_device_kernel *sn_flush_device_kernel;
+        struct sn_flush_device_kernel *dev_entry;
+        s64 status;
+        int widget, device, size;
+
+        /* Attach the error interrupt handlers */
+        if (hubdev->hdi_nasid & 1)      /* If TIO */
+                ice_error_init(hubdev);
+        else
+                hub_error_init(hubdev);
+
+        for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++)
+                hubdev->hdi_xwidget_info[widget].xwi_hubinfo = hubdev;
+
+        if (!hubdev->hdi_flush_nasid_list.widget_p)
+                return;
+
+        size = (HUB_WIDGET_ID_MAX + 1) *
+                sizeof(struct sn_flush_device_kernel *);
+        hubdev->hdi_flush_nasid_list.widget_p =
+                kzalloc(size, GFP_KERNEL);
+        if (!hubdev->hdi_flush_nasid_list.widget_p)
+                BUG();
+
+        for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) {
+                size = DEV_PER_WIDGET *
+                        sizeof(struct sn_flush_device_kernel);
+                sn_flush_device_kernel = kzalloc(size, GFP_KERNEL);
+                if (!sn_flush_device_kernel)
+                        BUG();
+
+                dev_entry = sn_flush_device_kernel;
+                for (device = 0; device < DEV_PER_WIDGET;
+                     device++, dev_entry++) {
+                        size = sizeof(struct sn_flush_device_common);
+                        dev_entry->common = kzalloc(size, GFP_KERNEL);
+                        if (!dev_entry->common)
+                                BUG();
+                        if (sn_prom_feature_available(PRF_DEVICE_FLUSH_LIST))
+                                status = sal_get_device_dmaflush_list(
+                                             hubdev->hdi_nasid, widget, device,
+                                             (u64)(dev_entry->common));
+                        else
+                                status = sn_device_fixup_war(hubdev->hdi_nasid,
+                                                             widget, device,
+                                                             dev_entry->common);
+                        if (status != SALRET_OK)
+                                panic("SAL call failed: %s\n",
+                                      ia64_sal_strerror(status));
+
+                        spin_lock_init(&dev_entry->sfdl_flush_lock);
+                }
+
+                if (sn_flush_device_kernel)
+                        hubdev->hdi_flush_nasid_list.widget_p[widget] =
+                                                         sn_flush_device_kernel;
+        }
+}
+
+void sn_pci_unfixup_slot(struct pci_dev *dev)
+{
+        struct pci_dev *host_pci_dev = SN_PCIDEV_INFO(dev)->host_pci_dev;
+
+        sn_irq_unfixup(dev);
+        pci_dev_put(host_pci_dev);
+        pci_dev_put(dev);
+}
+
+/*
+ * sn_pci_fixup_slot() - This routine sets up a slot's resources consistent
+ *                       with the Linux PCI abstraction layer. Resources
+ *                       acquired from our PCI provider include PIO maps
+ *                       to BAR space and interrupt objects.
+ */
+void sn_pci_fixup_slot(struct pci_dev *dev)
+{
+        int segment = pci_domain_nr(dev->bus);
+        int status = 0;
+        struct pcibus_bussoft *bs;
+        struct pci_bus *host_pci_bus;
+        struct pci_dev *host_pci_dev;
+        struct pcidev_info *pcidev_info;
+        struct sn_irq_info *sn_irq_info;
+        unsigned int bus_no, devfn;
+
+        pci_dev_get(dev); /* for the sysdata pointer */
+        pcidev_info = kzalloc(sizeof(struct pcidev_info), GFP_KERNEL);
+        if (!pcidev_info)
+                BUG();          /* Cannot afford to run out of memory */
+
+        sn_irq_info = kzalloc(sizeof(struct sn_irq_info), GFP_KERNEL);
+        if (!sn_irq_info)
+                BUG();          /* Cannot afford to run out of memory */
+
+        /* Call to retrieve pci device information needed by kernel. */
+        status = sal_get_pcidev_info((u64) segment, (u64) dev->bus->number,
+                                     dev->devfn,
+                                     (u64) __pa(pcidev_info),
+                                     (u64) __pa(sn_irq_info));
+        if (status)
+                BUG(); /* Cannot get platform pci device information */
+
+        /* Add pcidev_info to list in pci_controller.platform_data */
+        list_add_tail(&pcidev_info->pdi_list,
+                      &(SN_PLATFORM_DATA(dev->bus)->pcidev_info));
+
+        if (SN_ACPI_BASE_SUPPORT())
+                sn_acpi_slot_fixup(dev, pcidev_info);
+        else
+                sn_more_slot_fixup(dev, pcidev_info);
+        /*
+         * Using the PROMs values for the PCI host bus, get the Linux
+         * PCI host_pci_dev struct and set up host bus linkages
+         */
+
+        bus_no = (pcidev_info->pdi_slot_host_handle >> 32) & 0xff;
+        devfn = pcidev_info->pdi_slot_host_handle & 0xffffffff;
+        host_pci_bus = pci_find_bus(segment, bus_no);
+        host_pci_dev = pci_get_slot(host_pci_bus, devfn);
+
+        pcidev_info->host_pci_dev = host_pci_dev;
+        pcidev_info->pdi_linux_pcidev = dev;
+        pcidev_info->pdi_host_pcidev_info = SN_PCIDEV_INFO(host_pci_dev);
+        bs = SN_PCIBUS_BUSSOFT(dev->bus);
+        pcidev_info->pdi_pcibus_info = bs;
+
+        if (bs && bs->bs_asic_type < PCIIO_ASIC_MAX_TYPES) {
+                SN_PCIDEV_BUSPROVIDER(dev) = sn_pci_provider[bs->bs_asic_type];
+        } else {
+                SN_PCIDEV_BUSPROVIDER(dev) = &sn_pci_default_provider;
+        }
+
+        /* Only set up IRQ stuff if this device has a host bus context */
+        if (bs && sn_irq_info->irq_irq) {
+                pcidev_info->pdi_sn_irq_info = sn_irq_info;
+                dev->irq = pcidev_info->pdi_sn_irq_info->irq_irq;
+                sn_irq_fixup(dev, sn_irq_info);
+        } else {
+                pcidev_info->pdi_sn_irq_info = NULL;
+                kfree(sn_irq_info);
+        }
+}
+
+/*
+ * sn_common_bus_fixup - Perform platform specific bus fixup.
+ *                       Execute the ASIC specific fixup routine
+ *                       for this bus.
+ */
+void
+sn_common_bus_fixup(struct pci_bus *bus,
+                    struct pcibus_bussoft *prom_bussoft_ptr)
+{
+        int cnode;
+        struct pci_controller *controller;
+        struct hubdev_info *hubdev_info;
+        int nasid;
+        void *provider_soft;
+        struct sn_pcibus_provider *provider;
+        struct sn_platform_data *sn_platform_data;
+
+        controller = PCI_CONTROLLER(bus);
+        /*
+         * Per-provider fixup.  Copies the bus soft structure from prom
+         * to local area and links SN_PCIBUS_BUSSOFT().
+         */
+
+        if (prom_bussoft_ptr->bs_asic_type >= PCIIO_ASIC_MAX_TYPES) {
+                printk(KERN_WARNING "sn_common_bus_fixup: Unsupported asic type, %d",
+                       prom_bussoft_ptr->bs_asic_type);
+                return;
+        }
+
+        if (prom_bussoft_ptr->bs_asic_type == PCIIO_ASIC_TYPE_PPB)
+                return; /* no further fixup necessary */
+
+        provider = sn_pci_provider[prom_bussoft_ptr->bs_asic_type];
+        if (provider == NULL)
+                panic("sn_common_bus_fixup: No provider registered for this asic type, %d",
+                      prom_bussoft_ptr->bs_asic_type);
+
+        if (provider->bus_fixup)
+                provider_soft = (*provider->bus_fixup) (prom_bussoft_ptr,
+                                 controller);
+        else
+                provider_soft = NULL;
+
+        /*
+         * Generic bus fixup goes here.  Don't reference prom_bussoft_ptr
+         * after this point.
+         */
+        controller->platform_data = kzalloc(sizeof(struct sn_platform_data),
+                                            GFP_KERNEL);
+        if (controller->platform_data == NULL)
+                BUG();
+        sn_platform_data =
+                        (struct sn_platform_data *) controller->platform_data;
+        sn_platform_data->provider_soft = provider_soft;
+        INIT_LIST_HEAD(&((struct sn_platform_data *)
+                         controller->platform_data)->pcidev_info);
+        nasid = NASID_GET(SN_PCIBUS_BUSSOFT(bus)->bs_base);
+        cnode = nasid_to_cnodeid(nasid);
+        hubdev_info = (struct hubdev_info *)(NODEPDA(cnode)->pdinfo);
+        SN_PCIBUS_BUSSOFT(bus)->bs_xwidget_info =
+            &(hubdev_info->hdi_xwidget_info[SN_PCIBUS_BUSSOFT(bus)->bs_xid]);
+
+        /*
+         * If the node information we obtained during the fixup phase is
+         * invalid then set controller->node to -1 (undetermined)
+         */
+        if (controller->node >= num_online_nodes()) {
+                struct pcibus_bussoft *b = SN_PCIBUS_BUSSOFT(bus);
+
+                printk(KERN_WARNING "Device ASIC=%u XID=%u PBUSNUM=%u"
+                       "L_IO=%lx L_MEM=%lx BASE=%lx\n",
+                       b->bs_asic_type, b->bs_xid, b->bs_persist_busnum,
+                       b->bs_legacy_io, b->bs_legacy_mem, b->bs_base);
+                printk(KERN_WARNING "on node %d but only %d nodes online."
+                       "Association set to undetermined.\n",
+                       controller->node, num_online_nodes());
+                controller->node = -1;
+        }
+}
+
+void sn_bus_store_sysdata(struct pci_dev *dev)
+{
+        struct sysdata_el *element;
+
+        element = kzalloc(sizeof(struct sysdata_el), GFP_KERNEL);
+        if (!element) {
+                dev_dbg(dev, "%s: out of memory!\n", __FUNCTION__);
+                return;
+        }
+        element->sysdata = SN_PCIDEV_INFO(dev);
+        list_add(&element->entry, &sn_sysdata_list);
+}
+
+void sn_bus_free_sysdata(void)
+{
+        struct sysdata_el *element;
+        struct list_head *list, *safe;
+
+        list_for_each_safe(list, safe, &sn_sysdata_list) {
+                element = list_entry(list, struct sysdata_el, entry);
+                list_del(&element->entry);
+                list_del(&(((struct pcidev_info *)
+                             (element->sysdata))->pdi_list));
+                kfree(element->sysdata);
+                kfree(element);
+        }
+        return;
+}
+
+/*
+ * hubdev_init_node() - Creates the HUB data structure and link them to it's
+ *                      own NODE specific data area.
+ */
+void hubdev_init_node(nodepda_t * npda, cnodeid_t node)
+{
+        struct hubdev_info *hubdev_info;
+        int size;
+        pg_data_t *pg;
+
+        size = sizeof(struct hubdev_info);
+
+        if (node >= num_online_nodes()) /* Headless/memless IO nodes */
+                pg = NODE_DATA(0);
+        else
+                pg = NODE_DATA(node);
+
+        hubdev_info = (struct hubdev_info *)alloc_bootmem_node(pg, size);
+
+        npda->pdinfo = (void *)hubdev_info;
+}
+
+geoid_t
+cnodeid_get_geoid(cnodeid_t cnode)
+{
+        struct hubdev_info *hubdev;
+
+        hubdev = (struct hubdev_info *)(NODEPDA(cnode)->pdinfo);
+        return hubdev->hdi_geoid;
+}
+
+void sn_generate_path(struct pci_bus *pci_bus, char *address)
+{
+        nasid_t nasid;
+        cnodeid_t cnode;
+        geoid_t geoid;
+        moduleid_t moduleid;
+        u16 bricktype;
+
+        nasid = NASID_GET(SN_PCIBUS_BUSSOFT(pci_bus)->bs_base);
+        cnode = nasid_to_cnodeid(nasid);
+        geoid = cnodeid_get_geoid(cnode);
+        moduleid = geo_module(geoid);
+
+        sprintf(address, "module_%c%c%c%c%.2d",
+                '0'+RACK_GET_CLASS(MODULE_GET_RACK(moduleid)),
+                '0'+RACK_GET_GROUP(MODULE_GET_RACK(moduleid)),
+                '0'+RACK_GET_NUM(MODULE_GET_RACK(moduleid)),
+                MODULE_GET_BTCHAR(moduleid), MODULE_GET_BPOS(moduleid));
+
+        /* Tollhouse requires slot id to be displayed */
+        bricktype = MODULE_GET_BTYPE(moduleid);
+        if ((bricktype == L1_BRICKTYPE_191010) ||
+            (bricktype == L1_BRICKTYPE_1932))
+                        sprintf(address, "%s^%d", address, geo_slot(geoid));
+}
+
+/*
+ * sn_pci_fixup_bus() - Perform SN specific setup of software structs
+ *                      (pcibus_bussoft, pcidev_info) and hardware
+ *                      registers, for the specified bus and devices under it.
+ */
+void __devinit
+sn_pci_fixup_bus(struct pci_bus *bus)
+{
+
+        if (SN_ACPI_BASE_SUPPORT())
+                sn_acpi_bus_fixup(bus);
+        else
+                sn_bus_fixup(bus);
+}
+
+/*
+ * sn_io_early_init - Perform early IO (and some non-IO) initialization.
+ *                    In particular, setup the sn_pci_provider[] array.
+ *                    This needs to be done prior to any bus scanning
+ *                    (acpi_scan_init()) in the ACPI case, as the SN
+ *                    bus fixup code will reference the array.
+ */
+static int __init
+sn_io_early_init(void)
+{
+        int i;
+
+        if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
+                return 0;
+
+        /*
+         * prime sn_pci_provider[].  Individial provider init routines will
+         * override their respective default entries.
+         */
+
+        for (i = 0; i < PCIIO_ASIC_MAX_TYPES; i++)
+                sn_pci_provider[i] = &sn_pci_default_provider;
+
+        pcibr_init_provider();
+        tioca_init_provider();
+        tioce_init_provider();
+
+        /*
+         * This is needed to avoid bounce limit checks in the blk layer
+         */
+        ia64_max_iommu_merge_mask = ~PAGE_MASK;
+
+        sn_irq_lh_init();
+        INIT_LIST_HEAD(&sn_sysdata_list);
+        sn_init_cpei_timer();
+
+#ifdef CONFIG_PROC_FS
+        register_sn_procfs();
+#endif
+
+        printk(KERN_INFO "ACPI  DSDT OEM Rev 0x%x\n",
+               acpi_gbl_DSDT->oem_revision);
+        if (SN_ACPI_BASE_SUPPORT())
+                sn_io_acpi_init();
+        else
+                sn_io_init();
+        return 0;
+}
+
+arch_initcall(sn_io_early_init);
+
+/*
+ * sn_io_late_init() - Perform any final platform specific IO initialization.
+ */
+
+int __init
+sn_io_late_init(void)
+{
+        struct pci_bus *bus;
+        struct pcibus_bussoft *bussoft;
+        cnodeid_t cnode;
+        nasid_t nasid;
+        cnodeid_t near_cnode;
+
+        if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
+                return 0;
+
+        /*
+         * Setup closest node in pci_controller->node for
+         * PIC, TIOCP, TIOCE (TIOCA does it during bus fixup using
+         * info from the PROM).
+         */
+        bus = NULL;
+        while ((bus = pci_find_next_bus(bus)) != NULL) {
+                bussoft = SN_PCIBUS_BUSSOFT(bus);
+                nasid = NASID_GET(bussoft->bs_base);
+                cnode = nasid_to_cnodeid(nasid);
+                if ((bussoft->bs_asic_type == PCIIO_ASIC_TYPE_TIOCP) ||
+                    (bussoft->bs_asic_type == PCIIO_ASIC_TYPE_TIOCE)) {
+                        /* TIO PCI Bridge: find nearest node with CPUs */
+                        int e = sn_hwperf_get_nearest_node(cnode, NULL,
+                                                           &near_cnode);
+                        if (e < 0) {
+                                near_cnode = (cnodeid_t)-1; /* use any node */
+                                printk(KERN_WARNING "pcibr_bus_fixup: failed "
+                                       "to find near node with CPUs to TIO "
+                                       "node %d, err=%d\n", cnode, e);
+                        }
+                        PCI_CONTROLLER(bus)->node = near_cnode;
+                } else if (bussoft->bs_asic_type == PCIIO_ASIC_TYPE_PIC) {
+                        PCI_CONTROLLER(bus)->node = cnode;
+                }
+        }
+
+        sn_ioif_inited = 1;     /* SN I/O infrastructure now initialized */
+
+        return 0;
+}
+
+fs_initcall(sn_io_late_init);
+
+EXPORT_SYMBOL(sn_pci_fixup_slot);
+EXPORT_SYMBOL(sn_pci_unfixup_slot);
+EXPORT_SYMBOL(sn_bus_store_sysdata);
+EXPORT_SYMBOL(sn_bus_free_sysdata);
+EXPORT_SYMBOL(sn_generate_path);
+
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index dc09a6a28a37..9ad843e0383b 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -3,103 +3,28 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1992 - 1997, 2000-2006 Silicon Graphics, Inc. All rights reserved.
  */
 
-#include <linux/bootmem.h>
-#include <linux/nodemask.h>
 #include <asm/sn/types.h>
 #include <asm/sn/addrs.h>
-#include <asm/sn/sn_feature_sets.h>
-#include <asm/sn/geo.h>
 #include <asm/sn/io.h>
-#include <asm/sn/l1.h>
 #include <asm/sn/module.h>
-#include <asm/sn/pcibr_provider.h>
+#include <asm/sn/intr.h>
 #include <asm/sn/pcibus_provider_defs.h>
 #include <asm/sn/pcidev.h>
-#include <asm/sn/simulator.h>
 #include <asm/sn/sn_sal.h>
-#include <asm/sn/tioca_provider.h>
-#include <asm/sn/tioce_provider.h>
 #include "xtalk/hubdev.h"
-#include "xtalk/xwidgetdev.h"
-
-
-extern void sn_init_cpei_timer(void);
-extern void register_sn_procfs(void);
-
-static struct list_head sn_sysdata_list;
-
-/* sysdata list struct */
-struct sysdata_el {
-        struct list_head entry;
-        void *sysdata;
-};
-
-struct slab_info {
-        struct hubdev_info hubdev;
-};
-
-struct brick {
-        moduleid_t id;          /* Module ID of this module        */
-        struct slab_info slab_info[MAX_SLABS + 1];
-};
-
-int sn_ioif_inited;             /* SN I/O infrastructure initialized? */
-
-struct sn_pcibus_provider *sn_pci_provider[PCIIO_ASIC_MAX_TYPES];       /* indexed by asic type */
-
-static int max_segment_number;           /* Default highest segment number */
-static int max_pcibus_number = 255;     /* Default highest pci bus number */
 
 /*
- * Hooks and struct for unsupported pci providers
+ * The code in this file will only be executed when running with
+ * a PROM that does _not_ have base ACPI IO support.
+ * (i.e., SN_ACPI_BASE_SUPPORT() == 0)
  */
 
-static dma_addr_t
-sn_default_pci_map(struct pci_dev *pdev, unsigned long paddr, size_t size, int type)
-{
-        return 0;
-}
-
-static void
-sn_default_pci_unmap(struct pci_dev *pdev, dma_addr_t addr, int direction)
-{
-        return;
-}
-
-static void *
-sn_default_pci_bus_fixup(struct pcibus_bussoft *soft, struct pci_controller *controller)
-{
-        return NULL;
-}
-
-static struct sn_pcibus_provider sn_pci_default_provider = {
-        .dma_map = sn_default_pci_map,
-        .dma_map_consistent = sn_default_pci_map,
-        .dma_unmap = sn_default_pci_unmap,
-        .bus_fixup = sn_default_pci_bus_fixup,
-};
-
-/*
- * Retrieve the DMA Flush List given nasid, widget, and device.
- * This list is needed to implement the WAR - Flush DMA data on PIO Reads.
- */
-static inline u64
-sal_get_device_dmaflush_list(u64 nasid, u64 widget_num, u64 device_num,
-                             u64 address)
-{
-        struct ia64_sal_retval ret_stuff;
-        ret_stuff.status = 0;
-        ret_stuff.v0 = 0;
+static int max_segment_number;           /* Default highest segment number */
+static int max_pcibus_number = 255;     /* Default highest pci bus number */
 
-        SAL_CALL_NOLOCK(ret_stuff,
-                        (u64) SN_SAL_IOIF_GET_DEVICE_DMAFLUSH_LIST,
-                        (u64) nasid, (u64) widget_num,
-                        (u64) device_num, (u64) address, 0, 0, 0);
-        return ret_stuff.status;
-}
 
 /*
  * Retrieve the hub device info structure for the given nasid.
@@ -131,93 +56,20 @@ static inline u64 sal_get_pcibus_info(u64 segment, u64 busnum, u64 address)
         return ret_stuff.v0;
 }
 
-/*
- * Retrieve the pci device information given the bus and device|function number.
- */
-static inline u64
-sal_get_pcidev_info(u64 segment, u64 bus_number, u64 devfn, u64 pci_dev,
-                    u64 sn_irq_info)
-{
-        struct ia64_sal_retval ret_stuff;
-        ret_stuff.status = 0;
-        ret_stuff.v0 = 0;
-
-        SAL_CALL_NOLOCK(ret_stuff,
-                        (u64) SN_SAL_IOIF_GET_PCIDEV_INFO,
-                        (u64) segment, (u64) bus_number, (u64) devfn,
-                        (u64) pci_dev,
-                        sn_irq_info, 0, 0);
-        return ret_stuff.v0;
-}
-
-/*
- * sn_pcidev_info_get() - Retrieve the pcidev_info struct for the specified
- *                        device.
- */
-inline struct pcidev_info *
-sn_pcidev_info_get(struct pci_dev *dev)
-{
-        struct pcidev_info *pcidev;
-
-        list_for_each_entry(pcidev,
-                            &(SN_PCI_CONTROLLER(dev)->pcidev_info), pdi_list) {
-                if (pcidev->pdi_linux_pcidev == dev) {
-                        return pcidev;
-                }
-        }
-        return NULL;
-}
-
-/* Older PROM flush WAR
- *
- * 01/16/06 -- This war will be in place until a new official PROM is released.
- * Additionally note that the struct sn_flush_device_war also has to be
- * removed from arch/ia64/sn/include/xtalk/hubdev.h
- */
-static u8 war_implemented = 0;
-
-static s64 sn_device_fixup_war(u64 nasid, u64 widget, int device,
-                               struct sn_flush_device_common *common)
-{
-        struct sn_flush_device_war *war_list;
-        struct sn_flush_device_war *dev_entry;
-        struct ia64_sal_retval isrv = {0,0,0,0};
-
-        if (!war_implemented) {
-                printk(KERN_WARNING "PROM version < 4.50 -- implementing old "
-                       "PROM flush WAR\n");
-                war_implemented = 1;
-        }
-
-        war_list = kzalloc(DEV_PER_WIDGET * sizeof(*war_list), GFP_KERNEL);
-        if (!war_list)
-                BUG();
-
-        SAL_CALL_NOLOCK(isrv, SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST,
-                        nasid, widget, __pa(war_list), 0, 0, 0 ,0);
-        if (isrv.status)
-                panic("sn_device_fixup_war failed: %s\n",
-                      ia64_sal_strerror(isrv.status));
-
-        dev_entry = war_list + device;
-        memcpy(common,dev_entry, sizeof(*common));
-        kfree(war_list);
-
-        return isrv.status;
-}
 
 /*
- * sn_fixup_ionodes() - This routine initializes the HUB data strcuture for
- *      each node in the system.
+ * sn_fixup_ionodes() - This routine initializes the HUB data structure for
+ *                      each node in the system. This function is only
+ *                      executed when running with a non-ACPI capable PROM.
  */
 static void __init sn_fixup_ionodes(void)
 {
-        struct sn_flush_device_kernel *sn_flush_device_kernel;
-        struct sn_flush_device_kernel *dev_entry;
+
         struct hubdev_info *hubdev;
         u64 status;
         u64 nasid;
-        int i, widget, device, size;
+        int i;
+        extern void sn_common_hubdev_init(struct hubdev_info *);
 
         /*
          * Get SGI Specific HUB chipset information.
@@ -240,70 +92,47 @@ static void __init sn_fixup_ionodes(void)
                         max_segment_number = hubdev->max_segment_number;
                         max_pcibus_number = hubdev->max_pcibus_number;
                 }
+                sn_common_hubdev_init(hubdev);
+        }
+}
 
-                /* Attach the error interrupt handlers */
-                if (nasid & 1)
-                        ice_error_init(hubdev);
-                else
-                        hub_error_init(hubdev);
-
-                for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++)
-                        hubdev->hdi_xwidget_info[widget].xwi_hubinfo = hubdev;
-
-                if (!hubdev->hdi_flush_nasid_list.widget_p)
-                        continue;
-
-                size = (HUB_WIDGET_ID_MAX + 1) *
-                        sizeof(struct sn_flush_device_kernel *);
-                hubdev->hdi_flush_nasid_list.widget_p =
-                        kzalloc(size, GFP_KERNEL);
-                if (!hubdev->hdi_flush_nasid_list.widget_p)
+/*
+ * sn_pci_legacy_window_fixup - Create PCI controller windows for
+ *                              legacy IO and MEM space. This needs to
+ *                              be done here, as the PROM does not have
+ *                              ACPI support defining the root buses
+ *                              and their resources (_CRS),
+ */
+static void
+sn_legacy_pci_window_fixup(struct pci_controller *controller,
+                           u64 legacy_io, u64 legacy_mem)
+{
+                controller->window = kcalloc(2, sizeof(struct pci_window),
+                                             GFP_KERNEL);
+                if (controller->window == NULL)
                         BUG();
-
-                for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) {
-                        size = DEV_PER_WIDGET *
-                                sizeof(struct sn_flush_device_kernel);
-                        sn_flush_device_kernel = kzalloc(size, GFP_KERNEL);
-                        if (!sn_flush_device_kernel)
-                                BUG();
-
-                        dev_entry = sn_flush_device_kernel;
-                        for (device = 0; device < DEV_PER_WIDGET;
-                             device++,dev_entry++) {
-                                size = sizeof(struct sn_flush_device_common);
-                                dev_entry->common = kzalloc(size, GFP_KERNEL);
-                                if (!dev_entry->common)
-                                        BUG();
-
-                                if (sn_prom_feature_available(
-                                                       PRF_DEVICE_FLUSH_LIST))
-                                        status = sal_get_device_dmaflush_list(
-                                                     nasid, widget, device,
-                                                     (u64)(dev_entry->common));
-                                else
-                                        status = sn_device_fixup_war(nasid,
-                                                     widget, device,
-                                                     dev_entry->common);
-                                if (status != SALRET_OK)
-                                        panic("SAL call failed: %s\n",
-                                              ia64_sal_strerror(status));
-
-                                spin_lock_init(&dev_entry->sfdl_flush_lock);
-                        }
-
-                        if (sn_flush_device_kernel)
-                                hubdev->hdi_flush_nasid_list.widget_p[widget] =
-                                                       sn_flush_device_kernel;
-                }
-        }
+                controller->window[0].offset = legacy_io;
+                controller->window[0].resource.name = "legacy_io";
+                controller->window[0].resource.flags = IORESOURCE_IO;
+                controller->window[0].resource.start = legacy_io;
+                controller->window[0].resource.end =
+                                controller->window[0].resource.start + 0xffff;
+                controller->window[0].resource.parent = &ioport_resource;
+                controller->window[1].offset = legacy_mem;
+                controller->window[1].resource.name = "legacy_mem";
+                controller->window[1].resource.flags = IORESOURCE_MEM;
+                controller->window[1].resource.start = legacy_mem;
+                controller->window[1].resource.end =
+                       controller->window[1].resource.start + (1024 * 1024) - 1;
+                controller->window[1].resource.parent = &iomem_resource;
+                controller->windows = 2;
 }
 
 /*
  * sn_pci_window_fixup() - Create a pci_window for each device resource.
- *                         Until ACPI support is added, we need this code
- *                         to setup pci_windows for use by
- *                         pcibios_bus_to_resource(),
- *                         pcibios_resource_to_bus(), etc.
+ *                         It will setup pci_windows for use by
+ *                         pcibios_bus_to_resource(), pcibios_resource_to_bus(),
+ *                         etc.
  */
 static void
 sn_pci_window_fixup(struct pci_dev *dev, unsigned int count,
@@ -342,60 +171,22 @@ sn_pci_window_fixup(struct pci_dev *dev, unsigned int count,
         controller->window = new_window;
 }
 
-void sn_pci_unfixup_slot(struct pci_dev *dev)
-{
-        struct pci_dev *host_pci_dev = SN_PCIDEV_INFO(dev)->host_pci_dev;
-
-        sn_irq_unfixup(dev);
-        pci_dev_put(host_pci_dev);
-        pci_dev_put(dev);
-}
-
 /*
- * sn_pci_fixup_slot() - This routine sets up a slot's resources
- * consistent with the Linux PCI abstraction layer.  Resources acquired
- * from our PCI provider include PIO maps to BAR space and interrupt
- * objects.
+ * sn_more_slot_fixup() - We are not running with an ACPI capable PROM,
+ *                        and need to convert the pci_dev->resource
+ *                        'start' and 'end' addresses to mapped addresses,
+ *                        and setup the pci_controller->window array entries.
  */
-void sn_pci_fixup_slot(struct pci_dev *dev)
+void
+sn_more_slot_fixup(struct pci_dev *dev, struct pcidev_info *pcidev_info)
 {
         unsigned int count = 0;
         int idx;
-        int segment = pci_domain_nr(dev->bus);
-        int status = 0;
-        struct pcibus_bussoft *bs;
-        struct pci_bus *host_pci_bus;
-        struct pci_dev *host_pci_dev;
-        struct pcidev_info *pcidev_info;
         s64 pci_addrs[PCI_ROM_RESOURCE + 1];
-        struct sn_irq_info *sn_irq_info;
-        unsigned long size;
-        unsigned int bus_no, devfn;
-
-        pci_dev_get(dev); /* for the sysdata pointer */
-        pcidev_info = kzalloc(sizeof(struct pcidev_info), GFP_KERNEL);
-        if (!pcidev_info)
-                BUG();          /* Cannot afford to run out of memory */
-
-        sn_irq_info = kzalloc(sizeof(struct sn_irq_info), GFP_KERNEL);
-        if (!sn_irq_info)
-                BUG();          /* Cannot afford to run out of memory */
-
-        /* Call to retrieve pci device information needed by kernel. */
-        status = sal_get_pcidev_info((u64) segment, (u64) dev->bus->number, 
-                                     dev->devfn,
-                                     (u64) __pa(pcidev_info),
-                                     (u64) __pa(sn_irq_info));
-        if (status)
-                BUG(); /* Cannot get platform pci device information */
-
-        /* Add pcidev_info to list in sn_pci_controller struct */
-        list_add_tail(&pcidev_info->pdi_list,
-                      &(SN_PCI_CONTROLLER(dev->bus)->pcidev_info));
+        unsigned long addr, end, size, start;
 
         /* Copy over PIO Mapped Addresses */
         for (idx = 0; idx <= PCI_ROM_RESOURCE; idx++) {
-                unsigned long start, end, addr;
 
                 if (!pcidev_info->pdi_pio_mapped_addr[idx]) {
                         pci_addrs[idx] = -1;
@@ -419,60 +210,28 @@ void sn_pci_fixup_slot(struct pci_dev *dev)
                         dev->resource[idx].parent = &ioport_resource;
                 else
                         dev->resource[idx].parent = &iomem_resource;
+                /* If ROM, mark as shadowed in PROM */
+                if (idx == PCI_ROM_RESOURCE)
+                        dev->resource[idx].flags |= IORESOURCE_ROM_BIOS_COPY;
         }
         /* Create a pci_window in the pci_controller struct for
          * each device resource.
          */
         if (count > 0)
                 sn_pci_window_fixup(dev, count, pci_addrs);
-
-        /*
-         * Using the PROMs values for the PCI host bus, get the Linux
-         * PCI host_pci_dev struct and set up host bus linkages
-         */
-
-        bus_no = (pcidev_info->pdi_slot_host_handle >> 32) & 0xff;
-        devfn = pcidev_info->pdi_slot_host_handle & 0xffffffff;
-        host_pci_bus = pci_find_bus(segment, bus_no);
-        host_pci_dev = pci_get_slot(host_pci_bus, devfn);
-
-        pcidev_info->host_pci_dev = host_pci_dev;
-        pcidev_info->pdi_linux_pcidev = dev;
-        pcidev_info->pdi_host_pcidev_info = SN_PCIDEV_INFO(host_pci_dev);
-        bs = SN_PCIBUS_BUSSOFT(dev->bus);
-        pcidev_info->pdi_pcibus_info = bs;
-
-        if (bs && bs->bs_asic_type < PCIIO_ASIC_MAX_TYPES) {
-                SN_PCIDEV_BUSPROVIDER(dev) = sn_pci_provider[bs->bs_asic_type];
-        } else {
-                SN_PCIDEV_BUSPROVIDER(dev) = &sn_pci_default_provider;
-        }
-
-        /* Only set up IRQ stuff if this device has a host bus context */
-        if (bs && sn_irq_info->irq_irq) {
-                pcidev_info->pdi_sn_irq_info = sn_irq_info;
-                dev->irq = pcidev_info->pdi_sn_irq_info->irq_irq;
-                sn_irq_fixup(dev, sn_irq_info);
-        } else {
-                pcidev_info->pdi_sn_irq_info = NULL;
-                kfree(sn_irq_info);
-        }
 }
 
 /*
  * sn_pci_controller_fixup() - This routine sets up a bus's resources
- * consistent with the Linux PCI abstraction layer.
+ *                             consistent with the Linux PCI abstraction layer.
  */
-void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
+static void
+sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
 {
-        int status;
-        int nasid, cnode;
+        s64 status = 0;
         struct pci_controller *controller;
-        struct sn_pci_controller *sn_controller;
         struct pcibus_bussoft *prom_bussoft_ptr;
-        struct hubdev_info *hubdev_info;
-        void *provider_soft;
-        struct sn_pcibus_provider *provider;
+
 
         status = sal_get_pcibus_info((u64) segment, (u64) busnum,
                                      (u64) ia64_tpa(&prom_bussoft_ptr));
@@ -480,261 +239,77 @@ void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
                 return;         /*bus # does not exist */
         prom_bussoft_ptr = __va(prom_bussoft_ptr);
 
-        /* Allocate a sn_pci_controller, which has a pci_controller struct
-         * as the first member.
-         */
-        sn_controller = kzalloc(sizeof(struct sn_pci_controller), GFP_KERNEL);
-        if (!sn_controller)
+        controller = kzalloc(sizeof(*controller), GFP_KERNEL);
+        if (!controller)
                 BUG();
-        INIT_LIST_HEAD(&sn_controller->pcidev_info);
-        controller = &sn_controller->pci_controller;
         controller->segment = segment;
 
-        if (bus == NULL) {
-                bus = pci_scan_bus(busnum, &pci_root_ops, controller);
-                if (bus == NULL)
-                        goto error_return; /* error, or bus already scanned */
-                bus->sysdata = NULL;
-        }
-
-        if (bus->sysdata)
-                goto error_return; /* sysdata already alloc'd */
-
         /*
-         * Per-provider fixup.  Copies the contents from prom to local
-         * area and links SN_PCIBUS_BUSSOFT().
+         * Temporarily save the prom_bussoft_ptr for use by sn_bus_fixup().
+         * (platform_data will be overwritten later in sn_common_bus_fixup())
          */
+        controller->platform_data = prom_bussoft_ptr;
 
-        if (prom_bussoft_ptr->bs_asic_type >= PCIIO_ASIC_MAX_TYPES)
-                goto error_return; /* unsupported asic type */
-
-        if (prom_bussoft_ptr->bs_asic_type == PCIIO_ASIC_TYPE_PPB)
-                goto error_return; /* no further fixup necessary */
-
-        provider = sn_pci_provider[prom_bussoft_ptr->bs_asic_type];
-        if (provider == NULL)
-                goto error_return; /* no provider registerd for this asic */
+        bus = pci_scan_bus(busnum, &pci_root_ops, controller);
+        if (bus == NULL)
+                goto error_return; /* error, or bus already scanned */
 
         bus->sysdata = controller;
-        if (provider->bus_fixup)
-                provider_soft = (*provider->bus_fixup) (prom_bussoft_ptr, controller);
-        else
-                provider_soft = NULL;
-
-        if (provider_soft == NULL) {
-                /* fixup failed or not applicable */
-                bus->sysdata = NULL;
-                goto error_return;
-        }
-
-        /*
-         * Setup pci_windows for legacy IO and MEM space.
-         * (Temporary until ACPI support is in place.)
-         */
-        controller->window = kcalloc(2, sizeof(struct pci_window), GFP_KERNEL);
-        if (controller->window == NULL)
-                BUG();
-        controller->window[0].offset = prom_bussoft_ptr->bs_legacy_io;
-        controller->window[0].resource.name = "legacy_io";
-        controller->window[0].resource.flags = IORESOURCE_IO;
-        controller->window[0].resource.start = prom_bussoft_ptr->bs_legacy_io;
-        controller->window[0].resource.end =
-            controller->window[0].resource.start + 0xffff;
-        controller->window[0].resource.parent = &ioport_resource;
-        controller->window[1].offset = prom_bussoft_ptr->bs_legacy_mem;
-        controller->window[1].resource.name = "legacy_mem";
-        controller->window[1].resource.flags = IORESOURCE_MEM;
-        controller->window[1].resource.start = prom_bussoft_ptr->bs_legacy_mem;
-        controller->window[1].resource.end =
-            controller->window[1].resource.start + (1024 * 1024) - 1;
-        controller->window[1].resource.parent = &iomem_resource;
-        controller->windows = 2;
-
-        /*
-         * Generic bus fixup goes here.  Don't reference prom_bussoft_ptr
-         * after this point.
-         */
-
-        PCI_CONTROLLER(bus)->platform_data = provider_soft;
-        nasid = NASID_GET(SN_PCIBUS_BUSSOFT(bus)->bs_base);
-        cnode = nasid_to_cnodeid(nasid);
-        hubdev_info = (struct hubdev_info *)(NODEPDA(cnode)->pdinfo);
-        SN_PCIBUS_BUSSOFT(bus)->bs_xwidget_info =
-            &(hubdev_info->hdi_xwidget_info[SN_PCIBUS_BUSSOFT(bus)->bs_xid]);
 
-        /*
-         * If the node information we obtained during the fixup phase is invalid
-         * then set controller->node to -1 (undetermined)
-         */
-        if (controller->node >= num_online_nodes()) {
-                struct pcibus_bussoft *b = SN_PCIBUS_BUSSOFT(bus);
-
-                printk(KERN_WARNING "Device ASIC=%u XID=%u PBUSNUM=%u"
-                                    "L_IO=%lx L_MEM=%lx BASE=%lx\n",
-                        b->bs_asic_type, b->bs_xid, b->bs_persist_busnum,
-                        b->bs_legacy_io, b->bs_legacy_mem, b->bs_base);
-                printk(KERN_WARNING "on node %d but only %d nodes online."
-                        "Association set to undetermined.\n",
-                        controller->node, num_online_nodes());
-                controller->node = -1;
-        }
         return;
 
 error_return:
 
-        kfree(sn_controller);
+        kfree(controller);
         return;
 }
 
-void sn_bus_store_sysdata(struct pci_dev *dev)
+/*
+ * sn_bus_fixup
+ */
+void
+sn_bus_fixup(struct pci_bus *bus)
 {
-        struct sysdata_el *element;
-
-        element = kzalloc(sizeof(struct sysdata_el), GFP_KERNEL);
-        if (!element) {
-                dev_dbg(dev, "%s: out of memory!\n", __FUNCTION__);
-                return;
-        }
-        element->sysdata = SN_PCIDEV_INFO(dev);
-        list_add(&element->entry, &sn_sysdata_list);
-}
+        struct pci_dev *pci_dev = NULL;
+        struct pcibus_bussoft *prom_bussoft_ptr;
+        extern void sn_common_bus_fixup(struct pci_bus *,
+                                        struct pcibus_bussoft *);
+
+
+        if (!bus->parent) {  /* If root bus */
+                prom_bussoft_ptr = PCI_CONTROLLER(bus)->platform_data;
+                if (prom_bussoft_ptr == NULL) {
+                        printk(KERN_ERR
+                               "sn_bus_fixup: 0x%04x:0x%02x Unable to "
+                               "obtain prom_bussoft_ptr\n",
+                               pci_domain_nr(bus), bus->number);
+                        return;
+                }
+                sn_common_bus_fixup(bus, prom_bussoft_ptr);
+                sn_legacy_pci_window_fixup(PCI_CONTROLLER(bus),
+                                           prom_bussoft_ptr->bs_legacy_io,
+                                           prom_bussoft_ptr->bs_legacy_mem);
+        }
+        list_for_each_entry(pci_dev, &bus->devices, bus_list) {
+                sn_pci_fixup_slot(pci_dev);
+        }
 
-void sn_bus_free_sysdata(void)
-{
-        struct sysdata_el *element;
-        struct list_head *list, *safe;
-
-        list_for_each_safe(list, safe, &sn_sysdata_list) {
-                element = list_entry(list, struct sysdata_el, entry);
-                list_del(&element->entry);
-                list_del(&(((struct pcidev_info *)
-                             (element->sysdata))->pdi_list));
-                kfree(element->sysdata);
-                kfree(element);
-        }
-        return;
 }
 
 /*
- * Ugly hack to get PCI setup until we have a proper ACPI namespace.
+ * sn_io_init - PROM does not have ACPI support to define nodes or root buses,
+ *              so we need to do things the hard way, including initiating the
+ *              bus scanning ourselves.
  */
 
-#define PCI_BUSES_TO_SCAN 256
-
-static int __init sn_pci_init(void)
+void __init sn_io_init(void)
 {
         int i, j;
-        struct pci_dev *pci_dev = NULL;
-
-        if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
-                return 0;
-
-        /*
-         * prime sn_pci_provider[].  Individial provider init routines will
-         * override their respective default entries.
-         */
-
-        for (i = 0; i < PCIIO_ASIC_MAX_TYPES; i++)
-                sn_pci_provider[i] = &sn_pci_default_provider;
 
-        pcibr_init_provider();
-        tioca_init_provider();
-        tioce_init_provider();
-
-        /*
-         * This is needed to avoid bounce limit checks in the blk layer
-         */
-        ia64_max_iommu_merge_mask = ~PAGE_MASK;
         sn_fixup_ionodes();
-        sn_irq_lh_init();
-        INIT_LIST_HEAD(&sn_sysdata_list);
-        sn_init_cpei_timer();
-
-#ifdef CONFIG_PROC_FS
-        register_sn_procfs();
-#endif
 
         /* busses are not known yet ... */
         for (i = 0; i <= max_segment_number; i++)
                 for (j = 0; j <= max_pcibus_number; j++)
                         sn_pci_controller_fixup(i, j, NULL);
-
-        /*
-         * Generic Linux PCI Layer has created the pci_bus and pci_dev 
-         * structures - time for us to add our SN PLatform specific 
-         * information.
-         */
-
-        while ((pci_dev =
-                pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) != NULL)
-                sn_pci_fixup_slot(pci_dev);
-
-        sn_ioif_inited = 1;     /* sn I/O infrastructure now initialized */
-
-        return 0;
-}
-
-/*
- * hubdev_init_node() - Creates the HUB data structure and link them to it's 
- *      own NODE specific data area.
- */
-void hubdev_init_node(nodepda_t * npda, cnodeid_t node)
-{
-        struct hubdev_info *hubdev_info;
-        int size;
-        pg_data_t *pg;
-
-        size = sizeof(struct hubdev_info);
-
-        if (node >= num_online_nodes()) /* Headless/memless IO nodes */
-                pg = NODE_DATA(0);
-        else
-                pg = NODE_DATA(node);
-
-        hubdev_info = (struct hubdev_info *)alloc_bootmem_node(pg, size);
-
-        npda->pdinfo = (void *)hubdev_info;
 }
-
-geoid_t
-cnodeid_get_geoid(cnodeid_t cnode)
-{
-        struct hubdev_info *hubdev;
-
-        hubdev = (struct hubdev_info *)(NODEPDA(cnode)->pdinfo);
-        return hubdev->hdi_geoid;
-}
-
-void sn_generate_path(struct pci_bus *pci_bus, char *address)
-{
-        nasid_t nasid;
-        cnodeid_t cnode;
-        geoid_t geoid;
-        moduleid_t moduleid;
-        u16 bricktype;
-
-        nasid = NASID_GET(SN_PCIBUS_BUSSOFT(pci_bus)->bs_base);
-        cnode = nasid_to_cnodeid(nasid);
-        geoid = cnodeid_get_geoid(cnode);
-        moduleid = geo_module(geoid);
-
-        sprintf(address, "module_%c%c%c%c%.2d",
-                '0'+RACK_GET_CLASS(MODULE_GET_RACK(moduleid)),
-                '0'+RACK_GET_GROUP(MODULE_GET_RACK(moduleid)),
-                '0'+RACK_GET_NUM(MODULE_GET_RACK(moduleid)),
-                MODULE_GET_BTCHAR(moduleid), MODULE_GET_BPOS(moduleid));
-
-        /* Tollhouse requires slot id to be displayed */
-        bricktype = MODULE_GET_BTYPE(moduleid);
-        if ((bricktype == L1_BRICKTYPE_191010) ||
-            (bricktype == L1_BRICKTYPE_1932))
-                        sprintf(address, "%s^%d", address, geo_slot(geoid));
-}
-
-subsys_initcall(sn_pci_init);
-EXPORT_SYMBOL(sn_pci_fixup_slot);
-EXPORT_SYMBOL(sn_pci_unfixup_slot);
-EXPORT_SYMBOL(sn_pci_controller_fixup);
-EXPORT_SYMBOL(sn_bus_store_sysdata);
-EXPORT_SYMBOL(sn_bus_free_sysdata);
-EXPORT_SYMBOL(sn_generate_path);
diff --git a/arch/ia64/sn/kernel/iomv.c b/arch/ia64/sn/kernel/iomv.c
index 7ce3cdad627b..4aa4f301d56d 100644
--- a/arch/ia64/sn/kernel/iomv.c
+++ b/arch/ia64/sn/kernel/iomv.c
@@ -3,10 +3,11 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2000-2003 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 2000-2003, 2006 Silicon Graphics, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
 #include <asm/delay.h>
 #include <asm/vga.h>
@@ -15,6 +16,7 @@
 #include <asm/sn/pda.h>
 #include <asm/sn/sn_cpuid.h>
 #include <asm/sn/shub_mmr.h>
+#include <asm/sn/acpi.h>
 
 #define IS_LEGACY_VGA_IOPORT(p) \
         (((p) >= 0x3b0 && (p) <= 0x3bb) || ((p) >= 0x3c0 && (p) <= 0x3df))
@@ -31,11 +33,14 @@ void *sn_io_addr(unsigned long port)
 {
         if (!IS_RUNNING_ON_SIMULATOR()) {
                 if (IS_LEGACY_VGA_IOPORT(port))
-                        port += vga_console_iobase;
+                        return (__ia64_mk_io_addr(port));
                 /* On sn2, legacy I/O ports don't point at anything */
                 if (port < (64 * 1024))
                         return NULL;
-                return ((void *)(port | __IA64_UNCACHED_OFFSET));
+                if (SN_ACPI_BASE_SUPPORT())
+                        return (__ia64_mk_io_addr(port));
+                else
+                        return ((void *)(port | __IA64_UNCACHED_OFFSET));
         } else {
                 /* but the simulator uses them... */
                 unsigned long addr;
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 7a2d824c5ce3..1d009f93244d 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -388,6 +388,14 @@ void __init sn_setup(char **cmdline_p)
         ia64_sn_plat_set_error_handling_features();     // obsolete
         ia64_sn_set_os_feature(OSF_MCA_SLV_TO_OS_INIT_SLV);
         ia64_sn_set_os_feature(OSF_FEAT_LOG_SBES);
+        /*
+         * Note: The calls to notify the PROM of ACPI and PCI Segment
+         *       support must be done prior to acpi_load_tables(), as
+         *       an ACPI capable PROM will rebuild the DSDT as result
+         *       of the call.
+         */
+        ia64_sn_set_os_feature(OSF_PCISEGMENT_ENABLE);
+        ia64_sn_set_os_feature(OSF_ACPI_ENABLE);
 
 
 #if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
@@ -413,6 +421,16 @@ void __init sn_setup(char **cmdline_p)
         if (! vga_console_membase)
                 sn_scan_pcdp();
 
+        /*
+         *      Setup legacy IO space.
+         *      vga_console_iobase maps to PCI IO Space address 0 on the
+         *      bus containing the VGA console.
+         */
+        if (vga_console_iobase) {
+                io_space[0].mmio_base = vga_console_iobase;
+                io_space[0].sparse = 0;
+        }
+
         if (vga_console_membase) {
                 /* usable vga ... make tty0 the preferred default console */
                 if (!strstr(*cmdline_p, "console="))
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index feaf1a6e8101..493380b2c05f 100644
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -552,7 +552,7 @@ static void __exit tiocx_exit(void)
         bus_unregister(&tiocx_bus_type);
 }
 
-subsys_initcall(tiocx_init);
+fs_initcall(tiocx_init);
 module_exit(tiocx_exit);
 
 /************************************************************************
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
index 27dd7df0f446..6846dc9b432d 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2001-2004 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 2001-2004, 2006 Silicon Graphics, Inc. All rights reserved.
  */
 
 #include <linux/interrupt.h>
@@ -109,7 +109,6 @@ void *
 pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *controller)
 {
         int nasid, cnode, j;
-        cnodeid_t near_cnode;
         struct hubdev_info *hubdev_info;
         struct pcibus_info *soft;
         struct sn_flush_device_kernel *sn_flush_device_kernel;
@@ -186,20 +185,6 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
                 return NULL;
         }
 
-        if (prom_bussoft->bs_asic_type == PCIIO_ASIC_TYPE_TIOCP) {
-                /* TIO PCI Bridge: find nearest node with CPUs */
-                int e = sn_hwperf_get_nearest_node(cnode, NULL, &near_cnode);
-
-                if (e < 0) {
-                        near_cnode = (cnodeid_t)-1; /* use any node */
-                        printk(KERN_WARNING "pcibr_bus_fixup: failed to find "
-                                "near node with CPUs to TIO node %d, err=%d\n",
-                                cnode, e);
-                }
-                controller->node = near_cnode;
-        }
-        else
-                controller->node = cnode;
         return soft;
 }
 
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c
index 46e16dcf5971..35f854fb6120 100644
--- a/arch/ia64/sn/pci/tioce_provider.c
+++ b/arch/ia64/sn/pci/tioce_provider.c
@@ -15,7 +15,6 @@
 #include <asm/sn/pcidev.h>
 #include <asm/sn/pcibus_provider_defs.h>
 #include <asm/sn/tioce_provider.h>
-#include <asm/sn/sn2/sn_hwperf.h>
 
 /*
  * 1/26/2006
@@ -990,8 +989,6 @@ tioce_target_interrupt(struct sn_irq_info *sn_irq_info)
 static void *
 tioce_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *controller)
 {
-        int my_nasid;
-        cnodeid_t my_cnode, mem_cnode;
         struct tioce_common *tioce_common;
         struct tioce_kernel *tioce_kern;
         struct tioce __iomem *tioce_mmr;
@@ -1035,21 +1032,6 @@ tioce_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
                        tioce_common->ce_pcibus.bs_persist_segment,
                        tioce_common->ce_pcibus.bs_persist_busnum);
 
-        /*
-         * identify closest nasid for memory allocations
-         */
-
-        my_nasid = NASID_GET(tioce_common->ce_pcibus.bs_base);
-        my_cnode = nasid_to_cnodeid(my_nasid);
-
-        if (sn_hwperf_get_nearest_node(my_cnode, &mem_cnode, NULL) < 0) {
-                printk(KERN_WARNING "tioce_bus_fixup: failed to find "
-                       "closest node with MEM to TIO node %d\n", my_cnode);
-                mem_cnode = (cnodeid_t)-1; /* use any node */
-        }
-
-        controller->node = mem_cnode;
-
         return tioce_common;
 }
 
diff --git a/arch/m32r/lib/csum_partial_copy.c b/arch/m32r/lib/csum_partial_copy.c
index 3d5f06145854..5596f3df833f 100644
--- a/arch/m32r/lib/csum_partial_copy.c
+++ b/arch/m32r/lib/csum_partial_copy.c
@@ -27,9 +27,8 @@
 /*
  * Copy while checksumming, otherwise like csum_partial
  */
-unsigned int
-csum_partial_copy_nocheck (const unsigned char *src, unsigned char *dst,
-                           int len, unsigned int sum)
+__wsum
+csum_partial_copy_nocheck (const void *src, void *dst, int len, __wsum sum)
 {
         sum = csum_partial(src, len, sum);
         memcpy(dst, src, len);
@@ -42,10 +41,9 @@ EXPORT_SYMBOL(csum_partial_copy_nocheck);
  * Copy from userspace and compute checksum.  If we catch an exception
  * then zero the rest of the buffer.
  */
-unsigned int
-csum_partial_copy_from_user (const unsigned char __user *src,
-                             unsigned char *dst,
-                             int len, unsigned int sum, int *err_ptr)
+__wsum
+csum_partial_copy_from_user (const void __user *src, void *dst,
+                             int len, __wsum sum, int *err_ptr)
 {
         int missing;
 
diff --git a/arch/m68k/lib/checksum.c b/arch/m68k/lib/checksum.c
index cb13c6e3ccae..aed3be29e06b 100644
--- a/arch/m68k/lib/checksum.c
+++ b/arch/m68k/lib/checksum.c
@@ -39,8 +39,7 @@
  * computes a partial checksum, e.g. for TCP/UDP fragments
  */
 
-unsigned int
-csum_partial (const unsigned char *buff, int len, unsigned int sum)
+__wsum csum_partial(const void *buff, int len, __wsum sum)
 {
         unsigned long tmp1, tmp2;
           /*
@@ -133,9 +132,9 @@ EXPORT_SYMBOL(csum_partial);
  * copy from user space while checksumming, with exception handling.
  */
 
-unsigned int
-csum_partial_copy_from_user(const unsigned char __user *src, unsigned char *dst,
-                            int len, int sum, int *csum_err)
+__wsum
+csum_partial_copy_from_user(const void __user *src, void *dst,
+                            int len, __wsum sum, int *csum_err)
 {
         /*
          * GCC doesn't like more than 10 operands for the asm
@@ -325,8 +324,8 @@ csum_partial_copy_from_user(const unsigned char __user *src, unsigned char *dst,
  * copy from kernel space while checksumming, otherwise like csum_partial
  */
 
-unsigned int
-csum_partial_copy_nocheck(const unsigned char *src, unsigned char *dst, int len, int sum)
+__wsum
+csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
 {
         unsigned long tmp1, tmp2;
         __asm__("movel %2,%4\n\t"
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 6d920d4bdc3d..c1bc22c6d0d8 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -565,7 +565,7 @@ config ROMVEC
         depends on ROM
         help
           This is almost always the same as the base of the ROM. Since on all
-          68000 type varients the vectors are at the base of the boot device
+          68000 type variants the vectors are at the base of the boot device
           on system startup.
 
 config ROMVECSIZE
@@ -574,7 +574,7 @@ config ROMVECSIZE
         depends on ROM
         help
           Define the size of the vector region in ROM. For most 68000
-          varients this would be 0x400 bytes in size. Set to 0 if you do
+          variants this would be 0x400 bytes in size. Set to 0 if you do
           not want a vector region at the start of the ROM.
 
 config ROMSTART
diff --git a/arch/m68knommu/kernel/m68k_ksyms.c b/arch/m68knommu/kernel/m68k_ksyms.c
index 1e62150f3588..25327c9eadd7 100644
--- a/arch/m68knommu/kernel/m68k_ksyms.c
+++ b/arch/m68knommu/kernel/m68k_ksyms.c
@@ -38,7 +38,7 @@ EXPORT_SYMBOL(ip_fast_csum);
 EXPORT_SYMBOL(kernel_thread);
 
 /* Networking helper routines. */
-EXPORT_SYMBOL(csum_partial_copy);
+EXPORT_SYMBOL(csum_partial_copy_nocheck);
 
 /* The following are special because they're not called
    explicitly (the C compiler generates them).  Fortunately,
diff --git a/arch/m68knommu/lib/checksum.c b/arch/m68knommu/lib/checksum.c
index 7bec6fdee34b..269d83bfbbe1 100644
--- a/arch/m68knommu/lib/checksum.c
+++ b/arch/m68knommu/lib/checksum.c
@@ -96,9 +96,9 @@ out:
  *      This is a version of ip_compute_csum() optimized for IP headers,
  *      which always checksum on 4 octet boundaries.
  */
-unsigned short ip_fast_csum(unsigned char * iph, unsigned int ihl)
+__sum16 ip_fast_csum(const void *iph, unsigned int ihl)
 {
-        return ~do_csum(iph,ihl*4);
+        return (__force __sum16)~do_csum(iph,ihl*4);
 }
 
 /*
@@ -113,15 +113,15 @@ unsigned short ip_fast_csum(unsigned char * iph, unsigned int ihl)
  *
  * it's best to have buff aligned on a 32-bit boundary
  */
-unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum)
+__wsum csum_partial(const void *buff, int len, __wsum sum)
 {
         unsigned int result = do_csum(buff, len);
 
         /* add in old sum, and carry.. */
-        result += sum;
-        if (sum > result)
+        result += (__force u32)sum;
+        if ((__force u32)sum > result)
                 result += 1;
-        return result;
+        return (__force __wsum)result;
 }
 
 EXPORT_SYMBOL(csum_partial);
@@ -130,21 +130,21 @@ EXPORT_SYMBOL(csum_partial);
  * this routine is used for miscellaneous IP-like checksums, mainly
  * in icmp.c
  */
-unsigned short ip_compute_csum(const unsigned char * buff, int len)
+__sum16 ip_compute_csum(const void *buff, int len)
 {
-        return ~do_csum(buff,len);
+        return (__force __sum16)~do_csum(buff,len);
 }
 
 /*
  * copy from fs while checksumming, otherwise like csum_partial
  */
 
-unsigned int
-csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst,
-                            int len, int sum, int *csum_err)
+__wsum
+csum_partial_copy_from_user(const void __user *src, void *dst,
+                            int len, __wsum sum, int *csum_err)
 {
         if (csum_err) *csum_err = 0;
-        memcpy(dst, src, len);
+        memcpy(dst, (__force const void *)src, len);
         return csum_partial(dst, len, sum);
 }
 
@@ -152,8 +152,8 @@ csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst,
  * copy from ds while checksumming, otherwise like csum_partial
  */
 
-unsigned int
-csum_partial_copy(const unsigned char *src, unsigned char *dst, int len, int sum)
+__wsum
+csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
 {
         memcpy(dst, src, len);
         return csum_partial(dst, len, sum);
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 1443024b1c7c..27f83e642968 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -266,8 +266,8 @@ config MIPS_MALTA
         select BOOT_ELF32
         select HAVE_STD_PC_SERIAL_PORT
         select DMA_NONCOHERENT
-        select IRQ_CPU
         select GENERIC_ISA_DMA
+        select IRQ_CPU
         select HW_HAS_PCI
         select I8259
         select MIPS_BOARDS_GEN
@@ -534,7 +534,7 @@ config SGI_IP22
         select HW_HAS_EISA
         select IP22_CPU_SCACHE
         select IRQ_CPU
-        select NO_ISA if ISA
+        select GENERIC_ISA_DMA_SUPPORT_BROKEN
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_R4X00
         select SYS_HAS_CPU_R5000
@@ -766,6 +766,23 @@ config TOSHIBA_RBTX4938
 
 endchoice
 
+config KEXEC
+        bool "Kexec system call (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+        help
+          kexec is a system call that implements the ability to shutdown your
+          current kernel, and to start another kernel.  It is like a reboot
+          but it is indepedent of the system firmware.   And like a reboot
+          you can start any kernel with it, not just Linux.
+
+          The name comes from the similiarity to the exec system call.
+
+          It is an ongoing process to be certain the hardware in a machine
+          is properly shutdown, so do not be surprised if this code does not
+          initially work for you.  It may help to enable device hotplugging
+          support.  As of this writing the exact hardware interface is
+          strongly in flux, so no good recommendation can be made.
+
 source "arch/mips/ddb5xxx/Kconfig"
 source "arch/mips/gt64120/ev64120/Kconfig"
 source "arch/mips/jazz/Kconfig"
@@ -864,8 +881,11 @@ config MIPS_NILE4
 config MIPS_DISABLE_OBSOLETE_IDE
         bool
 
+config GENERIC_ISA_DMA_SUPPORT_BROKEN
+        bool
+
 #
-# Endianess selection.  Suffiently obscure so many users don't know what to
+# Endianess selection.  Sufficiently obscure so many users don't know what to
 # answer,so we try hard to limit the available choices.  Also the use of a
 # choice statement should be more obvious to the user.
 #
@@ -874,7 +894,7 @@ choice
         help
           Some MIPS machines can be configured for either little or big endian
           byte order. These modes require different kernels and a different
-          Linux distribution.  In general there is one prefered byteorder for a
+          Linux distribution.  In general there is one preferred byteorder for a
           particular system but some systems are just as commonly used in the
           one or the other endianess.
 
@@ -1835,13 +1855,11 @@ source "drivers/pci/Kconfig"
 config ISA
         bool
 
-config NO_ISA
-        bool
-
 config EISA
         bool "EISA support"
         depends on HW_HAS_EISA
         select ISA
+        select GENERIC_ISA_DMA
         ---help---
           The Extended Industry Standard Architecture (EISA) bus was
           developed as an open alternative to the IBM MicroChannel bus.
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index d580d46f967b..641aa30b3638 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -63,9 +63,7 @@ cflags-y		+= -mabi=64
 ifdef CONFIG_BUILD_ELF64
 cflags-y                += $(call cc-option,-mno-explicit-relocs)
 else
-# -msym32 can not be used for modules since they are loaded into XKSEG
-CFLAGS_MODULE           += $(call cc-option,-mno-explicit-relocs)
-CFLAGS_KERNEL           += $(call cc-option,-msym32)
+cflags-y                += $(call cc-option,-msym32)
 endif
 endif
 
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c
index 2abe132bb07d..9cf7b6715836 100644
--- a/arch/mips/au1000/common/irq.c
+++ b/arch/mips/au1000/common/irq.c
@@ -70,7 +70,6 @@ extern irq_cpustat_t irq_stat [NR_CPUS];
 extern void mips_timer_interrupt(void);
 
 static void setup_local_irq(unsigned int irq, int type, int int_req);
-static unsigned int startup_irq(unsigned int irq);
 static void end_irq(unsigned int irq_nr);
 static inline void mask_and_ack_level_irq(unsigned int irq_nr);
 static inline void mask_and_ack_rise_edge_irq(unsigned int irq_nr);
@@ -84,20 +83,6 @@ void	(*board_init_irq)(void);
 static DEFINE_SPINLOCK(irq_lock);
 
 
-static unsigned int startup_irq(unsigned int irq_nr)
-{
-        local_enable_irq(irq_nr);
-        return 0;
-}
-
-
-static void shutdown_irq(unsigned int irq_nr)
-{
-        local_disable_irq(irq_nr);
-        return;
-}
-
-
 inline void local_enable_irq(unsigned int irq_nr)
 {
         if (irq_nr > AU1000_LAST_INTC0_INT) {
@@ -249,41 +234,37 @@ void restore_local_and_enable(int controller, unsigned long mask)
 
 static struct irq_chip rise_edge_irq_type = {
         .typename = "Au1000 Rise Edge",
-        .startup = startup_irq,
-        .shutdown = shutdown_irq,
-        .enable = local_enable_irq,
-        .disable = local_disable_irq,
         .ack = mask_and_ack_rise_edge_irq,
+        .mask = local_disable_irq,
+        .mask_ack = mask_and_ack_rise_edge_irq,
+        .unmask = local_enable_irq,
         .end = end_irq,
 };
 
 static struct irq_chip fall_edge_irq_type = {
         .typename = "Au1000 Fall Edge",
-        .startup = startup_irq,
-        .shutdown = shutdown_irq,
-        .enable = local_enable_irq,
-        .disable = local_disable_irq,
         .ack = mask_and_ack_fall_edge_irq,
+        .mask = local_disable_irq,
+        .mask_ack = mask_and_ack_fall_edge_irq,
+        .unmask = local_enable_irq,
         .end = end_irq,
 };
 
 static struct irq_chip either_edge_irq_type = {
         .typename = "Au1000 Rise or Fall Edge",
-        .startup = startup_irq,
-        .shutdown = shutdown_irq,
-        .enable = local_enable_irq,
-        .disable = local_disable_irq,
         .ack = mask_and_ack_either_edge_irq,
+        .mask = local_disable_irq,
+        .mask_ack = mask_and_ack_either_edge_irq,
+        .unmask = local_enable_irq,
         .end = end_irq,
 };
 
 static struct irq_chip level_irq_type = {
         .typename = "Au1000 Level",
-        .startup = startup_irq,
-        .shutdown = shutdown_irq,
-        .enable = local_enable_irq,
-        .disable = local_disable_irq,
         .ack = mask_and_ack_level_irq,
+        .mask = local_disable_irq,
+        .mask_ack = mask_and_ack_level_irq,
+        .unmask = local_enable_irq,
         .end = end_irq,
 };
 
@@ -328,31 +309,31 @@ static void setup_local_irq(unsigned int irq_nr, int type, int int_req)
                                 au_writel(1<<(irq_nr-32), IC1_CFG2CLR);
                                 au_writel(1<<(irq_nr-32), IC1_CFG1CLR);
                                 au_writel(1<<(irq_nr-32), IC1_CFG0SET);
-                                irq_desc[irq_nr].chip = &rise_edge_irq_type;
+                                set_irq_chip(irq_nr, &rise_edge_irq_type);
                                 break;
                         case INTC_INT_FALL_EDGE: /* 0:1:0 */
                                 au_writel(1<<(irq_nr-32), IC1_CFG2CLR);
                                 au_writel(1<<(irq_nr-32), IC1_CFG1SET);
                                 au_writel(1<<(irq_nr-32), IC1_CFG0CLR);
-                                irq_desc[irq_nr].chip = &fall_edge_irq_type;
+                                set_irq_chip(irq_nr, &fall_edge_irq_type);
                                 break;
                         case INTC_INT_RISE_AND_FALL_EDGE: /* 0:1:1 */
                                 au_writel(1<<(irq_nr-32), IC1_CFG2CLR);
                                 au_writel(1<<(irq_nr-32), IC1_CFG1SET);
                                 au_writel(1<<(irq_nr-32), IC1_CFG0SET);
-                                irq_desc[irq_nr].chip = &either_edge_irq_type;
+                                set_irq_chip(irq_nr, &either_edge_irq_type);
                                 break;
                         case INTC_INT_HIGH_LEVEL: /* 1:0:1 */
                                 au_writel(1<<(irq_nr-32), IC1_CFG2SET);
                                 au_writel(1<<(irq_nr-32), IC1_CFG1CLR);
                                 au_writel(1<<(irq_nr-32), IC1_CFG0SET);
-                                irq_desc[irq_nr].chip = &level_irq_type;
+                                set_irq_chip(irq_nr, &level_irq_type);
                                 break;
                         case INTC_INT_LOW_LEVEL: /* 1:1:0 */
                                 au_writel(1<<(irq_nr-32), IC1_CFG2SET);
                                 au_writel(1<<(irq_nr-32), IC1_CFG1SET);
                                 au_writel(1<<(irq_nr-32), IC1_CFG0CLR);
-                                irq_desc[irq_nr].chip = &level_irq_type;
+                                set_irq_chip(irq_nr, &level_irq_type);
                                 break;
                         case INTC_INT_DISABLED: /* 0:0:0 */
                                 au_writel(1<<(irq_nr-32), IC1_CFG0CLR);
@@ -380,31 +361,31 @@ static void setup_local_irq(unsigned int irq_nr, int type, int int_req)
                                 au_writel(1<<irq_nr, IC0_CFG2CLR);
                                 au_writel(1<<irq_nr, IC0_CFG1CLR);
                                 au_writel(1<<irq_nr, IC0_CFG0SET);
-                                irq_desc[irq_nr].chip = &rise_edge_irq_type;
+                                set_irq_chip(irq_nr, &rise_edge_irq_type);
                                 break;
                         case INTC_INT_FALL_EDGE: /* 0:1:0 */
                                 au_writel(1<<irq_nr, IC0_CFG2CLR);
                                 au_writel(1<<irq_nr, IC0_CFG1SET);
                                 au_writel(1<<irq_nr, IC0_CFG0CLR);
-                                irq_desc[irq_nr].chip = &fall_edge_irq_type;
+                                set_irq_chip(irq_nr, &fall_edge_irq_type);
                                 break;
                         case INTC_INT_RISE_AND_FALL_EDGE: /* 0:1:1 */
                                 au_writel(1<<irq_nr, IC0_CFG2CLR);
                                 au_writel(1<<irq_nr, IC0_CFG1SET);
                                 au_writel(1<<irq_nr, IC0_CFG0SET);
-                                irq_desc[irq_nr].chip = &either_edge_irq_type;
+                                set_irq_chip(irq_nr, &either_edge_irq_type);
                                 break;
                         case INTC_INT_HIGH_LEVEL: /* 1:0:1 */
                                 au_writel(1<<irq_nr, IC0_CFG2SET);
                                 au_writel(1<<irq_nr, IC0_CFG1CLR);
                                 au_writel(1<<irq_nr, IC0_CFG0SET);
-                                irq_desc[irq_nr].chip = &level_irq_type;
+                                set_irq_chip(irq_nr, &level_irq_type);
                                 break;
                         case INTC_INT_LOW_LEVEL: /* 1:1:0 */
                                 au_writel(1<<irq_nr, IC0_CFG2SET);
                                 au_writel(1<<irq_nr, IC0_CFG1SET);
                                 au_writel(1<<irq_nr, IC0_CFG0CLR);
-                                irq_desc[irq_nr].chip = &level_irq_type;
+                                set_irq_chip(irq_nr, &level_irq_type);
                                 break;
                         case INTC_INT_DISABLED: /* 0:0:0 */
                                 au_writel(1<<irq_nr, IC0_CFG0CLR);
diff --git a/arch/mips/au1000/pb1200/board_setup.c b/arch/mips/au1000/pb1200/board_setup.c
index 8b953b9fc25c..043302b7fe58 100644
--- a/arch/mips/au1000/pb1200/board_setup.c
+++ b/arch/mips/au1000/pb1200/board_setup.c
@@ -55,7 +55,7 @@
 #endif
 
 extern void _board_init_irq(void);
-extern void     (*board_init_irq)(void);
+extern void (*board_init_irq)(void);
 
 void board_reset (void)
 {
@@ -151,11 +151,7 @@ void __init board_setup(void)
 #endif
 
         /* Setup Pb1200 External Interrupt Controller */
-        {
-                extern void (*board_init_irq)(void);
-                extern void _board_init_irq(void);
-                board_init_irq = _board_init_irq;
-        }
+        board_init_irq = _board_init_irq;
 }
 
 int
diff --git a/arch/mips/cobalt/irq.c b/arch/mips/cobalt/irq.c
index 82e569d5b02c..4c46f0e73783 100644
--- a/arch/mips/cobalt/irq.c
+++ b/arch/mips/cobalt/irq.c
@@ -45,25 +45,22 @@ static inline void galileo_irq(void)
 {
         unsigned int mask, pending, devfn;
 
-        mask = GALILEO_INL(GT_INTRMASK_OFS);
-        pending = GALILEO_INL(GT_INTRCAUSE_OFS) & mask;
+        mask = GT_READ(GT_INTRMASK_OFS);
+        pending = GT_READ(GT_INTRCAUSE_OFS) & mask;
 
-        if (pending & GALILEO_INTR_T0EXP) {
-
-                GALILEO_OUTL(~GALILEO_INTR_T0EXP, GT_INTRCAUSE_OFS);
+        if (pending & GT_INTR_T0EXP_MSK) {
+                GT_WRITE(GT_INTRCAUSE_OFS, ~GT_INTR_T0EXP_MSK);
                 do_IRQ(COBALT_GALILEO_IRQ);
-
-        } else if (pending & GALILEO_INTR_RETRY_CTR) {
-
-                devfn = GALILEO_INL(GT_PCI0_CFGADDR_OFS) >> 8;
-                GALILEO_OUTL(~GALILEO_INTR_RETRY_CTR, GT_INTRCAUSE_OFS);
-                printk(KERN_WARNING "Galileo: PCI retry count exceeded (%02x.%u)\n",
-                        PCI_SLOT(devfn), PCI_FUNC(devfn));
-
+        } else if (pending & GT_INTR_RETRYCTR0_MSK) {
+                devfn = GT_READ(GT_PCI0_CFGADDR_OFS) >> 8;
+                GT_WRITE(GT_INTRCAUSE_OFS, ~GT_INTR_RETRYCTR0_MSK);
+                printk(KERN_WARNING
+                       "Galileo: PCI retry count exceeded (%02x.%u)\n",
+                       PCI_SLOT(devfn), PCI_FUNC(devfn));
         } else {
-
-                GALILEO_OUTL(mask & ~pending, GT_INTRMASK_OFS);
-                printk(KERN_WARNING "Galileo: masking unexpected interrupt %08x\n", pending);
+                GT_WRITE(GT_INTRMASK_OFS, mask & ~pending);
+                printk(KERN_WARNING
+                       "Galileo: masking unexpected interrupt %08x\n", pending);
         }
 }
 
@@ -104,7 +101,7 @@ void __init arch_init_irq(void)
          * Mask all Galileo interrupts. The Galileo
          * handler is set in cobalt_timer_setup()
          */
-        GALILEO_OUTL(0, GT_INTRMASK_OFS);
+        GT_WRITE(GT_INTRMASK_OFS, 0);
 
         init_i8259_irqs();                              /*  0 ... 15 */
         mips_cpu_irq_init(COBALT_CPU_IRQ);              /* 16 ... 23 */
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index bf9dc72b9720..e8f0f20b852d 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -51,23 +51,23 @@ const char *get_system_type(void)
 void __init plat_timer_setup(struct irqaction *irq)
 {
         /* Load timer value for HZ (TCLK is 50MHz) */
-        GALILEO_OUTL(50*1000*1000 / HZ, GT_TC0_OFS);
+        GT_WRITE(GT_TC0_OFS, 50*1000*1000 / HZ);
 
         /* Enable timer */
-        GALILEO_OUTL(GALILEO_ENTC0 | GALILEO_SELTC0, GT_TC_CONTROL_OFS);
+        GT_WRITE(GT_TC_CONTROL_OFS, GT_TC_CONTROL_ENTC0_MSK | GT_TC_CONTROL_SELTC0_MSK);
 
         /* Register interrupt */
         setup_irq(COBALT_GALILEO_IRQ, irq);
 
         /* Enable interrupt */
-        GALILEO_OUTL(GALILEO_INTR_T0EXP | GALILEO_INL(GT_INTRMASK_OFS), GT_INTRMASK_OFS);
+        GT_WRITE(GT_INTRMASK_OFS, GT_INTR_T0EXP_MSK | GT_READ(GT_INTRMASK_OFS));
 }
 
 extern struct pci_ops gt64111_pci_ops;
 
 static struct resource cobalt_mem_resource = {
-        .start  = GT64111_MEM_BASE,
-        .end    = GT64111_MEM_END,
+        .start  = GT_DEF_PCI0_MEM0_BASE,
+        .end    = GT_DEF_PCI0_MEM0_BASE + GT_DEF_PCI0_MEM0_SIZE - 1,
         .name   = "PCI memory",
         .flags  = IORESOURCE_MEM
 };
@@ -115,7 +115,7 @@ static struct pci_controller cobalt_pci_controller = {
         .mem_resource   = &cobalt_mem_resource,
         .mem_offset     = 0,
         .io_resource    = &cobalt_io_resource,
-        .io_offset      = 0 - GT64111_IO_BASE
+        .io_offset      = 0 - GT_DEF_PCI0_IO_BASE,
 };
 
 void __init plat_mem_setup(void)
@@ -128,7 +128,7 @@ void __init plat_mem_setup(void)
         _machine_halt = cobalt_machine_halt;
         pm_power_off = cobalt_machine_power_off;
 
-        set_io_port_base(CKSEG1ADDR(GT64111_IO_BASE));
+        set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE));
 
         /* I/O port resource must include UART and LCD/buttons */
         ioport_resource.end = 0x0fffffff;
@@ -139,7 +139,7 @@ void __init plat_mem_setup(void)
 
         /* Read the cobalt id register out of the PCI config space */
         PCI_CFG_SET(devfn, (VIA_COBALT_BRD_ID_REG & ~0x3));
-        cobalt_board_id = GALILEO_INL(GT_PCI0_CFGDATA_OFS);
+        cobalt_board_id = GT_READ(GT_PCI0_CFGDATA_OFS);
         cobalt_board_id >>= ((VIA_COBALT_BRD_ID_REG & 3) * 8);
         cobalt_board_id = VIA_COBALT_BRD_REG_to_ID(cobalt_board_id);
 
diff --git a/arch/mips/ddb5xxx/ddb5477/irq_5477.c b/arch/mips/ddb5xxx/ddb5477/irq_5477.c
index ba52705a2738..96249aa5df5d 100644
--- a/arch/mips/ddb5xxx/ddb5477/irq_5477.c
+++ b/arch/mips/ddb5xxx/ddb5477/irq_5477.c
@@ -53,14 +53,6 @@ vrc5477_irq_disable(unsigned int irq)
         ll_vrc5477_irq_disable(irq - vrc5477_irq_base);
 }
 
-static unsigned int vrc5477_irq_startup(unsigned int irq)
-{
-        vrc5477_irq_enable(irq);
-        return 0;
-}
-
-#define vrc5477_irq_shutdown    vrc5477_irq_disable
-
 static void
 vrc5477_irq_ack(unsigned int irq)
 {
@@ -91,11 +83,10 @@ vrc5477_irq_end(unsigned int irq)
 
 struct irq_chip vrc5477_irq_controller = {
         .typename = "vrc5477_irq",
-        .startup = vrc5477_irq_startup,
-        .shutdown = vrc5477_irq_shutdown,
-        .enable = vrc5477_irq_enable,
-        .disable = vrc5477_irq_disable,
         .ack = vrc5477_irq_ack,
+        .mask = vrc5477_irq_disable,
+        .mask_ack = vrc5477_irq_ack,
+        .unmask = vrc5477_irq_enable,
         .end = vrc5477_irq_end
 };
 
@@ -103,12 +94,8 @@ void __init vrc5477_irq_init(u32 irq_base)
 {
         u32 i;
 
-        for (i= irq_base; i< irq_base+ NUM_5477_IRQ; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = NULL;
-                irq_desc[i].depth = 1;
-                irq_desc[i].chip = &vrc5477_irq_controller;
-        }
+        for (i= irq_base; i< irq_base+ NUM_5477_IRQ; i++)
+                set_irq_chip(i, &vrc5477_irq_controller);
 
         vrc5477_irq_base = irq_base;
 }
diff --git a/arch/mips/dec/ecc-berr.c b/arch/mips/dec/ecc-berr.c
index 3e374d05978f..c8430c07355e 100644
--- a/arch/mips/dec/ecc-berr.c
+++ b/arch/mips/dec/ecc-berr.c
@@ -18,7 +18,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/spinlock.h>
 #include <linux/types.h>
 
 #include <asm/addrspace.h>
@@ -231,13 +230,10 @@ irqreturn_t dec_ecc_be_interrupt(int irq, void *dev_id)
 static inline void dec_kn02_be_init(void)
 {
         volatile u32 *csr = (void *)CKSEG1ADDR(KN02_SLOT_BASE + KN02_CSR);
-        unsigned long flags;
 
         kn0x_erraddr = (void *)CKSEG1ADDR(KN02_SLOT_BASE + KN02_ERRADDR);
         kn0x_chksyn = (void *)CKSEG1ADDR(KN02_SLOT_BASE + KN02_CHKSYN);
 
-        spin_lock_irqsave(&kn02_lock, flags);
-
         /* Preset write-only bits of the Control Register cache. */
         cached_kn02_csr = *csr | KN02_CSR_LEDS;
 
@@ -247,8 +243,6 @@ static inline void dec_kn02_be_init(void)
         cached_kn02_csr |= KN02_CSR_CORRECT;
         *csr = cached_kn02_csr;
         iob();
-
-        spin_unlock_irqrestore(&kn02_lock, flags);
 }
 
 static inline void dec_kn03_be_init(void)
diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S
index 31dd47d1002d..b251ef864c33 100644
--- a/arch/mips/dec/int-handler.S
+++ b/arch/mips/dec/int-handler.S
@@ -267,7 +267,7 @@ handle_it:
                 LONG_L  s0, TI_REGS($28)
                 LONG_S  sp, TI_REGS($28)
                 PTR_LA  ra, ret_from_irq
-                j       do_IRQ
+                j       dec_irq_dispatch
                  nop
 
 #ifdef CONFIG_32BIT
diff --git a/arch/mips/dec/ioasic-irq.c b/arch/mips/dec/ioasic-irq.c
index 41cd2a96148b..269b22b34313 100644
--- a/arch/mips/dec/ioasic-irq.c
+++ b/arch/mips/dec/ioasic-irq.c
@@ -13,7 +13,6 @@
 
 #include <linux/init.h>
 #include <linux/irq.h>
-#include <linux/spinlock.h>
 #include <linux/types.h>
 
 #include <asm/dec/ioasic.h>
@@ -21,8 +20,6 @@
 #include <asm/dec/ioasic_ints.h>
 
 
-static DEFINE_SPINLOCK(ioasic_lock);
-
 static int ioasic_irq_base;
 
 
@@ -52,65 +49,31 @@ static inline void clear_ioasic_irq(unsigned int irq)
         ioasic_write(IO_REG_SIR, sir);
 }
 
-static inline void enable_ioasic_irq(unsigned int irq)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&ioasic_lock, flags);
-        unmask_ioasic_irq(irq);
-        spin_unlock_irqrestore(&ioasic_lock, flags);
-}
-
-static inline void disable_ioasic_irq(unsigned int irq)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&ioasic_lock, flags);
-        mask_ioasic_irq(irq);
-        spin_unlock_irqrestore(&ioasic_lock, flags);
-}
-
-
-static inline unsigned int startup_ioasic_irq(unsigned int irq)
-{
-        enable_ioasic_irq(irq);
-        return 0;
-}
-
-#define shutdown_ioasic_irq disable_ioasic_irq
-
 static inline void ack_ioasic_irq(unsigned int irq)
 {
-        spin_lock(&ioasic_lock);
         mask_ioasic_irq(irq);
-        spin_unlock(&ioasic_lock);
         fast_iob();
 }
 
 static inline void end_ioasic_irq(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-                enable_ioasic_irq(irq);
+                unmask_ioasic_irq(irq);
 }
 
 static struct irq_chip ioasic_irq_type = {
         .typename = "IO-ASIC",
-        .startup = startup_ioasic_irq,
-        .shutdown = shutdown_ioasic_irq,
-        .enable = enable_ioasic_irq,
-        .disable = disable_ioasic_irq,
         .ack = ack_ioasic_irq,
+        .mask = mask_ioasic_irq,
+        .mask_ack = ack_ioasic_irq,
+        .unmask = unmask_ioasic_irq,
         .end = end_ioasic_irq,
 };
 
 
-#define startup_ioasic_dma_irq startup_ioasic_irq
-
-#define shutdown_ioasic_dma_irq shutdown_ioasic_irq
-
-#define enable_ioasic_dma_irq enable_ioasic_irq
+#define unmask_ioasic_dma_irq unmask_ioasic_irq
 
-#define disable_ioasic_dma_irq disable_ioasic_irq
+#define mask_ioasic_dma_irq mask_ioasic_irq
 
 #define ack_ioasic_dma_irq ack_ioasic_irq
 
@@ -123,11 +86,10 @@ static inline void end_ioasic_dma_irq(unsigned int irq)
 
 static struct irq_chip ioasic_dma_irq_type = {
         .typename = "IO-ASIC-DMA",
-        .startup = startup_ioasic_dma_irq,
-        .shutdown = shutdown_ioasic_dma_irq,
-        .enable = enable_ioasic_dma_irq,
-        .disable = disable_ioasic_dma_irq,
         .ack = ack_ioasic_dma_irq,
+        .mask = mask_ioasic_dma_irq,
+        .mask_ack = ack_ioasic_dma_irq,
+        .unmask = unmask_ioasic_dma_irq,
         .end = end_ioasic_dma_irq,
 };
 
@@ -140,18 +102,12 @@ void __init init_ioasic_irqs(int base)
         ioasic_write(IO_REG_SIMR, 0);
         fast_iob();
 
-        for (i = base; i < base + IO_INR_DMA; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 1;
-                irq_desc[i].chip = &ioasic_irq_type;
-        }
-        for (; i < base + IO_IRQ_LINES; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 1;
-                irq_desc[i].chip = &ioasic_dma_irq_type;
-        }
+        for (i = base; i < base + IO_INR_DMA; i++)
+                set_irq_chip_and_handler(i, &ioasic_irq_type,
+                                         handle_level_irq);
+        for (; i < base + IO_IRQ_LINES; i++)
+                set_irq_chip_and_handler(i, &ioasic_dma_irq_type,
+                                         handle_level_irq);
 
         ioasic_irq_base = base;
 }
diff --git a/arch/mips/dec/kn02-irq.c b/arch/mips/dec/kn02-irq.c
index 04a367a60a57..5a9be4c93584 100644
--- a/arch/mips/dec/kn02-irq.c
+++ b/arch/mips/dec/kn02-irq.c
@@ -14,7 +14,6 @@
 
 #include <linux/init.h>
 #include <linux/irq.h>
-#include <linux/spinlock.h>
 #include <linux/types.h>
 
 #include <asm/dec/kn02.h>
@@ -29,7 +28,6 @@
  * There is no default value -- it has to be initialized.
  */
 u32 cached_kn02_csr;
-DEFINE_SPINLOCK(kn02_lock);
 
 
 static int kn02_irq_base;
@@ -53,54 +51,24 @@ static inline void mask_kn02_irq(unsigned int irq)
         *csr = cached_kn02_csr;
 }
 
-static inline void enable_kn02_irq(unsigned int irq)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&kn02_lock, flags);
-        unmask_kn02_irq(irq);
-        spin_unlock_irqrestore(&kn02_lock, flags);
-}
-
-static inline void disable_kn02_irq(unsigned int irq)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&kn02_lock, flags);
-        mask_kn02_irq(irq);
-        spin_unlock_irqrestore(&kn02_lock, flags);
-}
-
-
-static unsigned int startup_kn02_irq(unsigned int irq)
-{
-        enable_kn02_irq(irq);
-        return 0;
-}
-
-#define shutdown_kn02_irq disable_kn02_irq
-
 static void ack_kn02_irq(unsigned int irq)
 {
-        spin_lock(&kn02_lock);
         mask_kn02_irq(irq);
-        spin_unlock(&kn02_lock);
         iob();
 }
 
 static void end_kn02_irq(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-                enable_kn02_irq(irq);
+                unmask_kn02_irq(irq);
 }
 
 static struct irq_chip kn02_irq_type = {
         .typename = "KN02-CSR",
-        .startup = startup_kn02_irq,
-        .shutdown = shutdown_kn02_irq,
-        .enable = enable_kn02_irq,
-        .disable = disable_kn02_irq,
         .ack = ack_kn02_irq,
+        .mask = mask_kn02_irq,
+        .mask_ack = ack_kn02_irq,
+        .unmask = unmask_kn02_irq,
         .end = end_kn02_irq,
 };
 
@@ -109,22 +77,15 @@ void __init init_kn02_irqs(int base)
 {
         volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE +
                                                        KN02_CSR);
-        unsigned long flags;
         int i;
 
         /* Mask interrupts. */
-        spin_lock_irqsave(&kn02_lock, flags);
         cached_kn02_csr &= ~KN02_CSR_IOINTEN;
         *csr = cached_kn02_csr;
         iob();
-        spin_unlock_irqrestore(&kn02_lock, flags);
-
-        for (i = base; i < base + KN02_IRQ_LINES; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 1;
-                irq_desc[i].chip = &kn02_irq_type;
-        }
+
+        for (i = base; i < base + KN02_IRQ_LINES; i++)
+                set_irq_chip_and_handler(i, &kn02_irq_type, handle_level_irq);
 
         kn02_irq_base = base;
 }
diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c
index 6b7481e97bec..d34032ac492a 100644
--- a/arch/mips/dec/setup.c
+++ b/arch/mips/dec/setup.c
@@ -761,3 +761,9 @@ void __init arch_init_irq(void)
         if (dec_interrupt[DEC_IRQ_HALT] >= 0)
                 setup_irq(dec_interrupt[DEC_IRQ_HALT], &haltirq);
 }
+
+asmlinkage unsigned int dec_irq_dispatch(unsigned int irq)
+{
+        do_IRQ(irq);
+        return 0;
+}
diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c
index 69e424e9ab6f..8b7e0c17ac35 100644
--- a/arch/mips/dec/time.c
+++ b/arch/mips/dec/time.c
@@ -151,7 +151,7 @@ static void dec_timer_ack(void)
         CMOS_READ(RTC_REG_C);                   /* Ack the RTC interrupt.  */
 }
 
-static unsigned int dec_ioasic_hpt_read(void)
+static cycle_t dec_ioasic_hpt_read(void)
 {
         /*
          * The free-running counter is 32-bit which is good for about
@@ -171,7 +171,7 @@ void __init dec_time_init(void)
 
         if (!cpu_has_counter && IOASIC)
                 /* For pre-R4k systems we use the I/O ASIC's counter.  */
-                mips_hpt_read = dec_ioasic_hpt_read;
+                clocksource_mips.read = dec_ioasic_hpt_read;
 
         /* Set up the rate of periodic DS1287 interrupts.  */
         CMOS_WRITE(RTC_REF_CLCK_32KHZ | (16 - __ffs(HZ)), RTC_REG_A);
diff --git a/arch/mips/emma2rh/common/irq_emma2rh.c b/arch/mips/emma2rh/common/irq_emma2rh.c
index 197ed4c2ba04..59b98299c896 100644
--- a/arch/mips/emma2rh/common/irq_emma2rh.c
+++ b/arch/mips/emma2rh/common/irq_emma2rh.c
@@ -56,22 +56,6 @@ static void emma2rh_irq_disable(unsigned int irq)
         ll_emma2rh_irq_disable(irq - emma2rh_irq_base);
 }
 
-static unsigned int emma2rh_irq_startup(unsigned int irq)
-{
-        emma2rh_irq_enable(irq);
-        return 0;
-}
-
-#define emma2rh_irq_shutdown    emma2rh_irq_disable
-
-static void emma2rh_irq_ack(unsigned int irq)
-{
-        /* disable interrupt - some handler will re-enable the irq
-         * and if the interrupt is leveled, we will have infinite loop
-         */
-        ll_emma2rh_irq_disable(irq - emma2rh_irq_base);
-}
-
 static void emma2rh_irq_end(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
@@ -80,25 +64,20 @@ static void emma2rh_irq_end(unsigned int irq)
 
 struct irq_chip emma2rh_irq_controller = {
         .typename = "emma2rh_irq",
-        .startup = emma2rh_irq_startup,
-        .shutdown = emma2rh_irq_shutdown,
-        .enable = emma2rh_irq_enable,
-        .disable = emma2rh_irq_disable,
-        .ack = emma2rh_irq_ack,
+        .ack = emma2rh_irq_disable,
+        .mask = emma2rh_irq_disable,
+        .mask_ack = emma2rh_irq_disable,
+        .unmask = emma2rh_irq_enable,
         .end = emma2rh_irq_end,
-        .set_affinity = NULL    /* no affinity stuff for UP */
 };
 
 void emma2rh_irq_init(u32 irq_base)
 {
         u32 i;
 
-        for (i = irq_base; i < irq_base + NUM_EMMA2RH_IRQ; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = NULL;
-                irq_desc[i].depth = 1;
-                irq_desc[i].chip = &emma2rh_irq_controller;
-        }
+        for (i = irq_base; i < irq_base + NUM_EMMA2RH_IRQ; i++)
+                set_irq_chip_and_handler(i, &emma2rh_irq_controller,
+                                         handle_level_irq);
 
         emma2rh_irq_base = irq_base;
 }
diff --git a/arch/mips/emma2rh/markeins/irq_markeins.c b/arch/mips/emma2rh/markeins/irq_markeins.c
index 0b36eb001e62..3ac4e405ecdc 100644
--- a/arch/mips/emma2rh/markeins/irq_markeins.c
+++ b/arch/mips/emma2rh/markeins/irq_markeins.c
@@ -48,19 +48,6 @@ static void emma2rh_sw_irq_disable(unsigned int irq)
         ll_emma2rh_sw_irq_disable(irq - emma2rh_sw_irq_base);
 }
 
-static unsigned int emma2rh_sw_irq_startup(unsigned int irq)
-{
-        emma2rh_sw_irq_enable(irq);
-        return 0;
-}
-
-#define emma2rh_sw_irq_shutdown emma2rh_sw_irq_disable
-
-static void emma2rh_sw_irq_ack(unsigned int irq)
-{
-        ll_emma2rh_sw_irq_disable(irq - emma2rh_sw_irq_base);
-}
-
 static void emma2rh_sw_irq_end(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
@@ -69,25 +56,20 @@ static void emma2rh_sw_irq_end(unsigned int irq)
 
 struct irq_chip emma2rh_sw_irq_controller = {
         .typename = "emma2rh_sw_irq",
-        .startup = emma2rh_sw_irq_startup,
-        .shutdown = emma2rh_sw_irq_shutdown,
-        .enable = emma2rh_sw_irq_enable,
-        .disable = emma2rh_sw_irq_disable,
-        .ack = emma2rh_sw_irq_ack,
+        .ack = emma2rh_sw_irq_disable,
+        .mask = emma2rh_sw_irq_disable,
+        .mask_ack = emma2rh_sw_irq_disable,
+        .unmask = emma2rh_sw_irq_enable,
         .end = emma2rh_sw_irq_end,
-        .set_affinity = NULL,
 };
 
 void emma2rh_sw_irq_init(u32 irq_base)
 {
         u32 i;
 
-        for (i = irq_base; i < irq_base + NUM_EMMA2RH_IRQ_SW; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = NULL;
-                irq_desc[i].depth = 2;
-                irq_desc[i].chip = &emma2rh_sw_irq_controller;
-        }
+        for (i = irq_base; i < irq_base + NUM_EMMA2RH_IRQ_SW; i++)
+                set_irq_chip_and_handler(i, &emma2rh_sw_irq_controller,
+                                         handle_level_irq);
 
         emma2rh_sw_irq_base = irq_base;
 }
@@ -126,14 +108,6 @@ static void emma2rh_gpio_irq_disable(unsigned int irq)
         ll_emma2rh_gpio_irq_disable(irq - emma2rh_gpio_irq_base);
 }
 
-static unsigned int emma2rh_gpio_irq_startup(unsigned int irq)
-{
-        emma2rh_gpio_irq_enable(irq);
-        return 0;
-}
-
-#define emma2rh_gpio_irq_shutdown emma2rh_gpio_irq_disable
-
 static void emma2rh_gpio_irq_ack(unsigned int irq)
 {
         irq -= emma2rh_gpio_irq_base;
@@ -149,25 +123,19 @@ static void emma2rh_gpio_irq_end(unsigned int irq)
 
 struct irq_chip emma2rh_gpio_irq_controller = {
         .typename = "emma2rh_gpio_irq",
-        .startup = emma2rh_gpio_irq_startup,
-        .shutdown = emma2rh_gpio_irq_shutdown,
-        .enable = emma2rh_gpio_irq_enable,
-        .disable = emma2rh_gpio_irq_disable,
         .ack = emma2rh_gpio_irq_ack,
+        .mask = emma2rh_gpio_irq_disable,
+        .mask_ack = emma2rh_gpio_irq_ack,
+        .unmask = emma2rh_gpio_irq_enable,
         .end = emma2rh_gpio_irq_end,
-        .set_affinity = NULL,
 };
 
 void emma2rh_gpio_irq_init(u32 irq_base)
 {
         u32 i;
 
-        for (i = irq_base; i < irq_base + NUM_EMMA2RH_IRQ_GPIO; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = NULL;
-                irq_desc[i].depth = 2;
-                irq_desc[i].chip = &emma2rh_gpio_irq_controller;
-        }
+        for (i = irq_base; i < irq_base + NUM_EMMA2RH_IRQ_GPIO; i++)
+                set_irq_chip(i, &emma2rh_gpio_irq_controller);
 
         emma2rh_gpio_irq_base = irq_base;
 }
diff --git a/arch/mips/gt64120/ev64120/irq.c b/arch/mips/gt64120/ev64120/irq.c
index ed4d82b9a24a..b3e5796c81d7 100644
--- a/arch/mips/gt64120/ev64120/irq.c
+++ b/arch/mips/gt64120/ev64120/irq.c
@@ -66,38 +66,21 @@ asmlinkage void plat_irq_dispatch(void)
 
 static void disable_ev64120_irq(unsigned int irq_nr)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         if (irq_nr >= 8) {      // All PCI interrupts are on line 5 or 2
                 clear_c0_status(9 << 10);
         } else {
                 clear_c0_status(1 << (irq_nr + 8));
         }
-        local_irq_restore(flags);
 }
 
 static void enable_ev64120_irq(unsigned int irq_nr)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         if (irq_nr >= 8)        // All PCI interrupts are on line 5 or 2
                 set_c0_status(9 << 10);
         else
                 set_c0_status(1 << (irq_nr + 8));
-        local_irq_restore(flags);
-}
-
-static unsigned int startup_ev64120_irq(unsigned int irq)
-{
-        enable_ev64120_irq(irq);
-        return 0;               /* Never anything pending  */
 }
 
-#define shutdown_ev64120_irq     disable_ev64120_irq
-#define mask_and_ack_ev64120_irq disable_ev64120_irq
-
 static void end_ev64120_irq(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
@@ -106,13 +89,11 @@ static void end_ev64120_irq(unsigned int irq)
 
 static struct irq_chip ev64120_irq_type = {
         .typename       = "EV64120",
-        .startup        = startup_ev64120_irq,
-        .shutdown       = shutdown_ev64120_irq,
-        .enable         = enable_ev64120_irq,
-        .disable        = disable_ev64120_irq,
-        .ack            = mask_and_ack_ev64120_irq,
+        .ack            = disable_ev64120_irq,
+        .mask           = disable_ev64120_irq,
+        .mask_ack       = disable_ev64120_irq,
+        .unmask         = enable_ev64120_irq,
         .end            = end_ev64120_irq,
-        .set_affinity   = NULL
 };
 
 void gt64120_irq_setup(void)
@@ -122,8 +103,6 @@ void gt64120_irq_setup(void)
          */
         clear_c0_status(ST0_IM);
 
-        local_irq_disable();
-
         /*
          * Enable timer.  Other interrupts will be enabled as they are
          * registered.
@@ -133,16 +112,5 @@ void gt64120_irq_setup(void)
 
 void __init arch_init_irq(void)
 {
-        int i;
-
-        /*  Let's initialize our IRQ descriptors  */
-        for (i = 0; i < NR_IRQS; i++) {
-                irq_desc[i].status = 0;
-                irq_desc[i].chip = &no_irq_chip;
-                irq_desc[i].action = NULL;
-                irq_desc[i].depth = 0;
-                spin_lock_init(&irq_desc[i].lock);
-        }
-
         gt64120_irq_setup();
 }
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c
index d5bd6b3a0933..5c4f50cdf157 100644
--- a/arch/mips/jazz/irq.c
+++ b/arch/mips/jazz/irq.c
@@ -28,14 +28,6 @@ static void enable_r4030_irq(unsigned int irq)
         spin_unlock_irqrestore(&r4030_lock, flags);
 }
 
-static unsigned int startup_r4030_irq(unsigned int irq)
-{
-        enable_r4030_irq(irq);
-        return 0; /* never anything pending */
-}
-
-#define shutdown_r4030_irq      disable_r4030_irq
-
 void disable_r4030_irq(unsigned int irq)
 {
         unsigned int mask = ~(1 << (irq - JAZZ_PARALLEL_IRQ));
@@ -47,8 +39,6 @@ void disable_r4030_irq(unsigned int irq)
         spin_unlock_irqrestore(&r4030_lock, flags);
 }
 
-#define mask_and_ack_r4030_irq disable_r4030_irq
-
 static void end_r4030_irq(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
@@ -57,11 +47,10 @@ static void end_r4030_irq(unsigned int irq)
 
 static struct irq_chip r4030_irq_type = {
         .typename = "R4030",
-        .startup = startup_r4030_irq,
-        .shutdown = shutdown_r4030_irq,
-        .enable = enable_r4030_irq,
-        .disable = disable_r4030_irq,
-        .ack = mask_and_ack_r4030_irq,
+        .ack = disable_r4030_irq,
+        .mask = disable_r4030_irq,
+        .mask_ack = disable_r4030_irq,
+        .unmask = enable_r4030_irq,
         .end = end_r4030_irq,
 };
 
@@ -69,12 +58,8 @@ void __init init_r4030_ints(void)
 {
         int i;
 
-        for (i = JAZZ_PARALLEL_IRQ; i <= JAZZ_TIMER_IRQ; i++) {
-                irq_desc[i].status     = IRQ_DISABLED;
-                irq_desc[i].action     = 0;
-                irq_desc[i].depth      = 1;
-                irq_desc[i].chip    = &r4030_irq_type;
-        }
+        for (i = JAZZ_PARALLEL_IRQ; i <= JAZZ_TIMER_IRQ; i++)
+                set_irq_chip_and_handler(i, &r4030_irq_type, handle_level_irq);
 
         r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, 0);
         r4030_read_reg16(JAZZ_IO_IRQ_SOURCE);           /* clear pending IRQs */
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c
index de4a238c28be..3da49c5aaf49 100644
--- a/arch/mips/jmr3927/rbhma3100/irq.c
+++ b/arch/mips/jmr3927/rbhma3100/irq.c
@@ -90,17 +90,6 @@ static unsigned char irc_level[TX3927_NUM_IR] = {
 static void jmr3927_irq_disable(unsigned int irq_nr);
 static void jmr3927_irq_enable(unsigned int irq_nr);
 
-static DEFINE_SPINLOCK(jmr3927_irq_lock);
-
-static unsigned int jmr3927_irq_startup(unsigned int irq)
-{
-        jmr3927_irq_enable(irq);
-
-        return 0;
-}
-
-#define jmr3927_irq_shutdown    jmr3927_irq_disable
-
 static void jmr3927_irq_ack(unsigned int irq)
 {
         if (irq == JMR3927_IRQ_IRC_TMR0)
@@ -118,9 +107,7 @@ static void jmr3927_irq_end(unsigned int irq)
 static void jmr3927_irq_disable(unsigned int irq_nr)
 {
         struct tb_irq_space* sp;
-        unsigned long flags;
 
-        spin_lock_irqsave(&jmr3927_irq_lock, flags);
         for (sp = tb_irq_spaces; sp; sp = sp->next) {
                 if (sp->start_irqno <= irq_nr &&
                     irq_nr < sp->start_irqno + sp->nr_irqs) {
@@ -130,15 +117,12 @@ static void jmr3927_irq_disable(unsigned int irq_nr)
                         break;
                 }
         }
-        spin_unlock_irqrestore(&jmr3927_irq_lock, flags);
 }
 
 static void jmr3927_irq_enable(unsigned int irq_nr)
 {
         struct tb_irq_space* sp;
-        unsigned long flags;
 
-        spin_lock_irqsave(&jmr3927_irq_lock, flags);
         for (sp = tb_irq_spaces; sp; sp = sp->next) {
                 if (sp->start_irqno <= irq_nr &&
                     irq_nr < sp->start_irqno + sp->nr_irqs) {
@@ -148,7 +132,6 @@ static void jmr3927_irq_enable(unsigned int irq_nr)
                         break;
                 }
         }
-        spin_unlock_irqrestore(&jmr3927_irq_lock, flags);
 }
 
 /*
@@ -457,11 +440,10 @@ void __init arch_init_irq(void)
 
 static struct irq_chip jmr3927_irq_controller = {
         .typename = "jmr3927_irq",
-        .startup = jmr3927_irq_startup,
-        .shutdown = jmr3927_irq_shutdown,
-        .enable = jmr3927_irq_enable,
-        .disable = jmr3927_irq_disable,
         .ack = jmr3927_irq_ack,
+        .mask = jmr3927_irq_disable,
+        .mask_ack = jmr3927_irq_ack,
+        .unmask = jmr3927_irq_enable,
         .end = jmr3927_irq_end,
 };
 
@@ -469,12 +451,8 @@ void jmr3927_irq_init(u32 irq_base)
 {
         u32 i;
 
-        for (i= irq_base; i< irq_base + JMR3927_NR_IRQ_IRC + JMR3927_NR_IRQ_IOC; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = NULL;
-                irq_desc[i].depth = 1;
-                irq_desc[i].chip = &jmr3927_irq_controller;
-        }
+        for (i= irq_base; i< irq_base + JMR3927_NR_IRQ_IRC + JMR3927_NR_IRQ_IOC; i++)
+                set_irq_chip(i, &jmr3927_irq_controller);
 
         jmr3927_irq_base = irq_base;
 }
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c
index 16e5dfe7aa8a..138f25efe38a 100644
--- a/arch/mips/jmr3927/rbhma3100/setup.c
+++ b/arch/mips/jmr3927/rbhma3100/setup.c
@@ -170,7 +170,7 @@ static void jmr3927_machine_power_off(void)
         while (1);
 }
 
-static unsigned int jmr3927_hpt_read(void)
+static cycle_t jmr3927_hpt_read(void)
 {
         /* We assume this function is called xtime_lock held. */
         return jiffies * (JMR3927_TIMER_CLK / HZ) + jmr3927_tmrptr->trr;
@@ -182,7 +182,7 @@ extern void rtc_ds1742_init(unsigned long base);
 #endif
 static void __init jmr3927_time_init(void)
 {
-        mips_hpt_read = jmr3927_hpt_read;
+        clocksource_mips.read = jmr3927_hpt_read;
         mips_hpt_frequency = JMR3927_TIMER_CLK;
 #ifdef USE_RTC_DS1742
         if (jmr3927_have_nvram()) {
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index cd9cec9e39e9..bbbb8d7cb89b 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -6,7 +6,7 @@ extra-y		:= head.o init_task.o vmlinux.lds
 
 obj-y           += cpu-probe.o branch.o entry.o genex.o irq.o process.o \
                    ptrace.o reset.o semaphore.o setup.o signal.o syscall.o \
-                   time.o traps.o unaligned.o
+                   time.o topology.o traps.o unaligned.o
 
 binfmt_irix-objs        := irixelf.o irixinv.o irixioctl.o irixsig.o    \
                            irix5sys.o sysirix.o
@@ -45,7 +45,6 @@ obj-$(CONFIG_MIPS_APSP_KSPD)	+= kspd.o
 obj-$(CONFIG_MIPS_VPE_LOADER)   += vpe.o
 obj-$(CONFIG_MIPS_VPE_APSP_API) += rtlx.o
 
-obj-$(CONFIG_NO_ISA)            += dma-no-isa.o
 obj-$(CONFIG_I8259)             += i8259.o
 obj-$(CONFIG_IRQ_CPU)           += irq_cpu.o
 obj-$(CONFIG_IRQ_CPU_RM7K)      += irq-rm7000.o
@@ -67,6 +66,8 @@ obj-$(CONFIG_64BIT)		+= cpu-bugs64.o
 
 obj-$(CONFIG_I8253)             += i8253.o
 
+obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.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)
 
 EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 8485af340ee1..442839e9578c 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -110,9 +110,8 @@ static inline void check_wait(void)
 {
         struct cpuinfo_mips *c = &current_cpu_data;
 
-        printk("Checking for 'wait' instruction... ");
         if (nowait) {
-                printk (" disabled.\n");
+                printk("Wait instruction disabled.\n");
                 return;
         }
 
@@ -120,11 +119,9 @@ static inline void check_wait(void)
         case CPU_R3081:
         case CPU_R3081E:
                 cpu_wait = r3081_wait;
-                printk(" available.\n");
                 break;
         case CPU_TX3927:
                 cpu_wait = r39xx_wait;
-                printk(" available.\n");
                 break;
         case CPU_R4200:
 /*      case CPU_R4300: */
@@ -146,33 +143,23 @@ static inline void check_wait(void)
         case CPU_74K:
         case CPU_PR4450:
                 cpu_wait = r4k_wait;
-                printk(" available.\n");
                 break;
         case CPU_TX49XX:
                 cpu_wait = r4k_wait_irqoff;
-                printk(" available.\n");
                 break;
         case CPU_AU1000:
         case CPU_AU1100:
         case CPU_AU1500:
         case CPU_AU1550:
         case CPU_AU1200:
-                if (allow_au1k_wait) {
+                if (allow_au1k_wait)
                         cpu_wait = au1k_wait;
-                        printk(" available.\n");
-                } else
-                        printk(" unavailable.\n");
                 break;
         case CPU_RM9000:
-                if ((c->processor_id & 0x00ff) >= 0x40) {
+                if ((c->processor_id & 0x00ff) >= 0x40)
                         cpu_wait = r4k_wait;
-                        printk(" available.\n");
-                } else {
-                        printk(" unavailable.\n");
-                }
                 break;
         default:
-                printk(" unavailable.\n");
                 break;
         }
 }
diff --git a/arch/mips/kernel/dma-no-isa.c b/arch/mips/kernel/dma-no-isa.c
deleted file mode 100644
index 6df8b07741e3..000000000000
--- a/arch/mips/kernel/dma-no-isa.c
+++ /dev/null
@@ -1,28 +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) 2004 by Ralf Baechle
- *
- * Dummy ISA DMA functions for systems that don't have ISA but share drivers
- * with ISA such as legacy free PCI.
- */
-#include <linux/errno.h>
-#include <linux/module.h>
-#include <linux/spinlock.h>
-
-DEFINE_SPINLOCK(dma_spin_lock);
-
-int request_dma(unsigned int dmanr, const char * device_id)
-{
-        return -EINVAL;
-}
-
-void free_dma(unsigned int dmanr)
-{
-}
-
-EXPORT_SYMBOL(dma_spin_lock);
-EXPORT_SYMBOL(request_dma);
-EXPORT_SYMBOL(free_dma);
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index 5baca16993d0..aacd4a005c5f 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -19,6 +19,7 @@
 #include <asm/mipsregs.h>
 #include <asm/stackframe.h>
 #include <asm/war.h>
+#include <asm/page.h>
 
 #define PANIC_PIC(msg)                                  \
                 .set push;                              \
@@ -378,6 +379,68 @@ NESTED(nmi_handler, PT_SIZE, sp)
         BUILD_HANDLER dsp dsp sti silent                /* #26 */
         BUILD_HANDLER reserved reserved sti verbose     /* others */
 
+        .align  5
+        LEAF(handle_ri_rdhwr_vivt)
+#ifdef CONFIG_MIPS_MT_SMTC
+        PANIC_PIC("handle_ri_rdhwr_vivt called")
+#else
+        .set    push
+        .set    noat
+        .set    noreorder
+        /* check if TLB contains a entry for EPC */
+        MFC0    k1, CP0_ENTRYHI
+        andi    k1, 0xff        /* ASID_MASK */
+        MFC0    k0, CP0_EPC
+        PTR_SRL k0, PAGE_SHIFT + 1
+        PTR_SLL k0, PAGE_SHIFT + 1
+        or      k1, k0
+        MTC0    k1, CP0_ENTRYHI
+        mtc0_tlbw_hazard
+        tlbp
+        tlb_probe_hazard
+        mfc0    k1, CP0_INDEX
+        .set    pop
+        bltz    k1, handle_ri   /* slow path */
+        /* fall thru */
+#endif
+        END(handle_ri_rdhwr_vivt)
+
+        LEAF(handle_ri_rdhwr)
+        .set    push
+        .set    noat
+        .set    noreorder
+        /* 0x7c03e83b: rdhwr v1,$29 */
+        MFC0    k1, CP0_EPC
+        lui     k0, 0x7c03
+        lw      k1, (k1)
+        ori     k0, 0xe83b
+        .set    reorder
+        bne     k0, k1, handle_ri       /* if not ours */
+        /* The insn is rdhwr.  No need to check CAUSE.BD here. */
+        get_saved_sp    /* k1 := current_thread_info */
+        .set    noreorder
+        MFC0    k0, CP0_EPC
+#if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX)
+        ori     k1, _THREAD_MASK
+        xori    k1, _THREAD_MASK
+        LONG_L  v1, TI_TP_VALUE(k1)
+        LONG_ADDIU      k0, 4
+        jr      k0
+         rfe
+#else
+        LONG_ADDIU      k0, 4           /* stall on $k0 */
+        MTC0    k0, CP0_EPC
+        /* I hope three instructions between MTC0 and ERET are enough... */
+        ori     k1, _THREAD_MASK
+        xori    k1, _THREAD_MASK
+        LONG_L  v1, TI_TP_VALUE(k1)
+        .set    mips3
+        eret
+        .set    mips0
+#endif
+        .set    pop
+        END(handle_ri_rdhwr)
+
 #ifdef CONFIG_64BIT
 /* A temporary overflow handler used by check_daddi(). */
 
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
index ddc1b71c9378..a2e095adaa3f 100644
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -250,6 +250,9 @@ NESTED(smp_bootstrap, 16, sp)
          */
         page    swapper_pg_dir, _PGD_ORDER
 #ifdef CONFIG_64BIT
+#if defined(CONFIG_MODULES) && !defined(CONFIG_BUILD_ELF64)
+        page    module_pg_dir, _PGD_ORDER
+#endif
         page    invalid_pmd_table, _PMD_ORDER
 #endif
         page    invalid_pte_table, _PTE_ORDER
diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
index 48e3418c217b..2526c0ca4d81 100644
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
@@ -40,21 +40,10 @@ static void end_8259A_irq (unsigned int irq)
                 enable_8259A_irq(irq);
 }
 
-#define shutdown_8259A_irq      disable_8259A_irq
-
 void mask_and_ack_8259A(unsigned int);
 
-static unsigned int startup_8259A_irq(unsigned int irq)
-{
-        enable_8259A_irq(irq);
-
-        return 0; /* never anything pending */
-}
-
 static struct irq_chip i8259A_irq_type = {
         .typename = "XT-PIC",
-        .startup = startup_8259A_irq,
-        .shutdown = shutdown_8259A_irq,
         .enable = enable_8259A_irq,
         .disable = disable_8259A_irq,
         .ack = mask_and_ack_8259A,
@@ -120,7 +109,7 @@ int i8259A_irq_pending(unsigned int irq)
 void make_8259A_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
-        irq_desc[irq].chip = &i8259A_irq_type;
+        set_irq_chip(irq, &i8259A_irq_type);
         enable_irq(irq);
 }
 
@@ -323,12 +312,8 @@ void __init init_i8259_irqs (void)
 
         init_8259A(0);
 
-        for (i = 0; i < 16; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = NULL;
-                irq_desc[i].depth = 1;
-                irq_desc[i].chip = &i8259A_irq_type;
-        }
+        for (i = 0; i < 16; i++)
+                set_irq_chip(i, &i8259A_irq_type);
 
         setup_irq(2, &irq2);
 }
diff --git a/arch/mips/kernel/irq-msc01.c b/arch/mips/kernel/irq-msc01.c
index 650a80ca3741..bcaad6696082 100644
--- a/arch/mips/kernel/irq-msc01.c
+++ b/arch/mips/kernel/irq-msc01.c
@@ -45,31 +45,6 @@ static inline void unmask_msc_irq(unsigned int irq)
 }
 
 /*
- * Enables the IRQ on SOC-it
- */
-static void enable_msc_irq(unsigned int irq)
-{
-        unmask_msc_irq(irq);
-}
-
-/*
- * Initialize the IRQ on SOC-it
- */
-static unsigned int startup_msc_irq(unsigned int irq)
-{
-        unmask_msc_irq(irq);
-        return 0;
-}
-
-/*
- * Disables the IRQ on SOC-it
- */
-static void disable_msc_irq(unsigned int irq)
-{
-        mask_msc_irq(irq);
-}
-
-/*
  * Masks and ACKs an IRQ
  */
 static void level_mask_and_ack_msc_irq(unsigned int irq)
@@ -136,25 +111,23 @@ msc_bind_eic_interrupt (unsigned int irq, unsigned int set)
                     (irq<<MSC01_IC_RAMW_ADDR_SHF) | (set<<MSC01_IC_RAMW_DATA_SHF));
 }
 
-#define shutdown_msc_irq        disable_msc_irq
-
 struct irq_chip msc_levelirq_type = {
         .typename = "SOC-it-Level",
-        .startup = startup_msc_irq,
-        .shutdown = shutdown_msc_irq,
-        .enable = enable_msc_irq,
-        .disable = disable_msc_irq,
         .ack = level_mask_and_ack_msc_irq,
+        .mask = mask_msc_irq,
+        .mask_ack = level_mask_and_ack_msc_irq,
+        .unmask = unmask_msc_irq,
+        .eoi = unmask_msc_irq,
         .end = end_msc_irq,
 };
 
 struct irq_chip msc_edgeirq_type = {
         .typename = "SOC-it-Edge",
-        .startup =startup_msc_irq,
-        .shutdown = shutdown_msc_irq,
-        .enable = enable_msc_irq,
-        .disable = disable_msc_irq,
         .ack = edge_mask_and_ack_msc_irq,
+        .mask = mask_msc_irq,
+        .mask_ack = edge_mask_and_ack_msc_irq,
+        .unmask = unmask_msc_irq,
+        .eoi = unmask_msc_irq,
         .end = end_msc_irq,
 };
 
@@ -175,14 +148,14 @@ void __init init_msc_irqs(unsigned int base, msc_irqmap_t *imp, int nirq)
 
                 switch (imp->im_type) {
                 case MSC01_IRQ_EDGE:
-                        irq_desc[base+n].chip = &msc_edgeirq_type;
+                        set_irq_chip(base+n, &msc_edgeirq_type);
                         if (cpu_has_veic)
                                 MSCIC_WRITE(MSC01_IC_SUP+n*8, MSC01_IC_SUP_EDGE_BIT);
                         else
                                 MSCIC_WRITE(MSC01_IC_SUP+n*8, MSC01_IC_SUP_EDGE_BIT | imp->im_lvl);
                         break;
                 case MSC01_IRQ_LEVEL:
-                        irq_desc[base+n].chip = &msc_levelirq_type;
+                        set_irq_chip(base+n, &msc_levelirq_type);
                         if (cpu_has_veic)
                                 MSCIC_WRITE(MSC01_IC_SUP+n*8, 0);
                         else
diff --git a/arch/mips/kernel/irq-mv6434x.c b/arch/mips/kernel/irq-mv6434x.c
index 37d106202b83..6cfb31cafde2 100644
--- a/arch/mips/kernel/irq-mv6434x.c
+++ b/arch/mips/kernel/irq-mv6434x.c
@@ -67,39 +67,6 @@ static inline void unmask_mv64340_irq(unsigned int irq)
 }
 
 /*
- * Enables the IRQ on Marvell Chip
- */
-static void enable_mv64340_irq(unsigned int irq)
-{
-        unmask_mv64340_irq(irq);
-}
-
-/*
- * Initialize the IRQ on Marvell Chip
- */
-static unsigned int startup_mv64340_irq(unsigned int irq)
-{
-        unmask_mv64340_irq(irq);
-        return 0;
-}
-
-/*
- * Disables the IRQ on Marvell Chip
- */
-static void disable_mv64340_irq(unsigned int irq)
-{
-        mask_mv64340_irq(irq);
-}
-
-/*
- * Masks and ACKs an IRQ
- */
-static void mask_and_ack_mv64340_irq(unsigned int irq)
-{
-        mask_mv64340_irq(irq);
-}
-
-/*
  * End IRQ processing
  */
 static void end_mv64340_irq(unsigned int irq)
@@ -133,15 +100,12 @@ void ll_mv64340_irq(void)
                 do_IRQ(ls1bit32(irq_src_high) + irq_base + 32);
 }
 
-#define shutdown_mv64340_irq    disable_mv64340_irq
-
 struct irq_chip mv64340_irq_type = {
         .typename = "MV-64340",
-        .startup = startup_mv64340_irq,
-        .shutdown = shutdown_mv64340_irq,
-        .enable = enable_mv64340_irq,
-        .disable = disable_mv64340_irq,
-        .ack = mask_and_ack_mv64340_irq,
+        .ack = mask_mv64340_irq,
+        .mask = mask_mv64340_irq,
+        .mask_ack = mask_mv64340_irq,
+        .unmask = unmask_mv64340_irq,
         .end = end_mv64340_irq,
 };
 
@@ -149,13 +113,9 @@ void __init mv64340_irq_init(unsigned int base)
 {
         int i;
 
-        /* Reset irq handlers pointers to NULL */
-        for (i = base; i < base + 64; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 2;
-                irq_desc[i].chip = &mv64340_irq_type;
-        }
+        for (i = base; i < base + 64; i++)
+                set_irq_chip_and_handler(i, &mv64340_irq_type,
+                                         handle_level_irq);
 
         irq_base = base;
 }
diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c
index 6b54c7109e2e..ddcc2a5f8a06 100644
--- a/arch/mips/kernel/irq-rm7000.c
+++ b/arch/mips/kernel/irq-rm7000.c
@@ -29,42 +29,6 @@ static inline void mask_rm7k_irq(unsigned int irq)
         clear_c0_intcontrol(0x100 << (irq - irq_base));
 }
 
-static inline void rm7k_cpu_irq_enable(unsigned int irq)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        unmask_rm7k_irq(irq);
-        local_irq_restore(flags);
-}
-
-static void rm7k_cpu_irq_disable(unsigned int irq)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        mask_rm7k_irq(irq);
-        local_irq_restore(flags);
-}
-
-static unsigned int rm7k_cpu_irq_startup(unsigned int irq)
-{
-        rm7k_cpu_irq_enable(irq);
-
-        return 0;
-}
-
-#define rm7k_cpu_irq_shutdown   rm7k_cpu_irq_disable
-
-/*
- * While we ack the interrupt interrupts are disabled and thus we don't need
- * to deal with concurrency issues.  Same for rm7k_cpu_irq_end.
- */
-static void rm7k_cpu_irq_ack(unsigned int irq)
-{
-        mask_rm7k_irq(irq);
-}
-
 static void rm7k_cpu_irq_end(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
@@ -73,11 +37,10 @@ static void rm7k_cpu_irq_end(unsigned int irq)
 
 static struct irq_chip rm7k_irq_controller = {
         .typename = "RM7000",
-        .startup = rm7k_cpu_irq_startup,
-        .shutdown = rm7k_cpu_irq_shutdown,
-        .enable = rm7k_cpu_irq_enable,
-        .disable = rm7k_cpu_irq_disable,
-        .ack = rm7k_cpu_irq_ack,
+        .ack = mask_rm7k_irq,
+        .mask = mask_rm7k_irq,
+        .mask_ack = mask_rm7k_irq,
+        .unmask = unmask_rm7k_irq,
         .end = rm7k_cpu_irq_end,
 };
 
@@ -87,12 +50,9 @@ void __init rm7k_cpu_irq_init(int base)
 
         clear_c0_intcontrol(0x00000f00);                /* Mask all */
 
-        for (i = base; i < base + 4; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = NULL;
-                irq_desc[i].depth = 1;
-                irq_desc[i].chip = &rm7k_irq_controller;
-        }
+        for (i = base; i < base + 4; i++)
+                set_irq_chip_and_handler(i, &rm7k_irq_controller,
+                                         handle_level_irq);
 
         irq_base = base;
 }
diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c
index 62f011ba97a2..ba6440c88abd 100644
--- a/arch/mips/kernel/irq-rm9000.c
+++ b/arch/mips/kernel/irq-rm9000.c
@@ -48,15 +48,6 @@ static void rm9k_cpu_irq_disable(unsigned int irq)
         local_irq_restore(flags);
 }
 
-static unsigned int rm9k_cpu_irq_startup(unsigned int irq)
-{
-        rm9k_cpu_irq_enable(irq);
-
-        return 0;
-}
-
-#define rm9k_cpu_irq_shutdown   rm9k_cpu_irq_disable
-
 /*
  * Performance counter interrupts are global on all processors.
  */
@@ -89,16 +80,6 @@ static void rm9k_perfcounter_irq_shutdown(unsigned int irq)
         on_each_cpu(local_rm9k_perfcounter_irq_shutdown, (void *) irq, 0, 1);
 }
 
-
-/*
- * While we ack the interrupt interrupts are disabled and thus we don't need
- * to deal with concurrency issues.  Same for rm9k_cpu_irq_end.
- */
-static void rm9k_cpu_irq_ack(unsigned int irq)
-{
-        mask_rm9k_irq(irq);
-}
-
 static void rm9k_cpu_irq_end(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
@@ -107,11 +88,10 @@ static void rm9k_cpu_irq_end(unsigned int irq)
 
 static struct irq_chip rm9k_irq_controller = {
         .typename = "RM9000",
-        .startup = rm9k_cpu_irq_startup,
-        .shutdown = rm9k_cpu_irq_shutdown,
-        .enable = rm9k_cpu_irq_enable,
-        .disable = rm9k_cpu_irq_disable,
-        .ack = rm9k_cpu_irq_ack,
+        .ack = mask_rm9k_irq,
+        .mask = mask_rm9k_irq,
+        .mask_ack = mask_rm9k_irq,
+        .unmask = unmask_rm9k_irq,
         .end = rm9k_cpu_irq_end,
 };
 
@@ -119,9 +99,10 @@ static struct irq_chip rm9k_perfcounter_irq = {
         .typename = "RM9000",
         .startup = rm9k_perfcounter_irq_startup,
         .shutdown = rm9k_perfcounter_irq_shutdown,
-        .enable = rm9k_cpu_irq_enable,
-        .disable = rm9k_cpu_irq_disable,
-        .ack = rm9k_cpu_irq_ack,
+        .ack = mask_rm9k_irq,
+        .mask = mask_rm9k_irq,
+        .mask_ack = mask_rm9k_irq,
+        .unmask = unmask_rm9k_irq,
         .end = rm9k_cpu_irq_end,
 };
 
@@ -135,15 +116,13 @@ void __init rm9k_cpu_irq_init(int base)
 
         clear_c0_intcontrol(0x0000f000);                /* Mask all */
 
-        for (i = base; i < base + 4; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = NULL;
-                irq_desc[i].depth = 1;
-                irq_desc[i].chip = &rm9k_irq_controller;
-        }
+        for (i = base; i < base + 4; i++)
+                set_irq_chip_and_handler(i, &rm9k_irq_controller,
+                                         handle_level_irq);
 
         rm9000_perfcount_irq = base + 1;
-        irq_desc[rm9000_perfcount_irq].chip = &rm9k_perfcounter_irq;
+        set_irq_chip_and_handler(rm9000_perfcount_irq, &rm9k_perfcounter_irq,
+                                 handle_level_irq);
 
         irq_base = base;
 }
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index 9b0e49d63d7b..b339798b3172 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -88,25 +88,6 @@ atomic_t irq_err_count;
 unsigned long irq_hwmask[NR_IRQS];
 #endif /* CONFIG_MIPS_MT_SMTC */
 
-#undef do_IRQ
-
-/*
- * do_IRQ handles all normal device IRQ's (the special
- * SMP cross-CPU interrupts have their own specific
- * handlers).
- */
-asmlinkage unsigned int do_IRQ(unsigned int irq)
-{
-        irq_enter();
-
-        __DO_IRQ_SMTC_HOOK();
-        __do_IRQ(irq);
-
-        irq_exit();
-
-        return 1;
-}
-
 /*
  * Generic, controller-independent functions:
  */
@@ -172,19 +153,6 @@ __setup("nokgdb", nokgdb);
 
 void __init init_IRQ(void)
 {
-        int i;
-
-        for (i = 0; i < NR_IRQS; i++) {
-                irq_desc[i].status  = IRQ_DISABLED;
-                irq_desc[i].action  = NULL;
-                irq_desc[i].depth   = 1;
-                irq_desc[i].chip = &no_irq_chip;
-                spin_lock_init(&irq_desc[i].lock);
-#ifdef CONFIG_MIPS_MT_SMTC
-                irq_hwmask[i] = 0;
-#endif /* CONFIG_MIPS_MT_SMTC */
-        }
-
         arch_init_irq();
 
 #ifdef CONFIG_KGDB
diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c
index 9bb21c7f2149..be5ac23d3812 100644
--- a/arch/mips/kernel/irq_cpu.c
+++ b/arch/mips/kernel/irq_cpu.c
@@ -50,44 +50,6 @@ static inline void mask_mips_irq(unsigned int irq)
         irq_disable_hazard();
 }
 
-static inline void mips_cpu_irq_enable(unsigned int irq)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        unmask_mips_irq(irq);
-        back_to_back_c0_hazard();
-        local_irq_restore(flags);
-}
-
-static void mips_cpu_irq_disable(unsigned int irq)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        mask_mips_irq(irq);
-        back_to_back_c0_hazard();
-        local_irq_restore(flags);
-}
-
-static unsigned int mips_cpu_irq_startup(unsigned int irq)
-{
-        mips_cpu_irq_enable(irq);
-
-        return 0;
-}
-
-#define mips_cpu_irq_shutdown           mips_cpu_irq_disable
-
-/*
- * While we ack the interrupt interrupts are disabled and thus we don't need
- * to deal with concurrency issues.  Same for mips_cpu_irq_end.
- */
-static void mips_cpu_irq_ack(unsigned int irq)
-{
-        mask_mips_irq(irq);
-}
-
 static void mips_cpu_irq_end(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
@@ -96,11 +58,11 @@ static void mips_cpu_irq_end(unsigned int irq)
 
 static struct irq_chip mips_cpu_irq_controller = {
         .typename       = "MIPS",
-        .startup        = mips_cpu_irq_startup,
-        .shutdown       = mips_cpu_irq_shutdown,
-        .enable         = mips_cpu_irq_enable,
-        .disable        = mips_cpu_irq_disable,
-        .ack            = mips_cpu_irq_ack,
+        .ack            = mask_mips_irq,
+        .mask           = mask_mips_irq,
+        .mask_ack       = mask_mips_irq,
+        .unmask         = unmask_mips_irq,
+        .eoi            = unmask_mips_irq,
         .end            = mips_cpu_irq_end,
 };
 
@@ -110,8 +72,6 @@ static struct irq_chip mips_cpu_irq_controller = {
 
 #define unmask_mips_mt_irq      unmask_mips_irq
 #define mask_mips_mt_irq        mask_mips_irq
-#define mips_mt_cpu_irq_enable  mips_cpu_irq_enable
-#define mips_mt_cpu_irq_disable mips_cpu_irq_disable
 
 static unsigned int mips_mt_cpu_irq_startup(unsigned int irq)
 {
@@ -119,13 +79,11 @@ static unsigned int mips_mt_cpu_irq_startup(unsigned int irq)
 
         clear_c0_cause(0x100 << (irq - mips_cpu_irq_base));
         evpe(vpflags);
-        mips_mt_cpu_irq_enable(irq);
+        unmask_mips_mt_irq(irq);
 
         return 0;
 }
 
-#define mips_mt_cpu_irq_shutdown        mips_mt_cpu_irq_disable
-
 /*
  * While we ack the interrupt interrupts are disabled and thus we don't need
  * to deal with concurrency issues.  Same for mips_cpu_irq_end.
@@ -143,10 +101,11 @@ static void mips_mt_cpu_irq_ack(unsigned int irq)
 static struct irq_chip mips_mt_cpu_irq_controller = {
         .typename       = "MIPS",
         .startup        = mips_mt_cpu_irq_startup,
-        .shutdown       = mips_mt_cpu_irq_shutdown,
-        .enable         = mips_mt_cpu_irq_enable,
-        .disable        = mips_mt_cpu_irq_disable,
         .ack            = mips_mt_cpu_irq_ack,
+        .mask           = mask_mips_mt_irq,
+        .mask_ack       = mips_mt_cpu_irq_ack,
+        .unmask         = unmask_mips_mt_irq,
+        .eoi            = unmask_mips_mt_irq,
         .end            = mips_mt_cpu_irq_end,
 };
 
@@ -163,19 +122,12 @@ void __init mips_cpu_irq_init(int irq_base)
          * leave them uninitialized for other processors.
          */
         if (cpu_has_mipsmt)
-                for (i = irq_base; i < irq_base + 2; i++) {
-                        irq_desc[i].status = IRQ_DISABLED;
-                        irq_desc[i].action = NULL;
-                        irq_desc[i].depth = 1;
-                        irq_desc[i].chip = &mips_mt_cpu_irq_controller;
-                }
-
-        for (i = irq_base + 2; i < irq_base + 8; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = NULL;
-                irq_desc[i].depth = 1;
-                irq_desc[i].chip = &mips_cpu_irq_controller;
-        }
+                for (i = irq_base; i < irq_base + 2; i++)
+                        set_irq_chip(i, &mips_mt_cpu_irq_controller);
+
+        for (i = irq_base + 2; i < irq_base + 8; i++)
+                set_irq_chip_and_handler(i, &mips_cpu_irq_controller,
+                                         handle_level_irq);
 
         mips_cpu_irq_base = irq_base;
 }
diff --git a/arch/mips/kernel/machine_kexec.c b/arch/mips/kernel/machine_kexec.c
new file mode 100644
index 000000000000..e0ad754c7edd
--- /dev/null
+++ b/arch/mips/kernel/machine_kexec.c
@@ -0,0 +1,85 @@
+/*
+ * machine_kexec.c for kexec
+ * Created by <nschichan@corp.free.fr> on Thu Oct 12 15:15:06 2006
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+
+#include <linux/kexec.h>
+#include <linux/mm.h>
+#include <linux/delay.h>
+
+#include <asm/cacheflush.h>
+#include <asm/page.h>
+
+const extern unsigned char relocate_new_kernel[];
+const extern unsigned int relocate_new_kernel_size;
+
+extern unsigned long kexec_start_address;
+extern unsigned long kexec_indirection_page;
+
+int
+machine_kexec_prepare(struct kimage *kimage)
+{
+        return 0;
+}
+
+void
+machine_kexec_cleanup(struct kimage *kimage)
+{
+}
+
+void
+machine_shutdown(void)
+{
+}
+
+void
+machine_crash_shutdown(struct pt_regs *regs)
+{
+}
+
+void
+machine_kexec(struct kimage *image)
+{
+        unsigned long reboot_code_buffer;
+        unsigned long entry;
+        unsigned long *ptr;
+
+        reboot_code_buffer =
+          (unsigned long)page_address(image->control_code_page);
+
+        kexec_start_address = image->start;
+        kexec_indirection_page = phys_to_virt(image->head & PAGE_MASK);
+
+        memcpy((void*)reboot_code_buffer, relocate_new_kernel,
+               relocate_new_kernel_size);
+
+        /*
+         * The generic kexec code builds a page list with physical
+         * addresses. they are directly accessible through KSEG0 (or
+         * CKSEG0 or XPHYS if on 64bit system), hence the
+         * pys_to_virt() call.
+         */
+        for (ptr = &image->head; (entry = *ptr) && !(entry &IND_DONE);
+             ptr = (entry & IND_INDIRECTION) ?
+               phys_to_virt(entry & PAGE_MASK) : ptr + 1) {
+                if (*ptr & IND_SOURCE || *ptr & IND_INDIRECTION ||
+                    *ptr & IND_DESTINATION)
+                        *ptr = phys_to_virt(*ptr);
+        }
+
+        /*
+         * we do not want to be bothered.
+         */
+        local_irq_disable();
+
+        flush_icache_range(reboot_code_buffer,
+                           reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE);
+
+        printk("Will call new kernel at %08x\n", image->start);
+        printk("Bye ...\n");
+        flush_cache_all();
+        ((void (*)(void))reboot_code_buffer)();
+}
diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c
index d7bf0215bc1d..cb0801437b66 100644
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
@@ -29,6 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
+#include <asm/pgtable.h>        /* MODULE_START */
 
 struct mips_hi16 {
         struct mips_hi16 *next;
@@ -43,9 +44,23 @@ static DEFINE_SPINLOCK(dbe_lock);
 
 void *module_alloc(unsigned long size)
 {
+#ifdef MODULE_START
+        struct vm_struct *area;
+
+        size = PAGE_ALIGN(size);
+        if (!size)
+                return NULL;
+
+        area = __get_vm_area(size, VM_ALLOC, MODULE_START, MODULE_END);
+        if (!area)
+                return NULL;
+
+        return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
+#else
         if (size == 0)
                 return NULL;
         return vmalloc(size);
+#endif
 }
 
 /* Free memory returned from module_alloc */
diff --git a/arch/mips/kernel/relocate_kernel.S b/arch/mips/kernel/relocate_kernel.S
new file mode 100644
index 000000000000..a3f0d00c1334
--- /dev/null
+++ b/arch/mips/kernel/relocate_kernel.S
@@ -0,0 +1,80 @@
+/*
+ * relocate_kernel.S for kexec
+ * Created by <nschichan@corp.free.fr> on Thu Oct 12 17:49:57 2006
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+
+#include <asm/asm.h>
+#include <asm/asmmacro.h>
+#include <asm/regdef.h>
+#include <asm/page.h>
+#include <asm/mipsregs.h>
+#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
+
+process_entry:
+        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
+
+1:
+        /* indirection page, update s0  */
+        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
+1:
+        /* source page */
+        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
+
+done:
+        /* jump to kexec_start_address */
+        j       s1
+
+        .globl kexec_start_address
+kexec_start_address:
+        .long   0x0
+
+        .globl kexec_indirection_page
+kexec_indirection_page:
+        .long   0x0
+
+relocate_new_kernel_end:
+
+        .globl relocate_new_kernel_size
+relocate_new_kernel_size:
+        .long relocate_new_kernel_end - relocate_new_kernel
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index a95f37de080e..7c0b3936ba44 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -653,7 +653,7 @@ einval:	li	v0, -EINVAL
         sys     sys_move_pages          6
         sys     sys_set_robust_list     2
         sys     sys_get_robust_list     3       /* 4310 */
-        sys     sys_ni_syscall          0
+        sys     sys_kexec_load          4
         sys     sys_getcpu              3
         sys     sys_epoll_pwait         6
         .endm
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index 8fb0f60f657b..e569b846e9a3 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -468,6 +468,6 @@ sys_call_table:
         PTR     sys_move_pages
         PTR     sys_set_robust_list
         PTR     sys_get_robust_list
-        PTR     sys_ni_syscall                  /* 5270 */
+        PTR     sys_kexec_load                  /* 5270 */
         PTR     sys_getcpu
         PTR     sys_epoll_pwait
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 0da5ca2040ff..5b18f265d75b 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -394,6 +394,6 @@ EXPORT(sysn32_call_table)
         PTR     sys_move_pages
         PTR     compat_sys_set_robust_list
         PTR     compat_sys_get_robust_list
-        PTR     sys_ni_syscall
+        PTR     compat_sys_kexec_load
         PTR     sys_getcpu
         PTR     sys_epoll_pwait
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index b9d00cae8b5f..e91379c1be1d 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -516,7 +516,7 @@ sys_call_table:
         PTR     compat_sys_move_pages
         PTR     compat_sys_set_robust_list
         PTR     compat_sys_get_robust_list      /* 4310 */
-        PTR     sys_ni_syscall
+        PTR     compat_sys_kexec_load
         PTR     sys_getcpu
         PTR     sys_epoll_pwait
         .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 8f6e89697ccf..89440a0d8528 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -145,13 +145,12 @@ static int __init rd_start_early(char *p)
         unsigned long start = memparse(p, &p);
 
 #ifdef CONFIG_64BIT
-        /* HACK: Guess if the sign extension was forgotten */
-        if (start > 0x0000000080000000 && start < 0x00000000ffffffff)
-                start |= 0xffffffff00000000UL;
+        /* Guess if the sign extension was forgotten by bootloader */
+        if (start < XKPHYS)
+                start = (int)start;
 #endif
         initrd_start = start;
         initrd_end += start;
-
         return 0;
 }
 early_param("rd_start", rd_start_early);
@@ -159,41 +158,64 @@ early_param("rd_start", rd_start_early);
 static int __init rd_size_early(char *p)
 {
         initrd_end += memparse(p, &p);
-
         return 0;
 }
 early_param("rd_size", rd_size_early);
 
+/* it returns the next free pfn after initrd */
 static unsigned long __init init_initrd(void)
 {
-        unsigned long tmp, end, size;
+        unsigned long end;
         u32 *initrd_header;
 
-        ROOT_DEV = Root_RAM0;
-
         /*
          * Board specific code or command line parser should have
          * already set up initrd_start and initrd_end. In these cases
          * perfom sanity checks and use them if all looks good.
          */
-        size = initrd_end - initrd_start;
-        if (initrd_end == 0 || size == 0) {
-                initrd_start = 0;
-                initrd_end = 0;
-        } else
-                return initrd_end;
-
-        end = (unsigned long)&_end;
-        tmp = PAGE_ALIGN(end) - sizeof(u32) * 2;
-        if (tmp < end)
-                tmp += PAGE_SIZE;
-
-        initrd_header = (u32 *)tmp;
-        if (initrd_header[0] == 0x494E5244) {
-                initrd_start = (unsigned long)&initrd_header[2];
-                initrd_end = initrd_start + initrd_header[1];
+        if (initrd_start && initrd_end > initrd_start)
+                goto sanitize;
+
+        /*
+         * See if initrd has been added to the kernel image by
+         * arch/mips/boot/addinitrd.c. In that case a header is
+         * prepended to initrd and is made up by 8 bytes. The fisrt
+         * word is a magic number and the second one is the size of
+         * initrd.  Initrd start must be page aligned in any cases.
+         */
+        initrd_header = __va(PAGE_ALIGN(__pa_symbol(&_end) + 8)) - 8;
+        if (initrd_header[0] != 0x494E5244)
+                goto disable;
+        initrd_start = (unsigned long)(initrd_header + 2);
+        initrd_end = initrd_start + initrd_header[1];
+
+sanitize:
+        if (initrd_start & ~PAGE_MASK) {
+                printk(KERN_ERR "initrd start must be page aligned\n");
+                goto disable;
         }
-        return initrd_end;
+        if (initrd_start < PAGE_OFFSET) {
+                printk(KERN_ERR "initrd start < PAGE_OFFSET\n");
+                goto disable;
+        }
+
+        /*
+         * Sanitize initrd addresses. For example firmware
+         * can't guess if they need to pass them through
+         * 64-bits values if the kernel has been built in pure
+         * 32-bit. We need also to switch from KSEG0 to XKPHYS
+         * addresses now, so the code can now safely use __pa().
+         */
+        end = __pa(initrd_end);
+        initrd_end = (unsigned long)__va(end);
+        initrd_start = (unsigned long)__va(__pa(initrd_start));
+
+        ROOT_DEV = Root_RAM0;
+        return PFN_UP(end);
+disable:
+        initrd_start = 0;
+        initrd_end = 0;
+        return 0;
 }
 
 static void __init finalize_initrd(void)
@@ -204,12 +226,12 @@ static void __init finalize_initrd(void)
                 printk(KERN_INFO "Initrd not found or empty");
                 goto disable;
         }
-        if (CPHYSADDR(initrd_end) > PFN_PHYS(max_low_pfn)) {
+        if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) {
                 printk("Initrd extends beyond end of memory");
                 goto disable;
         }
 
-        reserve_bootmem(CPHYSADDR(initrd_start), size);
+        reserve_bootmem(__pa(initrd_start), size);
         initrd_below_start_ok = 1;
 
         printk(KERN_INFO "Initial ramdisk at: 0x%lx (%lu bytes)\n",
@@ -259,8 +281,7 @@ static void __init bootmem_init(void)
          * not selected. Once that done we can determine the low bound
          * of usable memory.
          */
-        reserved_end = init_initrd();
-        reserved_end = PFN_UP(CPHYSADDR(max(reserved_end, (unsigned long)&_end)));
+        reserved_end = max(init_initrd(), PFN_UP(__pa_symbol(&_end)));
 
         /*
          * Find the highest page frame number we have available.
@@ -432,10 +453,10 @@ static void __init resource_init(void)
         if (UNCAC_BASE != IO_BASE)
                 return;
 
-        code_resource.start = virt_to_phys(&_text);
-        code_resource.end = virt_to_phys(&_etext) - 1;
-        data_resource.start = virt_to_phys(&_etext);
-        data_resource.end = virt_to_phys(&_edata) - 1;
+        code_resource.start = __pa_symbol(&_text);
+        code_resource.end = __pa_symbol(&_etext) - 1;
+        data_resource.start = __pa_symbol(&_etext);
+        data_resource.end = __pa_symbol(&_edata) - 1;
 
         /*
          * Request address space for all standard RAM.
diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c
index 477c5334ec1b..a67c18555ed3 100644
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
@@ -17,7 +17,6 @@
  */
 #include <linux/cache.h>
 #include <linux/sched.h>
-#include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index 2ac19a6cbf68..1ee689c0e0c9 100644
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -278,7 +278,9 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
 
         /* need to mark IPI's as IRQ_PER_CPU */
         irq_desc[cpu_ipi_resched_irq].status |= IRQ_PER_CPU;
+        set_irq_handler(cpu_ipi_resched_irq, handle_percpu_irq);
         irq_desc[cpu_ipi_call_irq].status |= IRQ_PER_CPU;
+        set_irq_handler(cpu_ipi_call_irq, handle_percpu_irq);
 }
 
 /*
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index db80957ada89..49db516789e0 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -463,28 +463,5 @@ void flush_tlb_one(unsigned long vaddr)
         smp_on_each_tlb(flush_tlb_one_ipi, (void *) vaddr);
 }
 
-static DEFINE_PER_CPU(struct cpu, cpu_devices);
-
-static int __init topology_init(void)
-{
-        int i, ret;
-
-#ifdef CONFIG_NUMA
-        for_each_online_node(i)
-                register_one_node(i);
-#endif /* CONFIG_NUMA */
-
-        for_each_present_cpu(i) {
-                ret = register_cpu(&per_cpu(cpu_devices, i), i);
-                if (ret)
-                        printk(KERN_WARNING "topology_init: register_cpu %d "
-                               "failed (%d)\n", i, ret);
-        }
-
-        return 0;
-}
-
-subsys_initcall(topology_init);
-
 EXPORT_SYMBOL(flush_tlb_page);
 EXPORT_SYMBOL(flush_tlb_one);
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 3b78caf112f5..802febed7df5 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -1009,6 +1009,7 @@ void setup_cross_vpe_interrupts(void)
         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/time.c b/arch/mips/kernel/time.c
index e535f86efa2f..11aab6d6bfe5 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -11,7 +11,6 @@
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
  */
-#include <linux/clocksource.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -83,17 +82,11 @@ static void null_timer_ack(void) { /* nothing */ }
 /*
  * Null high precision timer functions for systems lacking one.
  */
-static unsigned int null_hpt_read(void)
+static cycle_t null_hpt_read(void)
 {
         return 0;
 }
 
-static void __init null_hpt_init(void)
-{
-        /* nothing */
-}
-
-
 /*
  * Timer ack for an R4k-compatible timer of a known frequency.
  */
@@ -118,7 +111,7 @@ static void c0_timer_ack(void)
 /*
  * High precision timer functions for a R4k-compatible timer.
  */
-static unsigned int c0_hpt_read(void)
+static cycle_t c0_hpt_read(void)
 {
         return read_c0_count();
 }
@@ -132,9 +125,6 @@ static void __init c0_hpt_timer_init(void)
 
 int (*mips_timer_state)(void);
 void (*mips_timer_ack)(void);
-unsigned int (*mips_hpt_read)(void);
-void (*mips_hpt_init)(void) __initdata = null_hpt_init;
-unsigned int mips_hpt_mask = 0xffffffff;
 
 /* last time when xtime and rtc are sync'ed up */
 static long last_rtc_update;
@@ -276,8 +266,7 @@ static struct irqaction timer_irqaction = {
 
 static unsigned int __init calibrate_hpt(void)
 {
-        u64 frequency;
-        u32 hpt_start, hpt_end, hpt_count, hz;
+        cycle_t frequency, hpt_start, hpt_end, hpt_count, hz;
 
         const int loops = HZ / 10;
         int log_2_loops = 0;
@@ -303,28 +292,23 @@ static unsigned int __init calibrate_hpt(void)
          * during the calculated number of periods between timer
          * interrupts.
          */
-        hpt_start = mips_hpt_read();
+        hpt_start = clocksource_mips.read();
         do {
                 while (mips_timer_state());
                 while (!mips_timer_state());
         } while (--i);
-        hpt_end = mips_hpt_read();
+        hpt_end = clocksource_mips.read();
 
-        hpt_count = (hpt_end - hpt_start) & mips_hpt_mask;
+        hpt_count = (hpt_end - hpt_start) & clocksource_mips.mask;
         hz = HZ;
-        frequency = (u64)hpt_count * (u64)hz;
+        frequency = hpt_count * hz;
 
         return frequency >> log_2_loops;
 }
 
-static cycle_t read_mips_hpt(void)
-{
-        return (cycle_t)mips_hpt_read();
-}
-
-static struct clocksource clocksource_mips = {
+struct clocksource clocksource_mips = {
         .name           = "MIPS",
-        .read           = read_mips_hpt,
+        .mask           = 0xffffffff,
         .is_continuous  = 1,
 };
 
@@ -333,7 +317,7 @@ static void __init init_mips_clocksource(void)
         u64 temp;
         u32 shift;
 
-        if (!mips_hpt_frequency || mips_hpt_read == null_hpt_read)
+        if (!mips_hpt_frequency || clocksource_mips.read == null_hpt_read)
                 return;
 
         /* Calclate a somewhat reasonable rating value */
@@ -347,7 +331,6 @@ static void __init init_mips_clocksource(void)
         }
         clocksource_mips.shift = shift;
         clocksource_mips.mult = (u32)temp;
-        clocksource_mips.mask = mips_hpt_mask;
 
         clocksource_register(&clocksource_mips);
 }
@@ -367,32 +350,36 @@ void __init time_init(void)
                                 -xtime.tv_sec, -xtime.tv_nsec);
 
         /* Choose appropriate high precision timer routines.  */
-        if (!cpu_has_counter && !mips_hpt_read)
+        if (!cpu_has_counter && !clocksource_mips.read)
                 /* No high precision timer -- sorry.  */
-                mips_hpt_read = null_hpt_read;
+                clocksource_mips.read = null_hpt_read;
         else if (!mips_hpt_frequency && !mips_timer_state) {
                 /* A high precision timer of unknown frequency.  */
-                if (!mips_hpt_read)
+                if (!clocksource_mips.read)
                         /* No external high precision timer -- use R4k.  */
-                        mips_hpt_read = c0_hpt_read;
+                        clocksource_mips.read = c0_hpt_read;
         } else {
                 /* We know counter frequency.  Or we can get it.  */
-                if (!mips_hpt_read) {
+                if (!clocksource_mips.read) {
                         /* No external high precision timer -- use R4k.  */
-                        mips_hpt_read = c0_hpt_read;
+                        clocksource_mips.read = c0_hpt_read;
 
                         if (!mips_timer_state) {
                                 /* No external timer interrupt -- use R4k.  */
-                                mips_hpt_init = c0_hpt_timer_init;
                                 mips_timer_ack = c0_timer_ack;
+                                /* Calculate cache parameters.  */
+                                cycles_per_jiffy =
+                                        (mips_hpt_frequency + HZ / 2) / HZ;
+                                /*
+                                 * This sets up the high precision
+                                 * timer for the first interrupt.
+                                 */
+                                c0_hpt_timer_init();
                         }
                 }
                 if (!mips_hpt_frequency)
                         mips_hpt_frequency = calibrate_hpt();
 
-                /* Calculate cache parameters.  */
-                cycles_per_jiffy = (mips_hpt_frequency + HZ / 2) / HZ;
-
                 /* Report the high precision timer rate for a reference.  */
                 printk("Using %u.%03u MHz high precision timer.\n",
                        ((mips_hpt_frequency + 500) / 1000) / 1000,
@@ -403,9 +390,6 @@ void __init time_init(void)
                 /* No timer interrupt ack (e.g. i8254).  */
                 mips_timer_ack = null_timer_ack;
 
-        /* This sets up the high precision timer for the first interrupt.  */
-        mips_hpt_init();
-
         /*
          * Call board specific timer interrupt setup.
          *
diff --git a/arch/mips/kernel/topology.c b/arch/mips/kernel/topology.c
new file mode 100644
index 000000000000..660e44ed44d7
--- /dev/null
+++ b/arch/mips/kernel/topology.c
@@ -0,0 +1,29 @@
+#include <linux/cpu.h>
+#include <linux/cpumask.h>
+#include <linux/init.h>
+#include <linux/node.h>
+#include <linux/nodemask.h>
+#include <linux/percpu.h>
+
+static DEFINE_PER_CPU(struct cpu, cpu_devices);
+
+static int __init topology_init(void)
+{
+        int i, ret;
+
+#ifdef CONFIG_NUMA
+        for_each_online_node(i)
+                register_one_node(i);
+#endif /* CONFIG_NUMA */
+
+        for_each_present_cpu(i) {
+                ret = register_cpu(&per_cpu(cpu_devices, i), i);
+                if (ret)
+                        printk(KERN_WARNING "topology_init: register_cpu %d "
+                               "failed (%d)\n", i, ret);
+        }
+
+        return 0;
+}
+
+subsys_initcall(topology_init);
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 9fda1b8be3a7..2a932cada244 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -54,6 +54,8 @@ extern asmlinkage void handle_dbe(void);
 extern asmlinkage void handle_sys(void);
 extern asmlinkage void handle_bp(void);
 extern asmlinkage void handle_ri(void);
+extern asmlinkage void handle_ri_rdhwr_vivt(void);
+extern asmlinkage void handle_ri_rdhwr(void);
 extern asmlinkage void handle_cpu(void);
 extern asmlinkage void handle_ov(void);
 extern asmlinkage void handle_tr(void);
@@ -397,19 +399,6 @@ asmlinkage void do_be(struct pt_regs *regs)
         force_sig(SIGBUS, current);
 }
 
-static inline int get_insn_opcode(struct pt_regs *regs, unsigned int *opcode)
-{
-        unsigned int __user *epc;
-
-        epc = (unsigned int __user *) regs->cp0_epc +
-              ((regs->cp0_cause & CAUSEF_BD) != 0);
-        if (!get_user(*opcode, epc))
-                return 0;
-
-        force_sig(SIGSEGV, current);
-        return 1;
-}
-
 /*
  * ll/sc emulation
  */
@@ -544,8 +533,8 @@ static inline int simulate_llsc(struct pt_regs *regs)
 {
         unsigned int opcode;
 
-        if (unlikely(get_insn_opcode(regs, &opcode)))
-                return -EFAULT;
+        if (get_user(opcode, (unsigned int __user *) exception_epc(regs)))
+                goto out_sigsegv;
 
         if ((opcode & OPCODE) == LL) {
                 simulate_ll(regs, opcode);
@@ -557,6 +546,10 @@ static inline int simulate_llsc(struct pt_regs *regs)
         }
 
         return -EFAULT;                 /* Strange things going on ... */
+
+out_sigsegv:
+        force_sig(SIGSEGV, current);
+        return -EFAULT;
 }
 
 /*
@@ -569,8 +562,8 @@ static inline int simulate_rdhwr(struct pt_regs *regs)
         struct thread_info *ti = task_thread_info(current);
         unsigned int opcode;
 
-        if (unlikely(get_insn_opcode(regs, &opcode)))
-                return -EFAULT;
+        if (get_user(opcode, (unsigned int __user *) exception_epc(regs)))
+                goto out_sigsegv;
 
         if (unlikely(compute_return_epc(regs)))
                 return -EFAULT;
@@ -589,6 +582,10 @@ static inline int simulate_rdhwr(struct pt_regs *regs)
 
         /* Not ours.  */
         return -EFAULT;
+
+out_sigsegv:
+        force_sig(SIGSEGV, current);
+        return -EFAULT;
 }
 
 asmlinkage void do_ov(struct pt_regs *regs)
@@ -672,10 +669,8 @@ asmlinkage void do_bp(struct pt_regs *regs)
         unsigned int opcode, bcode;
         siginfo_t info;
 
-        die_if_kernel("Break instruction in kernel code", regs);
-
-        if (get_insn_opcode(regs, &opcode))
-                return;
+        if (get_user(opcode, (unsigned int __user *) exception_epc(regs)))
+                goto out_sigsegv;
 
         /*
          * There is the ancient bug in the MIPS assemblers that the break
@@ -696,6 +691,7 @@ asmlinkage void do_bp(struct pt_regs *regs)
         switch (bcode) {
         case BRK_OVERFLOW << 10:
         case BRK_DIVZERO << 10:
+                die_if_kernel("Break instruction in kernel code", regs);
                 if (bcode == (BRK_DIVZERO << 10))
                         info.si_code = FPE_INTDIV;
                 else
@@ -705,9 +701,16 @@ asmlinkage void do_bp(struct pt_regs *regs)
                 info.si_addr = (void __user *) regs->cp0_epc;
                 force_sig_info(SIGFPE, &info, current);
                 break;
+        case BRK_BUG:
+                die("Kernel bug detected", regs);
+                break;
         default:
+                die_if_kernel("Break instruction in kernel code", regs);
                 force_sig(SIGTRAP, current);
         }
+
+out_sigsegv:
+        force_sig(SIGSEGV, current);
 }
 
 asmlinkage void do_tr(struct pt_regs *regs)
@@ -715,10 +718,8 @@ asmlinkage void do_tr(struct pt_regs *regs)
         unsigned int opcode, tcode = 0;
         siginfo_t info;
 
-        die_if_kernel("Trap instruction in kernel code", regs);
-
-        if (get_insn_opcode(regs, &opcode))
-                return;
+        if (get_user(opcode, (unsigned int __user *) exception_epc(regs)))
+                goto out_sigsegv;
 
         /* Immediate versions don't provide a code.  */
         if (!(opcode & OPCODE))
@@ -733,6 +734,7 @@ asmlinkage void do_tr(struct pt_regs *regs)
         switch (tcode) {
         case BRK_OVERFLOW:
         case BRK_DIVZERO:
+                die_if_kernel("Trap instruction in kernel code", regs);
                 if (tcode == BRK_DIVZERO)
                         info.si_code = FPE_INTDIV;
                 else
@@ -742,9 +744,16 @@ asmlinkage void do_tr(struct pt_regs *regs)
                 info.si_addr = (void __user *) regs->cp0_epc;
                 force_sig_info(SIGFPE, &info, current);
                 break;
+        case BRK_BUG:
+                die("Kernel bug detected", regs);
+                break;
         default:
+                die_if_kernel("Trap instruction in kernel code", regs);
                 force_sig(SIGTRAP, current);
         }
+
+out_sigsegv:
+        force_sig(SIGSEGV, current);
 }
 
 asmlinkage void do_ri(struct pt_regs *regs)
@@ -1423,6 +1432,15 @@ void __init set_uncached_handler (unsigned long offset, void *addr, unsigned lon
         memcpy((void *)(uncached_ebase + offset), addr, size);
 }
 
+static int __initdata rdhwr_noopt;
+static int __init set_rdhwr_noopt(char *str)
+{
+        rdhwr_noopt = 1;
+        return 1;
+}
+
+__setup("rdhwr_noopt", set_rdhwr_noopt);
+
 void __init trap_init(void)
 {
         extern char except_vec3_generic, except_vec3_r4000;
@@ -1502,7 +1520,9 @@ void __init trap_init(void)
 
         set_except_vector(8, handle_sys);
         set_except_vector(9, handle_bp);
-        set_except_vector(10, handle_ri);
+        set_except_vector(10, rdhwr_noopt ? handle_ri :
+                          (cpu_has_vtag_icache ?
+                           handle_ri_rdhwr_vivt : handle_ri_rdhwr));
         set_except_vector(11, handle_cpu);
         set_except_vector(12, handle_ov);
         set_except_vector(13, handle_tr);
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c
index a144a002dcc4..4a84a7beac53 100644
--- a/arch/mips/lasat/interrupt.c
+++ b/arch/mips/lasat/interrupt.c
@@ -36,33 +36,14 @@ static volatile int lasat_int_mask_shift;
 
 void disable_lasat_irq(unsigned int irq_nr)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         *lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift;
-        local_irq_restore(flags);
 }
 
 void enable_lasat_irq(unsigned int irq_nr)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift;
-        local_irq_restore(flags);
 }
 
-static unsigned int startup_lasat_irq(unsigned int irq)
-{
-        enable_lasat_irq(irq);
-
-        return 0; /* never anything pending */
-}
-
-#define shutdown_lasat_irq      disable_lasat_irq
-
-#define mask_and_ack_lasat_irq disable_lasat_irq
-
 static void end_lasat_irq(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
@@ -71,11 +52,10 @@ static void end_lasat_irq(unsigned int irq)
 
 static struct irq_chip lasat_irq_type = {
         .typename = "Lasat",
-        .startup = startup_lasat_irq,
-        .shutdown = shutdown_lasat_irq,
-        .enable = enable_lasat_irq,
-        .disable = disable_lasat_irq,
-        .ack = mask_and_ack_lasat_irq,
+        .ack = disable_lasat_irq,
+        .mask = disable_lasat_irq,
+        .mask_ack = disable_lasat_irq,
+        .unmask = enable_lasat_irq,
         .end = end_lasat_irq,
 };
 
@@ -152,10 +132,6 @@ void __init arch_init_irq(void)
                 panic("arch_init_irq: mips_machtype incorrect");
         }
 
-        for (i = 0; i <= LASATINT_END; i++) {
-                irq_desc[i].status      = IRQ_DISABLED;
-                irq_desc[i].action      = 0;
-                irq_desc[i].depth       = 1;
-                irq_desc[i].chip        = &lasat_irq_type;
-        }
+        for (i = 0; i <= LASATINT_END; i++)
+                set_irq_chip_and_handler(i, &lasat_irq_type, handle_level_irq);
 }
diff --git a/arch/mips/lib/csum_partial_copy.c b/arch/mips/lib/csum_partial_copy.c
index 6e9f366f961d..1720f2ceeeae 100644
--- a/arch/mips/lib/csum_partial_copy.c
+++ b/arch/mips/lib/csum_partial_copy.c
@@ -16,8 +16,8 @@
 /*
  * copy while checksumming, otherwise like csum_partial
  */
-unsigned int csum_partial_copy_nocheck(const unsigned char *src,
-        unsigned char *dst, int len, unsigned int sum)
+__wsum csum_partial_copy_nocheck(const void *src,
+        void *dst, int len, __wsum sum)
 {
         /*
          * It's 2:30 am and I don't feel like doing it real ...
@@ -33,8 +33,8 @@ unsigned int csum_partial_copy_nocheck(const unsigned char *src,
  * Copy from userspace and compute checksum.  If we catch an exception
  * then zero the rest of the buffer.
  */
-unsigned int csum_partial_copy_from_user (const unsigned char __user *src,
-        unsigned char *dst, int len, unsigned int sum, int *err_ptr)
+__wsum csum_partial_copy_from_user (const void __user *src,
+        void *dst, int len, __wsum sum, int *err_ptr)
 {
         int missing;
 
diff --git a/arch/mips/mips-boards/atlas/atlas_int.c b/arch/mips/mips-boards/atlas/atlas_int.c
index be624b8c3b0e..43dba6ce6603 100644
--- a/arch/mips/mips-boards/atlas/atlas_int.c
+++ b/arch/mips/mips-boards/atlas/atlas_int.c
@@ -62,16 +62,6 @@ void enable_atlas_irq(unsigned int irq_nr)
         iob();
 }
 
-static unsigned int startup_atlas_irq(unsigned int irq)
-{
-        enable_atlas_irq(irq);
-        return 0; /* never anything pending */
-}
-
-#define shutdown_atlas_irq      disable_atlas_irq
-
-#define mask_and_ack_atlas_irq disable_atlas_irq
-
 static void end_atlas_irq(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
@@ -80,11 +70,11 @@ static void end_atlas_irq(unsigned int irq)
 
 static struct irq_chip atlas_irq_type = {
         .typename = "Atlas",
-        .startup = startup_atlas_irq,
-        .shutdown = shutdown_atlas_irq,
-        .enable = enable_atlas_irq,
-        .disable = disable_atlas_irq,
-        .ack = mask_and_ack_atlas_irq,
+        .ack = disable_atlas_irq,
+        .mask = disable_atlas_irq,
+        .mask_ack = disable_atlas_irq,
+        .unmask = enable_atlas_irq,
+        .eoi = enable_atlas_irq,
         .end = end_atlas_irq,
 };
 
@@ -217,13 +207,8 @@ static inline void init_atlas_irqs (int base)
          */
         atlas_hw0_icregs->intrsten = 0xffffffff;
 
-        for (i = ATLAS_INT_BASE; i <= ATLAS_INT_END; i++) {
-                irq_desc[i].status      = IRQ_DISABLED;
-                irq_desc[i].action      = 0;
-                irq_desc[i].depth       = 1;
-                irq_desc[i].chip        = &atlas_irq_type;
-                spin_lock_init(&irq_desc[i].lock);
-        }
+        for (i = ATLAS_INT_BASE; i <= ATLAS_INT_END; i++)
+                set_irq_chip_and_handler(i, &atlas_irq_type, handle_level_irq);
 }
 
 static struct irqaction atlasirq = {
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c
index d817c60c5ca5..e4604c73f02e 100644
--- a/arch/mips/mips-boards/generic/time.c
+++ b/arch/mips/mips-boards/generic/time.c
@@ -288,6 +288,7 @@ void __init plat_timer_setup(struct irqaction *irq)
            The effect is that the int remains disabled on the second cpu.
            Mark the interrupt with IRQ_PER_CPU to avoid any confusion */
         irq_desc[mips_cpu_timer_irq].status |= IRQ_PER_CPU;
+        set_irq_handler(mips_cpu_timer_irq, handle_percpu_irq);
 #endif
 
         /* to generate the first timer interrupt */
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c
index ab460f805bef..282f3e52eea3 100644
--- a/arch/mips/mips-boards/malta/malta_setup.c
+++ b/arch/mips/mips-boards/malta/malta_setup.c
@@ -159,7 +159,7 @@ void __init plat_mem_setup(void)
                                 BONITO_PCIMEMBASECFG |=
                                         (BONITO_PCIMEMBASECFG_MEMBASE0_CACHED |
                                          BONITO_PCIMEMBASECFG_MEMBASE1_CACHED);
-                                printk("Disabled Bonito IOBC coherency\n");
+                                printk("Enabled Bonito IOBC coherency\n");
                         }
                 }
                 else
diff --git a/arch/mips/mips-boards/sim/sim_time.c b/arch/mips/mips-boards/sim/sim_time.c
index 24a4ed00cc0a..30711d016fed 100644
--- a/arch/mips/mips-boards/sim/sim_time.c
+++ b/arch/mips/mips-boards/sim/sim_time.c
@@ -3,31 +3,24 @@
 #include <linux/kernel_stat.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
-
-#include <asm/mipsregs.h>
-#include <asm/ptrace.h>
-#include <asm/hardirq.h>
-#include <asm/div64.h>
-#include <asm/cpu.h>
-#include <asm/time.h>
-
 #include <linux/interrupt.h>
 #include <linux/mc146818rtc.h>
 #include <linux/timex.h>
+
 #include <asm/mipsregs.h>
+#include <asm/ptrace.h>
 #include <asm/hardirq.h>
-#include <asm/irq.h>
 #include <asm/div64.h>
 #include <asm/cpu.h>
 #include <asm/time.h>
+#include <asm/irq.h>
 #include <asm/mc146818-time.h>
 #include <asm/msc01_ic.h>
+#include <asm/smp.h>
 
 #include <asm/mips-boards/generic.h>
 #include <asm/mips-boards/prom.h>
 #include <asm/mips-boards/simint.h>
-#include <asm/mc146818-time.h>
-#include <asm/smp.h>
 
 
 unsigned long cpu_khz;
@@ -203,7 +196,8 @@ void __init plat_timer_setup(struct irqaction *irq)
            on seperate cpu's the first one tries to handle the second interrupt.
            The effect is that the int remains disabled on the second cpu.
            Mark the interrupt with IRQ_PER_CPU to avoid any confusion */
-        irq_desc[mips_cpu_timer_irq].status |= IRQ_PER_CPU;
+        irq_desc[mips_cpu_timer_irq].flags |= IRQ_PER_CPU;
+        set_irq_handler(mips_cpu_timer_irq, handle_percpu_irq);
 #endif
 
         /* to generate the first timer interrupt */
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index cc895dad71d2..df04a315d830 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -323,7 +323,6 @@ static void __init r4k_blast_scache_setup(void)
 static inline void local_r4k_flush_cache_all(void * args)
 {
         r4k_blast_dcache();
-        r4k_blast_icache();
 }
 
 static void r4k_flush_cache_all(void)
@@ -359,21 +358,19 @@ static void r4k___flush_cache_all(void)
 static inline void local_r4k_flush_cache_range(void * args)
 {
         struct vm_area_struct *vma = args;
-        int exec;
 
         if (!(cpu_context(smp_processor_id(), vma->vm_mm)))
                 return;
 
-        exec = vma->vm_flags & VM_EXEC;
-        if (cpu_has_dc_aliases || exec)
-                r4k_blast_dcache();
-        if (exec)
-                r4k_blast_icache();
+        r4k_blast_dcache();
 }
 
 static void r4k_flush_cache_range(struct vm_area_struct *vma,
         unsigned long start, unsigned long end)
 {
+        if (!cpu_has_dc_aliases)
+                return;
+
         r4k_on_each_cpu(local_r4k_flush_cache_range, vma, 1, 1);
 }
 
@@ -384,18 +381,21 @@ static inline void local_r4k_flush_cache_mm(void * args)
         if (!cpu_context(smp_processor_id(), mm))
                 return;
 
-        r4k_blast_dcache();
-        r4k_blast_icache();
-
         /*
          * Kludge alert.  For obscure reasons R4000SC and R4400SC go nuts if we
          * only flush the primary caches but R10000 and R12000 behave sane ...
+         * R4000SC and R4400SC indexed S-cache ops also invalidate primary
+         * caches, so we can bail out early.
          */
         if (current_cpu_data.cputype == CPU_R4000SC ||
             current_cpu_data.cputype == CPU_R4000MC ||
             current_cpu_data.cputype == CPU_R4400SC ||
-            current_cpu_data.cputype == CPU_R4400MC)
+            current_cpu_data.cputype == CPU_R4400MC) {
                 r4k_blast_scache();
+                return;
+        }
+
+        r4k_blast_dcache();
 }
 
 static void r4k_flush_cache_mm(struct mm_struct *mm)
diff --git a/arch/mips/mm/c-sb1.c b/arch/mips/mm/c-sb1.c
index d0ddb4a768a5..3a8afd47feaa 100644
--- a/arch/mips/mm/c-sb1.c
+++ b/arch/mips/mm/c-sb1.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 #include <linux/init.h>
+#include <linux/hardirq.h>
 
 #include <asm/asm.h>
 #include <asm/bootinfo.h>
@@ -242,6 +243,25 @@ void sb1_flush_cache_page(struct vm_area_struct *vma, unsigned long addr, unsign
         __attribute__((alias("local_sb1_flush_cache_page")));
 #endif
 
+#ifdef CONFIG_SMP
+static void sb1_flush_cache_data_page_ipi(void *info)
+{
+        unsigned long start = (unsigned long)info;
+
+        __sb1_writeback_inv_dcache_range(start, start + PAGE_SIZE);
+}
+
+static void sb1_flush_cache_data_page(unsigned long addr)
+{
+        if (in_atomic())
+                __sb1_writeback_inv_dcache_range(addr, addr + PAGE_SIZE);
+        else
+                on_each_cpu(sb1_flush_cache_data_page_ipi, (void *) addr, 1, 1);
+}
+#else
+void sb1_flush_cache_data_page(unsigned long)
+        __attribute__((alias("local_sb1_flush_cache_data_page")));
+#endif
 
 /*
  * Invalidate all caches on this CPU
@@ -481,7 +501,7 @@ void sb1_cache_init(void)
 
         flush_cache_sigtramp = sb1_flush_cache_sigtramp;
         local_flush_data_cache_page = (void *) sb1_nop;
-        flush_data_cache_page = (void *) sb1_nop;
+        flush_data_cache_page = sb1_flush_cache_data_page;
 
         /* Full flush */
         __flush_cache_all = sb1___flush_cache_all;
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
index 8423d8590779..6f90e7ef66ac 100644
--- a/arch/mips/mm/fault.c
+++ b/arch/mips/mm/fault.c
@@ -60,6 +60,10 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,
          */
         if (unlikely(address >= VMALLOC_START && address <= VMALLOC_END))
                 goto vmalloc_fault;
+#ifdef MODULE_START
+        if (unlikely(address >= MODULE_START && address < MODULE_END))
+                goto vmalloc_fault;
+#endif
 
         /*
          * If we're in an interrupt or have no user
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 2de4d3c367a2..9e29ba9205f0 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -90,9 +90,9 @@ unsigned long setup_zero_pages(void)
         if (!empty_zero_page)
                 panic("Oh boy, that early out of memory?");
 
-        page = virt_to_page(empty_zero_page);
+        page = virt_to_page((void *)empty_zero_page);
         split_page(page, order);
-        while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) {
+        while (page < virt_to_page((void *)(empty_zero_page + (PAGE_SIZE << order)))) {
                 SetPageReserved(page);
                 page++;
         }
@@ -443,15 +443,18 @@ void __init mem_init(void)
 }
 #endif /* !CONFIG_NEED_MULTIPLE_NODES */
 
-void free_init_pages(char *what, unsigned long begin, unsigned long end)
+static void free_init_pages(char *what, unsigned long begin, unsigned long end)
 {
-        unsigned long addr;
+        unsigned long pfn;
 
-        for (addr = begin; addr < end; addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                memset((void *)addr, 0xcc, PAGE_SIZE);
-                free_page(addr);
+        for (pfn = PFN_UP(begin); pfn < PFN_DOWN(end); pfn++) {
+                struct page *page = pfn_to_page(pfn);
+                void *addr = phys_to_virt(PFN_PHYS(pfn));
+
+                ClearPageReserved(page);
+                init_page_count(page);
+                memset(addr, POISON_FREE_INITMEM, PAGE_SIZE);
+                __free_page(page);
                 totalram_pages++;
         }
         printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
@@ -460,12 +463,9 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-#ifdef CONFIG_64BIT
-        /* Switch from KSEG0 to XKPHYS addresses */
-        start = (unsigned long)phys_to_virt(CPHYSADDR(start));
-        end = (unsigned long)phys_to_virt(CPHYSADDR(end));
-#endif
-        free_init_pages("initrd memory", start, end);
+        free_init_pages("initrd memory",
+                        virt_to_phys((void *)start),
+                        virt_to_phys((void *)end));
 }
 #endif
 
@@ -473,17 +473,13 @@ extern unsigned long prom_free_prom_memory(void);
 
 void free_initmem(void)
 {
-        unsigned long start, end, freed;
+        unsigned long freed;
 
         freed = prom_free_prom_memory();
         if (freed)
                 printk(KERN_INFO "Freeing firmware memory: %ldk freed\n",freed);
 
-        start = (unsigned long)(&__init_begin);
-        end = (unsigned long)(&__init_end);
-#ifdef CONFIG_64BIT
-        start = PAGE_OFFSET | CPHYSADDR(start);
-        end = PAGE_OFFSET | CPHYSADDR(end);
-#endif
-        free_init_pages("unused kernel memory", start, end);
+        free_init_pages("unused kernel memory",
+                        __pa_symbol(&__init_begin),
+                        __pa_symbol(&__init_end));
 }
diff --git a/arch/mips/mm/pgtable-64.c b/arch/mips/mm/pgtable-64.c
index 8d600d307d5d..c46eb651bf09 100644
--- a/arch/mips/mm/pgtable-64.c
+++ b/arch/mips/mm/pgtable-64.c
@@ -58,6 +58,9 @@ void __init pagetable_init(void)
 
         /* Initialize the entire pgd.  */
         pgd_init((unsigned long)swapper_pg_dir);
+#ifdef MODULE_START
+        pgd_init((unsigned long)module_pg_dir);
+#endif
         pmd_init((unsigned long)invalid_pmd_table, (unsigned long)invalid_pte_table);
 
         pgd_base = swapper_pg_dir;
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index fec318a1c8c5..492c518e7ba5 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -423,6 +423,9 @@ enum label_id {
         label_invalid,
         label_second_part,
         label_leave,
+#ifdef MODULE_START
+        label_module_alloc,
+#endif
         label_vmalloc,
         label_vmalloc_done,
         label_tlbw_hazard,
@@ -455,6 +458,9 @@ static __init void build_label(struct label **lab, u32 *addr,
 
 L_LA(_second_part)
 L_LA(_leave)
+#ifdef MODULE_START
+L_LA(_module_alloc)
+#endif
 L_LA(_vmalloc)
 L_LA(_vmalloc_done)
 L_LA(_tlbw_hazard)
@@ -686,6 +692,13 @@ static void __init il_bgezl(u32 **p, struct reloc **r, unsigned int reg,
         i_bgezl(p, reg, 0);
 }
 
+static void __init __attribute__((unused))
+il_bgez(u32 **p, struct reloc **r, unsigned int reg, enum label_id l)
+{
+        r_mips_pc16(r, *p, l);
+        i_bgez(p, reg, 0);
+}
+
 /* The only general purpose registers allowed in TLB handlers. */
 #define K0              26
 #define K1              27
@@ -970,7 +983,11 @@ build_get_pmde64(u32 **p, struct label **l, struct reloc **r,
          * The vmalloc handling is not in the hotpath.
          */
         i_dmfc0(p, tmp, C0_BADVADDR);
+#ifdef MODULE_START
+        il_bltz(p, r, tmp, label_module_alloc);
+#else
         il_bltz(p, r, tmp, label_vmalloc);
+#endif
         /* No i_nop needed here, since the next insn doesn't touch TMP. */
 
 #ifdef CONFIG_SMP
@@ -1023,8 +1040,46 @@ build_get_pgd_vmalloc64(u32 **p, struct label **l, struct reloc **r,
 {
         long swpd = (long)swapper_pg_dir;
 
+#ifdef MODULE_START
+        long modd = (long)module_pg_dir;
+
+        l_module_alloc(l, *p);
+        /*
+         * Assumption:
+         * VMALLOC_START >= 0xc000000000000000UL
+         * MODULE_START >= 0xe000000000000000UL
+         */
+        i_SLL(p, ptr, bvaddr, 2);
+        il_bgez(p, r, ptr, label_vmalloc);
+
+        if (in_compat_space_p(MODULE_START) && !rel_lo(MODULE_START)) {
+                i_lui(p, ptr, rel_hi(MODULE_START)); /* delay slot */
+        } else {
+                /* unlikely configuration */
+                i_nop(p); /* delay slot */
+                i_LA(p, ptr, MODULE_START);
+        }
+        i_dsubu(p, bvaddr, bvaddr, ptr);
+
+        if (in_compat_space_p(modd) && !rel_lo(modd)) {
+                il_b(p, r, label_vmalloc_done);
+                i_lui(p, ptr, rel_hi(modd));
+        } else {
+                i_LA_mostly(p, ptr, modd);
+                il_b(p, r, label_vmalloc_done);
+                i_daddiu(p, ptr, ptr, rel_lo(modd));
+        }
+
+        l_vmalloc(l, *p);
+        if (in_compat_space_p(MODULE_START) && !rel_lo(MODULE_START) &&
+            MODULE_START << 32 == VMALLOC_START)
+                i_dsll32(p, ptr, ptr, 0);       /* typical case */
+        else
+                i_LA(p, ptr, VMALLOC_START);
+#else
         l_vmalloc(l, *p);
         i_LA(p, ptr, VMALLOC_START);
+#endif
         i_dsubu(p, bvaddr, bvaddr, ptr);
 
         if (in_compat_space_p(swpd) && !rel_lo(swpd)) {
diff --git a/arch/mips/momentum/ocelot_c/cpci-irq.c b/arch/mips/momentum/ocelot_c/cpci-irq.c
index 47e3fa32b075..e5a4a0a8a7f0 100644
--- a/arch/mips/momentum/ocelot_c/cpci-irq.c
+++ b/arch/mips/momentum/ocelot_c/cpci-irq.c
@@ -66,39 +66,6 @@ static inline void unmask_cpci_irq(unsigned int irq)
 }
 
 /*
- * Enables the IRQ in the FPGA
- */
-static void enable_cpci_irq(unsigned int irq)
-{
-        unmask_cpci_irq(irq);
-}
-
-/*
- * Initialize the IRQ in the FPGA
- */
-static unsigned int startup_cpci_irq(unsigned int irq)
-{
-        unmask_cpci_irq(irq);
-        return 0;
-}
-
-/*
- * Disables the IRQ in the FPGA
- */
-static void disable_cpci_irq(unsigned int irq)
-{
-        mask_cpci_irq(irq);
-}
-
-/*
- * Masks and ACKs an IRQ
- */
-static void mask_and_ack_cpci_irq(unsigned int irq)
-{
-        mask_cpci_irq(irq);
-}
-
-/*
  * End IRQ processing
  */
 static void end_cpci_irq(unsigned int irq)
@@ -125,15 +92,12 @@ void ll_cpci_irq(void)
         do_IRQ(ls1bit8(irq_src) + CPCI_IRQ_BASE);
 }
 
-#define shutdown_cpci_irq       disable_cpci_irq
-
 struct irq_chip cpci_irq_type = {
         .typename = "CPCI/FPGA",
-        .startup = startup_cpci_irq,
-        .shutdown = shutdown_cpci_irq,
-        .enable = enable_cpci_irq,
-        .disable = disable_cpci_irq,
-        .ack = mask_and_ack_cpci_irq,
+        .ack = mask_cpci_irq,
+        .mask = mask_cpci_irq,
+        .mask_ack = mask_cpci_irq,
+        .unmask = unmask_cpci_irq,
         .end = end_cpci_irq,
 };
 
@@ -141,11 +105,6 @@ void cpci_irq_init(void)
 {
         int i;
 
-        /* Reset irq handlers pointers to NULL */
-        for (i = CPCI_IRQ_BASE; i < (CPCI_IRQ_BASE + 8); i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 2;
-                irq_desc[i].chip = &cpci_irq_type;
-        }
+        for (i = CPCI_IRQ_BASE; i < (CPCI_IRQ_BASE + 8); i++)
+                set_irq_chip_and_handler(i, &cpci_irq_type, handle_level_irq);
 }
diff --git a/arch/mips/momentum/ocelot_c/uart-irq.c b/arch/mips/momentum/ocelot_c/uart-irq.c
index 510257dc205a..0029f0008dea 100644
--- a/arch/mips/momentum/ocelot_c/uart-irq.c
+++ b/arch/mips/momentum/ocelot_c/uart-irq.c
@@ -60,39 +60,6 @@ static inline void unmask_uart_irq(unsigned int irq)
 }
 
 /*
- * Enables the IRQ in the FPGA
- */
-static void enable_uart_irq(unsigned int irq)
-{
-        unmask_uart_irq(irq);
-}
-
-/*
- * Initialize the IRQ in the FPGA
- */
-static unsigned int startup_uart_irq(unsigned int irq)
-{
-        unmask_uart_irq(irq);
-        return 0;
-}
-
-/*
- * Disables the IRQ in the FPGA
- */
-static void disable_uart_irq(unsigned int irq)
-{
-        mask_uart_irq(irq);
-}
-
-/*
- * Masks and ACKs an IRQ
- */
-static void mask_and_ack_uart_irq(unsigned int irq)
-{
-        mask_uart_irq(irq);
-}
-
-/*
  * End IRQ processing
  */
 static void end_uart_irq(unsigned int irq)
@@ -118,28 +85,17 @@ void ll_uart_irq(void)
         do_IRQ(ls1bit8(irq_src) + 74);
 }
 
-#define shutdown_uart_irq       disable_uart_irq
-
 struct irq_chip uart_irq_type = {
         .typename = "UART/FPGA",
-        .startup = startup_uart_irq,
-        .shutdown = shutdown_uart_irq,
-        .enable = enable_uart_irq,
-        .disable = disable_uart_irq,
-        .ack = mask_and_ack_uart_irq,
+        .ack = mask_uart_irq,
+        .mask = mask_uart_irq,
+        .mask_ack = mask_uart_irq,
+        .unmask = unmask_uart_irq,
         .end = end_uart_irq,
 };
 
 void uart_irq_init(void)
 {
-        /* Reset irq handlers pointers to NULL */
-        irq_desc[80].status = IRQ_DISABLED;
-        irq_desc[80].action = 0;
-        irq_desc[80].depth = 2;
-        irq_desc[80].chip = &uart_irq_type;
-
-        irq_desc[81].status = IRQ_DISABLED;
-        irq_desc[81].action = 0;
-        irq_desc[81].depth = 2;
-        irq_desc[81].chip = &uart_irq_type;
+        set_irq_chip_and_handler(80, &uart_irq_type, handle_level_irq);
+        set_irq_chip_and_handler(81, &uart_irq_type, handle_level_irq);
 }
diff --git a/arch/mips/oprofile/Makefile b/arch/mips/oprofile/Makefile
index 0a50aad5bbe4..bf3be6fcf7ff 100644
--- a/arch/mips/oprofile/Makefile
+++ b/arch/mips/oprofile/Makefile
@@ -12,5 +12,6 @@ oprofile-y				:= $(DRIVER_OBJS) common.o
 
 oprofile-$(CONFIG_CPU_MIPS32)           += op_model_mipsxx.o
 oprofile-$(CONFIG_CPU_MIPS64)           += op_model_mipsxx.o
+oprofile-$(CONFIG_CPU_R10000)           += op_model_mipsxx.o
 oprofile-$(CONFIG_CPU_SB1)              += op_model_mipsxx.o
 oprofile-$(CONFIG_CPU_RM9000)           += op_model_rm9000.o
diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index 65eb55400d77..4e0a90b3916b 100644
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
@@ -83,6 +83,9 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
         case CPU_74K:
         case CPU_SB1:
         case CPU_SB1A:
+        case CPU_R10000:
+        case CPU_R12000:
+        case CPU_R14000:
                 lmodel = &op_model_mipsxx_ops;
                 break;
 
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index 1fb240c57bac..455d76ad06d8 100644
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -18,7 +18,7 @@
 #define M_PERFCTL_SUPERVISOR            (1UL      <<  2)
 #define M_PERFCTL_USER                  (1UL      <<  3)
 #define M_PERFCTL_INTERRUPT_ENABLE      (1UL      <<  4)
-#define M_PERFCTL_EVENT(event)          ((event)  << 5)
+#define M_PERFCTL_EVENT(event)          (((event) & 0x3f)  << 5)
 #define M_PERFCTL_VPEID(vpe)            ((vpe)    << 16)
 #define M_PERFCTL_MT_EN(filter)         ((filter) << 20)
 #define    M_TC_EN_ALL                  M_PERFCTL_MT_EN(0)
@@ -218,13 +218,23 @@ static inline int __n_counters(void)
 
 static inline int n_counters(void)
 {
-        int counters = __n_counters();
+        int counters;
+
+        switch (current_cpu_data.cputype) {
+        case CPU_R10000:
+                counters = 2;
+
+        case CPU_R12000:
+        case CPU_R14000:
+                counters = 4;
+
+        default:
+                counters = __n_counters();
+        }
 
 #ifdef CONFIG_MIPS_MT_SMP
-        if (current_cpu_data.cputype == CPU_34K)
-                return counters >> 1;
+        counters >> 1;
 #endif
-
         return counters;
 }
 
@@ -284,6 +294,18 @@ static int __init mipsxx_init(void)
                 op_model_mipsxx_ops.cpu_type = "mips/5K";
                 break;
 
+        case CPU_R10000:
+                if ((current_cpu_data.processor_id & 0xff) == 0x20)
+                        op_model_mipsxx_ops.cpu_type = "mips/r10000-v2.x";
+                else
+                        op_model_mipsxx_ops.cpu_type = "mips/r10000";
+                break;
+
+        case CPU_R12000:
+        case CPU_R14000:
+                op_model_mipsxx_ops.cpu_type = "mips/r12000";
+                break;
+
         case CPU_SB1:
         case CPU_SB1A:
                 op_model_mipsxx_ops.cpu_type = "mips/sb1";
diff --git a/arch/mips/pci/fixup-cobalt.c b/arch/mips/pci/fixup-cobalt.c
index 75a01e764898..7d5f6bbf7a9d 100644
--- a/arch/mips/pci/fixup-cobalt.c
+++ b/arch/mips/pci/fixup-cobalt.c
@@ -94,22 +94,21 @@ static void qube_raq_galileo_fixup(struct pci_dev *dev)
 #if 0
         if (galileo_id >= 0x10) {
                 /* New Galileo, assumes PCI stop line to VIA is connected. */
-                GALILEO_OUTL(0x4020, GT_PCI0_TOR_OFS);
+                GT_WRITE(GT_PCI0_TOR_OFS, 0x4020);
         } else if (galileo_id == 0x1 || galileo_id == 0x2)
 #endif
         {
                 signed int timeo;
                 /* XXX WE MUST DO THIS ELSE GALILEO LOCKS UP! -DaveM */
-                timeo = GALILEO_INL(GT_PCI0_TOR_OFS);
+                timeo = GT_READ(GT_PCI0_TOR_OFS);
                 /* Old Galileo, assumes PCI STOP line to VIA is disconnected. */
-                GALILEO_OUTL(
+                GT_WRITE(GT_PCI0_TOR_OFS,
                         (0xff << 16) |          /* retry count */
                         (0xff << 8) |           /* timeout 1   */
-                        0xff,                   /* timeout 0   */
-                        GT_PCI0_TOR_OFS);
+                        0xff);                  /* timeout 0   */
 
                 /* enable PCI retry exceeded interrupt */
-                GALILEO_OUTL(GALILEO_INTR_RETRY_CTR | GALILEO_INL(GT_INTRMASK_OFS), GT_INTRMASK_OFS);
+                GT_WRITE(GT_INTRMASK_OFS, GT_INTR_RETRYCTR0_MSK | GT_READ(GT_INTRMASK_OFS));
         }
 }
 
diff --git a/arch/mips/pci/ops-gt64111.c b/arch/mips/pci/ops-gt64111.c
index 13de45940b19..ecd3991bd0e4 100644
--- a/arch/mips/pci/ops-gt64111.c
+++ b/arch/mips/pci/ops-gt64111.c
@@ -38,18 +38,18 @@ static int gt64111_pci_read_config(struct pci_bus *bus, unsigned int devfn,
         switch (size) {
         case 4:
                 PCI_CFG_SET(devfn, where);
-                *val = GALILEO_INL(GT_PCI0_CFGDATA_OFS);
+                *val = GT_READ(GT_PCI0_CFGDATA_OFS);
                 return PCIBIOS_SUCCESSFUL;
 
         case 2:
                 PCI_CFG_SET(devfn, (where & ~0x3));
-                *val = GALILEO_INL(GT_PCI0_CFGDATA_OFS)
+                *val = GT_READ(GT_PCI0_CFGDATA_OFS)
                     >> ((where & 3) * 8);
                 return PCIBIOS_SUCCESSFUL;
 
         case 1:
                 PCI_CFG_SET(devfn, (where & ~0x3));
-                *val = GALILEO_INL(GT_PCI0_CFGDATA_OFS)
+                *val = GT_READ(GT_PCI0_CFGDATA_OFS)
                     >> ((where & 3) * 8);
                 return PCIBIOS_SUCCESSFUL;
         }
@@ -68,25 +68,25 @@ static int gt64111_pci_write_config(struct pci_bus *bus, unsigned int devfn,
         switch (size) {
         case 4:
                 PCI_CFG_SET(devfn, where);
-                GALILEO_OUTL(val, GT_PCI0_CFGDATA_OFS);
+                GT_WRITE(GT_PCI0_CFGDATA_OFS, val);
 
                 return PCIBIOS_SUCCESSFUL;
 
         case 2:
                 PCI_CFG_SET(devfn, (where & ~0x3));
-                tmp = GALILEO_INL(GT_PCI0_CFGDATA_OFS);
+                tmp = GT_READ(GT_PCI0_CFGDATA_OFS);
                 tmp &= ~(0xffff << ((where & 0x3) * 8));
                 tmp |= (val << ((where & 0x3) * 8));
-                GALILEO_OUTL(tmp, GT_PCI0_CFGDATA_OFS);
+                GT_WRITE(GT_PCI0_CFGDATA_OFS, tmp);
 
                 return PCIBIOS_SUCCESSFUL;
 
         case 1:
                 PCI_CFG_SET(devfn, (where & ~0x3));
-                tmp = GALILEO_INL(GT_PCI0_CFGDATA_OFS);
+                tmp = GT_READ(GT_PCI0_CFGDATA_OFS);
                 tmp &= ~(0xff << ((where & 0x3) * 8));
                 tmp |= (val << ((where & 0x3) * 8));
-                GALILEO_OUTL(tmp, GT_PCI0_CFGDATA_OFS);
+                GT_WRITE(GT_PCI0_CFGDATA_OFS, tmp);
 
                 return PCIBIOS_SUCCESSFUL;
         }
diff --git a/arch/mips/philips/pnx8550/common/int.c b/arch/mips/philips/pnx8550/common/int.c
index 710611615ca2..0dc23930edbd 100644
--- a/arch/mips/philips/pnx8550/common/int.c
+++ b/arch/mips/philips/pnx8550/common/int.c
@@ -38,8 +38,6 @@
 #include <int.h>
 #include <uart.h>
 
-static DEFINE_SPINLOCK(irq_lock);
-
 /* default prio for interrupts */
 /* first one is a no-no so therefore always prio 0 (disabled) */
 static char gic_prio[PNX8550_INT_GIC_TOTINT] = {
@@ -149,38 +147,6 @@ static inline void unmask_irq(unsigned int irq_nr)
         }
 }
 
-#define pnx8550_disable pnx8550_ack
-static void pnx8550_ack(unsigned int irq)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&irq_lock, flags);
-        mask_irq(irq);
-        spin_unlock_irqrestore(&irq_lock, flags);
-}
-
-#define pnx8550_enable pnx8550_unmask
-static void pnx8550_unmask(unsigned int irq)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&irq_lock, flags);
-        unmask_irq(irq);
-        spin_unlock_irqrestore(&irq_lock, flags);
-}
-
-static unsigned int startup_irq(unsigned int irq_nr)
-{
-        pnx8550_unmask(irq_nr);
-        return 0;
-}
-
-static void shutdown_irq(unsigned int irq_nr)
-{
-        pnx8550_ack(irq_nr);
-        return;
-}
-
 int pnx8550_set_gic_priority(int irq, int priority)
 {
         int gic_irq = irq-PNX8550_INT_GIC_MIN;
@@ -192,26 +158,19 @@ int pnx8550_set_gic_priority(int irq, int priority)
         return prev_priority;
 }
 
-static inline void mask_and_ack_level_irq(unsigned int irq)
-{
-        pnx8550_disable(irq);
-        return;
-}
-
 static void end_irq(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) {
-                pnx8550_enable(irq);
+                unmask_irq(irq);
         }
 }
 
 static struct irq_chip level_irq_type = {
         .typename =     "PNX Level IRQ",
-        .startup =      startup_irq,
-        .shutdown =     shutdown_irq,
-        .enable =       pnx8550_enable,
-        .disable =      pnx8550_disable,
-        .ack =          mask_and_ack_level_irq,
+        .ack =          mask_irq,
+        .mask =         mask_irq,
+        .mask_ack =     mask_irq,
+        .unmask =       unmask_irq,
         .end =          end_irq,
 };
 
@@ -233,8 +192,8 @@ void __init arch_init_irq(void)
         int configPR;
 
         for (i = 0; i < PNX8550_INT_CP0_TOTINT; i++) {
-                irq_desc[i].chip = &level_irq_type;
-                pnx8550_ack(i); /* mask the irq just in case  */
+                set_irq_chip_and_handler(i, &level_irq_type, handle_level_irq);
+                mask_irq(i);    /* mask the irq just in case  */
         }
 
         /* init of GIC/IPC interrupts */
@@ -270,7 +229,7 @@ void __init arch_init_irq(void)
                 /* mask/priority is still 0 so we will not get any
                  * interrupts until it is unmasked */
 
-                irq_desc[i].chip = &level_irq_type;
+                set_irq_chip_and_handler(i, &level_irq_type, handle_level_irq);
         }
 
         /* Priority level 0 */
@@ -279,20 +238,21 @@ void __init arch_init_irq(void)
         /* Set int vector table address */
         PNX8550_GIC_VECTOR_0 = PNX8550_GIC_VECTOR_1 = 0;
 
-        irq_desc[MIPS_CPU_GIC_IRQ].chip = &level_irq_type;
+        set_irq_chip_and_handler(MIPS_CPU_GIC_IRQ, &level_irq_type,
+                                 handle_level_irq);
         setup_irq(MIPS_CPU_GIC_IRQ, &gic_action);
 
         /* init of Timer interrupts */
-        for (i = PNX8550_INT_TIMER_MIN; i <= PNX8550_INT_TIMER_MAX; i++) {
-                irq_desc[i].chip = &level_irq_type;
-        }
+        for (i = PNX8550_INT_TIMER_MIN; i <= PNX8550_INT_TIMER_MAX; i++)
+                set_irq_chip_and_handler(i, &level_irq_type, handle_level_irq);
 
         /* Stop Timer 1-3 */
         configPR = read_c0_config7();
         configPR |= 0x00000038;
         write_c0_config7(configPR);
 
-        irq_desc[MIPS_CPU_TIMER_IRQ].chip = &level_irq_type;
+        set_irq_chip_and_handler(MIPS_CPU_TIMER_IRQ, &level_irq_type,
+                                 handle_level_irq);
         setup_irq(MIPS_CPU_TIMER_IRQ, &timer_action);
 }
 
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c
index 3cc0436db6cf..305491e74dbe 100644
--- a/arch/mips/pmc-sierra/yosemite/smp.c
+++ b/arch/mips/pmc-sierra/yosemite/smp.c
@@ -99,8 +99,6 @@ void prom_cpus_done(void)
  */
 void prom_init_secondary(void)
 {
-        mips_hpt_init();
-
         set_c0_status(ST0_CO | ST0_IE | ST0_IM);
 }
 
diff --git a/arch/mips/sgi-ip22/ip22-eisa.c b/arch/mips/sgi-ip22/ip22-eisa.c
index 0d18ed47c47a..a1a9af6da7bf 100644
--- a/arch/mips/sgi-ip22/ip22-eisa.c
+++ b/arch/mips/sgi-ip22/ip22-eisa.c
@@ -95,16 +95,11 @@ static irqreturn_t ip22_eisa_intr(int irq, void *dev_id)
 
 static void enable_eisa1_irq(unsigned int irq)
 {
-        unsigned long flags;
         u8 mask;
 
-        local_irq_save(flags);
-
         mask = inb(EISA_INT1_MASK);
         mask &= ~((u8) (1 << irq));
         outb(mask, EISA_INT1_MASK);
-
-        local_irq_restore(flags);
 }
 
 static unsigned int startup_eisa1_irq(unsigned int irq)
@@ -130,8 +125,6 @@ static void disable_eisa1_irq(unsigned int irq)
         outb(mask, EISA_INT1_MASK);
 }
 
-#define shutdown_eisa1_irq      disable_eisa1_irq
-
 static void mask_and_ack_eisa1_irq(unsigned int irq)
 {
         disable_eisa1_irq(irq);
@@ -148,25 +141,20 @@ static void end_eisa1_irq(unsigned int irq)
 static struct irq_chip ip22_eisa1_irq_type = {
         .typename       = "IP22 EISA",
         .startup        = startup_eisa1_irq,
-        .shutdown       = shutdown_eisa1_irq,
-        .enable         = enable_eisa1_irq,
-        .disable        = disable_eisa1_irq,
         .ack            = mask_and_ack_eisa1_irq,
+        .mask           = disable_eisa1_irq,
+        .mask_ack       = mask_and_ack_eisa1_irq,
+        .unmask         = enable_eisa1_irq,
         .end            = end_eisa1_irq,
 };
 
 static void enable_eisa2_irq(unsigned int irq)
 {
-        unsigned long flags;
         u8 mask;
 
-        local_irq_save(flags);
-
         mask = inb(EISA_INT2_MASK);
         mask &= ~((u8) (1 << (irq - 8)));
         outb(mask, EISA_INT2_MASK);
-
-        local_irq_restore(flags);
 }
 
 static unsigned int startup_eisa2_irq(unsigned int irq)
@@ -192,8 +180,6 @@ static void disable_eisa2_irq(unsigned int irq)
         outb(mask, EISA_INT2_MASK);
 }
 
-#define shutdown_eisa2_irq      disable_eisa2_irq
-
 static void mask_and_ack_eisa2_irq(unsigned int irq)
 {
         disable_eisa2_irq(irq);
@@ -210,10 +196,10 @@ static void end_eisa2_irq(unsigned int irq)
 static struct irq_chip ip22_eisa2_irq_type = {
         .typename       = "IP22 EISA",
         .startup        = startup_eisa2_irq,
-        .shutdown       = shutdown_eisa2_irq,
-        .enable         = enable_eisa2_irq,
-        .disable        = disable_eisa2_irq,
         .ack            = mask_and_ack_eisa2_irq,
+        .mask           = disable_eisa2_irq,
+        .mask_ack       = mask_and_ack_eisa2_irq,
+        .unmask         = enable_eisa2_irq,
         .end            = end_eisa2_irq,
 };
 
@@ -275,13 +261,10 @@ int __init ip22_eisa_init(void)
         outb(0, EISA_DMA2_WRITE_SINGLE);
 
         for (i = SGINT_EISA; i < (SGINT_EISA + EISA_MAX_IRQ); i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 1;
                 if (i < (SGINT_EISA + 8))
-                        irq_desc[i].chip = &ip22_eisa1_irq_type;
+                        set_irq_chip(i, &ip22_eisa1_irq_type);
                 else
-                        irq_desc[i].chip = &ip22_eisa2_irq_type;
+                        set_irq_chip(i, &ip22_eisa2_irq_type);
         }
 
         /* Cannot use request_irq because of kmalloc not being ready at such
diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c
index af518898eaa1..c7b138053159 100644
--- a/arch/mips/sgi-ip22/ip22-int.c
+++ b/arch/mips/sgi-ip22/ip22-int.c
@@ -40,34 +40,17 @@ extern int ip22_eisa_init(void);
 
 static void enable_local0_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         /* don't allow mappable interrupt to be enabled from setup_irq,
          * we have our own way to do so */
         if (irq != SGI_MAP_0_IRQ)
                 sgint->imask0 |= (1 << (irq - SGINT_LOCAL0));
-        local_irq_restore(flags);
-}
-
-static unsigned int startup_local0_irq(unsigned int irq)
-{
-        enable_local0_irq(irq);
-        return 0;               /* Never anything pending  */
 }
 
 static void disable_local0_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         sgint->imask0 &= ~(1 << (irq - SGINT_LOCAL0));
-        local_irq_restore(flags);
 }
 
-#define shutdown_local0_irq     disable_local0_irq
-#define mask_and_ack_local0_irq disable_local0_irq
-
 static void end_local0_irq (unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
@@ -76,44 +59,26 @@ static void end_local0_irq (unsigned int irq)
 
 static struct irq_chip ip22_local0_irq_type = {
         .typename       = "IP22 local 0",
-        .startup        = startup_local0_irq,
-        .shutdown       = shutdown_local0_irq,
-        .enable         = enable_local0_irq,
-        .disable        = disable_local0_irq,
-        .ack            = mask_and_ack_local0_irq,
+        .ack            = disable_local0_irq,
+        .mask           = disable_local0_irq,
+        .mask_ack       = disable_local0_irq,
+        .unmask         = enable_local0_irq,
         .end            = end_local0_irq,
 };
 
 static void enable_local1_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         /* don't allow mappable interrupt to be enabled from setup_irq,
          * we have our own way to do so */
         if (irq != SGI_MAP_1_IRQ)
                 sgint->imask1 |= (1 << (irq - SGINT_LOCAL1));
-        local_irq_restore(flags);
-}
-
-static unsigned int startup_local1_irq(unsigned int irq)
-{
-        enable_local1_irq(irq);
-        return 0;               /* Never anything pending  */
 }
 
 void disable_local1_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         sgint->imask1 &= ~(1 << (irq - SGINT_LOCAL1));
-        local_irq_restore(flags);
 }
 
-#define shutdown_local1_irq     disable_local1_irq
-#define mask_and_ack_local1_irq disable_local1_irq
-
 static void end_local1_irq (unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
@@ -122,44 +87,26 @@ static void end_local1_irq (unsigned int irq)
 
 static struct irq_chip ip22_local1_irq_type = {
         .typename       = "IP22 local 1",
-        .startup        = startup_local1_irq,
-        .shutdown       = shutdown_local1_irq,
-        .enable         = enable_local1_irq,
-        .disable        = disable_local1_irq,
-        .ack            = mask_and_ack_local1_irq,
+        .ack            = disable_local1_irq,
+        .mask           = disable_local1_irq,
+        .mask_ack       = disable_local1_irq,
+        .unmask         = enable_local1_irq,
         .end            = end_local1_irq,
 };
 
 static void enable_local2_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         sgint->imask0 |= (1 << (SGI_MAP_0_IRQ - SGINT_LOCAL0));
         sgint->cmeimask0 |= (1 << (irq - SGINT_LOCAL2));
-        local_irq_restore(flags);
-}
-
-static unsigned int startup_local2_irq(unsigned int irq)
-{
-        enable_local2_irq(irq);
-        return 0;               /* Never anything pending  */
 }
 
 void disable_local2_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         sgint->cmeimask0 &= ~(1 << (irq - SGINT_LOCAL2));
         if (!sgint->cmeimask0)
                 sgint->imask0 &= ~(1 << (SGI_MAP_0_IRQ - SGINT_LOCAL0));
-        local_irq_restore(flags);
 }
 
-#define shutdown_local2_irq disable_local2_irq
-#define mask_and_ack_local2_irq disable_local2_irq
-
 static void end_local2_irq (unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
@@ -168,44 +115,26 @@ static void end_local2_irq (unsigned int irq)
 
 static struct irq_chip ip22_local2_irq_type = {
         .typename       = "IP22 local 2",
-        .startup        = startup_local2_irq,
-        .shutdown       = shutdown_local2_irq,
-        .enable         = enable_local2_irq,
-        .disable        = disable_local2_irq,
-        .ack            = mask_and_ack_local2_irq,
+        .ack            = disable_local2_irq,
+        .mask           = disable_local2_irq,
+        .mask_ack       = disable_local2_irq,
+        .unmask         = enable_local2_irq,
         .end            = end_local2_irq,
 };
 
 static void enable_local3_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         sgint->imask1 |= (1 << (SGI_MAP_1_IRQ - SGINT_LOCAL1));
         sgint->cmeimask1 |= (1 << (irq - SGINT_LOCAL3));
-        local_irq_restore(flags);
-}
-
-static unsigned int startup_local3_irq(unsigned int irq)
-{
-        enable_local3_irq(irq);
-        return 0;               /* Never anything pending  */
 }
 
 void disable_local3_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         sgint->cmeimask1 &= ~(1 << (irq - SGINT_LOCAL3));
         if (!sgint->cmeimask1)
                 sgint->imask1 &= ~(1 << (SGI_MAP_1_IRQ - SGINT_LOCAL1));
-        local_irq_restore(flags);
 }
 
-#define shutdown_local3_irq disable_local3_irq
-#define mask_and_ack_local3_irq disable_local3_irq
-
 static void end_local3_irq (unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
@@ -214,11 +143,10 @@ static void end_local3_irq (unsigned int irq)
 
 static struct irq_chip ip22_local3_irq_type = {
         .typename       = "IP22 local 3",
-        .startup        = startup_local3_irq,
-        .shutdown       = shutdown_local3_irq,
-        .enable         = enable_local3_irq,
-        .disable        = disable_local3_irq,
-        .ack            = mask_and_ack_local3_irq,
+        .ack            = disable_local3_irq,
+        .mask           = disable_local3_irq,
+        .mask_ack       = disable_local3_irq,
+        .unmask         = enable_local3_irq,
         .end            = end_local3_irq,
 };
 
@@ -430,10 +358,7 @@ void __init arch_init_irq(void)
                 else
                         handler         = &ip22_local3_irq_type;
 
-                irq_desc[i].status      = IRQ_DISABLED;
-                irq_desc[i].action      = 0;
-                irq_desc[i].depth       = 1;
-                irq_desc[i].chip        = handler;
+                set_irq_chip_and_handler(i, handler, handle_level_irq);
         }
 
         /* vector handler. this register the IRQ as non-sharable */
diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c
index 270ecd3e6b4a..5f8835b4e84a 100644
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
@@ -332,11 +332,6 @@ static inline void disable_bridge_irq(unsigned int irq)
         intr_disconnect_level(cpu, swlevel);
 }
 
-static void mask_and_ack_bridge_irq(unsigned int irq)
-{
-        disable_bridge_irq(irq);
-}
-
 static void end_bridge_irq(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)) &&
@@ -348,18 +343,16 @@ static struct irq_chip bridge_irq_type = {
         .typename       = "bridge",
         .startup        = startup_bridge_irq,
         .shutdown       = shutdown_bridge_irq,
-        .enable         = enable_bridge_irq,
-        .disable        = disable_bridge_irq,
-        .ack            = mask_and_ack_bridge_irq,
+        .ack            = disable_bridge_irq,
+        .mask           = disable_bridge_irq,
+        .mask_ack       = disable_bridge_irq,
+        .unmask         = enable_bridge_irq,
         .end            = end_bridge_irq,
 };
 
 void __devinit register_bridge_irq(unsigned int irq)
 {
-        irq_desc[irq].status    = IRQ_DISABLED;
-        irq_desc[irq].action    = 0;
-        irq_desc[irq].depth     = 1;
-        irq_desc[irq].chip      = &bridge_irq_type;
+        set_irq_chip_and_handler(irq, &bridge_irq_type, handle_level_irq);
 }
 
 int __devinit request_bridge_irq(struct bridge_controller *bc)
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c
index 5e82a268e3c9..7d361726bbfb 100644
--- a/arch/mips/sgi-ip27/ip27-timer.c
+++ b/arch/mips/sgi-ip27/ip27-timer.c
@@ -172,15 +172,6 @@ static __init unsigned long get_m48t35_time(void)
         return mktime(year, month, date, hour, min, sec);
 }
 
-static unsigned int startup_rt_irq(unsigned int irq)
-{
-        return 0;
-}
-
-static void shutdown_rt_irq(unsigned int irq)
-{
-}
-
 static void enable_rt_irq(unsigned int irq)
 {
 }
@@ -189,21 +180,17 @@ static void disable_rt_irq(unsigned int irq)
 {
 }
 
-static void mask_and_ack_rt(unsigned int irq)
-{
-}
-
 static void end_rt_irq(unsigned int irq)
 {
 }
 
 static struct irq_chip rt_irq_type = {
         .typename       = "SN HUB RT timer",
-        .startup        = startup_rt_irq,
-        .shutdown       = shutdown_rt_irq,
-        .enable         = enable_rt_irq,
-        .disable        = disable_rt_irq,
-        .ack            = mask_and_ack_rt,
+        .ack            = disable_rt_irq,
+        .mask           = disable_rt_irq,
+        .mask_ack       = disable_rt_irq,
+        .unmask         = enable_rt_irq,
+        .eoi            = enable_rt_irq,
         .end            = end_rt_irq,
 };
 
@@ -221,10 +208,7 @@ void __init plat_timer_setup(struct irqaction *irq)
         if (irqno < 0)
                 panic("Can't allocate interrupt number for timer interrupt");
 
-        irq_desc[irqno].status  = IRQ_DISABLED;
-        irq_desc[irqno].action  = NULL;
-        irq_desc[irqno].depth   = 1;
-        irq_desc[irqno].chip    = &rt_irq_type;
+        set_irq_chip_and_handler(irqno, &rt_irq_type, handle_percpu_irq);
 
         /* over-write the handler, we use our own way */
         irq->handler = no_action;
@@ -239,14 +223,14 @@ void __init plat_timer_setup(struct irqaction *irq)
         setup_irq(irqno, &rt_irqaction);
 }
 
-static unsigned int ip27_hpt_read(void)
+static cycle_t ip27_hpt_read(void)
 {
         return REMOTE_HUB_L(cputonasid(0), PI_RT_COUNT);
 }
 
 void __init ip27_time_init(void)
 {
-        mips_hpt_read = ip27_hpt_read;
+        clocksource_mips.read = ip27_hpt_read;
         mips_hpt_frequency = CYCLES_PER_SEC;
         xtime.tv_sec = get_m48t35_time();
         xtime.tv_nsec = 0;
diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c
index c9acadd0846b..ae063864c026 100644
--- a/arch/mips/sgi-ip32/ip32-irq.c
+++ b/arch/mips/sgi-ip32/ip32-irq.c
@@ -113,12 +113,6 @@ static void inline flush_mace_bus(void)
  * is quite different anyway.
  */
 
-/*
- * IRQ spinlock - Ralf says not to disable CPU interrupts,
- * and I think he knows better.
- */
-static DEFINE_SPINLOCK(ip32_irq_lock);
-
 /* Some initial interrupts to set up */
 extern irqreturn_t crime_memerr_intr(int irq, void *dev_id);
 extern irqreturn_t crime_cpuerr_intr(int irq, void *dev_id);
@@ -138,12 +132,6 @@ static void enable_cpu_irq(unsigned int irq)
         set_c0_status(STATUSF_IP7);
 }
 
-static unsigned int startup_cpu_irq(unsigned int irq)
-{
-        enable_cpu_irq(irq);
-        return 0;
-}
-
 static void disable_cpu_irq(unsigned int irq)
 {
         clear_c0_status(STATUSF_IP7);
@@ -155,16 +143,12 @@ static void end_cpu_irq(unsigned int irq)
                 enable_cpu_irq (irq);
 }
 
-#define shutdown_cpu_irq disable_cpu_irq
-#define mask_and_ack_cpu_irq disable_cpu_irq
-
 static struct irq_chip ip32_cpu_interrupt = {
         .typename = "IP32 CPU",
-        .startup = startup_cpu_irq,
-        .shutdown = shutdown_cpu_irq,
-        .enable = enable_cpu_irq,
-        .disable = disable_cpu_irq,
-        .ack = mask_and_ack_cpu_irq,
+        .ack = disable_cpu_irq,
+        .mask = disable_cpu_irq,
+        .mask_ack = disable_cpu_irq,
+        .unmask = enable_cpu_irq,
         .end = end_cpu_irq,
 };
 
@@ -177,45 +161,27 @@ static uint64_t crime_mask;
 
 static void enable_crime_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&ip32_irq_lock, flags);
         crime_mask |= 1 << (irq - 1);
         crime->imask = crime_mask;
-        spin_unlock_irqrestore(&ip32_irq_lock, flags);
-}
-
-static unsigned int startup_crime_irq(unsigned int irq)
-{
-        enable_crime_irq(irq);
-        return 0; /* This is probably not right; we could have pending irqs */
 }
 
 static void disable_crime_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&ip32_irq_lock, flags);
         crime_mask &= ~(1 << (irq - 1));
         crime->imask = crime_mask;
         flush_crime_bus();
-        spin_unlock_irqrestore(&ip32_irq_lock, flags);
 }
 
 static void mask_and_ack_crime_irq(unsigned int irq)
 {
-        unsigned long flags;
-
         /* Edge triggered interrupts must be cleared. */
         if ((irq >= CRIME_GBE0_IRQ && irq <= CRIME_GBE3_IRQ)
             || (irq >= CRIME_RE_EMPTY_E_IRQ && irq <= CRIME_RE_IDLE_E_IRQ)
             || (irq >= CRIME_SOFT0_IRQ && irq <= CRIME_SOFT2_IRQ)) {
                 uint64_t crime_int;
-                spin_lock_irqsave(&ip32_irq_lock, flags);
                 crime_int = crime->hard_int;
                 crime_int &= ~(1 << (irq - 1));
                 crime->hard_int = crime_int;
-                spin_unlock_irqrestore(&ip32_irq_lock, flags);
         }
         disable_crime_irq(irq);
 }
@@ -226,15 +192,12 @@ static void end_crime_irq(unsigned int irq)
                 enable_crime_irq(irq);
 }
 
-#define shutdown_crime_irq disable_crime_irq
-
 static struct irq_chip ip32_crime_interrupt = {
         .typename = "IP32 CRIME",
-        .startup = startup_crime_irq,
-        .shutdown = shutdown_crime_irq,
-        .enable = enable_crime_irq,
-        .disable = disable_crime_irq,
         .ack = mask_and_ack_crime_irq,
+        .mask = disable_crime_irq,
+        .mask_ack = mask_and_ack_crime_irq,
+        .unmask = enable_crime_irq,
         .end = end_crime_irq,
 };
 
@@ -248,34 +211,20 @@ static unsigned long macepci_mask;
 
 static void enable_macepci_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&ip32_irq_lock, flags);
         macepci_mask |= MACEPCI_CONTROL_INT(irq - 9);
         mace->pci.control = macepci_mask;
         crime_mask |= 1 << (irq - 1);
         crime->imask = crime_mask;
-        spin_unlock_irqrestore(&ip32_irq_lock, flags);
-}
-
-static unsigned int startup_macepci_irq(unsigned int irq)
-{
-        enable_macepci_irq (irq);
-        return 0;
 }
 
 static void disable_macepci_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&ip32_irq_lock, flags);
         crime_mask &= ~(1 << (irq - 1));
         crime->imask = crime_mask;
         flush_crime_bus();
         macepci_mask &= ~MACEPCI_CONTROL_INT(irq - 9);
         mace->pci.control = macepci_mask;
         flush_mace_bus();
-        spin_unlock_irqrestore(&ip32_irq_lock, flags);
 }
 
 static void end_macepci_irq(unsigned int irq)
@@ -284,16 +233,12 @@ static void end_macepci_irq(unsigned int irq)
                 enable_macepci_irq(irq);
 }
 
-#define shutdown_macepci_irq disable_macepci_irq
-#define mask_and_ack_macepci_irq disable_macepci_irq
-
 static struct irq_chip ip32_macepci_interrupt = {
         .typename = "IP32 MACE PCI",
-        .startup = startup_macepci_irq,
-        .shutdown = shutdown_macepci_irq,
-        .enable = enable_macepci_irq,
-        .disable = disable_macepci_irq,
-        .ack = mask_and_ack_macepci_irq,
+        .ack = disable_macepci_irq,
+        .mask = disable_macepci_irq,
+        .mask_ack = disable_macepci_irq,
+        .unmask = enable_macepci_irq,
         .end = end_macepci_irq,
 };
 
@@ -339,7 +284,6 @@ static unsigned long maceisa_mask;
 static void enable_maceisa_irq (unsigned int irq)
 {
         unsigned int crime_int = 0;
-        unsigned long flags;
 
         DBG ("maceisa enable: %u\n", irq);
 
@@ -355,26 +299,16 @@ static void enable_maceisa_irq (unsigned int irq)
                 break;
         }
         DBG ("crime_int %08x enabled\n", crime_int);
-        spin_lock_irqsave(&ip32_irq_lock, flags);
         crime_mask |= crime_int;
         crime->imask = crime_mask;
         maceisa_mask |= 1 << (irq - 33);
         mace->perif.ctrl.imask = maceisa_mask;
-        spin_unlock_irqrestore(&ip32_irq_lock, flags);
-}
-
-static unsigned int startup_maceisa_irq(unsigned int irq)
-{
-        enable_maceisa_irq(irq);
-        return 0;
 }
 
 static void disable_maceisa_irq(unsigned int irq)
 {
         unsigned int crime_int = 0;
-        unsigned long flags;
 
-        spin_lock_irqsave(&ip32_irq_lock, flags);
         maceisa_mask &= ~(1 << (irq - 33));
         if(!(maceisa_mask & MACEISA_AUDIO_INT))
                 crime_int |= MACE_AUDIO_INT;
@@ -387,23 +321,20 @@ static void disable_maceisa_irq(unsigned int irq)
         flush_crime_bus();
         mace->perif.ctrl.imask = maceisa_mask;
         flush_mace_bus();
-        spin_unlock_irqrestore(&ip32_irq_lock, flags);
 }
 
 static void mask_and_ack_maceisa_irq(unsigned int irq)
 {
-        unsigned long mace_int, flags;
+        unsigned long mace_int;
 
         switch (irq) {
         case MACEISA_PARALLEL_IRQ:
         case MACEISA_SERIAL1_TDMAPR_IRQ:
         case MACEISA_SERIAL2_TDMAPR_IRQ:
                 /* edge triggered */
-                spin_lock_irqsave(&ip32_irq_lock, flags);
                 mace_int = mace->perif.ctrl.istat;
                 mace_int &= ~(1 << (irq - 33));
                 mace->perif.ctrl.istat = mace_int;
-                spin_unlock_irqrestore(&ip32_irq_lock, flags);
                 break;
         }
         disable_maceisa_irq(irq);
@@ -415,15 +346,12 @@ static void end_maceisa_irq(unsigned irq)
                 enable_maceisa_irq(irq);
 }
 
-#define shutdown_maceisa_irq disable_maceisa_irq
-
 static struct irq_chip ip32_maceisa_interrupt = {
         .typename = "IP32 MACE ISA",
-        .startup = startup_maceisa_irq,
-        .shutdown = shutdown_maceisa_irq,
-        .enable = enable_maceisa_irq,
-        .disable = disable_maceisa_irq,
         .ack = mask_and_ack_maceisa_irq,
+        .mask = disable_maceisa_irq,
+        .mask_ack = mask_and_ack_maceisa_irq,
+        .unmask = enable_maceisa_irq,
         .end = end_maceisa_irq,
 };
 
@@ -433,29 +361,15 @@ static struct irq_chip ip32_maceisa_interrupt = {
 
 static void enable_mace_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&ip32_irq_lock, flags);
         crime_mask |= 1 << (irq - 1);
         crime->imask = crime_mask;
-        spin_unlock_irqrestore(&ip32_irq_lock, flags);
-}
-
-static unsigned int startup_mace_irq(unsigned int irq)
-{
-        enable_mace_irq(irq);
-        return 0;
 }
 
 static void disable_mace_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&ip32_irq_lock, flags);
         crime_mask &= ~(1 << (irq - 1));
         crime->imask = crime_mask;
         flush_crime_bus();
-        spin_unlock_irqrestore(&ip32_irq_lock, flags);
 }
 
 static void end_mace_irq(unsigned int irq)
@@ -464,16 +378,12 @@ static void end_mace_irq(unsigned int irq)
                 enable_mace_irq(irq);
 }
 
-#define shutdown_mace_irq disable_mace_irq
-#define mask_and_ack_mace_irq disable_mace_irq
-
 static struct irq_chip ip32_mace_interrupt = {
         .typename = "IP32 MACE",
-        .startup = startup_mace_irq,
-        .shutdown = shutdown_mace_irq,
-        .enable = enable_mace_irq,
-        .disable = disable_mace_irq,
-        .ack = mask_and_ack_mace_irq,
+        .ack = disable_mace_irq,
+        .mask = disable_mace_irq,
+        .mask_ack = disable_mace_irq,
+        .unmask = enable_mace_irq,
         .end = end_mace_irq,
 };
 
@@ -586,10 +496,7 @@ void __init arch_init_irq(void)
                 else
                         controller = &ip32_maceisa_interrupt;
 
-                irq_desc[irq].status = IRQ_DISABLED;
-                irq_desc[irq].action = 0;
-                irq_desc[irq].depth = 0;
-                irq_desc[irq].chip = controller;
+                set_irq_chip(irq, controller);
         }
         setup_irq(CRIME_MEMERR_IRQ, &memerr_irq);
         setup_irq(CRIME_CPUERR_IRQ, &cpuerr_irq);
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index 8b1f41484923..2e8f6b2e2420 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -45,11 +45,9 @@
  */
 
 
-#define shutdown_bcm1480_irq    disable_bcm1480_irq
 static void end_bcm1480_irq(unsigned int irq);
 static void enable_bcm1480_irq(unsigned int irq);
 static void disable_bcm1480_irq(unsigned int irq);
-static unsigned int startup_bcm1480_irq(unsigned int irq);
 static void ack_bcm1480_irq(unsigned int irq);
 #ifdef CONFIG_SMP
 static void bcm1480_set_affinity(unsigned int irq, cpumask_t mask);
@@ -85,11 +83,10 @@ extern char sb1250_duart_present[];
 
 static struct irq_chip bcm1480_irq_type = {
         .typename = "BCM1480-IMR",
-        .startup = startup_bcm1480_irq,
-        .shutdown = shutdown_bcm1480_irq,
-        .enable = enable_bcm1480_irq,
-        .disable = disable_bcm1480_irq,
         .ack = ack_bcm1480_irq,
+        .mask = disable_bcm1480_irq,
+        .mask_ack = ack_bcm1480_irq,
+        .unmask = enable_bcm1480_irq,
         .end = end_bcm1480_irq,
 #ifdef CONFIG_SMP
         .set_affinity = bcm1480_set_affinity
@@ -188,14 +185,6 @@ static void bcm1480_set_affinity(unsigned int irq, cpumask_t mask)
 
 /*****************************************************************************/
 
-static unsigned int startup_bcm1480_irq(unsigned int irq)
-{
-        bcm1480_unmask_irq(bcm1480_irq_owner[irq], irq);
-
-        return 0;               /* never anything pending */
-}
-
-
 static void disable_bcm1480_irq(unsigned int irq)
 {
         bcm1480_mask_irq(bcm1480_irq_owner[irq], irq);
@@ -270,16 +259,9 @@ void __init init_bcm1480_irqs(void)
 {
         int i;
 
-        for (i = 0; i < NR_IRQS; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 1;
-                if (i < BCM1480_NR_IRQS) {
-                        irq_desc[i].chip = &bcm1480_irq_type;
-                        bcm1480_irq_owner[i] = 0;
-                } else {
-                        irq_desc[i].chip = &no_irq_chip;
-                }
+        for (i = 0; i < BCM1480_NR_IRQS; i++) {
+                set_irq_chip(i, &bcm1480_irq_type);
+                bcm1480_irq_owner[i] = 0;
         }
 }
 
diff --git a/arch/mips/sibyte/bcm1480/time.c b/arch/mips/sibyte/bcm1480/time.c
index e136bde5248e..6f3f71bf4244 100644
--- a/arch/mips/sibyte/bcm1480/time.c
+++ b/arch/mips/sibyte/bcm1480/time.c
@@ -94,8 +94,6 @@ void bcm1480_time_init(void)
          */
 }
 
-#include <asm/sibyte/sb1250.h>
-
 void bcm1480_timer_interrupt(void)
 {
         int cpu = smp_processor_id();
@@ -119,7 +117,7 @@ void bcm1480_timer_interrupt(void)
         }
 }
 
-static unsigned int bcm1480_hpt_read(void)
+static cycle_t bcm1480_hpt_read(void)
 {
         /* We assume this function is called xtime_lock held. */
         unsigned long count =
@@ -129,6 +127,6 @@ static unsigned int bcm1480_hpt_read(void)
 
 void __init bcm1480_hpt_setup(void)
 {
-        mips_hpt_read = bcm1480_hpt_read;
+        clocksource_mips.read = bcm1480_hpt_read;
         mips_hpt_frequency = BCM1480_HPT_VALUE;
 }
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index d5d26770daf6..82ce7533053f 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -44,11 +44,9 @@
  */
 
 
-#define shutdown_sb1250_irq     disable_sb1250_irq
 static void end_sb1250_irq(unsigned int irq);
 static void enable_sb1250_irq(unsigned int irq);
 static void disable_sb1250_irq(unsigned int irq);
-static unsigned int startup_sb1250_irq(unsigned int irq);
 static void ack_sb1250_irq(unsigned int irq);
 #ifdef CONFIG_SMP
 static void sb1250_set_affinity(unsigned int irq, cpumask_t mask);
@@ -70,11 +68,10 @@ extern char sb1250_duart_present[];
 
 static struct irq_chip sb1250_irq_type = {
         .typename = "SB1250-IMR",
-        .startup = startup_sb1250_irq,
-        .shutdown = shutdown_sb1250_irq,
-        .enable = enable_sb1250_irq,
-        .disable = disable_sb1250_irq,
         .ack = ack_sb1250_irq,
+        .mask = disable_sb1250_irq,
+        .mask_ack = ack_sb1250_irq,
+        .unmask = enable_sb1250_irq,
         .end = end_sb1250_irq,
 #ifdef CONFIG_SMP
         .set_affinity = sb1250_set_affinity
@@ -163,14 +160,6 @@ static void sb1250_set_affinity(unsigned int irq, cpumask_t mask)
 
 /*****************************************************************************/
 
-static unsigned int startup_sb1250_irq(unsigned int irq)
-{
-        sb1250_unmask_irq(sb1250_irq_owner[irq], irq);
-
-        return 0;               /* never anything pending */
-}
-
-
 static void disable_sb1250_irq(unsigned int irq)
 {
         sb1250_mask_irq(sb1250_irq_owner[irq], irq);
@@ -239,16 +228,9 @@ void __init init_sb1250_irqs(void)
 {
         int i;
 
-        for (i = 0; i < NR_IRQS; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 1;
-                if (i < SB1250_NR_IRQS) {
-                        irq_desc[i].chip = &sb1250_irq_type;
-                        sb1250_irq_owner[i] = 0;
-                } else {
-                        irq_desc[i].chip = &no_irq_chip;
-                }
+        for (i = 0; i < SB1250_NR_IRQS; i++) {
+                set_irq_chip(i, &sb1250_irq_type);
+                sb1250_irq_owner[i] = 0;
         }
 }
 
diff --git a/arch/mips/sibyte/sb1250/time.c b/arch/mips/sibyte/sb1250/time.c
index bcb74f2c1948..2efffe15ff23 100644
--- a/arch/mips/sibyte/sb1250/time.c
+++ b/arch/mips/sibyte/sb1250/time.c
@@ -51,7 +51,7 @@
 
 extern int sb1250_steal_irq(int irq);
 
-static unsigned int sb1250_hpt_read(void);
+static cycle_t sb1250_hpt_read(void);
 
 void __init sb1250_hpt_setup(void)
 {
@@ -66,8 +66,8 @@ void __init sb1250_hpt_setup(void)
                              IOADDR(A_SCD_TIMER_REGISTER(SB1250_HPT_NUM, R_SCD_TIMER_CFG)));
 
                 mips_hpt_frequency = V_SCD_TIMER_FREQ;
-                mips_hpt_read = sb1250_hpt_read;
-                mips_hpt_mask = M_SCD_TIMER_INIT;
+                clocksource_mips.read = sb1250_hpt_read;
+                clocksource_mips.mask = M_SCD_TIMER_INIT;
         }
 }
 
@@ -143,7 +143,7 @@ void sb1250_timer_interrupt(void)
  * The HPT is free running from SB1250_HPT_VALUE down to 0 then starts over
  * again.
  */
-static unsigned int sb1250_hpt_read(void)
+static cycle_t sb1250_hpt_read(void)
 {
         unsigned int count;
 
diff --git a/arch/mips/sni/irq.c b/arch/mips/sni/irq.c
index 48fb74a7aaec..8511bcc6d99d 100644
--- a/arch/mips/sni/irq.c
+++ b/arch/mips/sni/irq.c
@@ -11,44 +11,25 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/kernel.h>
-#include <linux/spinlock.h>
 
 #include <asm/i8259.h>
 #include <asm/io.h>
 #include <asm/sni.h>
 
-DEFINE_SPINLOCK(pciasic_lock);
-
 static void enable_pciasic_irq(unsigned int irq)
 {
         unsigned int mask = 1 << (irq - PCIMT_IRQ_INT2);
-        unsigned long flags;
 
-        spin_lock_irqsave(&pciasic_lock, flags);
         *(volatile u8 *) PCIMT_IRQSEL |= mask;
-        spin_unlock_irqrestore(&pciasic_lock, flags);
-}
-
-static unsigned int startup_pciasic_irq(unsigned int irq)
-{
-        enable_pciasic_irq(irq);
-        return 0; /* never anything pending */
 }
 
-#define shutdown_pciasic_irq    disable_pciasic_irq
-
 void disable_pciasic_irq(unsigned int irq)
 {
         unsigned int mask = ~(1 << (irq - PCIMT_IRQ_INT2));
-        unsigned long flags;
 
-        spin_lock_irqsave(&pciasic_lock, flags);
         *(volatile u8 *) PCIMT_IRQSEL &= mask;
-        spin_unlock_irqrestore(&pciasic_lock, flags);
 }
 
-#define mask_and_ack_pciasic_irq disable_pciasic_irq
-
 static void end_pciasic_irq(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
@@ -57,11 +38,10 @@ static void end_pciasic_irq(unsigned int irq)
 
 static struct irq_chip pciasic_irq_type = {
         .typename = "ASIC-PCI",
-        .startup = startup_pciasic_irq,
-        .shutdown = shutdown_pciasic_irq,
-        .enable = enable_pciasic_irq,
-        .disable = disable_pciasic_irq,
-        .ack = mask_and_ack_pciasic_irq,
+        .ack = disable_pciasic_irq,
+        .mask = disable_pciasic_irq,
+        .mask_ack = disable_pciasic_irq,
+        .unmask = enable_pciasic_irq,
         .end = end_pciasic_irq,
 };
 
@@ -178,12 +158,8 @@ asmlinkage void plat_irq_dispatch(void)
 
 void __init init_pciasic(void)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&pciasic_lock, flags);
         * (volatile u8 *) PCIMT_IRQSEL =
                 IT_EISA | IT_INTA | IT_INTB | IT_INTC | IT_INTD;
-        spin_unlock_irqrestore(&pciasic_lock, flags);
 }
 
 /*
@@ -199,12 +175,8 @@ void __init arch_init_irq(void)
         init_pciasic();
 
         /* Actually we've got more interrupts to handle ...  */
-        for (i = PCIMT_IRQ_INT2; i <= PCIMT_IRQ_ETHERNET; i++) {
-                irq_desc[i].status     = IRQ_DISABLED;
-                irq_desc[i].action     = 0;
-                irq_desc[i].depth      = 1;
-                irq_desc[i].chip    = &pciasic_irq_type;
-        }
+        for (i = PCIMT_IRQ_INT2; i <= PCIMT_IRQ_ETHERNET; i++)
+                set_irq_chip(i, &pciasic_irq_type);
 
         change_c0_status(ST0_IM, IE_IRQ1|IE_IRQ2|IE_IRQ3|IE_IRQ4);
 }
diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/tx4927/common/tx4927_irq.c
index 8266a88a3f88..21873de49aa8 100644
--- a/arch/mips/tx4927/common/tx4927_irq.c
+++ b/arch/mips/tx4927/common/tx4927_irq.c
@@ -64,19 +64,13 @@
 #define TX4927_IRQ_NEST4       ( 1 <<  9 )
 
 #define TX4927_IRQ_CP0_INIT     ( 1 << 10 )
-#define TX4927_IRQ_CP0_STARTUP  ( 1 << 11 )
-#define TX4927_IRQ_CP0_SHUTDOWN ( 1 << 12 )
 #define TX4927_IRQ_CP0_ENABLE   ( 1 << 13 )
 #define TX4927_IRQ_CP0_DISABLE  ( 1 << 14 )
-#define TX4927_IRQ_CP0_MASK     ( 1 << 15 )
 #define TX4927_IRQ_CP0_ENDIRQ   ( 1 << 16 )
 
 #define TX4927_IRQ_PIC_INIT     ( 1 << 20 )
-#define TX4927_IRQ_PIC_STARTUP  ( 1 << 21 )
-#define TX4927_IRQ_PIC_SHUTDOWN ( 1 << 22 )
 #define TX4927_IRQ_PIC_ENABLE   ( 1 << 23 )
 #define TX4927_IRQ_PIC_DISABLE  ( 1 << 24 )
-#define TX4927_IRQ_PIC_MASK     ( 1 << 25 )
 #define TX4927_IRQ_PIC_ENDIRQ   ( 1 << 26 )
 
 #define TX4927_IRQ_ALL         0xffffffff
@@ -87,18 +81,12 @@ static const u32 tx4927_irq_debug_flag = (TX4927_IRQ_NONE
                                           | TX4927_IRQ_INFO
                                           | TX4927_IRQ_WARN | TX4927_IRQ_EROR
 //                                       | TX4927_IRQ_CP0_INIT
-//                                       | TX4927_IRQ_CP0_STARTUP
-//                                       | TX4927_IRQ_CP0_SHUTDOWN
 //                                       | TX4927_IRQ_CP0_ENABLE
 //                                       | TX4927_IRQ_CP0_DISABLE
-//                                       | TX4927_IRQ_CP0_MASK
 //                                       | TX4927_IRQ_CP0_ENDIRQ
 //                                       | TX4927_IRQ_PIC_INIT
-//                                       | TX4927_IRQ_PIC_STARTUP
-//                                       | TX4927_IRQ_PIC_SHUTDOWN
 //                                       | TX4927_IRQ_PIC_ENABLE
 //                                       | TX4927_IRQ_PIC_DISABLE
-//                                       | TX4927_IRQ_PIC_MASK
 //                                       | TX4927_IRQ_PIC_ENDIRQ
 //                                       | TX4927_IRQ_INIT
 //                                       | TX4927_IRQ_NEST1
@@ -124,49 +112,36 @@ static const u32 tx4927_irq_debug_flag = (TX4927_IRQ_NONE
  * Forwad definitions for all pic's
  */
 
-static unsigned int tx4927_irq_cp0_startup(unsigned int irq);
-static void tx4927_irq_cp0_shutdown(unsigned int irq);
 static void tx4927_irq_cp0_enable(unsigned int irq);
 static void tx4927_irq_cp0_disable(unsigned int irq);
-static void tx4927_irq_cp0_mask_and_ack(unsigned int irq);
 static void tx4927_irq_cp0_end(unsigned int irq);
 
-static unsigned int tx4927_irq_pic_startup(unsigned int irq);
-static void tx4927_irq_pic_shutdown(unsigned int irq);
 static void tx4927_irq_pic_enable(unsigned int irq);
 static void tx4927_irq_pic_disable(unsigned int irq);
-static void tx4927_irq_pic_mask_and_ack(unsigned int irq);
 static void tx4927_irq_pic_end(unsigned int irq);
 
 /*
  * Kernel structs for all pic's
  */
 
-static DEFINE_SPINLOCK(tx4927_cp0_lock);
-static DEFINE_SPINLOCK(tx4927_pic_lock);
-
 #define TX4927_CP0_NAME "TX4927-CP0"
 static struct irq_chip tx4927_irq_cp0_type = {
         .typename       = TX4927_CP0_NAME,
-        .startup        = tx4927_irq_cp0_startup,
-        .shutdown       = tx4927_irq_cp0_shutdown,
-        .enable         = tx4927_irq_cp0_enable,
-        .disable        = tx4927_irq_cp0_disable,
-        .ack            = tx4927_irq_cp0_mask_and_ack,
+        .ack            = tx4927_irq_cp0_disable,
+        .mask           = tx4927_irq_cp0_disable,
+        .mask_ack       = tx4927_irq_cp0_disable,
+        .unmask         = tx4927_irq_cp0_enable,
         .end            = tx4927_irq_cp0_end,
-        .set_affinity   = NULL
 };
 
 #define TX4927_PIC_NAME "TX4927-PIC"
 static struct irq_chip tx4927_irq_pic_type = {
         .typename       = TX4927_PIC_NAME,
-        .startup        = tx4927_irq_pic_startup,
-        .shutdown       = tx4927_irq_pic_shutdown,
-        .enable         = tx4927_irq_pic_enable,
-        .disable        = tx4927_irq_pic_disable,
-        .ack            = tx4927_irq_pic_mask_and_ack,
+        .ack            = tx4927_irq_pic_disable,
+        .mask           = tx4927_irq_pic_disable,
+        .mask_ack       = tx4927_irq_pic_disable,
+        .unmask         = tx4927_irq_pic_enable,
         .end            = tx4927_irq_pic_end,
-        .set_affinity   = NULL
 };
 
 #define TX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL }
@@ -211,8 +186,6 @@ tx4927_irq_cp0_modify(unsigned cp0_reg, unsigned clr_bits, unsigned set_bits)
                         break;
                 }
         }
-
-        return;
 }
 
 static void __init tx4927_irq_cp0_init(void)
@@ -222,71 +195,23 @@ static void __init tx4927_irq_cp0_init(void)
         TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_INIT, "beg=%d end=%d\n",
                            TX4927_IRQ_CP0_BEG, TX4927_IRQ_CP0_END);
 
-        for (i = TX4927_IRQ_CP0_BEG; i <= TX4927_IRQ_CP0_END; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 1;
-                irq_desc[i].chip = &tx4927_irq_cp0_type;
-        }
-
-        return;
-}
-
-static unsigned int tx4927_irq_cp0_startup(unsigned int irq)
-{
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_STARTUP, "irq=%d \n", irq);
-
-        tx4927_irq_cp0_enable(irq);
-
-        return (0);
-}
-
-static void tx4927_irq_cp0_shutdown(unsigned int irq)
-{
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_SHUTDOWN, "irq=%d \n", irq);
-
-        tx4927_irq_cp0_disable(irq);
-
-        return;
+        for (i = TX4927_IRQ_CP0_BEG; i <= TX4927_IRQ_CP0_END; i++)
+                set_irq_chip_and_handler(i, &tx4927_irq_cp0_type,
+                                         handle_level_irq);
 }
 
 static void tx4927_irq_cp0_enable(unsigned int irq)
 {
-        unsigned long flags;
-
         TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_ENABLE, "irq=%d \n", irq);
 
-        spin_lock_irqsave(&tx4927_cp0_lock, flags);
-
         tx4927_irq_cp0_modify(CCP0_STATUS, 0, tx4927_irq_cp0_mask(irq));
-
-        spin_unlock_irqrestore(&tx4927_cp0_lock, flags);
-
-        return;
 }
 
 static void tx4927_irq_cp0_disable(unsigned int irq)
 {
-        unsigned long flags;
-
         TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_DISABLE, "irq=%d \n", irq);
 
-        spin_lock_irqsave(&tx4927_cp0_lock, flags);
-
         tx4927_irq_cp0_modify(CCP0_STATUS, tx4927_irq_cp0_mask(irq), 0);
-
-        spin_unlock_irqrestore(&tx4927_cp0_lock, flags);
-
-        return;
-}
-
-static void tx4927_irq_cp0_mask_and_ack(unsigned int irq)
-{
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_MASK, "irq=%d \n", irq);
-
-        tx4927_irq_cp0_disable(irq);
-
-        return;
 }
 
 static void tx4927_irq_cp0_end(unsigned int irq)
@@ -296,8 +221,6 @@ static void tx4927_irq_cp0_end(unsigned int irq)
         if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
                 tx4927_irq_cp0_enable(irq);
         }
-
-        return;
 }
 
 /*
@@ -418,94 +341,39 @@ static void tx4927_irq_pic_modify(unsigned pic_reg, unsigned clr_bits,
         val &= (~clr_bits);
         val |= (set_bits);
         TX4927_WR(pic_reg, val);
-
-        return;
 }
 
 static void __init tx4927_irq_pic_init(void)
 {
-        unsigned long flags;
         int i;
 
         TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_INIT, "beg=%d end=%d\n",
                            TX4927_IRQ_PIC_BEG, TX4927_IRQ_PIC_END);
 
-        for (i = TX4927_IRQ_PIC_BEG; i <= TX4927_IRQ_PIC_END; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 2;
-                irq_desc[i].chip = &tx4927_irq_pic_type;
-        }
+        for (i = TX4927_IRQ_PIC_BEG; i <= TX4927_IRQ_PIC_END; i++)
+                set_irq_chip_and_handler(i, &tx4927_irq_pic_type,
+                                         handle_level_irq);
 
         setup_irq(TX4927_IRQ_NEST_PIC_ON_CP0, &tx4927_irq_pic_action);
 
-        spin_lock_irqsave(&tx4927_pic_lock, flags);
-
         TX4927_WR(0xff1ff640, 0x6);     /* irq level mask -- only accept hightest */
         TX4927_WR(0xff1ff600, TX4927_RD(0xff1ff600) | 0x1);     /* irq enable */
-
-        spin_unlock_irqrestore(&tx4927_pic_lock, flags);
-
-        return;
-}
-
-static unsigned int tx4927_irq_pic_startup(unsigned int irq)
-{
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_STARTUP, "irq=%d\n", irq);
-
-        tx4927_irq_pic_enable(irq);
-
-        return (0);
-}
-
-static void tx4927_irq_pic_shutdown(unsigned int irq)
-{
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_SHUTDOWN, "irq=%d\n", irq);
-
-        tx4927_irq_pic_disable(irq);
-
-        return;
 }
 
 static void tx4927_irq_pic_enable(unsigned int irq)
 {
-        unsigned long flags;
-
         TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_ENABLE, "irq=%d\n", irq);
 
-        spin_lock_irqsave(&tx4927_pic_lock, flags);
-
         tx4927_irq_pic_modify(tx4927_irq_pic_addr(irq), 0,
                               tx4927_irq_pic_mask(irq));
-
-        spin_unlock_irqrestore(&tx4927_pic_lock, flags);
-
-        return;
 }
 
 static void tx4927_irq_pic_disable(unsigned int irq)
 {
-        unsigned long flags;
-
         TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_DISABLE, "irq=%d\n", irq);
 
-        spin_lock_irqsave(&tx4927_pic_lock, flags);
-
         tx4927_irq_pic_modify(tx4927_irq_pic_addr(irq),
                               tx4927_irq_pic_mask(irq), 0);
-
-        spin_unlock_irqrestore(&tx4927_pic_lock, flags);
-
-        return;
-}
-
-static void tx4927_irq_pic_mask_and_ack(unsigned int irq)
-{
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_MASK, "irq=%d\n", irq);
-
-        tx4927_irq_pic_disable(irq);
-
-        return;
 }
 
 static void tx4927_irq_pic_end(unsigned int irq)
@@ -515,8 +383,6 @@ static void tx4927_irq_pic_end(unsigned int irq)
         if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
                 tx4927_irq_pic_enable(irq);
         }
-
-        return;
 }
 
 /*
@@ -533,8 +399,6 @@ void __init tx4927_irq_init(void)
         tx4927_irq_pic_init();
 
         TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "+\n");
-
-        return;
 }
 
 static int tx4927_irq_nested(void)
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
index 0c3c3f668230..34cdb2a240e9 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
@@ -151,16 +151,11 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
 #define TOSHIBA_RBTX4927_IRQ_EROR          ( 1 <<  2 )
 
 #define TOSHIBA_RBTX4927_IRQ_IOC_INIT      ( 1 << 10 )
-#define TOSHIBA_RBTX4927_IRQ_IOC_STARTUP   ( 1 << 11 )
-#define TOSHIBA_RBTX4927_IRQ_IOC_SHUTDOWN  ( 1 << 12 )
 #define TOSHIBA_RBTX4927_IRQ_IOC_ENABLE    ( 1 << 13 )
 #define TOSHIBA_RBTX4927_IRQ_IOC_DISABLE   ( 1 << 14 )
-#define TOSHIBA_RBTX4927_IRQ_IOC_MASK      ( 1 << 15 )
 #define TOSHIBA_RBTX4927_IRQ_IOC_ENDIRQ    ( 1 << 16 )
 
 #define TOSHIBA_RBTX4927_IRQ_ISA_INIT      ( 1 << 20 )
-#define TOSHIBA_RBTX4927_IRQ_ISA_STARTUP   ( 1 << 21 )
-#define TOSHIBA_RBTX4927_IRQ_ISA_SHUTDOWN  ( 1 << 22 )
 #define TOSHIBA_RBTX4927_IRQ_ISA_ENABLE    ( 1 << 23 )
 #define TOSHIBA_RBTX4927_IRQ_ISA_DISABLE   ( 1 << 24 )
 #define TOSHIBA_RBTX4927_IRQ_ISA_MASK      ( 1 << 25 )
@@ -175,15 +170,10 @@ static const u32 toshiba_rbtx4927_irq_debug_flag =
     (TOSHIBA_RBTX4927_IRQ_NONE | TOSHIBA_RBTX4927_IRQ_INFO |
      TOSHIBA_RBTX4927_IRQ_WARN | TOSHIBA_RBTX4927_IRQ_EROR
 //                                                 | TOSHIBA_RBTX4927_IRQ_IOC_INIT
-//                                                 | TOSHIBA_RBTX4927_IRQ_IOC_STARTUP
-//                                                 | TOSHIBA_RBTX4927_IRQ_IOC_SHUTDOWN
 //                                                 | TOSHIBA_RBTX4927_IRQ_IOC_ENABLE
 //                                                 | TOSHIBA_RBTX4927_IRQ_IOC_DISABLE
-//                                                 | TOSHIBA_RBTX4927_IRQ_IOC_MASK
 //                                                 | TOSHIBA_RBTX4927_IRQ_IOC_ENDIRQ
 //                                                 | TOSHIBA_RBTX4927_IRQ_ISA_INIT
-//                                                 | TOSHIBA_RBTX4927_IRQ_ISA_STARTUP
-//                                                 | TOSHIBA_RBTX4927_IRQ_ISA_SHUTDOWN
 //                                                 | TOSHIBA_RBTX4927_IRQ_ISA_ENABLE
 //                                                 | TOSHIBA_RBTX4927_IRQ_ISA_DISABLE
 //                                                 | TOSHIBA_RBTX4927_IRQ_ISA_MASK
@@ -231,35 +221,25 @@ extern void disable_8259A_irq(unsigned int irq);
 extern void mask_and_ack_8259A(unsigned int irq);
 #endif
 
-static unsigned int toshiba_rbtx4927_irq_ioc_startup(unsigned int irq);
-static void toshiba_rbtx4927_irq_ioc_shutdown(unsigned int irq);
 static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq);
 static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq);
-static void toshiba_rbtx4927_irq_ioc_mask_and_ack(unsigned int irq);
 static void toshiba_rbtx4927_irq_ioc_end(unsigned int irq);
 
 #ifdef CONFIG_TOSHIBA_FPCIB0
-static unsigned int toshiba_rbtx4927_irq_isa_startup(unsigned int irq);
-static void toshiba_rbtx4927_irq_isa_shutdown(unsigned int irq);
 static void toshiba_rbtx4927_irq_isa_enable(unsigned int irq);
 static void toshiba_rbtx4927_irq_isa_disable(unsigned int irq);
 static void toshiba_rbtx4927_irq_isa_mask_and_ack(unsigned int irq);
 static void toshiba_rbtx4927_irq_isa_end(unsigned int irq);
 #endif
 
-static DEFINE_SPINLOCK(toshiba_rbtx4927_ioc_lock);
-
-
 #define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC"
 static struct irq_chip toshiba_rbtx4927_irq_ioc_type = {
         .typename = TOSHIBA_RBTX4927_IOC_NAME,
-        .startup = toshiba_rbtx4927_irq_ioc_startup,
-        .shutdown = toshiba_rbtx4927_irq_ioc_shutdown,
-        .enable = toshiba_rbtx4927_irq_ioc_enable,
-        .disable = toshiba_rbtx4927_irq_ioc_disable,
-        .ack = toshiba_rbtx4927_irq_ioc_mask_and_ack,
+        .ack = toshiba_rbtx4927_irq_ioc_disable,
+        .mask = toshiba_rbtx4927_irq_ioc_disable,
+        .mask_ack = toshiba_rbtx4927_irq_ioc_disable,
+        .unmask = toshiba_rbtx4927_irq_ioc_enable,
         .end = toshiba_rbtx4927_irq_ioc_end,
-        .set_affinity = NULL
 };
 #define TOSHIBA_RBTX4927_IOC_INTR_ENAB 0xbc002000
 #define TOSHIBA_RBTX4927_IOC_INTR_STAT 0xbc002006
@@ -269,13 +249,11 @@ static struct irq_chip toshiba_rbtx4927_irq_ioc_type = {
 #define TOSHIBA_RBTX4927_ISA_NAME "RBTX4927-ISA"
 static struct irq_chip toshiba_rbtx4927_irq_isa_type = {
         .typename = TOSHIBA_RBTX4927_ISA_NAME,
-        .startup = toshiba_rbtx4927_irq_isa_startup,
-        .shutdown = toshiba_rbtx4927_irq_isa_shutdown,
-        .enable = toshiba_rbtx4927_irq_isa_enable,
-        .disable = toshiba_rbtx4927_irq_isa_disable,
         .ack = toshiba_rbtx4927_irq_isa_mask_and_ack,
+        .mask = toshiba_rbtx4927_irq_isa_disable,
+        .mask_ack = toshiba_rbtx4927_irq_isa_mask_and_ack,
+        .unmask = toshiba_rbtx4927_irq_isa_enable,
         .end = toshiba_rbtx4927_irq_isa_end,
-        .set_affinity = NULL
 };
 #endif
 
@@ -363,58 +341,16 @@ static void __init toshiba_rbtx4927_irq_ioc_init(void)
                                      TOSHIBA_RBTX4927_IRQ_IOC_END);
 
         for (i = TOSHIBA_RBTX4927_IRQ_IOC_BEG;
-             i <= TOSHIBA_RBTX4927_IRQ_IOC_END; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 3;
-                irq_desc[i].chip = &toshiba_rbtx4927_irq_ioc_type;
-        }
+             i <= TOSHIBA_RBTX4927_IRQ_IOC_END; i++)
+                set_irq_chip_and_handler(i, &toshiba_rbtx4927_irq_ioc_type,
+                                         handle_level_irq);
 
         setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_IOC_ON_PIC,
                   &toshiba_rbtx4927_irq_ioc_action);
-
-        return;
 }
 
-static unsigned int toshiba_rbtx4927_irq_ioc_startup(unsigned int irq)
-{
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_IOC_STARTUP,
-                                     "irq=%d\n", irq);
-
-        if (irq < TOSHIBA_RBTX4927_IRQ_IOC_BEG
-            || irq > TOSHIBA_RBTX4927_IRQ_IOC_END) {
-                TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,
-                                             "bad irq=%d\n", irq);
-                panic("\n");
-        }
-
-        toshiba_rbtx4927_irq_ioc_enable(irq);
-
-        return (0);
-}
-
-
-static void toshiba_rbtx4927_irq_ioc_shutdown(unsigned int irq)
-{
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_IOC_SHUTDOWN,
-                                     "irq=%d\n", irq);
-
-        if (irq < TOSHIBA_RBTX4927_IRQ_IOC_BEG
-            || irq > TOSHIBA_RBTX4927_IRQ_IOC_END) {
-                TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,
-                                             "bad irq=%d\n", irq);
-                panic("\n");
-        }
-
-        toshiba_rbtx4927_irq_ioc_disable(irq);
-
-        return;
-}
-
-
 static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq)
 {
-        unsigned long flags;
         volatile unsigned char v;
 
         TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_IOC_ENABLE,
@@ -427,21 +363,14 @@ static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq)
                 panic("\n");
         }
 
-        spin_lock_irqsave(&toshiba_rbtx4927_ioc_lock, flags);
-
         v = TX4927_RD08(TOSHIBA_RBTX4927_IOC_INTR_ENAB);
         v |= (1 << (irq - TOSHIBA_RBTX4927_IRQ_IOC_BEG));
         TOSHIBA_RBTX4927_WR08(TOSHIBA_RBTX4927_IOC_INTR_ENAB, v);
-
-        spin_unlock_irqrestore(&toshiba_rbtx4927_ioc_lock, flags);
-
-        return;
 }
 
 
 static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq)
 {
-        unsigned long flags;
         volatile unsigned char v;
 
         TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_IOC_DISABLE,
@@ -454,36 +383,11 @@ static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq)
                 panic("\n");
         }
 
-        spin_lock_irqsave(&toshiba_rbtx4927_ioc_lock, flags);
-
         v = TX4927_RD08(TOSHIBA_RBTX4927_IOC_INTR_ENAB);
         v &= ~(1 << (irq - TOSHIBA_RBTX4927_IRQ_IOC_BEG));
         TOSHIBA_RBTX4927_WR08(TOSHIBA_RBTX4927_IOC_INTR_ENAB, v);
-
-        spin_unlock_irqrestore(&toshiba_rbtx4927_ioc_lock, flags);
-
-        return;
 }
 
-
-static void toshiba_rbtx4927_irq_ioc_mask_and_ack(unsigned int irq)
-{
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_IOC_MASK,
-                                     "irq=%d\n", irq);
-
-        if (irq < TOSHIBA_RBTX4927_IRQ_IOC_BEG
-            || irq > TOSHIBA_RBTX4927_IRQ_IOC_END) {
-                TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,
-                                             "bad irq=%d\n", irq);
-                panic("\n");
-        }
-
-        toshiba_rbtx4927_irq_ioc_disable(irq);
-
-        return;
-}
-
-
 static void toshiba_rbtx4927_irq_ioc_end(unsigned int irq)
 {
         TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_IOC_ENDIRQ,
@@ -499,8 +403,6 @@ static void toshiba_rbtx4927_irq_ioc_end(unsigned int irq)
         if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
                 toshiba_rbtx4927_irq_ioc_enable(irq);
         }
-
-        return;
 }
 
 
@@ -520,13 +422,8 @@ static void __init toshiba_rbtx4927_irq_isa_init(void)
                                      TOSHIBA_RBTX4927_IRQ_ISA_END);
 
         for (i = TOSHIBA_RBTX4927_IRQ_ISA_BEG;
-             i <= TOSHIBA_RBTX4927_IRQ_ISA_END; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth =
-                    ((i < TOSHIBA_RBTX4927_IRQ_ISA_MID) ? (4) : (5));
-                irq_desc[i].chip = &toshiba_rbtx4927_irq_isa_type;
-        }
+             i <= TOSHIBA_RBTX4927_IRQ_ISA_END; i++)
+                set_irq_chip(i, &toshiba_rbtx4927_irq_isa_type);
 
         setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC,
                   &toshiba_rbtx4927_irq_isa_master);
@@ -536,48 +433,6 @@ static void __init toshiba_rbtx4927_irq_isa_init(void)
         /* make sure we are looking at IRR (not ISR) */
         outb(0x0A, 0x20);
         outb(0x0A, 0xA0);
-
-        return;
-}
-#endif
-
-
-#ifdef CONFIG_TOSHIBA_FPCIB0
-static unsigned int toshiba_rbtx4927_irq_isa_startup(unsigned int irq)
-{
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_STARTUP,
-                                     "irq=%d\n", irq);
-
-        if (irq < TOSHIBA_RBTX4927_IRQ_ISA_BEG
-            || irq > TOSHIBA_RBTX4927_IRQ_ISA_END) {
-                TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,
-                                             "bad irq=%d\n", irq);
-                panic("\n");
-        }
-
-        toshiba_rbtx4927_irq_isa_enable(irq);
-
-        return (0);
-}
-#endif
-
-
-#ifdef CONFIG_TOSHIBA_FPCIB0
-static void toshiba_rbtx4927_irq_isa_shutdown(unsigned int irq)
-{
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_SHUTDOWN,
-                                     "irq=%d\n", irq);
-
-        if (irq < TOSHIBA_RBTX4927_IRQ_ISA_BEG
-            || irq > TOSHIBA_RBTX4927_IRQ_ISA_END) {
-                TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,
-                                             "bad irq=%d\n", irq);
-                panic("\n");
-        }
-
-        toshiba_rbtx4927_irq_isa_disable(irq);
-
-        return;
 }
 #endif
 
@@ -596,8 +451,6 @@ static void toshiba_rbtx4927_irq_isa_enable(unsigned int irq)
         }
 
         enable_8259A_irq(irq);
-
-        return;
 }
 #endif
 
@@ -616,8 +469,6 @@ static void toshiba_rbtx4927_irq_isa_disable(unsigned int irq)
         }
 
         disable_8259A_irq(irq);
-
-        return;
 }
 #endif
 
@@ -636,8 +487,6 @@ static void toshiba_rbtx4927_irq_isa_mask_and_ack(unsigned int irq)
         }
 
         mask_and_ack_8259A(irq);
-
-        return;
 }
 #endif
 
@@ -658,8 +507,6 @@ static void toshiba_rbtx4927_irq_isa_end(unsigned int irq)
         if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
                 toshiba_rbtx4927_irq_isa_enable(irq);
         }
-
-        return;
 }
 #endif
 
@@ -668,8 +515,6 @@ void __init arch_init_irq(void)
 {
         extern void tx4927_irq_init(void);
 
-        local_irq_disable();
-
         tx4927_irq_init();
         toshiba_rbtx4927_irq_ioc_init();
 #ifdef CONFIG_TOSHIBA_FPCIB0
@@ -681,8 +526,6 @@ void __init arch_init_irq(void)
 #endif
 
         wbflush();
-
-        return;
 }
 
 void toshiba_rbtx4927_irq_dump(char *key)
@@ -715,7 +558,6 @@ void toshiba_rbtx4927_irq_dump(char *key)
                 }
         }
 #endif
-        return;
 }
 
 void toshiba_rbtx4927_irq_dump_pics(char *s)
@@ -780,6 +622,4 @@ void toshiba_rbtx4927_irq_dump_pics(char *s)
                                      level5_s);
         TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_INFO, "[%s]\n",
                                      s);
-
-        return;
 }
diff --git a/arch/mips/tx4938/common/irq.c b/arch/mips/tx4938/common/irq.c
index 77fe2454f5b9..42e127683ae9 100644
--- a/arch/mips/tx4938/common/irq.c
+++ b/arch/mips/tx4938/common/irq.c
@@ -37,48 +37,36 @@
 /* Forwad definitions for all pic's                                               */
 /**********************************************************************************/
 
-static unsigned int tx4938_irq_cp0_startup(unsigned int irq);
-static void tx4938_irq_cp0_shutdown(unsigned int irq);
 static void tx4938_irq_cp0_enable(unsigned int irq);
 static void tx4938_irq_cp0_disable(unsigned int irq);
-static void tx4938_irq_cp0_mask_and_ack(unsigned int irq);
 static void tx4938_irq_cp0_end(unsigned int irq);
 
-static unsigned int tx4938_irq_pic_startup(unsigned int irq);
-static void tx4938_irq_pic_shutdown(unsigned int irq);
 static void tx4938_irq_pic_enable(unsigned int irq);
 static void tx4938_irq_pic_disable(unsigned int irq);
-static void tx4938_irq_pic_mask_and_ack(unsigned int irq);
 static void tx4938_irq_pic_end(unsigned int irq);
 
 /**********************************************************************************/
 /* Kernel structs for all pic's                                                   */
 /**********************************************************************************/
-DEFINE_SPINLOCK(tx4938_cp0_lock);
-DEFINE_SPINLOCK(tx4938_pic_lock);
 
 #define TX4938_CP0_NAME "TX4938-CP0"
 static struct irq_chip tx4938_irq_cp0_type = {
         .typename = TX4938_CP0_NAME,
-        .startup = tx4938_irq_cp0_startup,
-        .shutdown = tx4938_irq_cp0_shutdown,
-        .enable = tx4938_irq_cp0_enable,
-        .disable = tx4938_irq_cp0_disable,
-        .ack = tx4938_irq_cp0_mask_and_ack,
+        .ack = tx4938_irq_cp0_disable,
+        .mask = tx4938_irq_cp0_disable,
+        .mask_ack = tx4938_irq_cp0_disable,
+        .unmask = tx4938_irq_cp0_enable,
         .end = tx4938_irq_cp0_end,
-        .set_affinity = NULL
 };
 
 #define TX4938_PIC_NAME "TX4938-PIC"
 static struct irq_chip tx4938_irq_pic_type = {
         .typename = TX4938_PIC_NAME,
-        .startup = tx4938_irq_pic_startup,
-        .shutdown = tx4938_irq_pic_shutdown,
-        .enable = tx4938_irq_pic_enable,
-        .disable = tx4938_irq_pic_disable,
-        .ack = tx4938_irq_pic_mask_and_ack,
+        .ack = tx4938_irq_pic_disable,
+        .mask = tx4938_irq_pic_disable,
+        .mask_ack = tx4938_irq_pic_disable,
+        .unmask = tx4938_irq_pic_enable,
         .end = tx4938_irq_pic_end,
-        .set_affinity = NULL
 };
 
 static struct irqaction tx4938_irq_pic_action = {
@@ -99,56 +87,21 @@ tx4938_irq_cp0_init(void)
 {
         int i;
 
-        for (i = TX4938_IRQ_CP0_BEG; i <= TX4938_IRQ_CP0_END; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 1;
-                irq_desc[i].chip = &tx4938_irq_cp0_type;
-        }
-}
-
-static unsigned int
-tx4938_irq_cp0_startup(unsigned int irq)
-{
-        tx4938_irq_cp0_enable(irq);
-
-        return 0;
-}
-
-static void
-tx4938_irq_cp0_shutdown(unsigned int irq)
-{
-        tx4938_irq_cp0_disable(irq);
+        for (i = TX4938_IRQ_CP0_BEG; i <= TX4938_IRQ_CP0_END; i++)
+                set_irq_chip_and_handler(i, &tx4938_irq_cp0_type,
+                                         handle_level_irq);
 }
 
 static void
 tx4938_irq_cp0_enable(unsigned int irq)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&tx4938_cp0_lock, flags);
-
         set_c0_status(tx4938_irq_cp0_mask(irq));
-
-        spin_unlock_irqrestore(&tx4938_cp0_lock, flags);
 }
 
 static void
 tx4938_irq_cp0_disable(unsigned int irq)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&tx4938_cp0_lock, flags);
-
         clear_c0_status(tx4938_irq_cp0_mask(irq));
-
-        spin_unlock_irqrestore(&tx4938_cp0_lock, flags);
-}
-
-static void
-tx4938_irq_cp0_mask_and_ack(unsigned int irq)
-{
-        tx4938_irq_cp0_disable(irq);
 }
 
 static void
@@ -290,70 +243,30 @@ tx4938_irq_pic_modify(unsigned pic_reg, unsigned clr_bits, unsigned set_bits)
 static void __init
 tx4938_irq_pic_init(void)
 {
-        unsigned long flags;
         int i;
 
-        for (i = TX4938_IRQ_PIC_BEG; i <= TX4938_IRQ_PIC_END; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 2;
-                irq_desc[i].chip = &tx4938_irq_pic_type;
-        }
+        for (i = TX4938_IRQ_PIC_BEG; i <= TX4938_IRQ_PIC_END; i++)
+                set_irq_chip_and_handler(i, &tx4938_irq_pic_type,
+                                         handle_level_irq);
 
         setup_irq(TX4938_IRQ_NEST_PIC_ON_CP0, &tx4938_irq_pic_action);
 
-        spin_lock_irqsave(&tx4938_pic_lock, flags);
-
         TX4938_WR(0xff1ff640, 0x6);     /* irq level mask -- only accept hightest */
         TX4938_WR(0xff1ff600, TX4938_RD(0xff1ff600) | 0x1);     /* irq enable */
-
-        spin_unlock_irqrestore(&tx4938_pic_lock, flags);
-}
-
-static unsigned int
-tx4938_irq_pic_startup(unsigned int irq)
-{
-        tx4938_irq_pic_enable(irq);
-
-        return 0;
-}
-
-static void
-tx4938_irq_pic_shutdown(unsigned int irq)
-{
-        tx4938_irq_pic_disable(irq);
 }
 
 static void
 tx4938_irq_pic_enable(unsigned int irq)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&tx4938_pic_lock, flags);
-
         tx4938_irq_pic_modify(tx4938_irq_pic_addr(irq), 0,
                               tx4938_irq_pic_mask(irq));
-
-        spin_unlock_irqrestore(&tx4938_pic_lock, flags);
 }
 
 static void
 tx4938_irq_pic_disable(unsigned int irq)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&tx4938_pic_lock, flags);
-
         tx4938_irq_pic_modify(tx4938_irq_pic_addr(irq),
                               tx4938_irq_pic_mask(irq), 0);
-
-        spin_unlock_irqrestore(&tx4938_pic_lock, flags);
-}
-
-static void
-tx4938_irq_pic_mask_and_ack(unsigned int irq)
-{
-        tx4938_irq_pic_disable(irq);
 }
 
 static void
diff --git a/arch/mips/tx4938/common/setup.c b/arch/mips/tx4938/common/setup.c
index f415a1f18fba..dc87d92bb08d 100644
--- a/arch/mips/tx4938/common/setup.c
+++ b/arch/mips/tx4938/common/setup.c
@@ -31,7 +31,6 @@
 #include <asm/mipsregs.h>
 #include <asm/system.h>
 #include <asm/time.h>
-#include <asm/time.h>
 #include <asm/tx4938/rbtx4938.h>
 
 extern void toshiba_rbtx4938_setup(void);
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/irq.c b/arch/mips/tx4938/toshiba_rbtx4938/irq.c
index 102e473c10a2..8c87a35f3068 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/irq.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/irq.c
@@ -87,25 +87,18 @@ IRQ  Device
 #include <linux/bootmem.h>
 #include <asm/tx4938/rbtx4938.h>
 
-static unsigned int toshiba_rbtx4938_irq_ioc_startup(unsigned int irq);
-static void toshiba_rbtx4938_irq_ioc_shutdown(unsigned int irq);
 static void toshiba_rbtx4938_irq_ioc_enable(unsigned int irq);
 static void toshiba_rbtx4938_irq_ioc_disable(unsigned int irq);
-static void toshiba_rbtx4938_irq_ioc_mask_and_ack(unsigned int irq);
 static void toshiba_rbtx4938_irq_ioc_end(unsigned int irq);
 
-DEFINE_SPINLOCK(toshiba_rbtx4938_ioc_lock);
-
 #define TOSHIBA_RBTX4938_IOC_NAME "RBTX4938-IOC"
 static struct irq_chip toshiba_rbtx4938_irq_ioc_type = {
         .typename = TOSHIBA_RBTX4938_IOC_NAME,
-        .startup = toshiba_rbtx4938_irq_ioc_startup,
-        .shutdown = toshiba_rbtx4938_irq_ioc_shutdown,
-        .enable = toshiba_rbtx4938_irq_ioc_enable,
-        .disable = toshiba_rbtx4938_irq_ioc_disable,
-        .ack = toshiba_rbtx4938_irq_ioc_mask_and_ack,
+        .ack = toshiba_rbtx4938_irq_ioc_disable,
+        .mask = toshiba_rbtx4938_irq_ioc_disable,
+        .mask_ack = toshiba_rbtx4938_irq_ioc_disable,
+        .unmask = toshiba_rbtx4938_irq_ioc_enable,
         .end = toshiba_rbtx4938_irq_ioc_end,
-        .set_affinity = NULL
 };
 
 #define TOSHIBA_RBTX4938_IOC_INTR_ENAB 0xb7f02000
@@ -142,69 +135,36 @@ toshiba_rbtx4938_irq_ioc_init(void)
         int i;
 
         for (i = TOSHIBA_RBTX4938_IRQ_IOC_BEG;
-             i <= TOSHIBA_RBTX4938_IRQ_IOC_END; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = 0;
-                irq_desc[i].depth = 3;
-                irq_desc[i].chip = &toshiba_rbtx4938_irq_ioc_type;
-        }
+             i <= TOSHIBA_RBTX4938_IRQ_IOC_END; i++)
+                set_irq_chip_and_handler(i, &toshiba_rbtx4938_irq_ioc_type,
+                                         handle_level_irq);
 
         setup_irq(RBTX4938_IRQ_IOCINT,
                   &toshiba_rbtx4938_irq_ioc_action);
 }
 
-static unsigned int
-toshiba_rbtx4938_irq_ioc_startup(unsigned int irq)
-{
-        toshiba_rbtx4938_irq_ioc_enable(irq);
-
-        return 0;
-}
-
-static void
-toshiba_rbtx4938_irq_ioc_shutdown(unsigned int irq)
-{
-        toshiba_rbtx4938_irq_ioc_disable(irq);
-}
-
 static void
 toshiba_rbtx4938_irq_ioc_enable(unsigned int irq)
 {
-        unsigned long flags;
         volatile unsigned char v;
 
-        spin_lock_irqsave(&toshiba_rbtx4938_ioc_lock, flags);
-
         v = TX4938_RD08(TOSHIBA_RBTX4938_IOC_INTR_ENAB);
         v |= (1 << (irq - TOSHIBA_RBTX4938_IRQ_IOC_BEG));
         TX4938_WR08(TOSHIBA_RBTX4938_IOC_INTR_ENAB, v);
         mmiowb();
         TX4938_RD08(TOSHIBA_RBTX4938_IOC_INTR_ENAB);
-
-        spin_unlock_irqrestore(&toshiba_rbtx4938_ioc_lock, flags);
 }
 
 static void
 toshiba_rbtx4938_irq_ioc_disable(unsigned int irq)
 {
-        unsigned long flags;
         volatile unsigned char v;
 
-        spin_lock_irqsave(&toshiba_rbtx4938_ioc_lock, flags);
-
         v = TX4938_RD08(TOSHIBA_RBTX4938_IOC_INTR_ENAB);
         v &= ~(1 << (irq - TOSHIBA_RBTX4938_IRQ_IOC_BEG));
         TX4938_WR08(TOSHIBA_RBTX4938_IOC_INTR_ENAB, v);
         mmiowb();
         TX4938_RD08(TOSHIBA_RBTX4938_IOC_INTR_ENAB);
-
-        spin_unlock_irqrestore(&toshiba_rbtx4938_ioc_lock, flags);
-}
-
-static void
-toshiba_rbtx4938_irq_ioc_mask_and_ack(unsigned int irq)
-{
-        toshiba_rbtx4938_irq_ioc_disable(irq);
 }
 
 static void
diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
index c215c0d39fae..54b92a74c7ac 100644
--- a/arch/mips/vr41xx/common/icu.c
+++ b/arch/mips/vr41xx/common/icu.c
@@ -417,14 +417,7 @@ void vr41xx_disable_bcuint(void)
 
 EXPORT_SYMBOL(vr41xx_disable_bcuint);
 
-static unsigned int startup_sysint1_irq(unsigned int irq)
-{
-        icu1_set(MSYSINT1REG, 1 << SYSINT1_IRQ_TO_PIN(irq));
-
-        return 0; /* never anything pending */
-}
-
-static void shutdown_sysint1_irq(unsigned int irq)
+static void disable_sysint1_irq(unsigned int irq)
 {
         icu1_clear(MSYSINT1REG, 1 << SYSINT1_IRQ_TO_PIN(irq));
 }
@@ -434,9 +427,6 @@ static void enable_sysint1_irq(unsigned int irq)
         icu1_set(MSYSINT1REG, 1 << SYSINT1_IRQ_TO_PIN(irq));
 }
 
-#define disable_sysint1_irq     shutdown_sysint1_irq
-#define ack_sysint1_irq         shutdown_sysint1_irq
-
 static void end_sysint1_irq(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
@@ -445,22 +435,14 @@ static void end_sysint1_irq(unsigned int irq)
 
 static struct irq_chip sysint1_irq_type = {
         .typename       = "SYSINT1",
-        .startup        = startup_sysint1_irq,
-        .shutdown       = shutdown_sysint1_irq,
-        .enable         = enable_sysint1_irq,
-        .disable        = disable_sysint1_irq,
-        .ack            = ack_sysint1_irq,
+        .ack            = disable_sysint1_irq,
+        .mask           = disable_sysint1_irq,
+        .mask_ack       = disable_sysint1_irq,
+        .unmask         = enable_sysint1_irq,
         .end            = end_sysint1_irq,
 };
 
-static unsigned int startup_sysint2_irq(unsigned int irq)
-{
-        icu2_set(MSYSINT2REG, 1 << SYSINT2_IRQ_TO_PIN(irq));
-
-        return 0; /* never anything pending */
-}
-
-static void shutdown_sysint2_irq(unsigned int irq)
+static void disable_sysint2_irq(unsigned int irq)
 {
         icu2_clear(MSYSINT2REG, 1 << SYSINT2_IRQ_TO_PIN(irq));
 }
@@ -470,9 +452,6 @@ static void enable_sysint2_irq(unsigned int irq)
         icu2_set(MSYSINT2REG, 1 << SYSINT2_IRQ_TO_PIN(irq));
 }
 
-#define disable_sysint2_irq     shutdown_sysint2_irq
-#define ack_sysint2_irq         shutdown_sysint2_irq
-
 static void end_sysint2_irq(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
@@ -481,11 +460,10 @@ static void end_sysint2_irq(unsigned int irq)
 
 static struct irq_chip sysint2_irq_type = {
         .typename       = "SYSINT2",
-        .startup        = startup_sysint2_irq,
-        .shutdown       = shutdown_sysint2_irq,
-        .enable         = enable_sysint2_irq,
-        .disable        = disable_sysint2_irq,
-        .ack            = ack_sysint2_irq,
+        .ack            = disable_sysint2_irq,
+        .mask           = disable_sysint2_irq,
+        .mask_ack       = disable_sysint2_irq,
+        .unmask         = enable_sysint2_irq,
         .end            = end_sysint2_irq,
 };
 
@@ -723,10 +701,12 @@ static int __init vr41xx_icu_init(void)
         icu2_write(MGIUINTHREG, 0xffff);
 
         for (i = SYSINT1_IRQ_BASE; i <= SYSINT1_IRQ_LAST; i++)
-                irq_desc[i].chip = &sysint1_irq_type;
+                set_irq_chip_and_handler(i, &sysint1_irq_type,
+                                         handle_level_irq);
 
         for (i = SYSINT2_IRQ_BASE; i <= SYSINT2_IRQ_LAST; i++)
-                irq_desc[i].chip = &sysint2_irq_type;
+                set_irq_chip_and_handler(i, &sysint2_irq_type,
+                                         handle_level_irq);
 
         cascade_irq(INT0_IRQ, icu_get_irq);
         cascade_irq(INT1_IRQ, icu_get_irq);
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/irq.c b/arch/mips/vr41xx/nec-cmbvr4133/irq.c
index 2483487344c2..a039bb7251ff 100644
--- a/arch/mips/vr41xx/nec-cmbvr4133/irq.c
+++ b/arch/mips/vr41xx/nec-cmbvr4133/irq.c
@@ -30,17 +30,6 @@ extern void init_8259A(int hoge);
 
 extern int vr4133_rockhopper;
 
-static unsigned int startup_i8259_irq(unsigned int irq)
-{
-        enable_8259A_irq(irq - I8259_IRQ_BASE);
-        return 0;
-}
-
-static void shutdown_i8259_irq(unsigned int irq)
-{
-        disable_8259A_irq(irq - I8259_IRQ_BASE);
-}
-
 static void enable_i8259_irq(unsigned int irq)
 {
         enable_8259A_irq(irq - I8259_IRQ_BASE);
@@ -64,11 +53,10 @@ static void end_i8259_irq(unsigned int irq)
 
 static struct irq_chip i8259_irq_type = {
         .typename       = "XT-PIC",
-        .startup        = startup_i8259_irq,
-        .shutdown       = shutdown_i8259_irq,
-        .enable         = enable_i8259_irq,
-        .disable        = disable_i8259_irq,
         .ack            = ack_i8259_irq,
+        .mask           = disable_i8259_irq,
+        .mask_ack       = ack_i8259_irq,
+        .unmask         = enable_i8259_irq,
         .end            = end_i8259_irq,
 };
 
@@ -104,7 +92,7 @@ void __init rockhopper_init_irq(void)
         }
 
         for (i = I8259_IRQ_BASE; i <= I8259_IRQ_LAST; i++)
-                irq_desc[i].chip = &i8259_irq_type;
+                set_irq_chip(i, &i8259_irq_type);
 
         setup_irq(I8259_SLAVE_IRQ, &i8259_slave_cascade);
 
diff --git a/arch/parisc/lib/checksum.c b/arch/parisc/lib/checksum.c
index 8a1e08068e7d..462696d30d3b 100644
--- a/arch/parisc/lib/checksum.c
+++ b/arch/parisc/lib/checksum.c
@@ -101,11 +101,14 @@ out:
 /*
  * computes a partial checksum, e.g. for TCP/UDP fragments
  */
-unsigned int csum_partial(const unsigned char *buff, int len, unsigned int sum)
+/*
+ * why bother folding?
+ */
+__wsum csum_partial(const void *buff, int len, __wsum sum)
 {
         unsigned int result = do_csum(buff, len);
         addc(result, sum);
-        return from32to16(result);
+        return (__force __wsum)from32to16(result);
 }
 
 EXPORT_SYMBOL(csum_partial);
@@ -113,8 +116,8 @@ EXPORT_SYMBOL(csum_partial);
 /*
  * copy while checksumming, otherwise like csum_partial
  */
-unsigned int csum_partial_copy_nocheck(const unsigned char *src, unsigned char *dst,
-                                       int len, unsigned int sum)
+__wsum csum_partial_copy_nocheck(const void *src, void *dst,
+                                       int len, __wsum sum)
 {
         /*
          * It's 2:30 am and I don't feel like doing it real ...
@@ -131,9 +134,9 @@ EXPORT_SYMBOL(csum_partial_copy_nocheck);
  * Copy from userspace and compute checksum.  If we catch an exception
  * then zero the rest of the buffer.
  */
-unsigned int csum_partial_copy_from_user(const unsigned char __user *src,
-                                        unsigned char *dst, int len,
-                                        unsigned int sum, int *err_ptr)
+__wsum csum_partial_copy_from_user(const void __user *src,
+                                        void *dst, int len,
+                                        __wsum sum, int *err_ptr)
 {
         int missing;
 
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 0673dbedb241..116d7d3683ed 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -425,7 +425,7 @@ config PPC_MAPLE
         default n
         help
           This option enables support for the Maple 970FX Evaluation Board.
-          For more informations, refer to <http://www.970eval.com>
+          For more information, refer to <http://www.970eval.com>
 
 config PPC_PASEMI
         depends on PPC_MULTIPLATFORM && PPC64
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 7edb6b461382..edcd5b875b66 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -21,7 +21,7 @@ config MPC834x_SYS
           Be aware that PCI buses can only function when SYS board is plugged
           into the PIB (Platform IO Board) board from Freescale which provide
           3 PCI slots.  The PIBs PCI initialization is the bootloader's
-          responsiblilty.
+          responsibility.
 
 config MPC834x_ITX
         bool "Freescale MPC834x ITX"
@@ -30,7 +30,7 @@ config MPC834x_ITX
           This option enables support for the MPC 834x ITX evaluation board.
 
           Be aware that PCI initialization is the bootloader's
-          responsiblilty.
+          responsibility.
 
 config MPC8360E_PB
         bool "Freescale MPC8360E PB"
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 9923adc5248e..257dc9068468 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -48,7 +48,6 @@ static struct pci_controller *u3_ht;
 static int has_second_ohare;
 #endif /* CONFIG_PPC64 */
 
-extern u8 pci_cache_line_size;
 extern int pcibios_assign_bus_offset;
 
 struct device_node *k2_skiplist[2];
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 077711e63104..ef018e25fb07 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -724,7 +724,7 @@ config MPC834x_SYS
           Be aware that PCI buses can only function when SYS board is plugged
           into the PIB (Platform IO Board) board from Freescale which provide
           3 PCI slots.  The PIBs PCI initialization is the bootloader's
-          responsiblilty.
+          responsibility.
 
 config EV64360
         bool "Marvell-EV64360BP"
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 6a461d4caeff..bffc7e176970 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -217,7 +217,7 @@ config SH_SHMIN
         bool "SHMIN"
         select CPU_SUBTYPE_SH7706
         help
-          Select SHMIN if configureing for the SHMIN board
+          Select SHMIN if configuring for the SHMIN board.
 
 config SH_UNKNOWN
         bool "BareCPU"
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c
index 9daad70bc305..8a2fd19dc9eb 100644
--- a/arch/sh/kernel/sh_ksyms.c
+++ b/arch/sh/kernel/sh_ksyms.c
@@ -18,7 +18,6 @@
 #include <asm/delay.h>
 #include <asm/tlbflush.h>
 #include <asm/cacheflush.h>
-#include <asm/checksum.h>
 
 extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
 extern struct hw_interrupt_type no_irq_type;
diff --git a/arch/sh64/kernel/sh_ksyms.c b/arch/sh64/kernel/sh_ksyms.c
index 4b2df7247b59..7aa4b4f7bc5e 100644
--- a/arch/sh64/kernel/sh_ksyms.c
+++ b/arch/sh64/kernel/sh_ksyms.c
@@ -38,7 +38,7 @@ EXPORT_SYMBOL(disable_irq);
 EXPORT_SYMBOL(kernel_thread);
 
 /* Networking helper routines. */
-EXPORT_SYMBOL(csum_partial_copy);
+EXPORT_SYMBOL(csum_partial_copy_nocheck);
 
 EXPORT_SYMBOL(strstr);
 
diff --git a/arch/sh64/lib/c-checksum.c b/arch/sh64/lib/c-checksum.c
index 0e8a742abf8c..4b2676380deb 100644
--- a/arch/sh64/lib/c-checksum.c
+++ b/arch/sh64/lib/c-checksum.c
@@ -118,24 +118,24 @@ static unsigned long do_csum(const unsigned char *buff, int len)
 
 /* computes the checksum of a memory block at buff, length len,
    and adds in "sum" (32-bit)  */
-unsigned int csum_partial(const unsigned char *buff, int len, unsigned int sum)
+__wsum csum_partial(const void *buff, int len, __wsum sum)
 {
         unsigned long long result = do_csum(buff, len);
 
         /* add in old sum, and carry.. */
-        result += sum;
+        result += (__force u32)sum;
         /* 32+c bits -> 32 bits */
         result = (result & 0xffffffff) + (result >> 32);
 
         pr_debug("csum_partial, buff %p len %d sum 0x%x result=0x%016Lx\n",
                 buff, len, sum, result);
 
-        return result;
+        return (__force __wsum)result;
 }
 
 /* Copy while checksumming, otherwise like csum_partial.  */
-unsigned int
-csum_partial_copy(const unsigned char *src, unsigned char *dst, int len, unsigned int sum)
+__wsum
+csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
 {
         sum = csum_partial(src, len, sum);
         memcpy(dst, src, len);
@@ -145,9 +145,9 @@ csum_partial_copy(const unsigned char *src, unsigned char *dst, int len, unsigne
 
 /* Copy from userspace and compute checksum.  If we catch an exception
    then zero the rest of the buffer.  */
-unsigned int
-csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, int len,
-                            unsigned int sum, int *err_ptr)
+__wsum
+csum_partial_copy_from_user(const void __user *src, void *dst, int len,
+                            __wsum sum, int *err_ptr)
 {
         int missing;
 
@@ -166,9 +166,9 @@ csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, int le
 }
 
 /* Copy to userspace and compute checksum.  */
-unsigned int
+__wsum
 csum_partial_copy_to_user(const unsigned char *src, unsigned char *dst, int len,
-                          unsigned int sum, int *err_ptr)
+                          __wsum sum, int *err_ptr)
 {
         sum = csum_partial(src, len, sum);
 
@@ -182,28 +182,24 @@ csum_partial_copy_to_user(const unsigned char *src, unsigned char *dst, int len,
  *      This is a version of ip_compute_csum() optimized for IP headers,
  *      which always checksum on 4 octet boundaries.
  */
-unsigned short ip_fast_csum(unsigned char *iph, unsigned int ihl)
+__sum16 ip_fast_csum(const void *iph, unsigned int ihl)
 {
         pr_debug("ip_fast_csum %p,%d\n", iph, ihl);
 
-        return ~do_csum(iph, ihl * 4);
+        return (__force __sum16)~do_csum(iph, ihl * 4);
 }
 
-unsigned int csum_tcpudp_nofold(unsigned long saddr,
-                                unsigned long daddr,
+__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
                                 unsigned short len,
-                                unsigned short proto, unsigned int sum)
+                                unsigned short proto, __wsum sum)
 {
         unsigned long long result;
 
         pr_debug("ntohs(0x%x)=0x%x\n", 0xdead, ntohs(0xdead));
         pr_debug("htons(0x%x)=0x%x\n", 0xdead, htons(0xdead));
 
-        result = ((unsigned long long) saddr +
-                  (unsigned long long) daddr +
-                  (unsigned long long) sum +
-                  ((unsigned long long) ntohs(len) << 16) +
-                  ((unsigned long long) proto << 8));
+        result = (__force u64) saddr + (__force u64) daddr +
+                 (__force u64) sum + ((len + proto) << 8);
 
         /* Fold down to 32-bits so we don't loose in the typedef-less
            network stack.  */
@@ -215,16 +211,5 @@ unsigned int csum_tcpudp_nofold(unsigned long saddr,
         pr_debug("%s saddr %x daddr %x len %x proto %x sum %x result %08Lx\n",
                 __FUNCTION__, saddr, daddr, len, proto, sum, result);
 
-        return result;
-}
-
-// Post SIM:
-unsigned int
-csum_partial_copy_nocheck(const unsigned char *src, unsigned char *dst, int len, unsigned int sum)
-{
-        //  unsigned dummy;
-        pr_debug("csum_partial_copy_nocheck src %p dst %p len %d\n", src, dst,
-                len);
-
-        return csum_partial_copy(src, dst, len, sum);
+        return (__wsum)result;
 }
diff --git a/arch/sh64/lib/dbg.c b/arch/sh64/lib/dbg.c
index 1326f45f31eb..4310fc87444e 100644
--- a/arch/sh64/lib/dbg.c
+++ b/arch/sh64/lib/dbg.c
@@ -383,7 +383,7 @@ void show_excp_regs(char *from, int trapnr, int signr, struct pt_regs *regs)
 /* ======================================================================= */
 
 /*
-** Depending on <base> scan the MMU, Data or Instrction side
+** Depending on <base> scan the MMU, Data or Instruction side
 ** looking for a valid mapping matching Eaddr & asid.
 ** Return -1 if not found or the TLB id entry otherwise.
 ** Note: it works only for 4k pages!
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 2f96610a83e9..92a7c8a636d3 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -212,8 +212,8 @@ config SPARC_LED
         tristate "Sun4m LED driver"
         help
           This driver toggles the front-panel LED on sun4m systems
-          in a user-specifyable manner.  It's state can be probed
-          by reading /proc/led and it's blinking mode can be changed
+          in a user-specifiable manner.  Its state can be probed
+          by reading /proc/led and its blinking mode can be changed
           via writes to /proc/led
 
 source "fs/Kconfig.binfmt"
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index e02f01b644af..dfc41cd4bb5d 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -646,13 +646,4 @@ int pci_domain_nr(struct pci_bus *pbus)
 }
 EXPORT_SYMBOL(pci_domain_nr);
 
-int pcibios_prep_mwi(struct pci_dev *dev)
-{
-        /* We set correct PCI_CACHE_LINE_SIZE register values for every
-         * device probed on this platform.  So there is nothing to check
-         * and this always succeeds.
-         */
-        return 0;
-}
-
 #endif /* !(CONFIG_PCI) */
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
index 2f880cb167a5..0cad3546cb89 100644
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
@@ -120,7 +120,7 @@ static int winch_thread(void *arg)
         /* These are synchronization calls between various UML threads on the
          * host - since they are not different kernel threads, we cannot use
          * kernel semaphores. We don't use SysV semaphores because they are
-         * persistant. */
+         * persistent. */
         count = os_read_file(pipe_fd, &c, sizeof(c));
         if(count != sizeof(c))
                 printk("winch_thread : failed to read synchronization byte, "
diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index 6516f6dca96d..13a86bd383d3 100644
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -233,6 +233,8 @@ extern unsigned long __do_user_copy(void *to, const void *from, int n,
                                     void (*op)(void *to, const void *from,
                                                int n), int *faulted_out);
 
+/* execvp.c */
+extern int execvp_noalloc(char *buf, const char *file, char *const argv[]);
 /* helper.c */
 extern int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
                       unsigned long *stack_out);
diff --git a/arch/um/include/sysdep-i386/checksum.h b/arch/um/include/sysdep-i386/checksum.h
index 052bb061a978..0cb4645cbeb8 100644
--- a/arch/um/include/sysdep-i386/checksum.h
+++ b/arch/um/include/sysdep-i386/checksum.h
@@ -20,8 +20,7 @@
  *
  * it's best to have buff aligned on a 32-bit boundary
  */
-unsigned int csum_partial(const unsigned char * buff, int len, 
-                          unsigned int sum);
+__wsum csum_partial(const void *buff, int len, __wsum sum);
 
 /*
  *      Note: when you get a NULL pointer exception here this means someone
@@ -32,8 +31,8 @@ unsigned int csum_partial(const unsigned char * buff, int len,
  */
 
 static __inline__
-unsigned int csum_partial_copy_nocheck(const unsigned char *src, unsigned char *dst,
-                                       int len, int sum)
+__wsum csum_partial_copy_nocheck(const void *src, void *dst,
+                                       int len, __wsum sum)
 {
         memcpy(dst, src, len);
         return csum_partial(dst, len, sum);
@@ -48,36 +47,25 @@ unsigned int csum_partial_copy_nocheck(const unsigned char *src, unsigned char *
  */
 
 static __inline__
-unsigned int csum_partial_copy_from_user(const unsigned char __user *src,
-                                         unsigned char *dst,
-                                         int len, int sum, int *err_ptr)
+__wsum csum_partial_copy_from_user(const void __user *src, void *dst,
+                                         int len, __wsum sum, int *err_ptr)
 {
-        if(copy_from_user(dst, src, len)){
+        if (copy_from_user(dst, src, len)) {
                 *err_ptr = -EFAULT;
-                return(-1);
+                return (__force __wsum)-1;
         }
 
         return csum_partial(dst, len, sum);
 }
 
 /*
- * These are the old (and unsafe) way of doing checksums, a warning message 
- * will be printed if they are used and an exception occurs.
- *
- * these functions should go away after some time.
- */
-
-#define csum_partial_copy_fromuser csum_partial_copy_from_user
-
-/*
  *      This is a version of ip_compute_csum() optimized for IP headers,
  *      which always checksum on 4 octet boundaries.
  *
  *      By Jorge Cwik <jorge@laser.satlink.net>, adapted for linux by
  *      Arnt Gulbrandsen.
  */
-static inline unsigned short ip_fast_csum(unsigned char * iph,
-                                          unsigned int ihl)
+static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
 {
         unsigned int sum;
 
@@ -105,29 +93,29 @@ static inline unsigned short ip_fast_csum(unsigned char * iph,
         : "=r" (sum), "=r" (iph), "=r" (ihl)
         : "1" (iph), "2" (ihl)
         : "memory");
-        return sum;
+        return (__force __sum16)sum;
 }
 
 /*
  *      Fold a partial checksum
  */
 
-static inline unsigned int csum_fold(unsigned int sum)
+static inline __sum16 csum_fold(__wsum sum)
 {
         __asm__(
                 "addl %1, %0            ;\n"
                 "adcl $0xffff, %0       ;\n"
                 : "=r" (sum)
-                : "r" (sum << 16), "0" (sum & 0xffff0000)
+                : "r" ((__force u32)sum << 16),
+                  "0" ((__force u32)sum & 0xffff0000)
         );
-        return (~sum) >> 16;
+        return (__force __sum16)(~(__force u32)sum >> 16);
 }
 
-static inline unsigned long csum_tcpudp_nofold(unsigned long saddr,
-                                                   unsigned long daddr,
+static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
                                                    unsigned short len,
                                                    unsigned short proto,
-                                                   unsigned int sum)
+                                                   __wsum sum)
 {
     __asm__(
         "addl %1, %0    ;\n"
@@ -135,7 +123,7 @@ static inline unsigned long csum_tcpudp_nofold(unsigned long saddr,
         "adcl %3, %0    ;\n"
         "adcl $0, %0    ;\n"
         : "=r" (sum)
-        : "g" (daddr), "g"(saddr), "g"((ntohs(len)<<16)+proto*256), "0"(sum));
+        : "g" (daddr), "g"(saddr), "g"((len + proto) << 8), "0"(sum));
     return sum;
 }
 
@@ -143,11 +131,10 @@ static inline unsigned long csum_tcpudp_nofold(unsigned long saddr,
  * computes the checksum of the TCP/UDP pseudo-header
  * returns a 16-bit checksum, already complemented
  */
-static inline unsigned short int csum_tcpudp_magic(unsigned long saddr,
-                                                   unsigned long daddr,
+static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
                                                    unsigned short len,
                                                    unsigned short proto,
-                                                   unsigned int sum)
+                                                   __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
 }
@@ -157,17 +144,16 @@ static inline unsigned short int csum_tcpudp_magic(unsigned long saddr,
  * in icmp.c
  */
 
-static inline unsigned short ip_compute_csum(unsigned char * buff, int len)
+static inline __sum16 ip_compute_csum(const void *buff, int len)
 {
     return csum_fold (csum_partial(buff, len, 0));
 }
 
 #define _HAVE_ARCH_IPV6_CSUM
-static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
-                                                     struct in6_addr *daddr,
-                                                     __u32 len,
-                                                     unsigned short proto,
-                                                     unsigned int sum)
+static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
+                                          const struct in6_addr *daddr,
+                                          __u32 len, unsigned short proto,
+                                          __wsum sum)
 {
         __asm__(
                 "addl 0(%1), %0         ;\n"
@@ -192,14 +178,14 @@ static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
  *      Copy and checksum to user
  */
 #define HAVE_CSUM_COPY_USER
-static __inline__ unsigned int csum_and_copy_to_user(const unsigned char *src,
-                                                     unsigned char __user *dst,
-                                                     int len, int sum, int *err_ptr)
+static __inline__ __wsum csum_and_copy_to_user(const void *src,
+                                                     void __user *dst,
+                                                     int len, __wsum sum, int *err_ptr)
 {
-        if (access_ok(VERIFY_WRITE, dst, len)){
-                if(copy_to_user(dst, src, len)){
+        if (access_ok(VERIFY_WRITE, dst, len)) {
+                if (copy_to_user(dst, src, len)) {
                         *err_ptr = -EFAULT;
-                        return(-1);
+                        return (__force __wsum)-1;
                 }
 
                 return csum_partial(src, len, sum);
@@ -208,7 +194,7 @@ static __inline__ unsigned int csum_and_copy_to_user(const unsigned char *src,
         if (len)
                 *err_ptr = -EFAULT;
 
-        return -1; /* invalid checksum */
+        return (__force __wsum)-1; /* invalid checksum */
 }
 
 #endif
diff --git a/arch/um/include/sysdep-x86_64/checksum.h b/arch/um/include/sysdep-x86_64/checksum.h
index ea97005af694..a5be9031ea85 100644
--- a/arch/um/include/sysdep-x86_64/checksum.h
+++ b/arch/um/include/sysdep-x86_64/checksum.h
@@ -9,8 +9,7 @@
 #include "linux/in6.h"
 #include "asm/uaccess.h"
 
-extern unsigned csum_partial(const unsigned char *buff, unsigned len,
-                             unsigned sum);
+extern __wsum csum_partial(const void *buff, int len, __wsum sum);
 
 /*
  *      Note: when you get a NULL pointer exception here this means someone
@@ -21,21 +20,21 @@ extern unsigned csum_partial(const unsigned char *buff, unsigned len,
  */
 
 static __inline__
-unsigned int csum_partial_copy_nocheck(const unsigned char *src, unsigned char *dst,
-                                       int len, int sum)
+__wsum csum_partial_copy_nocheck(const void *src, void *dst,
+                                       int len, __wsum sum)
 {
         memcpy(dst, src, len);
         return(csum_partial(dst, len, sum));
 }
 
 static __inline__
-unsigned int csum_partial_copy_from_user(const unsigned char *src,
-                                         unsigned char *dst, int len, int sum,
+__wsum csum_partial_copy_from_user(const void __user *src,
+                                         void *dst, int len, __wsum sum,
                                          int *err_ptr)
 {
-        if(copy_from_user(dst, src, len)){
+        if (copy_from_user(dst, src, len)) {
                 *err_ptr = -EFAULT;
-                return(-1);
+                return (__force __wsum)-1;
         }
         return csum_partial(dst, len, sum);
 }
@@ -48,15 +47,16 @@ unsigned int csum_partial_copy_from_user(const unsigned char *src,
  * the last step before putting a checksum into a packet.
  * Make sure not to mix with 64bit checksums.
  */
-static inline unsigned int csum_fold(unsigned int sum)
+static inline __sum16 csum_fold(__wsum sum)
 {
         __asm__(
                 "  addl %1,%0\n"
                 "  adcl $0xffff,%0"
                 : "=r" (sum)
-                : "r" (sum << 16), "0" (sum & 0xffff0000)
+                : "r" ((__force u32)sum << 16),
+                  "0" ((__force u32)sum & 0xffff0000)
         );
-        return (~sum) >> 16;
+        return (__force __sum16)(~(__force u32)sum >> 16);
 }
 
 /**
@@ -70,28 +70,27 @@ static inline unsigned int csum_fold(unsigned int sum)
  * Returns the pseudo header checksum the input data. Result is
  * 32bit unfolded.
  */
-static inline unsigned long
-csum_tcpudp_nofold(unsigned saddr, unsigned daddr, unsigned short len,
-                   unsigned short proto, unsigned int sum)
+static inline __wsum
+csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
+                   unsigned short proto, __wsum sum)
 {
         asm("  addl %1, %0\n"
             "  adcl %2, %0\n"
             "  adcl %3, %0\n"
             "  adcl $0, %0\n"
                 : "=r" (sum)
-            : "g" (daddr), "g" (saddr), "g" ((ntohs(len)<<16)+proto*256), "0" (sum));
-    return sum;
+            : "g" (daddr), "g" (saddr), "g" ((len + proto) << 8), "0" (sum));
+        return sum;
 }
 
 /*
  * computes the checksum of the TCP/UDP pseudo-header
  * returns a 16-bit checksum, already complemented
  */
-static inline unsigned short int csum_tcpudp_magic(unsigned long saddr,
-                                                   unsigned long daddr,
-                                                   unsigned short len,
-                                                   unsigned short proto,
-                                                   unsigned int sum)
+static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
+                                           unsigned short len,
+                                           unsigned short proto,
+                                           __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
 }
@@ -101,7 +100,7 @@ static inline unsigned short int csum_tcpudp_magic(unsigned long saddr,
  * iph: ipv4 header
  * ihl: length of header / 4
  */
-static inline unsigned short ip_fast_csum(unsigned char *iph, unsigned int ihl)
+static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
 {
         unsigned int sum;
 
@@ -128,7 +127,7 @@ static inline unsigned short ip_fast_csum(unsigned char *iph, unsigned int ihl)
         : "=r" (sum), "=r" (iph), "=r" (ihl)
         : "1" (iph), "2" (ihl)
         : "memory");
-        return(sum);
+        return (__force __sum16)sum;
 }
 
 static inline unsigned add32_with_carry(unsigned a, unsigned b)
@@ -140,6 +139,6 @@ static inline unsigned add32_with_carry(unsigned a, unsigned b)
         return a;
 }
 
-extern unsigned short ip_compute_csum(unsigned char * buff, int len);
+extern __sum16 ip_compute_csum(const void *buff, int len);
 
 #endif
diff --git a/arch/um/os-Linux/Makefile b/arch/um/os-Linux/Makefile
index b4183929b32c..2f8c79464015 100644
--- a/arch/um/os-Linux/Makefile
+++ b/arch/um/os-Linux/Makefile
@@ -3,8 +3,8 @@
 # Licensed under the GPL
 #
 
-obj-y = aio.o elf_aux.o file.o helper.o irq.o main.o mem.o process.o sigio.o \
-        signal.o start_up.o time.o trap.o tty.o uaccess.o umid.o tls.o \
+obj-y = aio.o elf_aux.o execvp.o file.o helper.o irq.o main.o mem.o process.o \
+        sigio.o signal.o start_up.o time.o trap.o tty.o uaccess.o umid.o tls.o \
         user_syms.o util.o drivers/ sys-$(SUBARCH)/
 
 obj-$(CONFIG_MODE_SKAS) += skas/
@@ -15,9 +15,9 @@ user-objs-$(CONFIG_MODE_TT) += tt.o
 obj-$(CONFIG_TTY_LOG) += tty_log.o
 user-objs-$(CONFIG_TTY_LOG) += tty_log.o
 
-USER_OBJS := $(user-objs-y) aio.o elf_aux.o file.o helper.o irq.o main.o mem.o \
-        process.o sigio.o signal.o start_up.o time.o trap.o tty.o tls.o \
-        uaccess.o umid.o util.o
+USER_OBJS := $(user-objs-y) aio.o elf_aux.o execvp.o file.o helper.o irq.o \
+        main.o mem.o process.o sigio.o signal.o start_up.o time.o trap.o tty.o \
+        tls.o uaccess.o umid.o util.o
 
 CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH)
 
diff --git a/arch/um/os-Linux/execvp.c b/arch/um/os-Linux/execvp.c
new file mode 100644
index 000000000000..66e583a4031b
--- /dev/null
+++ b/arch/um/os-Linux/execvp.c
@@ -0,0 +1,149 @@
+/* Copyright (C) 2006 by Paolo Giarrusso - modified from glibc' execvp.c.
+   Original copyright notice follows:
+
+   Copyright (C) 1991,92,1995-99,2002,2004 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+#include <unistd.h>
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <limits.h>
+
+#ifndef TEST
+#include "um_malloc.h"
+#else
+#include <stdio.h>
+#define um_kmalloc malloc
+#endif
+#include "os.h"
+
+/* Execute FILE, searching in the `PATH' environment variable if it contains
+   no slashes, with arguments ARGV and environment from `environ'.  */
+int execvp_noalloc(char *buf, const char *file, char *const argv[])
+{
+        if (*file == '\0') {
+                return -ENOENT;
+        }
+
+        if (strchr (file, '/') != NULL) {
+                /* Don't search when it contains a slash.  */
+                execv(file, argv);
+        } else {
+                int got_eacces;
+                size_t len, pathlen;
+                char *name, *p;
+                char *path = getenv("PATH");
+                if (path == NULL)
+                        path = ":/bin:/usr/bin";
+
+                len = strlen(file) + 1;
+                pathlen = strlen(path);
+                /* Copy the file name at the top.  */
+                name = memcpy(buf + pathlen + 1, file, len);
+                /* And add the slash.  */
+                *--name = '/';
+
+                got_eacces = 0;
+                p = path;
+                do {
+                        char *startp;
+
+                        path = p;
+                        //Let's avoid this GNU extension.
+                        //p = strchrnul (path, ':');
+                        p = strchr(path, ':');
+                        if (!p)
+                                p = strchr(path, '\0');
+
+                        if (p == path)
+                                /* Two adjacent colons, or a colon at the beginning or the end
+                                   of `PATH' means to search the current directory.  */
+                                startp = name + 1;
+                        else
+                                startp = memcpy(name - (p - path), path, p - path);
+
+                        /* Try to execute this name.  If it works, execv will not return.  */
+                        execv(startp, argv);
+
+                        /*
+                        if (errno == ENOEXEC) {
+                        }
+                        */
+
+                        switch (errno) {
+                                case EACCES:
+                                        /* Record the we got a `Permission denied' error.  If we end
+                                           up finding no executable we can use, we want to diagnose
+                                           that we did find one but were denied access.  */
+                                        got_eacces = 1;
+                                case ENOENT:
+                                case ESTALE:
+                                case ENOTDIR:
+                                        /* Those errors indicate the file is missing or not executable
+                                           by us, in which case we want to just try the next path
+                                           directory.  */
+                                case ENODEV:
+                                case ETIMEDOUT:
+                                        /* Some strange filesystems like AFS return even
+                                           stranger error numbers.  They cannot reasonably mean
+                                           anything else so ignore those, too.  */
+                                case ENOEXEC:
+                                        /* We won't go searching for the shell
+                                         * if it is not executable - the Linux
+                                         * kernel already handles this enough,
+                                         * for us. */
+                                        break;
+
+                                default:
+                                        /* Some other error means we found an executable file, but
+                                           something went wrong executing it; return the error to our
+                                           caller.  */
+                                        return -errno;
+                        }
+                } while (*p++ != '\0');
+
+                /* We tried every element and none of them worked.  */
+                if (got_eacces)
+                        /* At least one failure was due to permissions, so report that
+                           error.  */
+                        return -EACCES;
+        }
+
+        /* Return the error from the last attempt (probably ENOENT).  */
+        return -errno;
+}
+#ifdef TEST
+int main(int argc, char**argv)
+{
+        char buf[PATH_MAX];
+        int ret;
+        argc--;
+        if (!argc) {
+                fprintf(stderr, "Not enough arguments\n");
+                return 1;
+        }
+        argv++;
+        if (ret = execvp_noalloc(buf, argv[0], argv)) {
+                errno = -ret;
+                perror("execvp_noalloc");
+        }
+        return 0;
+}
+#endif
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c
index d13299cfa318..c7ad6306e22f 100644
--- a/arch/um/os-Linux/helper.c
+++ b/arch/um/os-Linux/helper.c
@@ -8,18 +8,21 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sched.h>
+#include <limits.h>
 #include <sys/signal.h>
 #include <sys/wait.h>
 #include "user.h"
 #include "kern_util.h"
 #include "user_util.h"
 #include "os.h"
+#include "um_malloc.h"
 
 struct helper_data {
         void (*pre_exec)(void*);
         void *pre_data;
         char **argv;
         int fd;
+        char *buf;
 };
 
 /* Debugging aid, changed only from gdb */
@@ -41,9 +44,8 @@ static int helper_child(void *arg)
         }
         if (data->pre_exec != NULL)
                 (*data->pre_exec)(data->pre_data);
-        execvp(argv[0], argv);
-        errval = -errno;
-        printk("helper_child - execve of '%s' failed - errno = %d\n", argv[0], errno);
+        errval = execvp_noalloc(data->buf, argv[0], argv);
+        printk("helper_child - execvp of '%s' failed - errno = %d\n", argv[0], -errval);
         os_write_file(data->fd, &errval, sizeof(errval));
         kill(os_getpid(), SIGKILL);
         return 0;
@@ -84,11 +86,13 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
         data.pre_data = pre_data;
         data.argv = argv;
         data.fd = fds[1];
+        data.buf = __cant_sleep() ? um_kmalloc_atomic(PATH_MAX) :
+                                        um_kmalloc(PATH_MAX);
         pid = clone(helper_child, (void *) sp, CLONE_VM | SIGCHLD, &data);
         if (pid < 0) {
                 ret = -errno;
                 printk("run_helper : clone failed, errno = %d\n", errno);
-                goto out_close;
+                goto out_free2;
         }
 
         close(fds[1]);
@@ -109,6 +113,8 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
                 CATCH_EINTR(waitpid(pid, NULL, 0));
         }
 
+out_free2:
+        kfree(data.buf);
 out_close:
         if (fds[1] != -1)
                 close(fds[1]);
diff --git a/arch/v850/kernel/v850_ksyms.c b/arch/v850/kernel/v850_ksyms.c
index 67bc48e57c60..93575fdc874d 100644
--- a/arch/v850/kernel/v850_ksyms.c
+++ b/arch/v850/kernel/v850_ksyms.c
@@ -24,7 +24,7 @@ EXPORT_SYMBOL (kernel_thread);
 EXPORT_SYMBOL (__bug);
 
 /* Networking helper routines. */
-EXPORT_SYMBOL (csum_partial_copy);
+EXPORT_SYMBOL (csum_partial_copy_nocheck);
 EXPORT_SYMBOL (csum_partial_copy_from_user);
 EXPORT_SYMBOL (ip_compute_csum);
 EXPORT_SYMBOL (ip_fast_csum);
diff --git a/arch/v850/lib/checksum.c b/arch/v850/lib/checksum.c
index fa5872633075..042158dfe17a 100644
--- a/arch/v850/lib/checksum.c
+++ b/arch/v850/lib/checksum.c
@@ -88,32 +88,32 @@ out:
  *      This is a version of ip_compute_csum() optimized for IP headers,
  *      which always checksum on 4 octet boundaries.
  */
-unsigned short ip_fast_csum(unsigned char * iph, unsigned int ihl)
+__sum16 ip_fast_csum(const void *iph, unsigned int ihl)
 {
-        return ~do_csum(iph,ihl*4);
+        return (__force __sum16)~do_csum(iph,ihl*4);
 }
 
 /*
  * this routine is used for miscellaneous IP-like checksums, mainly
  * in icmp.c
  */
-unsigned short ip_compute_csum(const unsigned char * buff, int len)
+__sum16 ip_compute_csum(const void *buff, int len)
 {
-        return ~do_csum(buff,len);
+        return (__force __sum16)~do_csum(buff,len);
 }
 
 /*
  * computes a partial checksum, e.g. for TCP/UDP fragments
  */
-unsigned int csum_partial(const unsigned char *buff, int len, unsigned int sum)
+__wsum csum_partial(const void *buff, int len, __wsum sum)
 {
         unsigned int result = do_csum(buff, len);
 
         /* add in old sum, and carry.. */
-        result += sum;
-        if(sum > result)
+        result += (__force u32)sum;
+        if ((__force u32)sum > result)
                 result += 1;
-        return result;
+        return (__force __wsum)result;
 }
 
 EXPORT_SYMBOL(csum_partial);
@@ -121,8 +121,8 @@ EXPORT_SYMBOL(csum_partial);
 /*
  * copy while checksumming, otherwise like csum_partial
  */
-unsigned int csum_partial_copy(const unsigned char *src, unsigned char *dst,
-                               int len, unsigned int sum)
+__wsum csum_partial_copy_nocheck(const void *src, void *dst,
+                               int len, __wsum sum)
 {
         /*
          * It's 2:30 am and I don't feel like doing it real ...
@@ -138,9 +138,9 @@ unsigned int csum_partial_copy(const unsigned char *src, unsigned char *dst,
  * Copy from userspace and compute checksum.  If we catch an exception
  * then zero the rest of the buffer.
  */
-unsigned int csum_partial_copy_from_user (const unsigned char *src,
-                                          unsigned char *dst,
-                                          int len, unsigned int sum,
+__wsum csum_partial_copy_from_user (const void *src,
+                                          void *dst,
+                                          int len, __wsum sum,
                                           int *err_ptr)
 {
         int missing;
diff --git a/arch/x86_64/kernel/early_printk.c b/arch/x86_64/kernel/early_printk.c
index e22ecd54870d..47b6d90349da 100644
--- a/arch/x86_64/kernel/early_printk.c
+++ b/arch/x86_64/kernel/early_printk.c
@@ -224,7 +224,7 @@ static int __init setup_early_printk(char *buf)
                 return 0;
         early_console_initialized = 1;
 
-        if (!strcmp(buf,"keep"))
+        if (strstr(buf, "keep"))
                 keep_early = 1;
 
         if (!strncmp(buf, "serial", 6)) {
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index 14654e682411..c80081a6ba41 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -754,10 +754,8 @@ void __setup_vector_irq(int cpu)
 {
         /* Initialize vector_irq on a new cpu */
         /* This function must be called with vector_lock held */
-        unsigned long flags;
         int irq, vector;
 
-
         /* Mark the inuse vectors */
         for (irq = 0; irq < NR_IRQ_VECTORS; ++irq) {
                 if (!cpu_isset(cpu, irq_domain[irq]))
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index a153d0a01b72..0d65b22f229c 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -242,12 +242,19 @@ static int dump_trace_unwind(struct unwind_frame_info *info, void *context)
  * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
  */
 
+static inline int valid_stack_ptr(struct thread_info *tinfo, void *p)
+{
+        void *t = (void *)tinfo;
+        return p > t && p < t + THREAD_SIZE - 3;
+}
+
 void dump_trace(struct task_struct *tsk, struct pt_regs *regs, unsigned long * stack,
                 struct stacktrace_ops *ops, void *data)
 {
         const unsigned cpu = smp_processor_id();
         unsigned long *irqstack_end = (unsigned long *)cpu_pda(cpu)->irqstackptr;
         unsigned used = 0;
+        struct thread_info *tinfo;
 
         if (!tsk)
                 tsk = current;
@@ -370,7 +377,8 @@ void dump_trace(struct task_struct *tsk, struct pt_regs *regs, unsigned long * s
         /*
          * This handles the process stack:
          */
-        HANDLE_STACK (((long) stack & (THREAD_SIZE-1)) != 0);
+        tinfo = current_thread_info();
+        HANDLE_STACK (valid_stack_ptr(tinfo, stack));
 #undef HANDLE_STACK
 }
 EXPORT_SYMBOL(dump_trace);
diff --git a/arch/x86_64/lib/csum-partial.c b/arch/x86_64/lib/csum-partial.c
index c493735218da..06ae630de82b 100644
--- a/arch/x86_64/lib/csum-partial.c
+++ b/arch/x86_64/lib/csum-partial.c
@@ -132,9 +132,10 @@ static __force_inline unsigned do_csum(const unsigned char *buff, unsigned len)
  *
  * it's best to have buff aligned on a 64-bit boundary
  */
-unsigned csum_partial(const unsigned char *buff, unsigned len, unsigned sum)
+__wsum csum_partial(const void *buff, int len, __wsum sum)
 {
-        return add32_with_carry(do_csum(buff, len), sum); 
+        return (__force __wsum)add32_with_carry(do_csum(buff, len),
+                                                (__force u32)sum);
 }
 
 EXPORT_SYMBOL(csum_partial);
@@ -143,7 +144,7 @@ EXPORT_SYMBOL(csum_partial);
  * this routine is used for miscellaneous IP-like checksums, mainly
  * in icmp.c
  */
-unsigned short ip_compute_csum(unsigned char * buff, int len)
+__sum16 ip_compute_csum(const void *buff, int len)
 {
         return csum_fold(csum_partial(buff,len,0));
 }
diff --git a/arch/x86_64/lib/csum-wrappers.c b/arch/x86_64/lib/csum-wrappers.c
index b1320ec58428..fd42a4a095fc 100644
--- a/arch/x86_64/lib/csum-wrappers.c
+++ b/arch/x86_64/lib/csum-wrappers.c
@@ -18,9 +18,9 @@
  * Returns an 32bit unfolded checksum of the buffer.
  * src and dst are best aligned to 64bits. 
  */ 
-unsigned int 
-csum_partial_copy_from_user(const unsigned char __user *src, unsigned char *dst,
-                            int len, unsigned int isum, int *errp)
+__wsum
+csum_partial_copy_from_user(const void __user *src, void *dst,
+                            int len, __wsum isum, int *errp)
 { 
         might_sleep();
         *errp = 0;
@@ -34,17 +34,19 @@ csum_partial_copy_from_user(const unsigned char __user *src, unsigned char *dst,
                 if (unlikely((unsigned long)src & 6)) {                 
                         while (((unsigned long)src & 6) && len >= 2) { 
                                 __u16 val16;                    
-                                *errp = __get_user(val16, (__u16 __user *)src); 
+                                *errp = __get_user(val16, (const __u16 __user *)src);
                                 if (*errp)
                                         return isum;
                                 *(__u16 *)dst = val16;
-                                isum = add32_with_carry(isum, val16); 
+                                isum = (__force __wsum)add32_with_carry(
+                                                (__force unsigned)isum, val16);
                                 src += 2; 
                                 dst += 2; 
                                 len -= 2;
                         }
                 }
-                isum = csum_partial_copy_generic((__force void *)src,dst,len,isum,errp,NULL);
+                isum = csum_partial_copy_generic((__force const void *)src,
+                                        dst, len, isum, errp, NULL);
                 if (likely(*errp == 0)) 
                         return isum;
         } 
@@ -66,9 +68,9 @@ EXPORT_SYMBOL(csum_partial_copy_from_user);
  * Returns an 32bit unfolded checksum of the buffer.
  * src and dst are best aligned to 64bits.
  */ 
-unsigned int 
-csum_partial_copy_to_user(unsigned const char *src, unsigned char __user *dst,
-                          int len, unsigned int isum, int *errp)
+__wsum
+csum_partial_copy_to_user(const void *src, void __user *dst,
+                          int len, __wsum isum, int *errp)
 { 
         might_sleep();
         if (unlikely(!access_ok(VERIFY_WRITE, dst, len))) {
@@ -79,7 +81,8 @@ csum_partial_copy_to_user(unsigned const char *src, unsigned char __user *dst,
         if (unlikely((unsigned long)dst & 6)) {
                 while (((unsigned long)dst & 6) && len >= 2) { 
                         __u16 val16 = *(__u16 *)src;
-                        isum = add32_with_carry(isum, val16);
+                        isum = (__force __wsum)add32_with_carry(
+                                        (__force unsigned)isum, val16);
                         *errp = __put_user(val16, (__u16 __user *)dst);
                         if (*errp)
                                 return isum;
@@ -104,19 +107,21 @@ EXPORT_SYMBOL(csum_partial_copy_to_user);
  * 
  * Returns an 32bit unfolded checksum of the buffer.
  */ 
-unsigned int 
-csum_partial_copy_nocheck(const unsigned char *src, unsigned char *dst, int len, unsigned int sum)
+__wsum
+csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
 { 
         return csum_partial_copy_generic(src,dst,len,sum,NULL,NULL);
 } 
 EXPORT_SYMBOL(csum_partial_copy_nocheck);
 
-unsigned short csum_ipv6_magic(struct in6_addr *saddr, struct in6_addr *daddr,
-                               __u32 len, unsigned short proto, unsigned int sum) 
+__sum16 csum_ipv6_magic(const struct in6_addr *saddr,
+                        const struct in6_addr *daddr,
+                        __u32 len, unsigned short proto, __wsum sum)
 {
         __u64 rest, sum64;
      
-        rest = (__u64)htonl(len) + (__u64)htons(proto) + (__u64)sum;
+        rest = (__force __u64)htonl(len) + (__force __u64)htons(proto) +
+                (__force __u64)sum;
         asm("  addq (%[saddr]),%[sum]\n"
             "  adcq 8(%[saddr]),%[sum]\n"
             "  adcq (%[daddr]),%[sum]\n" 
@@ -124,7 +129,7 @@ unsigned short csum_ipv6_magic(struct in6_addr *saddr, struct in6_addr *daddr,
             "  adcq $0,%[sum]\n"
             : [sum] "=r" (sum64) 
             : "[sum]" (rest),[saddr] "r" (saddr), [daddr] "r" (daddr));
-        return csum_fold(add32_with_carry(sum64 & 0xffffffff, sum64>>32));
+        return csum_fold((__force __wsum)add32_with_carry(sum64 & 0xffffffff, sum64>>32));
 }
 
 EXPORT_SYMBOL(csum_ipv6_magic);