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

1268 files changed, 56175 insertions, 18957 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 7e55ea66c6d4..84caf50725b5 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -25,6 +25,14 @@ config RWSEM_XCHGADD_ALGORITHM
         bool
         default y
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config GENERIC_FIND_NEXT_BIT
         bool
         default y
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index ad6173651995..be133f1f75a4 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -277,7 +277,7 @@ osf_fstatfs(unsigned long fd, struct osf_statfs __user *buffer, unsigned long bu
         retval = -EBADF;
         file = fget(fd);
         if (file) {
-                retval = do_osf_statfs(file->f_dentry, buffer, bufsiz);
+                retval = do_osf_statfs(file->f_path.dentry, buffer, bufsiz);
                 fput(file);
         }
         return retval;
@@ -979,7 +979,7 @@ osf_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp,
         long timeout;
         int ret = -EINVAL;
         struct fdtable *fdt;
-        int max_fdset;
+        int max_fds;
 
         timeout = MAX_SCHEDULE_TIMEOUT;
         if (tvp) {
@@ -1003,9 +1003,9 @@ osf_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp,
 
         rcu_read_lock();
         fdt = files_fdtable(current->files);
-        max_fdset = fdt->max_fdset;
+        max_fds = fdt->max_fds;
         rcu_read_unlock();
-        if (n < 0 || n > max_fdset)
+        if (n < 0 || n > max_fds)
                 goto out_nofds;
 
         /*
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index ffb7d5423cc0..3c10b9a1ddf5 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -516,10 +516,11 @@ sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn)
                 if (bus == 0 && dfn == 0) {
                         hose = pci_isa_hose;
                 } else {
-                        dev = pci_find_slot(bus, dfn);
+                        dev = pci_get_bus_and_slot(bus, dfn);
                         if (!dev)
                                 return -ENODEV;
                         hose = dev->sysdata;
+                        pci_dev_put(dev);
                 }
         }
 
diff --git a/arch/alpha/kernel/sys_miata.c b/arch/alpha/kernel/sys_miata.c
index b8b817feb1ee..910b43cd63e8 100644
--- a/arch/alpha/kernel/sys_miata.c
+++ b/arch/alpha/kernel/sys_miata.c
@@ -183,11 +183,15 @@ miata_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 
         if((slot == 7) && (PCI_FUNC(dev->devfn) == 3)) {
                 u8 irq=0;
-
-                if(pci_read_config_byte(pci_find_slot(dev->bus->number, dev->devfn & ~(7)), 0x40,&irq)!=PCIBIOS_SUCCESSFUL)
+                struct pci_dev *pdev = pci_get_slot(dev->bus, dev->devfn & ~7);
+                if(pdev == NULL || pci_read_config_byte(pdev, 0x40,&irq) != PCIBIOS_SUCCESSFUL) {
+                        pci_dev_put(pdev);
                         return -1;
-                else    
+                }
+                else    {
+                        pci_dev_put(pdev);
                         return irq;
+                }
         }
 
         return COMMON_TABLE_LOOKUP;
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c
index 93744bab73fb..e7594a7cf585 100644
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@ -200,7 +200,7 @@ nautilus_init_pci(void)
         bus = pci_scan_bus(0, alpha_mv.pci_ops, hose);
         hose->bus = bus;
 
-        irongate = pci_find_slot(0, 0);
+        irongate = pci_get_bus_and_slot(0, 0);
         bus->self = irongate;
         bus->resource[1] = &irongate_mem;
 
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/alpha/mm/fault.c b/arch/alpha/mm/fault.c
index 8871529a34e2..8aa9db834c11 100644
--- a/arch/alpha/mm/fault.c
+++ b/arch/alpha/mm/fault.c
@@ -108,7 +108,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
 
         /* If we're in an interrupt context, or have no user context,
            we must not take the fault.  */
-        if (!mm || in_interrupt())
+        if (!mm || in_atomic())
                 goto no_context;
 
 #ifdef CONFIG_ALPHA_LARGE_VMALLOC
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ce00c570459d..6783c2e5512d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -74,6 +74,14 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
         bool
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config GENERIC_HWEIGHT
         bool
         default y
@@ -223,6 +231,12 @@ config ARCH_IOP33X
         help
           Support for Intel's IOP33X (XScale) family of processors.
 
+config ARCH_IOP13XX
+        bool "IOP13xx-based"
+        select PCI
+        help
+          Support for Intel's IOP13XX (XScale) family of processors.
+
 config ARCH_IXP4XX
         bool "IXP4xx-based"
         depends on MMU
@@ -331,6 +345,8 @@ source "arch/arm/mach-iop32x/Kconfig"
 
 source "arch/arm/mach-iop33x/Kconfig"
 
+source "arch/arm/mach-iop13xx/Kconfig"
+
 source "arch/arm/mach-ixp4xx/Kconfig"
 
 source "arch/arm/mach-ixp2000/Kconfig"
@@ -374,6 +390,14 @@ config PLAT_IOP
 
 source arch/arm/mm/Kconfig
 
+config IWMMXT
+        bool "Enable iWMMXt support"
+        depends CPU_XSCALE || CPU_XSC3
+        default y if PXA27x
+        help
+          Enable support for iWMMXt context switching at run time if
+          running on a CPU that supports it.
+
 #  bool 'Use XScale PMU as timer source' CONFIG_XSCALE_PMU_TIMER
 config XSCALE_PMU
         bool
@@ -583,7 +607,7 @@ config LEDS
                    ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
                    ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                    ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
-                   ARCH_AT91RM9200 || MACH_TRIZEPS4
+                   ARCH_AT91 || MACH_TRIZEPS4
         help
           If you say Y here, the LEDs on your machine will be used
           to provide useful information about your current system status.
@@ -716,7 +740,7 @@ config XIP_PHYS_ADDR
 
 endmenu
 
-if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP)
+if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX )
 
 menu "CPU Frequency scaling"
 
@@ -743,6 +767,15 @@ config CPU_FREQ_INTEGRATOR
 
           If in doubt, say Y.
 
+config CPU_FREQ_IMX
+        tristate "CPUfreq driver for i.MX CPUs"
+        depends on ARCH_IMX && CPU_FREQ
+        default n
+        help
+          This enables the CPUfreq driver for i.MX CPUs.
+
+          If in doubt, say N.
+
 endmenu
 
 endif
@@ -921,6 +954,8 @@ source "drivers/video/Kconfig"
 
 source "sound/Kconfig"
 
+source "drivers/hid/Kconfig"
+
 source "drivers/usb/Kconfig"
 
 source "drivers/mmc/Kconfig"
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index d22f38b957db..40c5eb1f55c7 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -32,10 +32,6 @@ config DEBUG_USER
               8 - SIGSEGV faults
              16 - SIGBUS faults
 
-config DEBUG_WAITQ
-        bool "Wait queue debugging"
-        depends on DEBUG_KERNEL
-
 config DEBUG_ERRORS
         bool "Verbose kernel error messages"
         depends on DEBUG_KERNEL
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 6f4f8bf36071..000f1100b553 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -15,6 +15,8 @@ CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)
 OBJCOPYFLAGS    :=-O binary -R .note -R .comment -S
 GZFLAGS         :=-9
 #CFLAGS         +=-pipe
+# Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:
+CFLAGS          +=$(call cc-option,-marm,)
 
 # Do not use arch/arm/defconfig - it's always outdated.
 # Select a platform tht is kept up-to-date
@@ -108,6 +110,7 @@ endif
  machine-$(CONFIG_ARCH_CLPS711X)   := clps711x
  machine-$(CONFIG_ARCH_IOP32X)     := iop32x
  machine-$(CONFIG_ARCH_IOP33X)     := iop33x
+ machine-$(CONFIG_ARCH_IOP13XX)    := iop13xx
  machine-$(CONFIG_ARCH_IXP4XX)     := ixp4xx
  machine-$(CONFIG_ARCH_IXP2000)    := ixp2000
  machine-$(CONFIG_ARCH_IXP23XX)    := ixp23xx
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index f3e020f2227f..09b9d1b6844c 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -160,7 +160,7 @@ void __init gic_dist_init(void __iomem *base)
          */
         for (i = 29; i < max_irq; i++) {
                 set_irq_chip(i, &gic_chip);
-                set_irq_handler(i, do_level_IRQ);
+                set_irq_handler(i, handle_level_irq);
                 set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
         }
 
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index 80a72c75214f..cfe6f4650bc9 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -163,11 +163,11 @@ static struct locomo_dev_info locomo_devices[] = {
 #define LOCOMO_IRQ_LT_START     (IRQ_LOCOMO_LT)
 #define LOCOMO_IRQ_SPI_START    (IRQ_LOCOMO_SPI_RFR)
 
-static void locomo_handler(unsigned int irq, struct irqdesc *desc)
+static void locomo_handler(unsigned int irq, struct irq_desc *desc)
 {
         int req, i;
-        struct irqdesc *d;
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        struct irq_desc *d;
+        void __iomem *mapbase = get_irq_chip_data(irq);
 
         /* Acknowledge the parent IRQ */
         desc->chip->ack(irq);
@@ -194,7 +194,7 @@ static void locomo_ack_irq(unsigned int irq)
 
 static void locomo_mask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_ICR);
         r &= ~(0x0010 << (irq - LOCOMO_IRQ_START));
@@ -203,7 +203,7 @@ static void locomo_mask_irq(unsigned int irq)
 
 static void locomo_unmask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_ICR);
         r |= (0x0010 << (irq - LOCOMO_IRQ_START));
@@ -217,10 +217,10 @@ static struct irq_chip locomo_chip = {
         .unmask = locomo_unmask_irq,
 };
 
-static void locomo_key_handler(unsigned int irq, struct irqdesc *desc)
+static void locomo_key_handler(unsigned int irq, struct irq_desc *desc)
 {
-        struct irqdesc *d;
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        struct irq_desc *d;
+        void __iomem *mapbase = get_irq_chip_data(irq);
 
         if (locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC) & 0x0001) {
                 d = irq_desc + LOCOMO_IRQ_KEY_START;
@@ -230,7 +230,7 @@ static void locomo_key_handler(unsigned int irq, struct irqdesc *desc)
 
 static void locomo_key_ack_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
         r &= ~(0x0100 << (irq - LOCOMO_IRQ_KEY_START));
@@ -239,7 +239,7 @@ static void locomo_key_ack_irq(unsigned int irq)
 
 static void locomo_key_mask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
         r &= ~(0x0010 << (irq - LOCOMO_IRQ_KEY_START));
@@ -248,7 +248,7 @@ static void locomo_key_mask_irq(unsigned int irq)
 
 static void locomo_key_unmask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
         r |= (0x0010 << (irq - LOCOMO_IRQ_KEY_START));
@@ -262,11 +262,11 @@ static struct irq_chip locomo_key_chip = {
         .unmask = locomo_key_unmask_irq,
 };
 
-static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc)
+static void locomo_gpio_handler(unsigned int irq, struct irq_desc *desc)
 {
         int req, i;
-        struct irqdesc *d;
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        struct irq_desc *d;
+        void __iomem *mapbase = get_irq_chip_data(irq);
 
         req =   locomo_readl(mapbase + LOCOMO_GIR) &
                 locomo_readl(mapbase + LOCOMO_GPD) &
@@ -285,7 +285,7 @@ static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc)
 
 static void locomo_gpio_ack_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_GWE);
         r |= (0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
@@ -302,7 +302,7 @@ static void locomo_gpio_ack_irq(unsigned int irq)
 
 static void locomo_gpio_mask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_GIE);
         r &= ~(0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
@@ -311,7 +311,7 @@ static void locomo_gpio_mask_irq(unsigned int irq)
 
 static void locomo_gpio_unmask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_GIE);
         r |= (0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
@@ -325,10 +325,10 @@ static struct irq_chip locomo_gpio_chip = {
         .unmask = locomo_gpio_unmask_irq,
 };
 
-static void locomo_lt_handler(unsigned int irq, struct irqdesc *desc)
+static void locomo_lt_handler(unsigned int irq, struct irq_desc *desc)
 {
-        struct irqdesc *d;
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        struct irq_desc *d;
+        void __iomem *mapbase = get_irq_chip_data(irq);
 
         if (locomo_readl(mapbase + LOCOMO_LTINT) & 0x0001) {
                 d = irq_desc + LOCOMO_IRQ_LT_START;
@@ -338,7 +338,7 @@ static void locomo_lt_handler(unsigned int irq, struct irqdesc *desc)
 
 static void locomo_lt_ack_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_LTINT);
         r &= ~(0x0100 << (irq - LOCOMO_IRQ_LT_START));
@@ -347,7 +347,7 @@ static void locomo_lt_ack_irq(unsigned int irq)
 
 static void locomo_lt_mask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_LTINT);
         r &= ~(0x0010 << (irq - LOCOMO_IRQ_LT_START));
@@ -356,7 +356,7 @@ static void locomo_lt_mask_irq(unsigned int irq)
 
 static void locomo_lt_unmask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_LTINT);
         r |= (0x0010 << (irq - LOCOMO_IRQ_LT_START));
@@ -370,11 +370,11 @@ static struct irq_chip locomo_lt_chip = {
         .unmask = locomo_lt_unmask_irq,
 };
 
-static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc)
+static void locomo_spi_handler(unsigned int irq, struct irq_desc *desc)
 {
         int req, i;
-        struct irqdesc *d;
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        struct irq_desc *d;
+        void __iomem *mapbase = get_irq_chip_data(irq);
 
         req = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIR) & 0x000F;
         if (req) {
@@ -391,7 +391,7 @@ static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc)
 
 static void locomo_spi_ack_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIWE);
         r |= (0x0001 << (irq - LOCOMO_IRQ_SPI_START));
@@ -408,7 +408,7 @@ static void locomo_spi_ack_irq(unsigned int irq)
 
 static void locomo_spi_mask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIE);
         r &= ~(0x0001 << (irq - LOCOMO_IRQ_SPI_START));
@@ -417,7 +417,7 @@ static void locomo_spi_mask_irq(unsigned int irq)
 
 static void locomo_spi_unmask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIE);
         r |= (0x0001 << (irq - LOCOMO_IRQ_SPI_START));
@@ -440,55 +440,55 @@ static void locomo_setup_irq(struct locomo *lchip)
          * Install handler for IRQ_LOCOMO_HW.
          */
         set_irq_type(lchip->irq, IRQT_FALLING);
-        set_irq_chipdata(lchip->irq, irqbase);
+        set_irq_chip_data(lchip->irq, irqbase);
         set_irq_chained_handler(lchip->irq, locomo_handler);
 
         /* Install handlers for IRQ_LOCOMO_*_BASE */
         set_irq_chip(IRQ_LOCOMO_KEY_BASE, &locomo_chip);
-        set_irq_chipdata(IRQ_LOCOMO_KEY_BASE, irqbase);
+        set_irq_chip_data(IRQ_LOCOMO_KEY_BASE, irqbase);
         set_irq_chained_handler(IRQ_LOCOMO_KEY_BASE, locomo_key_handler);
         set_irq_flags(IRQ_LOCOMO_KEY_BASE, IRQF_VALID | IRQF_PROBE);
 
         set_irq_chip(IRQ_LOCOMO_GPIO_BASE, &locomo_chip);
-        set_irq_chipdata(IRQ_LOCOMO_GPIO_BASE, irqbase);
+        set_irq_chip_data(IRQ_LOCOMO_GPIO_BASE, irqbase);
         set_irq_chained_handler(IRQ_LOCOMO_GPIO_BASE, locomo_gpio_handler);
         set_irq_flags(IRQ_LOCOMO_GPIO_BASE, IRQF_VALID | IRQF_PROBE);
 
         set_irq_chip(IRQ_LOCOMO_LT_BASE, &locomo_chip);
-        set_irq_chipdata(IRQ_LOCOMO_LT_BASE, irqbase);
+        set_irq_chip_data(IRQ_LOCOMO_LT_BASE, irqbase);
         set_irq_chained_handler(IRQ_LOCOMO_LT_BASE, locomo_lt_handler);
         set_irq_flags(IRQ_LOCOMO_LT_BASE, IRQF_VALID | IRQF_PROBE);
 
         set_irq_chip(IRQ_LOCOMO_SPI_BASE, &locomo_chip);
-        set_irq_chipdata(IRQ_LOCOMO_SPI_BASE, irqbase);
+        set_irq_chip_data(IRQ_LOCOMO_SPI_BASE, irqbase);
         set_irq_chained_handler(IRQ_LOCOMO_SPI_BASE, locomo_spi_handler);
         set_irq_flags(IRQ_LOCOMO_SPI_BASE, IRQF_VALID | IRQF_PROBE);
 
         /* install handlers for IRQ_LOCOMO_KEY_BASE generated interrupts */
         set_irq_chip(LOCOMO_IRQ_KEY_START, &locomo_key_chip);
-        set_irq_chipdata(LOCOMO_IRQ_KEY_START, irqbase);
-        set_irq_handler(LOCOMO_IRQ_KEY_START, do_edge_IRQ);
+        set_irq_chip_data(LOCOMO_IRQ_KEY_START, irqbase);
+        set_irq_handler(LOCOMO_IRQ_KEY_START, handle_edge_irq);
         set_irq_flags(LOCOMO_IRQ_KEY_START, IRQF_VALID | IRQF_PROBE);
 
         /* install handlers for IRQ_LOCOMO_GPIO_BASE generated interrupts */
         for (irq = LOCOMO_IRQ_GPIO_START; irq < LOCOMO_IRQ_GPIO_START + 16; irq++) {
                 set_irq_chip(irq, &locomo_gpio_chip);
-                set_irq_chipdata(irq, irqbase);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_chip_data(irq, irqbase);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
         /* install handlers for IRQ_LOCOMO_LT_BASE generated interrupts */
         set_irq_chip(LOCOMO_IRQ_LT_START, &locomo_lt_chip);
-        set_irq_chipdata(LOCOMO_IRQ_LT_START, irqbase);
-        set_irq_handler(LOCOMO_IRQ_LT_START, do_edge_IRQ);
+        set_irq_chip_data(LOCOMO_IRQ_LT_START, irqbase);
+        set_irq_handler(LOCOMO_IRQ_LT_START, handle_edge_irq);
         set_irq_flags(LOCOMO_IRQ_LT_START, IRQF_VALID | IRQF_PROBE);
 
         /* install handlers for IRQ_LOCOMO_SPI_BASE generated interrupts */
         for (irq = LOCOMO_IRQ_SPI_START; irq < LOCOMO_IRQ_SPI_START + 3; irq++) {
                 set_irq_chip(irq, &locomo_spi_chip);
-                set_irq_chipdata(irq, irqbase);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_chip_data(irq, irqbase);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 }
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index d5f72010a6f3..fe3f05901a23 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -147,7 +147,7 @@ void __init sa1111_adjust_zones(int node, unsigned long *size, unsigned long *ho
  * will call us again if there are more interrupts to process.
  */
 static void
-sa1111_irq_handler(unsigned int irq, struct irqdesc *desc)
+sa1111_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         unsigned int stat0, stat1, i;
         void __iomem *base = get_irq_data(irq);
@@ -187,7 +187,7 @@ static void sa1111_ack_irq(unsigned int irq)
 
 static void sa1111_mask_lowirq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ie0;
 
         ie0 = sa1111_readl(mapbase + SA1111_INTEN0);
@@ -197,7 +197,7 @@ static void sa1111_mask_lowirq(unsigned int irq)
 
 static void sa1111_unmask_lowirq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ie0;
 
         ie0 = sa1111_readl(mapbase + SA1111_INTEN0);
@@ -215,7 +215,7 @@ static void sa1111_unmask_lowirq(unsigned int irq)
 static int sa1111_retrigger_lowirq(unsigned int irq)
 {
         unsigned int mask = SA1111_IRQMASK_LO(irq);
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ip0;
         int i;
 
@@ -236,7 +236,7 @@ static int sa1111_retrigger_lowirq(unsigned int irq)
 static int sa1111_type_lowirq(unsigned int irq, unsigned int flags)
 {
         unsigned int mask = SA1111_IRQMASK_LO(irq);
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ip0;
 
         if (flags == IRQT_PROBE)
@@ -259,7 +259,7 @@ static int sa1111_type_lowirq(unsigned int irq, unsigned int flags)
 static int sa1111_wake_lowirq(unsigned int irq, unsigned int on)
 {
         unsigned int mask = SA1111_IRQMASK_LO(irq);
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long we0;
 
         we0 = sa1111_readl(mapbase + SA1111_WAKEEN0);
@@ -284,7 +284,7 @@ static struct irq_chip sa1111_low_chip = {
 
 static void sa1111_mask_highirq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ie1;
 
         ie1 = sa1111_readl(mapbase + SA1111_INTEN1);
@@ -294,7 +294,7 @@ static void sa1111_mask_highirq(unsigned int irq)
 
 static void sa1111_unmask_highirq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ie1;
 
         ie1 = sa1111_readl(mapbase + SA1111_INTEN1);
@@ -312,7 +312,7 @@ static void sa1111_unmask_highirq(unsigned int irq)
 static int sa1111_retrigger_highirq(unsigned int irq)
 {
         unsigned int mask = SA1111_IRQMASK_HI(irq);
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ip1;
         int i;
 
@@ -333,7 +333,7 @@ static int sa1111_retrigger_highirq(unsigned int irq)
 static int sa1111_type_highirq(unsigned int irq, unsigned int flags)
 {
         unsigned int mask = SA1111_IRQMASK_HI(irq);
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ip1;
 
         if (flags == IRQT_PROBE)
@@ -356,7 +356,7 @@ static int sa1111_type_highirq(unsigned int irq, unsigned int flags)
 static int sa1111_wake_highirq(unsigned int irq, unsigned int on)
 {
         unsigned int mask = SA1111_IRQMASK_HI(irq);
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long we1;
 
         we1 = sa1111_readl(mapbase + SA1111_WAKEEN1);
@@ -410,15 +410,15 @@ static void sa1111_setup_irq(struct sa1111 *sachip)
 
         for (irq = IRQ_GPAIN0; irq <= SSPROR; irq++) {
                 set_irq_chip(irq, &sa1111_low_chip);
-                set_irq_chipdata(irq, irqbase);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_chip_data(irq, irqbase);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
         for (irq = AUDXMTDMADONEA; irq <= IRQ_S1_BVD1_STSCHG; irq++) {
                 set_irq_chip(irq, &sa1111_high_chip);
-                set_irq_chipdata(irq, irqbase);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_chip_data(irq, irqbase);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c
index 605dedf96790..b3599743093b 100644
--- a/arch/arm/common/sharpsl_pm.c
+++ b/arch/arm/common/sharpsl_pm.c
@@ -60,16 +60,16 @@ static int sharpsl_ac_check(void);
 static int sharpsl_fatal_check(void);
 static int sharpsl_average_value(int ad);
 static void sharpsl_average_clear(void);
-static void sharpsl_charge_toggle(void *private_);
-static void sharpsl_battery_thread(void *private_);
+static void sharpsl_charge_toggle(struct work_struct *private_);
+static void sharpsl_battery_thread(struct work_struct *private_);
 
 
 /*
  * Variables
  */
 struct sharpsl_pm_status sharpsl_pm;
-DECLARE_WORK(toggle_charger, sharpsl_charge_toggle, NULL);
-DECLARE_WORK(sharpsl_bat, sharpsl_battery_thread, NULL);
+DECLARE_DELAYED_WORK(toggle_charger, sharpsl_charge_toggle);
+DECLARE_DELAYED_WORK(sharpsl_bat, sharpsl_battery_thread);
 DEFINE_LED_TRIGGER(sharpsl_charge_led_trigger);
 
 
@@ -116,7 +116,7 @@ void sharpsl_battery_kick(void)
 EXPORT_SYMBOL(sharpsl_battery_kick);
 
 
-static void sharpsl_battery_thread(void *private_)
+static void sharpsl_battery_thread(struct work_struct *private_)
 {
         int voltage, percent, apm_status, i = 0;
 
@@ -128,7 +128,7 @@ static void sharpsl_battery_thread(void *private_)
         /* Corgi cannot confirm when battery fully charged so periodically kick! */
         if (!sharpsl_pm.machinfo->batfull_irq && (sharpsl_pm.charge_mode == CHRG_ON)
                         && time_after(jiffies, sharpsl_pm.charge_start_time +  SHARPSL_CHARGE_ON_TIME_INTERVAL))
-                schedule_work(&toggle_charger);
+                schedule_delayed_work(&toggle_charger, 0);
 
         while(1) {
                 voltage = sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT);
@@ -212,7 +212,7 @@ static void sharpsl_charge_off(void)
         sharpsl_pm_led(SHARPSL_LED_OFF);
         sharpsl_pm.charge_mode = CHRG_OFF;
 
-        schedule_work(&sharpsl_bat);
+        schedule_delayed_work(&sharpsl_bat, 0);
 }
 
 static void sharpsl_charge_error(void)
@@ -222,7 +222,7 @@ static void sharpsl_charge_error(void)
         sharpsl_pm.charge_mode = CHRG_ERROR;
 }
 
-static void sharpsl_charge_toggle(void *private_)
+static void sharpsl_charge_toggle(struct work_struct *private_)
 {
         dev_dbg(sharpsl_pm.dev, "Toogling Charger at time: %lx\n", jiffies);
 
@@ -254,7 +254,7 @@ static void sharpsl_ac_timer(unsigned long data)
         else if (sharpsl_pm.charge_mode == CHRG_ON)
                 sharpsl_charge_off();
 
-        schedule_work(&sharpsl_bat);
+        schedule_delayed_work(&sharpsl_bat, 0);
 }
 
 
@@ -279,10 +279,10 @@ static void sharpsl_chrg_full_timer(unsigned long data)
                         sharpsl_charge_off();
         } else if (sharpsl_pm.full_count < 2) {
                 dev_dbg(sharpsl_pm.dev, "Charge Full: Count too low\n");
-                schedule_work(&toggle_charger);
+                schedule_delayed_work(&toggle_charger, 0);
         } else if (time_after(jiffies, sharpsl_pm.charge_start_time + SHARPSL_CHARGE_FINISH_TIME)) {
                 dev_dbg(sharpsl_pm.dev, "Charge Full: Interrupt generated too slowly - retry.\n");
-                schedule_work(&toggle_charger);
+                schedule_delayed_work(&toggle_charger, 0);
         } else {
                 sharpsl_charge_off();
                 sharpsl_pm.charge_mode = CHRG_DONE;
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 43d278134521..c026fa2214a3 100644
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -27,14 +27,14 @@
 
 static void vic_mask_irq(unsigned int irq)
 {
-        void __iomem *base = get_irq_chipdata(irq);
+        void __iomem *base = get_irq_chip_data(irq);
         irq &= 31;
         writel(1 << irq, base + VIC_INT_ENABLE_CLEAR);
 }
 
 static void vic_unmask_irq(unsigned int irq)
 {
-        void __iomem *base = get_irq_chipdata(irq);
+        void __iomem *base = get_irq_chip_data(irq);
         irq &= 31;
         writel(1 << irq, base + VIC_INT_ENABLE);
 }
@@ -88,10 +88,10 @@ void __init vic_init(void __iomem *base, unsigned int irq_start,
                 unsigned int irq = irq_start + i;
 
                 set_irq_chip(irq, &vic_chip);
-                set_irq_chipdata(irq, base);
+                set_irq_chip_data(irq, base);
 
                 if (vic_sources & (1 << i)) {
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
                 }
         }
diff --git a/arch/arm/configs/at91rm9200dk_defconfig b/arch/arm/configs/at91rm9200dk_defconfig
index b43041476e02..e10d003566d6 100644
--- a/arch/arm/configs/at91rm9200dk_defconfig
+++ b/arch/arm/configs/at91rm9200dk_defconfig
@@ -357,9 +357,9 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0x10000000
-CONFIG_MTD_PHYSMAP_LEN=0x200000
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+CONFIG_MTD_PHYSMAP_START=0
+CONFIG_MTD_PHYSMAP_LEN=0
+CONFIG_MTD_PHYSMAP_BANKWIDTH=0
 # CONFIG_MTD_ARM_INTEGRATOR is not set
 # CONFIG_MTD_IMPA7 is not set
 # CONFIG_MTD_PLATRAM is not set
@@ -585,7 +585,9 @@ CONFIG_AT91RM9200_WATCHDOG=y
 # CONFIG_USBPCWATCHDOG is not set
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
-CONFIG_AT91_RTC=y
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_AT91RM9200=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
@@ -979,7 +981,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 # CONFIG_DEBUG_ERRORS is not set
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/at91rm9200ek_defconfig b/arch/arm/configs/at91rm9200ek_defconfig
index d96fc8386e2f..834dddb51314 100644
--- a/arch/arm/configs/at91rm9200ek_defconfig
+++ b/arch/arm/configs/at91rm9200ek_defconfig
@@ -348,9 +348,9 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0x10000000
-CONFIG_MTD_PHYSMAP_LEN=0x800000
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+CONFIG_MTD_PHYSMAP_START=0
+CONFIG_MTD_PHYSMAP_LEN=0
+CONFIG_MTD_PHYSMAP_BANKWIDTH=0
 # CONFIG_MTD_ARM_INTEGRATOR is not set
 # CONFIG_MTD_IMPA7 is not set
 # CONFIG_MTD_PLATRAM is not set
@@ -566,7 +566,9 @@ CONFIG_AT91RM9200_WATCHDOG=y
 # CONFIG_USBPCWATCHDOG is not set
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
-CONFIG_AT91_RTC=y
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_AT91RM9200=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
@@ -968,7 +970,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 # CONFIG_DEBUG_ERRORS is not set
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig
new file mode 100644
index 000000000000..79049206dfa5
--- /dev/null
+++ b/arch/arm/configs/at91sam9260ek_defconfig
@@ -0,0 +1,950 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.19-rc6
+# Fri Nov 17 18:42:21 2006
+#
+CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+CONFIG_ARCH_AT91=y
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+
+#
+# Atmel AT91 System-on-Chip
+#
+# CONFIG_ARCH_AT91RM9200 is not set
+CONFIG_ARCH_AT91SAM9260=y
+# CONFIG_ARCH_AT91SAM9261 is not set
+
+#
+# AT91SAM9260 Board Type
+#
+CONFIG_MACH_AT91SAM9260EK=y
+
+#
+# AT91 Board Options
+#
+# CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set
+
+#
+# AT91 Feature Selections
+#
+# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+CONFIG_HZ=100
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+# CONFIG_LEDS is not set
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
+# CONFIG_XIP_KERNEL is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+# CONFIG_VFP is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+# CONFIG_PM is not set
+# CONFIG_APM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+# CONFIG_NETDEVICES is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+# CONFIG_SERIAL_ATMEL_TTYAT is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_NVRAM is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Misc devices
+#
+# CONFIG_TIFM_CORE is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+CONFIG_USB_STORAGE_DEBUG=y
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_PXA2XX is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+CONFIG_USB_GADGET_AT91=y
+CONFIG_USB_AT91=y
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
+CONFIG_USB_ZERO=m
+# CONFIG_USB_ETH is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_CRAMFS=y
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_850=y
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FRAME_POINTER=y
+CONFIG_FORCED_INLINING=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_DEBUG_USER=y
+# CONFIG_DEBUG_WAITQ is not set
+# CONFIG_DEBUG_ERRORS is not set
+CONFIG_DEBUG_LL=y
+# CONFIG_DEBUG_ICEDCC is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_PLIST=y
diff --git a/arch/arm/configs/at91sam9261ek_defconfig b/arch/arm/configs/at91sam9261ek_defconfig
new file mode 100644
index 000000000000..784ad7c0186d
--- /dev/null
+++ b/arch/arm/configs/at91sam9261ek_defconfig
@@ -0,0 +1,1106 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.19-rc6
+# Fri Nov 17 18:00:38 2006
+#
+CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+CONFIG_ARCH_AT91=y
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+
+#
+# Atmel AT91 System-on-Chip
+#
+# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_ARCH_AT91SAM9260 is not set
+CONFIG_ARCH_AT91SAM9261=y
+
+#
+# AT91SAM9261 Board Type
+#
+CONFIG_MACH_AT91SAM9261EK=y
+
+#
+# AT91 Board Options
+#
+# CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set
+
+#
+# AT91 Feature Selections
+#
+# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+CONFIG_HZ=100
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+# CONFIG_LEDS is not set
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
+# CONFIG_XIP_KERNEL is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+# CONFIG_VFP is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+# CONFIG_PM is not set
+# CONFIG_APM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+# CONFIG_MTD_CHAR is not set
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+CONFIG_MTD_NAND_AT91=y
+# CONFIG_MTD_NAND_NANDSIM is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_SMC91X is not set
+CONFIG_DM9000=y
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+# CONFIG_SERIAL_ATMEL_TTYAT is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_NVRAM is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+CONFIG_I2C_AT91=y
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_PCA is not set
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Misc devices
+#
+# CONFIG_TIFM_CORE is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+CONFIG_USB_STORAGE_DEBUG=y
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_PXA2XX is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+CONFIG_USB_GADGET_AT91=y
+CONFIG_USB_AT91=y
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
+CONFIG_USB_ZERO=m
+# CONFIG_USB_ETH is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_AT91=m
+# CONFIG_MMC_TIFM_SD is not set
+
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+CONFIG_CRAMFS=y
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_850=y
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FRAME_POINTER=y
+CONFIG_FORCED_INLINING=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_DEBUG_USER=y
+# CONFIG_DEBUG_WAITQ is not set
+# CONFIG_DEBUG_ERRORS is not set
+CONFIG_DEBUG_LL=y
+# CONFIG_DEBUG_ICEDCC is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_PLIST=y
diff --git a/arch/arm/configs/badge4_defconfig b/arch/arm/configs/badge4_defconfig
index cfe6bd8e81cd..821865f75605 100644
--- a/arch/arm/configs/badge4_defconfig
+++ b/arch/arm/configs/badge4_defconfig
@@ -1216,7 +1216,6 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/carmeva_defconfig b/arch/arm/configs/carmeva_defconfig
index d24ae8777c35..d392833b31fb 100644
--- a/arch/arm/configs/carmeva_defconfig
+++ b/arch/arm/configs/carmeva_defconfig
@@ -474,7 +474,7 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_WATCHDOG is not set
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
-# CONFIG_AT91_RTC is not set
+# CONFIG_AT91RM9200_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
diff --git a/arch/arm/configs/cerfcube_defconfig b/arch/arm/configs/cerfcube_defconfig
index 09b7acd7f647..ee130b528bd4 100644
--- a/arch/arm/configs/cerfcube_defconfig
+++ b/arch/arm/configs/cerfcube_defconfig
@@ -851,7 +851,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/collie_defconfig b/arch/arm/configs/collie_defconfig
index a3758913c0bb..970c8c772eb7 100644
--- a/arch/arm/configs/collie_defconfig
+++ b/arch/arm/configs/collie_defconfig
@@ -934,7 +934,6 @@ CONFIG_FRAME_POINTER=y
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 # CONFIG_DEBUG_LL is not set
 
diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig
index c41c04fa5020..e8980a9bb893 100644
--- a/arch/arm/configs/corgi_defconfig
+++ b/arch/arm/configs/corgi_defconfig
@@ -1513,7 +1513,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/csb337_defconfig b/arch/arm/configs/csb337_defconfig
index 20e68250d835..2cadd51506bb 100644
--- a/arch/arm/configs/csb337_defconfig
+++ b/arch/arm/configs/csb337_defconfig
@@ -1113,7 +1113,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 # CONFIG_DEBUG_ERRORS is not set
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/csb637_defconfig b/arch/arm/configs/csb637_defconfig
index df8595ac031f..94908c1df4cf 100644
--- a/arch/arm/configs/csb637_defconfig
+++ b/arch/arm/configs/csb637_defconfig
@@ -623,7 +623,7 @@ CONFIG_AT91RM9200_WATCHDOG=y
 # CONFIG_USBPCWATCHDOG is not set
 # CONFIG_NVRAM is not set
 CONFIG_RTC=y
-# CONFIG_AT91_RTC is not set
+# CONFIG_AT91RM9200_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
@@ -1062,7 +1062,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 # CONFIG_DEBUG_ERRORS is not set
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig
index 3b4802a849e4..24a701ab33e5 100644
--- a/arch/arm/configs/ep93xx_defconfig
+++ b/arch/arm/configs/ep93xx_defconfig
@@ -1,14 +1,18 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-rc1-git9
-# Sat Jul 15 15:08:10 2006
+# Linux kernel version: 2.6.20-rc1
+# Sat Dec 16 06:05:24 2006
 #
 CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_VECTORS_BASE=0xffff0000
@@ -28,18 +32,22 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-CONFIG_SYSCTL=y
+# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -48,12 +56,12 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
-CONFIG_RT_MUTEXES=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
 CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -71,7 +79,10 @@ CONFIG_KMOD=y
 #
 # Block layer
 #
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
 
 #
 # IO Schedulers
@@ -103,7 +114,9 @@ CONFIG_ARCH_EP93XX=y
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
@@ -125,7 +138,9 @@ CONFIG_CRUNCH=y
 #
 # EP93xx Platforms
 #
+CONFIG_MACH_ADSSPHERE=y
 CONFIG_MACH_EDB9302=y
+CONFIG_MACH_EDB9302A=y
 CONFIG_MACH_EDB9312=y
 CONFIG_MACH_EDB9315=y
 CONFIG_MACH_EDB9315A=y
@@ -137,12 +152,14 @@ CONFIG_MACH_TS72XX=y
 #
 CONFIG_CPU_32=y
 CONFIG_CPU_ARM920T=y
-CONFIG_CPU_32v4=y
+CONFIG_CPU_32v4T=y
 CONFIG_CPU_ABRT_EV4T=y
 CONFIG_CPU_CACHE_V4WT=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_COPY_V4WB=y
 CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
 
 #
 # Processor Features
@@ -229,6 +246,7 @@ CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
 CONFIG_NET_KEY=y
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -249,13 +267,29 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_TUNNEL is not set
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
-# CONFIG_IPV6 is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 
@@ -282,7 +316,6 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 
@@ -329,7 +362,7 @@ CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
 
 #
@@ -341,6 +374,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -429,7 +463,7 @@ CONFIG_MTD_NAND_IDS=y
 #
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_NBD=y
 # CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -441,6 +475,8 @@ CONFIG_MTD_NAND_IDS=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
 # CONFIG_SCSI_PROC_FS is not set
 
 #
@@ -459,23 +495,29 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
 
 #
-# SCSI Transport Attributes
+# SCSI Transports
 #
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
 
 #
 # SCSI low-level drivers
 #
 # CONFIG_ISCSI_TCP is not set
-# CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_DEBUG is not set
 
 #
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
 # Multi-device support (RAID and LVM)
 #
 # CONFIG_MD is not set
@@ -512,6 +554,7 @@ CONFIG_NETDEVICES=y
 #
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+CONFIG_EP93XX_ETH=y
 # CONFIG_SMC91X is not set
 # CONFIG_DM9000 is not set
 
@@ -606,17 +649,12 @@ CONFIG_EP93XX_WATCHDOG=y
 # CONFIG_NVRAM is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_RAW_DRIVER is not set
 
 #
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
 
 #
 # I2C support
@@ -644,7 +682,7 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_EEPROM is not set
+CONFIG_SENSORS_EEPROM=y
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
@@ -663,6 +701,7 @@ CONFIG_I2C_DEBUG_CHIP=y
 #
 # Dallas's 1-wire bus
 #
+# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
@@ -696,12 +735,15 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
@@ -710,6 +752,7 @@ CONFIG_HWMON=y
 #
 # Misc devices
 #
+# CONFIG_TIFM_CORE is not set
 
 #
 # LED devices
@@ -728,7 +771,6 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
@@ -741,6 +783,7 @@ CONFIG_VIDEO_V4L2=y
 #
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
@@ -762,6 +805,7 @@ CONFIG_USB_DEBUG=y
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
 CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_MULTITHREAD_PROBE is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -796,12 +840,12 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_LIBUSUAL is not set
 
 #
 # USB Input Devices
 #
-# CONFIG_USB_HID is not set
 
 #
 # USB HID Boot Protocol drivers
@@ -820,6 +864,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 CONFIG_USB_RTL8150=y
+# CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_USBNET is not set
 # CONFIG_USB_MON is not set
 
@@ -833,8 +878,8 @@ CONFIG_USB_RTL8150=y
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_CONSOLE=y
 # CONFIG_USB_SERIAL_GENERIC is not set
+# CONFIG_USB_SERIAL_AIRCABLE is not set
 # CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_ANYDATA is not set
 # CONFIG_USB_SERIAL_ARK3116 is not set
 # CONFIG_USB_SERIAL_BELKIN is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
@@ -856,6 +901,8 @@ CONFIG_USB_SERIAL_CONSOLE=y
 # CONFIG_USB_SERIAL_KLSI is not set
 # CONFIG_USB_SERIAL_KOBIL_SCT is not set
 # CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
 # CONFIG_USB_SERIAL_NAVMAN is not set
 CONFIG_USB_SERIAL_PL2303=y
 # CONFIG_USB_SERIAL_HP4X is not set
@@ -866,12 +913,14 @@ CONFIG_USB_SERIAL_PL2303=y
 # CONFIG_USB_SERIAL_XIRCOM is not set
 # CONFIG_USB_SERIAL_OPTION is not set
 # CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
 
 #
 # USB Miscellaneous drivers
 #
 # CONFIG_USB_EMI62 is not set
 # CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
 # CONFIG_USB_AUERSWALD is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
@@ -879,11 +928,12 @@ CONFIG_USB_SERIAL_PL2303=y
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_PHIDGET is not set
 # CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_TEST is not set
 
 #
@@ -907,6 +957,7 @@ CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
 
 #
 # RTC interfaces
@@ -920,7 +971,7 @@ CONFIG_RTC_INTF_DEV=y
 # RTC drivers
 #
 # CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_DS1307 is not set
+CONFIG_RTC_DRV_DS1307=y
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
@@ -942,12 +993,14 @@ CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4DEV_FS is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -979,8 +1032,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
@@ -1101,6 +1156,11 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -1109,8 +1169,11 @@ CONFIG_NLS_ISO8859_1=y
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
@@ -1127,14 +1190,12 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_UNWIND_INFO is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_WAITQ=y
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
@@ -1151,12 +1212,9 @@ CONFIG_DEBUG_LL=y
 # CONFIG_CRYPTO is not set
 
 #
-# Hardware crypto devices
-#
-
-#
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
@@ -1164,3 +1222,4 @@ CONFIG_LIBCRC32C=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff --git a/arch/arm/configs/h7202_defconfig b/arch/arm/configs/h7202_defconfig
index 9d62ed16bf57..0e739af52713 100644
--- a/arch/arm/configs/h7202_defconfig
+++ b/arch/arm/configs/h7202_defconfig
@@ -702,7 +702,6 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 # CONFIG_DEBUG_ERRORS is not set
 # CONFIG_DEBUG_LL is not set
 
diff --git a/arch/arm/configs/hackkit_defconfig b/arch/arm/configs/hackkit_defconfig
index a45b57582b86..1c8fb89a6730 100644
--- a/arch/arm/configs/hackkit_defconfig
+++ b/arch/arm/configs/hackkit_defconfig
@@ -740,7 +740,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_WAITQ=y
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig
index 692ab57ba1ca..3ce96e60b409 100644
--- a/arch/arm/configs/integrator_defconfig
+++ b/arch/arm/configs/integrator_defconfig
@@ -835,7 +835,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 # CONFIG_DEBUG_LL is not set
 
diff --git a/arch/arm/configs/iop13xx_defconfig b/arch/arm/configs/iop13xx_defconfig
new file mode 100644
index 000000000000..43c4a37e9247
--- /dev/null
+++ b/arch/arm/configs/iop13xx_defconfig
@@ -0,0 +1,1209 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.20-rc1-git5
+# Tue Dec 19 21:38:01 2006
+#
+CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+CONFIG_ARCH_IOP13XX=y
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+
+#
+# IOP13XX Implementation Options
+#
+
+#
+# IOP13XX Platform Support
+#
+CONFIG_MACH_IQ81340SC=y
+CONFIG_MACH_IQ81340MC=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_XSC3=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+CONFIG_IO_36=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+# CONFIG_IWMMXT is not set
+
+#
+# Bus support
+#
+CONFIG_PCI=y
+# CONFIG_PCI_MULTITHREAD_PROBE is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+CONFIG_HZ=100
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="ip=bootp root=nfs console=ttyS0,115200 nfsroot=,tcp,v3,wsize=8192,rsize=8192"
+# CONFIG_XIP_KERNEL is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_AOUT=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+# CONFIG_PM is not set
+# CONFIG_APM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=y
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
+CONFIG_MTD_REDBOOT_PARTS_READONLY=y
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+# CONFIG_MTD_CHAR is not set
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_GEOMETRY is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0xfa000000
+CONFIG_MTD_PHYSMAP_LEN=0x0
+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_NBD=y
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=2
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+CONFIG_SCSI_ISCSI_ATTRS=y
+CONFIG_SCSI_SAS_ATTRS=y
+# CONFIG_SCSI_SAS_LIBSAS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+# CONFIG_MD_LINEAR is not set
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID10=y
+CONFIG_MD_RAID456=y
+# CONFIG_MD_RAID5_RESHAPE is not set
+# CONFIG_MD_MULTIPATH is not set
+# CONFIG_MD_FAULTY is not set
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+# CONFIG_DM_CRYPT is not set
+# CONFIG_DM_SNAPSHOT is not set
+# CONFIG_DM_MIRROR is not set
+# CONFIG_DM_ZERO is not set
+# CONFIG_DM_MULTIPATH is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# PHY device support
+#
+
+#
+# Ethernet (10 or 100Mbit)
+#
+# CONFIG_NET_ETHERNET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+CONFIG_E1000=y
+CONFIG_E1000_NAPI=y
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_NVRAM is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+# CONFIG_I2C_CHARDEV is not set
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCF=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+CONFIG_I2C_IOP3XX=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# HID Devices
+#
+CONFIG_HID=y
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+CONFIG_ECRYPT_FS=y
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_FRAME_POINTER=y
+CONFIG_DEBUG_USER=y
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_KHAZAD=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_CRC_CCITT=y
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+CONFIG_LIBCRC32C=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff --git a/arch/arm/configs/iop32x_defconfig b/arch/arm/configs/iop32x_defconfig
index 0d67f66e78c2..7909a555706d 100644
--- a/arch/arm/configs/iop32x_defconfig
+++ b/arch/arm/configs/iop32x_defconfig
@@ -1,15 +1,18 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-rc7
-# Tue Sep 19 00:30:18 2006
+# Linux kernel version: 2.6.20-rc1-git5
+# Tue Dec 19 21:37:52 2006
 #
 CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_VECTORS_BASE=0xffff0000
@@ -29,18 +32,22 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
-CONFIG_SYSCTL=y
+# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -49,12 +56,12 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
-CONFIG_RT_MUTEXES=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
 CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -72,7 +79,10 @@ CONFIG_KMOD=y
 #
 # Block layer
 #
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
 
 #
 # IO Schedulers
@@ -106,6 +116,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_ARCH_IMX is not set
 CONFIG_ARCH_IOP32X=y
 # CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
@@ -141,17 +152,22 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
 
 #
 # Processor Features
 #
 # CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_IWMMXT is not set
 CONFIG_XSCALE_PMU=y
 
 #
 # Bus support
 #
 CONFIG_PCI=y
+# CONFIG_PCI_MULTITHREAD_PROBE is not set
 # CONFIG_PCI_DEBUG is not set
 
 #
@@ -225,6 +241,7 @@ CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -246,13 +263,29 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_TUNNEL is not set
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
-# CONFIG_IPV6 is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 
@@ -279,7 +312,6 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 
@@ -338,6 +370,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -419,9 +452,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_NBD=y
 # CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
@@ -440,6 +475,8 @@ CONFIG_BLK_DEV_INITRD=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -458,14 +495,16 @@ CONFIG_CHR_DEV_SG=y
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
 
 #
-# SCSI Transport Attributes
+# SCSI Transports
 #
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
 
 #
 # SCSI low-level drivers
@@ -478,26 +517,84 @@ CONFIG_CHR_DEV_SG=y
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
 # CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
 # CONFIG_SCSI_SYM53C8XX_2 is not set
 # CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
 # CONFIG_SCSI_LPFC is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+CONFIG_ATA=y
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_SATA_SIL=y
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
 
 #
 # Multi-device support (RAID and LVM)
@@ -512,6 +609,7 @@ CONFIG_MD_RAID1=y
 # CONFIG_MD_MULTIPATH is not set
 # CONFIG_MD_FAULTY is not set
 CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
 # CONFIG_DM_CRYPT is not set
 # CONFIG_DM_SNAPSHOT is not set
 # CONFIG_DM_MIRROR is not set
@@ -612,6 +710,7 @@ CONFIG_R8169=y
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
 
 #
 # Ethernet (10000 Mbit)
@@ -620,6 +719,7 @@ CONFIG_R8169=y
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
 
 #
 # Token Ring devices
@@ -654,6 +754,7 @@ CONFIG_R8169=y
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
 
 #
 # Userland interfaces
@@ -725,10 +826,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
 
@@ -736,7 +833,6 @@ CONFIG_HW_RANDOM=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
 
 #
 # I2C support
@@ -801,6 +897,7 @@ CONFIG_I2C_IOP3XX=y
 #
 # Dallas's 1-wire bus
 #
+# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
@@ -834,15 +931,18 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
@@ -851,6 +951,8 @@ CONFIG_HWMON=y
 #
 # Misc devices
 #
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
 
 #
 # LED devices
@@ -869,12 +971,12 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
 #
 # CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
 
 #
 # Graphics support
@@ -895,6 +997,11 @@ CONFIG_DUMMY_CONSOLE=y
 # CONFIG_SOUND is not set
 
 #
+# HID Devices
+#
+CONFIG_HID=y
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -909,6 +1016,7 @@ CONFIG_USB=y
 # CONFIG_USB_DEVICEFS is not set
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_MULTITHREAD_PROBE is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -946,6 +1054,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_LIBUSUAL is not set
 
 #
@@ -984,6 +1093,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 
@@ -1001,6 +1111,7 @@ CONFIG_USB_MON=y
 #
 # CONFIG_USB_EMI62 is not set
 # CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
 # CONFIG_USB_AUERSWALD is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
@@ -1008,12 +1119,13 @@ CONFIG_USB_MON=y
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_PHIDGET is not set
 # CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
 
 #
 # USB DSL modem support
@@ -1045,6 +1157,7 @@ CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 # CONFIG_EXT3_FS_POSIX_ACL is not set
 # CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=y
@@ -1056,6 +1169,7 @@ CONFIG_XFS_FS=y
 CONFIG_XFS_SECURITY=y
 CONFIG_XFS_POSIX_ACL=y
 # CONFIG_XFS_RT is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -1084,8 +1198,10 @@ CONFIG_DNOTIFY=y
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
@@ -1095,6 +1211,7 @@ CONFIG_RAMFS=y
 #
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
+CONFIG_ECRYPT_FS=y
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
@@ -1129,7 +1246,7 @@ CONFIG_NFSD=y
 CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V3_ACL is not set
 # CONFIG_NFSD_V4 is not set
-# CONFIG_NFSD_TCP is not set
+CONFIG_NFSD_TCP=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
@@ -1172,6 +1289,11 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -1180,8 +1302,11 @@ CONFIG_MSDOS_PARTITION=y
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
@@ -1197,14 +1322,12 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_UNWIND_INFO is not set
 # CONFIG_FORCED_INLINING is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 # CONFIG_DEBUG_ERRORS is not set
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
@@ -1212,13 +1335,48 @@ CONFIG_DEBUG_LL=y
 #
 # Security options
 #
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
 # CONFIG_SECURITY is not set
 
 #
 # Cryptographic options
 #
-# CONFIG_CRYPTO is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_KHAZAD=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_TEST is not set
 
 #
 # Hardware crypto devices
@@ -1227,10 +1385,12 @@ CONFIG_DEBUG_LL=y
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
+CONFIG_LIBCRC32C=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff --git a/arch/arm/configs/iop33x_defconfig b/arch/arm/configs/iop33x_defconfig
index 2a8fc153969d..fa271bce8ff7 100644
--- a/arch/arm/configs/iop33x_defconfig
+++ b/arch/arm/configs/iop33x_defconfig
@@ -1,15 +1,18 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-rc7
-# Tue Sep 19 00:30:42 2006
+# Linux kernel version: 2.6.20-rc1
+# Sat Dec 16 06:05:34 2006
 #
 CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_VECTORS_BASE=0xffff0000
@@ -29,18 +32,22 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
-CONFIG_SYSCTL=y
+# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -49,12 +56,12 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
-CONFIG_RT_MUTEXES=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
 CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -72,7 +79,10 @@ CONFIG_KMOD=y
 #
 # Block layer
 #
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
 
 #
 # IO Schedulers
@@ -106,6 +116,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_IOP32X is not set
 CONFIG_ARCH_IOP33X=y
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
@@ -139,17 +150,22 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
 
 #
 # Processor Features
 #
 # CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_IWMMXT is not set
 CONFIG_XSCALE_PMU=y
 
 #
 # Bus support
 #
 CONFIG_PCI=y
+# CONFIG_PCI_MULTITHREAD_PROBE is not set
 # CONFIG_PCI_DEBUG is not set
 
 #
@@ -223,6 +239,7 @@ CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -244,13 +261,29 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_TUNNEL is not set
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
-# CONFIG_IPV6 is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 
@@ -277,7 +310,6 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 
@@ -336,6 +368,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -423,7 +456,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_NBD=y
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
@@ -443,6 +476,8 @@ CONFIG_BLK_DEV_INITRD=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -461,14 +496,16 @@ CONFIG_CHR_DEV_SG=y
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
 
 #
-# SCSI Transport Attributes
+# SCSI Transports
 #
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
 
 #
 # SCSI low-level drivers
@@ -481,26 +518,34 @@ CONFIG_CHR_DEV_SG=y
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
 # CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
 # CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
 # CONFIG_SCSI_LPFC is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
 
 #
 # Multi-device support (RAID and LVM)
@@ -515,6 +560,7 @@ CONFIG_MD_RAID1=y
 # CONFIG_MD_MULTIPATH is not set
 # CONFIG_MD_FAULTY is not set
 CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
 # CONFIG_DM_CRYPT is not set
 # CONFIG_DM_SNAPSHOT is not set
 # CONFIG_DM_MIRROR is not set
@@ -580,6 +626,7 @@ CONFIG_E1000_NAPI=y
 # CONFIG_SK98LIN is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
 
 #
 # Ethernet (10000 Mbit)
@@ -588,6 +635,7 @@ CONFIG_E1000_NAPI=y
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
 
 #
 # Token Ring devices
@@ -622,6 +670,7 @@ CONFIG_E1000_NAPI=y
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
 
 #
 # Userland interfaces
@@ -693,10 +742,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
 
@@ -704,7 +749,6 @@ CONFIG_HW_RANDOM=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
 
 #
 # I2C support
@@ -769,6 +813,7 @@ CONFIG_I2C_IOP3XX=y
 #
 # Dallas's 1-wire bus
 #
+# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
@@ -802,15 +847,18 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
@@ -819,6 +867,8 @@ CONFIG_HWMON=y
 #
 # Misc devices
 #
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
 
 #
 # LED devices
@@ -837,7 +887,6 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
@@ -863,6 +912,11 @@ CONFIG_DUMMY_CONSOLE=y
 # CONFIG_SOUND is not set
 
 #
+# HID Devices
+#
+CONFIG_HID=y
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -900,6 +954,7 @@ CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 # CONFIG_EXT3_FS_POSIX_ACL is not set
 # CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=y
@@ -911,6 +966,7 @@ CONFIG_XFS_FS=y
 CONFIG_XFS_SECURITY=y
 CONFIG_XFS_POSIX_ACL=y
 # CONFIG_XFS_RT is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -939,8 +995,10 @@ CONFIG_DNOTIFY=y
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
@@ -1019,6 +1077,11 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -1027,8 +1090,11 @@ CONFIG_MSDOS_PARTITION=y
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
@@ -1044,14 +1110,12 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_UNWIND_INFO is not set
 # CONFIG_FORCED_INLINING is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 # CONFIG_DEBUG_ERRORS is not set
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
@@ -1068,10 +1132,6 @@ CONFIG_DEBUG_LL=y
 # CONFIG_CRYPTO is not set
 
 #
-# Hardware crypto devices
-#
-
-#
 # Library routines
 #
 # CONFIG_CRC_CCITT is not set
@@ -1079,3 +1139,4 @@ CONFIG_DEBUG_LL=y
 # CONFIG_CRC32 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff --git a/arch/arm/configs/ixp2000_defconfig b/arch/arm/configs/ixp2000_defconfig
index 27b3e31a8ad8..f8f9793b526f 100644
--- a/arch/arm/configs/ixp2000_defconfig
+++ b/arch/arm/configs/ixp2000_defconfig
@@ -1,14 +1,18 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-rc1
-# Sun Jul  9 15:28:50 2006
+# Linux kernel version: 2.6.20-rc1
+# Sat Dec 16 06:05:39 2006
 #
 CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_VECTORS_BASE=0xffff0000
@@ -28,17 +32,22 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -47,12 +56,12 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
-CONFIG_RT_MUTEXES=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
 CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -70,7 +79,10 @@ CONFIG_KMOD=y
 #
 # Block layer
 #
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
 
 #
 # IO Schedulers
@@ -102,7 +114,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 CONFIG_ARCH_IXP2000=y
 # CONFIG_ARCH_IXP23XX is not set
@@ -143,24 +157,28 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
 
 #
 # Processor Features
 #
 # CONFIG_ARM_THUMB is not set
 CONFIG_CPU_BIG_ENDIAN=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_IWMMXT is not set
 CONFIG_XSCALE_PMU=y
 
 #
 # Bus support
 #
 CONFIG_PCI=y
+# CONFIG_PCI_MULTITHREAD_PROBE is not set
 # CONFIG_PCI_DEBUG is not set
 
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-# CONFIG_PCCARD is not set
 
 #
 # Kernel Features
@@ -228,6 +246,7 @@ CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -248,13 +267,29 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_TUNNEL is not set
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
-# CONFIG_IPV6 is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 
@@ -281,7 +316,6 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 
@@ -308,7 +342,6 @@ CONFIG_TCP_CONG_BIC=y
 #
 CONFIG_STANDALONE=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_SYS_HYPERVISOR is not set
 
@@ -340,6 +373,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -422,11 +456,12 @@ CONFIG_MTD_IXP2000=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_NBD=y
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
@@ -436,6 +471,12 @@ CONFIG_BLK_DEV_INITRD=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
 
 #
 # Multi-device support (RAID and LVM)
@@ -501,8 +542,8 @@ CONFIG_NET_PCI=y
 # CONFIG_FORCEDETH is not set
 CONFIG_CS89x0=y
 # CONFIG_DGRS is not set
-CONFIG_EEPRO100=y
-# CONFIG_E100 is not set
+# CONFIG_EEPRO100 is not set
+CONFIG_E100=y
 # CONFIG_FEALNX is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
@@ -532,6 +573,7 @@ CONFIG_ENP2611_MSF_NET=y
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
 
 #
 # Ethernet (10000 Mbit)
@@ -540,6 +582,7 @@ CONFIG_ENP2611_MSF_NET=y
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
 
 #
 # Token Ring devices
@@ -555,7 +598,6 @@ CONFIG_ENP2611_MSF_NET=y
 # Wan interfaces
 #
 CONFIG_WAN=y
-# CONFIG_DSCC4 is not set
 # CONFIG_LANMEDIA is not set
 CONFIG_HDLC=y
 CONFIG_HDLC_RAW=y
@@ -571,6 +613,7 @@ CONFIG_HDLC_PPP=y
 # CONFIG_WANXL is not set
 # CONFIG_PC300 is not set
 # CONFIG_FARSYNC is not set
+# CONFIG_DSCC4 is not set
 CONFIG_DLCI=y
 CONFIG_DLCI_COUNT=24
 CONFIG_DLCI_MAX=8
@@ -592,6 +635,7 @@ CONFIG_DLCI_MAX=8
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
 
 #
 # Userland interfaces
@@ -673,10 +717,6 @@ CONFIG_IXP2000_WATCHDOG=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
 
@@ -684,7 +724,6 @@ CONFIG_IXP2000_WATCHDOG=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
 
 #
 # I2C support
@@ -749,6 +788,7 @@ CONFIG_SENSORS_EEPROM=y
 #
 # Dallas's 1-wire bus
 #
+# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
@@ -782,15 +822,18 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
@@ -799,6 +842,8 @@ CONFIG_HWMON=y
 #
 # Misc devices
 #
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
 
 #
 # LED devices
@@ -817,7 +862,6 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
@@ -829,6 +873,7 @@ CONFIG_VIDEO_V4L2=y
 #
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
@@ -836,6 +881,11 @@ CONFIG_VIDEO_V4L2=y
 # CONFIG_SOUND is not set
 
 #
+# HID Devices
+#
+CONFIG_HID=y
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -875,6 +925,7 @@ CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 # CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=y
@@ -882,6 +933,7 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -910,8 +962,10 @@ CONFIG_DNOTIFY=y
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
@@ -961,7 +1015,6 @@ CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_CIFS is not set
-# CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -994,6 +1047,11 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -1002,8 +1060,11 @@ CONFIG_MSDOS_PARTITION=y
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
@@ -1019,14 +1080,12 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_UNWIND_INFO is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
@@ -1043,12 +1102,9 @@ CONFIG_DEBUG_LL=y
 # CONFIG_CRYPTO is not set
 
 #
-# Hardware crypto devices
-#
-
-#
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
@@ -1056,3 +1112,4 @@ CONFIG_CRC32=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff --git a/arch/arm/configs/ixp23xx_defconfig b/arch/arm/configs/ixp23xx_defconfig
index 7b18997083ce..27cf022dd807 100644
--- a/arch/arm/configs/ixp23xx_defconfig
+++ b/arch/arm/configs/ixp23xx_defconfig
@@ -1,14 +1,18 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-rc1
-# Sun Jul  9 14:13:35 2006
+# Linux kernel version: 2.6.20-rc1
+# Sat Dec 16 06:05:45 2006
 #
 CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_VECTORS_BASE=0xffff0000
@@ -28,17 +32,22 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -47,12 +56,12 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
-CONFIG_RT_MUTEXES=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
 CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -70,7 +79,10 @@ CONFIG_KMOD=y
 #
 # Block layer
 #
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
 
 #
 # IO Schedulers
@@ -102,7 +114,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 CONFIG_ARCH_IXP23XX=y
@@ -137,6 +151,8 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
 CONFIG_IO_36=y
 
 #
@@ -144,11 +160,15 @@ CONFIG_IO_36=y
 #
 # CONFIG_ARM_THUMB is not set
 CONFIG_CPU_BIG_ENDIAN=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+# CONFIG_IWMMXT is not set
 
 #
 # Bus support
 #
 CONFIG_PCI=y
+# CONFIG_PCI_MULTITHREAD_PROBE is not set
 # CONFIG_PCI_DEBUG is not set
 
 #
@@ -222,6 +242,7 @@ CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -242,13 +263,29 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_TUNNEL is not set
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
-# CONFIG_IPV6 is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 
@@ -275,7 +312,6 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 
@@ -334,6 +370,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -418,12 +455,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_NBD=y
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
@@ -432,6 +470,7 @@ CONFIG_BLK_DEV_INITRD=y
 # ATA/ATAPI/MFM/RLL support
 #
 CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
 
 #
@@ -455,7 +494,6 @@ CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 # CONFIG_BLK_DEV_GENERIC is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
 # CONFIG_IDEDMA_PCI_AUTO is not set
@@ -469,6 +507,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_CS5530 is not set
 # CONFIG_BLK_DEV_HPT34X is not set
 # CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
 # CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_PIIX is not set
 # CONFIG_BLK_DEV_IT821X is not set
@@ -477,6 +516,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_PDC202XX_NEW is not set
 # CONFIG_BLK_DEV_SVWKS is not set
 CONFIG_BLK_DEV_SIIMAGE=y
+# CONFIG_BLK_DEV_SL82C105 is not set
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -491,6 +531,8 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -509,14 +551,16 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
 
 #
-# SCSI Transport Attributes
+# SCSI Transports
 #
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
 
 #
 # SCSI low-level drivers
@@ -529,26 +573,34 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
 # CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
 # CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
 # CONFIG_SCSI_LPFC is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
 
 #
 # Multi-device support (RAID and LVM)
@@ -649,6 +701,7 @@ CONFIG_E1000_NAPI=y
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
 
 #
 # Ethernet (10000 Mbit)
@@ -657,6 +710,7 @@ CONFIG_E1000_NAPI=y
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
 
 #
 # Token Ring devices
@@ -672,7 +726,6 @@ CONFIG_E1000_NAPI=y
 # Wan interfaces
 #
 CONFIG_WAN=y
-# CONFIG_DSCC4 is not set
 # CONFIG_LANMEDIA is not set
 CONFIG_HDLC=y
 CONFIG_HDLC_RAW=y
@@ -688,6 +741,7 @@ CONFIG_HDLC_PPP=y
 # CONFIG_WANXL is not set
 # CONFIG_PC300 is not set
 # CONFIG_FARSYNC is not set
+# CONFIG_DSCC4 is not set
 CONFIG_DLCI=y
 CONFIG_DLCI_COUNT=24
 CONFIG_DLCI_MAX=8
@@ -710,6 +764,7 @@ CONFIG_DLCI_MAX=8
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
 
 #
 # Userland interfaces
@@ -795,10 +850,6 @@ CONFIG_WATCHDOG=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
 
@@ -806,7 +857,6 @@ CONFIG_WATCHDOG=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
 
 #
 # I2C support
@@ -870,6 +920,7 @@ CONFIG_SENSORS_EEPROM=y
 #
 # Dallas's 1-wire bus
 #
+# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
@@ -903,15 +954,18 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
@@ -920,6 +974,8 @@ CONFIG_HWMON=y
 #
 # Misc devices
 #
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
 
 #
 # LED devices
@@ -938,7 +994,6 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
@@ -951,6 +1006,7 @@ CONFIG_VIDEO_V4L2=y
 #
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
@@ -958,6 +1014,11 @@ CONFIG_VIDEO_V4L2=y
 # CONFIG_SOUND is not set
 
 #
+# HID Devices
+#
+CONFIG_HID=y
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -972,6 +1033,7 @@ CONFIG_USB=y
 # CONFIG_USB_DEVICEFS is not set
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_MULTITHREAD_PROBE is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -1012,6 +1074,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_LIBUSUAL is not set
 
 #
@@ -1050,6 +1113,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 
@@ -1067,19 +1131,21 @@ CONFIG_USB_MON=y
 #
 # CONFIG_USB_EMI62 is not set
 # CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
 # CONFIG_USB_AUERSWALD is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LED is not set
-# CONFIG_USB_CY7C63 is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_PHIDGET is not set
 # CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
 
 #
 # USB DSL modem support
@@ -1113,6 +1179,7 @@ CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 # CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=y
@@ -1120,6 +1187,7 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -1150,8 +1218,10 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
@@ -1201,7 +1271,6 @@ CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_CIFS is not set
-# CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -1273,6 +1342,11 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -1281,8 +1355,11 @@ CONFIG_NLS_CODEPAGE_437=y
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
@@ -1298,14 +1375,12 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_UNWIND_INFO is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
@@ -1322,12 +1397,9 @@ CONFIG_DEBUG_LL=y
 # CONFIG_CRYPTO is not set
 
 #
-# Hardware crypto devices
-#
-
-#
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
@@ -1335,3 +1407,4 @@ CONFIG_CRC32=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig
index fac7c3b240c0..fabf74c51a88 100644
--- a/arch/arm/configs/ixp4xx_defconfig
+++ b/arch/arm/configs/ixp4xx_defconfig
@@ -1243,7 +1243,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/jornada720_defconfig b/arch/arm/configs/jornada720_defconfig
index 80a6fd97eb32..0c556289a3f4 100644
--- a/arch/arm/configs/jornada720_defconfig
+++ b/arch/arm/configs/jornada720_defconfig
@@ -889,7 +889,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/kb9202_defconfig b/arch/arm/configs/kb9202_defconfig
index b4cd4b414836..c16537d9d67a 100644
--- a/arch/arm/configs/kb9202_defconfig
+++ b/arch/arm/configs/kb9202_defconfig
@@ -437,7 +437,7 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_WATCHDOG is not set
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
-# CONFIG_AT91_RTC is not set
+# CONFIG_AT91RM9200_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
@@ -753,7 +753,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/lpd270_defconfig b/arch/arm/configs/lpd270_defconfig
index 4b29e099640d..a3bf5833b87a 100644
--- a/arch/arm/configs/lpd270_defconfig
+++ b/arch/arm/configs/lpd270_defconfig
@@ -1,14 +1,18 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-rc1
-# Sun Jul  9 14:15:23 2006
+# Linux kernel version: 2.6.20-rc1
+# Sat Dec 16 06:05:51 2006
 #
 CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_MTD_XIP=y
@@ -29,16 +33,21 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -47,12 +56,12 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
-CONFIG_RT_MUTEXES=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
 CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -69,7 +78,10 @@ CONFIG_MODULES=y
 #
 # Block layer
 #
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
 
 #
 # IO Schedulers
@@ -101,7 +113,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
@@ -125,7 +139,6 @@ CONFIG_MACH_LOGICPD_PXA270=y
 # CONFIG_PXA_SHARPSL is not set
 # CONFIG_MACH_TRIZEPS4 is not set
 CONFIG_PXA27x=y
-CONFIG_IWMMXT=y
 
 #
 # Processor Type
@@ -136,11 +149,15 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
 
 #
 # Processor Features
 #
 # CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+CONFIG_IWMMXT=y
 CONFIG_XSCALE_PMU=y
 
 #
@@ -217,6 +234,7 @@ CONFIG_NET=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -237,13 +255,29 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_TUNNEL is not set
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
-# CONFIG_IPV6 is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 
@@ -270,7 +304,6 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 
@@ -329,6 +362,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -410,7 +444,7 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_NBD=y
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
@@ -447,6 +481,12 @@ CONFIG_BLK_DEV_IDEDISK=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
 
 #
 # Multi-device support (RAID and LVM)
@@ -526,6 +566,7 @@ CONFIG_SMC91X=y
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
 
 #
 # Userland interfaces
@@ -548,6 +589,7 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
@@ -600,17 +642,12 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_NVRAM is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_RAW_DRIVER is not set
 
 #
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
 
 #
 # I2C support
@@ -626,6 +663,7 @@ CONFIG_LEGACY_PTY_COUNT=256
 #
 # Dallas's 1-wire bus
 #
+# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
@@ -634,11 +672,14 @@ CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_VT1211 is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
 # Misc devices
 #
+# CONFIG_TIFM_CORE is not set
 
 #
 # LED devices
@@ -657,7 +698,6 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
@@ -679,6 +719,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_PXA=y
 # CONFIG_FB_PXA_PARAMETERS is not set
+# CONFIG_FB_MBX is not set
 # CONFIG_FB_VIRTUAL is not set
 
 #
@@ -725,7 +766,6 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # Generic devices
 #
 CONFIG_SND_AC97_CODEC=y
-CONFIG_SND_AC97_BUS=y
 # CONFIG_SND_DUMMY is not set
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_SERIAL_U16550 is not set
@@ -741,6 +781,12 @@ CONFIG_SND_PXA2XX_AC97=y
 # Open Sound System
 #
 # CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=y
+
+#
+# HID Devices
+#
+CONFIG_HID=y
 
 #
 # USB support
@@ -777,10 +823,12 @@ CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
 # CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -811,6 +859,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 # CONFIG_TMPFS is not set
 # CONFIG_HUGETLB_PAGE is not set
@@ -860,7 +909,6 @@ CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_CIFS is not set
-# CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -917,6 +965,11 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -925,8 +978,11 @@ CONFIG_NLS_ISO8859_1=y
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
@@ -942,14 +998,12 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_UNWIND_INFO is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
@@ -966,12 +1020,9 @@ CONFIG_DEBUG_LL=y
 # CONFIG_CRYPTO is not set
 
 #
-# Hardware crypto devices
-#
-
-#
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
@@ -979,3 +1030,4 @@ CONFIG_CRC32=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff --git a/arch/arm/configs/lpd7a400_defconfig b/arch/arm/configs/lpd7a400_defconfig
index bf9cf9c6d2df..f8ac29d5c654 100644
--- a/arch/arm/configs/lpd7a400_defconfig
+++ b/arch/arm/configs/lpd7a400_defconfig
@@ -850,7 +850,6 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 # CONFIG_DEBUG_LL is not set
 
diff --git a/arch/arm/configs/lpd7a404_defconfig b/arch/arm/configs/lpd7a404_defconfig
index 3a57be32e849..46a0f7fe1fa5 100644
--- a/arch/arm/configs/lpd7a404_defconfig
+++ b/arch/arm/configs/lpd7a404_defconfig
@@ -1100,7 +1100,6 @@ CONFIG_FRAME_POINTER=y
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 # CONFIG_DEBUG_LL is not set
 
diff --git a/arch/arm/configs/lubbock_defconfig b/arch/arm/configs/lubbock_defconfig
index 81daadcbe0ba..e544bfbbde5d 100644
--- a/arch/arm/configs/lubbock_defconfig
+++ b/arch/arm/configs/lubbock_defconfig
@@ -772,7 +772,6 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/mainstone_defconfig b/arch/arm/configs/mainstone_defconfig
index b112bd75bda2..cc8c95b99292 100644
--- a/arch/arm/configs/mainstone_defconfig
+++ b/arch/arm/configs/mainstone_defconfig
@@ -766,7 +766,6 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/mx1ads_defconfig b/arch/arm/configs/mx1ads_defconfig
index d16f6cd6e039..577d7e1b5d42 100644
--- a/arch/arm/configs/mx1ads_defconfig
+++ b/arch/arm/configs/mx1ads_defconfig
@@ -691,7 +691,6 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 # CONFIG_DEBUG_LL is not set
 
diff --git a/arch/arm/configs/neponset_defconfig b/arch/arm/configs/neponset_defconfig
index df8168e57b7c..e86794a10fc0 100644
--- a/arch/arm/configs/neponset_defconfig
+++ b/arch/arm/configs/neponset_defconfig
@@ -1115,7 +1115,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/netwinder_defconfig b/arch/arm/configs/netwinder_defconfig
index 2cae1ead9f9b..c1a63a35c58d 100644
--- a/arch/arm/configs/netwinder_defconfig
+++ b/arch/arm/configs/netwinder_defconfig
@@ -994,7 +994,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 # CONFIG_DEBUG_ERRORS is not set
 # CONFIG_DEBUG_LL is not set
 
diff --git a/arch/arm/configs/netx_defconfig b/arch/arm/configs/netx_defconfig
index 61115a773382..57f32f39d0ff 100644
--- a/arch/arm/configs/netx_defconfig
+++ b/arch/arm/configs/netx_defconfig
@@ -872,7 +872,6 @@ CONFIG_FRAME_POINTER=y
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 # CONFIG_DEBUG_LL is not set
 
diff --git a/arch/arm/configs/onearm_defconfig b/arch/arm/configs/onearm_defconfig
index 9b9f2155af35..650a248613e5 100644
--- a/arch/arm/configs/onearm_defconfig
+++ b/arch/arm/configs/onearm_defconfig
@@ -1,14 +1,18 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-rc1
-# Sun Jul  9 14:16:20 2006
+# Linux kernel version: 2.6.20-rc1
+# Sat Dec 16 06:05:18 2006
 #
 CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_VECTORS_BASE=0xffff0000
@@ -28,16 +32,21 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -46,12 +55,12 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
-CONFIG_RT_MUTEXES=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
 CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -69,7 +78,10 @@ CONFIG_KMOD=y
 #
 # Block layer
 #
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
 
 #
 # IO Schedulers
@@ -101,7 +113,9 @@ CONFIG_ARCH_AT91=y
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
@@ -118,10 +132,6 @@ CONFIG_ARCH_AT91=y
 #
 # Atmel AT91 System-on-Chip
 #
-
-#
-# Atmel AT91 Processors
-#
 CONFIG_ARCH_AT91RM9200=y
 # CONFIG_ARCH_AT91SAM9260 is not set
 # CONFIG_ARCH_AT91SAM9261 is not set
@@ -140,6 +150,10 @@ CONFIG_MACH_ONEARM=y
 # CONFIG_MACH_KAFA is not set
 
 #
+# AT91 Board Options
+#
+
+#
 # AT91 Feature Selections
 #
 CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
@@ -149,12 +163,14 @@ CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
 #
 CONFIG_CPU_32=y
 CONFIG_CPU_ARM920T=y
-CONFIG_CPU_32v4=y
+CONFIG_CPU_32v4T=y
 CONFIG_CPU_ABRT_EV4T=y
 CONFIG_CPU_CACHE_V4WT=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_COPY_V4WB=y
 CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
 
 #
 # Processor Features
@@ -251,6 +267,7 @@ CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -271,13 +288,29 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_TUNNEL is not set
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
-# CONFIG_IPV6 is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 
@@ -304,7 +337,6 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 
@@ -360,6 +392,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -438,11 +471,12 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=0
 #
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_NBD=y
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
@@ -457,6 +491,12 @@ CONFIG_BLK_DEV_INITRD=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
 
 #
 # Multi-device support (RAID and LVM)
@@ -541,6 +581,7 @@ CONFIG_ARM_AT91_ETHER=y
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
 
 #
 # Userland interfaces
@@ -619,10 +660,6 @@ CONFIG_AT91RM9200_WATCHDOG=y
 # CONFIG_R3964 is not set
 
 #
-# Ftape, the floppy tape device driver
-#
-
-#
 # PCMCIA character devices
 #
 # CONFIG_SYNCLINK_CS is not set
@@ -634,7 +671,6 @@ CONFIG_AT91RM9200_WATCHDOG=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
 
 #
 # I2C support
@@ -652,6 +688,7 @@ CONFIG_I2C_CHARDEV=y
 #
 # I2C Hardware Bus support
 #
+# CONFIG_I2C_AT91 is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_STUB is not set
@@ -681,6 +718,7 @@ CONFIG_I2C_CHARDEV=y
 #
 # Dallas's 1-wire bus
 #
+# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
@@ -714,12 +752,15 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
@@ -728,6 +769,7 @@ CONFIG_HWMON=y
 #
 # Misc devices
 #
+# CONFIG_TIFM_CORE is not set
 
 #
 # LED devices
@@ -746,7 +788,6 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
@@ -759,6 +800,7 @@ CONFIG_VIDEO_V4L2=y
 #
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
@@ -766,6 +808,11 @@ CONFIG_VIDEO_V4L2=y
 # CONFIG_SOUND is not set
 
 #
+# HID Devices
+#
+CONFIG_HID=y
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -780,6 +827,7 @@ CONFIG_USB_DEBUG=y
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_MULTITHREAD_PROBE is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -804,7 +852,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 #
 # may also be needed; see USB_STORAGE Help for more information
 #
-# CONFIG_USB_STORAGE is not set
 # CONFIG_USB_LIBUSUAL is not set
 
 #
@@ -842,6 +889,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 
@@ -859,18 +907,20 @@ CONFIG_USB_MON=y
 #
 # CONFIG_USB_EMI62 is not set
 # CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
 # CONFIG_USB_AUERSWALD is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LED is not set
-# CONFIG_USB_CY7C63 is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_PHIDGET is not set
 # CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_TEST is not set
 
 #
@@ -897,6 +947,7 @@ CONFIG_USB_AT91=y
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_FILE_STORAGE is not set
 # CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
 
 #
 # MMC/SD Card support
@@ -904,7 +955,8 @@ CONFIG_USB_AT91=y
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=y
-CONFIG_MMC_AT91RM9200=y
+# CONFIG_MMC_AT91 is not set
+# CONFIG_MMC_TIFM_SD is not set
 
 #
 # Real Time Clock
@@ -919,10 +971,12 @@ CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
 # CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -951,8 +1005,10 @@ CONFIG_DNOTIFY=y
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
@@ -995,7 +1051,6 @@ CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_CIFS is not set
-# CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -1013,6 +1068,11 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -1021,8 +1081,11 @@ CONFIG_MSDOS_PARTITION=y
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
@@ -1038,14 +1101,12 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_UNWIND_INFO is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 # CONFIG_DEBUG_ERRORS is not set
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
@@ -1062,15 +1123,13 @@ CONFIG_DEBUG_LL=y
 # CONFIG_CRYPTO is not set
 
 #
-# Hardware crypto devices
-#
-
-#
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff --git a/arch/arm/configs/pleb_defconfig b/arch/arm/configs/pleb_defconfig
index 24e8bdd4cb91..a6b47ea8e465 100644
--- a/arch/arm/configs/pleb_defconfig
+++ b/arch/arm/configs/pleb_defconfig
@@ -721,7 +721,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
 # CONFIG_DEBUG_ERRORS is not set
 # CONFIG_DEBUG_LL is not set
 
diff --git a/arch/arm/configs/pnx4008_defconfig b/arch/arm/configs/pnx4008_defconfig
index a4989f44baaa..b5e11aa2e290 100644
--- a/arch/arm/configs/pnx4008_defconfig
+++ b/arch/arm/configs/pnx4008_defconfig
@@ -1604,7 +1604,6 @@ CONFIG_FRAME_POINTER=y
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
 # CONFIG_DEBUG_ERRORS is not set
 # CONFIG_DEBUG_LL is not set
 
diff --git a/arch/arm/configs/pxa255-idp_defconfig b/arch/arm/configs/pxa255-idp_defconfig
index b71d31a4bb56..46e5089df0ae 100644
--- a/arch/arm/configs/pxa255-idp_defconfig
+++ b/arch/arm/configs/pxa255-idp_defconfig
@@ -768,7 +768,6 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/realview-smp_defconfig b/arch/arm/configs/realview-smp_defconfig
index ffd905ff19f1..fc39ba1a89f3 100644
--- a/arch/arm/configs/realview-smp_defconfig
+++ b/arch/arm/configs/realview-smp_defconfig
@@ -967,7 +967,6 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig
index 3f1ec4e304f7..accbf529ce5b 100644
--- a/arch/arm/configs/realview_defconfig
+++ b/arch/arm/configs/realview_defconfig
@@ -759,7 +759,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 # CONFIG_DEBUG_LL is not set
 
diff --git a/arch/arm/configs/rpc_defconfig b/arch/arm/configs/rpc_defconfig
index b498afdc03b6..bc091264d354 100644
--- a/arch/arm/configs/rpc_defconfig
+++ b/arch/arm/configs/rpc_defconfig
@@ -910,7 +910,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig
index c0152393e494..3b31a33d0080 100644
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
@@ -1319,7 +1319,6 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 # CONFIG_DEBUG_ERRORS is not set
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/shark_defconfig b/arch/arm/configs/shark_defconfig
index c48d17062262..9b6561d119af 100644
--- a/arch/arm/configs/shark_defconfig
+++ b/arch/arm/configs/shark_defconfig
@@ -965,7 +965,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 # CONFIG_DEBUG_ERRORS is not set
 # CONFIG_DEBUG_LL is not set
 
diff --git a/arch/arm/configs/simpad_defconfig b/arch/arm/configs/simpad_defconfig
index 140056a3507f..03f783e696b3 100644
--- a/arch/arm/configs/simpad_defconfig
+++ b/arch/arm/configs/simpad_defconfig
@@ -934,7 +934,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig
index bd03238968c1..aa7a01179500 100644
--- a/arch/arm/configs/spitz_defconfig
+++ b/arch/arm/configs/spitz_defconfig
@@ -1406,7 +1406,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig
index f7bf6ef27d19..48dca69addae 100644
--- a/arch/arm/configs/versatile_defconfig
+++ b/arch/arm/configs/versatile_defconfig
@@ -972,7 +972,6 @@ CONFIG_FRAME_POINTER=y
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 1320a0efca73..ab06a86e85d5 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -24,7 +24,9 @@ obj-$(CONFIG_OABI_COMPAT)	+= sys_oabi-compat.o
 obj-$(CONFIG_CRUNCH)            += crunch.o crunch-bits.o
 AFLAGS_crunch-bits.o            := -Wa,-mcpu=ep9312
 
-obj-$(CONFIG_IWMMXT)            += iwmmxt.o iwmmxt-notifier.o
+obj-$(CONFIG_CPU_XSCALE)        += xscale-cp0.o
+obj-$(CONFIG_CPU_XSC3)          += xscale-cp0.o
+obj-$(CONFIG_IWMMXT)            += iwmmxt.o
 AFLAGS_iwmmxt.o                 := -Wa,-mcpu=iwmmxt
 
 ifneq ($(CONFIG_ARCH_EBSA110),y)
diff --git a/arch/arm/kernel/apm.c b/arch/arm/kernel/apm.c
index ecf4f9472d94..2c37b70b17ab 100644
--- a/arch/arm/kernel/apm.c
+++ b/arch/arm/kernel/apm.c
@@ -12,7 +12,6 @@
  */
 #include <linux/module.h>
 #include <linux/poll.h>
-#include <linux/timer.h>
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/miscdevice.h>
@@ -26,6 +25,7 @@
 #include <linux/init.h>
 #include <linux/completion.h>
 #include <linux/kthread.h>
+#include <linux/delay.h>
 
 #include <asm/apm.h> /* apm_power_info */
 #include <asm/system.h>
@@ -71,7 +71,8 @@ struct apm_user {
 #define SUSPEND_PENDING 1               /* suspend pending read */
 #define SUSPEND_READ    2               /* suspend read, pending ack */
 #define SUSPEND_ACKED   3               /* suspend acked */
-#define SUSPEND_DONE    4               /* suspend completed */
+#define SUSPEND_WAIT    4               /* waiting for suspend */
+#define SUSPEND_DONE    5               /* suspend completed */
 
         struct apm_queue        queue;
 };
@@ -101,6 +102,7 @@ static DECLARE_WAIT_QUEUE_HEAD(kapmd_wait);
 static DEFINE_SPINLOCK(kapmd_queue_lock);
 static struct apm_queue kapmd_queue;
 
+static DEFINE_MUTEX(state_lock);
 
 static const char driver_version[] = "1.13";    /* no spaces */
 
@@ -148,38 +150,60 @@ static void queue_add_event(struct apm_queue *q, apm_event_t event)
         q->events[q->event_head] = event;
 }
 
-static void queue_event_one_user(struct apm_user *as, apm_event_t event)
+static void queue_event(apm_event_t event)
 {
-        if (as->suser && as->writer) {
-                switch (event) {
-                case APM_SYS_SUSPEND:
-                case APM_USER_SUSPEND:
-                        /*
-                         * If this user already has a suspend pending,
-                         * don't queue another one.
-                         */
-                        if (as->suspend_state != SUSPEND_NONE)
-                                return;
+        struct apm_user *as;
 
-                        as->suspend_state = SUSPEND_PENDING;
-                        suspends_pending++;
-                        break;
-                }
+        down_read(&user_list_lock);
+        list_for_each_entry(as, &apm_user_list, list) {
+                if (as->reader)
+                        queue_add_event(&as->queue, event);
         }
-        queue_add_event(&as->queue, event);
+        up_read(&user_list_lock);
+        wake_up_interruptible(&apm_waitqueue);
 }
 
-static void queue_event(apm_event_t event, struct apm_user *sender)
+/*
+ * queue_suspend_event - queue an APM suspend event.
+ *
+ * Check that we're in a state where we can suspend.  If not,
+ * return -EBUSY.  Otherwise, queue an event to all "writer"
+ * users.  If there are no "writer" users, return '1' to
+ * indicate that we can immediately suspend.
+ */
+static int queue_suspend_event(apm_event_t event, struct apm_user *sender)
 {
         struct apm_user *as;
+        int ret = 1;
 
+        mutex_lock(&state_lock);
         down_read(&user_list_lock);
+
+        /*
+         * If a thread is still processing, we can't suspend, so reject
+         * the request.
+         */
         list_for_each_entry(as, &apm_user_list, list) {
-                if (as != sender && as->reader)
-                        queue_event_one_user(as, event);
+                if (as != sender && as->reader && as->writer && as->suser &&
+                    as->suspend_state != SUSPEND_NONE) {
+                        ret = -EBUSY;
+                        goto out;
+                }
         }
+
+        list_for_each_entry(as, &apm_user_list, list) {
+                if (as != sender && as->reader && as->writer && as->suser) {
+                        as->suspend_state = SUSPEND_PENDING;
+                        suspends_pending++;
+                        queue_add_event(&as->queue, event);
+                        ret = 0;
+                }
+        }
+ out:
         up_read(&user_list_lock);
+        mutex_unlock(&state_lock);
         wake_up_interruptible(&apm_waitqueue);
+        return ret;
 }
 
 static void apm_suspend(void)
@@ -191,17 +215,22 @@ static void apm_suspend(void)
          * Anyone on the APM queues will think we're still suspended.
          * Send a message so everyone knows we're now awake again.
          */
-        queue_event(APM_NORMAL_RESUME, NULL);
+        queue_event(APM_NORMAL_RESUME);
 
         /*
          * Finally, wake up anyone who is sleeping on the suspend.
          */
+        mutex_lock(&state_lock);
         down_read(&user_list_lock);
         list_for_each_entry(as, &apm_user_list, list) {
-                as->suspend_result = err;
-                as->suspend_state = SUSPEND_DONE;
+                if (as->suspend_state == SUSPEND_WAIT ||
+                    as->suspend_state == SUSPEND_ACKED) {
+                        as->suspend_result = err;
+                        as->suspend_state = SUSPEND_DONE;
+                }
         }
         up_read(&user_list_lock);
+        mutex_unlock(&state_lock);
 
         wake_up(&apm_suspend_waitqueue);
 }
@@ -227,8 +256,11 @@ static ssize_t apm_read(struct file *fp, char __user *buf, size_t count, loff_t
                 if (copy_to_user(buf, &event, sizeof(event)))
                         break;
 
-                if (event == APM_SYS_SUSPEND || event == APM_USER_SUSPEND)
+                mutex_lock(&state_lock);
+                if (as->suspend_state == SUSPEND_PENDING &&
+                    (event == APM_SYS_SUSPEND || event == APM_USER_SUSPEND))
                         as->suspend_state = SUSPEND_READ;
+                mutex_unlock(&state_lock);
 
                 buf += sizeof(event);
                 i -= sizeof(event);
@@ -270,9 +302,13 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
 
         switch (cmd) {
         case APM_IOC_SUSPEND:
+                mutex_lock(&state_lock);
+
                 as->suspend_result = -EINTR;
 
                 if (as->suspend_state == SUSPEND_READ) {
+                        int pending;
+
                         /*
                          * If we read a suspend command from /dev/apm_bios,
                          * then the corresponding APM_IOC_SUSPEND ioctl is
@@ -280,47 +316,73 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
                          */
                         as->suspend_state = SUSPEND_ACKED;
                         suspends_pending--;
+                        pending = suspends_pending == 0;
+                        mutex_unlock(&state_lock);
+
+                        /*
+                         * If there are no further acknowledges required,
+                         * suspend the system.
+                         */
+                        if (pending)
+                                apm_suspend();
+
+                        /*
+                         * Wait for the suspend/resume to complete.  If there
+                         * are pending acknowledges, we wait here for them.
+                         *
+                         * Note: we need to ensure that the PM subsystem does
+                         * not kick us out of the wait when it suspends the
+                         * threads.
+                         */
+                        flags = current->flags;
+                        current->flags |= PF_NOFREEZE;
+
+                        wait_event(apm_suspend_waitqueue,
+                                   as->suspend_state == SUSPEND_DONE);
                 } else {
+                        as->suspend_state = SUSPEND_WAIT;
+                        mutex_unlock(&state_lock);
+
                         /*
                          * Otherwise it is a request to suspend the system.
                          * Queue an event for all readers, and expect an
                          * acknowledge from all writers who haven't already
                          * acknowledged.
                          */
-                        queue_event(APM_USER_SUSPEND, as);
-                }
-
-                /*
-                 * If there are no further acknowledges required, suspend
-                 * the system.
-                 */
-                if (suspends_pending == 0)
-                        apm_suspend();
+                        err = queue_suspend_event(APM_USER_SUSPEND, as);
+                        if (err < 0) {
+                                /*
+                                 * Avoid taking the lock here - this
+                                 * should be fine.
+                                 */
+                                as->suspend_state = SUSPEND_NONE;
+                                break;
+                        }
+
+                        if (err > 0)
+                                apm_suspend();
 
-                /*
-                 * Wait for the suspend/resume to complete.  If there are
-                 * pending acknowledges, we wait here for them.
-                 *
-                 * Note that we need to ensure that the PM subsystem does
-                 * not kick us out of the wait when it suspends the threads.
-                 */
-                flags = current->flags;
-                current->flags |= PF_NOFREEZE;
+                        /*
+                         * Wait for the suspend/resume to complete.  If there
+                         * are pending acknowledges, we wait here for them.
+                         *
+                         * Note: we need to ensure that the PM subsystem does
+                         * not kick us out of the wait when it suspends the
+                         * threads.
+                         */
+                        flags = current->flags;
+                        current->flags |= PF_NOFREEZE;
 
-                /*
-                 * Note: do not allow a thread which is acking the suspend
-                 * to escape until the resume is complete.
-                 */
-                if (as->suspend_state == SUSPEND_ACKED)
-                        wait_event(apm_suspend_waitqueue,
-                                         as->suspend_state == SUSPEND_DONE);
-                else
                         wait_event_interruptible(apm_suspend_waitqueue,
                                          as->suspend_state == SUSPEND_DONE);
+                }
 
                 current->flags = flags;
+
+                mutex_lock(&state_lock);
                 err = as->suspend_result;
                 as->suspend_state = SUSPEND_NONE;
+                mutex_unlock(&state_lock);
                 break;
         }
 
@@ -330,6 +392,8 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
 static int apm_release(struct inode * inode, struct file * filp)
 {
         struct apm_user *as = filp->private_data;
+        int pending = 0;
+
         filp->private_data = NULL;
 
         down_write(&user_list_lock);
@@ -342,11 +406,14 @@ static int apm_release(struct inode * inode, struct file * filp)
          * need to balance suspends_pending, which means the
          * possibility of sleeping.
          */
+        mutex_lock(&state_lock);
         if (as->suspend_state != SUSPEND_NONE) {
                 suspends_pending -= 1;
-                if (suspends_pending == 0)
-                        apm_suspend();
+                pending = suspends_pending == 0;
         }
+        mutex_unlock(&state_lock);
+        if (pending)
+                apm_suspend();
 
         kfree(as);
         return 0;
@@ -356,7 +423,7 @@ static int apm_open(struct inode * inode, struct file * filp)
 {
         struct apm_user *as;
 
-        as = (struct apm_user *)kzalloc(sizeof(*as), GFP_KERNEL);
+        as = kzalloc(sizeof(*as), GFP_KERNEL);
         if (as) {
                 /*
                  * XXX - this is a tiny bit broken, when we consider BSD
@@ -470,6 +537,7 @@ static int kapmd(void *arg)
 {
         do {
                 apm_event_t event;
+                int ret;
 
                 wait_event_interruptible(kapmd_wait,
                                 !queue_empty(&kapmd_queue) || kthread_should_stop());
@@ -489,13 +557,20 @@ static int kapmd(void *arg)
 
                 case APM_LOW_BATTERY:
                 case APM_POWER_STATUS_CHANGE:
-                        queue_event(event, NULL);
+                        queue_event(event);
                         break;
 
                 case APM_USER_SUSPEND:
                 case APM_SYS_SUSPEND:
-                        queue_event(event, NULL);
-                        if (suspends_pending == 0)
+                        ret = queue_suspend_event(event, NULL);
+                        if (ret < 0) {
+                                /*
+                                 * We were busy.  Try again in 50ms.
+                                 */
+                                queue_add_event(&kapmd_queue, event);
+                                msleep(50);
+                        }
+                        if (ret > 0)
                                 apm_suspend();
                         break;
 
diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
index cc2d58d028e1..3c078e346753 100644
--- a/arch/arm/kernel/asm-offsets.c
+++ b/arch/arm/kernel/asm-offsets.c
@@ -15,6 +15,7 @@
 #include <asm/mach/arch.h>
 #include <asm/thread_info.h>
 #include <asm/memory.h>
+#include <asm/procinfo.h>
 
 /*
  * Make sure that the compiler and target are compatible.
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 3173924a9b60..f7598cbc7ec5 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -110,7 +110,7 @@
                 CALL(sys_ni_syscall)            /* was sys_profil */
                 CALL(sys_statfs)
 /* 100 */       CALL(sys_fstatfs)
-                CALL(sys_ni_syscall)
+                CALL(sys_ni_syscall)            /* sys_ioperm */
                 CALL(OBSOLETE(ABI(sys_socketcall, sys_oabi_socketcall)))
                 CALL(sys_syslog)
                 CALL(sys_setitimer)
@@ -132,7 +132,7 @@
 /* 120 */       CALL(sys_clone_wrapper)
                 CALL(sys_setdomainname)
                 CALL(sys_newuname)
-                CALL(sys_ni_syscall)
+                CALL(sys_ni_syscall)            /* modify_ldt */
                 CALL(sys_adjtimex)
 /* 125 */       CALL(sys_mprotect)
                 CALL(sys_sigprocmask)
@@ -146,7 +146,7 @@
                 CALL(sys_bdflush)
 /* 135 */       CALL(sys_sysfs)
                 CALL(sys_personality)
-                CALL(sys_ni_syscall)            /* CALL(_sys_afs_syscall) */
+                CALL(sys_ni_syscall)            /* reserved for afs_syscall */
                 CALL(sys_setfsuid16)
                 CALL(sys_setfsgid16)
 /* 140 */       CALL(sys_llseek)
@@ -175,7 +175,7 @@
                 CALL(sys_arm_mremap)
                 CALL(sys_setresuid16)
 /* 165 */       CALL(sys_getresuid16)
-                CALL(sys_ni_syscall)
+                CALL(sys_ni_syscall)            /* vm86 */
                 CALL(sys_ni_syscall)            /* was sys_query_module */
                 CALL(sys_poll)
                 CALL(sys_nfsservctl)
@@ -197,8 +197,8 @@
 /* 185 */       CALL(sys_capset)
                 CALL(sys_sigaltstack_wrapper)
                 CALL(sys_sendfile)
-                CALL(sys_ni_syscall)
-                CALL(sys_ni_syscall)
+                CALL(sys_ni_syscall)            /* getpmsg */
+                CALL(sys_ni_syscall)            /* putpmsg */
 /* 190 */       CALL(sys_vfork_wrapper)
                 CALL(sys_getrlimit)
                 CALL(sys_mmap2)
@@ -331,6 +331,31 @@
                 CALL(sys_mbind)
 /* 320 */       CALL(sys_get_mempolicy)
                 CALL(sys_set_mempolicy)
+                CALL(sys_openat)
+                CALL(sys_mkdirat)
+                CALL(sys_mknodat)
+/* 325 */       CALL(sys_fchownat)
+                CALL(sys_futimesat)
+                CALL(sys_fstatat64)
+                CALL(sys_unlinkat)
+                CALL(sys_renameat)
+/* 330 */       CALL(sys_linkat)
+                CALL(sys_symlinkat)
+                CALL(sys_readlinkat)
+                CALL(sys_fchmodat)
+                CALL(sys_faccessat)
+/* 335 */       CALL(sys_ni_syscall)            /* eventually pselect6 */
+                CALL(sys_ni_syscall)            /* eventually ppoll */
+                CALL(sys_unshare)
+                CALL(sys_set_robust_list)
+                CALL(sys_get_robust_list)
+/* 340 */       CALL(sys_splice)
+                CALL(sys_arm_sync_file_range)
+                CALL(sys_tee)
+                CALL(sys_vmsplice)
+                CALL(sys_move_pages)
+/* 345 */       CALL(sys_getcpu)
+                CALL(sys_ni_syscall)            /* eventually epoll_pwait */
 #ifndef syscalls_counted
 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
 #define syscalls_counted
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index b27513a0f11e..71257e3d513f 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -353,7 +353,7 @@ int ecard_readchunk(struct in_chunk_dir *cd, ecard_t *ec, int id, int num)
                 }
                 if (c_id(&excd) == 0x80) { /* loader */
                         if (!ec->loader) {
-                                ec->loader = (loader_t)kmalloc(c_len(&excd),
+                                ec->loader = kmalloc(c_len(&excd),
                                                                GFP_KERNEL);
                                 if (ec->loader)
                                         ecard_readbytes(ec->loader, ec,
@@ -529,7 +529,7 @@ static void ecard_dump_irq_state(void)
         }
 }
 
-static void ecard_check_lockup(struct irqdesc *desc)
+static void ecard_check_lockup(struct irq_desc *desc)
 {
         static unsigned long last;
         static int lockup;
@@ -567,7 +567,7 @@ static void ecard_check_lockup(struct irqdesc *desc)
 }
 
 static void
-ecard_irq_handler(unsigned int irq, struct irqdesc *desc)
+ecard_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         ecard_t *ec;
         int called = 0;
@@ -585,7 +585,7 @@ ecard_irq_handler(unsigned int irq, struct irqdesc *desc)
                         pending = ecard_default_ops.irqpending(ec);
 
                 if (pending) {
-                        struct irqdesc *d = irq_desc + ec->irq;
+                        struct irq_desc *d = irq_desc + ec->irq;
                         desc_handle_irq(ec->irq, d);
                         called ++;
                 }
@@ -609,7 +609,7 @@ static unsigned char first_set[] =
 };
 
 static void
-ecard_irqexp_handler(unsigned int irq, struct irqdesc *desc)
+ecard_irqexp_handler(unsigned int irq, struct irq_desc *desc)
 {
         const unsigned int statusmask = 15;
         unsigned int status;
@@ -1022,7 +1022,7 @@ ecard_probe(int slot, card_type_t type)
         if (slot < 8) {
                 ec->irq = 32 + slot;
                 set_irq_chip(ec->irq, &ecard_chip);
-                set_irq_handler(ec->irq, do_level_IRQ);
+                set_irq_handler(ec->irq, handle_level_irq);
                 set_irq_flags(ec->irq, IRQF_VALID);
         }
 
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index bd623b73445f..8517c3c3eb33 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -436,7 +436,7 @@ __und_usr:
         usr_entry
 
         tst     r3, #PSR_T_BIT                  @ Thumb mode?
-        bne     fpundefinstr                    @ ignore FP
+        bne     __und_usr_unknown               @ ignore FP
         sub     r4, r2, #4
 
         @
@@ -448,7 +448,7 @@ __und_usr:
         @
 1:      ldrt    r0, [r4]
         adr     r9, ret_from_exception
-        adr     lr, fpundefinstr
+        adr     lr, __und_usr_unknown
         @
         @ fallthrough to call_fpe
         @
@@ -476,7 +476,9 @@ __und_usr:
  * Emulators may wish to make use of the following registers:
  *  r0  = instruction opcode.
  *  r2  = PC+4
+ *  r9  = normal "successful" return address
  *  r10 = this threads thread_info structure.
+ *  lr  = unrecognised instruction return address
  */
 call_fpe:
         tst     r0, #0x08000000                 @ only CDP/CPRT/LDC/STC have bit 27
@@ -545,10 +547,12 @@ do_fpe:
 
         .data
 ENTRY(fp_enter)
-        .word   fpundefinstr
+        .word   no_fp
         .text
 
-fpundefinstr:
+no_fp:  mov     pc, lr
+
+__und_usr_unknown:
         mov     r0, sp
         adr     lr, ret_from_exception
         b       do_undefinstr
@@ -589,10 +593,6 @@ ENTRY(__switch_to)
         strex   r5, r4, [ip]                    @ Clear exclusive monitor
 #endif
 #endif
-#if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT)
-        mra     r4, r5, acc0
-        stmia   ip, {r4, r5}
-#endif
 #if defined(CONFIG_HAS_TLS_REG)
         mcr     p15, 0, r3, c13, c0, 3          @ set TLS register
 #elif !defined(CONFIG_TLS_REG_EMUL)
@@ -602,11 +602,6 @@ ENTRY(__switch_to)
 #ifdef CONFIG_MMU
         mcr     p15, 0, r6, c3, c0, 0           @ Set domain register
 #endif
-#if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT)
-        add     r4, r2, #TI_CPU_DOMAIN + 40     @ cpu_context_save->extra
-        ldmib   r4, {r4, r5}
-        mar     acc0, r4, r5
-#endif
         mov     r5, r0
         add     r4, r2, #TI_CPU_SAVE
         ldr     r0, =thread_notify_head
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S
index f359a189dcf2..0119c0d5f978 100644
--- a/arch/arm/kernel/head-nommu.S
+++ b/arch/arm/kernel/head-nommu.S
@@ -16,7 +16,6 @@
 
 #include <asm/assembler.h>
 #include <asm/mach-types.h>
-#include <asm/procinfo.h>
 #include <asm/ptrace.h>
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index ebc3e74a7947..d994561816a1 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -16,37 +16,37 @@
 
 #include <asm/assembler.h>
 #include <asm/domain.h>
-#include <asm/procinfo.h>
 #include <asm/ptrace.h>
 #include <asm/asm-offsets.h>
 #include <asm/memory.h>
 #include <asm/thread_info.h>
 #include <asm/system.h>
 
-#define KERNEL_RAM_ADDR (PAGE_OFFSET + TEXT_OFFSET)
+#define KERNEL_RAM_VADDR        (PAGE_OFFSET + TEXT_OFFSET)
+#define KERNEL_RAM_PADDR        (PHYS_OFFSET + TEXT_OFFSET)
 
 /*
  * swapper_pg_dir is the virtual address of the initial page table.
- * We place the page tables 16K below KERNEL_RAM_ADDR.  Therefore, we must
- * make sure that KERNEL_RAM_ADDR is correctly set.  Currently, we expect
+ * We place the page tables 16K below KERNEL_RAM_VADDR.  Therefore, we must
+ * make sure that KERNEL_RAM_VADDR is correctly set.  Currently, we expect
  * the least significant 16 bits to be 0x8000, but we could probably
- * relax this restriction to KERNEL_RAM_ADDR >= PAGE_OFFSET + 0x4000.
+ * relax this restriction to KERNEL_RAM_VADDR >= PAGE_OFFSET + 0x4000.
  */
-#if (KERNEL_RAM_ADDR & 0xffff) != 0x8000
-#error KERNEL_RAM_ADDR must start at 0xXXXX8000
+#if (KERNEL_RAM_VADDR & 0xffff) != 0x8000
+#error KERNEL_RAM_VADDR must start at 0xXXXX8000
 #endif
 
         .globl  swapper_pg_dir
-        .equ    swapper_pg_dir, KERNEL_RAM_ADDR - 0x4000
+        .equ    swapper_pg_dir, KERNEL_RAM_VADDR - 0x4000
 
         .macro  pgtbl, rd
-        ldr     \rd, =(__virt_to_phys(KERNEL_RAM_ADDR - 0x4000))
+        ldr     \rd, =(KERNEL_RAM_PADDR - 0x4000)
         .endm
 
 #ifdef CONFIG_XIP_KERNEL
 #define TEXTADDR  XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR)
 #else
-#define TEXTADDR  KERNEL_RAM_ADDR
+#define TEXTADDR  KERNEL_RAM_VADDR
 #endif
 
 /*
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 2c4ff1cbe334..ec01f08f5642 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -112,7 +112,7 @@ static struct irq_desc bad_irq_desc = {
 asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)
 {
         struct pt_regs *old_regs = set_irq_regs(regs);
-        struct irqdesc *desc = irq_desc + irq;
+        struct irq_desc *desc = irq_desc + irq;
 
         /*
          * Some hardware gives randomly wrong interrupts.  Rather
@@ -134,7 +134,7 @@ asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)
 
 void set_irq_flags(unsigned int irq, unsigned int iflags)
 {
-        struct irqdesc *desc;
+        struct irq_desc *desc;
         unsigned long flags;
 
         if (irq >= NR_IRQS) {
@@ -171,7 +171,7 @@ void __init init_IRQ(void)
 
 #ifdef CONFIG_HOTPLUG_CPU
 
-static void route_irq(struct irqdesc *desc, unsigned int irq, unsigned int cpu)
+static void route_irq(struct irq_desc *desc, unsigned int irq, unsigned int cpu)
 {
         pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc->cpu, cpu);
 
@@ -190,7 +190,7 @@ void migrate_irqs(void)
         unsigned int i, cpu = smp_processor_id();
 
         for (i = 0; i < NR_IRQS; i++) {
-                struct irqdesc *desc = irq_desc + i;
+                struct irq_desc *desc = irq_desc + i;
 
                 if (desc->cpu == cpu) {
                         unsigned int newcpu = any_online_cpu(desc->affinity);
diff --git a/arch/arm/kernel/iwmmxt-notifier.c b/arch/arm/kernel/iwmmxt-notifier.c
deleted file mode 100644
index 0d1a1db40062..000000000000
--- a/arch/arm/kernel/iwmmxt-notifier.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  linux/arch/arm/kernel/iwmmxt-notifier.c
- *
- *  XScale iWMMXt (Concan) context switching and handling
- *
- *  Initial code:
- *  Copyright (c) 2003, Intel Corporation
- *
- *  Full lazy switching support, optimizations and more, by Nicolas Pitre
- *  Copyright (c) 2003-2004, MontaVista Software, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/init.h>
-#include <asm/thread_notify.h>
-#include <asm/io.h>
-
-static int iwmmxt_do(struct notifier_block *self, unsigned long cmd, void *t)
-{
-        struct thread_info *thread = t;
-
-        switch (cmd) {
-        case THREAD_NOTIFY_FLUSH:
-                /*
-                 * flush_thread() zeroes thread->fpstate, so no need
-                 * to do anything here.
-                 *
-                 * FALLTHROUGH: Ensure we don't try to overwrite our newly
-                 * initialised state information on the first fault.
-                 */
-
-        case THREAD_NOTIFY_RELEASE:
-                iwmmxt_task_release(thread);
-                break;
-
-        case THREAD_NOTIFY_SWITCH:
-                iwmmxt_task_switch(thread);
-                break;
-        }
-
-        return NOTIFY_DONE;
-}
-
-static struct notifier_block iwmmxt_notifier_block = {
-        .notifier_call  = iwmmxt_do,
-};
-
-static int __init iwmmxt_init(void)
-{
-        thread_register_notifier(&iwmmxt_notifier_block);
-
-        return 0;
-}
-
-late_initcall(iwmmxt_init);
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index bf35c178a877..a9e8f7e55fd6 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -281,67 +281,6 @@ void show_fpregs(struct user_fp *regs)
 }
 
 /*
- * Task structure and kernel stack allocation.
- */
-struct thread_info_list {
-        unsigned long *head;
-        unsigned int nr;
-};
-
-static DEFINE_PER_CPU(struct thread_info_list, thread_info_list) = { NULL, 0 };
-
-#define EXTRA_TASK_STRUCT       4
-
-struct thread_info *alloc_thread_info(struct task_struct *task)
-{
-        struct thread_info *thread = NULL;
-
-        if (EXTRA_TASK_STRUCT) {
-                struct thread_info_list *th = &get_cpu_var(thread_info_list);
-                unsigned long *p = th->head;
-
-                if (p) {
-                        th->head = (unsigned long *)p[0];
-                        th->nr -= 1;
-                }
-                put_cpu_var(thread_info_list);
-
-                thread = (struct thread_info *)p;
-        }
-
-        if (!thread)
-                thread = (struct thread_info *)
-                           __get_free_pages(GFP_KERNEL, THREAD_SIZE_ORDER);
-
-#ifdef CONFIG_DEBUG_STACK_USAGE
-        /*
-         * The stack must be cleared if you want SYSRQ-T to
-         * give sensible stack usage information
-         */
-        if (thread)
-                memzero(thread, THREAD_SIZE);
-#endif
-        return thread;
-}
-
-void free_thread_info(struct thread_info *thread)
-{
-        if (EXTRA_TASK_STRUCT) {
-                struct thread_info_list *th = &get_cpu_var(thread_info_list);
-                if (th->nr < EXTRA_TASK_STRUCT) {
-                        unsigned long *p = (unsigned long *)thread;
-                        p[0] = (unsigned long)th->head;
-                        th->head = p;
-                        th->nr += 1;
-                        put_cpu_var(thread_info_list);
-                        return;
-                }
-                put_cpu_var(thread_info_list);
-        }
-        free_pages((unsigned long)thread, THREAD_SIZE_ORDER);
-}
-
-/*
  * Free current thread data structures etc..
  */
 void exit_thread(void)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 29efc9f82057..bbab134cd82d 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -354,12 +354,6 @@ static void __init setup_processor(void)
 #ifndef CONFIG_ARM_THUMB
         elf_hwcap &= ~HWCAP_THUMB;
 #endif
-#ifndef CONFIG_VFP
-        elf_hwcap &= ~HWCAP_VFP;
-#endif
-#ifndef CONFIG_IWMMXT
-        elf_hwcap &= ~HWCAP_IWMMXT;
-#endif
 
         cpu_proc_init();
 }
@@ -441,16 +435,19 @@ __early_param("initrd=", early_initrd);
 
 static void __init arm_add_memory(unsigned long start, unsigned long size)
 {
+        struct membank *bank;
+
         /*
          * Ensure that start/size are aligned to a page boundary.
          * Size is appropriately rounded down, start is rounded up.
          */
         size -= start & ~PAGE_MASK;
 
-        meminfo.bank[meminfo.nr_banks].start = PAGE_ALIGN(start);
-        meminfo.bank[meminfo.nr_banks].size  = size & PAGE_MASK;
-        meminfo.bank[meminfo.nr_banks].node  = PHYS_TO_NID(start);
-        meminfo.nr_banks += 1;
+        bank = &meminfo.bank[meminfo.nr_banks++];
+
+        bank->start = PAGE_ALIGN(start);
+        bank->size  = size & PAGE_MASK;
+        bank->node  = PHYS_TO_NID(start);
 }
 
 /*
@@ -858,6 +855,7 @@ static const char *hwcap_str[] = {
         "edsp",
         "java",
         "iwmmxt",
+        "crunch",
         NULL
 };
 
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 48cf7fffddf2..3843d3bab2dd 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -11,7 +11,9 @@
 #include <linux/signal.h>
 #include <linux/ptrace.h>
 #include <linux/personality.h>
+#include <linux/freezer.h>
 
+#include <asm/elf.h>
 #include <asm/cacheflush.h>
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index 00c18d35913c..3d4fcbc16276 100644
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -328,3 +328,16 @@ asmlinkage long sys_arm_fadvise64_64(int fd, int advice,
 {
         return sys_fadvise64_64(fd, offset, len, advice);
 }
+
+/*
+ * Yet more syscall fsckage - we can't fit sys_sync_file_range's
+ * arguments into the available registers with EABI.  So, let's
+ * create an ARM specific syscall for this which has _sane_
+ * arguments.  (This incidentally also has an ABI-independent
+ * argument layout.)
+ */
+asmlinkage long sys_arm_sync_file_range(int fd, unsigned int flags,
+                                        loff_t offset, loff_t nbytes)
+{
+        return sys_sync_file_range(fd, offset, nbytes, flags);
+}
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 6ff5e3ff6cb5..3c8cdcfe8d4a 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -29,6 +29,8 @@
 #include <linux/timer.h>
 #include <linux/irq.h>
 
+#include <linux/mc146818rtc.h>
+
 #include <asm/leds.h>
 #include <asm/thread_info.h>
 #include <asm/mach/time.h>
@@ -85,6 +87,17 @@ unsigned long long __attribute__((weak)) sched_clock(void)
         return (unsigned long long)jiffies * (1000000000 / HZ);
 }
 
+/*
+ * An implementation of printk_clock() independent from
+ * sched_clock().  This avoids non-bootable kernels when
+ * printk_clock is enabled.
+ */
+unsigned long long printk_clock(void)
+{
+        return (unsigned long long)(jiffies - INITIAL_JIFFIES) *
+                        (1000000000 / HZ);
+}
+
 static unsigned long next_rtc_update;
 
 /*
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index bede380c07a9..908915675edc 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -27,6 +27,7 @@
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 #include <asm/traps.h>
+#include <asm/io.h>
 
 #include "ptrace.h"
 #include "signal.h"
@@ -631,12 +632,9 @@ baddataabort(int code, unsigned long instr, struct pt_regs *regs)
         notify_die("unknown data abort code", regs, &info, instr, 0);
 }
 
-void __attribute__((noreturn)) __bug(const char *file, int line, void *data)
+void __attribute__((noreturn)) __bug(const char *file, int line)
 {
-        printk(KERN_CRIT"kernel BUG at %s:%d!", file, line);
-        if (data)
-                printk(" - extra data = %p", data);
-        printk("\n");
+        printk(KERN_CRIT"kernel BUG at %s:%d!\n", file, line);
         *(int *)0 = 0;
 
         /* Avoid "noreturn function does return" */
diff --git a/arch/arm/kernel/xscale-cp0.c b/arch/arm/kernel/xscale-cp0.c
new file mode 100644
index 000000000000..180000bfdc8f
--- /dev/null
+++ b/arch/arm/kernel/xscale-cp0.c
@@ -0,0 +1,179 @@
+/*
+ * linux/arch/arm/kernel/xscale-cp0.c
+ *
+ * XScale DSP and iWMMXt coprocessor context switching and handling
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/init.h>
+#include <asm/thread_notify.h>
+#include <asm/io.h>
+
+static inline void dsp_save_state(u32 *state)
+{
+        __asm__ __volatile__ (
+                "mrrc   p0, 0, %0, %1, c0\n"
+                : "=r" (state[0]), "=r" (state[1]));
+}
+
+static inline void dsp_load_state(u32 *state)
+{
+        __asm__ __volatile__ (
+                "mcrr   p0, 0, %0, %1, c0\n"
+                : : "r" (state[0]), "r" (state[1]));
+}
+
+static int dsp_do(struct notifier_block *self, unsigned long cmd, void *t)
+{
+        struct thread_info *thread = t;
+
+        switch (cmd) {
+        case THREAD_NOTIFY_FLUSH:
+                thread->cpu_context.extra[0] = 0;
+                thread->cpu_context.extra[1] = 0;
+                break;
+
+        case THREAD_NOTIFY_SWITCH:
+                dsp_save_state(current_thread_info()->cpu_context.extra);
+                dsp_load_state(thread->cpu_context.extra);
+                break;
+        }
+
+        return NOTIFY_DONE;
+}
+
+static struct notifier_block dsp_notifier_block = {
+        .notifier_call  = dsp_do,
+};
+
+
+#ifdef CONFIG_IWMMXT
+static int iwmmxt_do(struct notifier_block *self, unsigned long cmd, void *t)
+{
+        struct thread_info *thread = t;
+
+        switch (cmd) {
+        case THREAD_NOTIFY_FLUSH:
+                /*
+                 * flush_thread() zeroes thread->fpstate, so no need
+                 * to do anything here.
+                 *
+                 * FALLTHROUGH: Ensure we don't try to overwrite our newly
+                 * initialised state information on the first fault.
+                 */
+
+        case THREAD_NOTIFY_RELEASE:
+                iwmmxt_task_release(thread);
+                break;
+
+        case THREAD_NOTIFY_SWITCH:
+                iwmmxt_task_switch(thread);
+                break;
+        }
+
+        return NOTIFY_DONE;
+}
+
+static struct notifier_block iwmmxt_notifier_block = {
+        .notifier_call  = iwmmxt_do,
+};
+#endif
+
+
+static u32 __init xscale_cp_access_read(void)
+{
+        u32 value;
+
+        __asm__ __volatile__ (
+                "mrc    p15, 0, %0, c15, c1, 0\n\t"
+                : "=r" (value));
+
+        return value;
+}
+
+static void __init xscale_cp_access_write(u32 value)
+{
+        u32 temp;
+
+        __asm__ __volatile__ (
+                "mcr    p15, 0, %1, c15, c1, 0\n\t"
+                "mrc    p15, 0, %0, c15, c1, 0\n\t"
+                "mov    %0, %0\n\t"
+                "sub    pc, pc, #4\n\t"
+                : "=r" (temp) : "r" (value));
+}
+
+/*
+ * Detect whether we have a MAC coprocessor (40 bit register) or an
+ * iWMMXt coprocessor (64 bit registers) by loading 00000100:00000000
+ * into a coprocessor register and reading it back, and checking
+ * whether the upper word survived intact.
+ */
+static int __init cpu_has_iwmmxt(void)
+{
+        u32 lo;
+        u32 hi;
+
+        /*
+         * This sequence is interpreted by the DSP coprocessor as:
+         *      mar     acc0, %2, %3
+         *      mra     %0, %1, acc0
+         *
+         * And by the iWMMXt coprocessor as:
+         *      tmcrr   wR0, %2, %3
+         *      tmrrc   %0, %1, wR0
+         */
+        __asm__ __volatile__ (
+                "mcrr   p0, 0, %2, %3, c0\n"
+                "mrrc   p0, 0, %0, %1, c0\n"
+                : "=r" (lo), "=r" (hi)
+                : "r" (0), "r" (0x100));
+
+        return !!hi;
+}
+
+
+/*
+ * If we detect that the CPU has iWMMXt (and CONFIG_IWMMXT=y), we
+ * disable CP0/CP1 on boot, and let call_fpe() and the iWMMXt lazy
+ * switch code handle iWMMXt context switching.  If on the other
+ * hand the CPU has a DSP coprocessor, we keep access to CP0 enabled
+ * all the time, and save/restore acc0 on context switch in non-lazy
+ * fashion.
+ */
+static int __init xscale_cp0_init(void)
+{
+        u32 cp_access;
+
+        cp_access = xscale_cp_access_read() & ~3;
+        xscale_cp_access_write(cp_access | 1);
+
+        if (cpu_has_iwmmxt()) {
+#ifndef CONFIG_IWMMXT
+                printk(KERN_WARNING "CAUTION: XScale iWMMXt coprocessor "
+                        "detected, but kernel support is missing.\n");
+#else
+                printk(KERN_INFO "XScale iWMMXt coprocessor detected.\n");
+                elf_hwcap |= HWCAP_IWMMXT;
+                thread_register_notifier(&iwmmxt_notifier_block);
+#endif
+        } else {
+                printk(KERN_INFO "XScale DSP coprocessor detected.\n");
+                thread_register_notifier(&dsp_notifier_block);
+                cp_access |= 1;
+        }
+
+        xscale_cp_access_write(cp_access);
+
+        return 0;
+}
+
+late_initcall(xscale_cp0_init);
diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c
index fe3d297d682d..a950160fcfb6 100644
--- a/arch/arm/mach-aaec2000/core.c
+++ b/arch/arm/mach-aaec2000/core.c
@@ -82,7 +82,7 @@ static void aaec2000_int_unmask(unsigned int irq)
         IRQ_INTENS |= (1 << irq);
 }
 
-static struct irqchip aaec2000_irq_chip = {
+static struct irq_chip aaec2000_irq_chip = {
         .ack    = aaec2000_int_ack,
         .mask   = aaec2000_int_mask,
         .unmask = aaec2000_int_unmask,
@@ -93,7 +93,7 @@ void __init aaec2000_init_irq(void)
         unsigned int i;
 
         for (i = 0; i < NR_IRQS; i++) {
-                set_irq_handler(i, do_level_IRQ);
+                set_irq_handler(i, handle_level_irq);
                 set_irq_chip(i, &aaec2000_irq_chip);
                 set_irq_flags(i, IRQF_VALID);
         }
diff --git a/arch/arm/mach-at91rm9200/Kconfig b/arch/arm/mach-at91rm9200/Kconfig
index 2f85e8693b1b..9f11db8af233 100644
--- a/arch/arm/mach-at91rm9200/Kconfig
+++ b/arch/arm/mach-at91rm9200/Kconfig
@@ -2,7 +2,8 @@ if ARCH_AT91
 
 menu "Atmel AT91 System-on-Chip"
 
-comment "Atmel AT91 Processors"
+choice
+        prompt "Atmel AT91 Processor"
 
 config ARCH_AT91RM9200
         bool "AT91RM9200"
@@ -13,6 +14,8 @@ config ARCH_AT91SAM9260
 config ARCH_AT91SAM9261
         bool "AT91SAM9261"
 
+endchoice
+
 # ----------------------------------------------------------
 
 if ARCH_AT91RM9200
@@ -33,7 +36,6 @@ config ARCH_AT91RM9200DK
           Select this if you are using Atmel's AT91RM9200-DK Development board.
           (Discontinued)
 
-
 config MACH_AT91RM9200EK
         bool "Atmel AT91RM9200-EK Evaluation Kit"
         depends on ARCH_AT91RM9200
@@ -90,6 +92,13 @@ if ARCH_AT91SAM9260
 
 comment "AT91SAM9260 Board Type"
 
+config MACH_AT91SAM9260EK
+        bool "Atmel AT91SAM9260-EK Evaluation Kit"
+        depends on ARCH_AT91SAM9260
+        help
+          Select this if you are using Atmel's AT91SAM9260-EK Evaluation Kit.
+          <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933>
+
 endif
 
 # ----------------------------------------------------------
@@ -98,8 +107,31 @@ if ARCH_AT91SAM9261
 
 comment "AT91SAM9261 Board Type"
 
+config MACH_AT91SAM9261EK
+        bool "Atmel AT91SAM9261-EK Evaluation Kit"
+        depends on ARCH_AT91SAM9261
+        help
+          Select this if you are using Atmel's AT91SAM9261-EK Evaluation Kit.
+          <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3820>
+
 endif
 
+# ----------------------------------------------------------
+
+comment "AT91 Board Options"
+
+config MTD_AT91_DATAFLASH_CARD
+        bool "Enable DataFlash Card support"
+        depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK)
+        help
+          Enable support for the DataFlash card.
+
+config MTD_NAND_AT91_BUSWIDTH_16
+        bool "Enable 16-bit data bus interface to NAND flash"
+        depends on (MACH_AT91SAM9261EK || MACH_AT91SAM9260EK)
+        help
+          On AT91SAM926x boards both types of NAND flash can be present
+          (8 and 16 bit data bus width).
 
 # ----------------------------------------------------------
 
diff --git a/arch/arm/mach-at91rm9200/Makefile b/arch/arm/mach-at91rm9200/Makefile
index c174805c24e5..cf777007847a 100644
--- a/arch/arm/mach-at91rm9200/Makefile
+++ b/arch/arm/mach-at91rm9200/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-obj-y           := clock.o irq.o gpio.o devices.o
+obj-y           := clock.o irq.o gpio.o
 obj-m           :=
 obj-n           :=
 obj-            :=
@@ -10,11 +10,11 @@ obj-		:=
 obj-$(CONFIG_PM)                += pm.o
 
 # CPU-specific support
-obj-$(CONFIG_ARCH_AT91RM9200)   += at91rm9200.o at91rm9200_time.o
-obj-$(CONFIG_ARCH_AT91SAM9260)  +=
-obj-$(CONFIG_ARCH_AT91SAM9261)  +=
+obj-$(CONFIG_ARCH_AT91RM9200)   += at91rm9200.o at91rm9200_time.o at91rm9200_devices.o
+obj-$(CONFIG_ARCH_AT91SAM9260)  += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o
+obj-$(CONFIG_ARCH_AT91SAM9261)  += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o
 
-# AT91RM9200 Board-specific support
+# AT91RM9200 board-specific support
 obj-$(CONFIG_MACH_ONEARM)       += board-1arm.o
 obj-$(CONFIG_ARCH_AT91RM9200DK) += board-dk.o
 obj-$(CONFIG_MACH_AT91RM9200EK) += board-ek.o
@@ -26,8 +26,10 @@ obj-$(CONFIG_MACH_ATEB9200)	+= board-eb9200.o
 obj-$(CONFIG_MACH_KAFA)         += board-kafa.o
 
 # AT91SAM9260 board-specific support
+obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
 
 # AT91SAM9261 board-specific support
+obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o
 
 # LEDs support
 led-$(CONFIG_ARCH_AT91RM9200DK) += leds.o
diff --git a/arch/arm/mach-at91rm9200/at91rm9200.c b/arch/arm/mach-at91rm9200/at91rm9200.c
index dcf6136fedf9..a92e9a495b07 100644
--- a/arch/arm/mach-at91rm9200/at91rm9200.c
+++ b/arch/arm/mach-at91rm9200/at91rm9200.c
@@ -14,8 +14,10 @@
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
+#include <asm/arch/at91rm9200.h>
+#include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91_st.h>
 
-#include <asm/hardware.h>
 #include "generic.h"
 #include "clock.h"
 
@@ -26,32 +28,12 @@ static struct map_desc at91rm9200_io_desc[] __initdata = {
                 .length         = SZ_4K,
                 .type           = MT_DEVICE,
         }, {
-                .virtual        = AT91_VA_BASE_SPI,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_SPI),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
                 .virtual        = AT91_VA_BASE_EMAC,
                 .pfn            = __phys_to_pfn(AT91RM9200_BASE_EMAC),
                 .length         = SZ_16K,
                 .type           = MT_DEVICE,
         }, {
-                .virtual        = AT91_VA_BASE_TWI,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_TWI),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_VA_BASE_MCI,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_MCI),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_VA_BASE_UDP,
-                .pfn            = __phys_to_pfn(AT91RM9200_BASE_UDP),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_SRAM_VIRT_BASE,
+                .virtual        = AT91_IO_VIRT_BASE - AT91RM9200_SRAM_SIZE,
                 .pfn            = __phys_to_pfn(AT91RM9200_SRAM_BASE),
                 .length         = AT91RM9200_SRAM_SIZE,
                 .type           = MT_DEVICE,
@@ -222,6 +204,16 @@ static struct at91_gpio_bank at91rm9200_gpio[] = {
         }
 };
 
+static void at91rm9200_reset(void)
+{
+        /*
+         * Perform a hardware reset with the use of the Watchdog timer.
+         */
+        at91_sys_write(AT91_ST_WDMR, AT91_ST_RSTEN | AT91_ST_EXTEN | 1);
+        at91_sys_write(AT91_ST_CR, AT91_ST_WDRST);
+}
+
+
 /* --------------------------------------------------------------------
  *  AT91RM9200 processor initialization
  * -------------------------------------------------------------------- */
@@ -230,6 +222,12 @@ void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks
         /* Map peripherals */
         iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc));
 
+        at91_arch_reset = at91rm9200_reset;
+        at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1)
+                        | (1 << AT91RM9200_ID_IRQ2) | (1 << AT91RM9200_ID_IRQ3)
+                        | (1 << AT91RM9200_ID_IRQ4) | (1 << AT91RM9200_ID_IRQ5)
+                        | (1 << AT91RM9200_ID_IRQ6);
+
         /* Init clock subsystem */
         at91_clock_init(main_clock);
 
diff --git a/arch/arm/mach-at91rm9200/devices.c b/arch/arm/mach-at91rm9200/at91rm9200_devices.c
index 059824376629..4641b99db0ee 100644
--- a/arch/arm/mach-at91rm9200/devices.c
+++ b/arch/arm/mach-at91rm9200/at91rm9200_devices.c
@@ -1,5 +1,5 @@
 /*
- * arch/arm/mach-at91rm9200/devices.c
+ * arch/arm/mach-at91rm9200/at91rm9200_devices.c
  *
  *  Copyright (C) 2005 Thibaut VARENE <varenet@parisc-linux.org>
  *  Copyright (C) 2005 David Brownell
@@ -15,9 +15,10 @@
 
 #include <linux/platform_device.h>
 
-#include <asm/hardware.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>
+#include <asm/arch/at91rm9200.h>
+#include <asm/arch/at91rm9200_mc.h>
 
 #include "generic.h"
 
@@ -33,7 +34,7 @@
 static u64 ohci_dmamask = 0xffffffffUL;
 static struct at91_usbh_data usbh_data;
 
-static struct resource at91_usbh_resources[] = {
+static struct resource usbh_resources[] = {
         [0] = {
                 .start  = AT91RM9200_UHP_BASE,
                 .end    = AT91RM9200_UHP_BASE + SZ_1M - 1,
@@ -54,8 +55,8 @@ static struct platform_device at91rm9200_usbh_device = {
                                 .coherent_dma_mask      = 0xffffffff,
                                 .platform_data          = &usbh_data,
         },
-        .resource       = at91_usbh_resources,
-        .num_resources  = ARRAY_SIZE(at91_usbh_resources),
+        .resource       = usbh_resources,
+        .num_resources  = ARRAY_SIZE(usbh_resources),
 };
 
 void __init at91_add_device_usbh(struct at91_usbh_data *data)
@@ -78,7 +79,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
 #ifdef CONFIG_USB_GADGET_AT91
 static struct at91_udc_data udc_data;
 
-static struct resource at91_udc_resources[] = {
+static struct resource udc_resources[] = {
         [0] = {
                 .start  = AT91RM9200_BASE_UDP,
                 .end    = AT91RM9200_BASE_UDP + SZ_16K - 1,
@@ -97,8 +98,8 @@ static struct platform_device at91rm9200_udc_device = {
         .dev            = {
                                 .platform_data          = &udc_data,
         },
-        .resource       = at91_udc_resources,
-        .num_resources  = ARRAY_SIZE(at91_udc_resources),
+        .resource       = udc_resources,
+        .num_resources  = ARRAY_SIZE(udc_resources),
 };
 
 void __init at91_add_device_udc(struct at91_udc_data *data)
@@ -129,7 +130,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {}
 static u64 eth_dmamask = 0xffffffffUL;
 static struct at91_eth_data eth_data;
 
-static struct resource at91_eth_resources[] = {
+static struct resource eth_resources[] = {
         [0] = {
                 .start  = AT91_VA_BASE_EMAC,
                 .end    = AT91_VA_BASE_EMAC + SZ_16K - 1,
@@ -150,8 +151,8 @@ static struct platform_device at91rm9200_eth_device = {
                                 .coherent_dma_mask      = 0xffffffff,
                                 .platform_data          = &eth_data,
         },
-        .resource       = at91_eth_resources,
-        .num_resources  = ARRAY_SIZE(at91_eth_resources),
+        .resource       = eth_resources,
+        .num_resources  = ARRAY_SIZE(eth_resources),
 };
 
 void __init at91_add_device_eth(struct at91_eth_data *data)
@@ -202,11 +203,13 @@ void __init at91_add_device_eth(struct at91_eth_data *data) {}
 #if defined(CONFIG_AT91_CF) || defined(CONFIG_AT91_CF_MODULE)
 static struct at91_cf_data cf_data;
 
-static struct resource at91_cf_resources[] = {
+#define CF_BASE         AT91_CHIPSELECT_4
+
+static struct resource cf_resources[] = {
         [0] = {
-                .start  = AT91_CF_BASE,
+                .start  = CF_BASE,
                 /* ties up CS4, CS5 and CS6 */
-                .end    = AT91_CF_BASE + (0x30000000 - 1),
+                .end    = CF_BASE + (0x30000000 - 1),
                 .flags  = IORESOURCE_MEM | IORESOURCE_MEM_8AND16BIT,
         },
 };
@@ -217,15 +220,38 @@ static struct platform_device at91rm9200_cf_device = {
         .dev            = {
                                 .platform_data          = &cf_data,
         },
-        .resource       = at91_cf_resources,
-        .num_resources  = ARRAY_SIZE(at91_cf_resources),
+        .resource       = cf_resources,
+        .num_resources  = ARRAY_SIZE(cf_resources),
 };
 
 void __init at91_add_device_cf(struct at91_cf_data *data)
 {
+        unsigned int csa;
+
         if (!data)
                 return;
 
+        data->chipselect = 4;           /* can only use EBI ChipSelect 4 */
+
+        /* CF takes over CS4, CS5, CS6 */
+        csa = at91_sys_read(AT91_EBI_CSA);
+        at91_sys_write(AT91_EBI_CSA, csa | AT91_EBI_CS4A_SMC_COMPACTFLASH);
+
+        /*
+         * Static memory controller timing adjustments.
+         * REVISIT:  these timings are in terms of MCK cycles, so
+         * when MCK changes (cpufreq etc) so must these values...
+         */
+        at91_sys_write(AT91_SMC_CSR(4),
+                                  AT91_SMC_ACSS_STD
+                                | AT91_SMC_DBW_16
+                                | AT91_SMC_BAT
+                                | AT91_SMC_WSEN
+                                | AT91_SMC_NWS_(32)     /* wait states */
+                                | AT91_SMC_RWSETUP_(6)  /* setup time */
+                                | AT91_SMC_RWHOLD_(4)   /* hold time */
+        );
+
         /* input/irq */
         if (data->irq_pin) {
                 at91_set_gpio_input(data->irq_pin, 1);
@@ -245,6 +271,9 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
         at91_set_A_periph(AT91_PIN_PC11, 0);    /* NCS5/CFCE1 */
         at91_set_A_periph(AT91_PIN_PC12, 0);    /* NCS6/CFCE2 */
 
+        /* nWAIT is _not_ a default setting */
+        at91_set_A_periph(AT91_PIN_PC6, 1);     /*  nWAIT */
+
         cf_data = *data;
         platform_device_register(&at91rm9200_cf_device);
 }
@@ -257,11 +286,11 @@ void __init at91_add_device_cf(struct at91_cf_data *data) {}
  *  MMC / SD
  * -------------------------------------------------------------------- */
 
-#if defined(CONFIG_MMC_AT91RM9200) || defined(CONFIG_MMC_AT91RM9200_MODULE)
+#if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE)
 static u64 mmc_dmamask = 0xffffffffUL;
 static struct at91_mmc_data mmc_data;
 
-static struct resource at91_mmc_resources[] = {
+static struct resource mmc_resources[] = {
         [0] = {
                 .start  = AT91RM9200_BASE_MCI,
                 .end    = AT91RM9200_BASE_MCI + SZ_16K - 1,
@@ -282,8 +311,8 @@ static struct platform_device at91rm9200_mmc_device = {
                                 .coherent_dma_mask      = 0xffffffff,
                                 .platform_data          = &mmc_data,
         },
-        .resource       = at91_mmc_resources,
-        .num_resources  = ARRAY_SIZE(at91_mmc_resources),
+        .resource       = mmc_resources,
+        .num_resources  = ARRAY_SIZE(mmc_resources),
 };
 
 void __init at91_add_device_mmc(struct at91_mmc_data *data)
@@ -298,31 +327,33 @@ void __init at91_add_device_mmc(struct at91_mmc_data *data)
         }
         if (data->wp_pin)
                 at91_set_gpio_input(data->wp_pin, 1);
+        if (data->vcc_pin)
+                at91_set_gpio_output(data->vcc_pin, 0);
 
         /* CLK */
         at91_set_A_periph(AT91_PIN_PA27, 0);
 
-        if (data->is_b) {
+        if (data->slot_b) {
                 /* CMD */
-                at91_set_B_periph(AT91_PIN_PA8, 0);
+                at91_set_B_periph(AT91_PIN_PA8, 1);
 
                 /* DAT0, maybe DAT1..DAT3 */
-                at91_set_B_periph(AT91_PIN_PA9, 0);
+                at91_set_B_periph(AT91_PIN_PA9, 1);
                 if (data->wire4) {
-                        at91_set_B_periph(AT91_PIN_PA10, 0);
-                        at91_set_B_periph(AT91_PIN_PA11, 0);
-                        at91_set_B_periph(AT91_PIN_PA12, 0);
+                        at91_set_B_periph(AT91_PIN_PA10, 1);
+                        at91_set_B_periph(AT91_PIN_PA11, 1);
+                        at91_set_B_periph(AT91_PIN_PA12, 1);
                 }
         } else {
                 /* CMD */
-                at91_set_A_periph(AT91_PIN_PA28, 0);
+                at91_set_A_periph(AT91_PIN_PA28, 1);
 
                 /* DAT0, maybe DAT1..DAT3 */
-                at91_set_A_periph(AT91_PIN_PA29, 0);
+                at91_set_A_periph(AT91_PIN_PA29, 1);
                 if (data->wire4) {
-                        at91_set_B_periph(AT91_PIN_PB3, 0);
-                        at91_set_B_periph(AT91_PIN_PB4, 0);
-                        at91_set_B_periph(AT91_PIN_PB5, 0);
+                        at91_set_B_periph(AT91_PIN_PB3, 1);
+                        at91_set_B_periph(AT91_PIN_PB4, 1);
+                        at91_set_B_periph(AT91_PIN_PB5, 1);
                 }
         }
 
@@ -341,29 +372,45 @@ void __init at91_add_device_mmc(struct at91_mmc_data *data) {}
 #if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)
 static struct at91_nand_data nand_data;
 
-static struct resource at91_nand_resources[] = {
+#define NAND_BASE       AT91_CHIPSELECT_3
+
+static struct resource nand_resources[] = {
         {
-                .start  = AT91_SMARTMEDIA_BASE,
-                .end    = AT91_SMARTMEDIA_BASE + SZ_8M - 1,
+                .start  = NAND_BASE,
+                .end    = NAND_BASE + SZ_8M - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
 
-static struct platform_device at91_nand_device = {
+static struct platform_device at91rm9200_nand_device = {
         .name           = "at91_nand",
         .id             = -1,
         .dev            = {
                                 .platform_data  = &nand_data,
         },
-        .resource       = at91_nand_resources,
-        .num_resources  = ARRAY_SIZE(at91_nand_resources),
+        .resource       = nand_resources,
+        .num_resources  = ARRAY_SIZE(nand_resources),
 };
 
 void __init at91_add_device_nand(struct at91_nand_data *data)
 {
+        unsigned int csa;
+
         if (!data)
                 return;
 
+        /* enable the address range of CS3 */
+        csa = at91_sys_read(AT91_EBI_CSA);
+        at91_sys_write(AT91_EBI_CSA, csa | AT91_EBI_CS3A_SMC_SMARTMEDIA);
+
+        /* set the bus interface characteristics */
+        at91_sys_write(AT91_SMC_CSR(3), AT91_SMC_ACSS_STD | AT91_SMC_DBW_8 | AT91_SMC_WSEN
+                | AT91_SMC_NWS_(5)
+                | AT91_SMC_TDF_(1)
+                | AT91_SMC_RWSETUP_(0)  /* tDS Data Set up Time 30 - ns */
+                | AT91_SMC_RWHOLD_(1)   /* tDH Data Hold Time 20 - ns */
+        );
+
         /* enable pin */
         if (data->enable_pin)
                 at91_set_gpio_output(data->enable_pin, 1);
@@ -380,7 +427,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data)
         at91_set_A_periph(AT91_PIN_PC3, 0);             /* SMWE */
 
         nand_data = *data;
-        platform_device_register(&at91_nand_device);
+        platform_device_register(&at91rm9200_nand_device);
 }
 #else
 void __init at91_add_device_nand(struct at91_nand_data *data) {}
@@ -392,10 +439,25 @@ void __init at91_add_device_nand(struct at91_nand_data *data) {}
  * -------------------------------------------------------------------- */
 
 #if defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE)
+
+static struct resource twi_resources[] = {
+        [0] = {
+                .start  = AT91RM9200_BASE_TWI,
+                .end    = AT91RM9200_BASE_TWI + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91RM9200_ID_TWI,
+                .end    = AT91RM9200_ID_TWI,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
 static struct platform_device at91rm9200_twi_device = {
         .name           = "at91_i2c",
         .id             = -1,
-        .num_resources  = 0,
+        .resource       = twi_resources,
+        .num_resources  = ARRAY_SIZE(twi_resources),
 };
 
 void __init at91_add_device_i2c(void)
@@ -421,7 +483,7 @@ void __init at91_add_device_i2c(void) {}
 #if defined(CONFIG_SPI_AT91) || defined(CONFIG_SPI_AT91_MODULE) || defined(CONFIG_AT91_SPI) || defined(CONFIG_AT91_SPI_MODULE)
 static u64 spi_dmamask = 0xffffffffUL;
 
-static struct resource at91_spi_resources[] = {
+static struct resource spi_resources[] = {
         [0] = {
                 .start  = AT91RM9200_BASE_SPI,
                 .end    = AT91RM9200_BASE_SPI + SZ_16K - 1,
@@ -438,14 +500,14 @@ static struct platform_device at91rm9200_spi_device = {
         .name           = "at91_spi",
         .id             = 0,
         .dev            = {
-                .dma_mask               = &spi_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
+                                .dma_mask               = &spi_dmamask,
+                                .coherent_dma_mask      = 0xffffffff,
         },
-        .resource       = at91_spi_resources,
-        .num_resources  = ARRAY_SIZE(at91_spi_resources),
+        .resource       = spi_resources,
+        .num_resources  = ARRAY_SIZE(spi_resources),
 };
 
-static const unsigned at91_spi_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PA4, AT91_PIN_PA5, AT91_PIN_PA6 };
+static const unsigned spi_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PA4, AT91_PIN_PA5, AT91_PIN_PA6 };
 
 void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
 {
@@ -461,7 +523,7 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
                 if (devices[i].controller_data)
                         cs_pin = (unsigned long) devices[i].controller_data;
                 else
-                        cs_pin = at91_spi_standard_cs[devices[i].chip_select];
+                        cs_pin = spi_standard_cs[devices[i].chip_select];
 
 #ifdef CONFIG_SPI_AT91_MANUAL_CS
                 at91_set_gpio_output(cs_pin, 1);
@@ -474,7 +536,7 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
         }
 
         spi_register_board_info(devices, nr_devices);
-        at91_clock_associate("spi0_clk", &at91rm9200_spi_device.dev, "spi");
+        at91_clock_associate("spi_clk", &at91rm9200_spi_device.dev, "spi");
         platform_device_register(&at91rm9200_spi_device);
 }
 #else
@@ -486,7 +548,7 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
  *  RTC
  * -------------------------------------------------------------------- */
 
-#if defined(CONFIG_RTC_DRV_AT91) || defined(CONFIG_RTC_DRV_AT91_MODULE)
+#if defined(CONFIG_RTC_DRV_AT91RM9200) || defined(CONFIG_RTC_DRV_AT91RM9200_MODULE)
 static struct platform_device at91rm9200_rtc_device = {
         .name           = "at91_rtc",
         .id             = -1,
@@ -506,7 +568,7 @@ static void __init at91_add_device_rtc(void) {}
  *  Watchdog
  * -------------------------------------------------------------------- */
 
-#if defined(CONFIG_AT91_WATCHDOG) || defined(CONFIG_AT91_WATCHDOG_MODULE)
+#if defined(CONFIG_AT91RM9200_WATCHDOG) || defined(CONFIG_AT91RM9200_WATCHDOG_MODULE)
 static struct platform_device at91rm9200_wdt_device = {
         .name           = "at91_wdt",
         .id             = -1,
diff --git a/arch/arm/mach-at91rm9200/at91rm9200_time.c b/arch/arm/mach-at91rm9200/at91rm9200_time.c
index 07c9cea8961d..b999e192a7e9 100644
--- a/arch/arm/mach-at91rm9200/at91rm9200_time.c
+++ b/arch/arm/mach-at91rm9200/at91rm9200_time.c
@@ -30,6 +30,8 @@
 #include <asm/io.h>
 #include <asm/mach/time.h>
 
+#include <asm/arch/at91_st.h>
+
 static unsigned long last_crtr;
 
 /*
@@ -99,6 +101,9 @@ void at91rm9200_timer_reset(void)
         /* Set Period Interval timer */
         at91_sys_write(AT91_ST_PIMR, LATCH);
 
+        /* Clear any pending interrupts */
+        (void) at91_sys_read(AT91_ST_SR);
+
         /* Enable Period Interval Timer interrupt */
         at91_sys_write(AT91_ST_IER, AT91_ST_PITS);
 }
diff --git a/arch/arm/mach-at91rm9200/at91sam9260.c b/arch/arm/mach-at91rm9200/at91sam9260.c
new file mode 100644
index 000000000000..203f073a53e6
--- /dev/null
+++ b/arch/arm/mach-at91rm9200/at91sam9260.c
@@ -0,0 +1,294 @@
+/*
+ * arch/arm/mach-at91rm9200/at91sam9260.c
+ *
+ *  Copyright (C) 2006 SAN People
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ */
+
+#include <linux/module.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/arch/at91sam9260.h>
+#include <asm/arch/at91_pmc.h>
+
+#include "generic.h"
+#include "clock.h"
+
+static struct map_desc at91sam9260_io_desc[] __initdata = {
+        {
+                .virtual        = AT91_VA_BASE_SYS,
+                .pfn            = __phys_to_pfn(AT91_BASE_SYS),
+                .length         = SZ_16K,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = AT91_IO_VIRT_BASE - AT91SAM9260_SRAM0_SIZE,
+                .pfn            = __phys_to_pfn(AT91SAM9260_SRAM0_BASE),
+                .length         = AT91SAM9260_SRAM0_SIZE,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = AT91_IO_VIRT_BASE - AT91SAM9260_SRAM0_SIZE - AT91SAM9260_SRAM1_SIZE,
+                .pfn            = __phys_to_pfn(AT91SAM9260_SRAM1_BASE),
+                .length         = AT91SAM9260_SRAM1_SIZE,
+                .type           = MT_DEVICE,
+        },
+};
+
+/* --------------------------------------------------------------------
+ *  Clocks
+ * -------------------------------------------------------------------- */
+
+/*
+ * The peripheral clocks.
+ */
+static struct clk pioA_clk = {
+        .name           = "pioA_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_PIOA,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk pioB_clk = {
+        .name           = "pioB_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_PIOB,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk pioC_clk = {
+        .name           = "pioC_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_PIOC,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk adc_clk = {
+        .name           = "adc_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_ADC,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk usart0_clk = {
+        .name           = "usart0_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_US0,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk usart1_clk = {
+        .name           = "usart1_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_US1,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk usart2_clk = {
+        .name           = "usart2_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_US2,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk mmc_clk = {
+        .name           = "mci_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_MCI,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk udc_clk = {
+        .name           = "udc_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_UDP,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk twi_clk = {
+        .name           = "twi_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_TWI,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk spi0_clk = {
+        .name           = "spi0_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_SPI0,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk spi1_clk = {
+        .name           = "spi1_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_SPI1,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk ohci_clk = {
+        .name           = "ohci_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_UHP,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk ether_clk = {
+        .name           = "ether_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_EMAC,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk isi_clk = {
+        .name           = "isi_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_ISI,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk usart3_clk = {
+        .name           = "usart3_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_US3,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk usart4_clk = {
+        .name           = "usart4_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_US4,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk usart5_clk = {
+        .name           = "usart5_clk",
+        .pmc_mask       = 1 << AT91SAM9260_ID_US5,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+
+static struct clk *periph_clocks[] __initdata = {
+        &pioA_clk,
+        &pioB_clk,
+        &pioC_clk,
+        &adc_clk,
+        &usart0_clk,
+        &usart1_clk,
+        &usart2_clk,
+        &mmc_clk,
+        &udc_clk,
+        &twi_clk,
+        &spi0_clk,
+        &spi1_clk,
+        // ssc
+        // tc0 .. tc2
+        &ohci_clk,
+        &ether_clk,
+        &isi_clk,
+        &usart3_clk,
+        &usart4_clk,
+        &usart5_clk,
+        // tc3 .. tc5
+        // irq0 .. irq2
+};
+
+/*
+ * The two programmable clocks.
+ * You must configure pin multiplexing to bring these signals out.
+ */
+static struct clk pck0 = {
+        .name           = "pck0",
+        .pmc_mask       = AT91_PMC_PCK0,
+        .type           = CLK_TYPE_PROGRAMMABLE,
+        .id             = 0,
+};
+static struct clk pck1 = {
+        .name           = "pck1",
+        .pmc_mask       = AT91_PMC_PCK1,
+        .type           = CLK_TYPE_PROGRAMMABLE,
+        .id             = 1,
+};
+
+static void __init at91sam9260_register_clocks(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
+                clk_register(periph_clocks[i]);
+
+        clk_register(&pck0);
+        clk_register(&pck1);
+}
+
+/* --------------------------------------------------------------------
+ *  GPIO
+ * -------------------------------------------------------------------- */
+
+static struct at91_gpio_bank at91sam9260_gpio[] = {
+        {
+                .id             = AT91SAM9260_ID_PIOA,
+                .offset         = AT91_PIOA,
+                .clock          = &pioA_clk,
+        }, {
+                .id             = AT91SAM9260_ID_PIOB,
+                .offset         = AT91_PIOB,
+                .clock          = &pioB_clk,
+        }, {
+                .id             = AT91SAM9260_ID_PIOC,
+                .offset         = AT91_PIOC,
+                .clock          = &pioC_clk,
+        }
+};
+
+static void at91sam9260_reset(void)
+{
+#warning "Implement CPU reset"
+}
+
+
+/* --------------------------------------------------------------------
+ *  AT91SAM9260 processor initialization
+ * -------------------------------------------------------------------- */
+
+void __init at91sam9260_initialize(unsigned long main_clock)
+{
+        /* Map peripherals */
+        iotable_init(at91sam9260_io_desc, ARRAY_SIZE(at91sam9260_io_desc));
+
+        at91_arch_reset = at91sam9260_reset;
+        at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)
+                        | (1 << AT91SAM9260_ID_IRQ2);
+
+        /* Init clock subsystem */
+        at91_clock_init(main_clock);
+
+        /* Register the processor-specific clocks */
+        at91sam9260_register_clocks();
+
+        /* Register GPIO subsystem */
+        at91_gpio_init(at91sam9260_gpio, 3);
+}
+
+/* --------------------------------------------------------------------
+ *  Interrupt initialization
+ * -------------------------------------------------------------------- */
+
+/*
+ * The default interrupt priority levels (0 = lowest, 7 = highest).
+ */
+static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
+        7,      /* Advanced Interrupt Controller */
+        7,      /* System Peripherals */
+        0,      /* Parallel IO Controller A */
+        0,      /* Parallel IO Controller B */
+        0,      /* Parallel IO Controller C */
+        0,      /* Analog-to-Digital Converter */
+        6,      /* USART 0 */
+        6,      /* USART 1 */
+        6,      /* USART 2 */
+        0,      /* Multimedia Card Interface */
+        4,      /* USB Device Port */
+        0,      /* Two-Wire Interface */
+        6,      /* Serial Peripheral Interface 0 */
+        6,      /* Serial Peripheral Interface 1 */
+        5,      /* Serial Synchronous Controller */
+        0,
+        0,
+        0,      /* Timer Counter 0 */
+        0,      /* Timer Counter 1 */
+        0,      /* Timer Counter 2 */
+        3,      /* USB Host port */
+        3,      /* Ethernet */
+        0,      /* Image Sensor Interface */
+        6,      /* USART 3 */
+        6,      /* USART 4 */
+        6,      /* USART 5 */
+        0,      /* Timer Counter 3 */
+        0,      /* Timer Counter 4 */
+        0,      /* Timer Counter 5 */
+        0,      /* Advanced Interrupt Controller */
+        0,      /* Advanced Interrupt Controller */
+        0,      /* Advanced Interrupt Controller */
+};
+
+void __init at91sam9260_init_interrupts(unsigned int priority[NR_AIC_IRQS])
+{
+        if (!priority)
+                priority = at91sam9260_default_irq_priority;
+
+        /* Initialize the AIC interrupt controller */
+        at91_aic_init(priority);
+
+        /* Enable GPIO interrupts */
+        at91_gpio_irq_setup();
+}
diff --git a/arch/arm/mach-at91rm9200/at91sam9260_devices.c b/arch/arm/mach-at91rm9200/at91sam9260_devices.c
new file mode 100644
index 000000000000..f42d3a40ec3c
--- /dev/null
+++ b/arch/arm/mach-at91rm9200/at91sam9260_devices.c
@@ -0,0 +1,867 @@
+/*
+ * arch/arm/mach-at91rm9200/at91sam9260_devices.c
+ *
+ *  Copyright (C) 2006 Atmel
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ */
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+
+#include <linux/platform_device.h>
+
+#include <asm/arch/board.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/at91sam9260.h>
+#include <asm/arch/at91sam926x_mc.h>
+#include <asm/arch/at91sam9260_matrix.h>
+
+#include "generic.h"
+
+#define SZ_512  0x00000200
+#define SZ_256  0x00000100
+#define SZ_16   0x00000010
+
+/* --------------------------------------------------------------------
+ *  USB Host
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
+static u64 ohci_dmamask = 0xffffffffUL;
+static struct at91_usbh_data usbh_data;
+
+static struct resource usbh_resources[] = {
+        [0] = {
+                .start  = AT91SAM9260_UHP_BASE,
+                .end    = AT91SAM9260_UHP_BASE + SZ_1M - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9260_ID_UHP,
+                .end    = AT91SAM9260_ID_UHP,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91_usbh_device = {
+        .name           = "at91_ohci",
+        .id             = -1,
+        .dev            = {
+                                .dma_mask               = &ohci_dmamask,
+                                .coherent_dma_mask      = 0xffffffff,
+                                .platform_data          = &usbh_data,
+        },
+        .resource       = usbh_resources,
+        .num_resources  = ARRAY_SIZE(usbh_resources),
+};
+
+void __init at91_add_device_usbh(struct at91_usbh_data *data)
+{
+        if (!data)
+                return;
+
+        usbh_data = *data;
+        platform_device_register(&at91_usbh_device);
+}
+#else
+void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
+#endif
+
+
+/* --------------------------------------------------------------------
+ *  USB Device (Gadget)
+ * -------------------------------------------------------------------- */
+
+#ifdef CONFIG_USB_GADGET_AT91
+static struct at91_udc_data udc_data;
+
+static struct resource udc_resources[] = {
+        [0] = {
+                .start  = AT91SAM9260_BASE_UDP,
+                .end    = AT91SAM9260_BASE_UDP + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9260_ID_UDP,
+                .end    = AT91SAM9260_ID_UDP,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91_udc_device = {
+        .name           = "at91_udc",
+        .id             = -1,
+        .dev            = {
+                                .platform_data          = &udc_data,
+        },
+        .resource       = udc_resources,
+        .num_resources  = ARRAY_SIZE(udc_resources),
+};
+
+void __init at91_add_device_udc(struct at91_udc_data *data)
+{
+        if (!data)
+                return;
+
+        if (data->vbus_pin) {
+                at91_set_gpio_input(data->vbus_pin, 0);
+                at91_set_deglitch(data->vbus_pin, 1);
+        }
+
+        /* Pullup pin is handled internally by USB device peripheral */
+
+        udc_data = *data;
+        platform_device_register(&at91_udc_device);
+}
+#else
+void __init at91_add_device_udc(struct at91_udc_data *data) {}
+#endif
+
+
+/* --------------------------------------------------------------------
+ *  Ethernet
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE)
+static u64 eth_dmamask = 0xffffffffUL;
+static struct eth_platform_data eth_data;
+
+static struct resource eth_resources[] = {
+        [0] = {
+                .start  = AT91SAM9260_BASE_EMAC,
+                .end    = AT91SAM9260_BASE_EMAC + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9260_ID_EMAC,
+                .end    = AT91SAM9260_ID_EMAC,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91sam9260_eth_device = {
+        .name           = "macb",
+        .id             = -1,
+        .dev            = {
+                                .dma_mask               = &eth_dmamask,
+                                .coherent_dma_mask      = 0xffffffff,
+                                .platform_data          = &eth_data,
+        },
+        .resource       = eth_resources,
+        .num_resources  = ARRAY_SIZE(eth_resources),
+};
+
+void __init at91_add_device_eth(struct eth_platform_data *data)
+{
+        if (!data)
+                return;
+
+        if (data->phy_irq_pin) {
+                at91_set_gpio_input(data->phy_irq_pin, 0);
+                at91_set_deglitch(data->phy_irq_pin, 1);
+        }
+
+        /* Pins used for MII and RMII */
+        at91_set_A_periph(AT91_PIN_PA19, 0);    /* ETXCK_EREFCK */
+        at91_set_A_periph(AT91_PIN_PA17, 0);    /* ERXDV */
+        at91_set_A_periph(AT91_PIN_PA14, 0);    /* ERX0 */
+        at91_set_A_periph(AT91_PIN_PA15, 0);    /* ERX1 */
+        at91_set_A_periph(AT91_PIN_PA18, 0);    /* ERXER */
+        at91_set_A_periph(AT91_PIN_PA16, 0);    /* ETXEN */
+        at91_set_A_periph(AT91_PIN_PA12, 0);    /* ETX0 */
+        at91_set_A_periph(AT91_PIN_PA13, 0);    /* ETX1 */
+        at91_set_A_periph(AT91_PIN_PA21, 0);    /* EMDIO */
+        at91_set_A_periph(AT91_PIN_PA20, 0);    /* EMDC */
+
+        if (!data->is_rmii) {
+                at91_set_B_periph(AT91_PIN_PA28, 0);    /* ECRS */
+                at91_set_B_periph(AT91_PIN_PA29, 0);    /* ECOL */
+                at91_set_B_periph(AT91_PIN_PA25, 0);    /* ERX2 */
+                at91_set_B_periph(AT91_PIN_PA26, 0);    /* ERX3 */
+                at91_set_B_periph(AT91_PIN_PA27, 0);    /* ERXCK */
+                at91_set_B_periph(AT91_PIN_PA23, 0);    /* ETX2 */
+                at91_set_B_periph(AT91_PIN_PA24, 0);    /* ETX3 */
+                at91_set_B_periph(AT91_PIN_PA22, 0);    /* ETXER */
+        }
+
+        eth_data = *data;
+        platform_device_register(&at91sam9260_eth_device);
+}
+#else
+void __init at91_add_device_eth(struct eth_platform_data *data) {}
+#endif
+
+
+/* --------------------------------------------------------------------
+ *  MMC / SD
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE)
+static u64 mmc_dmamask = 0xffffffffUL;
+static struct at91_mmc_data mmc_data;
+
+static struct resource mmc_resources[] = {
+        [0] = {
+                .start  = AT91SAM9260_BASE_MCI,
+                .end    = AT91SAM9260_BASE_MCI + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9260_ID_MCI,
+                .end    = AT91SAM9260_ID_MCI,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91sam9260_mmc_device = {
+        .name           = "at91_mci",
+        .id             = -1,
+        .dev            = {
+                                .dma_mask               = &mmc_dmamask,
+                                .coherent_dma_mask      = 0xffffffff,
+                                .platform_data          = &mmc_data,
+        },
+        .resource       = mmc_resources,
+        .num_resources  = ARRAY_SIZE(mmc_resources),
+};
+
+void __init at91_add_device_mmc(struct at91_mmc_data *data)
+{
+        if (!data)
+                return;
+
+        /* input/irq */
+        if (data->det_pin) {
+                at91_set_gpio_input(data->det_pin, 1);
+                at91_set_deglitch(data->det_pin, 1);
+        }
+        if (data->wp_pin)
+                at91_set_gpio_input(data->wp_pin, 1);
+        if (data->vcc_pin)
+                at91_set_gpio_output(data->vcc_pin, 0);
+
+        /* CLK */
+        at91_set_A_periph(AT91_PIN_PA8, 0);
+
+        if (data->slot_b) {
+                /* CMD */
+                at91_set_B_periph(AT91_PIN_PA1, 1);
+
+                /* DAT0, maybe DAT1..DAT3 */
+                at91_set_B_periph(AT91_PIN_PA0, 1);
+                if (data->wire4) {
+                        at91_set_B_periph(AT91_PIN_PA5, 1);
+                        at91_set_B_periph(AT91_PIN_PA4, 1);
+                        at91_set_B_periph(AT91_PIN_PA3, 1);
+                }
+        } else {
+                /* CMD */
+                at91_set_A_periph(AT91_PIN_PA7, 1);
+
+                /* DAT0, maybe DAT1..DAT3 */
+                at91_set_A_periph(AT91_PIN_PA6, 1);
+                if (data->wire4) {
+                        at91_set_A_periph(AT91_PIN_PA9, 1);
+                        at91_set_A_periph(AT91_PIN_PA10, 1);
+                        at91_set_A_periph(AT91_PIN_PA11, 1);
+                }
+        }
+
+        mmc_data = *data;
+        platform_device_register(&at91sam9260_mmc_device);
+}
+#else
+void __init at91_add_device_mmc(struct at91_mmc_data *data) {}
+#endif
+
+
+/* --------------------------------------------------------------------
+ *  NAND / SmartMedia
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)
+static struct at91_nand_data nand_data;
+
+#define NAND_BASE       AT91_CHIPSELECT_3
+
+static struct resource nand_resources[] = {
+        {
+                .start  = NAND_BASE,
+                .end    = NAND_BASE + SZ_8M - 1,
+                .flags  = IORESOURCE_MEM,
+        }
+};
+
+static struct platform_device at91sam9260_nand_device = {
+        .name           = "at91_nand",
+        .id             = -1,
+        .dev            = {
+                                .platform_data  = &nand_data,
+        },
+        .resource       = nand_resources,
+        .num_resources  = ARRAY_SIZE(nand_resources),
+};
+
+void __init at91_add_device_nand(struct at91_nand_data *data)
+{
+        unsigned long csa, mode;
+
+        if (!data)
+                return;
+
+        csa = at91_sys_read(AT91_MATRIX_EBICSA);
+        at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC);
+
+        /* set the bus interface characteristics */
+        at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(0) | AT91_SMC_NCS_WRSETUP_(0)
+                        | AT91_SMC_NRDSETUP_(0) | AT91_SMC_NCS_RDSETUP_(0));
+
+        at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(2) | AT91_SMC_NCS_WRPULSE_(5)
+                        | AT91_SMC_NRDPULSE_(2) | AT91_SMC_NCS_RDPULSE_(5));
+
+        at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(7) | AT91_SMC_NRDCYCLE_(7));
+
+        if (data->bus_width_16)
+                mode = AT91_SMC_DBW_16;
+        else
+                mode = AT91_SMC_DBW_8;
+        at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(1));
+
+        /* enable pin */
+        if (data->enable_pin)
+                at91_set_gpio_output(data->enable_pin, 1);
+
+        /* ready/busy pin */
+        if (data->rdy_pin)
+                at91_set_gpio_input(data->rdy_pin, 1);
+
+        /* card detect pin */
+        if (data->det_pin)
+                at91_set_gpio_input(data->det_pin, 1);
+
+        nand_data = *data;
+        platform_device_register(&at91sam9260_nand_device);
+}
+#else
+void __init at91_add_device_nand(struct at91_nand_data *data) {}
+#endif
+
+
+/* --------------------------------------------------------------------
+ *  TWI (i2c)
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE)
+
+static struct resource twi_resources[] = {
+        [0] = {
+                .start  = AT91SAM9260_BASE_TWI,
+                .end    = AT91SAM9260_BASE_TWI + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9260_ID_TWI,
+                .end    = AT91SAM9260_ID_TWI,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91sam9260_twi_device = {
+        .name           = "at91_i2c",
+        .id             = -1,
+        .resource       = twi_resources,
+        .num_resources  = ARRAY_SIZE(twi_resources),
+};
+
+void __init at91_add_device_i2c(void)
+{
+        /* pins used for TWI interface */
+        at91_set_A_periph(AT91_PIN_PA23, 0);            /* TWD */
+        at91_set_multi_drive(AT91_PIN_PA23, 1);
+
+        at91_set_A_periph(AT91_PIN_PA24, 0);            /* TWCK */
+        at91_set_multi_drive(AT91_PIN_PA24, 1);
+
+        platform_device_register(&at91sam9260_twi_device);
+}
+#else
+void __init at91_add_device_i2c(void) {}
+#endif
+
+
+/* --------------------------------------------------------------------
+ *  SPI
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)
+static u64 spi_dmamask = 0xffffffffUL;
+
+static struct resource spi0_resources[] = {
+        [0] = {
+                .start  = AT91SAM9260_BASE_SPI0,
+                .end    = AT91SAM9260_BASE_SPI0 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9260_ID_SPI0,
+                .end    = AT91SAM9260_ID_SPI0,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91sam9260_spi0_device = {
+        .name           = "atmel_spi",
+        .id             = 0,
+        .dev            = {
+                                .dma_mask               = &spi_dmamask,
+                                .coherent_dma_mask      = 0xffffffff,
+        },
+        .resource       = spi0_resources,
+        .num_resources  = ARRAY_SIZE(spi0_resources),
+};
+
+static const unsigned spi0_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PC11, AT91_PIN_PC16, AT91_PIN_PC17 };
+
+static struct resource spi1_resources[] = {
+        [0] = {
+                .start  = AT91SAM9260_BASE_SPI1,
+                .end    = AT91SAM9260_BASE_SPI1 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9260_ID_SPI1,
+                .end    = AT91SAM9260_ID_SPI1,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91sam9260_spi1_device = {
+        .name           = "atmel_spi",
+        .id             = 1,
+        .dev            = {
+                                .dma_mask               = &spi_dmamask,
+                                .coherent_dma_mask      = 0xffffffff,
+        },
+        .resource       = spi1_resources,
+        .num_resources  = ARRAY_SIZE(spi1_resources),
+};
+
+static const unsigned spi1_standard_cs[4] = { AT91_PIN_PB3, AT91_PIN_PC5, AT91_PIN_PC4, AT91_PIN_PC3 };
+
+void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
+{
+        int i;
+        unsigned long cs_pin;
+        short enable_spi0 = 0;
+        short enable_spi1 = 0;
+
+        /* Choose SPI chip-selects */
+        for (i = 0; i < nr_devices; i++) {
+                if (devices[i].controller_data)
+                        cs_pin = (unsigned long) devices[i].controller_data;
+                else if (devices[i].bus_num == 0)
+                        cs_pin = spi0_standard_cs[devices[i].chip_select];
+                else
+                        cs_pin = spi1_standard_cs[devices[i].chip_select];
+
+                if (devices[i].bus_num == 0)
+                        enable_spi0 = 1;
+                else
+                        enable_spi1 = 1;
+
+                /* enable chip-select pin */
+                at91_set_gpio_output(cs_pin, 1);
+
+                /* pass chip-select pin to driver */
+                devices[i].controller_data = (void *) cs_pin;
+        }
+
+        spi_register_board_info(devices, nr_devices);
+
+        /* Configure SPI bus(es) */
+        if (enable_spi0) {
+                at91_set_A_periph(AT91_PIN_PA0, 0);     /* SPI0_MISO */
+                at91_set_A_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
+                at91_set_A_periph(AT91_PIN_PA2, 0);     /* SPI1_SPCK */
+
+                at91_clock_associate("spi0_clk", &at91sam9260_spi0_device.dev, "spi_clk");
+                platform_device_register(&at91sam9260_spi0_device);
+        }
+        if (enable_spi1) {
+                at91_set_A_periph(AT91_PIN_PB0, 0);     /* SPI1_MISO */
+                at91_set_A_periph(AT91_PIN_PB1, 0);     /* SPI1_MOSI */
+                at91_set_A_periph(AT91_PIN_PB2, 0);     /* SPI1_SPCK */
+
+                at91_clock_associate("spi1_clk", &at91sam9260_spi1_device.dev, "spi_clk");
+                platform_device_register(&at91sam9260_spi1_device);
+        }
+}
+#else
+void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) {}
+#endif
+
+
+/* --------------------------------------------------------------------
+ *  LEDs
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_LEDS)
+u8 at91_leds_cpu;
+u8 at91_leds_timer;
+
+void __init at91_init_leds(u8 cpu_led, u8 timer_led)
+{
+        at91_leds_cpu   = cpu_led;
+        at91_leds_timer = timer_led;
+}
+#else
+void __init at91_init_leds(u8 cpu_led, u8 timer_led) {}
+#endif
+
+
+/* --------------------------------------------------------------------
+ *  UART
+ * -------------------------------------------------------------------- */
+#if defined(CONFIG_SERIAL_ATMEL)
+static struct resource dbgu_resources[] = {
+        [0] = {
+                .start  = AT91_VA_BASE_SYS + AT91_DBGU,
+                .end    = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91_ID_SYS,
+                .end    = AT91_ID_SYS,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct atmel_uart_data dbgu_data = {
+        .use_dma_tx     = 0,
+        .use_dma_rx     = 0,            /* DBGU not capable of receive DMA */
+        .regs           = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
+};
+
+static struct platform_device at91sam9260_dbgu_device = {
+        .name           = "atmel_usart",
+        .id             = 0,
+        .dev            = {
+                                .platform_data  = &dbgu_data,
+                                .coherent_dma_mask = 0xffffffff,
+        },
+        .resource       = dbgu_resources,
+        .num_resources  = ARRAY_SIZE(dbgu_resources),
+};
+
+static inline void configure_dbgu_pins(void)
+{
+        at91_set_A_periph(AT91_PIN_PB14, 0);            /* DRXD */
+        at91_set_A_periph(AT91_PIN_PB15, 1);            /* DTXD */
+}
+
+static struct resource uart0_resources[] = {
+        [0] = {
+                .start  = AT91SAM9260_BASE_US0,
+                .end    = AT91SAM9260_BASE_US0 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9260_ID_US0,
+                .end    = AT91SAM9260_ID_US0,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct atmel_uart_data uart0_data = {
+        .use_dma_tx     = 1,
+        .use_dma_rx     = 1,
+};
+
+static struct platform_device at91sam9260_uart0_device = {
+        .name           = "atmel_usart",
+        .id             = 1,
+        .dev            = {
+                                .platform_data  = &uart0_data,
+                                .coherent_dma_mask = 0xffffffff,
+        },
+        .resource       = uart0_resources,
+        .num_resources  = ARRAY_SIZE(uart0_resources),
+};
+
+static inline void configure_usart0_pins(void)
+{
+        at91_set_A_periph(AT91_PIN_PB4, 1);             /* TXD0 */
+        at91_set_A_periph(AT91_PIN_PB5, 0);             /* RXD0 */
+        at91_set_A_periph(AT91_PIN_PB26, 0);            /* RTS0 */
+        at91_set_A_periph(AT91_PIN_PB27, 0);            /* CTS0 */
+        at91_set_A_periph(AT91_PIN_PB24, 0);            /* DTR0 */
+        at91_set_A_periph(AT91_PIN_PB22, 0);            /* DSR0 */
+        at91_set_A_periph(AT91_PIN_PB23, 0);            /* DCD0 */
+        at91_set_A_periph(AT91_PIN_PB25, 0);            /* RI0 */
+}
+
+static struct resource uart1_resources[] = {
+        [0] = {
+                .start  = AT91SAM9260_BASE_US1,
+                .end    = AT91SAM9260_BASE_US1 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9260_ID_US1,
+                .end    = AT91SAM9260_ID_US1,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct atmel_uart_data uart1_data = {
+        .use_dma_tx     = 1,
+        .use_dma_rx     = 1,
+};
+
+static struct platform_device at91sam9260_uart1_device = {
+        .name           = "atmel_usart",
+        .id             = 2,
+        .dev            = {
+                                .platform_data  = &uart1_data,
+                                .coherent_dma_mask = 0xffffffff,
+        },
+        .resource       = uart1_resources,
+        .num_resources  = ARRAY_SIZE(uart1_resources),
+};
+
+static inline void configure_usart1_pins(void)
+{
+        at91_set_A_periph(AT91_PIN_PB6, 1);             /* TXD1 */
+        at91_set_A_periph(AT91_PIN_PB7, 0);             /* RXD1 */
+        at91_set_A_periph(AT91_PIN_PB28, 0);            /* RTS1 */
+        at91_set_A_periph(AT91_PIN_PB29, 0);            /* CTS1 */
+}
+
+static struct resource uart2_resources[] = {
+        [0] = {
+                .start  = AT91SAM9260_BASE_US2,
+                .end    = AT91SAM9260_BASE_US2 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9260_ID_US2,
+                .end    = AT91SAM9260_ID_US2,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct atmel_uart_data uart2_data = {
+        .use_dma_tx     = 1,
+        .use_dma_rx     = 1,
+};
+
+static struct platform_device at91sam9260_uart2_device = {
+        .name           = "atmel_usart",
+        .id             = 3,
+        .dev            = {
+                                .platform_data  = &uart2_data,
+                                .coherent_dma_mask = 0xffffffff,
+        },
+        .resource       = uart2_resources,
+        .num_resources  = ARRAY_SIZE(uart2_resources),
+};
+
+static inline void configure_usart2_pins(void)
+{
+        at91_set_A_periph(AT91_PIN_PB8, 1);             /* TXD2 */
+        at91_set_A_periph(AT91_PIN_PB9, 0);             /* RXD2 */
+}
+
+static struct resource uart3_resources[] = {
+        [0] = {
+                .start  = AT91SAM9260_BASE_US3,
+                .end    = AT91SAM9260_BASE_US3 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9260_ID_US3,
+                .end    = AT91SAM9260_ID_US3,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct atmel_uart_data uart3_data = {
+        .use_dma_tx     = 1,
+        .use_dma_rx     = 1,
+};
+
+static struct platform_device at91sam9260_uart3_device = {
+        .name           = "atmel_usart",
+        .id             = 4,
+        .dev            = {
+                                .platform_data  = &uart3_data,
+                                .coherent_dma_mask = 0xffffffff,
+        },
+        .resource       = uart3_resources,
+        .num_resources  = ARRAY_SIZE(uart3_resources),
+};
+
+static inline void configure_usart3_pins(void)
+{
+        at91_set_A_periph(AT91_PIN_PB10, 1);            /* TXD3 */
+        at91_set_A_periph(AT91_PIN_PB11, 0);            /* RXD3 */
+}
+
+static struct resource uart4_resources[] = {
+        [0] = {
+                .start  = AT91SAM9260_BASE_US4,
+                .end    = AT91SAM9260_BASE_US4 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9260_ID_US4,
+                .end    = AT91SAM9260_ID_US4,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct atmel_uart_data uart4_data = {
+        .use_dma_tx     = 1,
+        .use_dma_rx     = 1,
+};
+
+static struct platform_device at91sam9260_uart4_device = {
+        .name           = "atmel_usart",
+        .id             = 5,
+        .dev            = {
+                                .platform_data  = &uart4_data,
+                                .coherent_dma_mask = 0xffffffff,
+        },
+        .resource       = uart4_resources,
+        .num_resources  = ARRAY_SIZE(uart4_resources),
+};
+
+static inline void configure_usart4_pins(void)
+{
+        at91_set_B_periph(AT91_PIN_PA31, 1);            /* TXD4 */
+        at91_set_B_periph(AT91_PIN_PA30, 0);            /* RXD4 */
+}
+
+static struct resource uart5_resources[] = {
+        [0] = {
+                .start  = AT91SAM9260_BASE_US5,
+                .end    = AT91SAM9260_BASE_US5 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9260_ID_US5,
+                .end    = AT91SAM9260_ID_US5,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct atmel_uart_data uart5_data = {
+        .use_dma_tx     = 1,
+        .use_dma_rx     = 1,
+};
+
+static struct platform_device at91sam9260_uart5_device = {
+        .name           = "atmel_usart",
+        .id             = 6,
+        .dev            = {
+                                .platform_data  = &uart5_data,
+                                .coherent_dma_mask = 0xffffffff,
+        },
+        .resource       = uart5_resources,
+        .num_resources  = ARRAY_SIZE(uart5_resources),
+};
+
+static inline void configure_usart5_pins(void)
+{
+        at91_set_A_periph(AT91_PIN_PB12, 1);            /* TXD5 */
+        at91_set_A_periph(AT91_PIN_PB13, 0);            /* RXD5 */
+}
+
+struct platform_device *at91_uarts[ATMEL_MAX_UART];     /* the UARTs to use */
+struct platform_device *atmel_default_console_device;   /* the serial console device */
+
+void __init at91_init_serial(struct at91_uart_config *config)
+{
+        int i;
+
+        /* Fill in list of supported UARTs */
+        for (i = 0; i < config->nr_tty; i++) {
+                switch (config->tty_map[i]) {
+                        case 0:
+                                configure_usart0_pins();
+                                at91_uarts[i] = &at91sam9260_uart0_device;
+                                at91_clock_associate("usart0_clk", &at91sam9260_uart0_device.dev, "usart");
+                                break;
+                        case 1:
+                                configure_usart1_pins();
+                                at91_uarts[i] = &at91sam9260_uart1_device;
+                                at91_clock_associate("usart1_clk", &at91sam9260_uart1_device.dev, "usart");
+                                break;
+                        case 2:
+                                configure_usart2_pins();
+                                at91_uarts[i] = &at91sam9260_uart2_device;
+                                at91_clock_associate("usart2_clk", &at91sam9260_uart2_device.dev, "usart");
+                                break;
+                        case 3:
+                                configure_usart3_pins();
+                                at91_uarts[i] = &at91sam9260_uart3_device;
+                                at91_clock_associate("usart3_clk", &at91sam9260_uart3_device.dev, "usart");
+                                break;
+                        case 4:
+                                configure_usart4_pins();
+                                at91_uarts[i] = &at91sam9260_uart4_device;
+                                at91_clock_associate("usart4_clk", &at91sam9260_uart4_device.dev, "usart");
+                                break;
+                        case 5:
+                                configure_usart5_pins();
+                                at91_uarts[i] = &at91sam9260_uart5_device;
+                                at91_clock_associate("usart5_clk", &at91sam9260_uart5_device.dev, "usart");
+                                break;
+                        case 6:
+                                configure_dbgu_pins();
+                                at91_uarts[i] = &at91sam9260_dbgu_device;
+                                at91_clock_associate("mck", &at91sam9260_dbgu_device.dev, "usart");
+                                break;
+                        default:
+                                continue;
+                }
+                at91_uarts[i]->id = i;          /* update ID number to mapped ID */
+        }
+
+        /* Set serial console device */
+        if (config->console_tty < ATMEL_MAX_UART)
+                atmel_default_console_device = at91_uarts[config->console_tty];
+        if (!atmel_default_console_device)
+                printk(KERN_INFO "AT91: No default serial console defined.\n");
+}
+
+void __init at91_add_device_serial(void)
+{
+        int i;
+
+        for (i = 0; i < ATMEL_MAX_UART; i++) {
+                if (at91_uarts[i])
+                        platform_device_register(at91_uarts[i]);
+        }
+}
+#else
+void __init at91_init_serial(struct at91_uart_config *config) {}
+void __init at91_add_device_serial(void) {}
+#endif
+
+
+/* -------------------------------------------------------------------- */
+/*
+ * These devices are always present and don't need any board-specific
+ * setup.
+ */
+static int __init at91_add_standard_devices(void)
+{
+        return 0;
+}
+
+arch_initcall(at91_add_standard_devices);
diff --git a/arch/arm/mach-at91rm9200/at91sam9261.c b/arch/arm/mach-at91rm9200/at91sam9261.c
new file mode 100644
index 000000000000..5a82f35da2e9
--- /dev/null
+++ b/arch/arm/mach-at91rm9200/at91sam9261.c
@@ -0,0 +1,289 @@
+/*
+ * arch/arm/mach-at91rm9200/at91sam9261.c
+ *
+ *  Copyright (C) 2005 SAN People
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ */
+
+#include <linux/module.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/arch/at91sam9261.h>
+#include <asm/arch/at91_pmc.h>
+
+#include "generic.h"
+#include "clock.h"
+
+static struct map_desc at91sam9261_io_desc[] __initdata = {
+        {
+                .virtual        = AT91_VA_BASE_SYS,
+                .pfn            = __phys_to_pfn(AT91_BASE_SYS),
+                .length         = SZ_16K,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = AT91_IO_VIRT_BASE - AT91SAM9261_SRAM_SIZE,
+                .pfn            = __phys_to_pfn(AT91SAM9261_SRAM_BASE),
+                .length         = AT91SAM9261_SRAM_SIZE,
+                .type           = MT_DEVICE,
+        },
+};
+
+/* --------------------------------------------------------------------
+ *  Clocks
+ * -------------------------------------------------------------------- */
+
+/*
+ * The peripheral clocks.
+ */
+static struct clk pioA_clk = {
+        .name           = "pioA_clk",
+        .pmc_mask       = 1 << AT91SAM9261_ID_PIOA,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk pioB_clk = {
+        .name           = "pioB_clk",
+        .pmc_mask       = 1 << AT91SAM9261_ID_PIOB,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk pioC_clk = {
+        .name           = "pioC_clk",
+        .pmc_mask       = 1 << AT91SAM9261_ID_PIOC,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk usart0_clk = {
+        .name           = "usart0_clk",
+        .pmc_mask       = 1 << AT91SAM9261_ID_US0,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk usart1_clk = {
+        .name           = "usart1_clk",
+        .pmc_mask       = 1 << AT91SAM9261_ID_US1,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk usart2_clk = {
+        .name           = "usart2_clk",
+        .pmc_mask       = 1 << AT91SAM9261_ID_US2,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk mmc_clk = {
+        .name           = "mci_clk",
+        .pmc_mask       = 1 << AT91SAM9261_ID_MCI,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk udc_clk = {
+        .name           = "udc_clk",
+        .pmc_mask       = 1 << AT91SAM9261_ID_UDP,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk twi_clk = {
+        .name           = "twi_clk",
+        .pmc_mask       = 1 << AT91SAM9261_ID_TWI,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk spi0_clk = {
+        .name           = "spi0_clk",
+        .pmc_mask       = 1 << AT91SAM9261_ID_SPI0,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk spi1_clk = {
+        .name           = "spi1_clk",
+        .pmc_mask       = 1 << AT91SAM9261_ID_SPI1,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk ohci_clk = {
+        .name           = "ohci_clk",
+        .pmc_mask       = 1 << AT91SAM9261_ID_UHP,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+static struct clk lcdc_clk = {
+        .name           = "lcdc_clk",
+        .pmc_mask       = 1 << AT91SAM9261_ID_LCDC,
+        .type           = CLK_TYPE_PERIPHERAL,
+};
+
+static struct clk *periph_clocks[] __initdata = {
+        &pioA_clk,
+        &pioB_clk,
+        &pioC_clk,
+        &usart0_clk,
+        &usart1_clk,
+        &usart2_clk,
+        &mmc_clk,
+        &udc_clk,
+        &twi_clk,
+        &spi0_clk,
+        &spi1_clk,
+        // ssc 0 .. ssc2
+        // tc0 .. tc2
+        &ohci_clk,
+        &lcdc_clk,
+        // irq0 .. irq2
+};
+
+/*
+ * The four programmable clocks.
+ * You must configure pin multiplexing to bring these signals out.
+ */
+static struct clk pck0 = {
+        .name           = "pck0",
+        .pmc_mask       = AT91_PMC_PCK0,
+        .type           = CLK_TYPE_PROGRAMMABLE,
+        .id             = 0,
+};
+static struct clk pck1 = {
+        .name           = "pck1",
+        .pmc_mask       = AT91_PMC_PCK1,
+        .type           = CLK_TYPE_PROGRAMMABLE,
+        .id             = 1,
+};
+static struct clk pck2 = {
+        .name           = "pck2",
+        .pmc_mask       = AT91_PMC_PCK2,
+        .type           = CLK_TYPE_PROGRAMMABLE,
+        .id             = 2,
+};
+static struct clk pck3 = {
+        .name           = "pck3",
+        .pmc_mask       = AT91_PMC_PCK3,
+        .type           = CLK_TYPE_PROGRAMMABLE,
+        .id             = 3,
+};
+
+/* HClocks */
+static struct clk hck0 = {
+        .name           = "hck0",
+        .pmc_mask       = AT91_PMC_HCK0,
+        .type           = CLK_TYPE_SYSTEM,
+        .id             = 0,
+};
+static struct clk hck1 = {
+        .name           = "hck1",
+        .pmc_mask       = AT91_PMC_HCK1,
+        .type           = CLK_TYPE_SYSTEM,
+        .id             = 1,
+};
+
+static void __init at91sam9261_register_clocks(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
+                clk_register(periph_clocks[i]);
+
+        clk_register(&pck0);
+        clk_register(&pck1);
+        clk_register(&pck2);
+        clk_register(&pck3);
+
+        clk_register(&hck0);
+        clk_register(&hck1);
+}
+
+/* --------------------------------------------------------------------
+ *  GPIO
+ * -------------------------------------------------------------------- */
+
+static struct at91_gpio_bank at91sam9261_gpio[] = {
+        {
+                .id             = AT91SAM9261_ID_PIOA,
+                .offset         = AT91_PIOA,
+                .clock          = &pioA_clk,
+        }, {
+                .id             = AT91SAM9261_ID_PIOB,
+                .offset         = AT91_PIOB,
+                .clock          = &pioB_clk,
+        }, {
+                .id             = AT91SAM9261_ID_PIOC,
+                .offset         = AT91_PIOC,
+                .clock          = &pioC_clk,
+        }
+};
+
+static void at91sam9261_reset(void)
+{
+#warning "Implement CPU reset"
+}
+
+
+/* --------------------------------------------------------------------
+ *  AT91SAM9261 processor initialization
+ * -------------------------------------------------------------------- */
+
+void __init at91sam9261_initialize(unsigned long main_clock)
+{
+        /* Map peripherals */
+        iotable_init(at91sam9261_io_desc, ARRAY_SIZE(at91sam9261_io_desc));
+
+        at91_arch_reset = at91sam9261_reset;
+        at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)
+                        | (1 << AT91SAM9261_ID_IRQ2);
+
+        /* Init clock subsystem */
+        at91_clock_init(main_clock);
+
+        /* Register the processor-specific clocks */
+        at91sam9261_register_clocks();
+
+        /* Register GPIO subsystem */
+        at91_gpio_init(at91sam9261_gpio, 3);
+}
+
+/* --------------------------------------------------------------------
+ *  Interrupt initialization
+ * -------------------------------------------------------------------- */
+
+/*
+ * The default interrupt priority levels (0 = lowest, 7 = highest).
+ */
+static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
+        7,      /* Advanced Interrupt Controller */
+        7,      /* System Peripherals */
+        0,      /* Parallel IO Controller A */
+        0,      /* Parallel IO Controller B */
+        0,      /* Parallel IO Controller C */
+        0,
+        6,      /* USART 0 */
+        6,      /* USART 1 */
+        6,      /* USART 2 */
+        0,      /* Multimedia Card Interface */
+        4,      /* USB Device Port */
+        0,      /* Two-Wire Interface */
+        6,      /* Serial Peripheral Interface 0 */
+        6,      /* Serial Peripheral Interface 1 */
+        5,      /* Serial Synchronous Controller 0 */
+        5,      /* Serial Synchronous Controller 1 */
+        5,      /* Serial Synchronous Controller 2 */
+        0,      /* Timer Counter 0 */
+        0,      /* Timer Counter 1 */
+        0,      /* Timer Counter 2 */
+        3,      /* USB Host port */
+        3,      /* LCD Controller */
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,      /* Advanced Interrupt Controller */
+        0,      /* Advanced Interrupt Controller */
+        0,      /* Advanced Interrupt Controller */
+};
+
+void __init at91sam9261_init_interrupts(unsigned int priority[NR_AIC_IRQS])
+{
+        if (!priority)
+                priority = at91sam9261_default_irq_priority;
+
+        /* Initialize the AIC interrupt controller */
+        at91_aic_init(priority);
+
+        /* Enable GPIO interrupts */
+        at91_gpio_irq_setup();
+}
diff --git a/arch/arm/mach-at91rm9200/at91sam9261_devices.c b/arch/arm/mach-at91rm9200/at91sam9261_devices.c
new file mode 100644
index 000000000000..ed1d79081b35
--- /dev/null
+++ b/arch/arm/mach-at91rm9200/at91sam9261_devices.c
@@ -0,0 +1,741 @@
+/*
+ * arch/arm/mach-at91rm9200/at91sam9261_devices.c
+ *
+ *  Copyright (C) 2005 Thibaut VARENE <varenet@parisc-linux.org>
+ *  Copyright (C) 2005 David Brownell
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ */
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+
+#include <linux/platform_device.h>
+
+#include <asm/arch/board.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/at91sam9261.h>
+#include <asm/arch/at91sam9261_matrix.h>
+#include <asm/arch/at91sam926x_mc.h>
+
+#include "generic.h"
+
+#define SZ_512  0x00000200
+#define SZ_256  0x00000100
+#define SZ_16   0x00000010
+
+/* --------------------------------------------------------------------
+ *  USB Host
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
+static u64 ohci_dmamask = 0xffffffffUL;
+static struct at91_usbh_data usbh_data;
+
+static struct resource usbh_resources[] = {
+        [0] = {
+                .start  = AT91SAM9261_UHP_BASE,
+                .end    = AT91SAM9261_UHP_BASE + SZ_1M - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9261_ID_UHP,
+                .end    = AT91SAM9261_ID_UHP,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91sam9261_usbh_device = {
+        .name           = "at91_ohci",
+        .id             = -1,
+        .dev            = {
+                                .dma_mask               = &ohci_dmamask,
+                                .coherent_dma_mask      = 0xffffffff,
+                                .platform_data          = &usbh_data,
+        },
+        .resource       = usbh_resources,
+        .num_resources  = ARRAY_SIZE(usbh_resources),
+};
+
+void __init at91_add_device_usbh(struct at91_usbh_data *data)
+{
+        if (!data)
+                return;
+
+        usbh_data = *data;
+        platform_device_register(&at91sam9261_usbh_device);
+}
+#else
+void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
+#endif
+
+
+/* --------------------------------------------------------------------
+ *  USB Device (Gadget)
+ * -------------------------------------------------------------------- */
+
+#ifdef CONFIG_USB_GADGET_AT91
+static struct at91_udc_data udc_data;
+
+static struct resource udc_resources[] = {
+        [0] = {
+                .start  = AT91SAM9261_BASE_UDP,
+                .end    = AT91SAM9261_BASE_UDP + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9261_ID_UDP,
+                .end    = AT91SAM9261_ID_UDP,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91sam9261_udc_device = {
+        .name           = "at91_udc",
+        .id             = -1,
+        .dev            = {
+                                .platform_data          = &udc_data,
+        },
+        .resource       = udc_resources,
+        .num_resources  = ARRAY_SIZE(udc_resources),
+};
+
+void __init at91_add_device_udc(struct at91_udc_data *data)
+{
+        unsigned long x;
+
+        if (!data)
+                return;
+
+        if (data->vbus_pin) {
+                at91_set_gpio_input(data->vbus_pin, 0);
+                at91_set_deglitch(data->vbus_pin, 1);
+        }
+
+        /* Pullup pin is handled internally */
+        x = at91_sys_read(AT91_MATRIX_USBPUCR);
+        at91_sys_write(AT91_MATRIX_USBPUCR, x | AT91_MATRIX_USBPUCR_PUON);
+
+        udc_data = *data;
+        platform_device_register(&at91sam9261_udc_device);
+}
+#else
+void __init at91_add_device_udc(struct at91_udc_data *data) {}
+#endif
+
+/* --------------------------------------------------------------------
+ *  MMC / SD
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE)
+static u64 mmc_dmamask = 0xffffffffUL;
+static struct at91_mmc_data mmc_data;
+
+static struct resource mmc_resources[] = {
+        [0] = {
+                .start  = AT91SAM9261_BASE_MCI,
+                .end    = AT91SAM9261_BASE_MCI + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9261_ID_MCI,
+                .end    = AT91SAM9261_ID_MCI,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91sam9261_mmc_device = {
+        .name           = "at91_mci",
+        .id             = -1,
+        .dev            = {
+                                .dma_mask               = &mmc_dmamask,
+                                .coherent_dma_mask      = 0xffffffff,
+                                .platform_data          = &mmc_data,
+        },
+        .resource       = mmc_resources,
+        .num_resources  = ARRAY_SIZE(mmc_resources),
+};
+
+void __init at91_add_device_mmc(struct at91_mmc_data *data)
+{
+        if (!data)
+                return;
+
+        /* input/irq */
+        if (data->det_pin) {
+                at91_set_gpio_input(data->det_pin, 1);
+                at91_set_deglitch(data->det_pin, 1);
+        }
+        if (data->wp_pin)
+                at91_set_gpio_input(data->wp_pin, 1);
+        if (data->vcc_pin)
+                at91_set_gpio_output(data->vcc_pin, 0);
+
+        /* CLK */
+        at91_set_B_periph(AT91_PIN_PA2, 0);
+
+        /* CMD */
+        at91_set_B_periph(AT91_PIN_PA1, 1);
+
+        /* DAT0, maybe DAT1..DAT3 */
+        at91_set_B_periph(AT91_PIN_PA0, 1);
+        if (data->wire4) {
+                at91_set_B_periph(AT91_PIN_PA4, 1);
+                at91_set_B_periph(AT91_PIN_PA5, 1);
+                at91_set_B_periph(AT91_PIN_PA6, 1);
+        }
+
+        mmc_data = *data;
+        platform_device_register(&at91sam9261_mmc_device);
+}
+#else
+void __init at91_add_device_mmc(struct at91_mmc_data *data) {}
+#endif
+
+
+/* --------------------------------------------------------------------
+ *  NAND / SmartMedia
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)
+static struct at91_nand_data nand_data;
+
+#define NAND_BASE       AT91_CHIPSELECT_3
+
+static struct resource nand_resources[] = {
+        {
+                .start  = NAND_BASE,
+                .end    = NAND_BASE + SZ_256M - 1,
+                .flags  = IORESOURCE_MEM,
+        }
+};
+
+static struct platform_device at91_nand_device = {
+        .name           = "at91_nand",
+        .id             = -1,
+        .dev            = {
+                                .platform_data  = &nand_data,
+        },
+        .resource       = nand_resources,
+        .num_resources  = ARRAY_SIZE(nand_resources),
+};
+
+void __init at91_add_device_nand(struct at91_nand_data *data)
+{
+        unsigned long csa, mode;
+
+        if (!data)
+                return;
+
+        csa = at91_sys_read(AT91_MATRIX_EBICSA);
+        at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC);
+
+        /* set the bus interface characteristics */
+        at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(0) | AT91_SMC_NCS_WRSETUP_(0)
+                        | AT91_SMC_NRDSETUP_(0) | AT91_SMC_NCS_RDSETUP_(0));
+
+        at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(2) | AT91_SMC_NCS_WRPULSE_(5)
+                        | AT91_SMC_NRDPULSE_(2) | AT91_SMC_NCS_RDPULSE_(5));
+
+        at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(7) | AT91_SMC_NRDCYCLE_(7));
+
+        if (data->bus_width_16)
+                mode = AT91_SMC_DBW_16;
+        else
+                mode = AT91_SMC_DBW_8;
+        at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(1));
+
+        /* enable pin */
+        if (data->enable_pin)
+                at91_set_gpio_output(data->enable_pin, 1);
+
+        /* ready/busy pin */
+        if (data->rdy_pin)
+                at91_set_gpio_input(data->rdy_pin, 1);
+
+        /* card detect pin */
+        if (data->det_pin)
+                at91_set_gpio_input(data->det_pin, 1);
+
+        at91_set_A_periph(AT91_PIN_PC0, 0);             /* NANDOE */
+        at91_set_A_periph(AT91_PIN_PC1, 0);             /* NANDWE */
+
+        nand_data = *data;
+        platform_device_register(&at91_nand_device);
+}
+
+#else
+void __init at91_add_device_nand(struct at91_nand_data *data) {}
+#endif
+
+
+/* --------------------------------------------------------------------
+ *  TWI (i2c)
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE)
+
+static struct resource twi_resources[] = {
+        [0] = {
+                .start  = AT91SAM9261_BASE_TWI,
+                .end    = AT91SAM9261_BASE_TWI + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9261_ID_TWI,
+                .end    = AT91SAM9261_ID_TWI,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91sam9261_twi_device = {
+        .name           = "at91_i2c",
+        .id             = -1,
+        .resource       = twi_resources,
+        .num_resources  = ARRAY_SIZE(twi_resources),
+};
+
+void __init at91_add_device_i2c(void)
+{
+        /* pins used for TWI interface */
+        at91_set_A_periph(AT91_PIN_PA7, 0);             /* TWD */
+        at91_set_multi_drive(AT91_PIN_PA7, 1);
+
+        at91_set_A_periph(AT91_PIN_PA8, 0);             /* TWCK */
+        at91_set_multi_drive(AT91_PIN_PA8, 1);
+
+        platform_device_register(&at91sam9261_twi_device);
+}
+#else
+void __init at91_add_device_i2c(void) {}
+#endif
+
+
+/* --------------------------------------------------------------------
+ *  SPI
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)
+static u64 spi_dmamask = 0xffffffffUL;
+
+static struct resource spi0_resources[] = {
+        [0] = {
+                .start  = AT91SAM9261_BASE_SPI0,
+                .end    = AT91SAM9261_BASE_SPI0 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9261_ID_SPI0,
+                .end    = AT91SAM9261_ID_SPI0,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91sam9261_spi0_device = {
+        .name           = "atmel_spi",
+        .id             = 0,
+        .dev            = {
+                                .dma_mask               = &spi_dmamask,
+                                .coherent_dma_mask      = 0xffffffff,
+        },
+        .resource       = spi0_resources,
+        .num_resources  = ARRAY_SIZE(spi0_resources),
+};
+
+static const unsigned spi0_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PA4, AT91_PIN_PA5, AT91_PIN_PA6 };
+
+static struct resource spi1_resources[] = {
+        [0] = {
+                .start  = AT91SAM9261_BASE_SPI1,
+                .end    = AT91SAM9261_BASE_SPI1 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9261_ID_SPI1,
+                .end    = AT91SAM9261_ID_SPI1,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91sam9261_spi1_device = {
+        .name           = "atmel_spi",
+        .id             = 1,
+        .dev            = {
+                                .dma_mask               = &spi_dmamask,
+                                .coherent_dma_mask      = 0xffffffff,
+        },
+        .resource       = spi1_resources,
+        .num_resources  = ARRAY_SIZE(spi1_resources),
+};
+
+static const unsigned spi1_standard_cs[4] = { AT91_PIN_PB28, AT91_PIN_PA24, AT91_PIN_PA25, AT91_PIN_PA26 };
+
+void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
+{
+        int i;
+        unsigned long cs_pin;
+        short enable_spi0 = 0;
+        short enable_spi1 = 0;
+
+        /* Choose SPI chip-selects */
+        for (i = 0; i < nr_devices; i++) {
+                if (devices[i].controller_data)
+                        cs_pin = (unsigned long) devices[i].controller_data;
+                else if (devices[i].bus_num == 0)
+                        cs_pin = spi0_standard_cs[devices[i].chip_select];
+                else
+                        cs_pin = spi1_standard_cs[devices[i].chip_select];
+
+                if (devices[i].bus_num == 0)
+                        enable_spi0 = 1;
+                else
+                        enable_spi1 = 1;
+
+                /* enable chip-select pin */
+                at91_set_gpio_output(cs_pin, 1);
+
+                /* pass chip-select pin to driver */
+                devices[i].controller_data = (void *) cs_pin;
+        }
+
+        spi_register_board_info(devices, nr_devices);
+
+        /* Configure SPI bus(es) */
+        if (enable_spi0) {
+                at91_set_A_periph(AT91_PIN_PA0, 0);     /* SPI0_MISO */
+                at91_set_A_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
+                at91_set_A_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
+
+                at91_clock_associate("spi0_clk", &at91sam9261_spi0_device.dev, "spi_clk");
+                platform_device_register(&at91sam9261_spi0_device);
+        }
+        if (enable_spi1) {
+                at91_set_A_periph(AT91_PIN_PB30, 0);    /* SPI1_MISO */
+                at91_set_A_periph(AT91_PIN_PB31, 0);    /* SPI1_MOSI */
+                at91_set_A_periph(AT91_PIN_PB29, 0);    /* SPI1_SPCK */
+
+                at91_clock_associate("spi1_clk", &at91sam9261_spi1_device.dev, "spi_clk");
+                platform_device_register(&at91sam9261_spi1_device);
+        }
+}
+#else
+void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) {}
+#endif
+
+
+/* --------------------------------------------------------------------
+ *  LCD Controller
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_FB_AT91) || defined(CONFIG_FB_AT91_MODULE)
+static u64 lcdc_dmamask = 0xffffffffUL;
+static struct at91fb_info lcdc_data;
+
+static struct resource lcdc_resources[] = {
+        [0] = {
+                .start  = AT91SAM9261_LCDC_BASE,
+                .end    = AT91SAM9261_LCDC_BASE + SZ_4K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9261_ID_LCDC,
+                .end    = AT91SAM9261_ID_LCDC,
+                .flags  = IORESOURCE_IRQ,
+        },
+#if defined(CONFIG_FB_INTSRAM)
+        [2] = {
+                .start  = AT91SAM9261_SRAM_BASE,
+                .end    = AT91SAM9261_SRAM_BASE + AT91SAM9261_SRAM_SIZE - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+#endif
+};
+
+static struct platform_device at91_lcdc_device = {
+        .name           = "at91-fb",
+        .id             = 0,
+        .dev            = {
+                                .dma_mask               = &lcdc_dmamask,
+                                .coherent_dma_mask      = 0xffffffff,
+                                .platform_data          = &lcdc_data,
+        },
+        .resource       = lcdc_resources,
+        .num_resources  = ARRAY_SIZE(lcdc_resources),
+};
+
+void __init at91_add_device_lcdc(struct at91fb_info *data)
+{
+        if (!data) {
+                return;
+        }
+
+        at91_set_A_periph(AT91_PIN_PB1, 0);     /* LCDHSYNC */
+        at91_set_A_periph(AT91_PIN_PB2, 0);     /* LCDDOTCK */
+        at91_set_A_periph(AT91_PIN_PB3, 0);     /* LCDDEN */
+        at91_set_A_periph(AT91_PIN_PB4, 0);     /* LCDCC */
+        at91_set_A_periph(AT91_PIN_PB7, 0);     /* LCDD2 */
+        at91_set_A_periph(AT91_PIN_PB8, 0);     /* LCDD3 */
+        at91_set_A_periph(AT91_PIN_PB9, 0);     /* LCDD4 */
+        at91_set_A_periph(AT91_PIN_PB10, 0);    /* LCDD5 */
+        at91_set_A_periph(AT91_PIN_PB11, 0);    /* LCDD6 */
+        at91_set_A_periph(AT91_PIN_PB12, 0);    /* LCDD7 */
+        at91_set_A_periph(AT91_PIN_PB15, 0);    /* LCDD10 */
+        at91_set_A_periph(AT91_PIN_PB16, 0);    /* LCDD11 */
+        at91_set_A_periph(AT91_PIN_PB17, 0);    /* LCDD12 */
+        at91_set_A_periph(AT91_PIN_PB18, 0);    /* LCDD13 */
+        at91_set_A_periph(AT91_PIN_PB19, 0);    /* LCDD14 */
+        at91_set_A_periph(AT91_PIN_PB20, 0);    /* LCDD15 */
+        at91_set_B_periph(AT91_PIN_PB23, 0);    /* LCDD18 */
+        at91_set_B_periph(AT91_PIN_PB24, 0);    /* LCDD19 */
+        at91_set_B_periph(AT91_PIN_PB25, 0);    /* LCDD20 */
+        at91_set_B_periph(AT91_PIN_PB26, 0);    /* LCDD21 */
+        at91_set_B_periph(AT91_PIN_PB27, 0);    /* LCDD22 */
+        at91_set_B_periph(AT91_PIN_PB28, 0);    /* LCDD23 */
+
+        lcdc_data = *data;
+        platform_device_register(&at91_lcdc_device);
+}
+#else
+void __init at91_add_device_lcdc(struct at91fb_info *data) {}
+#endif
+
+
+/* --------------------------------------------------------------------
+ *  LEDs
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_LEDS)
+u8 at91_leds_cpu;
+u8 at91_leds_timer;
+
+void __init at91_init_leds(u8 cpu_led, u8 timer_led)
+{
+        at91_leds_cpu   = cpu_led;
+        at91_leds_timer = timer_led;
+}
+#else
+void __init at91_init_leds(u8 cpu_led, u8 timer_led) {}
+#endif
+
+
+/* --------------------------------------------------------------------
+ *  UART
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_SERIAL_ATMEL)
+static struct resource dbgu_resources[] = {
+        [0] = {
+                .start  = AT91_VA_BASE_SYS + AT91_DBGU,
+                .end    = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91_ID_SYS,
+                .end    = AT91_ID_SYS,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct atmel_uart_data dbgu_data = {
+        .use_dma_tx     = 0,
+        .use_dma_rx     = 0,            /* DBGU not capable of receive DMA */
+        .regs           = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
+};
+
+static struct platform_device at91sam9261_dbgu_device = {
+        .name           = "atmel_usart",
+        .id             = 0,
+        .dev            = {
+                                .platform_data  = &dbgu_data,
+                                .coherent_dma_mask = 0xffffffff,
+        },
+        .resource       = dbgu_resources,
+        .num_resources  = ARRAY_SIZE(dbgu_resources),
+};
+
+static inline void configure_dbgu_pins(void)
+{
+        at91_set_A_periph(AT91_PIN_PA9, 0);             /* DRXD */
+        at91_set_A_periph(AT91_PIN_PA10, 1);            /* DTXD */
+}
+
+static struct resource uart0_resources[] = {
+        [0] = {
+                .start  = AT91SAM9261_BASE_US0,
+                .end    = AT91SAM9261_BASE_US0 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9261_ID_US0,
+                .end    = AT91SAM9261_ID_US0,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct atmel_uart_data uart0_data = {
+        .use_dma_tx     = 1,
+        .use_dma_rx     = 1,
+};
+
+static struct platform_device at91sam9261_uart0_device = {
+        .name           = "atmel_usart",
+        .id             = 1,
+        .dev            = {
+                                .platform_data  = &uart0_data,
+                                .coherent_dma_mask = 0xffffffff,
+        },
+        .resource       = uart0_resources,
+        .num_resources  = ARRAY_SIZE(uart0_resources),
+};
+
+static inline void configure_usart0_pins(void)
+{
+        at91_set_A_periph(AT91_PIN_PC8, 1);             /* TXD0 */
+        at91_set_A_periph(AT91_PIN_PC9, 0);             /* RXD0 */
+        at91_set_A_periph(AT91_PIN_PC10, 0);            /* RTS0 */
+        at91_set_A_periph(AT91_PIN_PC11, 0);            /* CTS0 */
+}
+
+static struct resource uart1_resources[] = {
+        [0] = {
+                .start  = AT91SAM9261_BASE_US1,
+                .end    = AT91SAM9261_BASE_US1 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9261_ID_US1,
+                .end    = AT91SAM9261_ID_US1,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct atmel_uart_data uart1_data = {
+        .use_dma_tx     = 1,
+        .use_dma_rx     = 1,
+};
+
+static struct platform_device at91sam9261_uart1_device = {
+        .name           = "atmel_usart",
+        .id             = 2,
+        .dev            = {
+                                .platform_data  = &uart1_data,
+                                .coherent_dma_mask = 0xffffffff,
+        },
+        .resource       = uart1_resources,
+        .num_resources  = ARRAY_SIZE(uart1_resources),
+};
+
+static inline void configure_usart1_pins(void)
+{
+        at91_set_A_periph(AT91_PIN_PC12, 1);            /* TXD1 */
+        at91_set_A_periph(AT91_PIN_PC13, 0);            /* RXD1 */
+}
+
+static struct resource uart2_resources[] = {
+        [0] = {
+                .start  = AT91SAM9261_BASE_US2,
+                .end    = AT91SAM9261_BASE_US2 + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9261_ID_US2,
+                .end    = AT91SAM9261_ID_US2,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct atmel_uart_data uart2_data = {
+        .use_dma_tx     = 1,
+        .use_dma_rx     = 1,
+};
+
+static struct platform_device at91sam9261_uart2_device = {
+        .name           = "atmel_usart",
+        .id             = 3,
+        .dev            = {
+                                .platform_data  = &uart2_data,
+                                .coherent_dma_mask = 0xffffffff,
+        },
+        .resource       = uart2_resources,
+        .num_resources  = ARRAY_SIZE(uart2_resources),
+};
+
+static inline void configure_usart2_pins(void)
+{
+        at91_set_A_periph(AT91_PIN_PC15, 0);            /* RXD2 */
+        at91_set_A_periph(AT91_PIN_PC14, 1);            /* TXD2 */
+}
+
+struct platform_device *at91_uarts[ATMEL_MAX_UART];     /* the UARTs to use */
+struct platform_device *atmel_default_console_device;   /* the serial console device */
+
+void __init at91_init_serial(struct at91_uart_config *config)
+{
+        int i;
+
+        /* Fill in list of supported UARTs */
+        for (i = 0; i < config->nr_tty; i++) {
+                switch (config->tty_map[i]) {
+                        case 0:
+                                configure_usart0_pins();
+                                at91_uarts[i] = &at91sam9261_uart0_device;
+                                at91_clock_associate("usart0_clk", &at91sam9261_uart0_device.dev, "usart");
+                                break;
+                        case 1:
+                                configure_usart1_pins();
+                                at91_uarts[i] = &at91sam9261_uart1_device;
+                                at91_clock_associate("usart1_clk", &at91sam9261_uart1_device.dev, "usart");
+                                break;
+                        case 2:
+                                configure_usart2_pins();
+                                at91_uarts[i] = &at91sam9261_uart2_device;
+                                at91_clock_associate("usart2_clk", &at91sam9261_uart2_device.dev, "usart");
+                                break;
+                        case 3:
+                                configure_dbgu_pins();
+                                at91_uarts[i] = &at91sam9261_dbgu_device;
+                                at91_clock_associate("mck", &at91sam9261_dbgu_device.dev, "usart");
+                                break;
+                        default:
+                                continue;
+                }
+                at91_uarts[i]->id = i;          /* update ID number to mapped ID */
+        }
+
+        /* Set serial console device */
+        if (config->console_tty < ATMEL_MAX_UART)
+                atmel_default_console_device = at91_uarts[config->console_tty];
+        if (!atmel_default_console_device)
+                printk(KERN_INFO "AT91: No default serial console defined.\n");
+}
+
+void __init at91_add_device_serial(void)
+{
+        int i;
+
+        for (i = 0; i < ATMEL_MAX_UART; i++) {
+                if (at91_uarts[i])
+                        platform_device_register(at91_uarts[i]);
+        }
+}
+#else
+void __init at91_init_serial(struct at91_uart_config *config) {}
+void __init at91_add_device_serial(void) {}
+#endif
+
+
+/* -------------------------------------------------------------------- */
+
+/*
+ * These devices are always present and don't need any board-specific
+ * setup.
+ */
+static int __init at91_add_standard_devices(void)
+{
+        return 0;
+}
+
+arch_initcall(at91_add_standard_devices);
diff --git a/arch/arm/mach-at91rm9200/at91sam926x_time.c b/arch/arm/mach-at91rm9200/at91sam926x_time.c
new file mode 100644
index 000000000000..99df5f6ee42e
--- /dev/null
+++ b/arch/arm/mach-at91rm9200/at91sam926x_time.c
@@ -0,0 +1,114 @@
+/*
+ * linux/arch/arm/mach-at91rm9200/at91sam926x_time.c
+ *
+ * Copyright (C) 2005-2006 M. Amine SAYA, ATMEL Rousset, France
+ * Revision      2005 M. Nicolas Diremdjian, ATMEL Rousset, France
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/mach/time.h>
+
+#include <asm/arch/at91_pit.h>
+
+
+#define PIT_CPIV(x)     ((x) & AT91_PIT_CPIV)
+#define PIT_PICNT(x)    (((x) & AT91_PIT_PICNT) >> 20)
+
+/*
+ * Returns number of microseconds since last timer interrupt.  Note that interrupts
+ * will have been disabled by do_gettimeofday()
+ *  'LATCH' is hwclock ticks (see CLOCK_TICK_RATE in timex.h) per jiffy.
+ *  'tick' is usecs per jiffy (linux/timex.h).
+ */
+static unsigned long at91sam926x_gettimeoffset(void)
+{
+        unsigned long elapsed;
+        unsigned long t = at91_sys_read(AT91_PIT_PIIR);
+
+        elapsed = (PIT_PICNT(t) * LATCH) + PIT_CPIV(t);         /* hardware clock cycles */
+
+        return (unsigned long)(elapsed * 1000000) / LATCH;
+}
+
+/*
+ * IRQ handler for the timer.
+ */
+static irqreturn_t at91sam926x_timer_interrupt(int irq, void *dev_id)
+{
+        volatile long nr_ticks;
+
+        if (at91_sys_read(AT91_PIT_SR) & AT91_PIT_PITS) {       /* This is a shared interrupt */
+                write_seqlock(&xtime_lock);
+
+                /* Get number to ticks performed before interrupt and clear PIT interrupt */
+                nr_ticks = PIT_PICNT(at91_sys_read(AT91_PIT_PIVR));
+                do {
+                        timer_tick();
+                        nr_ticks--;
+                } while (nr_ticks);
+
+                write_sequnlock(&xtime_lock);
+                return IRQ_HANDLED;
+        } else
+                return IRQ_NONE;                /* not handled */
+}
+
+static struct irqaction at91sam926x_timer_irq = {
+        .name           = "at91_tick",
+        .flags          = IRQF_SHARED | IRQF_DISABLED | IRQF_TIMER,
+        .handler        = at91sam926x_timer_interrupt
+};
+
+void at91sam926x_timer_reset(void)
+{
+        /* Disable timer */
+        at91_sys_write(AT91_PIT_MR, 0);
+
+        /* Clear any pending interrupts */
+        (void) at91_sys_read(AT91_PIT_PIVR);
+
+        /* Set Period Interval timer and enable its interrupt */
+        at91_sys_write(AT91_PIT_MR, (LATCH & AT91_PIT_PIV) | AT91_PIT_PITIEN | AT91_PIT_PITEN);
+}
+
+/*
+ * Set up timer interrupt.
+ */
+void __init at91sam926x_timer_init(void)
+{
+        /* Initialize and enable the timer */
+        at91sam926x_timer_reset();
+
+        /* Make IRQs happen for the system timer. */
+        setup_irq(AT91_ID_SYS, &at91sam926x_timer_irq);
+}
+
+#ifdef CONFIG_PM
+static void at91sam926x_timer_suspend(void)
+{
+        /* Disable timer */
+        at91_sys_write(AT91_PIT_MR, 0);
+}
+#else
+#define at91sam926x_timer_suspend       NULL
+#endif
+
+struct sys_timer at91sam926x_timer = {
+        .init           = at91sam926x_timer_init,
+        .offset         = at91sam926x_gettimeoffset,
+        .suspend        = at91sam926x_timer_suspend,
+        .resume         = at91sam926x_timer_reset,
+};
+
diff --git a/arch/arm/mach-at91rm9200/board-carmeva.c b/arch/arm/mach-at91rm9200/board-carmeva.c
index 98208740e7c5..654f0379550a 100644
--- a/arch/arm/mach-at91rm9200/board-carmeva.c
+++ b/arch/arm/mach-at91rm9200/board-carmeva.c
@@ -65,7 +65,6 @@ static void __init carmeva_init_irq(void)
         at91rm9200_init_interrupts(NULL);
 }
 
-
 static struct at91_eth_data __initdata carmeva_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
@@ -89,8 +88,33 @@ static struct at91_udc_data __initdata carmeva_udc_data = {
 // };
 
 static struct at91_mmc_data __initdata carmeva_mmc_data = {
-        .is_b           = 0,
+        .slot_b         = 0,
         .wire4          = 1,
+        .det_pin        = AT91_PIN_PB10,
+        .wp_pin         = AT91_PIN_PC14,
+};
+
+static struct spi_board_info carmeva_spi_devices[] = {
+        { /* DataFlash chip */
+                .modalias = "mtd_dataflash",
+                .chip_select  = 0,
+                .max_speed_hz = 10 * 1000 * 1000,
+        },
+        { /* User accessable spi - cs1 (250KHz) */
+                .modalias = "spi-cs1",
+                .chip_select  = 1,
+                .max_speed_hz = 250 *  1000,
+        },
+        { /* User accessable spi - cs2 (1MHz) */
+                .modalias = "spi-cs2",
+                .chip_select  = 2,
+                .max_speed_hz = 1 * 1000 *  1000,
+        },
+        { /* User accessable spi - cs3 (10MHz) */
+                .modalias = "spi-cs3",
+                .chip_select  = 3,
+                .max_speed_hz = 10 * 1000 *  1000,
+        },
 };
 
 static void __init carmeva_board_init(void)
@@ -105,10 +129,10 @@ static void __init carmeva_board_init(void)
         at91_add_device_udc(&carmeva_udc_data);
         /* I2C */
         at91_add_device_i2c();
+        /* SPI */
+        at91_add_device_spi(carmeva_spi_devices, ARRAY_SIZE(carmeva_spi_devices));
         /* Compact Flash */
 //      at91_add_device_cf(&carmeva_cf_data);
-        /* SPI */
-//      at91_add_device_spi(NULL, 0);
         /* MMC */
         at91_add_device_mmc(&carmeva_mmc_data);
 }
diff --git a/arch/arm/mach-at91rm9200/board-csb337.c b/arch/arm/mach-at91rm9200/board-csb337.c
index 8eeae491ce71..b8bb8052607a 100644
--- a/arch/arm/mach-at91rm9200/board-csb337.c
+++ b/arch/arm/mach-at91rm9200/board-csb337.c
@@ -99,7 +99,7 @@ static struct at91_cf_data __initdata csb337_cf_data = {
 
 static struct at91_mmc_data __initdata csb337_mmc_data = {
         .det_pin        = AT91_PIN_PD5,
-        .is_b           = 0,
+        .slot_b         = 0,
         .wire4          = 1,
         .wp_pin         = AT91_PIN_PD6,
 };
diff --git a/arch/arm/mach-at91rm9200/board-dk.c b/arch/arm/mach-at91rm9200/board-dk.c
index c699f3984d4b..7522bf91bce8 100644
--- a/arch/arm/mach-at91rm9200/board-dk.c
+++ b/arch/arm/mach-at91rm9200/board-dk.c
@@ -27,6 +27,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
+#include <linux/mtd/physmap.h>
 
 #include <asm/hardware.h>
 #include <asm/setup.h>
@@ -39,6 +40,7 @@
 
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>
+#include <asm/arch/at91rm9200_mc.h>
 
 #include "generic.h"
 
@@ -93,7 +95,7 @@ static struct at91_cf_data __initdata dk_cf_data = {
 };
 
 static struct at91_mmc_data __initdata dk_mmc_data = {
-        .is_b           = 0,
+        .slot_b         = 0,
         .wire4          = 1,
 };
 
@@ -145,6 +147,30 @@ static struct at91_nand_data __initdata dk_nand_data = {
         .partition_info = nand_partitions,
 };
 
+#define DK_FLASH_BASE   AT91_CHIPSELECT_0
+#define DK_FLASH_SIZE   0x200000
+
+static struct physmap_flash_data dk_flash_data = {
+        .width  = 2,
+};
+
+static struct resource dk_flash_resource = {
+        .start          = DK_FLASH_BASE,
+        .end            = DK_FLASH_BASE + DK_FLASH_SIZE - 1,
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device dk_flash = {
+        .name           = "physmap-flash",
+        .id             = 0,
+        .dev            = {
+                                .platform_data  = &dk_flash_data,
+                        },
+        .resource       = &dk_flash_resource,
+        .num_resources  = 1,
+};
+
+
 static void __init dk_board_init(void)
 {
         /* Serial */
@@ -172,6 +198,8 @@ static void __init dk_board_init(void)
 #endif
         /* NAND */
         at91_add_device_nand(&dk_nand_data);
+        /* NOR Flash */
+        platform_device_register(&dk_flash);
         /* VGA */
 //      dk_add_device_video();
 }
diff --git a/arch/arm/mach-at91rm9200/board-eb9200.c b/arch/arm/mach-at91rm9200/board-eb9200.c
index 65e867ba2df3..80b72cf7264c 100644
--- a/arch/arm/mach-at91rm9200/board-eb9200.c
+++ b/arch/arm/mach-at91rm9200/board-eb9200.c
@@ -87,7 +87,7 @@ static struct at91_cf_data __initdata eb9200_cf_data = {
 };
 
 static struct at91_mmc_data __initdata eb9200_mmc_data = {
-        .is_b           = 0,
+        .slot_b         = 0,
         .wire4          = 1,
 };
 
diff --git a/arch/arm/mach-at91rm9200/board-ek.c b/arch/arm/mach-at91rm9200/board-ek.c
index 830eb7932178..c4fdb415f20e 100644
--- a/arch/arm/mach-at91rm9200/board-ek.c
+++ b/arch/arm/mach-at91rm9200/board-ek.c
@@ -27,6 +27,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
+#include <linux/mtd/physmap.h>
 
 #include <asm/hardware.h>
 #include <asm/setup.h>
@@ -39,6 +40,7 @@
 
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>
+#include <asm/arch/at91rm9200_mc.h>
 
 #include "generic.h"
 
@@ -87,7 +89,7 @@ static struct at91_udc_data __initdata ek_udc_data = {
 
 static struct at91_mmc_data __initdata ek_mmc_data = {
         .det_pin        = AT91_PIN_PB27,
-        .is_b           = 0,
+        .slot_b         = 0,
         .wire4          = 1,
         .wp_pin         = AT91_PIN_PA17,
 };
@@ -107,6 +109,30 @@ static struct spi_board_info ek_spi_devices[] = {
 #endif
 };
 
+#define EK_FLASH_BASE   AT91_CHIPSELECT_0
+#define EK_FLASH_SIZE   0x200000
+
+static struct physmap_flash_data ek_flash_data = {
+        .width  = 2,
+};
+
+static struct resource ek_flash_resource = {
+        .start          = EK_FLASH_BASE,
+        .end            = EK_FLASH_BASE + EK_FLASH_SIZE - 1,
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device ek_flash = {
+        .name           = "physmap-flash",
+        .id             = 0,
+        .dev            = {
+                                .platform_data  = &ek_flash_data,
+                        },
+        .resource       = &ek_flash_resource,
+        .num_resources  = 1,
+};
+
+
 static void __init ek_board_init(void)
 {
         /* Serial */
@@ -130,6 +156,8 @@ static void __init ek_board_init(void)
         at91_set_gpio_output(AT91_PIN_PB22, 1); /* this MMC card slot can optionally use SPI signaling (CS3). */
         at91_add_device_mmc(&ek_mmc_data);
 #endif
+        /* NOR Flash */
+        platform_device_register(&ek_flash);
         /* VGA */
 //      ek_add_device_video();
 }
diff --git a/arch/arm/mach-at91rm9200/board-kb9202.c b/arch/arm/mach-at91rm9200/board-kb9202.c
index 35a954a44b1b..759d8191854f 100644
--- a/arch/arm/mach-at91rm9200/board-kb9202.c
+++ b/arch/arm/mach-at91rm9200/board-kb9202.c
@@ -84,7 +84,7 @@ static struct at91_udc_data __initdata kb9202_udc_data = {
 
 static struct at91_mmc_data __initdata kb9202_mmc_data = {
         .det_pin        = AT91_PIN_PB2,
-        .is_b           = 0,
+        .slot_b         = 0,
         .wire4          = 1,
 };
 
diff --git a/arch/arm/mach-at91rm9200/board-sam9260ek.c b/arch/arm/mach-at91rm9200/board-sam9260ek.c
new file mode 100644
index 000000000000..da5d58ac870b
--- /dev/null
+++ b/arch/arm/mach-at91rm9200/board-sam9260ek.c
@@ -0,0 +1,202 @@
+/*
+ * linux/arch/arm/mach-at91rm9200/board-ek.c
+ *
+ *  Copyright (C) 2005 SAN People
+ *  Copyright (C) 2006 Atmel
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+
+#include <asm/hardware.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/irq.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+
+#include <asm/arch/board.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/at91sam926x_mc.h>
+
+#include "generic.h"
+
+
+/*
+ * Serial port configuration.
+ *    0 .. 5 = USART0 .. USART5
+ *    6      = DBGU
+ */
+static struct at91_uart_config __initdata ek_uart_config = {
+        .console_tty    = 0,                            /* ttyS0 */
+        .nr_tty         = 3,
+        .tty_map        = { 6, 0, 1, -1, -1, -1, -1 }   /* ttyS0, ..., ttyS6 */
+};
+
+static void __init ek_map_io(void)
+{
+        /* Initialize processor: 18.432 MHz crystal */
+        at91sam9260_initialize(18432000);
+
+        /* Setup the serial ports and console */
+        at91_init_serial(&ek_uart_config);
+}
+
+static void __init ek_init_irq(void)
+{
+        at91sam9260_init_interrupts(NULL);
+}
+
+
+/*
+ * USB Host port
+ */
+static struct at91_usbh_data __initdata ek_usbh_data = {
+        .ports          = 2,
+};
+
+/*
+ * USB Device port
+ */
+static struct at91_udc_data __initdata ek_udc_data = {
+        .vbus_pin       = AT91_PIN_PC5,
+        .pullup_pin     = 0,            /* pull-up driven by UDC */
+};
+
+
+/*
+ * SPI devices.
+ */
+static struct spi_board_info ek_spi_devices[] = {
+#if !defined(CONFIG_MMC_AT91)
+        {       /* DataFlash chip */
+                .modalias       = "mtd_dataflash",
+                .chip_select    = 1,
+                .max_speed_hz   = 15 * 1000 * 1000,
+                .bus_num        = 0,
+        },
+#if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
+        {       /* DataFlash card */
+                .modalias       = "mtd_dataflash",
+                .chip_select    = 0,
+                .max_speed_hz   = 15 * 1000 * 1000,
+                .bus_num        = 0,
+        },
+#endif
+#endif
+#if defined(CONFIG_SND_AT73C213)
+        {       /* AT73C213 DAC */
+                .modalias       = "snd_at73c213",
+                .chip_select    = 0,
+                .max_speed_hz   = 10 * 1000 * 1000,
+                .bus_num        = 1,
+        },
+#endif
+};
+
+
+/*
+ * MACB Ethernet device
+ */
+static struct __initdata eth_platform_data ek_macb_data = {
+        .phy_irq_pin    = AT91_PIN_PA7,
+        .is_rmii        = 1,
+};
+
+
+/*
+ * NAND flash
+ */
+static struct mtd_partition __initdata ek_nand_partition[] = {
+        {
+                .name   = "Partition 1",
+                .offset = 0,
+                .size   = 256 * 1024,
+        },
+        {
+                .name   = "Partition 2",
+                .offset = 256 * 1024,
+                .size   = MTDPART_SIZ_FULL,
+        },
+};
+
+static struct mtd_partition *nand_partitions(int size, int *num_partitions)
+{
+        *num_partitions = ARRAY_SIZE(ek_nand_partition);
+        return ek_nand_partition;
+}
+
+static struct at91_nand_data __initdata ek_nand_data = {
+        .ale            = 21,
+        .cle            = 22,
+//      .det_pin        = ... not connected
+        .rdy_pin        = AT91_PIN_PC13,
+        .enable_pin     = AT91_PIN_PC14,
+        .partition_info = nand_partitions,
+#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
+        .bus_width_16   = 1,
+#else
+        .bus_width_16   = 0,
+#endif
+};
+
+
+/*
+ * MCI (SD/MMC)
+ */
+static struct at91_mmc_data __initdata ek_mmc_data = {
+        .slot_b         = 1,
+        .wire4          = 1,
+//      .det_pin        = ... not connected
+//      .wp_pin         = ... not connected
+//      .vcc_pin        = ... not connected
+};
+
+static void __init ek_board_init(void)
+{
+        /* Serial */
+        at91_add_device_serial();
+        /* USB Host */
+        at91_add_device_usbh(&ek_usbh_data);
+        /* USB Device */
+        at91_add_device_udc(&ek_udc_data);
+        /* SPI */
+        at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
+        /* NAND */
+        at91_add_device_nand(&ek_nand_data);
+        /* Ethernet */
+        at91_add_device_eth(&ek_macb_data);
+        /* MMC */
+        at91_add_device_mmc(&ek_mmc_data);
+}
+
+MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK")
+        /* Maintainer: Atmel */
+        .phys_io        = AT91_BASE_SYS,
+        .io_pg_offst    = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
+        .boot_params    = AT91_SDRAM_BASE + 0x100,
+        .timer          = &at91sam926x_timer,
+        .map_io         = ek_map_io,
+        .init_irq       = ek_init_irq,
+        .init_machine   = ek_board_init,
+MACHINE_END
diff --git a/arch/arm/mach-at91rm9200/board-sam9261ek.c b/arch/arm/mach-at91rm9200/board-sam9261ek.c
new file mode 100644
index 000000000000..30b490d8886b
--- /dev/null
+++ b/arch/arm/mach-at91rm9200/board-sam9261ek.c
@@ -0,0 +1,259 @@
+/*
+ * linux/arch/arm/mach-at91rm9200/board-ek.c
+ *
+ *  Copyright (C) 2005 SAN People
+ *  Copyright (C) 2006 Atmel
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+#include <linux/dm9000.h>
+
+#include <asm/hardware.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/irq.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+
+#include <asm/arch/board.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/at91sam926x_mc.h>
+
+#include "generic.h"
+
+
+/*
+ * Serial port configuration.
+ *    0 .. 2 = USART0 .. USART2
+ *    3      = DBGU
+ */
+static struct at91_uart_config __initdata ek_uart_config = {
+        .console_tty    = 0,                            /* ttyS0 */
+        .nr_tty         = 1,
+        .tty_map        = { 3, -1, -1, -1 }             /* ttyS0, ..., ttyS3 */
+};
+
+static void __init ek_map_io(void)
+{
+        /* Initialize processor: 18.432 MHz crystal */
+        at91sam9261_initialize(18432000);
+
+        /* Setup the serial ports and console */
+        at91_init_serial(&ek_uart_config);
+}
+
+static void __init ek_init_irq(void)
+{
+        at91sam9261_init_interrupts(NULL);
+}
+
+
+/*
+ * DM9000 ethernet device
+ */
+#if defined(CONFIG_DM9000)
+static struct resource at91sam9261_dm9000_resource[] = {
+        [0] = {
+                .start  = AT91_CHIPSELECT_2,
+                .end    = AT91_CHIPSELECT_2 + 3,
+                .flags  = IORESOURCE_MEM
+        },
+        [1] = {
+                .start  = AT91_CHIPSELECT_2 + 0x44,
+                .end    = AT91_CHIPSELECT_2 + 0xFF,
+                .flags  = IORESOURCE_MEM
+        },
+        [2] = {
+                .start  = AT91_PIN_PC11,
+                .end    = AT91_PIN_PC11,
+                .flags  = IORESOURCE_IRQ
+        }
+};
+
+static struct dm9000_plat_data dm9000_platdata = {
+        .flags          = DM9000_PLATF_16BITONLY,
+};
+
+static struct platform_device at91sam9261_dm9000_device = {
+        .name           = "dm9000",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(at91sam9261_dm9000_resource),
+        .resource       = at91sam9261_dm9000_resource,
+        .dev            = {
+                .platform_data  = &dm9000_platdata,
+        }
+};
+
+static void __init ek_add_device_dm9000(void)
+{
+        /*
+         * Configure Chip-Select 2 on SMC for the DM9000.
+         * Note: These timings were calculated for MASTER_CLOCK = 100000000
+         *  according to the DM9000 timings.
+         */
+        at91_sys_write(AT91_SMC_SETUP(2), AT91_SMC_NWESETUP_(2) | AT91_SMC_NCS_WRSETUP_(0) | AT91_SMC_NRDSETUP_(2) | AT91_SMC_NCS_RDSETUP_(0));
+        at91_sys_write(AT91_SMC_PULSE(2), AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(8) | AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(8));
+        at91_sys_write(AT91_SMC_CYCLE(2), AT91_SMC_NWECYCLE_(16) | AT91_SMC_NRDCYCLE_(16));
+        at91_sys_write(AT91_SMC_MODE(2), AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_BAT_WRITE | AT91_SMC_DBW_16 | AT91_SMC_TDF_(1));
+
+        /* Configure Reset signal as output */
+        at91_set_gpio_output(AT91_PIN_PC10, 0);
+
+        /* Configure Interrupt pin as input, no pull-up */
+        at91_set_gpio_input(AT91_PIN_PC11, 0);
+
+        platform_device_register(&at91sam9261_dm9000_device);
+}
+#else
+static void __init ek_add_device_dm9000(void) {}
+#endif /* CONFIG_DM9000 */
+
+
+/*
+ * USB Host Port
+ */
+static struct at91_usbh_data __initdata ek_usbh_data = {
+        .ports          = 2,
+};
+
+
+/*
+ * USB Device Port
+ */
+static struct at91_udc_data __initdata ek_udc_data = {
+        .vbus_pin       = AT91_PIN_PB29,
+        .pullup_pin     = 0,            /* pull-up driven by UDC */
+};
+
+
+/*
+ * MCI (SD/MMC)
+ */
+static struct at91_mmc_data __initdata ek_mmc_data = {
+        .wire4          = 1,
+//      .det_pin        = ... not connected
+//      .wp_pin         = ... not connected
+//      .vcc_pin        = ... not connected
+};
+
+
+/*
+ * NAND flash
+ */
+static struct mtd_partition __initdata ek_nand_partition[] = {
+        {
+                .name   = "Partition 1",
+                .offset = 0,
+                .size   = 256 * 1024,
+        },
+        {
+                .name   = "Partition 2",
+                .offset = 256 * 1024 ,
+                .size   = MTDPART_SIZ_FULL,
+        },
+};
+
+static struct mtd_partition *nand_partitions(int size, int *num_partitions)
+{
+        *num_partitions = ARRAY_SIZE(ek_nand_partition);
+        return ek_nand_partition;
+}
+
+static struct at91_nand_data __initdata ek_nand_data = {
+        .ale            = 22,
+        .cle            = 21,
+//      .det_pin        = ... not connected
+        .rdy_pin        = AT91_PIN_PC15,
+        .enable_pin     = AT91_PIN_PC14,
+        .partition_info = nand_partitions,
+#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
+        .bus_width_16   = 1,
+#else
+        .bus_width_16   = 0,
+#endif
+};
+
+/*
+ * SPI devices
+ */
+static struct spi_board_info ek_spi_devices[] = {
+        {       /* DataFlash chip */
+                .modalias       = "mtd_dataflash",
+                .chip_select    = 0,
+                .max_speed_hz   = 15 * 1000 * 1000,
+                .bus_num        = 0,
+        },
+#if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
+        {       /* DataFlash card - jumper (J12) configurable to CS3 or CS0 */
+                .modalias       = "mtd_dataflash",
+                .chip_select    = 3,
+                .max_speed_hz   = 15 * 1000 * 1000,
+                .bus_num        = 0,
+        },
+#elif defined(CONFIG_SND_AT73C213)
+        {       /* AT73C213 DAC */
+                .modalias       = "snd_at73c213",
+                .chip_select    = 3,
+                .max_speed_hz   = 10 * 1000 * 1000,
+                .bus_num        = 0,
+        },
+#endif
+};
+
+
+static void __init ek_board_init(void)
+{
+        /* Serial */
+        at91_add_device_serial();
+        /* USB Host */
+        at91_add_device_usbh(&ek_usbh_data);
+        /* USB Device */
+        at91_add_device_udc(&ek_udc_data);
+        /* I2C */
+        at91_add_device_i2c();
+        /* NAND */
+        at91_add_device_nand(&ek_nand_data);
+        /* DM9000 ethernet */
+        ek_add_device_dm9000();
+
+        /* spi0 and mmc/sd share the same PIO pins */
+#if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)
+        /* SPI */
+        at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
+#else
+        /* MMC */
+        at91_add_device_mmc(&ek_mmc_data);
+#endif
+}
+
+MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
+        /* Maintainer: Atmel */
+        .phys_io        = AT91_BASE_SYS,
+        .io_pg_offst    = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
+        .boot_params    = AT91_SDRAM_BASE + 0x100,
+        .timer          = &at91sam926x_timer,
+        .map_io         = ek_map_io,
+        .init_irq       = ek_init_irq,
+        .init_machine   = ek_board_init,
+MACHINE_END
diff --git a/arch/arm/mach-at91rm9200/clock.c b/arch/arm/mach-at91rm9200/clock.c
index a43b061a7c85..4dee21fefe5a 100644
--- a/arch/arm/mach-at91rm9200/clock.c
+++ b/arch/arm/mach-at91rm9200/clock.c
@@ -28,6 +28,8 @@
 #include <asm/mach-types.h>
 
 #include <asm/hardware.h>
+#include <asm/arch/at91_pmc.h>
+#include <asm/arch/cpu.h>
 
 #include "clock.h"
 
@@ -41,6 +43,7 @@
 #define clk_is_primary(x)       ((x)->type & CLK_TYPE_PRIMARY)
 #define clk_is_programmable(x)  ((x)->type & CLK_TYPE_PROGRAMMABLE)
 #define clk_is_peripheral(x)    ((x)->type & CLK_TYPE_PERIPHERAL)
+#define clk_is_sys(x)           ((x)->type & CLK_TYPE_SYSTEM)
 
 
 static LIST_HEAD(clocks);
@@ -114,13 +117,11 @@ static void pmc_sys_mode(struct clk *clk, int is_on)
 static struct clk udpck = {
         .name           = "udpck",
         .parent         = &pllb,
-        .pmc_mask       = AT91_PMC_UDP,
         .mode           = pmc_sys_mode,
 };
 static struct clk uhpck = {
         .name           = "uhpck",
         .parent         = &pllb,
-        .pmc_mask       = AT91_PMC_UHP,
         .mode           = pmc_sys_mode,
 };
 
@@ -434,6 +435,12 @@ int __init clk_register(struct clk *clk)
                 clk->mode = pmc_periph_mode;
                 list_add_tail(&clk->node, &clocks);
         }
+        else if (clk_is_sys(clk)) {
+                clk->parent = &mck;
+                clk->mode = pmc_sys_mode;
+
+                list_add_tail(&clk->node, &clocks);
+        }
 #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
         else if (clk_is_programmable(clk)) {
                 clk->mode = pmc_sys_mode;
@@ -586,9 +593,21 @@ int __init at91_clock_init(unsigned long main_clock)
          */
         at91_pllb_usb_init = at91_pll_calc(main_clock, 48000000 * 2) | AT91_PMC_USB96M;
         pllb.rate_hz = at91_pll_rate(&pllb, main_clock, at91_pllb_usb_init);
-        at91_sys_write(AT91_PMC_SCDR, AT91_PMC_UHP | AT91_PMC_UDP);
+        if (cpu_is_at91rm9200()) {
+                uhpck.pmc_mask = AT91RM9200_PMC_UHP;
+                udpck.pmc_mask = AT91RM9200_PMC_UDP;
+                at91_sys_write(AT91_PMC_SCDR, AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP);
+                at91_sys_write(AT91_PMC_SCER, AT91RM9200_PMC_MCKUDP);
+        } else if (cpu_is_at91sam9260()) {
+                uhpck.pmc_mask = AT91SAM926x_PMC_UHP;
+                udpck.pmc_mask = AT91SAM926x_PMC_UDP;
+                at91_sys_write(AT91_PMC_SCDR, AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP);
+        } else if (cpu_is_at91sam9261()) {
+                uhpck.pmc_mask = (AT91SAM926x_PMC_UHP | AT91_PMC_HCK0);
+                udpck.pmc_mask = AT91SAM926x_PMC_UDP;
+                at91_sys_write(AT91_PMC_SCDR, AT91SAM926x_PMC_UHP | AT91_PMC_HCK0 | AT91SAM926x_PMC_UDP);
+        }
         at91_sys_write(AT91_CKGR_PLLBR, 0);
-        at91_sys_write(AT91_PMC_SCER, AT91_PMC_MCKUDP);
 
         udpck.rate_hz = at91_usb_rate(&pllb, pllb.rate_hz, at91_pllb_usb_init);
         uhpck.rate_hz = at91_usb_rate(&pllb, pllb.rate_hz, at91_pllb_usb_init);
diff --git a/arch/arm/mach-at91rm9200/clock.h b/arch/arm/mach-at91rm9200/clock.h
index 0592e662ab37..b5c7a2eb2d1d 100644
--- a/arch/arm/mach-at91rm9200/clock.h
+++ b/arch/arm/mach-at91rm9200/clock.h
@@ -10,6 +10,7 @@
 #define CLK_TYPE_PLL            0x2
 #define CLK_TYPE_PROGRAMMABLE   0x4
 #define CLK_TYPE_PERIPHERAL     0x8
+#define CLK_TYPE_SYSTEM         0x10
 
 
 struct clk {
diff --git a/arch/arm/mach-at91rm9200/generic.h b/arch/arm/mach-at91rm9200/generic.h
index 694e411e285f..8c4d5a77d485 100644
--- a/arch/arm/mach-at91rm9200/generic.h
+++ b/arch/arm/mach-at91rm9200/generic.h
@@ -10,14 +10,19 @@
 
  /* Processors */
 extern void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks);
+extern void __init at91sam9260_initialize(unsigned long main_clock);
+extern void __init at91sam9261_initialize(unsigned long main_clock);
 
  /* Interrupts */
 extern void __init at91rm9200_init_interrupts(unsigned int priority[]);
+extern void __init at91sam9260_init_interrupts(unsigned int priority[]);
+extern void __init at91sam9261_init_interrupts(unsigned int priority[]);
 extern void __init at91_aic_init(unsigned int priority[]);
 
  /* Timer */
 struct sys_timer;
 extern struct sys_timer at91rm9200_timer;
+extern struct sys_timer at91sam926x_timer;
 
  /* Clocks */
 extern int __init at91_clock_init(unsigned long main_clock);
@@ -39,3 +44,6 @@ struct at91_gpio_bank {
 };
 extern void __init at91_gpio_init(struct at91_gpio_bank *, int nr_banks);
 extern void __init at91_gpio_irq_setup(void);
+
+extern void (*at91_arch_reset)(void);
+extern int at91_extern_irq;
diff --git a/arch/arm/mach-at91rm9200/gpio.c b/arch/arm/mach-at91rm9200/gpio.c
index 7467d644f0a3..3f188508c391 100644
--- a/arch/arm/mach-at91rm9200/gpio.c
+++ b/arch/arm/mach-at91rm9200/gpio.c
@@ -19,6 +19,8 @@
 
 #include <asm/io.h>
 #include <asm/hardware.h>
+#include <asm/arch/at91_pio.h>
+#include <asm/arch/at91_pmc.h>
 #include <asm/arch/gpio.h>
 
 #include "generic.h"
@@ -332,10 +334,10 @@ static struct irq_chip gpio_irqchip = {
         .set_wake       = gpio_irq_set_wake,
 };
 
-static void gpio_irq_handler(unsigned irq, struct irqdesc *desc)
+static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)
 {
         unsigned        pin;
-        struct irqdesc  *gpio;
+        struct irq_desc *gpio;
         void __iomem    *pio;
         u32             isr;
 
@@ -396,7 +398,7 @@ void __init at91_gpio_irq_setup(void)
                 __raw_writel(~0, controller + PIO_IDR);
 
                 set_irq_data(id, (void *) pin);
-                set_irq_chipdata(id, controller);
+                set_irq_chip_data(id, controller);
 
                 for (i = 0; i < 32; i++, pin++) {
                         /*
@@ -404,7 +406,7 @@ void __init at91_gpio_irq_setup(void)
                          * shorter, and the AIC handles interupts sanely.
                          */
                         set_irq_chip(pin, &gpio_irqchip);
-                        set_irq_handler(pin, do_simple_IRQ);
+                        set_irq_handler(pin, handle_simple_irq);
                         set_irq_flags(pin, IRQF_VALID);
                 }
 
diff --git a/arch/arm/mach-at91rm9200/irq.c b/arch/arm/mach-at91rm9200/irq.c
index 3e488117ca91..2148daafd29c 100644
--- a/arch/arm/mach-at91rm9200/irq.c
+++ b/arch/arm/mach-at91rm9200/irq.c
@@ -47,6 +47,10 @@ static void at91_aic_unmask_irq(unsigned int irq)
         at91_sys_write(AT91_AIC_IECR, 1 << irq);
 }
 
+unsigned int at91_extern_irq;
+
+#define is_extern_irq(irq) ((1 << (irq)) & at91_extern_irq)
+
 static int at91_aic_set_type(unsigned irq, unsigned type)
 {
         unsigned int smr, srctype;
@@ -59,14 +63,16 @@ static int at91_aic_set_type(unsigned irq, unsigned type)
                 srctype = AT91_AIC_SRCTYPE_RISING;
                 break;
         case IRQT_LOW:
-                if ((irq > AT91_ID_FIQ) && (irq < AT91RM9200_ID_IRQ0))  /* only supported on external interrupts */
+                if ((irq == AT91_ID_FIQ) || is_extern_irq(irq))         /* only supported on external interrupts */
+                        srctype = AT91_AIC_SRCTYPE_LOW;
+                else
                         return -EINVAL;
-                srctype = AT91_AIC_SRCTYPE_LOW;
                 break;
         case IRQT_FALLING:
-                if ((irq > AT91_ID_FIQ) && (irq < AT91RM9200_ID_IRQ0))  /* only supported on external interrupts */
+                if ((irq == AT91_ID_FIQ) || is_extern_irq(irq))         /* only supported on external interrupts */
+                        srctype = AT91_AIC_SRCTYPE_FALLING;
+                else
                         return -EINVAL;
-                srctype = AT91_AIC_SRCTYPE_FALLING;
                 break;
         default:
                 return -EINVAL;
@@ -139,7 +145,7 @@ void __init at91_aic_init(unsigned int priority[NR_AIC_IRQS])
                 at91_sys_write(AT91_AIC_SMR(i), AT91_AIC_SRCTYPE_LOW | priority[i]);
 
                 set_irq_chip(i, &at91_aic_chip);
-                set_irq_handler(i, do_level_IRQ);
+                set_irq_handler(i, handle_level_irq);
                 set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
 
                 /* Perform 8 End Of Interrupt Command to make sure AIC will not Lock out nIRQ */
diff --git a/arch/arm/mach-at91rm9200/pm.c b/arch/arm/mach-at91rm9200/pm.c
index 32c95d8eaacf..67aa5572a3ea 100644
--- a/arch/arm/mach-at91rm9200/pm.c
+++ b/arch/arm/mach-at91rm9200/pm.c
@@ -26,7 +26,10 @@
 #include <asm/mach/irq.h>
 #include <asm/mach-types.h>
 
+#include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91rm9200_mc.h>
 #include <asm/arch/gpio.h>
+#include <asm/arch/cpu.h>
 
 #include "generic.h"
 
@@ -68,9 +71,15 @@ static int at91_pm_verify_clocks(void)
         scsr = at91_sys_read(AT91_PMC_SCSR);
 
         /* USB must not be using PLLB */
-        if ((scsr & (AT91_PMC_UHP | AT91_PMC_UDP)) != 0) {
-                pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n");
-                return 0;
+        if (cpu_is_at91rm9200()) {
+                if ((scsr & (AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP)) != 0) {
+                        pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n");
+                        return 0;
+                }
+        } else if (cpu_is_at91sam9260()) {
+#warning "Check SAM9260 USB clocks"
+        } else if (cpu_is_at91sam9261()) {
+#warning "Check SAM9261 USB clocks"
         }
 
 #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
@@ -112,7 +121,6 @@ EXPORT_SYMBOL(at91_suspend_entering_slow_clock);
 static void (*slow_clock)(void);
 
 
-
 static int at91_pm_enter(suspend_state_t state)
 {
         at91_gpio_suspend();
@@ -123,13 +131,7 @@ static int at91_pm_enter(suspend_state_t state)
                         (at91_sys_read(AT91_PMC_PCSR)
                                         | (1 << AT91_ID_FIQ)
                                         | (1 << AT91_ID_SYS)
-                                        | (1 << AT91RM9200_ID_IRQ0)
-                                        | (1 << AT91RM9200_ID_IRQ1)
-                                        | (1 << AT91RM9200_ID_IRQ2)
-                                        | (1 << AT91RM9200_ID_IRQ3)
-                                        | (1 << AT91RM9200_ID_IRQ4)
-                                        | (1 << AT91RM9200_ID_IRQ5)
-                                        | (1 << AT91RM9200_ID_IRQ6))
+                                        | (at91_extern_irq))
                                 & at91_sys_read(AT91_AIC_IMR),
                         state);
 
diff --git a/arch/arm/mach-clps711x/irq.c b/arch/arm/mach-clps711x/irq.c
index 7ee926e5bad2..ca102960f528 100644
--- a/arch/arm/mach-clps711x/irq.c
+++ b/arch/arm/mach-clps711x/irq.c
@@ -63,7 +63,7 @@ static void int1_unmask(unsigned int irq)
         clps_writel(intmr1, INTMR1);
 }
 
-static struct irqchip int1_chip = {
+static struct irq_chip int1_chip = {
         .ack    = int1_ack,
         .mask   = int1_mask,
         .unmask = int1_unmask,
@@ -100,7 +100,7 @@ static void int2_unmask(unsigned int irq)
         clps_writel(intmr2, INTMR2);
 }
 
-static struct irqchip int2_chip = {
+static struct irq_chip int2_chip = {
         .ack    = int2_ack,
         .mask   = int2_mask,
         .unmask = int2_unmask,
@@ -112,12 +112,12 @@ void __init clps711x_init_irq(void)
 
         for (i = 0; i < NR_IRQS; i++) {
                 if (INT1_IRQS & (1 << i)) {
-                        set_irq_handler(i, do_level_IRQ);
+                        set_irq_handler(i, handle_level_irq);
                         set_irq_chip(i, &int1_chip);
                         set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
                 }
                 if (INT2_IRQS & (1 << i)) {
-                        set_irq_handler(i, do_level_IRQ);
+                        set_irq_handler(i, handle_level_irq);
                         set_irq_chip(i, &int2_chip);
                         set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
                 }                       
diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c
index fb10cf252588..231b90004736 100644
--- a/arch/arm/mach-clps7500/core.c
+++ b/arch/arm/mach-clps7500/core.c
@@ -57,7 +57,7 @@ static void cl7500_unmask_irq_a(unsigned int irq)
         iomd_writeb(val | mask, IOMD_IRQMASKA);
 }
 
-static struct irqchip clps7500_a_chip = {
+static struct irq_chip clps7500_a_chip = {
         .ack    = cl7500_ack_irq_a,
         .mask   = cl7500_mask_irq_a,
         .unmask = cl7500_unmask_irq_a,
@@ -81,7 +81,7 @@ static void cl7500_unmask_irq_b(unsigned int irq)
         iomd_writeb(val | mask, IOMD_IRQMASKB);
 }
 
-static struct irqchip clps7500_b_chip = {
+static struct irq_chip clps7500_b_chip = {
         .ack    = cl7500_mask_irq_b,
         .mask   = cl7500_mask_irq_b,
         .unmask = cl7500_unmask_irq_b,
@@ -105,7 +105,7 @@ static void cl7500_unmask_irq_c(unsigned int irq)
         iomd_writeb(val | mask, IOMD_IRQMASKC);
 }
 
-static struct irqchip clps7500_c_chip = {
+static struct irq_chip clps7500_c_chip = {
         .ack    = cl7500_mask_irq_c,
         .mask   = cl7500_mask_irq_c,
         .unmask = cl7500_unmask_irq_c,
@@ -129,7 +129,7 @@ static void cl7500_unmask_irq_d(unsigned int irq)
         iomd_writeb(val | mask, IOMD_IRQMASKD);
 }
 
-static struct irqchip clps7500_d_chip = {
+static struct irq_chip clps7500_d_chip = {
         .ack    = cl7500_mask_irq_d,
         .mask   = cl7500_mask_irq_d,
         .unmask = cl7500_unmask_irq_d,
@@ -153,7 +153,7 @@ static void cl7500_unmask_irq_dma(unsigned int irq)
         iomd_writeb(val | mask, IOMD_DMAMASK);
 }
 
-static struct irqchip clps7500_dma_chip = {
+static struct irq_chip clps7500_dma_chip = {
         .ack    = cl7500_mask_irq_dma,
         .mask   = cl7500_mask_irq_dma,
         .unmask = cl7500_unmask_irq_dma,
@@ -177,7 +177,7 @@ static void cl7500_unmask_irq_fiq(unsigned int irq)
         iomd_writeb(val | mask, IOMD_FIQMASK);
 }
 
-static struct irqchip clps7500_fiq_chip = {
+static struct irq_chip clps7500_fiq_chip = {
         .ack    = cl7500_mask_irq_fiq,
         .mask   = cl7500_mask_irq_fiq,
         .unmask = cl7500_unmask_irq_fiq,
@@ -187,7 +187,7 @@ static void cl7500_no_action(unsigned int irq)
 {
 }
 
-static struct irqchip clps7500_no_chip = {
+static struct irq_chip clps7500_no_chip = {
         .ack    = cl7500_no_action,
         .mask   = cl7500_no_action,
         .unmask = cl7500_no_action,
@@ -214,43 +214,43 @@ static void __init clps7500_init_irq(void)
                 switch (irq) {
                 case 0 ... 7:
                         set_irq_chip(irq, &clps7500_a_chip);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, flags);
                         break;
 
                 case 8 ... 15:
                         set_irq_chip(irq, &clps7500_b_chip);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, flags);
                         break;
 
                 case 16 ... 22:
                         set_irq_chip(irq, &clps7500_dma_chip);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, flags);
                         break;
 
                 case 24 ... 31:
                         set_irq_chip(irq, &clps7500_c_chip);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, flags);
                         break;
 
                 case 40 ... 47:
                         set_irq_chip(irq, &clps7500_d_chip);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, flags);
                         break;
 
                 case 48 ... 55:
                         set_irq_chip(irq, &clps7500_no_chip);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, flags);
                         break;
 
                 case 64 ... 72:
                         set_irq_chip(irq, &clps7500_fiq_chip);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, flags);
                         break;
                 }
diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c
index 90103ab373a6..8459431cfd71 100644
--- a/arch/arm/mach-ebsa110/core.c
+++ b/arch/arm/mach-ebsa110/core.c
@@ -45,7 +45,7 @@ static void ebsa110_unmask_irq(unsigned int irq)
         __raw_writeb(1 << irq, IRQ_MSET);
 }
 
-static struct irqchip ebsa110_irq_chip = {
+static struct irq_chip ebsa110_irq_chip = {
         .ack    = ebsa110_mask_irq,
         .mask   = ebsa110_mask_irq,
         .unmask = ebsa110_unmask_irq,
@@ -67,7 +67,7 @@ static void __init ebsa110_init_irq(void)
 
         for (irq = 0; irq < NR_IRQS; irq++) {
                 set_irq_chip(irq, &ebsa110_irq_chip);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 }
diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig
index e346b03cd921..af7904b3d0a8 100644
--- a/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
@@ -9,12 +9,24 @@ config CRUNCH
 
 comment "EP93xx Platforms"
 
+config MACH_ADSSPHERE
+        bool "Support ADS Sphere"
+        help
+          Say 'Y' here if you want your kernel to support the ADS
+          Sphere board.
+
 config MACH_EDB9302
         bool "Support Cirrus Logic EDB9302"
         help
           Say 'Y' here if you want your kernel to support the Cirrus
           Logic EDB9302 Evaluation Board.
 
+config MACH_EDB9302A
+        bool "Support Cirrus Logic EDB9302A"
+        help
+          Say 'Y' here if you want your kernel to support the Cirrus
+          Logic EDB9302A Evaluation Board.
+
 config MACH_EDB9312
         bool "Support Cirrus Logic EDB9312"
         help
diff --git a/arch/arm/mach-ep93xx/Makefile b/arch/arm/mach-ep93xx/Makefile
index c2eb18b530c2..b06641dd450d 100644
--- a/arch/arm/mach-ep93xx/Makefile
+++ b/arch/arm/mach-ep93xx/Makefile
@@ -6,7 +6,9 @@ obj-m			:=
 obj-n                   :=
 obj-                    :=
 
+obj-$(CONFIG_MACH_ADSSPHERE)    += adssphere.o
 obj-$(CONFIG_MACH_EDB9302)      += edb9302.o
+obj-$(CONFIG_MACH_EDB9302A)     += edb9302a.o
 obj-$(CONFIG_MACH_EDB9312)      += edb9312.o
 obj-$(CONFIG_MACH_EDB9315)      += edb9315.o
 obj-$(CONFIG_MACH_EDB9315A)     += edb9315a.o
diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c
new file mode 100644
index 000000000000..ac5d5818eb7b
--- /dev/null
+++ b/arch/arm/mach-ep93xx/adssphere.c
@@ -0,0 +1,91 @@
+/*
+ * arch/arm/mach-ep93xx/adssphere.c
+ * ADS Sphere support.
+ *
+ * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <linux/mtd/physmap.h>
+#include <linux/platform_device.h>
+#include <asm/io.h>
+#include <asm/hardware.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
+static struct physmap_flash_data adssphere_flash_data = {
+        .width          = 4,
+};
+
+static struct resource adssphere_flash_resource = {
+        .start          = 0x60000000,
+        .end            = 0x61ffffff,
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device adssphere_flash = {
+        .name           = "physmap-flash",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &adssphere_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &adssphere_flash_resource,
+};
+
+static struct ep93xx_eth_data adssphere_eth_data = {
+        .phy_id         = 1,
+};
+
+static struct resource adssphere_eth_resource[] = {
+        {
+                .start  = EP93XX_ETHERNET_PHYS_BASE,
+                .end    = EP93XX_ETHERNET_PHYS_BASE + 0xffff,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = IRQ_EP93XX_ETHERNET,
+                .end    = IRQ_EP93XX_ETHERNET,
+                .flags  = IORESOURCE_IRQ,
+        }
+};
+
+static struct platform_device adssphere_eth_device = {
+        .name           = "ep93xx-eth",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &adssphere_eth_data,
+        },
+        .num_resources  = 2,
+        .resource       = adssphere_eth_resource,
+};
+
+static void __init adssphere_init_machine(void)
+{
+        ep93xx_init_devices();
+        platform_device_register(&adssphere_flash);
+
+        memcpy(adssphere_eth_data.dev_addr,
+                (void *)(EP93XX_ETHERNET_BASE + 0x50), 6);
+        platform_device_register(&adssphere_eth_device);
+}
+
+MACHINE_START(ADSSPHERE, "ADS Sphere board")
+        /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
+        .phys_io        = EP93XX_APB_PHYS_BASE,
+        .io_pg_offst    = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
+        .boot_params    = 0x00000100,
+        .map_io         = ep93xx_map_io,
+        .init_irq       = ep93xx_init_irq,
+        .timer          = &ep93xx_timer,
+        .init_machine   = adssphere_init_machine,
+MACHINE_END
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index e3fd1ab6adcc..6b26346191c0 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -245,7 +245,7 @@ EXPORT_SYMBOL(gpio_line_set);
  * EP93xx IRQ handling
  *************************************************************************/
 static void ep93xx_gpio_ab_irq_handler(unsigned int irq,
-                struct irqdesc *desc)
+                struct irq_desc *desc)
 {
         unsigned char status;
         int i;
@@ -335,7 +335,7 @@ static int ep93xx_gpio_ab_irq_type(unsigned int irq, unsigned int type)
         return 0;
 }
 
-static struct irqchip ep93xx_gpio_ab_irq_chip = {
+static struct irq_chip ep93xx_gpio_ab_irq_chip = {
         .ack            = ep93xx_gpio_ab_irq_mask_ack,
         .mask           = ep93xx_gpio_ab_irq_mask,
         .unmask         = ep93xx_gpio_ab_irq_unmask,
@@ -352,7 +352,7 @@ void __init ep93xx_init_irq(void)
 
         for (irq = IRQ_EP93XX_GPIO(0) ; irq <= IRQ_EP93XX_GPIO(15); irq++) {
                 set_irq_chip(irq, &ep93xx_gpio_ab_irq_chip);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID);
         }
         set_irq_chained_handler(IRQ_EP93XX_GPIO_AB, ep93xx_gpio_ab_irq_handler);
@@ -477,4 +477,8 @@ void __init ep93xx_init_devices(void)
 
         platform_device_register(&ep93xx_rtc_device);
         platform_device_register(&ep93xx_ohci_device);
+
+#ifdef CONFIG_CRUNCH
+        elf_hwcap |= HWCAP_CRUNCH;
+#endif
 }
diff --git a/arch/arm/mach-ep93xx/edb9302a.c b/arch/arm/mach-ep93xx/edb9302a.c
new file mode 100644
index 000000000000..62e064bab1d2
--- /dev/null
+++ b/arch/arm/mach-ep93xx/edb9302a.c
@@ -0,0 +1,91 @@
+/*
+ * arch/arm/mach-ep93xx/edb9302a.c
+ * Cirrus Logic EDB9302A support.
+ *
+ * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <linux/mtd/physmap.h>
+#include <linux/platform_device.h>
+#include <asm/io.h>
+#include <asm/hardware.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
+static struct physmap_flash_data edb9302a_flash_data = {
+        .width          = 2,
+};
+
+static struct resource edb9302a_flash_resource = {
+        .start          = 0x60000000,
+        .end            = 0x60ffffff,
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device edb9302a_flash = {
+        .name           = "physmap-flash",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &edb9302a_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &edb9302a_flash_resource,
+};
+
+static struct ep93xx_eth_data edb9302a_eth_data = {
+        .phy_id                 = 1,
+};
+
+static struct resource edb9302a_eth_resource[] = {
+        {
+                .start  = EP93XX_ETHERNET_PHYS_BASE,
+                .end    = EP93XX_ETHERNET_PHYS_BASE + 0xffff,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = IRQ_EP93XX_ETHERNET,
+                .end    = IRQ_EP93XX_ETHERNET,
+                .flags  = IORESOURCE_IRQ,
+        }
+};
+
+static struct platform_device edb9302a_eth_device = {
+        .name           = "ep93xx-eth",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &edb9302a_eth_data,
+        },
+        .num_resources  = 2,
+        .resource       = edb9302a_eth_resource,
+};
+
+static void __init edb9302a_init_machine(void)
+{
+        ep93xx_init_devices();
+        platform_device_register(&edb9302a_flash);
+
+        memcpy(edb9302a_eth_data.dev_addr,
+                (void *)(EP93XX_ETHERNET_BASE + 0x50), 6);
+        platform_device_register(&edb9302a_eth_device);
+}
+
+MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board")
+        /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
+        .phys_io        = EP93XX_APB_PHYS_BASE,
+        .io_pg_offst    = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
+        .boot_params    = 0xc0000100,
+        .map_io         = ep93xx_map_io,
+        .init_irq       = ep93xx_init_irq,
+        .timer          = &ep93xx_timer,
+        .init_machine   = edb9302a_init_machine,
+MACHINE_END
diff --git a/arch/arm/mach-footbridge/common.c b/arch/arm/mach-footbridge/common.c
index af900f4755a4..ef29fc34ce65 100644
--- a/arch/arm/mach-footbridge/common.c
+++ b/arch/arm/mach-footbridge/common.c
@@ -78,7 +78,7 @@ static void fb_unmask_irq(unsigned int irq)
         *CSR_IRQ_ENABLE = fb_irq_mask[_DC21285_INR(irq)];
 }
 
-static struct irqchip fb_chip = {
+static struct irq_chip fb_chip = {
         .ack    = fb_mask_irq,
         .mask   = fb_mask_irq,
         .unmask = fb_unmask_irq,
@@ -96,7 +96,7 @@ static void __init __fb_init_irq(void)
 
         for (irq = _DC21285_IRQ(0); irq < _DC21285_IRQ(20); irq++) {
                 set_irq_chip(irq, &fb_chip);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 }
diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c
index 888dedd501b9..79443ffc8916 100644
--- a/arch/arm/mach-footbridge/isa-irq.c
+++ b/arch/arm/mach-footbridge/isa-irq.c
@@ -49,7 +49,7 @@ static void isa_unmask_pic_lo_irq(unsigned int irq)
         outb(inb(PIC_MASK_LO) & ~mask, PIC_MASK_LO);
 }
 
-static struct irqchip isa_lo_chip = {
+static struct irq_chip isa_lo_chip = {
         .ack    = isa_ack_pic_lo_irq,
         .mask   = isa_mask_pic_lo_irq,
         .unmask = isa_unmask_pic_lo_irq,
@@ -78,14 +78,14 @@ static void isa_unmask_pic_hi_irq(unsigned int irq)
         outb(inb(PIC_MASK_HI) & ~mask, PIC_MASK_HI);
 }
 
-static struct irqchip isa_hi_chip = {
+static struct irq_chip isa_hi_chip = {
         .ack    = isa_ack_pic_hi_irq,
         .mask   = isa_mask_pic_hi_irq,
         .unmask = isa_unmask_pic_hi_irq,
 };
 
 static void
-isa_irq_handler(unsigned int irq, struct irqdesc *desc)
+isa_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         unsigned int isa_irq = *(unsigned char *)PCIIACK_BASE;
 
@@ -150,13 +150,13 @@ void __init isa_init_irq(unsigned int host_irq)
         if (host_irq != (unsigned int)-1) {
                 for (irq = _ISA_IRQ(0); irq < _ISA_IRQ(8); irq++) {
                         set_irq_chip(irq, &isa_lo_chip);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
                 }
 
                 for (irq = _ISA_IRQ(8); irq < _ISA_IRQ(16); irq++) {
                         set_irq_chip(irq, &isa_hi_chip);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
                 }
 
diff --git a/arch/arm/mach-h720x/common.c b/arch/arm/mach-h720x/common.c
index 4719229a1a78..7f31816896ad 100644
--- a/arch/arm/mach-h720x/common.c
+++ b/arch/arm/mach-h720x/common.c
@@ -101,7 +101,7 @@ static void inline unmask_gpio_irq(u32 irq)
 
 static void
 h720x_gpio_handler(unsigned int mask, unsigned int irq,
-                 struct irqdesc *desc)
+                 struct irq_desc *desc)
 {
         IRQDBG("%s irq: %d\n",__FUNCTION__,irq);
         desc = irq_desc + irq;
@@ -117,7 +117,7 @@ h720x_gpio_handler(unsigned int mask, unsigned int irq,
 }
 
 static void
-h720x_gpioa_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
+h720x_gpioa_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
 {
         unsigned int mask, irq;
 
@@ -128,7 +128,7 @@ h720x_gpioa_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
 }
 
 static void
-h720x_gpiob_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
+h720x_gpiob_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
 {
         unsigned int mask, irq;
         mask = CPU_REG(GPIO_B_VIRT,GPIO_STAT);
@@ -138,7 +138,7 @@ h720x_gpiob_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
 }
 
 static void
-h720x_gpioc_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
+h720x_gpioc_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
 {
         unsigned int mask, irq;
 
@@ -149,7 +149,7 @@ h720x_gpioc_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
 }
 
 static void
-h720x_gpiod_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
+h720x_gpiod_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
 {
         unsigned int mask, irq;
 
@@ -161,7 +161,7 @@ h720x_gpiod_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
 
 #ifdef CONFIG_CPU_H7202
 static void
-h720x_gpioe_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
+h720x_gpioe_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
 {
         unsigned int mask, irq;
 
@@ -172,13 +172,13 @@ h720x_gpioe_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
 }
 #endif
 
-static struct irqchip h720x_global_chip = {
+static struct irq_chip h720x_global_chip = {
         .ack = mask_global_irq,
         .mask = mask_global_irq,
         .unmask = unmask_global_irq,
 };
 
-static struct irqchip h720x_gpio_chip = {
+static struct irq_chip h720x_gpio_chip = {
         .ack = ack_gpio_irq,
         .mask = mask_gpio_irq,
         .unmask = unmask_gpio_irq,
@@ -203,14 +203,14 @@ void __init h720x_init_irq (void)
         /* Initialize global IRQ's, fast path */
         for (irq = 0; irq < NR_GLBL_IRQS; irq++) {
                 set_irq_chip(irq, &h720x_global_chip);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
         /* Initialize multiplexed IRQ's, slow path */
         for (irq = IRQ_CHAINED_GPIOA(0) ; irq <= IRQ_CHAINED_GPIOD(31); irq++) {
                 set_irq_chip(irq, &h720x_gpio_chip);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID );
         }
         set_irq_chained_handler(IRQ_GPIOA, h720x_gpioa_demux_handler);
@@ -221,7 +221,7 @@ void __init h720x_init_irq (void)
 #ifdef CONFIG_CPU_H7202
         for (irq = IRQ_CHAINED_GPIOE(0) ; irq <= IRQ_CHAINED_GPIOE(31); irq++) {
                 set_irq_chip(irq, &h720x_gpio_chip);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID );
         }
         set_irq_chained_handler(IRQ_GPIOE, h720x_gpioe_demux_handler);
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c
index 06fecaefd8dc..703870f30adf 100644
--- a/arch/arm/mach-h720x/cpu-h7202.c
+++ b/arch/arm/mach-h720x/cpu-h7202.c
@@ -106,7 +106,7 @@ static struct platform_device *devices[] __initdata = {
  * we have to handle all timer interrupts in one place.
  */
 static void
-h7202_timerx_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
+h7202_timerx_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
 {
         unsigned int mask, irq;
 
@@ -162,7 +162,7 @@ static void inline unmask_timerx_irq (u32 irq)
         CPU_REG (TIMER_VIRT, TIMER_TOPCTRL) |= bit;
 }
 
-static struct irqchip h7202_timerx_chip = {
+static struct irq_chip h7202_timerx_chip = {
         .ack = mask_timerx_irq,
         .mask = mask_timerx_irq,
         .unmask = unmask_timerx_irq,
@@ -202,7 +202,7 @@ void __init h7202_init_irq (void)
                           irq < IRQ_CHAINED_TIMERX(NR_TIMERX_IRQS); irq++) {
                 mask_timerx_irq(irq);
                 set_irq_chip(irq, &h7202_timerx_chip);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID );
         }
         set_irq_chained_handler(IRQ_TIMERX, h7202_timerx_demux_handler);
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 0b27d79f2efd..02272aa36e90 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -9,6 +9,8 @@
 
 obj-y                   += irq.o time.o dma.o generic.o
 
+obj-$(CONFIG_CPU_FREQ_IMX)      += cpufreq.o
+
 # Specific board support
 obj-$(CONFIG_ARCH_MX1ADS) += mx1ads.o
 
diff --git a/arch/arm/mach-imx/cpufreq.c b/arch/arm/mach-imx/cpufreq.c
new file mode 100644
index 000000000000..ac5f99895660
--- /dev/null
+++ b/arch/arm/mach-imx/cpufreq.c
@@ -0,0 +1,287 @@
+/*
+ * cpu.c: clock scaling for the iMX
+ *
+ * Copyright (C) 2000 2001, The Delft University of Technology
+ * Copyright (c) 2004 Sascha Hauer <sascha@saschahauer.de>
+ * Copyright (C) 2006 Inky Lung <ilung@cwlinux.com>
+ * Copyright (C) 2006 Pavel Pisa, PiKRON <ppisa@pikron.com>
+ *
+ * Based on SA1100 version written by:
+ * - Johan Pouwelse (J.A.Pouwelse@its.tudelft.nl): initial version
+ * - Erik Mouw (J.A.K.Mouw@its.tudelft.nl):
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+/*#define DEBUG*/
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/cpufreq.h>
+#include <asm/system.h>
+
+#include <asm/hardware.h>
+
+#include "generic.h"
+
+#ifndef __val2mfld
+#define __val2mfld(mask,val) (((mask)&~((mask)<<1))*(val)&(mask))
+#endif
+#ifndef __mfld2val
+#define __mfld2val(mask,val) (((val)&(mask))/((mask)&~((mask)<<1)))
+#endif
+
+#define CR_920T_CLOCK_MODE      0xC0000000
+#define CR_920T_FASTBUS_MODE    0x00000000
+#define CR_920T_ASYNC_MODE      0xC0000000
+
+static u32 mpctl0_at_boot;
+
+static void imx_set_async_mode(void)
+{
+        adjust_cr(CR_920T_CLOCK_MODE, CR_920T_ASYNC_MODE);
+}
+
+static void imx_set_fastbus_mode(void)
+{
+        adjust_cr(CR_920T_CLOCK_MODE, CR_920T_FASTBUS_MODE);
+}
+
+static void imx_set_mpctl0(u32 mpctl0)
+{
+        unsigned long flags;
+
+        if (mpctl0 == 0) {
+                local_irq_save(flags);
+                CSCR &= ~CSCR_MPEN;
+                local_irq_restore(flags);
+                return;
+        }
+
+        local_irq_save(flags);
+        MPCTL0 = mpctl0;
+        CSCR |= CSCR_MPEN;
+        local_irq_restore(flags);
+}
+
+/**
+ * imx_compute_mpctl - compute new PLL parameters
+ * @new_mpctl:  pointer to location assigned by new PLL control register value
+ * @cur_mpctl:  current PLL control register parameters
+ * @freq:       required frequency in Hz
+ * @relation:   is one of %CPUFREQ_RELATION_L (supremum)
+ *              and %CPUFREQ_RELATION_H (infimum)
+ */
+long imx_compute_mpctl(u32 *new_mpctl, u32 cur_mpctl, unsigned long freq, int relation)
+{
+        u32 f_ref = (CSCR & CSCR_SYSTEM_SEL) ? 16000000 : (CLK32 * 512);
+        u32 mfi;
+        u32 mfn;
+        u32 mfd;
+        u32 pd;
+        unsigned long long ll;
+        long l;
+        long quot;
+
+        /* Fdppl=2*Fref*(MFI+MFN/(MFD+1))/(PD+1) */
+        /*  PD=<0,15>, MFD=<1,1023>, MFI=<5,15> MFN=<0,1022> */
+
+        if (cur_mpctl) {
+                mfd = ((cur_mpctl >> 16) & 0x3ff) + 1;
+                pd =  ((cur_mpctl >> 26) & 0xf) + 1;
+        } else {
+                pd=2; mfd=313;
+        }
+
+        /* pd=2; mfd=313; mfi=8; mfn=183; */
+        /* (MFI+MFN/(MFD)) = Fdppl / (2*Fref) * (PD); */
+
+        quot = (f_ref + (1 << 9)) >> 10;
+        l = (freq * pd + quot) / (2 * quot);
+        mfi = l >> 10;
+        mfn = ((l & ((1 << 10) - 1)) * mfd + (1 << 9)) >> 10;
+
+        mfd -= 1;
+        pd -= 1;
+
+        *new_mpctl = ((mfi & 0xf) << 10) | (mfn & 0x3ff) | ((mfd & 0x3ff) << 16)
+                | ((pd & 0xf) << 26);
+
+        ll = 2 * (unsigned long long)f_ref * ( (mfi<<16) + (mfn<<16) / (mfd+1) );
+        quot = (pd+1) * (1<<16);
+        ll += quot / 2;
+        do_div(ll, quot);
+        freq = ll;
+
+        pr_debug(KERN_DEBUG "imx: new PLL parameters pd=%d mfd=%d mfi=%d mfn=%d, freq=%ld\n",
+                pd, mfd, mfi, mfn, freq);
+
+        return freq;
+}
+
+
+static int imx_verify_speed(struct cpufreq_policy *policy)
+{
+        if (policy->cpu != 0)
+                return -EINVAL;
+
+        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, policy->cpuinfo.max_freq);
+
+        return 0;
+}
+
+static unsigned int imx_get_speed(unsigned int cpu)
+{
+        unsigned int freq;
+        unsigned int cr;
+        unsigned int cscr;
+        unsigned int bclk_div;
+
+        if (cpu)
+                return 0;
+
+        cscr = CSCR;
+        bclk_div = __mfld2val(CSCR_BCLK_DIV, cscr) + 1;
+        cr = get_cr();
+
+        if((cr & CR_920T_CLOCK_MODE) == CR_920T_FASTBUS_MODE) {
+                freq = imx_get_system_clk();
+                freq = (freq + bclk_div/2) / bclk_div;
+        } else {
+                freq = imx_get_mcu_clk();
+                if (cscr & CSCR_MPU_PRESC)
+                        freq /= 2;
+        }
+
+        freq = (freq + 500) / 1000;
+
+        return freq;
+}
+
+static int imx_set_target(struct cpufreq_policy *policy,
+                          unsigned int target_freq,
+                          unsigned int relation)
+{
+        struct cpufreq_freqs freqs;
+        u32 mpctl0 = 0;
+        u32 cscr;
+        unsigned long flags;
+        long freq;
+        long sysclk;
+        unsigned int bclk_div = 1;
+
+        freq = target_freq * 1000;
+
+        pr_debug(KERN_DEBUG "imx: requested frequency %ld Hz, mpctl0 at boot 0x%08x\n",
+                        freq, mpctl0_at_boot);
+
+        sysclk = imx_get_system_clk();
+
+        if (freq > sysclk + 1000000) {
+                freq = imx_compute_mpctl(&mpctl0, mpctl0_at_boot, freq, relation);
+                if (freq < 0) {
+                        printk(KERN_WARNING "imx: target frequency %ld Hz cannot be set\n", freq);
+                        return -EINVAL;
+                }
+        } else {
+                if(freq + 1000 < sysclk) {
+                        if (relation == CPUFREQ_RELATION_L)
+                                bclk_div = (sysclk - 1000) / freq;
+                        else
+                                bclk_div = (sysclk + freq + 1000) / freq;
+
+                        if(bclk_div > 16)
+                                bclk_div = 16;
+                }
+                freq = (sysclk + bclk_div / 2) / bclk_div;
+        }
+
+        freqs.old = imx_get_speed(0);
+        freqs.new = (freq + 500) / 1000;
+        freqs.cpu = 0;
+        freqs.flags = 0;
+
+        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+
+        local_irq_save(flags);
+
+        imx_set_fastbus_mode();
+
+        imx_set_mpctl0(mpctl0);
+
+        cscr = CSCR;
+        cscr &= ~CSCR_BCLK_DIV;
+        cscr |= __val2mfld(CSCR_BCLK_DIV, bclk_div - 1);
+        CSCR = cscr;
+
+        if(mpctl0) {
+                CSCR |= CSCR_MPLL_RESTART;
+
+                /* Wait until MPLL is stablized */
+                while( CSCR & CSCR_MPLL_RESTART );
+
+                imx_set_async_mode();
+        }
+
+        local_irq_restore(flags);
+
+        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+
+        pr_debug(KERN_INFO "imx: set frequency %ld Hz, running from %s\n",
+                        freq, mpctl0? "MPLL": "SPLL");
+
+        return 0;
+}
+
+static int __init imx_cpufreq_driver_init(struct cpufreq_policy *policy)
+{
+        printk(KERN_INFO "i.MX cpu freq change driver v1.0\n");
+
+        if (policy->cpu != 0)
+                return -EINVAL;
+
+        policy->cur = policy->min = policy->max = imx_get_speed(0);
+        policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
+        policy->cpuinfo.min_freq = 8000;
+        policy->cpuinfo.max_freq = 200000;
+        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
+        return 0;
+}
+
+static struct cpufreq_driver imx_driver = {
+        .flags          = CPUFREQ_STICKY,
+        .verify         = imx_verify_speed,
+        .target         = imx_set_target,
+        .get            = imx_get_speed,
+        .init           = imx_cpufreq_driver_init,
+        .name           = "imx",
+};
+
+static int __init imx_cpufreq_init(void)
+{
+
+        mpctl0_at_boot = 0;
+
+        if((CSCR & CSCR_MPEN) &&
+           ((get_cr() & CR_920T_CLOCK_MODE) != CR_920T_FASTBUS_MODE))
+                mpctl0_at_boot = MPCTL0;
+
+        return cpufreq_register_driver(&imx_driver);
+}
+
+arch_initcall(imx_cpufreq_init);
+
diff --git a/arch/arm/mach-imx/generic.c b/arch/arm/mach-imx/generic.c
index 12ea58a3b84f..b5aa49d00ca3 100644
--- a/arch/arm/mach-imx/generic.c
+++ b/arch/arm/mach-imx/generic.c
@@ -104,6 +104,9 @@ EXPORT_SYMBOL(imx_gpio_mode);
  */
 static unsigned int imx_decode_pll(unsigned int pll)
 {
+        unsigned long long ll;
+        unsigned long quot;
+
         u32 mfi = (pll >> 10) & 0xf;
         u32 mfn = pll & 0x3ff;
         u32 mfd = (pll >> 16) & 0x3ff;
@@ -112,7 +115,11 @@ static unsigned int imx_decode_pll(unsigned int pll)
 
         mfi = mfi <= 5 ? 5 : mfi;
 
-        return (2 * (f_ref>>10) * ( (mfi<<10) + (mfn<<10) / (mfd+1) )) / (pd+1);
+        ll = 2 * (unsigned long long)f_ref * ( (mfi<<16) + (mfn<<16) / (mfd+1) );
+        quot = (pd+1) * (1<<16);
+        ll += quot / 2;
+        do_div(ll, quot);
+        return (unsigned int) ll;
 }
 
 unsigned int imx_get_system_clk(void)
diff --git a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c
index 368b13b058ab..0791b56caecc 100644
--- a/arch/arm/mach-imx/irq.c
+++ b/arch/arm/mach-imx/irq.c
@@ -146,7 +146,7 @@ imx_gpio_unmask_irq(unsigned int irq)
 
 static void
 imx_gpio_handler(unsigned int mask, unsigned int irq,
-                 struct irqdesc *desc)
+                 struct irq_desc *desc)
 {
         desc = irq_desc + irq;
         while (mask) {
@@ -161,7 +161,7 @@ imx_gpio_handler(unsigned int mask, unsigned int irq,
 }
 
 static void
-imx_gpioa_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
+imx_gpioa_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
 {
         unsigned int mask, irq;
 
@@ -171,7 +171,7 @@ imx_gpioa_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
 }
 
 static void
-imx_gpiob_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
+imx_gpiob_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
 {
         unsigned int mask, irq;
 
@@ -181,7 +181,7 @@ imx_gpiob_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
 }
 
 static void
-imx_gpioc_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
+imx_gpioc_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
 {
         unsigned int mask, irq;
 
@@ -191,7 +191,7 @@ imx_gpioc_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
 }
 
 static void
-imx_gpiod_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
+imx_gpiod_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
 {
         unsigned int mask, irq;
 
@@ -230,13 +230,13 @@ imx_init_irq(void)
 
         for (irq = 0; irq < IMX_IRQS; irq++) {
                 set_irq_chip(irq, &imx_internal_chip);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID);
         }
 
         for (irq = IRQ_GPIOA(0); irq < IRQ_GPIOD(32); irq++) {
                 set_irq_chip(irq, &imx_gpio_chip);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID);
         }
 
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
index 8ae4a2c5066f..40039b2a90b3 100644
--- a/arch/arm/mach-imx/time.c
+++ b/arch/arm/mach-imx/time.c
@@ -14,6 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/time.h>
+#include <linux/clocksource.h>
 
 #include <asm/hardware.h>
 #include <asm/io.h>
@@ -24,33 +25,7 @@
 /* Use timer 1 as system timer */
 #define TIMER_BASE IMX_TIM1_BASE
 
-/*
- * Returns number of us since last clock interrupt.  Note that interrupts
- * will have been disabled by do_gettimeoffset()
- */
-static unsigned long imx_gettimeoffset(void)
-{
-        unsigned long ticks;
-
-        /*
-         * Get the current number of ticks.  Note that there is a race
-         * condition between us reading the timer and checking for
-         * an interrupt.  We get around this by ensuring that the
-         * counter has not reloaded between our two reads.
-         */
-        ticks = IMX_TCN(TIMER_BASE);
-
-        /*
-         * Interrupt pending?  If so, we've reloaded once already.
-         */
-        if (IMX_TSTAT(TIMER_BASE) & TSTAT_COMP)
-                ticks += LATCH;
-
-        /*
-         * Convert the ticks to usecs
-         */
-        return (1000000 / CLK32) * ticks;
-}
+static unsigned long evt_diff;
 
 /*
  * IRQ handler for the timer
@@ -58,14 +33,23 @@ static unsigned long imx_gettimeoffset(void)
 static irqreturn_t
 imx_timer_interrupt(int irq, void *dev_id)
 {
-        write_seqlock(&xtime_lock);
+        uint32_t tstat;
 
         /* clear the interrupt */
-        if (IMX_TSTAT(TIMER_BASE))
-                IMX_TSTAT(TIMER_BASE) = 0;
+        tstat = IMX_TSTAT(TIMER_BASE);
+        IMX_TSTAT(TIMER_BASE) = 0;
+
+        if (tstat & TSTAT_COMP) {
+                do {
+
+                        write_seqlock(&xtime_lock);
+                        timer_tick();
+                        write_sequnlock(&xtime_lock);
+                        IMX_TCMP(TIMER_BASE) += evt_diff;
 
-        timer_tick();
-        write_sequnlock(&xtime_lock);
+                } while (unlikely((int32_t)(IMX_TCMP(TIMER_BASE)
+                                        - IMX_TCN(TIMER_BASE)) < 0));
+        }
 
         return IRQ_HANDLED;
 }
@@ -77,9 +61,9 @@ static struct irqaction imx_timer_irq = {
 };
 
 /*
- * Set up timer interrupt, and return the current time in seconds.
+ * Set up timer hardware into expected mode and state.
  */
-static void __init imx_timer_init(void)
+static void __init imx_timer_hardware_init(void)
 {
         /*
          * Initialise to a known state (all timers off, and timing reset)
@@ -87,7 +71,38 @@ static void __init imx_timer_init(void)
         IMX_TCTL(TIMER_BASE) = 0;
         IMX_TPRER(TIMER_BASE) = 0;
         IMX_TCMP(TIMER_BASE) = LATCH - 1;
-        IMX_TCTL(TIMER_BASE) = TCTL_CLK_32 | TCTL_IRQEN | TCTL_TEN;
+
+        IMX_TCTL(TIMER_BASE) = TCTL_FRR | TCTL_CLK_PCLK1 | TCTL_IRQEN | TCTL_TEN;
+        evt_diff = LATCH;
+}
+
+cycle_t imx_get_cycles(void)
+{
+        return IMX_TCN(TIMER_BASE);
+}
+
+static struct clocksource clocksource_imx = {
+        .name           = "imx_timer1",
+        .rating         = 200,
+        .read           = imx_get_cycles,
+        .mask           = 0xFFFFFFFF,
+        .shift          = 20,
+        .is_continuous  = 1,
+};
+
+static int __init imx_clocksource_init(void)
+{
+        clocksource_imx.mult =
+                clocksource_hz2mult(imx_get_perclk1(), clocksource_imx.shift);
+        clocksource_register(&clocksource_imx);
+
+        return 0;
+}
+
+static void __init imx_timer_init(void)
+{
+        imx_timer_hardware_init();
+        imx_clocksource_init();
 
         /*
          * Make irqs happen for the system timer
@@ -97,5 +112,4 @@ static void __init imx_timer_init(void)
 
 struct sys_timer imx_timer = {
         .init           = imx_timer_init,
-        .offset         = imx_gettimeoffset,
 };
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 191c57a3b997..72280754354d 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -183,7 +183,7 @@ static void __init ap_init_irq(void)
         for (i = 0; i < NR_IRQS; i++) {
                 if (((1 << i) & INTEGRATOR_SC_VALID_INT) != 0) {
                         set_irq_chip(i, &sc_chip);
-                        set_irq_handler(i, do_level_IRQ);
+                        set_irq_handler(i, handle_level_irq);
                         set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
                 }
         }
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 771b65bffe69..913f64b22405 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -202,7 +202,7 @@ static struct irq_chip sic_chip = {
 };
 
 static void
-sic_handle_irq(unsigned int irq, struct irqdesc *desc)
+sic_handle_irq(unsigned int irq, struct irq_desc *desc)
 {
         unsigned long status = sic_readl(INTCP_VA_SIC_BASE + IRQ_STATUS);
 
@@ -238,7 +238,7 @@ static void __init intcp_init_irq(void)
                 if (i == 29)
                         break;
                 set_irq_chip(i, &pic_chip);
-                set_irq_handler(i, do_level_IRQ);
+                set_irq_handler(i, handle_level_irq);
                 set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
         }
 
@@ -247,7 +247,7 @@ static void __init intcp_init_irq(void)
 
         for (i = IRQ_CIC_START; i <= IRQ_CIC_END; i++) {
                 set_irq_chip(i, &cic_chip);
-                set_irq_handler(i, do_level_IRQ);
+                set_irq_handler(i, handle_level_irq);
                 set_irq_flags(i, IRQF_VALID);
         }
 
@@ -256,7 +256,7 @@ static void __init intcp_init_irq(void)
 
         for (i = IRQ_SIC_START; i <= IRQ_SIC_END; i++) {
                 set_irq_chip(i, &sic_chip);
-                set_irq_handler(i, do_level_IRQ);
+                set_irq_handler(i, handle_level_irq);
                 set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
         }
 
diff --git a/arch/arm/mach-integrator/platsmp.c b/arch/arm/mach-integrator/platsmp.c
index 1bc8534ef0c6..613b841a10f3 100644
--- a/arch/arm/mach-integrator/platsmp.c
+++ b/arch/arm/mach-integrator/platsmp.c
@@ -18,7 +18,6 @@
 #include <asm/cacheflush.h>
 #include <asm/delay.h>
 #include <asm/mmu_context.h>
-#include <asm/procinfo.h>
 #include <asm/ptrace.h>
 #include <asm/smp.h>
 
diff --git a/arch/arm/mach-iop13xx/Kconfig b/arch/arm/mach-iop13xx/Kconfig
new file mode 100644
index 000000000000..40c2d689f2eb
--- /dev/null
+++ b/arch/arm/mach-iop13xx/Kconfig
@@ -0,0 +1,20 @@
+if ARCH_IOP13XX
+
+menu "IOP13XX Implementation Options"
+
+comment "IOP13XX Platform Support"
+
+config MACH_IQ81340SC
+        bool "Enable IQ81340SC Hardware Support"
+        help
+          Say Y here if you want to support running on the Intel IQ81340SC
+          evaluation kit.
+
+config MACH_IQ81340MC
+        bool "Enable IQ81340MC Hardware Support"
+        help
+          Say Y here if you want to support running on the Intel IQ81340MC
+          evaluation kit.
+
+endmenu
+endif
diff --git a/arch/arm/mach-iop13xx/Makefile b/arch/arm/mach-iop13xx/Makefile
new file mode 100644
index 000000000000..c3d6c08f2d4c
--- /dev/null
+++ b/arch/arm/mach-iop13xx/Makefile
@@ -0,0 +1,12 @@
+obj-y                   :=
+obj-m                   :=
+obj-n                   :=
+obj-                    :=
+
+obj-$(CONFIG_ARCH_IOP13XX) += setup.o
+obj-$(CONFIG_ARCH_IOP13XX) += irq.o
+obj-$(CONFIG_ARCH_IOP13XX) += time.o
+obj-$(CONFIG_ARCH_IOP13XX) += pci.o
+obj-$(CONFIG_ARCH_IOP13XX) += io.o
+obj-$(CONFIG_MACH_IQ81340SC) += iq81340sc.o
+obj-$(CONFIG_MACH_IQ81340MC) += iq81340mc.o
diff --git a/arch/arm/mach-iop13xx/Makefile.boot b/arch/arm/mach-iop13xx/Makefile.boot
new file mode 100644
index 000000000000..0b0e19fdfe6c
--- /dev/null
+++ b/arch/arm/mach-iop13xx/Makefile.boot
@@ -0,0 +1,3 @@
+   zreladdr-y   := 0x00008000
+params_phys-y   := 0x00000100
+initrd_phys-y   := 0x00800000
diff --git a/arch/arm/mach-iop13xx/io.c b/arch/arm/mach-iop13xx/io.c
new file mode 100644
index 000000000000..e79a1b62600f
--- /dev/null
+++ b/arch/arm/mach-iop13xx/io.c
@@ -0,0 +1,112 @@
+/*
+ * iop13xx custom ioremap implementation
+ * Copyright (c) 2005-2006, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307 USA.
+ *
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+
+void * __iomem __iop13xx_io(unsigned long io_addr)
+{
+        void __iomem * io_virt;
+
+        switch (io_addr) {
+        case IOP13XX_PCIE_LOWER_IO_PA ... IOP13XX_PCIE_UPPER_IO_PA:
+                io_virt = (void *) IOP13XX_PCIE_IO_PHYS_TO_VIRT(io_addr);
+                break;
+        case IOP13XX_PCIX_LOWER_IO_PA ... IOP13XX_PCIX_UPPER_IO_PA:
+                io_virt = (void *) IOP13XX_PCIX_IO_PHYS_TO_VIRT(io_addr);
+                break;
+        default:
+                BUG();
+        }
+
+        return io_virt;
+}
+EXPORT_SYMBOL(__iop13xx_io);
+
+void * __iomem __iop13xx_ioremap(unsigned long cookie, size_t size,
+        unsigned long flags)
+{
+        void __iomem * retval;
+
+        switch (cookie) {
+        case IOP13XX_PCIX_LOWER_MEM_RA ... IOP13XX_PCIX_UPPER_MEM_RA:
+                if (unlikely(!iop13xx_atux_mem_base))
+                        retval = NULL;
+                else
+                        retval = (void *)(iop13xx_atux_mem_base +
+                                 (cookie - IOP13XX_PCIX_LOWER_MEM_RA));
+                break;
+        case IOP13XX_PCIE_LOWER_MEM_RA ... IOP13XX_PCIE_UPPER_MEM_RA:
+                if (unlikely(!iop13xx_atue_mem_base))
+                        retval = NULL;
+                else
+                        retval = (void *)(iop13xx_atue_mem_base +
+                                 (cookie - IOP13XX_PCIE_LOWER_MEM_RA));
+                break;
+        case IOP13XX_PBI_LOWER_MEM_RA ... IOP13XX_PBI_UPPER_MEM_RA:
+                retval = __ioremap(IOP13XX_PBI_LOWER_MEM_PA +
+                                  (cookie - IOP13XX_PBI_LOWER_MEM_RA),
+                                  size, flags);
+                break;
+        case IOP13XX_PCIE_LOWER_IO_PA ... IOP13XX_PCIE_UPPER_IO_PA:
+                retval = (void *) IOP13XX_PCIE_IO_PHYS_TO_VIRT(cookie);
+                break;
+        case IOP13XX_PCIX_LOWER_IO_PA ... IOP13XX_PCIX_UPPER_IO_PA:
+                retval = (void *) IOP13XX_PCIX_IO_PHYS_TO_VIRT(cookie);
+                break;
+        case IOP13XX_PMMR_PHYS_MEM_BASE ... IOP13XX_PMMR_UPPER_MEM_PA:
+                retval = (void *) IOP13XX_PMMR_PHYS_TO_VIRT(cookie);
+                break;
+        default:
+                retval = __ioremap(cookie, size, flags);
+        }
+
+        return retval;
+}
+EXPORT_SYMBOL(__iop13xx_ioremap);
+
+void __iop13xx_iounmap(void __iomem *addr)
+{
+        extern void __iounmap(volatile void __iomem *addr);
+
+        if (iop13xx_atue_mem_base)
+                if (addr >= (void __iomem *) iop13xx_atue_mem_base &&
+                    addr < (void __iomem *) (iop13xx_atue_mem_base +
+                                             iop13xx_atue_mem_size))
+                    goto skip;
+
+        if (iop13xx_atux_mem_base)
+                if (addr >= (void __iomem *) iop13xx_atux_mem_base &&
+                    addr < (void __iomem *) (iop13xx_atux_mem_base +
+                                             iop13xx_atux_mem_size))
+                    goto skip;
+
+        switch ((u32) addr) {
+        case IOP13XX_PCIE_LOWER_IO_VA ... IOP13XX_PCIE_UPPER_IO_VA:
+        case IOP13XX_PCIX_LOWER_IO_VA ... IOP13XX_PCIX_UPPER_IO_VA:
+        case IOP13XX_PMMR_VIRT_MEM_BASE ... IOP13XX_PMMR_UPPER_MEM_VA:
+                goto skip;
+        }
+        __iounmap(addr);
+
+skip:
+        return;
+}
+EXPORT_SYMBOL(__iop13xx_iounmap);
diff --git a/arch/arm/mach-iop13xx/iq81340mc.c b/arch/arm/mach-iop13xx/iq81340mc.c
new file mode 100644
index 000000000000..2a1bbfe9896f
--- /dev/null
+++ b/arch/arm/mach-iop13xx/iq81340mc.c
@@ -0,0 +1,98 @@
+/*
+ * iq81340mc board support
+ * Copyright (c) 2005-2006, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307 USA.
+ *
+ */
+#include <linux/pci.h>
+
+#include <asm/hardware.h>
+#include <asm/irq.h>
+#include <asm/mach/pci.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/arch/pci.h>
+#include <asm/mach/time.h>
+
+extern int init_atu; /* Flag to select which ATU(s) to initialize / disable */
+
+static int __init
+iq81340mc_pcix_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
+{
+        switch (idsel) {
+        case 1:
+                switch (pin) {
+                case 1: return ATUX_INTB;
+                case 2: return ATUX_INTC;
+                case 3: return ATUX_INTD;
+                case 4: return ATUX_INTA;
+                default: return -1;
+                }
+        case 2:
+                switch (pin) {
+                case 1: return ATUX_INTC;
+                case 2: return ATUX_INTD;
+                case 3: return ATUX_INTC;
+                case 4: return ATUX_INTD;
+                default: return -1;
+                }
+        default: return -1;
+        }
+}
+
+static struct hw_pci iq81340mc_pci __initdata = {
+        .swizzle        = pci_std_swizzle,
+        .nr_controllers = 0,
+        .setup          = iop13xx_pci_setup,
+        .map_irq        = iq81340mc_pcix_map_irq,
+        .scan           = iop13xx_scan_bus,
+        .preinit        = iop13xx_pci_init,
+};
+
+static int __init iq81340mc_pci_init(void)
+{
+        iop13xx_atu_select(&iq81340mc_pci);
+        pci_common_init(&iq81340mc_pci);
+        iop13xx_map_pci_memory();
+
+        return 0;
+}
+
+static void __init iq81340mc_init(void)
+{
+        iop13xx_platform_init();
+        iq81340mc_pci_init();
+}
+
+static void __init iq81340mc_timer_init(void)
+{
+        iop13xx_init_time(400000000);
+}
+
+static struct sys_timer iq81340mc_timer = {
+       .init       = iq81340mc_timer_init,
+       .offset     = iop13xx_gettimeoffset,
+};
+
+MACHINE_START(IQ81340MC, "Intel IQ81340MC")
+        /* Maintainer: Dan Williams <dan.j.williams@intel.com> */
+        .phys_io        = IOP13XX_PMMR_PHYS_MEM_BASE,
+        .io_pg_offst    = (IOP13XX_PMMR_VIRT_MEM_BASE >> 18) & 0xfffc,
+        .boot_params    = 0x00000100,
+        .map_io         = iop13xx_map_io,
+        .init_irq       = iop13xx_init_irq,
+        .timer          = &iq81340mc_timer,
+        .init_machine   = iq81340mc_init,
+MACHINE_END
diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c
new file mode 100644
index 000000000000..5ad2b62c9bfd
--- /dev/null
+++ b/arch/arm/mach-iop13xx/iq81340sc.c
@@ -0,0 +1,100 @@
+/*
+ * iq81340sc board support
+ * Copyright (c) 2005-2006, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307 USA.
+ *
+ */
+#include <linux/pci.h>
+
+#include <asm/hardware.h>
+#include <asm/irq.h>
+#include <asm/mach/pci.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/arch/pci.h>
+#include <asm/mach/time.h>
+
+extern int init_atu;
+
+static int __init
+iq81340sc_atux_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
+{
+        WARN_ON(idsel < 1 || idsel > 2);
+
+        switch (idsel) {
+        case 1:
+                switch (pin) {
+                case 1: return ATUX_INTB;
+                case 2: return ATUX_INTC;
+                case 3: return ATUX_INTD;
+                case 4: return ATUX_INTA;
+                default: return -1;
+                }
+        case 2:
+                switch (pin) {
+                case 1: return ATUX_INTC;
+                case 2: return ATUX_INTC;
+                case 3: return ATUX_INTC;
+                case 4: return ATUX_INTC;
+                default: return -1;
+                }
+        default: return -1;
+        }
+}
+
+static struct hw_pci iq81340sc_pci __initdata = {
+        .swizzle        = pci_std_swizzle,
+        .nr_controllers = 0,
+        .setup          = iop13xx_pci_setup,
+        .scan           = iop13xx_scan_bus,
+        .map_irq        = iq81340sc_atux_map_irq,
+        .preinit        = iop13xx_pci_init
+};
+
+static int __init iq81340sc_pci_init(void)
+{
+        iop13xx_atu_select(&iq81340sc_pci);
+        pci_common_init(&iq81340sc_pci);
+        iop13xx_map_pci_memory();
+
+        return 0;
+}
+
+static void __init iq81340sc_init(void)
+{
+        iop13xx_platform_init();
+        iq81340sc_pci_init();
+}
+
+static void __init iq81340sc_timer_init(void)
+{
+        iop13xx_init_time(400000000);
+}
+
+static struct sys_timer iq81340sc_timer = {
+       .init       = iq81340sc_timer_init,
+       .offset     = iop13xx_gettimeoffset,
+};
+
+MACHINE_START(IQ81340SC, "Intel IQ81340SC")
+        /* Maintainer: Dan Williams <dan.j.williams@intel.com> */
+        .phys_io        = IOP13XX_PMMR_PHYS_MEM_BASE,
+        .io_pg_offst    = (IOP13XX_PMMR_VIRT_MEM_BASE >> 18) & 0xfffc,
+        .boot_params    = 0x00000100,
+        .map_io         = iop13xx_map_io,
+        .init_irq       = iop13xx_init_irq,
+        .timer          = &iq81340sc_timer,
+        .init_machine   = iq81340sc_init,
+MACHINE_END
diff --git a/arch/arm/mach-iop13xx/irq.c b/arch/arm/mach-iop13xx/irq.c
new file mode 100644
index 000000000000..dbbc07c38b14
--- /dev/null
+++ b/arch/arm/mach-iop13xx/irq.c
@@ -0,0 +1,290 @@
+/*
+ * iop13xx IRQ handling / support functions
+ * Copyright (c) 2005-2006, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307 USA.
+ *
+ */
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/sysctl.h>
+#include <asm/uaccess.h>
+#include <asm/mach/irq.h>
+#include <asm/irq.h>
+#include <asm/hardware.h>
+#include <asm/mach-types.h>
+#include <asm/arch/irqs.h>
+
+/* INTCTL0 CP6 R0 Page 4
+ */
+static inline u32 read_intctl_0(void)
+{
+        u32 val;
+        asm volatile("mrc p6, 0, %0, c0, c4, 0":"=r" (val));
+        return val;
+}
+static inline void write_intctl_0(u32 val)
+{
+        asm volatile("mcr p6, 0, %0, c0, c4, 0"::"r" (val));
+}
+
+/* INTCTL1 CP6 R1 Page 4
+ */
+static inline u32 read_intctl_1(void)
+{
+        u32 val;
+        asm volatile("mrc p6, 0, %0, c1, c4, 0":"=r" (val));
+        return val;
+}
+static inline void write_intctl_1(u32 val)
+{
+        asm volatile("mcr p6, 0, %0, c1, c4, 0"::"r" (val));
+}
+
+/* INTCTL2 CP6 R2 Page 4
+ */
+static inline u32 read_intctl_2(void)
+{
+        u32 val;
+        asm volatile("mrc p6, 0, %0, c2, c4, 0":"=r" (val));
+        return val;
+}
+static inline void write_intctl_2(u32 val)
+{
+        asm volatile("mcr p6, 0, %0, c2, c4, 0"::"r" (val));
+}
+
+/* INTCTL3 CP6 R3 Page 4
+ */
+static inline u32 read_intctl_3(void)
+{
+        u32 val;
+        asm volatile("mrc p6, 0, %0, c3, c4, 0":"=r" (val));
+        return val;
+}
+static inline void write_intctl_3(u32 val)
+{
+        asm volatile("mcr p6, 0, %0, c3, c4, 0"::"r" (val));
+}
+
+/* INTSTR0 CP6 R0 Page 5
+ */
+static inline u32 read_intstr_0(void)
+{
+        u32 val;
+        asm volatile("mrc p6, 0, %0, c0, c5, 0":"=r" (val));
+        return val;
+}
+static inline void write_intstr_0(u32 val)
+{
+        asm volatile("mcr p6, 0, %0, c0, c5, 0"::"r" (val));
+}
+
+/* INTSTR1 CP6 R1 Page 5
+ */
+static inline u32 read_intstr_1(void)
+{
+        u32 val;
+        asm volatile("mrc p6, 0, %0, c1, c5, 0":"=r" (val));
+        return val;
+}
+static void write_intstr_1(u32 val)
+{
+        asm volatile("mcr p6, 0, %0, c1, c5, 0"::"r" (val));
+}
+
+/* INTSTR2 CP6 R2 Page 5
+ */
+static inline u32 read_intstr_2(void)
+{
+        u32 val;
+        asm volatile("mrc p6, 0, %0, c2, c5, 0":"=r" (val));
+        return val;
+}
+static void write_intstr_2(u32 val)
+{
+        asm volatile("mcr p6, 0, %0, c2, c5, 0"::"r" (val));
+}
+
+/* INTSTR3 CP6 R3 Page 5
+ */
+static inline u32 read_intstr_3(void)
+{
+        u32 val;
+        asm volatile("mrc p6, 0, %0, c3, c5, 0":"=r" (val));
+        return val;
+}
+static void write_intstr_3(u32 val)
+{
+        asm volatile("mcr p6, 0, %0, c3, c5, 0"::"r" (val));
+}
+
+/* INTBASE CP6 R0 Page 2
+ */
+static inline u32 read_intbase(void)
+{
+        u32 val;
+        asm volatile("mrc p6, 0, %0, c0, c2, 0":"=r" (val));
+        return val;
+}
+static void write_intbase(u32 val)
+{
+        asm volatile("mcr p6, 0, %0, c0, c2, 0"::"r" (val));
+}
+
+/* INTSIZE CP6 R2 Page 2
+ */
+static inline u32 read_intsize(void)
+{
+        u32 val;
+        asm volatile("mrc p6, 0, %0, c2, c2, 0":"=r" (val));
+        return val;
+}
+static void write_intsize(u32 val)
+{
+        asm volatile("mcr p6, 0, %0, c2, c2, 0"::"r" (val));
+}
+
+/* 0 = Interrupt Masked and 1 = Interrupt not masked */
+static void
+iop13xx_irq_mask0 (unsigned int irq)
+{
+        u32 cp_flags = iop13xx_cp6_save();
+        write_intctl_0(read_intctl_0() & ~(1 << (irq - 0)));
+        iop13xx_cp6_restore(cp_flags);
+}
+
+static void
+iop13xx_irq_mask1 (unsigned int irq)
+{
+        u32 cp_flags = iop13xx_cp6_save();
+        write_intctl_1(read_intctl_1() & ~(1 << (irq - 32)));
+        iop13xx_cp6_restore(cp_flags);
+}
+
+static void
+iop13xx_irq_mask2 (unsigned int irq)
+{
+        u32 cp_flags = iop13xx_cp6_save();
+        write_intctl_2(read_intctl_2() & ~(1 << (irq - 64)));
+        iop13xx_cp6_restore(cp_flags);
+}
+
+static void
+iop13xx_irq_mask3 (unsigned int irq)
+{
+        u32 cp_flags = iop13xx_cp6_save();
+        write_intctl_3(read_intctl_3() & ~(1 << (irq - 96)));
+        iop13xx_cp6_restore(cp_flags);
+}
+
+static void
+iop13xx_irq_unmask0(unsigned int irq)
+{
+        u32 cp_flags = iop13xx_cp6_save();
+        write_intctl_0(read_intctl_0() | (1 << (irq - 0)));
+        iop13xx_cp6_restore(cp_flags);
+}
+
+static void
+iop13xx_irq_unmask1(unsigned int irq)
+{
+        u32 cp_flags = iop13xx_cp6_save();
+        write_intctl_1(read_intctl_1() | (1 << (irq - 32)));
+        iop13xx_cp6_restore(cp_flags);
+}
+
+static void
+iop13xx_irq_unmask2(unsigned int irq)
+{
+        u32 cp_flags = iop13xx_cp6_save();
+        write_intctl_2(read_intctl_2() | (1 << (irq - 64)));
+        iop13xx_cp6_restore(cp_flags);
+}
+
+static void
+iop13xx_irq_unmask3(unsigned int irq)
+{
+        u32 cp_flags = iop13xx_cp6_save();
+        write_intctl_3(read_intctl_3() | (1 << (irq - 96)));
+        iop13xx_cp6_restore(cp_flags);
+}
+
+static struct irq_chip iop13xx_irqchip1 = {
+        .name   = "IOP13xx-1",
+        .ack    = iop13xx_irq_mask0,
+        .mask   = iop13xx_irq_mask0,
+        .unmask = iop13xx_irq_unmask0,
+};
+
+static struct irq_chip iop13xx_irqchip2 = {
+        .name   = "IOP13xx-2",
+        .ack    = iop13xx_irq_mask1,
+        .mask   = iop13xx_irq_mask1,
+        .unmask = iop13xx_irq_unmask1,
+};
+
+static struct irq_chip iop13xx_irqchip3 = {
+        .name   = "IOP13xx-3",
+        .ack    = iop13xx_irq_mask2,
+        .mask   = iop13xx_irq_mask2,
+        .unmask = iop13xx_irq_unmask2,
+};
+
+static struct irq_chip iop13xx_irqchip4 = {
+        .name   = "IOP13xx-4",
+        .ack    = iop13xx_irq_mask3,
+        .mask   = iop13xx_irq_mask3,
+        .unmask = iop13xx_irq_unmask3,
+};
+
+void __init iop13xx_init_irq(void)
+{
+        unsigned int i;
+
+        u32 cp_flags = iop13xx_cp6_save();
+
+        /* disable all interrupts */
+        write_intctl_0(0);
+        write_intctl_1(0);
+        write_intctl_2(0);
+        write_intctl_3(0);
+
+        /* treat all as IRQ */
+        write_intstr_0(0);
+        write_intstr_1(0);
+        write_intstr_2(0);
+        write_intstr_3(0);
+
+        /* initialize the interrupt vector generator */
+        write_intbase(INTBASE);
+        write_intsize(INTSIZE_4);
+
+        for(i = 0; i < NR_IOP13XX_IRQS; i++) {
+                if (i < 32)
+                        set_irq_chip(i, &iop13xx_irqchip1);
+                else if (i < 64)
+                        set_irq_chip(i, &iop13xx_irqchip2);
+                else if (i < 96)
+                        set_irq_chip(i, &iop13xx_irqchip3);
+                else
+                        set_irq_chip(i, &iop13xx_irqchip4);
+
+                set_irq_handler(i, handle_level_irq);
+                set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
+        }
+
+        iop13xx_cp6_restore(cp_flags);
+}
diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c
new file mode 100644
index 000000000000..89ec70ea3187
--- /dev/null
+++ b/arch/arm/mach-iop13xx/pci.c
@@ -0,0 +1,1113 @@
+/*
+ * iop13xx PCI support
+ * Copyright (c) 2005-2006, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307 USA.
+ *
+ */
+
+#include <linux/pci.h>
+#include <linux/delay.h>
+
+#include <asm/irq.h>
+#include <asm/hardware.h>
+#include <asm/sizes.h>
+#include <asm/mach/pci.h>
+#include <asm/arch/pci.h>
+
+#define IOP13XX_PCI_DEBUG 0
+#define PRINTK(x...) ((void)(IOP13XX_PCI_DEBUG && printk(x)))
+
+u32 iop13xx_atux_pmmr_offset; /* This offset can change based on strapping */
+u32 iop13xx_atue_pmmr_offset; /* This offset can change based on strapping */
+static struct pci_bus *pci_bus_atux = 0;
+static struct pci_bus *pci_bus_atue = 0;
+u32 iop13xx_atue_mem_base;
+u32 iop13xx_atux_mem_base;
+size_t iop13xx_atue_mem_size;
+size_t iop13xx_atux_mem_size;
+unsigned long iop13xx_pcibios_min_io = 0;
+unsigned long iop13xx_pcibios_min_mem = 0;
+
+EXPORT_SYMBOL(iop13xx_atue_mem_base);
+EXPORT_SYMBOL(iop13xx_atux_mem_base);
+EXPORT_SYMBOL(iop13xx_atue_mem_size);
+EXPORT_SYMBOL(iop13xx_atux_mem_size);
+
+int init_atu = 0; /* Flag to select which ATU(s) to initialize / disable */
+static unsigned long atux_trhfa_timeout = 0; /* Trhfa = RST# high to first
+                                                 access */
+
+/* Scan the initialized busses and ioremap the requested memory range
+ */
+void iop13xx_map_pci_memory(void)
+{
+        int atu;
+        struct pci_bus *bus;
+        struct pci_dev *dev;
+        resource_size_t end = 0;
+
+        for (atu = 0; atu < 2; atu++) {
+                bus = atu ? pci_bus_atue : pci_bus_atux;
+                if (bus) {
+                        list_for_each_entry(dev, &bus->devices, bus_list) {
+                                int i;
+                                int max = 7;
+
+                                if (dev->subordinate)
+                                        max = DEVICE_COUNT_RESOURCE;
+
+                                for (i = 0; i < max; i++) {
+                                        struct resource *res = &dev->resource[i];
+                                        if (res->flags & IORESOURCE_MEM)
+                                                end = max(res->end, end);
+                                }
+                        }
+
+                        switch(atu) {
+                        case 0:
+                                iop13xx_atux_mem_size =
+                                        (end - IOP13XX_PCIX_LOWER_MEM_RA) + 1;
+
+                                /* 16MB align the request */
+                                if (iop13xx_atux_mem_size & (SZ_16M - 1)) {
+                                        iop13xx_atux_mem_size &= ~(SZ_16M - 1);
+                                        iop13xx_atux_mem_size += SZ_16M;
+                                }
+
+                                if (end) {
+                                        iop13xx_atux_mem_base =
+                                        (u32) __ioremap_pfn(
+                                        __phys_to_pfn(IOP13XX_PCIX_LOWER_MEM_PA)
+                                        , 0, iop13xx_atux_mem_size, 0);
+                                        if (!iop13xx_atux_mem_base) {
+                                                printk("%s: atux allocation "
+                                                       "failed\n", __FUNCTION__);
+                                                BUG();
+                                        }
+                                } else
+                                        iop13xx_atux_mem_size = 0;
+                                PRINTK("%s: atu: %d bus_size: %d mem_base: %x\n",
+                                __FUNCTION__, atu, iop13xx_atux_mem_size,
+                                iop13xx_atux_mem_base);
+                                break;
+                        case 1:
+                                iop13xx_atue_mem_size =
+                                        (end - IOP13XX_PCIE_LOWER_MEM_RA) + 1;
+
+                                /* 16MB align the request */
+                                if (iop13xx_atue_mem_size & (SZ_16M - 1)) {
+                                        iop13xx_atue_mem_size &= ~(SZ_16M - 1);
+                                        iop13xx_atue_mem_size += SZ_16M;
+                                }
+
+                                if (end) {
+                                        iop13xx_atue_mem_base =
+                                        (u32) __ioremap_pfn(
+                                        __phys_to_pfn(IOP13XX_PCIE_LOWER_MEM_PA)
+                                        , 0, iop13xx_atue_mem_size, 0);
+                                        if (!iop13xx_atue_mem_base) {
+                                                printk("%s: atue allocation "
+                                                       "failed\n", __FUNCTION__);
+                                                BUG();
+                                        }
+                                } else
+                                        iop13xx_atue_mem_size = 0;
+                                PRINTK("%s: atu: %d bus_size: %d mem_base: %x\n",
+                                __FUNCTION__, atu, iop13xx_atue_mem_size,
+                                iop13xx_atue_mem_base);
+                                break;
+                        }
+
+                        printk("%s: Initialized (%uM @ resource/virtual: %08lx/%08x)\n",
+                        atu ? "ATUE" : "ATUX",
+                        (atu ? iop13xx_atue_mem_size : iop13xx_atux_mem_size) /
+                        SZ_1M,
+                        atu ? IOP13XX_PCIE_LOWER_MEM_RA :
+                        IOP13XX_PCIX_LOWER_MEM_RA,
+                        atu ? iop13xx_atue_mem_base :
+                        iop13xx_atux_mem_base);
+                        end = 0;
+                }
+
+        }
+}
+
+static inline int iop13xx_atu_function(int atu)
+{
+        int func = 0;
+        /* the function number depends on the value of the
+         * IOP13XX_INTERFACE_SEL_PCIX reset strap
+         * see C-Spec section 3.17
+         */
+        switch(atu) {
+        case IOP13XX_INIT_ATU_ATUX:
+                if (__raw_readl(IOP13XX_ESSR0) & IOP13XX_INTERFACE_SEL_PCIX)
+                        func = 5;
+                else
+                        func = 0;
+                break;
+        case IOP13XX_INIT_ATU_ATUE:
+                if (__raw_readl(IOP13XX_ESSR0) & IOP13XX_INTERFACE_SEL_PCIX)
+                        func = 0;
+                else
+                        func = 5;
+                break;
+        default:
+                BUG();
+        }
+
+        return func;
+}
+
+/* iop13xx_atux_cfg_address - format a configuration address for atux
+ * @bus: Target bus to access
+ * @devfn: Combined device number and function number
+ * @where: Desired register's address offset
+ *
+ * Convert the parameters to a configuration address formatted
+ * according the PCI-X 2.0 specification
+ */
+static u32 iop13xx_atux_cfg_address(struct pci_bus *bus, int devfn, int where)
+{
+        struct pci_sys_data *sys = bus->sysdata;
+        u32 addr;
+
+        if (sys->busnr == bus->number)
+                addr = 1 << (PCI_SLOT(devfn) + 16) | (PCI_SLOT(devfn) << 11);
+        else
+                addr = bus->number << 16 | PCI_SLOT(devfn) << 11 | 1;
+
+        addr |= PCI_FUNC(devfn) << 8 | ((where & 0xff) & ~3);
+        addr |= ((where & 0xf00) >> 8) << 24; /* upper register number */
+
+        return addr;
+}
+
+/* iop13xx_atue_cfg_address - format a configuration address for atue
+ * @bus: Target bus to access
+ * @devfn: Combined device number and function number
+ * @where: Desired register's address offset
+ *
+ * Convert the parameters to an address usable by the ATUE_OCCAR
+ */
+static u32 iop13xx_atue_cfg_address(struct pci_bus *bus, int devfn, int where)
+{
+        struct pci_sys_data *sys = bus->sysdata;
+        u32 addr;
+
+        PRINTK("iop13xx_atue_cfg_address: bus: %d dev: %d func: %d",
+                bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
+        addr = ((u32) bus->number)     << IOP13XX_ATUE_OCCAR_BUS_NUM |
+                   ((u32) PCI_SLOT(devfn)) << IOP13XX_ATUE_OCCAR_DEV_NUM |
+                   ((u32) PCI_FUNC(devfn)) << IOP13XX_ATUE_OCCAR_FUNC_NUM |
+                   (where & ~0x3);
+
+        if (sys->busnr != bus->number)
+                addr |= 1; /* type 1 access */
+
+        return addr;
+}
+
+/* This routine checks the status of the last configuration cycle.  If an error
+ * was detected it returns >0, else it returns a 0.  The errors being checked
+ * are parity, master abort, target abort (master and target).  These types of
+ * errors occure during a config cycle where there is no device, like during
+ * the discovery stage.
+ */
+static int iop13xx_atux_pci_status(int clear)
+{
+        unsigned int status;
+        int err = 0;
+
+        /*
+         * Check the status registers.
+         */
+        status = __raw_readw(IOP13XX_ATUX_ATUSR);
+        if (status & IOP_PCI_STATUS_ERROR)
+        {
+                PRINTK("\t\t\tPCI error: ATUSR %#08x", status);
+                if(clear)
+                        __raw_writew(status & IOP_PCI_STATUS_ERROR,
+                                IOP13XX_ATUX_ATUSR);
+                err = 1;
+        }
+        status = __raw_readl(IOP13XX_ATUX_ATUISR);
+        if (status & IOP13XX_ATUX_ATUISR_ERROR)
+        {
+                PRINTK("\t\t\tPCI error interrupt:  ATUISR %#08x", status);
+                if(clear)
+                        __raw_writel(status & IOP13XX_ATUX_ATUISR_ERROR,
+                                IOP13XX_ATUX_ATUISR);
+                err = 1;
+        }
+        return err;
+}
+
+/* Simply write the address register and read the configuration
+ * data.  Note that the data dependency on %0 encourages an abort
+ * to be detected before we return.
+ */
+static inline u32 iop13xx_atux_read(unsigned long addr)
+{
+        u32 val;
+
+        __asm__ __volatile__(
+                "str    %1, [%2]\n\t"
+                "ldr    %0, [%3]\n\t"
+                "mov    %0, %0\n\t"
+                : "=r" (val)
+                : "r" (addr), "r" (IOP13XX_ATUX_OCCAR), "r" (IOP13XX_ATUX_OCCDR));
+
+        return val;
+}
+
+/* The read routines must check the error status of the last configuration
+ * cycle.  If there was an error, the routine returns all hex f's.
+ */
+static int
+iop13xx_atux_read_config(struct pci_bus *bus, unsigned int devfn, int where,
+                int size, u32 *value)
+{
+        unsigned long addr = iop13xx_atux_cfg_address(bus, devfn, where);
+        u32 val = iop13xx_atux_read(addr) >> ((where & 3) * 8);
+
+        if (iop13xx_atux_pci_status(1) || is_atux_occdr_error()) {
+                __raw_writel(__raw_readl(IOP13XX_XBG_BECSR) & 3,
+                        IOP13XX_XBG_BECSR);
+                val = 0xffffffff;
+        }
+
+        *value = val;
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static int
+iop13xx_atux_write_config(struct pci_bus *bus, unsigned int devfn, int where,
+                int size, u32 value)
+{
+        unsigned long addr = iop13xx_atux_cfg_address(bus, devfn, where);
+        u32 val;
+
+        if (size != 4) {
+                val = iop13xx_atux_read(addr);
+                if (!iop13xx_atux_pci_status(1) == 0)
+                        return PCIBIOS_SUCCESSFUL;
+
+                where = (where & 3) * 8;
+
+                if (size == 1)
+                        val &= ~(0xff << where);
+                else
+                        val &= ~(0xffff << where);
+
+                __raw_writel(val | value << where, IOP13XX_ATUX_OCCDR);
+        } else {
+                __raw_writel(addr, IOP13XX_ATUX_OCCAR);
+                __raw_writel(value, IOP13XX_ATUX_OCCDR);
+        }
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static struct pci_ops iop13xx_atux_ops = {
+        .read   = iop13xx_atux_read_config,
+        .write  = iop13xx_atux_write_config,
+};
+
+/* This routine checks the status of the last configuration cycle.  If an error
+ * was detected it returns >0, else it returns a 0.  The errors being checked
+ * are parity, master abort, target abort (master and target).  These types of
+ * errors occure during a config cycle where there is no device, like during
+ * the discovery stage.
+ */
+static int iop13xx_atue_pci_status(int clear)
+{
+        unsigned int status;
+        int err = 0;
+
+        /*
+         * Check the status registers.
+         */
+
+        /* standard pci status register */
+        status = __raw_readw(IOP13XX_ATUE_ATUSR);
+        if (status & IOP_PCI_STATUS_ERROR) {
+                PRINTK("\t\t\tPCI error: ATUSR %#08x", status);
+                if(clear)
+                        __raw_writew(status & IOP_PCI_STATUS_ERROR,
+                                IOP13XX_ATUE_ATUSR);
+                err++;
+        }
+
+        /* check the normal status bits in the ATUISR */
+        status = __raw_readl(IOP13XX_ATUE_ATUISR);
+        if (status & IOP13XX_ATUE_ATUISR_ERROR) {
+                PRINTK("\t\t\tPCI error: ATUISR %#08x", status);
+                if (clear)
+                        __raw_writew(status & IOP13XX_ATUE_ATUISR_ERROR,
+                                IOP13XX_ATUE_ATUISR);
+                err++;
+
+                /* check the PCI-E status if the ATUISR reports an interface error */
+                if (status & IOP13XX_ATUE_STAT_PCI_IFACE_ERR) {
+                        /* get the unmasked errors */
+                        status = __raw_readl(IOP13XX_ATUE_PIE_STS) &
+                                        ~(__raw_readl(IOP13XX_ATUE_PIE_MSK));
+
+                        if (status) {
+                                PRINTK("\t\t\tPCI-E error: ATUE_PIE_STS %#08x",
+                                        __raw_readl(IOP13XX_ATUE_PIE_STS));
+                                err++;
+                        } else {
+                                PRINTK("\t\t\tPCI-E error: ATUE_PIE_STS %#08x",
+                                        __raw_readl(IOP13XX_ATUE_PIE_STS));
+                                PRINTK("\t\t\tPCI-E error: ATUE_PIE_MSK %#08x",
+                                        __raw_readl(IOP13XX_ATUE_PIE_MSK));
+                                BUG();
+                        }
+
+                        if(clear)
+                                __raw_writel(status, IOP13XX_ATUE_PIE_STS);
+                }
+        }
+
+        return err;
+}
+
+static inline int __init
+iop13xx_pcie_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
+{
+        WARN_ON(idsel != 0);
+
+        switch (pin) {
+        case 1: return ATUE_INTA;
+        case 2: return ATUE_INTB;
+        case 3: return ATUE_INTC;
+        case 4: return ATUE_INTD;
+        default: return -1;
+        }
+}
+
+static inline u32 iop13xx_atue_read(unsigned long addr)
+{
+        u32 val;
+
+        __raw_writel(addr, IOP13XX_ATUE_OCCAR);
+        val = __raw_readl(IOP13XX_ATUE_OCCDR);
+
+        rmb();
+
+        return val;
+}
+
+/* The read routines must check the error status of the last configuration
+ * cycle.  If there was an error, the routine returns all hex f's.
+ */
+static int
+iop13xx_atue_read_config(struct pci_bus *bus, unsigned int devfn, int where,
+                int size, u32 *value)
+{
+        u32 val;
+        unsigned long addr = iop13xx_atue_cfg_address(bus, devfn, where);
+
+        /* Hide device numbers > 0 on the local PCI-E bus (Type 0 access) */
+        if (!PCI_SLOT(devfn) || (addr & 1)) {
+                val = iop13xx_atue_read(addr) >> ((where & 3) * 8);
+                if( iop13xx_atue_pci_status(1) || is_atue_occdr_error() ) {
+                        __raw_writel(__raw_readl(IOP13XX_XBG_BECSR) & 3,
+                                IOP13XX_XBG_BECSR);
+                        val = 0xffffffff;
+                }
+
+                PRINTK("addr=%#0lx, val=%#010x", addr, val);
+        } else
+                val = 0xffffffff;
+
+        *value = val;
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static int
+iop13xx_atue_write_config(struct pci_bus *bus, unsigned int devfn, int where,
+                int size, u32 value)
+{
+        unsigned long addr = iop13xx_atue_cfg_address(bus, devfn, where);
+        u32 val;
+
+        if (size != 4) {
+                val = iop13xx_atue_read(addr);
+                if (!iop13xx_atue_pci_status(1) == 0)
+                        return PCIBIOS_SUCCESSFUL;
+
+                where = (where & 3) * 8;
+
+                if (size == 1)
+                        val &= ~(0xff << where);
+                else
+                        val &= ~(0xffff << where);
+
+                __raw_writel(val | value << where, IOP13XX_ATUE_OCCDR);
+        } else {
+                __raw_writel(addr, IOP13XX_ATUE_OCCAR);
+                __raw_writel(value, IOP13XX_ATUE_OCCDR);
+        }
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static struct pci_ops iop13xx_atue_ops = {
+        .read   = iop13xx_atue_read_config,
+        .write  = iop13xx_atue_write_config,
+};
+
+/* When a PCI device does not exist during config cycles, the XScale gets a
+ * bus error instead of returning 0xffffffff.  We can't rely on the ATU status
+ * bits to tell us that it was indeed a configuration cycle that caused this
+ * error especially in the case when the ATUE link is down.  Instead we rely
+ * on data from the south XSI bridge to validate the abort
+ */
+int
+iop13xx_pci_abort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
+{
+        PRINTK("Data abort: address = 0x%08lx "
+                    "fsr = 0x%03x PC = 0x%08lx LR = 0x%08lx",
+                addr, fsr, regs->ARM_pc, regs->ARM_lr);
+
+        PRINTK("IOP13XX_XBG_BECSR: %#10x", __raw_readl(IOP13XX_XBG_BECSR));
+        PRINTK("IOP13XX_XBG_BERAR: %#10x", __raw_readl(IOP13XX_XBG_BERAR));
+        PRINTK("IOP13XX_XBG_BERUAR: %#10x", __raw_readl(IOP13XX_XBG_BERUAR));
+
+        /*  If it was an imprecise abort, then we need to correct the
+         *  return address to be _after_ the instruction.
+         */
+        if (fsr & (1 << 10))
+                regs->ARM_pc += 4;
+
+        if (is_atue_occdr_error() || is_atux_occdr_error())
+                return 0;
+        else
+                return 1;
+}
+
+/* Scan an IOP13XX PCI bus.  nr selects which ATU we use.
+ */
+struct pci_bus *iop13xx_scan_bus(int nr, struct pci_sys_data *sys)
+{
+        int which_atu;
+        struct pci_bus *bus = NULL;
+
+        switch (init_atu) {
+        case IOP13XX_INIT_ATU_ATUX:
+                which_atu = nr ? 0 : IOP13XX_INIT_ATU_ATUX;
+                break;
+        case IOP13XX_INIT_ATU_ATUE:
+                which_atu = nr ? 0 : IOP13XX_INIT_ATU_ATUE;
+                break;
+        case (IOP13XX_INIT_ATU_ATUX | IOP13XX_INIT_ATU_ATUE):
+                which_atu = nr ? IOP13XX_INIT_ATU_ATUE : IOP13XX_INIT_ATU_ATUX;
+                break;
+        default:
+                which_atu = 0;
+        }
+
+        if (!which_atu) {
+                BUG();
+                return NULL;
+        }
+
+        switch (which_atu) {
+        case IOP13XX_INIT_ATU_ATUX:
+                if (time_after_eq(jiffies + msecs_to_jiffies(1000),
+                                  atux_trhfa_timeout))  /* ensure not wrap */
+                        while(time_before(jiffies, atux_trhfa_timeout))
+                                udelay(100);
+
+                bus = pci_bus_atux = pci_scan_bus(sys->busnr,
+                                                  &iop13xx_atux_ops,
+                                                  sys);
+                break;
+        case IOP13XX_INIT_ATU_ATUE:
+                bus = pci_bus_atue = pci_scan_bus(sys->busnr,
+                                                  &iop13xx_atue_ops,
+                                                  sys);
+                break;
+        }
+
+        return bus;
+}
+
+/* This function is called from iop13xx_pci_init() after assigning valid
+ * values to iop13xx_atue_pmmr_offset.  This is the location for common
+ * setup of ATUE for all IOP13XX implementations.
+ */
+void __init iop13xx_atue_setup(void)
+{
+        int func = iop13xx_atu_function(IOP13XX_INIT_ATU_ATUE);
+        u32 reg_val;
+
+        /* BAR 1 (1:1 mapping with Physical RAM) */
+        /* Set limit and enable */
+        __raw_writel(~(IOP13XX_MAX_RAM_SIZE - PHYS_OFFSET - 1) & ~0x1,
+                        IOP13XX_ATUE_IALR1);
+        __raw_writel(0x0, IOP13XX_ATUE_IAUBAR1);
+
+        /* Set base at the top of the reserved address space */
+        __raw_writel(PHYS_OFFSET | PCI_BASE_ADDRESS_MEM_TYPE_64 |
+                        PCI_BASE_ADDRESS_MEM_PREFETCH, IOP13XX_ATUE_IABAR1);
+
+        /* 1:1 mapping with physical ram
+         * (leave big endian byte swap disabled)
+         */
+         __raw_writel(0x0, IOP13XX_ATUE_IAUTVR1);
+         __raw_writel(PHYS_OFFSET, IOP13XX_ATUE_IATVR1);
+
+        /* Outbound window 1 (PCIX/PCIE memory window) */
+        /* 32 bit Address Space */
+        __raw_writel(0x0, IOP13XX_ATUE_OUMWTVR1);
+        /* PA[35:32] */
+        __raw_writel(IOP13XX_ATUE_OUMBAR_ENABLE |
+                        (IOP13XX_PCIE_MEM_PHYS_OFFSET >> 32),
+                        IOP13XX_ATUE_OUMBAR1);
+
+        /* Setup the I/O Bar
+         * A[35-16] in 31-12
+         */
+        __raw_writel(((IOP13XX_PCIE_LOWER_IO_PA >> 0x4) & 0xfffff000),
+                IOP13XX_ATUE_OIOBAR);
+        __raw_writel(IOP13XX_PCIE_LOWER_IO_BA, IOP13XX_ATUE_OIOWTVR);
+
+        /* clear startup errors */
+        iop13xx_atue_pci_status(1);
+
+        /* OIOBAR function number
+         */
+        reg_val = __raw_readl(IOP13XX_ATUE_OIOBAR);
+        reg_val &= ~0x7;
+        reg_val |= func;
+        __raw_writel(reg_val, IOP13XX_ATUE_OIOBAR);
+
+        /* OUMBAR function numbers
+         */
+        reg_val = __raw_readl(IOP13XX_ATUE_OUMBAR0);
+        reg_val &= ~(IOP13XX_ATU_OUMBAR_FUNC_NUM_MASK <<
+                        IOP13XX_ATU_OUMBAR_FUNC_NUM);
+        reg_val |= func << IOP13XX_ATU_OUMBAR_FUNC_NUM;
+        __raw_writel(reg_val, IOP13XX_ATUE_OUMBAR0);
+
+        reg_val = __raw_readl(IOP13XX_ATUE_OUMBAR1);
+        reg_val &= ~(IOP13XX_ATU_OUMBAR_FUNC_NUM_MASK <<
+                        IOP13XX_ATU_OUMBAR_FUNC_NUM);
+        reg_val |= func << IOP13XX_ATU_OUMBAR_FUNC_NUM;
+        __raw_writel(reg_val, IOP13XX_ATUE_OUMBAR1);
+
+        reg_val = __raw_readl(IOP13XX_ATUE_OUMBAR2);
+        reg_val &= ~(IOP13XX_ATU_OUMBAR_FUNC_NUM_MASK <<
+                        IOP13XX_ATU_OUMBAR_FUNC_NUM);
+        reg_val |= func << IOP13XX_ATU_OUMBAR_FUNC_NUM;
+        __raw_writel(reg_val, IOP13XX_ATUE_OUMBAR2);
+
+        reg_val = __raw_readl(IOP13XX_ATUE_OUMBAR3);
+        reg_val &= ~(IOP13XX_ATU_OUMBAR_FUNC_NUM_MASK <<
+                        IOP13XX_ATU_OUMBAR_FUNC_NUM);
+        reg_val |= func << IOP13XX_ATU_OUMBAR_FUNC_NUM;
+        __raw_writel(reg_val, IOP13XX_ATUE_OUMBAR3);
+
+        /* Enable inbound and outbound cycles
+         */
+        reg_val = __raw_readw(IOP13XX_ATUE_ATUCMD);
+        reg_val |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER |
+                        PCI_COMMAND_PARITY | PCI_COMMAND_SERR;
+        __raw_writew(reg_val, IOP13XX_ATUE_ATUCMD);
+
+        reg_val = __raw_readl(IOP13XX_ATUE_ATUCR);
+        reg_val |= IOP13XX_ATUE_ATUCR_OUT_EN |
+                        IOP13XX_ATUE_ATUCR_IVM;
+        __raw_writel(reg_val, IOP13XX_ATUE_ATUCR);
+}
+
+void __init iop13xx_atue_disable(void)
+{
+        u32 reg_val;
+
+        __raw_writew(0x0, IOP13XX_ATUE_ATUCMD);
+        __raw_writel(IOP13XX_ATUE_ATUCR_IVM, IOP13XX_ATUE_ATUCR);
+
+        /* wait for cycles to quiesce */
+        while (__raw_readl(IOP13XX_ATUE_PCSR) & (IOP13XX_ATUE_PCSR_OUT_Q_BUSY |
+                                             IOP13XX_ATUE_PCSR_IN_Q_BUSY |
+                                             IOP13XX_ATUE_PCSR_LLRB_BUSY))
+                cpu_relax();
+
+        /* BAR 0 ( Disabled ) */
+        __raw_writel(0x0, IOP13XX_ATUE_IAUBAR0);
+        __raw_writel(0x0, IOP13XX_ATUE_IABAR0);
+        __raw_writel(0x0, IOP13XX_ATUE_IAUTVR0);
+        __raw_writel(0x0, IOP13XX_ATUE_IATVR0);
+        __raw_writel(0x0, IOP13XX_ATUE_IALR0);
+        reg_val = __raw_readl(IOP13XX_ATUE_OUMBAR0);
+        reg_val &= ~IOP13XX_ATUE_OUMBAR_ENABLE;
+        __raw_writel(reg_val, IOP13XX_ATUE_OUMBAR0);
+
+        /* BAR 1 ( Disabled ) */
+        __raw_writel(0x0, IOP13XX_ATUE_IAUBAR1);
+        __raw_writel(0x0, IOP13XX_ATUE_IABAR1);
+        __raw_writel(0x0, IOP13XX_ATUE_IAUTVR1);
+        __raw_writel(0x0, IOP13XX_ATUE_IATVR1);
+        __raw_writel(0x0, IOP13XX_ATUE_IALR1);
+        reg_val = __raw_readl(IOP13XX_ATUE_OUMBAR1);
+        reg_val &= ~IOP13XX_ATUE_OUMBAR_ENABLE;
+        __raw_writel(reg_val, IOP13XX_ATUE_OUMBAR1);
+
+        /* BAR 2 ( Disabled ) */
+        __raw_writel(0x0, IOP13XX_ATUE_IAUBAR2);
+        __raw_writel(0x0, IOP13XX_ATUE_IABAR2);
+        __raw_writel(0x0, IOP13XX_ATUE_IAUTVR2);
+        __raw_writel(0x0, IOP13XX_ATUE_IATVR2);
+        __raw_writel(0x0, IOP13XX_ATUE_IALR2);
+        reg_val = __raw_readl(IOP13XX_ATUE_OUMBAR2);
+        reg_val &= ~IOP13XX_ATUE_OUMBAR_ENABLE;
+        __raw_writel(reg_val, IOP13XX_ATUE_OUMBAR2);
+
+        /* BAR 3 ( Disabled ) */
+        reg_val = __raw_readl(IOP13XX_ATUE_OUMBAR3);
+        reg_val &= ~IOP13XX_ATUE_OUMBAR_ENABLE;
+        __raw_writel(reg_val, IOP13XX_ATUE_OUMBAR3);
+
+        /* Setup the I/O Bar
+         * A[35-16] in 31-12
+         */
+        __raw_writel((IOP13XX_PCIE_LOWER_IO_PA >> 0x4) & 0xfffff000,
+                        IOP13XX_ATUE_OIOBAR);
+        __raw_writel(IOP13XX_PCIE_LOWER_IO_BA, IOP13XX_ATUE_OIOWTVR);
+}
+
+/* This function is called from iop13xx_pci_init() after assigning valid
+ * values to iop13xx_atux_pmmr_offset.  This is the location for common
+ * setup of ATUX for all IOP13XX implementations.
+ */
+void __init iop13xx_atux_setup(void)
+{
+        u32 reg_val;
+        int func = iop13xx_atu_function(IOP13XX_INIT_ATU_ATUX);
+
+        /* Take PCI-X bus out of reset if bootloader hasn't already.
+         * According to spec, we should wait for 2^25 PCI clocks to meet
+         * the PCI timing parameter Trhfa (RST# high to first access).
+         * This is rarely necessary and often ignored.
+         */
+        reg_val = __raw_readl(IOP13XX_ATUX_PCSR);
+        if (reg_val & IOP13XX_ATUX_PCSR_P_RSTOUT) {
+                int msec = (reg_val >> IOP13XX_ATUX_PCSR_FREQ_OFFSET) & 0x7;
+                msec = 1000 / (8-msec); /* bits 100=133MHz, 111=>33MHz */
+                __raw_writel(reg_val & ~IOP13XX_ATUX_PCSR_P_RSTOUT,
+                                IOP13XX_ATUX_PCSR);
+                atux_trhfa_timeout = jiffies + msecs_to_jiffies(msec);
+        }
+        else
+                atux_trhfa_timeout = jiffies;
+
+        /* BAR 1 (1:1 mapping with Physical RAM) */
+        /* Set limit and enable */
+        __raw_writel(~(IOP13XX_MAX_RAM_SIZE - PHYS_OFFSET - 1) & ~0x1,
+                        IOP13XX_ATUX_IALR1);
+        __raw_writel(0x0, IOP13XX_ATUX_IAUBAR1);
+
+        /* Set base at the top of the reserved address space */
+        __raw_writel(PHYS_OFFSET | PCI_BASE_ADDRESS_MEM_TYPE_64 |
+                        PCI_BASE_ADDRESS_MEM_PREFETCH, IOP13XX_ATUX_IABAR1);
+
+        /* 1:1 mapping with physical ram
+         * (leave big endian byte swap disabled)
+         */
+        __raw_writel(0x0, IOP13XX_ATUX_IAUTVR1);
+        __raw_writel(PHYS_OFFSET, IOP13XX_ATUX_IATVR1);
+
+        /* Outbound window 1 (PCIX/PCIE memory window) */
+        /* 32 bit Address Space */
+        __raw_writel(0x0, IOP13XX_ATUX_OUMWTVR1);
+        /* PA[35:32] */
+        __raw_writel(IOP13XX_ATUX_OUMBAR_ENABLE |
+                        IOP13XX_PCIX_MEM_PHYS_OFFSET >> 32,
+                        IOP13XX_ATUX_OUMBAR1);
+
+        /* Setup the I/O Bar
+         * A[35-16] in 31-12
+         */
+        __raw_writel((IOP13XX_PCIX_LOWER_IO_PA >> 0x4) & 0xfffff000,
+                IOP13XX_ATUX_OIOBAR);
+        __raw_writel(IOP13XX_PCIX_LOWER_IO_BA, IOP13XX_ATUX_OIOWTVR);
+
+        /* clear startup errors */
+        iop13xx_atux_pci_status(1);
+
+        /* OIOBAR function number
+         */
+        reg_val = __raw_readl(IOP13XX_ATUX_OIOBAR);
+        reg_val &= ~0x7;
+        reg_val |= func;
+        __raw_writel(reg_val, IOP13XX_ATUX_OIOBAR);
+
+        /* OUMBAR function numbers
+         */
+        reg_val = __raw_readl(IOP13XX_ATUX_OUMBAR0);
+        reg_val &= ~(IOP13XX_ATU_OUMBAR_FUNC_NUM_MASK <<
+                        IOP13XX_ATU_OUMBAR_FUNC_NUM);
+        reg_val |= func << IOP13XX_ATU_OUMBAR_FUNC_NUM;
+        __raw_writel(reg_val, IOP13XX_ATUX_OUMBAR0);
+
+        reg_val = __raw_readl(IOP13XX_ATUX_OUMBAR1);
+        reg_val &= ~(IOP13XX_ATU_OUMBAR_FUNC_NUM_MASK <<
+                        IOP13XX_ATU_OUMBAR_FUNC_NUM);
+        reg_val |= func << IOP13XX_ATU_OUMBAR_FUNC_NUM;
+        __raw_writel(reg_val, IOP13XX_ATUX_OUMBAR1);
+
+        reg_val = __raw_readl(IOP13XX_ATUX_OUMBAR2);
+        reg_val &= ~(IOP13XX_ATU_OUMBAR_FUNC_NUM_MASK <<
+                        IOP13XX_ATU_OUMBAR_FUNC_NUM);
+        reg_val |= func << IOP13XX_ATU_OUMBAR_FUNC_NUM;
+        __raw_writel(reg_val, IOP13XX_ATUX_OUMBAR2);
+
+        reg_val = __raw_readl(IOP13XX_ATUX_OUMBAR3);
+        reg_val &= ~(IOP13XX_ATU_OUMBAR_FUNC_NUM_MASK <<
+                        IOP13XX_ATU_OUMBAR_FUNC_NUM);
+        reg_val |= func << IOP13XX_ATU_OUMBAR_FUNC_NUM;
+        __raw_writel(reg_val, IOP13XX_ATUX_OUMBAR3);
+
+        /* Enable inbound and outbound cycles
+         */
+        reg_val = __raw_readw(IOP13XX_ATUX_ATUCMD);
+        reg_val |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER |
+                        PCI_COMMAND_PARITY | PCI_COMMAND_SERR;
+        __raw_writew(reg_val, IOP13XX_ATUX_ATUCMD);
+
+        reg_val = __raw_readl(IOP13XX_ATUX_ATUCR);
+        reg_val |= IOP13XX_ATUX_ATUCR_OUT_EN;
+        __raw_writel(reg_val, IOP13XX_ATUX_ATUCR);
+}
+
+void __init iop13xx_atux_disable(void)
+{
+        u32 reg_val;
+
+        __raw_writew(0x0, IOP13XX_ATUX_ATUCMD);
+        __raw_writel(0x0, IOP13XX_ATUX_ATUCR);
+
+        /* wait for cycles to quiesce */
+        while (__raw_readl(IOP13XX_ATUX_PCSR) & (IOP13XX_ATUX_PCSR_OUT_Q_BUSY |
+                                     IOP13XX_ATUX_PCSR_IN_Q_BUSY))
+                cpu_relax();
+
+        /* BAR 0 ( Disabled ) */
+        __raw_writel(0x0, IOP13XX_ATUX_IAUBAR0);
+        __raw_writel(0x0, IOP13XX_ATUX_IABAR0);
+        __raw_writel(0x0, IOP13XX_ATUX_IAUTVR0);
+        __raw_writel(0x0, IOP13XX_ATUX_IATVR0);
+        __raw_writel(0x0, IOP13XX_ATUX_IALR0);
+        reg_val = __raw_readl(IOP13XX_ATUX_OUMBAR0);
+        reg_val &= ~IOP13XX_ATUX_OUMBAR_ENABLE;
+        __raw_writel(reg_val, IOP13XX_ATUX_OUMBAR0);
+
+        /* BAR 1 ( Disabled ) */
+        __raw_writel(0x0, IOP13XX_ATUX_IAUBAR1);
+        __raw_writel(0x0, IOP13XX_ATUX_IABAR1);
+        __raw_writel(0x0, IOP13XX_ATUX_IAUTVR1);
+        __raw_writel(0x0, IOP13XX_ATUX_IATVR1);
+        __raw_writel(0x0, IOP13XX_ATUX_IALR1);
+        reg_val = __raw_readl(IOP13XX_ATUX_OUMBAR1);
+        reg_val &= ~IOP13XX_ATUX_OUMBAR_ENABLE;
+        __raw_writel(reg_val, IOP13XX_ATUX_OUMBAR1);
+
+        /* BAR 2 ( Disabled ) */
+        __raw_writel(0x0, IOP13XX_ATUX_IAUBAR2);
+        __raw_writel(0x0, IOP13XX_ATUX_IABAR2);
+        __raw_writel(0x0, IOP13XX_ATUX_IAUTVR2);
+        __raw_writel(0x0, IOP13XX_ATUX_IATVR2);
+        __raw_writel(0x0, IOP13XX_ATUX_IALR2);
+        reg_val = __raw_readl(IOP13XX_ATUX_OUMBAR2);
+        reg_val &= ~IOP13XX_ATUX_OUMBAR_ENABLE;
+        __raw_writel(reg_val, IOP13XX_ATUX_OUMBAR2);
+
+        /* BAR 3 ( Disabled ) */
+        __raw_writel(0x0, IOP13XX_ATUX_IAUBAR3);
+        __raw_writel(0x0, IOP13XX_ATUX_IABAR3);
+        __raw_writel(0x0, IOP13XX_ATUX_IAUTVR3);
+        __raw_writel(0x0, IOP13XX_ATUX_IATVR3);
+        __raw_writel(0x0, IOP13XX_ATUX_IALR3);
+        reg_val = __raw_readl(IOP13XX_ATUX_OUMBAR3);
+        reg_val &= ~IOP13XX_ATUX_OUMBAR_ENABLE;
+        __raw_writel(reg_val, IOP13XX_ATUX_OUMBAR3);
+
+        /* Setup the I/O Bar
+        * A[35-16] in 31-12
+        */
+        __raw_writel((IOP13XX_PCIX_LOWER_IO_PA >> 0x4) & 0xfffff000,
+                        IOP13XX_ATUX_OIOBAR);
+        __raw_writel(IOP13XX_PCIX_LOWER_IO_BA, IOP13XX_ATUX_OIOWTVR);
+}
+
+void __init iop13xx_set_atu_mmr_bases(void)
+{
+        /* Based on ESSR0, determine the ATU X/E offsets */
+        switch(__raw_readl(IOP13XX_ESSR0) &
+                (IOP13XX_CONTROLLER_ONLY | IOP13XX_INTERFACE_SEL_PCIX)) {
+        /* both asserted */
+        case 0:
+                iop13xx_atux_pmmr_offset = IOP13XX_ATU1_PMMR_OFFSET;
+                iop13xx_atue_pmmr_offset = IOP13XX_ATU2_PMMR_OFFSET;
+                break;
+        /* IOP13XX_CONTROLLER_ONLY = deasserted
+         * IOP13XX_INTERFACE_SEL_PCIX = asserted
+         */
+        case IOP13XX_CONTROLLER_ONLY:
+                iop13xx_atux_pmmr_offset = IOP13XX_ATU0_PMMR_OFFSET;
+                iop13xx_atue_pmmr_offset = IOP13XX_ATU2_PMMR_OFFSET;
+                break;
+        /* IOP13XX_CONTROLLER_ONLY = asserted
+         * IOP13XX_INTERFACE_SEL_PCIX = deasserted
+         */
+        case IOP13XX_INTERFACE_SEL_PCIX:
+                iop13xx_atux_pmmr_offset = IOP13XX_ATU1_PMMR_OFFSET;
+                iop13xx_atue_pmmr_offset = IOP13XX_ATU2_PMMR_OFFSET;
+                break;
+        /* both deasserted */
+        case IOP13XX_CONTROLLER_ONLY | IOP13XX_INTERFACE_SEL_PCIX:
+                iop13xx_atux_pmmr_offset = IOP13XX_ATU2_PMMR_OFFSET;
+                iop13xx_atue_pmmr_offset = IOP13XX_ATU0_PMMR_OFFSET;
+                break;
+        default:
+                BUG();
+        }
+}
+
+void __init iop13xx_atu_select(struct hw_pci *plat_pci)
+{
+        int i;
+
+        /* set system defaults
+         * note: if "iop13xx_init_atu=" is specified this autodetect
+         * sequence will be bypassed
+         */
+        if (init_atu == IOP13XX_INIT_ATU_DEFAULT) {
+                /* check for single/dual interface */
+                if (__raw_readl(IOP13XX_ESSR0) & IOP13XX_INTERFACE_SEL_PCIX) {
+                        /* ATUE must be present check the device id
+                         * to see if ATUX is present.
+                         */
+                        init_atu |= IOP13XX_INIT_ATU_ATUE;
+                        switch (__raw_readw(IOP13XX_ATUE_DID) & 0xf0) {
+                        case 0x70:
+                        case 0x80:
+                        case 0xc0:
+                                init_atu |= IOP13XX_INIT_ATU_ATUX;
+                                break;
+                        }
+                } else {
+                        /* ATUX must be present check the device id
+                         * to see if ATUE is present.
+                         */
+                        init_atu |= IOP13XX_INIT_ATU_ATUX;
+                        switch (__raw_readw(IOP13XX_ATUX_DID) & 0xf0) {
+                        case 0x70:
+                        case 0x80:
+                        case 0xc0:
+                                init_atu |= IOP13XX_INIT_ATU_ATUE;
+                                break;
+                        }
+                }
+
+                /* check central resource and root complex capability */
+                if (init_atu & IOP13XX_INIT_ATU_ATUX)
+                        if (!(__raw_readl(IOP13XX_ATUX_PCSR) &
+                                IOP13XX_ATUX_PCSR_CENTRAL_RES))
+                                init_atu &= ~IOP13XX_INIT_ATU_ATUX;
+
+                if (init_atu & IOP13XX_INIT_ATU_ATUE)
+                        if (__raw_readl(IOP13XX_ATUE_PCSR) &
+                                IOP13XX_ATUE_PCSR_END_POINT)
+                                init_atu &= ~IOP13XX_INIT_ATU_ATUE;
+        }
+
+        for (i = 0; i < 2; i++) {
+                if((init_atu & (1 << i)) == (1 << i))
+                        plat_pci->nr_controllers++;
+        }
+}
+
+void __init iop13xx_pci_init(void)
+{
+        /* clear pre-existing south bridge errors */
+        __raw_writel(__raw_readl(IOP13XX_XBG_BECSR) & 3, IOP13XX_XBG_BECSR);
+
+        /* Setup the Min Address for PCI memory... */
+        iop13xx_pcibios_min_mem = IOP13XX_PCIX_LOWER_MEM_BA;
+
+        /* if Linux is given control of an ATU
+         * clear out its prior configuration,
+         * otherwise do not touch the registers
+         */
+        if (init_atu & IOP13XX_INIT_ATU_ATUE) {
+                iop13xx_atue_disable();
+                iop13xx_atue_setup();
+        }
+
+        if (init_atu & IOP13XX_INIT_ATU_ATUX) {
+                iop13xx_atux_disable();
+                iop13xx_atux_setup();
+        }
+
+        hook_fault_code(16+6, iop13xx_pci_abort, SIGBUS,
+                        "imprecise external abort");
+}
+
+/* intialize the pci memory space.  handle any combination of
+ * atue and atux enabled/disabled
+ */
+int iop13xx_pci_setup(int nr, struct pci_sys_data *sys)
+{
+        struct resource *res;
+        int which_atu;
+        u32 pcixsr, pcsr;
+
+        if (nr > 1)
+                return 0;
+
+        res = kmalloc(sizeof(struct resource) * 2, GFP_KERNEL);
+        if (!res)
+                panic("PCI: unable to alloc resources");
+
+        memset(res, 0, sizeof(struct resource) * 2);
+
+        /* 'nr' assumptions:
+         * ATUX is always 0
+         * ATUE is 1 when ATUX is also enabled
+         * ATUE is 0 when ATUX is disabled
+         */
+        switch(init_atu) {
+        case IOP13XX_INIT_ATU_ATUX:
+                which_atu = nr ? 0 : IOP13XX_INIT_ATU_ATUX;
+                break;
+        case IOP13XX_INIT_ATU_ATUE:
+                which_atu = nr ? 0 : IOP13XX_INIT_ATU_ATUE;
+                break;
+        case (IOP13XX_INIT_ATU_ATUX | IOP13XX_INIT_ATU_ATUE):
+                which_atu = nr ? IOP13XX_INIT_ATU_ATUE : IOP13XX_INIT_ATU_ATUX;
+                break;
+        default:
+                which_atu = 0;
+        }
+
+        if (!which_atu)
+                return 0;
+
+        switch(which_atu) {
+        case IOP13XX_INIT_ATU_ATUX:
+                pcixsr = __raw_readl(IOP13XX_ATUX_PCIXSR);
+                pcixsr &= ~0xffff;
+                pcixsr |= sys->busnr << IOP13XX_ATUX_PCIXSR_BUS_NUM |
+                          0 << IOP13XX_ATUX_PCIXSR_DEV_NUM |
+                          iop13xx_atu_function(IOP13XX_INIT_ATU_ATUX)
+                                  << IOP13XX_ATUX_PCIXSR_FUNC_NUM;
+                __raw_writel(pcixsr, IOP13XX_ATUX_PCIXSR);
+
+                res[0].start = IOP13XX_PCIX_LOWER_IO_PA;
+                res[0].end   = IOP13XX_PCIX_UPPER_IO_PA;
+                res[0].name  = "IQ81340 ATUX PCI I/O Space";
+                res[0].flags = IORESOURCE_IO;
+
+                res[1].start = IOP13XX_PCIX_LOWER_MEM_RA;
+                res[1].end   = IOP13XX_PCIX_UPPER_MEM_RA;
+                res[1].name  = "IQ81340 ATUX PCI Memory Space";
+                res[1].flags = IORESOURCE_MEM;
+                sys->mem_offset = IOP13XX_PCIX_MEM_OFFSET;
+                sys->io_offset = IOP13XX_PCIX_IO_OFFSET;
+                break;
+        case IOP13XX_INIT_ATU_ATUE:
+                /* Note: the function number field in the PCSR is ro */
+                pcsr = __raw_readl(IOP13XX_ATUE_PCSR);
+                pcsr &= ~(0xfff8 << 16);
+                pcsr |= sys->busnr << IOP13XX_ATUE_PCSR_BUS_NUM |
+                                0 << IOP13XX_ATUE_PCSR_DEV_NUM;
+
+                __raw_writel(pcsr, IOP13XX_ATUE_PCSR);
+
+                res[0].start = IOP13XX_PCIE_LOWER_IO_PA;
+                res[0].end   = IOP13XX_PCIE_UPPER_IO_PA;
+                res[0].name  = "IQ81340 ATUE PCI I/O Space";
+                res[0].flags = IORESOURCE_IO;
+
+                res[1].start = IOP13XX_PCIE_LOWER_MEM_RA;
+                res[1].end   = IOP13XX_PCIE_UPPER_MEM_RA;
+                res[1].name  = "IQ81340 ATUE PCI Memory Space";
+                res[1].flags = IORESOURCE_MEM;
+                sys->mem_offset = IOP13XX_PCIE_MEM_OFFSET;
+                sys->io_offset = IOP13XX_PCIE_IO_OFFSET;
+                sys->map_irq = iop13xx_pcie_map_irq;
+                break;
+        default:
+                return 0;
+        }
+
+        request_resource(&ioport_resource, &res[0]);
+        request_resource(&iomem_resource, &res[1]);
+
+        sys->resource[0] = &res[0];
+        sys->resource[1] = &res[1];
+        sys->resource[2] = NULL;
+
+        return 1;
+}
+
+u16 iop13xx_dev_id(void)
+{
+        if (__raw_readl(IOP13XX_ESSR0) & IOP13XX_INTERFACE_SEL_PCIX)
+                return __raw_readw(IOP13XX_ATUE_DID);
+        else
+                return __raw_readw(IOP13XX_ATUX_DID);
+}
+
+static int __init iop13xx_init_atu_setup(char *str)
+{
+        init_atu = IOP13XX_INIT_ATU_NONE;
+        if (str) {
+                while (*str != '\0') {
+                        switch (*str) {
+                        case 'x':
+                        case 'X':
+                                init_atu |= IOP13XX_INIT_ATU_ATUX;
+                                init_atu &= ~IOP13XX_INIT_ATU_NONE;
+                                break;
+                        case 'e':
+                        case 'E':
+                                init_atu |= IOP13XX_INIT_ATU_ATUE;
+                                init_atu &= ~IOP13XX_INIT_ATU_NONE;
+                                break;
+                        case ',':
+                        case '=':
+                                break;
+                        default:
+                                PRINTK("\"iop13xx_init_atu\" malformed at "
+                                            "character: \'%c\'", *str);
+                                *(str + 1) = '\0';
+                                init_atu = IOP13XX_INIT_ATU_DEFAULT;
+                        }
+                        str++;
+                }
+        }
+        return 1;
+}
+
+__setup("iop13xx_init_atu", iop13xx_init_atu_setup);
diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c
new file mode 100644
index 000000000000..5fbeb28d04bb
--- /dev/null
+++ b/arch/arm/mach-iop13xx/setup.c
@@ -0,0 +1,406 @@
+/*
+ * iop13xx platform Initialization
+ * Copyright (c) 2005-2006, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307 USA.
+ *
+ */
+
+#include <linux/serial_8250.h>
+#ifdef CONFIG_MTD_PHYSMAP
+#include <linux/mtd/physmap.h>
+#endif
+#include <asm/mach/map.h>
+#include <asm/hardware.h>
+#include <asm/irq.h>
+
+#define IOP13XX_UART_XTAL 33334000
+#define IOP13XX_SETUP_DEBUG 0
+#define PRINTK(x...) ((void)(IOP13XX_SETUP_DEBUG && printk(x)))
+
+/* Standard IO mapping for all IOP13XX based systems
+ */
+static struct map_desc iop13xx_std_desc[] __initdata = {
+        {    /* mem mapped registers */
+                .virtual = IOP13XX_PMMR_VIRT_MEM_BASE,
+                .pfn     = __phys_to_pfn(IOP13XX_PMMR_PHYS_MEM_BASE),
+                .length  = IOP13XX_PMMR_SIZE,
+                .type    = MT_DEVICE,
+        }, { /* PCIE IO space */
+                .virtual = IOP13XX_PCIE_LOWER_IO_VA,
+                .pfn     = __phys_to_pfn(IOP13XX_PCIE_LOWER_IO_PA),
+                .length  = IOP13XX_PCIX_IO_WINDOW_SIZE,
+                .type    = MT_DEVICE,
+        }, { /* PCIX IO space */
+                .virtual = IOP13XX_PCIX_LOWER_IO_VA,
+                .pfn     = __phys_to_pfn(IOP13XX_PCIX_LOWER_IO_PA),
+                .length  = IOP13XX_PCIX_IO_WINDOW_SIZE,
+                .type    = MT_DEVICE,
+        },
+};
+
+static struct resource iop13xx_uart0_resources[] = {
+        [0] = {
+                .start = IOP13XX_UART0_PHYS,
+                .end = IOP13XX_UART0_PHYS + 0x3f,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_IOP13XX_UART0,
+                .end = IRQ_IOP13XX_UART0,
+                .flags = IORESOURCE_IRQ
+        }
+};
+
+static struct resource iop13xx_uart1_resources[] = {
+        [0] = {
+                .start = IOP13XX_UART1_PHYS,
+                .end = IOP13XX_UART1_PHYS + 0x3f,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_IOP13XX_UART1,
+                .end = IRQ_IOP13XX_UART1,
+                .flags = IORESOURCE_IRQ
+        }
+};
+
+static struct plat_serial8250_port iop13xx_uart0_data[] = {
+        {
+       .membase     = (char*)(IOP13XX_UART0_VIRT),
+       .mapbase     = (IOP13XX_UART0_PHYS),
+       .irq         = IRQ_IOP13XX_UART0,
+       .uartclk     = IOP13XX_UART_XTAL,
+       .regshift    = 2,
+       .iotype      = UPIO_MEM,
+       .flags       = UPF_SKIP_TEST,
+        },
+        {  },
+};
+
+static struct plat_serial8250_port iop13xx_uart1_data[] = {
+        {
+       .membase     = (char*)(IOP13XX_UART1_VIRT),
+       .mapbase     = (IOP13XX_UART1_PHYS),
+       .irq         = IRQ_IOP13XX_UART1,
+       .uartclk     = IOP13XX_UART_XTAL,
+       .regshift    = 2,
+       .iotype      = UPIO_MEM,
+       .flags       = UPF_SKIP_TEST,
+        },
+        {  },
+};
+
+/* The ids are fixed up later in iop13xx_platform_init */
+static struct platform_device iop13xx_uart0 = {
+       .name = "serial8250",
+       .id = 0,
+       .dev.platform_data = iop13xx_uart0_data,
+       .num_resources = 2,
+       .resource = iop13xx_uart0_resources,
+};
+
+static struct platform_device iop13xx_uart1 = {
+       .name = "serial8250",
+       .id = 0,
+       .dev.platform_data = iop13xx_uart1_data,
+       .num_resources = 2,
+       .resource = iop13xx_uart1_resources
+};
+
+static struct resource iop13xx_i2c_0_resources[] = {
+        [0] = {
+                .start = IOP13XX_I2C0_PHYS,
+                .end = IOP13XX_I2C0_PHYS + 0x18,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_IOP13XX_I2C_0,
+                .end = IRQ_IOP13XX_I2C_0,
+                .flags = IORESOURCE_IRQ
+        }
+};
+
+static struct resource iop13xx_i2c_1_resources[] = {
+        [0] = {
+                .start = IOP13XX_I2C1_PHYS,
+                .end = IOP13XX_I2C1_PHYS + 0x18,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_IOP13XX_I2C_1,
+                .end = IRQ_IOP13XX_I2C_1,
+                .flags = IORESOURCE_IRQ
+        }
+};
+
+static struct resource iop13xx_i2c_2_resources[] = {
+        [0] = {
+                .start = IOP13XX_I2C2_PHYS,
+                .end = IOP13XX_I2C2_PHYS + 0x18,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_IOP13XX_I2C_2,
+                .end = IRQ_IOP13XX_I2C_2,
+                .flags = IORESOURCE_IRQ
+        }
+};
+
+/* I2C controllers. The IOP13XX uses the same block as the IOP3xx, so
+ * we just use the same device name.
+ */
+
+/* The ids are fixed up later in iop13xx_platform_init */
+static struct platform_device iop13xx_i2c_0_controller = {
+        .name = "IOP3xx-I2C",
+        .id = 0,
+        .num_resources = 2,
+        .resource = iop13xx_i2c_0_resources
+};
+
+static struct platform_device iop13xx_i2c_1_controller = {
+        .name = "IOP3xx-I2C",
+        .id = 0,
+        .num_resources = 2,
+        .resource = iop13xx_i2c_1_resources
+};
+
+static struct platform_device iop13xx_i2c_2_controller = {
+        .name = "IOP3xx-I2C",
+        .id = 0,
+        .num_resources = 2,
+        .resource = iop13xx_i2c_2_resources
+};
+
+#ifdef CONFIG_MTD_PHYSMAP
+/* PBI Flash Device
+ */
+static struct physmap_flash_data iq8134x_flash_data = {
+        .width = 2,
+};
+
+static struct resource iq8134x_flash_resource = {
+        .start = IQ81340_FLASHBASE,
+        .end   = 0,
+        .flags = IORESOURCE_MEM,
+};
+
+static struct platform_device iq8134x_flash = {
+        .name           = "physmap-flash",
+        .id             = 0,
+        .dev            = { .platform_data  = &iq8134x_flash_data, },
+        .num_resources  = 1,
+        .resource       = &iq8134x_flash_resource,
+};
+
+static unsigned long iq8134x_probe_flash_size(void)
+{
+        uint8_t __iomem *flash_addr = ioremap(IQ81340_FLASHBASE, PAGE_SIZE);
+        int i;
+        char query[3];
+        unsigned long size = 0;
+        int width = iq8134x_flash_data.width;
+
+        if (flash_addr) {
+                /* send CFI 'query' command */
+                writew(0x98, flash_addr);
+
+                /* check for CFI compliance */
+                for (i = 0; i < 3 * width; i += width)
+                        query[i / width] = readb(flash_addr + (0x10 * width) + i);
+
+                /* read the size */
+                if (memcmp(query, "QRY", 3) == 0)
+                        size = 1 << readb(flash_addr + (0x27 * width));
+
+                /* send CFI 'read array' command */
+                writew(0xff, flash_addr);
+
+                iounmap(flash_addr);
+        }
+
+        return size;
+}
+#endif
+
+void __init iop13xx_map_io(void)
+{
+        /* Initialize the Static Page Table maps */
+        iotable_init(iop13xx_std_desc, ARRAY_SIZE(iop13xx_std_desc));
+}
+
+static int init_uart = 0;
+static int init_i2c = 0;
+
+void __init iop13xx_platform_init(void)
+{
+        int i;
+        u32 uart_idx, i2c_idx, plat_idx;
+        struct platform_device *iop13xx_devices[IQ81340_MAX_PLAT_DEVICES];
+
+        /* set the bases so we can read the device id */
+        iop13xx_set_atu_mmr_bases();
+
+        memset(iop13xx_devices, 0, sizeof(iop13xx_devices));
+
+        if (init_uart == IOP13XX_INIT_UART_DEFAULT) {
+                switch (iop13xx_dev_id()) {
+                /* enable both uarts on iop341 and iop342 */
+                case 0x3380:
+                case 0x3384:
+                case 0x3388:
+                case 0x338c:
+                case 0x3382:
+                case 0x3386:
+                case 0x338a:
+                case 0x338e:
+                        init_uart |= IOP13XX_INIT_UART_0;
+                        init_uart |= IOP13XX_INIT_UART_1;
+                        break;
+                /* only enable uart 1 */
+                default:
+                        init_uart |= IOP13XX_INIT_UART_1;
+                }
+        }
+
+        if (init_i2c == IOP13XX_INIT_I2C_DEFAULT) {
+                switch (iop13xx_dev_id()) {
+                /* enable all i2c units on iop341 and iop342 */
+                case 0x3380:
+                case 0x3384:
+                case 0x3388:
+                case 0x338c:
+                case 0x3382:
+                case 0x3386:
+                case 0x338a:
+                case 0x338e:
+                        init_i2c |= IOP13XX_INIT_I2C_0;
+                        init_i2c |= IOP13XX_INIT_I2C_1;
+                        init_i2c |= IOP13XX_INIT_I2C_2;
+                        break;
+                /* only enable i2c 1 and 2 */
+                default:
+                        init_i2c |= IOP13XX_INIT_I2C_1;
+                        init_i2c |= IOP13XX_INIT_I2C_2;
+                }
+        }
+
+        plat_idx = 0;
+        uart_idx = 0;
+        i2c_idx = 0;
+
+        /* uart 1 (if enabled) is ttyS0 */
+        if (init_uart & IOP13XX_INIT_UART_1) {
+                PRINTK("Adding uart1 to platform device list\n");
+                iop13xx_uart1.id = uart_idx++;
+                iop13xx_devices[plat_idx++] = &iop13xx_uart1;
+        }
+        if (init_uart & IOP13XX_INIT_UART_0) {
+                PRINTK("Adding uart0 to platform device list\n");
+                iop13xx_uart0.id = uart_idx++;
+                iop13xx_devices[plat_idx++] = &iop13xx_uart0;
+        }
+
+        for(i = 0; i < IQ81340_NUM_I2C; i++) {
+                if ((init_i2c & (1 << i)) && IOP13XX_SETUP_DEBUG)
+                        printk("Adding i2c%d to platform device list\n", i);
+                switch(init_i2c & (1 << i)) {
+                case IOP13XX_INIT_I2C_0:
+                        iop13xx_i2c_0_controller.id = i2c_idx++;
+                        iop13xx_devices[plat_idx++] =
+                                &iop13xx_i2c_0_controller;
+                        break;
+                case IOP13XX_INIT_I2C_1:
+                        iop13xx_i2c_1_controller.id = i2c_idx++;
+                        iop13xx_devices[plat_idx++] =
+                                &iop13xx_i2c_1_controller;
+                        break;
+                case IOP13XX_INIT_I2C_2:
+                        iop13xx_i2c_2_controller.id = i2c_idx++;
+                        iop13xx_devices[plat_idx++] =
+                                &iop13xx_i2c_2_controller;
+                        break;
+                }
+        }
+
+#ifdef CONFIG_MTD_PHYSMAP
+        iq8134x_flash_resource.end = iq8134x_flash_resource.start +
+                                iq8134x_probe_flash_size() - 1;
+        if (iq8134x_flash_resource.end > iq8134x_flash_resource.start)
+                iop13xx_devices[plat_idx++] = &iq8134x_flash;
+        else
+                printk(KERN_ERR "%s: Failed to probe flash size\n", __FUNCTION__);
+#endif
+
+        platform_add_devices(iop13xx_devices, plat_idx);
+}
+
+static int __init iop13xx_init_uart_setup(char *str)
+{
+        if (str) {
+                while (*str != '\0') {
+                        switch(*str) {
+                        case '0':
+                                init_uart |= IOP13XX_INIT_UART_0;
+                                break;
+                        case '1':
+                                init_uart |= IOP13XX_INIT_UART_1;
+                                break;
+                        case ',':
+                        case '=':
+                                break;
+                        default:
+                                PRINTK("\"iop13xx_init_uart\" malformed"
+                                            " at character: \'%c\'", *str);
+                                *(str + 1) = '\0';
+                                init_uart = IOP13XX_INIT_UART_DEFAULT;
+                        }
+                        str++;
+                }
+        }
+        return 1;
+}
+
+static int __init iop13xx_init_i2c_setup(char *str)
+{
+        if (str) {
+                while (*str != '\0') {
+                        switch(*str) {
+                        case '0':
+                                init_i2c |= IOP13XX_INIT_I2C_0;
+                                break;
+                        case '1':
+                                init_i2c |= IOP13XX_INIT_I2C_1;
+                                break;
+                        case '2':
+                                init_i2c |= IOP13XX_INIT_I2C_2;
+                                break;
+                        case ',':
+                        case '=':
+                                break;
+                        default:
+                                PRINTK("\"iop13xx_init_i2c\" malformed"
+                                            " at character: \'%c\'", *str);
+                                *(str + 1) = '\0';
+                                init_i2c = IOP13XX_INIT_I2C_DEFAULT;
+                        }
+                        str++;
+                }
+        }
+        return 1;
+}
+
+__setup("iop13xx_init_uart", iop13xx_init_uart_setup);
+__setup("iop13xx_init_i2c", iop13xx_init_i2c_setup);
diff --git a/arch/arm/mach-iop13xx/time.c b/arch/arm/mach-iop13xx/time.c
new file mode 100644
index 000000000000..8b21365f653f
--- /dev/null
+++ b/arch/arm/mach-iop13xx/time.c
@@ -0,0 +1,102 @@
+/*
+ * arch/arm/mach-iop13xx/time.c
+ *
+ * Timer code for IOP13xx (copied from IOP32x/IOP33x implementation)
+ *
+ * Author: Deepak Saxena <dsaxena@mvista.com>
+ *
+ * Copyright 2002-2003 MontaVista Software Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/time.h>
+#include <linux/init.h>
+#include <linux/timex.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/uaccess.h>
+#include <asm/mach/irq.h>
+#include <asm/mach/time.h>
+
+static unsigned long ticks_per_jiffy;
+static unsigned long ticks_per_usec;
+static unsigned long next_jiffy_time;
+
+static inline u32 read_tcr1(void)
+{
+        u32 val;
+        asm volatile("mrc p6, 0, %0, c3, c9, 0" : "=r" (val));
+        return val;
+}
+
+unsigned long iop13xx_gettimeoffset(void)
+{
+        unsigned long offset;
+        u32 cp_flags;
+
+        cp_flags = iop13xx_cp6_save();
+        offset = next_jiffy_time - read_tcr1();
+        iop13xx_cp6_restore(cp_flags);
+
+        return offset / ticks_per_usec;
+}
+
+static irqreturn_t
+iop13xx_timer_interrupt(int irq, void *dev_id)
+{
+        u32 cp_flags = iop13xx_cp6_save();
+
+        write_seqlock(&xtime_lock);
+
+        asm volatile("mcr p6, 0, %0, c6, c9, 0" : : "r" (1));
+
+        while ((signed long)(next_jiffy_time - read_tcr1())
+                                                        >= ticks_per_jiffy) {
+                timer_tick();
+                next_jiffy_time -= ticks_per_jiffy;
+        }
+
+        write_sequnlock(&xtime_lock);
+
+        iop13xx_cp6_restore(cp_flags);
+
+        return IRQ_HANDLED;
+}
+
+static struct irqaction iop13xx_timer_irq = {
+        .name           = "IOP13XX Timer Tick",
+        .handler        = iop13xx_timer_interrupt,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
+};
+
+void __init iop13xx_init_time(unsigned long tick_rate)
+{
+        u32 timer_ctl;
+        u32 cp_flags;
+
+        ticks_per_jiffy = (tick_rate + HZ/2) / HZ;
+        ticks_per_usec = tick_rate / 1000000;
+        next_jiffy_time = 0xffffffff;
+
+        timer_ctl = IOP13XX_TMR_EN | IOP13XX_TMR_PRIVILEGED |
+                        IOP13XX_TMR_RELOAD | IOP13XX_TMR_RATIO_1_1;
+
+        /*
+         * We use timer 0 for our timer interrupt, and timer 1 as
+         * monotonic counter for tracking missed jiffies.
+         */
+        cp_flags = iop13xx_cp6_save();
+        asm volatile("mcr p6, 0, %0, c4, c9, 0" : : "r" (ticks_per_jiffy - 1));
+        asm volatile("mcr p6, 0, %0, c0, c9, 0" : : "r" (timer_ctl));
+        asm volatile("mcr p6, 0, %0, c5, c9, 0" : : "r" (0xffffffff));
+        asm volatile("mcr p6, 0, %0, c1, c9, 0" : : "r" (timer_ctl));
+        iop13xx_cp6_restore(cp_flags);
+
+        setup_irq(IRQ_IOP13XX_TIMER0, &iop13xx_timer_irq);
+}
diff --git a/arch/arm/mach-iop32x/irq.c b/arch/arm/mach-iop32x/irq.c
index 69d6302f40cf..3ec1cd5c4f99 100644
--- a/arch/arm/mach-iop32x/irq.c
+++ b/arch/arm/mach-iop32x/irq.c
@@ -70,7 +70,7 @@ void __init iop32x_init_irq(void)
 
         for (i = 0; i < NR_IRQS; i++) {
                 set_irq_chip(i, &ext_chip);
-                set_irq_handler(i, do_level_IRQ);
+                set_irq_handler(i, handle_level_irq);
                 set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
         }
 }
diff --git a/arch/arm/mach-iop33x/irq.c b/arch/arm/mach-iop33x/irq.c
index 63304b3d0d76..00b37f32d72e 100644
--- a/arch/arm/mach-iop33x/irq.c
+++ b/arch/arm/mach-iop33x/irq.c
@@ -121,7 +121,7 @@ void __init iop33x_init_irq(void)
 
         for (i = 0; i < NR_IRQS; i++) {
                 set_irq_chip(i, (i < 32) ? &iop33x_irqchip1 : &iop33x_irqchip2);
-                set_irq_handler(i, do_level_IRQ);
+                set_irq_handler(i, handle_level_irq);
                 set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
         }
 }
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index 22c98e9dad28..27b7480f4afe 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -308,7 +308,7 @@ EXPORT_SYMBOL(gpio_line_config);
 /*************************************************************************
  * IRQ handling IXP2000
  *************************************************************************/
-static void ixp2000_GPIO_irq_handler(unsigned int irq, struct irqdesc *desc)
+static void ixp2000_GPIO_irq_handler(unsigned int irq, struct irq_desc *desc)
 {                               
         int i;
         unsigned long status = *IXP2000_GPIO_INST;
@@ -373,7 +373,7 @@ static void ixp2000_GPIO_irq_unmask(unsigned int irq)
         ixp2000_reg_write(IXP2000_GPIO_INSR, (1 << (irq - IRQ_IXP2000_GPIO0)));
 }
 
-static struct irqchip ixp2000_GPIO_irq_chip = {
+static struct irq_chip ixp2000_GPIO_irq_chip = {
         .ack            = ixp2000_GPIO_irq_mask_ack,
         .mask           = ixp2000_GPIO_irq_mask,
         .unmask         = ixp2000_GPIO_irq_unmask,
@@ -401,7 +401,7 @@ static void ixp2000_pci_irq_unmask(unsigned int irq)
 /*
  * Error interrupts. These are used extensively by the microengine drivers
  */
-static void ixp2000_err_irq_handler(unsigned int irq, struct irqdesc *desc)
+static void ixp2000_err_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         int i;
         unsigned long status = *IXP2000_IRQ_ERR_STATUS;
@@ -426,13 +426,13 @@ static void ixp2000_err_irq_unmask(unsigned int irq)
                         (1 << (irq - IRQ_IXP2000_DRAM0_MIN_ERR)));
 }
 
-static struct irqchip ixp2000_err_irq_chip = {
+static struct irq_chip ixp2000_err_irq_chip = {
         .ack    = ixp2000_err_irq_mask,
         .mask   = ixp2000_err_irq_mask,
         .unmask = ixp2000_err_irq_unmask
 };
 
-static struct irqchip ixp2000_pci_irq_chip = {
+static struct irq_chip ixp2000_pci_irq_chip = {
         .ack    = ixp2000_pci_irq_mask,
         .mask   = ixp2000_pci_irq_mask,
         .unmask = ixp2000_pci_irq_unmask
@@ -448,7 +448,7 @@ static void ixp2000_irq_unmask(unsigned int irq)
         ixp2000_reg_write(IXP2000_IRQ_ENABLE_SET, (1 << irq));
 }
 
-static struct irqchip ixp2000_irq_chip = {
+static struct irq_chip ixp2000_irq_chip = {
         .ack    = ixp2000_irq_mask,
         .mask   = ixp2000_irq_mask,
         .unmask = ixp2000_irq_unmask
@@ -484,7 +484,7 @@ void __init ixp2000_init_irq(void)
         for (irq = IRQ_IXP2000_SOFT_INT; irq <= IRQ_IXP2000_THDB3; irq++) {
                 if ((1 << irq) & IXP2000_VALID_IRQ_MASK) {
                         set_irq_chip(irq, &ixp2000_irq_chip);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, IRQF_VALID);
                 } else set_irq_flags(irq, 0);
         }
@@ -493,7 +493,7 @@ void __init ixp2000_init_irq(void)
                 if((1 << (irq - IRQ_IXP2000_DRAM0_MIN_ERR)) &
                                 IXP2000_VALID_ERR_IRQ_MASK) {
                         set_irq_chip(irq, &ixp2000_err_irq_chip);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, IRQF_VALID);
                 }
                 else
@@ -503,7 +503,7 @@ void __init ixp2000_init_irq(void)
 
         for (irq = IRQ_IXP2000_GPIO0; irq <= IRQ_IXP2000_GPIO7; irq++) {
                 set_irq_chip(irq, &ixp2000_GPIO_irq_chip);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID);
         }
         set_irq_chained_handler(IRQ_IXP2000_GPIO, ixp2000_GPIO_irq_handler);
@@ -516,7 +516,7 @@ void __init ixp2000_init_irq(void)
         ixp2000_reg_write(IXP2000_IRQ_ENABLE_SET, (1 << IRQ_IXP2000_PCI));
         for (irq = IRQ_IXP2000_PCIA; irq <= IRQ_IXP2000_PCIB; irq++) {
                 set_irq_chip(irq, &ixp2000_pci_irq_chip);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID);
         }
 }
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c
index aa2655092d2d..52b368b34346 100644
--- a/arch/arm/mach-ixp2000/ixdp2x00.c
+++ b/arch/arm/mach-ixp2000/ixdp2x00.c
@@ -106,7 +106,7 @@ static void ixdp2x00_irq_unmask(unsigned int irq)
                 ixp2000_release_slowport(&old_cfg);
 }
 
-static void ixdp2x00_irq_handler(unsigned int irq, struct irqdesc *desc)
+static void ixdp2x00_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         volatile u32 ex_interrupt = 0;
         static struct slowport_cfg old_cfg;
@@ -129,7 +129,7 @@ static void ixdp2x00_irq_handler(unsigned int irq, struct irqdesc *desc)
 
         for(i = 0; i < board_irq_count; i++) {
                 if(ex_interrupt & (1 << i))  {
-                        struct irqdesc *cpld_desc;
+                        struct irq_desc *cpld_desc;
                         int cpld_irq = IXP2000_BOARD_IRQ(0) + i;
                         cpld_desc = irq_desc + cpld_irq;
                         desc_handle_irq(cpld_irq, cpld_desc);
@@ -139,7 +139,7 @@ static void ixdp2x00_irq_handler(unsigned int irq, struct irqdesc *desc)
         desc->chip->unmask(irq);
 }
 
-static struct irqchip ixdp2x00_cpld_irq_chip = {
+static struct irq_chip ixdp2x00_cpld_irq_chip = {
         .ack    = ixdp2x00_irq_mask,
         .mask   = ixdp2x00_irq_mask,
         .unmask = ixdp2x00_irq_unmask
@@ -162,7 +162,7 @@ void ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long
 
         for(irq = IXP2000_BOARD_IRQ(0); irq < IXP2000_BOARD_IRQ(board_irq_count); irq++) {
                 set_irq_chip(irq, &ixdp2x00_cpld_irq_chip);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID);
         }
 
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index 9ccae9e63f70..3084a5fa751c 100644
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -63,7 +63,7 @@ static void ixdp2x01_irq_unmask(unsigned int irq)
 
 static u32 valid_irq_mask;
 
-static void ixdp2x01_irq_handler(unsigned int irq, struct irqdesc *desc)
+static void ixdp2x01_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         u32 ex_interrupt;
         int i;
@@ -79,7 +79,7 @@ static void ixdp2x01_irq_handler(unsigned int irq, struct irqdesc *desc)
 
         for (i = 0; i < IXP2000_BOARD_IRQS; i++) {
                 if (ex_interrupt & (1 << i)) {
-                        struct irqdesc *cpld_desc;
+                        struct irq_desc *cpld_desc;
                         int cpld_irq = IXP2000_BOARD_IRQ(0) + i;
                         cpld_desc = irq_desc + cpld_irq;
                         desc_handle_irq(cpld_irq, cpld_desc);
@@ -89,7 +89,7 @@ static void ixdp2x01_irq_handler(unsigned int irq, struct irqdesc *desc)
         desc->chip->unmask(irq);
 }
 
-static struct irqchip ixdp2x01_irq_chip = {
+static struct irq_chip ixdp2x01_irq_chip = {
         .mask   = ixdp2x01_irq_mask,
         .ack    = ixdp2x01_irq_mask,
         .unmask = ixdp2x01_irq_unmask
@@ -119,7 +119,7 @@ void __init ixdp2x01_init_irq(void)
         for (irq = NR_IXP2000_IRQS; irq < NR_IXDP2X01_IRQS; irq++) {
                 if (irq & valid_irq_mask) {
                         set_irq_chip(irq, &ixdp2x01_irq_chip);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, IRQF_VALID);
                 } else {
                         set_irq_flags(irq, 0);
diff --git a/arch/arm/mach-ixp2000/pci.c b/arch/arm/mach-ixp2000/pci.c
index d4bf1e1c0031..5a09a90c08fb 100644
--- a/arch/arm/mach-ixp2000/pci.c
+++ b/arch/arm/mach-ixp2000/pci.c
@@ -32,7 +32,7 @@
 
 #include <asm/mach/pci.h>
 
-static int pci_master_aborts = 0;
+static volatile int pci_master_aborts = 0;
 
 static int clear_master_aborts(void);
 
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c
index a704a1820048..ce6ad635a00c 100644
--- a/arch/arm/mach-ixp23xx/core.c
+++ b/arch/arm/mach-ixp23xx/core.c
@@ -224,14 +224,14 @@ static void ixp23xx_irq_edge_unmask(unsigned int irq)
         *intr_reg |= (1 << (irq % 32));
 }
 
-static struct irqchip ixp23xx_irq_level_chip = {
+static struct irq_chip ixp23xx_irq_level_chip = {
         .ack            = ixp23xx_irq_mask,
         .mask           = ixp23xx_irq_mask,
         .unmask         = ixp23xx_irq_level_unmask,
         .set_type       = ixp23xx_irq_set_type
 };
 
-static struct irqchip ixp23xx_irq_edge_chip = {
+static struct irq_chip ixp23xx_irq_edge_chip = {
         .ack            = ixp23xx_irq_ack,
         .mask           = ixp23xx_irq_mask,
         .unmask         = ixp23xx_irq_edge_unmask,
@@ -251,11 +251,11 @@ static void ixp23xx_pci_irq_unmask(unsigned int irq)
 /*
  * TODO: Should this just be done at ASM level?
  */
-static void pci_handler(unsigned int irq, struct irqdesc *desc)
+static void pci_handler(unsigned int irq, struct irq_desc *desc)
 {
         u32 pci_interrupt;
         unsigned int irqno;
-        struct irqdesc *int_desc;
+        struct irq_desc *int_desc;
 
         pci_interrupt = *IXP23XX_PCI_XSCALE_INT_STATUS;
 
@@ -276,7 +276,7 @@ static void pci_handler(unsigned int irq, struct irqdesc *desc)
         desc->chip->unmask(irq);
 }
 
-static struct irqchip ixp23xx_pci_irq_chip = {
+static struct irq_chip ixp23xx_pci_irq_chip = {
         .ack    = ixp23xx_pci_irq_mask,
         .mask   = ixp23xx_pci_irq_mask,
         .unmask = ixp23xx_pci_irq_unmask
@@ -287,11 +287,11 @@ static void ixp23xx_config_irq(unsigned int irq, enum ixp23xx_irq_type type)
         switch (type) {
         case IXP23XX_IRQ_LEVEL:
                 set_irq_chip(irq, &ixp23xx_irq_level_chip);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 break;
         case IXP23XX_IRQ_EDGE:
                 set_irq_chip(irq, &ixp23xx_irq_edge_chip);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_handler(irq, handle_edge_irq);
                 break;
         }
         set_irq_flags(irq, IRQF_VALID);
@@ -322,7 +322,7 @@ void __init ixp23xx_init_irq(void)
 
         for (irq = IRQ_IXP23XX_INTA; irq <= IRQ_IXP23XX_INTB; irq++) {
                 set_irq_chip(irq, &ixp23xx_pci_irq_chip);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID);
         }
 
diff --git a/arch/arm/mach-ixp23xx/ixdp2351.c b/arch/arm/mach-ixp23xx/ixdp2351.c
index b6ab0e8bb5e8..7a86a2516eaa 100644
--- a/arch/arm/mach-ixp23xx/ixdp2351.c
+++ b/arch/arm/mach-ixp23xx/ixdp2351.c
@@ -60,7 +60,7 @@ static void ixdp2351_inta_unmask(unsigned int irq)
         *IXDP2351_CPLD_INTA_MASK_CLR_REG = IXDP2351_INTA_IRQ_MASK(irq);
 }
 
-static void ixdp2351_inta_handler(unsigned int irq, struct irqdesc *desc)
+static void ixdp2351_inta_handler(unsigned int irq, struct irq_desc *desc)
 {
         u16 ex_interrupt =
                 *IXDP2351_CPLD_INTA_STAT_REG & IXDP2351_INTA_IRQ_VALID;
@@ -70,7 +70,7 @@ static void ixdp2351_inta_handler(unsigned int irq, struct irqdesc *desc)
 
         for (i = 0; i < IXDP2351_INTA_IRQ_NUM; i++) {
                 if (ex_interrupt & (1 << i)) {
-                        struct irqdesc *cpld_desc;
+                        struct irq_desc *cpld_desc;
                         int cpld_irq =
                                 IXP23XX_MACH_IRQ(IXDP2351_INTA_IRQ_BASE + i);
                         cpld_desc = irq_desc + cpld_irq;
@@ -81,7 +81,7 @@ static void ixdp2351_inta_handler(unsigned int irq, struct irqdesc *desc)
         desc->chip->unmask(irq);
 }
 
-static struct irqchip ixdp2351_inta_chip = {
+static struct irq_chip ixdp2351_inta_chip = {
         .ack    = ixdp2351_inta_mask,
         .mask   = ixdp2351_inta_mask,
         .unmask = ixdp2351_inta_unmask
@@ -97,7 +97,7 @@ static void ixdp2351_intb_unmask(unsigned int irq)
         *IXDP2351_CPLD_INTB_MASK_CLR_REG = IXDP2351_INTB_IRQ_MASK(irq);
 }
 
-static void ixdp2351_intb_handler(unsigned int irq, struct irqdesc *desc)
+static void ixdp2351_intb_handler(unsigned int irq, struct irq_desc *desc)
 {
         u16 ex_interrupt =
                 *IXDP2351_CPLD_INTB_STAT_REG & IXDP2351_INTB_IRQ_VALID;
@@ -107,7 +107,7 @@ static void ixdp2351_intb_handler(unsigned int irq, struct irqdesc *desc)
 
         for (i = 0; i < IXDP2351_INTB_IRQ_NUM; i++) {
                 if (ex_interrupt & (1 << i)) {
-                        struct irqdesc *cpld_desc;
+                        struct irq_desc *cpld_desc;
                         int cpld_irq =
                                 IXP23XX_MACH_IRQ(IXDP2351_INTB_IRQ_BASE + i);
                         cpld_desc = irq_desc + cpld_irq;
@@ -118,7 +118,7 @@ static void ixdp2351_intb_handler(unsigned int irq, struct irqdesc *desc)
         desc->chip->unmask(irq);
 }
 
-static struct irqchip ixdp2351_intb_chip = {
+static struct irq_chip ixdp2351_intb_chip = {
         .ack    = ixdp2351_intb_mask,
         .mask   = ixdp2351_intb_mask,
         .unmask = ixdp2351_intb_unmask
@@ -142,7 +142,7 @@ void ixdp2351_init_irq(void)
              irq++) {
                 if (IXDP2351_INTA_IRQ_MASK(irq) & IXDP2351_INTA_IRQ_VALID) {
                         set_irq_flags(irq, IRQF_VALID);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_chip(irq, &ixdp2351_inta_chip);
                 }
         }
@@ -153,7 +153,7 @@ void ixdp2351_init_irq(void)
              irq++) {
                 if (IXDP2351_INTB_IRQ_MASK(irq) & IXDP2351_INTB_IRQ_VALID) {
                         set_irq_flags(irq, IRQF_VALID);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_chip(irq, &ixdp2351_intb_chip);
                 }
         }
diff --git a/arch/arm/mach-ixp23xx/pci.c b/arch/arm/mach-ixp23xx/pci.c
index 3b34fa35e36b..ac7d43d23c28 100644
--- a/arch/arm/mach-ixp23xx/pci.c
+++ b/arch/arm/mach-ixp23xx/pci.c
@@ -36,7 +36,7 @@
 
 extern int (*external_fault) (unsigned long, struct pt_regs *);
 
-static int pci_master_aborts = 0;
+static volatile int pci_master_aborts = 0;
 
 #ifdef DEBUG
 #define DBG(x...)       printk(x)
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-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index fbe288a8da65..2ec9a9e9a04d 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -28,6 +28,7 @@
 #include <linux/timex.h>
 #include <linux/clocksource.h>
 
+#include <asm/arch/udc.h>
 #include <asm/hardware.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -39,6 +40,8 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 
+static int __init ixp4xx_clocksource_init(void);
+
 /*************************************************************************
  * IXP4xx chipset I/O mapping
  *************************************************************************/
@@ -195,7 +198,7 @@ static void ixp4xx_irq_unmask(unsigned int irq)
                 *IXP4XX_ICMR |= (1 << irq);
 }
 
-static struct irqchip ixp4xx_irq_chip = {
+static struct irq_chip ixp4xx_irq_chip = {
         .name           = "IXP4xx",
         .ack            = ixp4xx_irq_ack,
         .mask           = ixp4xx_irq_mask,
@@ -224,7 +227,7 @@ void __init ixp4xx_init_irq(void)
         /* Default to all level triggered */
         for(i = 0; i < NR_IRQS; i++) {
                 set_irq_chip(i, &ixp4xx_irq_chip);
-                set_irq_handler(i, do_level_IRQ);
+                set_irq_handler(i, handle_level_irq);
                 set_irq_flags(i, IRQF_VALID);
         }
 }
@@ -280,12 +283,52 @@ static void __init ixp4xx_timer_init(void)
 
         /* Connect the interrupt handler and enable the interrupt */
         setup_irq(IRQ_IXP4XX_TIMER1, &ixp4xx_timer_irq);
+
+        ixp4xx_clocksource_init();
 }
 
 struct sys_timer ixp4xx_timer = {
         .init           = ixp4xx_timer_init,
 };
 
+static struct pxa2xx_udc_mach_info ixp4xx_udc_info;
+
+void __init ixp4xx_set_udc_info(struct pxa2xx_udc_mach_info *info)
+{
+        memcpy(&ixp4xx_udc_info, info, sizeof *info);
+}
+
+static struct resource ixp4xx_udc_resources[] = {
+        [0] = {
+                .start  = 0xc800b000,
+                .end    = 0xc800bfff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = IRQ_IXP4XX_USB,
+                .end    = IRQ_IXP4XX_USB,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+/*
+ * USB device controller. The IXP4xx uses the same controller as PXA2XX,
+ * so we just use the same device.
+ */
+static struct platform_device ixp4xx_udc_device = {
+        .name           = "pxa2xx-udc",
+        .id             = -1,
+        .num_resources  = 2,
+        .resource       = ixp4xx_udc_resources,
+        .dev            = {
+                .platform_data = &ixp4xx_udc_info,
+        },
+};
+
+static struct platform_device *ixp4xx_devices[] __initdata = {
+        &ixp4xx_udc_device,
+};
+
 static struct resource ixp46x_i2c_resources[] = {
         [0] = {
                 .start  = 0xc8011000,
@@ -321,6 +364,8 @@ void __init ixp4xx_sys_init(void)
 {
         ixp4xx_exp_bus_size = SZ_16M;
 
+        platform_add_devices(ixp4xx_devices, ARRAY_SIZE(ixp4xx_devices));
+
         if (cpu_is_ixp46x()) {
                 int region;
 
@@ -363,5 +408,3 @@ static int __init ixp4xx_clocksource_init(void)
 
         return 0;
 }
-
-device_initcall(ixp4xx_clocksource_init);
diff --git a/arch/arm/mach-l7200/core.c b/arch/arm/mach-l7200/core.c
index b7af5640ea7b..561a0fe7095d 100644
--- a/arch/arm/mach-l7200/core.c
+++ b/arch/arm/mach-l7200/core.c
@@ -55,7 +55,7 @@ static void l7200_unmask_irq(unsigned int irq)
         IRQ_ENABLE = 1 << irq;
 }
 
-static struct irqchip l7200_irq_chip = {
+static struct irq_chip l7200_irq_chip = {
         .ack            = l7200_mask_irq,
         .mask           = l7200_mask_irq,
         .unmask         = l7200_unmask_irq
@@ -71,7 +71,7 @@ static void __init l7200_init_irq(void)
         for (irq = 0; irq < NR_IRQS; irq++) {
                 set_irq_chip(irq, &l7200_irq_chip);
                 set_irq_flags(irq, IRQF_VALID);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
         }
 
         init_FIQ();
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-lh7a40x/arch-kev7a400.c b/arch/arm/mach-lh7a40x/arch-kev7a400.c
index 15fbcc911fe7..6d26661d99f6 100644
--- a/arch/arm/mach-lh7a40x/arch-kev7a400.c
+++ b/arch/arm/mach-lh7a40x/arch-kev7a400.c
@@ -71,7 +71,7 @@ static struct irq_chip kev7a400_cpld_chip = {
 };
 
 
-static void kev7a400_cpld_handler (unsigned int irq, struct irqdesc *desc)
+static void kev7a400_cpld_handler (unsigned int irq, struct irq_desc *desc)
 {
         u32 mask = CPLD_LATCHED_INTS;
         irq = IRQ_KEV7A400_CPLD;
@@ -88,7 +88,7 @@ void __init lh7a40x_init_board_irq (void)
         for (irq = IRQ_KEV7A400_CPLD;
              irq < IRQ_KEV7A400_CPLD + NR_IRQ_BOARD; ++irq) {
                 set_irq_chip (irq, &kev7a400_cpld_chip);
-                set_irq_handler (irq, do_edge_IRQ);
+                set_irq_handler (irq, handle_edge_irq);
                 set_irq_flags (irq, IRQF_VALID);
         }
         set_irq_chained_handler (IRQ_CPLD, kev7a400_cpld_handler);
diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
index 8441e0a156cb..fe64946f9e18 100644
--- a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
+++ b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
@@ -207,7 +207,7 @@ static struct irq_chip lpd7a40x_cpld_chip = {
         .unmask = lh7a40x_unmask_cpld_irq,
 };
 
-static void lpd7a40x_cpld_handler (unsigned int irq, struct irqdesc *desc)
+static void lpd7a40x_cpld_handler (unsigned int irq, struct irq_desc *desc)
 {
         unsigned int mask = CPLD_INTERRUPTS;
 
@@ -279,7 +279,7 @@ void __init lh7a40x_init_board_irq (void)
         for (irq = IRQ_BOARD_START;
              irq < IRQ_BOARD_START + NR_IRQ_BOARD; ++irq) {
                 set_irq_chip (irq, &lpd7a40x_cpld_chip);
-                set_irq_handler (irq, do_level_IRQ);
+                set_irq_handler (irq, handle_level_irq);
                 set_irq_flags (irq, IRQF_VALID);
         }
 
diff --git a/arch/arm/mach-lh7a40x/irq-kev7a400.c b/arch/arm/mach-lh7a40x/irq-kev7a400.c
index 646071334b8f..c7433b3c5812 100644
--- a/arch/arm/mach-lh7a40x/irq-kev7a400.c
+++ b/arch/arm/mach-lh7a40x/irq-kev7a400.c
@@ -51,7 +51,7 @@ irq_chip lh7a400_cpld_chip = {
 };
 
 static void
-lh7a400_cpld_handler (unsigned int irq, struct irqdesc *desc)
+lh7a400_cpld_handler (unsigned int irq, struct irq_desc *desc)
 {
         u32 mask = CPLD_LATCHED_INTS;
         irq = IRQ_KEV_7A400_CPLD;
@@ -71,7 +71,7 @@ lh7a400_init_board_irq (void)
         for (irq = IRQ_KEV7A400_CPLD;
              irq < IRQ_KEV7A400_CPLD + NR_IRQ_KEV7A400_CPLD; ++irq) {
                 set_irq_chip (irq, &lh7a400_cpld_chip);
-                set_irq_handler (irq, do_edge_IRQ);
+                set_irq_handler (irq, handle_edge_irq);
                 set_irq_flags (irq, IRQF_VALID);
         }
         set_irq_chained_handler (IRQ_CPLD, kev7a400_cpld_handler);
diff --git a/arch/arm/mach-lh7a40x/irq-lh7a400.c b/arch/arm/mach-lh7a40x/irq-lh7a400.c
index 091b2dc58d25..0b938e8b4d98 100644
--- a/arch/arm/mach-lh7a40x/irq-lh7a400.c
+++ b/arch/arm/mach-lh7a40x/irq-lh7a400.c
@@ -74,11 +74,11 @@ void __init lh7a400_init_irq (void)
                 case IRQ_GPIO6INTR:
                 case IRQ_GPIO7INTR:
                         set_irq_chip (irq, &lh7a400_gpio_chip);
-                        set_irq_handler (irq, do_level_IRQ); /* OK default */
+                        set_irq_handler (irq, handle_level_irq); /* OK default */
                         break;
                 default:
                         set_irq_chip (irq, &lh7a400_internal_chip);
-                        set_irq_handler (irq, do_level_IRQ);
+                        set_irq_handler (irq, handle_level_irq);
                 }
                 set_irq_flags (irq, IRQF_VALID);
         }
diff --git a/arch/arm/mach-lh7a40x/irq-lh7a404.c b/arch/arm/mach-lh7a40x/irq-lh7a404.c
index 7059b983724f..5760f8c53e89 100644
--- a/arch/arm/mach-lh7a40x/irq-lh7a404.c
+++ b/arch/arm/mach-lh7a40x/irq-lh7a404.c
@@ -161,13 +161,13 @@ void __init lh7a404_init_irq (void)
                         set_irq_chip (irq, irq < 32
                                       ? &lh7a404_gpio_vic1_chip
                                       : &lh7a404_gpio_vic2_chip);
-                        set_irq_handler (irq, do_level_IRQ); /* OK default */
+                        set_irq_handler (irq, handle_level_irq); /* OK default */
                         break;
                 default:
                         set_irq_chip (irq, irq < 32
                                       ? &lh7a404_vic1_chip
                                       : &lh7a404_vic2_chip);
-                        set_irq_handler (irq, do_level_IRQ);
+                        set_irq_handler (irq, handle_level_irq);
                 }
                 set_irq_flags (irq, IRQF_VALID);
         }
diff --git a/arch/arm/mach-lh7a40x/irq-lpd7a40x.c b/arch/arm/mach-lh7a40x/irq-lpd7a40x.c
index b20376804bbb..15b9577023c9 100644
--- a/arch/arm/mach-lh7a40x/irq-lpd7a40x.c
+++ b/arch/arm/mach-lh7a40x/irq-lpd7a40x.c
@@ -57,7 +57,7 @@ static struct irq_chip lh7a40x_cpld_chip = {
         .unmask = lh7a40x_unmask_cpld_irq,
 };
 
-static void lh7a40x_cpld_handler (unsigned int irq, struct irqdesc *desc)
+static void lh7a40x_cpld_handler (unsigned int irq, struct irq_desc *desc)
 {
         unsigned int mask = CPLD_INTERRUPTS;
 
@@ -118,7 +118,7 @@ void __init lh7a40x_init_board_irq (void)
         for (irq = IRQ_BOARD_START;
              irq < IRQ_BOARD_START + NR_IRQ_BOARD; ++irq) {
                 set_irq_chip (irq, &lh7a40x_cpld_chip);
-                set_irq_handler (irq, do_edge_IRQ);
+                set_irq_handler (irq, handle_edge_irq);
                 set_irq_flags (irq, IRQF_VALID);
         }
 
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c
index edbbbdc3b06b..b9ca8f98265d 100644
--- a/arch/arm/mach-netx/generic.c
+++ b/arch/arm/mach-netx/generic.c
@@ -69,7 +69,7 @@ static struct platform_device *devices[] __initdata = {
 #endif
 
 static void
-netx_hif_demux_handler(unsigned int irq_unused, struct irqdesc *desc)
+netx_hif_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
 {
         unsigned int irq = NETX_IRQ_HIF_CHAINED(0);
         unsigned int stat;
@@ -160,7 +160,7 @@ netx_hif_unmask_irq(unsigned int _irq)
         DEBUG_IRQ("%s: irq %d\n", __FUNCTION__, _irq);
 }
 
-static struct irqchip netx_hif_chip = {
+static struct irq_chip netx_hif_chip = {
         .ack = netx_hif_ack_irq,
         .mask = netx_hif_mask_irq,
         .unmask = netx_hif_unmask_irq,
@@ -175,7 +175,7 @@ void __init netx_init_irq(void)
 
         for (irq = NETX_IRQ_HIF_CHAINED(0); irq <= NETX_IRQ_HIF_LAST; irq++) {
                 set_irq_chip(irq, &netx_hif_chip);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID);
         }
 
diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c
index 0993336c0b55..5773b55ef4a6 100644
--- a/arch/arm/mach-netx/time.c
+++ b/arch/arm/mach-netx/time.c
@@ -19,6 +19,8 @@
 
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/clocksource.h>
 
 #include <asm/hardware.h>
 #include <asm/io.h>
@@ -26,15 +28,6 @@
 #include <asm/arch/netx-regs.h>
 
 /*
- * Returns number of us since last clock interrupt.  Note that interrupts
- * will have been disabled by do_gettimeoffset()
- */
-static unsigned long netx_gettimeoffset(void)
-{
-        return readl(NETX_GPIO_COUNTER_CURRENT(0)) / 100;
-}
-
-/*
  * IRQ handler for the timer
  */
 static irqreturn_t
@@ -43,6 +36,7 @@ netx_timer_interrupt(int irq, void *dev_id)
         write_seqlock(&xtime_lock);
 
         timer_tick();
+
         write_sequnlock(&xtime_lock);
 
         /* acknowledge interrupt */
@@ -51,13 +45,26 @@ netx_timer_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-
 static struct irqaction netx_timer_irq = {
         .name           = "NetX Timer Tick",
         .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = netx_timer_interrupt,
 };
 
+cycle_t netx_get_cycles(void)
+{
+        return readl(NETX_GPIO_COUNTER_CURRENT(1));
+}
+
+static struct clocksource clocksource_netx = {
+        .name           = "netx_timer",
+        .rating         = 200,
+        .read           = netx_get_cycles,
+        .mask           = CLOCKSOURCE_MASK(32),
+        .shift          = 20,
+        .is_continuous  = 1,
+};
+
 /*
  * Set up timer interrupt
  */
@@ -80,9 +87,20 @@ static void __init netx_timer_init(void)
                 NETX_GPIO_COUNTER_CTRL(0));
 
         setup_irq(NETX_IRQ_TIMER0, &netx_timer_irq);
+
+        /* Setup timer one for clocksource */
+        writel(0, NETX_GPIO_COUNTER_CTRL(1));
+        writel(0, NETX_GPIO_COUNTER_CURRENT(1));
+        writel(0xFFFFFFFF, NETX_GPIO_COUNTER_MAX(1));
+
+        writel(NETX_GPIO_COUNTER_CTRL_RUN,
+                NETX_GPIO_COUNTER_CTRL(1));
+
+        clocksource_netx.mult =
+                clocksource_hz2mult(CLOCK_TICK_RATE, clocksource_netx.shift);
+        clocksource_register(&clocksource_netx);
 }
 
 struct sys_timer netx_timer = {
-        .init           = netx_timer_init,
-        .offset         = netx_gettimeoffset,
+        .init           = netx_timer_init,
 };
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index d135568dc9e7..8781aaeb576b 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -43,6 +43,7 @@ config MACH_OMAP_H3
 config MACH_OMAP_OSK
         bool "TI OSK Support"
         depends on ARCH_OMAP1 && ARCH_OMAP16XX
+        select TPS65010
         help
           TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
           if you have such a board.
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index f225a083dee1..9d2346fb68f4 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -323,7 +323,8 @@ static int h3_transceiver_mode(struct device *dev, int mode)
 
         cancel_delayed_work(&irda_config->gpio_expa);
         PREPARE_WORK(&irda_config->gpio_expa, set_trans_mode, &mode);
-        schedule_work(&irda_config->gpio_expa);
+#error this is not permitted - mode is an argument variable
+        schedule_delayed_work(&irda_config->gpio_expa, 0);
 
         return 0;
 }
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index dbc555d209ff..cbe909bad79b 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -74,7 +74,7 @@ static struct omap_kp_platform_data nokia770_kp_data = {
         .rows           = 8,
         .cols           = 8,
         .keymap         = nokia770_keymap,
-        .keymapsize     = ARRAY_SIZE(nokia770_keymap)
+        .keymapsize     = ARRAY_SIZE(nokia770_keymap),
         .delay          = 4,
 };
 
@@ -191,7 +191,7 @@ static void nokia770_audio_pwr_up(void)
                 printk("HP connected\n");
 }
 
-static void codec_delayed_power_down(void *arg)
+static void codec_delayed_power_down(struct work_struct *work)
 {
         down(&audio_pwr_sem);
         if (audio_pwr_state == -1)
@@ -200,7 +200,7 @@ static void codec_delayed_power_down(void *arg)
         up(&audio_pwr_sem);
 }
 
-static DECLARE_WORK(codec_power_down_work, codec_delayed_power_down, NULL);
+static DECLARE_DELAYED_WORK(codec_power_down_work, codec_delayed_power_down);
 
 static void nokia770_audio_pwr_down(void)
 {
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 3a622801d7b0..7d0cf7af88ce 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -30,6 +30,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
+#include <linux/interrupt.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index a611c3b63954..6dcd10ab4496 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -55,7 +55,7 @@ static inline void omap_init_irda(void) {}
 
 /*-------------------------------------------------------------------------*/
 
-#if     defined(CONFIG_OMAP_RTC) || defined(CONFIG_OMAP_RTC)
+#if defined(CONFIG_RTC_DRV_OMAP) || defined(CONFIG_RTC_DRV_OMAP_MODULE)
 
 #define OMAP_RTC_BASE           0xfffb4800
 
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c
index 8e40208b10bb..30e188109046 100644
--- a/arch/arm/mach-omap1/fpga.c
+++ b/arch/arm/mach-omap1/fpga.c
@@ -84,9 +84,9 @@ static void fpga_mask_ack_irq(unsigned int irq)
         fpga_ack_irq(irq);
 }
 
-void innovator_fpga_IRQ_demux(unsigned int irq, struct irqdesc *desc)
+void innovator_fpga_IRQ_demux(unsigned int irq, struct irq_desc *desc)
 {
-        struct irqdesc *d;
+        struct irq_desc *d;
         u32 stat;
         int fpga_irq;
 
@@ -168,7 +168,7 @@ void omap1510_fpga_init_irq(void)
                         set_irq_chip(i, &omap_fpga_irq);
                 }
 
-                set_irq_handler(i, do_edge_IRQ);
+                set_irq_handler(i, handle_edge_irq);
                 set_irq_flags(i, IRQF_VALID);
         }
 
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c
index 3ea140bb9eba..6383a12ad970 100644
--- a/arch/arm/mach-omap1/irq.c
+++ b/arch/arm/mach-omap1/irq.c
@@ -229,7 +229,7 @@ void __init omap_init_irq(void)
                         omap_irq_set_cfg(j, 0, 0, irq_trigger);
 
                         set_irq_chip(j, &omap_irq_chip);
-                        set_irq_handler(j, do_level_IRQ);
+                        set_irq_handler(j, handle_level_irq);
                         set_irq_flags(j, IRQF_VALID);
                 }
         }
diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c
index 3b29e59b0e6f..0cbf1b0071f8 100644
--- a/arch/arm/mach-omap1/leds-osk.c
+++ b/arch/arm/mach-omap1/leds-osk.c
@@ -35,7 +35,7 @@ static u8 hw_led_state;
 
 static u8 tps_leds_change;
 
-static void tps_work(void *unused)
+static void tps_work(struct work_struct *unused)
 {
         for (;;) {
                 u8      leds;
@@ -61,7 +61,7 @@ static void tps_work(void *unused)
         }
 }
 
-static DECLARE_WORK(work, tps_work, NULL);
+static DECLARE_WORK(work, tps_work);
 
 #ifdef  CONFIG_OMAP_OSK_MISTRAL
 
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index 03d6905ba490..878ff9181d0e 100644
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -22,6 +22,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/onenand.h>
+#include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 26a95a642ad7..3b1ad1d981a3 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -206,7 +206,8 @@ static int h4_transceiver_mode(struct device *dev, int mode)
 
         cancel_delayed_work(&irda_config->gpio_expa);
         PREPARE_WORK(&irda_config->gpio_expa, set_trans_mode, &mode);
-        schedule_work(&irda_config->gpio_expa);
+#error this is not permitted - mode is an argument variable
+        schedule_delayed_work(&irda_config->gpio_expa, 0);
 
         return 0;
 }
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index f4f04d87df32..d8f57824423f 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -17,6 +17,7 @@
 #include <linux/spinlock.h>
 
 #include <asm/io.h>
+#include <asm/mach-types.h>
 #include <asm/arch/gpmc.h>
 
 #undef DEBUG
@@ -338,19 +339,13 @@ void __init gpmc_mem_init(void)
         int cs;
         unsigned long boot_rom_space = 0;
 
-        if (cpu_is_omap242x()) {
-                u32 l;
-                l = omap_readl(OMAP242X_CONTROL_STATUS);
-                /* In case of internal boot the 1st MB is redirected to the
-                 * boot ROM memory space.
-                 */
-                if (l & (1 << 3))
-                        boot_rom_space = BOOT_ROM_SPACE;
-        } else
-                /* We assume internal boot if the mode can't be
-                 * determined.
-                 */
-                boot_rom_space = BOOT_ROM_SPACE;
+        /* never allocate the first page, to facilitate bug detection;
+         * even if we didn't boot from ROM.
+         */
+        boot_rom_space = BOOT_ROM_SPACE;
+        /* In apollon the CS0 is mapped as 0x0000 0000 */
+        if (machine_is_omap_apollon())
+                boot_rom_space = 0;
         gpmc_mem_root.start = GPMC_MEM_START + boot_rom_space;
         gpmc_mem_root.end = GPMC_MEM_END;
 
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index 11870093d7a1..a39d30680300 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -130,7 +130,7 @@ void __init omap_init_irq(void)
 
         for (i = 0; i < nr_irqs; i++) {
                 set_irq_chip(i, &omap_irq_chip);
-                set_irq_handler(i, do_level_IRQ);
+                set_irq_handler(i, handle_level_irq);
                 set_irq_flags(i, IRQF_VALID);
         }
 }
diff --git a/arch/arm/mach-pnx4008/Makefile b/arch/arm/mach-pnx4008/Makefile
index b457ca0a431a..777564c90a12 100644
--- a/arch/arm/mach-pnx4008/Makefile
+++ b/arch/arm/mach-pnx4008/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-obj-y                   := core.o irq.o time.o clock.o gpio.o serial.o dma.o
+obj-y                   := core.o irq.o time.o clock.o gpio.o serial.o dma.o i2c.o
 obj-m                   :=
 obj-n                   :=
 obj-                    :=
diff --git a/arch/arm/mach-pnx4008/i2c.c b/arch/arm/mach-pnx4008/i2c.c
new file mode 100644
index 000000000000..6f308827c4fe
--- /dev/null
+++ b/arch/arm/mach-pnx4008/i2c.c
@@ -0,0 +1,167 @@
+/*
+ * I2C initialization for PNX4008.
+ *
+ * Author: Vitaly Wool <vitalywool@gmail.com>
+ *
+ * 2005-2006 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#include <linux/clk.h>
+#include <linux/i2c.h>
+#include <linux/i2c-pnx.h>
+#include <linux/platform_device.h>
+#include <linux/err.h>
+#include <asm/arch/platform.h>
+#include <asm/arch/i2c.h>
+
+static int set_clock_run(struct platform_device *pdev)
+{
+        struct clk *clk;
+        char name[10];
+        int retval = 0;
+
+        snprintf(name, 10, "i2c%d_ck", pdev->id);
+        clk = clk_get(&pdev->dev, name);
+        if (!IS_ERR(clk)) {
+                clk_set_rate(clk, 1);
+                clk_put(clk);
+        } else
+                retval = -ENOENT;
+
+        return retval;
+}
+
+static int set_clock_stop(struct platform_device *pdev)
+{
+        struct clk *clk;
+        char name[10];
+        int retval = 0;
+
+        snprintf(name, 10, "i2c%d_ck", pdev->id);
+        clk = clk_get(&pdev->dev, name);
+        if (!IS_ERR(clk)) {
+                clk_set_rate(clk, 0);
+                clk_put(clk);
+        } else
+                retval = -ENOENT;
+
+        return retval;
+}
+
+static int i2c_pnx_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        int retval = 0;
+#ifdef CONFIG_PM
+        retval = set_clock_run(pdev);
+#endif
+        return retval;
+}
+
+static int i2c_pnx_resume(struct platform_device *pdev)
+{
+        int retval = 0;
+#ifdef CONFIG_PM
+        retval = set_clock_run(pdev);
+#endif
+        return retval;
+}
+
+static u32 calculate_input_freq(struct platform_device *pdev)
+{
+        return HCLK_MHZ;
+}
+
+
+static struct i2c_pnx_algo_data pnx_algo_data0 = {
+        .base = PNX4008_I2C1_BASE,
+        .irq = I2C_1_INT,
+};
+
+static struct i2c_pnx_algo_data pnx_algo_data1 = {
+        .base = PNX4008_I2C2_BASE,
+        .irq = I2C_2_INT,
+};
+
+static struct i2c_pnx_algo_data pnx_algo_data2 = {
+        .base = (PNX4008_USB_CONFIG_BASE + 0x300),
+        .irq = USB_I2C_INT,
+};
+
+static struct i2c_adapter pnx_adapter0 = {
+        .name = I2C_CHIP_NAME "0",
+        .algo_data = &pnx_algo_data0,
+};
+static struct i2c_adapter pnx_adapter1 = {
+        .name = I2C_CHIP_NAME "1",
+        .algo_data = &pnx_algo_data1,
+};
+
+static struct i2c_adapter pnx_adapter2 = {
+        .name = "USB-I2C",
+        .algo_data = &pnx_algo_data2,
+};
+
+static struct i2c_pnx_data i2c0_data = {
+        .suspend = i2c_pnx_suspend,
+        .resume = i2c_pnx_resume,
+        .calculate_input_freq = calculate_input_freq,
+        .set_clock_run = set_clock_run,
+        .set_clock_stop = set_clock_stop,
+        .adapter = &pnx_adapter0,
+};
+
+static struct i2c_pnx_data i2c1_data = {
+        .suspend = i2c_pnx_suspend,
+        .resume = i2c_pnx_resume,
+        .calculate_input_freq = calculate_input_freq,
+        .set_clock_run = set_clock_run,
+        .set_clock_stop = set_clock_stop,
+        .adapter = &pnx_adapter1,
+};
+
+static struct i2c_pnx_data i2c2_data = {
+        .suspend = i2c_pnx_suspend,
+        .resume = i2c_pnx_resume,
+        .calculate_input_freq = calculate_input_freq,
+        .set_clock_run = set_clock_run,
+        .set_clock_stop = set_clock_stop,
+        .adapter = &pnx_adapter2,
+};
+
+static struct platform_device i2c0_device = {
+        .name = "pnx-i2c",
+        .id = 0,
+        .dev = {
+                .platform_data = &i2c0_data,
+        },
+};
+
+static struct platform_device i2c1_device = {
+        .name = "pnx-i2c",
+        .id = 1,
+        .dev = {
+                .platform_data = &i2c1_data,
+        },
+};
+
+static struct platform_device i2c2_device = {
+        .name = "pnx-i2c",
+        .id = 2,
+        .dev = {
+                .platform_data = &i2c2_data,
+        },
+};
+
+static struct platform_device *devices[] __initdata = {
+        &i2c0_device,
+        &i2c1_device,
+        &i2c2_device,
+};
+
+void __init pnx4008_register_i2c_devices(void)
+{
+        platform_add_devices(devices, ARRAY_SIZE(devices));
+}
diff --git a/arch/arm/mach-pnx4008/irq.c b/arch/arm/mach-pnx4008/irq.c
index 3a4bcf3d91fa..968d0b027597 100644
--- a/arch/arm/mach-pnx4008/irq.c
+++ b/arch/arm/mach-pnx4008/irq.c
@@ -59,22 +59,22 @@ static int pnx4008_set_irq_type(unsigned int irq, unsigned int type)
         case IRQT_RISING:
                 __raw_writel(__raw_readl(INTC_ATR(irq)) | INTC_BIT(irq), INTC_ATR(irq));        /*edge sensitive */
                 __raw_writel(__raw_readl(INTC_APR(irq)) | INTC_BIT(irq), INTC_APR(irq));        /*rising edge */
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_handler(irq, handle_edge_irq);
                 break;
         case IRQT_FALLING:
                 __raw_writel(__raw_readl(INTC_ATR(irq)) | INTC_BIT(irq), INTC_ATR(irq));        /*edge sensitive */
                 __raw_writel(__raw_readl(INTC_APR(irq)) & ~INTC_BIT(irq), INTC_APR(irq));       /*falling edge */
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_handler(irq, handle_edge_irq);
                 break;
         case IRQT_LOW:
                 __raw_writel(__raw_readl(INTC_ATR(irq)) & ~INTC_BIT(irq), INTC_ATR(irq));       /*level sensitive */
                 __raw_writel(__raw_readl(INTC_APR(irq)) & ~INTC_BIT(irq), INTC_APR(irq));       /*low level */
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 break;
         case IRQT_HIGH:
                 __raw_writel(__raw_readl(INTC_ATR(irq)) & ~INTC_BIT(irq), INTC_ATR(irq));       /*level sensitive */
                 __raw_writel(__raw_readl(INTC_APR(irq)) | INTC_BIT(irq), INTC_APR(irq));        /* high level */
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 break;
 
         /* IRQT_BOTHEDGE is not supported */
@@ -85,7 +85,7 @@ static int pnx4008_set_irq_type(unsigned int irq, unsigned int type)
         return 0;
 }
 
-static struct irqchip pnx4008_irq_chip = {
+static struct irq_chip pnx4008_irq_chip = {
         .ack = pnx4008_mask_ack_irq,
         .mask = pnx4008_mask_irq,
         .unmask = pnx4008_unmask_irq,
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 03d07cae26c8..5c0a10041cd1 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -13,12 +13,10 @@ config ARCH_LUBBOCK
 config MACH_LOGICPD_PXA270
         bool "LogicPD PXA270 Card Engine Development Platform"
         select PXA27x
-        select IWMMXT
 
 config MACH_MAINSTONE
         bool "Intel HCDDBBVA0 Development Platform"
         select PXA27x
-        select IWMMXT
 
 config ARCH_PXA_IDP
         bool "Accelent Xscale IDP"
@@ -53,7 +51,6 @@ config PXA_SHARPSL_25x
 config PXA_SHARPSL_27x
         bool "Sharp PXA270 models (SL-Cxx00)"
         select PXA27x
-        select IWMMXT
 
 endchoice
 
@@ -78,28 +75,28 @@ endmenu
 
 config MACH_POODLE
         bool "Enable Sharp SL-5600 (Poodle) Support"
-        depends PXA_SHARPSL_25x
+        depends on PXA_SHARPSL_25x
         select SHARP_LOCOMO
         select PXA_SSP
 
 config MACH_CORGI
         bool "Enable Sharp SL-C700 (Corgi) Support"
-        depends PXA_SHARPSL_25x
+        depends on PXA_SHARPSL_25x
         select PXA_SHARP_C7xx
 
 config MACH_SHEPHERD
         bool "Enable Sharp SL-C750 (Shepherd) Support"
-        depends PXA_SHARPSL_25x
+        depends on PXA_SHARPSL_25x
         select PXA_SHARP_C7xx
 
 config MACH_HUSKY
         bool "Enable Sharp SL-C760 (Husky) Support"
-        depends PXA_SHARPSL_25x
+        depends on PXA_SHARPSL_25x
         select PXA_SHARP_C7xx
 
 config MACH_AKITA
         bool "Enable Sharp SL-1000 (Akita) Support"
-        depends PXA_SHARPSL_27x
+        depends on PXA_SHARPSL_27x
         select PXA_SHARP_Cxx00
         select MACH_SPITZ
         select I2C
@@ -107,17 +104,17 @@ config MACH_AKITA
 
 config MACH_SPITZ
         bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
-        depends PXA_SHARPSL_27x
+        depends on PXA_SHARPSL_27x
         select PXA_SHARP_Cxx00
 
 config MACH_BORZOI
         bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
-        depends PXA_SHARPSL_27x
+        depends on PXA_SHARPSL_27x
         select PXA_SHARP_Cxx00
 
 config MACH_TOSA
         bool "Enable Sharp SL-6000x (Tosa) Support"
-        depends PXA_SHARPSL_25x
+        depends on PXA_SHARPSL_25x
 
 config PXA25x
         bool
@@ -129,11 +126,6 @@ config PXA27x
         help
           Select code specific to PXA27x variants
 
-config IWMMXT
-        bool
-        help
-          Enable support for iWMMXt
-
 config PXA_SHARP_C7xx
         bool
         select PXA_SSP
diff --git a/arch/arm/mach-pxa/akita-ioexp.c b/arch/arm/mach-pxa/akita-ioexp.c
index 1b398742ab56..12d2fe0ceff6 100644
--- a/arch/arm/mach-pxa/akita-ioexp.c
+++ b/arch/arm/mach-pxa/akita-ioexp.c
@@ -36,11 +36,11 @@ I2C_CLIENT_INSMOD;
 
 static int max7310_write(struct i2c_client *client, int address, int data);
 static struct i2c_client max7310_template;
-static void akita_ioexp_work(void *private_);
+static void akita_ioexp_work(struct work_struct *private_);
 
 static struct device *akita_ioexp_device;
 static unsigned char ioexp_output_value = AKITA_IOEXP_IO_OUT;
-DECLARE_WORK(akita_ioexp, akita_ioexp_work, NULL);
+DECLARE_WORK(akita_ioexp, akita_ioexp_work);
 
 
 /*
@@ -158,7 +158,7 @@ void akita_reset_ioexp(struct device *dev, unsigned char bit)
 EXPORT_SYMBOL(akita_set_ioexp);
 EXPORT_SYMBOL(akita_reset_ioexp);
 
-static void akita_ioexp_work(void *private_)
+static void akita_ioexp_work(struct work_struct *private_)
 {
         if (akita_ioexp_device)
                 max7310_set_ouputs(akita_ioexp_device, ioexp_output_value);
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index 45fb2c3bcf82..9de1278d234f 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -25,6 +25,10 @@
 #include <linux/pm.h>
 #include <linux/string.h>
 
+#include <linux/sched.h>
+#include <asm/cnt32_to_63.h>
+#include <asm/div64.h>
+
 #include <asm/hardware.h>
 #include <asm/irq.h>
 #include <asm/system.h>
@@ -41,6 +45,64 @@
 #include "generic.h"
 
 /*
+ * This is the PXA2xx sched_clock implementation. This has a resolution
+ * of at least 308ns and a maximum value that depends on the value of
+ * CLOCK_TICK_RATE.
+ *
+ * The return value is guaranteed to be monotonic in that range as
+ * long as there is always less than 582 seconds between successive
+ * calls to this function.
+ */
+unsigned long long sched_clock(void)
+{
+        unsigned long long v = cnt32_to_63(OSCR);
+        /* Note: top bit ov v needs cleared unless multiplier is even. */
+
+#if     CLOCK_TICK_RATE == 3686400
+        /* 1E9 / 3686400 => 78125 / 288, max value = 32025597s (370 days). */
+        /* The <<1 is used to get rid of tick.hi top bit */
+        v *= 78125<<1;
+        do_div(v, 288<<1);
+#elif   CLOCK_TICK_RATE == 3250000
+        /* 1E9 / 3250000 => 4000 / 13, max value = 709490156s (8211 days) */
+        v *= 4000;
+        do_div(v, 13);
+#elif   CLOCK_TICK_RATE == 3249600
+        /* 1E9 / 3249600 => 625000 / 2031, max value = 4541295s (52 days) */
+        v *= 625000;
+        do_div(v, 2031);
+#else
+#warning "consider fixing sched_clock for your value of CLOCK_TICK_RATE"
+        /*
+         * 96-bit math to perform tick * NSEC_PER_SEC / CLOCK_TICK_RATE for
+         * any value of CLOCK_TICK_RATE. Max value is in the 80 thousand
+         * years range and truncation to unsigned long long limits it to
+         * sched_clock's max range of ~584 years.  This is nice but with
+         * higher computation cost.
+         */
+        {
+                union {
+                        unsigned long long val;
+                        struct { unsigned long lo, hi; };
+                } x;
+                unsigned long long y;
+
+                x.val = v;
+                x.hi &= 0x7fffffff;
+                y = (unsigned long long)x.lo * NSEC_PER_SEC;
+                x.lo = y;
+                y = (y >> 32) + (unsigned long long)x.hi * NSEC_PER_SEC;
+                x.hi = do_div(y, CLOCK_TICK_RATE);
+                do_div(x.val, CLOCK_TICK_RATE);
+                x.hi += y;
+                v = x.val;
+        }
+#endif
+
+        return v;
+}
+
+/*
  * Handy function to set GPIO alternate functions
  */
 
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index ab1a16025d51..f815678a9d63 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -143,7 +143,7 @@ static struct irq_chip pxa_low_gpio_chip = {
  * Demux handler for GPIO>=2 edge detect interrupts
  */
 
-static void pxa_gpio_demux_handler(unsigned int irq, struct irqdesc *desc)
+static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
 {
         unsigned int mask;
         int loop;
@@ -286,27 +286,27 @@ void __init pxa_init_irq(void)
 
         for (irq = PXA_IRQ(PXA_IRQ_SKIP); irq <= PXA_IRQ(31); irq++) {
                 set_irq_chip(irq, &pxa_internal_chip_low);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID);
         }
 
 #if PXA_INTERNAL_IRQS > 32
         for (irq = PXA_IRQ(32); irq < PXA_IRQ(PXA_INTERNAL_IRQS); irq++) {
                 set_irq_chip(irq, &pxa_internal_chip_high);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID);
         }
 #endif
 
         for (irq = IRQ_GPIO0; irq <= IRQ_GPIO1; irq++) {
                 set_irq_chip(irq, &pxa_low_gpio_chip);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
         for (irq = IRQ_GPIO(2); irq <= IRQ_GPIO(PXA_LAST_GPIO); irq++) {
                 set_irq_chip(irq, &pxa_muxed_gpio_chip);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c
index 5749f6b72e12..8e27a64fa9f4 100644
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@ -75,7 +75,7 @@ static struct irq_chip lpd270_irq_chip = {
         .unmask         = lpd270_unmask_irq,
 };
 
-static void lpd270_irq_handler(unsigned int irq, struct irqdesc *desc)
+static void lpd270_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         unsigned long pending;
 
@@ -105,7 +105,7 @@ static void __init lpd270_init_irq(void)
         /* setup extra LogicPD PXA270 irqs */
         for (irq = LPD270_IRQ(2); irq <= LPD270_IRQ(4); irq++) {
                 set_irq_chip(irq, &lpd270_irq_chip);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
         set_irq_chained_handler(IRQ_GPIO(0), lpd270_irq_handler);
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 142c33c3dff5..055de7f4f00a 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -85,7 +85,7 @@ static struct irq_chip lubbock_irq_chip = {
         .unmask         = lubbock_unmask_irq,
 };
 
-static void lubbock_irq_handler(unsigned int irq, struct irqdesc *desc)
+static void lubbock_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         unsigned long pending = LUB_IRQ_SET_CLR & lubbock_irq_enabled;
         do {
@@ -108,7 +108,7 @@ static void __init lubbock_init_irq(void)
         /* setup extra lubbock irqs */
         for (irq = LUBBOCK_IRQ(0); irq <= LUBBOCK_LAST_IRQ; irq++) {
                 set_irq_chip(irq, &lubbock_irq_chip);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 49c34d94a9fe..56d94d88d5ca 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -71,7 +71,7 @@ static struct irq_chip mainstone_irq_chip = {
         .unmask         = mainstone_unmask_irq,
 };
 
-static void mainstone_irq_handler(unsigned int irq, struct irqdesc *desc)
+static void mainstone_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         unsigned long pending = MST_INTSETCLR & mainstone_irq_enabled;
         do {
@@ -94,7 +94,7 @@ static void __init mainstone_init_irq(void)
         /* setup extra Mainstone irqs */
         for(irq = MAINSTONE_IRQ(0); irq <= MAINSTONE_IRQ(15); irq++) {
                 set_irq_chip(irq, &mainstone_irq_chip);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 if (irq == MAINSTONE_IRQ(10) || irq == MAINSTONE_IRQ(14))
                         set_irq_flags(irq, IRQF_VALID | IRQF_PROBE | IRQF_NOAUTOEN);
                 else
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index 2112c414f0e2..b4d8276d6050 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -83,7 +83,8 @@ int pxa_pm_enter(suspend_state_t state)
 
 #ifdef CONFIG_IWMMXT
         /* force any iWMMXt context to ram **/
-        iwmmxt_task_disable(NULL);
+        if (elf_hwcap & HWCAP_IWMMXT)
+                iwmmxt_task_disable(NULL);
 #endif
 
         /* preserve current time */
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
index 3ac268fa419b..ee2beb400414 100644
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
@@ -18,6 +18,7 @@
 #include <linux/signal.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
+#include <linux/clocksource.h>
 
 #include <asm/system.h>
 #include <asm/hardware.h>
@@ -48,27 +49,6 @@ static int pxa_set_rtc(void)
         return 0;
 }
 
-/* IRQs are disabled before entering here from do_gettimeofday() */
-static unsigned long pxa_gettimeoffset (void)
-{
-        long ticks_to_match, elapsed, usec;
-
-        /* Get ticks before next timer match */
-        ticks_to_match = OSMR0 - OSCR;
-
-        /* We need elapsed ticks since last match */
-        elapsed = LATCH - ticks_to_match;
-
-        /* don't get fooled by the workaround in pxa_timer_interrupt() */
-        if (elapsed <= 0)
-                return 0;
-
-        /* Now convert them to usec */
-        usec = (unsigned long)(elapsed * (tick_nsec / 1000))/LATCH;
-
-        return usec;
-}
-
 #ifdef CONFIG_NO_IDLE_HZ
 static unsigned long initial_match;
 static int match_posponed;
@@ -121,9 +101,24 @@ static struct irqaction pxa_timer_irq = {
         .handler        = pxa_timer_interrupt,
 };
 
+static cycle_t pxa_get_cycles(void)
+{
+        return OSCR;
+}
+
+static struct clocksource clocksource_pxa = {
+        .name           = "pxa_timer",
+        .rating         = 200,
+        .read           = pxa_get_cycles,
+        .mask           = CLOCKSOURCE_MASK(32),
+        .shift          = 20,
+        .is_continuous  = 1,
+};
+
 static void __init pxa_timer_init(void)
 {
         struct timespec tv;
+        unsigned long flags;
 
         set_rtc = pxa_set_rtc;
 
@@ -132,12 +127,20 @@ static void __init pxa_timer_init(void)
         do_settimeofday(&tv);
 
         OIER = 0;               /* disable any timer interrupts */
-        OSCR = LATCH*2;         /* push OSCR out of the way */
-        OSMR0 = LATCH;          /* set initial match */
         OSSR = 0xf;             /* clear status on all timers */
         setup_irq(IRQ_OST0, &pxa_timer_irq);
+        local_irq_save(flags);
         OIER = OIER_E0;         /* enable match on timer 0 to cause interrupts */
-        OSCR = 0;               /* initialize free-running timer */
+        OSMR0 = OSCR + LATCH;   /* set initial match */
+        local_irq_restore(flags);
+
+        /*
+         * OSCR runs continuously on PXA and is not written to,
+         * so we can use it as clock source directly.
+         */
+        clocksource_pxa.mult =
+                clocksource_hz2mult(CLOCK_TICK_RATE, clocksource_pxa.shift);
+        clocksource_register(&clocksource_pxa);
 }
 
 #ifdef CONFIG_NO_IDLE_HZ
@@ -210,7 +213,6 @@ struct sys_timer pxa_timer = {
         .init           = pxa_timer_init,
         .suspend        = pxa_timer_suspend,
         .resume         = pxa_timer_resume,
-        .offset         = pxa_gettimeoffset,
 #ifdef CONFIG_NO_IDLE_HZ
         .dyn_tick       = &pxa_dyn_tick,
 #endif
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index c1827d021ba8..119c64b7223f 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -393,10 +393,6 @@ static struct pxafb_mach_info sharp_lcd = {
     .pxafb_backlight_power = board_backlight_power,
 };
 
-static void __init trizeps4_fixup(struct machine_desc *desc, struct tag *tags, char **cmdline, struct meminfo *mi)
-{
-}
-
 static void __init trizeps4_init(void)
 {
         platform_add_devices(trizeps4_devices, ARRAY_SIZE(trizeps4_devices));
@@ -469,7 +465,6 @@ MACHINE_START(TRIZEPS4, "Keith und Koep Trizeps IV module")
         .phys_io        = 0x40000000,
         .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
         .boot_params    = TRIZEPS4_SDRAM_BASE + 0x100,
-        .fixup          = trizeps4_fixup,
         .init_machine   = trizeps4_init,
         .map_io         = trizeps4_map_io,
         .init_irq       = pxa_init_irq,
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index 68c67053f479..84d3fe76e94e 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -141,6 +141,19 @@ struct platform_device realview_smc91x_device = {
         .resource       = realview_smc91x_resources,
 };
 
+static struct resource realview_i2c_resource = {
+        .start          = REALVIEW_I2C_BASE,
+        .end            = REALVIEW_I2C_BASE + SZ_4K - 1,
+        .flags          = IORESOURCE_MEM,
+};
+
+struct platform_device realview_i2c_device = {
+        .name           = "versatile-i2c",
+        .id             = -1,
+        .num_resources  = 1,
+        .resource       = &realview_i2c_resource,
+};
+
 #define REALVIEW_SYSMCI (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_MCI_OFFSET)
 
 static unsigned int realview_mmc_status(struct device *dev)
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h
index 93e86d9f439c..2b53420f9c1b 100644
--- a/arch/arm/mach-realview/core.h
+++ b/arch/arm/mach-realview/core.h
@@ -108,6 +108,7 @@ static struct amba_device name##_device = {			\
 
 extern struct platform_device realview_flash_device;
 extern struct platform_device realview_smc91x_device;
+extern struct platform_device realview_i2c_device;
 extern struct mmc_platform_data realview_mmc0_plat_data;
 extern struct mmc_platform_data realview_mmc1_plat_data;
 extern struct clk realview_clcd_clk;
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 84a959530fb6..9741b4d3c9cf 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -155,6 +155,7 @@ static void __init realview_eb_init(void)
 
         platform_device_register(&realview_flash_device);
         platform_device_register(&realview_smc91x_device);
+        platform_device_register(&realview_i2c_device);
 
         for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
                 struct amba_device *d = amba_devs[i];
diff --git a/arch/arm/mach-rpc/irq.c b/arch/arm/mach-rpc/irq.c
index 56b2716f8cf5..7a029621db43 100644
--- a/arch/arm/mach-rpc/irq.c
+++ b/arch/arm/mach-rpc/irq.c
@@ -34,7 +34,7 @@ static void iomd_unmask_irq_a(unsigned int irq)
         iomd_writeb(val | mask, IOMD_IRQMASKA);
 }
 
-static struct irqchip iomd_a_chip = {
+static struct irq_chip iomd_a_chip = {
         .ack    = iomd_ack_irq_a,
         .mask   = iomd_mask_irq_a,
         .unmask = iomd_unmask_irq_a,
@@ -58,7 +58,7 @@ static void iomd_unmask_irq_b(unsigned int irq)
         iomd_writeb(val | mask, IOMD_IRQMASKB);
 }
 
-static struct irqchip iomd_b_chip = {
+static struct irq_chip iomd_b_chip = {
         .ack    = iomd_mask_irq_b,
         .mask   = iomd_mask_irq_b,
         .unmask = iomd_unmask_irq_b,
@@ -82,7 +82,7 @@ static void iomd_unmask_irq_dma(unsigned int irq)
         iomd_writeb(val | mask, IOMD_DMAMASK);
 }
 
-static struct irqchip iomd_dma_chip = {
+static struct irq_chip iomd_dma_chip = {
         .ack    = iomd_mask_irq_dma,
         .mask   = iomd_mask_irq_dma,
         .unmask = iomd_unmask_irq_dma,
@@ -106,7 +106,7 @@ static void iomd_unmask_irq_fiq(unsigned int irq)
         iomd_writeb(val | mask, IOMD_FIQMASK);
 }
 
-static struct irqchip iomd_fiq_chip = {
+static struct irq_chip iomd_fiq_chip = {
         .ack    = iomd_mask_irq_fiq,
         .mask   = iomd_mask_irq_fiq,
         .unmask = iomd_unmask_irq_fiq,
@@ -134,19 +134,19 @@ void __init rpc_init_irq(void)
                 switch (irq) {
                 case 0 ... 7:
                         set_irq_chip(irq, &iomd_a_chip);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, flags);
                         break;
 
                 case 8 ... 15:
                         set_irq_chip(irq, &iomd_b_chip);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, flags);
                         break;
 
                 case 16 ... 21:
                         set_irq_chip(irq, &iomd_dma_chip);
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, flags);
                         break;
 
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 63965c78de8c..eb4ec411312b 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -5,6 +5,7 @@ menu "S3C24XX Implementations"
 config MACH_AML_M5900
         bool "AML M5900 Series"
         select CPU_S3C2410
+        select PM_SIMTEC if PM
         help
            Say Y here if you are using the American Microsystems M5900 Series
            <http://www.amltd.com>
@@ -12,6 +13,7 @@ config MACH_AML_M5900
 config MACH_ANUBIS
         bool "Simtec Electronics ANUBIS"
         select CPU_S3C2440
+        select PM_SIMTEC if PM
         help
           Say Y here if you are using the Simtec Electronics ANUBIS
           development system
@@ -19,6 +21,7 @@ config MACH_ANUBIS
 config MACH_OSIRIS
         bool "Simtec IM2440D20 (OSIRIS) module"
         select CPU_S3C2440
+        select PM_SIMTEC if PM
         help
           Say Y here if you are using the Simtec IM2440D20 module, also
           known as the Osiris.
@@ -26,6 +29,7 @@ config MACH_OSIRIS
 config ARCH_BAST
         bool "Simtec Electronics BAST (EB2410ITX)"
         select CPU_S3C2410
+        select PM_SIMTEC if PM
         select ISA
         help
           Say Y here if you are using the Simtec Electronics EB2410ITX
@@ -41,9 +45,15 @@ config BAST_PC104_IRQ
           Say Y here to enable the PC104 IRQ routing on the
           Simtec BAST (EB2410ITX)
 
+config PM_H1940
+        bool
+        help
+          Internal node for H1940 and related PM
+
 config ARCH_H1940
         bool "IPAQ H1940"
         select CPU_S3C2410
+        select PM_H1940 if PM
         help
           Say Y here if you are using the HP IPAQ H1940
 
@@ -91,7 +101,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
 
@@ -105,6 +115,7 @@ config MACH_SMDK2413
 
 config MACH_VR1000
         bool "Thorcom VR1000"
+        select PM_SIMTEC if PM
         select CPU_S3C2410
         help
           Say Y here if you are using the Thorcom VR1000 board.
@@ -115,6 +126,7 @@ config MACH_VR1000
 config MACH_RX3715
         bool "HP iPAQ rx3715"
         select CPU_S3C2440
+        select PM_H1940 if PM
         help
           Say Y here if you are using the HP iPAQ rx3715.
 
@@ -148,7 +160,6 @@ config S3C2410_CLOCK
 
 config S3C2410_PM
         bool
-        depends on CONFIG_PM
         help
           Power Management code common to S3C2410 and better
 
@@ -163,7 +174,7 @@ config CPU_S3C2410
         bool
         depends on ARCH_S3C2410
         select S3C2410_CLOCK
-        select S3C2410_PM
+        select S3C2410_PM if PM
         help
           Support for S3C2410 and S3C2410A family from the S3C24XX line
           of Samsung Mobile CPUs.
@@ -178,14 +189,13 @@ config CPU_S3C2412_ONLY
 
 config S3C2412_PM
         bool
-        default y if PM
-        depends on CPU_S3C2412
         help
           Internal config node to apply S3C2412 power management
 
 config CPU_S3C2412
         bool
         depends on ARCH_S3C2410
+        select S3C2412_PM if PM
         help
           Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
 
@@ -199,7 +209,7 @@ config CPU_S3C2440
         bool
         depends on ARCH_S3C2410
         select S3C2410_CLOCK
-        select S3C2410_PM
+        select S3C2410_PM if PM
         select CPU_S3C244X
         help
           Support for S3C2440 Samsung Mobile CPU based systems.
@@ -208,7 +218,7 @@ config CPU_S3C2442
         bool
         depends on ARCH_S3C2420
         select S3C2410_CLOCK
-        select S3C2410_PM
+        select S3C2410_PM if PM
         select CPU_S3C244X
         help
           Support for S3C2442 Samsung Mobile CPU based systems.
@@ -292,8 +302,9 @@ config S3C2410_PM_CHECK_CHUNKSIZE
 
 config PM_SIMTEC
         bool
-        depends on PM && (ARCH_BAST || MACH_VR1000 || MACH_AML_M5900)
-        default y
+        help
+          Common power management code for systems that are
+          compatible with the Simtec style of power management
 
 config S3C2410_LOWLEVEL_UART_PORT
         int "S3C2410 UART to use for low-level messages"
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index d66013365b6b..27663e28cc88 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_CPU_S3C2410_DMA)	+= s3c2410-dma.o
 
 obj-$(CONFIG_PM)                += pm.o sleep.o
 obj-$(CONFIG_PM_SIMTEC)         += pm-simtec.o
+obj-$(CONFIG_PM_H1940)          += pm-h1940.o
 
 # S3C2412 support
 obj-$(CONFIG_CPU_S3C2412)       += s3c2412.o
diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c
index 23d5beea5568..379efe70778c 100644
--- a/arch/arm/mach-s3c2410/bast-irq.c
+++ b/arch/arm/mach-s3c2410/bast-irq.c
@@ -88,7 +88,7 @@ bast_pc104_mask(unsigned int irqno)
 static void
 bast_pc104_maskack(unsigned int irqno)
 {
-        struct irqdesc *desc = irq_desc + IRQ_ISA;
+        struct irq_desc *desc = irq_desc + IRQ_ISA;
 
         bast_pc104_mask(irqno);
         desc->chip->ack(IRQ_ISA);
@@ -104,7 +104,7 @@ bast_pc104_unmask(unsigned int irqno)
         __raw_writeb(temp, BAST_VA_PC104_IRQMASK);
 }
 
-static struct irqchip  bast_pc104_chip = {
+static struct irq_chip  bast_pc104_chip = {
         .mask        = bast_pc104_mask,
         .unmask      = bast_pc104_unmask,
         .ack         = bast_pc104_maskack
@@ -112,7 +112,7 @@ static struct irqchip  bast_pc104_chip = {
 
 static void
 bast_irq_pc104_demux(unsigned int irq,
-                     struct irqdesc *desc)
+                     struct irq_desc *desc)
 {
         unsigned int stat;
         unsigned int irqno;
@@ -157,7 +157,7 @@ static __init int bast_irq_init(void)
                         unsigned int irqno = bast_pc104_irqs[i];
 
                         set_irq_chip(irqno, &bast_pc104_chip);
-                        set_irq_handler(irqno, do_level_IRQ);
+                        set_irq_handler(irqno, handle_level_irq);
                         set_irq_flags(irqno, IRQF_VALID);
                 }
         }
diff --git a/arch/arm/mach-s3c2410/cpu.c b/arch/arm/mach-s3c2410/cpu.c
index 9d4899eddf1f..ae1f5bb63f7a 100644
--- a/arch/arm/mach-s3c2410/cpu.c
+++ b/arch/arm/mach-s3c2410/cpu.c
@@ -26,6 +26,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
+#include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
 #include <asm/hardware.h>
diff --git a/arch/arm/mach-s3c2410/devs.c b/arch/arm/mach-s3c2410/devs.c
index cae35ff76f33..faccde2092d2 100644
--- a/arch/arm/mach-s3c2410/devs.c
+++ b/arch/arm/mach-s3c2410/devs.c
@@ -17,6 +17,7 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c
index 3d211dc2f2f9..fa860e716b4f 100644
--- a/arch/arm/mach-s3c2410/dma.c
+++ b/arch/arm/mach-s3c2410/dma.c
@@ -1,6 +1,6 @@
 /* linux/arch/arm/mach-s3c2410/dma.c
  *
- * (c) 2003-2005,2006 Simtec Electronics
+ * Copyright (c) 2003-2005,2006 Simtec Electronics
  *      Ben Dooks <ben@simtec.co.uk>
  *
  * S3C2410 DMA core
@@ -40,7 +40,7 @@
 
 /* io map for dma */
 static void __iomem *dma_base;
-static kmem_cache_t *dma_kmem;
+static struct kmem_cache *dma_kmem;
 
 struct s3c24xx_dma_selection dma_sel;
 
@@ -1053,11 +1053,11 @@ int s3c2410_dma_config(dmach_t channel,
         if (chan == NULL)
                 return -EINVAL;
 
-        printk("Initial dcon is %08x\n", dcon);
+        pr_debug("%s: Initial dcon is %08x\n", __FUNCTION__, dcon);
 
         dcon |= chan->dcon & dma_sel.dcon_mask;
 
-        printk("New dcon is %08x\n", dcon);
+        pr_debug("%s: New dcon is %08x\n", __FUNCTION__, dcon);
 
         switch (xferunit) {
         case 1:
@@ -1271,7 +1271,7 @@ struct sysdev_class dma_sysclass = {
 
 /* kmem cache implementation */
 
-static void s3c2410_dma_cache_ctor(void *p, kmem_cache_t *c, unsigned long f)
+static void s3c2410_dma_cache_ctor(void *p, struct kmem_cache *c, unsigned long f)
 {
         memset(p, 0, sizeof(struct s3c2410_dma_buf));
 }
diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c
index 683b3491ba3c..3c0ed7871c55 100644
--- a/arch/arm/mach-s3c2410/irq.c
+++ b/arch/arm/mach-s3c2410/irq.c
@@ -180,7 +180,7 @@ s3c_irq_unmask(unsigned int irqno)
         __raw_writel(mask, S3C2410_INTMSK);
 }
 
-struct irqchip s3c_irq_level_chip = {
+struct irq_chip s3c_irq_level_chip = {
         .name           = "s3c-level",
         .ack            = s3c_irq_maskack,
         .mask           = s3c_irq_mask,
@@ -188,7 +188,7 @@ struct irqchip s3c_irq_level_chip = {
         .set_wake       = s3c_irq_wake
 };
 
-static struct irqchip s3c_irq_chip = {
+static struct irq_chip s3c_irq_chip = {
         .name           = "s3c",
         .ack            = s3c_irq_ack,
         .mask           = s3c_irq_mask,
@@ -206,18 +206,6 @@ s3c_irqext_mask(unsigned int irqno)
         mask = __raw_readl(S3C24XX_EINTMASK);
         mask |= ( 1UL << irqno);
         __raw_writel(mask, S3C24XX_EINTMASK);
-
-        if (irqno <= (IRQ_EINT7 - EXTINT_OFF)) {
-                /* check to see if all need masking */
-
-                if ((mask & (0xf << 4)) == (0xf << 4)) {
-                        /* all masked, mask the parent */
-                        s3c_irq_mask(IRQ_EINT4t7);
-                }
-        } else {
-                /* todo: the same check as above for the rest of the irq regs...*/
-
-        }
 }
 
 static void
@@ -229,7 +217,6 @@ s3c_irqext_ack(unsigned int irqno)
 
         bit = 1UL << (irqno - EXTINT_OFF);
 
-
         mask = __raw_readl(S3C24XX_EINTMASK);
 
         __raw_writel(bit, S3C24XX_EINTPEND);
@@ -258,8 +245,6 @@ s3c_irqext_unmask(unsigned int irqno)
         mask = __raw_readl(S3C24XX_EINTMASK);
         mask &= ~( 1UL << irqno);
         __raw_writel(mask, S3C24XX_EINTMASK);
-
-        s3c_irq_unmask((irqno <= (IRQ_EINT7 - EXTINT_OFF)) ? IRQ_EINT4t7 : IRQ_EINT8t23);
 }
 
 int
@@ -344,7 +329,7 @@ s3c_irqext_type(unsigned int irq, unsigned int type)
         return 0;
 }
 
-static struct irqchip s3c_irqext_chip = {
+static struct irq_chip s3c_irqext_chip = {
         .name           = "s3c-ext",
         .mask           = s3c_irqext_mask,
         .unmask         = s3c_irqext_unmask,
@@ -353,7 +338,7 @@ static struct irqchip s3c_irqext_chip = {
         .set_wake       = s3c_irqext_wake
 };
 
-static struct irqchip s3c_irq_eint0t4 = {
+static struct irq_chip s3c_irq_eint0t4 = {
         .name           = "s3c-ext0",
         .ack            = s3c_irq_ack,
         .mask           = s3c_irq_mask,
@@ -390,7 +375,7 @@ s3c_irq_uart0_ack(unsigned int irqno)
         s3c_irqsub_maskack(irqno, INTMSK_UART0, 7);
 }
 
-static struct irqchip s3c_irq_uart0 = {
+static struct irq_chip s3c_irq_uart0 = {
         .name           = "s3c-uart0",
         .mask           = s3c_irq_uart0_mask,
         .unmask         = s3c_irq_uart0_unmask,
@@ -417,7 +402,7 @@ s3c_irq_uart1_ack(unsigned int irqno)
         s3c_irqsub_maskack(irqno, INTMSK_UART1, 7 << 3);
 }
 
-static struct irqchip s3c_irq_uart1 = {
+static struct irq_chip s3c_irq_uart1 = {
         .name           = "s3c-uart1",
         .mask           = s3c_irq_uart1_mask,
         .unmask         = s3c_irq_uart1_unmask,
@@ -444,7 +429,7 @@ s3c_irq_uart2_ack(unsigned int irqno)
         s3c_irqsub_maskack(irqno, INTMSK_UART2, 7 << 6);
 }
 
-static struct irqchip s3c_irq_uart2 = {
+static struct irq_chip s3c_irq_uart2 = {
         .name           = "s3c-uart2",
         .mask           = s3c_irq_uart2_mask,
         .unmask         = s3c_irq_uart2_unmask,
@@ -471,7 +456,7 @@ s3c_irq_adc_ack(unsigned int irqno)
         s3c_irqsub_ack(irqno, INTMSK_ADCPARENT, 3 << 9);
 }
 
-static struct irqchip s3c_irq_adc = {
+static struct irq_chip s3c_irq_adc = {
         .name           = "s3c-adc",
         .mask           = s3c_irq_adc_mask,
         .unmask         = s3c_irq_adc_unmask,
@@ -480,11 +465,11 @@ static struct irqchip s3c_irq_adc = {
 
 /* irq demux for adc */
 static void s3c_irq_demux_adc(unsigned int irq,
-                              struct irqdesc *desc)
+                              struct irq_desc *desc)
 {
         unsigned int subsrc, submsk;
         unsigned int offset = 9;
-        struct irqdesc *mydesc;
+        struct irq_desc *mydesc;
 
         /* read the current pending interrupts, and the mask
          * for what it is available */
@@ -512,7 +497,7 @@ static void s3c_irq_demux_uart(unsigned int start)
 {
         unsigned int subsrc, submsk;
         unsigned int offset = start - IRQ_S3CUART_RX0;
-        struct irqdesc *desc;
+        struct irq_desc *desc;
 
         /* read the current pending interrupts, and the mask
          * for what it is available */
@@ -549,7 +534,7 @@ static void s3c_irq_demux_uart(unsigned int start)
 
 static void
 s3c_irq_demux_uart0(unsigned int irq,
-                    struct irqdesc *desc)
+                    struct irq_desc *desc)
 {
         irq = irq;
         s3c_irq_demux_uart(IRQ_S3CUART_RX0);
@@ -557,7 +542,7 @@ s3c_irq_demux_uart0(unsigned int irq,
 
 static void
 s3c_irq_demux_uart1(unsigned int irq,
-                    struct irqdesc *desc)
+                    struct irq_desc *desc)
 {
         irq = irq;
         s3c_irq_demux_uart(IRQ_S3CUART_RX1);
@@ -565,7 +550,7 @@ s3c_irq_demux_uart1(unsigned int irq,
 
 static void
 s3c_irq_demux_uart2(unsigned int irq,
-                    struct irqdesc *desc)
+                    struct irq_desc *desc)
 {
         irq = irq;
         s3c_irq_demux_uart(IRQ_S3CUART_RX2);
@@ -573,7 +558,7 @@ s3c_irq_demux_uart2(unsigned int irq,
 
 static void
 s3c_irq_demux_extint8(unsigned int irq,
-                      struct irqdesc *desc)
+                      struct irq_desc *desc)
 {
         unsigned long eintpnd = __raw_readl(S3C24XX_EINTPEND);
         unsigned long eintmsk = __raw_readl(S3C24XX_EINTMASK);
@@ -595,7 +580,7 @@ s3c_irq_demux_extint8(unsigned int irq,
 
 static void
 s3c_irq_demux_extint4t7(unsigned int irq,
-                        struct irqdesc *desc)
+                        struct irq_desc *desc)
 {
         unsigned long eintpnd = __raw_readl(S3C24XX_EINTPEND);
         unsigned long eintmsk = __raw_readl(S3C24XX_EINTMASK);
@@ -738,7 +723,7 @@ void __init s3c24xx_init_irq(void)
                 case IRQ_UART2:
                 case IRQ_ADCPARENT:
                         set_irq_chip(irqno, &s3c_irq_level_chip);
-                        set_irq_handler(irqno, do_level_IRQ);
+                        set_irq_handler(irqno, handle_level_irq);
                         break;
 
                 case IRQ_RESERVED6:
@@ -749,7 +734,7 @@ void __init s3c24xx_init_irq(void)
                 default:
                         //irqdbf("registering irq %d (s3c irq)\n", irqno);
                         set_irq_chip(irqno, &s3c_irq_chip);
-                        set_irq_handler(irqno, do_edge_IRQ);
+                        set_irq_handler(irqno, handle_edge_irq);
                         set_irq_flags(irqno, IRQF_VALID);
                 }
         }
@@ -769,14 +754,14 @@ void __init s3c24xx_init_irq(void)
         for (irqno = IRQ_EINT0; irqno <= IRQ_EINT3; irqno++) {
                 irqdbf("registering irq %d (ext int)\n", irqno);
                 set_irq_chip(irqno, &s3c_irq_eint0t4);
-                set_irq_handler(irqno, do_edge_IRQ);
+                set_irq_handler(irqno, handle_edge_irq);
                 set_irq_flags(irqno, IRQF_VALID);
         }
 
         for (irqno = IRQ_EINT4; irqno <= IRQ_EINT23; irqno++) {
                 irqdbf("registering irq %d (extended s3c irq)\n", irqno);
                 set_irq_chip(irqno, &s3c_irqext_chip);
-                set_irq_handler(irqno, do_edge_IRQ);
+                set_irq_handler(irqno, handle_edge_irq);
                 set_irq_flags(irqno, IRQF_VALID);
         }
 
@@ -787,28 +772,28 @@ void __init s3c24xx_init_irq(void)
         for (irqno = IRQ_S3CUART_RX0; irqno <= IRQ_S3CUART_ERR0; irqno++) {
                 irqdbf("registering irq %d (s3c uart0 irq)\n", irqno);
                 set_irq_chip(irqno, &s3c_irq_uart0);
-                set_irq_handler(irqno, do_level_IRQ);
+                set_irq_handler(irqno, handle_level_irq);
                 set_irq_flags(irqno, IRQF_VALID);
         }
 
         for (irqno = IRQ_S3CUART_RX1; irqno <= IRQ_S3CUART_ERR1; irqno++) {
                 irqdbf("registering irq %d (s3c uart1 irq)\n", irqno);
                 set_irq_chip(irqno, &s3c_irq_uart1);
-                set_irq_handler(irqno, do_level_IRQ);
+                set_irq_handler(irqno, handle_level_irq);
                 set_irq_flags(irqno, IRQF_VALID);
         }
 
         for (irqno = IRQ_S3CUART_RX2; irqno <= IRQ_S3CUART_ERR2; irqno++) {
                 irqdbf("registering irq %d (s3c uart2 irq)\n", irqno);
                 set_irq_chip(irqno, &s3c_irq_uart2);
-                set_irq_handler(irqno, do_level_IRQ);
+                set_irq_handler(irqno, handle_level_irq);
                 set_irq_flags(irqno, IRQF_VALID);
         }
 
         for (irqno = IRQ_TC; irqno <= IRQ_ADC; irqno++) {
                 irqdbf("registering irq %d (s3c adc irq)\n", irqno);
                 set_irq_chip(irqno, &s3c_irq_adc);
-                set_irq_handler(irqno, do_edge_IRQ);
+                set_irq_handler(irqno, handle_edge_irq);
                 set_irq_flags(irqno, IRQF_VALID);
         }
 
diff --git a/arch/arm/mach-s3c2410/irq.h b/arch/arm/mach-s3c2410/irq.h
index 842a9f42c97b..e5913da3b919 100644
--- a/arch/arm/mach-s3c2410/irq.h
+++ b/arch/arm/mach-s3c2410/irq.h
@@ -8,8 +8,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- * Modifications:
 */
 
 #define irqdbf(x...)
@@ -17,7 +15,7 @@
 
 #define EXTINT_OFF (IRQ_EINT4 - 4)
 
-extern struct irqchip s3c_irq_level_chip;
+extern struct irq_chip s3c_irq_level_chip;
 
 static inline void
 s3c_irqsub_mask(unsigned int irqno, unsigned int parentbit,
diff --git a/arch/arm/mach-s3c2410/mach-anubis.c b/arch/arm/mach-s3c2410/mach-anubis.c
index e94cdcd96591..0fad0c2fe07b 100644
--- a/arch/arm/mach-s3c2410/mach-anubis.c
+++ b/arch/arm/mach-s3c2410/mach-anubis.c
@@ -15,6 +15,7 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 2968fb235f95..b8b76757ec54 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -16,6 +16,7 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/dm9000.h>
 
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index 8c895c077d22..15b625eae499 100644
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -17,6 +17,7 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
 #include <asm/mach/arch.h>
@@ -33,14 +34,14 @@
 #include <asm/arch/regs-serial.h>
 #include <asm/arch/regs-lcd.h>
 
+#include <asm/arch/h1940.h>
 #include <asm/arch/h1940-latch.h>
 #include <asm/arch/fb.h>
 
-#include <linux/serial_core.h>
-
 #include "clock.h"
 #include "devs.h"
 #include "cpu.h"
+#include "pm.h"
 
 static struct map_desc h1940_iodesc[] __initdata = {
         [0] = {
@@ -164,12 +165,16 @@ static void __init h1940_map_io(void)
         s3c24xx_init_clocks(0);
         s3c24xx_init_uarts(h1940_uartcfgs, ARRAY_SIZE(h1940_uartcfgs));
         s3c24xx_set_board(&h1940_board);
+
+        /* setup PM */
+
+        memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);
+        s3c2410_pm_init();
 }
 
 static void __init h1940_init_irq(void)
 {
         s3c24xx_init_irq();
-
 }
 
 static void __init h1940_init(void)
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
index 116ac3169966..0411e9adb54d 100644
--- a/arch/arm/mach-s3c2410/mach-n30.c
+++ b/arch/arm/mach-s3c2410/mach-n30.c
@@ -20,6 +20,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/kthread.h>
 
@@ -37,8 +38,6 @@
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/iic.h>
 
-#include <linux/serial_core.h>
-
 #include "s3c2410.h"
 #include "clock.h"
 #include "devs.h"
diff --git a/arch/arm/mach-s3c2410/mach-nexcoder.c b/arch/arm/mach-s3c2410/mach-nexcoder.c
index 065a1d4e860b..d6dfdad8c90b 100644
--- a/arch/arm/mach-s3c2410/mach-nexcoder.c
+++ b/arch/arm/mach-s3c2410/mach-nexcoder.c
@@ -19,6 +19,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/string.h>
+#include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
 #include <linux/mtd/map.h>
diff --git a/arch/arm/mach-s3c2410/mach-osiris.c b/arch/arm/mach-s3c2410/mach-osiris.c
index e193ba69e652..37b40850c9b9 100644
--- a/arch/arm/mach-s3c2410/mach-osiris.c
+++ b/arch/arm/mach-s3c2410/mach-osiris.c
@@ -16,6 +16,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/serial_core.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -114,6 +115,15 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = {
                 .clocks      = osiris_serial_clocks,
                 .clocks_size = ARRAY_SIZE(osiris_serial_clocks),
         },
+        [2] = {
+                .hwport      = 2,
+                .flags       = 0,
+                .ucon        = UCON,
+                .ulcon       = ULCON,
+                .ufcon       = UFCON,
+                .clocks      = osiris_serial_clocks,
+                .clocks_size = ARRAY_SIZE(osiris_serial_clocks),
+        }
 };
 
 /* NAND Flash on Osiris board */
diff --git a/arch/arm/mach-s3c2410/mach-otom.c b/arch/arm/mach-s3c2410/mach-otom.c
index c71673fd9955..2c738b375e4d 100644
--- a/arch/arm/mach-s3c2410/mach-otom.c
+++ b/arch/arm/mach-s3c2410/mach-otom.c
@@ -15,6 +15,7 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-s3c2410/mach-rx3715.c b/arch/arm/mach-s3c2410/mach-rx3715.c
index 23d7c052013c..ecbcdf79d739 100644
--- a/arch/arm/mach-s3c2410/mach-rx3715.c
+++ b/arch/arm/mach-s3c2410/mach-rx3715.c
@@ -42,6 +42,7 @@
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-lcd.h>
 
+#include <asm/arch/h1940.h>
 #include <asm/arch/nand.h>
 #include <asm/arch/fb.h>
 
@@ -224,7 +225,9 @@ static void __init rx3715_init_irq(void)
 
 static void __init rx3715_init_machine(void)
 {
+        memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);
         s3c2410_pm_init();
+
         s3c24xx_fb_set_platdata(&rx3715_lcdcfg);
 }
 
diff --git a/arch/arm/mach-s3c2410/mach-smdk2410.c b/arch/arm/mach-s3c2410/mach-smdk2410.c
index b3b0171d5052..01c0c986d827 100644
--- a/arch/arm/mach-s3c2410/mach-smdk2410.c
+++ b/arch/arm/mach-s3c2410/mach-smdk2410.c
@@ -35,6 +35,7 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-s3c2410/mach-smdk2413.c b/arch/arm/mach-s3c2410/mach-smdk2413.c
index 3a4ca7f6f7b9..4f89abd7a6df 100644
--- a/arch/arm/mach-s3c2410/mach-smdk2413.c
+++ b/arch/arm/mach-s3c2410/mach-smdk2413.c
@@ -17,6 +17,7 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-s3c2410/mach-smdk2440.c b/arch/arm/mach-s3c2410/mach-smdk2440.c
index e2205ff1b0ee..2b61f4ed1da4 100644
--- a/arch/arm/mach-s3c2410/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2410/mach-smdk2440.c
@@ -19,6 +19,7 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c
index a0d7692cdb2b..a382fc095110 100644
--- a/arch/arm/mach-s3c2410/mach-vr1000.c
+++ b/arch/arm/mach-s3c2410/mach-vr1000.c
@@ -41,6 +41,7 @@
 
 #include <asm/arch/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
+#include <asm/arch/leds-gpio.h>
 
 #include "clock.h"
 #include "devs.h"
@@ -313,6 +314,50 @@ static struct platform_device vr1000_dm9k1 = {
         }
 };
 
+/* LEDS */
+
+static struct s3c24xx_led_platdata vr1000_led1_pdata = {
+        .name           = "led1",
+        .gpio           = S3C2410_GPB0,
+        .def_trigger    = "",
+};
+
+static struct s3c24xx_led_platdata vr1000_led2_pdata = {
+        .name           = "led2",
+        .gpio           = S3C2410_GPB1,
+        .def_trigger    = "",
+};
+
+static struct s3c24xx_led_platdata vr1000_led3_pdata = {
+        .name           = "led3",
+        .gpio           = S3C2410_GPB2,
+        .def_trigger    = "",
+};
+
+static struct platform_device vr1000_led1 = {
+        .name           = "s3c24xx_led",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &vr1000_led1_pdata,
+        },
+};
+
+static struct platform_device vr1000_led2 = {
+        .name           = "s3c24xx_led",
+        .id             = 2,
+        .dev            = {
+                .platform_data  = &vr1000_led2_pdata,
+        },
+};
+
+static struct platform_device vr1000_led3 = {
+        .name           = "s3c24xx_led",
+        .id             = 3,
+        .dev            = {
+                .platform_data  = &vr1000_led3_pdata,
+        },
+};
+
 /* devices for this board */
 
 static struct platform_device *vr1000_devices[] __initdata = {
@@ -325,7 +370,10 @@ static struct platform_device *vr1000_devices[] __initdata = {
         &serial_device,
         &vr1000_nor,
         &vr1000_dm9k0,
-        &vr1000_dm9k1
+        &vr1000_dm9k1,
+        &vr1000_led1,
+        &vr1000_led2,
+        &vr1000_led3,
 };
 
 static struct clk *vr1000_clocks[] = {
diff --git a/arch/arm/mach-s3c2410/mach-vstms.c b/arch/arm/mach-s3c2410/mach-vstms.c
index ea554e7c006e..0360e1055bcd 100644
--- a/arch/arm/mach-s3c2410/mach-vstms.c
+++ b/arch/arm/mach-s3c2410/mach-vstms.c
@@ -15,6 +15,7 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
 #include <linux/mtd/mtd.h>
diff --git a/arch/arm/mach-s3c2410/pm-h1940.S b/arch/arm/mach-s3c2410/pm-h1940.S
new file mode 100644
index 000000000000..7d66de7ff7db
--- /dev/null
+++ b/arch/arm/mach-s3c2410/pm-h1940.S
@@ -0,0 +1,33 @@
+/* linux/arch/arm/mach-s3c2410/pm-h1940.S
+ *
+ * Copyright (c) 2006 Ben Dooks <ben-linux@fluff.org>
+ *
+ * H1940 Suspend to RAM
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+#include <asm/hardware.h>
+#include <asm/arch/map.h>
+
+#include <asm/arch/regs-gpio.h>
+
+        .text
+        .global h1940_pm_return
+
+h1940_pm_return:
+        mov     r0, #S3C2410_PA_GPIO
+        ldr     pc, [ r0, #S3C2410_GSTATUS3 - S3C24XX_VA_GPIO ]
diff --git a/arch/arm/mach-s3c2410/pm-simtec.c b/arch/arm/mach-s3c2410/pm-simtec.c
index 42cd05e298f8..619133eb7168 100644
--- a/arch/arm/mach-s3c2410/pm-simtec.c
+++ b/arch/arm/mach-s3c2410/pm-simtec.c
@@ -27,7 +27,6 @@
 #include <asm/io.h>
 
 #include <asm/arch/map.h>
-#include <asm/arch/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-mem.h>
 
diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c
index b49a0b3b72b3..00834097eb82 100644
--- a/arch/arm/mach-s3c2410/pm.c
+++ b/arch/arm/mach-s3c2410/pm.c
@@ -34,6 +34,7 @@
 #include <linux/crc32.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
+#include <linux/serial_core.h>
 
 #include <asm/cacheflush.h>
 #include <asm/hardware.h>
diff --git a/arch/arm/mach-s3c2410/s3c2410-clock.c b/arch/arm/mach-s3c2410/s3c2410-clock.c
index 00abe199a08e..992cc6af230e 100644
--- a/arch/arm/mach-s3c2410/s3c2410-clock.c
+++ b/arch/arm/mach-s3c2410/s3c2410-clock.c
@@ -30,13 +30,18 @@
 #include <linux/clk.h>
 #include <linux/mutex.h>
 #include <linux/delay.h>
+#include <linux/serial_core.h>
+
+#include <asm/mach/map.h>
 
 #include <asm/hardware.h>
 #include <asm/io.h>
 
+#include <asm/arch/regs-serial.h>
 #include <asm/arch/regs-clock.h>
 #include <asm/arch/regs-gpio.h>
 
+#include "s3c2410.h"
 #include "clock.h"
 #include "cpu.h"
 
diff --git a/arch/arm/mach-s3c2410/s3c2410-dma.c b/arch/arm/mach-s3c2410/s3c2410-dma.c
index 51e5098b32e8..e67ba3911f11 100644
--- a/arch/arm/mach-s3c2410/s3c2410-dma.c
+++ b/arch/arm/mach-s3c2410/s3c2410-dma.c
@@ -1,6 +1,6 @@
 /* linux/arch/arm/mach-s3c2410/s3c2410-dma.c
  *
- * (c) 2006 Simtec Electronics
+ * Copyright (c) 2006 Simtec Electronics
  *      Ben Dooks <ben@simtec.co.uk>
  *
  * S3C2410 DMA selection
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/sysdev.h>
+#include <linux/serial_core.h>
 
 #include <asm/dma.h>
 #include <asm/arch/dma.h>
@@ -131,6 +132,7 @@ static int s3c2410_dma_add(struct sys_device *sysdev)
         return s3c24xx_dma_init_map(&s3c2410_dma_sel);
 }
 
+#if defined(CONFIG_CPU_S3C2410)
 static struct sysdev_driver s3c2410_dma_driver = {
         .add    = s3c2410_dma_add,
 };
@@ -141,9 +143,10 @@ static int __init s3c2410_dma_init(void)
 }
 
 arch_initcall(s3c2410_dma_init);
+#endif
 
+#if defined(CONFIG_CPU_S3C2442)
 /* S3C2442 DMA contains the same selection table as the S3C2410 */
-
 static struct sysdev_driver s3c2442_dma_driver = {
         .add    = s3c2410_dma_add,
 };
@@ -154,5 +157,5 @@ static int __init s3c2442_dma_init(void)
 }
 
 arch_initcall(s3c2442_dma_init);
-
+#endif
 
diff --git a/arch/arm/mach-s3c2410/s3c2410-pm.c b/arch/arm/mach-s3c2410/s3c2410-pm.c
index e51d76669512..8bb6e5e21f59 100644
--- a/arch/arm/mach-s3c2410/s3c2410-pm.c
+++ b/arch/arm/mach-s3c2410/s3c2410-pm.c
@@ -32,6 +32,7 @@
 #include <asm/mach-types.h>
 
 #include <asm/arch/regs-gpio.h>
+#include <asm/arch/h1940.h>
 
 #include "cpu.h"
 #include "pm.h"
@@ -52,12 +53,41 @@ static void s3c2410_pm_prepare(void)
         DBG("GSTATUS3 0x%08x\n", __raw_readl(S3C2410_GSTATUS3));
         DBG("GSTATUS4 0x%08x\n", __raw_readl(S3C2410_GSTATUS4));
 
+        if (machine_is_h1940()) {
+                void *base = phys_to_virt(H1940_SUSPEND_CHECK);
+                unsigned long ptr;
+                unsigned long calc = 0;
+
+                /* generate check for the bootloader to check on resume */
+
+                for (ptr = 0; ptr < 0x40000; ptr += 0x400)
+                        calc += __raw_readl(base+ptr);
+
+                __raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM));
+        }
+
+        /* the RX3715 uses similar code and the same H1940 and the
+         * same offsets for resume and checksum pointers */
+
+        if (machine_is_rx3715()) {
+                void *base = phys_to_virt(H1940_SUSPEND_CHECK);
+                unsigned long ptr;
+                unsigned long calc = 0;
+
+                /* generate check for the bootloader to check on resume */
+
+                for (ptr = 0; ptr < 0x40000; ptr += 0x4)
+                        calc += __raw_readl(base+ptr);
+
+                __raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM));
+        }
+
         if ( machine_is_aml_m5900() )
                 s3c2410_gpio_setpin(S3C2410_GPF2, 1);
 
 }
 
-int s3c2410_pm_resume(struct sys_device *dev)
+static int s3c2410_pm_resume(struct sys_device *dev)
 {
         unsigned long tmp;
 
@@ -81,6 +111,7 @@ static int s3c2410_pm_add(struct sys_device *dev)
         return 0;
 }
 
+#if defined(CONFIG_CPU_S3C2410)
 static struct sysdev_driver s3c2410_pm_driver = {
         .add            = s3c2410_pm_add,
         .resume         = s3c2410_pm_resume,
@@ -94,7 +125,9 @@ static int __init s3c2410_pm_drvinit(void)
 }
 
 arch_initcall(s3c2410_pm_drvinit);
+#endif
 
+#if defined(CONFIG_CPU_S3C2440)
 static struct sysdev_driver s3c2440_pm_driver = {
         .add            = s3c2410_pm_add,
         .resume         = s3c2410_pm_resume,
@@ -106,7 +139,9 @@ static int __init s3c2440_pm_drvinit(void)
 }
 
 arch_initcall(s3c2440_pm_drvinit);
+#endif
 
+#if defined(CONFIG_CPU_S3C2442)
 static struct sysdev_driver s3c2442_pm_driver = {
         .add            = s3c2410_pm_add,
         .resume         = s3c2410_pm_resume,
@@ -118,3 +153,4 @@ static int __init s3c2442_pm_drvinit(void)
 }
 
 arch_initcall(s3c2442_pm_drvinit);
+#endif
diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c
index 183e4033ce61..4cdc0d70c19f 100644
--- a/arch/arm/mach-s3c2410/s3c2410.c
+++ b/arch/arm/mach-s3c2410/s3c2410.c
@@ -17,6 +17,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/sysdev.h>
+#include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
 #include <asm/mach/arch.h>
@@ -38,11 +39,9 @@
 /* Initial IO mappings */
 
 static struct map_desc s3c2410_iodesc[] __initdata = {
-        IODESC_ENT(USBHOST),
         IODESC_ENT(CLKPWR),
         IODESC_ENT(LCD),
         IODESC_ENT(TIMER),
-        IODESC_ENT(ADC),
         IODESC_ENT(WATCHDOG),
 };
 
diff --git a/arch/arm/mach-s3c2410/s3c2412-clock.c b/arch/arm/mach-s3c2410/s3c2412-clock.c
index c95ed3e18580..8f94ad83901d 100644
--- a/arch/arm/mach-s3c2410/s3c2412-clock.c
+++ b/arch/arm/mach-s3c2410/s3c2412-clock.c
@@ -30,13 +30,18 @@
 #include <linux/clk.h>
 #include <linux/mutex.h>
 #include <linux/delay.h>
+#include <linux/serial_core.h>
+
+#include <asm/mach/map.h>
 
 #include <asm/hardware.h>
 #include <asm/io.h>
 
+#include <asm/arch/regs-serial.h>
 #include <asm/arch/regs-clock.h>
 #include <asm/arch/regs-gpio.h>
 
+#include "s3c2412.h"
 #include "clock.h"
 #include "cpu.h"
 
@@ -49,7 +54,7 @@
  * set the correct muxing at initialisation
 */
 
-int s3c2412_clkcon_enable(struct clk *clk, int enable)
+static int s3c2412_clkcon_enable(struct clk *clk, int enable)
 {
         unsigned int clocks = clk->ctrlbit;
         unsigned long clkcon;
@@ -556,7 +561,7 @@ struct clk_init {
         struct clk      *src_1;
 };
 
-struct clk_init clks_src[] __initdata = {
+static struct clk_init clks_src[] __initdata = {
         {
                 .clk    = &clk_usysclk,
                 .bit    = S3C2412_CLKSRC_USBCLK_HCLK,
@@ -619,7 +624,7 @@ static void __init s3c2412_clk_initparents(void)
 
 /* clocks to add straight away */
 
-struct clk *clks[] __initdata = {
+static struct clk *clks[] __initdata = {
         &clk_ext,
         &clk_usb_bus,
         &clk_erefclk,
diff --git a/arch/arm/mach-s3c2410/s3c2412-dma.c b/arch/arm/mach-s3c2410/s3c2412-dma.c
index 171f3706d36d..fe71a8fdb87c 100644
--- a/arch/arm/mach-s3c2410/s3c2412-dma.c
+++ b/arch/arm/mach-s3c2410/s3c2412-dma.c
@@ -1,6 +1,6 @@
 /* linux/arch/arm/mach-s3c2410/s3c2412-dma.c
  *
- * (c) 2006 Simtec Electronics
+ * Copyright (c) 2006 Simtec Electronics
  *      Ben Dooks <ben@simtec.co.uk>
  *
  * S3C2412 DMA selection
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/sysdev.h>
+#include <linux/serial_core.h>
 
 #include <asm/dma.h>
 #include <asm/arch/dma.h>
diff --git a/arch/arm/mach-s3c2410/s3c2412-irq.c b/arch/arm/mach-s3c2410/s3c2412-irq.c
index 7f741547658f..ffcc30b23a80 100644
--- a/arch/arm/mach-s3c2410/s3c2412-irq.c
+++ b/arch/arm/mach-s3c2410/s3c2412-irq.c
@@ -98,7 +98,7 @@ s3c2412_irq_unmask(unsigned int irqno)
         __raw_writel(mask & ~bitval, S3C2410_INTMSK);
 }
 
-static struct irqchip s3c2412_irq_eint0t4 = {
+static struct irq_chip s3c2412_irq_eint0t4 = {
         .ack       = s3c2412_irq_ack,
         .mask      = s3c2412_irq_mask,
         .unmask    = s3c2412_irq_unmask,
@@ -112,7 +112,7 @@ static int s3c2412_irq_add(struct sys_device *sysdev)
 
         for (irqno = IRQ_EINT0; irqno <= IRQ_EINT3; irqno++) {
                 set_irq_chip(irqno, &s3c2412_irq_eint0t4);
-                set_irq_handler(irqno, do_edge_IRQ);
+                set_irq_handler(irqno, handle_edge_irq);
                 set_irq_flags(irqno, IRQF_VALID);
         }
 
diff --git a/arch/arm/mach-s3c2410/s3c2412.c b/arch/arm/mach-s3c2410/s3c2412.c
index e76431c41461..2f651a811ecd 100644
--- a/arch/arm/mach-s3c2410/s3c2412.c
+++ b/arch/arm/mach-s3c2410/s3c2412.c
@@ -17,6 +17,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/sysdev.h>
+#include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
 #include <asm/mach/arch.h>
@@ -60,7 +61,6 @@ static struct map_desc s3c2412_iodesc[] __initdata = {
         IODESC_ENT(CLKPWR),
         IODESC_ENT(LCD),
         IODESC_ENT(TIMER),
-        IODESC_ENT(ADC),
         IODESC_ENT(WATCHDOG),
 };
 
diff --git a/arch/arm/mach-s3c2410/s3c2440-clock.c b/arch/arm/mach-s3c2410/s3c2440-clock.c
index 15796864d010..ba13c1d079d1 100644
--- a/arch/arm/mach-s3c2410/s3c2440-clock.c
+++ b/arch/arm/mach-s3c2410/s3c2440-clock.c
@@ -113,18 +113,18 @@ static int s3c2440_clk_add(struct sys_device *sysdev)
 {
         unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN);
         unsigned long clkdivn;
-        struct clk *clk_h;
-        struct clk *clk_p;
-        struct clk *clk_upll;
+        struct clk *clock_h;
+        struct clk *clock_p;
+        struct clk *clock_upll;
 
         printk("S3C2440: Clock Support, DVS %s\n",
                (camdivn & S3C2440_CAMDIVN_DVSEN) ? "on" : "off");
 
-        clk_p = clk_get(NULL, "pclk");
-        clk_h = clk_get(NULL, "hclk");
-        clk_upll = clk_get(NULL, "upll");
+        clock_p = clk_get(NULL, "pclk");
+        clock_h = clk_get(NULL, "hclk");
+        clock_upll = clk_get(NULL, "upll");
 
-        if (IS_ERR(clk_p) || IS_ERR(clk_h) || IS_ERR(clk_upll)) {
+        if (IS_ERR(clock_p) || IS_ERR(clock_h) || IS_ERR(clock_upll)) {
                 printk(KERN_ERR "S3C2440: Failed to get parent clocks\n");
                 return -EINVAL;
         }
@@ -132,8 +132,8 @@ static int s3c2440_clk_add(struct sys_device *sysdev)
         /* check rate of UPLL, and if it is near 96MHz, then change
          * to using half the UPLL rate for the system */
 
-        if (clk_get_rate(clk_upll) > (94 * MHZ)) {
-                clk_usb_bus.rate = clk_get_rate(clk_upll) / 2;
+        if (clk_get_rate(clock_upll) > (94 * MHZ)) {
+                clk_usb_bus.rate = clk_get_rate(clock_upll) / 2;
 
                 mutex_lock(&clocks_mutex);
 
@@ -144,9 +144,9 @@ static int s3c2440_clk_add(struct sys_device *sysdev)
                 mutex_unlock(&clocks_mutex);
         }
 
-        s3c2440_clk_cam.parent = clk_h;
-        s3c2440_clk_ac97.parent = clk_p;
-        s3c2440_clk_cam_upll.parent = clk_upll;
+        s3c2440_clk_cam.parent = clock_h;
+        s3c2440_clk_ac97.parent = clock_p;
+        s3c2440_clk_cam_upll.parent = clock_upll;
 
         s3c24xx_register_clock(&s3c2440_clk_ac97);
         s3c24xx_register_clock(&s3c2440_clk_cam);
diff --git a/arch/arm/mach-s3c2410/s3c2440-dma.c b/arch/arm/mach-s3c2410/s3c2440-dma.c
index 11e109c84a15..47b861b9443d 100644
--- a/arch/arm/mach-s3c2410/s3c2440-dma.c
+++ b/arch/arm/mach-s3c2410/s3c2440-dma.c
@@ -1,6 +1,6 @@
 /* linux/arch/arm/mach-s3c2410/s3c2440-dma.c
  *
- * (c) 2006 Simtec Electronics
+ * Copyright (c) 2006 Simtec Electronics
  *      Ben Dooks <ben@simtec.co.uk>
  *
  * S3C2440 DMA selection
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/sysdev.h>
+#include <linux/serial_core.h>
 
 #include <asm/dma.h>
 #include <asm/arch/dma.h>
diff --git a/arch/arm/mach-s3c2410/s3c2440-irq.c b/arch/arm/mach-s3c2410/s3c2440-irq.c
index 39db0752d53b..1ba19b27ab05 100644
--- a/arch/arm/mach-s3c2410/s3c2440-irq.c
+++ b/arch/arm/mach-s3c2410/s3c2440-irq.c
@@ -42,10 +42,10 @@
 /* WDT/AC97 */
 
 static void s3c_irq_demux_wdtac97(unsigned int irq,
-                                  struct irqdesc *desc)
+                                  struct irq_desc *desc)
 {
         unsigned int subsrc, submsk;
-        struct irqdesc *mydesc;
+        struct irq_desc *mydesc;
 
         /* read the current pending interrupts, and the mask
          * for what it is available */
@@ -90,7 +90,7 @@ s3c_irq_wdtac97_ack(unsigned int irqno)
         s3c_irqsub_maskack(irqno, INTMSK_WDT, 3<<13);
 }
 
-static struct irqchip s3c_irq_wdtac97 = {
+static struct irq_chip s3c_irq_wdtac97 = {
         .mask       = s3c_irq_wdtac97_mask,
         .unmask     = s3c_irq_wdtac97_unmask,
         .ack        = s3c_irq_wdtac97_ack,
@@ -105,12 +105,12 @@ static int s3c2440_irq_add(struct sys_device *sysdev)
         /* add new chained handler for wdt, ac7 */
 
         set_irq_chip(IRQ_WDT, &s3c_irq_level_chip);
-        set_irq_handler(IRQ_WDT, do_level_IRQ);
+        set_irq_handler(IRQ_WDT, handle_level_irq);
         set_irq_chained_handler(IRQ_WDT, s3c_irq_demux_wdtac97);
 
         for (irqno = IRQ_S3C2440_WDT; irqno <= IRQ_S3C2440_AC97; irqno++) {
                 set_irq_chip(irqno, &s3c_irq_wdtac97);
-                set_irq_handler(irqno, do_level_IRQ);
+                set_irq_handler(irqno, handle_level_irq);
                 set_irq_flags(irqno, IRQF_VALID);
         }
 
diff --git a/arch/arm/mach-s3c2410/s3c2440.c b/arch/arm/mach-s3c2410/s3c2440.c
index 0ab50f44f318..344eb27cca48 100644
--- a/arch/arm/mach-s3c2410/s3c2440.c
+++ b/arch/arm/mach-s3c2410/s3c2440.c
@@ -17,6 +17,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/serial_core.h>
 #include <linux/sysdev.h>
 #include <linux/clk.h>
 
@@ -28,17 +29,9 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-gpioj.h>
-#include <asm/arch/regs-dsc.h>
-
 #include "s3c2440.h"
-#include "clock.h"
 #include "devs.h"
 #include "cpu.h"
-#include "pm.h"
 
 static struct sys_device s3c2440_sysdev = {
         .cls            = &s3c2440_sysclass,
diff --git a/arch/arm/mach-s3c2410/s3c2440.h b/arch/arm/mach-s3c2410/s3c2440.h
index 29cb6df65a48..dcd316076c59 100644
--- a/arch/arm/mach-s3c2410/s3c2440.h
+++ b/arch/arm/mach-s3c2410/s3c2440.h
@@ -8,28 +8,10 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- * Modifications:
- *      24-Aug-2004 BJD  Start of S3C2440 CPU support
- *      04-Nov-2004 BJD  Added s3c2440_init_uarts()
- *      04-Jan-2005 BJD  Moved uart init to cpu code
- *      10-Jan-2005 BJD  Moved 2440 specific init here
- *      14-Jan-2005 BJD  Split the clock initialisation code
 */
 
 #ifdef CONFIG_CPU_S3C2440
-
 extern  int s3c2440_init(void);
-
-extern void s3c2440_map_io(struct map_desc *mach_desc, int size);
-
-extern void s3c2440_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
-extern void s3c2440_init_clocks(int xtal);
-
 #else
-#define s3c2440_init_clocks NULL
-#define s3c2440_init_uarts NULL
-#define s3c2440_map_io NULL
 #define s3c2440_init NULL
 #endif
diff --git a/arch/arm/mach-s3c2410/s3c2442-clock.c b/arch/arm/mach-s3c2410/s3c2442-clock.c
index d9f54b5cab7f..4e292ca7c9be 100644
--- a/arch/arm/mach-s3c2410/s3c2442-clock.c
+++ b/arch/arm/mach-s3c2410/s3c2442-clock.c
@@ -117,18 +117,18 @@ static int s3c2442_clk_add(struct sys_device *sysdev)
 {
         unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN);
         unsigned long clkdivn;
-        struct clk *clk_h;
-        struct clk *clk_p;
-        struct clk *clk_upll;
+        struct clk *clock_h;
+        struct clk *clock_p;
+        struct clk *clock_upll;
 
         printk("S3C2442: Clock Support, DVS %s\n",
                (camdivn & S3C2440_CAMDIVN_DVSEN) ? "on" : "off");
 
-        clk_p = clk_get(NULL, "pclk");
-        clk_h = clk_get(NULL, "hclk");
-        clk_upll = clk_get(NULL, "upll");
+        clock_p = clk_get(NULL, "pclk");
+        clock_h = clk_get(NULL, "hclk");
+        clock_upll = clk_get(NULL, "upll");
 
-        if (IS_ERR(clk_p) || IS_ERR(clk_h) || IS_ERR(clk_upll)) {
+        if (IS_ERR(clock_p) || IS_ERR(clock_h) || IS_ERR(clock_upll)) {
                 printk(KERN_ERR "S3C2442: Failed to get parent clocks\n");
                 return -EINVAL;
         }
@@ -136,8 +136,8 @@ static int s3c2442_clk_add(struct sys_device *sysdev)
         /* check rate of UPLL, and if it is near 96MHz, then change
          * to using half the UPLL rate for the system */
 
-        if (clk_get_rate(clk_upll) > (94 * MHZ)) {
-                clk_usb_bus.rate = clk_get_rate(clk_upll) / 2;
+        if (clk_get_rate(clock_upll) > (94 * MHZ)) {
+                clk_usb_bus.rate = clk_get_rate(clock_upll) / 2;
 
                 mutex_lock(&clocks_mutex);
 
@@ -148,8 +148,8 @@ static int s3c2442_clk_add(struct sys_device *sysdev)
                 mutex_unlock(&clocks_mutex);
         }
 
-        s3c2442_clk_cam.parent = clk_h;
-        s3c2442_clk_cam_upll.parent = clk_upll;
+        s3c2442_clk_cam.parent = clock_h;
+        s3c2442_clk_cam_upll.parent = clock_upll;
 
         s3c24xx_register_clock(&s3c2442_clk_cam);
         s3c24xx_register_clock(&s3c2442_clk_cam_upll);
diff --git a/arch/arm/mach-s3c2410/s3c2442.c b/arch/arm/mach-s3c2410/s3c2442.c
index 581667efd13c..428732ee68c4 100644
--- a/arch/arm/mach-s3c2410/s3c2442.c
+++ b/arch/arm/mach-s3c2410/s3c2442.c
@@ -16,29 +16,11 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
-#include <linux/platform_device.h>
+#include <linux/serial_core.h>
 #include <linux/sysdev.h>
-#include <linux/clk.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <asm/hardware.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-gpioj.h>
-#include <asm/arch/regs-dsc.h>
 
 #include "s3c2442.h"
-#include "clock.h"
-#include "devs.h"
 #include "cpu.h"
-#include "pm.h"
 
 static struct sys_device s3c2442_sysdev = {
         .cls            = &s3c2442_sysclass,
diff --git a/arch/arm/mach-s3c2410/s3c244x-irq.c b/arch/arm/mach-s3c2410/s3c244x-irq.c
index 146f2109dd90..ede94636a72a 100644
--- a/arch/arm/mach-s3c2410/s3c244x-irq.c
+++ b/arch/arm/mach-s3c2410/s3c244x-irq.c
@@ -42,10 +42,10 @@
 /* camera irq */
 
 static void s3c_irq_demux_cam(unsigned int irq,
-                              struct irqdesc *desc)
+                              struct irq_desc *desc)
 {
         unsigned int subsrc, submsk;
-        struct irqdesc *mydesc;
+        struct irq_desc *mydesc;
 
         /* read the current pending interrupts, and the mask
          * for what it is available */
@@ -89,7 +89,7 @@ s3c_irq_cam_ack(unsigned int irqno)
         s3c_irqsub_maskack(irqno, INTMSK_CAM, 3<<11);
 }
 
-static struct irqchip s3c_irq_cam = {
+static struct irq_chip s3c_irq_cam = {
         .mask       = s3c_irq_cam_mask,
         .unmask     = s3c_irq_cam_unmask,
         .ack        = s3c_irq_cam_ack,
@@ -100,18 +100,18 @@ static int s3c244x_irq_add(struct sys_device *sysdev)
         unsigned int irqno;
 
         set_irq_chip(IRQ_NFCON, &s3c_irq_level_chip);
-        set_irq_handler(IRQ_NFCON, do_level_IRQ);
+        set_irq_handler(IRQ_NFCON, handle_level_irq);
         set_irq_flags(IRQ_NFCON, IRQF_VALID);
 
         /* add chained handler for camera */
 
         set_irq_chip(IRQ_CAM, &s3c_irq_level_chip);
-        set_irq_handler(IRQ_CAM, do_level_IRQ);
+        set_irq_handler(IRQ_CAM, handle_level_irq);
         set_irq_chained_handler(IRQ_CAM, s3c_irq_demux_cam);
 
         for (irqno = IRQ_S3C2440_CAM_C; irqno <= IRQ_S3C2440_CAM_P; irqno++) {
                 set_irq_chip(irqno, &s3c_irq_cam);
-                set_irq_handler(irqno, do_level_IRQ);
+                set_irq_handler(irqno, handle_level_irq);
                 set_irq_flags(irqno, IRQF_VALID);
         }
 
diff --git a/arch/arm/mach-s3c2410/s3c244x.c b/arch/arm/mach-s3c2410/s3c244x.c
index 9a2258270de9..23c7494ad10d 100644
--- a/arch/arm/mach-s3c2410/s3c244x.c
+++ b/arch/arm/mach-s3c2410/s3c244x.c
@@ -16,6 +16,7 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/sysdev.h>
 #include <linux/clk.h>
@@ -47,8 +48,6 @@ static struct map_desc s3c244x_iodesc[] __initdata = {
         IODESC_ENT(TIMER),
         IODESC_ENT(WATCHDOG),
         IODESC_ENT(LCD),
-        IODESC_ENT(ADC),
-        IODESC_ENT(USBHOST),
 };
 
 /* uart initialisation */
diff --git a/arch/arm/mach-s3c2410/usb-simtec.h b/arch/arm/mach-s3c2410/usb-simtec.h
index d8aa6127dedb..03842ede9e71 100644
--- a/arch/arm/mach-s3c2410/usb-simtec.h
+++ b/arch/arm/mach-s3c2410/usb-simtec.h
@@ -10,9 +10,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- * Modifications:
- *      20-Aug-2004 BJD  Created
 */
 
 extern int usb_simtec_init(void);
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c
index 4575f316e141..e510295c2580 100644
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@ -20,6 +20,7 @@
 #include <linux/platform_device.h>
 
 #include <asm/div64.h>
+#include <asm/cnt32_to_63.h>
 #include <asm/hardware.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
@@ -118,15 +119,21 @@ EXPORT_SYMBOL(cpufreq_get);
 
 /*
  * This is the SA11x0 sched_clock implementation.  This has
- * a resolution of 271ns, and a maximum value of 1165s.
+ * a resolution of 271ns, and a maximum value of 32025597s (370 days).
+ *
+ * The return value is guaranteed to be monotonic in that range as
+ * long as there is always less than 582 seconds between successive
+ * calls to this function.
+ *
  *  ( * 1E9 / 3686400 => * 78125 / 288)
  */
 unsigned long long sched_clock(void)
 {
-        unsigned long long v;
+        unsigned long long v = cnt32_to_63(OSCR);
 
-        v = (unsigned long long)OSCR * 78125;
-        do_div(v, 288);
+        /* the <<1 gets rid of the cnt_32_to_63 top bit saving on a bic insn */
+        v *= 78125<<1;
+        do_div(v, 288<<1);
 
         return v;
 }
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index fa6dc71bd6ad..b034ad69a324 100644
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -702,7 +702,7 @@ static u32 gpio_irq_mask[] = {
         GPIO2_SD_CON_SLT,
 };
 
-static void h3800_IRQ_demux(unsigned int irq, struct irqdesc *desc)
+static void h3800_IRQ_demux(unsigned int irq, struct irq_desc *desc)
 {
         int i;
 
@@ -719,14 +719,14 @@ static void h3800_IRQ_demux(unsigned int irq, struct irqdesc *desc)
                 if (0) printk("%s KPIO 0x%08X\n", __FUNCTION__, irq);
                 for (j = 0; j < H3800_KPIO_IRQ_COUNT; j++)
                         if (irq & kpio_irq_mask[j])
-                                do_edge_IRQ(H3800_KPIO_IRQ_COUNT + j, irq_desc + H3800_KPIO_IRQ_COUNT + j);
+                                handle_edge_irq(H3800_KPIO_IRQ_COUNT + j, irq_desc + H3800_KPIO_IRQ_COUNT + j);
 
                 /* GPIO2 */
                 irq = H3800_ASIC2_GPIINTFLAG;
                 if (0) printk("%s GPIO 0x%08X\n", __FUNCTION__, irq);
                 for (j = 0; j < H3800_GPIO_IRQ_COUNT; j++)
                         if (irq & gpio_irq_mask[j])
-                                do_edge_IRQ(H3800_GPIO_IRQ_COUNT + j, irq_desc + H3800_GPIO_IRQ_COUNT + j);
+                                handle_edge_irq(H3800_GPIO_IRQ_COUNT + j, irq_desc + H3800_GPIO_IRQ_COUNT + j);
         }
 
         if (i >= MAX_ASIC_ISR_LOOPS)
diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c
index f4c6322ca33e..5642aeca079e 100644
--- a/arch/arm/mach-sa1100/irq.c
+++ b/arch/arm/mach-sa1100/irq.c
@@ -110,7 +110,7 @@ static struct irq_chip sa1100_low_gpio_chip = {
  * and call the handler.
  */
 static void
-sa1100_high_gpio_handler(unsigned int irq, struct irqdesc *desc)
+sa1100_high_gpio_handler(unsigned int irq, struct irq_desc *desc)
 {
         unsigned int mask;
 
@@ -327,19 +327,19 @@ void __init sa1100_init_irq(void)
 
         for (irq = 0; irq <= 10; irq++) {
                 set_irq_chip(irq, &sa1100_low_gpio_chip);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
         for (irq = 12; irq <= 31; irq++) {
                 set_irq_chip(irq, &sa1100_normal_chip);
-                set_irq_handler(irq, do_level_IRQ);
+                set_irq_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID);
         }
 
         for (irq = 32; irq <= 48; irq++) {
                 set_irq_chip(irq, &sa1100_high_gpio_chip);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index 17f5a43acdb7..54ecdaa373d6 100644
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@ -1,5 +1,15 @@
 /*
  * linux/arch/arm/mach-sa1100/jornada720.c
+ *
+ * HP Jornada720 init code
+ *
+ * Copyright (C) 2006 Filip Zyzniewski <filip.zyzniewski@tefnet.pl>
+ *  Copyright (C) 2005 Michael Gernoth <michael@gernoth.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
  */
 
 #include <linux/init.h>
@@ -10,13 +20,13 @@
 #include <linux/ioport.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
+#include <video/s1d13xxxfb.h>
 
 #include <asm/hardware.h>
 #include <asm/hardware/sa1111.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/setup.h>
-
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
@@ -24,13 +34,170 @@
 
 #include "generic.h"
 
+/*
+ * HP Documentation referred in this file:
+ * http://www.jlime.com/downloads/development/docs/jornada7xx/jornada720.txt
+ */
+
+/* line 110 of HP's doc */
+#define TUCR_VAL        0x20000400
+
+/* memory space (line 52 of HP's doc) */
+#define SA1111REGSTART  0x40000000
+#define SA1111REGLEN    0x00001fff
+#define EPSONREGSTART   0x48000000
+#define EPSONREGLEN     0x00100000
+#define EPSONFBSTART    0x48200000
+/* 512kB framebuffer */
+#define EPSONFBLEN      512*1024
+
+static struct s1d13xxxfb_regval s1d13xxxfb_initregs[] = {
+        /* line 344 of HP's doc */
+        {0x0001,0x00},  // Miscellaneous Register
+        {0x01FC,0x00},  // Display Mode Register
+        {0x0004,0x00},  // General IO Pins Configuration Register 0
+        {0x0005,0x00},  // General IO Pins Configuration Register 1
+        {0x0008,0x00},  // General IO Pins Control Register 0
+        {0x0009,0x00},  // General IO Pins Control Register 1
+        {0x0010,0x01},  // Memory Clock Configuration Register
+        {0x0014,0x11},  // LCD Pixel Clock Configuration Register
+        {0x0018,0x01},  // CRT/TV Pixel Clock Configuration Register
+        {0x001C,0x01},  // MediaPlug Clock Configuration Register
+        {0x001E,0x01},  // CPU To Memory Wait State Select Register
+        {0x0020,0x00},  // Memory Configuration Register
+        {0x0021,0x45},  // DRAM Refresh Rate Register
+        {0x002A,0x01},  // DRAM Timings Control Register 0
+        {0x002B,0x03},  // DRAM Timings Control Register 1
+        {0x0030,0x1c},  // Panel Type Register
+        {0x0031,0x00},  // MOD Rate Register
+        {0x0032,0x4F},  // LCD Horizontal Display Width Register
+        {0x0034,0x07},  // LCD Horizontal Non-Display Period Register
+        {0x0035,0x01},  // TFT FPLINE Start Position Register
+        {0x0036,0x0B},  // TFT FPLINE Pulse Width Register
+        {0x0038,0xEF},  // LCD Vertical Display Height Register 0
+        {0x0039,0x00},  // LCD Vertical Display Height Register 1
+        {0x003A,0x13},  // LCD Vertical Non-Display Period Register
+        {0x003B,0x0B},  // TFT FPFRAME Start Position Register
+        {0x003C,0x01},  // TFT FPFRAME Pulse Width Register
+        {0x0040,0x05},  // LCD Display Mode Register (2:4bpp,3:8bpp,5:16bpp)
+        {0x0041,0x00},  // LCD Miscellaneous Register
+        {0x0042,0x00},  // LCD Display Start Address Register 0
+        {0x0043,0x00},  // LCD Display Start Address Register 1
+        {0x0044,0x00},  // LCD Display Start Address Register 2
+        {0x0046,0x80},  // LCD Memory Address Offset Register 0
+        {0x0047,0x02},  // LCD Memory Address Offset Register 1
+        {0x0048,0x00},  // LCD Pixel Panning Register
+        {0x004A,0x00},  // LCD Display FIFO High Threshold Control Register
+        {0x004B,0x00},  // LCD Display FIFO Low Threshold Control Register
+        {0x0050,0x4F},  // CRT/TV Horizontal Display Width Register
+        {0x0052,0x13},  // CRT/TV Horizontal Non-Display Period Register
+        {0x0053,0x01},  // CRT/TV HRTC Start Position Register
+        {0x0054,0x0B},  // CRT/TV HRTC Pulse Width Register
+        {0x0056,0xDF},  // CRT/TV Vertical Display Height Register 0
+        {0x0057,0x01},  // CRT/TV Vertical Display Height Register 1
+        {0x0058,0x2B},  // CRT/TV Vertical Non-Display Period Register
+        {0x0059,0x09},  // CRT/TV VRTC Start Position Register
+        {0x005A,0x01},  // CRT/TV VRTC Pulse Width Register
+        {0x005B,0x10},  // TV Output Control Register
+        {0x0060,0x03},  // CRT/TV Display Mode Register (2:4bpp,3:8bpp,5:16bpp)
+        {0x0062,0x00},  // CRT/TV Display Start Address Register 0
+        {0x0063,0x00},  // CRT/TV Display Start Address Register 1
+        {0x0064,0x00},  // CRT/TV Display Start Address Register 2
+        {0x0066,0x40},  // CRT/TV Memory Address Offset Register 0
+        {0x0067,0x01},  // CRT/TV Memory Address Offset Register 1
+        {0x0068,0x00},  // CRT/TV Pixel Panning Register
+        {0x006A,0x00},  // CRT/TV Display FIFO High Threshold Control Register
+        {0x006B,0x00},  // CRT/TV Display FIFO Low Threshold Control Register
+        {0x0070,0x00},  // LCD Ink/Cursor Control Register
+        {0x0071,0x01},  // LCD Ink/Cursor Start Address Register
+        {0x0072,0x00},  // LCD Cursor X Position Register 0
+        {0x0073,0x00},  // LCD Cursor X Position Register 1
+        {0x0074,0x00},  // LCD Cursor Y Position Register 0
+        {0x0075,0x00},  // LCD Cursor Y Position Register 1
+        {0x0076,0x00},  // LCD Ink/Cursor Blue Color 0 Register
+        {0x0077,0x00},  // LCD Ink/Cursor Green Color 0 Register
+        {0x0078,0x00},  // LCD Ink/Cursor Red Color 0 Register
+        {0x007A,0x1F},  // LCD Ink/Cursor Blue Color 1 Register
+        {0x007B,0x3F},  // LCD Ink/Cursor Green Color 1 Register
+        {0x007C,0x1F},  // LCD Ink/Cursor Red Color 1 Register
+        {0x007E,0x00},  // LCD Ink/Cursor FIFO Threshold Register
+        {0x0080,0x00},  // CRT/TV Ink/Cursor Control Register
+        {0x0081,0x01},  // CRT/TV Ink/Cursor Start Address Register
+        {0x0082,0x00},  // CRT/TV Cursor X Position Register 0
+        {0x0083,0x00},  // CRT/TV Cursor X Position Register 1
+        {0x0084,0x00},  // CRT/TV Cursor Y Position Register 0
+        {0x0085,0x00},  // CRT/TV Cursor Y Position Register 1
+        {0x0086,0x00},  // CRT/TV Ink/Cursor Blue Color 0 Register
+        {0x0087,0x00},  // CRT/TV Ink/Cursor Green Color 0 Register
+        {0x0088,0x00},  // CRT/TV Ink/Cursor Red Color 0 Register
+        {0x008A,0x1F},  // CRT/TV Ink/Cursor Blue Color 1 Register
+        {0x008B,0x3F},  // CRT/TV Ink/Cursor Green Color 1 Register
+        {0x008C,0x1F},  // CRT/TV Ink/Cursor Red Color 1 Register
+        {0x008E,0x00},  // CRT/TV Ink/Cursor FIFO Threshold Register
+        {0x0100,0x00},  // BitBlt Control Register 0
+        {0x0101,0x00},  // BitBlt Control Register 1
+        {0x0102,0x00},  // BitBlt ROP Code/Color Expansion Register
+        {0x0103,0x00},  // BitBlt Operation Register
+        {0x0104,0x00},  // BitBlt Source Start Address Register 0
+        {0x0105,0x00},  // BitBlt Source Start Address Register 1
+        {0x0106,0x00},  // BitBlt Source Start Address Register 2
+        {0x0108,0x00},  // BitBlt Destination Start Address Register 0
+        {0x0109,0x00},  // BitBlt Destination Start Address Register 1
+        {0x010A,0x00},  // BitBlt Destination Start Address Register 2
+        {0x010C,0x00},  // BitBlt Memory Address Offset Register 0
+        {0x010D,0x00},  // BitBlt Memory Address Offset Register 1
+        {0x0110,0x00},  // BitBlt Width Register 0
+        {0x0111,0x00},  // BitBlt Width Register 1
+        {0x0112,0x00},  // BitBlt Height Register 0
+        {0x0113,0x00},  // BitBlt Height Register 1
+        {0x0114,0x00},  // BitBlt Background Color Register 0
+        {0x0115,0x00},  // BitBlt Background Color Register 1
+        {0x0118,0x00},  // BitBlt Foreground Color Register 0
+        {0x0119,0x00},  // BitBlt Foreground Color Register 1
+        {0x01E0,0x00},  // Look-Up Table Mode Register
+        {0x01E2,0x00},  // Look-Up Table Address Register
+        /* not sure, wouldn't like to mess with the driver */
+        {0x01E4,0x00},  // Look-Up Table Data Register
+        /* jornada doc says 0x00, but I trust the driver */
+        {0x01F0,0x10},  // Power Save Configuration Register
+        {0x01F1,0x00},  // Power Save Status Register
+        {0x01F4,0x00},  // CPU-to-Memory Access Watchdog Timer Register
+        {0x01FC,0x01},  // Display Mode Register(0x01:LCD, 0x02:CRT, 0x03:LCD&CRT)
+};
+
+static struct s1d13xxxfb_pdata s1d13xxxfb_data = {
+        .initregs               = s1d13xxxfb_initregs,
+        .initregssize           = ARRAY_SIZE(s1d13xxxfb_initregs),
+        .platform_init_video    = NULL
+};
 
-#define JORTUCR_VAL     0x20000400
+static struct resource s1d13xxxfb_resources[] = {
+        [0] = {
+                .start  = EPSONFBSTART,
+                .end    = EPSONFBSTART + EPSONFBLEN,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = EPSONREGSTART,
+                .end    = EPSONREGSTART + EPSONREGLEN,
+                .flags  = IORESOURCE_MEM,
+        }
+};
+
+static struct platform_device s1d13xxxfb_device = {
+        .name           = S1D_DEVICENAME,
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &s1d13xxxfb_data,
+        },
+        .num_resources  = ARRAY_SIZE(s1d13xxxfb_resources),
+        .resource       = s1d13xxxfb_resources,
+};
 
 static struct resource sa1111_resources[] = {
         [0] = {
-                .start          = 0x40000000,
-                .end            = 0x40001fff,
+                .start          = SA1111REGSTART,
+                .end            = SA1111REGSTART + SA1111REGLEN,
                 .flags          = IORESOURCE_MEM,
         },
         [1] = {
@@ -53,18 +220,32 @@ static struct platform_device sa1111_device = {
         .resource       = sa1111_resources,
 };
 
+static struct platform_device jornada720_mcu_device = {
+        .name           = "jornada720_mcu",
+        .id             = -1,
+};
+
 static struct platform_device *devices[] __initdata = {
         &sa1111_device,
+        &jornada720_mcu_device,
+        &s1d13xxxfb_device,
 };
 
+/* a stub for now, we theoretically cannot suspend without a flashboard */
+int pm_suspend(suspend_state_t state)
+{
+        return -1;
+}
+
 static int __init jornada720_init(void)
 {
         int ret = -ENODEV;
 
         if (machine_is_jornada720()) {
                 GPDR |= GPIO_GPIO20;
-                TUCR = JORTUCR_VAL;     /* set the oscillator out to the SA-1101 */
-
+                /* oscillator setup (line 116 of HP's doc) */
+                TUCR = TUCR_VAL;
+                /* resetting SA1111 (line 118 of HP's doc) */
                 GPSR = GPIO_GPIO20;
                 udelay(1);
                 GPCR = GPIO_GPIO20;
@@ -72,10 +253,6 @@ static int __init jornada720_init(void)
                 GPSR = GPIO_GPIO20;
                 udelay(20);
 
-                /* LDD4 is speaker, LDD3 is microphone */
-                PPSR &= ~(PPC_LDD3 | PPC_LDD4);
-                PPDR |= PPC_LDD3 | PPC_LDD4;
-
                 ret = platform_add_devices(devices, ARRAY_SIZE(devices));
         }
         return ret;
@@ -85,19 +262,19 @@ arch_initcall(jornada720_init);
 
 static struct map_desc jornada720_io_desc[] __initdata = {
         {       /* Epson registers */
-                .virtual        =  0xf0000000,
-                .pfn            = __phys_to_pfn(0x48000000),
-                .length         = 0x00100000,
+                .virtual        = 0xf0000000,
+                .pfn            = __phys_to_pfn(EPSONREGSTART),
+                .length         = EPSONREGLEN,
                 .type           = MT_DEVICE
         }, {    /* Epson frame buffer */
-                .virtual        =  0xf1000000,
-                .pfn            = __phys_to_pfn(0x48200000),
-                .length         = 0x00100000,
+                .virtual        = 0xf1000000,
+                .pfn            = __phys_to_pfn(EPSONFBSTART),
+                .length         = EPSONFBLEN,
                 .type           = MT_DEVICE
         }, {    /* SA-1111 */
-                .virtual        =  0xf4000000,
-                .pfn            = __phys_to_pfn(0x40000000),
-                .length         = 0x00100000,
+                .virtual        = 0xf4000000,
+                .pfn            = __phys_to_pfn(SA1111REGSTART),
+                .length         = SA1111REGLEN,
                 .type           = MT_DEVICE
         }
 };
@@ -106,7 +283,7 @@ static void __init jornada720_map_io(void)
 {
         sa1100_map_io();
         iotable_init(jornada720_io_desc, ARRAY_SIZE(jornada720_io_desc));
-        
+
         sa1100_register_uart(0, 3);
         sa1100_register_uart(1, 1);
 }
@@ -116,7 +293,7 @@ static struct mtd_partition jornada720_partitions[] = {
                 .name           = "JORNADA720 boot firmware",
                 .size           = 0x00040000,
                 .offset         = 0,
-                .mask_flags     = MTD_WRITEABLE,  /* force read-only */
+                .mask_flags     = MTD_WRITEABLE, /* force read-only */
         }, {
                 .name           = "JORNADA720 kernel",
                 .size           = 0x000c0000,
@@ -139,7 +316,7 @@ static struct mtd_partition jornada720_partitions[] = {
                 .offset         = 0x00540000,
         }, {
                 .name           = "JORNADA720 usr local",
-                .size           = 0,  /* will expand to the end of the flash */
+                .size           = 0, /* will expand to the end of the flash */
                 .offset         = 0x00d00000,
         }
 };
@@ -147,10 +324,12 @@ static struct mtd_partition jornada720_partitions[] = {
 static void jornada720_set_vpp(int vpp)
 {
         if (vpp)
-                PPSR |= 0x80;
+                /* enabling flash write (line 470 of HP's doc) */
+                PPSR |= PPC_LDD7;
         else
-                PPSR &= ~0x80;
-        PPDR |= 0x80;
+                /* disabling flash write (line 470 of HP's doc) */
+                PPSR &= ~PPC_LDD7;
+        PPDR |= PPC_LDD7;
 }
 
 static struct flash_platform_data jornada720_flash_data = {
diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
index 354d5e91da59..075d4d1d63be 100644
--- a/arch/arm/mach-sa1100/neponset.c
+++ b/arch/arm/mach-sa1100/neponset.c
@@ -29,12 +29,12 @@
  * is rather unfortunate.
  */
 static void
-neponset_irq_handler(unsigned int irq, struct irqdesc *desc)
+neponset_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         unsigned int irr;
 
         while (1) {
-                struct irqdesc *d;
+                struct irq_desc *d;
 
                 /*
                  * Acknowledge the parent IRQ.
@@ -168,9 +168,9 @@ static int neponset_probe(struct platform_device *dev)
          * Setup other Neponset IRQs.  SA1111 will be done by the
          * generic SA1111 code.
          */
-        set_irq_handler(IRQ_NEPONSET_SMC9196, do_simple_IRQ);
+        set_irq_handler(IRQ_NEPONSET_SMC9196, handle_simple_irq);
         set_irq_flags(IRQ_NEPONSET_SMC9196, IRQF_VALID | IRQF_PROBE);
-        set_irq_handler(IRQ_NEPONSET_USAR, do_simple_IRQ);
+        set_irq_handler(IRQ_NEPONSET_USAR, handle_simple_irq);
         set_irq_flags(IRQ_NEPONSET_USAR, IRQF_VALID | IRQF_PROBE);
 
         /*
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index 4284bd6f7a1f..29c89f9eb2ce 100644
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -118,6 +118,7 @@ static struct irqaction sa1100_timer_irq = {
 static void __init sa1100_timer_init(void)
 {
         struct timespec tv;
+        unsigned long flags;
 
         set_rtc = sa1100_set_rtc;
 
@@ -126,12 +127,12 @@ static void __init sa1100_timer_init(void)
         do_settimeofday(&tv);
 
         OIER = 0;               /* disable any timer interrupts */
-        OSCR = LATCH*2;         /* push OSCR out of the way */
-        OSMR0 = LATCH;          /* set initial match */
         OSSR = 0xf;             /* clear status on all timers */
         setup_irq(IRQ_OST0, &sa1100_timer_irq);
+        local_irq_save(flags);
         OIER = OIER_E0;         /* enable match on timer 0 to cause interrupts */
-        OSCR = 0;               /* initialize free-running timer */
+        OSMR0 = OSCR + LATCH;   /* set initial match */
+        local_irq_restore(flags);
 }
 
 #ifdef CONFIG_NO_IDLE_HZ
diff --git a/arch/arm/mach-shark/irq.c b/arch/arm/mach-shark/irq.c
index 297ecf130650..00a6c1466867 100644
--- a/arch/arm/mach-shark/irq.c
+++ b/arch/arm/mach-shark/irq.c
@@ -82,7 +82,7 @@ void __init shark_init_irq(void)
 
         for (irq = 0; irq < NR_IRQS; irq++) {
                 set_irq_chip(irq, &fb_chip);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 3b8576111c16..bf71507c76fd 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -27,6 +27,7 @@
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
 
+#include <asm/cnt32_to_63.h>
 #include <asm/system.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
@@ -77,7 +78,7 @@ static struct irq_chip sic_chip = {
 };
 
 static void
-sic_handle_irq(unsigned int irq, struct irqdesc *desc)
+sic_handle_irq(unsigned int irq, struct irq_desc *desc)
 {
         unsigned long status = readl(VA_SIC_BASE + SIC_IRQ_STATUS);
 
@@ -123,7 +124,7 @@ void __init versatile_init_irq(void)
         for (i = IRQ_SIC_START; i <= IRQ_SIC_END; i++) {
                 if ((PIC_MASK & (1 << (i - IRQ_SIC_START))) == 0) {
                         set_irq_chip(i, &sic_chip);
-                        set_irq_handler(i, do_level_IRQ);
+                        set_irq_handler(i, handle_level_irq);
                         set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
                 }
         }
@@ -228,14 +229,19 @@ void __init versatile_map_io(void)
 
 /*
  * This is the Versatile sched_clock implementation.  This has
- * a resolution of 41.7ns, and a maximum value of about 179s.
+ * a resolution of 41.7ns, and a maximum value of about 35583 days.
+ *
+ * The return value is guaranteed to be monotonic in that range as
+ * long as there is always less than 89 seconds between successive
+ * calls to this function.
  */
 unsigned long long sched_clock(void)
 {
-        unsigned long long v;
+        unsigned long long v = cnt32_to_63(readl(VERSATILE_REFCOUNTER));
 
-        v = (unsigned long long)readl(VERSATILE_REFCOUNTER) * 125;
-        do_div(v, 3);
+        /* the <<1 gets rid of the cnt_32_to_63 top bit saving on a bic insn */
+        v *= 125<<1;
+        do_div(v, 3<<1);
 
         return v;
 }
@@ -319,6 +325,19 @@ static struct platform_device smc91x_device = {
         .resource       = smc91x_resources,
 };
 
+static struct resource versatile_i2c_resource = {
+        .start                  = VERSATILE_I2C_BASE,
+        .end                    = VERSATILE_I2C_BASE + SZ_4K - 1,
+        .flags                  = IORESOURCE_MEM,
+};
+
+static struct platform_device versatile_i2c_device = {
+        .name                   = "versatile-i2c",
+        .id                     = -1,
+        .num_resources          = 1,
+        .resource               = &versatile_i2c_resource,
+};
+
 #define VERSATILE_SYSMCI        (__io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_MCI_OFFSET)
 
 unsigned int mmc_status(struct device *dev)
@@ -769,6 +788,7 @@ void __init versatile_init(void)
         clk_register(&versatile_clcd_clk);
 
         platform_device_register(&versatile_flash_device);
+        platform_device_register(&versatile_i2c_device);
         platform_device_register(&smc91x_device);
 
         for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c
index 503725b166fc..be439bb9d450 100644
--- a/arch/arm/mach-versatile/versatile_pb.c
+++ b/arch/arm/mach-versatile/versatile_pb.c
@@ -81,22 +81,18 @@ static struct amba_device *amba_devs[] __initdata = {
         &mmc1_device,
 };
 
-static int __init versatile_pb_init(void)
+static void __init versatile_pb_init(void)
 {
         int i;
 
-        if (machine_is_versatile_pb()) {
-                for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
-                        struct amba_device *d = amba_devs[i];
-                        amba_device_register(d, &iomem_resource);
-                }
-        }
+        versatile_init();
 
-        return 0;
+        for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
+                struct amba_device *d = amba_devs[i];
+                amba_device_register(d, &iomem_resource);
+        }
 }
 
-arch_initcall(versatile_pb_init);
-
 MACHINE_START(VERSATILE_PB, "ARM-Versatile PB")
         /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
         .phys_io        = 0x101f1000,
@@ -105,5 +101,5 @@ MACHINE_START(VERSATILE_PB, "ARM-Versatile PB")
         .map_io         = versatile_map_io,
         .init_irq       = versatile_init_irq,
         .timer          = &versatile_timer,
-        .init_machine   = versatile_init,
+        .init_machine   = versatile_pb_init,
 MACHINE_END
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index c0bfb8212b77..aade2f72c920 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.
 
@@ -333,7 +333,7 @@ config CPU_XSCALE
 # XScale Core Version 3
 config CPU_XSC3
         bool
-        depends on ARCH_IXP23XX
+        depends on ARCH_IXP23XX || ARCH_IOP13XX
         default y
         select CPU_32v5
         select CPU_ABRT_EV5T
@@ -580,7 +580,7 @@ config CPU_CACHE_ROUND_ROBIN
 
 config CPU_BPREDICT_DISABLE
         bool "Disable branch prediction"
-        depends on CPU_ARM1020 || CPU_V6
+        depends on CPU_ARM1020 || CPU_V6 || CPU_XSC3
         help
           Say Y here to disable branch prediction.  If unsure, say N.
 
diff --git a/arch/arm/mm/consistent.c b/arch/arm/mm/consistent.c
index b797217e82be..6a9c362fef5e 100644
--- a/arch/arm/mm/consistent.c
+++ b/arch/arm/mm/consistent.c
@@ -238,7 +238,7 @@ __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp,
                          * x86 does not mark the pages reserved...
                          */
                         SetPageReserved(page);
-                        set_pte(pte, mk_pte(page, prot));
+                        set_pte_ext(pte, mk_pte(page, prot), 0);
                         page++;
                         pte++;
                         off++;
diff --git a/arch/arm/mm/copypage-v4mc.c b/arch/arm/mm/copypage-v4mc.c
index df1645e14b4c..ded0e96d069d 100644
--- a/arch/arm/mm/copypage-v4mc.c
+++ b/arch/arm/mm/copypage-v4mc.c
@@ -19,6 +19,7 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
+#include <asm/cacheflush.h>
 
 #include "mm.h"
 
@@ -69,9 +70,14 @@ mc_copy_user_page(void *from, void *to)
 
 void v4_mc_copy_user_page(void *kto, const void *kfrom, unsigned long vaddr)
 {
+        struct page *page = virt_to_page(kfrom);
+
+        if (test_and_clear_bit(PG_dcache_dirty, &page->flags))
+                __flush_dcache_page(page_mapping(page), page);
+
         spin_lock(&minicache_lock);
 
-        set_pte(TOP_PTE(0xffff8000), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot));
+        set_pte_ext(TOP_PTE(0xffff8000), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot), 0);
         flush_tlb_kernel_page(0xffff8000);
 
         mc_copy_user_page((void *)0xffff8000, kto);
diff --git a/arch/arm/mm/copypage-v6.c b/arch/arm/mm/copypage-v6.c
index 3d0d3a963d20..3adb79257f43 100644
--- a/arch/arm/mm/copypage-v6.c
+++ b/arch/arm/mm/copypage-v6.c
@@ -53,6 +53,10 @@ static void v6_copy_user_page_aliasing(void *kto, const void *kfrom, unsigned lo
 {
         unsigned int offset = CACHE_COLOUR(vaddr);
         unsigned long from, to;
+        struct page *page = virt_to_page(kfrom);
+
+        if (test_and_clear_bit(PG_dcache_dirty, &page->flags))
+                __flush_dcache_page(page_mapping(page), page);
 
         /*
          * Discard data in the kernel mapping for the new page.
@@ -70,8 +74,8 @@ static void v6_copy_user_page_aliasing(void *kto, const void *kfrom, unsigned lo
          */
         spin_lock(&v6_lock);
 
-        set_pte(TOP_PTE(from_address) + offset, pfn_pte(__pa(kfrom) >> PAGE_SHIFT, PAGE_KERNEL));
-        set_pte(TOP_PTE(to_address) + offset, pfn_pte(__pa(kto) >> PAGE_SHIFT, PAGE_KERNEL));
+        set_pte_ext(TOP_PTE(from_address) + offset, pfn_pte(__pa(kfrom) >> PAGE_SHIFT, PAGE_KERNEL), 0);
+        set_pte_ext(TOP_PTE(to_address) + offset, pfn_pte(__pa(kto) >> PAGE_SHIFT, PAGE_KERNEL), 0);
 
         from = from_address + (offset << PAGE_SHIFT);
         to   = to_address + (offset << PAGE_SHIFT);
@@ -110,7 +114,7 @@ static void v6_clear_user_page_aliasing(void *kaddr, unsigned long vaddr)
          */
         spin_lock(&v6_lock);
 
-        set_pte(TOP_PTE(to_address) + offset, pfn_pte(__pa(kaddr) >> PAGE_SHIFT, PAGE_KERNEL));
+        set_pte_ext(TOP_PTE(to_address) + offset, pfn_pte(__pa(kaddr) >> PAGE_SHIFT, PAGE_KERNEL), 0);
         flush_tlb_kernel_page(to);
         clear_page((void *)to);
 
diff --git a/arch/arm/mm/copypage-xscale.c b/arch/arm/mm/copypage-xscale.c
index 84ebe0aa379e..2e455f82a4d5 100644
--- a/arch/arm/mm/copypage-xscale.c
+++ b/arch/arm/mm/copypage-xscale.c
@@ -19,6 +19,7 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
+#include <asm/cacheflush.h>
 
 #include "mm.h"
 
@@ -91,9 +92,14 @@ mc_copy_user_page(void *from, void *to)
 
 void xscale_mc_copy_user_page(void *kto, const void *kfrom, unsigned long vaddr)
 {
+        struct page *page = virt_to_page(kfrom);
+
+        if (test_and_clear_bit(PG_dcache_dirty, &page->flags))
+                __flush_dcache_page(page_mapping(page), page);
+
         spin_lock(&minicache_lock);
 
-        set_pte(TOP_PTE(COPYPAGE_MINICACHE), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot));
+        set_pte_ext(TOP_PTE(COPYPAGE_MINICACHE), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot), 0);
         flush_tlb_kernel_page(COPYPAGE_MINICACHE);
 
         mc_copy_user_page((void *)COPYPAGE_MINICACHE, kto);
diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c
index 7fc1b35a6746..cf95c5d0ce4c 100644
--- a/arch/arm/mm/fault-armv.c
+++ b/arch/arm/mm/fault-armv.c
@@ -61,7 +61,7 @@ static int adjust_pte(struct vm_area_struct *vma, unsigned long address)
         if (pte_present(entry) && pte_val(entry) & shared_pte_mask) {
                 flush_cache_page(vma, address, pte_pfn(entry));
                 pte_val(entry) &= ~shared_pte_mask;
-                set_pte(pte, entry);
+                set_pte_at(vma->vm_mm, address, pte, entry);
                 flush_tlb_page(vma, address);
                 ret = 1;
         }
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index 5e658a874498..9fd6d2eafb40 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -230,7 +230,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
          * If we're in an interrupt or have no user
          * context, we must not take the fault..
          */
-        if (in_interrupt() || !mm)
+        if (in_atomic() || !mm)
                 goto no_context;
 
         /*
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c
index 454205b789d5..9df507d36e0b 100644
--- a/arch/arm/mm/flush.c
+++ b/arch/arm/mm/flush.c
@@ -26,7 +26,7 @@ static void flush_pfn_alias(unsigned long pfn, unsigned long vaddr)
         unsigned long to = ALIAS_FLUSH_START + (CACHE_COLOUR(vaddr) << PAGE_SHIFT);
         const int zero = 0;
 
-        set_pte(TOP_PTE(to), pfn_pte(pfn, PAGE_KERNEL));
+        set_pte_ext(TOP_PTE(to), pfn_pte(pfn, PAGE_KERNEL), 0);
         flush_tlb_kernel_page(to);
 
         asm(    "mcrr   p15, 0, %1, %0, c14\n"
@@ -202,3 +202,42 @@ void flush_dcache_page(struct page *page)
         }
 }
 EXPORT_SYMBOL(flush_dcache_page);
+
+/*
+ * Flush an anonymous page so that users of get_user_pages()
+ * can safely access the data.  The expected sequence is:
+ *
+ *  get_user_pages()
+ *    -> flush_anon_page
+ *  memcpy() to/from page
+ *  if written to page, flush_dcache_page()
+ */
+void __flush_anon_page(struct vm_area_struct *vma, struct page *page, unsigned long vmaddr)
+{
+        unsigned long pfn;
+
+        /* VIPT non-aliasing caches need do nothing */
+        if (cache_is_vipt_nonaliasing())
+                return;
+
+        /*
+         * Write back and invalidate userspace mapping.
+         */
+        pfn = page_to_pfn(page);
+        if (cache_is_vivt()) {
+                flush_cache_page(vma, vmaddr, pfn);
+        } else {
+                /*
+                 * For aliasing VIPT, we can flush an alias of the
+                 * userspace address only.
+                 */
+                flush_pfn_alias(pfn, vmaddr);
+        }
+
+        /*
+         * Invalidate kernel mapping.  No data should be contained
+         * in this mapping of the page.  FIXME: this is overkill
+         * since we actually ask for a write-back and invalidate.
+         */
+        __cpuc_flush_dcache_page(page_address(page));
+}
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 465440592791..251685fe73a8 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -38,89 +38,71 @@
  */
 #define VM_ARM_SECTION_MAPPING  0x80000000
 
-static inline void
-remap_area_pte(pte_t * pte, unsigned long address, unsigned long size,
-               unsigned long phys_addr, pgprot_t pgprot)
+static int remap_area_pte(pmd_t *pmd, unsigned long addr, unsigned long end,
+                          unsigned long phys_addr, pgprot_t prot)
 {
-        unsigned long end;
+        pte_t *pte;
+
+        pte = pte_alloc_kernel(pmd, addr);
+        if (!pte)
+                return -ENOMEM;
 
-        address &= ~PMD_MASK;
-        end = address + size;
-        if (end > PMD_SIZE)
-                end = PMD_SIZE;
-        BUG_ON(address >= end);
         do {
                 if (!pte_none(*pte))
                         goto bad;
 
-                set_pte(pte, pfn_pte(phys_addr >> PAGE_SHIFT, pgprot));
-                address += PAGE_SIZE;
+                set_pte_ext(pte, pfn_pte(phys_addr >> PAGE_SHIFT, prot), 0);
                 phys_addr += PAGE_SIZE;
-                pte++;
-        } while (address && (address < end));
-        return;
+        } while (pte++, addr += PAGE_SIZE, addr != end);
+        return 0;
 
  bad:
-        printk("remap_area_pte: page already exists\n");
+        printk(KERN_CRIT "remap_area_pte: page already exists\n");
         BUG();
 }
 
-static inline int
-remap_area_pmd(pmd_t * pmd, unsigned long address, unsigned long size,
-               unsigned long phys_addr, unsigned long flags)
+static inline int remap_area_pmd(pgd_t *pgd, unsigned long addr,
+                                 unsigned long end, unsigned long phys_addr,
+                                 pgprot_t prot)
 {
-        unsigned long end;
-        pgprot_t pgprot;
-
-        address &= ~PGDIR_MASK;
-        end = address + size;
-
-        if (end > PGDIR_SIZE)
-                end = PGDIR_SIZE;
+        unsigned long next;
+        pmd_t *pmd;
+        int ret = 0;
 
-        phys_addr -= address;
-        BUG_ON(address >= end);
+        pmd = pmd_alloc(&init_mm, pgd, addr);
+        if (!pmd)
+                return -ENOMEM;
 
-        pgprot = __pgprot(L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | L_PTE_WRITE | flags);
         do {
-                pte_t * pte = pte_alloc_kernel(pmd, address);
-                if (!pte)
-                        return -ENOMEM;
-                remap_area_pte(pte, address, end - address, address + phys_addr, pgprot);
-                address = (address + PMD_SIZE) & PMD_MASK;
-                pmd++;
-        } while (address && (address < end));
-        return 0;
+                next = pmd_addr_end(addr, end);
+                ret = remap_area_pte(pmd, addr, next, phys_addr, prot);
+                if (ret)
+                        return ret;
+                phys_addr += next - addr;
+        } while (pmd++, addr = next, addr != end);
+        return ret;
 }
 
-static int
-remap_area_pages(unsigned long start, unsigned long pfn,
-                 unsigned long size, unsigned long flags)
+static int remap_area_pages(unsigned long start, unsigned long pfn,
+                            unsigned long size, unsigned long flags)
 {
-        unsigned long address = start;
-        unsigned long end = start + size;
+        unsigned long addr = start;
+        unsigned long next, end = start + size;
         unsigned long phys_addr = __pfn_to_phys(pfn);
+        pgprot_t prot = __pgprot(L_PTE_PRESENT | L_PTE_YOUNG |
+                                 L_PTE_DIRTY | L_PTE_WRITE | flags);
+        pgd_t *pgd;
         int err = 0;
-        pgd_t * dir;
 
-        phys_addr -= address;
-        dir = pgd_offset(&init_mm, address);
-        BUG_ON(address >= end);
+        BUG_ON(addr >= end);
+        pgd = pgd_offset_k(addr);
         do {
-                pmd_t *pmd = pmd_alloc(&init_mm, dir, address);
-                if (!pmd) {
-                        err = -ENOMEM;
-                        break;
-                }
-                if (remap_area_pmd(pmd, address, end - address,
-                                         phys_addr + address, flags)) {
-                        err = -ENOMEM;
+                next = pgd_addr_end(addr, end);
+                err = remap_area_pmd(pgd, addr, next, phys_addr, prot);
+                if (err)
                         break;
-                }
-
-                address = (address + PGDIR_SIZE) & PGDIR_MASK;
-                dir++;
-        } while (address && (address < end));
+                phys_addr += next - addr;
+        } while (pgd++, addr = next, addr != end);
 
         return err;
 }
@@ -310,6 +292,8 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,
         if (pfn >= 0x100000 && (__pfn_to_phys(pfn) & ~SUPERSECTION_MASK))
                 return NULL;
 
+        size = PAGE_ALIGN(size);
+
         area = get_vm_area(size, VM_IOREMAP);
         if (!area)
                 return NULL;
diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h
index bb2bc9ab6bd3..a44e30970635 100644
--- a/arch/arm/mm/mm.h
+++ b/arch/arm/mm/mm.h
@@ -1,4 +1,7 @@
 /* the upper-most page table pointer */
+
+#ifdef CONFIG_MMU
+
 extern pmd_t *top_pmd;
 
 #define TOP_PTE(x)      pte_offset_kernel(top_pmd, x)
@@ -13,6 +16,8 @@ static inline pmd_t *pmd_off_k(unsigned long virt)
         return pmd_off(pgd_offset_k(virt), virt);
 }
 
+#endif
+
 struct map_desc;
 struct meminfo;
 struct pglist_data;
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index f866bf6b97d4..655c8376f0b5 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -154,6 +154,26 @@ static int __init noalign_setup(char *__unused)
 }
 __setup("noalign", noalign_setup);
 
+#ifndef CONFIG_SMP
+void adjust_cr(unsigned long mask, unsigned long set)
+{
+        unsigned long flags;
+
+        mask &= ~CR_A;
+
+        set &= mask;
+
+        local_irq_save(flags);
+
+        cr_no_alignment = (cr_no_alignment & ~mask) | set;
+        cr_alignment = (cr_alignment & ~mask) | set;
+
+        set_cr((get_cr() & ~mask) | set);
+
+        local_irq_restore(flags);
+}
+#endif
+
 struct mem_types {
         unsigned int    prot_pte;
         unsigned int    prot_l1;
@@ -265,7 +285,7 @@ static void __init build_mem_type_table(void)
         if (arch_is_coherent()) {
                 if (cpu_is_xsc3()) {
                         mem_types[MT_MEMORY].prot_sect |= PMD_SECT_S;
-                        mem_types[MT_MEMORY].prot_pte |= L_PTE_COHERENT;
+                        mem_types[MT_MEMORY].prot_pte |= L_PTE_SHARED;
                 }
         }
 
@@ -294,12 +314,6 @@ static void __init build_mem_type_table(void)
                 mem_types[MT_DEVICE].prot_pte |= L_PTE_BUFFERABLE;
                 mem_types[MT_DEVICE].prot_sect |= PMD_SECT_BUFFERED;
 
-                /*
-                 * User pages need to be mapped with the ASID
-                 * (iow, non-global)
-                 */
-                user_pgprot |= L_PTE_ASID;
-
 #ifdef CONFIG_SMP
                 /*
                  * Mark memory with the "shared" attribute for SMP systems
@@ -408,7 +422,7 @@ alloc_init_page(unsigned long virt, unsigned long phys, unsigned int prot_l1, pg
         }
         ptep = pte_offset_kernel(pmdp, virt);
 
-        set_pte(ptep, pfn_pte(phys >> PAGE_SHIFT, prot));
+        set_pte_ext(ptep, pfn_pte(phys >> PAGE_SHIFT, prot), 0);
 }
 
 /*
@@ -619,6 +633,13 @@ void __init reserve_node_zero(pg_data_t *pgdat)
         if (machine_is_p720t())
                 res_size = 0x00014000;
 
+        /* H1940 and RX3715 need to reserve this for suspend */
+
+        if (machine_is_h1940() || machine_is_rx3715()) {
+                reserve_bootmem_node(pgdat, 0x30003000, 0x1000);
+                reserve_bootmem_node(pgdat, 0x30081000, 0x1000);
+        }
+
 #ifdef CONFIG_SA1111
         /*
          * Because of the SA1111 DMA bug, we want to preserve our
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c
index d0e66424a597..05818fc0c705 100644
--- a/arch/arm/mm/nommu.c
+++ b/arch/arm/mm/nommu.c
@@ -6,10 +6,12 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/pagemap.h>
+#include <linux/bootmem.h>
 
 #include <asm/cacheflush.h>
 #include <asm/io.h>
 #include <asm/page.h>
+#include <asm/mach/arch.h>
 
 #include "mm.h"
 
@@ -76,7 +78,7 @@ void __iomem *__ioremap(unsigned long phys_addr, size_t size,
 }
 EXPORT_SYMBOL(__ioremap);
 
-void __iounmap(void __iomem *addr)
+void __iounmap(volatile void __iomem *addr)
 {
 }
 EXPORT_SYMBOL(__iounmap);
diff --git a/arch/arm/mm/pgd.c b/arch/arm/mm/pgd.c
index 20c1b0df75f2..50b9aed6000d 100644
--- a/arch/arm/mm/pgd.c
+++ b/arch/arm/mm/pgd.c
@@ -57,7 +57,7 @@ pgd_t *get_pgd_slow(struct mm_struct *mm)
 
                 init_pmd = pmd_offset(init_pgd, 0);
                 init_pte = pte_offset_map_nested(init_pmd, 0);
-                set_pte(new_pte, *init_pte);
+                set_pte_ext(new_pte, *init_pte, 0);
                 pte_unmap_nested(init_pte);
                 pte_unmap(new_pte);
         }
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
index 1d8316f3cecf..700c04d6996e 100644
--- a/arch/arm/mm/proc-arm1020.S
+++ b/arch/arm/mm/proc-arm1020.S
@@ -29,9 +29,9 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/ptrace.h>
 
 #include "proc-macros.S"
@@ -397,7 +397,7 @@ ENTRY(cpu_arm1020_switch_mm)
  * Set a PTE and flush it out
  */
         .align  5
-ENTRY(cpu_arm1020_set_pte)
+ENTRY(cpu_arm1020_set_pte_ext)
 #ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
@@ -477,7 +477,7 @@ arm1020_processor_functions:
         .word   cpu_arm1020_do_idle
         .word   cpu_arm1020_dcache_clean_area
         .word   cpu_arm1020_switch_mm
-        .word   cpu_arm1020_set_pte
+        .word   cpu_arm1020_set_pte_ext
         .size   arm1020_processor_functions, . - arm1020_processor_functions
 
         .section ".rodata"
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
index 89b1d6d3d7c0..1cc206ab5eae 100644
--- a/arch/arm/mm/proc-arm1020e.S
+++ b/arch/arm/mm/proc-arm1020e.S
@@ -29,9 +29,9 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/ptrace.h>
 
 #include "proc-macros.S"
@@ -381,7 +381,7 @@ ENTRY(cpu_arm1020e_switch_mm)
  * Set a PTE and flush it out
  */
         .align  5
-ENTRY(cpu_arm1020e_set_pte)
+ENTRY(cpu_arm1020e_set_pte_ext)
 #ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
@@ -458,7 +458,7 @@ arm1020e_processor_functions:
         .word   cpu_arm1020e_do_idle
         .word   cpu_arm1020e_dcache_clean_area
         .word   cpu_arm1020e_switch_mm
-        .word   cpu_arm1020e_set_pte
+        .word   cpu_arm1020e_set_pte_ext
         .size   arm1020e_processor_functions, . - arm1020e_processor_functions
 
         .section ".rodata"
diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
index a089528e6bce..aff0ea08e2f8 100644
--- a/arch/arm/mm/proc-arm1022.S
+++ b/arch/arm/mm/proc-arm1022.S
@@ -18,9 +18,9 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/ptrace.h>
 
 #include "proc-macros.S"
@@ -358,12 +358,12 @@ ENTRY(cpu_arm1022_switch_mm)
         mov     pc, lr
         
 /*
- * cpu_arm1022_set_pte(ptep, pte)
+ * cpu_arm1022_set_pte_ext(ptep, pte, ext)
  *
  * Set a PTE and flush it out
  */
         .align  5
-ENTRY(cpu_arm1022_set_pte)
+ENTRY(cpu_arm1022_set_pte_ext)
 #ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
@@ -441,7 +441,7 @@ arm1022_processor_functions:
         .word   cpu_arm1022_do_idle
         .word   cpu_arm1022_dcache_clean_area
         .word   cpu_arm1022_switch_mm
-        .word   cpu_arm1022_set_pte
+        .word   cpu_arm1022_set_pte_ext
         .size   arm1022_processor_functions, . - arm1022_processor_functions
 
         .section ".rodata"
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S
index d6d84d92c7c7..65e43a109085 100644
--- a/arch/arm/mm/proc-arm1026.S
+++ b/arch/arm/mm/proc-arm1026.S
@@ -18,9 +18,9 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/ptrace.h>
 
 #include "proc-macros.S"
@@ -347,12 +347,12 @@ ENTRY(cpu_arm1026_switch_mm)
         mov     pc, lr
         
 /*
- * cpu_arm1026_set_pte(ptep, pte)
+ * cpu_arm1026_set_pte_ext(ptep, pte, ext)
  *
  * Set a PTE and flush it out
  */
         .align  5
-ENTRY(cpu_arm1026_set_pte)
+ENTRY(cpu_arm1026_set_pte_ext)
 #ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
@@ -436,7 +436,7 @@ arm1026_processor_functions:
         .word   cpu_arm1026_do_idle
         .word   cpu_arm1026_dcache_clean_area
         .word   cpu_arm1026_switch_mm
-        .word   cpu_arm1026_set_pte
+        .word   cpu_arm1026_set_pte_ext
         .size   arm1026_processor_functions, . - arm1026_processor_functions
 
         .section .rodata
diff --git a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S
index 0432e4806888..123a7dc7a433 100644
--- a/arch/arm/mm/proc-arm6_7.S
+++ b/arch/arm/mm/proc-arm6_7.S
@@ -15,9 +15,9 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/ptrace.h>
 
 ENTRY(cpu_arm6_dcache_clean_area)
@@ -209,14 +209,14 @@ ENTRY(cpu_arm7_switch_mm)
                 mov     pc, lr
 
 /*
- * Function: arm6_7_set_pte(pte_t *ptep, pte_t pte)
+ * Function: arm6_7_set_pte_ext(pte_t *ptep, pte_t pte, unsigned int ext)
  * Params  : r0 = Address to set
  *         : r1 = value to set
  * Purpose : Set a PTE and flush it out of any WB cache
  */
                 .align  5
-ENTRY(cpu_arm6_set_pte)
-ENTRY(cpu_arm7_set_pte)
+ENTRY(cpu_arm6_set_pte_ext)
+ENTRY(cpu_arm7_set_pte_ext)
 #ifdef CONFIG_MMU
                 str     r1, [r0], #-2048                @ linux version
 
@@ -299,7 +299,7 @@ ENTRY(arm6_processor_functions)
                 .word   cpu_arm6_do_idle
                 .word   cpu_arm6_dcache_clean_area
                 .word   cpu_arm6_switch_mm
-                .word   cpu_arm6_set_pte
+                .word   cpu_arm6_set_pte_ext
                 .size   arm6_processor_functions, . - arm6_processor_functions
 
 /*
@@ -315,7 +315,7 @@ ENTRY(arm7_processor_functions)
                 .word   cpu_arm7_do_idle
                 .word   cpu_arm7_dcache_clean_area
                 .word   cpu_arm7_switch_mm
-                .word   cpu_arm7_set_pte
+                .word   cpu_arm7_set_pte_ext
                 .size   arm7_processor_functions, . - arm7_processor_functions
 
                 .section ".rodata"
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
index c2f0705bfd49..dc763be43362 100644
--- a/arch/arm/mm/proc-arm720.S
+++ b/arch/arm/mm/proc-arm720.S
@@ -36,9 +36,9 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/ptrace.h>
 
 #include "proc-macros.S"
@@ -88,13 +88,13 @@ ENTRY(cpu_arm720_switch_mm)
                 mov     pc, lr
 
 /*
- * Function: arm720_set_pte(pte_t *ptep, pte_t pte)
+ * Function: arm720_set_pte_ext(pte_t *ptep, pte_t pte, unsigned int ext)
  * Params  : r0 = Address to set
  *         : r1 = value to set
  * Purpose : Set a PTE and flush it out of any WB cache
  */
                 .align  5
-ENTRY(cpu_arm720_set_pte)
+ENTRY(cpu_arm720_set_pte_ext)
 #ifdef CONFIG_MMU
                 str     r1, [r0], #-2048                @ linux version
 
@@ -204,7 +204,7 @@ ENTRY(arm720_processor_functions)
                 .word   cpu_arm720_do_idle
                 .word   cpu_arm720_dcache_clean_area
                 .word   cpu_arm720_switch_mm
-                .word   cpu_arm720_set_pte
+                .word   cpu_arm720_set_pte_ext
                 .size   arm720_processor_functions, . - arm720_processor_functions
 
                 .section ".rodata"
diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S
index 40713818a87b..7069f495cf9b 100644
--- a/arch/arm/mm/proc-arm740.S
+++ b/arch/arm/mm/proc-arm740.S
@@ -12,9 +12,9 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/ptrace.h>
 
         .text
diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S
index 22d7e3100ea6..d091c2571823 100644
--- a/arch/arm/mm/proc-arm7tdmi.S
+++ b/arch/arm/mm/proc-arm7tdmi.S
@@ -12,9 +12,9 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/ptrace.h>
 
         .text
diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
index 4adb46b3a4e0..75c945ed6c4d 100644
--- a/arch/arm/mm/proc-arm920.S
+++ b/arch/arm/mm/proc-arm920.S
@@ -28,9 +28,9 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/page.h>
 #include <asm/ptrace.h>
 #include "proc-macros.S"
@@ -344,12 +344,12 @@ ENTRY(cpu_arm920_switch_mm)
         mov     pc, lr
 
 /*
- * cpu_arm920_set_pte(ptep, pte)
+ * cpu_arm920_set_pte(ptep, pte, ext)
  *
  * Set a PTE and flush it out
  */
         .align  5
-ENTRY(cpu_arm920_set_pte)
+ENTRY(cpu_arm920_set_pte_ext)
 #ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
@@ -423,7 +423,7 @@ arm920_processor_functions:
         .word   cpu_arm920_do_idle
         .word   cpu_arm920_dcache_clean_area
         .word   cpu_arm920_switch_mm
-        .word   cpu_arm920_set_pte
+        .word   cpu_arm920_set_pte_ext
         .size   arm920_processor_functions, . - arm920_processor_functions
 
         .section ".rodata"
diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S
index 571f082f0247..ffb751b877ff 100644
--- a/arch/arm/mm/proc-arm922.S
+++ b/arch/arm/mm/proc-arm922.S
@@ -29,9 +29,9 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/page.h>
 #include <asm/ptrace.h>
 #include "proc-macros.S"
@@ -348,12 +348,12 @@ ENTRY(cpu_arm922_switch_mm)
         mov     pc, lr
 
 /*
- * cpu_arm922_set_pte(ptep, pte)
+ * cpu_arm922_set_pte_ext(ptep, pte, ext)
  *
  * Set a PTE and flush it out
  */
         .align  5
-ENTRY(cpu_arm922_set_pte)
+ENTRY(cpu_arm922_set_pte_ext)
 #ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
@@ -427,7 +427,7 @@ arm922_processor_functions:
         .word   cpu_arm922_do_idle
         .word   cpu_arm922_dcache_clean_area
         .word   cpu_arm922_switch_mm
-        .word   cpu_arm922_set_pte
+        .word   cpu_arm922_set_pte_ext
         .size   arm922_processor_functions, . - arm922_processor_functions
 
         .section ".rodata"
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index 8d9a9f93b011..44c2c997819f 100644
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@ -52,9 +52,9 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/page.h>
 #include <asm/ptrace.h>
 #include "proc-macros.S"
@@ -391,12 +391,12 @@ ENTRY(cpu_arm925_switch_mm)
         mov     pc, lr
 
 /*
- * cpu_arm925_set_pte(ptep, pte)
+ * cpu_arm925_set_pte_ext(ptep, pte, ext)
  *
  * Set a PTE and flush it out
  */
         .align  5
-ENTRY(cpu_arm925_set_pte)
+ENTRY(cpu_arm925_set_pte_ext)
 #ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
@@ -490,7 +490,7 @@ arm925_processor_functions:
         .word   cpu_arm925_do_idle
         .word   cpu_arm925_dcache_clean_area
         .word   cpu_arm925_switch_mm
-        .word   cpu_arm925_set_pte
+        .word   cpu_arm925_set_pte_ext
         .size   arm925_processor_functions, . - arm925_processor_functions
 
         .section ".rodata"
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
index 44a7a652d625..5b80b6bdd0cb 100644
--- a/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
@@ -28,9 +28,9 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/page.h>
 #include <asm/ptrace.h>
 #include "proc-macros.S"
@@ -348,12 +348,12 @@ ENTRY(cpu_arm926_switch_mm)
         mov     pc, lr
 
 /*
- * cpu_arm926_set_pte(ptep, pte)
+ * cpu_arm926_set_pte_ext(ptep, pte, ext)
  *
  * Set a PTE and flush it out
  */
         .align  5
-ENTRY(cpu_arm926_set_pte)
+ENTRY(cpu_arm926_set_pte_ext)
 #ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
@@ -439,7 +439,7 @@ arm926_processor_functions:
         .word   cpu_arm926_do_idle
         .word   cpu_arm926_dcache_clean_area
         .word   cpu_arm926_switch_mm
-        .word   cpu_arm926_set_pte
+        .word   cpu_arm926_set_pte_ext
         .size   arm926_processor_functions, . - arm926_processor_functions
 
         .section ".rodata"
@@ -480,7 +480,7 @@ __arm926_proc_info:
         b       __arm926_setup
         .long   cpu_arch_name
         .long   cpu_elf_name
-        .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_VFP|HWCAP_EDSP|HWCAP_JAVA
+        .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_JAVA
         .long   cpu_arm926_name
         .long   arm926_processor_functions
         .long   v4wbi_tlb_fns
diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S
index 2397f4b6e151..786c593778f0 100644
--- a/arch/arm/mm/proc-arm940.S
+++ b/arch/arm/mm/proc-arm940.S
@@ -11,9 +11,9 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/ptrace.h>
 
 /* ARM940T has a 4KB DCache comprising 256 lines of 4 words */
diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S
index e18617564421..a60c1421d450 100644
--- a/arch/arm/mm/proc-arm946.S
+++ b/arch/arm/mm/proc-arm946.S
@@ -13,9 +13,9 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/ptrace.h>
 
 /*
diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S
index 918ebf65d4f6..4848eeac86b6 100644
--- a/arch/arm/mm/proc-arm9tdmi.S
+++ b/arch/arm/mm/proc-arm9tdmi.S
@@ -12,9 +12,9 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/ptrace.h>
 
         .text
diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
index c878064e9b88..6e226e12989f 100644
--- a/arch/arm/mm/proc-sa110.S
+++ b/arch/arm/mm/proc-sa110.S
@@ -17,7 +17,7 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/procinfo.h>
+#include <asm/elf.h>
 #include <asm/hardware.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
@@ -146,12 +146,12 @@ ENTRY(cpu_sa110_switch_mm)
 #endif
 
 /*
- * cpu_sa110_set_pte(ptep, pte)
+ * cpu_sa110_set_pte_ext(ptep, pte, ext)
  *
  * Set a PTE and flush it out
  */
         .align  5
-ENTRY(cpu_sa110_set_pte)
+ENTRY(cpu_sa110_set_pte_ext)
 #ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
@@ -222,7 +222,7 @@ ENTRY(sa110_processor_functions)
         .word   cpu_sa110_do_idle
         .word   cpu_sa110_dcache_clean_area
         .word   cpu_sa110_switch_mm
-        .word   cpu_sa110_set_pte
+        .word   cpu_sa110_set_pte_ext
         .size   sa110_processor_functions, . - sa110_processor_functions
 
         .section ".rodata"
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
index b23b66a6155a..9afb11d089fe 100644
--- a/arch/arm/mm/proc-sa1100.S
+++ b/arch/arm/mm/proc-sa1100.S
@@ -22,7 +22,7 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/procinfo.h>
+#include <asm/elf.h>
 #include <asm/hardware.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
@@ -159,12 +159,12 @@ ENTRY(cpu_sa1100_switch_mm)
 #endif
 
 /*
- * cpu_sa1100_set_pte(ptep, pte)
+ * cpu_sa1100_set_pte_ext(ptep, pte, ext)
  *
  * Set a PTE and flush it out
  */
         .align  5
-ENTRY(cpu_sa1100_set_pte)
+ENTRY(cpu_sa1100_set_pte_ext)
 #ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
@@ -237,7 +237,7 @@ ENTRY(sa1100_processor_functions)
         .word   cpu_sa1100_do_idle
         .word   cpu_sa1100_dcache_clean_area
         .word   cpu_sa1100_switch_mm
-        .word   cpu_sa1100_set_pte
+        .word   cpu_sa1100_set_pte_ext
         .size   sa1100_processor_functions, . - sa1100_processor_functions
 
         .section ".rodata"
diff --git a/arch/arm/mm/proc-syms.c b/arch/arm/mm/proc-syms.c
index ab143557e688..9f396b4fa0b7 100644
--- a/arch/arm/mm/proc-syms.c
+++ b/arch/arm/mm/proc-syms.c
@@ -17,7 +17,7 @@
 
 #ifndef MULTI_CPU
 EXPORT_SYMBOL(cpu_dcache_clean_area);
-EXPORT_SYMBOL(cpu_set_pte);
+EXPORT_SYMBOL(cpu_set_pte_ext);
 #else
 EXPORT_SYMBOL(processor);
 #endif
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 6f72549f8843..7b1843befb9c 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -13,8 +13,8 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
+#include <asm/elf.h>
 #include <asm/hardware/arm_scu.h>
-#include <asm/procinfo.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 
@@ -103,13 +103,14 @@ ENTRY(cpu_v6_switch_mm)
         mov     pc, lr
 
 /*
- *      cpu_v6_set_pte(ptep, pte)
+ *      cpu_v6_set_pte_ext(ptep, pte, ext)
  *
  *      Set a level 2 translation table entry.
  *
  *      - ptep  - pointer to level 2 translation table entry
  *                (hardware version is stored at -1024 bytes)
  *      - pte   - PTE value to store
+ *      - ext   - value for extended PTE bits
  *
  *      Permissions:
  *        YUWD  APX AP1 AP0     SVC     User
@@ -121,33 +122,34 @@ ENTRY(cpu_v6_switch_mm)
  *        11x0   0   1   0      r/w     r/o
  *        1111   0   1   1      r/w     r/w
  */
-ENTRY(cpu_v6_set_pte)
+ENTRY(cpu_v6_set_pte_ext)
 #ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
-        bic     r2, r1, #0x000003f0
-        bic     r2, r2, #0x00000003
-        orr     r2, r2, #PTE_EXT_AP0 | 2
+        bic     r3, r1, #0x000003f0
+        bic     r3, r3, #0x00000003
+        orr     r3, r3, r2
+        orr     r3, r3, #PTE_EXT_AP0 | 2
 
         tst     r1, #L_PTE_WRITE
         tstne   r1, #L_PTE_DIRTY
-        orreq   r2, r2, #PTE_EXT_APX
+        orreq   r3, r3, #PTE_EXT_APX
 
         tst     r1, #L_PTE_USER
-        orrne   r2, r2, #PTE_EXT_AP1
-        tstne   r2, #PTE_EXT_APX
-        bicne   r2, r2, #PTE_EXT_APX | PTE_EXT_AP0
+        orrne   r3, r3, #PTE_EXT_AP1
+        tstne   r3, #PTE_EXT_APX
+        bicne   r3, r3, #PTE_EXT_APX | PTE_EXT_AP0
 
         tst     r1, #L_PTE_YOUNG
-        biceq   r2, r2, #PTE_EXT_APX | PTE_EXT_AP_MASK
+        biceq   r3, r3, #PTE_EXT_APX | PTE_EXT_AP_MASK
 
         tst     r1, #L_PTE_EXEC
-        orreq   r2, r2, #PTE_EXT_XN
+        orreq   r3, r3, #PTE_EXT_XN
 
         tst     r1, #L_PTE_PRESENT
-        moveq   r2, #0
+        moveq   r3, #0
 
-        str     r2, [r0]
+        str     r3, [r0]
         mcr     p15, 0, r0, c7, c10, 1 @ flush_pte
 #endif
         mov     pc, lr
@@ -156,7 +158,7 @@ ENTRY(cpu_v6_set_pte)
 
 
 cpu_v6_name:
-        .asciz  "Some Random V6 Processor"
+        .asciz  "ARMv6-compatible processor"
         .align
 
         .section ".text.init", #alloc, #execinstr
@@ -207,11 +209,6 @@ __v6_setup:
 #endif
         mcr     p15, 0, r4, c2, c0, 1           @ load TTB1
 #endif /* CONFIG_MMU */
-#ifdef CONFIG_VFP
-        mrc     p15, 0, r0, c1, c0, 2
-        orr     r0, r0, #(0xf << 20)
-        mcr     p15, 0, r0, c1, c0, 2           @ Enable full access to VFP
-#endif
         adr     r5, v6_crval
         ldmia   r5, {r5, r6}
         mrc     p15, 0, r0, c1, c0, 0           @ read control register
@@ -238,7 +235,7 @@ ENTRY(v6_processor_functions)
         .word   cpu_v6_do_idle
         .word   cpu_v6_dcache_clean_area
         .word   cpu_v6_switch_mm
-        .word   cpu_v6_set_pte
+        .word   cpu_v6_set_pte_ext
         .size   v6_processor_functions, . - v6_processor_functions
 
         .type   cpu_arch_name, #object
@@ -273,7 +270,7 @@ __v6_proc_info:
         b       __v6_setup
         .long   cpu_arch_name
         .long   cpu_elf_name
-        .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_VFP|HWCAP_EDSP|HWCAP_JAVA
+        .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_JAVA
         .long   cpu_v6_name
         .long   v6_processor_functions
         .long   v6wbi_tlb_fns
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
index 4ace2d8090c7..94a58455f346 100644
--- a/arch/arm/mm/proc-xsc3.S
+++ b/arch/arm/mm/proc-xsc3.S
@@ -2,7 +2,7 @@
  * linux/arch/arm/mm/proc-xsc3.S
  *
  * Original Author: Matthew Gilbert
- * Current Maintainer: Deepak Saxena <dsaxena@plexity.net>
+ * Current Maintainer: Lennert Buytenhek <buytenh@wantstofly.org>
  *
  * Copyright 2004 (C) Intel Corp.
  * Copyright 2005 (c) MontaVista Software, Inc.
@@ -27,7 +27,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/procinfo.h>
+#include <asm/elf.h>
 #include <asm/hardware.h>
 #include <asm/pgtable.h>
 #include <asm/pgtable-hwdef.h>
@@ -57,11 +57,6 @@
 #define L2_CACHE_ENABLE 1
 
 /*
- * Enable the Branch Target Buffer (can cause crashes, see erratum #42.)
- */
-#define BTB_ENABLE      0
-
-/*
  * This macro is used to wait for a CP15 write and is needed
  * when we have to ensure that the last operation to the co-pro
  * was completed before continuing with operation.
@@ -362,17 +357,19 @@ ENTRY(cpu_xsc3_switch_mm)
         cpwait_ret lr, ip
 
 /*
- * cpu_xsc3_set_pte(ptep, pte)
+ * cpu_xsc3_set_pte_ext(ptep, pte, ext)
  *
  * Set a PTE and flush it out
  *
  */
         .align  5
-ENTRY(cpu_xsc3_set_pte)
+ENTRY(cpu_xsc3_set_pte_ext)
         str     r1, [r0], #-2048                @ linux version
 
-        bic     r2, r1, #0xdf0                  @ Keep C, B, coherency bits
+        bic     r2, r1, #0xff0                  @ Keep C, B bits
         orr     r2, r2, #PTE_TYPE_EXT           @ extended page
+        tst     r1, #L_PTE_SHARED               @ Shared?
+        orrne   r2, r2, #0x200
 
         eor     r3, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
 
@@ -432,9 +429,7 @@ __xsc3_setup:
         mrc     p15, 0, r0, c1, c0, 0           @ get control register
         bic     r0, r0, r5                      @ .... .... .... ..A.
         orr     r0, r0, r6                      @ .... .... .... .C.M
-#if BTB_ENABLE
         orr     r0, r0, #0x00000800             @ ..VI Z..S .... ....
-#endif
 #if L2_CACHE_ENABLE
         orr     r0, r0, #0x04000000             @ L2 enable
 #endif
@@ -462,7 +457,7 @@ ENTRY(xsc3_processor_functions)
         .word   cpu_xsc3_do_idle
         .word   cpu_xsc3_dcache_clean_area
         .word   cpu_xsc3_switch_mm
-        .word   cpu_xsc3_set_pte
+        .word   cpu_xsc3_set_pte_ext
         .size   xsc3_processor_functions, . - xsc3_processor_functions
 
         .section ".rodata"
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
index 2749c1f88d7d..490e11b34231 100644
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@ -23,7 +23,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/procinfo.h>
+#include <asm/elf.h>
 #include <asm/pgtable.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/page.h>
@@ -421,14 +421,14 @@ ENTRY(cpu_xscale_switch_mm)
         cpwait_ret lr, ip
 
 /*
- * cpu_xscale_set_pte(ptep, pte)
+ * cpu_xscale_set_pte_ext(ptep, pte, ext)
  *
  * Set a PTE and flush it out
  *
  * Errata 40: must set memory to write-through for user read-only pages.
  */
         .align  5
-ENTRY(cpu_xscale_set_pte)
+ENTRY(cpu_xscale_set_pte_ext)
         str     r1, [r0], #-2048                @ linux version
 
         bic     r2, r1, #0xff0
@@ -491,12 +491,7 @@ __xscale_setup:
         mcr     p15, 0, ip, c7, c7, 0           @ invalidate I, D caches & BTB
         mcr     p15, 0, ip, c7, c10, 4          @ Drain Write (& Fill) Buffer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I, D TLBs
-#ifdef CONFIG_IWMMXT
-        mov     r0, #0                          @ initially disallow access to CP0/CP1
-#else
-        mov     r0, #1                          @ Allow access to CP0
-#endif
-        orr     r0, r0, #1 << 6                 @ cp6 for IOP3xx and Bulverde
+        mov     r0, #1 << 6                     @ cp6 for IOP3xx and Bulverde
         orr     r0, r0, #1 << 13                @ Its undefined whether this
         mcr     p15, 0, r0, c15, c1, 0          @ affects USR or SVC modes
 
@@ -534,7 +529,7 @@ ENTRY(xscale_processor_functions)
         .word   cpu_xscale_do_idle
         .word   cpu_xscale_dcache_clean_area
         .word   cpu_xscale_switch_mm
-        .word   cpu_xscale_set_pte
+        .word   cpu_xscale_set_pte_ext
         .size   xscale_processor_functions, . - xscale_processor_functions
 
         .section ".rodata"
@@ -909,7 +904,7 @@ __pxa270_proc_info:
         b       __xscale_setup
         .long   cpu_arch_name
         .long   cpu_elf_name
-        .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_IWMMXT
+        .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
         .long   cpu_pxa270_name
         .long   xscale_processor_functions
         .long   v4wbi_tlb_fns
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index ec752e16d618..f2dc363de66b 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -113,7 +113,7 @@ endchoice
 
 config OMAP_SERIAL_WAKE
         bool "Enable wake-up events for serial ports"
-        depends OMAP_MUX
+        depends on OMAP_MUX
         default y
         help
           Select this option if you want to have your system wake up
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 8162eed8b500..4f2fd5591337 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -410,7 +410,7 @@ static inline void set_24xx_gpio_triggering(void __iomem *base, int gpio, int tr
                 trigger & __IRQT_RISEDGE);
         MOD_REG_BIT(OMAP24XX_GPIO_FALLINGDETECT, gpio_bit,
                 trigger & __IRQT_FALEDGE);
-        /* FIXME: Possibly do 'set_irq_handler(j, do_level_IRQ)' if only level
+        /* FIXME: Possibly do 'set_irq_handler(j, handle_level_irq)' if only level
          * triggering requested. */
 }
 
@@ -783,7 +783,7 @@ void omap_free_gpio(int gpio)
  * line's interrupt handler has been run, we may miss some nested
  * interrupts.
  */
-static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc)
+static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         void __iomem *isr_reg = NULL;
         u32 isr;
@@ -853,7 +853,7 @@ static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc)
 
                 gpio_irq = bank->virtual_irq_start;
                 for (; isr != 0; isr >>= 1, gpio_irq++) {
-                        struct irqdesc *d;
+                        struct irq_desc *d;
                         int irq_mask;
                         if (!(isr & 1))
                                 continue;
@@ -1092,7 +1092,7 @@ static int __init _omap_gpio_init(void)
                                 set_irq_chip(j, &mpuio_irq_chip);
                         else
                                 set_irq_chip(j, &gpio_irq_chip);
-                        set_irq_handler(j, do_simple_IRQ);
+                        set_irq_handler(j, handle_simple_irq);
                         set_irq_flags(j, IRQF_VALID);
                 }
                 set_irq_chained_handler(bank->irq, gpio_irq_handler);
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 579c69ae9ff7..8bcb838e5444 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@
 #
 #   http://www.arm.linux.org.uk/developer/machines/?action=new
 #
-# Last update: Mon Oct 16 21:13:36 2006
+# Last update: Thu Dec 7 17:19:20 2006
 #
 # machine_is_xxx        CONFIG_xxxx             MACH_TYPE_xxx           number
 #
@@ -79,7 +79,7 @@ psionw			ARCH_PSIONW		PSIONW			60
 aln                     SA1100_ALN              ALN                     61
 epxa                    ARCH_CAMELOT            CAMELOT                 62
 gds2200                 SA1100_GDS2200          GDS2200                 63
-psion_series7           SA1100_PSION_SERIES7    PSION_SERIES7           64
+netbook                 SA1100_PSION_SERIES7    PSION_SERIES7           64
 xfile                   SA1100_XFILE            XFILE                   65
 accelent_ep9312         ARCH_ACCELENT_EP9312    ACCELENT_EP9312         66
 ic200                   ARCH_IC200              IC200                   67
@@ -810,9 +810,9 @@ sb3010			MACH_SB3010		SB3010			795
 rm9200                  MACH_RM9200             RM9200                  796
 dma03                   MACH_DMA03              DMA03                   797
 road_s101               MACH_ROAD_S101          ROAD_S101               798
-iq_nextgen_a            MACH_IQ_NEXTGEN_A       IQ_NEXTGEN_A            799
+iq81340sc               MACH_IQ81340SC          IQ81340SC               799
 iq_nextgen_b            MACH_IQ_NEXTGEN_B       IQ_NEXTGEN_B            800
-iq_nextgen_c            MACH_IQ_NEXTGEN_C       IQ_NEXTGEN_C            801
+iq81340mc               MACH_IQ81340MC          IQ81340MC               801
 iq_nextgen_d            MACH_IQ_NEXTGEN_D       IQ_NEXTGEN_D            802
 iq_nextgen_e            MACH_IQ_NEXTGEN_E       IQ_NEXTGEN_E            803
 mallow_at91             MACH_MALLOW_AT91        MALLOW_AT91             804
@@ -1165,9 +1165,57 @@ pnx4010			MACH_PNX4010		PNX4010			1151
 oxnas                   MACH_OXNAS              OXNAS                   1152
 fiori                   MACH_FIORI              FIORI                   1153
 ml1200                  MACH_ML1200             ML1200                  1154
-cactus                  MACH_CACTUS             CACTUS                  1155
+pecos                   MACH_PECOS              PECOS                   1155
 nb2xxx                  MACH_NB2XXX             NB2XXX                  1156
 hw6900                  MACH_HW6900             HW6900                  1157
 cdcs_quoll              MACH_CDCS_QUOLL         CDCS_QUOLL              1158
 quicksilver             MACH_QUICKSILVER        QUICKSILVER             1159
 uplat926                MACH_UPLAT926           UPLAT926                1160
+dep2410_dep2410         MACH_DEP2410_THOMAS     DEP2410_THOMAS          1161
+dtk2410                 MACH_DTK2410            DTK2410                 1162
+chili                   MACH_CHILI              CHILI                   1163
+demeter                 MACH_DEMETER            DEMETER                 1164
+dionysus                MACH_DIONYSUS           DIONYSUS                1165
+as352x                  MACH_AS352X             AS352X                  1166
+service                 MACH_SERVICE            SERVICE                 1167
+cs_e9301                MACH_CS_E9301           CS_E9301                1168
+micro9m                 MACH_MICRO9M            MICRO9M                 1169
+ia_mospck               MACH_IA_MOSPCK          IA_MOSPCK               1170
+ql201b                  MACH_QL201B             QL201B                  1171
+bbm                     MACH_BBM                BBM                     1174
+exxx                    MACH_EXXX               EXXX                    1175
+wma11b                  MACH_WMA11B             WMA11B                  1176
+pelco_atlas             MACH_PELCO_ATLAS        PELCO_ATLAS             1177
+g500                    MACH_G500               G500                    1178
+bug                     MACH_BUG                BUG                     1179
+mx33ads                 MACH_MX33ADS            MX33ADS                 1180
+chub                    MACH_CHUB               CHUB                    1181
+gta01                   MACH_GTA01              GTA01                   1182
+w90n740                 MACH_W90N740            W90N740                 1183
+medallion_sa2410        MACH_MEDALLION_SA2410   MEDALLION_SA2410        1184
+ia_cpu_9200_2           MACH_IA_CPU_9200_2      IA_CPU_9200_2           1185
+dimmrm9200              MACH_DIMMRM9200         DIMMRM9200              1186
+pm9261                  MACH_PM9261             PM9261                  1187
+mx21                    MACH_MX21               MX21                    1188
+ml7304                  MACH_ML7304             ML7304                  1189
+ucp250                  MACH_UCP250             UCP250                  1190
+intboard                MACH_INTBOARD           INTBOARD                1191
+gulfstream              MACH_GULFSTREAM         GULFSTREAM              1192
+labquest                MACH_LABQUEST           LABQUEST                1193
+vcmx313                 MACH_VCMX313            VCMX313                 1194
+urg200                  MACH_URG200             URG200                  1195
+cpux255lcdnet           MACH_CPUX255LCDNET      CPUX255LCDNET           1196
+netdcu9                 MACH_NETDCU9            NETDCU9                 1197
+netdcu10                MACH_NETDCU10           NETDCU10                1198
+dspg_dga                MACH_DSPG_DGA           DSPG_DGA                1199
+dspg_dvw                MACH_DSPG_DVW           DSPG_DVW                1200
+solos                   MACH_SOLOS              SOLOS                   1201
+at91sam9263ek           MACH_AT91SAM9263EK      AT91SAM9263EK           1202
+osstbox                 MACH_OSSTBOX            OSSTBOX                 1203
+kbat9261                MACH_KBAT9261           KBAT9261                1204
+ct1100                  MACH_CT1100             CT1100                  1205
+akcppxa                 MACH_AKCPPXA            AKCPPXA                 1206
+zevio_1020              MACH_ZEVIO_1020         ZEVIO_1020              1207
+hitrack                 MACH_HITRACK            HITRACK                 1208
+syme1                   MACH_SYME1              SYME1                   1209
+syhl1                   MACH_SYHL1              SYHL1                   1210
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index f08eafbddcc1..490d9d18a7d1 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -263,13 +263,36 @@ void VFP9_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs)
         if (exceptions)
                 vfp_raise_exceptions(exceptions, trigger, orig_fpscr, regs);
 }
- 
+
+static void vfp_enable(void *unused)
+{
+        u32 access = get_copro_access();
+
+        /*
+         * Enable full access to VFP (cp10 and cp11)
+         */
+        set_copro_access(access | CPACC_FULL(10) | CPACC_FULL(11));
+}
+
+#include <linux/smp.h>
+
 /*
  * VFP support code initialisation.
  */
 static int __init vfp_init(void)
 {
         unsigned int vfpsid;
+        unsigned int cpu_arch = cpu_architecture();
+        u32 access = 0;
+
+        if (cpu_arch >= CPU_ARCH_ARMv6) {
+                access = get_copro_access();
+
+                /*
+                 * Enable full access to VFP (cp10 and cp11)
+                 */
+                set_copro_access(access | CPACC_FULL(10) | CPACC_FULL(11));
+        }
 
         /*
          * First check that there is a VFP that we can use.
@@ -277,13 +300,22 @@ static int __init vfp_init(void)
          * we just need to read the VFPSID register.
          */
         vfpsid = fmrx(FPSID);
+        barrier();
 
         printk(KERN_INFO "VFP support v0.3: ");
         if (VFP_arch) {
                 printk("not present\n");
+
+                /*
+                 * Restore the copro access register.
+                 */
+                if (cpu_arch >= CPU_ARCH_ARMv6)
+                        set_copro_access(access);
         } else if (vfpsid & FPSID_NODOUBLE) {
                 printk("no double precision support\n");
         } else {
+                smp_call_function(vfp_enable, NULL, 1, 1);
+
                 VFP_arch = (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT;  /* Extract the architecture version */
                 printk("implementor %02x architecture %d part %02x variant %x rev %x\n",
                         (vfpsid & FPSID_IMPLEMENTER_MASK) >> FPSID_IMPLEMENTER_BIT,
@@ -291,9 +323,16 @@ static int __init vfp_init(void)
                         (vfpsid & FPSID_PART_MASK) >> FPSID_PART_BIT,
                         (vfpsid & FPSID_VARIANT_MASK) >> FPSID_VARIANT_BIT,
                         (vfpsid & FPSID_REV_MASK) >> FPSID_REV_BIT);
+
                 vfp_vector = vfp_support_entry;
 
                 thread_register_notifier(&vfp_notifier_block);
+
+                /*
+                 * We detected VFP, and the support code is
+                 * in place; report VFP support to userspace.
+                 */
+                elf_hwcap |= HWCAP_VFP;
         }
         return 0;
 }
diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig
index c14fe918bc4c..74eba8b5a8ca 100644
--- a/arch/arm26/Kconfig
+++ b/arch/arm26/Kconfig
@@ -41,6 +41,14 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
         bool
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config GENERIC_HWEIGHT
         bool
         default y
diff --git a/arch/arm26/kernel/ecard.c b/arch/arm26/kernel/ecard.c
index 047d0a408b9d..9dbc17247c6f 100644
--- a/arch/arm26/kernel/ecard.c
+++ b/arch/arm26/kernel/ecard.c
@@ -215,7 +215,7 @@ int ecard_readchunk(struct in_chunk_dir *cd, ecard_t *ec, int id, int num)
                 }
                 if (c_id(&excd) == 0x80) { /* loader */
                         if (!ec->loader) {
-                                ec->loader = (loader_t)kmalloc(c_len(&excd),
+                                ec->loader = kmalloc(c_len(&excd),
                                                                GFP_KERNEL);
                                 if (ec->loader)
                                         ecard_readbytes(ec->loader, ec,
@@ -620,12 +620,10 @@ ecard_probe(int slot, card_type_t type)
         struct ex_ecid cid;
         int i, rc = -ENOMEM;
 
-        ec = kmalloc(sizeof(ecard_t), GFP_KERNEL);
+        ec = kzalloc(sizeof(ecard_t), GFP_KERNEL);
         if (!ec)
                 goto nomem;
 
-        memset(ec, 0, sizeof(ecard_t));
-
         ec->slot_no     = slot;
         ec->type        = type;
         ec->irq         = NO_IRQ;
diff --git a/arch/arm26/kernel/irq.c b/arch/arm26/kernel/irq.c
index d87d68b77d66..d53382c83bf9 100644
--- a/arch/arm26/kernel/irq.c
+++ b/arch/arm26/kernel/irq.c
@@ -545,7 +545,7 @@ int request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_
             (irq_flags & IRQF_SHARED && !dev_id))
                 return -EINVAL;
 
-        action = (struct irqaction *)kmalloc(sizeof(struct irqaction), GFP_KERNEL);
+        action = kmalloc(sizeof(struct irqaction), GFP_KERNEL);
         if (!action)
                 return -ENOMEM;
 
diff --git a/arch/arm26/mm/fault.c b/arch/arm26/mm/fault.c
index a1f6d8a9cc32..93c0cee0fb5e 100644
--- a/arch/arm26/mm/fault.c
+++ b/arch/arm26/mm/fault.c
@@ -215,7 +215,7 @@ int do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
          * If we're in an interrupt or have no user
          * context, we must not take the fault..
          */
-        if (in_interrupt() || !mm)
+        if (in_atomic() || !mm)
                 goto no_context;
 
         down_read(&mm->mmap_sem);
diff --git a/arch/arm26/mm/memc.c b/arch/arm26/mm/memc.c
index 34def6397c3c..f2901581d4da 100644
--- a/arch/arm26/mm/memc.c
+++ b/arch/arm26/mm/memc.c
@@ -24,7 +24,7 @@
 
 #define MEMC_TABLE_SIZE (256*sizeof(unsigned long))
 
-kmem_cache_t *pte_cache, *pgd_cache;
+struct kmem_cache *pte_cache, *pgd_cache;
 int page_nr;
 
 /*
@@ -162,12 +162,12 @@ void __init create_memmap_holes(struct meminfo *mi)
 {
 }
 
-static void pte_cache_ctor(void *pte, kmem_cache_t *cache, unsigned long flags)
+static void pte_cache_ctor(void *pte, struct kmem_cache *cache, unsigned long flags)
 {
         memzero(pte, sizeof(pte_t) * PTRS_PER_PTE);
 }
 
-static void pgd_cache_ctor(void *pgd, kmem_cache_t *cache, unsigned long flags)
+static void pgd_cache_ctor(void *pgd, struct kmem_cache *cache, unsigned long flags)
 {
         memzero(pgd + MEMC_TABLE_SIZE, USER_PTRS_PER_PGD * sizeof(pgd_t));
 }
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 5f1694eea842..bb059a4e1df9 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -45,6 +45,14 @@ config GENERIC_TIME
 config RWSEM_XCHGADD_ALGORITHM
         bool
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config GENERIC_BUST_SPINLOCK
         bool
 
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index cced73c58115..32b361f31c2c 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -7,20 +7,83 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/clk.h>
+#include <linux/etherdevice.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/string.h>
+#include <linux/types.h>
 
+#include <asm/io.h>
+#include <asm/setup.h>
 #include <asm/arch/board.h>
 #include <asm/arch/init.h>
 
-struct eth_platform_data __initdata eth0_data = {
-        .valid          = 1,
-        .mii_phy_addr   = 0x10,
-        .is_rmii        = 0,
-        .hw_addr        = { 0x6a, 0x87, 0x71, 0x14, 0xcd, 0xcb },
+struct eth_addr {
+        u8 addr[6];
 };
 
+static struct eth_addr __initdata hw_addr[2];
+
+static struct eth_platform_data __initdata eth_data[2];
 extern struct lcdc_platform_data atstk1000_fb0_data;
 
+/*
+ * The next two functions should go away as the boot loader is
+ * supposed to initialize the macb address registers with a valid
+ * ethernet address. But we need to keep it around for a while until
+ * we can be reasonably sure the boot loader does this.
+ *
+ * The phy_id is ignored as the driver will probe for it.
+ */
+static int __init parse_tag_ethernet(struct tag *tag)
+{
+        int i;
+
+        i = tag->u.ethernet.mac_index;
+        if (i < ARRAY_SIZE(hw_addr))
+                memcpy(hw_addr[i].addr, tag->u.ethernet.hw_address,
+                       sizeof(hw_addr[i].addr));
+
+        return 0;
+}
+__tagtable(ATAG_ETHERNET, parse_tag_ethernet);
+
+static void __init set_hw_addr(struct platform_device *pdev)
+{
+        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        const u8 *addr;
+        void __iomem *regs;
+        struct clk *pclk;
+
+        if (!res)
+                return;
+        if (pdev->id >= ARRAY_SIZE(hw_addr))
+                return;
+
+        addr = hw_addr[pdev->id].addr;
+        if (!is_valid_ether_addr(addr))
+                return;
+
+        /*
+         * Since this is board-specific code, we'll cheat and use the
+         * physical address directly as we happen to know that it's
+         * the same as the virtual address.
+         */
+        regs = (void __iomem __force *)res->start;
+        pclk = clk_get(&pdev->dev, "pclk");
+        if (!pclk)
+                return;
+
+        clk_enable(pclk);
+        __raw_writel((addr[3] << 24) | (addr[2] << 16)
+                     | (addr[1] << 8) | addr[0], regs + 0x98);
+        __raw_writel((addr[5] << 8) | addr[4], regs + 0x9c);
+        clk_disable(pclk);
+        clk_put(pclk);
+}
+
 void __init setup_board(void)
 {
         at32_map_usart(1, 0);   /* /dev/ttyS0 */
@@ -38,7 +101,8 @@ static int __init atstk1002_init(void)
         at32_add_device_usart(1);
         at32_add_device_usart(2);
 
-        at32_add_device_eth(0, &eth0_data);
+        set_hw_addr(at32_add_device_eth(0, &eth_data[0]));
+
         at32_add_device_spi(0);
         at32_add_device_lcdc(0, &atstk1000_fb0_data);
 
diff --git a/arch/avr32/kernel/avr32_ksyms.c b/arch/avr32/kernel/avr32_ksyms.c
index 372e3f8b2417..7c4c76114bba 100644
--- a/arch/avr32/kernel/avr32_ksyms.c
+++ b/arch/avr32/kernel/avr32_ksyms.c
@@ -7,12 +7,12 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/module.h>
 
 #include <asm/checksum.h>
 #include <asm/uaccess.h>
-#include <asm/delay.h>
 
 /*
  * GCC functions
diff --git a/arch/avr32/kernel/kprobes.c b/arch/avr32/kernel/kprobes.c
index ca41fc1edbe1..d0abbcaf1c1e 100644
--- a/arch/avr32/kernel/kprobes.c
+++ b/arch/avr32/kernel/kprobes.c
@@ -154,6 +154,7 @@ ss_probe:
         return 1;
 
 no_kprobe:
+        preempt_enable_no_resched();
         return ret;
 }
 
diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c
index 317dc50945f2..0b4325946a41 100644
--- a/arch/avr32/kernel/process.c
+++ b/arch/avr32/kernel/process.c
@@ -38,6 +38,13 @@ void cpu_idle(void)
 
 void machine_halt(void)
 {
+        /*
+         * Enter Stop mode. The 32 kHz oscillator will keep running so
+         * the RTC will keep the time properly and the system will
+         * boot quickly.
+         */
+        asm volatile("sleep 3\n\t"
+                     "sub pc, -2");
 }
 
 void machine_power_off(void)
diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c
index ea2d1ffee478..a34211601008 100644
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
@@ -229,30 +229,6 @@ static int __init parse_tag_rsvd_mem(struct tag *tag)
 }
 __tagtable(ATAG_RSVD_MEM, parse_tag_rsvd_mem);
 
-static int __init parse_tag_ethernet(struct tag *tag)
-{
-#if 0
-        const struct platform_device *pdev;
-
-        /*
-         * We really need a bus type that supports "classes"...this
-         * will do for now (until we must handle other kinds of
-         * ethernet controllers)
-         */
-        pdev = platform_get_device("macb", tag->u.ethernet.mac_index);
-        if (pdev && pdev->dev.platform_data) {
-                struct eth_platform_data *data = pdev->dev.platform_data;
-
-                data->valid = 1;
-                data->mii_phy_addr = tag->u.ethernet.mii_phy_addr;
-                memcpy(data->hw_addr, tag->u.ethernet.hw_address,
-                       sizeof(data->hw_addr));
-        }
-#endif
-        return 0;
-}
-__tagtable(ATAG_ETHERNET, parse_tag_ethernet);
-
 /*
  * Scan the tag table for this tag, and call its parse function. The
  * tag table is built by the linker from all the __tagtable
diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c
index 33096651c24f..0ec14854a200 100644
--- a/arch/avr32/kernel/signal.c
+++ b/arch/avr32/kernel/signal.c
@@ -15,7 +15,7 @@
 #include <linux/errno.h>
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 
 #include <asm/uaccess.h>
 #include <asm/ucontext.h>
diff --git a/arch/avr32/lib/delay.c b/arch/avr32/lib/delay.c
index 462c8307b680..b3bc0b56e2c6 100644
--- a/arch/avr32/lib/delay.c
+++ b/arch/avr32/lib/delay.c
@@ -12,9 +12,9 @@
 
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/param.h>
 #include <linux/types.h>
 
-#include <asm/delay.h>
 #include <asm/processor.h>
 #include <asm/sysreg.h>
 
diff --git a/arch/avr32/mach-at32ap/at32ap7000.c b/arch/avr32/mach-at32ap/at32ap7000.c
index 7ff6ad8bab5f..48f4ef38c70e 100644
--- a/arch/avr32/mach-at32ap/at32ap7000.c
+++ b/arch/avr32/mach-at32ap/at32ap7000.c
@@ -11,6 +11,7 @@
 
 #include <asm/io.h>
 
+#include <asm/arch/at32ap7000.h>
 #include <asm/arch/board.h>
 #include <asm/arch/portmux.h>
 #include <asm/arch/sm.h>
@@ -57,6 +58,9 @@ static struct platform_device _name##_id##_device = {		\
         .num_resources  = ARRAY_SIZE(_name##_id##_resource),    \
 }
 
+#define select_peripheral(pin, periph, flags)                   \
+        at32_select_periph(GPIO_PIN_##pin, GPIO_##periph, flags)
+
 #define DEV_CLK(_name, devname, bus, _index)                    \
 static struct clk devname##_##_name = {                         \
         .name           = #_name,                               \
@@ -67,18 +71,6 @@ static struct clk devname##_##_name = {				\
         .index          = _index,                               \
 }
 
-enum {
-        PIOA,
-        PIOB,
-        PIOC,
-        PIOD,
-};
-
-enum {
-        FUNC_A,
-        FUNC_B,
-};
-
 unsigned long at32ap7000_osc_rates[3] = {
         [0] = 32768,
         /* FIXME: these are ATSTK1002-specific */
@@ -569,26 +561,26 @@ DEV_CLK(usart, atmel_usart3, pba, 6);
 
 static inline void configure_usart0_pins(void)
 {
-        portmux_set_func(PIOA,  8, FUNC_B);     /* RXD  */
-        portmux_set_func(PIOA,  9, FUNC_B);     /* TXD  */
+        select_peripheral(PA(8),  PERIPH_B, 0); /* RXD  */
+        select_peripheral(PA(9),  PERIPH_B, 0); /* TXD  */
 }
 
 static inline void configure_usart1_pins(void)
 {
-        portmux_set_func(PIOA, 17, FUNC_A);     /* RXD  */
-        portmux_set_func(PIOA, 18, FUNC_A);     /* TXD  */
+        select_peripheral(PA(17), PERIPH_A, 0); /* RXD  */
+        select_peripheral(PA(18), PERIPH_A, 0); /* TXD  */
 }
 
 static inline void configure_usart2_pins(void)
 {
-        portmux_set_func(PIOB, 26, FUNC_B);     /* RXD  */
-        portmux_set_func(PIOB, 27, FUNC_B);     /* TXD  */
+        select_peripheral(PB(26), PERIPH_B, 0); /* RXD  */
+        select_peripheral(PB(27), PERIPH_B, 0); /* TXD  */
 }
 
 static inline void configure_usart3_pins(void)
 {
-        portmux_set_func(PIOB, 18, FUNC_B);     /* RXD  */
-        portmux_set_func(PIOB, 17, FUNC_B);     /* TXD  */
+        select_peripheral(PB(18), PERIPH_B, 0); /* RXD  */
+        select_peripheral(PB(17), PERIPH_B, 0); /* TXD  */
 }
 
 static struct platform_device *at32_usarts[4];
@@ -654,6 +646,15 @@ DEFINE_DEV_DATA(macb, 0);
 DEV_CLK(hclk, macb0, hsb, 8);
 DEV_CLK(pclk, macb0, pbb, 6);
 
+static struct eth_platform_data macb1_data;
+static struct resource macb1_resource[] = {
+        PBMEM(0xfff01c00),
+        IRQ(26),
+};
+DEFINE_DEV_DATA(macb, 1);
+DEV_CLK(hclk, macb1, hsb, 9);
+DEV_CLK(pclk, macb1, pbb, 7);
+
 struct platform_device *__init
 at32_add_device_eth(unsigned int id, struct eth_platform_data *data)
 {
@@ -663,27 +664,54 @@ at32_add_device_eth(unsigned int id, struct eth_platform_data *data)
         case 0:
                 pdev = &macb0_device;
 
-                portmux_set_func(PIOC,  3, FUNC_A);     /* TXD0 */
-                portmux_set_func(PIOC,  4, FUNC_A);     /* TXD1 */
-                portmux_set_func(PIOC,  7, FUNC_A);     /* TXEN */
-                portmux_set_func(PIOC,  8, FUNC_A);     /* TXCK */
-                portmux_set_func(PIOC,  9, FUNC_A);     /* RXD0 */
-                portmux_set_func(PIOC, 10, FUNC_A);     /* RXD1 */
-                portmux_set_func(PIOC, 13, FUNC_A);     /* RXER */
-                portmux_set_func(PIOC, 15, FUNC_A);     /* RXDV */
-                portmux_set_func(PIOC, 16, FUNC_A);     /* MDC  */
-                portmux_set_func(PIOC, 17, FUNC_A);     /* MDIO */
+                select_peripheral(PC(3),  PERIPH_A, 0); /* TXD0 */
+                select_peripheral(PC(4),  PERIPH_A, 0); /* TXD1 */
+                select_peripheral(PC(7),  PERIPH_A, 0); /* TXEN */
+                select_peripheral(PC(8),  PERIPH_A, 0); /* TXCK */
+                select_peripheral(PC(9),  PERIPH_A, 0); /* RXD0 */
+                select_peripheral(PC(10), PERIPH_A, 0); /* RXD1 */
+                select_peripheral(PC(13), PERIPH_A, 0); /* RXER */
+                select_peripheral(PC(15), PERIPH_A, 0); /* RXDV */
+                select_peripheral(PC(16), PERIPH_A, 0); /* MDC  */
+                select_peripheral(PC(17), PERIPH_A, 0); /* MDIO */
+
+                if (!data->is_rmii) {
+                        select_peripheral(PC(0),  PERIPH_A, 0); /* COL  */
+                        select_peripheral(PC(1),  PERIPH_A, 0); /* CRS  */
+                        select_peripheral(PC(2),  PERIPH_A, 0); /* TXER */
+                        select_peripheral(PC(5),  PERIPH_A, 0); /* TXD2 */
+                        select_peripheral(PC(6),  PERIPH_A, 0); /* TXD3 */
+                        select_peripheral(PC(11), PERIPH_A, 0); /* RXD2 */
+                        select_peripheral(PC(12), PERIPH_A, 0); /* RXD3 */
+                        select_peripheral(PC(14), PERIPH_A, 0); /* RXCK */
+                        select_peripheral(PC(18), PERIPH_A, 0); /* SPD  */
+                }
+                break;
+
+        case 1:
+                pdev = &macb1_device;
+
+                select_peripheral(PD(13), PERIPH_B, 0);         /* TXD0 */
+                select_peripheral(PD(14), PERIPH_B, 0);         /* TXD1 */
+                select_peripheral(PD(11), PERIPH_B, 0);         /* TXEN */
+                select_peripheral(PD(12), PERIPH_B, 0);         /* TXCK */
+                select_peripheral(PD(10), PERIPH_B, 0);         /* RXD0 */
+                select_peripheral(PD(6),  PERIPH_B, 0);         /* RXD1 */
+                select_peripheral(PD(5),  PERIPH_B, 0);         /* RXER */
+                select_peripheral(PD(4),  PERIPH_B, 0);         /* RXDV */
+                select_peripheral(PD(3),  PERIPH_B, 0);         /* MDC  */
+                select_peripheral(PD(2),  PERIPH_B, 0);         /* MDIO */
 
                 if (!data->is_rmii) {
-                        portmux_set_func(PIOC,  0, FUNC_A);     /* COL  */
-                        portmux_set_func(PIOC,  1, FUNC_A);     /* CRS  */
-                        portmux_set_func(PIOC,  2, FUNC_A);     /* TXER */
-                        portmux_set_func(PIOC,  5, FUNC_A);     /* TXD2 */
-                        portmux_set_func(PIOC,  6, FUNC_A);     /* TXD3 */
-                        portmux_set_func(PIOC, 11, FUNC_A);     /* RXD2 */
-                        portmux_set_func(PIOC, 12, FUNC_A);     /* RXD3 */
-                        portmux_set_func(PIOC, 14, FUNC_A);     /* RXCK */
-                        portmux_set_func(PIOC, 18, FUNC_A);     /* SPD  */
+                        select_peripheral(PC(19), PERIPH_B, 0); /* COL  */
+                        select_peripheral(PC(23), PERIPH_B, 0); /* CRS  */
+                        select_peripheral(PC(26), PERIPH_B, 0); /* TXER */
+                        select_peripheral(PC(27), PERIPH_B, 0); /* TXD2 */
+                        select_peripheral(PC(28), PERIPH_B, 0); /* TXD3 */
+                        select_peripheral(PC(29), PERIPH_B, 0); /* RXD2 */
+                        select_peripheral(PC(30), PERIPH_B, 0); /* RXD3 */
+                        select_peripheral(PC(24), PERIPH_B, 0); /* RXCK */
+                        select_peripheral(PD(15), PERIPH_B, 0); /* SPD  */
                 }
                 break;
 
@@ -714,12 +742,12 @@ struct platform_device *__init at32_add_device_spi(unsigned int id)
         switch (id) {
         case 0:
                 pdev = &spi0_device;
-                portmux_set_func(PIOA,  0, FUNC_A);     /* MISO  */
-                portmux_set_func(PIOA,  1, FUNC_A);     /* MOSI  */
-                portmux_set_func(PIOA,  2, FUNC_A);     /* SCK   */
-                portmux_set_func(PIOA,  3, FUNC_A);     /* NPCS0 */
-                portmux_set_func(PIOA,  4, FUNC_A);     /* NPCS1 */
-                portmux_set_func(PIOA,  5, FUNC_A);     /* NPCS2 */
+                select_peripheral(PA(0),  PERIPH_A, 0); /* MISO  */
+                select_peripheral(PA(1),  PERIPH_A, 0); /* MOSI  */
+                select_peripheral(PA(2),  PERIPH_A, 0); /* SCK   */
+                select_peripheral(PA(3),  PERIPH_A, 0); /* NPCS0 */
+                select_peripheral(PA(4),  PERIPH_A, 0); /* NPCS1 */
+                select_peripheral(PA(5),  PERIPH_A, 0); /* NPCS2 */
                 break;
 
         default:
@@ -762,37 +790,37 @@ at32_add_device_lcdc(unsigned int id, struct lcdc_platform_data *data)
         switch (id) {
         case 0:
                 pdev = &lcdc0_device;
-                portmux_set_func(PIOC, 19, FUNC_A);     /* CC     */
-                portmux_set_func(PIOC, 20, FUNC_A);     /* HSYNC  */
-                portmux_set_func(PIOC, 21, FUNC_A);     /* PCLK   */
-                portmux_set_func(PIOC, 22, FUNC_A);     /* VSYNC  */
-                portmux_set_func(PIOC, 23, FUNC_A);     /* DVAL   */
-                portmux_set_func(PIOC, 24, FUNC_A);     /* MODE   */
-                portmux_set_func(PIOC, 25, FUNC_A);     /* PWR    */
-                portmux_set_func(PIOC, 26, FUNC_A);     /* DATA0  */
-                portmux_set_func(PIOC, 27, FUNC_A);     /* DATA1  */
-                portmux_set_func(PIOC, 28, FUNC_A);     /* DATA2  */
-                portmux_set_func(PIOC, 29, FUNC_A);     /* DATA3  */
-                portmux_set_func(PIOC, 30, FUNC_A);     /* DATA4  */
-                portmux_set_func(PIOC, 31, FUNC_A);     /* DATA5  */
-                portmux_set_func(PIOD,  0, FUNC_A);     /* DATA6  */
-                portmux_set_func(PIOD,  1, FUNC_A);     /* DATA7  */
-                portmux_set_func(PIOD,  2, FUNC_A);     /* DATA8  */
-                portmux_set_func(PIOD,  3, FUNC_A);     /* DATA9  */
-                portmux_set_func(PIOD,  4, FUNC_A);     /* DATA10 */
-                portmux_set_func(PIOD,  5, FUNC_A);     /* DATA11 */
-                portmux_set_func(PIOD,  6, FUNC_A);     /* DATA12 */
-                portmux_set_func(PIOD,  7, FUNC_A);     /* DATA13 */
-                portmux_set_func(PIOD,  8, FUNC_A);     /* DATA14 */
-                portmux_set_func(PIOD,  9, FUNC_A);     /* DATA15 */
-                portmux_set_func(PIOD, 10, FUNC_A);     /* DATA16 */
-                portmux_set_func(PIOD, 11, FUNC_A);     /* DATA17 */
-                portmux_set_func(PIOD, 12, FUNC_A);     /* DATA18 */
-                portmux_set_func(PIOD, 13, FUNC_A);     /* DATA19 */
-                portmux_set_func(PIOD, 14, FUNC_A);     /* DATA20 */
-                portmux_set_func(PIOD, 15, FUNC_A);     /* DATA21 */
-                portmux_set_func(PIOD, 16, FUNC_A);     /* DATA22 */
-                portmux_set_func(PIOD, 17, FUNC_A);     /* DATA23 */
+                select_peripheral(PC(19), PERIPH_A, 0); /* CC     */
+                select_peripheral(PC(20), PERIPH_A, 0); /* HSYNC  */
+                select_peripheral(PC(21), PERIPH_A, 0); /* PCLK   */
+                select_peripheral(PC(22), PERIPH_A, 0); /* VSYNC  */
+                select_peripheral(PC(23), PERIPH_A, 0); /* DVAL   */
+                select_peripheral(PC(24), PERIPH_A, 0); /* MODE   */
+                select_peripheral(PC(25), PERIPH_A, 0); /* PWR    */
+                select_peripheral(PC(26), PERIPH_A, 0); /* DATA0  */
+                select_peripheral(PC(27), PERIPH_A, 0); /* DATA1  */
+                select_peripheral(PC(28), PERIPH_A, 0); /* DATA2  */
+                select_peripheral(PC(29), PERIPH_A, 0); /* DATA3  */
+                select_peripheral(PC(30), PERIPH_A, 0); /* DATA4  */
+                select_peripheral(PC(31), PERIPH_A, 0); /* DATA5  */
+                select_peripheral(PD(0),  PERIPH_A, 0); /* DATA6  */
+                select_peripheral(PD(1),  PERIPH_A, 0); /* DATA7  */
+                select_peripheral(PD(2),  PERIPH_A, 0); /* DATA8  */
+                select_peripheral(PD(3),  PERIPH_A, 0); /* DATA9  */
+                select_peripheral(PD(4),  PERIPH_A, 0); /* DATA10 */
+                select_peripheral(PD(5),  PERIPH_A, 0); /* DATA11 */
+                select_peripheral(PD(6),  PERIPH_A, 0); /* DATA12 */
+                select_peripheral(PD(7),  PERIPH_A, 0); /* DATA13 */
+                select_peripheral(PD(8),  PERIPH_A, 0); /* DATA14 */
+                select_peripheral(PD(9),  PERIPH_A, 0); /* DATA15 */
+                select_peripheral(PD(10), PERIPH_A, 0); /* DATA16 */
+                select_peripheral(PD(11), PERIPH_A, 0); /* DATA17 */
+                select_peripheral(PD(12), PERIPH_A, 0); /* DATA18 */
+                select_peripheral(PD(13), PERIPH_A, 0); /* DATA19 */
+                select_peripheral(PD(14), PERIPH_A, 0); /* DATA20 */
+                select_peripheral(PD(15), PERIPH_A, 0); /* DATA21 */
+                select_peripheral(PD(16), PERIPH_A, 0); /* DATA22 */
+                select_peripheral(PD(17), PERIPH_A, 0); /* DATA23 */
 
                 clk_set_parent(&lcdc0_pixclk, &pll0);
                 clk_set_rate(&lcdc0_pixclk, clk_get_rate(&pll0));
@@ -838,6 +866,8 @@ struct clk *at32_clock_list[] = {
         &atmel_usart3_usart,
         &macb0_hclk,
         &macb0_pclk,
+        &macb1_hclk,
+        &macb1_pclk,
         &spi0_mck,
         &lcdc0_hclk,
         &lcdc0_pixclk,
diff --git a/arch/avr32/mach-at32ap/extint.c b/arch/avr32/mach-at32ap/extint.c
index 4dff1f988900..b59272e81b9a 100644
--- a/arch/avr32/mach-at32ap/extint.c
+++ b/arch/avr32/mach-at32ap/extint.c
@@ -49,12 +49,25 @@ static void eim_unmask_irq(unsigned int irq)
 static int eim_set_irq_type(unsigned int irq, unsigned int flow_type)
 {
         struct at32_sm *sm = get_irq_chip_data(irq);
+        struct irq_desc *desc;
         unsigned int i = irq - sm->eim_first_irq;
         u32 mode, edge, level;
         unsigned long flags;
         int ret = 0;
 
-        flow_type &= IRQ_TYPE_SENSE_MASK;
+        if (flow_type == IRQ_TYPE_NONE)
+                flow_type = IRQ_TYPE_LEVEL_LOW;
+
+        desc = &irq_desc[irq];
+        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
+        desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
+
+        if (flow_type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH)) {
+                desc->status |= IRQ_LEVEL;
+                set_irq_handler(irq, handle_level_irq);
+        } else {
+                set_irq_handler(irq, handle_edge_irq);
+        }
 
         spin_lock_irqsave(&sm->lock, flags);
 
@@ -148,10 +161,15 @@ static int __init eim_init(void)
         pattern = sm_readl(sm, EIM_MODE);
         nr_irqs = fls(pattern);
 
+        /* Trigger on falling edge unless overridden by driver */
+        sm_writel(sm, EIM_MODE, 0UL);
+        sm_writel(sm, EIM_EDGE, 0UL);
+
         sm->eim_chip = &eim_chip;
 
         for (i = 0; i < nr_irqs; i++) {
-                set_irq_chip(sm->eim_first_irq + i, &eim_chip);
+                set_irq_chip_and_handler(sm->eim_first_irq + i, &eim_chip,
+                                         handle_edge_irq);
                 set_irq_chip_data(sm->eim_first_irq + i, sm);
         }
 
diff --git a/arch/avr32/mach-at32ap/intc.c b/arch/avr32/mach-at32ap/intc.c
index eb87a18ad7b2..dd5c009cf224 100644
--- a/arch/avr32/mach-at32ap/intc.c
+++ b/arch/avr32/mach-at32ap/intc.c
@@ -136,3 +136,7 @@ fail:
         panic("Interrupt controller initialization failed!\n");
 }
 
+unsigned long intc_get_pending(int group)
+{
+        return intc_readl(&intc0, INTREQ0 + 4 * group);
+}
diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c
index d3aabfca8598..f1280ed8ed6d 100644
--- a/arch/avr32/mach-at32ap/pio.c
+++ b/arch/avr32/mach-at32ap/pio.c
@@ -25,27 +25,98 @@ struct pio_device {
         void __iomem *regs;
         const struct platform_device *pdev;
         struct clk *clk;
-        u32 alloc_mask;
+        u32 pinmux_mask;
         char name[32];
 };
 
 static struct pio_device pio_dev[MAX_NR_PIO_DEVICES];
 
-void portmux_set_func(unsigned int portmux_id, unsigned int pin_id,
-                      unsigned int function_id)
+static struct pio_device *gpio_to_pio(unsigned int gpio)
 {
         struct pio_device *pio;
-        u32 mask = 1 << pin_id;
+        unsigned int index;
 
-        BUG_ON(portmux_id >= MAX_NR_PIO_DEVICES);
+        index = gpio >> 5;
+        if (index >= MAX_NR_PIO_DEVICES)
+                return NULL;
+        pio = &pio_dev[index];
+        if (!pio->regs)
+                return NULL;
 
-        pio = &pio_dev[portmux_id];
+        return pio;
+}
+
+/* Pin multiplexing API */
+
+void __init at32_select_periph(unsigned int pin, unsigned int periph,
+                               unsigned long flags)
+{
+        struct pio_device *pio;
+        unsigned int pin_index = pin & 0x1f;
+        u32 mask = 1 << pin_index;
+
+        pio = gpio_to_pio(pin);
+        if (unlikely(!pio)) {
+                printk("pio: invalid pin %u\n", pin);
+                goto fail;
+        }
 
-        if (function_id)
+        if (unlikely(test_and_set_bit(pin_index, &pio->pinmux_mask))) {
+                printk("%s: pin %u is busy\n", pio->name, pin_index);
+                goto fail;
+        }
+
+        pio_writel(pio, PUER, mask);
+        if (periph)
                 pio_writel(pio, BSR, mask);
         else
                 pio_writel(pio, ASR, mask);
+
         pio_writel(pio, PDR, mask);
+        if (!(flags & AT32_GPIOF_PULLUP))
+                pio_writel(pio, PUDR, mask);
+
+        return;
+
+fail:
+        dump_stack();
+}
+
+void __init at32_select_gpio(unsigned int pin, unsigned long flags)
+{
+        struct pio_device *pio;
+        unsigned int pin_index = pin & 0x1f;
+        u32 mask = 1 << pin_index;
+
+        pio = gpio_to_pio(pin);
+        if (unlikely(!pio)) {
+                printk("pio: invalid pin %u\n", pin);
+                goto fail;
+        }
+
+        if (unlikely(test_and_set_bit(pin_index, &pio->pinmux_mask))) {
+                printk("%s: pin %u is busy\n", pio->name, pin_index);
+                goto fail;
+        }
+
+        pio_writel(pio, PUER, mask);
+        if (flags & AT32_GPIOF_HIGH)
+                pio_writel(pio, SODR, mask);
+        else
+                pio_writel(pio, CODR, mask);
+        if (flags & AT32_GPIOF_OUTPUT)
+                pio_writel(pio, OER, mask);
+        else
+                pio_writel(pio, ODR, mask);
+
+        pio_writel(pio, PER, mask);
+        if (!(flags & AT32_GPIOF_PULLUP))
+                pio_writel(pio, PUDR, mask);
+
+        return;
+
+fail:
+        dump_stack();
 }
 
 static int __init pio_probe(struct platform_device *pdev)
diff --git a/arch/avr32/mach-at32ap/sm.c b/arch/avr32/mach-at32ap/sm.c
deleted file mode 100644
index 03306eb0345e..000000000000
--- a/arch/avr32/mach-at32ap/sm.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * System Manager driver for AT32AP CPUs
- *
- * Copyright (C) 2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/random.h>
-#include <linux/spinlock.h>
-
-#include <asm/intc.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#include <asm/arch/sm.h>
-
-#include "sm.h"
-
-#define SM_EIM_IRQ_RESOURCE     1
-#define SM_PM_IRQ_RESOURCE      2
-#define SM_RTC_IRQ_RESOURCE     3
-
-#define to_eim(irqc) container_of(irqc, struct at32_sm, irqc)
-
-struct at32_sm system_manager;
-
-int __init at32_sm_init(void)
-{
-        struct resource *regs;
-        struct at32_sm *sm = &system_manager;
-        int ret = -ENXIO;
-
-        regs = platform_get_resource(&at32_sm_device, IORESOURCE_MEM, 0);
-        if (!regs)
-                goto fail;
-
-        spin_lock_init(&sm->lock);
-        sm->pdev = &at32_sm_device;
-
-        ret = -ENOMEM;
-        sm->regs = ioremap(regs->start, regs->end - regs->start + 1);
-        if (!sm->regs)
-                goto fail;
-
-        return 0;
-
-fail:
-        printk(KERN_ERR "Failed to initialize System Manager: %d\n", ret);
-        return ret;
-}
-
-/*
- * External Interrupt Module (EIM).
- *
- * EIM gets level- or edge-triggered interrupts of either polarity
- * from the outside and converts it to active-high level-triggered
- * interrupts that the internal interrupt controller can handle. EIM
- * also provides masking/unmasking of interrupts, as well as
- * acknowledging of edge-triggered interrupts.
- */
-
-static irqreturn_t spurious_eim_interrupt(int irq, void *dev_id,
-                                          struct pt_regs *regs)
-{
-        printk(KERN_WARNING "Spurious EIM interrupt %d\n", irq);
-        disable_irq(irq);
-        return IRQ_NONE;
-}
-
-static struct irqaction eim_spurious_action = {
-        .handler = spurious_eim_interrupt,
-};
-
-static irqreturn_t eim_handle_irq(int irq, void *dev_id, struct pt_regs *regs)
-{
-        struct irq_controller * irqc = dev_id;
-        struct at32_sm *sm = to_eim(irqc);
-        unsigned long pending;
-
-        /*
-         * No need to disable interrupts globally.  The interrupt
-         * level relevant to this group must be masked all the time,
-         * so we know that this particular EIM instance will not be
-         * re-entered.
-         */
-        spin_lock(&sm->lock);
-
-        pending = intc_get_pending(sm->irqc.irq_group);
-        if (unlikely(!pending)) {
-                printk(KERN_ERR "EIM (group %u): No interrupts pending!\n",
-                       sm->irqc.irq_group);
-                goto unlock;
-        }
-
-        do {
-                struct irqaction *action;
-                unsigned int i;
-
-                i = fls(pending) - 1;
-                pending &= ~(1 << i);
-                action = sm->action[i];
-
-                /* Acknowledge the interrupt */
-                sm_writel(sm, EIM_ICR, 1 << i);
-
-                spin_unlock(&sm->lock);
-
-                if (action->flags & SA_INTERRUPT)
-                        local_irq_disable();
-                action->handler(sm->irqc.first_irq + i, action->dev_id, regs);
-                local_irq_enable();
-                spin_lock(&sm->lock);
-                if (action->flags & SA_SAMPLE_RANDOM)
-                        add_interrupt_randomness(sm->irqc.first_irq + i);
-        } while (pending);
-
-unlock:
-        spin_unlock(&sm->lock);
-        return IRQ_HANDLED;
-}
-
-static void eim_mask(struct irq_controller *irqc, unsigned int irq)
-{
-        struct at32_sm *sm = to_eim(irqc);
-        unsigned int i;
-
-        i = irq - sm->irqc.first_irq;
-        sm_writel(sm, EIM_IDR, 1 << i);
-}
-
-static void eim_unmask(struct irq_controller *irqc, unsigned int irq)
-{
-        struct at32_sm *sm = to_eim(irqc);
-        unsigned int i;
-
-        i = irq - sm->irqc.first_irq;
-        sm_writel(sm, EIM_IER, 1 << i);
-}
-
-static int eim_setup(struct irq_controller *irqc, unsigned int irq,
-                struct irqaction *action)
-{
-        struct at32_sm *sm = to_eim(irqc);
-        sm->action[irq - sm->irqc.first_irq] = action;
-        /* Acknowledge earlier interrupts */
-        sm_writel(sm, EIM_ICR, (1<<(irq - sm->irqc.first_irq)));
-        eim_unmask(irqc, irq);
-        return 0;
-}
-
-static void eim_free(struct irq_controller *irqc, unsigned int irq,
-                void *dev)
-{
-        struct at32_sm *sm = to_eim(irqc);
-        eim_mask(irqc, irq);
-        sm->action[irq - sm->irqc.first_irq] = &eim_spurious_action;
-}
-
-static int eim_set_type(struct irq_controller *irqc, unsigned int irq,
-                        unsigned int type)
-{
-        struct at32_sm *sm = to_eim(irqc);
-        unsigned long flags;
-        u32 value, pattern;
-
-        spin_lock_irqsave(&sm->lock, flags);
-
-        pattern = 1 << (irq - sm->irqc.first_irq);
-
-        value = sm_readl(sm, EIM_MODE);
-        if (type & IRQ_TYPE_LEVEL)
-                value |= pattern;
-        else
-                value &= ~pattern;
-        sm_writel(sm, EIM_MODE, value);
-        value = sm_readl(sm, EIM_EDGE);
-        if (type & IRQ_EDGE_RISING)
-                value |= pattern;
-        else
-                value &= ~pattern;
-        sm_writel(sm, EIM_EDGE, value);
-        value = sm_readl(sm, EIM_LEVEL);
-        if (type & IRQ_LEVEL_HIGH)
-                value |= pattern;
-        else
-                value &= ~pattern;
-        sm_writel(sm, EIM_LEVEL, value);
-
-        spin_unlock_irqrestore(&sm->lock, flags);
-
-        return 0;
-}
-
-static unsigned int eim_get_type(struct irq_controller *irqc,
-                                 unsigned int irq)
-{
-        struct at32_sm *sm = to_eim(irqc);
-        unsigned long flags;
-        unsigned int type = 0;
-        u32 mode, edge, level, pattern;
-
-        pattern = 1 << (irq - sm->irqc.first_irq);
-
-        spin_lock_irqsave(&sm->lock, flags);
-        mode = sm_readl(sm, EIM_MODE);
-        edge = sm_readl(sm, EIM_EDGE);
-        level = sm_readl(sm, EIM_LEVEL);
-        spin_unlock_irqrestore(&sm->lock, flags);
-
-        if (mode & pattern)
-                type |= IRQ_TYPE_LEVEL;
-        if (edge & pattern)
-                type |= IRQ_EDGE_RISING;
-        if (level & pattern)
-                type |= IRQ_LEVEL_HIGH;
-
-        return type;
-}
-
-static struct irq_controller_class eim_irq_class = {
-        .typename       = "EIM",
-        .handle         = eim_handle_irq,
-        .setup          = eim_setup,
-        .free           = eim_free,
-        .mask           = eim_mask,
-        .unmask         = eim_unmask,
-        .set_type       = eim_set_type,
-        .get_type       = eim_get_type,
-};
-
-static int __init eim_init(void)
-{
-        struct at32_sm *sm = &system_manager;
-        unsigned int i;
-        u32 pattern;
-        int ret;
-
-        /*
-         * The EIM is really the same module as SM, so register
-         * mapping, etc. has been taken care of already.
-         */
-
-        /*
-         * Find out how many interrupt lines that are actually
-         * implemented in hardware.
-         */
-        sm_writel(sm, EIM_IDR, ~0UL);
-        sm_writel(sm, EIM_MODE, ~0UL);
-        pattern = sm_readl(sm, EIM_MODE);
-        sm->irqc.nr_irqs = fls(pattern);
-
-        ret = -ENOMEM;
-        sm->action = kmalloc(sizeof(*sm->action) * sm->irqc.nr_irqs,
-                             GFP_KERNEL);
-        if (!sm->action)
-                goto out;
-
-        for (i = 0; i < sm->irqc.nr_irqs; i++)
-                sm->action[i] = &eim_spurious_action;
-
-        spin_lock_init(&sm->lock);
-        sm->irqc.irq_group = sm->pdev->resource[SM_EIM_IRQ_RESOURCE].start;
-        sm->irqc.class = &eim_irq_class;
-
-        ret = intc_register_controller(&sm->irqc);
-        if (ret < 0)
-                goto out_free_actions;
-
-        printk("EIM: External Interrupt Module at 0x%p, IRQ group %u\n",
-               sm->regs, sm->irqc.irq_group);
-        printk("EIM: Handling %u external IRQs, starting with IRQ%u\n",
-               sm->irqc.nr_irqs, sm->irqc.first_irq);
-
-        return 0;
-
-out_free_actions:
-        kfree(sm->action);
-out:
-        return ret;
-}
-arch_initcall(eim_init);
diff --git a/arch/avr32/mm/dma-coherent.c b/arch/avr32/mm/dma-coherent.c
index 44ab8a7bdae2..b68d669f823d 100644
--- a/arch/avr32/mm/dma-coherent.c
+++ b/arch/avr32/mm/dma-coherent.c
@@ -11,7 +11,7 @@
 #include <asm/addrspace.h>
 #include <asm/cacheflush.h>
 
-void dma_cache_sync(void *vaddr, size_t size, int direction)
+void dma_cache_sync(struct device *dev, void *vaddr, size_t size, int direction)
 {
         /*
          * No need to sync an uncached area
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 6a1238a29d6c..3474309e049c 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -16,6 +16,14 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
         bool
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config GENERIC_FIND_NEXT_BIT
         bool
         default y
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/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c
index 4fa81abab0c7..ffade19a14e6 100644
--- a/arch/cris/arch-v10/drivers/axisflashmap.c
+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
@@ -516,7 +516,7 @@ static int __init init_axis_flash(void)
 #else
                 struct mtd_info *mtd_ram;
 
-                mtd_ram = (struct mtd_info *)kmalloc(sizeof(struct mtd_info),
+                mtd_ram = kmalloc(sizeof(struct mtd_info),
                                                      GFP_KERNEL);
                 if (!mtd_ram) {
                         panic("axisflashmap couldn't allocate memory for "
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/gpio.c b/arch/cris/arch-v10/drivers/gpio.c
index fcba6632ed7b..9aba18b931dd 100644
--- a/arch/cris/arch-v10/drivers/gpio.c
+++ b/arch/cris/arch-v10/drivers/gpio.c
@@ -440,7 +440,7 @@ gpio_open(struct inode *inode, struct file *filp)
         if (p > GPIO_MINOR_LAST)
                 return -EINVAL;
 
-        priv = (struct gpio_private *)kmalloc(sizeof(struct gpio_private), 
+        priv = kmalloc(sizeof(struct gpio_private),
                                               GFP_KERNEL);
 
         if (!priv)
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/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index 41952320e00a..5180d45412fc 100644
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -427,7 +427,7 @@ static int __init init_axis_flash(void)
 #else
                 struct mtd_info *mtd_ram;
 
-                mtd_ram = (struct mtd_info *)kmalloc(sizeof(struct mtd_info),
+                mtd_ram = kmalloc(sizeof(struct mtd_info),
                                                      GFP_KERNEL);
                 if (!mtd_ram) {
                         panic("axisflashmap couldn't allocate memory for "
diff --git a/arch/cris/arch-v32/drivers/gpio.c b/arch/cris/arch-v32/drivers/gpio.c
index c3f876b4da6b..08d36f0955c6 100644
--- a/arch/cris/arch-v32/drivers/gpio.c
+++ b/arch/cris/arch-v32/drivers/gpio.c
@@ -423,7 +423,7 @@ gpio_open(struct inode *inode, struct file *filp)
         if (p > GPIO_MINOR_LAST)
                 return -EINVAL;
 
-        priv = (struct gpio_private *)kmalloc(sizeof(struct gpio_private),
+        priv = kmalloc(sizeof(struct gpio_private),
                                               GFP_KERNEL);
 
         if (!priv)
diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c
index e067806b2208..424eb0eb1cd5 100644
--- a/arch/cris/arch-v32/drivers/sync_serial.c
+++ b/arch/cris/arch-v32/drivers/sync_serial.c
@@ -504,7 +504,7 @@ static int sync_serial_release(struct inode *inode, struct file *file)
 
 static unsigned int sync_serial_poll(struct file *file, poll_table *wait)
 {
-        int dev = iminor(file->f_dentry->d_inode);
+        int dev = iminor(file->f_path.dentry->d_inode);
         unsigned int mask = 0;
         sync_port* port;
         DEBUGPOLL( static unsigned int prev_mask = 0; );
@@ -531,7 +531,7 @@ static int sync_serial_ioctl(struct inode *inode, struct file *file,
                   unsigned int cmd, unsigned long arg)
 {
         int return_val = 0;
-        int dev = iminor(file->f_dentry->d_inode);
+        int dev = iminor(file->f_path.dentry->d_inode);
         sync_port* port;
         reg_sser_rw_tr_cfg tr_cfg;
         reg_sser_rw_rec_cfg rec_cfg;
@@ -789,7 +789,7 @@ static int sync_serial_ioctl(struct inode *inode, struct file *file,
 static ssize_t sync_serial_write(struct file * file, const char * buf,
                                  size_t count, loff_t *ppos)
 {
-        int dev = iminor(file->f_dentry->d_inode);
+        int dev = iminor(file->f_path.dentry->d_inode);
         DECLARE_WAITQUEUE(wait, current);
         sync_port *port;
         unsigned long c, c1;
@@ -919,7 +919,7 @@ static ssize_t sync_serial_write(struct file * file, const char * buf,
 static ssize_t sync_serial_read(struct file * file, char * buf,
                                 size_t count, loff_t *ppos)
 {
-        int dev = iminor(file->f_dentry->d_inode);
+        int dev = iminor(file->f_path.dentry->d_inode);
         int avail;
         sync_port *port;
         unsigned char* start;
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index 99e59b3eacf8..7cd6ac803409 100644
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -686,7 +686,7 @@ keep_debug_flags(unsigned long oldccs, unsigned long oldspc,
 int __init
 cris_init_signal(void)
 {
-        u16* data = (u16*)kmalloc(PAGE_SIZE, GFP_KERNEL);
+        u16* data = kmalloc(PAGE_SIZE, GFP_KERNEL);
 
         /* This is movu.w __NR_sigreturn, r9; break 13; */
         data[0] = 0x9c5f;
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c
index 2d0023f2d49b..77e655f26560 100644
--- a/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
@@ -195,7 +195,7 @@ int setup_profiling_timer(unsigned int multiplier)
  */
 unsigned long cache_decay_ticks = 1;
 
-int __devinit __cpu_up(unsigned int cpu)
+int __cpuinit __cpu_up(unsigned int cpu)
 {
         smp_boot_one_cpu(cpu);
         return cpu_online(cpu) ? 0 : -ENOSYS;
diff --git a/arch/cris/kernel/profile.c b/arch/cris/kernel/profile.c
index 69c52189f044..f60ab785f235 100644
--- a/arch/cris/kernel/profile.c
+++ b/arch/cris/kernel/profile.c
@@ -59,7 +59,7 @@ static int
 __init init_cris_profile(void)
 {
   struct proc_dir_entry *entry;
-  sample_buffer = (char*)kmalloc(SAMPLE_BUFFER_SIZE, GFP_KERNEL);
+  sample_buffer = kmalloc(SAMPLE_BUFFER_SIZE, GFP_KERNEL);
   sample_buffer_pos = sample_buffer;
   entry = create_proc_entry("system_profile", S_IWUSR | S_IRUGO, NULL);
   if (entry) {
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 934c51078cce..c73e91f1299a 100644
--- a/arch/cris/mm/fault.c
+++ b/arch/cris/mm/fault.c
@@ -232,7 +232,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
          * context, we must not take the fault..
          */
 
-        if (in_interrupt() || !mm)
+        if (in_atomic() || !mm)
                 goto no_context;
 
         down_read(&mm->mmap_sem);
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index cf1c446e003a..7561d7b72e75 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -41,6 +41,14 @@ config TIME_LOW_RES
         bool
         default y
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default y
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default y
+
 mainmenu "Fujitsu FR-V Kernel Configuration"
 
 source "init/Kconfig"
diff --git a/arch/frv/kernel/futex.c b/arch/frv/kernel/futex.c
index eae874a970c6..14f64b054c7e 100644
--- a/arch/frv/kernel/futex.c
+++ b/arch/frv/kernel/futex.c
@@ -10,9 +10,9 @@
  */
 
 #include <linux/futex.h>
+#include <linux/uaccess.h>
 #include <asm/futex.h>
 #include <asm/errno.h>
-#include <asm/uaccess.h>
 
 /*
  * the various futex operations; MMU fault checking is ignored under no-MMU
@@ -200,7 +200,7 @@ int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
         if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
                 return -EFAULT;
 
-        inc_preempt_count();
+        pagefault_disable();
 
         switch (op) {
         case FUTEX_OP_SET:
@@ -223,7 +223,7 @@ int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
                 break;
         }
 
-        dec_preempt_count();
+        pagefault_enable();
 
         if (!ret) {
                 switch (cmp) {
diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c
index c1d9fc8f1a85..ee677ced7b68 100644
--- a/arch/frv/kernel/pm.c
+++ b/arch/frv/kernel/pm.c
@@ -223,7 +223,7 @@ static int cmode_procctl(ctl_table *ctl, int write, struct file *filp,
 
 static int cmode_sysctl(ctl_table *table, int __user *name, int nlen,
                         void __user *oldval, size_t __user *oldlenp,
-                        void __user *newval, size_t newlen, void **context)
+                        void __user *newval, size_t newlen)
 {
         if (oldval && oldlenp) {
                 size_t oldlen;
@@ -326,7 +326,7 @@ static int p0_procctl(ctl_table *ctl, int write, struct file *filp,
 
 static int p0_sysctl(ctl_table *table, int __user *name, int nlen,
                      void __user *oldval, size_t __user *oldlenp,
-                     void __user *newval, size_t newlen, void **context)
+                     void __user *newval, size_t newlen)
 {
         if (oldval && oldlenp) {
                 size_t oldlen;
@@ -370,7 +370,7 @@ static int cm_procctl(ctl_table *ctl, int write, struct file *filp,
 
 static int cm_sysctl(ctl_table *table, int __user *name, int nlen,
                      void __user *oldval, size_t __user *oldlenp,
-                     void __user *newval, size_t newlen, void **context)
+                     void __user *newval, size_t newlen)
 {
         if (oldval && oldlenp) {
                 size_t oldlen;
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index a8c61dac1cee..1a5eb6c301c9 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -947,7 +947,7 @@ static void __init setup_linux_memory(void)
         if (LOADER_TYPE && INITRD_START) {
                 if (INITRD_START + INITRD_SIZE <= (low_top_pfn << PAGE_SHIFT)) {
                         reserve_bootmem(INITRD_START, INITRD_SIZE);
-                        initrd_start = INITRD_START ? INITRD_START + PAGE_OFFSET : 0;
+                        initrd_start = INITRD_START + PAGE_OFFSET;
                         initrd_end = initrd_start + INITRD_SIZE;
                 }
                 else {
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index b8a5882b8625..85baeae9666a 100644
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@ -21,7 +21,7 @@
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/personality.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
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/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
index f5a653033fe0..9477ccce070e 100644
--- a/arch/frv/mm/elf-fdpic.c
+++ b/arch/frv/mm/elf-fdpic.c
@@ -110,14 +110,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
 
 #if 0
         printk("[area] l=%lx (ENOMEM) f='%s'\n",
-               len, filp ? filp->f_dentry->d_name.name : "");
+               len, filp ? filp->f_path.dentry->d_name.name : "");
 #endif
         return -ENOMEM;
 
  success:
 #if 0
         printk("[area] l=%lx ad=%lx f='%s'\n",
-               len, addr, filp ? filp->f_dentry->d_name.name : "");
+               len, addr, filp ? filp->f_path.dentry->d_name.name : "");
 #endif
         return addr;
 } /* end arch_get_unmapped_area() */
diff --git a/arch/frv/mm/fault.c b/arch/frv/mm/fault.c
index 8b3eb50c5105..3f12296c3688 100644
--- a/arch/frv/mm/fault.c
+++ b/arch/frv/mm/fault.c
@@ -78,7 +78,7 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
          * If we're in an interrupt or have no user
          * context, we must not take the fault..
          */
-        if (in_interrupt() || !mm)
+        if (in_atomic() || !mm)
                 goto no_context;
 
         down_read(&mm->mmap_sem);
diff --git a/arch/frv/mm/pgalloc.c b/arch/frv/mm/pgalloc.c
index f76dd03ddd99..19b13be114a2 100644
--- a/arch/frv/mm/pgalloc.c
+++ b/arch/frv/mm/pgalloc.c
@@ -18,7 +18,7 @@
 #include <asm/cacheflush.h>
 
 pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((aligned(PAGE_SIZE)));
-kmem_cache_t *pgd_cache;
+struct kmem_cache *pgd_cache;
 
 pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
 {
@@ -100,7 +100,7 @@ static inline void pgd_list_del(pgd_t *pgd)
                 set_page_private(next, (unsigned long) pprev);
 }
 
-void pgd_ctor(void *pgd, kmem_cache_t *cache, unsigned long unused)
+void pgd_ctor(void *pgd, struct kmem_cache *cache, unsigned long unused)
 {
         unsigned long flags;
 
@@ -120,7 +120,7 @@ void pgd_ctor(void *pgd, kmem_cache_t *cache, unsigned long unused)
 }
 
 /* never called when PTRS_PER_PMD > 1 */
-void pgd_dtor(void *pgd, kmem_cache_t *cache, unsigned long unused)
+void pgd_dtor(void *pgd, struct kmem_cache *cache, unsigned long unused)
 {
         unsigned long flags; /* can be called from interrupt context */
 
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index cabf0bfffc53..34a84bc4baf5 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -29,6 +29,14 @@ config RWSEM_XCHGADD_ALGORITHM
         bool
         default n
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config GENERIC_FIND_NEXT_BIT
         bool
         default y
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/kernel/ints.c b/arch/h8300/kernel/ints.c
index 1bfc77e391d5..587ef7f4fcc7 100644
--- a/arch/h8300/kernel/ints.c
+++ b/arch/h8300/kernel/ints.c
@@ -141,7 +141,7 @@ int request_irq(unsigned int irq,
                 return -EBUSY;
 
         if (use_kmalloc)
-                irq_handle = (irq_handler_t *)kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
+                irq_handle = kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
         else {
                 /* use bootmem allocater */
                 irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t));
diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c
index 1077b71d5226..6adf8f41d2a1 100644
--- a/arch/h8300/kernel/setup.c
+++ b/arch/h8300/kernel/setup.c
@@ -116,7 +116,7 @@ void __init setup_arch(char **cmdline_p)
 #endif
 #else
         if ((memory_end < CONFIG_BLKDEV_RESERVE_ADDRESS) && 
-            (memory_end > CONFIG_BLKDEV_RESERVE_ADDRESS)
+            (memory_end > CONFIG_BLKDEV_RESERVE_ADDRESS))
             /* overlap userarea */
             memory_end = CONFIG_BLKDEV_RESERVE_ADDRESS; 
 #endif
diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c
index 7787f70a05bb..02955604d760 100644
--- a/arch/h8300/kernel/signal.c
+++ b/arch/h8300/kernel/signal.c
@@ -38,7 +38,7 @@
 #include <linux/personality.h>
 #include <linux/tty.h>
 #include <linux/binfmts.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 
 #include <asm/setup.h>
 #include <asm/uaccess.h>
diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S
index 756325dd480e..f05288be8878 100644
--- a/arch/h8300/kernel/vmlinux.lds.S
+++ b/arch/h8300/kernel/vmlinux.lds.S
@@ -70,6 +70,7 @@ SECTIONS
 #endif
         .text :
         {
+        _text = .;
 #if defined(CONFIG_ROMKERNEL)
         *(.int_redirect)
 #endif
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/h8300/platform/h8s/ints.c b/arch/h8300/platform/h8s/ints.c
index 270440de4610..567f681ddfec 100644
--- a/arch/h8300/platform/h8s/ints.c
+++ b/arch/h8300/platform/h8s/ints.c
@@ -176,7 +176,7 @@ int request_irq(unsigned int irq,
         }               
 
         if (use_kmalloc)
-                irq_handle = (irq_handler_t *)kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
+                irq_handle = kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
         else {
                 /* use bootmem allocater */
                 irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t));
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 8ff1c6fb5aa1..0dfee812811a 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -49,6 +49,11 @@ config GENERIC_IOMAP
         bool
         default y
 
+config GENERIC_BUG
+        bool
+        default y
+        depends on BUG
+
 config GENERIC_HWEIGHT
         bool
         default y
@@ -182,6 +187,18 @@ config X86_ES7000
 
 endchoice
 
+config PARAVIRT
+        bool "Paravirtualization support (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+        depends on !(X86_VISWS || X86_VOYAGER)
+        help
+          Paravirtualization is a way of running multiple instances of
+          Linux on the same machine, under a hypervisor.  This option
+          changes the kernel so it can modify itself when it is run
+          under a hypervisor, improving performance significantly.
+          However, when run without a hypervisor the kernel is
+          theoretically slower.  If in doubt, say N.
+
 config ACPI_SRAT
         bool
         default y
@@ -443,7 +460,8 @@ source "drivers/firmware/Kconfig"
 
 choice
         prompt "High Memory Support"
-        default NOHIGHMEM
+        default HIGHMEM4G if !X86_NUMAQ
+        default HIGHMEM64G if X86_NUMAQ
 
 config NOHIGHMEM
         bool "off"
@@ -710,20 +728,6 @@ config BOOT_IOREMAP
         depends on (((X86_SUMMIT || X86_GENERICARCH) && NUMA) || (X86 && EFI))
         default y
 
-config REGPARM
-        bool "Use register arguments"
-        default y
-        help
-        Compile the kernel with -mregparm=3. This instructs gcc to use
-        a more efficient function call ABI which passes the first three
-        arguments of a function call via registers, which results in denser
-        and faster code.
-
-        If this option is disabled, then the default ABI of passing
-        arguments via the stack is used.
-
-        If unsure, say Y.
-
 config SECCOMP
         bool "Enable seccomp to safely compute untrusted bytecode"
         depends on PROC_FS
@@ -775,22 +779,79 @@ config CRASH_DUMP
 
 config PHYSICAL_START
         hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
-
-        default "0x1000000" if CRASH_DUMP
         default "0x100000"
         help
-          This gives the physical address where the kernel is loaded. Normally
-          for regular kernels this value is 0x100000 (1MB). But in the case
-          of kexec on panic the fail safe kernel needs to run at a different
-          address than the panic-ed kernel. This option is used to set the load
-          address for kernels used to capture crash dump on being kexec'ed
-          after panic. The default value for crash dump kernels is
-          0x1000000 (16MB). This can also be set based on the "X" value as
+          This gives the physical address where the kernel is loaded.
+
+          If kernel is a not relocatable (CONFIG_RELOCATABLE=n) then
+          bzImage will decompress itself to above physical address and
+          run from there. Otherwise, bzImage will run from the address where
+          it has been loaded by the boot loader and will ignore above physical
+          address.
+
+          In normal kdump cases one does not have to set/change this option
+          as now bzImage can be compiled as a completely relocatable image
+          (CONFIG_RELOCATABLE=y) and be used to load and run from a different
+          address. This option is mainly useful for the folks who don't want
+          to use a bzImage for capturing the crash dump and want to use a
+          vmlinux instead. vmlinux is not relocatable hence a kernel needs
+          to be specifically compiled to run from a specific memory area
+          (normally a reserved region) and this option comes handy.
+
+          So if you are using bzImage for capturing the crash dump, leave
+          the value here unchanged to 0x100000 and set CONFIG_RELOCATABLE=y.
+          Otherwise if you plan to use vmlinux for capturing the crash dump
+          change this value to start of the reserved region (Typically 16MB
+          0x1000000). In other words, it can be set based on the "X" value as
           specified in the "crashkernel=YM@XM" command line boot parameter
           passed to the panic-ed kernel. Typically this parameter is set as
           crashkernel=64M@16M. Please take a look at
           Documentation/kdump/kdump.txt for more details about crash dumps.
 
+          Usage of bzImage for capturing the crash dump is recommended as
+          one does not have to build two kernels. Same kernel can be used
+          as production kernel and capture kernel. Above option should have
+          gone away after relocatable bzImage support is introduced. But it
+          is present because there are users out there who continue to use
+          vmlinux for dump capture. This option should go away down the
+          line.
+
+          Don't change this unless you know what you are doing.
+
+config RELOCATABLE
+        bool "Build a relocatable kernel(EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+        help
+          This build a kernel image that retains relocation information
+          so it can be loaded someplace besides the default 1MB.
+          The relocations tend to the kernel binary about 10% larger,
+          but are discarded at runtime.
+
+          One use is for the kexec on panic case where the recovery kernel
+          must live at a different physical address than the primary
+          kernel.
+
+config PHYSICAL_ALIGN
+        hex "Alignment value to which kernel should be aligned"
+        default "0x100000"
+        range 0x2000 0x400000
+        help
+          This value puts the alignment restrictions on physical address
+          where kernel is loaded and run from. Kernel is compiled for an
+          address which meets above alignment restriction.
+
+          If bootloader loads the kernel at a non-aligned address and
+          CONFIG_RELOCATABLE is set, kernel will move itself to nearest
+          address aligned to above value and run from there.
+
+          If bootloader loads the kernel at a non-aligned address and
+          CONFIG_RELOCATABLE is not set, kernel will ignore the run time
+          load address and decompress itself to the address it has been
+          compiled for and run from there. The address for which kernel is
+          compiled already meets above alignment restrictions. Hence the
+          end result is that kernel runs from a physical address meeting
+          above alignment restrictions.
+
           Don't change this unless you know what you are doing.
 
 config HOTPLUG_CPU
diff --git a/arch/i386/Kconfig.cpu b/arch/i386/Kconfig.cpu
index fc4f2abccf06..2aecfba4ac4f 100644
--- a/arch/i386/Kconfig.cpu
+++ b/arch/i386/Kconfig.cpu
@@ -103,8 +103,15 @@ config MPENTIUMM
           Select this for Intel Pentium M (not Pentium-4 M)
           notebook chips.
 
+config MCORE2
+        bool "Core 2/newer Xeon"
+        help
+          Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx)
+          CPUs. You can distingush newer from older Xeons by the CPU family
+          in /proc/cpuinfo. Newer ones have 6.
+
 config MPENTIUM4
-        bool "Pentium-4/Celeron(P4-based)/Pentium-4 M/Xeon"
+        bool "Pentium-4/Celeron(P4-based)/Pentium-4 M/older Xeon"
         help
           Select this for Intel Pentium 4 chips.  This includes the
           Pentium 4, P4-based Celeron and Xeon, and Pentium-4 M
@@ -229,7 +236,7 @@ config X86_L1_CACHE_SHIFT
         default "7" if MPENTIUM4 || X86_GENERIC
         default "4" if X86_ELAN || M486 || M386 || MGEODEGX1
         default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
-        default "6" if MK7 || MK8 || MPENTIUMM
+        default "6" if MK7 || MK8 || MPENTIUMM || MCORE2
 
 config RWSEM_GENERIC_SPINLOCK
         bool
@@ -241,6 +248,14 @@ config RWSEM_XCHGADD_ALGORITHM
         depends on !M386
         default y
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config GENERIC_CALIBRATE_DELAY
         bool
         default y
@@ -287,17 +302,17 @@ config X86_ALIGNMENT_16
 
 config X86_GOOD_APIC
         bool
-        depends on MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || MK8 || MEFFICEON
+        depends on MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || MK8 || MEFFICEON || MCORE2
         default y
 
 config X86_INTEL_USERCOPY
         bool
-        depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON
+        depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2
         default y
 
 config X86_USE_PPRO_CHECKSUM
         bool
-        depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MEFFICEON || MGEODE_LX
+        depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MEFFICEON || MGEODE_LX || MCORE2
         default y
 
 config X86_USE_3DNOW
@@ -312,5 +327,5 @@ config X86_OOSTORE
 
 config X86_TSC
         bool
-        depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ
+        depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ
         default y
diff --git a/arch/i386/Kconfig.debug b/arch/i386/Kconfig.debug
index b31c0802e1cc..f68cc6f215f8 100644
--- a/arch/i386/Kconfig.debug
+++ b/arch/i386/Kconfig.debug
@@ -85,4 +85,14 @@ config DOUBLEFAULT
           option saves about 4k and might cause you much additional grey
           hair.
 
+config DEBUG_PARAVIRT
+        bool "Enable some paravirtualization debugging"
+        default y
+        depends on PARAVIRT && DEBUG_KERNEL
+        help
+          Currently deliberately clobbers regs which are allowed to be
+          clobbered in inlined paravirt hooks, even in native mode.
+          If turning this off solves a problem, then DISABLE_INTERRUPTS() or
+          ENABLE_INTERRUPTS() is lying about what registers can be clobbered.
+
 endmenu
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 0677908dfa06..f7ac1aea1d8a 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -26,10 +26,12 @@ endif
 
 LDFLAGS         := -m elf_i386
 OBJCOPYFLAGS    := -O binary -R .note -R .comment -S
-LDFLAGS_vmlinux :=
+ifdef CONFIG_RELOCATABLE
+LDFLAGS_vmlinux := --emit-relocs
+endif
 CHECKFLAGS      += -D__i386__
 
-CFLAGS += -pipe -msoft-float
+CFLAGS += -pipe -msoft-float -mregparm=3
 
 # prevent gcc from keeping the stack 16 byte aligned
 CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2)
@@ -37,8 +39,6 @@ CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2)
 # CPU-specific tuning. Anything which can be shared with UML should go here.
 include $(srctree)/arch/i386/Makefile.cpu
 
-cflags-$(CONFIG_REGPARM) += -mregparm=3
-
 # temporary until string.h is fixed
 cflags-y += -ffreestanding
 
diff --git a/arch/i386/Makefile.cpu b/arch/i386/Makefile.cpu
index a11befba26d5..a32c031c90d7 100644
--- a/arch/i386/Makefile.cpu
+++ b/arch/i386/Makefile.cpu
@@ -32,6 +32,7 @@ cflags-$(CONFIG_MWINCHIP2)	+= $(call cc-option,-march=winchip2,-march=i586)
 cflags-$(CONFIG_MWINCHIP3D)     += $(call cc-option,-march=winchip2,-march=i586)
 cflags-$(CONFIG_MCYRIXIII)      += $(call cc-option,-march=c3,-march=i486) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
 cflags-$(CONFIG_MVIAC3_2)       += $(call cc-option,-march=c3-2,-march=i686)
+cflags-$(CONFIG_MCORE2)         += -march=i686 $(call cc-option,-mtune=core2,$(call cc-option,-mtune=generic,-mtune=i686))
 
 # AMD Elan support
 cflags-$(CONFIG_X86_ELAN)       += -march=i486
diff --git a/arch/i386/boot/compressed/.gitignore b/arch/i386/boot/compressed/.gitignore
new file mode 100644
index 000000000000..be0ed065249b
--- /dev/null
+++ b/arch/i386/boot/compressed/.gitignore
@@ -0,0 +1 @@
+relocs
diff --git a/arch/i386/boot/compressed/Makefile b/arch/i386/boot/compressed/Makefile
index 258ea95224f6..a661217f33ec 100644
--- a/arch/i386/boot/compressed/Makefile
+++ b/arch/i386/boot/compressed/Makefile
@@ -4,22 +4,42 @@
 # create a compressed vmlinux image from the original vmlinux
 #
 
-targets         := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
+targets         := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o \
+                        vmlinux.bin.all vmlinux.relocs
 EXTRA_AFLAGS    := -traditional
 
-LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup_32
+LDFLAGS_vmlinux := -T
+CFLAGS_misc.o += -fPIC
+hostprogs-y     := relocs
 
-$(obj)/vmlinux: $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
+$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
         $(call if_changed,ld)
         @:
 
 $(obj)/vmlinux.bin: vmlinux FORCE
         $(call if_changed,objcopy)
 
+quiet_cmd_relocs = RELOCS  $@
+      cmd_relocs = $(obj)/relocs $< > $@;$(obj)/relocs --abs-relocs $<
+$(obj)/vmlinux.relocs: vmlinux $(obj)/relocs FORCE
+        $(call if_changed,relocs)
+
+vmlinux.bin.all-y := $(obj)/vmlinux.bin
+vmlinux.bin.all-$(CONFIG_RELOCATABLE) += $(obj)/vmlinux.relocs
+quiet_cmd_relocbin = BUILD   $@
+      cmd_relocbin = cat $(filter-out FORCE,$^) > $@
+$(obj)/vmlinux.bin.all: $(vmlinux.bin.all-y) FORCE
+        $(call if_changed,relocbin)
+
+ifdef CONFIG_RELOCATABLE
+$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin.all FORCE
+        $(call if_changed,gzip)
+else
 $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
         $(call if_changed,gzip)
+endif
 
 LDFLAGS_piggy.o := -r --format binary --oformat elf32-i386 -T
 
-$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
+$(obj)/piggy.o: $(src)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
         $(call if_changed,ld)
diff --git a/arch/i386/boot/compressed/head.S b/arch/i386/boot/compressed/head.S
index b5893e4ecd37..3517a32aaf41 100644
--- a/arch/i386/boot/compressed/head.S
+++ b/arch/i386/boot/compressed/head.S
@@ -26,9 +26,11 @@
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/page.h>
+#include <asm/boot.h>
 
+.section ".text.head","ax",@progbits
         .globl startup_32
-        
+
 startup_32:
         cld
         cli
@@ -37,93 +39,142 @@ startup_32:
         movl %eax,%es
         movl %eax,%fs
         movl %eax,%gs
+        movl %eax,%ss
 
-        lss stack_start,%esp
-        xorl %eax,%eax
-1:      incl %eax               # check that A20 really IS enabled
-        movl %eax,0x000000      # loop forever if it isn't
-        cmpl %eax,0x100000
-        je 1b
+/* Calculate the delta between where we were compiled to run
+ * at and where we were actually loaded at.  This can only be done
+ * with a short local call on x86.  Nothing  else will tell us what
+ * address we are running at.  The reserved chunk of the real-mode
+ * data at 0x34-0x3f are used as the stack for this calculation.
+ * Only 4 bytes are needed.
+ */
+        leal 0x40(%esi), %esp
+        call 1f
+1:      popl %ebp
+        subl $1b, %ebp
+
+/* %ebp contains the address we are loaded at by the boot loader and %ebx
+ * contains the address where we should move the kernel image temporarily
+ * for safe in-place decompression.
+ */
+
+#ifdef CONFIG_RELOCATABLE
+        movl    %ebp, %ebx
+        addl    $(CONFIG_PHYSICAL_ALIGN - 1), %ebx
+        andl    $(~(CONFIG_PHYSICAL_ALIGN - 1)), %ebx
+#else
+        movl $LOAD_PHYSICAL_ADDR, %ebx
+#endif
+
+        /* Replace the compressed data size with the uncompressed size */
+        subl input_len(%ebp), %ebx
+        movl output_len(%ebp), %eax
+        addl %eax, %ebx
+        /* Add 8 bytes for every 32K input block */
+        shrl $12, %eax
+        addl %eax, %ebx
+        /* Add 32K + 18 bytes of extra slack */
+        addl $(32768 + 18), %ebx
+        /* Align on a 4K boundary */
+        addl $4095, %ebx
+        andl $~4095, %ebx
+
+/* Copy the compressed kernel to the end of our buffer
+ * where decompression in place becomes safe.
+ */
+        pushl %esi
+        leal _end(%ebp), %esi
+        leal _end(%ebx), %edi
+        movl $(_end - startup_32), %ecx
+        std
+        rep
+        movsb
+        cld
+        popl %esi
+
+/* Compute the kernel start address.
+ */
+#ifdef CONFIG_RELOCATABLE
+        addl    $(CONFIG_PHYSICAL_ALIGN - 1), %ebp
+        andl    $(~(CONFIG_PHYSICAL_ALIGN - 1)), %ebp
+#else
+        movl    $LOAD_PHYSICAL_ADDR, %ebp
+#endif
 
 /*
- * Initialize eflags.  Some BIOS's leave bits like NT set.  This would
- * confuse the debugger if this code is traced.
- * XXX - best to initialize before switching to protected mode.
+ * Jump to the relocated address.
  */
-        pushl $0
-        popfl
+        leal relocated(%ebx), %eax
+        jmp *%eax
+.section ".text"
+relocated:
+
 /*
  * Clear BSS
  */
         xorl %eax,%eax
-        movl $_edata,%edi
-        movl $_end,%ecx
+        leal _edata(%ebx),%edi
+        leal _end(%ebx), %ecx
         subl %edi,%ecx
         cld
         rep
         stosb
+
+/*
+ * Setup the stack for the decompressor
+ */
+        leal stack_end(%ebx), %esp
+
 /*
  * Do the decompression, and jump to the new kernel..
  */
-        subl $16,%esp   # place for structure on the stack
-        movl %esp,%eax
+        movl output_len(%ebx), %eax
+        pushl %eax
+        pushl %ebp      # output address
+        movl input_len(%ebx), %eax
+        pushl %eax      # input_len
+        leal input_data(%ebx), %eax
+        pushl %eax      # input_data
+        leal _end(%ebx), %eax
+        pushl %eax      # end of the image as third argument
         pushl %esi      # real mode pointer as second arg
-        pushl %eax      # address of structure as first arg
         call decompress_kernel
-        orl  %eax,%eax 
-        jnz  3f
-        popl %esi       # discard address
-        popl %esi       # real mode pointer
-        xorl %ebx,%ebx
-        ljmp $(__BOOT_CS), $__PHYSICAL_START
+        addl $20, %esp
+        popl %ecx
 
+#if CONFIG_RELOCATABLE
+/* Find the address of the relocations.
+ */
+        movl %ebp, %edi
+        addl %ecx, %edi
+
+/* Calculate the delta between where vmlinux was compiled to run
+ * and where it was actually loaded.
+ */
+        movl %ebp, %ebx
+        subl $LOAD_PHYSICAL_ADDR, %ebx
+        jz   2f         /* Nothing to be done if loaded at compiled addr. */
 /*
- * We come here, if we were loaded high.
- * We need to move the move-in-place routine down to 0x1000
- * and then start it with the buffer addresses in registers,
- * which we got from the stack.
+ * Process relocations.
  */
-3:
-        movl $move_routine_start,%esi
-        movl $0x1000,%edi
-        movl $move_routine_end,%ecx
-        subl %esi,%ecx
-        addl $3,%ecx
-        shrl $2,%ecx
-        cld
-        rep
-        movsl
-
-        popl %esi       # discard the address
-        popl %ebx       # real mode pointer
-        popl %esi       # low_buffer_start
-        popl %ecx       # lcount
-        popl %edx       # high_buffer_start
-        popl %eax       # hcount
-        movl $__PHYSICAL_START,%edi
-        cli             # make sure we don't get interrupted
-        ljmp $(__BOOT_CS), $0x1000 # and jump to the move routine
+
+1:      subl $4, %edi
+        movl 0(%edi), %ecx
+        testl %ecx, %ecx
+        jz 2f
+        addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
+        jmp 1b
+2:
+#endif
 
 /*
- * Routine (template) for moving the decompressed kernel in place,
- * if we were high loaded. This _must_ PIC-code !
+ * Jump to the decompressed kernel.
  */
-move_routine_start:
-        movl %ecx,%ebp
-        shrl $2,%ecx
-        rep
-        movsl
-        movl %ebp,%ecx
-        andl $3,%ecx
-        rep
-        movsb
-        movl %edx,%esi
-        movl %eax,%ecx  # NOTE: rep movsb won't move if %ecx == 0
-        addl $3,%ecx
-        shrl $2,%ecx
-        rep
-        movsl
-        movl %ebx,%esi  # Restore setup pointer
         xorl %ebx,%ebx
-        ljmp $(__BOOT_CS), $__PHYSICAL_START
-move_routine_end:
+        jmp *%ebp
+
+.bss
+.balign 4
+stack:
+        .fill 4096, 1, 0
+stack_end:
diff --git a/arch/i386/boot/compressed/misc.c b/arch/i386/boot/compressed/misc.c
index b2ccd543410d..1ce7017fd627 100644
--- a/arch/i386/boot/compressed/misc.c
+++ b/arch/i386/boot/compressed/misc.c
@@ -9,11 +9,94 @@
  * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996
  */
 
+#undef CONFIG_PARAVIRT
 #include <linux/linkage.h>
 #include <linux/vmalloc.h>
 #include <linux/screen_info.h>
 #include <asm/io.h>
 #include <asm/page.h>
+#include <asm/boot.h>
+
+/* WARNING!!
+ * This code is compiled with -fPIC and it is relocated dynamically
+ * at run time, but no relocation processing is performed.
+ * This means that it is not safe to place pointers in static structures.
+ */
+
+/*
+ * Getting to provable safe in place decompression is hard.
+ * Worst case behaviours need to be analized.
+ * Background information:
+ *
+ * The file layout is:
+ *    magic[2]
+ *    method[1]
+ *    flags[1]
+ *    timestamp[4]
+ *    extraflags[1]
+ *    os[1]
+ *    compressed data blocks[N]
+ *    crc[4] orig_len[4]
+ *
+ * resulting in 18 bytes of non compressed data overhead.
+ *
+ * Files divided into blocks
+ * 1 bit (last block flag)
+ * 2 bits (block type)
+ *
+ * 1 block occurs every 32K -1 bytes or when there 50% compression has been achieved.
+ * The smallest block type encoding is always used.
+ *
+ * stored:
+ *    32 bits length in bytes.
+ *
+ * fixed:
+ *    magic fixed tree.
+ *    symbols.
+ *
+ * dynamic:
+ *    dynamic tree encoding.
+ *    symbols.
+ *
+ *
+ * The buffer for decompression in place is the length of the
+ * uncompressed data, plus a small amount extra to keep the algorithm safe.
+ * The compressed data is placed at the end of the buffer.  The output
+ * pointer is placed at the start of the buffer and the input pointer
+ * is placed where the compressed data starts.  Problems will occur
+ * when the output pointer overruns the input pointer.
+ *
+ * The output pointer can only overrun the input pointer if the input
+ * pointer is moving faster than the output pointer.  A condition only
+ * triggered by data whose compressed form is larger than the uncompressed
+ * form.
+ *
+ * The worst case at the block level is a growth of the compressed data
+ * of 5 bytes per 32767 bytes.
+ *
+ * The worst case internal to a compressed block is very hard to figure.
+ * The worst case can at least be boundined by having one bit that represents
+ * 32764 bytes and then all of the rest of the bytes representing the very
+ * very last byte.
+ *
+ * All of which is enough to compute an amount of extra data that is required
+ * to be safe.  To avoid problems at the block level allocating 5 extra bytes
+ * per 32767 bytes of data is sufficient.  To avoind problems internal to a block
+ * adding an extra 32767 bytes (the worst case uncompressed block size) is
+ * sufficient, to ensure that in the worst case the decompressed data for
+ * block will stop the byte before the compressed data for a block begins.
+ * To avoid problems with the compressed data's meta information an extra 18
+ * bytes are needed.  Leading to the formula:
+ *
+ * extra_bytes = (uncompressed_size >> 12) + 32768 + 18 + decompressor_size.
+ *
+ * Adding 8 bytes per 32K is a bit excessive but much easier to calculate.
+ * Adding 32768 instead of 32767 just makes for round numbers.
+ * Adding the decompressor_size is necessary as it musht live after all
+ * of the data as well.  Last I measured the decompressor is about 14K.
+ * 10K of actuall data and 4K of bss.
+ *
+ */
 
 /*
  * gzip declarations
@@ -30,15 +113,20 @@ typedef unsigned char  uch;
 typedef unsigned short ush;
 typedef unsigned long  ulg;
 
-#define WSIZE 0x8000            /* Window size must be at least 32k, */
-                                /* and a power of two */
+#define WSIZE 0x80000000        /* Window size must be at least 32k,
+                                 * and a power of two
+                                 * We don't actually have a window just
+                                 * a huge output buffer so I report
+                                 * a 2G windows size, as that should
+                                 * always be larger than our output buffer.
+                                 */
 
-static uch *inbuf;           /* input buffer */
-static uch window[WSIZE];    /* Sliding window buffer */
+static uch *inbuf;      /* input buffer */
+static uch *window;     /* Sliding window buffer, (and final output buffer) */
 
-static unsigned insize = 0;  /* valid bytes in inbuf */
-static unsigned inptr = 0;   /* index of next byte to be processed in inbuf */
-static unsigned outcnt = 0;  /* bytes in output buffer */
+static unsigned insize;  /* valid bytes in inbuf */
+static unsigned inptr;   /* index of next byte to be processed in inbuf */
+static unsigned outcnt;  /* bytes in output buffer */
 
 /* gzip flag byte */
 #define ASCII_FLAG   0x01 /* bit 0 set: file probably ASCII text */
@@ -89,8 +177,6 @@ extern unsigned char input_data[];
 extern int input_len;
 
 static long bytes_out = 0;
-static uch *output_data;
-static unsigned long output_ptr = 0;
 
 static void *malloc(int size);
 static void free(void *where);
@@ -100,24 +186,17 @@ static void *memcpy(void *dest, const void *src, unsigned n);
 
 static void putstr(const char *);
 
-extern int end;
-static long free_mem_ptr = (long)&end;
-static long free_mem_end_ptr;
+static unsigned long free_mem_ptr;
+static unsigned long free_mem_end_ptr;
 
-#define INPLACE_MOVE_ROUTINE  0x1000
-#define LOW_BUFFER_START      0x2000
-#define LOW_BUFFER_MAX       0x90000
 #define HEAP_SIZE             0x3000
-static unsigned int low_buffer_end, low_buffer_size;
-static int high_loaded =0;
-static uch *high_buffer_start /* = (uch *)(((ulg)&end) + HEAP_SIZE)*/;
 
 static char *vidmem = (char *)0xb8000;
 static int vidport;
 static int lines, cols;
 
 #ifdef CONFIG_X86_NUMAQ
-static void * xquad_portio = NULL;
+void *xquad_portio;
 #endif
 
 #include "../../../../lib/inflate.c"
@@ -151,7 +230,7 @@ static void gzip_mark(void **ptr)
 
 static void gzip_release(void **ptr)
 {
-        free_mem_ptr = (long) *ptr;
+        free_mem_ptr = (unsigned long) *ptr;
 }
  
 static void scroll(void)
@@ -179,7 +258,7 @@ static void putstr(const char *s)
                                 y--;
                         }
                 } else {
-                        vidmem [ ( x + cols * y ) * 2 ] = c; 
+                        vidmem [ ( x + cols * y ) * 2 ] = c;
                         if ( ++x >= cols ) {
                                 x = 0;
                                 if ( ++y >= lines ) {
@@ -224,58 +303,31 @@ static void* memcpy(void* dest, const void* src, unsigned n)
  */
 static int fill_inbuf(void)
 {
-        if (insize != 0) {
-                error("ran out of input data");
-        }
-
-        inbuf = input_data;
-        insize = input_len;
-        inptr = 1;
-        return inbuf[0];
+        error("ran out of input data");
+        return 0;
 }
 
 /* ===========================================================================
  * Write the output window window[0..outcnt-1] and update crc and bytes_out.
  * (Used for the decompressed data only.)
  */
-static void flush_window_low(void)
-{
-    ulg c = crc;         /* temporary variable */
-    unsigned n;
-    uch *in, *out, ch;
-    
-    in = window;
-    out = &output_data[output_ptr]; 
-    for (n = 0; n < outcnt; n++) {
-            ch = *out++ = *in++;
-            c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);
-    }
-    crc = c;
-    bytes_out += (ulg)outcnt;
-    output_ptr += (ulg)outcnt;
-    outcnt = 0;
-}
-
-static void flush_window_high(void)
-{
-    ulg c = crc;         /* temporary variable */
-    unsigned n;
-    uch *in,  ch;
-    in = window;
-    for (n = 0; n < outcnt; n++) {
-        ch = *output_data++ = *in++;
-        if ((ulg)output_data == low_buffer_end) output_data=high_buffer_start;
-        c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);
-    }
-    crc = c;
-    bytes_out += (ulg)outcnt;
-    outcnt = 0;
-}
-
 static void flush_window(void)
 {
-        if (high_loaded) flush_window_high();
-        else flush_window_low();
+        /* With my window equal to my output buffer
+         * I only need to compute the crc here.
+         */
+        ulg c = crc;         /* temporary variable */
+        unsigned n;
+        uch *in, ch;
+
+        in = window;
+        for (n = 0; n < outcnt; n++) {
+                ch = *in++;
+                c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);
+        }
+        crc = c;
+        bytes_out += (ulg)outcnt;
+        outcnt = 0;
 }
 
 static void error(char *x)
@@ -287,66 +339,8 @@ static void error(char *x)
         while(1);       /* Halt */
 }
 
-#define STACK_SIZE (4096)
-
-long user_stack [STACK_SIZE];
-
-struct {
-        long * a;
-        short b;
-        } stack_start = { & user_stack [STACK_SIZE] , __BOOT_DS };
-
-static void setup_normal_output_buffer(void)
-{
-#ifdef STANDARD_MEMORY_BIOS_CALL
-        if (RM_EXT_MEM_K < 1024) error("Less than 2MB of memory");
-#else
-        if ((RM_ALT_MEM_K > RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) < 1024) error("Less than 2MB of memory");
-#endif
-        output_data = (unsigned char *)__PHYSICAL_START; /* Normally Points to 1M */
-        free_mem_end_ptr = (long)real_mode;
-}
-
-struct moveparams {
-        uch *low_buffer_start;  int lcount;
-        uch *high_buffer_start; int hcount;
-};
-
-static void setup_output_buffer_if_we_run_high(struct moveparams *mv)
-{
-        high_buffer_start = (uch *)(((ulg)&end) + HEAP_SIZE);
-#ifdef STANDARD_MEMORY_BIOS_CALL
-        if (RM_EXT_MEM_K < (3*1024)) error("Less than 4MB of memory");
-#else
-        if ((RM_ALT_MEM_K > RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) < (3*1024)) error("Less than 4MB of memory");
-#endif  
-        mv->low_buffer_start = output_data = (unsigned char *)LOW_BUFFER_START;
-        low_buffer_end = ((unsigned int)real_mode > LOW_BUFFER_MAX
-          ? LOW_BUFFER_MAX : (unsigned int)real_mode) & ~0xfff;
-        low_buffer_size = low_buffer_end - LOW_BUFFER_START;
-        high_loaded = 1;
-        free_mem_end_ptr = (long)high_buffer_start;
-        if ( (__PHYSICAL_START + low_buffer_size) > ((ulg)high_buffer_start)) {
-                high_buffer_start = (uch *)(__PHYSICAL_START + low_buffer_size);
-                mv->hcount = 0; /* say: we need not to move high_buffer */
-        }
-        else mv->hcount = -1;
-        mv->high_buffer_start = high_buffer_start;
-}
-
-static void close_output_buffer_if_we_run_high(struct moveparams *mv)
-{
-        if (bytes_out > low_buffer_size) {
-                mv->lcount = low_buffer_size;
-                if (mv->hcount)
-                        mv->hcount = bytes_out - low_buffer_size;
-        } else {
-                mv->lcount = bytes_out;
-                mv->hcount = 0;
-        }
-}
-
-asmlinkage int decompress_kernel(struct moveparams *mv, void *rmode)
+asmlinkage void decompress_kernel(void *rmode, unsigned long end,
+                        uch *input_data, unsigned long input_len, uch *output)
 {
         real_mode = rmode;
 
@@ -361,13 +355,25 @@ asmlinkage int decompress_kernel(struct moveparams *mv, void *rmode)
         lines = RM_SCREEN_INFO.orig_video_lines;
         cols = RM_SCREEN_INFO.orig_video_cols;
 
-        if (free_mem_ptr < 0x100000) setup_normal_output_buffer();
-        else setup_output_buffer_if_we_run_high(mv);
+        window = output;        /* Output buffer (Normally at 1M) */
+        free_mem_ptr     = end; /* Heap  */
+        free_mem_end_ptr = end + HEAP_SIZE;
+        inbuf  = input_data;    /* Input buffer */
+        insize = input_len;
+        inptr  = 0;
+
+        if ((u32)output & (CONFIG_PHYSICAL_ALIGN -1))
+                error("Destination address not CONFIG_PHYSICAL_ALIGN aligned");
+        if (end > ((-__PAGE_OFFSET-(512 <<20)-1) & 0x7fffffff))
+                error("Destination address too large");
+#ifndef CONFIG_RELOCATABLE
+        if ((u32)output != LOAD_PHYSICAL_ADDR)
+                error("Wrong destination address");
+#endif
 
         makecrc();
         putstr("Uncompressing Linux... ");
         gunzip();
         putstr("Ok, booting the kernel.\n");
-        if (high_loaded) close_output_buffer_if_we_run_high(mv);
-        return high_loaded;
+        return;
 }
diff --git a/arch/i386/boot/compressed/relocs.c b/arch/i386/boot/compressed/relocs.c
new file mode 100644
index 000000000000..468da89153c4
--- /dev/null
+++ b/arch/i386/boot/compressed/relocs.c
@@ -0,0 +1,625 @@
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <elf.h>
+#include <byteswap.h>
+#define USE_BSD
+#include <endian.h>
+
+#define MAX_SHDRS 100
+static Elf32_Ehdr ehdr;
+static Elf32_Shdr shdr[MAX_SHDRS];
+static Elf32_Sym  *symtab[MAX_SHDRS];
+static Elf32_Rel  *reltab[MAX_SHDRS];
+static char *strtab[MAX_SHDRS];
+static unsigned long reloc_count, reloc_idx;
+static unsigned long *relocs;
+
+/*
+ * Following symbols have been audited. There values are constant and do
+ * not change if bzImage is loaded at a different physical address than
+ * the address for which it has been compiled. Don't warn user about
+ * absolute relocations present w.r.t these symbols.
+ */
+static const char* safe_abs_relocs[] = {
+                "__kernel_vsyscall",
+                "__kernel_rt_sigreturn",
+                "__kernel_sigreturn",
+                "SYSENTER_RETURN",
+};
+
+static int is_safe_abs_reloc(const char* sym_name)
+{
+        int i, array_size;
+
+        array_size = sizeof(safe_abs_relocs)/sizeof(char*);
+
+        for(i = 0; i < array_size; i++) {
+                if (!strcmp(sym_name, safe_abs_relocs[i]))
+                        /* Match found */
+                        return 1;
+        }
+        return 0;
+}
+
+static void die(char *fmt, ...)
+{
+        va_list ap;
+        va_start(ap, fmt);
+        vfprintf(stderr, fmt, ap);
+        va_end(ap);
+        exit(1);
+}
+
+static const char *sym_type(unsigned type)
+{
+        static const char *type_name[] = {
+#define SYM_TYPE(X) [X] = #X
+                SYM_TYPE(STT_NOTYPE),
+                SYM_TYPE(STT_OBJECT),
+                SYM_TYPE(STT_FUNC),
+                SYM_TYPE(STT_SECTION),
+                SYM_TYPE(STT_FILE),
+                SYM_TYPE(STT_COMMON),
+                SYM_TYPE(STT_TLS),
+#undef SYM_TYPE
+        };
+        const char *name = "unknown sym type name";
+        if (type < sizeof(type_name)/sizeof(type_name[0])) {
+                name = type_name[type];
+        }
+        return name;
+}
+
+static const char *sym_bind(unsigned bind)
+{
+        static const char *bind_name[] = {
+#define SYM_BIND(X) [X] = #X
+                SYM_BIND(STB_LOCAL),
+                SYM_BIND(STB_GLOBAL),
+                SYM_BIND(STB_WEAK),
+#undef SYM_BIND
+        };
+        const char *name = "unknown sym bind name";
+        if (bind < sizeof(bind_name)/sizeof(bind_name[0])) {
+                name = bind_name[bind];
+        }
+        return name;
+}
+
+static const char *sym_visibility(unsigned visibility)
+{
+        static const char *visibility_name[] = {
+#define SYM_VISIBILITY(X) [X] = #X
+                SYM_VISIBILITY(STV_DEFAULT),
+                SYM_VISIBILITY(STV_INTERNAL),
+                SYM_VISIBILITY(STV_HIDDEN),
+                SYM_VISIBILITY(STV_PROTECTED),
+#undef SYM_VISIBILITY
+        };
+        const char *name = "unknown sym visibility name";
+        if (visibility < sizeof(visibility_name)/sizeof(visibility_name[0])) {
+                name = visibility_name[visibility];
+        }
+        return name;
+}
+
+static const char *rel_type(unsigned type)
+{
+        static const char *type_name[] = {
+#define REL_TYPE(X) [X] = #X
+                REL_TYPE(R_386_NONE),
+                REL_TYPE(R_386_32),
+                REL_TYPE(R_386_PC32),
+                REL_TYPE(R_386_GOT32),
+                REL_TYPE(R_386_PLT32),
+                REL_TYPE(R_386_COPY),
+                REL_TYPE(R_386_GLOB_DAT),
+                REL_TYPE(R_386_JMP_SLOT),
+                REL_TYPE(R_386_RELATIVE),
+                REL_TYPE(R_386_GOTOFF),
+                REL_TYPE(R_386_GOTPC),
+#undef REL_TYPE
+        };
+        const char *name = "unknown type rel type name";
+        if (type < sizeof(type_name)/sizeof(type_name[0])) {
+                name = type_name[type];
+        }
+        return name;
+}
+
+static const char *sec_name(unsigned shndx)
+{
+        const char *sec_strtab;
+        const char *name;
+        sec_strtab = strtab[ehdr.e_shstrndx];
+        name = "<noname>";
+        if (shndx < ehdr.e_shnum) {
+                name = sec_strtab + shdr[shndx].sh_name;
+        }
+        else if (shndx == SHN_ABS) {
+                name = "ABSOLUTE";
+        }
+        else if (shndx == SHN_COMMON) {
+                name = "COMMON";
+        }
+        return name;
+}
+
+static const char *sym_name(const char *sym_strtab, Elf32_Sym *sym)
+{
+        const char *name;
+        name = "<noname>";
+        if (sym->st_name) {
+                name = sym_strtab + sym->st_name;
+        }
+        else {
+                name = sec_name(shdr[sym->st_shndx].sh_name);
+        }
+        return name;
+}
+
+
+
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define le16_to_cpu(val) (val)
+#define le32_to_cpu(val) (val)
+#endif
+#if BYTE_ORDER == BIG_ENDIAN
+#define le16_to_cpu(val) bswap_16(val)
+#define le32_to_cpu(val) bswap_32(val)
+#endif
+
+static uint16_t elf16_to_cpu(uint16_t val)
+{
+        return le16_to_cpu(val);
+}
+
+static uint32_t elf32_to_cpu(uint32_t val)
+{
+        return le32_to_cpu(val);
+}
+
+static void read_ehdr(FILE *fp)
+{
+        if (fread(&ehdr, sizeof(ehdr), 1, fp) != 1) {
+                die("Cannot read ELF header: %s\n",
+                        strerror(errno));
+        }
+        if (memcmp(ehdr.e_ident, ELFMAG, 4) != 0) {
+                die("No ELF magic\n");
+        }
+        if (ehdr.e_ident[EI_CLASS] != ELFCLASS32) {
+                die("Not a 32 bit executable\n");
+        }
+        if (ehdr.e_ident[EI_DATA] != ELFDATA2LSB) {
+                die("Not a LSB ELF executable\n");
+        }
+        if (ehdr.e_ident[EI_VERSION] != EV_CURRENT) {
+                die("Unknown ELF version\n");
+        }
+        /* Convert the fields to native endian */
+        ehdr.e_type      = elf16_to_cpu(ehdr.e_type);
+        ehdr.e_machine   = elf16_to_cpu(ehdr.e_machine);
+        ehdr.e_version   = elf32_to_cpu(ehdr.e_version);
+        ehdr.e_entry     = elf32_to_cpu(ehdr.e_entry);
+        ehdr.e_phoff     = elf32_to_cpu(ehdr.e_phoff);
+        ehdr.e_shoff     = elf32_to_cpu(ehdr.e_shoff);
+        ehdr.e_flags     = elf32_to_cpu(ehdr.e_flags);
+        ehdr.e_ehsize    = elf16_to_cpu(ehdr.e_ehsize);
+        ehdr.e_phentsize = elf16_to_cpu(ehdr.e_phentsize);
+        ehdr.e_phnum     = elf16_to_cpu(ehdr.e_phnum);
+        ehdr.e_shentsize = elf16_to_cpu(ehdr.e_shentsize);
+        ehdr.e_shnum     = elf16_to_cpu(ehdr.e_shnum);
+        ehdr.e_shstrndx  = elf16_to_cpu(ehdr.e_shstrndx);
+
+        if ((ehdr.e_type != ET_EXEC) && (ehdr.e_type != ET_DYN)) {
+                die("Unsupported ELF header type\n");
+        }
+        if (ehdr.e_machine != EM_386) {
+                die("Not for x86\n");
+        }
+        if (ehdr.e_version != EV_CURRENT) {
+                die("Unknown ELF version\n");
+        }
+        if (ehdr.e_ehsize != sizeof(Elf32_Ehdr)) {
+                die("Bad Elf header size\n");
+        }
+        if (ehdr.e_phentsize != sizeof(Elf32_Phdr)) {
+                die("Bad program header entry\n");
+        }
+        if (ehdr.e_shentsize != sizeof(Elf32_Shdr)) {
+                die("Bad section header entry\n");
+        }
+        if (ehdr.e_shstrndx >= ehdr.e_shnum) {
+                die("String table index out of bounds\n");
+        }
+}
+
+static void read_shdrs(FILE *fp)
+{
+        int i;
+        if (ehdr.e_shnum > MAX_SHDRS) {
+                die("%d section headers supported: %d\n",
+                        ehdr.e_shnum, MAX_SHDRS);
+        }
+        if (fseek(fp, ehdr.e_shoff, SEEK_SET) < 0) {
+                die("Seek to %d failed: %s\n",
+                        ehdr.e_shoff, strerror(errno));
+        }
+        if (fread(&shdr, sizeof(shdr[0]), ehdr.e_shnum, fp) != ehdr.e_shnum) {
+                die("Cannot read ELF section headers: %s\n",
+                        strerror(errno));
+        }
+        for(i = 0; i < ehdr.e_shnum; i++) {
+                shdr[i].sh_name      = elf32_to_cpu(shdr[i].sh_name);
+                shdr[i].sh_type      = elf32_to_cpu(shdr[i].sh_type);
+                shdr[i].sh_flags     = elf32_to_cpu(shdr[i].sh_flags);
+                shdr[i].sh_addr      = elf32_to_cpu(shdr[i].sh_addr);
+                shdr[i].sh_offset    = elf32_to_cpu(shdr[i].sh_offset);
+                shdr[i].sh_size      = elf32_to_cpu(shdr[i].sh_size);
+                shdr[i].sh_link      = elf32_to_cpu(shdr[i].sh_link);
+                shdr[i].sh_info      = elf32_to_cpu(shdr[i].sh_info);
+                shdr[i].sh_addralign = elf32_to_cpu(shdr[i].sh_addralign);
+                shdr[i].sh_entsize   = elf32_to_cpu(shdr[i].sh_entsize);
+        }
+
+}
+
+static void read_strtabs(FILE *fp)
+{
+        int i;
+        for(i = 0; i < ehdr.e_shnum; i++) {
+                if (shdr[i].sh_type != SHT_STRTAB) {
+                        continue;
+                }
+                strtab[i] = malloc(shdr[i].sh_size);
+                if (!strtab[i]) {
+                        die("malloc of %d bytes for strtab failed\n",
+                                shdr[i].sh_size);
+                }
+                if (fseek(fp, shdr[i].sh_offset, SEEK_SET) < 0) {
+                        die("Seek to %d failed: %s\n",
+                                shdr[i].sh_offset, strerror(errno));
+                }
+                if (fread(strtab[i], 1, shdr[i].sh_size, fp) != shdr[i].sh_size) {
+                        die("Cannot read symbol table: %s\n",
+                                strerror(errno));
+                }
+        }
+}
+
+static void read_symtabs(FILE *fp)
+{
+        int i,j;
+        for(i = 0; i < ehdr.e_shnum; i++) {
+                if (shdr[i].sh_type != SHT_SYMTAB) {
+                        continue;
+                }
+                symtab[i] = malloc(shdr[i].sh_size);
+                if (!symtab[i]) {
+                        die("malloc of %d bytes for symtab failed\n",
+                                shdr[i].sh_size);
+                }
+                if (fseek(fp, shdr[i].sh_offset, SEEK_SET) < 0) {
+                        die("Seek to %d failed: %s\n",
+                                shdr[i].sh_offset, strerror(errno));
+                }
+                if (fread(symtab[i], 1, shdr[i].sh_size, fp) != shdr[i].sh_size) {
+                        die("Cannot read symbol table: %s\n",
+                                strerror(errno));
+                }
+                for(j = 0; j < shdr[i].sh_size/sizeof(symtab[i][0]); j++) {
+                        symtab[i][j].st_name  = elf32_to_cpu(symtab[i][j].st_name);
+                        symtab[i][j].st_value = elf32_to_cpu(symtab[i][j].st_value);
+                        symtab[i][j].st_size  = elf32_to_cpu(symtab[i][j].st_size);
+                        symtab[i][j].st_shndx = elf16_to_cpu(symtab[i][j].st_shndx);
+                }
+        }
+}
+
+
+static void read_relocs(FILE *fp)
+{
+        int i,j;
+        for(i = 0; i < ehdr.e_shnum; i++) {
+                if (shdr[i].sh_type != SHT_REL) {
+                        continue;
+                }
+                reltab[i] = malloc(shdr[i].sh_size);
+                if (!reltab[i]) {
+                        die("malloc of %d bytes for relocs failed\n",
+                                shdr[i].sh_size);
+                }
+                if (fseek(fp, shdr[i].sh_offset, SEEK_SET) < 0) {
+                        die("Seek to %d failed: %s\n",
+                                shdr[i].sh_offset, strerror(errno));
+                }
+                if (fread(reltab[i], 1, shdr[i].sh_size, fp) != shdr[i].sh_size) {
+                        die("Cannot read symbol table: %s\n",
+                                strerror(errno));
+                }
+                for(j = 0; j < shdr[i].sh_size/sizeof(reltab[0][0]); j++) {
+                        reltab[i][j].r_offset = elf32_to_cpu(reltab[i][j].r_offset);
+                        reltab[i][j].r_info   = elf32_to_cpu(reltab[i][j].r_info);
+                }
+        }
+}
+
+
+static void print_absolute_symbols(void)
+{
+        int i;
+        printf("Absolute symbols\n");
+        printf(" Num:    Value Size  Type       Bind        Visibility  Name\n");
+        for(i = 0; i < ehdr.e_shnum; i++) {
+                char *sym_strtab;
+                Elf32_Sym *sh_symtab;
+                int j;
+                if (shdr[i].sh_type != SHT_SYMTAB) {
+                        continue;
+                }
+                sh_symtab = symtab[i];
+                sym_strtab = strtab[shdr[i].sh_link];
+                for(j = 0; j < shdr[i].sh_size/sizeof(symtab[0][0]); j++) {
+                        Elf32_Sym *sym;
+                        const char *name;
+                        sym = &symtab[i][j];
+                        name = sym_name(sym_strtab, sym);
+                        if (sym->st_shndx != SHN_ABS) {
+                                continue;
+                        }
+                        printf("%5d %08x %5d %10s %10s %12s %s\n",
+                                j, sym->st_value, sym->st_size,
+                                sym_type(ELF32_ST_TYPE(sym->st_info)),
+                                sym_bind(ELF32_ST_BIND(sym->st_info)),
+                                sym_visibility(ELF32_ST_VISIBILITY(sym->st_other)),
+                                name);
+                }
+        }
+        printf("\n");
+}
+
+static void print_absolute_relocs(void)
+{
+        int i, printed = 0;
+
+        for(i = 0; i < ehdr.e_shnum; i++) {
+                char *sym_strtab;
+                Elf32_Sym *sh_symtab;
+                unsigned sec_applies, sec_symtab;
+                int j;
+                if (shdr[i].sh_type != SHT_REL) {
+                        continue;
+                }
+                sec_symtab  = shdr[i].sh_link;
+                sec_applies = shdr[i].sh_info;
+                if (!(shdr[sec_applies].sh_flags & SHF_ALLOC)) {
+                        continue;
+                }
+                sh_symtab = symtab[sec_symtab];
+                sym_strtab = strtab[shdr[sec_symtab].sh_link];
+                for(j = 0; j < shdr[i].sh_size/sizeof(reltab[0][0]); j++) {
+                        Elf32_Rel *rel;
+                        Elf32_Sym *sym;
+                        const char *name;
+                        rel = &reltab[i][j];
+                        sym = &sh_symtab[ELF32_R_SYM(rel->r_info)];
+                        name = sym_name(sym_strtab, sym);
+                        if (sym->st_shndx != SHN_ABS) {
+                                continue;
+                        }
+
+                        /* Absolute symbols are not relocated if bzImage is
+                         * loaded at a non-compiled address. Display a warning
+                         * to user at compile time about the absolute
+                         * relocations present.
+                         *
+                         * User need to audit the code to make sure
+                         * some symbols which should have been section
+                         * relative have not become absolute because of some
+                         * linker optimization or wrong programming usage.
+                         *
+                         * Before warning check if this absolute symbol
+                         * relocation is harmless.
+                         */
+                        if (is_safe_abs_reloc(name))
+                                continue;
+
+                        if (!printed) {
+                                printf("WARNING: Absolute relocations"
+                                        " present\n");
+                                printf("Offset     Info     Type     Sym.Value "
+                                        "Sym.Name\n");
+                                printed = 1;
+                        }
+
+                        printf("%08x %08x %10s %08x  %s\n",
+                                rel->r_offset,
+                                rel->r_info,
+                                rel_type(ELF32_R_TYPE(rel->r_info)),
+                                sym->st_value,
+                                name);
+                }
+        }
+
+        if (printed)
+                printf("\n");
+}
+
+static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
+{
+        int i;
+        /* Walk through the relocations */
+        for(i = 0; i < ehdr.e_shnum; i++) {
+                char *sym_strtab;
+                Elf32_Sym *sh_symtab;
+                unsigned sec_applies, sec_symtab;
+                int j;
+                if (shdr[i].sh_type != SHT_REL) {
+                        continue;
+                }
+                sec_symtab  = shdr[i].sh_link;
+                sec_applies = shdr[i].sh_info;
+                if (!(shdr[sec_applies].sh_flags & SHF_ALLOC)) {
+                        continue;
+                }
+                sh_symtab = symtab[sec_symtab];
+                sym_strtab = strtab[shdr[sec_symtab].sh_link];
+                for(j = 0; j < shdr[i].sh_size/sizeof(reltab[0][0]); j++) {
+                        Elf32_Rel *rel;
+                        Elf32_Sym *sym;
+                        unsigned r_type;
+                        rel = &reltab[i][j];
+                        sym = &sh_symtab[ELF32_R_SYM(rel->r_info)];
+                        r_type = ELF32_R_TYPE(rel->r_info);
+                        /* Don't visit relocations to absolute symbols */
+                        if (sym->st_shndx == SHN_ABS) {
+                                continue;
+                        }
+                        if (r_type == R_386_PC32) {
+                                /* PC relative relocations don't need to be adjusted */
+                        }
+                        else if (r_type == R_386_32) {
+                                /* Visit relocations that need to be adjusted */
+                                visit(rel, sym);
+                        }
+                        else {
+                                die("Unsupported relocation type: %d\n", r_type);
+                        }
+                }
+        }
+}
+
+static void count_reloc(Elf32_Rel *rel, Elf32_Sym *sym)
+{
+        reloc_count += 1;
+}
+
+static void collect_reloc(Elf32_Rel *rel, Elf32_Sym *sym)
+{
+        /* Remember the address that needs to be adjusted. */
+        relocs[reloc_idx++] = rel->r_offset;
+}
+
+static int cmp_relocs(const void *va, const void *vb)
+{
+        const unsigned long *a, *b;
+        a = va; b = vb;
+        return (*a == *b)? 0 : (*a > *b)? 1 : -1;
+}
+
+static void emit_relocs(int as_text)
+{
+        int i;
+        /* Count how many relocations I have and allocate space for them. */
+        reloc_count = 0;
+        walk_relocs(count_reloc);
+        relocs = malloc(reloc_count * sizeof(relocs[0]));
+        if (!relocs) {
+                die("malloc of %d entries for relocs failed\n",
+                        reloc_count);
+        }
+        /* Collect up the relocations */
+        reloc_idx = 0;
+        walk_relocs(collect_reloc);
+
+        /* Order the relocations for more efficient processing */
+        qsort(relocs, reloc_count, sizeof(relocs[0]), cmp_relocs);
+
+        /* Print the relocations */
+        if (as_text) {
+                /* Print the relocations in a form suitable that
+                 * gas will like.
+                 */
+                printf(".section \".data.reloc\",\"a\"\n");
+                printf(".balign 4\n");
+                for(i = 0; i < reloc_count; i++) {
+                        printf("\t .long 0x%08lx\n", relocs[i]);
+                }
+                printf("\n");
+        }
+        else {
+                unsigned char buf[4];
+                buf[0] = buf[1] = buf[2] = buf[3] = 0;
+                /* Print a stop */
+                printf("%c%c%c%c", buf[0], buf[1], buf[2], buf[3]);
+                /* Now print each relocation */
+                for(i = 0; i < reloc_count; i++) {
+                        buf[0] = (relocs[i] >>  0) & 0xff;
+                        buf[1] = (relocs[i] >>  8) & 0xff;
+                        buf[2] = (relocs[i] >> 16) & 0xff;
+                        buf[3] = (relocs[i] >> 24) & 0xff;
+                        printf("%c%c%c%c", buf[0], buf[1], buf[2], buf[3]);
+                }
+        }
+}
+
+static void usage(void)
+{
+        die("relocs [--abs-syms |--abs-relocs | --text] vmlinux\n");
+}
+
+int main(int argc, char **argv)
+{
+        int show_absolute_syms, show_absolute_relocs;
+        int as_text;
+        const char *fname;
+        FILE *fp;
+        int i;
+
+        show_absolute_syms = 0;
+        show_absolute_relocs = 0;
+        as_text = 0;
+        fname = NULL;
+        for(i = 1; i < argc; i++) {
+                char *arg = argv[i];
+                if (*arg == '-') {
+                        if (strcmp(argv[1], "--abs-syms") == 0) {
+                                show_absolute_syms = 1;
+                                continue;
+                        }
+
+                        if (strcmp(argv[1], "--abs-relocs") == 0) {
+                                show_absolute_relocs = 1;
+                                continue;
+                        }
+                        else if (strcmp(argv[1], "--text") == 0) {
+                                as_text = 1;
+                                continue;
+                        }
+                }
+                else if (!fname) {
+                        fname = arg;
+                        continue;
+                }
+                usage();
+        }
+        if (!fname) {
+                usage();
+        }
+        fp = fopen(fname, "r");
+        if (!fp) {
+                die("Cannot open %s: %s\n",
+                        fname, strerror(errno));
+        }
+        read_ehdr(fp);
+        read_shdrs(fp);
+        read_strtabs(fp);
+        read_symtabs(fp);
+        read_relocs(fp);
+        if (show_absolute_syms) {
+                print_absolute_symbols();
+                return 0;
+        }
+        if (show_absolute_relocs) {
+                print_absolute_relocs();
+                return 0;
+        }
+        emit_relocs(as_text);
+        return 0;
+}
diff --git a/arch/i386/boot/compressed/vmlinux.lds b/arch/i386/boot/compressed/vmlinux.lds
new file mode 100644
index 000000000000..cc4854f6c6c1
--- /dev/null
+++ b/arch/i386/boot/compressed/vmlinux.lds
@@ -0,0 +1,43 @@
+OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+OUTPUT_ARCH(i386)
+ENTRY(startup_32)
+SECTIONS
+{
+        /* Be careful parts of head.S assume startup_32 is at
+         * address 0.
+         */
+        . =  0  ;
+        .text.head : {
+                _head = . ;
+                *(.text.head)
+                _ehead = . ;
+        }
+        .data.compressed : {
+                *(.data.compressed)
+        }
+        .text : {
+                _text = .;      /* Text */
+                *(.text)
+                *(.text.*)
+                _etext = . ;
+        }
+        .rodata : {
+                _rodata = . ;
+                *(.rodata)       /* read-only data */
+                *(.rodata.*)
+                _erodata = . ;
+        }
+        .data : {
+                _data = . ;
+                *(.data)
+                *(.data.*)
+                _edata = . ;
+        }
+        .bss : {
+                _bss = . ;
+                *(.bss)
+                *(.bss.*)
+                *(COMMON)
+                _end = . ;
+        }
+}
diff --git a/arch/i386/boot/compressed/vmlinux.scr b/arch/i386/boot/compressed/vmlinux.scr
index 1ed9d791f863..707a88f7f29e 100644
--- a/arch/i386/boot/compressed/vmlinux.scr
+++ b/arch/i386/boot/compressed/vmlinux.scr
@@ -1,9 +1,10 @@
 SECTIONS
 {
-  .data : { 
+  .data.compressed : {
         input_len = .;
         LONG(input_data_end - input_data) input_data = .; 
         *(.data) 
+        output_len = . - 4;
         input_data_end = .; 
         }
 }
diff --git a/arch/i386/boot/setup.S b/arch/i386/boot/setup.S
index 3aec4538a113..06edf1c66242 100644
--- a/arch/i386/boot/setup.S
+++ b/arch/i386/boot/setup.S
@@ -81,7 +81,7 @@ start:
 # This is the setup header, and it must start at %cs:2 (old 0x9020:2)
 
                 .ascii  "HdrS"          # header signature
-                .word   0x0204          # header version number (>= 0x0105)
+                .word   0x0205          # header version number (>= 0x0105)
                                         # or else old loadlin-1.5 will fail)
 realmode_swtch: .word   0, 0            # default_switch, SETUPSEG
 start_sys_seg:  .word   SYSSEG
@@ -160,6 +160,17 @@ ramdisk_max:	.long (-__PAGE_OFFSET-(512 << 20)-1) & 0x7fffffff
                                         # The highest safe address for
                                         # the contents of an initrd
 
+kernel_alignment:  .long CONFIG_PHYSICAL_ALIGN  #physical addr alignment
+                                                #required for protected mode
+                                                #kernel
+#ifdef CONFIG_RELOCATABLE
+relocatable_kernel:    .byte 1
+#else
+relocatable_kernel:    .byte 0
+#endif
+pad2:                   .byte 0
+pad3:                   .word 0
+
 trampoline:     call    start_of_setup
                 .align 16
                                         # The offset at this point is 0x240
@@ -588,11 +599,6 @@ rmodeswtch_normal:
         call    default_switch
 
 rmodeswtch_end:
-# we get the code32 start address and modify the below 'jmpi'
-# (loader may have changed it)
-        movl    %cs:code32_start, %eax
-        movl    %eax, %cs:code32
-
 # Now we move the system to its rightful place ... but we check if we have a
 # big-kernel. In that case we *must* not move it ...
         testb   $LOADED_HIGH, %cs:loadflags
@@ -788,11 +794,12 @@ a20_err_msg:
 a20_done:
 
 #endif /* CONFIG_X86_VOYAGER */
-# set up gdt and idt
+# set up gdt and idt and 32bit start address
         lidt    idt_48                          # load idt with 0,0
         xorl    %eax, %eax                      # Compute gdt_base
         movw    %ds, %ax                        # (Convert %ds:gdt to a linear ptr)
         shll    $4, %eax
+        addl    %eax, code32
         addl    $gdt, %eax
         movl    %eax, (gdt_48+2)
         lgdt    gdt_48                          # load gdt with whatever is
@@ -851,9 +858,26 @@ flush_instr:
 #       Manual, Mixing 16-bit and 32-bit code, page 16-6)
 
         .byte 0x66, 0xea                        # prefix + jmpi-opcode
-code32: .long   0x1000                          # will be set to 0x100000
-                                                # for big kernels
+code32: .long   startup_32                      # will be set to %cs+startup_32
         .word   __BOOT_CS
+.code32
+startup_32:
+        movl $(__BOOT_DS), %eax
+        movl %eax, %ds
+        movl %eax, %es
+        movl %eax, %fs
+        movl %eax, %gs
+        movl %eax, %ss
+
+        xorl %eax, %eax
+1:      incl %eax                               # check that A20 really IS enabled
+        movl %eax, 0x00000000                   # loop forever if it isn't
+        cmpl %eax, 0x00100000
+        je 1b
+
+        # Jump to the 32bit entry point
+        jmpl *(code32_start - start + (DELTA_INITSEG << 4))(%esi)
+.code16
 
 # Here's a bunch of information about your current kernel..
 kernel_version: .ascii  UTS_RELEASE
diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 97aacd6bd7d8..5d80edfc61b7 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19-rc2-git4
-# Sat Oct 21 03:38:56 2006
+# Linux kernel version: 2.6.20-rc3
+# Fri Jan  5 11:54:46 2007
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -12,6 +12,7 @@ CONFIG_X86=y
 CONFIG_MMU=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_DMI=y
@@ -40,13 +41,14 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_CPUSETS is not set
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
 CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -110,6 +112,7 @@ CONFIG_SMP=y
 # CONFIG_X86_VISWS is not set
 CONFIG_X86_GENERICARCH=y
 # CONFIG_X86_ES7000 is not set
+# CONFIG_PARAVIRT is not set
 CONFIG_X86_CYCLONE_TIMER=y
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
@@ -120,6 +123,7 @@ CONFIG_X86_CYCLONE_TIMER=y
 # CONFIG_MPENTIUMII is not set
 CONFIG_MPENTIUMIII=y
 # CONFIG_MPENTIUMM is not set
+# CONFIG_MCORE2 is not set
 # CONFIG_MPENTIUM4 is not set
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
@@ -138,6 +142,8 @@ CONFIG_X86_CMPXCHG=y
 CONFIG_X86_XADD=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_INVLPG=y
@@ -197,15 +203,16 @@ CONFIG_RESOURCES_64BIT=y
 CONFIG_MTRR=y
 # CONFIG_EFI is not set
 # CONFIG_IRQBALANCE is not set
-CONFIG_REGPARM=y
 CONFIG_SECCOMP=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
 # CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x100000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x100000
 # CONFIG_HOTPLUG_CPU is not set
 CONFIG_COMPAT_VDSO=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -367,6 +374,7 @@ CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
@@ -559,6 +567,7 @@ CONFIG_IDEDMA_AUTO=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
 CONFIG_SCSI_NETLINK=y
 # CONFIG_SCSI_PROC_FS is not set
 
@@ -579,6 +588,7 @@ CONFIG_CHR_DEV_SG=y
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
 
 #
 # SCSI Transports
@@ -638,6 +648,7 @@ CONFIG_AIC79XX_DEBUG_MASK=0
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
 
 #
 # Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -677,6 +688,7 @@ CONFIG_SATA_INTEL_COMBINED=y
 # CONFIG_PATA_IT821X is not set
 # CONFIG_PATA_JMICRON is not set
 # CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_NETCELL is not set
@@ -850,6 +862,7 @@ CONFIG_BNX2=y
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
 
 #
 # Token Ring devices
@@ -984,10 +997,6 @@ CONFIG_RTC=y
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_SONYPI is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 CONFIG_AGP=y
 # CONFIG_AGP_ALI is not set
 # CONFIG_AGP_ATI is not set
@@ -1080,10 +1089,7 @@ CONFIG_SOUND=y
 # Open Sound System
 #
 CONFIG_SOUND_PRIME=y
-CONFIG_OSS_OBSOLETE_DRIVER=y
 # CONFIG_SOUND_BT878 is not set
-# CONFIG_SOUND_EMU10K1 is not set
-# CONFIG_SOUND_FUSION is not set
 # CONFIG_SOUND_ES1371 is not set
 CONFIG_SOUND_ICH=y
 # CONFIG_SOUND_TRIDENT is not set
@@ -1093,6 +1099,11 @@ CONFIG_SOUND_ICH=y
 # CONFIG_SOUND_OSS is not set
 
 #
+# HID Devices
+#
+CONFIG_HID=y
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -1108,6 +1119,7 @@ CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_MULTITHREAD_PROBE is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -1155,7 +1167,6 @@ CONFIG_USB_STORAGE=y
 # USB Input Devices
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_HID_FF is not set
 # CONFIG_USB_HIDDEV is not set
@@ -1185,6 +1196,7 @@ CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 
@@ -1275,6 +1287,11 @@ CONFIG_USB_MON=y
 #
 
 #
+# Virtualization
+#
+# CONFIG_KVM is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1440,6 +1457,11 @@ CONFIG_NLS_ISO8859_15=y
 CONFIG_NLS_UTF8=y
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Instrumentation Support
 #
 CONFIG_PROFILING=y
@@ -1454,6 +1476,8 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_UNUSED_SYMBOLS=y
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_DETECT_SOFTLOCKUP=y
@@ -1472,14 +1496,10 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_FRAME_POINTER is not set
-CONFIG_UNWIND_INFO=y
-CONFIG_STACK_UNWIND=y
 # CONFIG_FORCED_INLINING is not set
-# CONFIG_HEADERS_CHECK is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_LKDTM is not set
 CONFIG_EARLY_PRINTK=y
@@ -1505,12 +1525,14 @@ CONFIG_DOUBLEFAULT=y
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_PENDING_IRQ=y
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 1a884b6e6e5c..1e8988e558c5 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -6,7 +6,7 @@ extra-y := head.o init_task.o vmlinux.lds
 
 obj-y   := process.o signal.o entry.o traps.o irq.o \
                 ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
-                pci-dma.o i386_ksyms.o i387.o bootflag.o \
+                pci-dma.o i386_ksyms.o i387.o bootflag.o e820.o\
                 quirks.o i8237.o topology.o alternative.o i8253.o tsc.o
 
 obj-$(CONFIG_STACKTRACE)        += stacktrace.o
@@ -40,6 +40,9 @@ obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 obj-$(CONFIG_HPET_TIMER)        += hpet.o
 obj-$(CONFIG_K8_NB)             += k8.o
 
+# Make sure this is linked after any other paravirt_ops structs: see head.S
+obj-$(CONFIG_PARAVIRT)          += paravirt.o
+
 EXTRA_AFLAGS   := -traditional
 
 obj-$(CONFIG_SCx200)            += scx200.o
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index d12fb97a5337..cbcb2c27f48b 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 __init 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();
@@ -1327,3 +1327,25 @@ static int __init setup_acpi_sci(char *s)
         return 0;
 }
 early_param("acpi_sci", setup_acpi_sci);
+
+int __acpi_acquire_global_lock(unsigned int *lock)
+{
+        unsigned int old, new, val;
+        do {
+                old = *lock;
+                new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1));
+                val = cmpxchg(lock, old, new);
+        } while (unlikely (val != old));
+        return (new < 3) ? -1 : 0;
+}
+
+int __acpi_release_global_lock(unsigned int *lock)
+{
+        unsigned int old, new, val;
+        do {
+                old = *lock;
+                new = old & ~0x3;
+                val = cmpxchg(lock, old, new);
+        } while (unlikely (val != old));
+        return old & 0x1;
+}
diff --git a/arch/i386/kernel/acpi/cstate.c b/arch/i386/kernel/acpi/cstate.c
index 20563e52c622..2d39f55d29a8 100644
--- a/arch/i386/kernel/acpi/cstate.c
+++ b/arch/i386/kernel/acpi/cstate.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/acpi.h>
 #include <linux/cpu.h>
+#include <linux/sched.h>
 
 #include <acpi/processor.h>
 #include <asm/acpi.h>
@@ -46,13 +47,13 @@ EXPORT_SYMBOL(acpi_processor_power_init_bm_check);
 
 /* The code below handles cstate entry with monitor-mwait pair on Intel*/
 
-struct cstate_entry_s {
+struct cstate_entry {
         struct {
                 unsigned int eax;
                 unsigned int ecx;
         } states[ACPI_PROCESSOR_MAX_POWER];
 };
-static struct cstate_entry_s *cpu_cstate_entry; /* per CPU ptr */
+static struct cstate_entry *cpu_cstate_entry;   /* per CPU ptr */
 
 static short mwait_supported[ACPI_PROCESSOR_MAX_POWER];
 
@@ -70,7 +71,7 @@ static short mwait_supported[ACPI_PROCESSOR_MAX_POWER];
 int acpi_processor_ffh_cstate_probe(unsigned int cpu,
                 struct acpi_processor_cx *cx, struct acpi_power_register *reg)
 {
-        struct cstate_entry_s *percpu_entry;
+        struct cstate_entry *percpu_entry;
         struct cpuinfo_x86 *c = cpu_data + cpu;
 
         cpumask_t saved_mask;
@@ -135,7 +136,7 @@ EXPORT_SYMBOL_GPL(acpi_processor_ffh_cstate_probe);
 void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cx)
 {
         unsigned int cpu = smp_processor_id();
-        struct cstate_entry_s *percpu_entry;
+        struct cstate_entry *percpu_entry;
 
         percpu_entry = per_cpu_ptr(cpu_cstate_entry, cpu);
         mwait_idle_with_hints(percpu_entry->states[cx->index].eax,
@@ -149,16 +150,14 @@ static int __init ffh_cstate_init(void)
         if (c->x86_vendor != X86_VENDOR_INTEL)
                 return -1;
 
-        cpu_cstate_entry = alloc_percpu(struct cstate_entry_s);
+        cpu_cstate_entry = alloc_percpu(struct cstate_entry);
         return 0;
 }
 
 static void __exit ffh_cstate_exit(void)
 {
-        if (cpu_cstate_entry) {
-                free_percpu(cpu_cstate_entry);
-                cpu_cstate_entry = NULL;
-        }
+        free_percpu(cpu_cstate_entry);
+        cpu_cstate_entry = NULL;
 }
 
 arch_initcall(ffh_cstate_init);
diff --git a/arch/i386/kernel/acpi/earlyquirk.c b/arch/i386/kernel/acpi/earlyquirk.c
index c9841692bb7c..4b60af7f91dd 100644
--- a/arch/i386/kernel/acpi/earlyquirk.c
+++ b/arch/i386/kernel/acpi/earlyquirk.c
@@ -10,6 +10,7 @@
 #include <asm/pci-direct.h>
 #include <asm/acpi.h>
 #include <asm/apic.h>
+#include <asm/irq.h>
 
 #ifdef CONFIG_ACPI
 
@@ -49,6 +50,24 @@ static int __init check_bridge(int vendor, int device)
         return 0;
 }
 
+static void check_intel(void)
+{
+        u16 vendor, device;
+
+        vendor = read_pci_config_16(0, 0, 0, PCI_VENDOR_ID);
+
+        if (vendor != PCI_VENDOR_ID_INTEL)
+                return;
+
+        device = read_pci_config_16(0, 0, 0, PCI_DEVICE_ID);
+#ifdef CONFIG_SMP
+        if (device == PCI_DEVICE_ID_INTEL_E7320_MCH ||
+            device == PCI_DEVICE_ID_INTEL_E7520_MCH ||
+            device == PCI_DEVICE_ID_INTEL_E7525_MCH)
+                quirk_intel_irqbalance();
+#endif
+}
+
 void __init check_acpi_pci(void)
 {
         int num, slot, func;
@@ -60,6 +79,8 @@ void __init check_acpi_pci(void)
         if (!early_pci_allowed())
                 return;
 
+        check_intel();
+
         /* Poor man's PCI discovery */
         for (num = 0; num < 32; num++) {
                 for (slot = 0; slot < 32; slot++) {
diff --git a/arch/i386/kernel/alternative.c b/arch/i386/kernel/alternative.c
index 583c238e17fb..9eca21b49f6b 100644
--- a/arch/i386/kernel/alternative.c
+++ b/arch/i386/kernel/alternative.c
@@ -1,4 +1,5 @@
 #include <linux/module.h>
+#include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>
 #include <asm/alternative.h>
@@ -123,6 +124,20 @@ static unsigned char** find_nop_table(void)
 
 #endif /* CONFIG_X86_64 */
 
+static void nop_out(void *insns, unsigned int len)
+{
+        unsigned char **noptable = find_nop_table();
+
+        while (len > 0) {
+                unsigned int noplen = len;
+                if (noplen > ASM_NOP_MAX)
+                        noplen = ASM_NOP_MAX;
+                memcpy(insns, noptable[noplen], noplen);
+                insns += noplen;
+                len -= noplen;
+        }
+}
+
 extern struct alt_instr __alt_instructions[], __alt_instructions_end[];
 extern struct alt_instr __smp_alt_instructions[], __smp_alt_instructions_end[];
 extern u8 *__smp_locks[], *__smp_locks_end[];
@@ -137,10 +152,9 @@ extern u8 __smp_alt_begin[], __smp_alt_end[];
 
 void apply_alternatives(struct alt_instr *start, struct alt_instr *end)
 {
-        unsigned char **noptable = find_nop_table();
         struct alt_instr *a;
         u8 *instr;
-        int diff, i, k;
+        int diff;
 
         DPRINTK("%s: alt table %p -> %p\n", __FUNCTION__, start, end);
         for (a = start; a < end; a++) {
@@ -158,13 +172,7 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end)
 #endif
                 memcpy(instr, a->replacement, a->replacementlen);
                 diff = a->instrlen - a->replacementlen;
-                /* Pad the rest with nops */
-                for (i = a->replacementlen; diff > 0; diff -= k, i += k) {
-                        k = diff;
-                        if (k > ASM_NOP_MAX)
-                                k = ASM_NOP_MAX;
-                        memcpy(a->instr + i, noptable[k], k);
-                }
+                nop_out(instr + a->replacementlen, diff);
         }
 }
 
@@ -208,7 +216,6 @@ static void alternatives_smp_lock(u8 **start, u8 **end, u8 *text, u8 *text_end)
 
 static void alternatives_smp_unlock(u8 **start, u8 **end, u8 *text, u8 *text_end)
 {
-        unsigned char **noptable = find_nop_table();
         u8 **ptr;
 
         for (ptr = start; ptr < end; ptr++) {
@@ -216,7 +223,7 @@ static void alternatives_smp_unlock(u8 **start, u8 **end, u8 *text, u8 *text_end
                         continue;
                 if (*ptr > text_end)
                         continue;
-                **ptr = noptable[1][0];
+                nop_out(*ptr, 1);
         };
 }
 
@@ -342,6 +349,40 @@ void alternatives_smp_switch(int smp)
 
 #endif
 
+#ifdef CONFIG_PARAVIRT
+void apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end)
+{
+        struct paravirt_patch *p;
+
+        for (p = start; p < end; p++) {
+                unsigned int used;
+
+                used = paravirt_ops.patch(p->instrtype, p->clobbers, p->instr,
+                                          p->len);
+#ifdef CONFIG_DEBUG_PARAVIRT
+                {
+                int i;
+                /* Deliberately clobber regs using "not %reg" to find bugs. */
+                for (i = 0; i < 3; i++) {
+                        if (p->len - used >= 2 && (p->clobbers & (1 << i))) {
+                                memcpy(p->instr + used, "\xf7\xd0", 2);
+                                p->instr[used+1] |= i;
+                                used += 2;
+                        }
+                }
+                }
+#endif
+                /* Pad the rest with nops */
+                nop_out(p->instr + used, p->len - used);
+        }
+
+        /* Sync to be conservative, in case we patched following instructions */
+        sync_core();
+}
+extern struct paravirt_patch __start_parainstructions[],
+        __stop_parainstructions[];
+#endif  /* CONFIG_PARAVIRT */
+
 void __init alternative_instructions(void)
 {
         unsigned long flags;
@@ -389,5 +430,6 @@ void __init alternative_instructions(void)
                 alternatives_smp_switch(0);
         }
 #endif
+        apply_paravirt(__start_parainstructions, __stop_parainstructions);
         local_irq_restore(flags);
 }
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c
index 2fd4b7d927c2..776d9be26af9 100644
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
@@ -647,23 +647,30 @@ static struct {
 static int lapic_suspend(struct sys_device *dev, pm_message_t state)
 {
         unsigned long flags;
+        int maxlvt;
 
         if (!apic_pm_state.active)
                 return 0;
 
+        maxlvt = get_maxlvt();
+
         apic_pm_state.apic_id = apic_read(APIC_ID);
         apic_pm_state.apic_taskpri = apic_read(APIC_TASKPRI);
         apic_pm_state.apic_ldr = apic_read(APIC_LDR);
         apic_pm_state.apic_dfr = apic_read(APIC_DFR);
         apic_pm_state.apic_spiv = apic_read(APIC_SPIV);
         apic_pm_state.apic_lvtt = apic_read(APIC_LVTT);
-        apic_pm_state.apic_lvtpc = apic_read(APIC_LVTPC);
+        if (maxlvt >= 4)
+                apic_pm_state.apic_lvtpc = apic_read(APIC_LVTPC);
         apic_pm_state.apic_lvt0 = apic_read(APIC_LVT0);
         apic_pm_state.apic_lvt1 = apic_read(APIC_LVT1);
         apic_pm_state.apic_lvterr = apic_read(APIC_LVTERR);
         apic_pm_state.apic_tmict = apic_read(APIC_TMICT);
         apic_pm_state.apic_tdcr = apic_read(APIC_TDCR);
-        apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);
+#ifdef CONFIG_X86_MCE_P4THERMAL
+        if (maxlvt >= 5)
+                apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);
+#endif
         
         local_irq_save(flags);
         disable_local_APIC();
@@ -675,10 +682,13 @@ static int lapic_resume(struct sys_device *dev)
 {
         unsigned int l, h;
         unsigned long flags;
+        int maxlvt;
 
         if (!apic_pm_state.active)
                 return 0;
 
+        maxlvt = get_maxlvt();
+
         local_irq_save(flags);
 
         /*
@@ -700,8 +710,12 @@ static int lapic_resume(struct sys_device *dev)
         apic_write(APIC_SPIV, apic_pm_state.apic_spiv);
         apic_write(APIC_LVT0, apic_pm_state.apic_lvt0);
         apic_write(APIC_LVT1, apic_pm_state.apic_lvt1);
-        apic_write(APIC_LVTTHMR, apic_pm_state.apic_thmr);
-        apic_write(APIC_LVTPC, apic_pm_state.apic_lvtpc);
+#ifdef CONFIG_X86_MCE_P4THERMAL
+        if (maxlvt >= 5)
+                apic_write(APIC_LVTTHMR, apic_pm_state.apic_thmr);
+#endif
+        if (maxlvt >= 4)
+                apic_write(APIC_LVTPC, apic_pm_state.apic_lvtpc);
         apic_write(APIC_LVTT, apic_pm_state.apic_lvtt);
         apic_write(APIC_TDCR, apic_pm_state.apic_tdcr);
         apic_write(APIC_TMICT, apic_pm_state.apic_tmict);
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index a60358fe9a49..199016927541 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -231,6 +231,7 @@
 #include <asm/uaccess.h>
 #include <asm/desc.h>
 #include <asm/i8253.h>
+#include <asm/paravirt.h>
 
 #include "io_ports.h"
 
@@ -784,7 +785,11 @@ static int apm_do_idle(void)
         polling = !!(current_thread_info()->status & TS_POLLING);
         if (polling) {
                 current_thread_info()->status &= ~TS_POLLING;
-                smp_mb__after_clear_bit();
+                /*
+                 * TS_POLLING-cleared state must be visible before we
+                 * test NEED_RESCHED:
+                 */
+                smp_mb();
         }
         if (!need_resched()) {
                 idled = 1;
@@ -1603,7 +1608,7 @@ static int do_open(struct inode * inode, struct file * filp)
 {
         struct apm_user *       as;
 
-        as = (struct apm_user *)kmalloc(sizeof(*as), GFP_KERNEL);
+        as = kmalloc(sizeof(*as), GFP_KERNEL);
         if (as == NULL) {
                 printk(KERN_ERR "apm: cannot allocate struct of size %d bytes\n",
                        sizeof(*as));
@@ -2235,7 +2240,7 @@ static int __init apm_init(void)
 
         dmi_check_system(apm_dmi_table);
 
-        if (apm_info.bios.version == 0) {
+        if (apm_info.bios.version == 0 || paravirt_enabled()) {
                 printk(KERN_INFO "apm: BIOS not found.\n");
                 return -ENODEV;
         }
diff --git a/arch/i386/kernel/asm-offsets.c b/arch/i386/kernel/asm-offsets.c
index c80271f8f084..1b2f3cd33270 100644
--- a/arch/i386/kernel/asm-offsets.c
+++ b/arch/i386/kernel/asm-offsets.c
@@ -15,6 +15,7 @@
 #include <asm/processor.h>
 #include <asm/thread_info.h>
 #include <asm/elf.h>
+#include <asm/pda.h>
 
 #define DEFINE(sym, val) \
         asm volatile("\n->" #sym " %0 " #val : : "i" (val))
@@ -51,13 +52,35 @@ void foo(void)
         OFFSET(TI_exec_domain, thread_info, exec_domain);
         OFFSET(TI_flags, thread_info, flags);
         OFFSET(TI_status, thread_info, status);
-        OFFSET(TI_cpu, thread_info, cpu);
         OFFSET(TI_preempt_count, thread_info, preempt_count);
         OFFSET(TI_addr_limit, thread_info, addr_limit);
         OFFSET(TI_restart_block, thread_info, restart_block);
         OFFSET(TI_sysenter_return, thread_info, sysenter_return);
         BLANK();
 
+        OFFSET(GDS_size, Xgt_desc_struct, size);
+        OFFSET(GDS_address, Xgt_desc_struct, address);
+        OFFSET(GDS_pad, Xgt_desc_struct, pad);
+        BLANK();
+
+        OFFSET(PT_EBX, pt_regs, ebx);
+        OFFSET(PT_ECX, pt_regs, ecx);
+        OFFSET(PT_EDX, pt_regs, edx);
+        OFFSET(PT_ESI, pt_regs, esi);
+        OFFSET(PT_EDI, pt_regs, edi);
+        OFFSET(PT_EBP, pt_regs, ebp);
+        OFFSET(PT_EAX, pt_regs, eax);
+        OFFSET(PT_DS,  pt_regs, xds);
+        OFFSET(PT_ES,  pt_regs, xes);
+        OFFSET(PT_GS,  pt_regs, xgs);
+        OFFSET(PT_ORIG_EAX, pt_regs, orig_eax);
+        OFFSET(PT_EIP, pt_regs, eip);
+        OFFSET(PT_CS,  pt_regs, xcs);
+        OFFSET(PT_EFLAGS, pt_regs, eflags);
+        OFFSET(PT_OLDESP, pt_regs, esp);
+        OFFSET(PT_OLDSS,  pt_regs, xss);
+        BLANK();
+
         OFFSET(EXEC_DOMAIN_handler, exec_domain, handler);
         OFFSET(RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext);
         BLANK();
@@ -74,4 +97,18 @@ void foo(void)
         DEFINE(VDSO_PRELINK, VDSO_PRELINK);
 
         OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
+
+        BLANK();
+        OFFSET(PDA_cpu, i386_pda, cpu_number);
+        OFFSET(PDA_pcurrent, i386_pda, pcurrent);
+
+#ifdef CONFIG_PARAVIRT
+        BLANK();
+        OFFSET(PARAVIRT_enabled, paravirt_ops, paravirt_enabled);
+        OFFSET(PARAVIRT_irq_disable, paravirt_ops, irq_disable);
+        OFFSET(PARAVIRT_irq_enable, paravirt_ops, irq_enable);
+        OFFSET(PARAVIRT_irq_enable_sysexit, paravirt_ops, irq_enable_sysexit);
+        OFFSET(PARAVIRT_iret, paravirt_ops, iret);
+        OFFSET(PARAVIRT_read_cr0, paravirt_ops, read_cr0);
+#endif
 }
diff --git a/arch/i386/kernel/cpu/amd.c b/arch/i386/kernel/cpu/amd.c
index e4758095d87a..41cfea57232b 100644
--- a/arch/i386/kernel/cpu/amd.c
+++ b/arch/i386/kernel/cpu/amd.c
@@ -104,10 +104,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
                                         f_vide();
                                 rdtscl(d2);
                                 d = d2-d;
-                                
-                                /* Knock these two lines out if it debugs out ok */
-                                printk(KERN_INFO "AMD K6 stepping B detected - ");
-                                /* -- cut here -- */
+
                                 if (d > 20*K6_BUG_LOOP) 
                                         printk("system stability may be impaired when more than 32 MB are used.\n");
                                 else 
diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
index d9f3e3c31f05..8689d62abd4a 100644
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
@@ -18,14 +18,15 @@
 #include <asm/apic.h>
 #include <mach_apic.h>
 #endif
+#include <asm/pda.h>
 
 #include "cpu.h"
 
 DEFINE_PER_CPU(struct Xgt_desc_struct, cpu_gdt_descr);
 EXPORT_PER_CPU_SYMBOL(cpu_gdt_descr);
 
-DEFINE_PER_CPU(unsigned char, cpu_16bit_stack[CPU_16BIT_STACK_SIZE]);
-EXPORT_PER_CPU_SYMBOL(cpu_16bit_stack);
+struct i386_pda *_cpu_pda[NR_CPUS] __read_mostly;
+EXPORT_SYMBOL(_cpu_pda);
 
 static int cachesize_override __cpuinitdata = -1;
 static int disable_x86_fxsr __cpuinitdata;
@@ -53,7 +54,7 @@ static struct cpu_dev __cpuinitdata default_cpu = {
         .c_init = default_init,
         .c_vendor = "Unknown",
 };
-static struct cpu_dev * this_cpu = &default_cpu;
+static struct cpu_dev * this_cpu __cpuinitdata = &default_cpu;
 
 static int __init cachesize_setup(char *str)
 {
@@ -235,29 +236,14 @@ static int __cpuinit have_cpuid_p(void)
         return flag_is_changeable_p(X86_EFLAGS_ID);
 }
 
-/* Do minimum CPU detection early.
-   Fields really needed: vendor, cpuid_level, family, model, mask, cache alignment.
-   The others are not touched to avoid unwanted side effects.
-
-   WARNING: this function is only called on the BP.  Don't add code here
-   that is supposed to run on all CPUs. */
-static void __init early_cpu_detect(void)
+void __init cpu_detect(struct cpuinfo_x86 *c)
 {
-        struct cpuinfo_x86 *c = &boot_cpu_data;
-
-        c->x86_cache_alignment = 32;
-
-        if (!have_cpuid_p())
-                return;
-
         /* Get vendor name */
         cpuid(0x00000000, &c->cpuid_level,
               (int *)&c->x86_vendor_id[0],
               (int *)&c->x86_vendor_id[8],
               (int *)&c->x86_vendor_id[4]);
 
-        get_cpu_vendor(c, 1);
-
         c->x86 = 4;
         if (c->cpuid_level >= 0x00000001) {
                 u32 junk, tfms, cap0, misc;
@@ -274,6 +260,26 @@ static void __init early_cpu_detect(void)
         }
 }
 
+/* Do minimum CPU detection early.
+   Fields really needed: vendor, cpuid_level, family, model, mask, cache alignment.
+   The others are not touched to avoid unwanted side effects.
+
+   WARNING: this function is only called on the BP.  Don't add code here
+   that is supposed to run on all CPUs. */
+static void __init early_cpu_detect(void)
+{
+        struct cpuinfo_x86 *c = &boot_cpu_data;
+
+        c->x86_cache_alignment = 32;
+
+        if (!have_cpuid_p())
+                return;
+
+        cpu_detect(c);
+
+        get_cpu_vendor(c, 1);
+}
+
 static void __cpuinit generic_identify(struct cpuinfo_x86 * c)
 {
         u32 tfms, xlvl;
@@ -308,6 +314,8 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 * c)
 #else
                         c->apicid = (ebx >> 24) & 0xFF;
 #endif
+                        if (c->x86_capability[0] & (1<<19))
+                                c->x86_clflush_size = ((ebx >> 8) & 0xff) * 8;
                 } else {
                         /* Have CPUID level 0 only - unheard of */
                         c->x86 = 4;
@@ -372,6 +380,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
         c->x86_vendor_id[0] = '\0'; /* Unset */
         c->x86_model_id[0] = '\0';  /* Unset */
         c->x86_max_cores = 1;
+        c->x86_clflush_size = 32;
         memset(&c->x86_capability, 0, sizeof c->x86_capability);
 
         if (!have_cpuid_p()) {
@@ -591,42 +600,24 @@ void __init early_cpu_init(void)
         disable_pse = 1;
 #endif
 }
-/*
- * cpu_init() initializes state that is per-CPU. Some data is already
- * initialized (naturally) in the bootstrap process, such as the GDT
- * and IDT. We reload them nevertheless, this function acts as a
- * 'CPU state barrier', nothing should get across.
- */
-void __cpuinit cpu_init(void)
+
+/* Make sure %gs is initialized properly in idle threads */
+struct pt_regs * __devinit idle_regs(struct pt_regs *regs)
 {
-        int cpu = smp_processor_id();
-        struct tss_struct * t = &per_cpu(init_tss, cpu);
-        struct thread_struct *thread = &current->thread;
-        struct desc_struct *gdt;
-        __u32 stk16_off = (__u32)&per_cpu(cpu_16bit_stack, cpu);
-        struct Xgt_desc_struct *cpu_gdt_descr = &per_cpu(cpu_gdt_descr, cpu);
+        memset(regs, 0, sizeof(struct pt_regs));
+        regs->xgs = __KERNEL_PDA;
+        return regs;
+}
 
-        if (cpu_test_and_set(cpu, cpu_initialized)) {
-                printk(KERN_WARNING "CPU#%d already initialized!\n", cpu);
-                for (;;) local_irq_enable();
-        }
-        printk(KERN_INFO "Initializing CPU#%d\n", cpu);
+static __cpuinit int alloc_gdt(int cpu)
+{
+        struct Xgt_desc_struct *cpu_gdt_descr = &per_cpu(cpu_gdt_descr, cpu);
+        struct desc_struct *gdt;
+        struct i386_pda *pda;
 
-        if (cpu_has_vme || cpu_has_tsc || cpu_has_de)
-                clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE);
-        if (tsc_disable && cpu_has_tsc) {
-                printk(KERN_NOTICE "Disabling TSC...\n");
-                /**** FIX-HPA: DOES THIS REALLY BELONG HERE? ****/
-                clear_bit(X86_FEATURE_TSC, boot_cpu_data.x86_capability);
-                set_in_cr4(X86_CR4_TSD);
-        }
+        gdt = (struct desc_struct *)cpu_gdt_descr->address;
+        pda = cpu_pda(cpu);
 
-        /* The CPU hotplug case */
-        if (cpu_gdt_descr->address) {
-                gdt = (struct desc_struct *)cpu_gdt_descr->address;
-                memset(gdt, 0, PAGE_SIZE);
-                goto old_gdt;
-        }
         /*
          * This is a horrible hack to allocate the GDT.  The problem
          * is that cpu_init() is called really early for the boot CPU
@@ -634,43 +625,130 @@ void __cpuinit cpu_init(void)
          * CPUs, when bootmem will have gone away
          */
         if (NODE_DATA(0)->bdata->node_bootmem_map) {
-                gdt = (struct desc_struct *)alloc_bootmem_pages(PAGE_SIZE);
-                /* alloc_bootmem_pages panics on failure, so no check */
+                BUG_ON(gdt != NULL || pda != NULL);
+
+                gdt = alloc_bootmem_pages(PAGE_SIZE);
+                pda = alloc_bootmem(sizeof(*pda));
+                /* alloc_bootmem(_pages) panics on failure, so no check */
+
                 memset(gdt, 0, PAGE_SIZE);
+                memset(pda, 0, sizeof(*pda));
         } else {
-                gdt = (struct desc_struct *)get_zeroed_page(GFP_KERNEL);
-                if (unlikely(!gdt)) {
-                        printk(KERN_CRIT "CPU%d failed to allocate GDT\n", cpu);
-                        for (;;)
-                                local_irq_enable();
+                /* GDT and PDA might already have been allocated if
+                   this is a CPU hotplug re-insertion. */
+                if (gdt == NULL)
+                        gdt = (struct desc_struct *)get_zeroed_page(GFP_KERNEL);
+
+                if (pda == NULL)
+                        pda = kmalloc_node(sizeof(*pda), GFP_KERNEL, cpu_to_node(cpu));
+
+                if (unlikely(!gdt || !pda)) {
+                        free_pages((unsigned long)gdt, 0);
+                        kfree(pda);
+                        return 0;
                 }
         }
-old_gdt:
+
+        cpu_gdt_descr->address = (unsigned long)gdt;
+        cpu_pda(cpu) = pda;
+
+        return 1;
+}
+
+/* Initial PDA used by boot CPU */
+struct i386_pda boot_pda = {
+        ._pda = &boot_pda,
+        .cpu_number = 0,
+        .pcurrent = &init_task,
+};
+
+static inline void set_kernel_gs(void)
+{
+        /* Set %gs for this CPU's PDA.  Memory clobber is to create a
+           barrier with respect to any PDA operations, so the compiler
+           doesn't move any before here. */
+        asm volatile ("mov %0, %%gs" : : "r" (__KERNEL_PDA) : "memory");
+}
+
+/* Initialize the CPU's GDT and PDA.  The boot CPU does this for
+   itself, but secondaries find this done for them. */
+__cpuinit int init_gdt(int cpu, struct task_struct *idle)
+{
+        struct Xgt_desc_struct *cpu_gdt_descr = &per_cpu(cpu_gdt_descr, cpu);
+        struct desc_struct *gdt;
+        struct i386_pda *pda;
+
+        /* For non-boot CPUs, the GDT and PDA should already have been
+           allocated. */
+        if (!alloc_gdt(cpu)) {
+                printk(KERN_CRIT "CPU%d failed to allocate GDT or PDA\n", cpu);
+                return 0;
+        }
+
+        gdt = (struct desc_struct *)cpu_gdt_descr->address;
+        pda = cpu_pda(cpu);
+
+        BUG_ON(gdt == NULL || pda == NULL);
+
         /*
          * Initialize the per-CPU GDT with the boot GDT,
          * and set up the GDT descriptor:
          */
         memcpy(gdt, cpu_gdt_table, GDT_SIZE);
+        cpu_gdt_descr->size = GDT_SIZE - 1;
 
-        /* Set up GDT entry for 16bit stack */
-        *(__u64 *)(&gdt[GDT_ENTRY_ESPFIX_SS]) |=
-                ((((__u64)stk16_off) << 16) & 0x000000ffffff0000ULL) |
-                ((((__u64)stk16_off) << 32) & 0xff00000000000000ULL) |
-                (CPU_16BIT_STACK_SIZE - 1);
+        pack_descriptor((u32 *)&gdt[GDT_ENTRY_PDA].a,
+                        (u32 *)&gdt[GDT_ENTRY_PDA].b,
+                        (unsigned long)pda, sizeof(*pda) - 1,
+                        0x80 | DESCTYPE_S | 0x2, 0); /* present read-write data segment */
 
-        cpu_gdt_descr->size = GDT_SIZE - 1;
-        cpu_gdt_descr->address = (unsigned long)gdt;
+        memset(pda, 0, sizeof(*pda));
+        pda->_pda = pda;
+        pda->cpu_number = cpu;
+        pda->pcurrent = idle;
+
+        return 1;
+}
+
+/* Common CPU init for both boot and secondary CPUs */
+static void __cpuinit _cpu_init(int cpu, struct task_struct *curr)
+{
+        struct tss_struct * t = &per_cpu(init_tss, cpu);
+        struct thread_struct *thread = &curr->thread;
+        struct Xgt_desc_struct *cpu_gdt_descr = &per_cpu(cpu_gdt_descr, cpu);
 
+        /* Reinit these anyway, even if they've already been done (on
+           the boot CPU, this will transition from the boot gdt+pda to
+           the real ones). */
         load_gdt(cpu_gdt_descr);
+        set_kernel_gs();
+
+        if (cpu_test_and_set(cpu, cpu_initialized)) {
+                printk(KERN_WARNING "CPU#%d already initialized!\n", cpu);
+                for (;;) local_irq_enable();
+        }
+
+        printk(KERN_INFO "Initializing CPU#%d\n", cpu);
+
+        if (cpu_has_vme || cpu_has_tsc || cpu_has_de)
+                clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE);
+        if (tsc_disable && cpu_has_tsc) {
+                printk(KERN_NOTICE "Disabling TSC...\n");
+                /**** FIX-HPA: DOES THIS REALLY BELONG HERE? ****/
+                clear_bit(X86_FEATURE_TSC, boot_cpu_data.x86_capability);
+                set_in_cr4(X86_CR4_TSD);
+        }
+
         load_idt(&idt_descr);
 
         /*
          * Set up and load the per-CPU TSS and LDT
          */
         atomic_inc(&init_mm.mm_count);
-        current->active_mm = &init_mm;
-        BUG_ON(current->mm);
-        enter_lazy_tlb(&init_mm, current);
+        curr->active_mm = &init_mm;
+        if (curr->mm)
+                BUG();
+        enter_lazy_tlb(&init_mm, curr);
 
         load_esp0(t, thread);
         set_tss_desc(cpu,t);
@@ -682,8 +760,8 @@ old_gdt:
         __set_tss_desc(cpu, GDT_ENTRY_DOUBLEFAULT_TSS, &doublefault_tss);
 #endif
 
-        /* Clear %fs and %gs. */
-        asm volatile ("movl %0, %%fs; movl %0, %%gs" : : "r" (0));
+        /* Clear %fs. */
+        asm volatile ("mov %0, %%fs" : : "r" (0));
 
         /* Clear all 6 debug registers: */
         set_debugreg(0, 0);
@@ -701,6 +779,37 @@ old_gdt:
         mxcsr_feature_mask_init();
 }
 
+/* Entrypoint to initialize secondary CPU */
+void __cpuinit secondary_cpu_init(void)
+{
+        int cpu = smp_processor_id();
+        struct task_struct *curr = current;
+
+        _cpu_init(cpu, curr);
+}
+
+/*
+ * cpu_init() initializes state that is per-CPU. Some data is already
+ * initialized (naturally) in the bootstrap process, such as the GDT
+ * and IDT. We reload them nevertheless, this function acts as a
+ * 'CPU state barrier', nothing should get across.
+ */
+void __cpuinit cpu_init(void)
+{
+        int cpu = smp_processor_id();
+        struct task_struct *curr = current;
+
+        /* Set up the real GDT and PDA, so we can transition from the
+           boot versions. */
+        if (!init_gdt(cpu, curr)) {
+                /* failed to allocate something; not much we can do... */
+                for (;;)
+                        local_irq_enable();
+        }
+
+        _cpu_init(cpu, curr);
+}
+
 #ifdef CONFIG_HOTPLUG_CPU
 void __cpuinit cpu_uninit(void)
 {
diff --git a/arch/i386/kernel/cpu/cpufreq/Kconfig b/arch/i386/kernel/cpu/cpufreq/Kconfig
index ccc1edff5c97..5299c5bf4454 100644
--- a/arch/i386/kernel/cpu/cpufreq/Kconfig
+++ b/arch/i386/kernel/cpu/cpufreq/Kconfig
@@ -17,6 +17,7 @@ config X86_ACPI_CPUFREQ
         help
           This driver adds a CPUFreq driver which utilizes the ACPI
           Processor Performance States.
+          This driver also supports Intel Enhanced Speedstep.
 
           For details, take a look at <file:Documentation/cpu-freq/>.
 
@@ -121,11 +122,14 @@ config X86_SPEEDSTEP_CENTRINO
           If in doubt, say N.
 
 config X86_SPEEDSTEP_CENTRINO_ACPI
-        bool "Use ACPI tables to decode valid frequency/voltage pairs"
+        bool "Use ACPI tables to decode valid frequency/voltage (deprecated)"
         depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR
         depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m)
         default y
         help
+          This is deprecated and this functionality is now merged into
+          acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of
+          speedstep_centrino.
           Use primarily the information provided in the BIOS ACPI tables
           to determine valid CPU frequency and voltage pairings. It is
           required for the driver to work on non-Banias CPUs.
diff --git a/arch/i386/kernel/cpu/cpufreq/Makefile b/arch/i386/kernel/cpu/cpufreq/Makefile
index 2e894f1c8910..8de3abe322a9 100644
--- a/arch/i386/kernel/cpu/cpufreq/Makefile
+++ b/arch/i386/kernel/cpu/cpufreq/Makefile
@@ -7,9 +7,9 @@ obj-$(CONFIG_SC520_CPUFREQ)		+= sc520_freq.o
 obj-$(CONFIG_X86_LONGRUN)               += longrun.o  
 obj-$(CONFIG_X86_GX_SUSPMOD)            += gx-suspmod.o
 obj-$(CONFIG_X86_SPEEDSTEP_ICH)         += speedstep-ich.o
-obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO)    += speedstep-centrino.o
 obj-$(CONFIG_X86_SPEEDSTEP_LIB)         += speedstep-lib.o
 obj-$(CONFIG_X86_SPEEDSTEP_SMI)         += speedstep-smi.o
 obj-$(CONFIG_X86_ACPI_CPUFREQ)          += acpi-cpufreq.o
+obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO)    += speedstep-centrino.o
 obj-$(CONFIG_X86_P4_CLOCKMOD)           += p4-clockmod.o
 obj-$(CONFIG_X86_CPUFREQ_NFORCE2)       += cpufreq-nforce2.o
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 57c880bf0bd6..10baa3501ed3 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -1,9 +1,10 @@
 /*
- * acpi-cpufreq.c - ACPI Processor P-States Driver ($Revision: 1.3 $)
+ * acpi-cpufreq.c - ACPI Processor P-States Driver ($Revision: 1.4 $)
  *
  *  Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
  *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
  *  Copyright (C) 2002 - 2004 Dominik Brodowski <linux@brodo.de>
+ *  Copyright (C) 2006       Denis Sadykov <denis.m.sadykov@intel.com>
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
@@ -27,202 +28,370 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/smp.h>
+#include <linux/sched.h>
 #include <linux/cpufreq.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
 #include <linux/compiler.h>
-#include <linux/sched.h>        /* current */
 #include <linux/dmi.h>
-#include <asm/io.h>
-#include <asm/delay.h>
-#include <asm/uaccess.h>
 
 #include <linux/acpi.h>
 #include <acpi/processor.h>
 
+#include <asm/io.h>
+#include <asm/msr.h>
+#include <asm/processor.h>
+#include <asm/cpufeature.h>
+#include <asm/delay.h>
+#include <asm/uaccess.h>
+
 #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "acpi-cpufreq", msg)
 
 MODULE_AUTHOR("Paul Diefenbaugh, Dominik Brodowski");
 MODULE_DESCRIPTION("ACPI Processor P-States Driver");
 MODULE_LICENSE("GPL");
 
+enum {
+        UNDEFINED_CAPABLE = 0,
+        SYSTEM_INTEL_MSR_CAPABLE,
+        SYSTEM_IO_CAPABLE,
+};
+
+#define INTEL_MSR_RANGE         (0xffff)
+#define CPUID_6_ECX_APERFMPERF_CAPABILITY       (0x1)
 
-struct cpufreq_acpi_io {
-        struct acpi_processor_performance       *acpi_data;
-        struct cpufreq_frequency_table          *freq_table;
-        unsigned int                            resume;
+struct acpi_cpufreq_data {
+        struct acpi_processor_performance *acpi_data;
+        struct cpufreq_frequency_table *freq_table;
+        unsigned int max_freq;
+        unsigned int resume;
+        unsigned int cpu_feature;
 };
 
-static struct cpufreq_acpi_io   *acpi_io_data[NR_CPUS];
-static struct acpi_processor_performance        *acpi_perf_data[NR_CPUS];
+static struct acpi_cpufreq_data *drv_data[NR_CPUS];
+static struct acpi_processor_performance *acpi_perf_data[NR_CPUS];
 
 static struct cpufreq_driver acpi_cpufreq_driver;
 
 static unsigned int acpi_pstate_strict;
 
-static int
-acpi_processor_write_port(
-        u16     port,
-        u8      bit_width,
-        u32     value)
+static int check_est_cpu(unsigned int cpuid)
 {
-        if (bit_width <= 8) {
-                outb(value, port);
-        } else if (bit_width <= 16) {
-                outw(value, port);
-        } else if (bit_width <= 32) {
-                outl(value, port);
-        } else {
-                return -ENODEV;
+        struct cpuinfo_x86 *cpu = &cpu_data[cpuid];
+
+        if (cpu->x86_vendor != X86_VENDOR_INTEL ||
+            !cpu_has(cpu, X86_FEATURE_EST))
+                return 0;
+
+        return 1;
+}
+
+static unsigned extract_io(u32 value, struct acpi_cpufreq_data *data)
+{
+        struct acpi_processor_performance *perf;
+        int i;
+
+        perf = data->acpi_data;
+
+        for (i=0; i<perf->state_count; i++) {
+                if (value == perf->states[i].status)
+                        return data->freq_table[i].frequency;
         }
         return 0;
 }
 
-static int
-acpi_processor_read_port(
-        u16     port,
-        u8      bit_width,
-        u32     *ret)
+static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
 {
-        *ret = 0;
-        if (bit_width <= 8) {
-                *ret = inb(port);
-        } else if (bit_width <= 16) {
-                *ret = inw(port);
-        } else if (bit_width <= 32) {
-                *ret = inl(port);
-        } else {
-                return -ENODEV;
+        int i;
+        struct acpi_processor_performance *perf;
+
+        msr &= INTEL_MSR_RANGE;
+        perf = data->acpi_data;
+
+        for (i=0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
+                if (msr == perf->states[data->freq_table[i].index].status)
+                        return data->freq_table[i].frequency;
         }
-        return 0;
+        return data->freq_table[0].frequency;
 }
 
-static int
-acpi_processor_set_performance (
-        struct cpufreq_acpi_io  *data,
-        unsigned int            cpu,
-        int                     state)
+static unsigned extract_freq(u32 val, struct acpi_cpufreq_data *data)
 {
-        u16                     port = 0;
-        u8                      bit_width = 0;
-        int                     i = 0;
-        int                     ret = 0;
-        u32                     value = 0;
-        int                     retval;
-        struct acpi_processor_performance       *perf;
-
-        dprintk("acpi_processor_set_performance\n");
-
-        retval = 0;
-        perf = data->acpi_data; 
-        if (state == perf->state) {
-                if (unlikely(data->resume)) {
-                        dprintk("Called after resume, resetting to P%d\n", state);
-                        data->resume = 0;
-                } else {
-                        dprintk("Already at target state (P%d)\n", state);
-                        return (retval);
-                }
+        switch (data->cpu_feature) {
+        case SYSTEM_INTEL_MSR_CAPABLE:
+                return extract_msr(val, data);
+        case SYSTEM_IO_CAPABLE:
+                return extract_io(val, data);
+        default:
+                return 0;
         }
+}
+
+struct msr_addr {
+        u32 reg;
+};
 
-        dprintk("Transitioning from P%d to P%d\n", perf->state, state);
+struct io_addr {
+        u16 port;
+        u8 bit_width;
+};
 
-        /*
-         * First we write the target state's 'control' value to the
-         * control_register.
-         */
+typedef union {
+        struct msr_addr msr;
+        struct io_addr io;
+} drv_addr_union;
 
-        port = perf->control_register.address;
-        bit_width = perf->control_register.bit_width;
-        value = (u32) perf->states[state].control;
+struct drv_cmd {
+        unsigned int type;
+        cpumask_t mask;
+        drv_addr_union addr;
+        u32 val;
+};
 
-        dprintk("Writing 0x%08x to port 0x%04x\n", value, port);
+static void do_drv_read(struct drv_cmd *cmd)
+{
+        u32 h;
+
+        switch (cmd->type) {
+        case SYSTEM_INTEL_MSR_CAPABLE:
+                rdmsr(cmd->addr.msr.reg, cmd->val, h);
+                break;
+        case SYSTEM_IO_CAPABLE:
+                acpi_os_read_port((acpi_io_address)cmd->addr.io.port,
+                                &cmd->val,
+                                (u32)cmd->addr.io.bit_width);
+                break;
+        default:
+                break;
+        }
+}
 
-        ret = acpi_processor_write_port(port, bit_width, value);
-        if (ret) {
-                dprintk("Invalid port width 0x%04x\n", bit_width);
-                return (ret);
+static void do_drv_write(struct drv_cmd *cmd)
+{
+        u32 h = 0;
+
+        switch (cmd->type) {
+        case SYSTEM_INTEL_MSR_CAPABLE:
+                wrmsr(cmd->addr.msr.reg, cmd->val, h);
+                break;
+        case SYSTEM_IO_CAPABLE:
+                acpi_os_write_port((acpi_io_address)cmd->addr.io.port,
+                                cmd->val,
+                                (u32)cmd->addr.io.bit_width);
+                break;
+        default:
+                break;
         }
+}
 
+static void drv_read(struct drv_cmd *cmd)
+{
+        cpumask_t saved_mask = current->cpus_allowed;
+        cmd->val = 0;
+
+        set_cpus_allowed(current, cmd->mask);
+        do_drv_read(cmd);
+        set_cpus_allowed(current, saved_mask);
+}
+
+static void drv_write(struct drv_cmd *cmd)
+{
+        cpumask_t saved_mask = current->cpus_allowed;
+        unsigned int i;
+
+        for_each_cpu_mask(i, cmd->mask) {
+                set_cpus_allowed(current, cpumask_of_cpu(i));
+                do_drv_write(cmd);
+        }
+
+        set_cpus_allowed(current, saved_mask);
+        return;
+}
+
+static u32 get_cur_val(cpumask_t mask)
+{
+        struct acpi_processor_performance *perf;
+        struct drv_cmd cmd;
+
+        if (unlikely(cpus_empty(mask)))
+                return 0;
+
+        switch (drv_data[first_cpu(mask)]->cpu_feature) {
+        case SYSTEM_INTEL_MSR_CAPABLE:
+                cmd.type = SYSTEM_INTEL_MSR_CAPABLE;
+                cmd.addr.msr.reg = MSR_IA32_PERF_STATUS;
+                break;
+        case SYSTEM_IO_CAPABLE:
+                cmd.type = SYSTEM_IO_CAPABLE;
+                perf = drv_data[first_cpu(mask)]->acpi_data;
+                cmd.addr.io.port = perf->control_register.address;
+                cmd.addr.io.bit_width = perf->control_register.bit_width;
+                break;
+        default:
+                return 0;
+        }
+
+        cmd.mask = mask;
+
+        drv_read(&cmd);
+
+        dprintk("get_cur_val = %u\n", cmd.val);
+
+        return cmd.val;
+}
+
+/*
+ * Return the measured active (C0) frequency on this CPU since last call
+ * to this function.
+ * Input: cpu number
+ * Return: Average CPU frequency in terms of max frequency (zero on error)
+ *
+ * We use IA32_MPERF and IA32_APERF MSRs to get the measured performance
+ * over a period of time, while CPU is in C0 state.
+ * IA32_MPERF counts at the rate of max advertised frequency
+ * IA32_APERF counts at the rate of actual CPU frequency
+ * Only IA32_APERF/IA32_MPERF ratio is architecturally defined and
+ * no meaning should be associated with absolute values of these MSRs.
+ */
+static unsigned int get_measured_perf(unsigned int cpu)
+{
+        union {
+                struct {
+                        u32 lo;
+                        u32 hi;
+                } split;
+                u64 whole;
+        } aperf_cur, mperf_cur;
+
+        cpumask_t saved_mask;
+        unsigned int perf_percent;
+        unsigned int retval;
+
+        saved_mask = current->cpus_allowed;
+        set_cpus_allowed(current, cpumask_of_cpu(cpu));
+        if (get_cpu() != cpu) {
+                /* We were not able to run on requested processor */
+                put_cpu();
+                return 0;
+        }
+
+        rdmsr(MSR_IA32_APERF, aperf_cur.split.lo, aperf_cur.split.hi);
+        rdmsr(MSR_IA32_MPERF, mperf_cur.split.lo, mperf_cur.split.hi);
+
+        wrmsr(MSR_IA32_APERF, 0,0);
+        wrmsr(MSR_IA32_MPERF, 0,0);
+
+#ifdef __i386__
         /*
-         * Assume the write went through when acpi_pstate_strict is not used.
-         * As read status_register is an expensive operation and there 
-         * are no specific error cases where an IO port write will fail.
+         * We dont want to do 64 bit divide with 32 bit kernel
+         * Get an approximate value. Return failure in case we cannot get
+         * an approximate value.
          */
-        if (acpi_pstate_strict) {
-                /* Then we read the 'status_register' and compare the value 
-                 * with the target state's 'status' to make sure the 
-                 * transition was successful.
-                 * Note that we'll poll for up to 1ms (100 cycles of 10us) 
-                 * before giving up.
-                 */
-
-                port = perf->status_register.address;
-                bit_width = perf->status_register.bit_width;
-
-                dprintk("Looking for 0x%08x from port 0x%04x\n",
-                        (u32) perf->states[state].status, port);
-
-                for (i = 0; i < 100; i++) {
-                        ret = acpi_processor_read_port(port, bit_width, &value);
-                        if (ret) {      
-                                dprintk("Invalid port width 0x%04x\n", bit_width);
-                                return (ret);
-                        }
-                        if (value == (u32) perf->states[state].status)
-                                break;
-                        udelay(10);
-                }
-        } else {
-                value = (u32) perf->states[state].status;
+        if (unlikely(aperf_cur.split.hi || mperf_cur.split.hi)) {
+                int shift_count;
+                u32 h;
+
+                h = max_t(u32, aperf_cur.split.hi, mperf_cur.split.hi);
+                shift_count = fls(h);
+
+                aperf_cur.whole >>= shift_count;
+                mperf_cur.whole >>= shift_count;
+        }
+
+        if (((unsigned long)(-1) / 100) < aperf_cur.split.lo) {
+                int shift_count = 7;
+                aperf_cur.split.lo >>= shift_count;
+                mperf_cur.split.lo >>= shift_count;
+        }
+
+        if (aperf_cur.split.lo && mperf_cur.split.lo)
+                perf_percent = (aperf_cur.split.lo * 100) / mperf_cur.split.lo;
+        else
+                perf_percent = 0;
+
+#else
+        if (unlikely(((unsigned long)(-1) / 100) < aperf_cur.whole)) {
+                int shift_count = 7;
+                aperf_cur.whole >>= shift_count;
+                mperf_cur.whole >>= shift_count;
         }
 
-        if (unlikely(value != (u32) perf->states[state].status)) {
-                printk(KERN_WARNING "acpi-cpufreq: Transition failed\n");
-                retval = -ENODEV;
-                return (retval);
+        if (aperf_cur.whole && mperf_cur.whole)
+                perf_percent = (aperf_cur.whole * 100) / mperf_cur.whole;
+        else
+                perf_percent = 0;
+
+#endif
+
+        retval = drv_data[cpu]->max_freq * perf_percent / 100;
+
+        put_cpu();
+        set_cpus_allowed(current, saved_mask);
+
+        dprintk("cpu %d: performance percent %d\n", cpu, perf_percent);
+        return retval;
+}
+
+static unsigned int get_cur_freq_on_cpu(unsigned int cpu)
+{
+        struct acpi_cpufreq_data *data = drv_data[cpu];
+        unsigned int freq;
+
+        dprintk("get_cur_freq_on_cpu (%d)\n", cpu);
+
+        if (unlikely(data == NULL ||
+                     data->acpi_data == NULL || data->freq_table == NULL)) {
+                return 0;
         }
 
-        dprintk("Transition successful after %d microseconds\n", i * 10);
+        freq = extract_freq(get_cur_val(cpumask_of_cpu(cpu)), data);
+        dprintk("cur freq = %u\n", freq);
 
-        perf->state = state;
-        return (retval);
+        return freq;
 }
 
+static unsigned int check_freqs(cpumask_t mask, unsigned int freq,
+                                struct acpi_cpufreq_data *data)
+{
+        unsigned int cur_freq;
+        unsigned int i;
+
+        for (i=0; i<100; i++) {
+                cur_freq = extract_freq(get_cur_val(mask), data);
+                if (cur_freq == freq)
+                        return 1;
+                udelay(10);
+        }
+        return 0;
+}
 
-static int
-acpi_cpufreq_target (
-        struct cpufreq_policy   *policy,
-        unsigned int target_freq,
-        unsigned int relation)
+static int acpi_cpufreq_target(struct cpufreq_policy *policy,
+                               unsigned int target_freq, unsigned int relation)
 {
-        struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
+        struct acpi_cpufreq_data *data = drv_data[policy->cpu];
         struct acpi_processor_performance *perf;
         struct cpufreq_freqs freqs;
         cpumask_t online_policy_cpus;
-        cpumask_t saved_mask;
-        cpumask_t set_mask;
-        cpumask_t covered_cpus;
-        unsigned int cur_state = 0;
-        unsigned int next_state = 0;
-        unsigned int result = 0;
-        unsigned int j;
-        unsigned int tmp;
+        struct drv_cmd cmd;
+        unsigned int msr;
+        unsigned int next_state = 0; /* Index into freq_table */
+        unsigned int next_perf_state = 0; /* Index into perf table */
+        unsigned int i;
+        int result = 0;
 
-        dprintk("acpi_cpufreq_setpolicy\n");
+        dprintk("acpi_cpufreq_target %d (%d)\n", target_freq, policy->cpu);
 
-        result = cpufreq_frequency_table_target(policy,
-                        data->freq_table,
-                        target_freq,
-                        relation,
-                        &next_state);
-        if (unlikely(result))
-                return (result);
+        if (unlikely(data == NULL ||
+             data->acpi_data == NULL || data->freq_table == NULL)) {
+                return -ENODEV;
+        }
 
         perf = data->acpi_data;
-        cur_state = perf->state;
-        freqs.old = data->freq_table[cur_state].frequency;
-        freqs.new = data->freq_table[next_state].frequency;
+        result = cpufreq_frequency_table_target(policy,
+                                                data->freq_table,
+                                                target_freq,
+                                                relation, &next_state);
+        if (unlikely(result))
+                return -ENODEV;
 
 #ifdef CONFIG_HOTPLUG_CPU
         /* cpufreq holds the hotplug lock, so we are safe from here on */
@@ -231,106 +400,85 @@ acpi_cpufreq_target (
         online_policy_cpus = policy->cpus;
 #endif
 
-        for_each_cpu_mask(j, online_policy_cpus) {
-                freqs.cpu = j;
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        next_perf_state = data->freq_table[next_state].index;
+        if (perf->state == next_perf_state) {
+                if (unlikely(data->resume)) {
+                        dprintk("Called after resume, resetting to P%d\n",
+                                next_perf_state);
+                        data->resume = 0;
+                } else {
+                        dprintk("Already at target state (P%d)\n",
+                                next_perf_state);
+                        return 0;
+                }
         }
 
-        /*
-         * We need to call driver->target() on all or any CPU in
-         * policy->cpus, depending on policy->shared_type.
-         */
-        saved_mask = current->cpus_allowed;
-        cpus_clear(covered_cpus);
-        for_each_cpu_mask(j, online_policy_cpus) {
-                /*
-                 * Support for SMP systems.
-                 * Make sure we are running on CPU that wants to change freq
-                 */
-                cpus_clear(set_mask);
-                if (policy->shared_type == CPUFREQ_SHARED_TYPE_ANY)
-                        cpus_or(set_mask, set_mask, online_policy_cpus);
-                else
-                        cpu_set(j, set_mask);
-
-                set_cpus_allowed(current, set_mask);
-                if (unlikely(!cpu_isset(smp_processor_id(), set_mask))) {
-                        dprintk("couldn't limit to CPUs in this domain\n");
-                        result = -EAGAIN;
-                        break;
-                }
+        switch (data->cpu_feature) {
+        case SYSTEM_INTEL_MSR_CAPABLE:
+                cmd.type = SYSTEM_INTEL_MSR_CAPABLE;
+                cmd.addr.msr.reg = MSR_IA32_PERF_CTL;
+                msr =
+                    (u32) perf->states[next_perf_state].
+                    control & INTEL_MSR_RANGE;
+                cmd.val = get_cur_val(online_policy_cpus);
+                cmd.val = (cmd.val & ~INTEL_MSR_RANGE) | msr;
+                break;
+        case SYSTEM_IO_CAPABLE:
+                cmd.type = SYSTEM_IO_CAPABLE;
+                cmd.addr.io.port = perf->control_register.address;
+                cmd.addr.io.bit_width = perf->control_register.bit_width;
+                cmd.val = (u32) perf->states[next_perf_state].control;
+                break;
+        default:
+                return -ENODEV;
+        }
 
-                result = acpi_processor_set_performance (data, j, next_state);
-                if (result) {
-                        result = -EAGAIN;
-                        break;
-                }
+        cpus_clear(cmd.mask);
 
-                if (policy->shared_type == CPUFREQ_SHARED_TYPE_ANY)
-                        break;
- 
-                cpu_set(j, covered_cpus);
-        }
+        if (policy->shared_type != CPUFREQ_SHARED_TYPE_ANY)
+                cmd.mask = online_policy_cpus;
+        else
+                cpu_set(policy->cpu, cmd.mask);
 
-        for_each_cpu_mask(j, online_policy_cpus) {
-                freqs.cpu = j;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        freqs.old = perf->states[perf->state].core_frequency * 1000;
+        freqs.new = data->freq_table[next_state].frequency;
+        for_each_cpu_mask(i, cmd.mask) {
+                freqs.cpu = i;
+                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
         }
 
-        if (unlikely(result)) {
-                /*
-                 * We have failed halfway through the frequency change.
-                 * We have sent callbacks to online_policy_cpus and
-                 * acpi_processor_set_performance() has been called on 
-                 * coverd_cpus. Best effort undo..
-                 */
-
-                if (!cpus_empty(covered_cpus)) {
-                        for_each_cpu_mask(j, covered_cpus) {
-                                policy->cpu = j;
-                                acpi_processor_set_performance (data, 
-                                                j, 
-                                                cur_state);
-                        }
-                }
+        drv_write(&cmd);
 
-                tmp = freqs.new;
-                freqs.new = freqs.old;
-                freqs.old = tmp;
-                for_each_cpu_mask(j, online_policy_cpus) {
-                        freqs.cpu = j;
-                        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-                        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        if (acpi_pstate_strict) {
+                if (!check_freqs(cmd.mask, freqs.new, data)) {
+                        dprintk("acpi_cpufreq_target failed (%d)\n",
+                                policy->cpu);
+                        return -EAGAIN;
                 }
         }
 
-        set_cpus_allowed(current, saved_mask);
-        return (result);
-}
+        for_each_cpu_mask(i, cmd.mask) {
+                freqs.cpu = i;
+                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        }
+        perf->state = next_perf_state;
 
+        return result;
+}
 
-static int
-acpi_cpufreq_verify (
-        struct cpufreq_policy   *policy)
+static int acpi_cpufreq_verify(struct cpufreq_policy *policy)
 {
-        unsigned int result = 0;
-        struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
+        struct acpi_cpufreq_data *data = drv_data[policy->cpu];
 
         dprintk("acpi_cpufreq_verify\n");
 
-        result = cpufreq_frequency_table_verify(policy, 
-                        data->freq_table);
-
-        return (result);
+        return cpufreq_frequency_table_verify(policy, data->freq_table);
 }
 
-
 static unsigned long
-acpi_cpufreq_guess_freq (
-        struct cpufreq_acpi_io  *data,
-        unsigned int            cpu)
+acpi_cpufreq_guess_freq(struct acpi_cpufreq_data *data, unsigned int cpu)
 {
-        struct acpi_processor_performance       *perf = data->acpi_data;
+        struct acpi_processor_performance *perf = data->acpi_data;
 
         if (cpu_khz) {
                 /* search the closest match to cpu_khz */
@@ -338,16 +486,16 @@ acpi_cpufreq_guess_freq (
                 unsigned long freq;
                 unsigned long freqn = perf->states[0].core_frequency * 1000;
 
-                for (i = 0; i < (perf->state_count - 1); i++) {
+                for (i=0; i<(perf->state_count-1); i++) {
                         freq = freqn;
                         freqn = perf->states[i+1].core_frequency * 1000;
                         if ((2 * cpu_khz) > (freqn + freq)) {
                                 perf->state = i;
-                                return (freq);
+                                return freq;
                         }
                 }
-                perf->state = perf->state_count - 1;
-                return (freqn);
+                perf->state = perf->state_count-1;
+                return freqn;
         } else {
                 /* assume CPU is at P0... */
                 perf->state = 0;
@@ -355,7 +503,6 @@ acpi_cpufreq_guess_freq (
         }
 }
 
-
 /*
  * acpi_cpufreq_early_init - initialize ACPI P-States library
  *
@@ -364,30 +511,34 @@ acpi_cpufreq_guess_freq (
  * do _PDC and _PSD and find out the processor dependency for the
  * actual init that will happen later...
  */
-static int acpi_cpufreq_early_init_acpi(void)
+static int acpi_cpufreq_early_init(void)
 {
-        struct acpi_processor_performance       *data;
-        unsigned int                            i, j;
+        struct acpi_processor_performance *data;
+        cpumask_t covered;
+        unsigned int i, j;
 
         dprintk("acpi_cpufreq_early_init\n");
 
         for_each_possible_cpu(i) {
-                data = kzalloc(sizeof(struct acpi_processor_performance), 
-                        GFP_KERNEL);
+                data = kzalloc(sizeof(struct acpi_processor_performance),
+                               GFP_KERNEL);
                 if (!data) {
-                        for_each_possible_cpu(j) {
+                        for_each_cpu_mask(j, covered) {
                                 kfree(acpi_perf_data[j]);
                                 acpi_perf_data[j] = NULL;
                         }
-                        return (-ENOMEM);
+                        return -ENOMEM;
                 }
                 acpi_perf_data[i] = data;
+                cpu_set(i, covered);
         }
 
         /* Do initialization in ACPI core */
-        return acpi_processor_preregister_performance(acpi_perf_data);
+        acpi_processor_preregister_performance(acpi_perf_data);
+        return 0;
 }
 
+#ifdef CONFIG_SMP
 /*
  * Some BIOSes do SW_ANY coordination internally, either set it up in hw
  * or do it in BIOS firmware and won't inform about it to OS. If not
@@ -414,39 +565,42 @@ static struct dmi_system_id sw_any_bug_dmi_table[] = {
         },
         { }
 };
+#endif
 
-static int
-acpi_cpufreq_cpu_init (
-        struct cpufreq_policy   *policy)
+static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
-        unsigned int            i;
-        unsigned int            cpu = policy->cpu;
-        struct cpufreq_acpi_io  *data;
-        unsigned int            result = 0;
+        unsigned int i;
+        unsigned int valid_states = 0;
+        unsigned int cpu = policy->cpu;
+        struct acpi_cpufreq_data *data;
+        unsigned int result = 0;
         struct cpuinfo_x86 *c = &cpu_data[policy->cpu];
-        struct acpi_processor_performance       *perf;
+        struct acpi_processor_performance *perf;
 
         dprintk("acpi_cpufreq_cpu_init\n");
 
         if (!acpi_perf_data[cpu])
-                return (-ENODEV);
+                return -ENODEV;
 
-        data = kzalloc(sizeof(struct cpufreq_acpi_io), GFP_KERNEL);
+        data = kzalloc(sizeof(struct acpi_cpufreq_data), GFP_KERNEL);
         if (!data)
-                return (-ENOMEM);
+                return -ENOMEM;
 
         data->acpi_data = acpi_perf_data[cpu];
-        acpi_io_data[cpu] = data;
+        drv_data[cpu] = data;
 
-        result = acpi_processor_register_performance(data->acpi_data, cpu);
+        if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
+                acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
 
+        result = acpi_processor_register_performance(data->acpi_data, cpu);
         if (result)
                 goto err_free;
 
         perf = data->acpi_data;
         policy->shared_type = perf->shared_type;
+
         /*
-         * Will let policy->cpus know about dependency only when software 
+         * Will let policy->cpus know about dependency only when software
          * coordination is required.
          */
         if (policy->shared_type == CPUFREQ_SHARED_TYPE_ALL ||
@@ -462,10 +616,6 @@ acpi_cpufreq_cpu_init (
         }
 #endif
 
-        if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
-                acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
-        }
-
         /* capability check */
         if (perf->state_count <= 1) {
                 dprintk("No P-States\n");
@@ -473,17 +623,33 @@ acpi_cpufreq_cpu_init (
                 goto err_unreg;
         }
 
-        if ((perf->control_register.space_id != ACPI_ADR_SPACE_SYSTEM_IO) ||
-            (perf->status_register.space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {
-                dprintk("Unsupported address space [%d, %d]\n",
-                        (u32) (perf->control_register.space_id),
-                        (u32) (perf->status_register.space_id));
+        if (perf->control_register.space_id != perf->status_register.space_id) {
                 result = -ENODEV;
                 goto err_unreg;
         }
 
-        /* alloc freq_table */
-        data->freq_table = kmalloc(sizeof(struct cpufreq_frequency_table) * (perf->state_count + 1), GFP_KERNEL);
+        switch (perf->control_register.space_id) {
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+                dprintk("SYSTEM IO addr space\n");
+                data->cpu_feature = SYSTEM_IO_CAPABLE;
+                break;
+        case ACPI_ADR_SPACE_FIXED_HARDWARE:
+                dprintk("HARDWARE addr space\n");
+                if (!check_est_cpu(cpu)) {
+                        result = -ENODEV;
+                        goto err_unreg;
+                }
+                data->cpu_feature = SYSTEM_INTEL_MSR_CAPABLE;
+                break;
+        default:
+                dprintk("Unknown addr space %d\n",
+                        (u32) (perf->control_register.space_id));
+                result = -ENODEV;
+                goto err_unreg;
+        }
+
+        data->freq_table = kmalloc(sizeof(struct cpufreq_frequency_table) *
+                    (perf->state_count+1), GFP_KERNEL);
         if (!data->freq_table) {
                 result = -ENOMEM;
                 goto err_unreg;
@@ -492,129 +658,141 @@ acpi_cpufreq_cpu_init (
         /* detect transition latency */
         policy->cpuinfo.transition_latency = 0;
         for (i=0; i<perf->state_count; i++) {
-                if ((perf->states[i].transition_latency * 1000) > policy->cpuinfo.transition_latency)
-                        policy->cpuinfo.transition_latency = perf->states[i].transition_latency * 1000;
+                if ((perf->states[i].transition_latency * 1000) >
+                    policy->cpuinfo.transition_latency)
+                        policy->cpuinfo.transition_latency =
+                            perf->states[i].transition_latency * 1000;
         }
         policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
 
-        /* The current speed is unknown and not detectable by ACPI...  */
-        policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
-
+        data->max_freq = perf->states[0].core_frequency * 1000;
         /* table init */
-        for (i=0; i<=perf->state_count; i++)
-        {
-                data->freq_table[i].index = i;
-                if (i<perf->state_count)
-                        data->freq_table[i].frequency = perf->states[i].core_frequency * 1000;
-                else
-                        data->freq_table[i].frequency = CPUFREQ_TABLE_END;
+        for (i=0; i<perf->state_count; i++) {
+                if (i>0 && perf->states[i].core_frequency ==
+                    perf->states[i-1].core_frequency)
+                        continue;
+
+                data->freq_table[valid_states].index = i;
+                data->freq_table[valid_states].frequency =
+                    perf->states[i].core_frequency * 1000;
+                valid_states++;
         }
+        data->freq_table[valid_states].frequency = CPUFREQ_TABLE_END;
+        perf->state = 0;
 
         result = cpufreq_frequency_table_cpuinfo(policy, data->freq_table);
-        if (result) {
+        if (result)
                 goto err_freqfree;
+
+        switch (perf->control_register.space_id) {
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+                /* Current speed is unknown and not detectable by IO port */
+                policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
+                break;
+        case ACPI_ADR_SPACE_FIXED_HARDWARE:
+                acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
+                policy->cur = get_cur_freq_on_cpu(cpu);
+                break;
+        default:
+                break;
         }
 
         /* notify BIOS that we exist */
         acpi_processor_notify_smm(THIS_MODULE);
 
-        printk(KERN_INFO "acpi-cpufreq: CPU%u - ACPI performance management activated.\n",
-               cpu);
+        /* Check for APERF/MPERF support in hardware */
+        if (c->x86_vendor == X86_VENDOR_INTEL && c->cpuid_level >= 6) {
+                unsigned int ecx;
+                ecx = cpuid_ecx(6);
+                if (ecx & CPUID_6_ECX_APERFMPERF_CAPABILITY)
+                        acpi_cpufreq_driver.getavg = get_measured_perf;
+        }
+
+        dprintk("CPU%u - ACPI performance management activated.\n", cpu);
         for (i = 0; i < perf->state_count; i++)
                 dprintk("     %cP%d: %d MHz, %d mW, %d uS\n",
-                        (i == perf->state?'*':' '), i,
+                        (i == perf->state ? '*' : ' '), i,
                         (u32) perf->states[i].core_frequency,
                         (u32) perf->states[i].power,
                         (u32) perf->states[i].transition_latency);
 
         cpufreq_frequency_table_get_attr(data->freq_table, policy->cpu);
-        
+
         /*
          * the first call to ->target() should result in us actually
          * writing something to the appropriate registers.
          */
         data->resume = 1;
-        
-        return (result);
 
- err_freqfree:
+        return result;
+
+err_freqfree:
         kfree(data->freq_table);
- err_unreg:
+err_unreg:
         acpi_processor_unregister_performance(perf, cpu);
- err_free:
+err_free:
         kfree(data);
-        acpi_io_data[cpu] = NULL;
+        drv_data[cpu] = NULL;
 
-        return (result);
+        return result;
 }
 
-
-static int
-acpi_cpufreq_cpu_exit (
-        struct cpufreq_policy   *policy)
+static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)
 {
-        struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
-
+        struct acpi_cpufreq_data *data = drv_data[policy->cpu];
 
         dprintk("acpi_cpufreq_cpu_exit\n");
 
         if (data) {
                 cpufreq_frequency_table_put_attr(policy->cpu);
-                acpi_io_data[policy->cpu] = NULL;
-                acpi_processor_unregister_performance(data->acpi_data, policy->cpu);
+                drv_data[policy->cpu] = NULL;
+                acpi_processor_unregister_performance(data->acpi_data,
+                                                      policy->cpu);
                 kfree(data);
         }
 
-        return (0);
+        return 0;
 }
 
-static int
-acpi_cpufreq_resume (
-        struct cpufreq_policy   *policy)
+static int acpi_cpufreq_resume(struct cpufreq_policy *policy)
 {
-        struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
-
+        struct acpi_cpufreq_data *data = drv_data[policy->cpu];
 
         dprintk("acpi_cpufreq_resume\n");
 
         data->resume = 1;
 
-        return (0);
+        return 0;
 }
 
-
-static struct freq_attr* acpi_cpufreq_attr[] = {
+static struct freq_attr *acpi_cpufreq_attr[] = {
         &cpufreq_freq_attr_scaling_available_freqs,
         NULL,
 };
 
 static struct cpufreq_driver acpi_cpufreq_driver = {
-        .verify = acpi_cpufreq_verify,
-        .target = acpi_cpufreq_target,
-        .init   = acpi_cpufreq_cpu_init,
-        .exit   = acpi_cpufreq_cpu_exit,
-        .resume = acpi_cpufreq_resume,
-        .name   = "acpi-cpufreq",
-        .owner  = THIS_MODULE,
-        .attr   = acpi_cpufreq_attr,
+        .verify = acpi_cpufreq_verify,
+        .target = acpi_cpufreq_target,
+        .init = acpi_cpufreq_cpu_init,
+        .exit = acpi_cpufreq_cpu_exit,
+        .resume = acpi_cpufreq_resume,
+        .name = "acpi-cpufreq",
+        .owner = THIS_MODULE,
+        .attr = acpi_cpufreq_attr,
 };
 
-
-static int __init
-acpi_cpufreq_init (void)
+static int __init acpi_cpufreq_init(void)
 {
         dprintk("acpi_cpufreq_init\n");
 
-        acpi_cpufreq_early_init_acpi();
+        acpi_cpufreq_early_init();
 
         return cpufreq_register_driver(&acpi_cpufreq_driver);
 }
 
-
-static void __exit
-acpi_cpufreq_exit (void)
+static void __exit acpi_cpufreq_exit(void)
 {
-        unsigned int    i;
+        unsigned int i;
         dprintk("acpi_cpufreq_exit\n");
 
         cpufreq_unregister_driver(&acpi_cpufreq_driver);
@@ -627,7 +805,9 @@ acpi_cpufreq_exit (void)
 }
 
 module_param(acpi_pstate_strict, uint, 0644);
-MODULE_PARM_DESC(acpi_pstate_strict, "value 0 or non-zero. non-zero -> strict ACPI checks are performed during frequency changes.");
+MODULE_PARM_DESC(acpi_pstate_strict,
+        "value 0 or non-zero. non-zero -> strict ACPI checks are "
+        "performed during frequency changes.");
 
 late_initcall(acpi_cpufreq_init);
 module_exit(acpi_cpufreq_exit);
diff --git a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c b/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
index 92afa3bc84f1..6667e9cceb9f 100644
--- a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
+++ b/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
@@ -447,7 +447,6 @@ static int __init cpufreq_gx_init(void)
         int ret;
         struct gxfreq_params *params;
         struct pci_dev *gx_pci;
-        u32 class_rev;
 
         /* Test if we have the right hardware */
         if ((gx_pci = gx_detect_chipset()) == NULL)
@@ -472,8 +471,7 @@ static int __init cpufreq_gx_init(void)
         pci_read_config_byte(params->cs55x0, PCI_PMER2, &(params->pci_pmer2));
         pci_read_config_byte(params->cs55x0, PCI_MODON, &(params->on_duration));
         pci_read_config_byte(params->cs55x0, PCI_MODOFF, &(params->off_duration));
-        pci_read_config_dword(params->cs55x0, PCI_CLASS_REVISION, &class_rev);
-        params->pci_rev = class_rev && 0xff;
+        pci_read_config_byte(params->cs55x0, PCI_REVISION_ID, &params->pci_rev);
 
         if ((ret = cpufreq_register_driver(&gx_suspmod_driver))) {
                 kfree(params);
diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c
index 7233abe5d695..e940e00b96c9 100644
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c
@@ -52,6 +52,10 @@
 #define CPU_EZRA_T      4
 #define CPU_NEHEMIAH    5
 
+/* Flags */
+#define USE_ACPI_C3             (1 << 1)
+#define USE_NORTHBRIDGE         (1 << 2)
+
 static int cpu_model;
 static unsigned int numscales=16;
 static unsigned int fsb;
@@ -68,7 +72,7 @@ static unsigned int minmult, maxmult;
 static int can_scale_voltage;
 static struct acpi_processor *pr = NULL;
 static struct acpi_processor_cx *cx = NULL;
-static int port22_en;
+static u8 longhaul_flags;
 
 /* Module parameters */
 static int scale_voltage;
@@ -80,7 +84,6 @@ static int ignore_latency;
 /* Clock ratios multiplied by 10 */
 static int clock_ratio[32];
 static int eblcr_table[32];
-static unsigned int highest_speed, lowest_speed; /* kHz */
 static int longhaul_version;
 static struct cpufreq_frequency_table *longhaul_table;
 
@@ -178,7 +181,7 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
         safe_halt();
         /* Change frequency on next halt or sleep */
         wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
-        if (port22_en) {
+        if (!cx_address) {
                 ACPI_FLUSH_CPU_CACHE();
                 /* Invoke C1 */
                 halt();
@@ -189,7 +192,6 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
                 /* Dummy op - must do something useless after P_LVL3 read */
                 t = inl(acpi_fadt.xpm_tmr_blk.address);
         }
-
         /* Disable bus ratio bit */
         local_irq_disable();
         longhaul.bits.RevisionKey = longhaul.bits.RevisionID;
@@ -243,15 +245,14 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
         outb(0xFF,0xA1);        /* Overkill */
         outb(0xFE,0x21);        /* TMR0 only */
 
-        if (pr->flags.bm_control) {
+        if (longhaul_flags & USE_NORTHBRIDGE) {
+                /* Disable AGP and PCI arbiters */
+                outb(3, 0x22);
+        } else if ((pr != NULL) && pr->flags.bm_control) {
                 /* Disable bus master arbitration */
                 acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1,
                                   ACPI_MTX_DO_NOT_LOCK);
-        } else if (port22_en) {
-                /* Disable AGP and PCI arbiters */
-                outb(3, 0x22);
         }
-
         switch (longhaul_version) {
 
         /*
@@ -278,22 +279,25 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
          * to work in practice.
          */
         case TYPE_POWERSAVER:
-                /* Don't allow wakeup */
-                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0,
-                                  ACPI_MTX_DO_NOT_LOCK);
-                do_powersaver(cx->address, clock_ratio_index);
+                if (longhaul_flags & USE_ACPI_C3) {
+                        /* Don't allow wakeup */
+                        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0,
+                                          ACPI_MTX_DO_NOT_LOCK);
+                        do_powersaver(cx->address, clock_ratio_index);
+                } else {
+                        do_powersaver(0, clock_ratio_index);
+                }
                 break;
         }
 
-        if (pr->flags.bm_control) {
+        if (longhaul_flags & USE_NORTHBRIDGE) {
+                /* Enable arbiters */
+                outb(0, 0x22);
+        } else if ((pr != NULL) && pr->flags.bm_control) {
                 /* Enable bus master arbitration */
                 acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0,
                                   ACPI_MTX_DO_NOT_LOCK);
-        } else if (port22_en) {
-                /* Enable arbiters */
-                outb(0, 0x22);
         }
-
         outb(pic2_mask,0xA1);   /* restore mask */
         outb(pic1_mask,0x21);
 
@@ -314,12 +318,12 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
 
 #define ROUNDING        0xf
 
-static int _guess(int guess)
+static int _guess(int guess, int mult)
 {
         int target;
 
-        target = ((maxmult/10)*guess);
-        if (maxmult%10 != 0)
+        target = ((mult/10)*guess);
+        if (mult%10 != 0)
                 target += (guess/2);
         target += ROUNDING/2;
         target &= ~ROUNDING;
@@ -327,17 +331,17 @@ static int _guess(int guess)
 }
 
 
-static int guess_fsb(void)
+static int guess_fsb(int mult)
 {
         int speed = (cpu_khz/1000);
         int i;
-        int speeds[3] = { 66, 100, 133 };
+        int speeds[] = { 66, 100, 133, 200 };
 
         speed += ROUNDING/2;
         speed &= ~ROUNDING;
 
-        for (i=0; i<3; i++) {
-                if (_guess(speeds[i]) == speed)
+        for (i=0; i<4; i++) {
+                if (_guess(speeds[i], mult) == speed)
                         return speeds[i];
         }
         return 0;
@@ -354,9 +358,7 @@ static int __init longhaul_get_ranges(void)
                         130, 150, 160, 140,  -1, 155,  -1, 145 };
         unsigned int j, k = 0;
         union msr_longhaul longhaul;
-        unsigned long lo, hi;
-        unsigned int eblcr_fsb_table_v1[] = { 66, 133, 100, -1 };
-        unsigned int eblcr_fsb_table_v2[] = { 133, 100, -1, 66 };
+        int mult = 0;
 
         switch (longhaul_version) {
         case TYPE_LONGHAUL_V1:
@@ -364,30 +366,18 @@ static int __init longhaul_get_ranges(void)
                 /* Ugh, Longhaul v1 didn't have the min/max MSRs.
                    Assume min=3.0x & max = whatever we booted at. */
                 minmult = 30;
-                maxmult = longhaul_get_cpu_mult();
-                rdmsr (MSR_IA32_EBL_CR_POWERON, lo, hi);
-                invalue = (lo & (1<<18|1<<19)) >>18;
-                if (cpu_model==CPU_SAMUEL || cpu_model==CPU_SAMUEL2)
-                        fsb = eblcr_fsb_table_v1[invalue];
-                else
-                        fsb = guess_fsb();
+                maxmult = mult = longhaul_get_cpu_mult();
                 break;
 
         case TYPE_POWERSAVER:
                 /* Ezra-T */
                 if (cpu_model==CPU_EZRA_T) {
+                        minmult = 30;
                         rdmsrl (MSR_VIA_LONGHAUL, longhaul.val);
                         invalue = longhaul.bits.MaxMHzBR;
                         if (longhaul.bits.MaxMHzBR4)
                                 invalue += 16;
-                        maxmult=ezra_t_multipliers[invalue];
-
-                        invalue = longhaul.bits.MinMHzBR;
-                        if (longhaul.bits.MinMHzBR4 == 1)
-                                minmult = 30;
-                        else
-                                minmult = ezra_t_multipliers[invalue];
-                        fsb = eblcr_fsb_table_v2[longhaul.bits.MaxMHzFSB];
+                        maxmult = mult = ezra_t_multipliers[invalue];
                         break;
                 }
 
@@ -407,21 +397,16 @@ static int __init longhaul_get_ranges(void)
                          *   But it works, so we don't grumble.
                          */
                         minmult=40;
-                        maxmult=longhaul_get_cpu_mult();
-
-                        /* Starting with the 1.2GHz parts, theres a 200MHz bus. */
-                        if ((cpu_khz/1000) > 1200)
-                                fsb = 200;
-                        else
-                                fsb = eblcr_fsb_table_v2[longhaul.bits.MaxMHzFSB];
+                        maxmult = mult = longhaul_get_cpu_mult();
                         break;
                 }
         }
+        fsb = guess_fsb(mult);
 
         dprintk ("MinMult:%d.%dx MaxMult:%d.%dx\n",
                  minmult/10, minmult%10, maxmult/10, maxmult%10);
 
-        if (fsb == -1) {
+        if (fsb == 0) {
                 printk (KERN_INFO PFX "Invalid (reserved) FSB!\n");
                 return -EINVAL;
         }
@@ -583,6 +568,10 @@ static int enable_arbiter_disable(void)
         if (dev == NULL) {
                 reg = 0x76;
                 dev = pci_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_862X_0, NULL);
+                /* Find CN400 V-Link host bridge */
+                if (dev == NULL)
+                        dev = pci_find_device(PCI_VENDOR_ID_VIA, 0x7259, NULL);
+
         }
         if (dev != NULL) {
                 /* Enable access to port 0x22 */
@@ -687,27 +676,32 @@ static int __init longhaul_cpu_init(struct cpufreq_policy *policy)
         /* Find ACPI data for processor */
         acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
                             &longhaul_walk_callback, NULL, (void *)&pr);
-        if (pr == NULL)
-                goto err_acpi;
 
-        if (longhaul_version == TYPE_POWERSAVER) {
-                /* Check ACPI support for C3 state */
+        /* Check ACPI support for C3 state */
+        if ((pr != NULL) && (longhaul_version == TYPE_POWERSAVER)) {
                 cx = &pr->power.states[ACPI_STATE_C3];
                 if (cx->address > 0 &&
                    (cx->latency <= 1000 || ignore_latency != 0) ) {
+                        longhaul_flags |= USE_ACPI_C3;
                         goto print_support_type;
                 }
         }
+        /* Check if northbridge is friendly */
+        if (enable_arbiter_disable()) {
+                longhaul_flags |= USE_NORTHBRIDGE;
+                goto print_support_type;
+        }
+
+        /* No ACPI C3 or we can't use it */
         /* Check ACPI support for bus master arbiter disable */
-        if (!pr->flags.bm_control) {
-                if (enable_arbiter_disable()) {
-                        port22_en = 1;
-                } else {
-                        goto err_acpi;
-                }
+        if ((pr == NULL) || !(pr->flags.bm_control)) {
+                printk(KERN_ERR PFX
+                        "No ACPI support. Unsupported northbridge.\n");
+                return -ENODEV;
         }
+
 print_support_type:
-        if (!port22_en) {
+        if (!(longhaul_flags & USE_NORTHBRIDGE)) {
                 printk (KERN_INFO PFX "Using ACPI support.\n");
         } else {
                 printk (KERN_INFO PFX "Using northbridge support.\n");
@@ -732,10 +726,6 @@ print_support_type:
         cpufreq_frequency_table_get_attr(longhaul_table, policy->cpu);
 
         return 0;
-
-err_acpi:
-        printk(KERN_ERR PFX "No ACPI support. No VT8601 or VT8623 northbridge. Aborting.\n");
-        return -ENODEV;
 }
 
 static int __devexit longhaul_cpu_exit(struct cpufreq_policy *policy)
@@ -770,8 +760,8 @@ static int __init longhaul_init(void)
 
 #ifdef CONFIG_SMP
         if (num_online_cpus() > 1) {
-                return -ENODEV;
                 printk(KERN_ERR PFX "More than 1 CPU detected, longhaul disabled.\n");
+                return -ENODEV;
         }
 #endif
 #ifdef CONFIG_X86_IO_APIC
@@ -783,8 +773,10 @@ static int __init longhaul_init(void)
         switch (c->x86_model) {
         case 6 ... 9:
                 return cpufreq_register_driver(&longhaul_driver);
+        case 10:
+                printk(KERN_ERR PFX "Use acpi-cpufreq driver for VIA C7\n");
         default:
-                printk (KERN_INFO PFX "Unknown VIA CPU. Contact davej@codemonkey.org.uk\n");
+                ;;
         }
 
         return -ENODEV;
diff --git a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
index 304d2eaa4a1b..bec50170b75a 100644
--- a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
+++ b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
@@ -163,29 +163,27 @@ static int cpufreq_p4_verify(struct cpufreq_policy *policy)
 
 static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
 {
-        if ((c->x86 == 0x06) && (c->x86_model == 0x09)) {
-                /* Pentium M (Banias) */
-                printk(KERN_WARNING PFX "Warning: Pentium M detected. "
-                       "The speedstep_centrino module offers voltage scaling"
-                       " in addition of frequency scaling. You should use "
-                       "that instead of p4-clockmod, if possible.\n");
-                return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PM);
-        }
-
-        if ((c->x86 == 0x06) && (c->x86_model == 0x0D)) {
-                /* Pentium M (Dothan) */
-                printk(KERN_WARNING PFX "Warning: Pentium M detected. "
-                       "The speedstep_centrino module offers voltage scaling"
-                       " in addition of frequency scaling. You should use "
-                       "that instead of p4-clockmod, if possible.\n");
-                /* on P-4s, the TSC runs with constant frequency independent whether
-                 * throttling is active or not. */
-                p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
-                return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PM);
+        if (c->x86 == 0x06) {
+                if (cpu_has(c, X86_FEATURE_EST))
+                        printk(KERN_WARNING PFX "Warning: EST-capable CPU detected. "
+                               "The acpi-cpufreq module offers voltage scaling"
+                               " in addition of frequency scaling. You should use "
+                               "that instead of p4-clockmod, if possible.\n");
+                switch (c->x86_model) {
+                case 0x0E: /* Core */
+                case 0x0F: /* Core Duo */
+                        p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
+                        return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PCORE);
+                case 0x0D: /* Pentium M (Dothan) */
+                        p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
+                        /* fall through */
+                case 0x09: /* Pentium M (Banias) */
+                        return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PM);
+                }
         }
 
         if (c->x86 != 0xF) {
-                printk(KERN_WARNING PFX "Unknown p4-clockmod-capable CPU. Please send an e-mail to <linux@brodo.de>\n");
+                printk(KERN_WARNING PFX "Unknown p4-clockmod-capable CPU. Please send an e-mail to <cpufreq@lists.linux.org.uk>\n");
                 return 0;
         }
 
diff --git a/arch/i386/kernel/cpu/cpufreq/sc520_freq.c b/arch/i386/kernel/cpu/cpufreq/sc520_freq.c
index ef457d50f4ac..b8fb4b521c62 100644
--- a/arch/i386/kernel/cpu/cpufreq/sc520_freq.c
+++ b/arch/i386/kernel/cpu/cpufreq/sc520_freq.c
@@ -153,6 +153,7 @@ static struct cpufreq_driver sc520_freq_driver = {
 static int __init sc520_freq_init(void)
 {
         struct cpuinfo_x86 *c = cpu_data;
+        int err;
 
         /* Test if we have the right hardware */
         if(c->x86_vendor != X86_VENDOR_AMD ||
@@ -166,7 +167,11 @@ static int __init sc520_freq_init(void)
                 return -ENOMEM;
         }
 
-        return cpufreq_register_driver(&sc520_freq_driver);
+        err = cpufreq_register_driver(&sc520_freq_driver);
+        if (err)
+                iounmap(cpuctl);
+
+        return err;
 }
 
 
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
index e8993baf3d14..f43b987f952b 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
@@ -36,6 +36,7 @@
 
 #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "speedstep-centrino", msg)
 
+#define INTEL_MSR_RANGE (0xffff)
 
 struct cpu_id
 {
@@ -379,6 +380,7 @@ static int centrino_cpu_early_init_acpi(void)
 }
 
 
+#ifdef CONFIG_SMP
 /*
  * Some BIOSes do SW_ANY coordination internally, either set it up in hw
  * or do it in BIOS firmware and won't inform about it to OS. If not
@@ -392,7 +394,6 @@ static int sw_any_bug_found(struct dmi_system_id *d)
         return 0;
 }
 
-
 static struct dmi_system_id sw_any_bug_dmi_table[] = {
         {
                 .callback = sw_any_bug_found,
@@ -405,7 +406,7 @@ static struct dmi_system_id sw_any_bug_dmi_table[] = {
         },
         { }
 };
-
+#endif
 
 /*
  * centrino_cpu_init_acpi - register with ACPI P-States library
@@ -463,8 +464,9 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)
         }
 
         for (i=0; i<p->state_count; i++) {
-                if (p->states[i].control != p->states[i].status) {
-                        dprintk("Different control (%llu) and status values (%llu)\n",
+                if ((p->states[i].control & INTEL_MSR_RANGE) !=
+                    (p->states[i].status & INTEL_MSR_RANGE)) {
+                        dprintk("Different MSR bits in control (%llu) and status (%llu)\n",
                                 p->states[i].control, p->states[i].status);
                         result = -EINVAL;
                         goto err_unreg;
@@ -500,7 +502,7 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)
         }
 
         for (i=0; i<p->state_count; i++) {
-                centrino_model[cpu]->op_points[i].index = p->states[i].control;
+                centrino_model[cpu]->op_points[i].index = p->states[i].control & INTEL_MSR_RANGE;
                 centrino_model[cpu]->op_points[i].frequency = p->states[i].core_frequency * 1000;
                 dprintk("adding state %i with frequency %u and control value %04x\n", 
                         i, centrino_model[cpu]->op_points[i].frequency, centrino_model[cpu]->op_points[i].index);
@@ -531,6 +533,9 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)
 
         /* notify BIOS that we exist */
         acpi_processor_notify_smm(THIS_MODULE);
+        printk("speedstep-centrino with X86_SPEEDSTEP_CENTRINO_ACPI "
+               "config is deprecated.\n "
+               "Use X86_ACPI_CPUFREQ (acpi-cpufreq) instead.\n" );
 
         return 0;
 
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c b/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
index 4f46cac155c4..d59277c00911 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
@@ -123,6 +123,36 @@ static unsigned int pentiumM_get_frequency(void)
         return (msr_tmp * 100 * 1000);
 }
 
+static unsigned int pentium_core_get_frequency(void)
+{
+        u32 fsb = 0;
+        u32 msr_lo, msr_tmp;
+
+        rdmsr(MSR_FSB_FREQ, msr_lo, msr_tmp);
+        /* see table B-2 of 25366920.pdf */
+        switch (msr_lo & 0x07) {
+        case 5:
+                fsb = 100000;
+                break;
+        case 1:
+                fsb = 133333;
+                break;
+        case 3:
+                fsb = 166667;
+                break;
+        default:
+                printk(KERN_ERR "PCORE - MSR_FSB_FREQ undefined value");
+        }
+
+        rdmsr(MSR_IA32_EBL_CR_POWERON, msr_lo, msr_tmp);
+        dprintk("PCORE - MSR_IA32_EBL_CR_POWERON: 0x%x 0x%x\n", msr_lo, msr_tmp);
+
+        msr_tmp = (msr_lo >> 22) & 0x1f;
+        dprintk("bits 22-26 are 0x%x, speed is %u\n", msr_tmp, (msr_tmp * fsb));
+
+        return (msr_tmp * fsb);
+}
+
 
 static unsigned int pentium4_get_frequency(void)
 {
@@ -174,6 +204,8 @@ static unsigned int pentium4_get_frequency(void)
 unsigned int speedstep_get_processor_frequency(unsigned int processor)
 {
         switch (processor) {
+        case SPEEDSTEP_PROCESSOR_PCORE:
+                return pentium_core_get_frequency();
         case SPEEDSTEP_PROCESSOR_PM:
                 return pentiumM_get_frequency();
         case SPEEDSTEP_PROCESSOR_P4D:
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.h b/arch/i386/kernel/cpu/cpufreq/speedstep-lib.h
index b735429c50b4..b11bcc608cac 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.h
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-lib.h
@@ -22,6 +22,7 @@
  * the speedstep_get_processor_frequency() call. */
 #define SPEEDSTEP_PROCESSOR_PM                  0xFFFFFF03  /* Pentium M  */
 #define SPEEDSTEP_PROCESSOR_P4D                 0xFFFFFF04  /* desktop P4  */
+#define SPEEDSTEP_PROCESSOR_PCORE               0xFFFFFF05  /* Core */
 
 /* speedstep states -- only two of them */
 
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c b/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
index c28333d53646..ff0d89806114 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
@@ -360,9 +360,6 @@ static int __init speedstep_init(void)
         case SPEEDSTEP_PROCESSOR_PIII_C:
         case SPEEDSTEP_PROCESSOR_PIII_C_EARLY:
                 break;
-        case SPEEDSTEP_PROCESSOR_P4M:
-                printk(KERN_INFO "speedstep-smi: you're trying to use this cpufreq driver on a Pentium 4-based CPU. Most likely it will not work.\n");
-                break;
         default:
                 speedstep_processor = 0;
         }
diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c
index c0c3b59de32c..abcff92f994c 100644
--- a/arch/i386/kernel/cpu/cyrix.c
+++ b/arch/i386/kernel/cpu/cyrix.c
@@ -173,7 +173,7 @@ static void __cpuinit geode_configure(void)
         ccr4 = getCx86(CX86_CCR4);
         ccr4 |= 0x38;           /* FPU fast, DTE cache, Mem bypass */
         
-        setCx86(CX86_CCR3, ccr3);
+        setCx86(CX86_CCR4, ccr4);
         
         set_cx86_memwb();
         set_cx86_reorder();     
diff --git a/arch/i386/kernel/cpu/intel.c b/arch/i386/kernel/cpu/intel.c
index 94a95aa5227e..56fe26584957 100644
--- a/arch/i386/kernel/cpu/intel.c
+++ b/arch/i386/kernel/cpu/intel.c
@@ -107,7 +107,7 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
          * Note that the workaround only should be initialized once...
          */
         c->f00f_bug = 0;
-        if ( c->x86 == 5 ) {
+        if (!paravirt_enabled() && c->x86 == 5) {
                 static int f00f_workaround_enabled = 0;
 
                 c->f00f_bug = 1;
@@ -195,8 +195,16 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
         if ((c->x86 == 0xf && c->x86_model >= 0x03) ||
                 (c->x86 == 0x6 && c->x86_model >= 0x0e))
                 set_bit(X86_FEATURE_CONSTANT_TSC, c->x86_capability);
-}
 
+        if (cpu_has_ds) {
+                unsigned int l1;
+                rdmsr(MSR_IA32_MISC_ENABLE, l1, l2);
+                if (!(l1 & (1<<11)))
+                        set_bit(X86_FEATURE_BTS, c->x86_capability);
+                if (!(l1 & (1<<12)))
+                        set_bit(X86_FEATURE_PEBS, c->x86_capability);
+        }
+}
 
 static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 * c, unsigned int size)
 {
diff --git a/arch/i386/kernel/cpu/intel_cacheinfo.c b/arch/i386/kernel/cpu/intel_cacheinfo.c
index 5c43be47587f..80b4c5d421b1 100644
--- a/arch/i386/kernel/cpu/intel_cacheinfo.c
+++ b/arch/i386/kernel/cpu/intel_cacheinfo.c
@@ -480,12 +480,10 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu)
         if (num_cache_leaves == 0)
                 return -ENOENT;
 
-        cpuid4_info[cpu] = kmalloc(
+        cpuid4_info[cpu] = kzalloc(
             sizeof(struct _cpuid4_info) * num_cache_leaves, GFP_KERNEL);
         if (unlikely(cpuid4_info[cpu] == NULL))
                 return -ENOMEM;
-        memset(cpuid4_info[cpu], 0,
-            sizeof(struct _cpuid4_info) * num_cache_leaves);
 
         oldmask = current->cpus_allowed;
         retval = set_cpus_allowed(current, cpumask_of_cpu(cpu));
@@ -658,17 +656,14 @@ static int __cpuinit cpuid4_cache_sysfs_init(unsigned int cpu)
                 return -ENOENT;
 
         /* Allocate all required memory */
-        cache_kobject[cpu] = kmalloc(sizeof(struct kobject), GFP_KERNEL);
+        cache_kobject[cpu] = kzalloc(sizeof(struct kobject), GFP_KERNEL);
         if (unlikely(cache_kobject[cpu] == NULL))
                 goto err_out;
-        memset(cache_kobject[cpu], 0, sizeof(struct kobject));
 
-        index_kobject[cpu] = kmalloc(
+        index_kobject[cpu] = kzalloc(
             sizeof(struct _index_kobject ) * num_cache_leaves, GFP_KERNEL);
         if (unlikely(index_kobject[cpu] == NULL))
                 goto err_out;
-        memset(index_kobject[cpu], 0,
-            sizeof(struct _index_kobject) * num_cache_leaves);
 
         return 0;
 
diff --git a/arch/i386/kernel/cpu/mcheck/non-fatal.c b/arch/i386/kernel/cpu/mcheck/non-fatal.c
index 1f9153ae5b03..6b5d3518a1c0 100644
--- a/arch/i386/kernel/cpu/mcheck/non-fatal.c
+++ b/arch/i386/kernel/cpu/mcheck/non-fatal.c
@@ -51,10 +51,10 @@ static void mce_checkregs (void *info)
         }
 }
 
-static void mce_work_fn(void *data);
-static DECLARE_WORK(mce_work, mce_work_fn, NULL);
+static void mce_work_fn(struct work_struct *work);
+static DECLARE_DELAYED_WORK(mce_work, mce_work_fn);
 
-static void mce_work_fn(void *data)
+static void mce_work_fn(struct work_struct *work)
 { 
         on_each_cpu(mce_checkregs, NULL, 1, 1);
         schedule_delayed_work(&mce_work, MCE_RATE);
diff --git a/arch/i386/kernel/cpu/mcheck/therm_throt.c b/arch/i386/kernel/cpu/mcheck/therm_throt.c
index 2d8703b7ce65..065005c3f168 100644
--- a/arch/i386/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/i386/kernel/cpu/mcheck/therm_throt.c
@@ -20,6 +20,7 @@
 #include <linux/cpu.h>
 #include <asm/cpu.h>
 #include <linux/notifier.h>
+#include <linux/jiffies.h>
 #include <asm/therm_throt.h>
 
 /* How long to wait between reporting thermal events */
@@ -115,7 +116,6 @@ static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev)
         return sysfs_create_group(&sys_dev->kobj, &thermal_throttle_attr_group);
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
 static __cpuinit void thermal_throttle_remove_dev(struct sys_device *sys_dev)
 {
         return sysfs_remove_group(&sys_dev->kobj, &thermal_throttle_attr_group);
@@ -152,7 +152,6 @@ static struct notifier_block thermal_throttle_cpu_notifier =
 {
         .notifier_call = thermal_throttle_cpu_callback,
 };
-#endif /* CONFIG_HOTPLUG_CPU */
 
 static __init int thermal_throttle_init_device(void)
 {
diff --git a/arch/i386/kernel/cpu/mtrr/Makefile b/arch/i386/kernel/cpu/mtrr/Makefile
index a25b701ab84e..191fc0533649 100644
--- a/arch/i386/kernel/cpu/mtrr/Makefile
+++ b/arch/i386/kernel/cpu/mtrr/Makefile
@@ -1,5 +1,3 @@
 obj-y           := main.o if.o generic.o state.o
-obj-y           += amd.o
-obj-y           += cyrix.o
-obj-y           += centaur.o
+obj-$(CONFIG_X86_32) += amd.o cyrix.o centaur.o
 
diff --git a/arch/i386/kernel/cpu/mtrr/amd.c b/arch/i386/kernel/cpu/mtrr/amd.c
index 1a1e04b6fd00..0949cdbf848a 100644
--- a/arch/i386/kernel/cpu/mtrr/amd.c
+++ b/arch/i386/kernel/cpu/mtrr/amd.c
@@ -7,7 +7,7 @@
 
 static void
 amd_get_mtrr(unsigned int reg, unsigned long *base,
-             unsigned int *size, mtrr_type * type)
+             unsigned long *size, mtrr_type * type)
 {
         unsigned long low, high;
 
diff --git a/arch/i386/kernel/cpu/mtrr/centaur.c b/arch/i386/kernel/cpu/mtrr/centaur.c
index 33f00ac314ef..cb9aa3a7a7ab 100644
--- a/arch/i386/kernel/cpu/mtrr/centaur.c
+++ b/arch/i386/kernel/cpu/mtrr/centaur.c
@@ -17,7 +17,7 @@ static u8 centaur_mcr_type;	/* 0 for winchip, 1 for winchip2 */
  */
 
 static int
-centaur_get_free_region(unsigned long base, unsigned long size)
+centaur_get_free_region(unsigned long base, unsigned long size, int replace_reg)
 /*  [SUMMARY] Get a free MTRR.
     <base> The starting (base) address of the region.
     <size> The size (in bytes) of the region.
@@ -26,10 +26,11 @@ centaur_get_free_region(unsigned long base, unsigned long size)
 {
         int i, max;
         mtrr_type ltype;
-        unsigned long lbase;
-        unsigned int lsize;
+        unsigned long lbase, lsize;
 
         max = num_var_ranges;
+        if (replace_reg >= 0 && replace_reg < max)
+                return replace_reg;
         for (i = 0; i < max; ++i) {
                 if (centaur_mcr_reserved & (1 << i))
                         continue;
@@ -49,7 +50,7 @@ mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi)
 
 static void
 centaur_get_mcr(unsigned int reg, unsigned long *base,
-                unsigned int *size, mtrr_type * type)
+                unsigned long *size, mtrr_type * type)
 {
         *base = centaur_mcr[reg].high >> PAGE_SHIFT;
         *size = -(centaur_mcr[reg].low & 0xfffff000) >> PAGE_SHIFT;
diff --git a/arch/i386/kernel/cpu/mtrr/cyrix.c b/arch/i386/kernel/cpu/mtrr/cyrix.c
index 9027a987006b..0737a596db43 100644
--- a/arch/i386/kernel/cpu/mtrr/cyrix.c
+++ b/arch/i386/kernel/cpu/mtrr/cyrix.c
@@ -9,7 +9,7 @@ int arr3_protected;
 
 static void
 cyrix_get_arr(unsigned int reg, unsigned long *base,
-              unsigned int *size, mtrr_type * type)
+              unsigned long *size, mtrr_type * type)
 {
         unsigned long flags;
         unsigned char arr, ccr3, rcr, shift;
@@ -77,7 +77,7 @@ cyrix_get_arr(unsigned int reg, unsigned long *base,
 }
 
 static int
-cyrix_get_free_region(unsigned long base, unsigned long size)
+cyrix_get_free_region(unsigned long base, unsigned long size, int replace_reg)
 /*  [SUMMARY] Get a free ARR.
     <base> The starting (base) address of the region.
     <size> The size (in bytes) of the region.
@@ -86,9 +86,24 @@ cyrix_get_free_region(unsigned long base, unsigned long size)
 {
         int i;
         mtrr_type ltype;
-        unsigned long lbase;
-        unsigned int  lsize;
+        unsigned long lbase, lsize;
 
+        switch (replace_reg) {
+        case 7:
+                if (size < 0x40)
+                        break;
+        case 6:
+        case 5:
+        case 4:
+                return replace_reg;
+        case 3:
+                if (arr3_protected)
+                        break;
+        case 2:
+        case 1:
+        case 0:
+                return replace_reg;
+        }
         /* If we are to set up a region >32M then look at ARR7 immediately */
         if (size > 0x2000) {
                 cyrix_get_arr(7, &lbase, &lsize, &ltype);
@@ -214,7 +229,7 @@ static void cyrix_set_arr(unsigned int reg, unsigned long base,
 
 typedef struct {
         unsigned long base;
-        unsigned int size;
+        unsigned long size;
         mtrr_type type;
 } arr_state_t;
 
diff --git a/arch/i386/kernel/cpu/mtrr/generic.c b/arch/i386/kernel/cpu/mtrr/generic.c
index 0b61eed8bbd8..f77fc53db654 100644
--- a/arch/i386/kernel/cpu/mtrr/generic.c
+++ b/arch/i386/kernel/cpu/mtrr/generic.c
@@ -3,6 +3,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
+#include <linux/module.h>
 #include <asm/io.h>
 #include <asm/mtrr.h>
 #include <asm/msr.h>
@@ -15,12 +16,19 @@ struct mtrr_state {
         struct mtrr_var_range *var_ranges;
         mtrr_type fixed_ranges[NUM_FIXED_RANGES];
         unsigned char enabled;
+        unsigned char have_fixed;
         mtrr_type def_type;
 };
 
 static unsigned long smp_changes_mask;
 static struct mtrr_state mtrr_state = {};
 
+#undef MODULE_PARAM_PREFIX
+#define MODULE_PARAM_PREFIX "mtrr."
+
+static __initdata int mtrr_show;
+module_param_named(show, mtrr_show, bool, 0);
+
 /*  Get the MSR pair relating to a var range  */
 static void __init
 get_mtrr_var_range(unsigned int index, struct mtrr_var_range *vr)
@@ -43,6 +51,14 @@ get_fixed_ranges(mtrr_type * frs)
                 rdmsr(MTRRfix4K_C0000_MSR + i, p[6 + i * 2], p[7 + i * 2]);
 }
 
+static void __init print_fixed(unsigned base, unsigned step, const mtrr_type*types)
+{
+        unsigned i;
+
+        for (i = 0; i < 8; ++i, ++types, base += step)
+                printk(KERN_INFO "MTRR %05X-%05X %s\n", base, base + step - 1, mtrr_attrib_to_str(*types));
+}
+
 /*  Grab all of the MTRR state for this CPU into *state  */
 void __init get_mtrr_state(void)
 {
@@ -58,13 +74,49 @@ void __init get_mtrr_state(void)
         } 
         vrs = mtrr_state.var_ranges;
 
+        rdmsr(MTRRcap_MSR, lo, dummy);
+        mtrr_state.have_fixed = (lo >> 8) & 1;
+
         for (i = 0; i < num_var_ranges; i++)
                 get_mtrr_var_range(i, &vrs[i]);
-        get_fixed_ranges(mtrr_state.fixed_ranges);
+        if (mtrr_state.have_fixed)
+                get_fixed_ranges(mtrr_state.fixed_ranges);
 
         rdmsr(MTRRdefType_MSR, lo, dummy);
         mtrr_state.def_type = (lo & 0xff);
         mtrr_state.enabled = (lo & 0xc00) >> 10;
+
+        if (mtrr_show) {
+                int high_width;
+
+                printk(KERN_INFO "MTRR default type: %s\n", mtrr_attrib_to_str(mtrr_state.def_type));
+                if (mtrr_state.have_fixed) {
+                        printk(KERN_INFO "MTRR fixed ranges %sabled:\n",
+                               mtrr_state.enabled & 1 ? "en" : "dis");
+                        print_fixed(0x00000, 0x10000, mtrr_state.fixed_ranges + 0);
+                        for (i = 0; i < 2; ++i)
+                                print_fixed(0x80000 + i * 0x20000, 0x04000, mtrr_state.fixed_ranges + (i + 1) * 8);
+                        for (i = 0; i < 8; ++i)
+                                print_fixed(0xC0000 + i * 0x08000, 0x01000, mtrr_state.fixed_ranges + (i + 3) * 8);
+                }
+                printk(KERN_INFO "MTRR variable ranges %sabled:\n",
+                       mtrr_state.enabled & 2 ? "en" : "dis");
+                high_width = ((size_or_mask ? ffs(size_or_mask) - 1 : 32) - (32 - PAGE_SHIFT) + 3) / 4;
+                for (i = 0; i < num_var_ranges; ++i) {
+                        if (mtrr_state.var_ranges[i].mask_lo & (1 << 11))
+                                printk(KERN_INFO "MTRR %u base %0*X%05X000 mask %0*X%05X000 %s\n",
+                                       i,
+                                       high_width,
+                                       mtrr_state.var_ranges[i].base_hi,
+                                       mtrr_state.var_ranges[i].base_lo >> 12,
+                                       high_width,
+                                       mtrr_state.var_ranges[i].mask_hi,
+                                       mtrr_state.var_ranges[i].mask_lo >> 12,
+                                       mtrr_attrib_to_str(mtrr_state.var_ranges[i].base_lo & 0xff));
+                        else
+                                printk(KERN_INFO "MTRR %u disabled\n", i);
+                }
+        }
 }
 
 /*  Some BIOS's are fucked and don't set all MTRRs the same!  */
@@ -95,7 +147,7 @@ void mtrr_wrmsr(unsigned msr, unsigned a, unsigned b)
                         smp_processor_id(), msr, a, b);
 }
 
-int generic_get_free_region(unsigned long base, unsigned long size)
+int generic_get_free_region(unsigned long base, unsigned long size, int replace_reg)
 /*  [SUMMARY] Get a free MTRR.
     <base> The starting (base) address of the region.
     <size> The size (in bytes) of the region.
@@ -104,10 +156,11 @@ int generic_get_free_region(unsigned long base, unsigned long size)
 {
         int i, max;
         mtrr_type ltype;
-        unsigned long lbase;
-        unsigned lsize;
+        unsigned long lbase, lsize;
 
         max = num_var_ranges;
+        if (replace_reg >= 0 && replace_reg < max)
+                return replace_reg;
         for (i = 0; i < max; ++i) {
                 mtrr_if->get(i, &lbase, &lsize, &ltype);
                 if (lsize == 0)
@@ -117,7 +170,7 @@ int generic_get_free_region(unsigned long base, unsigned long size)
 }
 
 static void generic_get_mtrr(unsigned int reg, unsigned long *base,
-                             unsigned int *size, mtrr_type * type)
+                             unsigned long *size, mtrr_type *type)
 {
         unsigned int mask_lo, mask_hi, base_lo, base_hi;
 
@@ -202,7 +255,9 @@ static int set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr)
         return changed;
 }
 
-static unsigned long set_mtrr_state(u32 deftype_lo, u32 deftype_hi)
+static u32 deftype_lo, deftype_hi;
+
+static unsigned long set_mtrr_state(void)
 /*  [SUMMARY] Set the MTRR state for this CPU.
     <state> The MTRR state information to read.
     <ctxt> Some relevant CPU context.
@@ -217,14 +272,14 @@ static unsigned long set_mtrr_state(u32 deftype_lo, u32 deftype_hi)
                 if (set_mtrr_var_ranges(i, &mtrr_state.var_ranges[i]))
                         change_mask |= MTRR_CHANGE_MASK_VARIABLE;
 
-        if (set_fixed_ranges(mtrr_state.fixed_ranges))
+        if (mtrr_state.have_fixed && set_fixed_ranges(mtrr_state.fixed_ranges))
                 change_mask |= MTRR_CHANGE_MASK_FIXED;
 
         /*  Set_mtrr_restore restores the old value of MTRRdefType,
            so to set it we fiddle with the saved value  */
         if ((deftype_lo & 0xff) != mtrr_state.def_type
             || ((deftype_lo & 0xc00) >> 10) != mtrr_state.enabled) {
-                deftype_lo |= (mtrr_state.def_type | mtrr_state.enabled << 10);
+                deftype_lo = (deftype_lo & ~0xcff) | mtrr_state.def_type | (mtrr_state.enabled << 10);
                 change_mask |= MTRR_CHANGE_MASK_DEFTYPE;
         }
 
@@ -233,7 +288,6 @@ static unsigned long set_mtrr_state(u32 deftype_lo, u32 deftype_hi)
 
 
 static unsigned long cr4 = 0;
-static u32 deftype_lo, deftype_hi;
 static DEFINE_SPINLOCK(set_atomicity_lock);
 
 /*
@@ -271,7 +325,7 @@ static void prepare_set(void) __acquires(set_atomicity_lock)
         rdmsr(MTRRdefType_MSR, deftype_lo, deftype_hi);
 
         /*  Disable MTRRs, and set the default type to uncached  */
-        mtrr_wrmsr(MTRRdefType_MSR, deftype_lo & 0xf300UL, deftype_hi);
+        mtrr_wrmsr(MTRRdefType_MSR, deftype_lo & ~0xcff, deftype_hi);
 }
 
 static void post_set(void) __releases(set_atomicity_lock)
@@ -300,7 +354,7 @@ static void generic_set_all(void)
         prepare_set();
 
         /* Actually set the state */
-        mask = set_mtrr_state(deftype_lo,deftype_hi);
+        mask = set_mtrr_state();
 
         post_set();
         local_irq_restore(flags);
@@ -366,7 +420,7 @@ int generic_validate_add_page(unsigned long base, unsigned long size, unsigned i
                         printk(KERN_WARNING "mtrr: base(0x%lx000) is not 4 MiB aligned\n", base);
                         return -EINVAL;
                 }
-                if (!(base + size < 0x70000000 || base > 0x7003FFFF) &&
+                if (!(base + size < 0x70000 || base > 0x7003F) &&
                     (type == MTRR_TYPE_WRCOMB
                      || type == MTRR_TYPE_WRBACK)) {
                         printk(KERN_WARNING "mtrr: writable mtrr between 0x70000000 and 0x7003FFFF may hang the CPU.\n");
diff --git a/arch/i386/kernel/cpu/mtrr/if.c b/arch/i386/kernel/cpu/mtrr/if.c
index 5ac051bb9d55..5ae1705eafa6 100644
--- a/arch/i386/kernel/cpu/mtrr/if.c
+++ b/arch/i386/kernel/cpu/mtrr/if.c
@@ -17,7 +17,7 @@ extern unsigned int *usage_table;
 
 #define FILE_FCOUNT(f) (((struct seq_file *)((f)->private_data))->private)
 
-static char *mtrr_strings[MTRR_NUM_TYPES] =
+static const char *const mtrr_strings[MTRR_NUM_TYPES] =
 {
     "uncachable",               /* 0 */
     "write-combining",          /* 1 */
@@ -28,7 +28,7 @@ static char *mtrr_strings[MTRR_NUM_TYPES] =
     "write-back",               /* 6 */
 };
 
-char *mtrr_attrib_to_str(int x)
+const char *mtrr_attrib_to_str(int x)
 {
         return (x <= 6) ? mtrr_strings[x] : "?";
 }
@@ -44,10 +44,9 @@ mtrr_file_add(unsigned long base, unsigned long size,
 
         max = num_var_ranges;
         if (fcount == NULL) {
-                fcount = kmalloc(max * sizeof *fcount, GFP_KERNEL);
+                fcount = kzalloc(max * sizeof *fcount, GFP_KERNEL);
                 if (!fcount)
                         return -ENOMEM;
-                memset(fcount, 0, max * sizeof *fcount);
                 FILE_FCOUNT(file) = fcount;
         }
         if (!page) {
@@ -155,6 +154,7 @@ mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg)
 {
         int err = 0;
         mtrr_type type;
+        unsigned long size;
         struct mtrr_sentry sentry;
         struct mtrr_gentry gentry;
         void __user *arg = (void __user *) __arg;
@@ -235,15 +235,15 @@ mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg)
         case MTRRIOC_GET_ENTRY:
                 if (gentry.regnum >= num_var_ranges)
                         return -EINVAL;
-                mtrr_if->get(gentry.regnum, &gentry.base, &gentry.size, &type);
+                mtrr_if->get(gentry.regnum, &gentry.base, &size, &type);
 
                 /* Hide entries that go above 4GB */
-                if (gentry.base + gentry.size > 0x100000
-                    || gentry.size == 0x100000)
+                if (gentry.base + size - 1 >= (1UL << (8 * sizeof(gentry.size) - PAGE_SHIFT))
+                    || size >= (1UL << (8 * sizeof(gentry.size) - PAGE_SHIFT)))
                         gentry.base = gentry.size = gentry.type = 0;
                 else {
                         gentry.base <<= PAGE_SHIFT;
-                        gentry.size <<= PAGE_SHIFT;
+                        gentry.size = size << PAGE_SHIFT;
                         gentry.type = type;
                 }
 
@@ -273,8 +273,14 @@ mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg)
         case MTRRIOC_GET_PAGE_ENTRY:
                 if (gentry.regnum >= num_var_ranges)
                         return -EINVAL;
-                mtrr_if->get(gentry.regnum, &gentry.base, &gentry.size, &type);
-                gentry.type = type;
+                mtrr_if->get(gentry.regnum, &gentry.base, &size, &type);
+                /* Hide entries that would overflow */
+                if (size != (__typeof__(gentry.size))size)
+                        gentry.base = gentry.size = gentry.type = 0;
+                else {
+                        gentry.size = size;
+                        gentry.type = type;
+                }
                 break;
         }
 
@@ -353,8 +359,7 @@ static int mtrr_seq_show(struct seq_file *seq, void *offset)
         char factor;
         int i, max, len;
         mtrr_type type;
-        unsigned long base;
-        unsigned int size;
+        unsigned long base, size;
 
         len = 0;
         max = num_var_ranges;
@@ -373,7 +378,7 @@ static int mtrr_seq_show(struct seq_file *seq, void *offset)
                         }
                         /* RED-PEN: base can be > 32bit */ 
                         len += seq_printf(seq, 
-                                   "reg%02i: base=0x%05lx000 (%4liMB), size=%4i%cB: %s, count=%d\n",
+                                   "reg%02i: base=0x%05lx000 (%4luMB), size=%4lu%cB: %s, count=%d\n",
                              i, base, base >> (20 - PAGE_SHIFT), size, factor,
                              mtrr_attrib_to_str(type), usage_table[i]);
                 }
diff --git a/arch/i386/kernel/cpu/mtrr/main.c b/arch/i386/kernel/cpu/mtrr/main.c
index fff90bda4733..16bb7ea87145 100644
--- a/arch/i386/kernel/cpu/mtrr/main.c
+++ b/arch/i386/kernel/cpu/mtrr/main.c
@@ -59,7 +59,11 @@ struct mtrr_ops * mtrr_if = NULL;
 static void set_mtrr(unsigned int reg, unsigned long base,
                      unsigned long size, mtrr_type type);
 
+#ifndef CONFIG_X86_64
 extern int arr3_protected;
+#else
+#define arr3_protected 0
+#endif
 
 void set_mtrr_ops(struct mtrr_ops * ops)
 {
@@ -168,6 +172,13 @@ static void ipi_handler(void *info)
 
 #endif
 
+static inline int types_compatible(mtrr_type type1, mtrr_type type2) {
+        return type1 == MTRR_TYPE_UNCACHABLE ||
+               type2 == MTRR_TYPE_UNCACHABLE ||
+               (type1 == MTRR_TYPE_WRTHROUGH && type2 == MTRR_TYPE_WRBACK) ||
+               (type1 == MTRR_TYPE_WRBACK && type2 == MTRR_TYPE_WRTHROUGH);
+}
+
 /**
  * set_mtrr - update mtrrs on all processors
  * @reg:        mtrr in question
@@ -263,8 +274,8 @@ static void set_mtrr(unsigned int reg, unsigned long base,
 
 /**
  *      mtrr_add_page - Add a memory type region
- *      @base: Physical base address of region in pages (4 KB)
- *      @size: Physical size of region in pages (4 KB)
+ *      @base: Physical base address of region in pages (in units of 4 kB!)
+ *      @size: Physical size of region in pages (4 kB)
  *      @type: Type of MTRR desired
  *      @increment: If this is true do usage counting on the region
  *
@@ -300,11 +311,9 @@ static void set_mtrr(unsigned int reg, unsigned long base,
 int mtrr_add_page(unsigned long base, unsigned long size, 
                   unsigned int type, char increment)
 {
-        int i;
+        int i, replace, error;
         mtrr_type ltype;
-        unsigned long lbase;
-        unsigned int lsize;
-        int error;
+        unsigned long lbase, lsize;
 
         if (!mtrr_if)
                 return -ENXIO;
@@ -324,12 +333,18 @@ int mtrr_add_page(unsigned long base, unsigned long size,
                 return -ENOSYS;
         }
 
+        if (!size) {
+                printk(KERN_WARNING "mtrr: zero sized request\n");
+                return -EINVAL;
+        }
+
         if (base & size_or_mask || size & size_or_mask) {
                 printk(KERN_WARNING "mtrr: base or size exceeds the MTRR width\n");
                 return -EINVAL;
         }
 
         error = -EINVAL;
+        replace = -1;
 
         /* No CPU hotplug when we change MTRR entries */
         lock_cpu_hotplug();
@@ -337,21 +352,28 @@ int mtrr_add_page(unsigned long base, unsigned long size,
         mutex_lock(&mtrr_mutex);
         for (i = 0; i < num_var_ranges; ++i) {
                 mtrr_if->get(i, &lbase, &lsize, &ltype);
-                if (base >= lbase + lsize)
-                        continue;
-                if ((base < lbase) && (base + size <= lbase))
+                if (!lsize || base > lbase + lsize - 1 || base + size - 1 < lbase)
                         continue;
                 /*  At this point we know there is some kind of overlap/enclosure  */
-                if ((base < lbase) || (base + size > lbase + lsize)) {
+                if (base < lbase || base + size - 1 > lbase + lsize - 1) {
+                        if (base <= lbase && base + size - 1 >= lbase + lsize - 1) {
+                                /*  New region encloses an existing region  */
+                                if (type == ltype) {
+                                        replace = replace == -1 ? i : -2;
+                                        continue;
+                                }
+                                else if (types_compatible(type, ltype))
+                                        continue;
+                        }
                         printk(KERN_WARNING
                                "mtrr: 0x%lx000,0x%lx000 overlaps existing"
-                               " 0x%lx000,0x%x000\n", base, size, lbase,
+                               " 0x%lx000,0x%lx000\n", base, size, lbase,
                                lsize);
                         goto out;
                 }
                 /*  New region is enclosed by an existing region  */
                 if (ltype != type) {
-                        if (type == MTRR_TYPE_UNCACHABLE)
+                        if (types_compatible(type, ltype))
                                 continue;
                         printk (KERN_WARNING "mtrr: type mismatch for %lx000,%lx000 old: %s new: %s\n",
                              base, size, mtrr_attrib_to_str(ltype),
@@ -364,10 +386,18 @@ int mtrr_add_page(unsigned long base, unsigned long size,
                 goto out;
         }
         /*  Search for an empty MTRR  */
-        i = mtrr_if->get_free_region(base, size);
+        i = mtrr_if->get_free_region(base, size, replace);
         if (i >= 0) {
                 set_mtrr(i, base, size, type);
-                usage_table[i] = 1;
+                if (likely(replace < 0))
+                        usage_table[i] = 1;
+                else {
+                        usage_table[i] = usage_table[replace] + !!increment;
+                        if (unlikely(replace != i)) {
+                                set_mtrr(replace, 0, 0, 0);
+                                usage_table[replace] = 0;
+                        }
+                }
         } else
                 printk(KERN_INFO "mtrr: no more MTRRs available\n");
         error = i;
@@ -455,8 +485,7 @@ int mtrr_del_page(int reg, unsigned long base, unsigned long size)
 {
         int i, max;
         mtrr_type ltype;
-        unsigned long lbase;
-        unsigned int lsize;
+        unsigned long lbase, lsize;
         int error = -EINVAL;
 
         if (!mtrr_if)
@@ -544,9 +573,11 @@ extern void centaur_init_mtrr(void);
 
 static void __init init_ifs(void)
 {
+#ifndef CONFIG_X86_64
         amd_init_mtrr();
         cyrix_init_mtrr();
         centaur_init_mtrr();
+#endif
 }
 
 /* The suspend/resume methods are only for CPU without MTRR. CPU using generic
@@ -555,7 +586,7 @@ static void __init init_ifs(void)
 struct mtrr_value {
         mtrr_type       ltype;
         unsigned long   lbase;
-        unsigned int    lsize;
+        unsigned long   lsize;
 };
 
 static struct mtrr_value * mtrr_state;
@@ -565,10 +596,8 @@ static int mtrr_save(struct sys_device * sysdev, pm_message_t state)
         int i;
         int size = num_var_ranges * sizeof(struct mtrr_value);
 
-        mtrr_state = kmalloc(size,GFP_ATOMIC);
-        if (mtrr_state)
-                memset(mtrr_state,0,size);
-        else
+        mtrr_state = kzalloc(size,GFP_ATOMIC);
+        if (!mtrr_state)
                 return -ENOMEM;
 
         for (i = 0; i < num_var_ranges; i++) {
diff --git a/arch/i386/kernel/cpu/mtrr/mtrr.h b/arch/i386/kernel/cpu/mtrr/mtrr.h
index 99c9f2682041..d61ea9db6cfe 100644
--- a/arch/i386/kernel/cpu/mtrr/mtrr.h
+++ b/arch/i386/kernel/cpu/mtrr/mtrr.h
@@ -43,15 +43,16 @@ struct mtrr_ops {
         void    (*set_all)(void);
 
         void    (*get)(unsigned int reg, unsigned long *base,
-                       unsigned int *size, mtrr_type * type);
-        int     (*get_free_region) (unsigned long base, unsigned long size);
-
+                       unsigned long *size, mtrr_type * type);
+        int     (*get_free_region)(unsigned long base, unsigned long size,
+                                   int replace_reg);
         int     (*validate_add_page)(unsigned long base, unsigned long size,
                                      unsigned int type);
         int     (*have_wrcomb)(void);
 };
 
-extern int generic_get_free_region(unsigned long base, unsigned long size);
+extern int generic_get_free_region(unsigned long base, unsigned long size,
+                                   int replace_reg);
 extern int generic_validate_add_page(unsigned long base, unsigned long size,
                                      unsigned int type);
 
@@ -62,17 +63,17 @@ extern int positive_have_wrcomb(void);
 /* library functions for processor-specific routines */
 struct set_mtrr_context {
         unsigned long flags;
-        unsigned long deftype_lo;
-        unsigned long deftype_hi;
         unsigned long cr4val;
-        unsigned long ccr3;
+        u32 deftype_lo;
+        u32 deftype_hi;
+        u32 ccr3;
 };
 
 struct mtrr_var_range {
-        unsigned long base_lo;
-        unsigned long base_hi;
-        unsigned long mask_lo;
-        unsigned long mask_hi;
+        u32 base_lo;
+        u32 base_hi;
+        u32 mask_lo;
+        u32 mask_hi;
 };
 
 void set_mtrr_done(struct set_mtrr_context *ctxt);
@@ -92,6 +93,6 @@ extern struct mtrr_ops * mtrr_if;
 extern unsigned int num_var_ranges;
 
 void mtrr_state_warn(void);
-char *mtrr_attrib_to_str(int x);
+const char *mtrr_attrib_to_str(int x);
 void mtrr_wrmsr(unsigned, unsigned, unsigned);
 
diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c
index 76aac088a323..6624d8583c42 100644
--- a/arch/i386/kernel/cpu/proc.c
+++ b/arch/i386/kernel/cpu/proc.c
@@ -152,9 +152,10 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                                 seq_printf(m, " [%d]", i);
                 }
 
-        seq_printf(m, "\nbogomips\t: %lu.%02lu\n\n",
+        seq_printf(m, "\nbogomips\t: %lu.%02lu\n",
                      c->loops_per_jiffy/(500000/HZ),
                      (c->loops_per_jiffy/(5000/HZ)) % 100);
+        seq_printf(m, "clflush size\t: %u\n\n", c->x86_clflush_size);
 
         return 0;
 }
diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c
index fde8bea85cee..51130b39cd2e 100644
--- a/arch/i386/kernel/cpuid.c
+++ b/arch/i386/kernel/cpuid.c
@@ -34,7 +34,6 @@
 #include <linux/major.h>
 #include <linux/fs.h>
 #include <linux/smp_lock.h>
-#include <linux/fs.h>
 #include <linux/device.h>
 #include <linux/cpu.h>
 #include <linux/notifier.h>
@@ -117,7 +116,7 @@ static ssize_t cpuid_read(struct file *file, char __user *buf,
         char __user *tmp = buf;
         u32 data[4];
         u32 reg = *ppos;
-        int cpu = iminor(file->f_dentry->d_inode);
+        int cpu = iminor(file->f_path.dentry->d_inode);
 
         if (count % 16)
                 return -EINVAL; /* Invalid chunk size */
@@ -135,7 +134,7 @@ static ssize_t cpuid_read(struct file *file, char __user *buf,
 
 static int cpuid_open(struct inode *inode, struct file *file)
 {
-        unsigned int cpu = iminor(file->f_dentry->d_inode);
+        unsigned int cpu = iminor(file->f_path.dentry->d_inode);
         struct cpuinfo_x86 *c = &(cpu_data)[cpu];
 
         if (cpu >= NR_CPUS || !cpu_online(cpu))
@@ -156,28 +155,27 @@ 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;
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
 static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
 
         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;
@@ -187,7 +185,6 @@ static struct notifier_block __cpuinitdata cpuid_class_cpu_notifier =
 {
         .notifier_call = cpuid_class_cpu_callback,
 };
-#endif /* !CONFIG_HOTPLUG_CPU */
 
 static int __init cpuid_init(void)
 {
@@ -206,7 +203,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 +215,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 +229,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/crash.c b/arch/i386/kernel/crash.c
index 144b43288965..a5e0e990ea95 100644
--- a/arch/i386/kernel/crash.c
+++ b/arch/i386/kernel/crash.c
@@ -31,68 +31,6 @@
 /* This keeps a track of which one is crashing cpu. */
 static int crashing_cpu;
 
-static u32 *append_elf_note(u32 *buf, char *name, unsigned type, void *data,
-                                                               size_t data_len)
-{
-        struct elf_note note;
-
-        note.n_namesz = strlen(name) + 1;
-        note.n_descsz = data_len;
-        note.n_type   = type;
-        memcpy(buf, &note, sizeof(note));
-        buf += (sizeof(note) +3)/4;
-        memcpy(buf, name, note.n_namesz);
-        buf += (note.n_namesz + 3)/4;
-        memcpy(buf, data, note.n_descsz);
-        buf += (note.n_descsz + 3)/4;
-
-        return buf;
-}
-
-static void final_note(u32 *buf)
-{
-        struct elf_note note;
-
-        note.n_namesz = 0;
-        note.n_descsz = 0;
-        note.n_type   = 0;
-        memcpy(buf, &note, sizeof(note));
-}
-
-static void crash_save_this_cpu(struct pt_regs *regs, int cpu)
-{
-        struct elf_prstatus prstatus;
-        u32 *buf;
-
-        if ((cpu < 0) || (cpu >= NR_CPUS))
-                return;
-
-        /* Using ELF notes here is opportunistic.
-         * I need a well defined structure format
-         * for the data I pass, and I need tags
-         * on the data to indicate what information I have
-         * squirrelled away.  ELF notes happen to provide
-         * all of that, so there is no need to invent something new.
-         */
-        buf = (u32*)per_cpu_ptr(crash_notes, cpu);
-        if (!buf)
-                return;
-        memset(&prstatus, 0, sizeof(prstatus));
-        prstatus.pr_pid = current->pid;
-        elf_core_copy_regs(&prstatus.pr_reg, regs);
-        buf = append_elf_note(buf, "CORE", NT_PRSTATUS, &prstatus,
-                                sizeof(prstatus));
-        final_note(buf);
-}
-
-static void crash_save_self(struct pt_regs *regs)
-{
-        int cpu;
-
-        cpu = safe_smp_processor_id();
-        crash_save_this_cpu(regs, cpu);
-}
-
 #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)
 static atomic_t waiting_for_crash_ipi;
 
@@ -121,7 +59,7 @@ static int crash_nmi_callback(struct notifier_block *self,
                 crash_fixup_ss_esp(&fixed_regs, regs);
                 regs = &fixed_regs;
         }
-        crash_save_this_cpu(regs, cpu);
+        crash_save_cpu(regs, cpu);
         disable_local_APIC();
         atomic_dec(&waiting_for_crash_ipi);
         /* Assume hlt works */
@@ -195,5 +133,5 @@ void machine_crash_shutdown(struct pt_regs *regs)
 #if defined(CONFIG_X86_IO_APIC)
         disable_IO_APIC();
 #endif
-        crash_save_self(regs);
+        crash_save_cpu(regs, safe_smp_processor_id());
 }
diff --git a/arch/i386/kernel/e820.c b/arch/i386/kernel/e820.c
new file mode 100644
index 000000000000..f391abcf7da9
--- /dev/null
+++ b/arch/i386/kernel/e820.c
@@ -0,0 +1,894 @@
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/bootmem.h>
+#include <linux/ioport.h>
+#include <linux/string.h>
+#include <linux/kexec.h>
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/efi.h>
+#include <linux/pfn.h>
+#include <linux/uaccess.h>
+
+#include <asm/pgtable.h>
+#include <asm/page.h>
+#include <asm/e820.h>
+
+#ifdef CONFIG_EFI
+int efi_enabled = 0;
+EXPORT_SYMBOL(efi_enabled);
+#endif
+
+struct e820map e820;
+struct change_member {
+        struct e820entry *pbios; /* pointer to original bios entry */
+        unsigned long long addr; /* address for this change point */
+};
+static struct change_member change_point_list[2*E820MAX] __initdata;
+static struct change_member *change_point[2*E820MAX] __initdata;
+static struct e820entry *overlap_list[E820MAX] __initdata;
+static struct e820entry new_bios[E820MAX] __initdata;
+/* For PCI or other memory-mapped resources */
+unsigned long pci_mem_start = 0x10000000;
+#ifdef CONFIG_PCI
+EXPORT_SYMBOL(pci_mem_start);
+#endif
+extern int user_defined_memmap;
+struct resource data_resource = {
+        .name   = "Kernel data",
+        .start  = 0,
+        .end    = 0,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
+};
+
+struct resource code_resource = {
+        .name   = "Kernel code",
+        .start  = 0,
+        .end    = 0,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
+};
+
+static struct resource system_rom_resource = {
+        .name   = "System ROM",
+        .start  = 0xf0000,
+        .end    = 0xfffff,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
+};
+
+static struct resource extension_rom_resource = {
+        .name   = "Extension ROM",
+        .start  = 0xe0000,
+        .end    = 0xeffff,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
+};
+
+static struct resource adapter_rom_resources[] = { {
+        .name   = "Adapter ROM",
+        .start  = 0xc8000,
+        .end    = 0,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
+}, {
+        .name   = "Adapter ROM",
+        .start  = 0,
+        .end    = 0,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
+}, {
+        .name   = "Adapter ROM",
+        .start  = 0,
+        .end    = 0,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
+}, {
+        .name   = "Adapter ROM",
+        .start  = 0,
+        .end    = 0,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
+}, {
+        .name   = "Adapter ROM",
+        .start  = 0,
+        .end    = 0,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
+}, {
+        .name   = "Adapter ROM",
+        .start  = 0,
+        .end    = 0,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
+} };
+
+static struct resource video_rom_resource = {
+        .name   = "Video ROM",
+        .start  = 0xc0000,
+        .end    = 0xc7fff,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
+};
+
+static struct resource video_ram_resource = {
+        .name   = "Video RAM area",
+        .start  = 0xa0000,
+        .end    = 0xbffff,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
+};
+
+static struct resource standard_io_resources[] = { {
+        .name   = "dma1",
+        .start  = 0x0000,
+        .end    = 0x001f,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
+}, {
+        .name   = "pic1",
+        .start  = 0x0020,
+        .end    = 0x0021,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
+}, {
+        .name   = "timer0",
+        .start  = 0x0040,
+        .end    = 0x0043,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
+}, {
+        .name   = "timer1",
+        .start  = 0x0050,
+        .end    = 0x0053,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
+}, {
+        .name   = "keyboard",
+        .start  = 0x0060,
+        .end    = 0x006f,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
+}, {
+        .name   = "dma page reg",
+        .start  = 0x0080,
+        .end    = 0x008f,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
+}, {
+        .name   = "pic2",
+        .start  = 0x00a0,
+        .end    = 0x00a1,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
+}, {
+        .name   = "dma2",
+        .start  = 0x00c0,
+        .end    = 0x00df,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
+}, {
+        .name   = "fpu",
+        .start  = 0x00f0,
+        .end    = 0x00ff,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
+} };
+
+static int romsignature(const unsigned char *x)
+{
+        unsigned short sig;
+        int ret = 0;
+        if (probe_kernel_address((const unsigned short *)x, sig) == 0)
+                ret = (sig == 0xaa55);
+        return ret;
+}
+
+static int __init romchecksum(unsigned char *rom, unsigned long length)
+{
+        unsigned char *p, sum = 0;
+
+        for (p = rom; p < rom + length; p++)
+                sum += *p;
+        return sum == 0;
+}
+
+static void __init probe_roms(void)
+{
+        unsigned long start, length, upper;
+        unsigned char *rom;
+        int           i;
+
+        /* video rom */
+        upper = adapter_rom_resources[0].start;
+        for (start = video_rom_resource.start; start < upper; start += 2048) {
+                rom = isa_bus_to_virt(start);
+                if (!romsignature(rom))
+                        continue;
+
+                video_rom_resource.start = start;
+
+                /* 0 < length <= 0x7f * 512, historically */
+                length = rom[2] * 512;
+
+                /* if checksum okay, trust length byte */
+                if (length && romchecksum(rom, length))
+                        video_rom_resource.end = start + length - 1;
+
+                request_resource(&iomem_resource, &video_rom_resource);
+                break;
+        }
+
+        start = (video_rom_resource.end + 1 + 2047) & ~2047UL;
+        if (start < upper)
+                start = upper;
+
+        /* system rom */
+        request_resource(&iomem_resource, &system_rom_resource);
+        upper = system_rom_resource.start;
+
+        /* check for extension rom (ignore length byte!) */
+        rom = isa_bus_to_virt(extension_rom_resource.start);
+        if (romsignature(rom)) {
+                length = extension_rom_resource.end - extension_rom_resource.start + 1;
+                if (romchecksum(rom, length)) {
+                        request_resource(&iomem_resource, &extension_rom_resource);
+                        upper = extension_rom_resource.start;
+                }
+        }
+
+        /* check for adapter roms on 2k boundaries */
+        for (i = 0; i < ARRAY_SIZE(adapter_rom_resources) && start < upper; start += 2048) {
+                rom = isa_bus_to_virt(start);
+                if (!romsignature(rom))
+                        continue;
+
+                /* 0 < length <= 0x7f * 512, historically */
+                length = rom[2] * 512;
+
+                /* but accept any length that fits if checksum okay */
+                if (!length || start + length > upper || !romchecksum(rom, length))
+                        continue;
+
+                adapter_rom_resources[i].start = start;
+                adapter_rom_resources[i].end = start + length - 1;
+                request_resource(&iomem_resource, &adapter_rom_resources[i]);
+
+                start = adapter_rom_resources[i++].end & ~2047UL;
+        }
+}
+
+/*
+ * Request address space for all standard RAM and ROM resources
+ * and also for regions reported as reserved by the e820.
+ */
+static void __init
+legacy_init_iomem_resources(struct resource *code_resource, struct resource *data_resource)
+{
+        int i;
+
+        probe_roms();
+        for (i = 0; i < e820.nr_map; i++) {
+                struct resource *res;
+#ifndef CONFIG_RESOURCES_64BIT
+                if (e820.map[i].addr + e820.map[i].size > 0x100000000ULL)
+                        continue;
+#endif
+                res = kzalloc(sizeof(struct resource), GFP_ATOMIC);
+                switch (e820.map[i].type) {
+                case E820_RAM:  res->name = "System RAM"; break;
+                case E820_ACPI: res->name = "ACPI Tables"; break;
+                case E820_NVS:  res->name = "ACPI Non-volatile Storage"; break;
+                default:        res->name = "reserved";
+                }
+                res->start = e820.map[i].addr;
+                res->end = res->start + e820.map[i].size - 1;
+                res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+                if (request_resource(&iomem_resource, res)) {
+                        kfree(res);
+                        continue;
+                }
+                if (e820.map[i].type == E820_RAM) {
+                        /*
+                         *  We don't know which RAM region contains kernel data,
+                         *  so we try it repeatedly and let the resource manager
+                         *  test it.
+                         */
+                        request_resource(res, code_resource);
+                        request_resource(res, data_resource);
+#ifdef CONFIG_KEXEC
+                        request_resource(res, &crashk_res);
+#endif
+                }
+        }
+}
+
+/*
+ * Request address space for all standard resources
+ *
+ * This is called just before pcibios_init(), which is also a
+ * subsys_initcall, but is linked in later (in arch/i386/pci/common.c).
+ */
+static int __init request_standard_resources(void)
+{
+        int i;
+
+        printk("Setting up standard PCI resources\n");
+        if (efi_enabled)
+                efi_initialize_iomem_resources(&code_resource, &data_resource);
+        else
+                legacy_init_iomem_resources(&code_resource, &data_resource);
+
+        /* EFI systems may still have VGA */
+        request_resource(&iomem_resource, &video_ram_resource);
+
+        /* request I/O space for devices used on all i[345]86 PCs */
+        for (i = 0; i < ARRAY_SIZE(standard_io_resources); i++)
+                request_resource(&ioport_resource, &standard_io_resources[i]);
+        return 0;
+}
+
+subsys_initcall(request_standard_resources);
+
+void __init add_memory_region(unsigned long long start,
+                              unsigned long long size, int type)
+{
+        int x;
+
+        if (!efi_enabled) {
+                x = e820.nr_map;
+
+                if (x == E820MAX) {
+                    printk(KERN_ERR "Ooops! Too many entries in the memory map!\n");
+                    return;
+                }
+
+                e820.map[x].addr = start;
+                e820.map[x].size = size;
+                e820.map[x].type = type;
+                e820.nr_map++;
+        }
+} /* add_memory_region */
+
+/*
+ * Sanitize the BIOS e820 map.
+ *
+ * Some e820 responses include overlapping entries.  The following
+ * replaces the original e820 map with a new one, removing overlaps.
+ *
+ */
+int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map)
+{
+        struct change_member *change_tmp;
+        unsigned long current_type, last_type;
+        unsigned long long last_addr;
+        int chgidx, still_changing;
+        int overlap_entries;
+        int new_bios_entry;
+        int old_nr, new_nr, chg_nr;
+        int i;
+
+        /*
+                Visually we're performing the following (1,2,3,4 = memory types)...
+
+                Sample memory map (w/overlaps):
+                   ____22__________________
+                   ______________________4_
+                   ____1111________________
+                   _44_____________________
+                   11111111________________
+                   ____________________33__
+                   ___________44___________
+                   __________33333_________
+                   ______________22________
+                   ___________________2222_
+                   _________111111111______
+                   _____________________11_
+                   _________________4______
+
+                Sanitized equivalent (no overlap):
+                   1_______________________
+                   _44_____________________
+                   ___1____________________
+                   ____22__________________
+                   ______11________________
+                   _________1______________
+                   __________3_____________
+                   ___________44___________
+                   _____________33_________
+                   _______________2________
+                   ________________1_______
+                   _________________4______
+                   ___________________2____
+                   ____________________33__
+                   ______________________4_
+        */
+        printk("sanitize start\n");
+        /* if there's only one memory region, don't bother */
+        if (*pnr_map < 2) {
+                printk("sanitize bail 0\n");
+                return -1;
+        }
+
+        old_nr = *pnr_map;
+
+        /* bail out if we find any unreasonable addresses in bios map */
+        for (i=0; i<old_nr; i++)
+                if (biosmap[i].addr + biosmap[i].size < biosmap[i].addr) {
+                        printk("sanitize bail 1\n");
+                        return -1;
+                }
+
+        /* create pointers for initial change-point information (for sorting) */
+        for (i=0; i < 2*old_nr; i++)
+                change_point[i] = &change_point_list[i];
+
+        /* record all known change-points (starting and ending addresses),
+           omitting those that are for empty memory regions */
+        chgidx = 0;
+        for (i=0; i < old_nr; i++)      {
+                if (biosmap[i].size != 0) {
+                        change_point[chgidx]->addr = biosmap[i].addr;
+                        change_point[chgidx++]->pbios = &biosmap[i];
+                        change_point[chgidx]->addr = biosmap[i].addr + biosmap[i].size;
+                        change_point[chgidx++]->pbios = &biosmap[i];
+                }
+        }
+        chg_nr = chgidx;        /* true number of change-points */
+
+        /* sort change-point list by memory addresses (low -> high) */
+        still_changing = 1;
+        while (still_changing)  {
+                still_changing = 0;
+                for (i=1; i < chg_nr; i++)  {
+                        /* if <current_addr> > <last_addr>, swap */
+                        /* or, if current=<start_addr> & last=<end_addr>, swap */
+                        if ((change_point[i]->addr < change_point[i-1]->addr) ||
+                                ((change_point[i]->addr == change_point[i-1]->addr) &&
+                                 (change_point[i]->addr == change_point[i]->pbios->addr) &&
+                                 (change_point[i-1]->addr != change_point[i-1]->pbios->addr))
+                           )
+                        {
+                                change_tmp = change_point[i];
+                                change_point[i] = change_point[i-1];
+                                change_point[i-1] = change_tmp;
+                                still_changing=1;
+                        }
+                }
+        }
+
+        /* create a new bios memory map, removing overlaps */
+        overlap_entries=0;       /* number of entries in the overlap table */
+        new_bios_entry=0;        /* index for creating new bios map entries */
+        last_type = 0;           /* start with undefined memory type */
+        last_addr = 0;           /* start with 0 as last starting address */
+        /* loop through change-points, determining affect on the new bios map */
+        for (chgidx=0; chgidx < chg_nr; chgidx++)
+        {
+                /* keep track of all overlapping bios entries */
+                if (change_point[chgidx]->addr == change_point[chgidx]->pbios->addr)
+                {
+                        /* add map entry to overlap list (> 1 entry implies an overlap) */
+                        overlap_list[overlap_entries++]=change_point[chgidx]->pbios;
+                }
+                else
+                {
+                        /* remove entry from list (order independent, so swap with last) */
+                        for (i=0; i<overlap_entries; i++)
+                        {
+                                if (overlap_list[i] == change_point[chgidx]->pbios)
+                                        overlap_list[i] = overlap_list[overlap_entries-1];
+                        }
+                        overlap_entries--;
+                }
+                /* if there are overlapping entries, decide which "type" to use */
+                /* (larger value takes precedence -- 1=usable, 2,3,4,4+=unusable) */
+                current_type = 0;
+                for (i=0; i<overlap_entries; i++)
+                        if (overlap_list[i]->type > current_type)
+                                current_type = overlap_list[i]->type;
+                /* continue building up new bios map based on this information */
+                if (current_type != last_type)  {
+                        if (last_type != 0)      {
+                                new_bios[new_bios_entry].size =
+                                        change_point[chgidx]->addr - last_addr;
+                                /* move forward only if the new size was non-zero */
+                                if (new_bios[new_bios_entry].size != 0)
+                                        if (++new_bios_entry >= E820MAX)
+                                                break;  /* no more space left for new bios entries */
+                        }
+                        if (current_type != 0)  {
+                                new_bios[new_bios_entry].addr = change_point[chgidx]->addr;
+                                new_bios[new_bios_entry].type = current_type;
+                                last_addr=change_point[chgidx]->addr;
+                        }
+                        last_type = current_type;
+                }
+        }
+        new_nr = new_bios_entry;   /* retain count for new bios entries */
+
+        /* copy new bios mapping into original location */
+        memcpy(biosmap, new_bios, new_nr*sizeof(struct e820entry));
+        *pnr_map = new_nr;
+
+        printk("sanitize end\n");
+        return 0;
+}
+
+/*
+ * Copy the BIOS e820 map into a safe place.
+ *
+ * Sanity-check it while we're at it..
+ *
+ * If we're lucky and live on a modern system, the setup code
+ * will have given us a memory map that we can use to properly
+ * set up memory.  If we aren't, we'll fake a memory map.
+ *
+ * We check to see that the memory map contains at least 2 elements
+ * before we'll use it, because the detection code in setup.S may
+ * not be perfect and most every PC known to man has two memory
+ * regions: one from 0 to 640k, and one from 1mb up.  (The IBM
+ * thinkpad 560x, for example, does not cooperate with the memory
+ * detection code.)
+ */
+int __init copy_e820_map(struct e820entry * biosmap, int nr_map)
+{
+        /* Only one memory region (or negative)? Ignore it */
+        if (nr_map < 2)
+                return -1;
+
+        do {
+                unsigned long long start = biosmap->addr;
+                unsigned long long size = biosmap->size;
+                unsigned long long end = start + size;
+                unsigned long type = biosmap->type;
+                printk("copy_e820_map() start: %016Lx size: %016Lx end: %016Lx type: %ld\n", start, size, end, type);
+
+                /* Overflow in 64 bits? Ignore the memory map. */
+                if (start > end)
+                        return -1;
+
+                /*
+                 * Some BIOSes claim RAM in the 640k - 1M region.
+                 * Not right. Fix it up.
+                 */
+                if (type == E820_RAM) {
+                        printk("copy_e820_map() type is E820_RAM\n");
+                        if (start < 0x100000ULL && end > 0xA0000ULL) {
+                                printk("copy_e820_map() lies in range...\n");
+                                if (start < 0xA0000ULL) {
+                                        printk("copy_e820_map() start < 0xA0000ULL\n");
+                                        add_memory_region(start, 0xA0000ULL-start, type);
+                                }
+                                if (end <= 0x100000ULL) {
+                                        printk("copy_e820_map() end <= 0x100000ULL\n");
+                                        continue;
+                                }
+                                start = 0x100000ULL;
+                                size = end - start;
+                        }
+                }
+                add_memory_region(start, size, type);
+        } while (biosmap++,--nr_map);
+        return 0;
+}
+
+/*
+ * Callback for efi_memory_walk.
+ */
+static int __init
+efi_find_max_pfn(unsigned long start, unsigned long end, void *arg)
+{
+        unsigned long *max_pfn = arg, pfn;
+
+        if (start < end) {
+                pfn = PFN_UP(end -1);
+                if (pfn > *max_pfn)
+                        *max_pfn = pfn;
+        }
+        return 0;
+}
+
+static int __init
+efi_memory_present_wrapper(unsigned long start, unsigned long end, void *arg)
+{
+        memory_present(0, PFN_UP(start), PFN_DOWN(end));
+        return 0;
+}
+
+/*
+ * Find the highest page frame number we have available
+ */
+void __init find_max_pfn(void)
+{
+        int i;
+
+        max_pfn = 0;
+        if (efi_enabled) {
+                efi_memmap_walk(efi_find_max_pfn, &max_pfn);
+                efi_memmap_walk(efi_memory_present_wrapper, NULL);
+                return;
+        }
+
+        for (i = 0; i < e820.nr_map; i++) {
+                unsigned long start, end;
+                /* RAM? */
+                if (e820.map[i].type != E820_RAM)
+                        continue;
+                start = PFN_UP(e820.map[i].addr);
+                end = PFN_DOWN(e820.map[i].addr + e820.map[i].size);
+                if (start >= end)
+                        continue;
+                if (end > max_pfn)
+                        max_pfn = end;
+                memory_present(0, start, end);
+        }
+}
+
+/*
+ * Free all available memory for boot time allocation.  Used
+ * as a callback function by efi_memory_walk()
+ */
+
+static int __init
+free_available_memory(unsigned long start, unsigned long end, void *arg)
+{
+        /* check max_low_pfn */
+        if (start >= (max_low_pfn << PAGE_SHIFT))
+                return 0;
+        if (end >= (max_low_pfn << PAGE_SHIFT))
+                end = max_low_pfn << PAGE_SHIFT;
+        if (start < end)
+                free_bootmem(start, end - start);
+
+        return 0;
+}
+/*
+ * Register fully available low RAM pages with the bootmem allocator.
+ */
+void __init register_bootmem_low_pages(unsigned long max_low_pfn)
+{
+        int i;
+
+        if (efi_enabled) {
+                efi_memmap_walk(free_available_memory, NULL);
+                return;
+        }
+        for (i = 0; i < e820.nr_map; i++) {
+                unsigned long curr_pfn, last_pfn, size;
+                /*
+                 * Reserve usable low memory
+                 */
+                if (e820.map[i].type != E820_RAM)
+                        continue;
+                /*
+                 * We are rounding up the start address of usable memory:
+                 */
+                curr_pfn = PFN_UP(e820.map[i].addr);
+                if (curr_pfn >= max_low_pfn)
+                        continue;
+                /*
+                 * ... and at the end of the usable range downwards:
+                 */
+                last_pfn = PFN_DOWN(e820.map[i].addr + e820.map[i].size);
+
+                if (last_pfn > max_low_pfn)
+                        last_pfn = max_low_pfn;
+
+                /*
+                 * .. finally, did all the rounding and playing
+                 * around just make the area go away?
+                 */
+                if (last_pfn <= curr_pfn)
+                        continue;
+
+                size = last_pfn - curr_pfn;
+                free_bootmem(PFN_PHYS(curr_pfn), PFN_PHYS(size));
+        }
+}
+
+void __init e820_register_memory(void)
+{
+        unsigned long gapstart, gapsize, round;
+        unsigned long long last;
+        int i;
+
+        /*
+         * Search for the bigest gap in the low 32 bits of the e820
+         * memory space.
+         */
+        last = 0x100000000ull;
+        gapstart = 0x10000000;
+        gapsize = 0x400000;
+        i = e820.nr_map;
+        while (--i >= 0) {
+                unsigned long long start = e820.map[i].addr;
+                unsigned long long end = start + e820.map[i].size;
+
+                /*
+                 * Since "last" is at most 4GB, we know we'll
+                 * fit in 32 bits if this condition is true
+                 */
+                if (last > end) {
+                        unsigned long gap = last - end;
+
+                        if (gap > gapsize) {
+                                gapsize = gap;
+                                gapstart = end;
+                        }
+                }
+                if (start < last)
+                        last = start;
+        }
+
+        /*
+         * See how much we want to round up: start off with
+         * rounding to the next 1MB area.
+         */
+        round = 0x100000;
+        while ((gapsize >> 4) > round)
+                round += round;
+        /* Fun with two's complement */
+        pci_mem_start = (gapstart + round) & -round;
+
+        printk("Allocating PCI resources starting at %08lx (gap: %08lx:%08lx)\n",
+                pci_mem_start, gapstart, gapsize);
+}
+
+void __init print_memory_map(char *who)
+{
+        int i;
+
+        for (i = 0; i < e820.nr_map; i++) {
+                printk(" %s: %016Lx - %016Lx ", who,
+                        e820.map[i].addr,
+                        e820.map[i].addr + e820.map[i].size);
+                switch (e820.map[i].type) {
+                case E820_RAM:  printk("(usable)\n");
+                                break;
+                case E820_RESERVED:
+                                printk("(reserved)\n");
+                                break;
+                case E820_ACPI:
+                                printk("(ACPI data)\n");
+                                break;
+                case E820_NVS:
+                                printk("(ACPI NVS)\n");
+                                break;
+                default:        printk("type %lu\n", e820.map[i].type);
+                                break;
+                }
+        }
+}
+
+static __init __always_inline void efi_limit_regions(unsigned long long size)
+{
+        unsigned long long current_addr = 0;
+        efi_memory_desc_t *md, *next_md;
+        void *p, *p1;
+        int i, j;
+
+        j = 0;
+        p1 = memmap.map;
+        for (p = p1, i = 0; p < memmap.map_end; p += memmap.desc_size, i++) {
+                md = p;
+                next_md = p1;
+                current_addr = md->phys_addr +
+                        PFN_PHYS(md->num_pages);
+                if (is_available_memory(md)) {
+                        if (md->phys_addr >= size) continue;
+                        memcpy(next_md, md, memmap.desc_size);
+                        if (current_addr >= size) {
+                                next_md->num_pages -=
+                                        PFN_UP(current_addr-size);
+                        }
+                        p1 += memmap.desc_size;
+                        next_md = p1;
+                        j++;
+                } else if ((md->attribute & EFI_MEMORY_RUNTIME) ==
+                           EFI_MEMORY_RUNTIME) {
+                        /* In order to make runtime services
+                         * available we have to include runtime
+                         * memory regions in memory map */
+                        memcpy(next_md, md, memmap.desc_size);
+                        p1 += memmap.desc_size;
+                        next_md = p1;
+                        j++;
+                }
+        }
+        memmap.nr_map = j;
+        memmap.map_end = memmap.map +
+                (memmap.nr_map * memmap.desc_size);
+}
+
+void __init limit_regions(unsigned long long size)
+{
+        unsigned long long current_addr;
+        int i;
+
+        print_memory_map("limit_regions start");
+        if (efi_enabled) {
+                efi_limit_regions(size);
+                return;
+        }
+        for (i = 0; i < e820.nr_map; i++) {
+                current_addr = e820.map[i].addr + e820.map[i].size;
+                if (current_addr < size)
+                        continue;
+
+                if (e820.map[i].type != E820_RAM)
+                        continue;
+
+                if (e820.map[i].addr >= size) {
+                        /*
+                         * This region starts past the end of the
+                         * requested size, skip it completely.
+                         */
+                        e820.nr_map = i;
+                } else {
+                        e820.nr_map = i + 1;
+                        e820.map[i].size -= current_addr - size;
+                }
+                print_memory_map("limit_regions endfor");
+                return;
+        }
+        print_memory_map("limit_regions endfunc");
+}
+
+ /*
+  * This function checks if the entire range <start,end> is mapped with type.
+  *
+  * Note: this function only works correct if the e820 table is sorted and
+  * not-overlapping, which is the case
+  */
+int __init
+e820_all_mapped(unsigned long s, unsigned long e, unsigned type)
+{
+        u64 start = s;
+        u64 end = e;
+        int i;
+        for (i = 0; i < e820.nr_map; i++) {
+                struct e820entry *ei = &e820.map[i];
+                if (type && ei->type != type)
+                        continue;
+                /* is the region (part) in overlap with the current region ?*/
+                if (ei->addr >= end || ei->addr + ei->size <= start)
+                        continue;
+                /* if the region is at the beginning of <start,end> we move
+                 * start to the end of the region since it's ok until there
+                 */
+                if (ei->addr <= start)
+                        start = ei->addr + ei->size;
+                /* if start is now at or beyond end, we're done, full
+                 * coverage */
+                if (start >= end)
+                        return 1; /* we're done */
+        }
+        return 0;
+}
+
+static int __init parse_memmap(char *arg)
+{
+        if (!arg)
+                return -EINVAL;
+
+        if (strcmp(arg, "exactmap") == 0) {
+#ifdef CONFIG_CRASH_DUMP
+                /* If we are doing a crash dump, we
+                 * still need to know the real mem
+                 * size before original memory map is
+                 * reset.
+                 */
+                find_max_pfn();
+                saved_max_pfn = max_pfn;
+#endif
+                e820.nr_map = 0;
+                user_defined_memmap = 1;
+        } else {
+                /* If the user specifies memory size, we
+                 * limit the BIOS-provided memory map to
+                 * that size. exactmap can be used to specify
+                 * the exact map. mem=number can be used to
+                 * trim the existing memory map.
+                 */
+                unsigned long long start_at, mem_size;
+
+                mem_size = memparse(arg, &arg);
+                if (*arg == '@') {
+                        start_at = memparse(arg+1, &arg);
+                        add_memory_region(start_at, mem_size, E820_RAM);
+                } else if (*arg == '#') {
+                        start_at = memparse(arg+1, &arg);
+                        add_memory_region(start_at, mem_size, E820_ACPI);
+                } else if (*arg == '$') {
+                        start_at = memparse(arg+1, &arg);
+                        add_memory_region(start_at, mem_size, E820_RESERVED);
+                } else {
+                        limit_regions(mem_size);
+                        user_defined_memmap = 1;
+                }
+        }
+        return 0;
+}
+early_param("memmap", parse_memmap);
diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c
index 8b40648d0ef0..b92c7f0a358a 100644
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
@@ -194,17 +194,24 @@ inline int efi_set_rtc_mmss(unsigned long nowtime)
         return 0;
 }
 /*
- * This should only be used during kernel init and before runtime
- * services have been remapped, therefore, we'll need to call in physical
- * mode.  Note, this call isn't used later, so mark it __init.
+ * This is used during kernel init before runtime
+ * services have been remapped and also during suspend, therefore,
+ * we'll need to call both in physical and virtual modes.
  */
-inline unsigned long __init efi_get_time(void)
+inline unsigned long efi_get_time(void)
 {
         efi_status_t status;
         efi_time_t eft;
         efi_time_cap_t cap;
 
-        status = phys_efi_get_time(&eft, &cap);
+        if (efi.get_time) {
+                /* if we are in virtual mode use remapped function */
+                status = efi.get_time(&eft, &cap);
+        } else {
+                /* we are in physical mode */
+                status = phys_efi_get_time(&eft, &cap);
+        }
+
         if (status != EFI_SUCCESS)
                 printk("Oops: efitime: can't read time status: 0x%lx\n",status);
 
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
index 5a63d6fdb70e..06461b8b715d 100644
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
@@ -30,12 +30,13 @@
  *      18(%esp) - %eax
  *      1C(%esp) - %ds
  *      20(%esp) - %es
- *      24(%esp) - orig_eax
- *      28(%esp) - %eip
- *      2C(%esp) - %cs
- *      30(%esp) - %eflags
- *      34(%esp) - %oldesp
- *      38(%esp) - %oldss
+ *      24(%esp) - %gs
+ *      28(%esp) - orig_eax
+ *      2C(%esp) - %eip
+ *      30(%esp) - %cs
+ *      34(%esp) - %eflags
+ *      38(%esp) - %oldesp
+ *      3C(%esp) - %oldss
  *
  * "current" is in register %ebx during any slow entries.
  */
@@ -48,26 +49,24 @@
 #include <asm/smp.h>
 #include <asm/page.h>
 #include <asm/desc.h>
+#include <asm/percpu.h>
 #include <asm/dwarf2.h>
 #include "irq_vectors.h"
 
-#define nr_syscalls ((syscall_table_size)/4)
+/*
+ * We use macros for low-level operations which need to be overridden
+ * for paravirtualization.  The following will never clobber any registers:
+ *   INTERRUPT_RETURN (aka. "iret")
+ *   GET_CR0_INTO_EAX (aka. "movl %cr0, %eax")
+ *   ENABLE_INTERRUPTS_SYSEXIT (aka "sti; sysexit").
+ *
+ * For DISABLE_INTERRUPTS/ENABLE_INTERRUPTS (aka "cli"/"sti"), you must
+ * specify what registers can be overwritten (CLBR_NONE, CLBR_EAX/EDX/ECX/ANY).
+ * Allowing a register to be clobbered can shrink the paravirt replacement
+ * enough to patch inline, increasing performance.
+ */
 
-EBX             = 0x00
-ECX             = 0x04
-EDX             = 0x08
-ESI             = 0x0C
-EDI             = 0x10
-EBP             = 0x14
-EAX             = 0x18
-DS              = 0x1C
-ES              = 0x20
-ORIG_EAX        = 0x24
-EIP             = 0x28
-CS              = 0x2C
-EFLAGS          = 0x30
-OLDESP          = 0x34
-OLDSS           = 0x38
+#define nr_syscalls ((syscall_table_size)/4)
 
 CF_MASK         = 0x00000001
 TF_MASK         = 0x00000100
@@ -76,23 +75,16 @@ DF_MASK		= 0x00000400
 NT_MASK         = 0x00004000
 VM_MASK         = 0x00020000
 
-/* These are replaces for paravirtualization */
-#define DISABLE_INTERRUPTS              cli
-#define ENABLE_INTERRUPTS               sti
-#define ENABLE_INTERRUPTS_SYSEXIT       sti; sysexit
-#define INTERRUPT_RETURN                iret
-#define GET_CR0_INTO_EAX                movl %cr0, %eax
-
 #ifdef CONFIG_PREEMPT
-#define preempt_stop            DISABLE_INTERRUPTS; TRACE_IRQS_OFF
+#define preempt_stop(clobbers)  DISABLE_INTERRUPTS(clobbers); TRACE_IRQS_OFF
 #else
-#define preempt_stop
+#define preempt_stop(clobbers)
 #define resume_kernel           restore_nocheck
 #endif
 
 .macro TRACE_IRQS_IRET
 #ifdef CONFIG_TRACE_IRQFLAGS
-        testl $IF_MASK,EFLAGS(%esp)     # interrupts off?
+        testl $IF_MASK,PT_EFLAGS(%esp)     # interrupts off?
         jz 1f
         TRACE_IRQS_ON
 1:
@@ -107,6 +99,9 @@ VM_MASK		= 0x00020000
 
 #define SAVE_ALL \
         cld; \
+        pushl %gs; \
+        CFI_ADJUST_CFA_OFFSET 4;\
+        /*CFI_REL_OFFSET gs, 0;*/\
         pushl %es; \
         CFI_ADJUST_CFA_OFFSET 4;\
         /*CFI_REL_OFFSET es, 0;*/\
@@ -136,7 +131,9 @@ VM_MASK		= 0x00020000
         CFI_REL_OFFSET ebx, 0;\
         movl $(__USER_DS), %edx; \
         movl %edx, %ds; \
-        movl %edx, %es;
+        movl %edx, %es; \
+        movl $(__KERNEL_PDA), %edx; \
+        movl %edx, %gs
 
 #define RESTORE_INT_REGS \
         popl %ebx;      \
@@ -169,17 +166,22 @@ VM_MASK		= 0x00020000
 2:      popl %es;       \
         CFI_ADJUST_CFA_OFFSET -4;\
         /*CFI_RESTORE es;*/\
-.section .fixup,"ax";   \
-3:      movl $0,(%esp); \
-        jmp 1b;         \
+3:      popl %gs;       \
+        CFI_ADJUST_CFA_OFFSET -4;\
+        /*CFI_RESTORE gs;*/\
+.pushsection .fixup,"ax";       \
 4:      movl $0,(%esp); \
+        jmp 1b;         \
+5:      movl $0,(%esp); \
         jmp 2b;         \
-.previous;              \
+6:      movl $0,(%esp); \
+        jmp 3b;         \
 .section __ex_table,"a";\
         .align 4;       \
-        .long 1b,3b;    \
-        .long 2b,4b;    \
-.previous
+        .long 1b,4b;    \
+        .long 2b,5b;    \
+        .long 3b,6b;    \
+.popsection
 
 #define RING0_INT_FRAME \
         CFI_STARTPROC simple;\
@@ -198,18 +200,18 @@ VM_MASK		= 0x00020000
 #define RING0_PTREGS_FRAME \
         CFI_STARTPROC simple;\
         CFI_SIGNAL_FRAME;\
-        CFI_DEF_CFA esp, OLDESP-EBX;\
-        /*CFI_OFFSET cs, CS-OLDESP;*/\
-        CFI_OFFSET eip, EIP-OLDESP;\
-        /*CFI_OFFSET es, ES-OLDESP;*/\
-        /*CFI_OFFSET ds, DS-OLDESP;*/\
-        CFI_OFFSET eax, EAX-OLDESP;\
-        CFI_OFFSET ebp, EBP-OLDESP;\
-        CFI_OFFSET edi, EDI-OLDESP;\
-        CFI_OFFSET esi, ESI-OLDESP;\
-        CFI_OFFSET edx, EDX-OLDESP;\
-        CFI_OFFSET ecx, ECX-OLDESP;\
-        CFI_OFFSET ebx, EBX-OLDESP
+        CFI_DEF_CFA esp, PT_OLDESP-PT_EBX;\
+        /*CFI_OFFSET cs, PT_CS-PT_OLDESP;*/\
+        CFI_OFFSET eip, PT_EIP-PT_OLDESP;\
+        /*CFI_OFFSET es, PT_ES-PT_OLDESP;*/\
+        /*CFI_OFFSET ds, PT_DS-PT_OLDESP;*/\
+        CFI_OFFSET eax, PT_EAX-PT_OLDESP;\
+        CFI_OFFSET ebp, PT_EBP-PT_OLDESP;\
+        CFI_OFFSET edi, PT_EDI-PT_OLDESP;\
+        CFI_OFFSET esi, PT_ESI-PT_OLDESP;\
+        CFI_OFFSET edx, PT_EDX-PT_OLDESP;\
+        CFI_OFFSET ecx, PT_ECX-PT_OLDESP;\
+        CFI_OFFSET ebx, PT_EBX-PT_OLDESP
 
 ENTRY(ret_from_fork)
         CFI_STARTPROC
@@ -237,17 +239,18 @@ ENTRY(ret_from_fork)
         ALIGN
         RING0_PTREGS_FRAME
 ret_from_exception:
-        preempt_stop
+        preempt_stop(CLBR_ANY)
 ret_from_intr:
         GET_THREAD_INFO(%ebp)
 check_userspace:
-        movl EFLAGS(%esp), %eax         # mix EFLAGS and CS
-        movb CS(%esp), %al
+        movl PT_EFLAGS(%esp), %eax      # mix EFLAGS and CS
+        movb PT_CS(%esp), %al
         andl $(VM_MASK | SEGMENT_RPL_MASK), %eax
         cmpl $USER_RPL, %eax
         jb resume_kernel                # not returning to v8086 or userspace
+
 ENTRY(resume_userspace)
-        DISABLE_INTERRUPTS              # make sure we don't miss an interrupt
+        DISABLE_INTERRUPTS(CLBR_ANY)    # make sure we don't miss an interrupt
                                         # setting need_resched or sigpending
                                         # between sampling and the iret
         movl TI_flags(%ebp), %ecx
@@ -258,14 +261,14 @@ ENTRY(resume_userspace)
 
 #ifdef CONFIG_PREEMPT
 ENTRY(resume_kernel)
-        DISABLE_INTERRUPTS
+        DISABLE_INTERRUPTS(CLBR_ANY)
         cmpl $0,TI_preempt_count(%ebp)  # non-zero preempt_count ?
         jnz restore_nocheck
 need_resched:
         movl TI_flags(%ebp), %ecx       # need_resched set ?
         testb $_TIF_NEED_RESCHED, %cl
         jz restore_all
-        testl $IF_MASK,EFLAGS(%esp)     # interrupts off (exception path) ?
+        testl $IF_MASK,PT_EFLAGS(%esp)  # interrupts off (exception path) ?
         jz restore_all
         call preempt_schedule_irq
         jmp need_resched
@@ -287,7 +290,7 @@ sysenter_past_esp:
          * No need to follow this irqs on/off section: the syscall
          * disabled irqs and here we enable it straight after entry:
          */
-        ENABLE_INTERRUPTS
+        ENABLE_INTERRUPTS(CLBR_NONE)
         pushl $(__USER_DS)
         CFI_ADJUST_CFA_OFFSET 4
         /*CFI_REL_OFFSET ss, 0*/
@@ -331,20 +334,27 @@ sysenter_past_esp:
         cmpl $(nr_syscalls), %eax
         jae syscall_badsys
         call *sys_call_table(,%eax,4)
-        movl %eax,EAX(%esp)
-        DISABLE_INTERRUPTS
+        movl %eax,PT_EAX(%esp)
+        DISABLE_INTERRUPTS(CLBR_ECX|CLBR_EDX)
         TRACE_IRQS_OFF
         movl TI_flags(%ebp), %ecx
         testw $_TIF_ALLWORK_MASK, %cx
         jne syscall_exit_work
 /* if something modifies registers it must also disable sysexit */
-        movl EIP(%esp), %edx
-        movl OLDESP(%esp), %ecx
+        movl PT_EIP(%esp), %edx
+        movl PT_OLDESP(%esp), %ecx
         xorl %ebp,%ebp
         TRACE_IRQS_ON
+1:      mov  PT_GS(%esp), %gs
         ENABLE_INTERRUPTS_SYSEXIT
         CFI_ENDPROC
-
+.pushsection .fixup,"ax"
+2:      movl $0,PT_GS(%esp)
+        jmp 1b
+.section __ex_table,"a"
+        .align 4
+        .long 1b,2b
+.popsection
 
         # system call handler stub
 ENTRY(system_call)
@@ -353,7 +363,7 @@ ENTRY(system_call)
         CFI_ADJUST_CFA_OFFSET 4
         SAVE_ALL
         GET_THREAD_INFO(%ebp)
-        testl $TF_MASK,EFLAGS(%esp)
+        testl $TF_MASK,PT_EFLAGS(%esp)
         jz no_singlestep
         orl $_TIF_SINGLESTEP,TI_flags(%ebp)
 no_singlestep:
@@ -365,9 +375,9 @@ no_singlestep:
         jae syscall_badsys
 syscall_call:
         call *sys_call_table(,%eax,4)
-        movl %eax,EAX(%esp)             # store the return value
+        movl %eax,PT_EAX(%esp)          # store the return value
 syscall_exit:
-        DISABLE_INTERRUPTS              # make sure we don't miss an interrupt
+        DISABLE_INTERRUPTS(CLBR_ANY)    # make sure we don't miss an interrupt
                                         # setting need_resched or sigpending
                                         # between sampling and the iret
         TRACE_IRQS_OFF
@@ -376,12 +386,12 @@ syscall_exit:
         jne syscall_exit_work
 
 restore_all:
-        movl EFLAGS(%esp), %eax         # mix EFLAGS, SS and CS
-        # Warning: OLDSS(%esp) contains the wrong/random values if we
+        movl PT_EFLAGS(%esp), %eax      # mix EFLAGS, SS and CS
+        # Warning: PT_OLDSS(%esp) contains the wrong/random values if we
         # are returning to the kernel.
         # See comments in process.c:copy_thread() for details.
-        movb OLDSS(%esp), %ah
-        movb CS(%esp), %al
+        movb PT_OLDSS(%esp), %ah
+        movb PT_CS(%esp), %al
         andl $(VM_MASK | (SEGMENT_TI_MASK << 8) | SEGMENT_RPL_MASK), %eax
         cmpl $((SEGMENT_LDT << 8) | USER_RPL), %eax
         CFI_REMEMBER_STATE
@@ -390,13 +400,13 @@ restore_nocheck:
         TRACE_IRQS_IRET
 restore_nocheck_notrace:
         RESTORE_REGS
-        addl $4, %esp
+        addl $4, %esp                   # skip orig_eax/error_code
         CFI_ADJUST_CFA_OFFSET -4
 1:      INTERRUPT_RETURN
 .section .fixup,"ax"
 iret_exc:
         TRACE_IRQS_ON
-        ENABLE_INTERRUPTS
+        ENABLE_INTERRUPTS(CLBR_NONE)
         pushl $0                        # no error code
         pushl $do_iret_error
         jmp error_code
@@ -408,33 +418,42 @@ iret_exc:
 
         CFI_RESTORE_STATE
 ldt_ss:
-        larl OLDSS(%esp), %eax
+        larl PT_OLDSS(%esp), %eax
         jnz restore_nocheck
         testl $0x00400000, %eax         # returning to 32bit stack?
         jnz restore_nocheck             # allright, normal return
+
+#ifdef CONFIG_PARAVIRT
+        /*
+         * The kernel can't run on a non-flat stack if paravirt mode
+         * is active.  Rather than try to fixup the high bits of
+         * ESP, bypass this code entirely.  This may break DOSemu
+         * and/or Wine support in a paravirt VM, although the option
+         * is still available to implement the setting of the high
+         * 16-bits in the INTERRUPT_RETURN paravirt-op.
+         */
+        cmpl $0, paravirt_ops+PARAVIRT_enabled
+        jne restore_nocheck
+#endif
+
         /* If returning to userspace with 16bit stack,
          * try to fix the higher word of ESP, as the CPU
          * won't restore it.
          * This is an "official" bug of all the x86-compatible
          * CPUs, which we can try to work around to make
          * dosemu and wine happy. */
-        subl $8, %esp           # reserve space for switch16 pointer
-        CFI_ADJUST_CFA_OFFSET 8
-        DISABLE_INTERRUPTS
+        movl PT_OLDESP(%esp), %eax
+        movl %esp, %edx
+        call patch_espfix_desc
+        pushl $__ESPFIX_SS
+        CFI_ADJUST_CFA_OFFSET 4
+        pushl %eax
+        CFI_ADJUST_CFA_OFFSET 4
+        DISABLE_INTERRUPTS(CLBR_EAX)
         TRACE_IRQS_OFF
-        movl %esp, %eax
-        /* Set up the 16bit stack frame with switch32 pointer on top,
-         * and a switch16 pointer on top of the current frame. */
-        call setup_x86_bogus_stack
-        CFI_ADJUST_CFA_OFFSET -8        # frame has moved
-        TRACE_IRQS_IRET
-        RESTORE_REGS
-        lss 20+4(%esp), %esp    # switch to 16bit stack
-1:      INTERRUPT_RETURN
-.section __ex_table,"a"
-        .align 4
-        .long 1b,iret_exc
-.previous
+        lss (%esp), %esp
+        CFI_ADJUST_CFA_OFFSET -8
+        jmp restore_nocheck
         CFI_ENDPROC
 
         # perform work that needs to be done immediately before resumption
@@ -445,7 +464,7 @@ work_pending:
         jz work_notifysig
 work_resched:
         call schedule
-        DISABLE_INTERRUPTS              # make sure we don't miss an interrupt
+        DISABLE_INTERRUPTS(CLBR_ANY)    # make sure we don't miss an interrupt
                                         # setting need_resched or sigpending
                                         # between sampling and the iret
         TRACE_IRQS_OFF
@@ -458,7 +477,8 @@ work_resched:
 
 work_notifysig:                         # deal with pending signals and
                                         # notify-resume requests
-        testl $VM_MASK, EFLAGS(%esp)
+#ifdef CONFIG_VM86
+        testl $VM_MASK, PT_EFLAGS(%esp)
         movl %esp, %eax
         jne work_notifysig_v86          # returning to kernel-space or
                                         # vm86-space
@@ -468,29 +488,30 @@ work_notifysig:				# deal with pending signals and
 
         ALIGN
 work_notifysig_v86:
-#ifdef CONFIG_VM86
         pushl %ecx                      # save ti_flags for do_notify_resume
         CFI_ADJUST_CFA_OFFSET 4
         call save_v86_state             # %eax contains pt_regs pointer
         popl %ecx
         CFI_ADJUST_CFA_OFFSET -4
         movl %eax, %esp
+#else
+        movl %esp, %eax
+#endif
         xorl %edx, %edx
         call do_notify_resume
         jmp resume_userspace_sig
-#endif
 
         # perform syscall exit tracing
         ALIGN
 syscall_trace_entry:
-        movl $-ENOSYS,EAX(%esp)
+        movl $-ENOSYS,PT_EAX(%esp)
         movl %esp, %eax
         xorl %edx,%edx
         call do_syscall_trace
         cmpl $0, %eax
         jne resume_userspace            # ret != 0 -> running under PTRACE_SYSEMU,
                                         # so must skip actual syscall
-        movl ORIG_EAX(%esp), %eax
+        movl PT_ORIG_EAX(%esp), %eax
         cmpl $(nr_syscalls), %eax
         jnae syscall_call
         jmp syscall_exit
@@ -501,7 +522,7 @@ syscall_exit_work:
         testb $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP), %cl
         jz work_pending
         TRACE_IRQS_ON
-        ENABLE_INTERRUPTS               # could let do_syscall_trace() call
+        ENABLE_INTERRUPTS(CLBR_ANY)     # could let do_syscall_trace() call
                                         # schedule() instead
         movl %esp, %eax
         movl $1, %edx
@@ -515,39 +536,38 @@ syscall_fault:
         CFI_ADJUST_CFA_OFFSET 4
         SAVE_ALL
         GET_THREAD_INFO(%ebp)
-        movl $-EFAULT,EAX(%esp)
+        movl $-EFAULT,PT_EAX(%esp)
         jmp resume_userspace
 
 syscall_badsys:
-        movl $-ENOSYS,EAX(%esp)
+        movl $-ENOSYS,PT_EAX(%esp)
         jmp resume_userspace
         CFI_ENDPROC
 
 #define FIXUP_ESPFIX_STACK \
-        movl %esp, %eax; \
-        /* switch to 32bit stack using the pointer on top of 16bit stack */ \
-        lss %ss:CPU_16BIT_STACK_SIZE-8, %esp; \
-        /* copy data from 16bit stack to 32bit stack */ \
-        call fixup_x86_bogus_stack; \
-        /* put ESP to the proper location */ \
-        movl %eax, %esp;
-#define UNWIND_ESPFIX_STACK \
+        /* since we are on a wrong stack, we cant make it a C code :( */ \
+        movl %gs:PDA_cpu, %ebx; \
+        PER_CPU(cpu_gdt_descr, %ebx); \
+        movl GDS_address(%ebx), %ebx; \
+        GET_DESC_BASE(GDT_ENTRY_ESPFIX_SS, %ebx, %eax, %ax, %al, %ah); \
+        addl %esp, %eax; \
+        pushl $__KERNEL_DS; \
+        CFI_ADJUST_CFA_OFFSET 4; \
         pushl %eax; \
         CFI_ADJUST_CFA_OFFSET 4; \
+        lss (%esp), %esp; \
+        CFI_ADJUST_CFA_OFFSET -8;
+#define UNWIND_ESPFIX_STACK \
         movl %ss, %eax; \
-        /* see if on 16bit stack */ \
+        /* see if on espfix stack */ \
         cmpw $__ESPFIX_SS, %ax; \
-        je 28f; \
-27:     popl %eax; \
-        CFI_ADJUST_CFA_OFFSET -4; \
-.section .fixup,"ax"; \
-28:     movl $__KERNEL_DS, %eax; \
+        jne 27f; \
+        movl $__KERNEL_DS, %eax; \
         movl %eax, %ds; \
         movl %eax, %es; \
-        /* switch to 32bit stack */ \
+        /* switch to normal stack */ \
         FIXUP_ESPFIX_STACK; \
-        jmp 27b; \
-.previous
+27:;
 
 /*
  * Build the entry stubs and pointer table with
@@ -608,13 +628,16 @@ KPROBE_ENTRY(page_fault)
         CFI_ADJUST_CFA_OFFSET 4
         ALIGN
 error_code:
+        /* the function address is in %gs's slot on the stack */
+        pushl %es
+        CFI_ADJUST_CFA_OFFSET 4
+        /*CFI_REL_OFFSET es, 0*/
         pushl %ds
         CFI_ADJUST_CFA_OFFSET 4
         /*CFI_REL_OFFSET ds, 0*/
         pushl %eax
         CFI_ADJUST_CFA_OFFSET 4
         CFI_REL_OFFSET eax, 0
-        xorl %eax, %eax
         pushl %ebp
         CFI_ADJUST_CFA_OFFSET 4
         CFI_REL_OFFSET ebp, 0
@@ -627,7 +650,6 @@ error_code:
         pushl %edx
         CFI_ADJUST_CFA_OFFSET 4
         CFI_REL_OFFSET edx, 0
-        decl %eax                       # eax = -1
         pushl %ecx
         CFI_ADJUST_CFA_OFFSET 4
         CFI_REL_OFFSET ecx, 0
@@ -635,18 +657,20 @@ error_code:
         CFI_ADJUST_CFA_OFFSET 4
         CFI_REL_OFFSET ebx, 0
         cld
-        pushl %es
+        pushl %gs
         CFI_ADJUST_CFA_OFFSET 4
-        /*CFI_REL_OFFSET es, 0*/
+        /*CFI_REL_OFFSET gs, 0*/
+        movl $(__KERNEL_PDA), %ecx
+        movl %ecx, %gs
         UNWIND_ESPFIX_STACK
         popl %ecx
         CFI_ADJUST_CFA_OFFSET -4
         /*CFI_REGISTER es, ecx*/
-        movl ES(%esp), %edi             # get the function address
-        movl ORIG_EAX(%esp), %edx       # get the error code
-        movl %eax, ORIG_EAX(%esp)
-        movl %ecx, ES(%esp)
-        /*CFI_REL_OFFSET es, ES*/
+        movl PT_GS(%esp), %edi          # get the function address
+        movl PT_ORIG_EAX(%esp), %edx    # get the error code
+        movl $-1, PT_ORIG_EAX(%esp)     # no syscall to restart
+        mov  %ecx, PT_GS(%esp)
+        /*CFI_REL_OFFSET gs, ES*/
         movl $(__USER_DS), %ecx
         movl %ecx, %ds
         movl %ecx, %es
@@ -682,7 +706,7 @@ ENTRY(device_not_available)
         GET_CR0_INTO_EAX
         testl $0x4, %eax                # EM (math emulation bit)
         jne device_not_available_emulate
-        preempt_stop
+        preempt_stop(CLBR_ANY)
         call math_state_restore
         jmp ret_from_exception
 device_not_available_emulate:
@@ -754,7 +778,7 @@ KPROBE_ENTRY(nmi)
         cmpw $__ESPFIX_SS, %ax
         popl %eax
         CFI_ADJUST_CFA_OFFSET -4
-        je nmi_16bit_stack
+        je nmi_espfix_stack
         cmpl $sysenter_entry,(%esp)
         je nmi_stack_fixup
         pushl %eax
@@ -797,7 +821,7 @@ nmi_debug_stack_check:
         FIX_STACK(24,nmi_stack_correct, 1)
         jmp nmi_stack_correct
 
-nmi_16bit_stack:
+nmi_espfix_stack:
         /* We have a RING0_INT_FRAME here.
          *
          * create the pointer to lss back
@@ -806,7 +830,6 @@ nmi_16bit_stack:
         CFI_ADJUST_CFA_OFFSET 4
         pushl %esp
         CFI_ADJUST_CFA_OFFSET 4
-        movzwl %sp, %esp
         addw $4, (%esp)
         /* copy the iret frame of 12 bytes */
         .rept 3
@@ -817,11 +840,11 @@ nmi_16bit_stack:
         CFI_ADJUST_CFA_OFFSET 4
         SAVE_ALL
         FIXUP_ESPFIX_STACK              # %eax == %esp
-        CFI_ADJUST_CFA_OFFSET -20       # the frame has now moved
         xorl %edx,%edx                  # zero error code
         call do_nmi
         RESTORE_REGS
-        lss 12+4(%esp), %esp            # back to 16bit stack
+        lss 12+4(%esp), %esp            # back to espfix stack
+        CFI_ADJUST_CFA_OFFSET -24
 1:      INTERRUPT_RETURN
         CFI_ENDPROC
 .section __ex_table,"a"
@@ -830,6 +853,19 @@ nmi_16bit_stack:
 .previous
 KPROBE_END(nmi)
 
+#ifdef CONFIG_PARAVIRT
+ENTRY(native_iret)
+1:      iret
+.section __ex_table,"a"
+        .align 4
+        .long 1b,iret_exc
+.previous
+
+ENTRY(native_irq_enable_sysexit)
+        sti
+        sysexit
+#endif
+
 KPROBE_ENTRY(int3)
         RING0_INT_FRAME
         pushl $-1                       # mark this as an int
@@ -943,37 +979,6 @@ ENTRY(spurious_interrupt_bug)
         jmp error_code
         CFI_ENDPROC
 
-#ifdef CONFIG_STACK_UNWIND
-ENTRY(arch_unwind_init_running)
-        CFI_STARTPROC
-        movl    4(%esp), %edx
-        movl    (%esp), %ecx
-        leal    4(%esp), %eax
-        movl    %ebx, EBX(%edx)
-        xorl    %ebx, %ebx
-        movl    %ebx, ECX(%edx)
-        movl    %ebx, EDX(%edx)
-        movl    %esi, ESI(%edx)
-        movl    %edi, EDI(%edx)
-        movl    %ebp, EBP(%edx)
-        movl    %ebx, EAX(%edx)
-        movl    $__USER_DS, DS(%edx)
-        movl    $__USER_DS, ES(%edx)
-        movl    %ebx, ORIG_EAX(%edx)
-        movl    %ecx, EIP(%edx)
-        movl    12(%esp), %ecx
-        movl    $__KERNEL_CS, CS(%edx)
-        movl    %ebx, EFLAGS(%edx)
-        movl    %eax, OLDESP(%edx)
-        movl    8(%esp), %eax
-        movl    %ecx, 8(%esp)
-        movl    EBX(%edx), %ebx
-        movl    $__KERNEL_DS, OLDSS(%edx)
-        jmpl    *%eax
-        CFI_ENDPROC
-ENDPROC(arch_unwind_init_running)
-#endif
-
 ENTRY(kernel_thread_helper)
         pushl $0                # fake return address for unwinder
         CFI_STARTPROC
diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S
index ca31f18d277c..edef5084ce17 100644
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S
@@ -55,6 +55,12 @@
  */
 ENTRY(startup_32)
 
+#ifdef CONFIG_PARAVIRT
+        movl %cs, %eax
+        testl $0x3, %eax
+        jnz startup_paravirt
+#endif
+
 /*
  * Set segments to known values.
  */
@@ -302,6 +308,7 @@ is386:	movl $2,%ecx		# set MP
         movl %eax,%cr0
 
         call check_x87
+        call setup_pda
         lgdt cpu_gdt_descr
         lidt idt_descr
         ljmp $(__KERNEL_CS),$1f
@@ -312,10 +319,13 @@ is386:	movl $2,%ecx		# set MP
         movl %eax,%ds
         movl %eax,%es
 
-        xorl %eax,%eax                  # Clear FS/GS and LDT
+        xorl %eax,%eax                  # Clear FS and LDT
         movl %eax,%fs
-        movl %eax,%gs
         lldt %ax
+
+        movl $(__KERNEL_PDA),%eax
+        mov  %eax,%gs
+
         cld                     # gcc2 wants the direction flag cleared at all times
         pushl $0                # fake return address for unwinder
 #ifdef CONFIG_SMP
@@ -346,6 +356,23 @@ check_x87:
         ret
 
 /*
+ * Point the GDT at this CPU's PDA.  On boot this will be
+ * cpu_gdt_table and boot_pda; for secondary CPUs, these will be
+ * that CPU's GDT and PDA.
+ */
+setup_pda:
+        /* get the PDA pointer */
+        movl start_pda, %eax
+
+        /* slot the PDA address into the GDT */
+        mov cpu_gdt_descr+2, %ecx
+        mov %ax, (__KERNEL_PDA+0+2)(%ecx)               /* base & 0x0000ffff */
+        shr $16, %eax
+        mov %al, (__KERNEL_PDA+4+0)(%ecx)               /* base & 0x00ff0000 */
+        mov %ah, (__KERNEL_PDA+4+3)(%ecx)               /* base & 0xff000000 */
+        ret
+
+/*
  *  setup_idt
  *
  *  sets up a idt with 256 entries pointing to
@@ -465,6 +492,33 @@ ignore_int:
 #endif
         iret
 
+#ifdef CONFIG_PARAVIRT
+startup_paravirt:
+        cld
+        movl $(init_thread_union+THREAD_SIZE),%esp
+
+        /* We take pains to preserve all the regs. */
+        pushl   %edx
+        pushl   %ecx
+        pushl   %eax
+
+        /* paravirt.o is last in link, and that probe fn never returns */
+        pushl   $__start_paravirtprobe
+1:
+        movl    0(%esp), %eax
+        pushl   (%eax)
+        movl    8(%esp), %eax
+        call    *(%esp)
+        popl    %eax
+
+        movl    4(%esp), %eax
+        movl    8(%esp), %ecx
+        movl    12(%esp), %edx
+
+        addl    $4, (%esp)
+        jmp     1b
+#endif
+
 /*
  * Real beginning of normal "text" segment
  */
@@ -484,6 +538,8 @@ ENTRY(empty_zero_page)
  * This starts the data section.
  */
 .data
+ENTRY(start_pda)
+        .long boot_pda
 
 ENTRY(stack_start)
         .long init_thread_union+THREAD_SIZE
@@ -525,7 +581,7 @@ idt_descr:
 
 # boot GDT descriptor (later on used by CPU#0):
         .word 0                         # 32 bit align gdt_desc.address
-cpu_gdt_descr:
+ENTRY(cpu_gdt_descr)
         .word GDT_ENTRIES*8-1
         .long cpu_gdt_table
 
@@ -584,8 +640,8 @@ ENTRY(cpu_gdt_table)
         .quad 0x00009a000000ffff        /* 0xc0 APM CS 16 code (16 bit) */
         .quad 0x004092000000ffff        /* 0xc8 APM DS    data */
 
-        .quad 0x0000920000000000        /* 0xd0 - ESPFIX 16-bit SS */
-        .quad 0x0000000000000000        /* 0xd8 - unused */
+        .quad 0x00c0920000000000        /* 0xd0 - ESPFIX SS */
+        .quad 0x00cf92000000ffff        /* 0xd8 - PDA */
         .quad 0x0000000000000000        /* 0xe0 - unused */
         .quad 0x0000000000000000        /* 0xe8 - unused */
         .quad 0x0000000000000000        /* 0xf0 - unused */
diff --git a/arch/i386/kernel/hpet.c b/arch/i386/kernel/hpet.c
index 17647a530b2f..45a8685bb60b 100644
--- a/arch/i386/kernel/hpet.c
+++ b/arch/i386/kernel/hpet.c
@@ -34,6 +34,7 @@ static int __init init_hpet_clocksource(void)
         unsigned long hpet_period;
         void __iomem* hpet_base;
         u64 tmp;
+        int err;
 
         if (!is_hpet_enabled())
                 return -ENODEV;
@@ -61,7 +62,11 @@ static int __init init_hpet_clocksource(void)
         do_div(tmp, FSEC_PER_NSEC);
         clocksource_hpet.mult = (u32)tmp;
 
-        return clocksource_register(&clocksource_hpet);
+        err = clocksource_register(&clocksource_hpet);
+        if (err)
+                iounmap(hpet_base);
+
+        return err;
 }
 
 module_init(init_hpet_clocksource);
diff --git a/arch/i386/kernel/i8259.c b/arch/i386/kernel/i8259.c
index 62996cd17084..c8d45821c788 100644
--- a/arch/i386/kernel/i8259.c
+++ b/arch/i386/kernel/i8259.c
@@ -381,7 +381,10 @@ void __init init_ISA_irqs (void)
         }
 }
 
-void __init init_IRQ(void)
+/* Overridden in paravirt.c */
+void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ")));
+
+void __init native_init_IRQ(void)
 {
         int i;
 
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 3b7a63e0ed1a..2424cc9c7b3d 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -34,6 +34,7 @@
 #include <linux/pci.h>
 #include <linux/msi.h>
 #include <linux/htirq.h>
+#include <linux/freezer.h>
 
 #include <asm/io.h>
 #include <asm/smp.h>
@@ -153,14 +154,20 @@ static struct IO_APIC_route_entry ioapic_read_entry(int apic, int pin)
  * the interrupt, and we need to make sure the entry is fully populated
  * before that happens.
  */
-static void ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e)
+static void
+__ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e)
 {
-        unsigned long flags;
         union entry_union eu;
         eu.entry = e;
-        spin_lock_irqsave(&ioapic_lock, flags);
         io_apic_write(apic, 0x11 + 2*pin, eu.w2);
         io_apic_write(apic, 0x10 + 2*pin, eu.w1);
+}
+
+static void ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&ioapic_lock, flags);
+        __ioapic_write_entry(apic, pin, e);
         spin_unlock_irqrestore(&ioapic_lock, flags);
 }
 
@@ -836,8 +843,7 @@ static int __init find_isa_irq_pin(int irq, int type)
 
                 if ((mp_bus_id_to_type[lbus] == MP_BUS_ISA ||
                      mp_bus_id_to_type[lbus] == MP_BUS_EISA ||
-                     mp_bus_id_to_type[lbus] == MP_BUS_MCA ||
-                     mp_bus_id_to_type[lbus] == MP_BUS_NEC98
+                     mp_bus_id_to_type[lbus] == MP_BUS_MCA
                     ) &&
                     (mp_irqs[i].mpc_irqtype == type) &&
                     (mp_irqs[i].mpc_srcbusirq == irq))
@@ -856,8 +862,7 @@ static int __init find_isa_irq_apic(int irq, int type)
 
                 if ((mp_bus_id_to_type[lbus] == MP_BUS_ISA ||
                      mp_bus_id_to_type[lbus] == MP_BUS_EISA ||
-                     mp_bus_id_to_type[lbus] == MP_BUS_MCA ||
-                     mp_bus_id_to_type[lbus] == MP_BUS_NEC98
+                     mp_bus_id_to_type[lbus] == MP_BUS_MCA
                     ) &&
                     (mp_irqs[i].mpc_irqtype == type) &&
                     (mp_irqs[i].mpc_srcbusirq == irq))
@@ -987,12 +992,6 @@ static int EISA_ELCR(unsigned int irq)
 #define default_MCA_trigger(idx)        (1)
 #define default_MCA_polarity(idx)       (0)
 
-/* NEC98 interrupts are always polarity zero edge triggered,
- * when listed as conforming in the MP table. */
-
-#define default_NEC98_trigger(idx)     (0)
-#define default_NEC98_polarity(idx)    (0)
-
 static int __init MPBIOS_polarity(int idx)
 {
         int bus = mp_irqs[idx].mpc_srcbus;
@@ -1027,11 +1026,6 @@ static int __init MPBIOS_polarity(int idx)
                                         polarity = default_MCA_polarity(idx);
                                         break;
                                 }
-                                case MP_BUS_NEC98: /* NEC 98 pin */
-                                {
-                                        polarity = default_NEC98_polarity(idx);
-                                        break;
-                                }
                                 default:
                                 {
                                         printk(KERN_WARNING "broken BIOS!!\n");
@@ -1101,11 +1095,6 @@ static int MPBIOS_trigger(int idx)
                                         trigger = default_MCA_trigger(idx);
                                         break;
                                 }
-                                case MP_BUS_NEC98: /* NEC 98 pin */
-                                {
-                                        trigger = default_NEC98_trigger(idx);
-                                        break;
-                                }
                                 default:
                                 {
                                         printk(KERN_WARNING "broken BIOS!!\n");
@@ -1167,7 +1156,6 @@ static int pin_2_irq(int idx, int apic, int pin)
                 case MP_BUS_ISA: /* ISA pin */
                 case MP_BUS_EISA:
                 case MP_BUS_MCA:
-                case MP_BUS_NEC98:
                 {
                         irq = mp_irqs[idx].mpc_srcbusirq;
                         break;
@@ -1235,7 +1223,7 @@ static inline int IO_APIC_irq_trigger(int irq)
 }
 
 /* irq_vectors is indexed by the sum of all RTEs in all I/O APICs. */
-u8 irq_vector[NR_IRQ_VECTORS] __read_mostly = { FIRST_DEVICE_VECTOR , 0 };
+static u8 irq_vector[NR_IRQ_VECTORS] __read_mostly = { FIRST_DEVICE_VECTOR , 0 };
 
 static int __assign_irq_vector(int irq)
 {
@@ -1360,8 +1348,8 @@ static void __init setup_IO_APIC_irqs(void)
                         if (!apic && (irq < 16))
                                 disable_8259A_irq(irq);
                 }
-                ioapic_write_entry(apic, pin, entry);
                 spin_lock_irqsave(&ioapic_lock, flags);
+                __ioapic_write_entry(apic, pin, entry);
                 set_native_irq_info(irq, TARGET_CPUS);
                 spin_unlock_irqrestore(&ioapic_lock, flags);
         }
@@ -1926,6 +1914,15 @@ static void __init setup_ioapic_ids_from_mpc(void)
 static void __init setup_ioapic_ids_from_mpc(void) { }
 #endif
 
+static int no_timer_check __initdata;
+
+static int __init notimercheck(char *s)
+{
+        no_timer_check = 1;
+        return 1;
+}
+__setup("no_timer_check", notimercheck);
+
 /*
  * There is a nasty bug in some older SMP boards, their mptable lies
  * about the timer IRQ. We do the following to work around the situation:
@@ -1934,10 +1931,13 @@ static void __init setup_ioapic_ids_from_mpc(void) { }
  *      - if this function detects that timer IRQs are defunct, then we fall
  *        back to ISA timer IRQs
  */
-static int __init timer_irq_works(void)
+int __init timer_irq_works(void)
 {
         unsigned long t1 = jiffies;
 
+        if (no_timer_check)
+                return 1;
+
         local_irq_enable();
         /* Let ten ticks pass... */
         mdelay((10 * 1000) / HZ);
@@ -2161,9 +2161,15 @@ static inline void unlock_ExtINT_logic(void)
         unsigned char save_control, save_freq_select;
 
         pin  = find_isa_irq_pin(8, mp_INT);
+        if (pin == -1) {
+                WARN_ON_ONCE(1);
+                return;
+        }
         apic = find_isa_irq_apic(8, mp_INT);
-        if (pin == -1)
+        if (apic == -1) {
+                WARN_ON_ONCE(1);
                 return;
+        }
 
         entry0 = ioapic_read_entry(apic, pin);
         clear_IO_APIC_pin(apic, pin);
@@ -2208,7 +2214,7 @@ int timer_uses_ioapic_pin_0;
  * is so screwy.  Thanks to Brian Perkins for testing/hacking this beast
  * fanatically on his truly buggy board.
  */
-static inline void check_timer(void)
+static inline void __init check_timer(void)
 {
         int apic1, pin1, apic2, pin2;
         int vector;
@@ -2479,7 +2485,7 @@ device_initcall(ioapic_init_sysfs);
 int create_irq(void)
 {
         /* Allocate an unused irq */
-        int irq, new, vector;
+        int irq, new, vector = 0;
         unsigned long flags;
 
         irq = -ENOSPC;
@@ -2856,8 +2862,8 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
         if (!ioapic && (irq < 16))
                 disable_8259A_irq(irq);
 
-        ioapic_write_entry(ioapic, pin, entry);
         spin_lock_irqsave(&ioapic_lock, flags);
+        __ioapic_write_entry(ioapic, pin, entry);
         set_native_irq_info(irq, TARGET_CPUS);
         spin_unlock_irqrestore(&ioapic_lock, flags);
 
diff --git a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c
index fc79e1e859c4..af1d53344993 100644
--- a/arch/i386/kernel/kprobes.c
+++ b/arch/i386/kernel/kprobes.c
@@ -184,7 +184,7 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
 void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
         mutex_lock(&kprobe_mutex);
-        free_insn_slot(p->ainsn.insn);
+        free_insn_slot(p->ainsn.insn, (p->ainsn.boostable == 1));
         mutex_unlock(&kprobe_mutex);
 }
 
@@ -333,7 +333,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
                 return 1;
 
 ss_probe:
-#ifndef CONFIG_PREEMPT
+#if !defined(CONFIG_PREEMPT) || defined(CONFIG_PM)
         if (p->ainsn.boostable == 1 && !p->post_handler){
                 /* Boost up -- we can execute copied instructions directly */
                 reset_current_kprobe();
diff --git a/arch/i386/kernel/ldt.c b/arch/i386/kernel/ldt.c
index 445211eb2d57..b410e5fb034f 100644
--- a/arch/i386/kernel/ldt.c
+++ b/arch/i386/kernel/ldt.c
@@ -160,16 +160,14 @@ static int read_default_ldt(void __user * ptr, unsigned long bytecount)
 {
         int err;
         unsigned long size;
-        void *address;
 
         err = 0;
-        address = &default_ldt[0];
         size = 5*sizeof(struct desc_struct);
         if (size > bytecount)
                 size = bytecount;
 
         err = size;
-        if (copy_to_user(ptr, address, size))
+        if (clear_user(ptr, size))
                 err = -EFAULT;
 
         return err;
diff --git a/arch/i386/kernel/mca.c b/arch/i386/kernel/mca.c
index eb57a851789d..b83672b89527 100644
--- a/arch/i386/kernel/mca.c
+++ b/arch/i386/kernel/mca.c
@@ -283,10 +283,9 @@ static int __init mca_init(void)
         bus->f.mca_transform_memory = mca_dummy_transform_memory;
 
         /* get the motherboard device */
-        mca_dev = kmalloc(sizeof(struct mca_device), GFP_KERNEL);
+        mca_dev = kzalloc(sizeof(struct mca_device), GFP_KERNEL);
         if(unlikely(!mca_dev))
                 goto out_nomem;
-        memset(mca_dev, 0, sizeof(struct mca_device));
 
         /*
          * We do not expect many MCA interrupts during initialization,
@@ -310,11 +309,9 @@ static int __init mca_init(void)
         mca_dev->slot = MCA_MOTHERBOARD;
         mca_register_device(MCA_PRIMARY_BUS, mca_dev);
 
-        mca_dev = kmalloc(sizeof(struct mca_device), GFP_ATOMIC);
+        mca_dev = kzalloc(sizeof(struct mca_device), GFP_ATOMIC);
         if(unlikely(!mca_dev))
                 goto out_unlock_nomem;
-        memset(mca_dev, 0, sizeof(struct mca_device));
-
 
         /* Put motherboard into video setup mode, read integrated video
          * POS registers, and turn motherboard setup off.
@@ -349,10 +346,9 @@ static int __init mca_init(void)
         }
         if(which_scsi) {
                 /* found a scsi card */
-                mca_dev = kmalloc(sizeof(struct mca_device), GFP_ATOMIC);
+                mca_dev = kzalloc(sizeof(struct mca_device), GFP_ATOMIC);
                 if(unlikely(!mca_dev))
                         goto out_unlock_nomem;
-                memset(mca_dev, 0, sizeof(struct mca_device));
 
                 for(j = 0; j < 8; j++)
                         mca_dev->pos[j] = pos[j];
@@ -378,10 +374,9 @@ static int __init mca_init(void)
                 if(!mca_read_and_store_pos(pos))
                         continue;
 
-                mca_dev = kmalloc(sizeof(struct mca_device), GFP_ATOMIC);
+                mca_dev = kzalloc(sizeof(struct mca_device), GFP_ATOMIC);
                 if(unlikely(!mca_dev))
                         goto out_unlock_nomem;
-                memset(mca_dev, 0, sizeof(struct mca_device));
 
                 for(j=0; j<8; j++)
                         mca_dev->pos[j]=pos[j];
diff --git a/arch/i386/kernel/microcode.c b/arch/i386/kernel/microcode.c
index 23f5984d0654..c8fa13721bcb 100644
--- a/arch/i386/kernel/microcode.c
+++ b/arch/i386/kernel/microcode.c
@@ -1,7 +1,7 @@
 /*
  *      Intel CPU Microcode Update Driver for Linux
  *
- *      Copyright (C) 2000-2004 Tigran Aivazian
+ *      Copyright (C) 2000-2006 Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
  *                    2006      Shaohua Li <shaohua.li@intel.com>
  *
  *      This driver allows to upgrade microcode on Intel processors
@@ -92,7 +92,7 @@
 #include <asm/processor.h>
 
 MODULE_DESCRIPTION("Intel CPU (IA-32) Microcode Update Driver");
-MODULE_AUTHOR("Tigran Aivazian <tigran@veritas.com>");
+MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");
 MODULE_LICENSE("GPL");
 
 #define MICROCODE_VERSION       "1.14a"
@@ -703,7 +703,6 @@ static struct sysdev_driver mc_sysdev_driver = {
         .resume = mc_sysdev_resume,
 };
 
-#ifdef CONFIG_HOTPLUG_CPU
 static __cpuinit int
 mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
 {
@@ -723,10 +722,9 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
         return NOTIFY_OK;
 }
 
-static struct notifier_block mc_cpu_notifier = {
+static struct notifier_block __cpuinitdata mc_cpu_notifier = {
         .notifier_call = mc_cpu_callback,
 };
-#endif
 
 static int __init microcode_init (void)
 {
@@ -754,7 +752,7 @@ static int __init microcode_init (void)
         register_hotcpu_notifier(&mc_cpu_notifier);
 
         printk(KERN_INFO 
-                "IA-32 Microcode Update Driver: v" MICROCODE_VERSION " <tigran@veritas.com>\n");
+                "IA-32 Microcode Update Driver: v" MICROCODE_VERSION " <tigran@aivazian.fsnet.co.uk>\n");
         return 0;
 }
 
diff --git a/arch/i386/kernel/module.c b/arch/i386/kernel/module.c
index 470cf97e7cd3..3db0a5442eb1 100644
--- a/arch/i386/kernel/module.c
+++ b/arch/i386/kernel/module.c
@@ -21,6 +21,7 @@
 #include <linux/fs.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
+#include <linux/bug.h>
 
 #if 0
 #define DEBUGP printk
@@ -108,7 +109,8 @@ int module_finalize(const Elf_Ehdr *hdr,
                     const Elf_Shdr *sechdrs,
                     struct module *me)
 {
-        const Elf_Shdr *s, *text = NULL, *alt = NULL, *locks = NULL;
+        const Elf_Shdr *s, *text = NULL, *alt = NULL, *locks = NULL,
+                *para = NULL;
         char *secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
 
         for (s = sechdrs; s < sechdrs + hdr->e_shnum; s++) { 
@@ -118,6 +120,8 @@ int module_finalize(const Elf_Ehdr *hdr,
                         alt = s;
                 if (!strcmp(".smp_locks", secstrings + s->sh_name))
                         locks= s;
+                if (!strcmp(".parainstructions", secstrings + s->sh_name))
+                        para = s;
         }
 
         if (alt) {
@@ -132,10 +136,17 @@ int module_finalize(const Elf_Ehdr *hdr,
                                             lseg, lseg + locks->sh_size,
                                             tseg, tseg + text->sh_size);
         }
-        return 0;
+
+        if (para) {
+                void *pseg = (void *)para->sh_addr;
+                apply_paravirt(pseg, pseg + para->sh_size);
+        }
+
+        return module_bug_finalize(hdr, sechdrs, me);
 }
 
 void module_arch_cleanup(struct module *mod)
 {
         alternatives_smp_module_del(mod);
+        module_bug_cleanup(mod);
 }
diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index 442aaf8c77eb..49bff3596bff 100644
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -36,7 +36,7 @@
 
 /* Have we found an MP table */
 int smp_found_config;
-unsigned int __initdata maxcpus = NR_CPUS;
+unsigned int __cpuinitdata maxcpus = NR_CPUS;
 
 /*
  * Various Linux-internal data structures created from the
@@ -102,9 +102,9 @@ static int __init mpf_checksum(unsigned char *mp, int len)
  */
 
 static int mpc_record; 
-static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY] __initdata;
+static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY] __cpuinitdata;
 
-static void __devinit MP_processor_info (struct mpc_config_processor *m)
+static void __cpuinit MP_processor_info (struct mpc_config_processor *m)
 {
         int ver, apicid;
         physid_mask_t phys_cpu;
@@ -249,8 +249,6 @@ static void __init MP_bus_info (struct mpc_config_bus *m)
                 mp_current_pci_id++;
         } else if (strncmp(str, BUSTYPE_MCA, sizeof(BUSTYPE_MCA)-1) == 0) {
                 mp_bus_id_to_type[m->mpc_busid] = MP_BUS_MCA;
-        } else if (strncmp(str, BUSTYPE_NEC98, sizeof(BUSTYPE_NEC98)-1) == 0) {
-                mp_bus_id_to_type[m->mpc_busid] = MP_BUS_NEC98;
         } else {
                 printk(KERN_WARNING "Unknown bustype %s - ignoring\n", str);
         }
@@ -824,7 +822,7 @@ void __init mp_register_lapic_address(u64 address)
         Dprintk("Boot CPU = %d\n", boot_cpu_physical_apicid);
 }
 
-void __devinit mp_register_lapic (u8 id, u8 enabled)
+void __cpuinit mp_register_lapic (u8 id, u8 enabled)
 {
         struct mpc_config_processor processor;
         int boot_cpu = 0;
diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c
index d535cdbbfd25..4a472a17d1c6 100644
--- a/arch/i386/kernel/msr.c
+++ b/arch/i386/kernel/msr.c
@@ -172,7 +172,7 @@ static ssize_t msr_read(struct file *file, char __user * buf,
         u32 __user *tmp = (u32 __user *) buf;
         u32 data[2];
         u32 reg = *ppos;
-        int cpu = iminor(file->f_dentry->d_inode);
+        int cpu = iminor(file->f_path.dentry->d_inode);
         int err;
 
         if (count % 8)
@@ -195,15 +195,14 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
 {
         const u32 __user *tmp = (const u32 __user *)buf;
         u32 data[2];
-        size_t rv;
         u32 reg = *ppos;
-        int cpu = iminor(file->f_dentry->d_inode);
+        int cpu = iminor(file->f_path.dentry->d_inode);
         int err;
 
         if (count % 8)
                 return -EINVAL; /* Invalid chunk size */
 
-        for (rv = 0; count; count -= 8) {
+        for (; count; count -= 8) {
                 if (copy_from_user(&data, tmp, 8))
                         return -EFAULT;
                 err = do_wrmsr(cpu, reg, data[0], data[1]);
@@ -217,7 +216,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
 
 static int msr_open(struct inode *inode, struct file *file)
 {
-        unsigned int cpu = iminor(file->f_dentry->d_inode);
+        unsigned int cpu = iminor(file->f_path.dentry->d_inode);
         struct cpuinfo_x86 *c = &(cpu_data)[cpu];
 
         if (cpu >= NR_CPUS || !cpu_online(cpu))
@@ -239,18 +238,17 @@ 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;
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
 static int msr_class_cpu_callback(struct notifier_block *nfb,
                                 unsigned long action, void *hcpu)
 {
@@ -258,10 +256,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;
@@ -271,7 +269,6 @@ static struct notifier_block __cpuinitdata msr_class_cpu_notifier =
 {
         .notifier_call = msr_class_cpu_callback,
 };
-#endif
 
 static int __init msr_init(void)
 {
@@ -290,7 +287,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 +299,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 +311,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/nmi.c b/arch/i386/kernel/nmi.c
index eaafe233a5da..a5e34d655965 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -22,6 +22,7 @@
 #include <linux/percpu.h>
 #include <linux/dmi.h>
 #include <linux/kprobes.h>
+#include <linux/cpumask.h>
 
 #include <asm/smp.h>
 #include <asm/nmi.h>
@@ -42,6 +43,8 @@ int nmi_watchdog_enabled;
 static DEFINE_PER_CPU(unsigned long, perfctr_nmi_owner);
 static DEFINE_PER_CPU(unsigned long, evntsel_nmi_owner[3]);
 
+static cpumask_t backtrace_mask = CPU_MASK_NONE;
+
 /* this number is calculated from Intel's MSR_P4_CRU_ESCR5 register and it's
  * offset from MSR_P4_BSU_ESCR0.  It will be the max for all platforms (for now)
  */
@@ -192,6 +195,8 @@ static __cpuinit inline int nmi_known_cpu(void)
         return 0;
 }
 
+static int endflag __initdata = 0;
+
 #ifdef CONFIG_SMP
 /* The performance counters used by NMI_LOCAL_APIC don't trigger when
  * the CPU is idle. To make sure the NMI watchdog really ticks on all
@@ -199,7 +204,6 @@ static __cpuinit inline int nmi_known_cpu(void)
  */
 static __init void nmi_cpu_busy(void *data)
 {
-        volatile int *endflag = data;
         local_irq_enable_in_hardirq();
         /* Intentionally don't use cpu_relax here. This is
            to make sure that the performance counter really ticks,
@@ -207,14 +211,13 @@ static __init void nmi_cpu_busy(void *data)
            pause instruction. On a real HT machine this is fine because
            all other CPUs are busy with "useless" delay loops and don't
            care if they get somewhat less cycles. */
-        while (*endflag == 0)
-                barrier();
+        while (endflag == 0)
+                mb();
 }
 #endif
 
 static int __init check_nmi_watchdog(void)
 {
-        volatile int endflag = 0;
         unsigned int *prev_nmi_count;
         int cpu;
 
@@ -867,14 +870,16 @@ static unsigned int
 
 void touch_nmi_watchdog (void)
 {
-        int i;
+        if (nmi_watchdog > 0) {
+                unsigned cpu;
 
-        /*
-         * Just reset the alert counters, (other CPUs might be
-         * spinning on locks we hold):
-         */
-        for_each_possible_cpu(i)
-                alert_counter[i] = 0;
+                /*
+                 * Just reset the alert counters, (other CPUs might be
+                 * spinning on locks we hold):
+                 */
+                for_each_present_cpu (cpu)
+                        alert_counter[cpu] = 0;
+        }
 
         /*
          * Tickle the softlockup detector too:
@@ -907,6 +912,16 @@ __kprobes int nmi_watchdog_tick(struct pt_regs * regs, unsigned reason)
                 touched = 1;
         }
 
+        if (cpu_isset(cpu, backtrace_mask)) {
+                static DEFINE_SPINLOCK(lock);   /* Serialise the printks */
+
+                spin_lock(&lock);
+                printk("NMI backtrace for cpu %d\n", cpu);
+                dump_stack();
+                spin_unlock(&lock);
+                cpu_clear(cpu, backtrace_mask);
+        }
+
         sum = per_cpu(irq_stat, cpu).apic_timer_irqs;
 
         /* if the apic timer isn't firing, this cpu isn't doing much */
@@ -1033,6 +1048,19 @@ int proc_nmi_enabled(struct ctl_table *table, int write, struct file *file,
 
 #endif
 
+void __trigger_all_cpu_backtrace(void)
+{
+        int i;
+
+        backtrace_mask = cpu_online_map;
+        /* Wait for up to 10 seconds for all CPUs to do the backtrace */
+        for (i = 0; i < 10 * 1000; i++) {
+                if (cpus_empty(backtrace_mask))
+                        break;
+                mdelay(1);
+        }
+}
+
 EXPORT_SYMBOL(nmi_active);
 EXPORT_SYMBOL(nmi_watchdog);
 EXPORT_SYMBOL(avail_to_resrv_perfctr_nmi);
diff --git a/arch/i386/kernel/paravirt.c b/arch/i386/kernel/paravirt.c
new file mode 100644
index 000000000000..3dceab5828f1
--- /dev/null
+++ b/arch/i386/kernel/paravirt.c
@@ -0,0 +1,569 @@
+/*  Paravirtualization interfaces
+    Copyright (C) 2006 Rusty Russell IBM Corporation
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include <linux/errno.h>
+#include <linux/module.h>
+#include <linux/efi.h>
+#include <linux/bcd.h>
+#include <linux/start_kernel.h>
+
+#include <asm/bug.h>
+#include <asm/paravirt.h>
+#include <asm/desc.h>
+#include <asm/setup.h>
+#include <asm/arch_hooks.h>
+#include <asm/time.h>
+#include <asm/irq.h>
+#include <asm/delay.h>
+#include <asm/fixmap.h>
+#include <asm/apic.h>
+#include <asm/tlbflush.h>
+
+/* nop stub */
+static void native_nop(void)
+{
+}
+
+static void __init default_banner(void)
+{
+        printk(KERN_INFO "Booting paravirtualized kernel on %s\n",
+               paravirt_ops.name);
+}
+
+char *memory_setup(void)
+{
+        return paravirt_ops.memory_setup();
+}
+
+/* Simple instruction patching code. */
+#define DEF_NATIVE(name, code)                                  \
+        extern const char start_##name[], end_##name[];         \
+        asm("start_" #name ": " code "; end_" #name ":")
+DEF_NATIVE(cli, "cli");
+DEF_NATIVE(sti, "sti");
+DEF_NATIVE(popf, "push %eax; popf");
+DEF_NATIVE(pushf, "pushf; pop %eax");
+DEF_NATIVE(pushf_cli, "pushf; pop %eax; cli");
+DEF_NATIVE(iret, "iret");
+DEF_NATIVE(sti_sysexit, "sti; sysexit");
+
+static const struct native_insns
+{
+        const char *start, *end;
+} native_insns[] = {
+        [PARAVIRT_IRQ_DISABLE] = { start_cli, end_cli },
+        [PARAVIRT_IRQ_ENABLE] = { start_sti, end_sti },
+        [PARAVIRT_RESTORE_FLAGS] = { start_popf, end_popf },
+        [PARAVIRT_SAVE_FLAGS] = { start_pushf, end_pushf },
+        [PARAVIRT_SAVE_FLAGS_IRQ_DISABLE] = { start_pushf_cli, end_pushf_cli },
+        [PARAVIRT_INTERRUPT_RETURN] = { start_iret, end_iret },
+        [PARAVIRT_STI_SYSEXIT] = { start_sti_sysexit, end_sti_sysexit },
+};
+
+static unsigned native_patch(u8 type, u16 clobbers, void *insns, unsigned len)
+{
+        unsigned int insn_len;
+
+        /* Don't touch it if we don't have a replacement */
+        if (type >= ARRAY_SIZE(native_insns) || !native_insns[type].start)
+                return len;
+
+        insn_len = native_insns[type].end - native_insns[type].start;
+
+        /* Similarly if we can't fit replacement. */
+        if (len < insn_len)
+                return len;
+
+        memcpy(insns, native_insns[type].start, insn_len);
+        return insn_len;
+}
+
+static fastcall unsigned long native_get_debugreg(int regno)
+{
+        unsigned long val = 0;  /* Damn you, gcc! */
+
+        switch (regno) {
+        case 0:
+                asm("movl %%db0, %0" :"=r" (val)); break;
+        case 1:
+                asm("movl %%db1, %0" :"=r" (val)); break;
+        case 2:
+                asm("movl %%db2, %0" :"=r" (val)); break;
+        case 3:
+                asm("movl %%db3, %0" :"=r" (val)); break;
+        case 6:
+                asm("movl %%db6, %0" :"=r" (val)); break;
+        case 7:
+                asm("movl %%db7, %0" :"=r" (val)); break;
+        default:
+                BUG();
+        }
+        return val;
+}
+
+static fastcall void native_set_debugreg(int regno, unsigned long value)
+{
+        switch (regno) {
+        case 0:
+                asm("movl %0,%%db0"     : /* no output */ :"r" (value));
+                break;
+        case 1:
+                asm("movl %0,%%db1"     : /* no output */ :"r" (value));
+                break;
+        case 2:
+                asm("movl %0,%%db2"     : /* no output */ :"r" (value));
+                break;
+        case 3:
+                asm("movl %0,%%db3"     : /* no output */ :"r" (value));
+                break;
+        case 6:
+                asm("movl %0,%%db6"     : /* no output */ :"r" (value));
+                break;
+        case 7:
+                asm("movl %0,%%db7"     : /* no output */ :"r" (value));
+                break;
+        default:
+                BUG();
+        }
+}
+
+void init_IRQ(void)
+{
+        paravirt_ops.init_IRQ();
+}
+
+static fastcall void native_clts(void)
+{
+        asm volatile ("clts");
+}
+
+static fastcall unsigned long native_read_cr0(void)
+{
+        unsigned long val;
+        asm volatile("movl %%cr0,%0\n\t" :"=r" (val));
+        return val;
+}
+
+static fastcall void native_write_cr0(unsigned long val)
+{
+        asm volatile("movl %0,%%cr0": :"r" (val));
+}
+
+static fastcall unsigned long native_read_cr2(void)
+{
+        unsigned long val;
+        asm volatile("movl %%cr2,%0\n\t" :"=r" (val));
+        return val;
+}
+
+static fastcall void native_write_cr2(unsigned long val)
+{
+        asm volatile("movl %0,%%cr2": :"r" (val));
+}
+
+static fastcall unsigned long native_read_cr3(void)
+{
+        unsigned long val;
+        asm volatile("movl %%cr3,%0\n\t" :"=r" (val));
+        return val;
+}
+
+static fastcall void native_write_cr3(unsigned long val)
+{
+        asm volatile("movl %0,%%cr3": :"r" (val));
+}
+
+static fastcall unsigned long native_read_cr4(void)
+{
+        unsigned long val;
+        asm volatile("movl %%cr4,%0\n\t" :"=r" (val));
+        return val;
+}
+
+static fastcall unsigned long native_read_cr4_safe(void)
+{
+        unsigned long val;
+        /* This could fault if %cr4 does not exist */
+        asm("1: movl %%cr4, %0          \n"
+                "2:                             \n"
+                ".section __ex_table,\"a\"      \n"
+                ".long 1b,2b                    \n"
+                ".previous                      \n"
+                : "=r" (val): "0" (0));
+        return val;
+}
+
+static fastcall void native_write_cr4(unsigned long val)
+{
+        asm volatile("movl %0,%%cr4": :"r" (val));
+}
+
+static fastcall unsigned long native_save_fl(void)
+{
+        unsigned long f;
+        asm volatile("pushfl ; popl %0":"=g" (f): /* no input */);
+        return f;
+}
+
+static fastcall void native_restore_fl(unsigned long f)
+{
+        asm volatile("pushl %0 ; popfl": /* no output */
+                             :"g" (f)
+                             :"memory", "cc");
+}
+
+static fastcall void native_irq_disable(void)
+{
+        asm volatile("cli": : :"memory");
+}
+
+static fastcall void native_irq_enable(void)
+{
+        asm volatile("sti": : :"memory");
+}
+
+static fastcall void native_safe_halt(void)
+{
+        asm volatile("sti; hlt": : :"memory");
+}
+
+static fastcall void native_halt(void)
+{
+        asm volatile("hlt": : :"memory");
+}
+
+static fastcall void native_wbinvd(void)
+{
+        asm volatile("wbinvd": : :"memory");
+}
+
+static fastcall unsigned long long native_read_msr(unsigned int msr, int *err)
+{
+        unsigned long long val;
+
+        asm volatile("2: rdmsr ; xorl %0,%0\n"
+                     "1:\n\t"
+                     ".section .fixup,\"ax\"\n\t"
+                     "3:  movl %3,%0 ; jmp 1b\n\t"
+                     ".previous\n\t"
+                     ".section __ex_table,\"a\"\n"
+                     "   .align 4\n\t"
+                     "   .long  2b,3b\n\t"
+                     ".previous"
+                     : "=r" (*err), "=A" (val)
+                     : "c" (msr), "i" (-EFAULT));
+
+        return val;
+}
+
+static fastcall int native_write_msr(unsigned int msr, unsigned long long val)
+{
+        int err;
+        asm volatile("2: wrmsr ; xorl %0,%0\n"
+                     "1:\n\t"
+                     ".section .fixup,\"ax\"\n\t"
+                     "3:  movl %4,%0 ; jmp 1b\n\t"
+                     ".previous\n\t"
+                     ".section __ex_table,\"a\"\n"
+                     "   .align 4\n\t"
+                     "   .long  2b,3b\n\t"
+                     ".previous"
+                     : "=a" (err)
+                     : "c" (msr), "0" ((u32)val), "d" ((u32)(val>>32)),
+                       "i" (-EFAULT));
+        return err;
+}
+
+static fastcall unsigned long long native_read_tsc(void)
+{
+        unsigned long long val;
+        asm volatile("rdtsc" : "=A" (val));
+        return val;
+}
+
+static fastcall unsigned long long native_read_pmc(void)
+{
+        unsigned long long val;
+        asm volatile("rdpmc" : "=A" (val));
+        return val;
+}
+
+static fastcall void native_load_tr_desc(void)
+{
+        asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
+}
+
+static fastcall void native_load_gdt(const struct Xgt_desc_struct *dtr)
+{
+        asm volatile("lgdt %0"::"m" (*dtr));
+}
+
+static fastcall void native_load_idt(const struct Xgt_desc_struct *dtr)
+{
+        asm volatile("lidt %0"::"m" (*dtr));
+}
+
+static fastcall void native_store_gdt(struct Xgt_desc_struct *dtr)
+{
+        asm ("sgdt %0":"=m" (*dtr));
+}
+
+static fastcall void native_store_idt(struct Xgt_desc_struct *dtr)
+{
+        asm ("sidt %0":"=m" (*dtr));
+}
+
+static fastcall unsigned long native_store_tr(void)
+{
+        unsigned long tr;
+        asm ("str %0":"=r" (tr));
+        return tr;
+}
+
+static fastcall void native_load_tls(struct thread_struct *t, unsigned int cpu)
+{
+#define C(i) get_cpu_gdt_table(cpu)[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i]
+        C(0); C(1); C(2);
+#undef C
+}
+
+static inline void native_write_dt_entry(void *dt, int entry, u32 entry_low, u32 entry_high)
+{
+        u32 *lp = (u32 *)((char *)dt + entry*8);
+        lp[0] = entry_low;
+        lp[1] = entry_high;
+}
+
+static fastcall void native_write_ldt_entry(void *dt, int entrynum, u32 low, u32 high)
+{
+        native_write_dt_entry(dt, entrynum, low, high);
+}
+
+static fastcall void native_write_gdt_entry(void *dt, int entrynum, u32 low, u32 high)
+{
+        native_write_dt_entry(dt, entrynum, low, high);
+}
+
+static fastcall void native_write_idt_entry(void *dt, int entrynum, u32 low, u32 high)
+{
+        native_write_dt_entry(dt, entrynum, low, high);
+}
+
+static fastcall void native_load_esp0(struct tss_struct *tss,
+                                      struct thread_struct *thread)
+{
+        tss->esp0 = thread->esp0;
+
+        /* This can only happen when SEP is enabled, no need to test "SEP"arately */
+        if (unlikely(tss->ss1 != thread->sysenter_cs)) {
+                tss->ss1 = thread->sysenter_cs;
+                wrmsr(MSR_IA32_SYSENTER_CS, thread->sysenter_cs, 0);
+        }
+}
+
+static fastcall void native_io_delay(void)
+{
+        asm volatile("outb %al,$0x80");
+}
+
+static fastcall void native_flush_tlb(void)
+{
+        __native_flush_tlb();
+}
+
+/*
+ * Global pages have to be flushed a bit differently. Not a real
+ * performance problem because this does not happen often.
+ */
+static fastcall void native_flush_tlb_global(void)
+{
+        __native_flush_tlb_global();
+}
+
+static fastcall void native_flush_tlb_single(u32 addr)
+{
+        __native_flush_tlb_single(addr);
+}
+
+#ifndef CONFIG_X86_PAE
+static fastcall void native_set_pte(pte_t *ptep, pte_t pteval)
+{
+        *ptep = pteval;
+}
+
+static fastcall void native_set_pte_at(struct mm_struct *mm, u32 addr, pte_t *ptep, pte_t pteval)
+{
+        *ptep = pteval;
+}
+
+static fastcall void native_set_pmd(pmd_t *pmdp, pmd_t pmdval)
+{
+        *pmdp = pmdval;
+}
+
+#else /* CONFIG_X86_PAE */
+
+static fastcall void native_set_pte(pte_t *ptep, pte_t pte)
+{
+        ptep->pte_high = pte.pte_high;
+        smp_wmb();
+        ptep->pte_low = pte.pte_low;
+}
+
+static fastcall void native_set_pte_at(struct mm_struct *mm, u32 addr, pte_t *ptep, pte_t pte)
+{
+        ptep->pte_high = pte.pte_high;
+        smp_wmb();
+        ptep->pte_low = pte.pte_low;
+}
+
+static fastcall void native_set_pte_present(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte)
+{
+        ptep->pte_low = 0;
+        smp_wmb();
+        ptep->pte_high = pte.pte_high;
+        smp_wmb();
+        ptep->pte_low = pte.pte_low;
+}
+
+static fastcall void native_set_pte_atomic(pte_t *ptep, pte_t pteval)
+{
+        set_64bit((unsigned long long *)ptep,pte_val(pteval));
+}
+
+static fastcall void native_set_pmd(pmd_t *pmdp, pmd_t pmdval)
+{
+        set_64bit((unsigned long long *)pmdp,pmd_val(pmdval));
+}
+
+static fastcall void native_set_pud(pud_t *pudp, pud_t pudval)
+{
+        *pudp = pudval;
+}
+
+static fastcall void native_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
+{
+        ptep->pte_low = 0;
+        smp_wmb();
+        ptep->pte_high = 0;
+}
+
+static fastcall void native_pmd_clear(pmd_t *pmd)
+{
+        u32 *tmp = (u32 *)pmd;
+        *tmp = 0;
+        smp_wmb();
+        *(tmp + 1) = 0;
+}
+#endif /* CONFIG_X86_PAE */
+
+/* These are in entry.S */
+extern fastcall void native_iret(void);
+extern fastcall void native_irq_enable_sysexit(void);
+
+static int __init print_banner(void)
+{
+        paravirt_ops.banner();
+        return 0;
+}
+core_initcall(print_banner);
+
+/* We simply declare start_kernel to be the paravirt probe of last resort. */
+paravirt_probe(start_kernel);
+
+struct paravirt_ops paravirt_ops = {
+        .name = "bare hardware",
+        .paravirt_enabled = 0,
+        .kernel_rpl = 0,
+
+        .patch = native_patch,
+        .banner = default_banner,
+        .arch_setup = native_nop,
+        .memory_setup = machine_specific_memory_setup,
+        .get_wallclock = native_get_wallclock,
+        .set_wallclock = native_set_wallclock,
+        .time_init = time_init_hook,
+        .init_IRQ = native_init_IRQ,
+
+        .cpuid = native_cpuid,
+        .get_debugreg = native_get_debugreg,
+        .set_debugreg = native_set_debugreg,
+        .clts = native_clts,
+        .read_cr0 = native_read_cr0,
+        .write_cr0 = native_write_cr0,
+        .read_cr2 = native_read_cr2,
+        .write_cr2 = native_write_cr2,
+        .read_cr3 = native_read_cr3,
+        .write_cr3 = native_write_cr3,
+        .read_cr4 = native_read_cr4,
+        .read_cr4_safe = native_read_cr4_safe,
+        .write_cr4 = native_write_cr4,
+        .save_fl = native_save_fl,
+        .restore_fl = native_restore_fl,
+        .irq_disable = native_irq_disable,
+        .irq_enable = native_irq_enable,
+        .safe_halt = native_safe_halt,
+        .halt = native_halt,
+        .wbinvd = native_wbinvd,
+        .read_msr = native_read_msr,
+        .write_msr = native_write_msr,
+        .read_tsc = native_read_tsc,
+        .read_pmc = native_read_pmc,
+        .load_tr_desc = native_load_tr_desc,
+        .set_ldt = native_set_ldt,
+        .load_gdt = native_load_gdt,
+        .load_idt = native_load_idt,
+        .store_gdt = native_store_gdt,
+        .store_idt = native_store_idt,
+        .store_tr = native_store_tr,
+        .load_tls = native_load_tls,
+        .write_ldt_entry = native_write_ldt_entry,
+        .write_gdt_entry = native_write_gdt_entry,
+        .write_idt_entry = native_write_idt_entry,
+        .load_esp0 = native_load_esp0,
+
+        .set_iopl_mask = native_set_iopl_mask,
+        .io_delay = native_io_delay,
+        .const_udelay = __const_udelay,
+
+#ifdef CONFIG_X86_LOCAL_APIC
+        .apic_write = native_apic_write,
+        .apic_write_atomic = native_apic_write_atomic,
+        .apic_read = native_apic_read,
+#endif
+
+        .flush_tlb_user = native_flush_tlb,
+        .flush_tlb_kernel = native_flush_tlb_global,
+        .flush_tlb_single = native_flush_tlb_single,
+
+        .set_pte = native_set_pte,
+        .set_pte_at = native_set_pte_at,
+        .set_pmd = native_set_pmd,
+        .pte_update = (void *)native_nop,
+        .pte_update_defer = (void *)native_nop,
+#ifdef CONFIG_X86_PAE
+        .set_pte_atomic = native_set_pte_atomic,
+        .set_pte_present = native_set_pte_present,
+        .set_pud = native_set_pud,
+        .pte_clear = native_pte_clear,
+        .pmd_clear = native_pmd_clear,
+#endif
+
+        .irq_enable_sysexit = native_irq_enable_sysexit,
+        .iret = native_iret,
+};
+EXPORT_SYMBOL(paravirt_ops);
diff --git a/arch/i386/kernel/pci-dma.c b/arch/i386/kernel/pci-dma.c
index 25fe66853934..41af692c1584 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;
 
@@ -92,14 +92,12 @@ int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
         if (!mem_base)
                 goto out;
 
-        dev->dma_mem = kmalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL);
+        dev->dma_mem = kzalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL);
         if (!dev->dma_mem)
                 goto out;
-        memset(dev->dma_mem, 0, sizeof(struct dma_coherent_mem));
-        dev->dma_mem->bitmap = kmalloc(bitmap_size, GFP_KERNEL);
+        dev->dma_mem->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
         if (!dev->dma_mem->bitmap)
                 goto free1_out;
-        memset(dev->dma_mem->bitmap, 0, bitmap_size);
 
         dev->dma_mem->virt_base = mem_base;
         dev->dma_mem->device_base = device_addr;
@@ -114,6 +112,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/kernel/process.c b/arch/i386/kernel/process.c
index dd53c58f64f1..c641056233a6 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -56,6 +56,7 @@
 
 #include <asm/tlbflush.h>
 #include <asm/cpu.h>
+#include <asm/pda.h>
 
 asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
 
@@ -99,22 +100,23 @@ EXPORT_SYMBOL(enable_hlt);
  */
 void default_idle(void)
 {
-        local_irq_enable();
-
         if (!hlt_counter && boot_cpu_data.hlt_works_ok) {
                 current_thread_info()->status &= ~TS_POLLING;
-                smp_mb__after_clear_bit();
-                while (!need_resched()) {
-                        local_irq_disable();
-                        if (!need_resched())
-                                safe_halt();
-                        else
-                                local_irq_enable();
-                }
+                /*
+                 * TS_POLLING-cleared state must be visible before we
+                 * test NEED_RESCHED:
+                 */
+                smp_mb();
+
+                local_irq_disable();
+                if (!need_resched())
+                        safe_halt();    /* enables interrupts racelessly */
+                else
+                        local_irq_enable();
                 current_thread_info()->status |= TS_POLLING;
         } else {
-                while (!need_resched())
-                        cpu_relax();
+                /* loop is done by the caller */
+                cpu_relax();
         }
 }
 #ifdef CONFIG_APM_MODULE
@@ -128,14 +130,7 @@ EXPORT_SYMBOL(default_idle);
  */
 static void poll_idle (void)
 {
-        local_irq_enable();
-
-        asm volatile(
-                "2:"
-                "testl %0, %1;"
-                "rep; nop;"
-                "je 2b;"
-                : : "i"(_TIF_NEED_RESCHED), "m" (current_thread_info()->flags));
+        cpu_relax();
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
@@ -256,8 +251,7 @@ void mwait_idle_with_hints(unsigned long eax, unsigned long ecx)
 static void mwait_idle(void)
 {
         local_irq_enable();
-        while (!need_resched())
-                mwait_idle_with_hints(0, 0);
+        mwait_idle_with_hints(0, 0);
 }
 
 void __devinit select_idle_routine(const struct cpuinfo_x86 *c)
@@ -314,8 +308,8 @@ void show_regs(struct pt_regs * regs)
                 regs->eax,regs->ebx,regs->ecx,regs->edx);
         printk("ESI: %08lx EDI: %08lx EBP: %08lx",
                 regs->esi, regs->edi, regs->ebp);
-        printk(" DS: %04x ES: %04x\n",
-                0xffff & regs->xds,0xffff & regs->xes);
+        printk(" DS: %04x ES: %04x GS: %04x\n",
+               0xffff & regs->xds,0xffff & regs->xes, 0xffff & regs->xgs);
 
         cr0 = read_cr0();
         cr2 = read_cr2();
@@ -346,6 +340,7 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
 
         regs.xds = __USER_DS;
         regs.xes = __USER_DS;
+        regs.xgs = __KERNEL_PDA;
         regs.orig_eax = -1;
         regs.eip = (unsigned long) kernel_thread_helper;
         regs.xcs = __KERNEL_CS | get_kernel_rpl();
@@ -431,7 +426,6 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long esp,
         p->thread.eip = (unsigned long) ret_from_fork;
 
         savesegment(fs,p->thread.fs);
-        savesegment(gs,p->thread.gs);
 
         tsk = current;
         if (unlikely(test_tsk_thread_flag(tsk, TIF_IO_BITMAP))) {
@@ -508,7 +502,7 @@ void dump_thread(struct pt_regs * regs, struct user * dump)
         dump->regs.ds = regs->xds;
         dump->regs.es = regs->xes;
         savesegment(fs,dump->regs.fs);
-        savesegment(gs,dump->regs.gs);
+        dump->regs.gs = regs->xgs;
         dump->regs.orig_eax = regs->orig_eax;
         dump->regs.eip = regs->eip;
         dump->regs.cs = regs->xcs;
@@ -648,22 +642,27 @@ struct task_struct fastcall * __switch_to(struct task_struct *prev_p, struct tas
 
         __unlazy_fpu(prev_p);
 
+
+        /* we're going to use this soon, after a few expensive things */
+        if (next_p->fpu_counter > 5)
+                prefetch(&next->i387.fxsave);
+
         /*
          * Reload esp0.
          */
         load_esp0(tss, next);
 
         /*
-         * Save away %fs and %gs. No need to save %es and %ds, as
-         * those are always kernel segments while inside the kernel.
-         * Doing this before setting the new TLS descriptors avoids
-         * the situation where we temporarily have non-reloadable
-         * segments in %fs and %gs.  This could be an issue if the
-         * NMI handler ever used %fs or %gs (it does not today), or
-         * if the kernel is running inside of a hypervisor layer.
+         * Save away %fs. No need to save %gs, as it was saved on the
+         * stack on entry.  No need to save %es and %ds, as those are
+         * always kernel segments while inside the kernel.  Doing this
+         * before setting the new TLS descriptors avoids the situation
+         * where we temporarily have non-reloadable segments in %fs
+         * and %gs.  This could be an issue if the NMI handler ever
+         * used %fs or %gs (it does not today), or if the kernel is
+         * running inside of a hypervisor layer.
          */
         savesegment(fs, prev->fs);
-        savesegment(gs, prev->gs);
 
         /*
          * Load the per-thread Thread-Local Storage descriptor.
@@ -671,22 +670,14 @@ struct task_struct fastcall * __switch_to(struct task_struct *prev_p, struct tas
         load_TLS(next, cpu);
 
         /*
-         * Restore %fs and %gs if needed.
+         * Restore %fs if needed.
          *
-         * Glibc normally makes %fs be zero, and %gs is one of
-         * the TLS segments.
+         * Glibc normally makes %fs be zero.
          */
         if (unlikely(prev->fs | next->fs))
                 loadsegment(fs, next->fs);
 
-        if (prev->gs | next->gs)
-                loadsegment(gs, next->gs);
-
-        /*
-         * Restore IOPL if needed.
-         */
-        if (unlikely(prev->iopl != next->iopl))
-                set_iopl_mask(next->iopl);
+        write_pda(pcurrent, next_p);
 
         /*
          * Now maybe handle debug registers and/or IO bitmaps
@@ -697,6 +688,13 @@ struct task_struct fastcall * __switch_to(struct task_struct *prev_p, struct tas
 
         disable_tsc(prev_p, next_p);
 
+        /* If the task has used fpu the last 5 timeslices, just do a full
+         * restore of the math state immediately to avoid the trap; the
+         * chances of needing FPU soon are obviously high now
+         */
+        if (next_p->fpu_counter > 5)
+                math_state_restore();
+
         return prev_p;
 }
 
diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c
index 775f50e9395b..af8aabe85800 100644
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/i386/kernel/ptrace.c
@@ -45,7 +45,7 @@
 /*
  * Offset of eflags on child stack..
  */
-#define EFL_OFFSET ((EFL-2)*4-sizeof(struct pt_regs))
+#define EFL_OFFSET offsetof(struct pt_regs, eflags)
 
 static inline struct pt_regs *get_child_regs(struct task_struct *task)
 {
@@ -54,24 +54,24 @@ static inline struct pt_regs *get_child_regs(struct task_struct *task)
 }
 
 /*
- * this routine will get a word off of the processes privileged stack. 
- * the offset is how far from the base addr as stored in the TSS.  
- * this routine assumes that all the privileged stacks are in our
+ * This routine will get a word off of the processes privileged stack.
+ * the offset is bytes into the pt_regs structure on the stack.
+ * This routine assumes that all the privileged stacks are in our
  * data space.
  */   
 static inline int get_stack_long(struct task_struct *task, int offset)
 {
         unsigned char *stack;
 
-        stack = (unsigned char *)task->thread.esp0;
+        stack = (unsigned char *)task->thread.esp0 - sizeof(struct pt_regs);
         stack += offset;
         return (*((int *)stack));
 }
 
 /*
- * this routine will put a word on the processes privileged stack. 
- * the offset is how far from the base addr as stored in the TSS.  
- * this routine assumes that all the privileged stacks are in our
+ * This routine will put a word on the processes privileged stack.
+ * the offset is bytes into the pt_regs structure on the stack.
+ * This routine assumes that all the privileged stacks are in our
  * data space.
  */
 static inline int put_stack_long(struct task_struct *task, int offset,
@@ -79,7 +79,7 @@ static inline int put_stack_long(struct task_struct *task, int offset,
 {
         unsigned char * stack;
 
-        stack = (unsigned char *) task->thread.esp0;
+        stack = (unsigned char *)task->thread.esp0 - sizeof(struct pt_regs);
         stack += offset;
         *(unsigned long *) stack = data;
         return 0;
@@ -94,13 +94,9 @@ static int putreg(struct task_struct *child,
                                 return -EIO;
                         child->thread.fs = value;
                         return 0;
-                case GS:
-                        if (value && (value & 3) != 3)
-                                return -EIO;
-                        child->thread.gs = value;
-                        return 0;
                 case DS:
                 case ES:
+                case GS:
                         if (value && (value & 3) != 3)
                                 return -EIO;
                         value &= 0xffff;
@@ -116,9 +112,9 @@ static int putreg(struct task_struct *child,
                         value |= get_stack_long(child, EFL_OFFSET) & ~FLAG_MASK;
                         break;
         }
-        if (regno > GS*4)
-                regno -= 2*4;
-        put_stack_long(child, regno - sizeof(struct pt_regs), value);
+        if (regno > ES*4)
+                regno -= 1*4;
+        put_stack_long(child, regno, value);
         return 0;
 }
 
@@ -131,19 +127,16 @@ static unsigned long getreg(struct task_struct *child,
                 case FS:
                         retval = child->thread.fs;
                         break;
-                case GS:
-                        retval = child->thread.gs;
-                        break;
                 case DS:
                 case ES:
+                case GS:
                 case SS:
                 case CS:
                         retval = 0xffff;
                         /* fall through */
                 default:
-                        if (regno > GS*4)
-                                regno -= 2*4;
-                        regno = regno - sizeof(struct pt_regs);
+                        if (regno > ES*4)
+                                regno -= 1*4;
                         retval &= get_stack_long(child, regno);
         }
         return retval;
diff --git a/arch/i386/kernel/quirks.c b/arch/i386/kernel/quirks.c
index 9f6ab1789bb0..34874c398b44 100644
--- a/arch/i386/kernel/quirks.c
+++ b/arch/i386/kernel/quirks.c
@@ -3,10 +3,12 @@
  */
 #include <linux/pci.h>
 #include <linux/irq.h>
+#include <asm/pci-direct.h>
+#include <asm/genapic.h>
+#include <asm/cpu.h>
 
 #if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP) && defined(CONFIG_PCI)
-
-static void __devinit quirk_intel_irqbalance(struct pci_dev *dev)
+static void __devinit verify_quirk_intel_irqbalance(struct pci_dev *dev)
 {
         u8 config, rev;
         u32 word;
@@ -14,14 +16,12 @@ static void __devinit quirk_intel_irqbalance(struct pci_dev *dev)
         /* BIOS may enable hardware IRQ balancing for
          * E7520/E7320/E7525(revision ID 0x9 and below)
          * based platforms.
-         * Disable SW irqbalance/affinity on those platforms.
+         * For those platforms, make sure that the genapic is set to 'flat'
          */
         pci_read_config_byte(dev, PCI_CLASS_REVISION, &rev);
         if (rev > 0x9)
                 return;
 
-        printk(KERN_INFO "Intel E7520/7320/7525 detected.");
-
         /* enable access to config space*/
         pci_read_config_byte(dev, 0xf4, &config);
         pci_write_config_byte(dev, 0xf4, config|0x2);
@@ -30,6 +30,44 @@ static void __devinit quirk_intel_irqbalance(struct pci_dev *dev)
         raw_pci_ops->read(0, 0, 0x40, 0x4c, 2, &word);
 
         if (!(word & (1 << 13))) {
+#ifdef CONFIG_X86_64
+                if (genapic !=  &apic_flat)
+                        panic("APIC mode must be flat on this system\n");
+#elif defined(CONFIG_X86_GENERICARCH)
+                if (genapic != &apic_default)
+                        panic("APIC mode must be default(flat) on this system. Use apic=default\n");
+#endif
+        }
+
+        /* put back the original value for config space*/
+        if (!(config & 0x2))
+                pci_write_config_byte(dev, 0xf4, config);
+}
+
+void __init quirk_intel_irqbalance(void)
+{
+        u8 config, rev;
+        u32 word;
+
+        /* BIOS may enable hardware IRQ balancing for
+         * E7520/E7320/E7525(revision ID 0x9 and below)
+         * based platforms.
+         * Disable SW irqbalance/affinity on those platforms.
+         */
+        rev = read_pci_config_byte(0, 0, 0, PCI_CLASS_REVISION);
+        if (rev > 0x9)
+                return;
+
+        printk(KERN_INFO "Intel E7520/7320/7525 detected.");
+
+        /* enable access to config space */
+        config = read_pci_config_byte(0, 0, 0, 0xf4);
+        write_pci_config_byte(0, 0, 0, 0xf4, config|0x2);
+
+        /* read xTPR register */
+        word = read_pci_config_16(0, 0, 0x40, 0x4c);
+
+        if (!(word & (1 << 13))) {
                 printk(KERN_INFO "Disabling irq balancing and affinity\n");
 #ifdef CONFIG_IRQBALANCE
                 irqbalance_disable("");
@@ -38,13 +76,24 @@ static void __devinit quirk_intel_irqbalance(struct pci_dev *dev)
 #ifdef CONFIG_PROC_FS
                 no_irq_affinity = 1;
 #endif
+#ifdef CONFIG_HOTPLUG_CPU
+                printk(KERN_INFO "Disabling cpu hotplug control\n");
+                enable_cpu_hotplug = 0;
+#endif
+#ifdef CONFIG_X86_64
+                /* force the genapic selection to flat mode so that
+                 * interrupts can be redirected to more than one CPU.
+                 */
+                genapic_force = &apic_flat;
+#endif
         }
 
-        /* put back the original value for config space*/
+        /* put back the original value for config space */
         if (!(config & 0x2))
-                pci_write_config_byte(dev, 0xf4, config);
+                write_pci_config_byte(0, 0, 0, 0xf4, config);
 }
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_E7320_MCH,  quirk_intel_irqbalance);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_E7525_MCH,  quirk_intel_irqbalance);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_E7520_MCH,  quirk_intel_irqbalance);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_E7320_MCH,  verify_quirk_intel_irqbalance);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_E7525_MCH,  verify_quirk_intel_irqbalance);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_E7520_MCH,  verify_quirk_intel_irqbalance);
+
 #endif
diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c
index 84278e0093a2..3514b4153f7f 100644
--- a/arch/i386/kernel/reboot.c
+++ b/arch/i386/kernel/reboot.c
@@ -12,6 +12,7 @@
 #include <linux/dmi.h>
 #include <linux/ctype.h>
 #include <linux/pm.h>
+#include <linux/reboot.h>
 #include <asm/uaccess.h>
 #include <asm/apic.h>
 #include <asm/desc.h>
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 141041dde74d..4b31ad70c1ac 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -63,9 +63,6 @@
 #include <setup_arch.h>
 #include <bios_ebda.h>
 
-/* Forward Declaration. */
-void __init find_max_pfn(void);
-
 /* This value is set up by the early boot code to point to the value
    immediately after the boot time page tables.  It contains a *physical*
    address, and must not be in the .bss segment! */
@@ -76,14 +73,11 @@ int disable_pse __devinitdata = 0;
 /*
  * Machine setup..
  */
-
-#ifdef CONFIG_EFI
-int efi_enabled = 0;
-EXPORT_SYMBOL(efi_enabled);
-#endif
+extern struct resource code_resource;
+extern struct resource data_resource;
 
 /* cpu data as detected by the assembly code in head.S */
-struct cpuinfo_x86 new_cpu_data __initdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
+struct cpuinfo_x86 new_cpu_data __cpuinitdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
 /* common cpu data for all cpus */
 struct cpuinfo_x86 boot_cpu_data __read_mostly = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
 EXPORT_SYMBOL(boot_cpu_data);
@@ -99,12 +93,6 @@ unsigned int machine_submodel_id;
 unsigned int BIOS_revision;
 unsigned int mca_pentium_flag;
 
-/* For PCI or other memory-mapped resources */
-unsigned long pci_mem_start = 0x10000000;
-#ifdef CONFIG_PCI
-EXPORT_SYMBOL(pci_mem_start);
-#endif
-
 /* Boot loader ID as an integer, for the benefit of proc_dointvec */
 int bootloader_type;
 
@@ -134,7 +122,6 @@ struct ist_info ist_info;
         defined(CONFIG_X86_SPEEDSTEP_SMI_MODULE)
 EXPORT_SYMBOL(ist_info);
 #endif
-struct e820map e820;
 
 extern void early_cpu_init(void);
 extern int root_mountflags;
@@ -149,516 +136,6 @@ static char command_line[COMMAND_LINE_SIZE];
 
 unsigned char __initdata boot_params[PARAM_SIZE];
 
-static struct resource data_resource = {
-        .name   = "Kernel data",
-        .start  = 0,
-        .end    = 0,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
-};
-
-static struct resource code_resource = {
-        .name   = "Kernel code",
-        .start  = 0,
-        .end    = 0,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
-};
-
-static struct resource system_rom_resource = {
-        .name   = "System ROM",
-        .start  = 0xf0000,
-        .end    = 0xfffff,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-};
-
-static struct resource extension_rom_resource = {
-        .name   = "Extension ROM",
-        .start  = 0xe0000,
-        .end    = 0xeffff,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-};
-
-static struct resource adapter_rom_resources[] = { {
-        .name   = "Adapter ROM",
-        .start  = 0xc8000,
-        .end    = 0,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-}, {
-        .name   = "Adapter ROM",
-        .start  = 0,
-        .end    = 0,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-}, {
-        .name   = "Adapter ROM",
-        .start  = 0,
-        .end    = 0,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-}, {
-        .name   = "Adapter ROM",
-        .start  = 0,
-        .end    = 0,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-}, {
-        .name   = "Adapter ROM",
-        .start  = 0,
-        .end    = 0,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-}, {
-        .name   = "Adapter ROM",
-        .start  = 0,
-        .end    = 0,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-} };
-
-static struct resource video_rom_resource = {
-        .name   = "Video ROM",
-        .start  = 0xc0000,
-        .end    = 0xc7fff,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-};
-
-static struct resource video_ram_resource = {
-        .name   = "Video RAM area",
-        .start  = 0xa0000,
-        .end    = 0xbffff,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
-};
-
-static struct resource standard_io_resources[] = { {
-        .name   = "dma1",
-        .start  = 0x0000,
-        .end    = 0x001f,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-}, {
-        .name   = "pic1",
-        .start  = 0x0020,
-        .end    = 0x0021,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-}, {
-        .name   = "timer0",
-        .start  = 0x0040,
-        .end    = 0x0043,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-}, {
-        .name   = "timer1",
-        .start  = 0x0050,
-        .end    = 0x0053,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-}, {
-        .name   = "keyboard",
-        .start  = 0x0060,
-        .end    = 0x006f,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-}, {
-        .name   = "dma page reg",
-        .start  = 0x0080,
-        .end    = 0x008f,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-}, {
-        .name   = "pic2",
-        .start  = 0x00a0,
-        .end    = 0x00a1,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-}, {
-        .name   = "dma2",
-        .start  = 0x00c0,
-        .end    = 0x00df,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-}, {
-        .name   = "fpu",
-        .start  = 0x00f0,
-        .end    = 0x00ff,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-} };
-
-#define romsignature(x) (*(unsigned short *)(x) == 0xaa55)
-
-static int __init romchecksum(unsigned char *rom, unsigned long length)
-{
-        unsigned char *p, sum = 0;
-
-        for (p = rom; p < rom + length; p++)
-                sum += *p;
-        return sum == 0;
-}
-
-static void __init probe_roms(void)
-{
-        unsigned long start, length, upper;
-        unsigned char *rom;
-        int           i;
-
-        /* video rom */
-        upper = adapter_rom_resources[0].start;
-        for (start = video_rom_resource.start; start < upper; start += 2048) {
-                rom = isa_bus_to_virt(start);
-                if (!romsignature(rom))
-                        continue;
-
-                video_rom_resource.start = start;
-
-                /* 0 < length <= 0x7f * 512, historically */
-                length = rom[2] * 512;
-
-                /* if checksum okay, trust length byte */
-                if (length && romchecksum(rom, length))
-                        video_rom_resource.end = start + length - 1;
-
-                request_resource(&iomem_resource, &video_rom_resource);
-                break;
-        }
-
-        start = (video_rom_resource.end + 1 + 2047) & ~2047UL;
-        if (start < upper)
-                start = upper;
-
-        /* system rom */
-        request_resource(&iomem_resource, &system_rom_resource);
-        upper = system_rom_resource.start;
-
-        /* check for extension rom (ignore length byte!) */
-        rom = isa_bus_to_virt(extension_rom_resource.start);
-        if (romsignature(rom)) {
-                length = extension_rom_resource.end - extension_rom_resource.start + 1;
-                if (romchecksum(rom, length)) {
-                        request_resource(&iomem_resource, &extension_rom_resource);
-                        upper = extension_rom_resource.start;
-                }
-        }
-
-        /* check for adapter roms on 2k boundaries */
-        for (i = 0; i < ARRAY_SIZE(adapter_rom_resources) && start < upper; start += 2048) {
-                rom = isa_bus_to_virt(start);
-                if (!romsignature(rom))
-                        continue;
-
-                /* 0 < length <= 0x7f * 512, historically */
-                length = rom[2] * 512;
-
-                /* but accept any length that fits if checksum okay */
-                if (!length || start + length > upper || !romchecksum(rom, length))
-                        continue;
-
-                adapter_rom_resources[i].start = start;
-                adapter_rom_resources[i].end = start + length - 1;
-                request_resource(&iomem_resource, &adapter_rom_resources[i]);
-
-                start = adapter_rom_resources[i++].end & ~2047UL;
-        }
-}
-
-static void __init limit_regions(unsigned long long size)
-{
-        unsigned long long current_addr = 0;
-        int i;
-
-        if (efi_enabled) {
-                efi_memory_desc_t *md;
-                void *p;
-
-                for (p = memmap.map, i = 0; p < memmap.map_end;
-                        p += memmap.desc_size, i++) {
-                        md = p;
-                        current_addr = md->phys_addr + (md->num_pages << 12);
-                        if (md->type == EFI_CONVENTIONAL_MEMORY) {
-                                if (current_addr >= size) {
-                                        md->num_pages -=
-                                                (((current_addr-size) + PAGE_SIZE-1) >> PAGE_SHIFT);
-                                        memmap.nr_map = i + 1;
-                                        return;
-                                }
-                        }
-                }
-        }
-        for (i = 0; i < e820.nr_map; i++) {
-                current_addr = e820.map[i].addr + e820.map[i].size;
-                if (current_addr < size)
-                        continue;
-
-                if (e820.map[i].type != E820_RAM)
-                        continue;
-
-                if (e820.map[i].addr >= size) {
-                        /*
-                         * This region starts past the end of the
-                         * requested size, skip it completely.
-                         */
-                        e820.nr_map = i;
-                } else {
-                        e820.nr_map = i + 1;
-                        e820.map[i].size -= current_addr - size;
-                }
-                return;
-        }
-}
-
-void __init add_memory_region(unsigned long long start,
-                              unsigned long long size, int type)
-{
-        int x;
-
-        if (!efi_enabled) {
-                x = e820.nr_map;
-
-                if (x == E820MAX) {
-                    printk(KERN_ERR "Ooops! Too many entries in the memory map!\n");
-                    return;
-                }
-
-                e820.map[x].addr = start;
-                e820.map[x].size = size;
-                e820.map[x].type = type;
-                e820.nr_map++;
-        }
-} /* add_memory_region */
-
-#define E820_DEBUG      1
-
-static void __init print_memory_map(char *who)
-{
-        int i;
-
-        for (i = 0; i < e820.nr_map; i++) {
-                printk(" %s: %016Lx - %016Lx ", who,
-                        e820.map[i].addr,
-                        e820.map[i].addr + e820.map[i].size);
-                switch (e820.map[i].type) {
-                case E820_RAM:  printk("(usable)\n");
-                                break;
-                case E820_RESERVED:
-                                printk("(reserved)\n");
-                                break;
-                case E820_ACPI:
-                                printk("(ACPI data)\n");
-                                break;
-                case E820_NVS:
-                                printk("(ACPI NVS)\n");
-                                break;
-                default:        printk("type %lu\n", e820.map[i].type);
-                                break;
-                }
-        }
-}
-
-/*
- * Sanitize the BIOS e820 map.
- *
- * Some e820 responses include overlapping entries.  The following 
- * replaces the original e820 map with a new one, removing overlaps.
- *
- */
-struct change_member {
-        struct e820entry *pbios; /* pointer to original bios entry */
-        unsigned long long addr; /* address for this change point */
-};
-static struct change_member change_point_list[2*E820MAX] __initdata;
-static struct change_member *change_point[2*E820MAX] __initdata;
-static struct e820entry *overlap_list[E820MAX] __initdata;
-static struct e820entry new_bios[E820MAX] __initdata;
-
-int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map)
-{
-        struct change_member *change_tmp;
-        unsigned long current_type, last_type;
-        unsigned long long last_addr;
-        int chgidx, still_changing;
-        int overlap_entries;
-        int new_bios_entry;
-        int old_nr, new_nr, chg_nr;
-        int i;
-
-        /*
-                Visually we're performing the following (1,2,3,4 = memory types)...
-
-                Sample memory map (w/overlaps):
-                   ____22__________________
-                   ______________________4_
-                   ____1111________________
-                   _44_____________________
-                   11111111________________
-                   ____________________33__
-                   ___________44___________
-                   __________33333_________
-                   ______________22________
-                   ___________________2222_
-                   _________111111111______
-                   _____________________11_
-                   _________________4______
-
-                Sanitized equivalent (no overlap):
-                   1_______________________
-                   _44_____________________
-                   ___1____________________
-                   ____22__________________
-                   ______11________________
-                   _________1______________
-                   __________3_____________
-                   ___________44___________
-                   _____________33_________
-                   _______________2________
-                   ________________1_______
-                   _________________4______
-                   ___________________2____
-                   ____________________33__
-                   ______________________4_
-        */
-
-        /* if there's only one memory region, don't bother */
-        if (*pnr_map < 2)
-                return -1;
-
-        old_nr = *pnr_map;
-
-        /* bail out if we find any unreasonable addresses in bios map */
-        for (i=0; i<old_nr; i++)
-                if (biosmap[i].addr + biosmap[i].size < biosmap[i].addr)
-                        return -1;
-
-        /* create pointers for initial change-point information (for sorting) */
-        for (i=0; i < 2*old_nr; i++)
-                change_point[i] = &change_point_list[i];
-
-        /* record all known change-points (starting and ending addresses),
-           omitting those that are for empty memory regions */
-        chgidx = 0;
-        for (i=0; i < old_nr; i++)      {
-                if (biosmap[i].size != 0) {
-                        change_point[chgidx]->addr = biosmap[i].addr;
-                        change_point[chgidx++]->pbios = &biosmap[i];
-                        change_point[chgidx]->addr = biosmap[i].addr + biosmap[i].size;
-                        change_point[chgidx++]->pbios = &biosmap[i];
-                }
-        }
-        chg_nr = chgidx;        /* true number of change-points */
-
-        /* sort change-point list by memory addresses (low -> high) */
-        still_changing = 1;
-        while (still_changing)  {
-                still_changing = 0;
-                for (i=1; i < chg_nr; i++)  {
-                        /* if <current_addr> > <last_addr>, swap */
-                        /* or, if current=<start_addr> & last=<end_addr>, swap */
-                        if ((change_point[i]->addr < change_point[i-1]->addr) ||
-                                ((change_point[i]->addr == change_point[i-1]->addr) &&
-                                 (change_point[i]->addr == change_point[i]->pbios->addr) &&
-                                 (change_point[i-1]->addr != change_point[i-1]->pbios->addr))
-                           )
-                        {
-                                change_tmp = change_point[i];
-                                change_point[i] = change_point[i-1];
-                                change_point[i-1] = change_tmp;
-                                still_changing=1;
-                        }
-                }
-        }
-
-        /* create a new bios memory map, removing overlaps */
-        overlap_entries=0;       /* number of entries in the overlap table */
-        new_bios_entry=0;        /* index for creating new bios map entries */
-        last_type = 0;           /* start with undefined memory type */
-        last_addr = 0;           /* start with 0 as last starting address */
-        /* loop through change-points, determining affect on the new bios map */
-        for (chgidx=0; chgidx < chg_nr; chgidx++)
-        {
-                /* keep track of all overlapping bios entries */
-                if (change_point[chgidx]->addr == change_point[chgidx]->pbios->addr)
-                {
-                        /* add map entry to overlap list (> 1 entry implies an overlap) */
-                        overlap_list[overlap_entries++]=change_point[chgidx]->pbios;
-                }
-                else
-                {
-                        /* remove entry from list (order independent, so swap with last) */
-                        for (i=0; i<overlap_entries; i++)
-                        {
-                                if (overlap_list[i] == change_point[chgidx]->pbios)
-                                        overlap_list[i] = overlap_list[overlap_entries-1];
-                        }
-                        overlap_entries--;
-                }
-                /* if there are overlapping entries, decide which "type" to use */
-                /* (larger value takes precedence -- 1=usable, 2,3,4,4+=unusable) */
-                current_type = 0;
-                for (i=0; i<overlap_entries; i++)
-                        if (overlap_list[i]->type > current_type)
-                                current_type = overlap_list[i]->type;
-                /* continue building up new bios map based on this information */
-                if (current_type != last_type)  {
-                        if (last_type != 0)      {
-                                new_bios[new_bios_entry].size =
-                                        change_point[chgidx]->addr - last_addr;
-                                /* move forward only if the new size was non-zero */
-                                if (new_bios[new_bios_entry].size != 0)
-                                        if (++new_bios_entry >= E820MAX)
-                                                break;  /* no more space left for new bios entries */
-                        }
-                        if (current_type != 0)  {
-                                new_bios[new_bios_entry].addr = change_point[chgidx]->addr;
-                                new_bios[new_bios_entry].type = current_type;
-                                last_addr=change_point[chgidx]->addr;
-                        }
-                        last_type = current_type;
-                }
-        }
-        new_nr = new_bios_entry;   /* retain count for new bios entries */
-
-        /* copy new bios mapping into original location */
-        memcpy(biosmap, new_bios, new_nr*sizeof(struct e820entry));
-        *pnr_map = new_nr;
-
-        return 0;
-}
-
-/*
- * Copy the BIOS e820 map into a safe place.
- *
- * Sanity-check it while we're at it..
- *
- * If we're lucky and live on a modern system, the setup code
- * will have given us a memory map that we can use to properly
- * set up memory.  If we aren't, we'll fake a memory map.
- *
- * We check to see that the memory map contains at least 2 elements
- * before we'll use it, because the detection code in setup.S may
- * not be perfect and most every PC known to man has two memory
- * regions: one from 0 to 640k, and one from 1mb up.  (The IBM
- * thinkpad 560x, for example, does not cooperate with the memory
- * detection code.)
- */
-int __init copy_e820_map(struct e820entry * biosmap, int nr_map)
-{
-        /* Only one memory region (or negative)? Ignore it */
-        if (nr_map < 2)
-                return -1;
-
-        do {
-                unsigned long long start = biosmap->addr;
-                unsigned long long size = biosmap->size;
-                unsigned long long end = start + size;
-                unsigned long type = biosmap->type;
-
-                /* Overflow in 64 bits? Ignore the memory map. */
-                if (start > end)
-                        return -1;
-
-                /*
-                 * Some BIOSes claim RAM in the 640k - 1M region.
-                 * Not right. Fix it up.
-                 */
-                if (type == E820_RAM) {
-                        if (start < 0x100000ULL && end > 0xA0000ULL) {
-                                if (start < 0xA0000ULL)
-                                        add_memory_region(start, 0xA0000ULL-start, type);
-                                if (end <= 0x100000ULL)
-                                        continue;
-                                start = 0x100000ULL;
-                                size = end - start;
-                        }
-                }
-                add_memory_region(start, size, type);
-        } while (biosmap++,--nr_map);
-        return 0;
-}
-
 #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
 struct edd edd;
 #ifdef CONFIG_EDD_MODULE
@@ -682,7 +159,7 @@ static inline void copy_edd(void)
 }
 #endif
 
-static int __initdata user_defined_memmap = 0;
+int __initdata user_defined_memmap = 0;
 
 /*
  * "mem=nopentium" disables the 4MB page tables.
@@ -719,51 +196,6 @@ static int __init parse_mem(char *arg)
 }
 early_param("mem", parse_mem);
 
-static int __init parse_memmap(char *arg)
-{
-        if (!arg)
-                return -EINVAL;
-
-        if (strcmp(arg, "exactmap") == 0) {
-#ifdef CONFIG_CRASH_DUMP
-                /* If we are doing a crash dump, we
-                 * still need to know the real mem
-                 * size before original memory map is
-                 * reset.
-                 */
-                find_max_pfn();
-                saved_max_pfn = max_pfn;
-#endif
-                e820.nr_map = 0;
-                user_defined_memmap = 1;
-        } else {
-                /* If the user specifies memory size, we
-                 * limit the BIOS-provided memory map to
-                 * that size. exactmap can be used to specify
-                 * the exact map. mem=number can be used to
-                 * trim the existing memory map.
-                 */
-                unsigned long long start_at, mem_size;
-
-                mem_size = memparse(arg, &arg);
-                if (*arg == '@') {
-                        start_at = memparse(arg+1, &arg);
-                        add_memory_region(start_at, mem_size, E820_RAM);
-                } else if (*arg == '#') {
-                        start_at = memparse(arg+1, &arg);
-                        add_memory_region(start_at, mem_size, E820_ACPI);
-                } else if (*arg == '$') {
-                        start_at = memparse(arg+1, &arg);
-                        add_memory_region(start_at, mem_size, E820_RESERVED);
-                } else {
-                        limit_regions(mem_size);
-                        user_defined_memmap = 1;
-                }
-        }
-        return 0;
-}
-early_param("memmap", parse_memmap);
-
 #ifdef CONFIG_PROC_VMCORE
 /* elfcorehdr= specifies the location of elf core header
  * stored by the crashed kernel.
@@ -828,90 +260,6 @@ static int __init parse_reservetop(char *arg)
 early_param("reservetop", parse_reservetop);
 
 /*
- * Callback for efi_memory_walk.
- */
-static int __init
-efi_find_max_pfn(unsigned long start, unsigned long end, void *arg)
-{
-        unsigned long *max_pfn = arg, pfn;
-
-        if (start < end) {
-                pfn = PFN_UP(end -1);
-                if (pfn > *max_pfn)
-                        *max_pfn = pfn;
-        }
-        return 0;
-}
-
-static int __init
-efi_memory_present_wrapper(unsigned long start, unsigned long end, void *arg)
-{
-        memory_present(0, PFN_UP(start), PFN_DOWN(end));
-        return 0;
-}
-
- /*
-  * This function checks if the entire range <start,end> is mapped with type.
-  *
-  * Note: this function only works correct if the e820 table is sorted and
-  * not-overlapping, which is the case
-  */
-int __init
-e820_all_mapped(unsigned long s, unsigned long e, unsigned type)
-{
-        u64 start = s;
-        u64 end = e;
-        int i;
-        for (i = 0; i < e820.nr_map; i++) {
-                struct e820entry *ei = &e820.map[i];
-                if (type && ei->type != type)
-                        continue;
-                /* is the region (part) in overlap with the current region ?*/
-                if (ei->addr >= end || ei->addr + ei->size <= start)
-                        continue;
-                /* if the region is at the beginning of <start,end> we move
-                 * start to the end of the region since it's ok until there
-                 */
-                if (ei->addr <= start)
-                        start = ei->addr + ei->size;
-                /* if start is now at or beyond end, we're done, full
-                 * coverage */
-                if (start >= end)
-                        return 1; /* we're done */
-        }
-        return 0;
-}
-
-/*
- * Find the highest page frame number we have available
- */
-void __init find_max_pfn(void)
-{
-        int i;
-
-        max_pfn = 0;
-        if (efi_enabled) {
-                efi_memmap_walk(efi_find_max_pfn, &max_pfn);
-                efi_memmap_walk(efi_memory_present_wrapper, NULL);
-                return;
-        }
-
-        for (i = 0; i < e820.nr_map; i++) {
-                unsigned long start, end;
-                /* RAM? */
-                if (e820.map[i].type != E820_RAM)
-                        continue;
-                start = PFN_UP(e820.map[i].addr);
-                end = PFN_DOWN(e820.map[i].addr + e820.map[i].size);
-                if (start >= end)
-                        continue;
-                if (end > max_pfn)
-                        max_pfn = end;
-                memory_present(0, start, end);
-        }
-}
-
-/*
  * Determine low and high memory ranges:
  */
 unsigned long __init find_max_low_pfn(void)
@@ -971,68 +319,6 @@ unsigned long __init find_max_low_pfn(void)
 }
 
 /*
- * Free all available memory for boot time allocation.  Used
- * as a callback function by efi_memory_walk()
- */
-
-static int __init
-free_available_memory(unsigned long start, unsigned long end, void *arg)
-{
-        /* check max_low_pfn */
-        if (start >= (max_low_pfn << PAGE_SHIFT))
-                return 0;
-        if (end >= (max_low_pfn << PAGE_SHIFT))
-                end = max_low_pfn << PAGE_SHIFT;
-        if (start < end)
-                free_bootmem(start, end - start);
-
-        return 0;
-}
-/*
- * Register fully available low RAM pages with the bootmem allocator.
- */
-static void __init register_bootmem_low_pages(unsigned long max_low_pfn)
-{
-        int i;
-
-        if (efi_enabled) {
-                efi_memmap_walk(free_available_memory, NULL);
-                return;
-        }
-        for (i = 0; i < e820.nr_map; i++) {
-                unsigned long curr_pfn, last_pfn, size;
-                /*
-                 * Reserve usable low memory
-                 */
-                if (e820.map[i].type != E820_RAM)
-                        continue;
-                /*
-                 * We are rounding up the start address of usable memory:
-                 */
-                curr_pfn = PFN_UP(e820.map[i].addr);
-                if (curr_pfn >= max_low_pfn)
-                        continue;
-                /*
-                 * ... and at the end of the usable range downwards:
-                 */
-                last_pfn = PFN_DOWN(e820.map[i].addr + e820.map[i].size);
-
-                if (last_pfn > max_low_pfn)
-                        last_pfn = max_low_pfn;
-
-                /*
-                 * .. finally, did all the rounding and playing
-                 * around just make the area go away?
-                 */
-                if (last_pfn <= curr_pfn)
-                        continue;
-
-                size = last_pfn - curr_pfn;
-                free_bootmem(PFN_PHYS(curr_pfn), PFN_PHYS(size));
-        }
-}
-
-/*
  * workaround for Dell systems that neglect to reserve EBDA
  */
 static void __init reserve_ebda_region(void)
@@ -1118,8 +404,8 @@ void __init setup_bootmem_allocator(void)
          * the (very unlikely) case of us accidentally initializing the
          * bootmem allocator with an invalid RAM area.
          */
-        reserve_bootmem(__PHYSICAL_START, (PFN_PHYS(min_low_pfn) +
-                         bootmap_size + PAGE_SIZE-1) - (__PHYSICAL_START));
+        reserve_bootmem(__pa_symbol(_text), (PFN_PHYS(min_low_pfn) +
+                         bootmap_size + PAGE_SIZE-1) - __pa_symbol(_text));
 
         /*
          * reserve physical page 0 - it's a special BIOS page on many boxes,
@@ -1162,8 +448,7 @@ void __init setup_bootmem_allocator(void)
         if (LOADER_TYPE && INITRD_START) {
                 if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) {
                         reserve_bootmem(INITRD_START, INITRD_SIZE);
-                        initrd_start =
-                                INITRD_START ? INITRD_START + PAGE_OFFSET : 0;
+                        initrd_start = INITRD_START + PAGE_OFFSET;
                         initrd_end = initrd_start+INITRD_SIZE;
                 }
                 else {
@@ -1200,126 +485,6 @@ void __init remapped_pgdat_init(void)
         }
 }
 
-/*
- * Request address space for all standard RAM and ROM resources
- * and also for regions reported as reserved by the e820.
- */
-static void __init
-legacy_init_iomem_resources(struct resource *code_resource, struct resource *data_resource)
-{
-        int i;
-
-        probe_roms();
-        for (i = 0; i < e820.nr_map; i++) {
-                struct resource *res;
-#ifndef CONFIG_RESOURCES_64BIT
-                if (e820.map[i].addr + e820.map[i].size > 0x100000000ULL)
-                        continue;
-#endif
-                res = kzalloc(sizeof(struct resource), GFP_ATOMIC);
-                switch (e820.map[i].type) {
-                case E820_RAM:  res->name = "System RAM"; break;
-                case E820_ACPI: res->name = "ACPI Tables"; break;
-                case E820_NVS:  res->name = "ACPI Non-volatile Storage"; break;
-                default:        res->name = "reserved";
-                }
-                res->start = e820.map[i].addr;
-                res->end = res->start + e820.map[i].size - 1;
-                res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
-                if (request_resource(&iomem_resource, res)) {
-                        kfree(res);
-                        continue;
-                }
-                if (e820.map[i].type == E820_RAM) {
-                        /*
-                         *  We don't know which RAM region contains kernel data,
-                         *  so we try it repeatedly and let the resource manager
-                         *  test it.
-                         */
-                        request_resource(res, code_resource);
-                        request_resource(res, data_resource);
-#ifdef CONFIG_KEXEC
-                        request_resource(res, &crashk_res);
-#endif
-                }
-        }
-}
-
-/*
- * Request address space for all standard resources
- *
- * This is called just before pcibios_init(), which is also a
- * subsys_initcall, but is linked in later (in arch/i386/pci/common.c).
- */
-static int __init request_standard_resources(void)
-{
-        int i;
-
-        printk("Setting up standard PCI resources\n");
-        if (efi_enabled)
-                efi_initialize_iomem_resources(&code_resource, &data_resource);
-        else
-                legacy_init_iomem_resources(&code_resource, &data_resource);
-
-        /* EFI systems may still have VGA */
-        request_resource(&iomem_resource, &video_ram_resource);
-
-        /* request I/O space for devices used on all i[345]86 PCs */
-        for (i = 0; i < ARRAY_SIZE(standard_io_resources); i++)
-                request_resource(&ioport_resource, &standard_io_resources[i]);
-        return 0;
-}
-
-subsys_initcall(request_standard_resources);
-
-static void __init register_memory(void)
-{
-        unsigned long gapstart, gapsize, round;
-        unsigned long long last;
-        int i;
-
-        /*
-         * Search for the bigest gap in the low 32 bits of the e820
-         * memory space.
-         */
-        last = 0x100000000ull;
-        gapstart = 0x10000000;
-        gapsize = 0x400000;
-        i = e820.nr_map;
-        while (--i >= 0) {
-                unsigned long long start = e820.map[i].addr;
-                unsigned long long end = start + e820.map[i].size;
-
-                /*
-                 * Since "last" is at most 4GB, we know we'll
-                 * fit in 32 bits if this condition is true
-                 */
-                if (last > end) {
-                        unsigned long gap = last - end;
-
-                        if (gap > gapsize) {
-                                gapsize = gap;
-                                gapstart = end;
-                        }
-                }
-                if (start < last)
-                        last = start;
-        }
-
-        /*
-         * See how much we want to round up: start off with
-         * rounding to the next 1MB area.
-         */
-        round = 0x100000;
-        while ((gapsize >> 4) > round)
-                round += round;
-        /* Fun with two's complement */
-        pci_mem_start = (gapstart + round) & -round;
-
-        printk("Allocating PCI resources starting at %08lx (gap: %08lx:%08lx)\n",
-                pci_mem_start, gapstart, gapsize);
-}
-
 #ifdef CONFIG_MCA
 static void set_mca_bus(int x)
 {
@@ -1329,6 +494,12 @@ static void set_mca_bus(int x)
 static void set_mca_bus(int x) { }
 #endif
 
+/* Overridden in paravirt.c if CONFIG_PARAVIRT */
+char * __init __attribute__((weak)) memory_setup(void)
+{
+        return machine_specific_memory_setup();
+}
+
 /*
  * Determine if we were loaded by an EFI loader.  If so, then we have also been
  * passed the efi memmap, systab, etc., so we should use these data structures
@@ -1381,7 +552,7 @@ void __init setup_arch(char **cmdline_p)
                 efi_init();
         else {
                 printk(KERN_INFO "BIOS-provided physical RAM map:\n");
-                print_memory_map(machine_specific_memory_setup());
+                print_memory_map(memory_setup());
         }
 
         copy_edd();
@@ -1468,7 +639,7 @@ void __init setup_arch(char **cmdline_p)
                 get_smp_config();
 #endif
 
-        register_memory();
+        e820_register_memory();
 
 #ifdef CONFIG_VT
 #if defined(CONFIG_VGA_CONSOLE)
diff --git a/arch/i386/kernel/signal.c b/arch/i386/kernel/signal.c
index 43002cfb40c4..65d7620eaa09 100644
--- a/arch/i386/kernel/signal.c
+++ b/arch/i386/kernel/signal.c
@@ -128,7 +128,7 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *peax
                          X86_EFLAGS_TF | X86_EFLAGS_SF | X86_EFLAGS_ZF | \
                          X86_EFLAGS_AF | X86_EFLAGS_PF | X86_EFLAGS_CF)
 
-        GET_SEG(gs);
+        COPY_SEG(gs);
         GET_SEG(fs);
         COPY_SEG(es);
         COPY_SEG(ds);
@@ -244,9 +244,7 @@ setup_sigcontext(struct sigcontext __user *sc, struct _fpstate __user *fpstate,
 {
         int tmp, err = 0;
 
-        tmp = 0;
-        savesegment(gs, tmp);
-        err |= __put_user(tmp, (unsigned int __user *)&sc->gs);
+        err |= __put_user(regs->xgs, (unsigned int __user *)&sc->gs);
         savesegment(fs, tmp);
         err |= __put_user(tmp, (unsigned int __user *)&sc->fs);
 
diff --git a/arch/i386/kernel/smp.c b/arch/i386/kernel/smp.c
index 31e5c6573aae..5285aff8367f 100644
--- a/arch/i386/kernel/smp.c
+++ b/arch/i386/kernel/smp.c
@@ -321,7 +321,6 @@ static inline void leave_mm (unsigned long cpu)
 
 fastcall void smp_invalidate_interrupt(struct pt_regs *regs)
 {
-        struct pt_regs *old_regs = set_irq_regs(regs);
         unsigned long cpu;
 
         cpu = get_cpu();
@@ -352,7 +351,6 @@ fastcall void smp_invalidate_interrupt(struct pt_regs *regs)
         smp_mb__after_clear_bit();
 out:
         put_cpu_no_resched();
-        set_irq_regs(old_regs);
 }
 
 static void flush_tlb_others(cpumask_t cpumask, struct mm_struct *mm,
@@ -607,14 +605,11 @@ void smp_send_stop(void)
  */
 fastcall void smp_reschedule_interrupt(struct pt_regs *regs)
 {
-        struct pt_regs *old_regs = set_irq_regs(regs);
         ack_APIC_irq();
-        set_irq_regs(old_regs);
 }
 
 fastcall void smp_call_function_interrupt(struct pt_regs *regs)
 {
-        struct pt_regs *old_regs = set_irq_regs(regs);
         void (*func) (void *info) = call_data->func;
         void *info = call_data->info;
         int wait = call_data->wait;
@@ -637,7 +632,6 @@ fastcall void smp_call_function_interrupt(struct pt_regs *regs)
                 mb();
                 atomic_inc(&call_data->finished);
         }
-        set_irq_regs(old_regs);
 }
 
 /*
@@ -699,6 +693,10 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
                 put_cpu();
                 return -EBUSY;
         }
+
+        /* Can deadlock when called with interrupts disabled */
+        WARN_ON(irqs_disabled());
+
         spin_lock_bh(&call_lock);
         __smp_call_function_single(cpu, func, info, nonatomic, wait);
         spin_unlock_bh(&call_lock);
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index 4bb8b77cd65b..dea7ef9d3e82 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -33,6 +33,11 @@
  *              Dave Jones      :       Report invalid combinations of Athlon CPUs.
 *               Rusty Russell   :       Hacked into shape for new "hotplug" boot process. */
 
+
+/* SMP boot always wants to use real time delay to allow sufficient time for
+ * the APs to come online */
+#define USE_REAL_TIME_DELAY
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -52,6 +57,8 @@
 #include <asm/desc.h>
 #include <asm/arch_hooks.h>
 #include <asm/nmi.h>
+#include <asm/pda.h>
+#include <asm/genapic.h>
 
 #include <mach_apic.h>
 #include <mach_wakecpu.h>
@@ -62,9 +69,7 @@ static int __devinitdata smp_b_stepping;
 
 /* Number of siblings per CPU package */
 int smp_num_siblings = 1;
-#ifdef CONFIG_X86_HT
 EXPORT_SYMBOL(smp_num_siblings);
-#endif
 
 /* Last level cache ID of each logical CPU */
 int cpu_llc_id[NR_CPUS] __cpuinitdata = {[0 ... NR_CPUS-1] = BAD_APICID};
@@ -154,7 +159,7 @@ void __init smp_alloc_memory(void)
  * a given CPU
  */
 
-static void __devinit smp_store_cpu_info(int id)
+static void __cpuinit smp_store_cpu_info(int id)
 {
         struct cpuinfo_x86 *c = cpu_data + id;
 
@@ -222,7 +227,7 @@ static struct {
         atomic_t count_start;
         atomic_t count_stop;
         unsigned long long values[NR_CPUS];
-} tsc __initdata = {
+} tsc __cpuinitdata = {
         .start_flag = ATOMIC_INIT(0),
         .count_start = ATOMIC_INIT(0),
         .count_stop = ATOMIC_INIT(0),
@@ -327,7 +332,7 @@ static void __init synchronize_tsc_bp(void)
                 printk("passed.\n");
 }
 
-static void __init synchronize_tsc_ap(void)
+static void __cpuinit synchronize_tsc_ap(void)
 {
         int i;
 
@@ -359,7 +364,7 @@ extern void calibrate_delay(void);
 
 static atomic_t init_deasserted;
 
-static void __devinit smp_callin(void)
+static void __cpuinit smp_callin(void)
 {
         int cpuid, phys_id;
         unsigned long timeout;
@@ -533,14 +538,14 @@ set_cpu_sibling_map(int cpu)
 /*
  * Activate a secondary processor.
  */
-static void __devinit start_secondary(void *unused)
+static void __cpuinit start_secondary(void *unused)
 {
         /*
-         * Dont put anything before smp_callin(), SMP
+         * Don't put *anything* before secondary_cpu_init(), SMP
          * booting is too fragile that we want to limit the
          * things done here to the most necessary things.
          */
-        cpu_init();
+        secondary_cpu_init();
         preempt_disable();
         smp_callin();
         while (!cpu_isset(smp_processor_id(), smp_commenced_mask))
@@ -599,13 +604,16 @@ void __devinit initialize_secondary(void)
                 "movl %0,%%esp\n\t"
                 "jmp *%1"
                 :
-                :"r" (current->thread.esp),"r" (current->thread.eip));
+                :"m" (current->thread.esp),"m" (current->thread.eip));
 }
 
+/* Static state in head.S used to set up a CPU */
 extern struct {
         void * esp;
         unsigned short ss;
 } stack_start;
+extern struct i386_pda *start_pda;
+extern struct Xgt_desc_struct cpu_gdt_descr;
 
 #ifdef CONFIG_NUMA
 
@@ -923,7 +931,7 @@ static inline struct task_struct * alloc_idle_task(int cpu)
 #define alloc_idle_task(cpu) fork_idle(cpu)
 #endif
 
-static int __devinit do_boot_cpu(int apicid, int cpu)
+static int __cpuinit do_boot_cpu(int apicid, int cpu)
 /*
  * NOTE - on most systems this is a PHYSICAL apic ID, but on multiquad
  * (ie clustered apic addressing mode), this is a LOGICAL apic ID.
@@ -936,9 +944,6 @@ static int __devinit do_boot_cpu(int apicid, int cpu)
         unsigned long start_eip;
         unsigned short nmi_high = 0, nmi_low = 0;
 
-        ++cpucount;
-        alternatives_smp_switch(1);
-
         /*
          * We can't use kernel_thread since we must avoid to
          * reschedule the child.
@@ -946,15 +951,30 @@ static int __devinit do_boot_cpu(int apicid, int cpu)
         idle = alloc_idle_task(cpu);
         if (IS_ERR(idle))
                 panic("failed fork for CPU %d", cpu);
+
+        /* Pre-allocate and initialize the CPU's GDT and PDA so it
+           doesn't have to do any memory allocation during the
+           delicate CPU-bringup phase. */
+        if (!init_gdt(cpu, idle)) {
+                printk(KERN_INFO "Couldn't allocate GDT/PDA for CPU %d\n", cpu);
+                return -1;      /* ? */
+        }
+
         idle->thread.eip = (unsigned long) start_secondary;
         /* start_eip had better be page-aligned! */
         start_eip = setup_trampoline();
 
+        ++cpucount;
+        alternatives_smp_switch(1);
+
         /* So we see what's up   */
         printk("Booting processor %d/%d eip %lx\n", cpu, apicid, start_eip);
         /* Stack for startup_32 can be just as for start_secondary onwards */
         stack_start.esp = (void *) idle->thread.esp;
 
+        start_pda = cpu_pda(cpu);
+        cpu_gdt_descr = per_cpu(cpu_gdt_descr, cpu);
+
         irq_ctx_init(cpu);
 
         x86_cpu_to_apicid[cpu] = apicid;
@@ -1049,13 +1069,15 @@ void cpu_exit_clear(void)
 
 struct warm_boot_cpu_info {
         struct completion *complete;
+        struct work_struct task;
         int apicid;
         int cpu;
 };
 
-static void __cpuinit do_warm_boot_cpu(void *p)
+static void __cpuinit do_warm_boot_cpu(struct work_struct *work)
 {
-        struct warm_boot_cpu_info *info = p;
+        struct warm_boot_cpu_info *info =
+                container_of(work, struct warm_boot_cpu_info, task);
         do_boot_cpu(info->apicid, info->cpu);
         complete(info->complete);
 }
@@ -1064,7 +1086,6 @@ static int __cpuinit __smp_prepare_cpu(int cpu)
 {
         DECLARE_COMPLETION_ONSTACK(done);
         struct warm_boot_cpu_info info;
-        struct work_struct task;
         int     apicid, ret;
         struct Xgt_desc_struct *cpu_gdt_descr = &per_cpu(cpu_gdt_descr, cpu);
 
@@ -1089,15 +1110,15 @@ static int __cpuinit __smp_prepare_cpu(int cpu)
         info.complete = &done;
         info.apicid = apicid;
         info.cpu = cpu;
-        INIT_WORK(&task, do_warm_boot_cpu, &info);
+        INIT_WORK(&info.task, do_warm_boot_cpu);
 
         tsc_sync_disabled = 1;
 
         /* init low mem mapping */
         clone_pgd_range(swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS,
-                        KERNEL_PGD_PTRS);
+                        min_t(unsigned long, KERNEL_PGD_PTRS, USER_PGD_PTRS));
         flush_tlb_all();
-        schedule_work(&task);
+        schedule_work(&info.task);
         wait_for_completion(&done);
 
         tsc_sync_disabled = 0;
@@ -1108,34 +1129,15 @@ exit:
 }
 #endif
 
-static void smp_tune_scheduling (void)
+static void smp_tune_scheduling(void)
 {
         unsigned long cachesize;       /* kB   */
-        unsigned long bandwidth = 350; /* MB/s */
-        /*
-         * Rough estimation for SMP scheduling, this is the number of
-         * cycles it takes for a fully memory-limited process to flush
-         * the SMP-local cache.
-         *
-         * (For a P5 this pretty much means we will choose another idle
-         *  CPU almost always at wakeup time (this is due to the small
-         *  L1 cache), on PIIs it's around 50-100 usecs, depending on
-         *  the cache size)
-         */
 
-        if (!cpu_khz) {
-                /*
-                 * this basically disables processor-affinity
-                 * scheduling on SMP without a TSC.
-                 */
-                return;
-        } else {
+        if (cpu_khz) {
                 cachesize = boot_cpu_data.x86_cache_size;
-                if (cachesize == -1) {
-                        cachesize = 16; /* Pentiums, 2x8kB cache */
-                        bandwidth = 100;
-                }
-                max_cache_size = cachesize * 1024;
+
+                if (cachesize > 0)
+                        max_cache_size = cachesize * 1024;
         }
 }
 
@@ -1430,7 +1432,7 @@ void __cpu_die(unsigned int cpu)
 }
 #endif /* CONFIG_HOTPLUG_CPU */
 
-int __devinit __cpu_up(unsigned int cpu)
+int __cpuinit __cpu_up(unsigned int cpu)
 {
 #ifdef CONFIG_HOTPLUG_CPU
         int ret=0;
@@ -1461,6 +1463,12 @@ int __devinit __cpu_up(unsigned int cpu)
         cpu_set(cpu, smp_commenced_mask);
         while (!cpu_isset(cpu, cpu_online_map))
                 cpu_relax();
+
+#ifdef CONFIG_X86_GENERICARCH
+        if (num_online_cpus() > 8 && genapic == &apic_default)
+                panic("Default flat APIC routing can't be used with > 8 cpus\n");
+#endif
+
         return 0;
 }
 
diff --git a/arch/i386/kernel/sysenter.c b/arch/i386/kernel/sysenter.c
index 713ba39d32c6..7de9117b5a3a 100644
--- a/arch/i386/kernel/sysenter.c
+++ b/arch/i386/kernel/sysenter.c
@@ -27,7 +27,11 @@
  * Should the kernel map a VDSO page into processes and pass its
  * address down to glibc upon exec()?
  */
+#ifdef CONFIG_PARAVIRT
+unsigned int __read_mostly vdso_enabled = 0;
+#else
 unsigned int __read_mostly vdso_enabled = 1;
+#endif
 
 EXPORT_SYMBOL_GPL(vdso_enabled);
 
@@ -132,7 +136,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
                 goto up_fail;
         }
 
-        vma = kmem_cache_zalloc(vm_area_cachep, SLAB_KERNEL);
+        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
         if (!vma) {
                 ret = -ENOMEM;
                 goto up_fail;
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index 78af572fd17c..c505b16c0990 100644
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -56,6 +56,7 @@
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 #include <asm/timer.h>
+#include <asm/time.h>
 
 #include "mach_time.h"
 
@@ -116,10 +117,7 @@ static int set_rtc_mmss(unsigned long nowtime)
         /* gets recalled with irq locally disabled */
         /* XXX - does irqsave resolve this? -johnstul */
         spin_lock_irqsave(&rtc_lock, flags);
-        if (efi_enabled)
-                retval = efi_set_rtc_mmss(nowtime);
-        else
-                retval = mach_set_rtc_mmss(nowtime);
+        retval = set_wallclock(nowtime);
         spin_unlock_irqrestore(&rtc_lock, flags);
 
         return retval;
@@ -223,10 +221,7 @@ unsigned long get_cmos_time(void)
 
         spin_lock_irqsave(&rtc_lock, flags);
 
-        if (efi_enabled)
-                retval = efi_get_time();
-        else
-                retval = mach_get_cmos_time();
+        retval = get_wallclock();
 
         spin_unlock_irqrestore(&rtc_lock, flags);
 
@@ -370,7 +365,7 @@ static void __init hpet_time_init(void)
                 printk("Using HPET for base-timer\n");
         }
 
-        time_init_hook();
+        do_time_init();
 }
 #endif
 
@@ -392,5 +387,5 @@ void __init time_init(void)
 
         do_settimeofday(&ts);
 
-        time_init_hook();
+        do_time_init();
 }
diff --git a/arch/i386/kernel/time_hpet.c b/arch/i386/kernel/time_hpet.c
index 1a2a979cf6a3..1e4702dfcd01 100644
--- a/arch/i386/kernel/time_hpet.c
+++ b/arch/i386/kernel/time_hpet.c
@@ -132,14 +132,20 @@ int __init hpet_enable(void)
          * the single HPET timer for system time.
          */
 #ifdef CONFIG_HPET_EMULATE_RTC
-        if (!(id & HPET_ID_NUMBER))
+        if (!(id & HPET_ID_NUMBER)) {
+                iounmap(hpet_virt_address);
+                hpet_virt_address = NULL;
                 return -1;
+        }
 #endif
 
 
         hpet_period = hpet_readl(HPET_PERIOD);
-        if ((hpet_period < HPET_MIN_PERIOD) || (hpet_period > HPET_MAX_PERIOD))
+        if ((hpet_period < HPET_MIN_PERIOD) || (hpet_period > HPET_MAX_PERIOD)) {
+                iounmap(hpet_virt_address);
+                hpet_virt_address = NULL;
                 return -1;
+        }
 
         /*
          * 64 bit math
@@ -156,8 +162,11 @@ int __init hpet_enable(void)
 
         hpet_use_timer = id & HPET_ID_LEGSUP;
 
-        if (hpet_timer_stop_set_go(hpet_tick))
+        if (hpet_timer_stop_set_go(hpet_tick)) {
+                iounmap(hpet_virt_address);
+                hpet_virt_address = NULL;
                 return -1;
+        }
 
         use_hpet = 1;
 
diff --git a/arch/i386/kernel/topology.c b/arch/i386/kernel/topology.c
index 07d6da36a825..79cf608e14ca 100644
--- a/arch/i386/kernel/topology.c
+++ b/arch/i386/kernel/topology.c
@@ -40,14 +40,18 @@ int arch_register_cpu(int num)
          * restrictions and assumptions in kernel. This basically
          * doesnt add a control file, one cannot attempt to offline
          * BSP.
+         *
+         * Also certain PCI quirks require not to enable hotplug control
+         * for all CPU's.
          */
-        if (!num)
-                cpu_devices[num].cpu.no_control = 1;
+        if (num && enable_cpu_hotplug)
+                cpu_devices[num].cpu.hotpluggable = 1;
 
         return register_cpu(&cpu_devices[num].cpu, num);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
+int enable_cpu_hotplug = 1;
 
 void arch_unregister_cpu(int num) {
         return unregister_cpu(&cpu_devices[num].cpu);
diff --git a/arch/i386/kernel/trampoline.S b/arch/i386/kernel/trampoline.S
index fcce0e61b0e7..2f1814c5cfd7 100644
--- a/arch/i386/kernel/trampoline.S
+++ b/arch/i386/kernel/trampoline.S
@@ -38,6 +38,11 @@
 
 .data
 
+/* We can free up trampoline after bootup if cpu hotplug is not supported. */
+#ifndef CONFIG_HOTPLUG_CPU
+.section ".init.data","aw",@progbits
+#endif
+
 .code16
 
 ENTRY(trampoline_data)
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index fe9c5e8e7e6f..0efad8aeb41a 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -29,6 +29,8 @@
 #include <linux/kexec.h>
 #include <linux/unwind.h>
 #include <linux/uaccess.h>
+#include <linux/nmi.h>
+#include <linux/bug.h>
 
 #ifdef CONFIG_EISA
 #include <linux/ioport.h>
@@ -61,9 +63,6 @@ int panic_on_unrecovered_nmi;
 
 asmlinkage int system_call(void);
 
-struct desc_struct default_ldt[] = { { 0, 0 }, { 0, 0 }, { 0, 0 },
-                { 0, 0 }, { 0, 0 } };
-
 /* Do we ignore FPU interrupts ? */
 char ignore_fpu_irq = 0;
 
@@ -94,12 +93,7 @@ asmlinkage void alignment_check(void);
 asmlinkage void spurious_interrupt_bug(void);
 asmlinkage void machine_check(void);
 
-static int kstack_depth_to_print = 24;
-#ifdef CONFIG_STACK_UNWIND
-static int call_trace = 1;
-#else
-#define call_trace (-1)
-#endif
+int kstack_depth_to_print = 24;
 ATOMIC_NOTIFIER_HEAD(i386die_chain);
 
 int register_die_notifier(struct notifier_block *nb)
@@ -153,25 +147,7 @@ static inline unsigned long print_context_stack(struct thread_info *tinfo,
         return ebp;
 }
 
-struct ops_and_data {
-        struct stacktrace_ops *ops;
-        void *data;
-};
-
-static asmlinkage int
-dump_trace_unwind(struct unwind_frame_info *info, void *data)
-{
-        struct ops_and_data *oad = (struct ops_and_data *)data;
-        int n = 0;
-
-        while (unwind(info) == 0 && UNW_PC(info)) {
-                n++;
-                oad->ops->address(oad->data, UNW_PC(info));
-                if (arch_unw_user_mode(info))
-                        break;
-        }
-        return n;
-}
+#define MSG(msg) ops->warning(data, msg)
 
 void dump_trace(struct task_struct *task, struct pt_regs *regs,
                 unsigned long *stack,
@@ -182,39 +158,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
         if (!task)
                 task = current;
 
-        if (call_trace >= 0) {
-                int unw_ret = 0;
-                struct unwind_frame_info info;
-                struct ops_and_data oad = { .ops = ops, .data = data };
-
-                if (regs) {
-                        if (unwind_init_frame_info(&info, task, regs) == 0)
-                                unw_ret = dump_trace_unwind(&info, &oad);
-                } else if (task == current)
-                        unw_ret = unwind_init_running(&info, dump_trace_unwind, &oad);
-                else {
-                        if (unwind_init_blocked(&info, task) == 0)
-                                unw_ret = dump_trace_unwind(&info, &oad);
-                }
-                if (unw_ret > 0) {
-                        if (call_trace == 1 && !arch_unw_user_mode(&info)) {
-                                ops->warning_symbol(data, "DWARF2 unwinder stuck at %s\n",
-                                             UNW_PC(&info));
-                                if (UNW_SP(&info) >= PAGE_OFFSET) {
-                                        ops->warning(data, "Leftover inexact backtrace:\n");
-                                        stack = (void *)UNW_SP(&info);
-                                        if (!stack)
-                                                return;
-                                        ebp = UNW_FP(&info);
-                                } else
-                                        ops->warning(data, "Full inexact backtrace again:\n");
-                        } else if (call_trace >= 1)
-                                return;
-                        else
-                                ops->warning(data, "Full inexact backtrace again:\n");
-                } else
-                        ops->warning(data, "Inexact backtrace:\n");
-        }
         if (!stack) {
                 unsigned long dummy;
                 stack = &dummy;
@@ -247,6 +190,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
                 stack = (unsigned long*)context->previous_esp;
                 if (!stack)
                         break;
+                touch_nmi_watchdog();
         }
 }
 EXPORT_SYMBOL(dump_trace);
@@ -379,7 +323,7 @@ void show_registers(struct pt_regs *regs)
          * time of the fault..
          */
         if (in_kernel) {
-                u8 __user *eip;
+                u8 *eip;
                 int code_bytes = 64;
                 unsigned char c;
 
@@ -388,18 +332,20 @@ void show_registers(struct pt_regs *regs)
 
                 printk(KERN_EMERG "Code: ");
 
-                eip = (u8 __user *)regs->eip - 43;
-                if (eip < (u8 __user *)PAGE_OFFSET || __get_user(c, eip)) {
+                eip = (u8 *)regs->eip - 43;
+                if (eip < (u8 *)PAGE_OFFSET ||
+                        probe_kernel_address(eip, c)) {
                         /* try starting at EIP */
-                        eip = (u8 __user *)regs->eip;
+                        eip = (u8 *)regs->eip;
                         code_bytes = 32;
                 }
                 for (i = 0; i < code_bytes; i++, eip++) {
-                        if (eip < (u8 __user *)PAGE_OFFSET || __get_user(c, eip)) {
+                        if (eip < (u8 *)PAGE_OFFSET ||
+                                probe_kernel_address(eip, c)) {
                                 printk(" Bad EIP value.");
                                 break;
                         }
-                        if (eip == (u8 __user *)regs->eip)
+                        if (eip == (u8 *)regs->eip)
                                 printk("<%02x> ", c);
                         else
                                 printk("%02x ", c);
@@ -408,43 +354,22 @@ void show_registers(struct pt_regs *regs)
         printk("\n");
 }       
 
-static void handle_BUG(struct pt_regs *regs)
+int is_valid_bugaddr(unsigned long eip)
 {
-        unsigned long eip = regs->eip;
         unsigned short ud2;
 
         if (eip < PAGE_OFFSET)
-                return;
-        if (probe_kernel_address((unsigned short __user *)eip, ud2))
-                return;
-        if (ud2 != 0x0b0f)
-                return;
-
-        printk(KERN_EMERG "------------[ cut here ]------------\n");
+                return 0;
+        if (probe_kernel_address((unsigned short *)eip, ud2))
+                return 0;
 
-#ifdef CONFIG_DEBUG_BUGVERBOSE
-        do {
-                unsigned short line;
-                char *file;
-                char c;
-
-                if (probe_kernel_address((unsigned short __user *)(eip + 2),
-                                        line))
-                        break;
-                if (__get_user(file, (char * __user *)(eip + 4)) ||
-                    (unsigned long)file < PAGE_OFFSET || __get_user(c, file))
-                        file = "<bad filename>";
-
-                printk(KERN_EMERG "kernel BUG at %s:%d!\n", file, line);
-                return;
-        } while (0);
-#endif
-        printk(KERN_EMERG "Kernel BUG at [verbose debug info unavailable]\n");
+        return ud2 == 0x0b0f;
 }
 
-/* This is gone through when something in the kernel
- * has done something bad and is about to be terminated.
-*/
+/*
+ * This is gone through when something in the kernel has done something bad and
+ * is about to be terminated.
+ */
 void die(const char * str, struct pt_regs * regs, long err)
 {
         static struct {
@@ -452,7 +377,7 @@ void die(const char * str, struct pt_regs * regs, long err)
                 u32 lock_owner;
                 int lock_owner_depth;
         } die = {
-                .lock =                 SPIN_LOCK_UNLOCKED,
+                .lock =                 __SPIN_LOCK_UNLOCKED(die.lock),
                 .lock_owner =           -1,
                 .lock_owner_depth =     0
         };
@@ -476,7 +401,8 @@ void die(const char * str, struct pt_regs * regs, long err)
                 unsigned long esp;
                 unsigned short ss;
 
-                handle_BUG(regs);
+                report_bug(regs->eip);
+
                 printk(KERN_EMERG "%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
 #ifdef CONFIG_PREEMPT
                 printk(KERN_EMERG "PREEMPT ");
@@ -707,8 +633,7 @@ mem_parity_error(unsigned char reason, struct pt_regs * regs)
 {
         printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x on "
                 "CPU %d.\n", reason, smp_processor_id());
-        printk(KERN_EMERG "You probably have a hardware problem with your RAM "
-                        "chips\n");
+        printk(KERN_EMERG "You have some hardware problem, likely on the PCI bus.\n");
         if (panic_on_unrecovered_nmi)
                 panic("NMI: Not continuing");
 
@@ -773,7 +698,6 @@ void __kprobes die_nmi(struct pt_regs *regs, const char *msg)
         printk(" on CPU%d, eip %08lx, registers:\n",
                 smp_processor_id(), regs->eip);
         show_registers(regs);
-        printk(KERN_EMERG "console shuts up ...\n");
         console_silent();
         spin_unlock(&nmi_print_lock);
         bust_spinlocks(0);
@@ -1088,49 +1012,24 @@ fastcall void do_spurious_interrupt_bug(struct pt_regs * regs,
 #endif
 }
 
-fastcall void setup_x86_bogus_stack(unsigned char * stk)
+fastcall unsigned long patch_espfix_desc(unsigned long uesp,
+                                          unsigned long kesp)
 {
-        unsigned long *switch16_ptr, *switch32_ptr;
-        struct pt_regs *regs;
-        unsigned long stack_top, stack_bot;
-        unsigned short iret_frame16_off;
         int cpu = smp_processor_id();
-        /* reserve the space on 32bit stack for the magic switch16 pointer */
-        memmove(stk, stk + 8, sizeof(struct pt_regs));
-        switch16_ptr = (unsigned long *)(stk + sizeof(struct pt_regs));
-        regs = (struct pt_regs *)stk;
-        /* now the switch32 on 16bit stack */
-        stack_bot = (unsigned long)&per_cpu(cpu_16bit_stack, cpu);
-        stack_top = stack_bot + CPU_16BIT_STACK_SIZE;
-        switch32_ptr = (unsigned long *)(stack_top - 8);
-        iret_frame16_off = CPU_16BIT_STACK_SIZE - 8 - 20;
-        /* copy iret frame on 16bit stack */
-        memcpy((void *)(stack_bot + iret_frame16_off), &regs->eip, 20);
-        /* fill in the switch pointers */
-        switch16_ptr[0] = (regs->esp & 0xffff0000) | iret_frame16_off;
-        switch16_ptr[1] = __ESPFIX_SS;
-        switch32_ptr[0] = (unsigned long)stk + sizeof(struct pt_regs) +
-                8 - CPU_16BIT_STACK_SIZE;
-        switch32_ptr[1] = __KERNEL_DS;
-}
-
-fastcall unsigned char * fixup_x86_bogus_stack(unsigned short sp)
-{
-        unsigned long *switch32_ptr;
-        unsigned char *stack16, *stack32;
-        unsigned long stack_top, stack_bot;
-        int len;
-        int cpu = smp_processor_id();
-        stack_bot = (unsigned long)&per_cpu(cpu_16bit_stack, cpu);
-        stack_top = stack_bot + CPU_16BIT_STACK_SIZE;
-        switch32_ptr = (unsigned long *)(stack_top - 8);
-        /* copy the data from 16bit stack to 32bit stack */
-        len = CPU_16BIT_STACK_SIZE - 8 - sp;
-        stack16 = (unsigned char *)(stack_bot + sp);
-        stack32 = (unsigned char *)
-                (switch32_ptr[0] + CPU_16BIT_STACK_SIZE - 8 - len);
-        memcpy(stack32, stack16, len);
-        return stack32;
+        struct Xgt_desc_struct *cpu_gdt_descr = &per_cpu(cpu_gdt_descr, cpu);
+        struct desc_struct *gdt = (struct desc_struct *)cpu_gdt_descr->address;
+        unsigned long base = (kesp - uesp) & -THREAD_SIZE;
+        unsigned long new_kesp = kesp - base;
+        unsigned long lim_pages = (new_kesp | (THREAD_SIZE - 1)) >> PAGE_SHIFT;
+        __u64 desc = *(__u64 *)&gdt[GDT_ENTRY_ESPFIX_SS];
+        /* Set up base for espfix segment */
+        desc &= 0x00f0ff0000000000ULL;
+        desc |= ((((__u64)base) << 16) & 0x000000ffffff0000ULL) |
+                ((((__u64)base) << 32) & 0xff00000000000000ULL) |
+                ((((__u64)lim_pages) << 32) & 0x000f000000000000ULL) |
+                (lim_pages & 0xffff);
+        *(__u64 *)&gdt[GDT_ENTRY_ESPFIX_SS] = desc;
+        return new_kesp;
 }
 
 /*
@@ -1143,7 +1042,7 @@ fastcall unsigned char * fixup_x86_bogus_stack(unsigned short sp)
  * Must be called with kernel preemption disabled (in this case,
  * local interrupts are disabled at the call-site in entry.S).
  */
-asmlinkage void math_state_restore(struct pt_regs regs)
+asmlinkage void math_state_restore(void)
 {
         struct thread_info *thread = current_thread_info();
         struct task_struct *tsk = thread->task;
@@ -1153,6 +1052,7 @@ asmlinkage void math_state_restore(struct pt_regs regs)
                 init_fpu(tsk);
         restore_fpu(tsk);
         thread->status |= TS_USEDFPU;   /* So we fnsave on switch_to() */
+        tsk->fpu_counter++;
 }
 
 #ifndef CONFIG_MATH_EMULATION
@@ -1291,19 +1191,3 @@ static int __init kstack_setup(char *s)
         return 1;
 }
 __setup("kstack=", kstack_setup);
-
-#ifdef CONFIG_STACK_UNWIND
-static int __init call_trace_setup(char *s)
-{
-        if (strcmp(s, "old") == 0)
-                call_trace = -1;
-        else if (strcmp(s, "both") == 0)
-                call_trace = 0;
-        else if (strcmp(s, "newfallback") == 0)
-                call_trace = 1;
-        else if (strcmp(s, "new") == 2)
-                call_trace = 2;
-        return 1;
-}
-__setup("call_trace=", call_trace_setup);
-#endif
diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c
index fbc95828cd74..2cfc7b09b925 100644
--- a/arch/i386/kernel/tsc.c
+++ b/arch/i386/kernel/tsc.c
@@ -13,7 +13,6 @@
 
 #include <asm/delay.h>
 #include <asm/tsc.h>
-#include <asm/delay.h>
 #include <asm/io.h>
 
 #include "mach_timer.h"
@@ -25,7 +24,7 @@
  */
 unsigned int tsc_khz;
 
-int tsc_disable __cpuinitdata = 0;
+int tsc_disable;
 
 #ifdef CONFIG_X86_TSC
 static int __init tsc_setup(char *str)
@@ -217,7 +216,7 @@ static unsigned int cpufreq_delayed_issched = 0;
 static unsigned int cpufreq_init = 0;
 static struct work_struct cpufreq_delayed_get_work;
 
-static void handle_cpufreq_delayed_get(void *v)
+static void handle_cpufreq_delayed_get(struct work_struct *work)
 {
         unsigned int cpu;
 
@@ -306,7 +305,7 @@ static int __init cpufreq_tsc(void)
 {
         int ret;
 
-        INIT_WORK(&cpufreq_delayed_get_work, handle_cpufreq_delayed_get, NULL);
+        INIT_WORK(&cpufreq_delayed_get_work, handle_cpufreq_delayed_get);
         ret = cpufreq_register_notifier(&time_cpufreq_notifier_block,
                                         CPUFREQ_TRANSITION_NOTIFIER);
         if (!ret)
diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c
index cbcd61d6120b..be2f96e67f78 100644
--- a/arch/i386/kernel/vm86.c
+++ b/arch/i386/kernel/vm86.c
@@ -43,6 +43,7 @@
 #include <linux/highmem.h>
 #include <linux/ptrace.h>
 #include <linux/audit.h>
+#include <linux/stddef.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -72,10 +73,10 @@
 /*
  * 8- and 16-bit register defines..
  */
-#define AL(regs)        (((unsigned char *)&((regs)->eax))[0])
-#define AH(regs)        (((unsigned char *)&((regs)->eax))[1])
-#define IP(regs)        (*(unsigned short *)&((regs)->eip))
-#define SP(regs)        (*(unsigned short *)&((regs)->esp))
+#define AL(regs)        (((unsigned char *)&((regs)->pt.eax))[0])
+#define AH(regs)        (((unsigned char *)&((regs)->pt.eax))[1])
+#define IP(regs)        (*(unsigned short *)&((regs)->pt.eip))
+#define SP(regs)        (*(unsigned short *)&((regs)->pt.esp))
 
 /*
  * virtual flags (16 and 32-bit versions)
@@ -89,10 +90,37 @@
 #define SAFE_MASK       (0xDD5)
 #define RETURN_MASK     (0xDFF)
 
-#define VM86_REGS_PART2 orig_eax
-#define VM86_REGS_SIZE1 \
-        ( (unsigned)( & (((struct kernel_vm86_regs *)0)->VM86_REGS_PART2) ) )
-#define VM86_REGS_SIZE2 (sizeof(struct kernel_vm86_regs) - VM86_REGS_SIZE1)
+/* convert kernel_vm86_regs to vm86_regs */
+static int copy_vm86_regs_to_user(struct vm86_regs __user *user,
+                                  const struct kernel_vm86_regs *regs)
+{
+        int ret = 0;
+
+        /* kernel_vm86_regs is missing xfs, so copy everything up to
+           (but not including) xgs, and then rest after xgs. */
+        ret += copy_to_user(user, regs, offsetof(struct kernel_vm86_regs, pt.xgs));
+        ret += copy_to_user(&user->__null_gs, &regs->pt.xgs,
+                            sizeof(struct kernel_vm86_regs) -
+                            offsetof(struct kernel_vm86_regs, pt.xgs));
+
+        return ret;
+}
+
+/* convert vm86_regs to kernel_vm86_regs */
+static int copy_vm86_regs_from_user(struct kernel_vm86_regs *regs,
+                                    const struct vm86_regs __user *user,
+                                    unsigned extra)
+{
+        int ret = 0;
+
+        ret += copy_from_user(regs, user, offsetof(struct kernel_vm86_regs, pt.xgs));
+        ret += copy_from_user(&regs->pt.xgs, &user->__null_gs,
+                              sizeof(struct kernel_vm86_regs) -
+                              offsetof(struct kernel_vm86_regs, pt.xgs) +
+                              extra);
+
+        return ret;
+}
 
 struct pt_regs * FASTCALL(save_v86_state(struct kernel_vm86_regs * regs));
 struct pt_regs * fastcall save_v86_state(struct kernel_vm86_regs * regs)
@@ -112,10 +140,8 @@ struct pt_regs * fastcall save_v86_state(struct kernel_vm86_regs * regs)
                 printk("no vm86_info: BAD\n");
                 do_exit(SIGSEGV);
         }
-        set_flags(regs->eflags, VEFLAGS, VIF_MASK | current->thread.v86mask);
-        tmp = copy_to_user(&current->thread.vm86_info->regs,regs, VM86_REGS_SIZE1);
-        tmp += copy_to_user(&current->thread.vm86_info->regs.VM86_REGS_PART2,
-                &regs->VM86_REGS_PART2, VM86_REGS_SIZE2);
+        set_flags(regs->pt.eflags, VEFLAGS, VIF_MASK | current->thread.v86mask);
+        tmp = copy_vm86_regs_to_user(&current->thread.vm86_info->regs,regs);
         tmp += put_user(current->thread.screen_bitmap,&current->thread.vm86_info->screen_bitmap);
         if (tmp) {
                 printk("vm86: could not access userspace vm86_info\n");
@@ -129,9 +155,11 @@ struct pt_regs * fastcall save_v86_state(struct kernel_vm86_regs * regs)
         current->thread.saved_esp0 = 0;
         put_cpu();
 
-        loadsegment(fs, current->thread.saved_fs);
-        loadsegment(gs, current->thread.saved_gs);
         ret = KVM86->regs32;
+
+        loadsegment(fs, current->thread.saved_fs);
+        ret->xgs = current->thread.saved_gs;
+
         return ret;
 }
 
@@ -183,9 +211,9 @@ asmlinkage int sys_vm86old(struct pt_regs regs)
         tsk = current;
         if (tsk->thread.saved_esp0)
                 goto out;
-        tmp  = copy_from_user(&info, v86, VM86_REGS_SIZE1);
-        tmp += copy_from_user(&info.regs.VM86_REGS_PART2, &v86->regs.VM86_REGS_PART2,
-                (long)&info.vm86plus - (long)&info.regs.VM86_REGS_PART2);
+        tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
+                                       offsetof(struct kernel_vm86_struct, vm86plus) -
+                                       sizeof(info.regs));
         ret = -EFAULT;
         if (tmp)
                 goto out;
@@ -233,9 +261,9 @@ asmlinkage int sys_vm86(struct pt_regs regs)
         if (tsk->thread.saved_esp0)
                 goto out;
         v86 = (struct vm86plus_struct __user *)regs.ecx;
-        tmp  = copy_from_user(&info, v86, VM86_REGS_SIZE1);
-        tmp += copy_from_user(&info.regs.VM86_REGS_PART2, &v86->regs.VM86_REGS_PART2,
-                (long)&info.regs32 - (long)&info.regs.VM86_REGS_PART2);
+        tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
+                                       offsetof(struct kernel_vm86_struct, regs32) -
+                                       sizeof(info.regs));
         ret = -EFAULT;
         if (tmp)
                 goto out;
@@ -252,15 +280,15 @@ out:
 static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk)
 {
         struct tss_struct *tss;
-        long eax;
 /*
  * make sure the vm86() system call doesn't try to do anything silly
  */
-        info->regs.__null_ds = 0;
-        info->regs.__null_es = 0;
+        info->regs.pt.xds = 0;
+        info->regs.pt.xes = 0;
+        info->regs.pt.xgs = 0;
 
-/* we are clearing fs,gs later just before "jmp resume_userspace",
- * because starting with Linux 2.1.x they aren't no longer saved/restored
+/* we are clearing fs later just before "jmp resume_userspace",
+ * because it is not saved/restored.
  */
 
 /*
@@ -268,10 +296,10 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
  * has set it up safely, so this makes sure interrupt etc flags are
  * inherited from protected mode.
  */
-        VEFLAGS = info->regs.eflags;
-        info->regs.eflags &= SAFE_MASK;
-        info->regs.eflags |= info->regs32->eflags & ~SAFE_MASK;
-        info->regs.eflags |= VM_MASK;
+        VEFLAGS = info->regs.pt.eflags;
+        info->regs.pt.eflags &= SAFE_MASK;
+        info->regs.pt.eflags |= info->regs32->eflags & ~SAFE_MASK;
+        info->regs.pt.eflags |= VM_MASK;
 
         switch (info->cpu_type) {
                 case CPU_286:
@@ -294,7 +322,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
         info->regs32->eax = 0;
         tsk->thread.saved_esp0 = tsk->thread.esp0;
         savesegment(fs, tsk->thread.saved_fs);
-        savesegment(gs, tsk->thread.saved_gs);
+        tsk->thread.saved_gs = info->regs32->xgs;
 
         tss = &per_cpu(init_tss, get_cpu());
         tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0;
@@ -306,19 +334,18 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
         tsk->thread.screen_bitmap = info->screen_bitmap;
         if (info->flags & VM86_SCREEN_BITMAP)
                 mark_screen_rdonly(tsk->mm);
-        __asm__ __volatile__("xorl %eax,%eax; movl %eax,%fs; movl %eax,%gs\n\t");
-        __asm__ __volatile__("movl %%eax, %0\n" :"=r"(eax));
 
         /*call audit_syscall_exit since we do not exit via the normal paths */
         if (unlikely(current->audit_context))
-                audit_syscall_exit(AUDITSC_RESULT(eax), eax);
+                audit_syscall_exit(AUDITSC_RESULT(0), 0);
 
         __asm__ __volatile__(
                 "movl %0,%%esp\n\t"
                 "movl %1,%%ebp\n\t"
+                "mov  %2, %%fs\n\t"
                 "jmp resume_userspace"
                 : /* no outputs */
-                :"r" (&info->regs), "r" (task_thread_info(tsk)));
+                :"r" (&info->regs), "r" (task_thread_info(tsk)), "r" (0));
         /* we never return here */
 }
 
@@ -348,12 +375,12 @@ static inline void clear_IF(struct kernel_vm86_regs * regs)
 
 static inline void clear_TF(struct kernel_vm86_regs * regs)
 {
-        regs->eflags &= ~TF_MASK;
+        regs->pt.eflags &= ~TF_MASK;
 }
 
 static inline void clear_AC(struct kernel_vm86_regs * regs)
 {
-        regs->eflags &= ~AC_MASK;
+        regs->pt.eflags &= ~AC_MASK;
 }
 
 /* It is correct to call set_IF(regs) from the set_vflags_*
@@ -370,7 +397,7 @@ static inline void clear_AC(struct kernel_vm86_regs * regs)
 static inline void set_vflags_long(unsigned long eflags, struct kernel_vm86_regs * regs)
 {
         set_flags(VEFLAGS, eflags, current->thread.v86mask);
-        set_flags(regs->eflags, eflags, SAFE_MASK);
+        set_flags(regs->pt.eflags, eflags, SAFE_MASK);
         if (eflags & IF_MASK)
                 set_IF(regs);
         else
@@ -380,7 +407,7 @@ static inline void set_vflags_long(unsigned long eflags, struct kernel_vm86_regs
 static inline void set_vflags_short(unsigned short flags, struct kernel_vm86_regs * regs)
 {
         set_flags(VFLAGS, flags, current->thread.v86mask);
-        set_flags(regs->eflags, flags, SAFE_MASK);
+        set_flags(regs->pt.eflags, flags, SAFE_MASK);
         if (flags & IF_MASK)
                 set_IF(regs);
         else
@@ -389,7 +416,7 @@ static inline void set_vflags_short(unsigned short flags, struct kernel_vm86_reg
 
 static inline unsigned long get_vflags(struct kernel_vm86_regs * regs)
 {
-        unsigned long flags = regs->eflags & RETURN_MASK;
+        unsigned long flags = regs->pt.eflags & RETURN_MASK;
 
         if (VEFLAGS & VIF_MASK)
                 flags |= IF_MASK;
@@ -493,7 +520,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
         unsigned long __user *intr_ptr;
         unsigned long segoffs;
 
-        if (regs->cs == BIOSSEG)
+        if (regs->pt.xcs == BIOSSEG)
                 goto cannot_handle;
         if (is_revectored(i, &KVM86->int_revectored))
                 goto cannot_handle;
@@ -505,9 +532,9 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
         if ((segoffs >> 16) == BIOSSEG)
                 goto cannot_handle;
         pushw(ssp, sp, get_vflags(regs), cannot_handle);
-        pushw(ssp, sp, regs->cs, cannot_handle);
+        pushw(ssp, sp, regs->pt.xcs, cannot_handle);
         pushw(ssp, sp, IP(regs), cannot_handle);
-        regs->cs = segoffs >> 16;
+        regs->pt.xcs = segoffs >> 16;
         SP(regs) -= 6;
         IP(regs) = segoffs & 0xffff;
         clear_TF(regs);
@@ -524,7 +551,7 @@ int handle_vm86_trap(struct kernel_vm86_regs * regs, long error_code, int trapno
         if (VMPI.is_vm86pus) {
                 if ( (trapno==3) || (trapno==1) )
                         return_to_32bit(regs, VM86_TRAP + (trapno << 8));
-                do_int(regs, trapno, (unsigned char __user *) (regs->ss << 4), SP(regs));
+                do_int(regs, trapno, (unsigned char __user *) (regs->pt.xss << 4), SP(regs));
                 return 0;
         }
         if (trapno !=1)
@@ -560,10 +587,10 @@ void handle_vm86_fault(struct kernel_vm86_regs * regs, long error_code)
                 handle_vm86_trap(regs, 0, 1); \
         return; } while (0)
 
-        orig_flags = *(unsigned short *)&regs->eflags;
+        orig_flags = *(unsigned short *)&regs->pt.eflags;
 
-        csp = (unsigned char __user *) (regs->cs << 4);
-        ssp = (unsigned char __user *) (regs->ss << 4);
+        csp = (unsigned char __user *) (regs->pt.xcs << 4);
+        ssp = (unsigned char __user *) (regs->pt.xss << 4);
         sp = SP(regs);
         ip = IP(regs);
 
@@ -650,7 +677,7 @@ void handle_vm86_fault(struct kernel_vm86_regs * regs, long error_code)
                         SP(regs) += 6;
                 }
                 IP(regs) = newip;
-                regs->cs = newcs;
+                regs->pt.xcs = newcs;
                 CHECK_IF_IN_TRAP;
                 if (data32) {
                         set_vflags_long(newflags, regs);
diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/i386/kernel/vmlinux.lds.S
index c6f84a0322ba..a53c8b1854b5 100644
--- a/arch/i386/kernel/vmlinux.lds.S
+++ b/arch/i386/kernel/vmlinux.lds.S
@@ -1,18 +1,32 @@
 /* ld script to make i386 Linux kernel
  * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>;
+ *
+ * Don't define absolute symbols until and unless you know that symbol
+ * value is should remain constant even if kernel image is relocated
+ * at run time. Absolute symbols are not relocated. If symbol value should
+ * change if kernel is relocated, make the symbol section relative and
+ * put it inside the section definition.
  */
 
+/* Don't define absolute symbols until and unless you know that symbol
+ * value is should remain constant even if kernel image is relocated
+ * at run time. Absolute symbols are not relocated. If symbol value should
+ * change if kernel is relocated, make the symbol section relative and
+ * put it inside the section definition.
+ */
 #define LOAD_OFFSET __PAGE_OFFSET
 
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/thread_info.h>
 #include <asm/page.h>
 #include <asm/cache.h>
+#include <asm/boot.h>
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
 OUTPUT_ARCH(i386)
 ENTRY(phys_startup_32)
 jiffies = jiffies_64;
+_proxy_pda = 0;
 
 PHDRS {
         text PT_LOAD FLAGS(5);  /* R_E */
@@ -21,34 +35,37 @@ PHDRS {
 }
 SECTIONS
 {
-  . = __KERNEL_START;
+  . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
   phys_startup_32 = startup_32 - LOAD_OFFSET;
   /* read-only */
-  _text = .;                    /* Text and read-only data */
   .text : AT(ADDR(.text) - LOAD_OFFSET) {
+        _text = .;                      /* Text and read-only data */
         *(.text)
         SCHED_TEXT
         LOCK_TEXT
         KPROBES_TEXT
         *(.fixup)
         *(.gnu.warning)
-        } :text = 0x9090
-
-  _etext = .;                   /* End of text section */
+        _etext = .;                     /* End of text section */
+  } :text = 0x9090
 
   . = ALIGN(16);                /* Exception table */
-  __start___ex_table = .;
-  __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { *(__ex_table) }
-  __stop___ex_table = .;
+  __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
+        __start___ex_table = .;
+         *(__ex_table)
+        __stop___ex_table = .;
+  }
 
   RODATA
 
+  BUG_TABLE
+
   . = ALIGN(4);
-  __tracedata_start = .;
   .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) {
+        __tracedata_start = .;
         *(.tracedata)
+        __tracedata_end = .;
   }
-  __tracedata_end = .;
 
   /* writeable */
   . = ALIGN(4096);
@@ -57,11 +74,19 @@ SECTIONS
         CONSTRUCTORS
         } :data
 
+  .paravirtprobe : AT(ADDR(.paravirtprobe) - LOAD_OFFSET) {
+        __start_paravirtprobe = .;
+        *(.paravirtprobe)
+        __stop_paravirtprobe = .;
+  }
+
   . = ALIGN(4096);
-  __nosave_begin = .;
-  .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { *(.data.nosave) }
-  . = ALIGN(4096);
-  __nosave_end = .;
+  .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
+        __nosave_begin = .;
+        *(.data.nosave)
+        . = ALIGN(4096);
+        __nosave_end = .;
+  }
 
   . = ALIGN(4096);
   .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) {
@@ -75,17 +100,10 @@ SECTIONS
 
   /* rarely changed data like cpu maps */
   . = ALIGN(32);
-  .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) { *(.data.read_mostly) }
-  _edata = .;                   /* End of data section */
-
-#ifdef CONFIG_STACK_UNWIND
-  . = ALIGN(4);
-  .eh_frame : AT(ADDR(.eh_frame) - LOAD_OFFSET) {
-        __start_unwind = .;
-        *(.eh_frame)
-        __end_unwind = .;
+  .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) {
+        *(.data.read_mostly)
+        _edata = .;             /* End of data section */
   }
-#endif
 
   . = ALIGN(THREAD_SIZE);       /* init_task */
   .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {
@@ -94,88 +112,102 @@ SECTIONS
 
   /* might get freed after init */
   . = ALIGN(4096);
-  __smp_alt_begin = .;
-  __smp_alt_instructions = .;
   .smp_altinstructions : AT(ADDR(.smp_altinstructions) - LOAD_OFFSET) {
+        __smp_alt_begin = .;
+        __smp_alt_instructions = .;
         *(.smp_altinstructions)
+        __smp_alt_instructions_end = .;
   }
-  __smp_alt_instructions_end = .;
   . = ALIGN(4);
-  __smp_locks = .;
   .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
+        __smp_locks = .;
         *(.smp_locks)
+        __smp_locks_end = .;
   }
-  __smp_locks_end = .;
   .smp_altinstr_replacement : AT(ADDR(.smp_altinstr_replacement) - LOAD_OFFSET) {
         *(.smp_altinstr_replacement)
+        __smp_alt_end = .;
   }
+  /* will be freed after init
+   * Following ALIGN() is required to make sure no other data falls on the
+   * same page where __smp_alt_end is pointing as that page might be freed
+   * after boot. Always make sure that ALIGN() directive is present after
+   * the section which contains __smp_alt_end.
+   */
   . = ALIGN(4096);
-  __smp_alt_end = .;
 
   /* will be freed after init */
   . = ALIGN(4096);              /* Init code and data */
-  __init_begin = .;
   .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {
+        __init_begin = .;
         _sinittext = .;
         *(.init.text)
         _einittext = .;
   }
   .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { *(.init.data) }
   . = ALIGN(16);
-  __setup_start = .;
-  .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) { *(.init.setup) }
-  __setup_end = .;
-  __initcall_start = .;
+  .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) {
+        __setup_start = .;
+        *(.init.setup)
+        __setup_end = .;
+   }
   .initcall.init : AT(ADDR(.initcall.init) - LOAD_OFFSET) {
+        __initcall_start = .;
         INITCALLS
+        __initcall_end = .;
   }
-  __initcall_end = .;
-  __con_initcall_start = .;
   .con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) {
+        __con_initcall_start = .;
         *(.con_initcall.init)
+        __con_initcall_end = .;
   }
-  __con_initcall_end = .;
   SECURITY_INIT
   . = ALIGN(4);
-  __alt_instructions = .;
   .altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) {
+        __alt_instructions = .;
         *(.altinstructions)
+        __alt_instructions_end = .;
   }
-  __alt_instructions_end = .; 
   .altinstr_replacement : AT(ADDR(.altinstr_replacement) - LOAD_OFFSET) {
         *(.altinstr_replacement)
   }
+  . = ALIGN(4);
+  .parainstructions : AT(ADDR(.parainstructions) - LOAD_OFFSET) {
+        __start_parainstructions = .;
+        *(.parainstructions)
+        __stop_parainstructions = .;
+  }
   /* .exit.text is discard at runtime, not link time, to deal with references
      from .altinstructions and .eh_frame */
   .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { *(.exit.text) }
   .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { *(.exit.data) }
   . = ALIGN(4096);
-  __initramfs_start = .;
-  .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) { *(.init.ramfs) }
-  __initramfs_end = .;
+  .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
+        __initramfs_start = .;
+        *(.init.ramfs)
+        __initramfs_end = .;
+  }
   . = ALIGN(L1_CACHE_BYTES);
-  __per_cpu_start = .;
-  .data.percpu  : AT(ADDR(.data.percpu) - LOAD_OFFSET) { *(.data.percpu) }
-  __per_cpu_end = .;
+  .data.percpu  : AT(ADDR(.data.percpu) - LOAD_OFFSET) {
+        __per_cpu_start = .;
+        *(.data.percpu)
+        __per_cpu_end = .;
+  }
   . = ALIGN(4096);
-  __init_end = .;
   /* freed after init ends here */
         
-  __bss_start = .;              /* BSS */
-  .bss.page_aligned : AT(ADDR(.bss.page_aligned) - LOAD_OFFSET) {
-        *(.bss.page_aligned)
-  }
   .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
+        __init_end = .;
+        __bss_start = .;                /* BSS */
+        *(.bss.page_aligned)
         *(.bss)
+        . = ALIGN(4);
+        __bss_stop = .;
+        _end = . ;
+        /* This is where the kernel creates the early boot page tables */
+        . = ALIGN(4096);
+        pg0 = . ;
   }
-  . = ALIGN(4);
-  __bss_stop = .; 
-
-  _end = . ;
-
-  /* This is where the kernel creates the early boot page tables */
-  . = ALIGN(4096);
-  pg0 = .;
 
   /* Sections to be discarded */
   /DISCARD/ : {
diff --git a/arch/i386/mach-generic/bigsmp.c b/arch/i386/mach-generic/bigsmp.c
index 33d9f93557ba..8a210fa915b5 100644
--- a/arch/i386/mach-generic/bigsmp.c
+++ b/arch/i386/mach-generic/bigsmp.c
@@ -45,7 +45,7 @@ static struct dmi_system_id __initdata bigsmp_dmi_table[] = {
 };
 
 
-static __init int probe_bigsmp(void)
+static int probe_bigsmp(void)
 { 
         if (def_to_bigsmp)
                 dmi_bigsmp = 1;
diff --git a/arch/i386/mach-generic/default.c b/arch/i386/mach-generic/default.c
index 96c19821e47d..8685208d8512 100644
--- a/arch/i386/mach-generic/default.c
+++ b/arch/i386/mach-generic/default.c
@@ -18,7 +18,7 @@
 #include <asm/mach-default/mach_mpparse.h>
 
 /* should be called last. */
-static __init int probe_default(void)
+static int probe_default(void)
 { 
         return 1;
 } 
diff --git a/arch/i386/mach-generic/es7000.c b/arch/i386/mach-generic/es7000.c
index aa144d82334d..b8963a5a3b25 100644
--- a/arch/i386/mach-generic/es7000.c
+++ b/arch/i386/mach-generic/es7000.c
@@ -19,7 +19,7 @@
 #include <asm/mach-es7000/mach_mpparse.h>
 #include <asm/mach-es7000/mach_wakecpu.h>
 
-static __init int probe_es7000(void)
+static int probe_es7000(void)
 {
         /* probed later in mptable/ACPI hooks */
         return 0;
diff --git a/arch/i386/mach-generic/probe.c b/arch/i386/mach-generic/probe.c
index 94b1fd9cbe3c..a7b3999bb37a 100644
--- a/arch/i386/mach-generic/probe.c
+++ b/arch/i386/mach-generic/probe.c
@@ -45,7 +45,9 @@ static int __init parse_apic(char *arg)
                         return 0;
                 }
         }
-        return -ENOENT;
+
+        /* Parsed again by __setup for debug/verbose */
+        return 0;
 }
 early_param("apic", parse_apic);
 
diff --git a/arch/i386/mach-generic/summit.c b/arch/i386/mach-generic/summit.c
index f7e5d66648dc..74883ccb8f73 100644
--- a/arch/i386/mach-generic/summit.c
+++ b/arch/i386/mach-generic/summit.c
@@ -18,7 +18,7 @@
 #include <asm/mach-summit/mach_ipi.h>
 #include <asm/mach-summit/mach_mpparse.h>
 
-static __init int probe_summit(void)
+static int probe_summit(void)
 { 
         /* probed later in mptable/ACPI hooks */
         return 0;
diff --git a/arch/i386/mach-visws/setup.c b/arch/i386/mach-visws/setup.c
index 885c7cbfd478..233ee20907b9 100644
--- a/arch/i386/mach-visws/setup.c
+++ b/arch/i386/mach-visws/setup.c
@@ -6,6 +6,7 @@
 #include <linux/smp.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 
 #include <asm/fixmap.h>
 #include <asm/arch_hooks.h>
@@ -142,6 +143,8 @@ void __init time_init_hook(void)
 
 unsigned long sgivwfb_mem_phys;
 unsigned long sgivwfb_mem_size;
+EXPORT_SYMBOL(sgivwfb_mem_phys);
+EXPORT_SYMBOL(sgivwfb_mem_size);
 
 long long mem_size __initdata = 0;
 
diff --git a/arch/i386/mach-voyager/voyager_cat.c b/arch/i386/mach-voyager/voyager_cat.c
index f50c6c6ad680..943a9473b138 100644
--- a/arch/i386/mach-voyager/voyager_cat.c
+++ b/arch/i386/mach-voyager/voyager_cat.c
@@ -776,7 +776,7 @@ voyager_cat_init(void)
                 for(asic=0; asic < (*modpp)->num_asics; asic++) {
                         int j;
                         voyager_asic_t *asicp = *asicpp 
-                                = kmalloc(sizeof(voyager_asic_t), GFP_KERNEL); /*&voyager_asic_storage[asic_count++];*/
+                                = kzalloc(sizeof(voyager_asic_t), GFP_KERNEL); /*&voyager_asic_storage[asic_count++];*/
                         voyager_sp_table_t *sp_table;
                         voyager_at_t *asic_table;
                         voyager_jtt_t *jtag_table;
@@ -785,7 +785,6 @@ voyager_cat_init(void)
                                 printk("**WARNING** kmalloc failure in cat_init\n");
                                 continue;
                         }
-                        memset(asicp, 0, sizeof(voyager_asic_t));
                         asicpp = &(asicp->next);
                         asicp->asic_location = asic;
                         sp_table = (voyager_sp_table_t *)(eprom_buf + sp_offset);
@@ -851,8 +850,7 @@ voyager_cat_init(void)
 #endif
 
                 {
-                        struct resource *res = kmalloc(sizeof(struct resource),GFP_KERNEL);
-                        memset(res, 0, sizeof(struct resource));
+                        struct resource *res = kzalloc(sizeof(struct resource),GFP_KERNEL);
                         res->name = kmalloc(128, GFP_KERNEL);
                         sprintf((char *)res->name, "Voyager %s Quad CPI", cat_module_name(i));
                         res->start = qic_addr;
diff --git a/arch/i386/mach-voyager/voyager_smp.c b/arch/i386/mach-voyager/voyager_smp.c
index f3fea2ad50fe..55428e656a3f 100644
--- a/arch/i386/mach-voyager/voyager_smp.c
+++ b/arch/i386/mach-voyager/voyager_smp.c
@@ -28,6 +28,7 @@
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 #include <asm/arch_hooks.h>
+#include <asm/pda.h>
 
 /* TLB state -- visible externally, indexed physically */
 DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate) ____cacheline_aligned = { &init_mm, 0 };
@@ -422,6 +423,7 @@ find_smp_config(void)
              VOYAGER_SUS_IN_CONTROL_PORT);
 
         current_thread_info()->cpu = boot_cpu_id;
+        write_pda(cpu_number, boot_cpu_id);
 }
 
 /*
@@ -458,7 +460,7 @@ start_secondary(void *unused)
         /* external functions not defined in the headers */
         extern void calibrate_delay(void);
 
-        cpu_init();
+        secondary_cpu_init();
 
         /* OK, we're in the routine */
         ack_CPI(VIC_CPU_BOOT_CPI);
@@ -578,6 +580,15 @@ do_boot_cpu(__u8 cpu)
         /* init_tasks (in sched.c) is indexed logically */
         stack_start.esp = (void *) idle->thread.esp;
 
+        /* Pre-allocate and initialize the CPU's GDT and PDA so it
+           doesn't have to do any memory allocation during the
+           delicate CPU-bringup phase. */
+        if (!init_gdt(cpu, idle)) {
+                printk(KERN_INFO "Couldn't allocate GDT/PDA for CPU %d\n", cpu);
+                cpucount--;
+                return;
+        }
+
         irq_ctx_init(cpu);
 
         /* Note: Don't modify initial ss override */
@@ -1963,4 +1974,5 @@ void __init
 smp_setup_processor_id(void)
 {
         current_thread_info()->cpu = hard_smp_processor_id();
+        write_pda(cpu_number, hard_smp_processor_id());
 }
diff --git a/arch/i386/math-emu/fpu_emu.h b/arch/i386/math-emu/fpu_emu.h
index d62b20a3e660..65120f523853 100644
--- a/arch/i386/math-emu/fpu_emu.h
+++ b/arch/i386/math-emu/fpu_emu.h
@@ -57,6 +57,7 @@
 #define TAG_Special     Const(2)        /* De-normal, + or - infinity,
                                            or Not a Number */
 #define TAG_Empty       Const(3)        /* empty */
+#define TAG_Error       Const(0x80)     /* probably need to abort */
 
 #define LOADED_DATA     Const(10101)    /* Special st() number to identify
                                            loaded data (not on stack). */
diff --git a/arch/i386/math-emu/fpu_entry.c b/arch/i386/math-emu/fpu_entry.c
index d93f16ef828f..ddf8fa3bbd01 100644
--- a/arch/i386/math-emu/fpu_entry.c
+++ b/arch/i386/math-emu/fpu_entry.c
@@ -742,7 +742,8 @@ int save_i387_soft(void *s387, struct _fpstate __user * buf)
   S387->fcs &= ~0xf8000000;
   S387->fos |= 0xffff0000;
 #endif /* PECULIAR_486 */
-  __copy_to_user(d, &S387->cwd, 7*4);
+  if (__copy_to_user(d, &S387->cwd, 7*4))
+    return -1;
   RE_ENTRANT_CHECK_ON;
 
   d += 7*4;
diff --git a/arch/i386/math-emu/fpu_system.h b/arch/i386/math-emu/fpu_system.h
index bf26341c8bde..a3ae28c49ddd 100644
--- a/arch/i386/math-emu/fpu_system.h
+++ b/arch/i386/math-emu/fpu_system.h
@@ -68,6 +68,7 @@
 
 #define FPU_access_ok(x,y,z)    if ( !access_ok(x,y,z) ) \
                                 math_abort(FPU_info,SIGSEGV)
+#define FPU_abort               math_abort(FPU_info, SIGSEGV)
 
 #undef FPU_IGNORE_CODE_SEGV
 #ifdef FPU_IGNORE_CODE_SEGV
diff --git a/arch/i386/math-emu/load_store.c b/arch/i386/math-emu/load_store.c
index 85314be2fef8..eebd6fb1c8a8 100644
--- a/arch/i386/math-emu/load_store.c
+++ b/arch/i386/math-emu/load_store.c
@@ -227,6 +227,8 @@ int FPU_load_store(u_char type, fpu_addr_modes addr_modes,
     case 027:      /* fild m64int */
       clear_C1();
       loaded_tag = FPU_load_int64((long long __user *)data_address);
+      if (loaded_tag == TAG_Error)
+        return 0;
       FPU_settag0(loaded_tag);
       break;
     case 030:     /* fstenv  m14/28byte */
diff --git a/arch/i386/math-emu/reg_ld_str.c b/arch/i386/math-emu/reg_ld_str.c
index f06ed41d191d..e976caef6498 100644
--- a/arch/i386/math-emu/reg_ld_str.c
+++ b/arch/i386/math-emu/reg_ld_str.c
@@ -244,7 +244,8 @@ int FPU_load_int64(long long __user *_s)
 
   RE_ENTRANT_CHECK_OFF;
   FPU_access_ok(VERIFY_READ, _s, 8);
-  copy_from_user(&s,_s,8);
+  if (copy_from_user(&s,_s,8))
+    FPU_abort;
   RE_ENTRANT_CHECK_ON;
 
   if (s == 0)
@@ -907,7 +908,8 @@ int FPU_store_int64(FPU_REG *st0_ptr, u_char st0_tag, long long __user *d)
 
   RE_ENTRANT_CHECK_OFF;
   FPU_access_ok(VERIFY_WRITE,d,8);
-  copy_to_user(d, &tll, 8);
+  if (copy_to_user(d, &tll, 8))
+    FPU_abort;
   RE_ENTRANT_CHECK_ON;
 
   return 1;
@@ -1336,7 +1338,8 @@ u_char __user *fstenv(fpu_addr_modes addr_modes, u_char __user *d)
       I387.soft.fcs &= ~0xf8000000;
       I387.soft.fos |= 0xffff0000;
 #endif /* PECULIAR_486 */
-      __copy_to_user(d, &control_word, 7*4);
+      if (__copy_to_user(d, &control_word, 7*4))
+        FPU_abort;
       RE_ENTRANT_CHECK_ON;
       d += 0x1c;
     }
@@ -1359,9 +1362,11 @@ void fsave(fpu_addr_modes addr_modes, u_char __user *data_address)
   FPU_access_ok(VERIFY_WRITE,d,80);
 
   /* Copy all registers in stack order. */
-  __copy_to_user(d, register_base+offset, other);
+  if (__copy_to_user(d, register_base+offset, other))
+    FPU_abort;
   if ( offset )
-    __copy_to_user(d+other, register_base, offset);
+    if (__copy_to_user(d+other, register_base, offset))
+      FPU_abort;
   RE_ENTRANT_CHECK_ON;
 
   finit();
diff --git a/arch/i386/mm/boot_ioremap.c b/arch/i386/mm/boot_ioremap.c
index 4de11f508c3a..4de95a17a7d4 100644
--- a/arch/i386/mm/boot_ioremap.c
+++ b/arch/i386/mm/boot_ioremap.c
@@ -16,6 +16,7 @@
  */
 
 #undef CONFIG_X86_PAE
+#undef CONFIG_PARAVIRT
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c
index ddbdb0336f28..e0c390d6ceb5 100644
--- a/arch/i386/mm/discontig.c
+++ b/arch/i386/mm/discontig.c
@@ -168,7 +168,7 @@ static void __init allocate_pgdat(int nid)
         if (nid && node_has_online_mem(nid))
                 NODE_DATA(nid) = (pg_data_t *)node_remap_start_vaddr[nid];
         else {
-                NODE_DATA(nid) = (pg_data_t *)(__va(min_low_pfn << PAGE_SHIFT));
+                NODE_DATA(nid) = (pg_data_t *)(pfn_to_kaddr(min_low_pfn));
                 min_low_pfn += PFN_UP(sizeof(pg_data_t));
         }
 }
@@ -405,3 +405,31 @@ void __init set_highmem_pages_init(int bad_ppro)
         totalram_pages += totalhigh_pages;
 #endif
 }
+
+#ifdef CONFIG_MEMORY_HOTPLUG
+int paddr_to_nid(u64 addr)
+{
+        int nid;
+        unsigned long pfn = PFN_DOWN(addr);
+
+        for_each_node(nid)
+                if (node_start_pfn[nid] <= pfn &&
+                    pfn < node_end_pfn[nid])
+                        return nid;
+
+        return -1;
+}
+
+/*
+ * This function is used to ask node id BEFORE memmap and mem_section's
+ * initialization (pfn_to_nid() can't be used yet).
+ * If _PXM is not defined on ACPI's DSDT, node id must be found by this.
+ */
+int memory_add_physaddr_to_nid(u64 addr)
+{
+        int nid = paddr_to_nid(addr);
+        return (nid >= 0) ? nid : 0;
+}
+
+EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
+#endif
diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c
index 2581575786c1..aaaa4d225f7e 100644
--- a/arch/i386/mm/fault.c
+++ b/arch/i386/mm/fault.c
@@ -22,9 +22,9 @@
 #include <linux/highmem.h>
 #include <linux/module.h>
 #include <linux/kprobes.h>
+#include <linux/uaccess.h>
 
 #include <asm/system.h>
-#include <asm/uaccess.h>
 #include <asm/desc.h>
 #include <asm/kdebug.h>
 #include <asm/segment.h>
@@ -167,7 +167,7 @@ static inline unsigned long get_segment_eip(struct pt_regs *regs,
 static int __is_prefetch(struct pt_regs *regs, unsigned long addr)
 { 
         unsigned long limit;
-        unsigned long instr = get_segment_eip (regs, &limit);
+        unsigned char *instr = (unsigned char *)get_segment_eip (regs, &limit);
         int scan_more = 1;
         int prefetch = 0; 
         int i;
@@ -177,9 +177,9 @@ static int __is_prefetch(struct pt_regs *regs, unsigned long addr)
                 unsigned char instr_hi;
                 unsigned char instr_lo;
 
-                if (instr > limit)
+                if (instr > (unsigned char *)limit)
                         break;
-                if (__get_user(opcode, (unsigned char __user *) instr))
+                if (probe_kernel_address(instr, opcode))
                         break; 
 
                 instr_hi = opcode & 0xf0; 
@@ -204,9 +204,9 @@ static int __is_prefetch(struct pt_regs *regs, unsigned long addr)
                 case 0x00:
                         /* Prefetch instruction is 0x0F0D or 0x0F18 */
                         scan_more = 0;
-                        if (instr > limit)
+                        if (instr > (unsigned char *)limit)
                                 break;
-                        if (__get_user(opcode, (unsigned char __user *) instr))
+                        if (probe_kernel_address(instr, opcode))
                                 break;
                         prefetch = (instr_lo == 0xF) &&
                                 (opcode == 0x0D || opcode == 0x18);
diff --git a/arch/i386/mm/highmem.c b/arch/i386/mm/highmem.c
index f9f647cdbc7b..e0fa6cb655a8 100644
--- a/arch/i386/mm/highmem.c
+++ b/arch/i386/mm/highmem.c
@@ -32,7 +32,7 @@ void *kmap_atomic(struct page *page, enum km_type type)
         unsigned long vaddr;
 
         /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
-        inc_preempt_count();
+        pagefault_disable();
         if (!PageHighMem(page))
                 return page_address(page);
 
@@ -50,26 +50,22 @@ void kunmap_atomic(void *kvaddr, enum km_type type)
         unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;
         enum fixed_addresses idx = type + KM_TYPE_NR*smp_processor_id();
 
-#ifdef CONFIG_DEBUG_HIGHMEM
-        if (vaddr >= PAGE_OFFSET && vaddr < (unsigned long)high_memory) {
-                dec_preempt_count();
-                preempt_check_resched();
-                return;
-        }
-
-        if (vaddr != __fix_to_virt(FIX_KMAP_BEGIN+idx))
-                BUG();
-#endif
         /*
          * Force other mappings to Oops if they'll try to access this pte
          * without first remap it.  Keeping stale mappings around is a bad idea
          * also, in case the page changes cacheability attributes or becomes
          * a protected page in a hypervisor.
          */
-        kpte_clear_flush(kmap_pte-idx, vaddr);
+        if (vaddr == __fix_to_virt(FIX_KMAP_BEGIN+idx))
+                kpte_clear_flush(kmap_pte-idx, vaddr);
+        else {
+#ifdef CONFIG_DEBUG_HIGHMEM
+                BUG_ON(vaddr < PAGE_OFFSET);
+                BUG_ON(vaddr >= (unsigned long)high_memory);
+#endif
+        }
 
-        dec_preempt_count();
-        preempt_check_resched();
+        pagefault_enable();
 }
 
 /* This is the same as kmap_atomic() but can map memory that doesn't
@@ -80,7 +76,7 @@ void *kmap_atomic_pfn(unsigned long pfn, enum km_type type)
         enum fixed_addresses idx;
         unsigned long vaddr;
 
-        inc_preempt_count();
+        pagefault_disable();
 
         idx = type + KM_TYPE_NR*smp_processor_id();
         vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
diff --git a/arch/i386/mm/hugetlbpage.c b/arch/i386/mm/hugetlbpage.c
index 1719a8141f81..34728e4afe48 100644
--- a/arch/i386/mm/hugetlbpage.c
+++ b/arch/i386/mm/hugetlbpage.c
@@ -17,6 +17,113 @@
 #include <asm/tlb.h>
 #include <asm/tlbflush.h>
 
+static unsigned long page_table_shareable(struct vm_area_struct *svma,
+                                struct vm_area_struct *vma,
+                                unsigned long addr, pgoff_t idx)
+{
+        unsigned long saddr = ((idx - svma->vm_pgoff) << PAGE_SHIFT) +
+                                svma->vm_start;
+        unsigned long sbase = saddr & PUD_MASK;
+        unsigned long s_end = sbase + PUD_SIZE;
+
+        /*
+         * match the virtual addresses, permission and the alignment of the
+         * page table page.
+         */
+        if (pmd_index(addr) != pmd_index(saddr) ||
+            vma->vm_flags != svma->vm_flags ||
+            sbase < svma->vm_start || svma->vm_end < s_end)
+                return 0;
+
+        return saddr;
+}
+
+static int vma_shareable(struct vm_area_struct *vma, unsigned long addr)
+{
+        unsigned long base = addr & PUD_MASK;
+        unsigned long end = base + PUD_SIZE;
+
+        /*
+         * check on proper vm_flags and page table alignment
+         */
+        if (vma->vm_flags & VM_MAYSHARE &&
+            vma->vm_start <= base && end <= vma->vm_end)
+                return 1;
+        return 0;
+}
+
+/*
+ * search for a shareable pmd page for hugetlb.
+ */
+static void huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)
+{
+        struct vm_area_struct *vma = find_vma(mm, addr);
+        struct address_space *mapping = vma->vm_file->f_mapping;
+        pgoff_t idx = ((addr - vma->vm_start) >> PAGE_SHIFT) +
+                        vma->vm_pgoff;
+        struct prio_tree_iter iter;
+        struct vm_area_struct *svma;
+        unsigned long saddr;
+        pte_t *spte = NULL;
+
+        if (!vma_shareable(vma, addr))
+                return;
+
+        spin_lock(&mapping->i_mmap_lock);
+        vma_prio_tree_foreach(svma, &iter, &mapping->i_mmap, idx, idx) {
+                if (svma == vma)
+                        continue;
+
+                saddr = page_table_shareable(svma, vma, addr, idx);
+                if (saddr) {
+                        spte = huge_pte_offset(svma->vm_mm, saddr);
+                        if (spte) {
+                                get_page(virt_to_page(spte));
+                                break;
+                        }
+                }
+        }
+
+        if (!spte)
+                goto out;
+
+        spin_lock(&mm->page_table_lock);
+        if (pud_none(*pud))
+                pud_populate(mm, pud, (unsigned long) spte & PAGE_MASK);
+        else
+                put_page(virt_to_page(spte));
+        spin_unlock(&mm->page_table_lock);
+out:
+        spin_unlock(&mapping->i_mmap_lock);
+}
+
+/*
+ * unmap huge page backed by shared pte.
+ *
+ * Hugetlb pte page is ref counted at the time of mapping.  If pte is shared
+ * indicated by page_count > 1, unmap is achieved by clearing pud and
+ * decrementing the ref count. If count == 1, the pte page is not shared.
+ *
+ * called with vma->vm_mm->page_table_lock held.
+ *
+ * returns: 1 successfully unmapped a shared pte page
+ *          0 the underlying pte page is not shared, or it is the last user
+ */
+int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
+{
+        pgd_t *pgd = pgd_offset(mm, *addr);
+        pud_t *pud = pud_offset(pgd, *addr);
+
+        BUG_ON(page_count(virt_to_page(ptep)) == 0);
+        if (page_count(virt_to_page(ptep)) == 1)
+                return 0;
+
+        pud_clear(pud);
+        put_page(virt_to_page(ptep));
+        *addr = ALIGN(*addr, HPAGE_SIZE * PTRS_PER_PTE) - HPAGE_SIZE;
+        return 1;
+}
+
 pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr)
 {
         pgd_t *pgd;
@@ -25,8 +132,11 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr)
 
         pgd = pgd_offset(mm, addr);
         pud = pud_alloc(mm, pgd, addr);
-        if (pud)
+        if (pud) {
+                if (pud_none(*pud))
+                        huge_pmd_share(mm, addr, pud);
                 pte = (pte_t *) pmd_alloc(mm, pud, addr);
+        }
         BUG_ON(pte && !pte_none(*pte) && !pte_huge(*pte));
 
         return pte;
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 167416155ee4..c5c5ea700cc7 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -192,8 +192,6 @@ static inline int page_kills_ppro(unsigned long pagenr)
         return 0;
 }
 
-extern int is_available_memory(efi_memory_desc_t *);
-
 int page_is_ram(unsigned long pagenr)
 {
         int i;
@@ -285,7 +283,7 @@ void __init add_one_highpage_init(struct page *page, int pfn, int bad_ppro)
                 SetPageReserved(page);
 }
 
-static int add_one_highpage_hotplug(struct page *page, unsigned long pfn)
+static int __meminit add_one_highpage_hotplug(struct page *page, unsigned long pfn)
 {
         free_new_highpage(page);
         totalram_pages++;
@@ -302,7 +300,7 @@ static int add_one_highpage_hotplug(struct page *page, unsigned long pfn)
  * has been added dynamically that would be
  * onlined here is in HIGHMEM
  */
-void online_page(struct page *page)
+void __meminit online_page(struct page *page)
 {
         ClearPageReserved(page);
         add_one_highpage_hotplug(page, page_to_pfn(page));
@@ -675,16 +673,10 @@ void __init mem_init(void)
 #endif
 }
 
-/*
- * this is for the non-NUMA, single node SMP system case.
- * Specifically, in the case of x86, we will always add
- * memory to the highmem for now.
- */
 #ifdef CONFIG_MEMORY_HOTPLUG
-#ifndef CONFIG_NEED_MULTIPLE_NODES
 int arch_add_memory(int nid, u64 start, u64 size)
 {
-        struct pglist_data *pgdata = &contig_page_data;
+        struct pglist_data *pgdata = NODE_DATA(nid);
         struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM;
         unsigned long start_pfn = start >> PAGE_SHIFT;
         unsigned long nr_pages = size >> PAGE_SHIFT;
@@ -696,11 +688,11 @@ int remove_memory(u64 start, u64 size)
 {
         return -EINVAL;
 }
-#endif
+EXPORT_SYMBOL_GPL(remove_memory);
 #endif
 
-kmem_cache_t *pgd_cache;
-kmem_cache_t *pmd_cache;
+struct kmem_cache *pgd_cache;
+struct kmem_cache *pmd_cache;
 
 void __init pgtable_cache_init(void)
 {
diff --git a/arch/i386/mm/pageattr.c b/arch/i386/mm/pageattr.c
index 8564b6ae17e3..ad91528bdc14 100644
--- a/arch/i386/mm/pageattr.c
+++ b/arch/i386/mm/pageattr.c
@@ -67,11 +67,17 @@ static struct page *split_large_page(unsigned long address, pgprot_t prot,
         return base;
 } 
 
-static void flush_kernel_map(void *dummy) 
+static void flush_kernel_map(void *arg)
 { 
-        /* Could use CLFLUSH here if the CPU supports it (Hammer,P4) */
-        if (boot_cpu_data.x86_model >= 4) 
+        unsigned long adr = (unsigned long)arg;
+
+        if (adr && cpu_has_clflush) {
+                int i;
+                for (i = 0; i < PAGE_SIZE; i += boot_cpu_data.x86_clflush_size)
+                        asm volatile("clflush (%0)" :: "r" (adr + i));
+        } else if (boot_cpu_data.x86_model >= 4)
                 wbinvd();
+
         /* Flush all to work around Errata in early athlons regarding 
          * large page flushing. 
          */
@@ -173,9 +179,9 @@ __change_page_attr(struct page *page, pgprot_t prot)
         return 0;
 } 
 
-static inline void flush_map(void)
+static inline void flush_map(void *adr)
 {
-        on_each_cpu(flush_kernel_map, NULL, 1, 1);
+        on_each_cpu(flush_kernel_map, adr, 1, 1);
 }
 
 /*
@@ -217,9 +223,13 @@ void global_flush_tlb(void)
         spin_lock_irq(&cpa_lock);
         list_replace_init(&df_list, &l);
         spin_unlock_irq(&cpa_lock);
-        flush_map();
-        list_for_each_entry_safe(pg, next, &l, lru)
+        if (!cpu_has_clflush)
+                flush_map(0);
+        list_for_each_entry_safe(pg, next, &l, lru) {
+                if (cpu_has_clflush)
+                        flush_map(page_address(pg));
                 __free_page(pg);
+        }
 }
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
diff --git a/arch/i386/mm/pgtable.c b/arch/i386/mm/pgtable.c
index 10126e3f8174..f349eaf450b0 100644
--- a/arch/i386/mm/pgtable.c
+++ b/arch/i386/mm/pgtable.c
@@ -95,8 +95,11 @@ static void set_pte_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags)
                 return;
         }
         pte = pte_offset_kernel(pmd, vaddr);
-        /* <pfn,flags> stored as-is, to permit clearing entries */
-        set_pte(pte, pfn_pte(pfn, flags));
+        if (pgprot_val(flags))
+                /* <pfn,flags> stored as-is, to permit clearing entries */
+                set_pte(pte, pfn_pte(pfn, flags));
+        else
+                pte_clear(&init_mm, vaddr, pte);
 
         /*
          * It's enough to flush this one mapping.
@@ -193,7 +196,7 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address)
         return pte;
 }
 
-void pmd_ctor(void *pmd, kmem_cache_t *cache, unsigned long flags)
+void pmd_ctor(void *pmd, struct kmem_cache *cache, unsigned long flags)
 {
         memset(pmd, 0, PTRS_PER_PMD*sizeof(pmd_t));
 }
@@ -233,7 +236,7 @@ static inline void pgd_list_del(pgd_t *pgd)
                 set_page_private(next, (unsigned long)pprev);
 }
 
-void pgd_ctor(void *pgd, kmem_cache_t *cache, unsigned long unused)
+void pgd_ctor(void *pgd, struct kmem_cache *cache, unsigned long unused)
 {
         unsigned long flags;
 
@@ -253,7 +256,7 @@ void pgd_ctor(void *pgd, kmem_cache_t *cache, unsigned long unused)
 }
 
 /* never called when PTRS_PER_PMD > 1 */
-void pgd_dtor(void *pgd, kmem_cache_t *cache, unsigned long unused)
+void pgd_dtor(void *pgd, struct kmem_cache *cache, unsigned long unused)
 {
         unsigned long flags; /* can be called from interrupt context */
 
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/early.c b/arch/i386/pci/early.c
index 713d6c866cae..42df4b6606df 100644
--- a/arch/i386/pci/early.c
+++ b/arch/i386/pci/early.c
@@ -45,6 +45,13 @@ void write_pci_config(u8 bus, u8 slot, u8 func, u8 offset,
         outl(val, 0xcfc);
 }
 
+void write_pci_config_byte(u8 bus, u8 slot, u8 func, u8 offset, u8 val)
+{
+        PDprintk("%x writing to %x: %x\n", slot, offset, val);
+        outl(0x80000000 | (bus<<16) | (slot<<11) | (func<<8) | offset, 0xcf8);
+        outb(val, 0xcfc);
+}
+
 int early_pci_allowed(void)
 {
         return (pci_probe & (PCI_PROBE_CONF1|PCI_PROBE_NOEARLY)) ==
diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c
index c1949ff38d61..8053b17ab647 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)
 {
         /*
@@ -161,7 +115,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3, pci
 #define VIA_8363_KL133_REVISION_ID 0x81
 #define VIA_8363_KM133_REVISION_ID 0x84
 
-static void __devinit pci_fixup_via_northbridge_bug(struct pci_dev *d)
+static void pci_fixup_via_northbridge_bug(struct pci_dev *d)
 {
         u8 v;
         u8 revision;
@@ -197,6 +151,10 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8363_0, pci_fixup_
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8622, pci_fixup_via_northbridge_bug);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8361, pci_fixup_via_northbridge_bug);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8367_0, pci_fixup_via_northbridge_bug);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8363_0, pci_fixup_via_northbridge_bug);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8622, pci_fixup_via_northbridge_bug);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8361, pci_fixup_via_northbridge_bug);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8367_0, pci_fixup_via_northbridge_bug);
 
 /*
  * For some reasons Intel decided that certain parts of their
@@ -227,7 +185,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, pci_fixup_transparent_
  * issue another HALT within 80 ns of the initial HALT, the failure condition
  * is avoided.
  */
-static void __init pci_fixup_nforce2(struct pci_dev *dev)
+static void pci_fixup_nforce2(struct pci_dev *dev)
 {
         u32 val;
 
@@ -250,6 +208,7 @@ static void __init pci_fixup_nforce2(struct pci_dev *dev)
         }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2, pci_fixup_nforce2);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2, pci_fixup_nforce2);
 
 /* Max PCI Express root ports */
 #define MAX_PCIEROOT    6
@@ -465,7 +424,7 @@ DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_TI, 0x8032,
  * Prevent the BIOS trapping accesses to the Cyrix CS5530A video device
  * configuration space.
  */
-static void __devinit pci_early_fixup_cyrix_5530(struct pci_dev *dev)
+static void pci_early_fixup_cyrix_5530(struct pci_dev *dev)
 {
         u8 r;
         /* clear 'F4 Video Configuration Trap' bit */
@@ -475,3 +434,5 @@ static void __devinit pci_early_fixup_cyrix_5530(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY,
                         pci_early_fixup_cyrix_5530);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY,
+                        pci_early_fixup_cyrix_5530);
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..f2cb942f8281 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;
@@ -758,7 +764,7 @@ static void __init pirq_find_router(struct irq_router *r)
         DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n",
             rt->rtr_vendor, rt->rtr_device);
 
-        pirq_router_dev = pci_find_slot(rt->rtr_bus, rt->rtr_devfn);
+        pirq_router_dev = pci_get_bus_and_slot(rt->rtr_bus, rt->rtr_devfn);
         if (!pirq_router_dev) {
                 DBG(KERN_DEBUG "PCI: Interrupt router not found at "
                         "%02x:%02x\n", rt->rtr_bus, rt->rtr_devfn);
@@ -778,6 +784,8 @@ static void __init pirq_find_router(struct irq_router *r)
                 pirq_router_dev->vendor,
                 pirq_router_dev->device,
                 pci_name(pirq_router_dev));
+
+        /* The device remains referenced for the kernel lifetime */
 }
 
 static struct irq_info *pirq_get_info(struct pci_dev *dev)
diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
index c6b6d9bbc453..e2616a266e13 100644
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
@@ -26,6 +26,7 @@
 
 /* The base address of the last MMCONFIG device accessed */
 static u32 mmcfg_last_accessed_device;
+static int mmcfg_last_accessed_cpu;
 
 static DECLARE_BITMAP(fallback_slots, MAX_CHECK_BUS*32);
 
@@ -73,8 +74,11 @@ static u32 get_base_addr(unsigned int seg, int bus, unsigned devfn)
 static void pci_exp_set_dev_base(unsigned int base, int bus, int devfn)
 {
         u32 dev_base = base | (bus << 20) | (devfn << 12);
-        if (dev_base != mmcfg_last_accessed_device) {
+        int cpu = smp_processor_id();
+        if (dev_base != mmcfg_last_accessed_device ||
+            cpu != mmcfg_last_accessed_cpu) {
                 mmcfg_last_accessed_device = dev_base;
+                mmcfg_last_accessed_cpu = cpu;
                 set_fixmap_nocache(FIX_PCIE_MCFG, dev_base);
         }
 }
diff --git a/arch/i386/pci/pcbios.c b/arch/i386/pci/pcbios.c
index ed1512a175ab..5f5193401bea 100644
--- a/arch/i386/pci/pcbios.c
+++ b/arch/i386/pci/pcbios.c
@@ -5,6 +5,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/uaccess.h>
 #include "pci.h"
 #include "pci-functions.h"
 
@@ -314,6 +315,10 @@ static struct pci_raw_ops * __devinit pci_find_bios(void)
         for (check = (union bios32 *) __va(0xe0000);
              check <= (union bios32 *) __va(0xffff0);
              ++check) {
+                long sig;
+                if (probe_kernel_address(&check->fields.signature, sig))
+                        continue;
+
                 if (check->fields.signature != BIOS32_SIGNATURE)
                         continue;
                 length = check->fields.length * 16;
@@ -331,11 +336,13 @@ static struct pci_raw_ops * __devinit pci_find_bios(void)
                 }
                 DBG("PCI: BIOS32 Service Directory structure at 0x%p\n", check);
                 if (check->fields.entry >= 0x100000) {
-                        printk("PCI: BIOS32 entry (0x%p) in high memory, cannot use.\n", check);
+                        printk("PCI: BIOS32 entry (0x%p) in high memory, "
+                                        "cannot use.\n", check);
                         return NULL;
                 } else {
                         unsigned long bios32_entry = check->fields.entry;
-                        DBG("PCI: BIOS32 Service Directory entry at 0x%lx\n", bios32_entry);
+                        DBG("PCI: BIOS32 Service Directory entry at 0x%lx\n",
+                                        bios32_entry);
                         bios32_indirect.address = bios32_entry + PAGE_OFFSET;
                         if (check_pcibios())
                                 return &pci_bios_access;
diff --git a/arch/i386/power/Makefile b/arch/i386/power/Makefile
index 8cfa4e8a719d..2de7bbf03cd7 100644
--- a/arch/i386/power/Makefile
+++ b/arch/i386/power/Makefile
@@ -1,2 +1,2 @@
 obj-$(CONFIG_PM)                += cpu.o
-obj-$(CONFIG_SOFTWARE_SUSPEND)  += swsusp.o
+obj-$(CONFIG_SOFTWARE_SUSPEND)  += swsusp.o suspend.o
diff --git a/arch/i386/power/cpu.c b/arch/i386/power/cpu.c
index 5a1abeff033b..2c15500f8713 100644
--- a/arch/i386/power/cpu.c
+++ b/arch/i386/power/cpu.c
@@ -26,8 +26,8 @@ void __save_processor_state(struct saved_context *ctxt)
         /*
          * descriptor tables
          */
-        store_gdt(&ctxt->gdt_limit);
-        store_idt(&ctxt->idt_limit);
+        store_gdt(&ctxt->gdt);
+        store_idt(&ctxt->idt);
         store_tr(ctxt->tr);
 
         /*
@@ -99,8 +99,8 @@ void __restore_processor_state(struct saved_context *ctxt)
          * now restore the descriptor tables to their proper values
          * ltr is done i fix_processor_context().
          */
-        load_gdt(&ctxt->gdt_limit);
-        load_idt(&ctxt->idt_limit);
+        load_gdt(&ctxt->gdt);
+        load_idt(&ctxt->idt);
 
         /*
          * segment registers
diff --git a/arch/i386/power/suspend.c b/arch/i386/power/suspend.c
new file mode 100644
index 000000000000..db5e98d2eb73
--- /dev/null
+++ b/arch/i386/power/suspend.c
@@ -0,0 +1,158 @@
+/*
+ * Suspend support specific for i386 - temporary page tables
+ *
+ * Distribute under GPLv2
+ *
+ * Copyright (c) 2006 Rafael J. Wysocki <rjw@sisk.pl>
+ */
+
+#include <linux/suspend.h>
+#include <linux/bootmem.h>
+
+#include <asm/system.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+
+/* Defined in arch/i386/power/swsusp.S */
+extern int restore_image(void);
+
+/* Pointer to the temporary resume page tables */
+pgd_t *resume_pg_dir;
+
+/* The following three functions are based on the analogous code in
+ * arch/i386/mm/init.c
+ */
+
+/*
+ * Create a middle page table on a resume-safe page and put a pointer to it in
+ * the given global directory entry.  This only returns the gd entry
+ * in non-PAE compilation mode, since the middle layer is folded.
+ */
+static pmd_t *resume_one_md_table_init(pgd_t *pgd)
+{
+        pud_t *pud;
+        pmd_t *pmd_table;
+
+#ifdef CONFIG_X86_PAE
+        pmd_table = (pmd_t *)get_safe_page(GFP_ATOMIC);
+        if (!pmd_table)
+                return NULL;
+
+        set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
+        pud = pud_offset(pgd, 0);
+
+        BUG_ON(pmd_table != pmd_offset(pud, 0));
+#else
+        pud = pud_offset(pgd, 0);
+        pmd_table = pmd_offset(pud, 0);
+#endif
+
+        return pmd_table;
+}
+
+/*
+ * Create a page table on a resume-safe page and place a pointer to it in
+ * a middle page directory entry.
+ */
+static pte_t *resume_one_page_table_init(pmd_t *pmd)
+{
+        if (pmd_none(*pmd)) {
+                pte_t *page_table = (pte_t *)get_safe_page(GFP_ATOMIC);
+                if (!page_table)
+                        return NULL;
+
+                set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
+
+                BUG_ON(page_table != pte_offset_kernel(pmd, 0));
+
+                return page_table;
+        }
+
+        return pte_offset_kernel(pmd, 0);
+}
+
+/*
+ * This maps the physical memory to kernel virtual address space, a total
+ * of max_low_pfn pages, by creating page tables starting from address
+ * PAGE_OFFSET.  The page tables are allocated out of resume-safe pages.
+ */
+static int resume_physical_mapping_init(pgd_t *pgd_base)
+{
+        unsigned long pfn;
+        pgd_t *pgd;
+        pmd_t *pmd;
+        pte_t *pte;
+        int pgd_idx, pmd_idx;
+
+        pgd_idx = pgd_index(PAGE_OFFSET);
+        pgd = pgd_base + pgd_idx;
+        pfn = 0;
+
+        for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
+                pmd = resume_one_md_table_init(pgd);
+                if (!pmd)
+                        return -ENOMEM;
+
+                if (pfn >= max_low_pfn)
+                        continue;
+
+                for (pmd_idx = 0; pmd_idx < PTRS_PER_PMD; pmd++, pmd_idx++) {
+                        if (pfn >= max_low_pfn)
+                                break;
+
+                        /* Map with big pages if possible, otherwise create
+                         * normal page tables.
+                         * NOTE: We can mark everything as executable here
+                         */
+                        if (cpu_has_pse) {
+                                set_pmd(pmd, pfn_pmd(pfn, PAGE_KERNEL_LARGE_EXEC));
+                                pfn += PTRS_PER_PTE;
+                        } else {
+                                pte_t *max_pte;
+
+                                pte = resume_one_page_table_init(pmd);
+                                if (!pte)
+                                        return -ENOMEM;
+
+                                max_pte = pte + PTRS_PER_PTE;
+                                for (; pte < max_pte; pte++, pfn++) {
+                                        if (pfn >= max_low_pfn)
+                                                break;
+
+                                        set_pte(pte, pfn_pte(pfn, PAGE_KERNEL_EXEC));
+                                }
+                        }
+                }
+        }
+        return 0;
+}
+
+static inline void resume_init_first_level_page_table(pgd_t *pg_dir)
+{
+#ifdef CONFIG_X86_PAE
+        int i;
+
+        /* Init entries of the first-level page table to the zero page */
+        for (i = 0; i < PTRS_PER_PGD; i++)
+                set_pgd(pg_dir + i,
+                        __pgd(__pa(empty_zero_page) | _PAGE_PRESENT));
+#endif
+}
+
+int swsusp_arch_resume(void)
+{
+        int error;
+
+        resume_pg_dir = (pgd_t *)get_safe_page(GFP_ATOMIC);
+        if (!resume_pg_dir)
+                return -ENOMEM;
+
+        resume_init_first_level_page_table(resume_pg_dir);
+        error = resume_physical_mapping_init(resume_pg_dir);
+        if (error)
+                return error;
+
+        /* We have got enough memory and from now on we cannot recover */
+        restore_image();
+        return 0;
+}
diff --git a/arch/i386/power/swsusp.S b/arch/i386/power/swsusp.S
index 8a2b50a0aaad..53662e05b393 100644
--- a/arch/i386/power/swsusp.S
+++ b/arch/i386/power/swsusp.S
@@ -28,8 +28,9 @@ ENTRY(swsusp_arch_suspend)
         call swsusp_save
         ret
 
-ENTRY(swsusp_arch_resume)
-        movl    $swsusp_pg_dir-__PAGE_OFFSET, %ecx
+ENTRY(restore_image)
+        movl    resume_pg_dir, %ecx
+        subl    $__PAGE_OFFSET, %ecx
         movl    %ecx, %cr3
 
         movl    restore_pblist, %edx
@@ -51,6 +52,10 @@ copy_loop:
         .p2align 4,,7
 
 done:
+        /* go back to the original page tables */
+        movl    $swapper_pg_dir, %ecx
+        subl    $__PAGE_OFFSET, %ecx
+        movl    %ecx, %cr3
         /* Flush TLB, including "global" things (vmalloc) */
         movl    mmu_cr4_features, %eax
         movl    %eax, %edx
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 683b12c6f76c..fcacfe291b9b 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -34,6 +34,14 @@ config RWSEM_XCHGADD_ALGORITHM
         bool
         default y
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config GENERIC_FIND_NEXT_BIT
         bool
         default y
@@ -434,6 +442,29 @@ config IA64_ESI
 
 source "drivers/sn/Kconfig"
 
+config KEXEC
+        bool "kexec system call (EXPERIMENTAL)"
+        depends on EXPERIMENTAL && !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
+        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.
+
+config CRASH_DUMP
+          bool "kernel crash dumps (EXPERIMENTAL)"
+          depends on EXPERIMENTAL && IA64_MCA_RECOVERY && !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
+          help
+            Generate crash dump after being started by kexec.
+
 source "drivers/firmware/Kconfig"
 
 source "fs/Kconfig.binfmt"
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index db8e1fcfa047..ce49fe3a3b56 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)
 
@@ -1672,15 +1672,13 @@ ioc_sac_init(struct ioc *ioc)
          * SAC (single address cycle) addressable, so allocate a
          * pseudo-device to enforce that.
          */
-        sac = kmalloc(sizeof(*sac), GFP_KERNEL);
+        sac = kzalloc(sizeof(*sac), GFP_KERNEL);
         if (!sac)
                 panic(PFX "Couldn't allocate struct pci_dev");
-        memset(sac, 0, sizeof(*sac));
 
-        controller = kmalloc(sizeof(*controller), GFP_KERNEL);
+        controller = kzalloc(sizeof(*controller), GFP_KERNEL);
         if (!controller)
                 panic(PFX "Couldn't allocate struct pci_controller");
-        memset(controller, 0, sizeof(*controller));
 
         controller->iommu = ioc;
         sac->sysdata = controller;
@@ -1737,12 +1735,10 @@ ioc_init(u64 hpa, void *handle)
         struct ioc *ioc;
         struct ioc_iommu *info;
 
-        ioc = kmalloc(sizeof(*ioc), GFP_KERNEL);
+        ioc = kzalloc(sizeof(*ioc), GFP_KERNEL);
         if (!ioc)
                 return NULL;
 
-        memset(ioc, 0, sizeof(*ioc));
-
         ioc->next = ioc_list;
         ioc_list = ioc;
 
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index caab986af70c..324ea7565e2c 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -209,7 +209,7 @@ static void do_serial_bh(void)
 }
 #endif
 
-static void do_softint(void *private_)
+static void do_softint(struct work_struct *private_)
 {
         printk(KERN_ERR "simserial: do_softint called\n");
 }
@@ -488,7 +488,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
 
 #define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))
 
-static void rs_set_termios(struct tty_struct *tty, struct termios *old_termios)
+static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 {
         unsigned int cflag = tty->termios->c_cflag;
 
@@ -684,12 +684,11 @@ static int get_async_struct(int line, struct async_struct **ret_info)
                 *ret_info = sstate->info;
                 return 0;
         }
-        info = kmalloc(sizeof(struct async_struct), GFP_KERNEL);
+        info = kzalloc(sizeof(struct async_struct), GFP_KERNEL);
         if (!info) {
                 sstate->count--;
                 return -ENOMEM;
         }
-        memset(info, 0, sizeof(struct async_struct));
         init_waitqueue_head(&info->open_wait);
         init_waitqueue_head(&info->close_wait);
         init_waitqueue_head(&info->delta_msr_wait);
@@ -698,7 +697,7 @@ static int get_async_struct(int line, struct async_struct **ret_info)
         info->flags = sstate->flags;
         info->xmit_fifo_size = sstate->xmit_fifo_size;
         info->line = line;
-        INIT_WORK(&info->work, do_softint, info);
+        INIT_WORK(&info->work, do_softint);
         info->state = sstate;
         if (sstate->info) {
                 kfree(info);
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
index daa6b91bc921..578737ec7629 100644
--- a/arch/ia64/ia32/binfmt_elf32.c
+++ b/arch/ia64/ia32/binfmt_elf32.c
@@ -91,7 +91,7 @@ ia64_elf32_init (struct pt_regs *regs)
          * it with privilege level 3 because the IVE uses non-privileged accesses to these
          * tables.  IA-32 segmentation is used to protect against IA-32 accesses to them.
          */
-        vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+        vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
         if (vma) {
                 memset(vma, 0, sizeof(*vma));
                 vma->vm_mm = current->mm;
@@ -117,7 +117,7 @@ ia64_elf32_init (struct pt_regs *regs)
          * code is locked in specific gate page, which is pointed by pretcode
          * when setup_frame_ia32
          */
-        vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+        vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
         if (vma) {
                 memset(vma, 0, sizeof(*vma));
                 vma->vm_mm = current->mm;
@@ -142,7 +142,7 @@ ia64_elf32_init (struct pt_regs *regs)
          * Install LDT as anonymous memory.  This gives us all-zero segment descriptors
          * until a task modifies them via modify_ldt().
          */
-        vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+        vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
         if (vma) {
                 memset(vma, 0, sizeof(*vma));
                 vma->vm_mm = current->mm;
@@ -214,7 +214,7 @@ ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
                 bprm->loader += stack_base;
         bprm->exec += stack_base;
 
-        mpnt = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+        mpnt = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
         if (!mpnt)
                 return -ENOMEM;
 
diff --git a/arch/ia64/ia32/ia32_support.c b/arch/ia64/ia32/ia32_support.c
index c187743965a0..6af400a12ca1 100644
--- a/arch/ia64/ia32/ia32_support.c
+++ b/arch/ia64/ia32/ia32_support.c
@@ -249,7 +249,7 @@ ia32_init (void)
 
 #if PAGE_SHIFT > IA32_PAGE_SHIFT
         {
-                extern kmem_cache_t *partial_page_cachep;
+                extern struct kmem_cache *partial_page_cachep;
 
                 partial_page_cachep = kmem_cache_create("partial_page_cache",
                                                         sizeof(struct partial_page), 0, 0,
diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h
index 703a67c934f8..cfa0bc0026b5 100644
--- a/arch/ia64/ia32/ia32priv.h
+++ b/arch/ia64/ia32/ia32priv.h
@@ -330,8 +330,6 @@ struct old_linux32_dirent {
 void ia64_elf32_init(struct pt_regs *regs);
 #define ELF_PLAT_INIT(_r, load_addr)    ia64_elf32_init(_r)
 
-#define elf_addr_t      u32
-
 /* This macro yields a bitmask that programs can use to figure out
    what instruction set this CPU supports.  */
 #define ELF_HWCAP       0
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index 9d6a3f210148..957681c39ad9 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -235,7 +235,7 @@ mmap_subpage (struct file *file, unsigned long start, unsigned long end, int pro
 
         if (!(flags & MAP_ANONYMOUS)) {
                 /* read the file contents */
-                inode = file->f_dentry->d_inode;
+                inode = file->f_path.dentry->d_inode;
                 if (!inode->i_fop || !file->f_op->read
                     || ((*file->f_op->read)(file, (char __user *) start, end - start, &off) < 0))
                 {
@@ -254,7 +254,7 @@ mmap_subpage (struct file *file, unsigned long start, unsigned long end, int pro
 }
 
 /* SLAB cache for partial_page structures */
-kmem_cache_t *partial_page_cachep;
+struct kmem_cache *partial_page_cachep;
 
 /*
  * init partial_page_list.
@@ -837,7 +837,7 @@ emulate_mmap (struct file *file, unsigned long start, unsigned long len, int pro
 
         if (!is_congruent) {
                 /* read the file contents */
-                inode = file->f_dentry->d_inode;
+                inode = file->f_path.dentry->d_inode;
                 if (!inode->i_fop || !file->f_op->read
                     || ((*file->f_op->read)(file, (char __user *) pstart, pend - pstart, &poff)
                         < 0))
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index cfa099b04cda..098ee605bf5e 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -28,6 +28,8 @@ obj-$(CONFIG_IA64_CYCLONE)	+= cyclone.o
 obj-$(CONFIG_CPU_FREQ)          += cpufreq/
 obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o
 obj-$(CONFIG_KPROBES)           += kprobes.o jprobes.o
+obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o crash.o
+obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
 obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR)   += uncached.o
 obj-$(CONFIG_AUDIT)             += audit.o
 obj-$(CONFIG_PCI_MSI)           += msi_ia64.o
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 73ef4a85b861..ef2fe474f107 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -590,6 +590,9 @@ void __init acpi_numa_arch_fixup(void)
  */
 int acpi_register_gsi(u32 gsi, int triggering, int polarity)
 {
+        if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
+                return gsi;
+
         if (has_8259 && gsi < 16)
                 return isa_irq_to_vector(gsi);
 
diff --git a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
index 86faf221a070..15c08d52f09f 100644
--- a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
+++ b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
@@ -68,7 +68,8 @@ processor_get_pstate (
 
         dprintk("processor_get_pstate\n");
 
-        retval = ia64_pal_get_pstate(&pstate_index);
+        retval = ia64_pal_get_pstate(&pstate_index,
+                                     PAL_GET_PSTATE_TYPE_INSTANT);
         *value = (u32) pstate_index;
 
         if (retval)
@@ -91,7 +92,7 @@ extract_clock (
         dprintk("extract_clock\n");
 
         for (i = 0; i < data->acpi_data.state_count; i++) {
-                if (value >= data->acpi_data.states[i].control)
+                if (value == data->acpi_data.states[i].status)
                         return data->acpi_data.states[i].core_frequency;
         }
         return data->acpi_data.states[i-1].core_frequency;
@@ -117,11 +118,7 @@ processor_get_freq (
                 goto migrate_end;
         }
 
-        /*
-         * processor_get_pstate gets the average frequency since the
-         * last get. So, do two PAL_get_freq()...
-         */
-        ret = processor_get_pstate(&value);
+        /* processor_get_pstate gets the instantaneous frequency */
         ret = processor_get_pstate(&value);
 
         if (ret) {
@@ -279,12 +276,10 @@ acpi_cpufreq_cpu_init (
 
         dprintk("acpi_cpufreq_cpu_init\n");
 
-        data = kmalloc(sizeof(struct cpufreq_acpi_io), GFP_KERNEL);
+        data = kzalloc(sizeof(struct cpufreq_acpi_io), GFP_KERNEL);
         if (!data)
                 return (-ENOMEM);
 
-        memset(data, 0, sizeof(struct cpufreq_acpi_io));
-
         acpi_io_data[cpu] = data;
 
         result = acpi_processor_register_performance(&data->acpi_data, cpu);
diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c
new file mode 100644
index 000000000000..bc2f64d72244
--- /dev/null
+++ b/arch/ia64/kernel/crash.c
@@ -0,0 +1,223 @@
+/*
+ * arch/ia64/kernel/crash.c
+ *
+ * Architecture specific (ia64) functions for kexec based crash dumps.
+ *
+ * Created by: Khalid Aziz <khalid.aziz@hp.com>
+ * Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
+ * Copyright (C) 2005 Intel Corp        Zou Nan hai <nanhai.zou@intel.com>
+ *
+ */
+#include <linux/smp.h>
+#include <linux/delay.h>
+#include <linux/crash_dump.h>
+#include <linux/bootmem.h>
+#include <linux/kexec.h>
+#include <linux/elfcore.h>
+#include <linux/sysctl.h>
+#include <linux/init.h>
+
+#include <asm/kdebug.h>
+#include <asm/mca.h>
+
+int kdump_status[NR_CPUS];
+atomic_t kdump_cpu_freezed;
+atomic_t kdump_in_progress;
+int kdump_on_init = 1;
+
+static inline Elf64_Word
+*append_elf_note(Elf64_Word *buf, char *name, unsigned type, void *data,
+                size_t data_len)
+{
+        struct elf_note *note = (struct elf_note *)buf;
+        note->n_namesz = strlen(name) + 1;
+        note->n_descsz = data_len;
+        note->n_type   = type;
+        buf += (sizeof(*note) + 3)/4;
+        memcpy(buf, name, note->n_namesz);
+        buf += (note->n_namesz + 3)/4;
+        memcpy(buf, data, data_len);
+        buf += (data_len + 3)/4;
+        return buf;
+}
+
+static void
+final_note(void *buf)
+{
+        memset(buf, 0, sizeof(struct elf_note));
+}
+
+extern void ia64_dump_cpu_regs(void *);
+
+static DEFINE_PER_CPU(struct elf_prstatus, elf_prstatus);
+
+void
+crash_save_this_cpu()
+{
+        void *buf;
+        unsigned long cfm, sof, sol;
+
+        int cpu = smp_processor_id();
+        struct elf_prstatus *prstatus = &per_cpu(elf_prstatus, cpu);
+
+        elf_greg_t *dst = (elf_greg_t *)&(prstatus->pr_reg);
+        memset(prstatus, 0, sizeof(*prstatus));
+        prstatus->pr_pid = current->pid;
+
+        ia64_dump_cpu_regs(dst);
+        cfm = dst[43];
+        sol = (cfm >> 7) & 0x7f;
+        sof = cfm & 0x7f;
+        dst[46] = (unsigned long)ia64_rse_skip_regs((unsigned long *)dst[46],
+                        sof - sol);
+
+        buf = (u64 *) per_cpu_ptr(crash_notes, cpu);
+        if (!buf)
+                return;
+        buf = append_elf_note(buf, "CORE", NT_PRSTATUS, prstatus,
+                        sizeof(*prstatus));
+        final_note(buf);
+}
+
+static int
+kdump_wait_cpu_freeze(void)
+{
+        int cpu_num = num_online_cpus() - 1;
+        int timeout = 1000;
+        while(timeout-- > 0) {
+                if (atomic_read(&kdump_cpu_freezed) == cpu_num)
+                        return 0;
+                udelay(1000);
+        }
+        return 1;
+}
+
+void
+machine_crash_shutdown(struct pt_regs *pt)
+{
+        /* This function is only called after the system
+         * has paniced or is otherwise in a critical state.
+         * The minimum amount of code to allow a kexec'd kernel
+         * to run successfully needs to happen here.
+         *
+         * In practice this means shooting down the other cpus in
+         * an SMP system.
+         */
+        kexec_disable_iosapic();
+#ifdef CONFIG_SMP
+        kdump_smp_send_stop();
+        if (kdump_wait_cpu_freeze() && kdump_on_init)   {
+                //not all cpu response to IPI, send INIT to freeze them
+                kdump_smp_send_init();
+        }
+#endif
+}
+
+static void
+machine_kdump_on_init(void)
+{
+        local_irq_disable();
+        kexec_disable_iosapic();
+        machine_kexec(ia64_kimage);
+}
+
+void
+kdump_cpu_freeze(struct unw_frame_info *info, void *arg)
+{
+        int cpuid;
+        local_irq_disable();
+        cpuid = smp_processor_id();
+        crash_save_this_cpu();
+        current->thread.ksp = (__u64)info->sw - 16;
+        atomic_inc(&kdump_cpu_freezed);
+        kdump_status[cpuid] = 1;
+        mb();
+        if (cpuid == 0) {
+                for (;;)
+                        cpu_relax();
+        } else
+                ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);
+}
+
+static int
+kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data)
+{
+        struct ia64_mca_notify_die *nd;
+        struct die_args *args = data;
+
+        if (!kdump_on_init)
+                return NOTIFY_DONE;
+
+        if (val != DIE_INIT_MONARCH_ENTER &&
+            val != DIE_INIT_SLAVE_ENTER &&
+            val != DIE_MCA_RENDZVOUS_LEAVE &&
+            val != DIE_MCA_MONARCH_LEAVE)
+                return NOTIFY_DONE;
+
+        nd = (struct ia64_mca_notify_die *)args->err;
+        /* Reason code 1 means machine check rendezous*/
+        if ((val == DIE_INIT_MONARCH_ENTER || DIE_INIT_SLAVE_ENTER) &&
+                 nd->sos->rv_rc == 1)
+                return NOTIFY_DONE;
+
+        switch (val) {
+                case DIE_INIT_MONARCH_ENTER:
+                        machine_kdump_on_init();
+                        break;
+                case DIE_INIT_SLAVE_ENTER:
+                        unw_init_running(kdump_cpu_freeze, NULL);
+                        break;
+                case DIE_MCA_RENDZVOUS_LEAVE:
+                        if (atomic_read(&kdump_in_progress))
+                                unw_init_running(kdump_cpu_freeze, NULL);
+                        break;
+                case DIE_MCA_MONARCH_LEAVE:
+                     /* die_register->signr indicate if MCA is recoverable */
+                        if (!args->signr)
+                                machine_kdump_on_init();
+                        break;
+        }
+        return NOTIFY_DONE;
+}
+
+#ifdef CONFIG_SYSCTL
+static ctl_table kdump_on_init_table[] = {
+        {
+                .ctl_name = CTL_UNNUMBERED,
+                .procname = "kdump_on_init",
+                .data = &kdump_on_init,
+                .maxlen = sizeof(int),
+                .mode = 0644,
+                .proc_handler = &proc_dointvec,
+        },
+        { .ctl_name = 0 }
+};
+
+static ctl_table sys_table[] = {
+        {
+          .ctl_name = CTL_KERN,
+          .procname = "kernel",
+          .mode = 0555,
+          .child = kdump_on_init_table,
+        },
+        { .ctl_name = 0 }
+};
+#endif
+
+static int
+machine_crash_setup(void)
+{
+        static struct notifier_block kdump_init_notifier_nb = {
+                .notifier_call = kdump_init_notifier,
+        };
+        int ret;
+        if((ret = register_die_notifier(&kdump_init_notifier_nb)) != 0)
+                return ret;
+#ifdef CONFIG_SYSCTL
+        register_sysctl_table(sys_table, 0);
+#endif
+        return 0;
+}
+
+__initcall(machine_crash_setup);
+
diff --git a/arch/ia64/kernel/crash_dump.c b/arch/ia64/kernel/crash_dump.c
new file mode 100644
index 000000000000..83b8c91c1408
--- /dev/null
+++ b/arch/ia64/kernel/crash_dump.c
@@ -0,0 +1,48 @@
+/*
+ *      kernel/crash_dump.c - Memory preserving reboot related code.
+ *
+ *      Created by: Simon Horman <horms@verge.net.au>
+ *      Original code moved from kernel/crash.c
+ *      Original code comment copied from the i386 version of this file
+ */
+
+#include <linux/errno.h>
+#include <linux/types.h>
+
+#include <linux/uaccess.h>
+
+/**
+ * copy_oldmem_page - copy one page from "oldmem"
+ * @pfn: page frame number to be copied
+ * @buf: target memory address for the copy; this can be in kernel address
+ *      space or user address space (see @userbuf)
+ * @csize: number of bytes to copy
+ * @offset: offset in bytes into the page (based on pfn) to begin the copy
+ * @userbuf: if set, @buf is in user address space, use copy_to_user(),
+ *      otherwise @buf is in kernel address space, use memcpy().
+ *
+ * Copy a page from "oldmem". For this page, there is no pte mapped
+ * in the current kernel. We stitch up a pte, similar to kmap_atomic.
+ *
+ * Calling copy_to_user() in atomic context is not desirable. Hence first
+ * copying the data to a pre-allocated kernel page and then copying to user
+ * space in non-atomic context.
+ */
+ssize_t
+copy_oldmem_page(unsigned long pfn, char *buf,
+                size_t csize, unsigned long offset, int userbuf)
+{
+        void  *vaddr;
+
+        if (!csize)
+                return 0;
+        vaddr = __va(pfn<<PAGE_SHIFT);
+        if (userbuf) {
+                if (copy_to_user(buf, (vaddr + offset), csize)) {
+                        return -EFAULT;
+                }
+        } else
+                memcpy(buf, (vaddr + offset), csize);
+        return csize;
+}
+
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index bb8770a177b5..0b25a7d4e1e4 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -26,6 +26,7 @@
 #include <linux/types.h>
 #include <linux/time.h>
 #include <linux/efi.h>
+#include <linux/kexec.h>
 
 #include <asm/io.h>
 #include <asm/kregs.h>
@@ -41,7 +42,7 @@ extern efi_status_t efi_call_phys (void *, ...);
 struct efi efi;
 EXPORT_SYMBOL(efi);
 static efi_runtime_services_t *runtime;
-static unsigned long mem_limit = ~0UL, max_addr = ~0UL;
+static unsigned long mem_limit = ~0UL, max_addr = ~0UL, min_addr = 0UL;
 
 #define efi_call_virt(f, args...)       (*(f))(args)
 
@@ -224,7 +225,7 @@ efi_gettimeofday (struct timespec *ts)
 }
 
 static int
-is_available_memory (efi_memory_desc_t *md)
+is_memory_available (efi_memory_desc_t *md)
 {
         if (!(md->attribute & EFI_MEMORY_WB))
                 return 0;
@@ -421,6 +422,8 @@ efi_init (void)
                         mem_limit = memparse(cp + 4, &cp);
                 } else if (memcmp(cp, "max_addr=", 9) == 0) {
                         max_addr = GRANULEROUNDDOWN(memparse(cp + 9, &cp));
+                } else if (memcmp(cp, "min_addr=", 9) == 0) {
+                        min_addr = GRANULEROUNDDOWN(memparse(cp + 9, &cp));
                 } else {
                         while (*cp != ' ' && *cp)
                                 ++cp;
@@ -428,6 +431,8 @@ efi_init (void)
                                 ++cp;
                 }
         }
+        if (min_addr != 0UL)
+                printk(KERN_INFO "Ignoring memory below %luMB\n", min_addr >> 20);
         if (max_addr != ~0UL)
                 printk(KERN_INFO "Ignoring memory above %luMB\n", max_addr >> 20);
 
@@ -887,14 +892,15 @@ find_memmap_space (void)
                         }
                         contig_high = GRANULEROUNDDOWN(contig_high);
                 }
-                if (!is_available_memory(md) || md->type == EFI_LOADER_DATA)
+                if (!is_memory_available(md) || md->type == EFI_LOADER_DATA)
                         continue;
 
                 /* Round ends inward to granule boundaries */
                 as = max(contig_low, md->phys_addr);
                 ae = min(contig_high, efi_md_end(md));
 
-                /* keep within max_addr= command line arg */
+                /* keep within max_addr= and min_addr= command line arg */
+                as = max(as, min_addr);
                 ae = min(ae, max_addr);
                 if (ae <= as)
                         continue;
@@ -962,7 +968,7 @@ efi_memmap_init(unsigned long *s, unsigned long *e)
                         }
                         contig_high = GRANULEROUNDDOWN(contig_high);
                 }
-                if (!is_available_memory(md))
+                if (!is_memory_available(md))
                         continue;
 
                 /*
@@ -1004,7 +1010,8 @@ efi_memmap_init(unsigned long *s, unsigned long *e)
                 } else
                         ae = efi_md_end(md);
 
-                /* keep within max_addr= command line arg */
+                /* keep within max_addr= and min_addr= command line arg */
+                as = max(as, min_addr);
                 ae = min(ae, max_addr);
                 if (ae <= as)
                         continue;
@@ -1116,6 +1123,58 @@ efi_initialize_iomem_resources(struct resource *code_resource,
                          */
                         insert_resource(res, code_resource);
                         insert_resource(res, data_resource);
+#ifdef CONFIG_KEXEC
+                        insert_resource(res, &efi_memmap_res);
+                        insert_resource(res, &boot_param_res);
+                        if (crashk_res.end > crashk_res.start)
+                                insert_resource(res, &crashk_res);
+#endif
                 }
         }
 }
+
+#ifdef CONFIG_KEXEC
+/* find a block of memory aligned to 64M exclude reserved regions
+   rsvd_regions are sorted
+ */
+unsigned long
+kdump_find_rsvd_region (unsigned long size,
+                struct rsvd_region *r, int n)
+{
+  int i;
+  u64 start, end;
+  u64 alignment = 1UL << _PAGE_SIZE_64M;
+  void *efi_map_start, *efi_map_end, *p;
+  efi_memory_desc_t *md;
+  u64 efi_desc_size;
+
+  efi_map_start = __va(ia64_boot_param->efi_memmap);
+  efi_map_end   = efi_map_start + ia64_boot_param->efi_memmap_size;
+  efi_desc_size = ia64_boot_param->efi_memdesc_size;
+
+  for (p = efi_map_start; p < efi_map_end; p += efi_desc_size) {
+          md = p;
+          if (!efi_wb(md))
+                  continue;
+          start = ALIGN(md->phys_addr, alignment);
+          end = efi_md_end(md);
+          for (i = 0; i < n; i++) {
+                if (__pa(r[i].start) >= start && __pa(r[i].end) < end) {
+                        if (__pa(r[i].start) > start + size)
+                                return start;
+                        start = ALIGN(__pa(r[i].end), alignment);
+                        if (i < n-1 && __pa(r[i+1].start) < start + size)
+                                continue;
+                        else
+                                break;
+                }
+          }
+          if (end > start + size)
+                return start;
+  }
+
+  printk(KERN_WARNING "Cannot reserve 0x%lx byte of memory for crashdump\n",
+        size);
+  return ~0UL;
+}
+#endif
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 3390b7c5a63f..15234ed3a341 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1575,7 +1575,7 @@ sys_call_table:
         data8 sys_mq_timedreceive               // 1265
         data8 sys_mq_notify
         data8 sys_mq_getsetattr
-        data8 sys_ni_syscall                    // reserved for kexec_load
+        data8 sys_kexec_load
         data8 sys_ni_syscall                    // reserved for vserver
         data8 sys_waitid                        // 1270
         data8 sys_add_key
diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
index 879c1817bd1c..bd17190bebb6 100644
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
@@ -14,6 +14,7 @@ EXPORT_SYMBOL(strlen);
 
 #include <asm/checksum.h>
 EXPORT_SYMBOL(ip_fast_csum);            /* hand-coded assembly */
+EXPORT_SYMBOL(csum_ipv6_magic);
 
 #include <asm/semaphore.h>
 EXPORT_SYMBOL(__down);
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 60d64950e3c2..0fc5fb7865cf 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -288,6 +288,27 @@ nop (unsigned int irq)
         /* do nothing... */
 }
 
+
+#ifdef CONFIG_KEXEC
+void
+kexec_disable_iosapic(void)
+{
+        struct iosapic_intr_info *info;
+        struct iosapic_rte_info *rte;
+        u8 vec = 0;
+        for (info = iosapic_intr_info; info <
+                        iosapic_intr_info + IA64_NUM_VECTORS; ++info, ++vec) {
+                list_for_each_entry(rte, &info->rtes,
+                                rte_list) {
+                        iosapic_write(rte->addr,
+                                        IOSAPIC_RTE_LOW(rte->rte_index),
+                                        IOSAPIC_MASK|vec);
+                        iosapic_eoi(rte->addr, vec);
+                }
+        }
+}
+#endif
+
 static void
 mask_irq (unsigned int irq)
 {
diff --git a/arch/ia64/kernel/jprobes.S b/arch/ia64/kernel/jprobes.S
index 5cd6226f44f2..621630256c4a 100644
--- a/arch/ia64/kernel/jprobes.S
+++ b/arch/ia64/kernel/jprobes.S
@@ -45,13 +45,14 @@
  * to the correct location.
  */
 #include <asm/asmmacro.h>
+#include <asm-ia64/break.h>
 
         /*
          * void jprobe_break(void)
          */
         .section .kprobes.text, "ax"
 ENTRY(jprobe_break)
-        break.m 0x80300
+        break.m __IA64_BREAK_JPROBE
 END(jprobe_break)
 
         /*
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 51217d63285e..6cb56dd4056d 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -88,6 +88,7 @@ static void __kprobes update_kprobe_inst_flag(uint template, uint  slot,
 {
         p->ainsn.inst_flag = 0;
         p->ainsn.target_br_reg = 0;
+        p->ainsn.slot = slot;
 
         /* Check for Break instruction
          * Bits 37:40 Major opcode to be zero
@@ -129,48 +130,6 @@ static void __kprobes update_kprobe_inst_flag(uint template, uint  slot,
 
 /*
  * In this function we check to see if the instruction
- * on which we are inserting kprobe is supported.
- * Returns 0 if supported
- * Returns -EINVAL if unsupported
- */
-static int __kprobes unsupported_inst(uint template, uint  slot,
-                                      uint major_opcode,
-                                      unsigned long kprobe_inst,
-                                      unsigned long addr)
-{
-        if (bundle_encoding[template][slot] == I) {
-                switch (major_opcode) {
-                        case 0x0: //I_UNIT_MISC_OPCODE:
-                        /*
-                         * Check for Integer speculation instruction
-                         * - Bit 33-35 to be equal to 0x1
-                         */
-                        if (((kprobe_inst >> 33) & 0x7) == 1) {
-                                printk(KERN_WARNING
-                                        "Kprobes on speculation inst at <0x%lx> not supported\n",
-                                        addr);
-                                return -EINVAL;
-                        }
-
-                        /*
-                         * IP relative mov instruction
-                         *  - Bit 27-35 to be equal to 0x30
-                         */
-                        if (((kprobe_inst >> 27) & 0x1FF) == 0x30) {
-                                printk(KERN_WARNING
-                                        "Kprobes on \"mov r1=ip\" at <0x%lx> not supported\n",
-                                        addr);
-                                return -EINVAL;
-
-                        }
-                }
-        }
-        return 0;
-}
-
-
-/*
- * In this function we check to see if the instruction
  * (qp) cmpx.crel.ctype p1,p2=r2,r3
  * on which we are inserting kprobe is cmp instruction
  * with ctype as unc.
@@ -206,26 +165,136 @@ out:
 }
 
 /*
+ * In this function we check to see if the instruction
+ * on which we are inserting kprobe is supported.
+ * Returns qp value if supported
+ * Returns -EINVAL if unsupported
+ */
+static int __kprobes unsupported_inst(uint template, uint  slot,
+                                      uint major_opcode,
+                                      unsigned long kprobe_inst,
+                                      unsigned long addr)
+{
+        int qp;
+
+        qp = kprobe_inst & 0x3f;
+        if (is_cmp_ctype_unc_inst(template, slot, major_opcode, kprobe_inst)) {
+                if (slot == 1 && qp)  {
+                        printk(KERN_WARNING "Kprobes on cmp unc"
+                                        "instruction on slot 1 at <0x%lx>"
+                                        "is not supported\n", addr);
+                        return -EINVAL;
+
+                }
+                qp = 0;
+        }
+        else if (bundle_encoding[template][slot] == I) {
+                if (major_opcode == 0) {
+                        /*
+                         * Check for Integer speculation instruction
+                         * - Bit 33-35 to be equal to 0x1
+                         */
+                        if (((kprobe_inst >> 33) & 0x7) == 1) {
+                                printk(KERN_WARNING
+                                        "Kprobes on speculation inst at <0x%lx> not supported\n",
+                                                addr);
+                                return -EINVAL;
+                        }
+                        /*
+                         * IP relative mov instruction
+                         *  - Bit 27-35 to be equal to 0x30
+                         */
+                        if (((kprobe_inst >> 27) & 0x1FF) == 0x30) {
+                                printk(KERN_WARNING
+                                        "Kprobes on \"mov r1=ip\" at <0x%lx> not supported\n",
+                                                addr);
+                                return -EINVAL;
+
+                        }
+                }
+                else if ((major_opcode == 5) && !(kprobe_inst & (0xFUl << 33)) &&
+                                (kprobe_inst & (0x1UL << 12))) {
+                        /* test bit instructions, tbit,tnat,tf
+                         * bit 33-36 to be equal to 0
+                         * bit 12 to be equal to 1
+                         */
+                        if (slot == 1 && qp) {
+                                printk(KERN_WARNING "Kprobes on test bit"
+                                                "instruction on slot at <0x%lx>"
+                                                "is not supported\n", addr);
+                                return -EINVAL;
+                        }
+                        qp = 0;
+                }
+        }
+        else if (bundle_encoding[template][slot] == B) {
+                if (major_opcode == 7) {
+                        /* IP-Relative Predict major code is 7 */
+                        printk(KERN_WARNING "Kprobes on IP-Relative"
+                                        "Predict is not supported\n");
+                        return -EINVAL;
+                }
+                else if (major_opcode == 2) {
+                        /* Indirect Predict, major code is 2
+                         * bit 27-32 to be equal to 10 or 11
+                         */
+                        int x6=(kprobe_inst >> 27) & 0x3F;
+                        if ((x6 == 0x10) || (x6 == 0x11)) {
+                                printk(KERN_WARNING "Kprobes on"
+                                        "Indirect Predict is not supported\n");
+                                return -EINVAL;
+                        }
+                }
+        }
+        /* kernel does not use float instruction, here for safety kprobe
+         * will judge whether it is fcmp/flass/float approximation instruction
+         */
+        else if (unlikely(bundle_encoding[template][slot] == F)) {
+                if ((major_opcode == 4 || major_opcode == 5) &&
+                                (kprobe_inst  & (0x1 << 12))) {
+                        /* fcmp/fclass unc instruction */
+                        if (slot == 1 && qp) {
+                                printk(KERN_WARNING "Kprobes on fcmp/fclass "
+                                        "instruction on slot at <0x%lx> "
+                                        "is not supported\n", addr);
+                                return -EINVAL;
+
+                        }
+                        qp = 0;
+                }
+                if ((major_opcode == 0 || major_opcode == 1) &&
+                        (kprobe_inst & (0x1UL << 33))) {
+                        /* float Approximation instruction */
+                        if (slot == 1 && qp) {
+                                printk(KERN_WARNING "Kprobes on float Approx "
+                                        "instr at <0x%lx> is not supported\n",
+                                                addr);
+                                return -EINVAL;
+                        }
+                        qp = 0;
+                }
+        }
+        return qp;
+}
+
+/*
  * In this function we override the bundle with
  * the break instruction at the given slot.
  */
 static void __kprobes prepare_break_inst(uint template, uint  slot,
                                          uint major_opcode,
                                          unsigned long kprobe_inst,
-                                         struct kprobe *p)
+                                         struct kprobe *p,
+                                         int qp)
 {
         unsigned long break_inst = BREAK_INST;
         bundle_t *bundle = &p->opcode.bundle;
 
         /*
          * Copy the original kprobe_inst qualifying predicate(qp)
-         * to the break instruction iff !is_cmp_ctype_unc_inst
-         * because for cmp instruction with ctype equal to unc,
-         * which is a special instruction always needs to be
-         * executed regradless of qp
+         * to the break instruction
          */
-        if (!is_cmp_ctype_unc_inst(template, slot, major_opcode, kprobe_inst))
-                break_inst |= (0x3f & kprobe_inst);
+        break_inst |= qp;
 
         switch (slot) {
           case 0:
@@ -296,12 +365,6 @@ static int __kprobes valid_kprobe_addr(int template, int slot,
                 return -EINVAL;
         }
 
-        if (slot == 1 && bundle_encoding[template][1] != L) {
-                printk(KERN_WARNING "Inserting kprobes on slot #1 "
-                       "is not supported\n");
-                return -EINVAL;
-        }
-
         return 0;
 }
 
@@ -427,6 +490,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
         unsigned long kprobe_inst=0;
         unsigned int slot = addr & 0xf, template, major_opcode = 0;
         bundle_t *bundle;
+        int qp;
 
         bundle = &((kprobe_opcode_t *)kprobe_addr)->bundle;
         template = bundle->quad0.template;
@@ -441,9 +505,9 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
         /* Get kprobe_inst and major_opcode from the bundle */
         get_kprobe_inst(bundle, slot, &kprobe_inst, &major_opcode);
 
-        if (unsupported_inst(template, slot, major_opcode, kprobe_inst, addr))
-                        return -EINVAL;
-
+        qp = unsupported_inst(template, slot, major_opcode, kprobe_inst, addr);
+        if (qp < 0)
+                return -EINVAL;
 
         p->ainsn.insn = get_insn_slot();
         if (!p->ainsn.insn)
@@ -451,37 +515,63 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
         memcpy(&p->opcode, kprobe_addr, sizeof(kprobe_opcode_t));
         memcpy(p->ainsn.insn, kprobe_addr, sizeof(kprobe_opcode_t));
 
-        prepare_break_inst(template, slot, major_opcode, kprobe_inst, p);
+        prepare_break_inst(template, slot, major_opcode, kprobe_inst, p, qp);
 
         return 0;
 }
 
 void __kprobes arch_arm_kprobe(struct kprobe *p)
 {
-        unsigned long addr = (unsigned long)p->addr;
-        unsigned long arm_addr = addr & ~0xFULL;
+        unsigned long arm_addr;
+        bundle_t *src, *dest;
+
+        arm_addr = ((unsigned long)p->addr) & ~0xFUL;
+        dest = &((kprobe_opcode_t *)arm_addr)->bundle;
+        src = &p->opcode.bundle;
 
         flush_icache_range((unsigned long)p->ainsn.insn,
                         (unsigned long)p->ainsn.insn + sizeof(kprobe_opcode_t));
-        memcpy((char *)arm_addr, &p->opcode, sizeof(kprobe_opcode_t));
+        switch (p->ainsn.slot) {
+                case 0:
+                        dest->quad0.slot0 = src->quad0.slot0;
+                        break;
+                case 1:
+                        dest->quad1.slot1_p1 = src->quad1.slot1_p1;
+                        break;
+                case 2:
+                        dest->quad1.slot2 = src->quad1.slot2;
+                        break;
+        }
         flush_icache_range(arm_addr, arm_addr + sizeof(kprobe_opcode_t));
 }
 
 void __kprobes arch_disarm_kprobe(struct kprobe *p)
 {
-        unsigned long addr = (unsigned long)p->addr;
-        unsigned long arm_addr = addr & ~0xFULL;
+        unsigned long arm_addr;
+        bundle_t *src, *dest;
 
+        arm_addr = ((unsigned long)p->addr) & ~0xFUL;
+        dest = &((kprobe_opcode_t *)arm_addr)->bundle;
         /* p->ainsn.insn contains the original unaltered kprobe_opcode_t */
-        memcpy((char *) arm_addr, (char *) p->ainsn.insn,
-                                         sizeof(kprobe_opcode_t));
+        src = &p->ainsn.insn->bundle;
+        switch (p->ainsn.slot) {
+                case 0:
+                        dest->quad0.slot0 = src->quad0.slot0;
+                        break;
+                case 1:
+                        dest->quad1.slot1_p1 = src->quad1.slot1_p1;
+                        break;
+                case 2:
+                        dest->quad1.slot2 = src->quad1.slot2;
+                        break;
+        }
         flush_icache_range(arm_addr, arm_addr + sizeof(kprobe_opcode_t));
 }
 
 void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
         mutex_lock(&kprobe_mutex);
-        free_insn_slot(p->ainsn.insn);
+        free_insn_slot(p->ainsn.insn, 0);
         mutex_unlock(&kprobe_mutex);
 }
 /*
@@ -807,7 +897,9 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
         switch(val) {
         case DIE_BREAK:
                 /* err is break number from ia64_bad_break() */
-                if (args->err == 0x80200 || args->err == 0x80300 || args->err == 0)
+                if ((args->err >> 12) == (__IA64_BREAK_KPROBE >> 12)
+                        || args->err == __IA64_BREAK_JPROBE
+                        || args->err == 0)
                         if (pre_kprobes_handler(args))
                                 ret = NOTIFY_STOP;
                 break;
@@ -851,7 +943,7 @@ static void ia64_get_bsp_cfm(struct unw_frame_info *info, void *arg)
                         return;
                 }
         } while (unw_unwind(info) >= 0);
-        lp->bsp = 0;
+        lp->bsp = NULL;
         lp->cfm = 0;
         return;
 }
diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c
new file mode 100644
index 000000000000..e2ccc9f660c5
--- /dev/null
+++ b/arch/ia64/kernel/machine_kexec.c
@@ -0,0 +1,136 @@
+/*
+ * arch/ia64/kernel/machine_kexec.c
+ *
+ * Handle transition of Linux booting another kernel
+ * Copyright (C) 2005 Hewlett-Packard Development Comapny, L.P.
+ * Copyright (C) 2005 Khalid Aziz <khalid.aziz@hp.com>
+ * Copyright (C) 2006 Intel Corp, Zou Nan hai <nanhai.zou@intel.com>
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+
+#include <linux/mm.h>
+#include <linux/kexec.h>
+#include <linux/cpu.h>
+#include <linux/irq.h>
+#include <asm/mmu_context.h>
+#include <asm/setup.h>
+#include <asm/delay.h>
+#include <asm/meminit.h>
+
+typedef NORET_TYPE void (*relocate_new_kernel_t)(
+                                        unsigned long indirection_page,
+                                        unsigned long start_address,
+                                        struct ia64_boot_param *boot_param,
+                                        unsigned long pal_addr) ATTRIB_NORET;
+
+struct kimage *ia64_kimage;
+
+struct resource efi_memmap_res = {
+        .name  = "EFI Memory Map",
+        .start = 0,
+        .end   = 0,
+        .flags = IORESOURCE_BUSY | IORESOURCE_MEM
+};
+
+struct resource boot_param_res = {
+        .name  = "Boot parameter",
+        .start = 0,
+        .end   = 0,
+        .flags = IORESOURCE_BUSY | IORESOURCE_MEM
+};
+
+
+/*
+ * Do what every setup is needed on image and the
+ * reboot code buffer to allow us to avoid allocations
+ * later.
+ */
+int machine_kexec_prepare(struct kimage *image)
+{
+        void *control_code_buffer;
+        const unsigned long *func;
+
+        func = (unsigned long *)&relocate_new_kernel;
+        /* Pre-load control code buffer to minimize work in kexec path */
+        control_code_buffer = page_address(image->control_code_page);
+        memcpy((void *)control_code_buffer, (const void *)func[0],
+                        relocate_new_kernel_size);
+        flush_icache_range((unsigned long)control_code_buffer,
+                        (unsigned long)control_code_buffer + relocate_new_kernel_size);
+        ia64_kimage = image;
+
+        return 0;
+}
+
+void machine_kexec_cleanup(struct kimage *image)
+{
+}
+
+void machine_shutdown(void)
+{
+        int cpu;
+
+        for_each_online_cpu(cpu) {
+                if (cpu != smp_processor_id())
+                        cpu_down(cpu);
+        }
+        kexec_disable_iosapic();
+}
+
+/*
+ * Do not allocate memory (or fail in any way) in machine_kexec().
+ * We are past the point of no return, committed to rebooting now.
+ */
+extern void *efi_get_pal_addr(void);
+static void ia64_machine_kexec(struct unw_frame_info *info, void *arg)
+{
+        struct kimage *image = arg;
+        relocate_new_kernel_t rnk;
+        void *pal_addr = efi_get_pal_addr();
+        unsigned long code_addr = (unsigned long)page_address(image->control_code_page);
+        unsigned long vector;
+        int ii;
+
+        if (image->type == KEXEC_TYPE_CRASH) {
+                crash_save_this_cpu();
+                current->thread.ksp = (__u64)info->sw - 16;
+        }
+
+        /* Interrupts aren't acceptable while we reboot */
+        local_irq_disable();
+
+        /* Mask CMC and Performance Monitor interrupts */
+        ia64_setreg(_IA64_REG_CR_PMV, 1 << 16);
+        ia64_setreg(_IA64_REG_CR_CMCV, 1 << 16);
+
+        /* Mask ITV and Local Redirect Registers */
+        ia64_set_itv(1 << 16);
+        ia64_set_lrr0(1 << 16);
+        ia64_set_lrr1(1 << 16);
+
+        /* terminate possible nested in-service interrupts */
+        for (ii = 0; ii < 16; ii++)
+                ia64_eoi();
+
+        /* unmask TPR and clear any pending interrupts */
+        ia64_setreg(_IA64_REG_CR_TPR, 0);
+        ia64_srlz_d();
+        vector = ia64_get_ivr();
+        while (vector != IA64_SPURIOUS_INT_VECTOR) {
+                ia64_eoi();
+                vector = ia64_get_ivr();
+        }
+        platform_kernel_launch_event();
+        rnk = (relocate_new_kernel_t)&code_addr;
+        (*rnk)(image->head, image->start, ia64_boot_param,
+                     GRANULEROUNDDOWN((unsigned long) pal_addr));
+        BUG();
+}
+
+void machine_kexec(struct kimage *image)
+{
+        unw_init_running(ia64_machine_kexec, image);
+        for(;;);
+}
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 7cfa63a98cb3..a76add3e76a2 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -82,6 +82,7 @@
 #include <asm/system.h>
 #include <asm/sal.h>
 #include <asm/mca.h>
+#include <asm/kexec.h>
 
 #include <asm/irq.h>
 #include <asm/hw_irq.h>
@@ -678,7 +679,7 @@ ia64_mca_cmc_vector_enable (void *dummy)
  * disable the cmc interrupt vector.
  */
 static void
-ia64_mca_cmc_vector_disable_keventd(void *unused)
+ia64_mca_cmc_vector_disable_keventd(struct work_struct *unused)
 {
         on_each_cpu(ia64_mca_cmc_vector_disable, NULL, 1, 0);
 }
@@ -690,7 +691,7 @@ ia64_mca_cmc_vector_disable_keventd(void *unused)
  * enable the cmc interrupt vector.
  */
 static void
-ia64_mca_cmc_vector_enable_keventd(void *unused)
+ia64_mca_cmc_vector_enable_keventd(struct work_struct *unused)
 {
         on_each_cpu(ia64_mca_cmc_vector_enable, NULL, 1, 0);
 }
@@ -1238,6 +1239,10 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
         } else {
                 /* Dump buffered message to console */
                 ia64_mlogbuf_finish(1);
+#ifdef CONFIG_KEXEC
+                atomic_set(&kdump_in_progress, 1);
+                monarch_cpu = -1;
+#endif
         }
         if (notify_die(DIE_MCA_MONARCH_LEAVE, "MCA", regs, (long)&nd, 0, recover)
                         == NOTIFY_STOP)
@@ -1247,8 +1252,8 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
         monarch_cpu = -1;
 }
 
-static DECLARE_WORK(cmc_disable_work, ia64_mca_cmc_vector_disable_keventd, NULL);
-static DECLARE_WORK(cmc_enable_work, ia64_mca_cmc_vector_enable_keventd, NULL);
+static DECLARE_WORK(cmc_disable_work, ia64_mca_cmc_vector_disable_keventd);
+static DECLARE_WORK(cmc_enable_work, ia64_mca_cmc_vector_enable_keventd);
 
 /*
  * ia64_mca_cmc_int_handler
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index 0b546e2b36ac..a71df9ae0397 100644
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -16,6 +16,7 @@
  * 02/05/2001   S.Eranian       fixed module support
  * 10/23/2001   S.Eranian       updated pal_perf_mon_info bug fixes
  * 03/24/2004   Ashok Raj       updated to work with CPU Hotplug
+ * 10/26/2006   Russ Anderson   updated processor features to rev 2.2 spec
  */
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -314,13 +315,20 @@ vm_info(char *page)
                      "Protection Key Registers(PKR)  : %d\n"
                      "Implemented bits in PKR.key    : %d\n"
                      "Hash Tag ID                    : 0x%x\n"
-                     "Size of RR.rid                 : %d\n",
+                     "Size of RR.rid                 : %d\n"
+                     "Max Purges                     : ",
                      vm_info_1.pal_vm_info_1_s.phys_add_size,
                      vm_info_2.pal_vm_info_2_s.impl_va_msb+1,
                      vm_info_1.pal_vm_info_1_s.max_pkr+1,
                      vm_info_1.pal_vm_info_1_s.key_size,
                      vm_info_1.pal_vm_info_1_s.hash_tag_id,
                      vm_info_2.pal_vm_info_2_s.rid_size);
+                if (vm_info_2.pal_vm_info_2_s.max_purges == PAL_MAX_PURGES)
+                        p += sprintf(p, "unlimited\n");
+                else
+                        p += sprintf(p, "%d\n",
+                                vm_info_2.pal_vm_info_2_s.max_purges ?
+                                vm_info_2.pal_vm_info_2_s.max_purges : 1);
         }
 
         if (ia64_pal_mem_attrib(&attrib) == 0) {
@@ -467,7 +475,11 @@ static const char *proc_features[]={
         NULL,NULL,NULL,NULL,NULL,NULL,NULL, NULL,NULL,
         NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
         NULL,NULL,NULL,NULL,NULL, NULL,NULL,NULL,NULL,
-        NULL,NULL,NULL,NULL,NULL,
+        "Unimplemented instruction address fault",
+        "INIT, PMI, and LINT pins",
+        "Simple unimplemented instr addresses",
+        "Variable P-state performance",
+        "Virtual machine features implemented",
         "XIP,XPSR,XFS implemented",
         "XR1-XR3 implemented",
         "Disable dynamic predicate prediction",
@@ -475,7 +487,11 @@ static const char *proc_features[]={
         "Disable dynamic data cache prefetch",
         "Disable dynamic inst cache prefetch",
         "Disable dynamic branch prediction",
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL,
+        "Disable P-states",
+        "Enable MCA on Data Poisoning",
+        "Enable vmsw instruction",
+        "Enable extern environmental notification",
         "Disable BINIT on processor time-out",
         "Disable dynamic power management (DPM)",
         "Disable coherency",
@@ -952,7 +968,6 @@ remove_palinfo_proc_entries(unsigned int hcpu)
         }
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
 static int palinfo_cpu_callback(struct notifier_block *nfb,
                                         unsigned long action, void *hcpu)
 {
@@ -974,7 +989,6 @@ static struct notifier_block palinfo_cpu_notifier =
         .notifier_call = palinfo_cpu_callback,
         .priority = 0,
 };
-#endif
 
 static int __init
 palinfo_init(void)
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 3aaede0d6981..aa94f60fa8e7 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -853,9 +853,8 @@ pfm_context_alloc(void)
          * allocate context descriptor 
          * must be able to free with interrupts disabled
          */
-        ctx = kmalloc(sizeof(pfm_context_t), GFP_KERNEL);
+        ctx = kzalloc(sizeof(pfm_context_t), GFP_KERNEL);
         if (ctx) {
-                memset(ctx, 0, sizeof(pfm_context_t));
                 DPRINT(("alloc ctx @%p\n", ctx));
         }
         return ctx;
@@ -2189,13 +2188,13 @@ pfm_alloc_fd(struct file **cfile)
         /*
          * allocate a new dcache entry
          */
-        file->f_dentry = d_alloc(pfmfs_mnt->mnt_sb->s_root, &this);
-        if (!file->f_dentry) goto out;
+        file->f_path.dentry = d_alloc(pfmfs_mnt->mnt_sb->s_root, &this);
+        if (!file->f_path.dentry) goto out;
 
-        file->f_dentry->d_op = &pfmfs_dentry_operations;
+        file->f_path.dentry->d_op = &pfmfs_dentry_operations;
 
-        d_add(file->f_dentry, inode);
-        file->f_vfsmnt = mntget(pfmfs_mnt);
+        d_add(file->f_path.dentry, inode);
+        file->f_path.mnt = mntget(pfmfs_mnt);
         file->f_mapping = inode->i_mapping;
 
         file->f_op    = &pfm_file_ops;
@@ -2302,7 +2301,7 @@ pfm_smpl_buffer_alloc(struct task_struct *task, pfm_context_t *ctx, unsigned lon
         DPRINT(("smpl_buf @%p\n", smpl_buf));
 
         /* allocate vma */
-        vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+        vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
         if (!vma) {
                 DPRINT(("Cannot allocate vma\n"));
                 goto error_kmem;
diff --git a/arch/ia64/kernel/perfmon_montecito.h b/arch/ia64/kernel/perfmon_montecito.h
index cd06ac6a686c..7f8da4c7ca67 100644
--- a/arch/ia64/kernel/perfmon_montecito.h
+++ b/arch/ia64/kernel/perfmon_montecito.h
@@ -45,16 +45,16 @@ static pfm_reg_desc_t pfm_mont_pmc_desc[PMU_MAX_PMCS]={
 /* pmc29 */ { PFM_REG_NOTIMPL, },
 /* pmc30 */ { PFM_REG_NOTIMPL, },
 /* pmc31 */ { PFM_REG_NOTIMPL, },
-/* pmc32 */ { PFM_REG_CONFIG,  0, 0x30f01ffffffffff, 0x30f01ffffffffff, NULL, pfm_mont_pmc_check, {0,0, 0, 0}, {0,0, 0, 0}},
-/* pmc33 */ { PFM_REG_CONFIG,  0, 0x0,  0x1ffffffffff, NULL, pfm_mont_pmc_check, {0,0, 0, 0}, {0,0, 0, 0}},
-/* pmc34 */ { PFM_REG_CONFIG,  0, 0xf01ffffffffff, 0xf01ffffffffff, NULL, pfm_mont_pmc_check, {0,0, 0, 0}, {0,0, 0, 0}},
-/* pmc35 */ { PFM_REG_CONFIG,  0, 0x0,  0x1ffffffffff, NULL, pfm_mont_pmc_check, {0,0, 0, 0}, {0,0, 0, 0}},
+/* pmc32 */ { PFM_REG_CONFIG,  0, 0x30f01ffffffffffUL, 0x30f01ffffffffffUL, NULL, pfm_mont_pmc_check, {0,0, 0, 0}, {0,0, 0, 0}},
+/* pmc33 */ { PFM_REG_CONFIG,  0, 0x0,  0x1ffffffffffUL, NULL, pfm_mont_pmc_check, {0,0, 0, 0}, {0,0, 0, 0}},
+/* pmc34 */ { PFM_REG_CONFIG,  0, 0xf01ffffffffffUL, 0xf01ffffffffffUL, NULL, pfm_mont_pmc_check, {0,0, 0, 0}, {0,0, 0, 0}},
+/* pmc35 */ { PFM_REG_CONFIG,  0, 0x0,  0x1ffffffffffUL, NULL, pfm_mont_pmc_check, {0,0, 0, 0}, {0,0, 0, 0}},
 /* pmc36 */ { PFM_REG_CONFIG,  0, 0xfffffff0, 0xf, NULL, pfm_mont_pmc_check, {0,0, 0, 0}, {0,0, 0, 0}},
 /* pmc37 */ { PFM_REG_MONITOR, 4, 0x0, 0x3fff, NULL, pfm_mont_pmc_check, {RDEP_MONT_IEAR, 0, 0, 0}, {0, 0, 0, 0}},
 /* pmc38 */ { PFM_REG_CONFIG,  0, 0xdb6, 0x2492, NULL, pfm_mont_pmc_check, {0,0, 0, 0}, {0,0, 0, 0}},
 /* pmc39 */ { PFM_REG_MONITOR, 6, 0x0, 0xffcf, NULL, pfm_mont_pmc_check, {RDEP_MONT_ETB,0, 0, 0}, {0,0, 0, 0}},
 /* pmc40 */ { PFM_REG_MONITOR, 6, 0x2000000, 0xf01cf, NULL, pfm_mont_pmc_check, {RDEP_MONT_DEAR,0, 0, 0}, {0,0, 0, 0}},
-/* pmc41 */ { PFM_REG_CONFIG,  0, 0x00002078fefefefe, 0x1e00018181818, NULL, pfm_mont_pmc_check, {0,0, 0, 0}, {0,0, 0, 0}},
+/* pmc41 */ { PFM_REG_CONFIG,  0, 0x00002078fefefefeUL, 0x1e00018181818UL, NULL, pfm_mont_pmc_check, {0,0, 0, 0}, {0,0, 0, 0}},
 /* pmc42 */ { PFM_REG_MONITOR, 6, 0x0, 0x7ff4f, NULL, pfm_mont_pmc_check, {RDEP_MONT_ETB,0, 0, 0}, {0,0, 0, 0}},
             { PFM_REG_END    , 0, 0x0, -1, NULL, NULL, {0,}, {0,}}, /* end marker */
 };
@@ -185,7 +185,7 @@ pfm_mont_pmc_check(struct task_struct *task, pfm_context_t *ctx, unsigned int cn
         DPRINT(("cnum=%u val=0x%lx, using_dbreg=%d loaded=%d\n", cnum, tmpval, ctx->ctx_fl_using_dbreg, is_loaded));
 
         if (cnum == 41 && is_loaded 
-            && (tmpval & 0x1e00000000000) && (tmpval & 0x18181818UL) != 0x18181818UL && ctx->ctx_fl_using_dbreg == 0) {
+            && (tmpval & 0x1e00000000000UL) && (tmpval & 0x18181818UL) != 0x18181818UL && ctx->ctx_fl_using_dbreg == 0) {
 
                 DPRINT(("pmc[%d]=0x%lx has active pmc41 settings, clearing dbr\n", cnum, tmpval));
 
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 51922b98086a..17685abaf496 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -268,10 +268,16 @@ cpu_idle (void)
 
         /* endless idle loop with no priority at all */
         while (1) {
-                if (can_do_pal_halt)
+                if (can_do_pal_halt) {
                         current_thread_info()->status &= ~TS_POLLING;
-                else
+                        /*
+                         * TS_POLLING-cleared state must be visible before we
+                         * test NEED_RESCHED:
+                         */
+                        smp_mb();
+                } else {
                         current_thread_info()->status |= TS_POLLING;
+                }
 
                 if (!need_resched()) {
                         void (*idle)(void);
diff --git a/arch/ia64/kernel/relocate_kernel.S b/arch/ia64/kernel/relocate_kernel.S
new file mode 100644
index 000000000000..ae473e3f2a0d
--- /dev/null
+++ b/arch/ia64/kernel/relocate_kernel.S
@@ -0,0 +1,334 @@
+/*
+ * arch/ia64/kernel/relocate_kernel.S
+ *
+ * Relocate kexec'able kernel and start it
+ *
+ * Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
+ * Copyright (C) 2005 Khalid Aziz  <khalid.aziz@hp.com>
+ * Copyright (C) 2005 Intel Corp,  Zou Nan hai <nanhai.zou@intel.com>
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+#include <asm/asmmacro.h>
+#include <asm/kregs.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+#include <asm/mca_asm.h>
+
+       /* Must be relocatable PIC code callable as a C function
+        */
+GLOBAL_ENTRY(relocate_new_kernel)
+        .prologue
+        alloc r31=ar.pfs,4,0,0,0
+        .body
+.reloc_entry:
+{
+        rsm psr.i| psr.ic
+        mov r2=ip
+}
+        ;;
+{
+        flushrs                         // must be first insn in group
+        srlz.i
+}
+        ;;
+        dep r2=0,r2,61,3                //to physical address
+        ;;
+        //first switch to physical mode
+        add r3=1f-.reloc_entry, r2
+        movl r16 = IA64_PSR_AC|IA64_PSR_BN|IA64_PSR_IC
+        mov ar.rsc=0                    // put RSE in enforced lazy mode
+        ;;
+        add sp=(memory_stack_end - 16 - .reloc_entry),r2
+        add r8=(register_stack - .reloc_entry),r2
+        ;;
+        mov r18=ar.rnat
+        mov ar.bspstore=r8
+        ;;
+        mov cr.ipsr=r16
+        mov cr.iip=r3
+        mov cr.ifs=r0
+        srlz.i
+        ;;
+        mov ar.rnat=r18
+        rfi
+        ;;
+1:
+        //physical mode code begin
+        mov b6=in1
+        dep r28=0,in2,61,3      //to physical address
+
+        // purge all TC entries
+#define O(member)       IA64_CPUINFO_##member##_OFFSET
+        GET_THIS_PADDR(r2, cpu_info)    // load phys addr of cpu_info into r2
+        ;;
+        addl r17=O(PTCE_STRIDE),r2
+        addl r2=O(PTCE_BASE),r2
+        ;;
+        ld8 r18=[r2],(O(PTCE_COUNT)-O(PTCE_BASE));;     // r18=ptce_base
+        ld4 r19=[r2],4                                  // r19=ptce_count[0]
+        ld4 r21=[r17],4                                 // r21=ptce_stride[0]
+        ;;
+        ld4 r20=[r2]                                    // r20=ptce_count[1]
+        ld4 r22=[r17]                                   // r22=ptce_stride[1]
+        mov r24=r0
+        ;;
+        adds r20=-1,r20
+        ;;
+#undef O
+2:
+        cmp.ltu p6,p7=r24,r19
+(p7)    br.cond.dpnt.few 4f
+        mov ar.lc=r20
+3:
+        ptc.e r18
+        ;;
+        add r18=r22,r18
+        br.cloop.sptk.few 3b
+        ;;
+        add r18=r21,r18
+        add r24=1,r24
+        ;;
+        br.sptk.few 2b
+4:
+        srlz.i
+        ;;
+        //purge TR entry for kernel text and data
+        movl r16=KERNEL_START
+        mov r18=KERNEL_TR_PAGE_SHIFT<<2
+        ;;
+        ptr.i r16, r18
+        ptr.d r16, r18
+        ;;
+        srlz.i
+        ;;
+
+        // purge TR entry for percpu data
+        movl r16=PERCPU_ADDR
+        mov r18=PERCPU_PAGE_SHIFT<<2
+        ;;
+        ptr.d r16,r18
+        ;;
+        srlz.d
+        ;;
+
+        // purge TR entry for pal code
+        mov r16=in3
+        mov r18=IA64_GRANULE_SHIFT<<2
+        ;;
+        ptr.i r16,r18
+        ;;
+        srlz.i
+        ;;
+
+        // purge TR entry for stack
+        mov r16=IA64_KR(CURRENT_STACK)
+        ;;
+        shl r16=r16,IA64_GRANULE_SHIFT
+        movl r19=PAGE_OFFSET
+        ;;
+        add r16=r19,r16
+        mov r18=IA64_GRANULE_SHIFT<<2
+        ;;
+        ptr.d r16,r18
+        ;;
+        srlz.i
+        ;;
+
+        //copy segments
+        movl r16=PAGE_MASK
+        mov  r30=in0                    // in0 is page_list
+        br.sptk.few .dest_page
+        ;;
+.loop:
+        ld8  r30=[in0], 8;;
+.dest_page:
+        tbit.z p0, p6=r30, 0;;          // 0x1 dest page
+(p6)    and r17=r30, r16
+(p6)    br.cond.sptk.few .loop;;
+
+        tbit.z p0, p6=r30, 1;;          // 0x2 indirect page
+(p6)    and in0=r30, r16
+(p6)    br.cond.sptk.few .loop;;
+
+        tbit.z p0, p6=r30, 2;;          // 0x4 end flag
+(p6)    br.cond.sptk.few .end_loop;;
+
+        tbit.z p6, p0=r30, 3;;          // 0x8 source page
+(p6)    br.cond.sptk.few .loop
+
+        and r18=r30, r16
+
+        // simple copy page, may optimize later
+        movl r14=PAGE_SIZE/8 - 1;;
+        mov ar.lc=r14;;
+1:
+        ld8 r14=[r18], 8;;
+        st8 [r17]=r14;;
+        fc.i r17
+        add r17=8, r17
+        br.ctop.sptk.few 1b
+        br.sptk.few .loop
+        ;;
+
+.end_loop:
+        sync.i                  // for fc.i
+        ;;
+        srlz.i
+        ;;
+        srlz.d
+        ;;
+        br.call.sptk.many b0=b6;;
+
+.align  32
+memory_stack:
+        .fill           8192, 1, 0
+memory_stack_end:
+register_stack:
+        .fill           8192, 1, 0
+register_stack_end:
+relocate_new_kernel_end:
+END(relocate_new_kernel)
+
+.global relocate_new_kernel_size
+relocate_new_kernel_size:
+        data8   relocate_new_kernel_end - relocate_new_kernel
+
+GLOBAL_ENTRY(ia64_dump_cpu_regs)
+        .prologue
+        alloc loc0=ar.pfs,1,2,0,0
+        .body
+        mov     ar.rsc=0                // put RSE in enforced lazy mode
+        add     loc1=4*8, in0           // save r4 and r5 first
+        ;;
+{
+        flushrs                         // flush dirty regs to backing store
+        srlz.i
+}
+        st8 [loc1]=r4, 8
+        ;;
+        st8 [loc1]=r5, 8
+        ;;
+        add loc1=32*8, in0
+        mov r4=ar.rnat
+        ;;
+        st8 [in0]=r0, 8                 // r0
+        st8 [loc1]=r4, 8                // rnat
+        mov r5=pr
+        ;;
+        st8 [in0]=r1, 8                 // r1
+        st8 [loc1]=r5, 8                // pr
+        mov r4=b0
+        ;;
+        st8 [in0]=r2, 8                 // r2
+        st8 [loc1]=r4, 8                // b0
+        mov r5=b1;
+        ;;
+        st8 [in0]=r3, 24                // r3
+        st8 [loc1]=r5, 8                // b1
+        mov r4=b2
+        ;;
+        st8 [in0]=r6, 8                 // r6
+        st8 [loc1]=r4, 8                // b2
+        mov r5=b3
+        ;;
+        st8 [in0]=r7, 8                 // r7
+        st8 [loc1]=r5, 8                // b3
+        mov r4=b4
+        ;;
+        st8 [in0]=r8, 8                 // r8
+        st8 [loc1]=r4, 8                // b4
+        mov r5=b5
+        ;;
+        st8 [in0]=r9, 8                 // r9
+        st8 [loc1]=r5, 8                // b5
+        mov r4=b6
+        ;;
+        st8 [in0]=r10, 8                // r10
+        st8 [loc1]=r5, 8                // b6
+        mov r5=b7
+        ;;
+        st8 [in0]=r11, 8                // r11
+        st8 [loc1]=r5, 8                // b7
+        mov r4=b0
+        ;;
+        st8 [in0]=r12, 8                // r12
+        st8 [loc1]=r4, 8                // ip
+        mov r5=loc0
+        ;;
+        st8 [in0]=r13, 8                // r13
+        extr.u r5=r5, 0, 38             // ar.pfs.pfm
+        mov r4=r0                       // user mask
+        ;;
+        st8 [in0]=r14, 8                // r14
+        st8 [loc1]=r5, 8                // cfm
+        ;;
+        st8 [in0]=r15, 8                // r15
+        st8 [loc1]=r4, 8                // user mask
+        mov r5=ar.rsc
+        ;;
+        st8 [in0]=r16, 8                // r16
+        st8 [loc1]=r5, 8                // ar.rsc
+        mov r4=ar.bsp
+        ;;
+        st8 [in0]=r17, 8                // r17
+        st8 [loc1]=r4, 8                // ar.bsp
+        mov r5=ar.bspstore
+        ;;
+        st8 [in0]=r18, 8                // r18
+        st8 [loc1]=r5, 8                // ar.bspstore
+        mov r4=ar.rnat
+        ;;
+        st8 [in0]=r19, 8                // r19
+        st8 [loc1]=r4, 8                // ar.rnat
+        mov r5=ar.ccv
+        ;;
+        st8 [in0]=r20, 8                // r20
+        st8 [loc1]=r5, 8                // ar.ccv
+        mov r4=ar.unat
+        ;;
+        st8 [in0]=r21, 8                // r21
+        st8 [loc1]=r4, 8                // ar.unat
+        mov r5 = ar.fpsr
+        ;;
+        st8 [in0]=r22, 8                // r22
+        st8 [loc1]=r5, 8                // ar.fpsr
+        mov r4 = ar.unat
+        ;;
+        st8 [in0]=r23, 8                // r23
+        st8 [loc1]=r4, 8                // unat
+        mov r5 = ar.fpsr
+        ;;
+        st8 [in0]=r24, 8                // r24
+        st8 [loc1]=r5, 8                // fpsr
+        mov r4 = ar.pfs
+        ;;
+        st8 [in0]=r25, 8                // r25
+        st8 [loc1]=r4, 8                // ar.pfs
+        mov r5 = ar.lc
+        ;;
+        st8 [in0]=r26, 8                // r26
+        st8 [loc1]=r5, 8                // ar.lc
+        mov r4 = ar.ec
+        ;;
+        st8 [in0]=r27, 8                // r27
+        st8 [loc1]=r4, 8                // ar.ec
+        mov r5 = ar.csd
+        ;;
+        st8 [in0]=r28, 8                // r28
+        st8 [loc1]=r5, 8                // ar.csd
+        mov r4 = ar.ssd
+        ;;
+        st8 [in0]=r29, 8                // r29
+        st8 [loc1]=r4, 8                // ar.ssd
+        ;;
+        st8 [in0]=r30, 8                // r30
+        ;;
+        st8 [in0]=r31, 8                // r31
+        mov ar.pfs=loc0
+        ;;
+        br.ret.sptk.many rp
+END(ia64_dump_cpu_regs)
+
+
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index e63b8ca5344a..e375a2f0f2c3 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -302,7 +302,7 @@ salinfo_event_open(struct inode *inode, struct file *file)
 static ssize_t
 salinfo_event_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file->f_path.dentry->d_inode;
         struct proc_dir_entry *entry = PDE(inode);
         struct salinfo_data *data = entry->data;
         char cmd[32];
@@ -464,7 +464,7 @@ retry:
 static ssize_t
 salinfo_log_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file->f_path.dentry->d_inode;
         struct proc_dir_entry *entry = PDE(inode);
         struct salinfo_data *data = entry->data;
         u8 *buf;
@@ -525,7 +525,7 @@ salinfo_log_clear(struct salinfo_data *data, int cpu)
 static ssize_t
 salinfo_log_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
 {
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file->f_path.dentry->d_inode;
         struct proc_dir_entry *entry = PDE(inode);
         struct salinfo_data *data = entry->data;
         char cmd[32];
@@ -575,7 +575,6 @@ static struct file_operations salinfo_data_fops = {
         .write   = salinfo_log_write,
 };
 
-#ifdef  CONFIG_HOTPLUG_CPU
 static int __devinit
 salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
 {
@@ -620,7 +619,6 @@ static struct notifier_block salinfo_cpu_notifier =
         .notifier_call = salinfo_cpu_callback,
         .priority = 0,
 };
-#endif  /* CONFIG_HOTPLUG_CPU */
 
 static int __init
 salinfo_init(void)
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index d10404a41756..ad567b8d432e 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -43,6 +43,8 @@
 #include <linux/initrd.h>
 #include <linux/pm.h>
 #include <linux/cpufreq.h>
+#include <linux/kexec.h>
+#include <linux/crash_dump.h>
 
 #include <asm/ia32.h>
 #include <asm/machvec.h>
@@ -252,6 +254,47 @@ reserve_memory (void)
         efi_memmap_init(&rsvd_region[n].start, &rsvd_region[n].end);
         n++;
 
+#ifdef CONFIG_KEXEC
+        /* crashkernel=size@offset specifies the size to reserve for a crash
+         * kernel. If offset is 0, then it is determined automatically.
+         * By reserving this memory we guarantee that linux never set's it
+         * up as a DMA target.Useful for holding code to do something
+         * appropriate after a kernel panic.
+         */
+        {
+                char *from = strstr(saved_command_line, "crashkernel=");
+                unsigned long base, size;
+                if (from) {
+                        size = memparse(from + 12, &from);
+                        if (*from == '@')
+                                base = memparse(from+1, &from);
+                        else
+                                base = 0;
+                        if (size) {
+                                if (!base) {
+                                        sort_regions(rsvd_region, n);
+                                        base = kdump_find_rsvd_region(size,
+                                                                rsvd_region, n);
+                                        }
+                                if (base != ~0UL) {
+                                        rsvd_region[n].start =
+                                                (unsigned long)__va(base);
+                                        rsvd_region[n].end =
+                                                (unsigned long)__va(base + size);
+                                        n++;
+                                        crashk_res.start = base;
+                                        crashk_res.end = base + size - 1;
+                                }
+                        }
+                }
+                efi_memmap_res.start = ia64_boot_param->efi_memmap;
+                efi_memmap_res.end = efi_memmap_res.start +
+                        ia64_boot_param->efi_memmap_size;
+                boot_param_res.start = __pa(ia64_boot_param);
+                boot_param_res.end = boot_param_res.start +
+                        sizeof(*ia64_boot_param);
+        }
+#endif
         /* end of memory marker */
         rsvd_region[n].start = ~0UL;
         rsvd_region[n].end   = ~0UL;
@@ -263,6 +306,7 @@ reserve_memory (void)
         sort_regions(rsvd_region, num_rsvd_regions);
 }
 
+
 /**
  * find_initrd - get initrd parameters from the boot parameter structure
  *
@@ -396,6 +440,21 @@ static __init int setup_nomca(char *s)
 }
 early_param("nomca", setup_nomca);
 
+#ifdef CONFIG_PROC_VMCORE
+/* elfcorehdr= specifies the location of elf core header
+ * stored by the crashed kernel.
+ */
+static int __init parse_elfcorehdr(char *arg)
+{
+        if (!arg)
+                return -EINVAL;
+
+        elfcorehdr_addr = memparse(arg, &arg);
+        return 0;
+}
+early_param("elfcorehdr", parse_elfcorehdr);
+#endif /* CONFIG_PROC_VMCORE */
+
 void __init
 setup_arch (char **cmdline_p)
 {
@@ -615,6 +674,7 @@ get_model_name(__u8 family, __u8 model)
 {
         char brand[128];
 
+        memcpy(brand, "Unknown", 8);
         if (ia64_pal_get_brand_info(brand)) {
                 if (family == 0x7)
                         memcpy(brand, "Merced", 7);
@@ -622,8 +682,7 @@ get_model_name(__u8 family, __u8 model)
                         case 0: memcpy(brand, "McKinley", 9); break;
                         case 1: memcpy(brand, "Madison", 8); break;
                         case 2: memcpy(brand, "Madison up to 9M cache", 23); break;
-                } else
-                        memcpy(brand, "Unknown", 8);
+                }
         }
         if (brandname[0] == '\0')
                 return strcpy(brandname, brand);
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index 6ab95ceaf9d4..f4c7f7769cf7 100644
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -30,6 +30,7 @@
 #include <linux/delay.h>
 #include <linux/efi.h>
 #include <linux/bitops.h>
+#include <linux/kexec.h>
 
 #include <asm/atomic.h>
 #include <asm/current.h>
@@ -66,6 +67,7 @@ static volatile struct call_data_struct *call_data;
 
 #define IPI_CALL_FUNC           0
 #define IPI_CPU_STOP            1
+#define IPI_KDUMP_CPU_STOP      3
 
 /* This needs to be cacheline aligned because it is written to by *other* CPUs.  */
 static DEFINE_PER_CPU(u64, ipi_operation) ____cacheline_aligned;
@@ -155,7 +157,11 @@ handle_IPI (int irq, void *dev_id)
                               case IPI_CPU_STOP:
                                 stop_this_cpu();
                                 break;
-
+#ifdef CONFIG_KEXEC
+                              case IPI_KDUMP_CPU_STOP:
+                                unw_init_running(kdump_cpu_freeze, NULL);
+                                break;
+#endif
                               default:
                                 printk(KERN_CRIT "Unknown IPI on CPU %d: %lu\n", this_cpu, which);
                                 break;
@@ -213,6 +219,26 @@ send_IPI_self (int op)
         send_IPI_single(smp_processor_id(), op);
 }
 
+#ifdef CONFIG_KEXEC
+void
+kdump_smp_send_stop()
+{
+        send_IPI_allbutself(IPI_KDUMP_CPU_STOP);
+}
+
+void
+kdump_smp_send_init()
+{
+        unsigned int cpu, self_cpu;
+        self_cpu = smp_processor_id();
+        for_each_online_cpu(cpu) {
+                if (cpu != self_cpu) {
+                        if(kdump_status[cpu] == 0)
+                                platform_send_ipi(cpu, 0, IA64_IPI_DM_INIT, 0);
+                }
+        }
+}
+#endif
 /*
  * Called with preeemption disabled.
  */
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index f7d7f5668144..b21ddecea943 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -463,15 +463,17 @@ struct pt_regs * __devinit idle_regs(struct pt_regs *regs)
 }
 
 struct create_idle {
+        struct work_struct work;
         struct task_struct *idle;
         struct completion done;
         int cpu;
 };
 
 void
-do_fork_idle(void *_c_idle)
+do_fork_idle(struct work_struct *work)
 {
-        struct create_idle *c_idle = _c_idle;
+        struct create_idle *c_idle =
+                container_of(work, struct create_idle, work);
 
         c_idle->idle = fork_idle(c_idle->cpu);
         complete(&c_idle->done);
@@ -482,10 +484,10 @@ do_boot_cpu (int sapicid, int cpu)
 {
         int timeout;
         struct create_idle c_idle = {
+                .work = __WORK_INITIALIZER(c_idle.work, do_fork_idle),
                 .cpu    = cpu,
                 .done   = COMPLETION_INITIALIZER(c_idle.done),
         };
-        DECLARE_WORK(work, do_fork_idle, &c_idle);
 
         c_idle.idle = get_idle_for_cpu(cpu);
         if (c_idle.idle) {
@@ -497,9 +499,9 @@ do_boot_cpu (int sapicid, int cpu)
          * We can't use kernel_thread since we must avoid to reschedule the child.
          */
         if (!keventd_up() || current_is_keventd())
-                work.func(work.data);
+                c_idle.work.func(&c_idle.work);
         else {
-                schedule_work(&work);
+                schedule_work(&c_idle.work);
                 wait_for_completion(&c_idle.done);
         }
 
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 5629b45e89c6..687500ddb4b8 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -31,11 +31,11 @@ int arch_register_cpu(int num)
 {
 #if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU)
         /*
-         * If CPEI cannot be re-targetted, and this is
-         * CPEI target, then dont create the control file
+         * If CPEI can be re-targetted or if this is not
+         * CPEI target, then it is hotpluggable
          */
-        if (!can_cpei_retarget() && is_cpu_cpei_target(num))
-                sysfs_cpus[num].cpu.no_control = 1;
+        if (can_cpei_retarget() || !is_cpu_cpei_target(num))
+                sysfs_cpus[num].cpu.hotpluggable = 1;
         map_cpu_to_node(num, node_cpuid[num].nid);
 #endif
 
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index fffa9e0826bc..ab684747036f 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -307,6 +307,15 @@ fp_emulate (int fp_fault, void *bundle, long *ipsr, long *fpsr, long *isr, long
         return ret.status;
 }
 
+struct fpu_swa_msg {
+        unsigned long count;
+        unsigned long time;
+};
+static DEFINE_PER_CPU(struct fpu_swa_msg, cpulast);
+DECLARE_PER_CPU(struct fpu_swa_msg, cpulast);
+static struct fpu_swa_msg last __cacheline_aligned;
+
+
 /*
  * Handle floating-point assist faults and traps.
  */
@@ -316,8 +325,6 @@ handle_fpu_swa (int fp_fault, struct pt_regs *regs, unsigned long isr)
         long exception, bundle[2];
         unsigned long fault_ip;
         struct siginfo siginfo;
-        static int fpu_swa_count = 0;
-        static unsigned long last_time;
 
         fault_ip = regs->cr_iip;
         if (!fp_fault && (ia64_psr(regs)->ri == 0))
@@ -325,14 +332,37 @@ handle_fpu_swa (int fp_fault, struct pt_regs *regs, unsigned long isr)
         if (copy_from_user(bundle, (void __user *) fault_ip, sizeof(bundle)))
                 return -1;
 
-        if (jiffies - last_time > 5*HZ)
-                fpu_swa_count = 0;
-        if ((fpu_swa_count < 4) && !(current->thread.flags & IA64_THREAD_FPEMU_NOPRINT)) {
-                last_time = jiffies;
-                ++fpu_swa_count;
-                printk(KERN_WARNING
-                       "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
-                       current->comm, current->pid, regs->cr_iip + ia64_psr(regs)->ri, isr);
+        if (!(current->thread.flags & IA64_THREAD_FPEMU_NOPRINT))  {
+                unsigned long count, current_jiffies = jiffies;
+                struct fpu_swa_msg *cp = &__get_cpu_var(cpulast);
+
+                if (unlikely(current_jiffies > cp->time))
+                        cp->count = 0;
+                if (unlikely(cp->count < 5)) {
+                        cp->count++;
+                        cp->time = current_jiffies + 5 * HZ;
+
+                        /* minimize races by grabbing a copy of count BEFORE checking last.time. */
+                        count = last.count;
+                        barrier();
+
+                        /*
+                         * Lower 4 bits are used as a count. Upper bits are a sequence
+                         * number that is updated when count is reset. The cmpxchg will
+                         * fail is seqno has changed. This minimizes mutiple cpus
+                         * reseting the count.
+                         */
+                        if (current_jiffies > last.time)
+                                (void) cmpxchg_acq(&last.count, count, 16 + (count & ~15));
+
+                        /* used fetchadd to atomically update the count */
+                        if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) {
+                                last.time = current_jiffies + 5 * HZ;
+                                printk(KERN_WARNING
+                                        "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
+                                        current->comm, current->pid, regs->cr_iip + ia64_psr(regs)->ri, isr);
+                        }
+                }
         }
 
         exception = fp_emulate(fp_fault, bundle, &regs->cr_ipsr, &regs->ar_fpsr, &isr, &regs->pr,
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/lib/ip_fast_csum.S b/arch/ia64/lib/ip_fast_csum.S
index 19674ca2acfc..1f86aeb2c948 100644
--- a/arch/ia64/lib/ip_fast_csum.S
+++ b/arch/ia64/lib/ip_fast_csum.S
@@ -8,8 +8,8 @@
  *      in0: address of buffer to checksum (char *)
  *      in1: length of the buffer (int)
  *
- * Copyright (C) 2002 Intel Corp.
- * Copyright (C) 2002 Ken Chen <kenneth.w.chen@intel.com>
+ * Copyright (C) 2002, 2006 Intel Corp.
+ * Copyright (C) 2002, 2006 Ken Chen <kenneth.w.chen@intel.com>
  */
 
 #include <asm/asmmacro.h>
@@ -25,6 +25,9 @@
 
 #define in0     r32
 #define in1     r33
+#define in2     r34
+#define in3     r35
+#define in4     r36
 #define ret0    r8
 
 GLOBAL_ENTRY(ip_fast_csum)
@@ -65,8 +68,9 @@ GLOBAL_ENTRY(ip_fast_csum)
         zxt2    r20=r20
         ;;
         add     r20=ret0,r20
+        mov     r9=0xffff
         ;;
-        andcm   ret0=-1,r20
+        andcm   ret0=r9,r20
         .restore sp             // reset frame state
         br.ret.sptk.many b0
         ;;
@@ -88,3 +92,51 @@ GLOBAL_ENTRY(ip_fast_csum)
         mov     b0=r34
         br.ret.sptk.many b0
 END(ip_fast_csum)
+
+GLOBAL_ENTRY(csum_ipv6_magic)
+        ld4     r20=[in0],4
+        ld4     r21=[in1],4
+        dep     r15=in3,in2,32,16
+        ;;
+        ld4     r22=[in0],4
+        ld4     r23=[in1],4
+        mux1    r15=r15,@rev
+        ;;
+        ld4     r24=[in0],4
+        ld4     r25=[in1],4
+        shr.u   r15=r15,16
+        add     r16=r20,r21
+        add     r17=r22,r23
+        ;;
+        ld4     r26=[in0],4
+        ld4     r27=[in1],4
+        add     r18=r24,r25
+        add     r8=r16,r17
+        ;;
+        add     r19=r26,r27
+        add     r8=r8,r18
+        ;;
+        add     r8=r8,r19
+        add     r15=r15,in4
+        ;;
+        add     r8=r8,r15
+        ;;
+        shr.u   r10=r8,32       // now fold sum into short
+        zxt4    r11=r8
+        ;;
+        add     r8=r10,r11
+        ;;
+        shr.u   r10=r8,16       // yeah, keep it rolling
+        zxt2    r11=r8
+        ;;
+        add     r8=r10,r11
+        ;;
+        shr.u   r10=r8,16       // three times lucky
+        zxt2    r11=r8
+        ;;
+        add     r8=r10,r11
+        mov     r9=0xffff
+        ;;
+        andcm   r8=r9,r8
+        br.ret.sptk.many b0
+END(csum_ipv6_magic)
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 82deaa3a7c48..1e79551231b9 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -174,6 +174,12 @@ find_memory (void)
         reserve_bootmem(bootmap_start, bootmap_size);
 
         find_initrd();
+
+#ifdef CONFIG_CRASH_DUMP
+        /* If we are doing a crash dump, we still need to know the real mem
+         * size before original memory map is * reset. */
+        saved_max_pfn = max_pfn;
+#endif
 }
 
 #ifdef CONFIG_SMP
@@ -226,7 +232,6 @@ void __init
 paging_init (void)
 {
         unsigned long max_dma;
-        unsigned long nid = 0;
         unsigned long max_zone_pfns[MAX_NR_ZONES];
 
         num_physpages = 0;
@@ -238,7 +243,7 @@ paging_init (void)
         max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
 
 #ifdef CONFIG_VIRTUAL_MEM_MAP
-        efi_memmap_walk(register_active_ranges, &nid);
+        efi_memmap_walk(register_active_ranges, NULL);
         efi_memmap_walk(find_largest_hole, (u64 *)&max_gap);
         if (max_gap < LARGE_GAP) {
                 vmem_map = (struct page *) 0;
diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
index f3a9585e98a8..0c7e94edc20e 100644
--- a/arch/ia64/mm/hugetlbpage.c
+++ b/arch/ia64/mm/hugetlbpage.c
@@ -64,6 +64,11 @@ huge_pte_offset (struct mm_struct *mm, unsigned long addr)
         return pte;
 }
 
+int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
+{
+        return 0;
+}
+
 #define mk_pte_huge(entry) { pte_val(entry) |= _PAGE_P; }
 
 /*
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index ff87a5cba399..1373fae7657f 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -156,7 +156,7 @@ ia64_init_addr_space (void)
          * the problem.  When the process attempts to write to the register backing store
          * for the first time, it will get a SEGFAULT in this case.
          */
-        vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+        vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
         if (vma) {
                 memset(vma, 0, sizeof(*vma));
                 vma->vm_mm = current->mm;
@@ -175,7 +175,7 @@ ia64_init_addr_space (void)
 
         /* map NaT-page at address zero to speed up speculative dereferencing of NULL: */
         if (!(current->personality & MMAP_PAGE_ZERO)) {
-                vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+                vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
                 if (vma) {
                         memset(vma, 0, sizeof(*vma));
                         vma->vm_mm = current->mm;
@@ -543,7 +543,8 @@ virtual_memmap_init (u64 start, u64 end, void *arg)
 
         if (map_start < map_end)
                 memmap_init_zone((unsigned long)(map_end - map_start),
-                                 args->nid, args->zone, page_to_pfn(map_start));
+                                 args->nid, args->zone, page_to_pfn(map_start),
+                                 MEMMAP_EARLY);
         return 0;
 }
 
@@ -552,7 +553,7 @@ memmap_init (unsigned long size, int nid, unsigned long zone,
              unsigned long start_pfn)
 {
         if (!vmem_map)
-                memmap_init_zone(size, nid, zone, start_pfn);
+                memmap_init_zone(size, nid, zone, start_pfn, MEMMAP_EARLY);
         else {
                 struct page *start;
                 struct memmap_init_callback_data args;
@@ -595,14 +596,9 @@ find_largest_hole (u64 start, u64 end, void *arg)
 }
 
 int __init
-register_active_ranges(u64 start, u64 end, void *nid)
+register_active_ranges(u64 start, u64 end, void *arg)
 {
-        BUG_ON(nid == NULL);
-        BUG_ON(*(unsigned long *)nid >= MAX_NUMNODES);
-
-        add_active_range(*(unsigned long *)nid,
-                                __pa(start) >> PAGE_SHIFT,
-                                __pa(end) >> PAGE_SHIFT);
+        add_active_range(0, __pa(start) >> PAGE_SHIFT, __pa(end) >> PAGE_SHIFT);
         return 0;
 }
 #endif /* CONFIG_VIRTUAL_MEM_MAP */
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index b30be7c48ba8..474d179966dc 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -125,11 +125,10 @@ alloc_pci_controller (int seg)
 {
         struct pci_controller *controller;
 
-        controller = kmalloc(sizeof(*controller), GFP_KERNEL);
+        controller = kzalloc(sizeof(*controller), GFP_KERNEL);
         if (!controller)
                 return NULL;
 
-        memset(controller, 0, sizeof(*controller));
         controller->segment = seg;
         controller->node = -1;
         return controller;
@@ -469,10 +468,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 +493,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;
 }
@@ -562,8 +563,8 @@ pcibios_enable_device (struct pci_dev *dev, int mask)
 void
 pcibios_disable_device (struct pci_dev *dev)
 {
-        if (dev->is_enabled)
-                acpi_pci_irq_disable(dev);
+        BUG_ON(atomic_read(&dev->enable_cnt));
+        acpi_pci_irq_disable(dev);
 }
 
 void
@@ -738,75 +739,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..cb96b4ea7df6
--- /dev/null
+++ b/arch/ia64/sn/kernel/io_acpi_init.c
@@ -0,0 +1,234 @@
+/*
+ * 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;
+
+        /* SN Altix does not follow the IOSAPIC IRQ routing model */
+        acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM;
+
+        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/irq.c b/arch/ia64/sn/kernel/irq.c
index 0b49459a878a..8c5bee01eaa2 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -117,7 +117,10 @@ struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info,
                                        nasid_t nasid, int slice)
 {
         int vector;
+        int cpuid;
+#ifdef CONFIG_SMP
         int cpuphys;
+#endif
         int64_t bridge;
         int local_widget, status;
         nasid_t local_nasid;
@@ -146,7 +149,6 @@ struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info,
         vector = sn_irq_info->irq_irq;
         /* Free the old PROM new_irq_info structure */
         sn_intr_free(local_nasid, local_widget, new_irq_info);
-        /* Update kernels new_irq_info with new target info */
         unregister_intr_pda(new_irq_info);
 
         /* allocate a new PROM new_irq_info struct */
@@ -160,8 +162,10 @@ struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info,
                 return NULL;
         }
 
-        cpuphys = nasid_slice_to_cpuid(nasid, slice);
-        new_irq_info->irq_cpuid = cpuphys;
+        /* Update kernels new_irq_info with new target info */
+        cpuid = nasid_slice_to_cpuid(new_irq_info->irq_nasid,
+                                     new_irq_info->irq_slice);
+        new_irq_info->irq_cpuid = cpuid;
         register_intr_pda(new_irq_info);
 
         pci_provider = sn_pci_provider[new_irq_info->irq_bridge_type];
@@ -180,6 +184,7 @@ struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info,
         call_rcu(&sn_irq_info->rcu, sn_irq_info_free);
 
 #ifdef CONFIG_SMP
+        cpuphys = cpu_physical_id(cpuid);
         set_irq_affinity_info((vector & 0xff), cpuphys, 0);
 #endif
 
@@ -299,6 +304,9 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info)
         nasid_t nasid = sn_irq_info->irq_nasid;
         int slice = sn_irq_info->irq_slice;
         int cpu = nasid_slice_to_cpuid(nasid, slice);
+#ifdef CONFIG_SMP
+        int cpuphys;
+#endif
 
         pci_dev_get(pci_dev);
         sn_irq_info->irq_cpuid = cpu;
@@ -311,6 +319,10 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info)
         spin_unlock(&sn_irq_info_lock);
 
         register_intr_pda(sn_irq_info);
+#ifdef CONFIG_SMP
+        cpuphys = cpu_physical_id(cpu);
+        set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0);
+#endif
 }
 
 void sn_irq_unfixup(struct pci_dev *pci_dev)
diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c
index 6ffd1f850d41..b3a435fd70fb 100644
--- a/arch/ia64/sn/kernel/msi_sn.c
+++ b/arch/ia64/sn/kernel/msi_sn.c
@@ -136,10 +136,6 @@ int sn_setup_msi_irq(unsigned int irq, struct pci_dev *pdev)
          */
         msg.data = 0x100 + irq;
 
-#ifdef CONFIG_SMP
-        set_irq_affinity_info(irq, sn_irq_info->irq_cpuid, 0);
-#endif
-
         write_msi_msg(irq, &msg);
         set_irq_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq);
 
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 7a2d824c5ce3..8571e52c2efd 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="))
@@ -562,7 +580,7 @@ void __cpuinit sn_cpu_init(void)
         int slice;
         int cnode;
         int i;
-        static int wars_have_been_checked;
+        static int wars_have_been_checked, set_cpu0_number;
 
         cpuid = smp_processor_id();
         if (cpuid == 0 && IS_MEDUSA()) {
@@ -587,8 +605,16 @@ void __cpuinit sn_cpu_init(void)
         /*
          * Don't check status. The SAL call is not supported on all PROMs
          * but a failure is harmless.
+         * Architechtuallly, cpu_init is always called twice on cpu 0. We
+         * should set cpu_number on cpu 0 once.
          */
-        (void) ia64_sn_set_cpu_number(cpuid);
+        if (cpuid == 0) {
+                if (!set_cpu0_number) {
+                        (void) ia64_sn_set_cpu_number(cpuid);
+                        set_cpu0_number = 1;
+                }
+        } else
+                (void) ia64_sn_set_cpu_number(cpuid);
 
         /*
          * The boot cpu makes this call again after platform initialization is
@@ -751,5 +777,13 @@ int sn_prom_feature_available(int id)
                 return 0;
         return test_bit(id, sn_prom_features);
 }
+
+void
+sn_kernel_launch_event(void)
+{
+        /* ignore status until we understand possible failure, if any*/
+        if (ia64_sn_kernel_launch_event())
+                printk(KERN_ERR "KEXEC is not supported in this PROM, Please update the PROM.\n");
+}
 EXPORT_SYMBOL(sn_prom_feature_available);
 
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 462ea178f49a..33367996d72d 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -189,7 +189,7 @@ static void print_pci_topology(struct seq_file *s)
         int e;
 
         for (sz = PAGE_SIZE; sz < 16 * PAGE_SIZE; sz += PAGE_SIZE) {
-                if (!(p = (char *)kmalloc(sz, GFP_KERNEL)))
+                if (!(p = kmalloc(sz, GFP_KERNEL)))
                         break;
                 e = ia64_sn_ioif_get_pci_topology(__pa(p), sz);
                 if (e == SALRET_OK)
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/kernel/xpc_channel.c b/arch/ia64/sn/kernel/xpc_channel.c
index 1f3540826e68..c08db9c2375d 100644
--- a/arch/ia64/sn/kernel/xpc_channel.c
+++ b/arch/ia64/sn/kernel/xpc_channel.c
@@ -632,7 +632,7 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags)
                 ch->number, ch->partid);
 
         spin_unlock_irqrestore(&ch->lock, *irq_flags);
-        xpc_create_kthreads(ch, 1);
+        xpc_create_kthreads(ch, 1, 0);
         spin_lock_irqsave(&ch->lock, *irq_flags);
 }
 
@@ -754,12 +754,12 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
 
         /* make sure all activity has settled down first */
 
-        if (atomic_read(&ch->references) > 0 ||
-                        ((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
-                        !(ch->flags & XPC_C_DISCONNECTINGCALLOUT_MADE))) {
+        if (atomic_read(&ch->kthreads_assigned) > 0 ||
+                                atomic_read(&ch->references) > 0) {
                 return;
         }
-        DBUG_ON(atomic_read(&ch->kthreads_assigned) != 0);
+        DBUG_ON((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
+                        !(ch->flags & XPC_C_DISCONNECTINGCALLOUT_MADE));
 
         if (part->act_state == XPC_P_DEACTIVATING) {
                 /* can't proceed until the other side disengages from us */
@@ -1651,6 +1651,11 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch,
         /* wake all idle kthreads so they can exit */
         if (atomic_read(&ch->kthreads_idle) > 0) {
                 wake_up_all(&ch->idle_wq);
+
+        } else if ((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
+                        !(ch->flags & XPC_C_DISCONNECTINGCALLOUT)) {
+                /* start a kthread that will do the xpcDisconnecting callout */
+                xpc_create_kthreads(ch, 1, 1);
         }
 
         /* wake those waiting to allocate an entry from the local msg queue */
diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c
index fa96dfc0e1aa..7a387d237363 100644
--- a/arch/ia64/sn/kernel/xpc_main.c
+++ b/arch/ia64/sn/kernel/xpc_main.c
@@ -681,7 +681,7 @@ xpc_activate_kthreads(struct xpc_channel *ch, int needed)
         dev_dbg(xpc_chan, "create %d new kthreads, partid=%d, channel=%d\n",
                 needed, ch->partid, ch->number);
 
-        xpc_create_kthreads(ch, needed);
+        xpc_create_kthreads(ch, needed, 0);
 }
 
 
@@ -775,26 +775,28 @@ xpc_daemonize_kthread(void *args)
                 xpc_kthread_waitmsgs(part, ch);
         }
 
-        if (atomic_dec_return(&ch->kthreads_assigned) == 0) {
-                spin_lock_irqsave(&ch->lock, irq_flags);
-                if ((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
-                                !(ch->flags & XPC_C_DISCONNECTINGCALLOUT)) {
-                        ch->flags |= XPC_C_DISCONNECTINGCALLOUT;
-                        spin_unlock_irqrestore(&ch->lock, irq_flags);
+        /* let registerer know that connection is disconnecting */
 
-                        xpc_disconnect_callout(ch, xpcDisconnecting);
-
-                        spin_lock_irqsave(&ch->lock, irq_flags);
-                        ch->flags |= XPC_C_DISCONNECTINGCALLOUT_MADE;
-                }
+        spin_lock_irqsave(&ch->lock, irq_flags);
+        if ((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
+                        !(ch->flags & XPC_C_DISCONNECTINGCALLOUT)) {
+                ch->flags |= XPC_C_DISCONNECTINGCALLOUT;
                 spin_unlock_irqrestore(&ch->lock, irq_flags);
+
+                xpc_disconnect_callout(ch, xpcDisconnecting);
+
+                spin_lock_irqsave(&ch->lock, irq_flags);
+                ch->flags |= XPC_C_DISCONNECTINGCALLOUT_MADE;
+        }
+        spin_unlock_irqrestore(&ch->lock, irq_flags);
+
+        if (atomic_dec_return(&ch->kthreads_assigned) == 0) {
                 if (atomic_dec_return(&part->nchannels_engaged) == 0) {
                         xpc_mark_partition_disengaged(part);
                         xpc_IPI_send_disengage(part);
                 }
         }
 
-
         xpc_msgqueue_deref(ch);
 
         dev_dbg(xpc_chan, "kthread exiting, partid=%d, channel=%d\n",
@@ -818,7 +820,8 @@ xpc_daemonize_kthread(void *args)
  * partition.
  */
 void
-xpc_create_kthreads(struct xpc_channel *ch, int needed)
+xpc_create_kthreads(struct xpc_channel *ch, int needed,
+                        int ignore_disconnecting)
 {
         unsigned long irq_flags;
         pid_t pid;
@@ -833,16 +836,38 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed)
                  * kthread. That kthread is responsible for doing the
                  * counterpart to the following before it exits.
                  */
+                if (ignore_disconnecting) {
+                        if (!atomic_inc_not_zero(&ch->kthreads_assigned)) {
+                                /* kthreads assigned had gone to zero */
+                                BUG_ON(!(ch->flags &
+                                        XPC_C_DISCONNECTINGCALLOUT_MADE));
+                                break;
+                        }
+
+                } else if (ch->flags & XPC_C_DISCONNECTING) {
+                        break;
+
+                } else if (atomic_inc_return(&ch->kthreads_assigned) == 1) {
+                        if (atomic_inc_return(&part->nchannels_engaged) == 1)
+                                xpc_mark_partition_engaged(part);
+                }
                 (void) xpc_part_ref(part);
                 xpc_msgqueue_ref(ch);
-                if (atomic_inc_return(&ch->kthreads_assigned) == 1 &&
-                    atomic_inc_return(&part->nchannels_engaged) == 1) {
-                        xpc_mark_partition_engaged(part);
-                }
 
                 pid = kernel_thread(xpc_daemonize_kthread, (void *) args, 0);
                 if (pid < 0) {
                         /* the fork failed */
+
+                        /*
+                         * NOTE: if (ignore_disconnecting &&
+                         * !(ch->flags & XPC_C_DISCONNECTINGCALLOUT)) is true,
+                         * then we'll deadlock if all other kthreads assigned
+                         * to this channel are blocked in the channel's
+                         * registerer, because the only thing that will unblock
+                         * them is the xpcDisconnecting callout that this
+                         * failed kernel_thread would have made.
+                         */
+
                         if (atomic_dec_return(&ch->kthreads_assigned) == 0 &&
                             atomic_dec_return(&part->nchannels_engaged) == 0) {
                                 xpc_mark_partition_disengaged(part);
@@ -857,9 +882,6 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed)
                                  * Flag this as an error only if we have an
                                  * insufficient #of kthreads for the channel
                                  * to function.
-                                 *
-                                 * No xpc_msgqueue_ref() is needed here since
-                                 * the channel mgr is doing this.
                                  */
                                 spin_lock_irqsave(&ch->lock, irq_flags);
                                 XPC_DISCONNECT_CHANNEL(ch, xpcLackOfResources,
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/Kconfig b/arch/m32r/Kconfig
index 41fd490af3b4..f383dab973f5 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -214,6 +214,14 @@ config RWSEM_XCHGADD_ALGORITHM
         bool
         default n
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config GENERIC_FIND_NEXT_BIT
         bool
         default y
diff --git a/arch/m32r/boot/compressed/m32r_sio.c b/arch/m32r/boot/compressed/m32r_sio.c
index bce8af5e3bb2..ee3c8be12fa0 100644
--- a/arch/m32r/boot/compressed/m32r_sio.c
+++ b/arch/m32r/boot/compressed/m32r_sio.c
@@ -2,6 +2,7 @@
  * arch/m32r/boot/compressed/m32r_sio.c
  *
  * 2003-02-12:  Takeo Takahashi
+ * 2006-11-30:  OPSPUT support by Kazuhiro Inaoka
  *
  */
 
@@ -16,7 +17,7 @@ static int puts(const char *s)
         return 0;
 }
 
-#if defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_M32700UT)
+#if defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT)
 #include <asm/m32r.h>
 #include <asm/io.h>
 
@@ -31,7 +32,11 @@ static int puts(const char *s)
 #define BOOT_SIO0TXB    (volatile unsigned short *)(0x02c00000 + 0x2000c)
 #else
 #undef PLD_BASE
+#if defined(CONFIG_PLAT_OPSPUT)
+#define PLD_BASE        0x1cc00000
+#else
 #define PLD_BASE        0xa4c00000
+#endif
 #define BOOT_SIO0STS    PLD_ESIO0STS
 #define BOOT_SIO0TXB    PLD_ESIO0TXB
 #endif
diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S
index ac6d840b382b..a2c472c0549f 100644
--- a/arch/m32r/kernel/entry.S
+++ b/arch/m32r/kernel/entry.S
@@ -23,35 +23,35 @@
  *      updated in fork.c:copy_thread, signal.c:do_signal,
  *      ptrace.c and ptrace.h
  *
- * M32Rx/M32R2                          M32R
- *       @(sp)      - r4                ditto
- *       @(0x04,sp) - r5                ditto
- *       @(0x08,sp) - r6                ditto
- *       @(0x0c,sp) - *pt_regs          ditto
- *       @(0x10,sp) - r0                ditto
- *       @(0x14,sp) - r1                ditto
- *       @(0x18,sp) - r2                ditto
- *       @(0x1c,sp) - r3                ditto
- *       @(0x20,sp) - r7                ditto
- *       @(0x24,sp) - r8                ditto
- *       @(0x28,sp) - r9                ditto
- *       @(0x2c,sp) - r10               ditto
- *       @(0x30,sp) - r11               ditto
- *       @(0x34,sp) - r12               ditto
- *       @(0x38,sp) - syscall_nr        ditto
- *       @(0x3c,sp) - acc0h             @(0x3c,sp) - acch
- *       @(0x40,sp) - acc0l             @(0x40,sp) - accl
- *       @(0x44,sp) - acc1h             @(0x44,sp) - dummy_acc1h
- *       @(0x48,sp) - acc1l             @(0x48,sp) - dummy_acc1l
- *       @(0x4c,sp) - psw               ditto
- *       @(0x50,sp) - bpc               ditto
- *       @(0x54,sp) - bbpsw             ditto
- *       @(0x58,sp) - bbpc              ditto
- *       @(0x5c,sp) - spu (cr3)         ditto
- *       @(0x60,sp) - fp (r13)          ditto
- *       @(0x64,sp) - lr (r14)          ditto
- *       @(0x68,sp) - spi (cr2)         ditto
- *       @(0x6c,sp) - orig_r0           ditto
+ * M32R/M32Rx/M32R2
+ *       @(sp)      - r4
+ *       @(0x04,sp) - r5
+ *       @(0x08,sp) - r6
+ *       @(0x0c,sp) - *pt_regs
+ *       @(0x10,sp) - r0
+ *       @(0x14,sp) - r1
+ *       @(0x18,sp) - r2
+ *       @(0x1c,sp) - r3
+ *       @(0x20,sp) - r7
+ *       @(0x24,sp) - r8
+ *       @(0x28,sp) - r9
+ *       @(0x2c,sp) - r10
+ *       @(0x30,sp) - r11
+ *       @(0x34,sp) - r12
+ *       @(0x38,sp) - syscall_nr
+ *       @(0x3c,sp) - acc0h
+ *       @(0x40,sp) - acc0l
+ *       @(0x44,sp) - acc1h             ; ISA_DSP_LEVEL2 only
+ *       @(0x48,sp) - acc1l             ; ISA_DSP_LEVEL2 only
+ *       @(0x4c,sp) - psw
+ *       @(0x50,sp) - bpc
+ *       @(0x54,sp) - bbpsw
+ *       @(0x58,sp) - bbpc
+ *       @(0x5c,sp) - spu (cr3)
+ *       @(0x60,sp) - fp (r13)
+ *       @(0x64,sp) - lr (r14)
+ *       @(0x68,sp) - spi (cr2)
+ *       @(0x6c,sp) - orig_r0
  */
 
 #include <linux/linkage.h>
@@ -95,17 +95,10 @@
 #define R11(reg)                @(0x30,reg)
 #define R12(reg)                @(0x34,reg)
 #define SYSCALL_NR(reg)         @(0x38,reg)
-#if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2)
 #define ACC0H(reg)              @(0x3C,reg)
 #define ACC0L(reg)              @(0x40,reg)
 #define ACC1H(reg)              @(0x44,reg)
 #define ACC1L(reg)              @(0x48,reg)
-#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
-#define ACCH(reg)               @(0x3C,reg)
-#define ACCL(reg)               @(0x40,reg)
-#else
-#error unknown isa configuration
-#endif
 #define PSW(reg)                @(0x4C,reg)
 #define BPC(reg)                @(0x50,reg)
 #define BBPSW(reg)              @(0x54,reg)
@@ -603,8 +596,6 @@ ENTRY(ace_handler)
         beqz    r1, inst
 oprand:
         ld      r2, @(low(MDEVA_offset),r2)     ; set address
-        srli    r2, #12
-        slli    r2, #12
         srli    r1, #1
         bra     1f
 inst:
diff --git a/arch/m32r/kernel/io_opsput.c b/arch/m32r/kernel/io_opsput.c
index da6c5f5c1f82..3cbb1f717e50 100644
--- a/arch/m32r/kernel/io_opsput.c
+++ b/arch/m32r/kernel/io_opsput.c
@@ -30,14 +30,34 @@ extern void pcc_iowrite_byte(int, unsigned long, void *, size_t, size_t, int);
 extern void pcc_iowrite_word(int, unsigned long, void *, size_t, size_t, int);
 #endif /* CONFIG_PCMCIA && CONFIG_M32R_CFC */
 
-#define PORT2ADDR(port)  _port2addr(port)
-#define PORT2ADDR_USB(port) _port2addr_usb(port)
+#define PORT2ADDR(port)         _port2addr(port)
+#define PORT2ADDR_USB(port)     _port2addr_usb(port)
 
 static inline void *_port2addr(unsigned long port)
 {
         return (void *)(port | NONCACHE_OFFSET);
 }
 
+#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC)
+static inline void *__port2addr_ata(unsigned long port)
+{
+        static int      dummy_reg;
+
+        switch (port) {
+        case 0x1f0:     return (void *)(0x0c002000 | NONCACHE_OFFSET);
+        case 0x1f1:     return (void *)(0x0c012800 | NONCACHE_OFFSET);
+        case 0x1f2:     return (void *)(0x0c012002 | NONCACHE_OFFSET);
+        case 0x1f3:     return (void *)(0x0c012802 | NONCACHE_OFFSET);
+        case 0x1f4:     return (void *)(0x0c012004 | NONCACHE_OFFSET);
+        case 0x1f5:     return (void *)(0x0c012804 | NONCACHE_OFFSET);
+        case 0x1f6:     return (void *)(0x0c012006 | NONCACHE_OFFSET);
+        case 0x1f7:     return (void *)(0x0c012806 | NONCACHE_OFFSET);
+        case 0x3f6:     return (void *)(0x0c01200e | NONCACHE_OFFSET);
+        default:        return (void *)&dummy_reg;
+        }
+}
+#endif
+
 /*
  * OPSPUT-LAN is located in the extended bus space
  * from 0x10000000 to 0x13ffffff on physical address.
@@ -97,6 +117,12 @@ unsigned char _inb(unsigned long port)
 {
         if (port >= LAN_IOSTART && port < LAN_IOEND)
                 return _ne_inb(PORT2ADDR_NE(port));
+
+#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC)
+        else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) {
+                return *(volatile unsigned char *)__port2addr_ata(port);
+        }
+#endif
 #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
         else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
                 unsigned char b;
@@ -112,6 +138,11 @@ unsigned short _inw(unsigned long port)
 {
         if (port >= LAN_IOSTART && port < LAN_IOEND)
                 return _ne_inw(PORT2ADDR_NE(port));
+#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC)
+        else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) {
+                return *(volatile unsigned short *)__port2addr_ata(port);
+        }
+#endif
 #if defined(CONFIG_USB)
         else if(port >= 0x340 && port < 0x3a0)
                 return *(volatile unsigned short *)PORT2ADDR_USB(port);
@@ -164,6 +195,11 @@ void _outb(unsigned char b, unsigned long port)
         if (port >= LAN_IOSTART && port < LAN_IOEND)
                 _ne_outb(b, PORT2ADDR_NE(port));
         else
+#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC)
+        if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) {
+                *(volatile unsigned char *)__port2addr_ata(port) = b;
+        } else
+#endif
 #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
         if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
                 pcc_iowrite_byte(0, port, &b, sizeof(b), 1, 0);
@@ -177,6 +213,11 @@ void _outw(unsigned short w, unsigned long port)
         if (port >= LAN_IOSTART && port < LAN_IOEND)
                 _ne_outw(w, PORT2ADDR_NE(port));
         else
+#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC)
+        if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) {
+                *(volatile unsigned short *)__port2addr_ata(port) = w;
+        } else
+#endif
 #if defined(CONFIG_USB)
         if(port >= 0x340 && port < 0x3a0)
                 *(volatile unsigned short *)PORT2ADDR_USB(port) = w;
@@ -222,6 +263,14 @@ void _insb(unsigned int port, void *addr, unsigned long count)
 {
         if (port >= LAN_IOSTART && port < LAN_IOEND)
                 _ne_insb(PORT2ADDR_NE(port), addr, count);
+#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC)
+        else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) {
+                unsigned char *buf = addr;
+                unsigned char *portp = __port2addr_ata(port);
+                while (count--)
+                        *buf++ = *(volatile unsigned char *)portp;
+        }
+#endif
 #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
         else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
                 pcc_ioread_byte(0, port, (void *)addr, sizeof(unsigned char),
@@ -254,6 +303,12 @@ void _insw(unsigned int port, void *addr, unsigned long count)
                 pcc_ioread_word(9, port, (void *)addr, sizeof(unsigned short),
                                 count, 1);
 #endif
+#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC)
+        } else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) {
+                portp = __port2addr_ata(port);
+                while (count--)
+                        *buf++ = *(volatile unsigned short *)portp;
+#endif
         } else {
                 portp = PORT2ADDR(port);
                 while (count--)
@@ -280,6 +335,12 @@ void _outsb(unsigned int port, const void *addr, unsigned long count)
                 portp = PORT2ADDR_NE(port);
                 while (count--)
                         _ne_outb(*buf++, portp);
+#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC)
+        } else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) {
+                portp = __port2addr_ata(port);
+                while (count--)
+                        *(volatile unsigned char *)portp = *buf++;
+#endif
 #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
         } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
                 pcc_iowrite_byte(0, port, (void *)addr, sizeof(unsigned char),
@@ -305,6 +366,12 @@ void _outsw(unsigned int port, const void *addr, unsigned long count)
                 portp = PORT2ADDR_NE(port);
                 while (count--)
                         *(volatile unsigned short *)portp = *buf++;
+#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC)
+        } else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) {
+                portp = __port2addr_ata(port);
+                while (count--)
+                        *(volatile unsigned short *)portp = *buf++;
+#endif
 #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
         } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
                 pcc_iowrite_word(9, port, (void *)addr, sizeof(unsigned short),
diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c
index 0e7778be33cc..936205f7aba0 100644
--- a/arch/m32r/kernel/setup.c
+++ b/arch/m32r/kernel/setup.c
@@ -196,9 +196,7 @@ static unsigned long __init setup_memory(void)
         if (LOADER_TYPE && INITRD_START) {
                 if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) {
                         reserve_bootmem(INITRD_START, INITRD_SIZE);
-                        initrd_start = INITRD_START ?
-                                INITRD_START + PAGE_OFFSET : 0;
-
+                        initrd_start = INITRD_START + PAGE_OFFSET;
                         initrd_end = initrd_start + INITRD_SIZE;
                         printk("initrd:start[%08lx],size[%08lx]\n",
                                 initrd_start, INITRD_SIZE);
diff --git a/arch/m32r/kernel/setup_opsput.c b/arch/m32r/kernel/setup_opsput.c
index 61d3b01cbe07..62d6b71de45f 100644
--- a/arch/m32r/kernel/setup_opsput.c
+++ b/arch/m32r/kernel/setup_opsput.c
@@ -218,13 +218,13 @@ static void shutdown_opsput_lanpld_irq(unsigned int irq)
 
 static struct hw_interrupt_type opsput_lanpld_irq_type =
 {
-        "OPSPUT-PLD-LAN-IRQ",
-        startup_opsput_lanpld_irq,
-        shutdown_opsput_lanpld_irq,
-        enable_opsput_lanpld_irq,
-        disable_opsput_lanpld_irq,
-        mask_and_ack_opsput_lanpld,
-        end_opsput_lanpld_irq
+        .typename = "OPSPUT-PLD-LAN-IRQ",
+        .startup = startup_opsput_lanpld_irq,
+        .shutdown = shutdown_opsput_lanpld_irq,
+        .enable = enable_opsput_lanpld_irq,
+        .disable = disable_opsput_lanpld_irq,
+        .ack = mask_and_ack_opsput_lanpld,
+        .end = end_opsput_lanpld_irq
 };
 
 /*
@@ -374,7 +374,6 @@ void __init init_IRQ(void)
         disable_opsput_pld_irq(PLD_IRQ_SIO0_SND);
 #endif  /* CONFIG_SERIAL_M32R_PLDSIO */
 
-#if defined(CONFIG_M32R_CFC)
         /* INT#1: CFC IREQ on PLD */
         irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED;
         irq_desc[PLD_IRQ_CFIREQ].chip = &opsput_pld_irq_type;
@@ -398,8 +397,6 @@ void __init init_IRQ(void)
         irq_desc[PLD_IRQ_CFC_EJECT].depth = 1;  /* disable nested irq */
         pld_icu_data[irq2pldirq(PLD_IRQ_CFC_EJECT)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD02;    /* 'H' edge sense */
         disable_opsput_pld_irq(PLD_IRQ_CFC_EJECT);
-#endif /* CONFIG_M32R_CFC */
-
 
         /*
          * INT0# is used for LAN, DIO
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c
index b60cea4aebaa..092ea86bb079 100644
--- a/arch/m32r/kernel/signal.c
+++ b/arch/m32r/kernel/signal.c
@@ -21,7 +21,7 @@
 #include <linux/unistd.h>
 #include <linux/stddef.h>
 #include <linux/personality.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <asm/cacheflush.h>
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c
index fa7865609495..48d376f47e1a 100644
--- a/arch/m32r/kernel/smpboot.c
+++ b/arch/m32r/kernel/smpboot.c
@@ -351,7 +351,7 @@ static void __init do_boot_cpu(int phys_id)
         }
 }
 
-int __devinit __cpu_up(unsigned int cpu_id)
+int __cpuinit __cpu_up(unsigned int cpu_id)
 {
         int timeout;
 
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/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c
index abb34ccd5986..c7efdb0aefc5 100644
--- a/arch/m32r/mm/discontig.c
+++ b/arch/m32r/mm/discontig.c
@@ -105,9 +105,7 @@ unsigned long __init setup_memory(void)
                 if (INITRD_START + INITRD_SIZE <= PFN_PHYS(max_low_pfn)) {
                         reserve_bootmem_node(NODE_DATA(0), INITRD_START,
                                 INITRD_SIZE);
-                        initrd_start = INITRD_START ?
-                                INITRD_START + PAGE_OFFSET : 0;
-
+                        initrd_start = INITRD_START + PAGE_OFFSET;
                         initrd_end = initrd_start + INITRD_SIZE;
                         printk("initrd:start[%08lx],size[%08lx]\n",
                                 initrd_start, INITRD_SIZE);
diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c
index 8d5f551b5754..9b9feb0f1610 100644
--- a/arch/m32r/mm/fault.c
+++ b/arch/m32r/mm/fault.c
@@ -173,7 +173,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
                 goto good_area;
         if (!(vma->vm_flags & VM_GROWSDOWN))
                 goto bad_area;
-#if 0
+
         if (error_code & ACE_USERMODE) {
                 /*
                  * accessing the stack below "spu" is always a bug.
@@ -184,7 +184,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
                 if (address + 4 < regs->spu)
                         goto bad_area;
         }
-#endif
+
         if (expand_stack(vma, address))
                 goto bad_area;
 /*
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 7bc14461a6ac..70a577c89c7c 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -17,6 +17,14 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
         bool
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config GENERIC_HWEIGHT
         bool
         default y
diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c
index de1304c91112..fa015d801617 100644
--- a/arch/m68k/amiga/chipram.c
+++ b/arch/m68k/amiga/chipram.c
@@ -52,10 +52,9 @@ void *amiga_chip_alloc(unsigned long size, const char *name)
 #ifdef DEBUG
     printk("amiga_chip_alloc: allocate %ld bytes\n", size);
 #endif
-    res = kmalloc(sizeof(struct resource), GFP_KERNEL);
+    res = kzalloc(sizeof(struct resource), GFP_KERNEL);
     if (!res)
         return NULL;
-    memset(res, 0, sizeof(struct resource));
     res->name = name;
 
     if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX, PAGE_SIZE, NULL, NULL) < 0) {
diff --git a/arch/m68k/atari/hades-pci.c b/arch/m68k/atari/hades-pci.c
index 6ca57b6564da..bee2b1443e36 100644
--- a/arch/m68k/atari/hades-pci.c
+++ b/arch/m68k/atari/hades-pci.c
@@ -375,10 +375,9 @@ struct pci_bus_info * __init init_hades_pci(void)
          * Allocate memory for bus info structure.
          */
 
-        bus = kmalloc(sizeof(struct pci_bus_info), GFP_KERNEL);
+        bus = kzalloc(sizeof(struct pci_bus_info), GFP_KERNEL);
         if (!bus)
                 return NULL;
-        memset(bus, 0, sizeof(struct pci_bus_info));
 
         /*
          * Claim resources. The m68k has no separate I/O space, both
diff --git a/arch/m68k/atari/stdma.c b/arch/m68k/atari/stdma.c
index d64b5804e980..d01deb46ebbc 100644
--- a/arch/m68k/atari/stdma.c
+++ b/arch/m68k/atari/stdma.c
@@ -174,7 +174,7 @@ int stdma_islocked(void)
 void __init stdma_init(void)
 {
         stdma_isr = NULL;
-        request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW,
+        request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | SA_SHIRQ,
                     "ST-DMA: floppy/ACSI/IDE/Falcon-SCSI", stdma_int);
 }
 
diff --git a/arch/m68k/kernel/sun3-head.S b/arch/m68k/kernel/sun3-head.S
index bffd69a4a1ab..4b5f050204e8 100644
--- a/arch/m68k/kernel/sun3-head.S
+++ b/arch/m68k/kernel/sun3-head.S
@@ -67,16 +67,6 @@ ENTRY(_start)
 1:      lea     init_task,%curptr                       | get initial thread...
         lea     init_thread_union+THREAD_SIZE,%sp       | ...and its stack.
 
-/* copy bootinfo records from the loader to _end */
-        lea     _end, %a1
-        lea     BI_START, %a0
-        /* number of longs to copy */
-        movel   %a0@, %d0
-1:      addl    #4, %a0
-        movel   %a0@, %a1@
-        addl    #4, %a1
-        dbf     %d0, 1b
-
 /* Point MSP at an invalid page to trap if it's used. --m */
         movl    #(PAGESIZE),%d0
         movc    %d0,%msp
diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds
index 2550b4ae2732..8c7eccbfc982 100644
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@@ -8,7 +8,7 @@ ENTRY(_start)
 jiffies = jiffies_64 + 4;
 SECTIONS
 {
-  . = 0xE004000;
+  . = 0xE002000;
   _text = .;                    /* Text and read-only data */
   .text : {
         *(.head)
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/m68k/mm/fault.c b/arch/m68k/mm/fault.c
index 911f2ce3f53e..2adbeb16e1b8 100644
--- a/arch/m68k/mm/fault.c
+++ b/arch/m68k/mm/fault.c
@@ -99,7 +99,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
          * If we're in an interrupt or have no user
          * context, we must not take the fault..
          */
-        if (in_interrupt() || !mm)
+        if (in_atomic() || !mm)
                 goto no_context;
 
         down_read(&mm->mmap_sem);
diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c
index b54ef1726c55..46b7d6035aab 100644
--- a/arch/m68k/mm/kmap.c
+++ b/arch/m68k/mm/kmap.c
@@ -59,7 +59,7 @@ static struct vm_struct *get_io_area(unsigned long size)
         unsigned long addr;
         struct vm_struct **p, *tmp, *area;
 
-        area = (struct vm_struct *)kmalloc(sizeof(*area), GFP_KERNEL);
+        area = kmalloc(sizeof(*area), GFP_KERNEL);
         if (!area)
                 return NULL;
         addr = KMAP_START;
diff --git a/arch/m68k/mm/memory.c b/arch/m68k/mm/memory.c
index 0f88812822b1..13c0b4ad01eb 100644
--- a/arch/m68k/mm/memory.c
+++ b/arch/m68k/mm/memory.c
@@ -299,7 +299,7 @@ void cache_clear (unsigned long paddr, int len)
         mach_l2_flush(0);
 #endif
 }
-EXPORT_SYMBOL(cache_clear);     /* probably can be unexported */
+EXPORT_SYMBOL(cache_clear);
 
 
 /*
@@ -352,7 +352,7 @@ void cache_push (unsigned long paddr, int len)
         mach_l2_flush(1);
 #endif
 }
-EXPORT_SYMBOL(cache_push);      /* probably can be unexported */
+EXPORT_SYMBOL(cache_push);
 
 #ifndef CONFIG_SINGLE_MEMORY_CHUNK
 int mm_end_of_chunk (unsigned long addr, int len)
diff --git a/arch/m68k/mm/sun3mmu.c b/arch/m68k/mm/sun3mmu.c
index ac6640ade0b1..6a6513aa1ce8 100644
--- a/arch/m68k/mm/sun3mmu.c
+++ b/arch/m68k/mm/sun3mmu.c
@@ -49,7 +49,6 @@ void __init paging_init(void)
         unsigned long zones_size[MAX_NR_ZONES] = { 0, };
         unsigned long size;
 
-
 #ifdef TEST_VERIFY_AREA
         wp_works_ok = 0;
 #endif
@@ -94,7 +93,11 @@ void __init paging_init(void)
         /* memory sizing is a hack stolen from motorola.c..  hope it works for us */
         zones_size[ZONE_DMA] = ((unsigned long)high_memory - PAGE_OFFSET) >> PAGE_SHIFT;
 
-        free_area_init(zones_size);
+        /* I really wish I knew why the following change made things better...  -- Sam */
+/*      free_area_init(zones_size); */
+        free_area_init_node(0, NODE_DATA(0), zones_size,
+                            (__pa(PAGE_OFFSET) >> PAGE_SHIFT) + 1, NULL);
+
 
 }
 
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 6d920d4bdc3d..25993c2a8fbb 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -25,6 +25,14 @@ config RWSEM_XCHGADD_ALGORITHM
         bool
         default n
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config GENERIC_FIND_NEXT_BIT
         bool
         default y
@@ -173,7 +181,7 @@ config CLOCK_DIV
           On many SoC style CPUs the master CPU clock is also used to drive 
           on-chip peripherals. The clock that is distributed to these
           peripherals is sometimes a fixed ratio of the master clock
-          frequency. If so then set this to the divider ration of the
+          frequency. If so then set this to the divider ratio of the
           master clock to the peripheral clock. If not sure then select 1.
 
 config OLDMASK
@@ -192,7 +200,7 @@ config PILOT3
           Support for the Palm Pilot 1000/5000, Personal/Pro and PalmIII.
 
 config XCOPILOT_BUGS
-        bool "  (X)Copilot support"
+        bool "(X)Copilot support"
         depends on PILOT3
         help
           Support the bugs of Xcopilot.
@@ -216,20 +224,20 @@ config DRAGEN2
           Support for the DragenEngine II board.
 
 config DIRECT_IO_ACCESS
-        bool "  Allow user to access IO directly"
+        bool "Allow user to access IO directly"
         depends on (UCSIMM || UCDIMM || DRAGEN2)
         help
           Disable the CPU internal registers protection in user mode,
           to allow a user application to read/write them.
 
 config INIT_LCD
-        bool "  Initialize LCD"
+        bool "Initialize LCD"
         depends on (UCSIMM || UCDIMM || DRAGEN2)
         help
           Initialize the LCD controller of the 68x328 processor.
 
 config MEMORY_RESERVE
-        int "  Memory reservation (MiB)"
+        int "Memory reservation (MiB)"
         depends on (UCSIMM || UCDIMM)
         help
           Reserve certain memory regions on 68x328 based boards.
@@ -409,7 +417,7 @@ config MOD5272
           Support for the Netburner MOD-5272 board.
 
 config ROMFS_FROM_ROM
-        bool "  ROMFS image not RAM resident"
+        bool "ROMFS image not RAM resident"
         depends on (NETtel || SNAPGEAR)
         help
           The ROMfs filesystem will stay resident in the FLASH/ROM, not be
@@ -565,7 +573,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 +582,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/kernel/process.c b/arch/m68knommu/kernel/process.c
index c18a83306953..941955dc3b7c 100644
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
@@ -290,7 +290,7 @@ void dump(struct pt_regs *fp)
         unsigned char   *tp;
         int             i;
 
-        printk(KERN_EMERG "\nCURRENT PROCESS:\n\n");
+        printk(KERN_EMERG "\n" KERN_EMERG "CURRENT PROCESS:\n" KERN_EMERG "\n");
         printk(KERN_EMERG "COMM=%s PID=%d\n", current->comm, current->pid);
 
         if (current->mm) {
@@ -301,7 +301,8 @@ void dump(struct pt_regs *fp)
                         (int) current->mm->end_data,
                         (int) current->mm->end_data,
                         (int) current->mm->brk);
-                printk(KERN_EMERG "USER-STACK=%08x  KERNEL-STACK=%08x\n\n",
+                printk(KERN_EMERG "USER-STACK=%08x KERNEL-STACK=%08x\n"
+                        KERN_EMERG "\n",
                         (int) current->mm->start_stack,
                         (int)(((unsigned long) current) + THREAD_SIZE));
         }
@@ -312,36 +313,35 @@ void dump(struct pt_regs *fp)
                 fp->d0, fp->d1, fp->d2, fp->d3);
         printk(KERN_EMERG "d4: %08lx    d5: %08lx    a0: %08lx    a1: %08lx\n",
                 fp->d4, fp->d5, fp->a0, fp->a1);
-        printk(KERN_EMERG "\nUSP: %08x   TRAPFRAME: %08x\n", (unsigned int) rdusp(),
-                (unsigned int) fp);
+        printk(KERN_EMERG "\n" KERN_EMERG "USP: %08x   TRAPFRAME: %08x\n",
+                (unsigned int) rdusp(), (unsigned int) fp);
 
-        printk(KERN_EMERG "\nCODE:");
+        printk(KERN_EMERG "\n" KERN_EMERG "CODE:");
         tp = ((unsigned char *) fp->pc) - 0x20;
         for (sp = (unsigned long *) tp, i = 0; (i < 0x40);  i += 4) {
                 if ((i % 0x10) == 0)
-                        printk(KERN_EMERG "\n%08x: ", (int) (tp + i));
-                printk(KERN_EMERG "%08x ", (int) *sp++);
+                        printk("\n" KERN_EMERG "%08x: ", (int) (tp + i));
+                printk("%08x ", (int) *sp++);
         }
-        printk(KERN_EMERG "\n");
+        printk("\n" KERN_EMERG "\n");
 
-        printk(KERN_EMERG "\nKERNEL STACK:");
+        printk(KERN_EMERG "KERNEL STACK:");
         tp = ((unsigned char *) fp) - 0x40;
         for (sp = (unsigned long *) tp, i = 0; (i < 0xc0); i += 4) {
                 if ((i % 0x10) == 0)
-                        printk(KERN_EMERG "\n%08x: ", (int) (tp + i));
-                printk(KERN_EMERG "%08x ", (int) *sp++);
+                        printk("\n" KERN_EMERG "%08x: ", (int) (tp + i));
+                printk("%08x ", (int) *sp++);
         }
-        printk(KERN_EMERG "\n");
-        printk(KERN_EMERG "\n");
+        printk("\n" KERN_EMERG "\n");
 
-        printk(KERN_EMERG "\nUSER STACK:");
+        printk(KERN_EMERG "USER STACK:");
         tp = (unsigned char *) (rdusp() - 0x10);
         for (sp = (unsigned long *) tp, i = 0; (i < 0x80); i += 4) {
                 if ((i % 0x10) == 0)
-                        printk(KERN_EMERG "\n%08x: ", (int) (tp + i));
-                printk(KERN_EMERG "%08x ", (int) *sp++);
+                        printk("\n" KERN_EMERG "%08x: ", (int) (tp + i));
+                printk("%08x ", (int) *sp++);
         }
-        printk(KERN_EMERG "\n\n");
+        printk("\n" KERN_EMERG "\n");
 }
 
 /*
diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c
index 7b21959eaeae..9cf2e4d1fc77 100644
--- a/arch/m68knommu/kernel/setup.c
+++ b/arch/m68knommu/kernel/setup.c
@@ -36,10 +36,7 @@
 #include <asm/setup.h>
 #include <asm/irq.h>
 #include <asm/machdep.h>
-
-#ifdef CONFIG_BLK_DEV_INITRD
 #include <asm/pgtable.h>
-#endif
 
 unsigned long memory_start;
 unsigned long memory_end;
diff --git a/arch/m68knommu/kernel/sys_m68k.c b/arch/m68knommu/kernel/sys_m68k.c
index c3494b8447d1..3265b2d734db 100644
--- a/arch/m68knommu/kernel/sys_m68k.c
+++ b/arch/m68knommu/kernel/sys_m68k.c
@@ -137,7 +137,7 @@ asmlinkage int old_select(struct sel_arg_struct *arg)
 asmlinkage int sys_ipc (uint call, int first, int second,
                         int third, void *ptr, long fifth)
 {
-        int version;
+        int version, ret;
 
         version = call >> 16; /* hack for backward compatibility */
         call &= 0xffff;
@@ -190,6 +190,27 @@ asmlinkage int sys_ipc (uint call, int first, int second,
                 default:
                         return -EINVAL;
                 }
+        if (call <= SHMCTL)
+                switch (call) {
+                case SHMAT:
+                        switch (version) {
+                        default: {
+                                ulong raddr;
+                                ret = do_shmat (first, ptr, second, &raddr);
+                                if (ret)
+                                        return ret;
+                                return put_user (raddr, (ulong __user *) third);
+                        }
+                        }
+                case SHMDT:
+                        return sys_shmdt (ptr);
+                case SHMGET:
+                        return sys_shmget (first, second, third);
+                case SHMCTL:
+                        return sys_shmctl (first, second, ptr);
+                default:
+                        return -ENOSYS;
+                }
 
         return -EINVAL;
 }
diff --git a/arch/m68knommu/kernel/traps.c b/arch/m68knommu/kernel/traps.c
index 17649d2543ef..9129b3a5258b 100644
--- a/arch/m68knommu/kernel/traps.c
+++ b/arch/m68knommu/kernel/traps.c
@@ -127,11 +127,12 @@ void show_stack(struct task_struct *task, unsigned long *stack)
                 if (stack + 1 > endstack)
                         break;
                 if (i % 8 == 0)
-                        printk(KERN_EMERG "\n       ");
-                printk(KERN_EMERG " %08lx", *stack++);
+                        printk("\n" KERN_EMERG "       ");
+                printk(" %08lx", *stack++);
         }
+        printk("\n");
 
-        printk(KERN_EMERG "\nCall Trace:");
+        printk(KERN_EMERG "Call Trace:");
         i = 0;
         while (stack + 1 <= endstack) {
                 addr = *stack++;
@@ -146,12 +147,12 @@ void show_stack(struct task_struct *task, unsigned long *stack)
                 if (((addr >= (unsigned long) &_start) &&
                      (addr <= (unsigned long) &_etext))) {
                         if (i % 4 == 0)
-                                printk(KERN_EMERG "\n       ");
-                        printk(KERN_EMERG " [<%08lx>]", addr);
+                                printk("\n" KERN_EMERG "       ");
+                        printk(" [<%08lx>]", addr);
                         i++;
                 }
         }
-        printk(KERN_EMERG "\n");
+        printk("\n");
 }
 
 void bad_super_trap(struct frame *fp)
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index 58afa8be604e..2b2a10da64a4 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -60,6 +60,7 @@ SECTIONS {
 #endif
 
         .text : {
+                _text = .;
                 _stext = . ;
                 *(.text)
                 SCHED_TEXT
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/m68knommu/platform/5307/head.S b/arch/m68knommu/platform/5307/head.S
index f2edb6498cd9..b9aa0ca29bfb 100644
--- a/arch/m68knommu/platform/5307/head.S
+++ b/arch/m68knommu/platform/5307/head.S
@@ -64,6 +64,26 @@
         negl    %d0                     /* negate bits */
 .endm
 
+#elif defined(CONFIG_M520x)
+.macro GET_MEM_SIZE
+        clrl    %d0
+        movel   MCF_MBAR+MCFSIM_SDCS0, %d2 /* Get SDRAM chip select 0 config */
+        andl    #0x1f, %d2              /* Get only the chip select size */
+        beq     3f                      /* Check if it is enabled */
+        addql   #1, %d2                 /* Form exponent */
+        moveql  #1, %d0
+        lsll    %d2, %d0                /* 2 ^ exponent */
+3:
+        movel   MCF_MBAR+MCFSIM_SDCS1, %d2 /* Get SDRAM chip select 1 config */
+        andl    #0x1f, %d2              /* Get only the chip select size */
+        beq     4f                      /* Check if it is enabled */
+        addql   #1, %d2                 /* Form exponent */
+        moveql  #1, %d1
+        lsll    %d2, %d1                /* 2 ^ exponent */
+        addl    %d1, %d0                /* Total size of SDRAM in d0 */
+4:
+.endm
+
 #else
 #error "ERROR: I don't know how to probe your boards memory size?"
 #endif
diff --git a/arch/m68knommu/platform/5307/timers.c b/arch/m68knommu/platform/5307/timers.c
index 24781f009337..e5668af19789 100644
--- a/arch/m68knommu/platform/5307/timers.c
+++ b/arch/m68knommu/platform/5307/timers.c
@@ -3,7 +3,7 @@
 /*
  *      timers.c -- generic ColdFire hardware timer support.
  *
- *      Copyright (C) 1999-2003, Greg Ungerer (gerg@snapgear.com)
+ *      Copyright (C) 1999-2006, Greg Ungerer (gerg@snapgear.com)
  */
 
 /***************************************************************************/
@@ -44,6 +44,14 @@ unsigned int	mcf_timerlevel = 5;
 extern void mcf_settimericr(int timer, int level);
 extern int mcf_timerirqpending(int timer);
 
+#if defined(CONFIG_M532x)
+#define __raw_readtrr   __raw_readl
+#define __raw_writetrr  __raw_writel
+#else
+#define __raw_readtrr   __raw_readw
+#define __raw_writetrr  __raw_writew
+#endif
+
 /***************************************************************************/
 
 void coldfire_tick(void)
@@ -57,7 +65,7 @@ void coldfire_tick(void)
 void coldfire_timer_init(irqreturn_t (*handler)(int, void *, struct pt_regs *))
 {
         __raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR));
-        __raw_writew(((MCF_BUSCLK / 16) / HZ), TA(MCFTIMER_TRR));
+        __raw_writetrr(((MCF_BUSCLK / 16) / HZ), TA(MCFTIMER_TRR));
         __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |
                 MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR));
 
@@ -76,7 +84,7 @@ unsigned long coldfire_timer_offset(void)
         unsigned long trr, tcn, offset;
 
         tcn = __raw_readw(TA(MCFTIMER_TCN));
-        trr = __raw_readw(TA(MCFTIMER_TRR));
+        trr = __raw_readtrr(TA(MCFTIMER_TRR));
         offset = (tcn * (1000000 / HZ)) / trr;
 
         /* Check if we just wrapped the counters and maybe missed a tick */
@@ -120,7 +128,7 @@ void coldfire_profile_init(void)
         /* Set up TIMER 2 as high speed profile clock */
         __raw_writew(MCFTIMER_TMR_DISABLE, PA(MCFTIMER_TMR));
 
-        __raw_writew(((MCF_CLK / 16) / PROFILEHZ), PA(MCFTIMER_TRR));
+        __raw_writetrr(((MCF_CLK / 16) / PROFILEHZ), PA(MCFTIMER_TRR));
         __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |
                 MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, PA(MCFTIMER_TMR));
 
diff --git a/arch/m68knommu/platform/68360/config.c b/arch/m68knommu/platform/68360/config.c
index c5482e3622eb..1b36f6261764 100644
--- a/arch/m68knommu/platform/68360/config.c
+++ b/arch/m68knommu/platform/68360/config.c
@@ -114,7 +114,7 @@ void BSP_gettod (int *yearp, int *monp, int *dayp,
 {
 }
 
-int BSP_hwclk(int op, struct hwclk_time *t)
+int BSP_hwclk(int op, struct rtc_time *t)
 {
   if (!op) {
     /* read */
diff --git a/arch/m68knommu/platform/68360/head-ram.S b/arch/m68knommu/platform/68360/head-ram.S
index 2ea51479f13a..2ef06242398b 100644
--- a/arch/m68knommu/platform/68360/head-ram.S
+++ b/arch/m68knommu/platform/68360/head-ram.S
@@ -25,6 +25,7 @@
 .global _periph_base
 
 #define RAMEND                      (CONFIG_RAMBASE + CONFIG_RAMSIZE)
+#define ROMEND                      (CONFIG_ROMBASE + CONFIG_ROMSIZE)
 
 #define REGB                        0x1000
 #define PEPAR                       (_dprbase + REGB + 0x0016)
@@ -175,7 +176,7 @@ configure_chip_select_0:
         move.l  %d0, BR0
 
 configure_chip_select_1:
-        move.l  #__rom_end, %d0
+        move.l  #ROMEND, %d0
         subi.l  #__rom_start, %d0
         subq.l  #0x01, %d0
         eori.l  #SIM_OR_MASK, %d0
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 1443024b1c7c..fd2ff0698a85 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -16,6 +16,7 @@ config MIPS_MTX1
         bool "4G Systems MTX-1 board"
         select DMA_NONCOHERENT
         select HW_HAS_PCI
+        select RESOURCES_64BIT if PCI
         select SOC_AU1500
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -32,6 +33,7 @@ config MIPS_PB1000
         select SOC_AU1000
         select DMA_NONCOHERENT
         select HW_HAS_PCI
+        select RESOURCES_64BIT if PCI
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -41,6 +43,7 @@ config MIPS_PB1100
         select SOC_AU1100
         select DMA_NONCOHERENT
         select HW_HAS_PCI
+        select RESOURCES_64BIT if PCI
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -50,6 +53,7 @@ config MIPS_PB1500
         select SOC_AU1500
         select DMA_NONCOHERENT
         select HW_HAS_PCI
+        select RESOURCES_64BIT if PCI
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -59,6 +63,7 @@ config MIPS_PB1550
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select MIPS_DISABLE_OBSOLETE_IDE
+        select RESOURCES_64BIT if PCI
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -67,6 +72,7 @@ config MIPS_PB1200
         select SOC_AU1200
         select DMA_NONCOHERENT
         select MIPS_DISABLE_OBSOLETE_IDE
+        select RESOURCES_64BIT if PCI
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -75,6 +81,7 @@ config MIPS_DB1000
         select SOC_AU1000
         select DMA_NONCOHERENT
         select HW_HAS_PCI
+        select RESOURCES_64BIT if PCI
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -91,6 +98,7 @@ config MIPS_DB1500
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select MIPS_DISABLE_OBSOLETE_IDE
+        select RESOURCES_64BIT if PCI
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -101,6 +109,7 @@ config MIPS_DB1550
         select HW_HAS_PCI
         select DMA_NONCOHERENT
         select MIPS_DISABLE_OBSOLETE_IDE
+        select RESOURCES_64BIT if PCI
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -156,6 +165,7 @@ config MIPS_COBALT
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
         select SYS_SUPPORTS_LITTLE_ENDIAN
+        select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config MACH_DECSTATION
         bool "DECstations"
@@ -216,6 +226,7 @@ config MACH_JAZZ
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
         select SYS_SUPPORTS_100HZ
+        select GENERIC_HARDIRQS_NO__DO_IRQ
         help
          This a family of machines based on the MIPS R4030 chipset which was
          used by several vendors to build RISC/os and Windows NT workstations.
@@ -233,6 +244,7 @@ config LASAT
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
         select SYS_SUPPORTS_LITTLE_ENDIAN
+        select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config MIPS_ATLAS
         bool "MIPS Atlas board"
@@ -256,6 +268,7 @@ config MIPS_ATLAS
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL
+        select GENERIC_HARDIRQS_NO__DO_IRQ
         help
           This enables support for the MIPS Technologies Atlas evaluation
           board.
@@ -266,8 +279,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
@@ -410,6 +423,7 @@ config MOMENCO_OCELOT_C
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
+        select GENERIC_HARDIRQS_NO__DO_IRQ
         help
           The Ocelot is a MIPS-based Single Board Computer (SBC) made by
           Momentum Computer <http://www.momenco.com/>.
@@ -447,6 +461,11 @@ config PNX8550_JBS
         select PNX8550
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
+config PNX8550_STB810
+        bool "Support for Philips PNX8550 based STB810 board"
+        select PNX8550
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+
 config DDB5477
         bool "NEC DDB Vrc-5477"
         select DDB5XXX_COMMON
@@ -470,6 +489,7 @@ config MACH_VR41XX
         select SYS_HAS_CPU_VR41XX
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+        select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config PMC_YOSEMITE
         bool "PMC-Sierra Yosemite eval board"
@@ -503,6 +523,7 @@ config QEMU
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select ARCH_SPARSEMEM_ENABLE
+        select GENERIC_HARDIRQS_NO__DO_IRQ
         help
           Qemu is a software emulator which among other architectures also
           can simulate a MIPS32 4Kc system.  This patch adds support for the
@@ -534,7 +555,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
@@ -560,6 +581,7 @@ config SGI_IP27
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_NUMA
         select SYS_SUPPORTS_SMP
+        select GENERIC_HARDIRQS_NO__DO_IRQ
         help
           This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics
           workstations.  To compile a Linux kernel that runs on these, say Y
@@ -688,8 +710,8 @@ config SIBYTE_CRHONE
         select SYS_SUPPORTS_HIGHMEM
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
-config SNI_RM200_PCI
-        bool "SNI RM200 PCI"
+config SNI_RM
+        bool "SNI RM200/300/400"
         select ARC if CPU_LITTLE_ENDIAN
         select ARC32 if CPU_LITTLE_ENDIAN
         select ARCH_MAY_HAVE_PC_FDC
@@ -712,8 +734,8 @@ config SNI_RM200_PCI
         select SYS_SUPPORTS_HIGHMEM
         select SYS_SUPPORTS_LITTLE_ENDIAN
         help
-          The SNI RM200 PCI was a MIPS-based platform manufactured by Siemens
-          Nixdorf Informationssysteme (SNI), parent company of Pyramid
+          The SNI RM200/300/400 are MIPS-based machines manufactured by
+          Siemens Nixdorf Informationssysteme (SNI), parent company of Pyramid
           Technology and now in turn merged with Fujitsu.  Say Y here to
           support this machine type.
 
@@ -741,6 +763,7 @@ config TOSHIBA_RBTX4927
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
         select TOSHIBA_BOARDS
+        select GENERIC_HARDIRQS_NO__DO_IRQ
         help
           This Toshiba board is based on the TX4927 processor. Say Y here to
           support this machine type
@@ -760,12 +783,30 @@ config TOSHIBA_RBTX4938
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_SUPPORTS_BIG_ENDIAN
         select TOSHIBA_BOARDS
+        select GENERIC_HARDIRQS_NO__DO_IRQ
         help
           This Toshiba board is based on the TX4938 processor. Say Y here to
           support this machine type
 
 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"
@@ -789,6 +830,14 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
         bool
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config GENERIC_FIND_NEXT_BIT
         bool
         default y
@@ -809,6 +858,10 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
         bool
         default y
 
+config GENERIC_HARDIRQS_NO__DO_IRQ
+        bool
+        default n
+
 #
 # Select some configuration options automatically based on user selections.
 #
@@ -864,8 +917,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 +930,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.
 
@@ -967,6 +1023,7 @@ config SOC_PNX8550
         select HW_HAS_PCI
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_32BIT_KERNEL
+        select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config SWAP_IO_SPACE
         bool
@@ -1024,16 +1081,16 @@ config HAVE_STD_PC_SERIAL_PORT
 
 config ARC_CONSOLE
         bool "ARC console support"
-        depends on SGI_IP22 || SNI_RM200_PCI
+        depends on SGI_IP22 || SNI_RM
 
 config ARC_MEMORY
         bool
-        depends on MACH_JAZZ || SNI_RM200_PCI || SGI_IP32
+        depends on MACH_JAZZ || SNI_RM || SGI_IP32
         default y
 
 config ARC_PROMLIB
         bool
-        depends on MACH_JAZZ || SNI_RM200_PCI || SGI_IP22 || SGI_IP32
+        depends on MACH_JAZZ || SNI_RM || SGI_IP22 || SGI_IP32
         default y
 
 config ARC64
@@ -1248,6 +1305,7 @@ config CPU_RM9000
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
         select CPU_SUPPORTS_HIGHMEM
+        select WEAK_ORDERING
 
 config CPU_SB1
         bool "SB1"
@@ -1256,6 +1314,7 @@ config CPU_SB1
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
         select CPU_SUPPORTS_HIGHMEM
+        select WEAK_ORDERING
 
 endchoice
 
@@ -1316,6 +1375,8 @@ config SYS_HAS_CPU_RM9000
 config SYS_HAS_CPU_SB1
         bool
 
+config WEAK_ORDERING
+        bool
 endmenu
 
 #
@@ -1835,13 +1896,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.
@@ -1922,6 +1981,11 @@ config COMPAT
         depends on MIPS32_COMPAT
         default y
 
+config SYSVIPC_COMPAT
+        bool
+        depends on COMPAT && SYSVIPC
+        default y
+
 config MIPS32_O32
         bool "Kernel support for o32 binaries"
         depends on MIPS32_COMPAT
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index d580d46f967b..d1b026a0337d 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
 
@@ -465,6 +463,11 @@ libs-$(CONFIG_PNX8550_JBS)	+= arch/mips/philips/pnx8550/jbs/
 #cflags-$(CONFIG_PNX8550_JBS)   += -Iinclude/asm-mips/mach-pnx8550
 load-$(CONFIG_PNX8550_JBS)      += 0xffffffff80060000
 
+# Philips PNX8550 STB810 board
+#
+libs-$(CONFIG_PNX8550_STB810)   += arch/mips/philips/pnx8550/stb810/
+load-$(CONFIG_PNX8550_STB810)   += 0xffffffff80060000
+
 # NEC EMMA2RH boards
 #
 core-$(CONFIG_EMMA2RH)          += arch/mips/emma2rh/common/
@@ -571,11 +574,11 @@ libs-$(CONFIG_SIBYTE_BIGSUR)	+= arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_BIGSUR)    := 0xffffffff80100000
 
 #
-# SNI RM200 PCI
+# SNI RM
 #
-core-$(CONFIG_SNI_RM200_PCI)    += arch/mips/sni/
-cflags-$(CONFIG_SNI_RM200_PCI)  += -Iinclude/asm-mips/mach-rm200
-load-$(CONFIG_SNI_RM200_PCI)    += 0xffffffff80600000
+core-$(CONFIG_SNI_RM)           += arch/mips/sni/
+cflags-$(CONFIG_SNI_RM)         += -Iinclude/asm-mips/mach-rm
+load-$(CONFIG_SNI_RM)           += 0xffffffff80600000
 
 #
 # Toshiba JMR-TX3927 board
@@ -697,7 +700,7 @@ ifdef CONFIG_QEMU
 all:    vmlinux.bin
 endif
 
-ifdef CONFIG_SNI_RM200_PCI
+ifdef CONFIG_SNI_RM
 all:    vmlinux.ecoff
 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/common/pci.c b/arch/mips/au1000/common/pci.c
index da591f674893..9f8ce08e173b 100644
--- a/arch/mips/au1000/common/pci.c
+++ b/arch/mips/au1000/common/pci.c
@@ -39,15 +39,15 @@
 
 /* TBD */
 static struct resource pci_io_resource = {
-        .start  = PCI_IO_START,
-        .end    = PCI_IO_END,
+        .start  = (resource_size_t)PCI_IO_START,
+        .end    = (resource_size_t)PCI_IO_END,
         .name   = "PCI IO space",
         .flags  = IORESOURCE_IO
 };
 
 static struct resource pci_mem_resource = {
-        .start  = PCI_MEM_START,
-        .end    = PCI_MEM_END,
+        .start  = (resource_size_t)PCI_MEM_START,
+        .end    = (resource_size_t)PCI_MEM_END,
         .name   = "PCI memory space",
         .flags  = IORESOURCE_MEM
 };
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/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig
index 35931bedc3df..ac1891687520 100644
--- a/arch/mips/configs/atlas_defconfig
+++ b/arch/mips/configs/atlas_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS_ATLAS=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index ba3bf733d27d..9554257c6f3a 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -57,7 +57,7 @@ CONFIG_SIBYTE_BIGSUR=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig
index e5358121d2da..49590d443712 100644
--- a/arch/mips/configs/capcella_defconfig
+++ b/arch/mips/configs/capcella_defconfig
@@ -59,7 +59,7 @@ CONFIG_MACH_VR41XX=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig
index adf1e8c98c65..0607fc239087 100644
--- a/arch/mips/configs/cobalt_defconfig
+++ b/arch/mips/configs/cobalt_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS_COBALT=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig
index 4fd29ffdfb8d..1a57b3375483 100644
--- a/arch/mips/configs/db1000_defconfig
+++ b/arch/mips/configs/db1000_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS_DB1000=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig
index 025b960ba990..0055ec41f207 100644
--- a/arch/mips/configs/db1100_defconfig
+++ b/arch/mips/configs/db1100_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS_DB1100=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig
index 80c9dd98f897..c41823b81be0 100644
--- a/arch/mips/configs/db1200_defconfig
+++ b/arch/mips/configs/db1200_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS_DB1200=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig
index 6caa90b0e176..7d6d92187880 100644
--- a/arch/mips/configs/db1500_defconfig
+++ b/arch/mips/configs/db1500_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS_DB1500=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig
index c6cae86c6ab7..c681c91763aa 100644
--- a/arch/mips/configs/db1550_defconfig
+++ b/arch/mips/configs/db1550_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS_DB1550=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig
index 72f24001c99e..dd4bb0080211 100644
--- a/arch/mips/configs/ddb5477_defconfig
+++ b/arch/mips/configs/ddb5477_defconfig
@@ -59,7 +59,7 @@ CONFIG_DDB5477=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig
index fe1387eb83c9..8a31ce4be12c 100644
--- a/arch/mips/configs/decstation_defconfig
+++ b/arch/mips/configs/decstation_defconfig
@@ -59,7 +59,7 @@ CONFIG_MACH_DECSTATION=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig
index 6133c28beb8c..6fa4f914f6e4 100644
--- a/arch/mips/configs/e55_defconfig
+++ b/arch/mips/configs/e55_defconfig
@@ -59,7 +59,7 @@ CONFIG_MACH_VR41XX=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/emma2rh_defconfig b/arch/mips/configs/emma2rh_defconfig
index a484b7d396fc..4c9d0405a5df 100644
--- a/arch/mips/configs/emma2rh_defconfig
+++ b/arch/mips/configs/emma2rh_defconfig
@@ -59,7 +59,7 @@ CONFIG_MARKEINS=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig
index 21bfcdebf8f5..d5b49735683b 100644
--- a/arch/mips/configs/ev64120_defconfig
+++ b/arch/mips/configs/ev64120_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS_EV64120=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/excite_defconfig b/arch/mips/configs/excite_defconfig
index 1a5b06cfb4d6..697140c6562f 100644
--- a/arch/mips/configs/excite_defconfig
+++ b/arch/mips/configs/excite_defconfig
@@ -60,7 +60,7 @@ CONFIG_BASLER_EXCITE=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index 21d53e0c9ee8..f9812d1e4579 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -59,7 +59,7 @@ CONFIG_SGI_IP22=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index e3e94c7e5ee1..96090f28373b 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -59,7 +59,7 @@ CONFIG_SGI_IP27=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index b4ab2bea9723..61e069a0f1aa 100644
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -59,7 +59,7 @@ CONFIG_SGI_IP32=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig
index 9d4d17ace123..88966666f4c6 100644
--- a/arch/mips/configs/jaguar-atx_defconfig
+++ b/arch/mips/configs/jaguar-atx_defconfig
@@ -59,7 +59,7 @@ CONFIG_MOMENCO_JAGUAR_ATX=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/jazz_defconfig b/arch/mips/configs/jazz_defconfig
index 382083ebea0a..835764d834f7 100644
--- a/arch/mips/configs/jazz_defconfig
+++ b/arch/mips/configs/jazz_defconfig
@@ -57,7 +57,7 @@ CONFIG_MACH_JAZZ=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig
index d03746667a96..50fd9557e646 100644
--- a/arch/mips/configs/jmr3927_defconfig
+++ b/arch/mips/configs/jmr3927_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 CONFIG_TOSHIBA_JMR3927=y
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig
index 1db8249b4c0f..05f539f84f58 100644
--- a/arch/mips/configs/lasat200_defconfig
+++ b/arch/mips/configs/lasat200_defconfig
@@ -59,7 +59,7 @@ CONFIG_LASAT=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index 101e80347dce..96e941084c04 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -57,7 +57,7 @@ CONFIG_MIPS_MALTA=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
@@ -644,7 +644,85 @@ CONFIG_CONNECTOR=m
 #
 # Memory Technology Devices (MTD)
 #
-# CONFIG_MTD is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0x0
+CONFIG_MTD_PHYSMAP_LEN=0x0
+CONFIG_MTD_PHYSMAP_BANKWIDTH=0
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
 
 #
 # Parallel port support
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig
index a3cbd23bf217..03efcfd0503b 100644
--- a/arch/mips/configs/mipssim_defconfig
+++ b/arch/mips/configs/mipssim_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS_SIM=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig
index 6570b47426ce..e4221aafbc4c 100644
--- a/arch/mips/configs/mpc30x_defconfig
+++ b/arch/mips/configs/mpc30x_defconfig
@@ -59,7 +59,7 @@ CONFIG_MACH_VR41XX=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig
index 440d65f93a94..32b1afdd1c20 100644
--- a/arch/mips/configs/ocelot_3_defconfig
+++ b/arch/mips/configs/ocelot_3_defconfig
@@ -59,7 +59,7 @@ CONFIG_MOMENCO_OCELOT_3=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig
index c2c7ae77da3e..ebe75c1c71af 100644
--- a/arch/mips/configs/ocelot_c_defconfig
+++ b/arch/mips/configs/ocelot_c_defconfig
@@ -59,7 +59,7 @@ CONFIG_MOMENCO_OCELOT_C=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig
index 67efe270e0cc..5a9603c12902 100644
--- a/arch/mips/configs/ocelot_defconfig
+++ b/arch/mips/configs/ocelot_defconfig
@@ -59,7 +59,7 @@ CONFIG_MOMENCO_OCELOT=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig
index a10f34de5f7e..46a942c253cf 100644
--- a/arch/mips/configs/ocelot_g_defconfig
+++ b/arch/mips/configs/ocelot_g_defconfig
@@ -59,7 +59,7 @@ CONFIG_MOMENCO_OCELOT_G=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig
index 9e672f63a0aa..7d3c688181d5 100644
--- a/arch/mips/configs/pb1100_defconfig
+++ b/arch/mips/configs/pb1100_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS_PB1100=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig
index d0c0f4af1bff..a77805af0819 100644
--- a/arch/mips/configs/pb1500_defconfig
+++ b/arch/mips/configs/pb1500_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS_PB1500=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig
index 3db7427d1b55..8318d74d6adb 100644
--- a/arch/mips/configs/pb1550_defconfig
+++ b/arch/mips/configs/pb1550_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS_PB1550=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig
index 280a8001eacf..fcb8fea3052c 100644
--- a/arch/mips/configs/pnx8550-jbs_defconfig
+++ b/arch/mips/configs/pnx8550-jbs_defconfig
@@ -57,7 +57,7 @@ CONFIG_PNX8550_JBS=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/pnx8550-stb810_defconfig b/arch/mips/configs/pnx8550-stb810_defconfig
new file mode 100644
index 000000000000..f38a2c123037
--- /dev/null
+++ b/arch/mips/configs/pnx8550-stb810_defconfig
@@ -0,0 +1,1229 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.19
+# Thu Dec  7 16:35:12 2006
+#
+CONFIG_MIPS=y
+
+#
+# Machine selection
+#
+# CONFIG_MIPS_MTX1 is not set
+# CONFIG_MIPS_BOSPORUS is not set
+# CONFIG_MIPS_PB1000 is not set
+# CONFIG_MIPS_PB1100 is not set
+# CONFIG_MIPS_PB1500 is not set
+# CONFIG_MIPS_PB1550 is not set
+# CONFIG_MIPS_PB1200 is not set
+# CONFIG_MIPS_DB1000 is not set
+# CONFIG_MIPS_DB1100 is not set
+# CONFIG_MIPS_DB1500 is not set
+# CONFIG_MIPS_DB1550 is not set
+# CONFIG_MIPS_DB1200 is not set
+# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_BASLER_EXCITE is not set
+# CONFIG_MIPS_COBALT is not set
+# CONFIG_MACH_DECSTATION is not set
+# CONFIG_MIPS_EV64120 is not set
+# CONFIG_MACH_JAZZ is not set
+# CONFIG_LASAT is not set
+# CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MALTA is not set
+# CONFIG_MIPS_SEAD is not set
+# CONFIG_WR_PPMC is not set
+# CONFIG_MIPS_SIM is not set
+# CONFIG_MOMENCO_JAGUAR_ATX is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_MOMENCO_OCELOT_3 is not set
+# CONFIG_MOMENCO_OCELOT_C is not set
+# CONFIG_MOMENCO_OCELOT_G is not set
+# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_PNX8550_V2PCI is not set
+# CONFIG_PNX8550_JBS is not set
+CONFIG_PNX8550_STB810=y
+# CONFIG_DDB5477 is not set
+# CONFIG_MACH_VR41XX is not set
+# CONFIG_PMC_YOSEMITE is not set
+# CONFIG_QEMU is not set
+# CONFIG_MARKEINS is not set
+# CONFIG_SGI_IP22 is not set
+# CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP32 is not set
+# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_SENTOSA is not set
+# CONFIG_SIBYTE_RHONE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_PTSWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_TOSHIBA_JMR3927 is not set
+# CONFIG_TOSHIBA_RBTX4927 is not set
+# CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_KEXEC is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_DMA_NONCOHERENT=y
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
+CONFIG_PNX8550=y
+CONFIG_SOC_PNX8550=y
+CONFIG_MIPS_L1_CACHE_SHIFT=5
+
+#
+# CPU selection
+#
+CONFIG_CPU_MIPS32_R1=y
+# CONFIG_CPU_MIPS32_R2 is not set
+# CONFIG_CPU_MIPS64_R1 is not set
+# CONFIG_CPU_MIPS64_R2 is not set
+# CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_TX39XX is not set
+# CONFIG_CPU_VR41XX is not set
+# CONFIG_CPU_R4300 is not set
+# CONFIG_CPU_R4X00 is not set
+# CONFIG_CPU_TX49XX is not set
+# CONFIG_CPU_R5000 is not set
+# CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R6000 is not set
+# CONFIG_CPU_NEVADA is not set
+# CONFIG_CPU_R8000 is not set
+# CONFIG_CPU_R10000 is not set
+# CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_RM9000 is not set
+# CONFIG_CPU_SB1 is not set
+CONFIG_SYS_HAS_CPU_MIPS32_R1=y
+CONFIG_CPU_MIPS32=y
+CONFIG_CPU_MIPSR1=y
+CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
+CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
+
+#
+# Kernel type
+#
+CONFIG_32BIT=y
+# CONFIG_64BIT is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_CPU_HAS_PREFETCH=y
+CONFIG_MIPS_MT_DISABLED=y
+# CONFIG_MIPS_MT_SMP is not set
+# CONFIG_MIPS_MT_SMTC is not set
+# CONFIG_MIPS_VPE_LOADER is not set
+# CONFIG_64BIT_PHYS_ADDR is not set
+CONFIG_CPU_HAS_LLSC=y
+CONFIG_CPU_HAS_SYNC=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_CPU_SUPPORTS_HIGHMEM=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+# CONFIG_HZ_48 is not set
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_128 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_256 is not set
+# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_1024 is not set
+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
+CONFIG_HZ=250
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+# CONFIG_HOTPLUG is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODULE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# Bus options (PCI, PCMCIA, EISA, ISA, TC)
+#
+CONFIG_HW_HAS_PCI=y
+CONFIG_PCI=y
+# CONFIG_PCI_MULTITHREAD_PROBE is not set
+# CONFIG_PCI_DEBUG is not set
+CONFIG_MMU=y
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+
+#
+# PCI Hotplug Support
+#
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_TRAD_SIGNALS=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# Misc devices
+#
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_BLK_DEV_IDECD=m
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+CONFIG_BLK_DEV_IDESCSI=y
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_BLK_DEV_OFFBOARD=y
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+# CONFIG_IDEDMA_PCI_AUTO is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+CONFIG_BLK_DEV_HPT366=y
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+
+#
+# SCSI low-level drivers
+#
+CONFIG_ISCSI_TCP=m
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_DM9000 is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+CONFIG_NATSEMI=y
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_VIA_RHINE is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_I8042 is not set
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_PNX8XXX is not set
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_RTC is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_MULTITHREAD_PROBE is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_EHCI_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_DPCM=y
+CONFIG_USB_STORAGE_USBAT=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+
+#
+# Real Time Clock
+#
+# CONFIG_RTC_CLASS is not set
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=m
+# CONFIG_NFSD_V3 is not set
+# CONFIG_NFSD_TCP is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+CONFIG_DEBUG_SLAB=y
+# CONFIG_DEBUG_SLAB_LEAK is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FORCED_INLINING=y
+CONFIG_HEADERS_CHECK=y
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_CROSSCOMPILE=y
+CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_KGDB is not set
+# CONFIG_RUNTIME_DEBUG is not set
+# CONFIG_MIPS_UNCACHED is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_MANAGER=m
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=m
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+CONFIG_CRC_CCITT=m
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+CONFIG_LIBCRC32C=m
+CONFIG_PLIST=y
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig
index 64b9fbf44a64..5bc3248e50e4 100644
--- a/arch/mips/configs/pnx8550-v2pci_defconfig
+++ b/arch/mips/configs/pnx8550-v2pci_defconfig
@@ -57,7 +57,7 @@ CONFIG_PNX8550_V2PCI=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig
index 9b0dab822bd0..aa61f0f030a5 100644
--- a/arch/mips/configs/qemu_defconfig
+++ b/arch/mips/configs/qemu_defconfig
@@ -59,7 +59,7 @@ CONFIG_QEMU=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig
index dd0296036026..f9e8f41d17f2 100644
--- a/arch/mips/configs/rbhma4500_defconfig
+++ b/arch/mips/configs/rbhma4500_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 CONFIG_TOSHIBA_RBTX4938=y
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
index d8a498d64d62..496aa67b9f82 100644
--- a/arch/mips/configs/rm200_defconfig
+++ b/arch/mips/configs/rm200_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-CONFIG_SNI_RM200_PCI=y
+CONFIG_SNI_RM=y
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index 805a4fe450f5..e33c17200b39 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -59,7 +59,7 @@ CONFIG_SIBYTE_SWARM=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig
index 6fcb656d8d87..83fb932f9d4b 100644
--- a/arch/mips/configs/sead_defconfig
+++ b/arch/mips/configs/sead_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS_SEAD=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index dc312f19ada7..e9d4eae45bfa 100644
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -59,7 +59,7 @@ CONFIG_MACH_VR41XX=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig
index 85615d99b01a..c19597fb0c32 100644
--- a/arch/mips/configs/tb0229_defconfig
+++ b/arch/mips/configs/tb0229_defconfig
@@ -59,7 +59,7 @@ CONFIG_MACH_VR41XX=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig
index f7e8194809a1..97d94f96990f 100644
--- a/arch/mips/configs/tb0287_defconfig
+++ b/arch/mips/configs/tb0287_defconfig
@@ -57,7 +57,7 @@ CONFIG_MACH_VR41XX=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig
index 863f6a7cadfd..553734a47b62 100644
--- a/arch/mips/configs/workpad_defconfig
+++ b/arch/mips/configs/workpad_defconfig
@@ -59,7 +59,7 @@ CONFIG_MACH_VR41XX=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/wrppmc_defconfig b/arch/mips/configs/wrppmc_defconfig
index c10267d61cc9..d3dfb702bb7c 100644
--- a/arch/mips/configs/wrppmc_defconfig
+++ b/arch/mips/configs/wrppmc_defconfig
@@ -59,7 +59,7 @@ CONFIG_WR_PPMC=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig
index 4d3c1329f3cf..b9f74d6745ee 100644
--- a/arch/mips/configs/yosemite_defconfig
+++ b/arch/mips/configs/yosemite_defconfig
@@ -59,7 +59,7 @@ CONFIG_PMC_YOSEMITE=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
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..6d55e8aab668 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>
@@ -26,6 +25,7 @@
 #include <asm/cpu.h>
 #include <asm/irq_regs.h>
 #include <asm/processor.h>
+#include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/traps.h>
 
@@ -231,13 +231,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 +244,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..4c7cb4048d35 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,30 @@ 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,
-        .end = end_ioasic_irq,
+        .mask = mask_ioasic_irq,
+        .mask_ack = ack_ioasic_irq,
+        .unmask = unmask_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 +85,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 +101,11 @@ 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(i, &ioasic_dma_irq_type);
 
         ioasic_irq_base = base;
 }
diff --git a/arch/mips/dec/kn01-berr.c b/arch/mips/dec/kn01-berr.c
index f19b4617a0a6..d3b8002bf1e7 100644
--- a/arch/mips/dec/kn01-berr.c
+++ b/arch/mips/dec/kn01-berr.c
@@ -20,8 +20,10 @@
 #include <linux/types.h>
 
 #include <asm/inst.h>
+#include <asm/irq_regs.h>
 #include <asm/mipsregs.h>
 #include <asm/page.h>
+#include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/traps.h>
 #include <asm/uaccess.h>
diff --git a/arch/mips/dec/kn02-irq.c b/arch/mips/dec/kn02-irq.c
index 04a367a60a57..916e46b8ccd8 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,55 +51,18 @@ 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);
-}
-
 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,
-        .end = end_kn02_irq,
+        .mask = mask_kn02_irq,
+        .mask_ack = ack_kn02_irq,
+        .unmask = unmask_kn02_irq,
 };
 
 
@@ -109,22 +70,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/defconfig b/arch/mips/defconfig
index 21d53e0c9ee8..f9812d1e4579 100644
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -59,7 +59,7 @@ CONFIG_SGI_IP22=y
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
diff --git a/arch/mips/emma2rh/common/irq_emma2rh.c b/arch/mips/emma2rh/common/irq_emma2rh.c
index 197ed4c2ba04..8d880f0b06ec 100644
--- a/arch/mips/emma2rh/common/irq_emma2rh.c
+++ b/arch/mips/emma2rh/common/irq_emma2rh.c
@@ -56,49 +56,21 @@ 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)))
-                ll_emma2rh_irq_enable(irq - emma2rh_irq_base);
-}
-
 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,
-        .end = emma2rh_irq_end,
-        .set_affinity = NULL    /* no affinity stuff for UP */
+        .ack = emma2rh_irq_disable,
+        .mask = emma2rh_irq_disable,
+        .mask_ack = emma2rh_irq_disable,
+        .unmask = emma2rh_irq_enable,
 };
 
 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..2116d9be5fa9 100644
--- a/arch/mips/emma2rh/markeins/irq_markeins.c
+++ b/arch/mips/emma2rh/markeins/irq_markeins.c
@@ -48,46 +48,21 @@ 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)))
-                ll_emma2rh_sw_irq_enable(irq - emma2rh_sw_irq_base);
-}
-
 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,
-        .end = emma2rh_sw_irq_end,
-        .set_affinity = NULL,
+        .ack = emma2rh_sw_irq_disable,
+        .mask = emma2rh_sw_irq_disable,
+        .mask_ack = emma2rh_sw_irq_disable,
+        .unmask = emma2rh_sw_irq_enable,
 };
 
 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 +101,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 +116,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..f8d417b5c2bb 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,34 +39,20 @@ 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)))
-                enable_r4030_irq(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,
-        .end = end_r4030_irq,
+        .ack = disable_r4030_irq,
+        .mask = disable_r4030_irq,
+        .mask_ack = disable_r4030_irq,
+        .unmask = enable_r4030_irq,
 };
 
 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 6bfbbed0897e..bbbb8d7cb89b 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -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/apm.c b/arch/mips/kernel/apm.c
index 528e731049c1..ba16d07588cb 100644
--- a/arch/mips/kernel/apm.c
+++ b/arch/mips/kernel/apm.c
@@ -356,7 +356,7 @@ static int apm_open(struct inode * inode, struct file * filp)
 {
         struct apm_user *as;
 
-        as = (struct apm_user *)kzalloc(sizeof(*as), GFP_KERNEL);
+        as = kzalloc(sizeof(*as), GFP_KERNEL);
         if (as) {
                 /*
                  * XXX - this is a tiny bit broken, when we consider BSD
diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
index 4a9f1ecefaf2..9b34238d41c0 100644
--- a/arch/mips/kernel/binfmt_elfn32.c
+++ b/arch/mips/kernel/binfmt_elfn32.c
@@ -90,7 +90,6 @@ struct elf_prpsinfo32
         char    pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */
 };
 
-#define elf_addr_t      u32
 #define elf_caddr_t     u32
 #define init_elf_binfmt init_elfn32_binfmt
 
diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
index e31813779895..993f7ec70f35 100644
--- a/arch/mips/kernel/binfmt_elfo32.c
+++ b/arch/mips/kernel/binfmt_elfo32.c
@@ -92,7 +92,6 @@ struct elf_prpsinfo32
         char    pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */
 };
 
-#define elf_addr_t      u32
 #define elf_caddr_t     u32
 #define init_elf_binfmt init_elf32_binfmt
 
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..9a7811d13db2 100644
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -138,7 +138,7 @@
 EXPORT(stext)                                   # used for profiling
 EXPORT(_stext)
 
-#if defined(CONFIG_QEMU) || defined(CONFIG_MIPS_SIM)
+#ifdef CONFIG_MIPS_SIM
         /*
          * Give us a fighting chance of running if execution beings at the
          * kernel load address.  This is needed because this platform does
@@ -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..b59a676c6d0e 100644
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
@@ -19,9 +19,6 @@
 #include <asm/i8259.h>
 #include <asm/io.h>
 
-void enable_8259A_irq(unsigned int irq);
-void disable_8259A_irq(unsigned int irq);
-
 /*
  * This is the 'legacy' 8259A Programmable Interrupt Controller,
  * present in the majority of PC/AT boxes.
@@ -31,34 +28,16 @@ void disable_8259A_irq(unsigned int irq);
  * moves to arch independent land
  */
 
+static int i8259A_auto_eoi;
 DEFINE_SPINLOCK(i8259A_lock);
-
-static void end_8259A_irq (unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)) &&
-            irq_desc[irq].action)
-                enable_8259A_irq(irq);
-}
-
-#define shutdown_8259A_irq      disable_8259A_irq
-
+/* some platforms call this... */
 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,
-        .end = end_8259A_irq,
+static struct irq_chip i8259A_chip = {
+        .name           = "XT-PIC",
+        .mask           = disable_8259A_irq,
+        .unmask         = enable_8259A_irq,
+        .mask_ack       = mask_and_ack_8259A,
 };
 
 /*
@@ -70,8 +49,8 @@ static struct irq_chip i8259A_irq_type = {
  */
 static unsigned int cached_irq_mask = 0xffff;
 
-#define cached_21       (cached_irq_mask)
-#define cached_A1       (cached_irq_mask >> 8)
+#define cached_master_mask      (cached_irq_mask)
+#define cached_slave_mask       (cached_irq_mask >> 8)
 
 void disable_8259A_irq(unsigned int irq)
 {
@@ -81,9 +60,9 @@ void disable_8259A_irq(unsigned int irq)
         spin_lock_irqsave(&i8259A_lock, flags);
         cached_irq_mask |= mask;
         if (irq & 8)
-                outb(cached_A1,0xA1);
+                outb(cached_slave_mask, PIC_SLAVE_IMR);
         else
-                outb(cached_21,0x21);
+                outb(cached_master_mask, PIC_MASTER_IMR);
         spin_unlock_irqrestore(&i8259A_lock, flags);
 }
 
@@ -95,9 +74,9 @@ void enable_8259A_irq(unsigned int irq)
         spin_lock_irqsave(&i8259A_lock, flags);
         cached_irq_mask &= mask;
         if (irq & 8)
-                outb(cached_A1,0xA1);
+                outb(cached_slave_mask, PIC_SLAVE_IMR);
         else
-                outb(cached_21,0x21);
+                outb(cached_master_mask, PIC_MASTER_IMR);
         spin_unlock_irqrestore(&i8259A_lock, flags);
 }
 
@@ -109,9 +88,9 @@ int i8259A_irq_pending(unsigned int irq)
 
         spin_lock_irqsave(&i8259A_lock, flags);
         if (irq < 8)
-                ret = inb(0x20) & mask;
+                ret = inb(PIC_MASTER_CMD) & mask;
         else
-                ret = inb(0xA0) & (mask >> 8);
+                ret = inb(PIC_SLAVE_CMD) & (mask >> 8);
         spin_unlock_irqrestore(&i8259A_lock, flags);
 
         return ret;
@@ -120,7 +99,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_and_handler(irq, &i8259A_chip, handle_level_irq);
         enable_irq(irq);
 }
 
@@ -136,14 +115,14 @@ static inline int i8259A_irq_real(unsigned int irq)
         int irqmask = 1 << irq;
 
         if (irq < 8) {
-                outb(0x0B,0x20);                /* ISR register */
-                value = inb(0x20) & irqmask;
-                outb(0x0A,0x20);                /* back to the IRR register */
+                outb(0x0B,PIC_MASTER_CMD);      /* ISR register */
+                value = inb(PIC_MASTER_CMD) & irqmask;
+                outb(0x0A,PIC_MASTER_CMD);      /* back to the IRR register */
                 return value;
         }
-        outb(0x0B,0xA0);                /* ISR register */
-        value = inb(0xA0) & (irqmask >> 8);
-        outb(0x0A,0xA0);                /* back to the IRR register */
+        outb(0x0B,PIC_SLAVE_CMD);       /* ISR register */
+        value = inb(PIC_SLAVE_CMD) & (irqmask >> 8);
+        outb(0x0A,PIC_SLAVE_CMD);       /* back to the IRR register */
         return value;
 }
 
@@ -160,17 +139,19 @@ void mask_and_ack_8259A(unsigned int irq)
 
         spin_lock_irqsave(&i8259A_lock, flags);
         /*
-         * Lightweight spurious IRQ detection. We do not want to overdo
-         * spurious IRQ handling - it's usually a sign of hardware problems, so
-         * we only do the checks we can do without slowing down good hardware
-         * nnecesserily.
+         * Lightweight spurious IRQ detection. We do not want
+         * to overdo spurious IRQ handling - it's usually a sign
+         * of hardware problems, so we only do the checks we can
+         * do without slowing down good hardware unnecessarily.
          *
-         * Note that IRQ7 and IRQ15 (the two spurious IRQs usually resulting
-         * rom the 8259A-1|2 PICs) occur even if the IRQ is masked in the 8259A.
-         * Thus we can check spurious 8259A IRQs without doing the quite slow
-         * i8259A_irq_real() call for every IRQ.  This does not cover 100% of
-         * spurious interrupts, but should be enough to warn the user that
-         * there is something bad going on ...
+         * Note that IRQ7 and IRQ15 (the two spurious IRQs
+         * usually resulting from the 8259A-1|2 PICs) occur
+         * even if the IRQ is masked in the 8259A. Thus we
+         * can check spurious 8259A IRQs without doing the
+         * quite slow i8259A_irq_real() call for every IRQ.
+         * This does not cover 100% of spurious interrupts,
+         * but should be enough to warn the user that there
+         * is something bad going on ...
          */
         if (cached_irq_mask & irqmask)
                 goto spurious_8259A_irq;
@@ -178,14 +159,14 @@ void mask_and_ack_8259A(unsigned int irq)
 
 handle_real_irq:
         if (irq & 8) {
-                inb(0xA1);              /* DUMMY - (do we need this?) */
-                outb(cached_A1,0xA1);
-                outb(0x60+(irq&7),0xA0);/* 'Specific EOI' to slave */
-                outb(0x62,0x20);        /* 'Specific EOI' to master-IRQ2 */
+                inb(PIC_SLAVE_IMR);     /* DUMMY - (do we need this?) */
+                outb(cached_slave_mask, PIC_SLAVE_IMR);
+                outb(0x60+(irq&7),PIC_SLAVE_CMD);/* 'Specific EOI' to slave */
+                outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */
         } else {
-                inb(0x21);              /* DUMMY - (do we need this?) */
-                outb(cached_21,0x21);
-                outb(0x60+irq,0x20);    /* 'Specific EOI' to master */
+                inb(PIC_MASTER_IMR);    /* DUMMY - (do we need this?) */
+                outb(cached_master_mask, PIC_MASTER_IMR);
+                outb(0x60+irq,PIC_MASTER_CMD);  /* 'Specific EOI to master */
         }
 #ifdef CONFIG_MIPS_MT_SMTC
         if (irq_hwmask[irq] & ST0_IM)
@@ -206,7 +187,7 @@ spurious_8259A_irq:
                 goto handle_real_irq;
 
         {
-                static int spurious_irq_mask = 0;
+                static int spurious_irq_mask;
                 /*
                  * At this point we can be sure the IRQ is spurious,
                  * lets ACK and report it. [once per IRQ]
@@ -227,13 +208,25 @@ spurious_8259A_irq:
 
 static int i8259A_resume(struct sys_device *dev)
 {
-        init_8259A(0);
+        init_8259A(i8259A_auto_eoi);
+        return 0;
+}
+
+static int i8259A_shutdown(struct sys_device *dev)
+{
+        /* Put the i8259A into a quiescent state that
+         * the kernel initialization code can get it
+         * out of.
+         */
+        outb(0xff, PIC_MASTER_IMR);     /* mask all of 8259A-1 */
+        outb(0xff, PIC_SLAVE_IMR);      /* mask all of 8259A-1 */
         return 0;
 }
 
 static struct sysdev_class i8259_sysdev_class = {
         set_kset_name("i8259"),
         .resume = i8259A_resume,
+        .shutdown = i8259A_shutdown,
 };
 
 static struct sys_device device_i8259A = {
@@ -255,41 +248,41 @@ void __init init_8259A(int auto_eoi)
 {
         unsigned long flags;
 
+        i8259A_auto_eoi = auto_eoi;
+
         spin_lock_irqsave(&i8259A_lock, flags);
 
-        outb(0xff, 0x21);       /* mask all of 8259A-1 */
-        outb(0xff, 0xA1);       /* mask all of 8259A-2 */
+        outb(0xff, PIC_MASTER_IMR);     /* mask all of 8259A-1 */
+        outb(0xff, PIC_SLAVE_IMR);      /* mask all of 8259A-2 */
 
         /*
          * outb_p - this has to work on a wide range of PC hardware.
          */
-        outb_p(0x11, 0x20);     /* ICW1: select 8259A-1 init */
-        outb_p(0x00, 0x21);     /* ICW2: 8259A-1 IR0-7 mapped to 0x00-0x07 */
-        outb_p(0x04, 0x21);     /* 8259A-1 (the master) has a slave on IR2 */
-        if (auto_eoi)
-                outb_p(0x03, 0x21);     /* master does Auto EOI */
-        else
-                outb_p(0x01, 0x21);     /* master expects normal EOI */
-
-        outb_p(0x11, 0xA0);     /* ICW1: select 8259A-2 init */
-        outb_p(0x08, 0xA1);     /* ICW2: 8259A-2 IR0-7 mapped to 0x08-0x0f */
-        outb_p(0x02, 0xA1);     /* 8259A-2 is a slave on master's IR2 */
-        outb_p(0x01, 0xA1);     /* (slave's support for AEOI in flat mode
-                                    is to be investigated) */
-
+        outb_p(0x11, PIC_MASTER_CMD);   /* ICW1: select 8259A-1 init */
+        outb_p(I8259A_IRQ_BASE + 0, PIC_MASTER_IMR);    /* ICW2: 8259A-1 IR0 mapped to I8259A_IRQ_BASE + 0x00 */
+        outb_p(1U << PIC_CASCADE_IR, PIC_MASTER_IMR);   /* 8259A-1 (the master) has a slave on IR2 */
+        if (auto_eoi)   /* master does Auto EOI */
+                outb_p(MASTER_ICW4_DEFAULT | PIC_ICW4_AEOI, PIC_MASTER_IMR);
+        else            /* master expects normal EOI */
+                outb_p(MASTER_ICW4_DEFAULT, PIC_MASTER_IMR);
+
+        outb_p(0x11, PIC_SLAVE_CMD);    /* ICW1: select 8259A-2 init */
+        outb_p(I8259A_IRQ_BASE + 8, PIC_SLAVE_IMR);     /* ICW2: 8259A-2 IR0 mapped to I8259A_IRQ_BASE + 0x08 */
+        outb_p(PIC_CASCADE_IR, PIC_SLAVE_IMR);  /* 8259A-2 is a slave on master's IR2 */
+        outb_p(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); /* (slave's support for AEOI in flat mode is to be investigated) */
         if (auto_eoi)
                 /*
-                 * in AEOI mode we just have to mask the interrupt
+                 * In AEOI mode we just have to mask the interrupt
                  * when acking.
                  */
-                i8259A_irq_type.ack = disable_8259A_irq;
+                i8259A_chip.mask_ack = disable_8259A_irq;
         else
-                i8259A_irq_type.ack = mask_and_ack_8259A;
+                i8259A_chip.mask_ack = mask_and_ack_8259A;
 
         udelay(100);            /* wait for 8259A to initialize */
 
-        outb(cached_21, 0x21);  /* restore master IRQ mask */
-        outb(cached_A1, 0xA1);  /* restore slave IRQ mask */
+        outb(cached_master_mask, PIC_MASTER_IMR); /* restore master IRQ mask */
+        outb(cached_slave_mask, PIC_SLAVE_IMR);   /* restore slave IRQ mask */
 
         spin_unlock_irqrestore(&i8259A_lock, flags);
 }
@@ -302,11 +295,17 @@ static struct irqaction irq2 = {
 };
 
 static struct resource pic1_io_resource = {
-        .name = "pic1", .start = 0x20, .end = 0x21, .flags = IORESOURCE_BUSY
+        .name = "pic1",
+        .start = PIC_MASTER_CMD,
+        .end = PIC_MASTER_IMR,
+        .flags = IORESOURCE_BUSY
 };
 
 static struct resource pic2_io_resource = {
-        .name = "pic2", .start = 0xa0, .end = 0xa1, .flags = IORESOURCE_BUSY
+        .name = "pic2",
+        .start = PIC_SLAVE_CMD,
+        .end = PIC_SLAVE_IMR,
+        .flags = IORESOURCE_BUSY
 };
 
 /*
@@ -323,12 +322,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_and_handler(i, &i8259A_chip, handle_level_irq);
 
-        setup_irq(2, &irq2);
+        setup_irq(PIC_CASCADE_IR, &irq2);
 }
diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c
index ab12c8f01518..37cad5de515c 100644
--- a/arch/mips/kernel/irixelf.c
+++ b/arch/mips/kernel/irixelf.c
@@ -52,10 +52,6 @@ static struct linux_binfmt irix_format = {
         irix_core_dump, PAGE_SIZE
 };
 
-#ifndef elf_addr_t
-#define elf_addr_t unsigned long
-#endif
-
 #ifdef DEBUG
 /* Debugging routines. */
 static char *get_elf_p_type(Elf32_Word p_type)
@@ -1013,7 +1009,7 @@ static int notesize(struct memelfnote *en)
         int sz;
 
         sz = sizeof(struct elf_note);
-        sz += roundup(strlen(en->name), 4);
+        sz += roundup(strlen(en->name) + 1, 4);
         sz += roundup(en->datasz, 4);
 
         return sz;
@@ -1032,7 +1028,7 @@ static int writenote(struct memelfnote *men, struct file *file)
 {
         struct elf_note en;
 
-        en.n_namesz = strlen(men->name);
+        en.n_namesz = strlen(men->name) + 1;
         en.n_descsz = men->datasz;
         en.n_type = men->type;
 
@@ -1149,7 +1145,7 @@ static int irix_core_dump(long signr, struct pt_regs * regs, struct file *file)
         psinfo.pr_pid = prstatus.pr_pid = current->pid;
         psinfo.pr_ppid = prstatus.pr_ppid = current->parent->pid;
         psinfo.pr_pgrp = prstatus.pr_pgrp = process_group(current);
-        psinfo.pr_sid = prstatus.pr_sid = current->signal->session;
+        psinfo.pr_sid = prstatus.pr_sid = process_session(current);
         if (current->pid == current->tgid) {
                 /*
                  * This is the record for the group leader.  Add in the
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..efbd219845b5 100644
--- a/arch/mips/kernel/irq-mv6434x.c
+++ b/arch/mips/kernel/irq-mv6434x.c
@@ -67,48 +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)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-                unmask_mv64340_irq(irq);
-}
-
-/*
  * Interrupt handler for interrupts coming from the Marvell chip.
  * It could be built in ethernet ports etc...
  */
@@ -133,29 +91,21 @@ 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,
-        .end = end_mv64340_irq,
+        .ack = mask_mv64340_irq,
+        .mask = mask_mv64340_irq,
+        .mask_ack = mask_mv64340_irq,
+        .unmask = unmask_mv64340_irq,
 };
 
 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..123324ba8c14 100644
--- a/arch/mips/kernel/irq-rm7000.c
+++ b/arch/mips/kernel/irq-rm7000.c
@@ -29,56 +29,12 @@ 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)))
-                unmask_rm7k_irq(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,
-        .end = rm7k_cpu_irq_end,
+        .ack = mask_rm7k_irq,
+        .mask = mask_rm7k_irq,
+        .mask_ack = mask_rm7k_irq,
+        .unmask = unmask_rm7k_irq,
 };
 
 void __init rm7k_cpu_irq_init(int base)
@@ -87,12 +43,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..0e6f4c5349d2 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,40 +80,22 @@ 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)))
-                unmask_rm9k_irq(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,
-        .end = rm9k_cpu_irq_end,
+        .ack = mask_rm9k_irq,
+        .mask = mask_rm9k_irq,
+        .mask_ack = mask_rm9k_irq,
+        .unmask = unmask_rm9k_irq,
 };
 
 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,
-        .end = rm9k_cpu_irq_end,
+        .ack = mask_rm9k_irq,
+        .mask = mask_rm9k_irq,
+        .mask_ack = mask_rm9k_irq,
+        .unmask = unmask_rm9k_irq,
 };
 
 unsigned int rm9000_perfcount_irq;
@@ -135,15 +108,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..2fe4c868a801 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:
  */
@@ -136,7 +117,7 @@ int show_interrupts(struct seq_file *p, void *v)
                 for_each_online_cpu(j)
                         seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
 #endif
-                seq_printf(p, " %14s", irq_desc[i].chip->typename);
+                seq_printf(p, " %14s", irq_desc[i].chip->name);
                 seq_printf(p, "  %s", action->name);
 
                 for (action=action->next; action; action = action->next)
@@ -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..fcc86b96ccf6 100644
--- a/arch/mips/kernel/irq_cpu.c
+++ b/arch/mips/kernel/irq_cpu.c
@@ -50,58 +50,13 @@ 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)))
-                unmask_mips_irq(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,
-        .end            = mips_cpu_irq_end,
+        .ack            = mask_mips_irq,
+        .mask           = mask_mips_irq,
+        .mask_ack       = mask_mips_irq,
+        .unmask         = unmask_mips_irq,
+        .eoi            = unmask_mips_irq,
 };
 
 /*
@@ -110,8 +65,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 +72,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.
@@ -138,16 +89,14 @@ static void mips_mt_cpu_irq_ack(unsigned int irq)
         mask_mips_mt_irq(irq);
 }
 
-#define mips_mt_cpu_irq_end mips_cpu_irq_end
-
 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,
-        .end            = mips_mt_cpu_irq_end,
+        .mask           = mask_mips_mt_irq,
+        .mask_ack       = mips_mt_cpu_irq_ack,
+        .unmask         = unmask_mips_mt_irq,
+        .eoi            = unmask_mips_mt_irq,
 };
 
 void __init mips_cpu_irq_init(int irq_base)
@@ -163,19 +112,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/kspd.c b/arch/mips/kernel/kspd.c
index f06a144c7881..5929f883e46b 100644
--- a/arch/mips/kernel/kspd.c
+++ b/arch/mips/kernel/kspd.c
@@ -301,7 +301,7 @@ static void sp_cleanup(void)
         for (;;) {
                 unsigned long set;
                 i = j * __NFDBITS;
-                if (i >= fdt->max_fdset || i >= fdt->max_fds)
+                if (i >= fdt->max_fds)
                         break;
                 set = fdt->open_fds->fds_bits[j++];
                 while (set) {
@@ -319,7 +319,7 @@ static void sp_cleanup(void)
 static int channel_open = 0;
 
 /* the work handler */
-static void sp_work(void *data)
+static void sp_work(struct work_struct *unused)
 {
         if (!channel_open) {
                 if( rtlx_open(RTLX_CHANNEL_SYSIO, 1) != 0) {
@@ -354,7 +354,7 @@ static void startwork(int vpe)
                         return;
                 }
 
-                INIT_WORK(&work, sp_work, NULL);
+                INIT_WORK(&work, sp_work);
                 queue_work(workqueue, &work);
         } else
                 queue_work(workqueue, &work);
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index 7a3ebbeba1f3..de3fae260ff8 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -382,531 +382,6 @@ asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid,
         return ret;
 }
 
-struct msgbuf32 { s32 mtype; char mtext[1]; };
-
-struct ipc_perm32
-{
-        key_t             key;
-        __compat_uid_t  uid;
-        __compat_gid_t  gid;
-        __compat_uid_t  cuid;
-        __compat_gid_t  cgid;
-        compat_mode_t   mode;
-        unsigned short  seq;
-};
-
-struct ipc64_perm32 {
-        key_t key;
-        __compat_uid_t uid;
-        __compat_gid_t gid;
-        __compat_uid_t cuid;
-        __compat_gid_t cgid;
-        compat_mode_t   mode;
-        unsigned short  seq;
-        unsigned short __pad1;
-        unsigned int __unused1;
-        unsigned int __unused2;
-};
-
-struct semid_ds32 {
-        struct ipc_perm32 sem_perm;               /* permissions .. see ipc.h */
-        compat_time_t   sem_otime;              /* last semop time */
-        compat_time_t   sem_ctime;              /* last change time */
-        u32 sem_base;              /* ptr to first semaphore in array */
-        u32 sem_pending;          /* pending operations to be processed */
-        u32 sem_pending_last;    /* last pending operation */
-        u32 undo;                  /* undo requests on this array */
-        unsigned short  sem_nsems;              /* no. of semaphores in array */
-};
-
-struct semid64_ds32 {
-        struct ipc64_perm32     sem_perm;
-        compat_time_t   sem_otime;
-        compat_time_t   sem_ctime;
-        unsigned int            sem_nsems;
-        unsigned int            __unused1;
-        unsigned int            __unused2;
-};
-
-struct msqid_ds32
-{
-        struct ipc_perm32 msg_perm;
-        u32 msg_first;
-        u32 msg_last;
-        compat_time_t   msg_stime;
-        compat_time_t   msg_rtime;
-        compat_time_t   msg_ctime;
-        u32 wwait;
-        u32 rwait;
-        unsigned short msg_cbytes;
-        unsigned short msg_qnum;
-        unsigned short msg_qbytes;
-        compat_ipc_pid_t msg_lspid;
-        compat_ipc_pid_t msg_lrpid;
-};
-
-struct msqid64_ds32 {
-        struct ipc64_perm32 msg_perm;
-        compat_time_t msg_stime;
-        unsigned int __unused1;
-        compat_time_t msg_rtime;
-        unsigned int __unused2;
-        compat_time_t msg_ctime;
-        unsigned int __unused3;
-        unsigned int msg_cbytes;
-        unsigned int msg_qnum;
-        unsigned int msg_qbytes;
-        compat_pid_t msg_lspid;
-        compat_pid_t msg_lrpid;
-        unsigned int __unused4;
-        unsigned int __unused5;
-};
-
-struct shmid_ds32 {
-        struct ipc_perm32       shm_perm;
-        int                     shm_segsz;
-        compat_time_t           shm_atime;
-        compat_time_t           shm_dtime;
-        compat_time_t           shm_ctime;
-        compat_ipc_pid_t    shm_cpid;
-        compat_ipc_pid_t    shm_lpid;
-        unsigned short          shm_nattch;
-};
-
-struct shmid64_ds32 {
-        struct ipc64_perm32     shm_perm;
-        compat_size_t           shm_segsz;
-        compat_time_t           shm_atime;
-        compat_time_t           shm_dtime;
-        compat_time_t shm_ctime;
-        compat_pid_t shm_cpid;
-        compat_pid_t shm_lpid;
-        unsigned int shm_nattch;
-        unsigned int __unused1;
-        unsigned int __unused2;
-};
-
-struct ipc_kludge32 {
-        u32 msgp;
-        s32 msgtyp;
-};
-
-static int
-do_sys32_semctl(int first, int second, int third, void __user *uptr)
-{
-        union semun fourth;
-        u32 pad;
-        int err, err2;
-        struct semid64_ds s;
-        mm_segment_t old_fs;
-
-        if (!uptr)
-                return -EINVAL;
-        err = -EFAULT;
-        if (get_user (pad, (u32 __user *)uptr))
-                return err;
-        if ((third & ~IPC_64) == SETVAL)
-                fourth.val = (int)pad;
-        else
-                fourth.__pad = (void __user *)A(pad);
-        switch (third & ~IPC_64) {
-        case IPC_INFO:
-        case IPC_RMID:
-        case IPC_SET:
-        case SEM_INFO:
-        case GETVAL:
-        case GETPID:
-        case GETNCNT:
-        case GETZCNT:
-        case GETALL:
-        case SETVAL:
-        case SETALL:
-                err = sys_semctl (first, second, third, fourth);
-                break;
-
-        case IPC_STAT:
-        case SEM_STAT:
-                fourth.__pad = (struct semid64_ds __user *)&s;
-                old_fs = get_fs();
-                set_fs(KERNEL_DS);
-                err = sys_semctl(first, second, third | IPC_64, fourth);
-                set_fs(old_fs);
-
-                if (third & IPC_64) {
-                        struct semid64_ds32 __user *usp64 = (struct semid64_ds32 __user *) A(pad);
-
-                        if (!access_ok(VERIFY_WRITE, usp64, sizeof(*usp64))) {
-                                err = -EFAULT;
-                                break;
-                        }
-                        err2 = __put_user(s.sem_perm.key, &usp64->sem_perm.key);
-                        err2 |= __put_user(s.sem_perm.uid, &usp64->sem_perm.uid);
-                        err2 |= __put_user(s.sem_perm.gid, &usp64->sem_perm.gid);
-                        err2 |= __put_user(s.sem_perm.cuid, &usp64->sem_perm.cuid);
-                        err2 |= __put_user(s.sem_perm.cgid, &usp64->sem_perm.cgid);
-                        err2 |= __put_user(s.sem_perm.mode, &usp64->sem_perm.mode);
-                        err2 |= __put_user(s.sem_perm.seq, &usp64->sem_perm.seq);
-                        err2 |= __put_user(s.sem_otime, &usp64->sem_otime);
-                        err2 |= __put_user(s.sem_ctime, &usp64->sem_ctime);
-                        err2 |= __put_user(s.sem_nsems, &usp64->sem_nsems);
-                } else {
-                        struct semid_ds32 __user *usp32 = (struct semid_ds32 __user *) A(pad);
-
-                        if (!access_ok(VERIFY_WRITE, usp32, sizeof(*usp32))) {
-                                err = -EFAULT;
-                                break;
-                        }
-                        err2 = __put_user(s.sem_perm.key, &usp32->sem_perm.key);
-                        err2 |= __put_user(s.sem_perm.uid, &usp32->sem_perm.uid);
-                        err2 |= __put_user(s.sem_perm.gid, &usp32->sem_perm.gid);
-                        err2 |= __put_user(s.sem_perm.cuid, &usp32->sem_perm.cuid);
-                        err2 |= __put_user(s.sem_perm.cgid, &usp32->sem_perm.cgid);
-                        err2 |= __put_user(s.sem_perm.mode, &usp32->sem_perm.mode);
-                        err2 |= __put_user(s.sem_perm.seq, &usp32->sem_perm.seq);
-                        err2 |= __put_user(s.sem_otime, &usp32->sem_otime);
-                        err2 |= __put_user(s.sem_ctime, &usp32->sem_ctime);
-                        err2 |= __put_user(s.sem_nsems, &usp32->sem_nsems);
-                }
-                if (err2)
-                        err = -EFAULT;
-                break;
-
-        default:
-                err = - EINVAL;
-                break;
-        }
-
-        return err;
-}
-
-static int
-do_sys32_msgsnd (int first, int second, int third, void __user *uptr)
-{
-        struct msgbuf32 __user *up = (struct msgbuf32 __user *)uptr;
-        struct msgbuf *p;
-        mm_segment_t old_fs;
-        int err;
-
-        if (second < 0)
-                return -EINVAL;
-        p = kmalloc (second + sizeof (struct msgbuf)
-                                    + 4, GFP_USER);
-        if (!p)
-                return -ENOMEM;
-        err = get_user (p->mtype, &up->mtype);
-        if (err)
-                goto out;
-        err |= __copy_from_user (p->mtext, &up->mtext, second);
-        if (err)
-                goto out;
-        old_fs = get_fs ();
-        set_fs (KERNEL_DS);
-        err = sys_msgsnd (first, (struct msgbuf __user *)p, second, third);
-        set_fs (old_fs);
-out:
-        kfree (p);
-
-        return err;
-}
-
-static int
-do_sys32_msgrcv (int first, int second, int msgtyp, int third,
-                 int version, void __user *uptr)
-{
-        struct msgbuf32 __user *up;
-        struct msgbuf *p;
-        mm_segment_t old_fs;
-        int err;
-
-        if (!version) {
-                struct ipc_kludge32 __user *uipck = (struct ipc_kludge32 __user *)uptr;
-                struct ipc_kludge32 ipck;
-
-                err = -EINVAL;
-                if (!uptr)
-                        goto out;
-                err = -EFAULT;
-                if (copy_from_user (&ipck, uipck, sizeof (struct ipc_kludge32)))
-                        goto out;
-                uptr = (void __user *)AA(ipck.msgp);
-                msgtyp = ipck.msgtyp;
-        }
-
-        if (second < 0)
-                return -EINVAL;
-        err = -ENOMEM;
-        p = kmalloc (second + sizeof (struct msgbuf) + 4, GFP_USER);
-        if (!p)
-                goto out;
-        old_fs = get_fs ();
-        set_fs (KERNEL_DS);
-        err = sys_msgrcv (first, (struct msgbuf __user *)p, second + 4, msgtyp, third);
-        set_fs (old_fs);
-        if (err < 0)
-                goto free_then_out;
-        up = (struct msgbuf32 __user *)uptr;
-        if (put_user (p->mtype, &up->mtype) ||
-            __copy_to_user (&up->mtext, p->mtext, err))
-                err = -EFAULT;
-free_then_out:
-        kfree (p);
-out:
-        return err;
-}
-
-static int
-do_sys32_msgctl (int first, int second, void __user *uptr)
-{
-        int err = -EINVAL, err2;
-        struct msqid64_ds m;
-        struct msqid_ds32 __user *up32 = (struct msqid_ds32 __user *)uptr;
-        struct msqid64_ds32 __user *up64 = (struct msqid64_ds32 __user *)uptr;
-        mm_segment_t old_fs;
-
-        switch (second & ~IPC_64) {
-        case IPC_INFO:
-        case IPC_RMID:
-        case MSG_INFO:
-                err = sys_msgctl (first, second, (struct msqid_ds __user *)uptr);
-                break;
-
-        case IPC_SET:
-                if (second & IPC_64) {
-                        if (!access_ok(VERIFY_READ, up64, sizeof(*up64))) {
-                                err = -EFAULT;
-                                break;
-                        }
-                        err = __get_user(m.msg_perm.uid, &up64->msg_perm.uid);
-                        err |= __get_user(m.msg_perm.gid, &up64->msg_perm.gid);
-                        err |= __get_user(m.msg_perm.mode, &up64->msg_perm.mode);
-                        err |= __get_user(m.msg_qbytes, &up64->msg_qbytes);
-                } else {
-                        if (!access_ok(VERIFY_READ, up32, sizeof(*up32))) {
-                                err = -EFAULT;
-                                break;
-                        }
-                        err = __get_user(m.msg_perm.uid, &up32->msg_perm.uid);
-                        err |= __get_user(m.msg_perm.gid, &up32->msg_perm.gid);
-                        err |= __get_user(m.msg_perm.mode, &up32->msg_perm.mode);
-                        err |= __get_user(m.msg_qbytes, &up32->msg_qbytes);
-                }
-                if (err)
-                        break;
-                old_fs = get_fs();
-                set_fs(KERNEL_DS);
-                err = sys_msgctl(first, second | IPC_64, (struct msqid_ds __user *)&m);
-                set_fs(old_fs);
-                break;
-
-        case IPC_STAT:
-        case MSG_STAT:
-                old_fs = get_fs();
-                set_fs(KERNEL_DS);
-                err = sys_msgctl(first, second | IPC_64, (struct msqid_ds __user *)&m);
-                set_fs(old_fs);
-                if (second & IPC_64) {
-                        if (!access_ok(VERIFY_WRITE, up64, sizeof(*up64))) {
-                                err = -EFAULT;
-                                break;
-                        }
-                        err2 = __put_user(m.msg_perm.key, &up64->msg_perm.key);
-                        err2 |= __put_user(m.msg_perm.uid, &up64->msg_perm.uid);
-                        err2 |= __put_user(m.msg_perm.gid, &up64->msg_perm.gid);
-                        err2 |= __put_user(m.msg_perm.cuid, &up64->msg_perm.cuid);
-                        err2 |= __put_user(m.msg_perm.cgid, &up64->msg_perm.cgid);
-                        err2 |= __put_user(m.msg_perm.mode, &up64->msg_perm.mode);
-                        err2 |= __put_user(m.msg_perm.seq, &up64->msg_perm.seq);
-                        err2 |= __put_user(m.msg_stime, &up64->msg_stime);
-                        err2 |= __put_user(m.msg_rtime, &up64->msg_rtime);
-                        err2 |= __put_user(m.msg_ctime, &up64->msg_ctime);
-                        err2 |= __put_user(m.msg_cbytes, &up64->msg_cbytes);
-                        err2 |= __put_user(m.msg_qnum, &up64->msg_qnum);
-                        err2 |= __put_user(m.msg_qbytes, &up64->msg_qbytes);
-                        err2 |= __put_user(m.msg_lspid, &up64->msg_lspid);
-                        err2 |= __put_user(m.msg_lrpid, &up64->msg_lrpid);
-                        if (err2)
-                                err = -EFAULT;
-                } else {
-                        if (!access_ok(VERIFY_WRITE, up32, sizeof(*up32))) {
-                                err = -EFAULT;
-                                break;
-                        }
-                        err2 = __put_user(m.msg_perm.key, &up32->msg_perm.key);
-                        err2 |= __put_user(m.msg_perm.uid, &up32->msg_perm.uid);
-                        err2 |= __put_user(m.msg_perm.gid, &up32->msg_perm.gid);
-                        err2 |= __put_user(m.msg_perm.cuid, &up32->msg_perm.cuid);
-                        err2 |= __put_user(m.msg_perm.cgid, &up32->msg_perm.cgid);
-                        err2 |= __put_user(m.msg_perm.mode, &up32->msg_perm.mode);
-                        err2 |= __put_user(m.msg_perm.seq, &up32->msg_perm.seq);
-                        err2 |= __put_user(m.msg_stime, &up32->msg_stime);
-                        err2 |= __put_user(m.msg_rtime, &up32->msg_rtime);
-                        err2 |= __put_user(m.msg_ctime, &up32->msg_ctime);
-                        err2 |= __put_user(m.msg_cbytes, &up32->msg_cbytes);
-                        err2 |= __put_user(m.msg_qnum, &up32->msg_qnum);
-                        err2 |= __put_user(m.msg_qbytes, &up32->msg_qbytes);
-                        err2 |= __put_user(m.msg_lspid, &up32->msg_lspid);
-                        err2 |= __put_user(m.msg_lrpid, &up32->msg_lrpid);
-                        if (err2)
-                                err = -EFAULT;
-                }
-                break;
-        }
-
-        return err;
-}
-
-static int
-do_sys32_shmat (int first, int second, int third, int version, void __user *uptr)
-{
-        unsigned long raddr;
-        u32 __user *uaddr = (u32 __user *)A((u32)third);
-        int err = -EINVAL;
-
-        if (version == 1)
-                return err;
-        err = do_shmat (first, uptr, second, &raddr);
-        if (err)
-                return err;
-        err = put_user (raddr, uaddr);
-        return err;
-}
-
-struct shm_info32 {
-        int used_ids;
-        u32 shm_tot, shm_rss, shm_swp;
-        u32 swap_attempts, swap_successes;
-};
-
-static int
-do_sys32_shmctl (int first, int second, void __user *uptr)
-{
-        struct shmid64_ds32 __user *up64 = (struct shmid64_ds32 __user *)uptr;
-        struct shmid_ds32 __user *up32 = (struct shmid_ds32 __user *)uptr;
-        struct shm_info32 __user *uip = (struct shm_info32 __user *)uptr;
-        int err = -EFAULT, err2;
-        struct shmid64_ds s64;
-        mm_segment_t old_fs;
-        struct shm_info si;
-        struct shmid_ds s;
-
-        switch (second & ~IPC_64) {
-        case IPC_INFO:
-                second = IPC_INFO; /* So that we don't have to translate it */
-        case IPC_RMID:
-        case SHM_LOCK:
-        case SHM_UNLOCK:
-                err = sys_shmctl(first, second, (struct shmid_ds __user *)uptr);
-                break;
-        case IPC_SET:
-                if (second & IPC_64) {
-                        err = get_user(s.shm_perm.uid, &up64->shm_perm.uid);
-                        err |= get_user(s.shm_perm.gid, &up64->shm_perm.gid);
-                        err |= get_user(s.shm_perm.mode, &up64->shm_perm.mode);
-                } else {
-                        err = get_user(s.shm_perm.uid, &up32->shm_perm.uid);
-                        err |= get_user(s.shm_perm.gid, &up32->shm_perm.gid);
-                        err |= get_user(s.shm_perm.mode, &up32->shm_perm.mode);
-                }
-                if (err)
-                        break;
-                old_fs = get_fs();
-                set_fs(KERNEL_DS);
-                err = sys_shmctl(first, second & ~IPC_64, (struct shmid_ds __user *)&s);
-                set_fs(old_fs);
-                break;
-
-        case IPC_STAT:
-        case SHM_STAT:
-                old_fs = get_fs();
-                set_fs(KERNEL_DS);
-                err = sys_shmctl(first, second | IPC_64, (void __user *) &s64);
-                set_fs(old_fs);
-                if (err < 0)
-                        break;
-                if (second & IPC_64) {
-                        if (!access_ok(VERIFY_WRITE, up64, sizeof(*up64))) {
-                                err = -EFAULT;
-                                break;
-                        }
-                        err2 = __put_user(s64.shm_perm.key, &up64->shm_perm.key);
-                        err2 |= __put_user(s64.shm_perm.uid, &up64->shm_perm.uid);
-                        err2 |= __put_user(s64.shm_perm.gid, &up64->shm_perm.gid);
-                        err2 |= __put_user(s64.shm_perm.cuid, &up64->shm_perm.cuid);
-                        err2 |= __put_user(s64.shm_perm.cgid, &up64->shm_perm.cgid);
-                        err2 |= __put_user(s64.shm_perm.mode, &up64->shm_perm.mode);
-                        err2 |= __put_user(s64.shm_perm.seq, &up64->shm_perm.seq);
-                        err2 |= __put_user(s64.shm_atime, &up64->shm_atime);
-                        err2 |= __put_user(s64.shm_dtime, &up64->shm_dtime);
-                        err2 |= __put_user(s64.shm_ctime, &up64->shm_ctime);
-                        err2 |= __put_user(s64.shm_segsz, &up64->shm_segsz);
-                        err2 |= __put_user(s64.shm_nattch, &up64->shm_nattch);
-                        err2 |= __put_user(s64.shm_cpid, &up64->shm_cpid);
-                        err2 |= __put_user(s64.shm_lpid, &up64->shm_lpid);
-                } else {
-                        if (!access_ok(VERIFY_WRITE, up32, sizeof(*up32))) {
-                                err = -EFAULT;
-                                break;
-                        }
-                        err2 = __put_user(s64.shm_perm.key, &up32->shm_perm.key);
-                        err2 |= __put_user(s64.shm_perm.uid, &up32->shm_perm.uid);
-                        err2 |= __put_user(s64.shm_perm.gid, &up32->shm_perm.gid);
-                        err2 |= __put_user(s64.shm_perm.cuid, &up32->shm_perm.cuid);
-                        err2 |= __put_user(s64.shm_perm.cgid, &up32->shm_perm.cgid);
-                        err2 |= __put_user(s64.shm_perm.mode, &up32->shm_perm.mode);
-                        err2 |= __put_user(s64.shm_perm.seq, &up32->shm_perm.seq);
-                        err2 |= __put_user(s64.shm_atime, &up32->shm_atime);
-                        err2 |= __put_user(s64.shm_dtime, &up32->shm_dtime);
-                        err2 |= __put_user(s64.shm_ctime, &up32->shm_ctime);
-                        err2 |= __put_user(s64.shm_segsz, &up32->shm_segsz);
-                        err2 |= __put_user(s64.shm_nattch, &up32->shm_nattch);
-                        err2 |= __put_user(s64.shm_cpid, &up32->shm_cpid);
-                        err2 |= __put_user(s64.shm_lpid, &up32->shm_lpid);
-                }
-                if (err2)
-                        err = -EFAULT;
-                break;
-
-        case SHM_INFO:
-                old_fs = get_fs();
-                set_fs(KERNEL_DS);
-                err = sys_shmctl(first, second, (void __user *)&si);
-                set_fs(old_fs);
-                if (err < 0)
-                        break;
-                err2 = put_user(si.used_ids, &uip->used_ids);
-                err2 |= __put_user(si.shm_tot, &uip->shm_tot);
-                err2 |= __put_user(si.shm_rss, &uip->shm_rss);
-                err2 |= __put_user(si.shm_swp, &uip->shm_swp);
-                err2 |= __put_user(si.swap_attempts, &uip->swap_attempts);
-                err2 |= __put_user (si.swap_successes, &uip->swap_successes);
-                if (err2)
-                        err = -EFAULT;
-                break;
-
-        default:
-                err = -EINVAL;
-                break;
-        }
-
-        return err;
-}
-
-static int sys32_semtimedop(int semid, struct sembuf __user *tsems, int nsems,
-                            const struct compat_timespec __user *timeout32)
-{
-        struct compat_timespec t32;
-        struct timespec __user *t64 = compat_alloc_user_space(sizeof(*t64));
-
-        if (copy_from_user(&t32, timeout32, sizeof(t32)))
-                return -EFAULT;
-
-        if (put_user(t32.tv_sec, &t64->tv_sec) ||
-            put_user(t32.tv_nsec, &t64->tv_nsec))
-                return -EFAULT;
-
-        return sys_semtimedop(semid, tsems, nsems, t64);
-}
-
 asmlinkage long
 sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth)
 {
@@ -918,48 +393,43 @@ sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth)
         switch (call) {
         case SEMOP:
                 /* struct sembuf is the same on 32 and 64bit :)) */
-                err = sys_semtimedop (first, (struct sembuf __user *)AA(ptr), second,
-                                      NULL);
+                err = sys_semtimedop(first, compat_ptr(ptr), second, NULL);
                 break;
         case SEMTIMEDOP:
-                err = sys32_semtimedop (first, (struct sembuf __user *)AA(ptr), second,
-                                      (const struct compat_timespec __user *)AA(fifth));
+                err = compat_sys_semtimedop(first, compat_ptr(ptr), second,
+                                            compat_ptr(fifth));
                 break;
         case SEMGET:
-                err = sys_semget (first, second, third);
+                err = sys_semget(first, second, third);
                 break;
         case SEMCTL:
-                err = do_sys32_semctl (first, second, third,
-                                       (void __user *)AA(ptr));
+                err = compat_sys_semctl(first, second, third, compat_ptr(ptr));
                 break;
-
         case MSGSND:
-                err = do_sys32_msgsnd (first, second, third,
-                                       (void __user *)AA(ptr));
+                err = compat_sys_msgsnd(first, second, third, compat_ptr(ptr));
                 break;
         case MSGRCV:
-                err = do_sys32_msgrcv (first, second, fifth, third,
-                                       version, (void __user *)AA(ptr));
+                err = compat_sys_msgrcv(first, second, fifth, third,
+                                        version, compat_ptr(ptr));
                 break;
         case MSGGET:
-                err = sys_msgget ((key_t) first, second);
+                err = sys_msgget((key_t) first, second);
                 break;
         case MSGCTL:
-                err = do_sys32_msgctl (first, second, (void __user *)AA(ptr));
+                err = compat_sys_msgctl(first, second, compat_ptr(ptr));
                 break;
-
         case SHMAT:
-                err = do_sys32_shmat (first, second, third,
-                                      version, (void __user *)AA(ptr));
+                err = compat_sys_shmat(first, second, third, version,
+                                       compat_ptr(ptr));
                 break;
         case SHMDT:
-                err = sys_shmdt ((char __user *)A(ptr));
+                err = sys_shmdt(compat_ptr(ptr));
                 break;
         case SHMGET:
-                err = sys_shmget (first, (unsigned)second, third);
+                err = sys_shmget(first, (unsigned)second, third);
                 break;
         case SHMCTL:
-                err = do_sys32_shmctl (first, second, (void __user *)AA(ptr));
+                err = compat_sys_shmctl(first, second, compat_ptr(ptr));
                 break;
         default:
                 err = -EINVAL;
@@ -969,18 +439,28 @@ sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth)
         return err;
 }
 
-asmlinkage long sys32_shmat(int shmid, char __user *shmaddr,
-                          int shmflg, int32_t __user *addr)
+#ifdef CONFIG_MIPS32_N32
+asmlinkage long sysn32_semctl(int semid, int semnum, int cmd, u32 arg)
 {
-        unsigned long raddr;
-        int err;
+        /* compat_sys_semctl expects a pointer to union semun */
+        u32 __user *uptr = compat_alloc_user_space(sizeof(u32));
+        if (put_user(arg, uptr))
+                return -EFAULT;
+        return compat_sys_semctl(semid, semnum, cmd, uptr);
+}
 
-        err = do_shmat(shmid, shmaddr, shmflg, &raddr);
-        if (err)
-                return err;
+asmlinkage long sysn32_msgsnd(int msqid, u32 msgp, unsigned msgsz, int msgflg)
+{
+        return compat_sys_msgsnd(msqid, msgsz, msgflg, compat_ptr(msgp));
+}
 
-        return put_user(raddr, addr);
+asmlinkage long sysn32_msgrcv(int msqid, u32 msgp, size_t msgsz, int msgtyp,
+                              int msgflg)
+{
+        return compat_sys_msgrcv(msqid, msgsz, msgtyp, msgflg, IPC_64,
+                                 compat_ptr(msgp));
 }
+#endif
 
 struct sysctl_args32
 {
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/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c
index f44a01357ada..2ef857c3ee53 100644
--- a/arch/mips/kernel/mips_ksyms.c
+++ b/arch/mips/kernel/mips_ksyms.c
@@ -46,5 +46,7 @@ EXPORT_SYMBOL(__strnlen_user_nocheck_asm);
 EXPORT_SYMBOL(__strnlen_user_asm);
 
 EXPORT_SYMBOL(csum_partial);
+EXPORT_SYMBOL(csum_partial_copy_nocheck);
+EXPORT_SYMBOL(__csum_partial_copy_user);
 
 EXPORT_SYMBOL(invalid_pte_table);
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/reset.c b/arch/mips/kernel/reset.c
index 621037db2290..060563a712b6 100644
--- a/arch/mips/kernel/reset.c
+++ b/arch/mips/kernel/reset.c
@@ -23,6 +23,8 @@ void (*_machine_restart)(char *command);
 void (*_machine_halt)(void);
 void (*pm_power_off)(void);
 
+EXPORT_SYMBOL(pm_power_off);
+
 void machine_restart(char *command)
 {
         if (_machine_restart)
diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index 8c8c8324f775..5a99e3e0c96d 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -415,7 +415,7 @@ static unsigned int file_poll(struct file *file, poll_table * wait)
         int minor;
         unsigned int mask = 0;
 
-        minor = iminor(file->f_dentry->d_inode);
+        minor = iminor(file->f_path.dentry->d_inode);
 
         poll_wait(file, &channel_wqs[minor].rt_queue, wait);
         poll_wait(file, &channel_wqs[minor].lx_queue, wait);
@@ -437,7 +437,7 @@ static unsigned int file_poll(struct file *file, poll_table * wait)
 static ssize_t file_read(struct file *file, char __user * buffer, size_t count,
                          loff_t * ppos)
 {
-        int minor = iminor(file->f_dentry->d_inode);
+        int minor = iminor(file->f_path.dentry->d_inode);
 
         /* data available? */
         if (!rtlx_read_poll(minor, (file->f_flags & O_NONBLOCK) ? 0 : 1)) {
@@ -454,7 +454,7 @@ static ssize_t file_write(struct file *file, const char __user * buffer,
         struct rtlx_channel *rt;
         DECLARE_WAITQUEUE(wait, current);
 
-        minor = iminor(file->f_dentry->d_inode);
+        minor = iminor(file->f_path.dentry->d_inode);
         rt = &rtlx->channel[minor];
 
         /* any space left... */
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..a7bff2a54723 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -149,8 +149,8 @@ EXPORT(sysn32_call_table)
         PTR     sys_mincore
         PTR     sys_madvise
         PTR     sys_shmget
-        PTR     sys32_shmat
-        PTR     sys_shmctl                      /* 6030 */
+        PTR     sys_shmat
+        PTR     compat_sys_shmctl                       /* 6030 */
         PTR     sys_dup
         PTR     sys_dup2
         PTR     sys_pause
@@ -184,12 +184,12 @@ EXPORT(sysn32_call_table)
         PTR     sys32_newuname
         PTR     sys_semget
         PTR     sys_semop
-        PTR     sys_semctl
+        PTR     sysn32_semctl
         PTR     sys_shmdt                       /* 6065 */
         PTR     sys_msgget
-        PTR     sys_msgsnd
-        PTR     sys_msgrcv
-        PTR     sys_msgctl
+        PTR     sysn32_msgsnd
+        PTR     sysn32_msgrcv
+        PTR     compat_sys_msgctl
         PTR     compat_sys_fcntl                /* 6070 */
         PTR     sys_flock
         PTR     sys_fsync
@@ -335,7 +335,7 @@ EXPORT(sysn32_call_table)
         PTR     compat_sys_fcntl64
         PTR     sys_set_tid_address
         PTR     sys_restart_syscall
-        PTR     sys_semtimedop                  /* 6215 */
+        PTR     compat_sys_semtimedop                   /* 6215 */
         PTR     sys_fadvise64_64
         PTR     compat_sys_statfs64
         PTR     compat_sys_fstatfs64
@@ -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 49db516789e0..0555fc554f65 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -172,7 +172,7 @@ int smp_call_function (void (*func) (void *info), void *info, int retry,
 
         spin_lock(&smp_call_lock);
         call_data = &data;
-        mb();
+        smp_mb();
 
         /* Send a message to all other CPUs and wait for them to respond */
         for_each_online_cpu(i)
@@ -204,7 +204,7 @@ void smp_call_function_interrupt(void)
          * Notify initiating CPU that I've grabbed the data and am
          * about to execute the function.
          */
-        mb();
+        smp_mb();
         atomic_inc(&call_data->started);
 
         /*
@@ -215,7 +215,7 @@ void smp_call_function_interrupt(void)
         irq_exit();
 
         if (wait) {
-                mb();
+                smp_mb();
                 atomic_inc(&call_data->finished);
         }
 }
@@ -271,7 +271,7 @@ void __devinit smp_prepare_boot_cpu(void)
  * and keep control until "cpu_online(cpu)" is set.  Note: cpu is
  * physical, not logical.
  */
-int __devinit __cpu_up(unsigned int cpu)
+int __cpuinit __cpu_up(unsigned int cpu)
 {
         struct task_struct *idle;
 
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/sysirix.c b/arch/mips/kernel/sysirix.c
index 93c74fefff76..6c2406a93f2b 100644
--- a/arch/mips/kernel/sysirix.c
+++ b/arch/mips/kernel/sysirix.c
@@ -732,7 +732,7 @@ asmlinkage int irix_fstatfs(unsigned int fd, struct irix_statfs __user *buf)
                 goto out;
         }
 
-        error = vfs_statfs(file->f_dentry, &kbuf);
+        error = vfs_statfs(file->f_path.dentry, &kbuf);
         if (error)
                 goto out_f;
 
@@ -1041,7 +1041,7 @@ asmlinkage unsigned long irix_mmap32(unsigned long addr, size_t len, int prot,
                         unsigned long old_pos;
                         long max_size = offset + len;
 
-                        if (max_size > file->f_dentry->d_inode->i_size) {
+                        if (max_size > file->f_path.dentry->d_inode->i_size) {
                                 old_pos = sys_lseek (fd, max_size - 1, 0);
                                 sys_write (fd, (void __user *) "", 1);
                                 sys_lseek (fd, old_pos, 0);
@@ -1406,7 +1406,7 @@ asmlinkage int irix_fstatvfs(int fd, struct irix_statvfs __user *buf)
                 error = -EBADF;
                 goto out;
         }
-        error = vfs_statfs(file->f_dentry, &kbuf);
+        error = vfs_statfs(file->f_path.dentry, &kbuf);
         if (error)
                 goto out_f;
 
@@ -1526,7 +1526,7 @@ asmlinkage int irix_mmap64(struct pt_regs *regs)
                         unsigned long old_pos;
                         long max_size = off2 + len;
 
-                        if (max_size > file->f_dentry->d_inode->i_size) {
+                        if (max_size > file->f_path.dentry->d_inode->i_size) {
                                 old_pos = sys_lseek (fd, max_size - 1, 0);
                                 sys_write (fd, (void __user *) "", 1);
                                 sys_lseek (fd, old_pos, 0);
@@ -1658,7 +1658,7 @@ asmlinkage int irix_fstatvfs64(int fd, struct irix_statvfs __user *buf)
                 error = -EBADF;
                 goto out;
         }
-        error = vfs_statfs(file->f_dentry, &kbuf);
+        error = vfs_statfs(file->f_path.dentry, &kbuf);
         if (error)
                 goto out_f;
 
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index e535f86efa2f..8aa544f73a5e 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.
  */
@@ -101,10 +94,8 @@ static void c0_timer_ack(void)
 {
         unsigned int count;
 
-#ifndef CONFIG_SOC_PNX8550      /* pnx8550 resets to zero */
         /* Ack this timer interrupt and set the next one.  */
         expirelo += cycles_per_jiffy;
-#endif
         write_c0_compare(expirelo);
 
         /* Check to see if we have missed any timer interrupts.  */
@@ -118,7 +109,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 +123,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 +264,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 +290,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 +315,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 +329,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 +348,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 +388,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/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/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 79f0317d84ac..cecff24cc972 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -112,6 +112,7 @@ SECTIONS
     /* .exit.text is discarded at runtime, not link time, to deal with
      references from .rodata */
   .exit.text : { *(.exit.text) }
+  .exit.data : { *(.exit.data) }
   . = ALIGN(_PAGE_SIZE);
   __initramfs_start = .;
   .init.ramfs : { *(.init.ramfs) }
@@ -139,7 +140,6 @@ SECTIONS
 
   /* Sections to be discarded */
   /DISCARD/ : {
-        *(.exit.data)
         *(.exitcall.exit)
 
         /* ABI crap starts here */
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 51ddd2166898..666bef484dcb 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -1179,7 +1179,7 @@ static ssize_t vpe_write(struct file *file, const char __user * buffer,
         size_t ret = count;
         struct vpe *v;
 
-        minor = iminor(file->f_dentry->d_inode);
+        minor = iminor(file->f_path.dentry->d_inode);
         if ((v = get_vpe(minor)) == NULL)
                 return -ENODEV;
 
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c
index a144a002dcc4..2affa5ff171c 100644
--- a/arch/mips/lasat/interrupt.c
+++ b/arch/mips/lasat/interrupt.c
@@ -36,47 +36,20 @@ 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)))
-                enable_lasat_irq(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,
-        .end = end_lasat_irq,
+        .ack = disable_lasat_irq,
+        .mask = disable_lasat_irq,
+        .mask_ack = disable_lasat_irq,
+        .unmask = enable_lasat_irq,
 };
 
 static inline int ls1bit32(unsigned int x)
@@ -152,10 +125,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/lasat/sysctl.c b/arch/mips/lasat/sysctl.c
index 6dd7ae1b7c25..12878359f2c8 100644
--- a/arch/mips/lasat/sysctl.c
+++ b/arch/mips/lasat/sysctl.c
@@ -40,12 +40,12 @@ static DEFINE_MUTEX(lasat_info_mutex);
 /* Strategy function to write EEPROM after changing string entry */
 int sysctl_lasatstring(ctl_table *table, int *name, int nlen,
                 void *oldval, size_t *oldlenp,
-                void *newval, size_t newlen, void **context)
+                void *newval, size_t newlen)
 {
         int r;
         mutex_lock(&lasat_info_mutex);
         r = sysctl_string(table, name,
-                          nlen, oldval, oldlenp, newval, newlen, context);
+                          nlen, oldval, oldlenp, newval, newlen);
         if (r < 0) {
                 mutex_unlock(&lasat_info_mutex);
                 return r;
@@ -119,11 +119,11 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
 /* Sysctl for setting the IP addresses */
 int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,
                     void *oldval, size_t *oldlenp,
-                    void *newval, size_t newlen, void **context)
+                    void *newval, size_t newlen)
 {
         int r;
         mutex_lock(&lasat_info_mutex);
-        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);
+        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
         if (r < 0) {
                 mutex_unlock(&lasat_info_mutex);
                 return r;
@@ -139,14 +139,14 @@ int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,
 /* Same for RTC */
 int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,
                     void *oldval, size_t *oldlenp,
-                    void *newval, size_t newlen, void **context)
+                    void *newval, size_t newlen)
 {
         int r;
         mutex_lock(&lasat_info_mutex);
         rtctmp = ds1603_read();
         if (rtctmp < 0)
                 rtctmp = 0;
-        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);
+        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
         if (r < 0) {
                 mutex_unlock(&lasat_info_mutex);
                 return r;
@@ -251,13 +251,12 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
 
 static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen,
                                      void *oldval, size_t *oldlenp,
-                                     void *newval, size_t newlen,
-                                     void **context)
+                                     void *newval, size_t newlen)
 {
         int r;
 
         mutex_lock(&lasat_info_mutex);
-        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);
+        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
         if (r < 0) {
                 mutex_unlock(&lasat_info_mutex);
                 return r;
@@ -286,11 +285,11 @@ int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp,
                 mutex_unlock(&lasat_info_mutex);
                 return r;
         }
-        if (filp && filp->f_dentry)
+        if (filp && filp->f_path.dentry)
         {
-                if (!strcmp(filp->f_dentry->d_name.name, "prid"))
+                if (!strcmp(filp->f_path.dentry->d_name.name, "prid"))
                         lasat_board_info.li_eeprom_info.prid = lasat_board_info.li_prid;
-                if (!strcmp(filp->f_dentry->d_name.name, "debugaccess"))
+                if (!strcmp(filp->f_path.dentry->d_name.name, "debugaccess"))
                         lasat_board_info.li_eeprom_info.debugaccess = lasat_board_info.li_debugaccess;
         }
         lasat_write_eeprom_info();
diff --git a/arch/mips/lib-32/Makefile b/arch/mips/lib-32/Makefile
index ad285786e74b..dcd4d2ed2ac4 100644
--- a/arch/mips/lib-32/Makefile
+++ b/arch/mips/lib-32/Makefile
@@ -2,7 +2,7 @@
 # Makefile for MIPS-specific library files..
 #
 
-lib-y   += csum_partial.o memset.o watch.o
+lib-y   += memset.o watch.o
 
 obj-$(CONFIG_CPU_MIPS32)        += dump_tlb.o
 obj-$(CONFIG_CPU_MIPS64)        += dump_tlb.o
diff --git a/arch/mips/lib-32/csum_partial.S b/arch/mips/lib-32/csum_partial.S
deleted file mode 100644
index ea257dbdcc40..000000000000
--- a/arch/mips/lib-32/csum_partial.S
+++ /dev/null
@@ -1,240 +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) 1998 Ralf Baechle
- */
-#include <asm/asm.h>
-#include <asm/regdef.h>
-
-#define ADDC(sum,reg)                   \
-        addu    sum, reg;               \
-        sltu    v1, sum, reg;           \
-        addu    sum, v1
-
-#define CSUM_BIGCHUNK(src, offset, sum, t0, t1, t2, t3) \
-        lw      t0, (offset + 0x00)(src); \
-        lw      t1, (offset + 0x04)(src); \
-        lw      t2, (offset + 0x08)(src); \
-        lw      t3, (offset + 0x0c)(src); \
-        ADDC(sum, t0);                    \
-        ADDC(sum, t1);                    \
-        ADDC(sum, t2);                    \
-        ADDC(sum, t3);                    \
-        lw      t0, (offset + 0x10)(src); \
-        lw      t1, (offset + 0x14)(src); \
-        lw      t2, (offset + 0x18)(src); \
-        lw      t3, (offset + 0x1c)(src); \
-        ADDC(sum, t0);                    \
-        ADDC(sum, t1);                    \
-        ADDC(sum, t2);                    \
-        ADDC(sum, t3);                    \
-
-/*
- * a0: source address
- * a1: length of the area to checksum
- * a2: partial checksum
- */
-
-#define src a0
-#define dest a1
-#define sum v0
-
-        .text
-        .set    noreorder
-
-/* unknown src alignment and < 8 bytes to go  */
-small_csumcpy:
-        move    a1, t2
-
-        andi    t0, a1, 4
-        beqz    t0, 1f
-         andi   t0, a1, 2
-
-        /* Still a full word to go  */
-        ulw     t1, (src)
-        addiu   src, 4
-        ADDC(sum, t1)
-
-1:      move    t1, zero
-        beqz    t0, 1f
-         andi   t0, a1, 1
-
-        /* Still a halfword to go  */
-        ulhu    t1, (src)
-        addiu   src, 2
-
-1:      beqz    t0, 1f
-         sll    t1, t1, 16
-
-        lbu     t2, (src)
-         nop
-
-#ifdef __MIPSEB__
-        sll     t2, t2, 8
-#endif
-        or      t1, t2
-
-1:      ADDC(sum, t1)
-
-        /* fold checksum */
-        sll     v1, sum, 16
-        addu    sum, v1
-        sltu    v1, sum, v1
-        srl     sum, sum, 16
-        addu    sum, v1
-
-        /* odd buffer alignment? */
-        beqz    t7, 1f
-         nop
-        sll     v1, sum, 8
-        srl     sum, sum, 8
-        or      sum, v1
-        andi    sum, 0xffff
-1:
-        .set    reorder
-        /* Add the passed partial csum.  */
-        ADDC(sum, a2)
-        jr      ra
-        .set    noreorder
-
-/* ------------------------------------------------------------------------- */
-
-        .align  5
-LEAF(csum_partial)
-        move    sum, zero
-        move    t7, zero
-
-        sltiu   t8, a1, 0x8
-        bnez    t8, small_csumcpy               /* < 8 bytes to copy */
-         move   t2, a1
-
-        beqz    a1, out
-         andi   t7, src, 0x1                    /* odd buffer? */
-
-hword_align:
-        beqz    t7, word_align
-         andi   t8, src, 0x2
-
-        lbu     t0, (src)
-        subu    a1, a1, 0x1
-#ifdef __MIPSEL__
-        sll     t0, t0, 8
-#endif
-        ADDC(sum, t0)
-        addu    src, src, 0x1
-        andi    t8, src, 0x2
-
-word_align:
-        beqz    t8, dword_align
-         sltiu  t8, a1, 56
-
-        lhu     t0, (src)
-        subu    a1, a1, 0x2
-        ADDC(sum, t0)
-        sltiu   t8, a1, 56
-        addu    src, src, 0x2
-
-dword_align:
-        bnez    t8, do_end_words
-         move   t8, a1
-
-        andi    t8, src, 0x4
-        beqz    t8, qword_align
-         andi   t8, src, 0x8
-
-        lw      t0, 0x00(src)
-        subu    a1, a1, 0x4
-        ADDC(sum, t0)
-        addu    src, src, 0x4
-        andi    t8, src, 0x8
-
-qword_align:
-        beqz    t8, oword_align
-         andi   t8, src, 0x10
-
-        lw      t0, 0x00(src)
-        lw      t1, 0x04(src)
-        subu    a1, a1, 0x8
-        ADDC(sum, t0)
-        ADDC(sum, t1)
-        addu    src, src, 0x8
-        andi    t8, src, 0x10
-
-oword_align:
-        beqz    t8, begin_movement
-         srl    t8, a1, 0x7
-
-        lw      t3, 0x08(src)
-        lw      t4, 0x0c(src)
-        lw      t0, 0x00(src)
-        lw      t1, 0x04(src)
-        ADDC(sum, t3)
-        ADDC(sum, t4)
-        ADDC(sum, t0)
-        ADDC(sum, t1)
-        subu    a1, a1, 0x10
-        addu    src, src, 0x10
-        srl     t8, a1, 0x7
-
-begin_movement:
-        beqz    t8, 1f
-         andi   t2, a1, 0x40
-
-move_128bytes:
-        CSUM_BIGCHUNK(src, 0x00, sum, t0, t1, t3, t4)
-        CSUM_BIGCHUNK(src, 0x20, sum, t0, t1, t3, t4)
-        CSUM_BIGCHUNK(src, 0x40, sum, t0, t1, t3, t4)
-        CSUM_BIGCHUNK(src, 0x60, sum, t0, t1, t3, t4)
-        subu    t8, t8, 0x01
-        bnez    t8, move_128bytes
-         addu   src, src, 0x80
-
-1:
-        beqz    t2, 1f
-         andi   t2, a1, 0x20
-
-move_64bytes:
-        CSUM_BIGCHUNK(src, 0x00, sum, t0, t1, t3, t4)
-        CSUM_BIGCHUNK(src, 0x20, sum, t0, t1, t3, t4)
-        addu    src, src, 0x40
-
-1:
-        beqz    t2, do_end_words
-         andi   t8, a1, 0x1c
-
-move_32bytes:
-        CSUM_BIGCHUNK(src, 0x00, sum, t0, t1, t3, t4)
-        andi    t8, a1, 0x1c
-        addu    src, src, 0x20
-
-do_end_words:
-        beqz    t8, maybe_end_cruft
-         srl    t8, t8, 0x2
-
-end_words:
-        lw      t0, (src)
-        subu    t8, t8, 0x1
-        ADDC(sum, t0)
-        bnez    t8, end_words
-         addu   src, src, 0x4
-
-maybe_end_cruft:
-        andi    t2, a1, 0x3
-
-small_memcpy:
- j small_csumcpy; move a1, t2
-        beqz    t2, out
-         move   a1, t2
-
-end_bytes:
-        lb      t0, (src)
-        subu    a1, a1, 0x1
-        bnez    a2, end_bytes
-         addu   src, src, 0x1
-
-out:
-        jr      ra
-         move   v0, sum
-        END(csum_partial)
diff --git a/arch/mips/lib-64/Makefile b/arch/mips/lib-64/Makefile
index ad285786e74b..dcd4d2ed2ac4 100644
--- a/arch/mips/lib-64/Makefile
+++ b/arch/mips/lib-64/Makefile
@@ -2,7 +2,7 @@
 # Makefile for MIPS-specific library files..
 #
 
-lib-y   += csum_partial.o memset.o watch.o
+lib-y   += memset.o watch.o
 
 obj-$(CONFIG_CPU_MIPS32)        += dump_tlb.o
 obj-$(CONFIG_CPU_MIPS64)        += dump_tlb.o
diff --git a/arch/mips/lib-64/csum_partial.S b/arch/mips/lib-64/csum_partial.S
deleted file mode 100644
index 25aba660cc9c..000000000000
--- a/arch/mips/lib-64/csum_partial.S
+++ /dev/null
@@ -1,242 +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.
- *
- * Quick'n'dirty IP checksum ...
- *
- * Copyright (C) 1998, 1999 Ralf Baechle
- * Copyright (C) 1999 Silicon Graphics, Inc.
- */
-#include <asm/asm.h>
-#include <asm/regdef.h>
-
-#define ADDC(sum,reg)                                           \
-        addu    sum, reg;                                       \
-        sltu    v1, sum, reg;                                   \
-        addu    sum, v1
-
-#define CSUM_BIGCHUNK(src, offset, sum, t0, t1, t2, t3)         \
-        lw      t0, (offset + 0x00)(src);                       \
-        lw      t1, (offset + 0x04)(src);                       \
-        lw      t2, (offset + 0x08)(src);                       \
-        lw      t3, (offset + 0x0c)(src);                       \
-        ADDC(sum, t0);                                          \
-        ADDC(sum, t1);                                          \
-        ADDC(sum, t2);                                          \
-        ADDC(sum, t3);                                          \
-        lw      t0, (offset + 0x10)(src);                       \
-        lw      t1, (offset + 0x14)(src);                       \
-        lw      t2, (offset + 0x18)(src);                       \
-        lw      t3, (offset + 0x1c)(src);                       \
-        ADDC(sum, t0);                                          \
-        ADDC(sum, t1);                                          \
-        ADDC(sum, t2);                                          \
-        ADDC(sum, t3);                                          \
-
-/*
- * a0: source address
- * a1: length of the area to checksum
- * a2: partial checksum
- */
-
-#define src a0
-#define sum v0
-
-        .text
-        .set    noreorder
-
-/* unknown src alignment and < 8 bytes to go  */
-small_csumcpy:
-        move    a1, ta2
-
-        andi    ta0, a1, 4
-        beqz    ta0, 1f
-         andi   ta0, a1, 2
-
-        /* Still a full word to go  */
-        ulw     ta1, (src)
-        daddiu  src, 4
-        ADDC(sum, ta1)
-
-1:      move    ta1, zero
-        beqz    ta0, 1f
-         andi   ta0, a1, 1
-
-        /* Still a halfword to go  */
-        ulhu    ta1, (src)
-        daddiu  src, 2
-
-1:      beqz    ta0, 1f
-         sll    ta1, ta1, 16
-
-        lbu     ta2, (src)
-         nop
-
-#ifdef __MIPSEB__
-        sll     ta2, ta2, 8
-#endif
-        or      ta1, ta2
-
-1:      ADDC(sum, ta1)
-
-        /* fold checksum */
-        sll     v1, sum, 16
-        addu    sum, v1
-        sltu    v1, sum, v1
-        srl     sum, sum, 16
-        addu    sum, v1
-
-        /* odd buffer alignment? */
-        beqz    t3, 1f
-         nop
-        sll     v1, sum, 8
-        srl     sum, sum, 8
-        or      sum, v1
-        andi    sum, 0xffff
-1:
-        .set    reorder
-        /* Add the passed partial csum.  */
-        ADDC(sum, a2)
-        jr      ra
-        .set    noreorder
-
-/* ------------------------------------------------------------------------- */
-
-        .align  5
-LEAF(csum_partial)
-        move    sum, zero
-        move    t3, zero
-
-        sltiu   t8, a1, 0x8
-        bnez    t8, small_csumcpy               /* < 8 bytes to copy */
-         move   ta2, a1
-
-        beqz    a1, out
-         andi   t3, src, 0x1                    /* odd buffer? */
-
-hword_align:
-        beqz    t3, word_align
-         andi   t8, src, 0x2
-
-        lbu     ta0, (src)
-        dsubu   a1, a1, 0x1
-#ifdef __MIPSEL__
-        sll     ta0, ta0, 8
-#endif
-        ADDC(sum, ta0)
-        daddu   src, src, 0x1
-        andi    t8, src, 0x2
-
-word_align:
-        beqz    t8, dword_align
-         sltiu  t8, a1, 56
-
-        lhu     ta0, (src)
-        dsubu   a1, a1, 0x2
-        ADDC(sum, ta0)
-        sltiu   t8, a1, 56
-        daddu   src, src, 0x2
-
-dword_align:
-        bnez    t8, do_end_words
-         move   t8, a1
-
-        andi    t8, src, 0x4
-        beqz    t8, qword_align
-         andi   t8, src, 0x8
-
-        lw      ta0, 0x00(src)
-        dsubu   a1, a1, 0x4
-        ADDC(sum, ta0)
-        daddu   src, src, 0x4
-        andi    t8, src, 0x8
-
-qword_align:
-        beqz    t8, oword_align
-         andi   t8, src, 0x10
-
-        lw      ta0, 0x00(src)
-        lw      ta1, 0x04(src)
-        dsubu   a1, a1, 0x8
-        ADDC(sum, ta0)
-        ADDC(sum, ta1)
-        daddu   src, src, 0x8
-        andi    t8, src, 0x10
-
-oword_align:
-        beqz    t8, begin_movement
-         dsrl   t8, a1, 0x7
-
-        lw      ta3, 0x08(src)
-        lw      t0, 0x0c(src)
-        lw      ta0, 0x00(src)
-        lw      ta1, 0x04(src)
-        ADDC(sum, ta3)
-        ADDC(sum, t0)
-        ADDC(sum, ta0)
-        ADDC(sum, ta1)
-        dsubu   a1, a1, 0x10
-        daddu   src, src, 0x10
-        dsrl    t8, a1, 0x7
-
-begin_movement:
-        beqz    t8, 1f
-         andi   ta2, a1, 0x40
-
-move_128bytes:
-        CSUM_BIGCHUNK(src, 0x00, sum, ta0, ta1, ta3, t0)
-        CSUM_BIGCHUNK(src, 0x20, sum, ta0, ta1, ta3, t0)
-        CSUM_BIGCHUNK(src, 0x40, sum, ta0, ta1, ta3, t0)
-        CSUM_BIGCHUNK(src, 0x60, sum, ta0, ta1, ta3, t0)
-        dsubu   t8, t8, 0x01
-        bnez    t8, move_128bytes
-         daddu  src, src, 0x80
-
-1:
-        beqz    ta2, 1f
-         andi   ta2, a1, 0x20
-
-move_64bytes:
-        CSUM_BIGCHUNK(src, 0x00, sum, ta0, ta1, ta3, t0)
-        CSUM_BIGCHUNK(src, 0x20, sum, ta0, ta1, ta3, t0)
-        daddu   src, src, 0x40
-
-1:
-        beqz    ta2, do_end_words
-         andi   t8, a1, 0x1c
-
-move_32bytes:
-        CSUM_BIGCHUNK(src, 0x00, sum, ta0, ta1, ta3, t0)
-        andi    t8, a1, 0x1c
-        daddu   src, src, 0x20
-
-do_end_words:
-        beqz    t8, maybe_end_cruft
-         dsrl   t8, t8, 0x2
-
-end_words:
-        lw      ta0, (src)
-        dsubu   t8, t8, 0x1
-        ADDC(sum, ta0)
-        bnez    t8, end_words
-         daddu  src, src, 0x4
-
-maybe_end_cruft:
-        andi    ta2, a1, 0x3
-
-small_memcpy:
- j small_csumcpy; move a1, ta2          /* XXX ??? */
-        beqz    t2, out
-         move   a1, ta2
-
-end_bytes:
-        lb      ta0, (src)
-        dsubu   a1, a1, 0x1
-        bnez    a2, end_bytes
-         daddu  src, src, 0x1
-
-out:
-        jr      ra
-         move   v0, sum
-        END(csum_partial)
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index b225543f5302..989c900b8b14 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -2,8 +2,8 @@
 # Makefile for MIPS-specific library files..
 #
 
-lib-y   += csum_partial_copy.o memcpy.o promlib.o strlen_user.o strncpy_user.o \
-           strnlen_user.o uncached.o
+lib-y   += csum_partial.o memcpy.o promlib.o \
+           strlen_user.o strncpy_user.o strnlen_user.o uncached.o
 
 obj-y   += iomap.o
 
diff --git a/arch/mips/lib/csum_partial.S b/arch/mips/lib/csum_partial.S
new file mode 100644
index 000000000000..c0a77fe038be
--- /dev/null
+++ b/arch/mips/lib/csum_partial.S
@@ -0,0 +1,715 @@
+/*
+ * 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.
+ *
+ * Quick'n'dirty IP checksum ...
+ *
+ * Copyright (C) 1998, 1999 Ralf Baechle
+ * Copyright (C) 1999 Silicon Graphics, Inc.
+ */
+#include <linux/errno.h>
+#include <asm/asm.h>
+#include <asm/asm-offsets.h>
+#include <asm/regdef.h>
+
+#ifdef CONFIG_64BIT
+/*
+ * As we are sharing code base with the mips32 tree (which use the o32 ABI
+ * register definitions). We need to redefine the register definitions from
+ * the n64 ABI register naming to the o32 ABI register naming.
+ */
+#undef t0
+#undef t1
+#undef t2
+#undef t3
+#define t0      $8
+#define t1      $9
+#define t2      $10
+#define t3      $11
+#define t4      $12
+#define t5      $13
+#define t6      $14
+#define t7      $15
+
+#define USE_DOUBLE
+#endif
+
+#ifdef USE_DOUBLE
+
+#define LOAD   ld
+#define ADD    daddu
+#define NBYTES 8
+
+#else
+
+#define LOAD   lw
+#define ADD    addu
+#define NBYTES 4
+
+#endif /* USE_DOUBLE */
+
+#define UNIT(unit)  ((unit)*NBYTES)
+
+#define ADDC(sum,reg)                                           \
+        ADD     sum, reg;                                       \
+        sltu    v1, sum, reg;                                   \
+        ADD     sum, v1
+
+#define CSUM_BIGCHUNK1(src, offset, sum, _t0, _t1, _t2, _t3)    \
+        LOAD    _t0, (offset + UNIT(0))(src);                   \
+        LOAD    _t1, (offset + UNIT(1))(src);                   \
+        LOAD    _t2, (offset + UNIT(2))(src);                   \
+        LOAD    _t3, (offset + UNIT(3))(src);                   \
+        ADDC(sum, _t0);                                         \
+        ADDC(sum, _t1);                                         \
+        ADDC(sum, _t2);                                         \
+        ADDC(sum, _t3)
+
+#ifdef USE_DOUBLE
+#define CSUM_BIGCHUNK(src, offset, sum, _t0, _t1, _t2, _t3)     \
+        CSUM_BIGCHUNK1(src, offset, sum, _t0, _t1, _t2, _t3)
+#else
+#define CSUM_BIGCHUNK(src, offset, sum, _t0, _t1, _t2, _t3)     \
+        CSUM_BIGCHUNK1(src, offset, sum, _t0, _t1, _t2, _t3);   \
+        CSUM_BIGCHUNK1(src, offset + 0x10, sum, _t0, _t1, _t2, _t3)
+#endif
+
+/*
+ * a0: source address
+ * a1: length of the area to checksum
+ * a2: partial checksum
+ */
+
+#define src a0
+#define sum v0
+
+        .text
+        .set    noreorder
+        .align  5
+LEAF(csum_partial)
+        move    sum, zero
+        move    t7, zero
+
+        sltiu   t8, a1, 0x8
+        bnez    t8, small_csumcpy               /* < 8 bytes to copy */
+         move   t2, a1
+
+        andi    t7, src, 0x1                    /* odd buffer? */
+
+hword_align:
+        beqz    t7, word_align
+         andi   t8, src, 0x2
+
+        lbu     t0, (src)
+        LONG_SUBU       a1, a1, 0x1
+#ifdef __MIPSEL__
+        sll     t0, t0, 8
+#endif
+        ADDC(sum, t0)
+        PTR_ADDU        src, src, 0x1
+        andi    t8, src, 0x2
+
+word_align:
+        beqz    t8, dword_align
+         sltiu  t8, a1, 56
+
+        lhu     t0, (src)
+        LONG_SUBU       a1, a1, 0x2
+        ADDC(sum, t0)
+        sltiu   t8, a1, 56
+        PTR_ADDU        src, src, 0x2
+
+dword_align:
+        bnez    t8, do_end_words
+         move   t8, a1
+
+        andi    t8, src, 0x4
+        beqz    t8, qword_align
+         andi   t8, src, 0x8
+
+        lw      t0, 0x00(src)
+        LONG_SUBU       a1, a1, 0x4
+        ADDC(sum, t0)
+        PTR_ADDU        src, src, 0x4
+        andi    t8, src, 0x8
+
+qword_align:
+        beqz    t8, oword_align
+         andi   t8, src, 0x10
+
+#ifdef USE_DOUBLE
+        ld      t0, 0x00(src)
+        LONG_SUBU       a1, a1, 0x8
+        ADDC(sum, t0)
+#else
+        lw      t0, 0x00(src)
+        lw      t1, 0x04(src)
+        LONG_SUBU       a1, a1, 0x8
+        ADDC(sum, t0)
+        ADDC(sum, t1)
+#endif
+        PTR_ADDU        src, src, 0x8
+        andi    t8, src, 0x10
+
+oword_align:
+        beqz    t8, begin_movement
+         LONG_SRL       t8, a1, 0x7
+
+#ifdef USE_DOUBLE
+        ld      t0, 0x00(src)
+        ld      t1, 0x08(src)
+        ADDC(sum, t0)
+        ADDC(sum, t1)
+#else
+        CSUM_BIGCHUNK1(src, 0x00, sum, t0, t1, t3, t4)
+#endif
+        LONG_SUBU       a1, a1, 0x10
+        PTR_ADDU        src, src, 0x10
+        LONG_SRL        t8, a1, 0x7
+
+begin_movement:
+        beqz    t8, 1f
+         andi   t2, a1, 0x40
+
+move_128bytes:
+        CSUM_BIGCHUNK(src, 0x00, sum, t0, t1, t3, t4)
+        CSUM_BIGCHUNK(src, 0x20, sum, t0, t1, t3, t4)
+        CSUM_BIGCHUNK(src, 0x40, sum, t0, t1, t3, t4)
+        CSUM_BIGCHUNK(src, 0x60, sum, t0, t1, t3, t4)
+        LONG_SUBU       t8, t8, 0x01
+        bnez    t8, move_128bytes
+         PTR_ADDU       src, src, 0x80
+
+1:
+        beqz    t2, 1f
+         andi   t2, a1, 0x20
+
+move_64bytes:
+        CSUM_BIGCHUNK(src, 0x00, sum, t0, t1, t3, t4)
+        CSUM_BIGCHUNK(src, 0x20, sum, t0, t1, t3, t4)
+        PTR_ADDU        src, src, 0x40
+
+1:
+        beqz    t2, do_end_words
+         andi   t8, a1, 0x1c
+
+move_32bytes:
+        CSUM_BIGCHUNK(src, 0x00, sum, t0, t1, t3, t4)
+        andi    t8, a1, 0x1c
+        PTR_ADDU        src, src, 0x20
+
+do_end_words:
+        beqz    t8, small_csumcpy
+         andi   t2, a1, 0x3
+        LONG_SRL        t8, t8, 0x2
+
+end_words:
+        lw      t0, (src)
+        LONG_SUBU       t8, t8, 0x1
+        ADDC(sum, t0)
+        bnez    t8, end_words
+         PTR_ADDU       src, src, 0x4
+
+/* unknown src alignment and < 8 bytes to go  */
+small_csumcpy:
+        move    a1, t2
+
+        andi    t0, a1, 4
+        beqz    t0, 1f
+         andi   t0, a1, 2
+
+        /* Still a full word to go  */
+        ulw     t1, (src)
+        PTR_ADDIU       src, 4
+        ADDC(sum, t1)
+
+1:      move    t1, zero
+        beqz    t0, 1f
+         andi   t0, a1, 1
+
+        /* Still a halfword to go  */
+        ulhu    t1, (src)
+        PTR_ADDIU       src, 2
+
+1:      beqz    t0, 1f
+         sll    t1, t1, 16
+
+        lbu     t2, (src)
+         nop
+
+#ifdef __MIPSEB__
+        sll     t2, t2, 8
+#endif
+        or      t1, t2
+
+1:      ADDC(sum, t1)
+
+        /* fold checksum */
+#ifdef USE_DOUBLE
+        dsll32  v1, sum, 0
+        daddu   sum, v1
+        sltu    v1, sum, v1
+        dsra32  sum, sum, 0
+        addu    sum, v1
+#endif
+        sll     v1, sum, 16
+        addu    sum, v1
+        sltu    v1, sum, v1
+        srl     sum, sum, 16
+        addu    sum, v1
+
+        /* odd buffer alignment? */
+        beqz    t7, 1f
+         nop
+        sll     v1, sum, 8
+        srl     sum, sum, 8
+        or      sum, v1
+        andi    sum, 0xffff
+1:
+        .set    reorder
+        /* Add the passed partial csum.  */
+        ADDC(sum, a2)
+        jr      ra
+        .set    noreorder
+        END(csum_partial)
+
+
+/*
+ * checksum and copy routines based on memcpy.S
+ *
+ *      csum_partial_copy_nocheck(src, dst, len, sum)
+ *      __csum_partial_copy_user(src, dst, len, sum, errp)
+ *
+ * See "Spec" in memcpy.S for details.  Unlike __copy_user, all
+ * function in this file use the standard calling convention.
+ */
+
+#define src a0
+#define dst a1
+#define len a2
+#define psum a3
+#define sum v0
+#define odd t8
+#define errptr t9
+
+/*
+ * The exception handler for loads requires that:
+ *  1- AT contain the address of the byte just past the end of the source
+ *     of the copy,
+ *  2- src_entry <= src < AT, and
+ *  3- (dst - src) == (dst_entry - src_entry),
+ * The _entry suffix denotes values when __copy_user was called.
+ *
+ * (1) is set up up by __csum_partial_copy_from_user and maintained by
+ *      not writing AT in __csum_partial_copy
+ * (2) is met by incrementing src by the number of bytes copied
+ * (3) is met by not doing loads between a pair of increments of dst and src
+ *
+ * The exception handlers for stores stores -EFAULT to errptr and return.
+ * These handlers do not need to overwrite any data.
+ */
+
+#define EXC(inst_reg,addr,handler)              \
+9:      inst_reg, addr;                         \
+        .section __ex_table,"a";                \
+        PTR     9b, handler;                    \
+        .previous
+
+#ifdef USE_DOUBLE
+
+#define LOAD   ld
+#define LOADL  ldl
+#define LOADR  ldr
+#define STOREL sdl
+#define STORER sdr
+#define STORE  sd
+#define ADD    daddu
+#define SUB    dsubu
+#define SRL    dsrl
+#define SLL    dsll
+#define SLLV   dsllv
+#define SRLV   dsrlv
+#define NBYTES 8
+#define LOG_NBYTES 3
+
+#else
+
+#define LOAD   lw
+#define LOADL  lwl
+#define LOADR  lwr
+#define STOREL swl
+#define STORER swr
+#define STORE  sw
+#define ADD    addu
+#define SUB    subu
+#define SRL    srl
+#define SLL    sll
+#define SLLV   sllv
+#define SRLV   srlv
+#define NBYTES 4
+#define LOG_NBYTES 2
+
+#endif /* USE_DOUBLE */
+
+#ifdef CONFIG_CPU_LITTLE_ENDIAN
+#define LDFIRST LOADR
+#define LDREST  LOADL
+#define STFIRST STORER
+#define STREST  STOREL
+#define SHIFT_DISCARD SLLV
+#define SHIFT_DISCARD_REVERT SRLV
+#else
+#define LDFIRST LOADL
+#define LDREST  LOADR
+#define STFIRST STOREL
+#define STREST  STORER
+#define SHIFT_DISCARD SRLV
+#define SHIFT_DISCARD_REVERT SLLV
+#endif
+
+#define FIRST(unit) ((unit)*NBYTES)
+#define REST(unit)  (FIRST(unit)+NBYTES-1)
+
+#define ADDRMASK (NBYTES-1)
+
+        .set    noat
+
+LEAF(__csum_partial_copy_user)
+        PTR_ADDU        AT, src, len    /* See (1) above. */
+#ifdef CONFIG_64BIT
+        move    errptr, a4
+#else
+        lw      errptr, 16(sp)
+#endif
+FEXPORT(csum_partial_copy_nocheck)
+        move    sum, zero
+        move    odd, zero
+        /*
+         * Note: dst & src may be unaligned, len may be 0
+         * Temps
+         */
+        /*
+         * The "issue break"s below are very approximate.
+         * Issue delays for dcache fills will perturb the schedule, as will
+         * load queue full replay traps, etc.
+         *
+         * If len < NBYTES use byte operations.
+         */
+        sltu    t2, len, NBYTES
+        and     t1, dst, ADDRMASK
+        bnez    t2, copy_bytes_checklen
+         and    t0, src, ADDRMASK
+        andi    odd, dst, 0x1                   /* odd buffer? */
+        bnez    t1, dst_unaligned
+         nop
+        bnez    t0, src_unaligned_dst_aligned
+        /*
+         * use delay slot for fall-through
+         * src and dst are aligned; need to compute rem
+         */
+both_aligned:
+         SRL    t0, len, LOG_NBYTES+3    # +3 for 8 units/iter
+        beqz    t0, cleanup_both_aligned # len < 8*NBYTES
+         nop
+        SUB     len, 8*NBYTES           # subtract here for bgez loop
+        .align  4
+1:
+EXC(    LOAD    t0, UNIT(0)(src),       l_exc)
+EXC(    LOAD    t1, UNIT(1)(src),       l_exc_copy)
+EXC(    LOAD    t2, UNIT(2)(src),       l_exc_copy)
+EXC(    LOAD    t3, UNIT(3)(src),       l_exc_copy)
+EXC(    LOAD    t4, UNIT(4)(src),       l_exc_copy)
+EXC(    LOAD    t5, UNIT(5)(src),       l_exc_copy)
+EXC(    LOAD    t6, UNIT(6)(src),       l_exc_copy)
+EXC(    LOAD    t7, UNIT(7)(src),       l_exc_copy)
+        SUB     len, len, 8*NBYTES
+        ADD     src, src, 8*NBYTES
+EXC(    STORE   t0, UNIT(0)(dst),       s_exc)
+        ADDC(sum, t0)
+EXC(    STORE   t1, UNIT(1)(dst),       s_exc)
+        ADDC(sum, t1)
+EXC(    STORE   t2, UNIT(2)(dst),       s_exc)
+        ADDC(sum, t2)
+EXC(    STORE   t3, UNIT(3)(dst),       s_exc)
+        ADDC(sum, t3)
+EXC(    STORE   t4, UNIT(4)(dst),       s_exc)
+        ADDC(sum, t4)
+EXC(    STORE   t5, UNIT(5)(dst),       s_exc)
+        ADDC(sum, t5)
+EXC(    STORE   t6, UNIT(6)(dst),       s_exc)
+        ADDC(sum, t6)
+EXC(    STORE   t7, UNIT(7)(dst),       s_exc)
+        ADDC(sum, t7)
+        bgez    len, 1b
+         ADD    dst, dst, 8*NBYTES
+        ADD     len, 8*NBYTES           # revert len (see above)
+
+        /*
+         * len == the number of bytes left to copy < 8*NBYTES
+         */
+cleanup_both_aligned:
+#define rem t7
+        beqz    len, done
+         sltu   t0, len, 4*NBYTES
+        bnez    t0, less_than_4units
+         and    rem, len, (NBYTES-1)    # rem = len % NBYTES
+        /*
+         * len >= 4*NBYTES
+         */
+EXC(    LOAD    t0, UNIT(0)(src),       l_exc)
+EXC(    LOAD    t1, UNIT(1)(src),       l_exc_copy)
+EXC(    LOAD    t2, UNIT(2)(src),       l_exc_copy)
+EXC(    LOAD    t3, UNIT(3)(src),       l_exc_copy)
+        SUB     len, len, 4*NBYTES
+        ADD     src, src, 4*NBYTES
+EXC(    STORE   t0, UNIT(0)(dst),       s_exc)
+        ADDC(sum, t0)
+EXC(    STORE   t1, UNIT(1)(dst),       s_exc)
+        ADDC(sum, t1)
+EXC(    STORE   t2, UNIT(2)(dst),       s_exc)
+        ADDC(sum, t2)
+EXC(    STORE   t3, UNIT(3)(dst),       s_exc)
+        ADDC(sum, t3)
+        beqz    len, done
+         ADD    dst, dst, 4*NBYTES
+less_than_4units:
+        /*
+         * rem = len % NBYTES
+         */
+        beq     rem, len, copy_bytes
+         nop
+1:
+EXC(    LOAD    t0, 0(src),             l_exc)
+        ADD     src, src, NBYTES
+        SUB     len, len, NBYTES
+EXC(    STORE   t0, 0(dst),             s_exc)
+        ADDC(sum, t0)
+        bne     rem, len, 1b
+         ADD    dst, dst, NBYTES
+
+        /*
+         * src and dst are aligned, need to copy rem bytes (rem < NBYTES)
+         * A loop would do only a byte at a time with possible branch
+         * mispredicts.  Can't do an explicit LOAD dst,mask,or,STORE
+         * because can't assume read-access to dst.  Instead, use
+         * STREST dst, which doesn't require read access to dst.
+         *
+         * This code should perform better than a simple loop on modern,
+         * wide-issue mips processors because the code has fewer branches and
+         * more instruction-level parallelism.
+         */
+#define bits t2
+        beqz    len, done
+         ADD    t1, dst, len    # t1 is just past last byte of dst
+        li      bits, 8*NBYTES
+        SLL     rem, len, 3     # rem = number of bits to keep
+EXC(    LOAD    t0, 0(src),             l_exc)
+        SUB     bits, bits, rem # bits = number of bits to discard
+        SHIFT_DISCARD t0, t0, bits
+EXC(    STREST  t0, -1(t1),             s_exc)
+        SHIFT_DISCARD_REVERT t0, t0, bits
+        .set reorder
+        ADDC(sum, t0)
+        b       done
+        .set noreorder
+dst_unaligned:
+        /*
+         * dst is unaligned
+         * t0 = src & ADDRMASK
+         * t1 = dst & ADDRMASK; T1 > 0
+         * len >= NBYTES
+         *
+         * Copy enough bytes to align dst
+         * Set match = (src and dst have same alignment)
+         */
+#define match rem
+EXC(    LDFIRST t3, FIRST(0)(src),      l_exc)
+        ADD     t2, zero, NBYTES
+EXC(    LDREST  t3, REST(0)(src),       l_exc_copy)
+        SUB     t2, t2, t1      # t2 = number of bytes copied
+        xor     match, t0, t1
+EXC(    STFIRST t3, FIRST(0)(dst),      s_exc)
+        SLL     t4, t1, 3               # t4 = number of bits to discard
+        SHIFT_DISCARD t3, t3, t4
+        /* no SHIFT_DISCARD_REVERT to handle odd buffer properly */
+        ADDC(sum, t3)
+        beq     len, t2, done
+         SUB    len, len, t2
+        ADD     dst, dst, t2
+        beqz    match, both_aligned
+         ADD    src, src, t2
+
+src_unaligned_dst_aligned:
+        SRL     t0, len, LOG_NBYTES+2    # +2 for 4 units/iter
+        beqz    t0, cleanup_src_unaligned
+         and    rem, len, (4*NBYTES-1)   # rem = len % 4*NBYTES
+1:
+/*
+ * Avoid consecutive LD*'s to the same register since some mips
+ * implementations can't issue them in the same cycle.
+ * It's OK to load FIRST(N+1) before REST(N) because the two addresses
+ * are to the same unit (unless src is aligned, but it's not).
+ */
+EXC(    LDFIRST t0, FIRST(0)(src),      l_exc)
+EXC(    LDFIRST t1, FIRST(1)(src),      l_exc_copy)
+        SUB     len, len, 4*NBYTES
+EXC(    LDREST  t0, REST(0)(src),       l_exc_copy)
+EXC(    LDREST  t1, REST(1)(src),       l_exc_copy)
+EXC(    LDFIRST t2, FIRST(2)(src),      l_exc_copy)
+EXC(    LDFIRST t3, FIRST(3)(src),      l_exc_copy)
+EXC(    LDREST  t2, REST(2)(src),       l_exc_copy)
+EXC(    LDREST  t3, REST(3)(src),       l_exc_copy)
+        ADD     src, src, 4*NBYTES
+#ifdef CONFIG_CPU_SB1
+        nop                             # improves slotting
+#endif
+EXC(    STORE   t0, UNIT(0)(dst),       s_exc)
+        ADDC(sum, t0)
+EXC(    STORE   t1, UNIT(1)(dst),       s_exc)
+        ADDC(sum, t1)
+EXC(    STORE   t2, UNIT(2)(dst),       s_exc)
+        ADDC(sum, t2)
+EXC(    STORE   t3, UNIT(3)(dst),       s_exc)
+        ADDC(sum, t3)
+        bne     len, rem, 1b
+         ADD    dst, dst, 4*NBYTES
+
+cleanup_src_unaligned:
+        beqz    len, done
+         and    rem, len, NBYTES-1  # rem = len % NBYTES
+        beq     rem, len, copy_bytes
+         nop
+1:
+EXC(    LDFIRST t0, FIRST(0)(src),      l_exc)
+EXC(    LDREST  t0, REST(0)(src),       l_exc_copy)
+        ADD     src, src, NBYTES
+        SUB     len, len, NBYTES
+EXC(    STORE   t0, 0(dst),             s_exc)
+        ADDC(sum, t0)
+        bne     len, rem, 1b
+         ADD    dst, dst, NBYTES
+
+copy_bytes_checklen:
+        beqz    len, done
+         nop
+copy_bytes:
+        /* 0 < len < NBYTES  */
+#ifdef CONFIG_CPU_LITTLE_ENDIAN
+#define SHIFT_START 0
+#define SHIFT_INC 8
+#else
+#define SHIFT_START 8*(NBYTES-1)
+#define SHIFT_INC -8
+#endif
+        move    t2, zero        # partial word
+        li      t3, SHIFT_START # shift
+/* use l_exc_copy here to return correct sum on fault */
+#define COPY_BYTE(N)                    \
+EXC(    lbu     t0, N(src), l_exc_copy);        \
+        SUB     len, len, 1;            \
+EXC(    sb      t0, N(dst), s_exc);     \
+        SLLV    t0, t0, t3;             \
+        addu    t3, SHIFT_INC;          \
+        beqz    len, copy_bytes_done;   \
+         or     t2, t0
+
+        COPY_BYTE(0)
+        COPY_BYTE(1)
+#ifdef USE_DOUBLE
+        COPY_BYTE(2)
+        COPY_BYTE(3)
+        COPY_BYTE(4)
+        COPY_BYTE(5)
+#endif
+EXC(    lbu     t0, NBYTES-2(src), l_exc_copy)
+        SUB     len, len, 1
+EXC(    sb      t0, NBYTES-2(dst), s_exc)
+        SLLV    t0, t0, t3
+        or      t2, t0
+copy_bytes_done:
+        ADDC(sum, t2)
+done:
+        /* fold checksum */
+#ifdef USE_DOUBLE
+        dsll32  v1, sum, 0
+        daddu   sum, v1
+        sltu    v1, sum, v1
+        dsra32  sum, sum, 0
+        addu    sum, v1
+#endif
+        sll     v1, sum, 16
+        addu    sum, v1
+        sltu    v1, sum, v1
+        srl     sum, sum, 16
+        addu    sum, v1
+
+        /* odd buffer alignment? */
+        beqz    odd, 1f
+         nop
+        sll     v1, sum, 8
+        srl     sum, sum, 8
+        or      sum, v1
+        andi    sum, 0xffff
+1:
+        .set reorder
+        ADDC(sum, psum)
+        jr      ra
+        .set noreorder
+
+l_exc_copy:
+        /*
+         * Copy bytes from src until faulting load address (or until a
+         * lb faults)
+         *
+         * When reached by a faulting LDFIRST/LDREST, THREAD_BUADDR($28)
+         * may be more than a byte beyond the last address.
+         * Hence, the lb below may get an exception.
+         *
+         * Assumes src < THREAD_BUADDR($28)
+         */
+        LOAD    t0, TI_TASK($28)
+         li     t2, SHIFT_START
+        LOAD    t0, THREAD_BUADDR(t0)
+1:
+EXC(    lbu     t1, 0(src),     l_exc)
+        ADD     src, src, 1
+        sb      t1, 0(dst)      # can't fault -- we're copy_from_user
+        SLLV    t1, t1, t2
+        addu    t2, SHIFT_INC
+        ADDC(sum, t1)
+        bne     src, t0, 1b
+         ADD    dst, dst, 1
+l_exc:
+        LOAD    t0, TI_TASK($28)
+         nop
+        LOAD    t0, THREAD_BUADDR(t0)   # t0 is just past last good address
+         nop
+        SUB     len, AT, t0             # len number of uncopied bytes
+        /*
+         * Here's where we rely on src and dst being incremented in tandem,
+         *   See (3) above.
+         * dst += (fault addr - src) to put dst at first byte to clear
+         */
+        ADD     dst, t0                 # compute start address in a1
+        SUB     dst, src
+        /*
+         * Clear len bytes starting at dst.  Can't call __bzero because it
+         * might modify len.  An inefficient loop for these rare times...
+         */
+        beqz    len, done
+         SUB    src, len, 1
+1:      sb      zero, 0(dst)
+        ADD     dst, dst, 1
+        bnez    src, 1b
+         SUB    src, src, 1
+        li      v1, -EFAULT
+        b       done
+         sw     v1, (errptr)
+
+s_exc:
+        li      v0, -1 /* invalid checksum */
+        li      v1, -EFAULT
+        jr      ra
+         sw     v1, (errptr)
+        END(__csum_partial_copy_user)
diff --git a/arch/mips/lib/csum_partial_copy.c b/arch/mips/lib/csum_partial_copy.c
deleted file mode 100644
index 6e9f366f961d..000000000000
--- a/arch/mips/lib/csum_partial_copy.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 1994, 1995 Waldorf Electronics GmbH
- * Copyright (C) 1998, 1999 Ralf Baechle
- */
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <asm/byteorder.h>
-#include <asm/string.h>
-#include <asm/uaccess.h>
-#include <net/checksum.h>
-
-/*
- * 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)
-{
-        /*
-         * It's 2:30 am and I don't feel like doing it real ...
-         * This is lots slower than the real thing (tm)
-         */
-        sum = csum_partial(src, len, sum);
-        memcpy(dst, src, len);
-
-        return sum;
-}
-
-/*
- * 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)
-{
-        int missing;
-
-        might_sleep();
-        missing = copy_from_user(dst, src, len);
-        if (missing) {
-                memset(dst + len - missing, 0, missing);
-                *err_ptr = -EFAULT;
-        }
-
-        return csum_partial(dst, len, sum);
-}
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..a3c3a1d462b2 100644
--- a/arch/mips/mips-boards/generic/time.c
+++ b/arch/mips/mips-boards/generic/time.c
@@ -47,6 +47,9 @@
 #ifdef CONFIG_MIPS_MALTA
 #include <asm/mips-boards/maltaint.h>
 #endif
+#ifdef CONFIG_MIPS_SEAD
+#include <asm/mips-boards/seadint.h>
+#endif
 
 unsigned long cpu_khz;
 
@@ -263,11 +266,13 @@ void __init mips_time_init(void)
 
 void __init plat_timer_setup(struct irqaction *irq)
 {
+#ifdef MSC01E_INT_BASE
         if (cpu_has_veic) {
                 set_vi_handler (MSC01E_INT_CPUCTR, mips_timer_dispatch);
                 mips_cpu_timer_irq = MSC01E_INT_BASE + MSC01E_INT_CPUCTR;
-        }
-        else {
+        } else
+#endif
+        {
                 if (cpu_has_vint)
                         set_vi_handler (MIPSCPU_INT_CPUCTR, mips_timer_dispatch);
                 mips_cpu_timer_irq = MIPSCPU_INT_BASE + MIPSCPU_INT_CPUCTR;
@@ -288,6 +293,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/Makefile b/arch/mips/mips-boards/malta/Makefile
index 77ee5c6d33c1..b662c75fb28e 100644
--- a/arch/mips/mips-boards/malta/Makefile
+++ b/arch/mips/mips-boards/malta/Makefile
@@ -19,5 +19,5 @@
 # under Linux.
 #
 
-obj-y := malta_int.o malta_setup.o
+obj-y := malta_int.o malta_mtd.o malta_setup.o
 obj-$(CONFIG_SMP) += malta_smp.o
diff --git a/arch/mips/mips-boards/malta/malta_mtd.c b/arch/mips/mips-boards/malta/malta_mtd.c
new file mode 100644
index 000000000000..8ad9bdf25dce
--- /dev/null
+++ b/arch/mips/mips-boards/malta/malta_mtd.c
@@ -0,0 +1,63 @@
+/*
+ * 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 MIPS Technologies, Inc.
+ *     written by Ralf Baechle <ralf@linux-mips.org>
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <mtd/mtd-abi.h>
+
+static struct mtd_partition malta_mtd_partitions[] = {
+        {
+                .name =         "YAMON",
+                .offset =       0x0,
+                .size =         0x100000,
+                .mask_flags =   MTD_WRITEABLE
+        }, {
+                .name =         "User FS",
+                .offset =       0x100000,
+                .size =         0x2e0000
+        }, {
+                .name =         "Board Config",
+                .offset =       0x3e0000,
+                .size =         0x020000,
+                .mask_flags =   MTD_WRITEABLE
+        }
+};
+
+static struct physmap_flash_data malta_flash_data = {
+        .width          = 4,
+        .nr_parts       = ARRAY_SIZE(malta_mtd_partitions),
+        .parts          = malta_mtd_partitions
+};
+
+static struct resource malta_flash_resource = {
+        .start          = 0x1e000000,
+        .end            = 0x1e3fffff,
+        .flags          = IORESOURCE_MEM
+};
+
+static struct platform_device malta_flash = {
+        .name           = "physmap-flash",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &malta_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &malta_flash_resource,
+};
+
+static int __init malta_mtd_init(void)
+{
+        platform_device_register(&malta_flash);
+
+        return 0;
+}
+
+module_init(malta_mtd_init)
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c
index 282f3e52eea3..56ea76679cd4 100644
--- a/arch/mips/mips-boards/malta/malta_setup.c
+++ b/arch/mips/mips-boards/malta/malta_setup.c
@@ -21,13 +21,6 @@
 #include <linux/pci.h>
 #include <linux/screen_info.h>
 
-#ifdef CONFIG_MTD
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#endif
-
 #include <asm/cpu.h>
 #include <asm/bootinfo.h>
 #include <asm/irq.h>
@@ -58,30 +51,6 @@ struct resource standard_io_resources[] = {
         { .name = "dma2", .start = 0xc0, .end = 0xdf, .flags = IORESOURCE_BUSY },
 };
 
-#ifdef CONFIG_MTD
-static struct mtd_partition malta_mtd_partitions[] = {
-        {
-                .name =         "YAMON",
-                .offset =       0x0,
-                .size =         0x100000,
-                .mask_flags =   MTD_WRITEABLE
-        },
-        {
-                .name =         "User FS",
-                .offset =       0x100000,
-                .size =         0x2e0000
-        },
-        {
-                .name =         "Board Config",
-                .offset =       0x3e0000,
-                .size =         0x020000,
-                .mask_flags =   MTD_WRITEABLE
-        }
-};
-
-#define number_partitions       (sizeof(malta_mtd_partitions)/sizeof(struct mtd_partition))
-#endif
-
 const char *get_system_type(void)
 {
         return "MIPS Malta";
@@ -211,14 +180,6 @@ void __init plat_mem_setup(void)
 #endif
 #endif
 
-#ifdef CONFIG_MTD
-        /*
-         * Support for MTD on Malta. Use the generic physmap driver
-         */
-        physmap_configure(0x1e000000, 0x400000, 4, NULL);
-        physmap_set_partitions(malta_mtd_partitions, number_partitions);
-#endif
-
         mips_reboot_setup();
 
         board_time_init = mips_time_init;
diff --git a/arch/mips/mips-boards/sead/sead_int.c b/arch/mips/mips-boards/sead/sead_int.c
index f445fcddfdfd..874ccb0066b8 100644
--- a/arch/mips/mips-boards/sead/sead_int.c
+++ b/arch/mips/mips-boards/sead/sead_int.c
@@ -21,7 +21,7 @@
  * Sead board.
  */
 #include <linux/init.h>
-#include <linux/irq.h>
+#include <linux/interrupt.h>
 
 #include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
@@ -108,7 +108,7 @@ asmlinkage void plat_irq_dispatch(void)
         if (irq >= 0)
                 do_IRQ(MIPSCPU_INT_BASE + irq);
         else
-                spurious_interrupt(regs);
+                spurious_interrupt();
 }
 
 void __init arch_init_irq(void)
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/cache.c b/arch/mips/mm/cache.c
index caf807ded514..1f954a238a63 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -32,6 +32,7 @@ void (*local_flush_data_cache_page)(void * addr);
 void (*flush_data_cache_page)(unsigned long addr);
 void (*flush_icache_all)(void);
 
+EXPORT_SYMBOL_GPL(local_flush_data_cache_page);
 EXPORT_SYMBOL(flush_data_cache_page);
 
 #ifdef CONFIG_DMA_NONCOHERENT
diff --git a/arch/mips/mm/dma-coherent.c b/arch/mips/mm/dma-coherent.c
index 7fa5fd16e46b..5697c6e250a3 100644
--- a/arch/mips/mm/dma-coherent.c
+++ b/arch/mips/mm/dma-coherent.c
@@ -190,14 +190,14 @@ int dma_supported(struct device *dev, u64 mask)
 
 EXPORT_SYMBOL(dma_supported);
 
-int dma_is_consistent(dma_addr_t dma_addr)
+int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)
 {
         return 1;
 }
 
 EXPORT_SYMBOL(dma_is_consistent);
 
-void dma_cache_sync(void *vaddr, size_t size,
+void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                enum dma_data_direction direction)
 {
         BUG_ON(direction == DMA_NONE);
diff --git a/arch/mips/mm/dma-ip27.c b/arch/mips/mm/dma-ip27.c
index 8da19fd22ac6..f088344db465 100644
--- a/arch/mips/mm/dma-ip27.c
+++ b/arch/mips/mm/dma-ip27.c
@@ -197,14 +197,14 @@ int dma_supported(struct device *dev, u64 mask)
 
 EXPORT_SYMBOL(dma_supported);
 
-int dma_is_consistent(dma_addr_t dma_addr)
+int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)
 {
         return 1;
 }
 
 EXPORT_SYMBOL(dma_is_consistent);
 
-void dma_cache_sync(void *vaddr, size_t size,
+void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                enum dma_data_direction direction)
 {
         BUG_ON(direction == DMA_NONE);
diff --git a/arch/mips/mm/dma-ip32.c b/arch/mips/mm/dma-ip32.c
index ec54ed0d26ff..b42b6f7456e6 100644
--- a/arch/mips/mm/dma-ip32.c
+++ b/arch/mips/mm/dma-ip32.c
@@ -363,14 +363,15 @@ int dma_supported(struct device *dev, u64 mask)
 
 EXPORT_SYMBOL(dma_supported);
 
-int dma_is_consistent(dma_addr_t dma_addr)
+int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)
 {
         return 1;
 }
 
 EXPORT_SYMBOL(dma_is_consistent);
 
-void dma_cache_sync(void *vaddr, size_t size, enum dma_data_direction direction)
+void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
+        enum dma_data_direction direction)
 {
         if (direction == DMA_NONE)
                 return;
diff --git a/arch/mips/mm/dma-noncoherent.c b/arch/mips/mm/dma-noncoherent.c
index 2eeffe5c2a3a..8cecef0957c3 100644
--- a/arch/mips/mm/dma-noncoherent.c
+++ b/arch/mips/mm/dma-noncoherent.c
@@ -299,14 +299,15 @@ int dma_supported(struct device *dev, u64 mask)
 
 EXPORT_SYMBOL(dma_supported);
 
-int dma_is_consistent(dma_addr_t dma_addr)
+int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)
 {
         return 1;
 }
 
 EXPORT_SYMBOL(dma_is_consistent);
 
-void dma_cache_sync(void *vaddr, size_t size, enum dma_data_direction direction)
+void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
+        enum dma_data_direction direction)
 {
         if (direction == DMA_NONE)
                 return;
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/highmem.c b/arch/mips/mm/highmem.c
index 99ebf3ccc222..675502ada5a2 100644
--- a/arch/mips/mm/highmem.c
+++ b/arch/mips/mm/highmem.c
@@ -39,7 +39,7 @@ void *__kmap_atomic(struct page *page, enum km_type type)
         unsigned long vaddr;
 
         /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
-        inc_preempt_count();
+        pagefault_disable();
         if (!PageHighMem(page))
                 return page_address(page);
 
@@ -62,8 +62,7 @@ void __kunmap_atomic(void *kvaddr, enum km_type type)
         enum fixed_addresses idx = type + KM_TYPE_NR*smp_processor_id();
 
         if (vaddr < FIXADDR_START) { // FIXME
-                dec_preempt_count();
-                preempt_check_resched();
+                pagefault_enable();
                 return;
         }
 
@@ -78,8 +77,7 @@ void __kunmap_atomic(void *kvaddr, enum km_type type)
         local_flush_tlb_one(vaddr);
 #endif
 
-        dec_preempt_count();
-        preempt_check_resched();
+        pagefault_enable();
 }
 
 #ifndef CONFIG_LIMITED_DMA
@@ -92,7 +90,7 @@ void *kmap_atomic_pfn(unsigned long pfn, enum km_type type)
         enum fixed_addresses idx;
         unsigned long vaddr;
 
-        inc_preempt_count();
+        pagefault_disable();
 
         idx = type + KM_TYPE_NR*smp_processor_id();
         vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 2de4d3c367a2..30245c09d025 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++;
         }
@@ -203,6 +203,31 @@ static inline void kunmap_coherent(struct page *page)
         preempt_check_resched();
 }
 
+void copy_user_highpage(struct page *to, struct page *from,
+        unsigned long vaddr, struct vm_area_struct *vma)
+{
+        void *vfrom, *vto;
+
+        vto = kmap_atomic(to, KM_USER1);
+        if (cpu_has_dc_aliases) {
+                vfrom = kmap_coherent(from, vaddr);
+                copy_page(vto, vfrom);
+                kunmap_coherent(from);
+        } else {
+                vfrom = kmap_atomic(from, KM_USER0);
+                copy_page(vto, vfrom);
+                kunmap_atomic(vfrom, KM_USER0);
+        }
+        if (((vma->vm_flags & VM_EXEC) && !cpu_has_ic_fills_f_dc) ||
+            pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
+                flush_data_cache_page((unsigned long)vto);
+        kunmap_atomic(vto, KM_USER1);
+        /* Make sure this page is cleared on other CPU's too before using it */
+        smp_wmb();
+}
+
+EXPORT_SYMBOL(copy_user_highpage);
+
 void copy_to_user_page(struct vm_area_struct *vma,
         struct page *page, unsigned long vaddr, void *dst, const void *src,
         unsigned long len)
@@ -316,7 +341,7 @@ static int __init page_is_ram(unsigned long pagenr)
 void __init paging_init(void)
 {
         unsigned long zones_size[MAX_NR_ZONES] = { 0, };
-        unsigned long max_dma, high, low;
+        unsigned long max_dma, low;
 #ifndef CONFIG_FLATMEM
         unsigned long zholes_size[MAX_NR_ZONES] = { 0, };
         unsigned long i, j, pfn;
@@ -331,7 +356,6 @@ void __init paging_init(void)
 
         max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
         low = max_low_pfn;
-        high = highend_pfn;
 
 #ifdef CONFIG_ISA
         if (low < max_dma)
@@ -344,13 +368,13 @@ void __init paging_init(void)
         zones_size[ZONE_DMA] = low;
 #endif
 #ifdef CONFIG_HIGHMEM
-        if (cpu_has_dc_aliases) {
-                printk(KERN_WARNING "This processor doesn't support highmem.");
-                if (high - low)
-                        printk(" %ldk highmem ignored", high - low);
-                printk("\n");
-        } else
-                zones_size[ZONE_HIGHMEM] = high - low;
+        zones_size[ZONE_HIGHMEM] = highend_pfn - highstart_pfn;
+
+        if (cpu_has_dc_aliases && zones_size[ZONE_HIGHMEM]) {
+                printk(KERN_WARNING "This processor doesn't support highmem."
+                       " %ldk highmem ignored\n", zones_size[ZONE_HIGHMEM]);
+                zones_size[ZONE_HIGHMEM] = 0;
+        }
 #endif
 
 #ifdef CONFIG_FLATMEM
@@ -443,15 +467,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 (pfn = PFN_UP(begin); pfn < PFN_DOWN(end); pfn++) {
+                struct page *page = pfn_to_page(pfn);
+                void *addr = phys_to_virt(PFN_PHYS(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);
+                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 +487,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 +497,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/ioremap.c b/arch/mips/mm/ioremap.c
index cea7d0ea36e4..fc2c96f0a1fd 100644
--- a/arch/mips/mm/ioremap.c
+++ b/arch/mips/mm/ioremap.c
@@ -6,98 +6,13 @@
  * (C) Copyright 1995 1996 Linus Torvalds
  * (C) Copyright 2001, 2002 Ralf Baechle
  */
+#include <linux/mm.h>
 #include <linux/module.h>
 #include <asm/addrspace.h>
 #include <asm/byteorder.h>
 
 #include <linux/vmalloc.h>
-#include <asm/cacheflush.h>
-#include <asm/io.h>
-#include <asm/tlbflush.h>
-
-static inline void remap_area_pte(pte_t * pte, unsigned long address,
-        phys_t size, phys_t phys_addr, unsigned long flags)
-{
-        phys_t end;
-        unsigned long pfn;
-        pgprot_t pgprot = __pgprot(_PAGE_GLOBAL | _PAGE_PRESENT | __READABLE
-                                   | __WRITEABLE | flags);
-
-        address &= ~PMD_MASK;
-        end = address + size;
-        if (end > PMD_SIZE)
-                end = PMD_SIZE;
-        if (address >= end)
-                BUG();
-        pfn = phys_addr >> PAGE_SHIFT;
-        do {
-                if (!pte_none(*pte)) {
-                        printk("remap_area_pte: page already exists\n");
-                        BUG();
-                }
-                set_pte(pte, pfn_pte(pfn, pgprot));
-                address += PAGE_SIZE;
-                pfn++;
-                pte++;
-        } while (address && (address < end));
-}
-
-static inline int remap_area_pmd(pmd_t * pmd, unsigned long address,
-        phys_t size, phys_t phys_addr, unsigned long flags)
-{
-        phys_t end;
-
-        address &= ~PGDIR_MASK;
-        end = address + size;
-        if (end > PGDIR_SIZE)
-                end = PGDIR_SIZE;
-        phys_addr -= address;
-        if (address >= end)
-                BUG();
-        do {
-                pte_t * pte = pte_alloc_kernel(pmd, address);
-                if (!pte)
-                        return -ENOMEM;
-                remap_area_pte(pte, address, end - address, address + phys_addr, flags);
-                address = (address + PMD_SIZE) & PMD_MASK;
-                pmd++;
-        } while (address && (address < end));
-        return 0;
-}
-
-static int remap_area_pages(unsigned long address, phys_t phys_addr,
-        phys_t size, unsigned long flags)
-{
-        int error;
-        pgd_t * dir;
-        unsigned long end = address + size;
-
-        phys_addr -= address;
-        dir = pgd_offset(&init_mm, address);
-        flush_cache_all();
-        if (address >= end)
-                BUG();
-        do {
-                pud_t *pud;
-                pmd_t *pmd;
-
-                error = -ENOMEM;
-                pud = pud_alloc(&init_mm, dir, address);
-                if (!pud)
-                        break;
-                pmd = pmd_alloc(&init_mm, pud, address);
-                if (!pmd)
-                        break;
-                if (remap_area_pmd(pmd, address, end - address,
-                                         phys_addr + address, flags))
-                        break;
-                error = 0;
-                address = (address + PGDIR_SIZE) & PGDIR_MASK;
-                dir++;
-        } while (address && (address < end));
-        flush_tlb_all();
-        return error;
-}
+#include <linux/io.h>
 
 /*
  * Generic mapping function (not visible outside):
@@ -121,6 +36,7 @@ void __iomem * __ioremap(phys_t phys_addr, phys_t size, unsigned long flags)
         unsigned long offset;
         phys_t last_addr;
         void * addr;
+        pgprot_t pgprot;
 
         phys_addr = fixup_bigphys_addr(phys_addr, size);
 
@@ -152,6 +68,9 @@ void __iomem * __ioremap(phys_t phys_addr, phys_t size, unsigned long flags)
                                 return NULL;
         }
 
+        pgprot = __pgprot(_PAGE_GLOBAL | _PAGE_PRESENT | __READABLE
+                          | __WRITEABLE | flags);
+
         /*
          * Mappings have to be page-aligned
          */
@@ -166,7 +85,8 @@ void __iomem * __ioremap(phys_t phys_addr, phys_t size, unsigned long flags)
         if (!area)
                 return NULL;
         addr = area->addr;
-        if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
+        if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size,
+                               phys_addr, pgprot)) {
                 vunmap(addr);
                 return NULL;
         }
diff --git a/arch/mips/mm/pg-r4k.c b/arch/mips/mm/pg-r4k.c
index d41fc5885e87..dc795be62807 100644
--- a/arch/mips/mm/pg-r4k.c
+++ b/arch/mips/mm/pg-r4k.c
@@ -243,11 +243,10 @@ static void __init __build_store_reg(int reg)
 
 static inline void build_store_reg(int reg)
 {
-        if (cpu_has_prefetch)
-                if (reg)
-                        build_dst_pref(pref_offset_copy);
-                else
-                        build_dst_pref(pref_offset_clear);
+        int pref_off = cpu_has_prefetch ?
+                (reg ? pref_offset_copy : pref_offset_clear) : 0;
+        if (pref_off)
+                build_dst_pref(pref_off);
         else if (cpu_has_cache_cdex_s)
                 build_cdex_s();
         else if (cpu_has_cache_cdex_p)
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..bb11fef08472 100644
--- a/arch/mips/momentum/ocelot_c/cpci-irq.c
+++ b/arch/mips/momentum/ocelot_c/cpci-irq.c
@@ -66,48 +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)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-                unmask_cpci_irq(irq);
-}
-
-/*
  * Interrupt handler for interrupts coming from the FPGA chip.
  * It could be built in ethernet ports etc...
  */
@@ -125,27 +83,18 @@ 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,
-        .end = end_cpci_irq,
+        .ack = mask_cpci_irq,
+        .mask = mask_cpci_irq,
+        .mask_ack = mask_cpci_irq,
+        .unmask = unmask_cpci_irq,
 };
 
 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..a7a80c0da569 100644
--- a/arch/mips/momentum/ocelot_c/uart-irq.c
+++ b/arch/mips/momentum/ocelot_c/uart-irq.c
@@ -60,48 +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)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-                unmask_uart_irq(irq);
-}
-
-/*
  * Interrupt handler for interrupts coming from the FPGA chip.
  */
 void ll_uart_irq(void)
@@ -118,28 +76,16 @@ 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,
-        .end = end_uart_irq,
+        .ack = mask_uart_irq,
+        .mask = mask_uart_irq,
+        .mask_ack = mask_uart_irq,
+        .unmask = unmask_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/Makefile b/arch/mips/pci/Makefile
index 70cb55b89df6..82b20c28bef8 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -43,7 +43,7 @@ obj-$(CONFIG_SGI_IP32)		+= fixup-ip32.o ops-mace.o pci-ip32.o
 obj-$(CONFIG_SIBYTE_SB1250)     += fixup-sb1250.o pci-sb1250.o
 obj-$(CONFIG_SIBYTE_BCM112X)    += fixup-sb1250.o pci-sb1250.o
 obj-$(CONFIG_SIBYTE_BCM1x80)    += pci-bcm1480.o pci-bcm1480ht.o
-obj-$(CONFIG_SNI_RM200_PCI)     += fixup-sni.o ops-sni.o
+obj-$(CONFIG_SNI_RM)            += fixup-sni.o ops-sni.o
 obj-$(CONFIG_TANBAC_TB0219)     += fixup-tb0219.o
 obj-$(CONFIG_TANBAC_TB0226)     += fixup-tb0226.o
 obj-$(CONFIG_TANBAC_TB0287)     += fixup-tb0287.o
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/fixup-pnx8550.c b/arch/mips/pci/fixup-pnx8550.c
index 4256b3b30b77..50546dab6689 100644
--- a/arch/mips/pci/fixup-pnx8550.c
+++ b/arch/mips/pci/fixup-pnx8550.c
@@ -33,7 +33,7 @@
 #define DBG(x...)
 #endif
 
-extern char irq_tab_jbs[][5];
+extern char pnx8550_irq_tab[][5];
 
 void __init pcibios_fixup_resources(struct pci_dev *dev)
 {
@@ -47,7 +47,7 @@ void __init pcibios_fixup(void)
 
 int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-        return irq_tab_jbs[slot][pin];
+        return pnx8550_irq_tab[slot][pin];
 }
 
 /* Do platform specific device initialization at pci_enable_device() time */
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/pci/ops-pnx8550.c b/arch/mips/pci/ops-pnx8550.c
index 454b65cc3354..f556b7a8dccd 100644
--- a/arch/mips/pci/ops-pnx8550.c
+++ b/arch/mips/pci/ops-pnx8550.c
@@ -202,7 +202,7 @@ write_config_byte(struct pci_bus *bus, unsigned int devfn, int where, u8 val)
                 break;
         }
 
-        err = config_access(PCI_CMD_CONFIG_READ, bus, devfn, where, ~(1 << (where & 3)), &data);
+        err = config_access(PCI_CMD_CONFIG_WRITE, bus, devfn, where, ~(1 << (where & 3)), &data);
 
         return err;
 }
diff --git a/arch/mips/philips/pnx8550/common/int.c b/arch/mips/philips/pnx8550/common/int.c
index 710611615ca2..2c36c108c4d6 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,27 +158,12 @@ 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);
-        }
-}
-
 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,
-        .end =          end_irq,
+        .ack =          mask_irq,
+        .mask =         mask_irq,
+        .mask_ack =     mask_irq,
+        .unmask =       unmask_irq,
 };
 
 static struct irqaction gic_action = {
@@ -233,8 +184,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 +221,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 +230,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/philips/pnx8550/common/prom.c b/arch/mips/philips/pnx8550/common/prom.c
index f8952c1359cd..eb6ec11fef07 100644
--- a/arch/mips/philips/pnx8550/common/prom.c
+++ b/arch/mips/philips/pnx8550/common/prom.c
@@ -35,23 +35,15 @@ char * prom_getcmdline(void)
         return &(arcs_cmdline[0]);
 }
 
-void  prom_init_cmdline(void)
+void __init prom_init_cmdline(void)
 {
-        char *cp;
-        int actr;
-
-        actr = 1; /* Always ignore argv[0] */
+        int i;
 
-        cp = &(arcs_cmdline[0]);
-        while(actr < prom_argc) {
-                strcpy(cp, prom_argv[actr]);
-                cp += strlen(prom_argv[actr]);
-                *cp++ = ' ';
-                actr++;
+        arcs_cmdline[0] = '\0';
+        for (i = 0; i < prom_argc; i++) {
+                strcat(arcs_cmdline, prom_argv[i]);
+                strcat(arcs_cmdline, " ");
         }
-        if (cp != &(arcs_cmdline[0])) /* get rid of trailing space */
-                --cp;
-        *cp = '\0';
 }
 
 char *prom_getenv(char *envname)
diff --git a/arch/mips/philips/pnx8550/common/time.c b/arch/mips/philips/pnx8550/common/time.c
index 65c440e8480b..68def3880a1c 100644
--- a/arch/mips/philips/pnx8550/common/time.c
+++ b/arch/mips/philips/pnx8550/common/time.c
@@ -33,7 +33,17 @@
 #include <int.h>
 #include <cm.h>
 
-extern unsigned int mips_hpt_frequency;
+static unsigned long cpj;
+
+static cycle_t hpt_read(void)
+{
+        return read_c0_count2();
+}
+
+static void timer_ack(void)
+{
+        write_c0_compare(cpj);
+}
 
 /*
  * pnx8550_time_init() - it does the following things:
@@ -68,27 +78,48 @@ void pnx8550_time_init(void)
          * HZ timer interrupts per second.
          */
         mips_hpt_frequency = 27UL * ((1000000UL * n)/(m * pow2p));
+        cpj = (mips_hpt_frequency + HZ / 2) / HZ;
+        write_c0_count(0);
+        timer_ack();
+
+        /* Setup Timer 2 */
+        write_c0_count2(0);
+        write_c0_compare2(0xffffffff);
+
+        clocksource_mips.read = hpt_read;
+        mips_timer_ack = timer_ack;
+}
+
+static irqreturn_t monotonic_interrupt(int irq, void *dev_id)
+{
+        /* Timer 2 clear interrupt */
+        write_c0_compare2(-1);
+        return IRQ_HANDLED;
 }
 
+static struct irqaction monotonic_irqaction = {
+        .handler = monotonic_interrupt,
+        .flags = IRQF_DISABLED,
+        .name = "Monotonic timer",
+};
+
 void __init plat_timer_setup(struct irqaction *irq)
 {
         int configPR;
 
         setup_irq(PNX8550_INT_TIMER1, irq);
+        setup_irq(PNX8550_INT_TIMER2, &monotonic_irqaction);
 
-        /* Start timer1 */
+        /* Timer 1 start */
         configPR = read_c0_config7();
         configPR &= ~0x00000008;
         write_c0_config7(configPR);
 
-        /* Timer 2 stop */
+        /* Timer 2 start */
         configPR = read_c0_config7();
-        configPR |= 0x00000010;
+        configPR &= ~0x00000010;
         write_c0_config7(configPR);
 
-        write_c0_count2(0);
-        write_c0_compare2(0xffffffff);
-
         /* Timer 3 stop */
         configPR = read_c0_config7();
         configPR |= 0x00000020;
diff --git a/arch/mips/philips/pnx8550/jbs/irqmap.c b/arch/mips/philips/pnx8550/jbs/irqmap.c
index f78e0423dc98..98c3429e6e50 100644
--- a/arch/mips/philips/pnx8550/jbs/irqmap.c
+++ b/arch/mips/philips/pnx8550/jbs/irqmap.c
@@ -28,9 +28,9 @@
 #include <linux/init.h>
 #include <int.h>
 
-char irq_tab_jbs[][5] __initdata = {
- [8] =  { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
- [9] =  { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
- [17] = { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
+char pnx8550_irq_tab[][5] __initdata = {
+        [8]     = { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
+        [9]     = { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
+        [17]    = { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
 };
 
diff --git a/arch/mips/philips/pnx8550/stb810/Makefile b/arch/mips/philips/pnx8550/stb810/Makefile
new file mode 100644
index 000000000000..f14b592af398
--- /dev/null
+++ b/arch/mips/philips/pnx8550/stb810/Makefile
@@ -0,0 +1,4 @@
+
+# Makefile for the Philips STB810 Board.
+
+lib-y := prom_init.o board_setup.o irqmap.o
diff --git a/arch/mips/philips/pnx8550/stb810/board_setup.c b/arch/mips/philips/pnx8550/stb810/board_setup.c
new file mode 100644
index 000000000000..345d71e53cf2
--- /dev/null
+++ b/arch/mips/philips/pnx8550/stb810/board_setup.c
@@ -0,0 +1,49 @@
+/*
+ *  STB810 specific board startup routines.
+ *
+ *  Based on the arch/mips/philips/pnx8550/jbs/board_setup.c
+ *
+ *  Author: MontaVista Software, Inc.
+ *          source@mvista.com
+ *
+ *  Copyright 2005 MontaVista Software Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation; either version 2 of the License, or (at your
+ *  option) any later version.
+ */
+
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/ioport.h>
+#include <linux/mm.h>
+#include <linux/console.h>
+#include <linux/mc146818rtc.h>
+#include <linux/delay.h>
+
+#include <asm/cpu.h>
+#include <asm/bootinfo.h>
+#include <asm/irq.h>
+#include <asm/mipsregs.h>
+#include <asm/reboot.h>
+#include <asm/pgtable.h>
+
+#include <glb.h>
+
+void __init board_setup(void)
+{
+        unsigned long config0, configpr;
+
+        config0 = read_c0_config();
+
+        /* clear all three cache coherency fields */
+        config0 &= ~(0x7 | (7<<25) | (7<<28));
+        config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) |
+                        (CONF_CM_DEFAULT<<28));
+        write_c0_config(config0);
+
+        configpr = read_c0_config7();
+        configpr |= (1<<19); /* enable tlb */
+        write_c0_config7(configpr);
+}
diff --git a/arch/mips/philips/pnx8550/stb810/irqmap.c b/arch/mips/philips/pnx8550/stb810/irqmap.c
new file mode 100644
index 000000000000..5ee11e19975e
--- /dev/null
+++ b/arch/mips/philips/pnx8550/stb810/irqmap.c
@@ -0,0 +1,23 @@
+/*
+ *  Philips STB810 board irqmap.
+ *
+ *  Author: MontaVista Software, Inc.
+ *          source@mvista.com
+ *
+ *  Copyright 2005 MontaVista Software Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation; either version 2 of the License, or (at your
+ *  option) any later version.
+ */
+
+#include <linux/init.h>
+#include <int.h>
+
+char pnx8550_irq_tab[][5] __initdata = {
+        [8]     = { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
+        [9]     = { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
+        [10]    = { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
+};
+
diff --git a/arch/mips/philips/pnx8550/stb810/prom_init.c b/arch/mips/philips/pnx8550/stb810/prom_init.c
new file mode 100644
index 000000000000..ea5b4e0fb47d
--- /dev/null
+++ b/arch/mips/philips/pnx8550/stb810/prom_init.c
@@ -0,0 +1,49 @@
+/*
+ *  STB810 specific prom routines
+ *
+ *  Author: MontaVista Software, Inc.
+ *          source@mvista.com
+ *
+ *  Copyright 2005 MontaVista Software Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation; either version 2 of the License, or (at your
+ *  option) any later version.
+ */
+
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/bootmem.h>
+#include <asm/addrspace.h>
+#include <asm/bootinfo.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
+
+int prom_argc;
+char **prom_argv, **prom_envp;
+extern void  __init prom_init_cmdline(void);
+extern char *prom_getenv(char *envname);
+
+const char *get_system_type(void)
+{
+        return "Philips PNX8550/STB810";
+}
+
+void __init prom_init(void)
+{
+        unsigned long memsize;
+
+        prom_argc = (int) fw_arg0;
+        prom_argv = (char **) fw_arg1;
+        prom_envp = (char **) fw_arg2;
+
+        prom_init_cmdline();
+
+        mips_machgroup = MACH_GROUP_PHILIPS;
+        mips_machtype = MACH_PHILIPS_STB810;
+
+        memsize = 0x08000000; /* Trimedia uses memory above */
+        add_memory_region(0, memsize, BOOT_MEM_RAM);
+}
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..c44f8be0644f 100644
--- a/arch/mips/sgi-ip22/ip22-int.c
+++ b/arch/mips/sgi-ip22/ip22-int.c
@@ -40,186 +40,86 @@ 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)))
-                enable_local0_irq(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,
-        .end            = end_local0_irq,
+        .ack            = disable_local0_irq,
+        .mask           = disable_local0_irq,
+        .mask_ack       = disable_local0_irq,
+        .unmask         = enable_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)))
-                enable_local1_irq(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,
-        .end            = end_local1_irq,
+        .ack            = disable_local1_irq,
+        .mask           = disable_local1_irq,
+        .mask_ack       = disable_local1_irq,
+        .unmask         = enable_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)))
-                enable_local2_irq(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,
-        .end            = end_local2_irq,
+        .ack            = disable_local2_irq,
+        .mask           = disable_local2_irq,
+        .mask_ack       = disable_local2_irq,
+        .unmask         = enable_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)))
-                enable_local3_irq(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,
-        .end            = end_local3_irq,
+        .ack            = disable_local3_irq,
+        .mask           = disable_local3_irq,
+        .mask_ack       = disable_local3_irq,
+        .unmask         = enable_local3_irq,
 };
 
 static void indy_local0_irqdispatch(void)
@@ -430,10 +330,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..319f8803ef6f 100644
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
@@ -332,34 +332,19 @@ 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)) &&
-            irq_desc[irq].action)
-                enable_bridge_irq(irq);
-}
-
 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,
-        .end            = end_bridge_irq,
+        .ack            = disable_bridge_irq,
+        .mask           = disable_bridge_irq,
+        .mask_ack       = disable_bridge_irq,
+        .unmask         = enable_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..c20e9899b34b 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,22 +180,13 @@ 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,
-        .end            = end_rt_irq,
+        .ack            = disable_rt_irq,
+        .mask           = disable_rt_irq,
+        .mask_ack       = disable_rt_irq,
+        .unmask         = enable_rt_irq,
+        .eoi            = enable_rt_irq,
 };
 
 static struct irqaction rt_irqaction = {
@@ -221,10 +203,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 +218,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/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
index ac342f5643c9..defa1f1452ad 100644
--- a/arch/mips/sibyte/swarm/setup.c
+++ b/arch/mips/sibyte/swarm/setup.c
@@ -43,7 +43,7 @@
 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
 #include <asm/sibyte/sb1250_regs.h>
 #else
-#error invalid SiByte board configuation
+#error invalid SiByte board configuration
 #endif
 #include <asm/sibyte/sb1250_genbus.h>
 #include <asm/sibyte/board.h>
@@ -53,7 +53,7 @@ extern void bcm1480_setup(void);
 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
 extern void sb1250_setup(void);
 #else
-#error invalid SiByte board configuation
+#error invalid SiByte board configuration
 #endif
 
 extern int xicor_probe(void);
@@ -90,7 +90,7 @@ void __init plat_timer_setup(struct irqaction *irq)
 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
         sb1250_time_init();
 #else
-#error invalid SiByte board configuation
+#error invalid SiByte board configuration
 #endif
 }
 
@@ -111,7 +111,7 @@ void __init plat_mem_setup(void)
 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
         sb1250_setup();
 #else
-#error invalid SiByte board configuation
+#error invalid SiByte board configuration
 #endif
 
         panic_timeout = 5;  /* For debug.  */
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..ed4a19adf361 100644
--- a/arch/mips/tx4927/common/tx4927_irq.c
+++ b/arch/mips/tx4927/common/tx4927_irq.c
@@ -64,20 +64,12 @@
 #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
 #endif
@@ -87,19 +79,11 @@ 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
 //                                       | TX4927_IRQ_NEST2
@@ -124,49 +108,32 @@ 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,
-        .end            = tx4927_irq_cp0_end,
-        .set_affinity   = NULL
+        .ack            = tx4927_irq_cp0_disable,
+        .mask           = tx4927_irq_cp0_disable,
+        .mask_ack       = tx4927_irq_cp0_disable,
+        .unmask         = tx4927_irq_cp0_enable,
 };
 
 #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,
-        .end            = tx4927_irq_pic_end,
-        .set_affinity   = NULL
+        .ack            = tx4927_irq_pic_disable,
+        .mask           = tx4927_irq_pic_disable,
+        .mask_ack       = tx4927_irq_pic_disable,
+        .unmask         = tx4927_irq_pic_enable,
 };
 
 #define TX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL }
@@ -211,8 +178,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,82 +187,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)
-{
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_ENDIRQ, "irq=%d \n", irq);
-
-        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
-                tx4927_irq_cp0_enable(irq);
-        }
-
-        return;
 }
 
 /*
@@ -418,105 +324,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)
-{
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_ENDIRQ, "irq=%d\n", irq);
-
-        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
-                tx4927_irq_pic_enable(irq);
-        }
-
-        return;
 }
 
 /*
@@ -533,8 +373,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..b54b529a29f9 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
@@ -151,20 +151,13 @@ 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 )
-#define TOSHIBA_RBTX4927_IRQ_ISA_ENDIRQ    ( 1 << 26 )
 
 #define TOSHIBA_RBTX4927_SETUP_ALL         0xffffffff
 #endif
@@ -175,19 +168,12 @@ 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
-//                                                 | TOSHIBA_RBTX4927_IRQ_ISA_ENDIRQ
     );
 #endif
 
@@ -231,35 +217,22 @@ 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,
-        .end = toshiba_rbtx4927_irq_ioc_end,
-        .set_affinity = NULL
+        .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,
 };
 #define TOSHIBA_RBTX4927_IOC_INTR_ENAB 0xbc002000
 #define TOSHIBA_RBTX4927_IOC_INTR_STAT 0xbc002006
@@ -269,13 +242,10 @@ 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,
-        .end = toshiba_rbtx4927_irq_isa_end,
-        .set_affinity = NULL
+        .mask = toshiba_rbtx4927_irq_isa_disable,
+        .mask_ack = toshiba_rbtx4927_irq_isa_mask_and_ack,
+        .unmask = toshiba_rbtx4927_irq_isa_enable,
 };
 #endif
 
@@ -363,58 +333,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 +355,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,53 +375,9 @@ 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,
-                                     "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");
-        }
-
-        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
-                toshiba_rbtx4927_irq_ioc_enable(irq);
-        }
-
-        return;
 }
 
 
@@ -520,13 +397,9 @@ 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_and_handler(i, &toshiba_rbtx4927_irq_isa_type,
+                                         handle_level_irq);
 
         setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC,
                   &toshiba_rbtx4927_irq_isa_master);
@@ -536,48 +409,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 +427,6 @@ static void toshiba_rbtx4927_irq_isa_enable(unsigned int irq)
         }
 
         enable_8259A_irq(irq);
-
-        return;
 }
 #endif
 
@@ -616,8 +445,6 @@ static void toshiba_rbtx4927_irq_isa_disable(unsigned int irq)
         }
 
         disable_8259A_irq(irq);
-
-        return;
 }
 #endif
 
@@ -636,30 +463,6 @@ static void toshiba_rbtx4927_irq_isa_mask_and_ack(unsigned int irq)
         }
 
         mask_and_ack_8259A(irq);
-
-        return;
-}
-#endif
-
-
-#ifdef CONFIG_TOSHIBA_FPCIB0
-static void toshiba_rbtx4927_irq_isa_end(unsigned int irq)
-{
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_ENDIRQ,
-                                     "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");
-        }
-
-        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
-                toshiba_rbtx4927_irq_isa_enable(irq);
-        }
-
-        return;
 }
 #endif
 
@@ -668,8 +471,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 +482,6 @@ void __init arch_init_irq(void)
 #endif
 
         wbflush();
-
-        return;
 }
 
 void toshiba_rbtx4927_irq_dump(char *key)
@@ -715,7 +514,6 @@ void toshiba_rbtx4927_irq_dump(char *key)
                 }
         }
 #endif
-        return;
 }
 
 void toshiba_rbtx4927_irq_dump_pics(char *s)
@@ -780,6 +578,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..a347b424d91c 100644
--- a/arch/mips/tx4938/common/irq.c
+++ b/arch/mips/tx4938/common/irq.c
@@ -37,48 +37,32 @@
 /* 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,
-        .end = tx4938_irq_cp0_end,
-        .set_affinity = NULL
+        .ack = tx4938_irq_cp0_disable,
+        .mask = tx4938_irq_cp0_disable,
+        .mask_ack = tx4938_irq_cp0_disable,
+        .unmask = tx4938_irq_cp0_enable,
 };
 
 #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,
-        .end = tx4938_irq_pic_end,
-        .set_affinity = NULL
+        .ack = tx4938_irq_pic_disable,
+        .mask = tx4938_irq_pic_disable,
+        .mask_ack = tx4938_irq_pic_disable,
+        .unmask = tx4938_irq_pic_enable,
 };
 
 static struct irqaction tx4938_irq_pic_action = {
@@ -99,64 +83,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
-tx4938_irq_cp0_end(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
-                tx4938_irq_cp0_enable(irq);
-        }
 }
 
 /**********************************************************************************/
@@ -290,78 +231,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
-tx4938_irq_pic_end(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
-                tx4938_irq_pic_enable(irq);
-        }
 }
 
 /**********************************************************************************/
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..b6f363d08011 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/irq.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/irq.c
@@ -87,25 +87,16 @@ 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,
-        .end = toshiba_rbtx4938_irq_ioc_end,
-        .set_affinity = NULL
+        .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,
 };
 
 #define TOSHIBA_RBTX4938_IOC_INTR_ENAB 0xb7f02000
@@ -142,77 +133,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
-toshiba_rbtx4938_irq_ioc_end(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
-                toshiba_rbtx4938_irq_ioc_enable(irq);
-        }
 }
 
 extern void __init txx9_spi_irqinit(int irc_irq);
diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
index c215c0d39fae..c075261976c5 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,33 +427,15 @@ 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)))
-                icu1_set(MSYSINT1REG, 1 << SYSINT1_IRQ_TO_PIN(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,
-        .end            = end_sysint1_irq,
+        .ack            = disable_sysint1_irq,
+        .mask           = disable_sysint1_irq,
+        .mask_ack       = disable_sysint1_irq,
+        .unmask         = enable_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,23 +445,12 @@ 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)))
-                icu2_set(MSYSINT2REG, 1 << SYSINT2_IRQ_TO_PIN(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,
-        .end            = end_sysint2_irq,
+        .ack            = disable_sysint2_irq,
+        .mask           = disable_sysint2_irq,
+        .mask_ack       = disable_sysint2_irq,
+        .unmask         = enable_sysint2_irq,
 };
 
 static inline int set_sysint1_assign(unsigned int irq, unsigned char assign)
@@ -723,10 +687,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..128ed8d6f111 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);
@@ -56,20 +45,12 @@ static void ack_i8259_irq(unsigned int irq)
         mask_and_ack_8259A(irq - I8259_IRQ_BASE);
 }
 
-static void end_i8259_irq(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-                enable_8259A_irq(irq - I8259_IRQ_BASE);
-}
-
 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,
-        .end            = end_i8259_irq,
+        .mask           = disable_i8259_irq,
+        .mask_ack       = ack_i8259_irq,
+        .unmask         = enable_i8259_irq,
 };
 
 static int i8259_get_irq_number(int irq)
@@ -104,7 +85,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_and_handler(i, &i8259_irq_type, handle_level_irq);
 
         setup_irq(I8259_SLAVE_IRQ, &i8259_slave_cascade);
 
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index d2101237442e..0f9ff618c6d7 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -25,6 +25,14 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
         bool
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config GENERIC_FIND_NEXT_BIT
         bool
         default y
diff --git a/arch/parisc/hpux/sys_hpux.c b/arch/parisc/hpux/sys_hpux.c
index 2e2dc4f2c853..04c2ff444396 100644
--- a/arch/parisc/hpux/sys_hpux.c
+++ b/arch/parisc/hpux/sys_hpux.c
@@ -237,7 +237,7 @@ asmlinkage long hpux_fstatfs(unsigned int fd, struct hpux_statfs __user * buf)
         file = fget(fd);
         if (!file)
                 goto out;
-        error = vfs_statfs_hpux(file->f_dentry, &tmp);
+        error = vfs_statfs_hpux(file->f_path.dentry, &tmp);
         if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
                 error = -EFAULT;
         fput(file);
@@ -475,7 +475,7 @@ int hpux_sysfs(int opcode, unsigned long arg1, unsigned long arg2)
                 printk(KERN_DEBUG "len of arg1 = %d\n", len);
                 if (len == 0)
                         return 0;
-                fsname = (char *) kmalloc(len, GFP_KERNEL);
+                fsname = kmalloc(len, GFP_KERNEL);
                 if ( !fsname ) {
                         printk(KERN_DEBUG "failed to kmalloc fsname\n");
                         return 0;
diff --git a/arch/parisc/kernel/binfmt_elf32.c b/arch/parisc/kernel/binfmt_elf32.c
index 1e64e7b88110..ecb10a4f63c6 100644
--- a/arch/parisc/kernel/binfmt_elf32.c
+++ b/arch/parisc/kernel/binfmt_elf32.c
@@ -75,7 +75,6 @@ struct elf_prpsinfo32
         char    pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */
 };
 
-#define elf_addr_t      unsigned int
 #define init_elf_binfmt init_elf32_binfmt
 
 #define ELF_PLATFORM  ("PARISC32\0")
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index 4a23a97b06cd..12cc019307ad 100644
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -608,7 +608,7 @@ void smp_cpus_done(unsigned int cpu_max)
 }
 
 
-int __devinit __cpu_up(unsigned int cpu)
+int __cpuinit __cpu_up(unsigned int cpu)
 {
         if (cpu != 0 && cpu < parisc_max_cpus)
                 smp_boot_one_cpu(cpu);
diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c
index 920bdbf8404f..c10ab47d81fa 100644
--- a/arch/parisc/kernel/unwind.c
+++ b/arch/parisc/kernel/unwind.c
@@ -343,7 +343,7 @@ void unwind_frame_init_from_blocked_task(struct unwind_frame_info *info, struct
         struct pt_regs *r = &t->thread.regs;
         struct pt_regs *r2;
 
-        r2 = (struct pt_regs *)kmalloc(sizeof(struct pt_regs), GFP_KERNEL);
+        r2 = kmalloc(sizeof(struct pt_regs), GFP_KERNEL);
         if (!r2)
                 return;
         *r2 = *r;
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/parisc/mm/fault.c b/arch/parisc/mm/fault.c
index 64785e46f93b..641f9c920eee 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -152,7 +152,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long code,
         const struct exception_table_entry *fix;
         unsigned long acc_type;
 
-        if (in_interrupt() || !mm)
+        if (in_atomic() || !mm)
                 goto no_context;
 
         down_read(&mm->mmap_sem);
diff --git a/arch/parisc/mm/ioremap.c b/arch/parisc/mm/ioremap.c
index 47a1d2ac9419..44b42c7f639d 100644
--- a/arch/parisc/mm/ioremap.c
+++ b/arch/parisc/mm/ioremap.c
@@ -9,110 +9,8 @@
 #include <linux/vmalloc.h>
 #include <linux/errno.h>
 #include <linux/module.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/pgalloc.h>
-#include <asm/tlbflush.h>
-#include <asm/cacheflush.h>
-
-static inline void 
-remap_area_pte(pte_t *pte, unsigned long address, unsigned long size,
-               unsigned long phys_addr, unsigned long flags)
-{
-        unsigned long end, pfn;
-        pgprot_t pgprot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY |
-                                   _PAGE_ACCESSED | flags);
-
-        address &= ~PMD_MASK;
-
-        end = address + size;
-        if (end > PMD_SIZE)
-                end = PMD_SIZE;
-
-        BUG_ON(address >= end);
-
-        pfn = phys_addr >> PAGE_SHIFT;
-        do {
-                BUG_ON(!pte_none(*pte));
-
-                set_pte(pte, pfn_pte(pfn, pgprot));
-
-                address += PAGE_SIZE;
-                pfn++;
-                pte++;
-        } while (address && (address < end));
-}
-
-static inline int 
-remap_area_pmd(pmd_t *pmd, unsigned long address, unsigned long size,
-               unsigned long phys_addr, unsigned long flags)
-{
-        unsigned long end;
-
-        address &= ~PGDIR_MASK;
-
-        end = address + size;
-        if (end > PGDIR_SIZE)
-                end = PGDIR_SIZE;
-
-        BUG_ON(address >= end);
-
-        phys_addr -= address;
-        do {
-                pte_t *pte = pte_alloc_kernel(pmd, address);
-                if (!pte)
-                        return -ENOMEM;
-
-                remap_area_pte(pte, address, end - address, 
-                               address + phys_addr, flags);
-
-                address = (address + PMD_SIZE) & PMD_MASK;
-                pmd++;
-        } while (address && (address < end));
-
-        return 0;
-}
-
-static int 
-remap_area_pages(unsigned long address, unsigned long phys_addr,
-                 unsigned long size, unsigned long flags)
-{
-        pgd_t *dir;
-        int error = 0;
-        unsigned long end = address + size;
-
-        BUG_ON(address >= end);
-
-        phys_addr -= address;
-        dir = pgd_offset_k(address);
-
-        flush_cache_all();
-
-        do {
-                pud_t *pud;
-                pmd_t *pmd;
-
-                error = -ENOMEM;
-                pud = pud_alloc(&init_mm, dir, address);
-                if (!pud)
-                        break;
-
-                pmd = pmd_alloc(&init_mm, pud, address);
-                if (!pmd)
-                        break;
-
-                if (remap_area_pmd(pmd, address, end - address,
-                                   phys_addr + address, flags))
-                        break;
-
-                error = 0;
-                address = (address + PGDIR_SIZE) & PGDIR_MASK;
-                dir++;
-        } while (address && (address < end));
-
-        flush_tlb_all();
-
-        return error;
-}
 
 /*
  * Generic mapping function (not visible outside):
@@ -131,6 +29,7 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
         void *addr;
         struct vm_struct *area;
         unsigned long offset, last_addr;
+        pgprot_t pgprot;
 
 #ifdef CONFIG_EISA
         unsigned long end = phys_addr + size - 1;
@@ -164,6 +63,9 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
                 }
         }
 
+        pgprot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY |
+                          _PAGE_ACCESSED | flags);
+
         /*
          * Mappings have to be page-aligned
          */
@@ -179,7 +81,8 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
                 return NULL;
 
         addr = area->addr;
-        if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
+        if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size,
+                               phys_addr, pgprot)) {
                 vfree(addr);
                 return NULL;
         }
diff --git a/arch/powerpc/.gitignore b/arch/powerpc/.gitignore
new file mode 100644
index 000000000000..a1a869c8c840
--- /dev/null
+++ b/arch/powerpc/.gitignore
@@ -0,0 +1 @@
+include
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 0673dbedb241..0855d55c194d 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -41,6 +41,14 @@ config RWSEM_XCHGADD_ALGORITHM
         bool
         default y
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default y
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default y if 64BIT
+
 config GENERIC_HWEIGHT
         bool
         default y
@@ -99,6 +107,11 @@ config AUDIT_ARCH
         bool
         default y
 
+config GENERIC_BUG
+        bool
+        default y
+        depends on BUG
+
 config DEFAULT_UIMAGE
         bool
         help
@@ -112,7 +125,7 @@ choice
         default 6xx
 
 config CLASSIC32
-        bool "6xx/7xx/74xx"
+        bool "52xx/6xx/7xx/74xx"
         select PPC_FPU
         select 6xx
         help
@@ -121,16 +134,18 @@ config CLASSIC32
           versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the AMCC
           embedded versions (403 and 405) and the high end 64 bit Power
           processors (POWER 3, POWER4, and IBM PPC970 also known as G5).
+
+          This option is the catch-all for 6xx types, including some of the
+          embedded versions.  Unless there is see an option for the specific
+          chip family you are using, you want this option.
+          
+          You do not want this if you are building a kernel for a 64 bit
+          IBM RS/6000 or an Apple G5, choose 6xx.
+          
+          If unsure, select this option
           
-          Unless you are building a kernel for one of the embedded processor
-          systems, 64 bit IBM RS/6000 or an Apple G5, choose 6xx.
           Note that the kernel runs in 32-bit mode even on 64-bit chips.
 
-config PPC_52xx
-        bool "Freescale 52xx"
-        select 6xx
-        select PPC_FPU
-        
 config PPC_82xx
         bool "Freescale 82xx"
         select 6xx
@@ -160,9 +175,11 @@ config PPC_86xx
 
 config 40x
         bool "AMCC 40x"
+        select PPC_DCR_NATIVE
 
 config 44x
         bool "AMCC 44x"
+        select PPC_DCR_NATIVE
 
 config 8xx
         bool "Freescale 8xx"
@@ -208,6 +225,24 @@ config PPC_FPU
         bool
         default y if PPC64
 
+config PPC_DCR_NATIVE
+        bool
+        default n
+
+config PPC_DCR_MMIO
+        bool
+        default n
+
+config PPC_DCR
+        bool
+        depends on PPC_DCR_NATIVE || PPC_DCR_MMIO
+        default y
+
+config PPC_OF_PLATFORM_PCI
+        bool
+        depends on PPC64 # not supported on 32 bits yet
+        default n
+
 config BOOKE
         bool
         depends on E200 || E500
@@ -227,6 +262,7 @@ config PTE_64BIT
 config PHYS_64BIT
         bool 'Large physical address support' if E500
         depends on 44x || E500
+        select RESOURCES_64BIT
         default y if 44x
         ---help---
           This option enables kernel support for larger than 32-bit physical
@@ -369,11 +405,13 @@ config PPC_PSERIES
         select PPC_RTAS
         select RTAS_ERROR_LOGGING
         select PPC_UDBG_16550
+        select PPC_NATIVE
         default y
 
 config PPC_ISERIES
         bool "IBM Legacy iSeries"
         depends on PPC_MULTIPLATFORM && PPC64
+        select PPC_INDIRECT_IO
 
 config PPC_CHRP
         bool "Common Hardware Reference Platform (CHRP) based machines"
@@ -384,14 +422,35 @@ config PPC_CHRP
         select PPC_RTAS
         select PPC_MPC106
         select PPC_UDBG_16550
+        select PPC_NATIVE
         default y
 
+config PPC_MPC52xx
+        bool
+        default n
+
+config PPC_EFIKA
+        bool "bPlan Efika 5k2. MPC5200B based computer"
+        depends on PPC_MULTIPLATFORM && PPC32
+        select PPC_RTAS
+        select RTAS_PROC
+        select PPC_MPC52xx
+        select PPC_NATIVE
+        default n
+
+config PPC_LITE5200
+        bool "Freescale Lite5200 Eval Board"
+        depends on PPC_MULTIPLATFORM && PPC32
+        select PPC_MPC52xx
+        default n
+
 config PPC_PMAC
         bool "Apple PowerMac based machines"
         depends on PPC_MULTIPLATFORM
         select MPIC
         select PPC_INDIRECT_PCI if PPC32
         select PPC_MPC106 if PPC32
+        select PPC_NATIVE
         default y
 
 config PPC_PMAC64
@@ -411,7 +470,8 @@ config PPC_PREP
         select PPC_I8259
         select PPC_INDIRECT_PCI
         select PPC_UDBG_16550
-        default y
+        select PPC_NATIVE
+        default n
 
 config PPC_MAPLE
         depends on PPC_MULTIPLATFORM && PPC64
@@ -422,10 +482,12 @@ config PPC_MAPLE
         select GENERIC_TBSYNC
         select PPC_UDBG_16550
         select PPC_970_NAP
+        select PPC_NATIVE
+        select PPC_RTAS
         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
@@ -434,6 +496,7 @@ config PPC_PASEMI
         select MPIC
         select PPC_UDBG_16550
         select GENERIC_TBSYNC
+        select PPC_NATIVE
         help
           This option enables support for PA Semi's PWRficient line
           of SoC processors, including PA6T-1682M
@@ -445,6 +508,11 @@ config PPC_CELL
 config PPC_CELL_NATIVE
         bool
         select PPC_CELL
+        select PPC_DCR_MMIO
+        select PPC_OF_PLATFORM_PCI
+        select PPC_INDIRECT_IO
+        select PPC_NATIVE
+        select MPIC
         default n
 
 config PPC_IBM_CELL_BLADE
@@ -456,6 +524,22 @@ config PPC_IBM_CELL_BLADE
         select PPC_UDBG_16550
         select UDBG_RTAS_CONSOLE
 
+config PPC_PS3
+        bool "Sony PS3"
+        depends on PPC_MULTIPLATFORM && PPC64
+        select PPC_CELL
+        help
+          This option enables support for the Sony PS3 game console
+          and other platforms using the PS3 hypervisor.
+
+config PPC_NATIVE
+        bool
+        depends on PPC_MULTIPLATFORM
+        help
+          Support for running natively on the hardware, i.e. without
+          a hypervisor. This option is not user-selectable but should
+          be selected by all platforms that need it.
+
 config UDBG_RTAS_CONSOLE
         bool "RTAS based debug console"
         depends on PPC_RTAS
@@ -517,6 +601,15 @@ config PPC_970_NAP
         bool
         default n
 
+config PPC_INDIRECT_IO
+        bool
+        select GENERIC_IOMAP
+        default n
+
+config GENERIC_IOMAP
+        bool
+        default n
+
 source "drivers/cpufreq/Kconfig"
 
 config CPU_FREQ_PMAC
@@ -594,12 +687,6 @@ config TAU_AVERAGE
 
           If in doubt, say N here.
 
-config PPC_TODC
-        depends on EMBEDDED6xx
-        bool "Generic Time-of-day Clock (TODC) support"
-        ---help---
-          This adds support for many TODC/RTC chips.
-
 endmenu
 
 source arch/powerpc/platforms/embedded6xx/Kconfig
@@ -610,6 +697,7 @@ source arch/powerpc/platforms/85xx/Kconfig
 source arch/powerpc/platforms/86xx/Kconfig
 source arch/powerpc/platforms/8xx/Kconfig
 source arch/powerpc/platforms/cell/Kconfig
+source arch/powerpc/platforms/ps3/Kconfig
 
 menu "Kernel options"
 
@@ -632,7 +720,7 @@ config FORCE_MAX_ZONEORDER
 
 config MATH_EMULATION
         bool "Math emulation"
-        depends on 4xx || 8xx || E200 || E500
+        depends on 4xx || 8xx || E200 || PPC_83xx || E500
         ---help---
           Some PowerPC chips designed for embedded applications do not have
           a floating-point unit and therefore do not implement the
@@ -790,7 +878,6 @@ source "arch/powerpc/platforms/prep/Kconfig"
 
 config CMDLINE_BOOL
         bool "Default bootloader kernel arguments"
-        depends on !PPC_ISERIES
 
 config CMDLINE
         string "Initial kernel command string"
@@ -880,7 +967,7 @@ config MCA
 
 config PCI
         bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
-                || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES) || MPC7448HPC2
+                || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES) || MPC7448HPC2 || PPC_PS3
         default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx \
                 && !PPC_85xx && !PPC_86xx
         default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 5ad149b47e34..f0e51edde022 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -77,7 +77,7 @@ config KGDB_CONSOLE
 
 config XMON
         bool "Include xmon kernel debugger"
-        depends on DEBUGGER && !PPC_ISERIES
+        depends on DEBUGGER
         help
           Include in-kernel hooks for the xmon kernel monitor/debugger.
           Unless you are intending to debug the kernel, say N here.
@@ -98,6 +98,15 @@ config XMON_DEFAULT
           xmon is normally disabled unless booted with 'xmon=on'.
           Use 'xmon=off' to disable xmon init during runtime.
 
+config XMON_DISASSEMBLY
+        bool "Include disassembly support in xmon"
+        depends on XMON
+        default y
+        help
+          Include support for disassembling in xmon. You probably want
+          to say Y here, unless you're building for a memory-constrained
+          system.
+
 config IRQSTACKS
         bool "Use separate kernel stacks when processing interrupts"
         depends on PPC64
@@ -116,7 +125,7 @@ config BDI_SWITCH
 
 config BOOTX_TEXT
         bool "Support for early boot text console (BootX or OpenFirmware only)"
-        depends PPC_OF && !PPC_ISERIES
+        depends PPC_OF
         help
           Say Y here to see progress messages from the boot firmware in text
           mode. Requires either BootX or Open Firmware.
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index 45c9ad23526e..0734b2fc1d95 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -1,19 +1,32 @@
 addnote
+empty.c
+hack-coff
 infblock.c
 infblock.h
 infcodes.c
 infcodes.h
 inffast.c
 inffast.h
+inffixed.h
 inflate.c
+inflate.h
 inftrees.c
 inftrees.h
 infutil.c
 infutil.h
 kernel-vmlinux.strip.c
 kernel-vmlinux.strip.gz
+mktree
 uImage
 zImage
+zImage.chrp
+zImage.coff
+zImage.coff.lds
+zImage.lds
+zImage.miboot
+zImage.pmac
+zImage.pseries
+zImage.sandpoint
 zImage.vmode
 zconf.h
 zlib.h
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 4b2be611f77f..98392fb5f581 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -40,7 +40,8 @@ zliblinuxheader := zlib.h zconf.h zutil.h
 $(addprefix $(obj)/,$(zlib) main.o): $(addprefix $(obj)/,$(zliblinuxheader)) \
                 $(addprefix $(obj)/,$(zlibheader))
 
-src-wlib := string.S stdio.c main.c div64.S $(zlib)
+src-wlib := string.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \
+                ns16550.c serial.c simple_alloc.c div64.S util.S $(zlib)
 src-plat := of.c
 src-boot := crt0.S $(src-wlib) $(src-plat) empty.c
 
@@ -74,7 +75,7 @@ $(obj)/zImage.lds $(obj)/zImage.coff.lds: $(obj)/%: $(srctree)/$(src)/%.S
         @cp $< $@
 
 clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \
-                $(obj)/empty.c
+                empty.c zImage zImage.coff.lds zImage.lds zImage.sandpoint
 
 quiet_cmd_bootcc = BOOTCC  $@
       cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<
@@ -93,13 +94,13 @@ $(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S
 $(obj)/wrapper.a: $(obj-wlib)
         $(call cmd,bootar)
 
-hostprogs-y     := addnote addRamDisk hack-coff
+hostprogs-y     := addnote addRamDisk hack-coff mktree
 
 extra-y         := $(obj)/crt0.o $(obj)/wrapper.a $(obj-plat) $(obj)/empty.o \
                    $(obj)/zImage.lds $(obj)/zImage.coff.lds
 
 wrapper         :=$(srctree)/$(src)/wrapper
-wrapperbits     := $(extra-y) $(addprefix $(obj)/,addnote hack-coff)
+wrapperbits     := $(extra-y) $(addprefix $(obj)/,addnote hack-coff mktree)
 
 #############
 # Bits for building various flavours of zImage
@@ -148,13 +149,21 @@ $(obj)/zImage.miboot: vmlinux $(wrapperbits)
 $(obj)/zImage.initrd.miboot: vmlinux $(wrapperbits)
         $(call cmd,wrap_initrd,miboot)
 
+$(obj)/zImage.ps3: vmlinux
+        $(STRIP) -s -R .comment $< -o $@
+
+$(obj)/zImage.initrd.ps3: vmlinux
+        @echo "  WARNING zImage.initrd.ps3 not supported (yet)"
+
 $(obj)/uImage: vmlinux $(wrapperbits)
         $(call cmd,wrap,uboot)
 
 image-$(CONFIG_PPC_PSERIES)             += zImage.pseries
 image-$(CONFIG_PPC_MAPLE)               += zImage.pseries
 image-$(CONFIG_PPC_IBM_CELL_BLADE)      += zImage.pseries
+image-$(CONFIG_PPC_PS3)                 += zImage.ps3
 image-$(CONFIG_PPC_CHRP)                += zImage.chrp
+image-$(CONFIG_PPC_EFIKA)               += zImage.chrp
 image-$(CONFIG_PPC_PMAC)                += zImage.pmac
 image-$(CONFIG_DEFAULT_UIMAGE)          += uImage
 
@@ -176,3 +185,4 @@ install: $(CONFIGURE) $(image-y)
 
 clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip.gz)
 clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.bin.gz)
+clean-files += $(image-)
diff --git a/arch/powerpc/boot/dts/kuroboxHG.dts b/arch/powerpc/boot/dts/kuroboxHG.dts
new file mode 100644
index 000000000000..d06b0b018899
--- /dev/null
+++ b/arch/powerpc/boot/dts/kuroboxHG.dts
@@ -0,0 +1,148 @@
+/*
+ * Device Tree Souce for Buffalo KuroboxHG
+ *
+ * Choose CONFIG_LINKSTATION to build a kernel for KuroboxHG, or use
+ * the default configuration linkstation_defconfig.
+ *
+ * Based on sandpoint.dts
+ *
+ * 2006 (c) G. Liakhovetski <g.liakhovetski@gmx.de>
+ *
+ * This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+
+XXXX add flash parts, rtc, ??
+
+build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
+
+
+ */
+
+/ {
+        linux,phandle = <1000>;
+        model = "KuroboxHG";
+        compatible = "linkstation";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        cpus {
+                linux,phandle = <2000>;
+                #cpus = <1>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,603e { /* Really 8241 */
+                        linux,phandle = <2100>;
+                        linux,boot-cpu;
+                        device_type = "cpu";
+                        reg = <0>;
+                        clock-frequency = <fdad680>;    /* Fixed by bootwrapper */
+                        timebase-frequency = <1F04000>; /* Fixed by bootwrapper */
+                        bus-frequency = <0>;            /* From bootloader */
+                        /* Following required by dtc but not used */
+                        i-cache-line-size = <0>;
+                        d-cache-line-size = <0>;
+                        i-cache-size = <4000>;
+                        d-cache-size = <4000>;
+                };
+        };
+
+        memory {
+                linux,phandle = <3000>;
+                device_type = "memory";
+                reg = <00000000 08000000>;
+        };
+
+        soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
+                linux,phandle = <4000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                #interrupt-cells = <2>;
+                device_type = "soc";
+                compatible = "mpc10x";
+                store-gathering = <0>; /* 0 == off, !0 == on */
+                reg = <80000000 00100000>;
+                ranges = <80000000 80000000 70000000    /* pci mem space */
+                          fc000000 fc000000 00100000    /* EUMB */
+                          fe000000 fe000000 00c00000    /* pci i/o space */
+                          fec00000 fec00000 00300000    /* pci cfg regs */
+                          fef00000 fef00000 00100000>;  /* pci iack */
+
+                i2c@80003000 {
+                        linux,phandle = <4300>;
+                        device_type = "i2c";
+                        compatible = "fsl-i2c";
+                        reg = <80003000 1000>;
+                        interrupts = <5 2>;
+                        interrupt-parent = <4400>;
+                };
+
+                serial@80004500 {
+                        linux,phandle = <4511>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <80004500 8>;
+                        clock-frequency = <7c044a8>;
+                        current-speed = <2580>;
+                        interrupts = <9 2>;
+                        interrupt-parent = <4400>;
+                };
+
+                serial@80004600 {
+                        linux,phandle = <4512>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <80004600 8>;
+                        clock-frequency = <7c044a8>;
+                        current-speed = <e100>;
+                        interrupts = <a 0>;
+                        interrupt-parent = <4400>;
+                };
+
+                pic@80040000 {
+                        linux,phandle = <4400>;
+                        #interrupt-cells = <2>;
+                        #address-cells = <0>;
+                        device_type = "open-pic";
+                        compatible = "chrp,open-pic";
+                        interrupt-controller;
+                        reg = <80040000 40000>;
+                        built-in;
+                };
+
+                pci@fec00000 {
+                        linux,phandle = <4500>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        device_type = "pci";
+                        compatible = "mpc10x-pci";
+                        reg = <fec00000 400000>;
+                        ranges = <01000000 0        0 fe000000 0 00c00000
+                                  02000000 0 80000000 80000000 0 70000000>;
+                        bus-range = <0 ff>;
+                        clock-frequency = <7f28155>;
+                        interrupt-parent = <4400>;
+                        interrupt-map-mask = <f800 0 0 7>;
+                        interrupt-map = <
+                                /* IDSEL 0x11 - IRQ0 ETH */
+                                5800 0 0 1 4400 0 1
+                                5800 0 0 2 4400 1 1
+                                5800 0 0 3 4400 2 1
+                                5800 0 0 4 4400 3 1
+                                /* IDSEL 0x12 - IRQ1 IDE0 */
+                                6000 0 0 1 4400 1 1
+                                6000 0 0 2 4400 2 1
+                                6000 0 0 3 4400 3 1
+                                6000 0 0 4 4400 0 1
+                                /* IDSEL 0x14 - IRQ3 USB2.0 */
+                                7000 0 0 1 4400 3 1
+                                7000 0 0 2 4400 3 1
+                                7000 0 0 3 4400 3 1
+                                7000 0 0 4 4400 3 1
+                        >;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts
new file mode 100644
index 000000000000..a8efb59f5dd7
--- /dev/null
+++ b/arch/powerpc/boot/dts/lite5200.dts
@@ -0,0 +1,313 @@
+/*
+ * Lite5200 board Device Tree Source
+ *
+ * Copyright 2006 Secret Lab Technologies Ltd.
+ * Grant Likely <grant.likely@secretlab.ca>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/ {
+        model = "Lite5200";
+        compatible = "lite5200\0lite52xx\0mpc5200\0mpc52xx";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        cpus {
+                #cpus = <1>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,5200@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <20>;
+                        i-cache-line-size = <20>;
+                        d-cache-size = <4000>;          // L1, 16K
+                        i-cache-size = <4000>;          // L1, 16K
+                        timebase-frequency = <0>;       // from bootloader
+                        bus-frequency = <0>;            // from bootloader
+                        clock-frequency = <0>;          // from bootloader
+                        32-bit;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <00000000 04000000>;      // 64MB
+        };
+
+        soc5200@f0000000 {
+                #interrupt-cells = <3>;
+                device_type = "soc";
+                ranges = <0 f0000000 f0010000>;
+                reg = <f0000000 00010000>;
+                bus-frequency = <0>;            // from bootloader
+
+                cdm@200 {
+                        compatible = "mpc5200-cdm\0mpc52xx-cdm";
+                        reg = <200 38>;
+                };
+
+                pic@500 {
+                        // 5200 interrupts are encoded into two levels;
+                        linux,phandle = <500>;
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+                        device_type = "interrupt-controller";
+                        compatible = "mpc5200-pic\0mpc52xx-pic";
+                        reg = <500 80>;
+                        built-in;
+                };
+
+                gpt@600 {       // General Purpose Timer
+                        compatible = "mpc5200-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <600 10>;
+                        interrupts = <1 9 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpt@610 {       // General Purpose Timer
+                        compatible = "mpc5200-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <610 10>;
+                        interrupts = <1 a 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpt@620 {       // General Purpose Timer
+                        compatible = "mpc5200-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <620 10>;
+                        interrupts = <1 b 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpt@630 {       // General Purpose Timer
+                        compatible = "mpc5200-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <630 10>;
+                        interrupts = <1 c 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpt@640 {       // General Purpose Timer
+                        compatible = "mpc5200-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <640 10>;
+                        interrupts = <1 d 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpt@650 {       // General Purpose Timer
+                        compatible = "mpc5200-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <650 10>;
+                        interrupts = <1 e 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpt@660 {       // General Purpose Timer
+                        compatible = "mpc5200-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <660 10>;
+                        interrupts = <1 f 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpt@670 {       // General Purpose Timer
+                        compatible = "mpc5200-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <670 10>;
+                        interrupts = <1 10 0>;
+                        interrupt-parent = <500>;
+                };
+
+                rtc@800 {       // Real time clock
+                        compatible = "mpc5200-rtc\0mpc52xx-rtc";
+                        device_type = "rtc";
+                        reg = <800 100>;
+                        interrupts = <1 5 0 1 6 0>;
+                        interrupt-parent = <500>;
+                };
+
+                mscan@900 {
+                        device_type = "mscan";
+                        compatible = "mpc5200-mscan\0mpc52xx-mscan";
+                        interrupts = <2 11 0>;
+                        interrupt-parent = <500>;
+                        reg = <900 80>;
+                };
+
+                mscan@980 {
+                        device_type = "mscan";
+                        compatible = "mpc5200-mscan\0mpc52xx-mscan";
+                        interrupts = <1 12 0>;
+                        interrupt-parent = <500>;
+                        reg = <980 80>;
+                };
+
+                gpio@b00 {
+                        compatible = "mpc5200-gpio\0mpc52xx-gpio";
+                        reg = <b00 40>;
+                        interrupts = <1 7 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpio-wkup@b00 {
+                        compatible = "mpc5200-gpio-wkup\0mpc52xx-gpio-wkup";
+                        reg = <c00 40>;
+                        interrupts = <1 8 0 0 3 0>;
+                        interrupt-parent = <500>;
+                };
+
+                pci@0d00 {
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        compatible = "mpc5200-pci\0mpc52xx-pci";
+                        reg = <d00 100>;
+                        interrupt-map-mask = <f800 0 0 7>;
+                        interrupt-map = <c000 0 0 1 500 0 0 3
+                                         c000 0 0 2 500 0 0 3
+                                         c000 0 0 3 500 0 0 3
+                                         c000 0 0 4 500 0 0 3>;
+                        clock-frequency = <0>; // From boot loader
+                        interrupts = <2 8 0 2 9 0 2 a 0>;
+                        interrupt-parent = <500>;
+                        bus-range = <0 0>;
+                        ranges = <42000000 0 80000000 80000000 0 20000000
+                                  02000000 0 a0000000 a0000000 0 10000000
+                                  01000000 0 00000000 b0000000 0 01000000>;
+                };
+
+                spi@f00 {
+                        device_type = "spi";
+                        compatible = "mpc5200-spi\0mpc52xx-spi";
+                        reg = <f00 20>;
+                        interrupts = <2 d 0 2 e 0>;
+                        interrupt-parent = <500>;
+                };
+
+                usb@1000 {
+                        device_type = "usb-ohci-be";
+                        compatible = "mpc5200-ohci\0mpc52xx-ohci\0ohci-be";
+                        reg = <1000 ff>;
+                        interrupts = <2 6 0>;
+                        interrupt-parent = <500>;
+                };
+
+                bestcomm@1200 {
+                        device_type = "dma-controller";
+                        compatible = "mpc5200-bestcomm\0mpc52xx-bestcomm";
+                        reg = <1200 80>;
+                        interrupts = <3 0 0  3 1 0  3 2 0  3 3 0
+                                      3 4 0  3 5 0  3 6 0  3 7 0
+                                      3 8 0  3 9 0  3 a 0  3 b 0
+                                      3 c 0  3 d 0  3 e 0  3 f 0>;
+                        interrupt-parent = <500>;
+                };
+
+                xlb@1f00 {
+                        compatible = "mpc5200-xlb\0mpc52xx-xlb";
+                        reg = <1f00 100>;
+                };
+
+                serial@2000 {           // PSC1
+                        device_type = "serial";
+                        compatible = "mpc5200-psc-uart\0mpc52xx-psc-uart";
+                        port-number = <0>;  // Logical port assignment
+                        reg = <2000 100>;
+                        interrupts = <2 1 0>;
+                        interrupt-parent = <500>;
+                };
+
+                // PSC2 in spi mode example
+                spi@2200 {              // PSC2
+                        device_type = "spi";
+                        compatible = "mpc5200-psc-spi\0mpc52xx-psc-spi";
+                        reg = <2200 100>;
+                        interrupts = <2 2 0>;
+                        interrupt-parent = <500>;
+                };
+
+                // PSC3 in CODEC mode example
+                i2s@2400 {              // PSC3
+                        device_type = "sound";
+                        compatible = "mpc5200-psc-i2s\0mpc52xx-psc-i2s";
+                        reg = <2400 100>;
+                        interrupts = <2 3 0>;
+                        interrupt-parent = <500>;
+                };
+
+                // PSC4 unconfigured
+                //serial@2600 {         // PSC4
+                //      device_type = "serial";
+                //      compatible = "mpc5200-psc-uart\0mpc52xx-psc-uart";
+                //      reg = <2600 100>;
+                //      interrupts = <2 b 0>;
+                //      interrupt-parent = <500>;
+                //};
+
+                // PSC5 unconfigured
+                //serial@2800 {         // PSC5
+                //      device_type = "serial";
+                //      compatible = "mpc5200-psc-uart\0mpc52xx-psc-uart";
+                //      reg = <2800 100>;
+                //      interrupts = <2 c 0>;
+                //      interrupt-parent = <500>;
+                //};
+
+                // PSC6 in AC97 mode example
+                ac97@2c00 {             // PSC6
+                        device_type = "sound";
+                        compatible = "mpc5200-psc-ac97\0mpc52xx-psc-ac97";
+                        reg = <2c00 100>;
+                        interrupts = <2 4 0>;
+                        interrupt-parent = <500>;
+                };
+
+                ethernet@3000 {
+                        device_type = "network";
+                        compatible = "mpc5200-fec\0mpc52xx-fec";
+                        reg = <3000 800>;
+                        mac-address = [ 02 03 04 05 06 07 ]; // Bad!
+                        interrupts = <2 5 0>;
+                        interrupt-parent = <500>;
+                };
+
+                ata@3a00 {
+                        device_type = "ata";
+                        compatible = "mpc5200-ata\0mpc52xx-ata";
+                        reg = <3a00 100>;
+                        interrupts = <2 7 0>;
+                        interrupt-parent = <500>;
+                };
+
+                i2c@3d00 {
+                        device_type = "i2c";
+                        compatible = "mpc5200-i2c\0mpc52xx-i2c";
+                        reg = <3d00 40>;
+                        interrupts = <2 f 0>;
+                        interrupt-parent = <500>;
+                };
+
+                i2c@3d40 {
+                        device_type = "i2c";
+                        compatible = "mpc5200-i2c\0mpc52xx-i2c";
+                        reg = <3d40 40>;
+                        interrupts = <2 10 0>;
+                        interrupt-parent = <500>;
+                };
+                sram@8000 {
+                        device_type = "sram";
+                        compatible = "mpc5200-sram\0mpc52xx-sram\0sram";
+                        reg = <8000 4000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
new file mode 100644
index 000000000000..1aabee432d86
--- /dev/null
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -0,0 +1,318 @@
+/*
+ * Lite5200B board Device Tree Source
+ *
+ * Copyright 2006 Secret Lab Technologies Ltd.
+ * Grant Likely <grant.likely@secretlab.ca>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/ {
+        model = "Lite5200b";
+        compatible = "lite5200b\0lite52xx\0mpc5200b\0mpc52xx";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        cpus {
+                #cpus = <1>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,5200@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <20>;
+                        i-cache-line-size = <20>;
+                        d-cache-size = <4000>;          // L1, 16K
+                        i-cache-size = <4000>;          // L1, 16K
+                        timebase-frequency = <0>;       // from bootloader
+                        bus-frequency = <0>;            // from bootloader
+                        clock-frequency = <0>;          // from bootloader
+                        32-bit;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <00000000 10000000>;      // 256MB
+        };
+
+        soc5200@f0000000 {
+                #interrupt-cells = <3>;
+                device_type = "soc";
+                ranges = <0 f0000000 f0010000>;
+                reg = <f0000000 00010000>;
+                bus-frequency = <0>;            // from bootloader
+
+                cdm@200 {
+                        compatible = "mpc5200b-cdm\0mpc52xx-cdm";
+                        reg = <200 38>;
+                };
+
+                pic@500 {
+                        // 5200 interrupts are encoded into two levels;
+                        linux,phandle = <500>;
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+                        device_type = "interrupt-controller";
+                        compatible = "mpc5200b-pic\0mpc52xx-pic";
+                        reg = <500 80>;
+                        built-in;
+                };
+
+                gpt@600 {       // General Purpose Timer
+                        compatible = "mpc5200b-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <600 10>;
+                        interrupts = <1 9 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpt@610 {       // General Purpose Timer
+                        compatible = "mpc5200b-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <610 10>;
+                        interrupts = <1 a 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpt@620 {       // General Purpose Timer
+                        compatible = "mpc5200b-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <620 10>;
+                        interrupts = <1 b 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpt@630 {       // General Purpose Timer
+                        compatible = "mpc5200b-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <630 10>;
+                        interrupts = <1 c 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpt@640 {       // General Purpose Timer
+                        compatible = "mpc5200b-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <640 10>;
+                        interrupts = <1 d 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpt@650 {       // General Purpose Timer
+                        compatible = "mpc5200b-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <650 10>;
+                        interrupts = <1 e 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpt@660 {       // General Purpose Timer
+                        compatible = "mpc5200b-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <660 10>;
+                        interrupts = <1 f 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpt@670 {       // General Purpose Timer
+                        compatible = "mpc5200b-gpt\0mpc52xx-gpt";
+                        device_type = "gpt";
+                        reg = <670 10>;
+                        interrupts = <1 10 0>;
+                        interrupt-parent = <500>;
+                };
+
+                rtc@800 {       // Real time clock
+                        compatible = "mpc5200b-rtc\0mpc52xx-rtc";
+                        device_type = "rtc";
+                        reg = <800 100>;
+                        interrupts = <1 5 0 1 6 0>;
+                        interrupt-parent = <500>;
+                };
+
+                mscan@900 {
+                        device_type = "mscan";
+                        compatible = "mpc5200b-mscan\0mpc52xx-mscan";
+                        interrupts = <2 11 0>;
+                        interrupt-parent = <500>;
+                        reg = <900 80>;
+                };
+
+                mscan@980 {
+                        device_type = "mscan";
+                        compatible = "mpc5200b-mscan\0mpc52xx-mscan";
+                        interrupts = <1 12 0>;
+                        interrupt-parent = <500>;
+                        reg = <980 80>;
+                };
+
+                gpio@b00 {
+                        compatible = "mpc5200b-gpio\0mpc52xx-gpio";
+                        reg = <b00 40>;
+                        interrupts = <1 7 0>;
+                        interrupt-parent = <500>;
+                };
+
+                gpio-wkup@b00 {
+                        compatible = "mpc5200b-gpio-wkup\0mpc52xx-gpio-wkup";
+                        reg = <c00 40>;
+                        interrupts = <1 8 0 0 3 0>;
+                        interrupt-parent = <500>;
+                };
+
+                pci@0d00 {
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        compatible = "mpc5200b-pci\0mpc52xx-pci";
+                        reg = <d00 100>;
+                        interrupt-map-mask = <f800 0 0 7>;
+                        interrupt-map = <c000 0 0 1 500 0 0 3 // 1st slot
+                                         c000 0 0 2 500 1 1 3
+                                         c000 0 0 3 500 1 2 3
+                                         c000 0 0 4 500 1 3 3
+
+                                         c800 0 0 1 500 1 1 3 // 2nd slot
+                                         c800 0 0 2 500 1 2 3
+                                         c800 0 0 3 500 1 3 3
+                                         c800 0 0 4 500 0 0 3>;
+                        clock-frequency = <0>; // From boot loader
+                        interrupts = <2 8 0 2 9 0 2 a 0>;
+                        interrupt-parent = <500>;
+                        bus-range = <0 0>;
+                        ranges = <42000000 0 80000000 80000000 0 20000000
+                                  02000000 0 a0000000 a0000000 0 10000000
+                                  01000000 0 00000000 b0000000 0 01000000>;
+                };
+
+                spi@f00 {
+                        device_type = "spi";
+                        compatible = "mpc5200b-spi\0mpc52xx-spi";
+                        reg = <f00 20>;
+                        interrupts = <2 d 0 2 e 0>;
+                        interrupt-parent = <500>;
+                };
+
+                usb@1000 {
+                        device_type = "usb-ohci-be";
+                        compatible = "mpc5200b-ohci\0mpc52xx-ohci\0ohci-be";
+                        reg = <1000 ff>;
+                        interrupts = <2 6 0>;
+                        interrupt-parent = <500>;
+                };
+
+                bestcomm@1200 {
+                        device_type = "dma-controller";
+                        compatible = "mpc5200b-bestcomm\0mpc52xx-bestcomm";
+                        reg = <1200 80>;
+                        interrupts = <3 0 0  3 1 0  3 2 0  3 3 0
+                                      3 4 0  3 5 0  3 6 0  3 7 0
+                                      3 8 0  3 9 0  3 a 0  3 b 0
+                                      3 c 0  3 d 0  3 e 0  3 f 0>;
+                        interrupt-parent = <500>;
+                };
+
+                xlb@1f00 {
+                        compatible = "mpc5200b-xlb\0mpc52xx-xlb";
+                        reg = <1f00 100>;
+                };
+
+                serial@2000 {           // PSC1
+                        device_type = "serial";
+                        compatible = "mpc5200b-psc-uart\0mpc52xx-psc-uart";
+                        port-number = <0>;  // Logical port assignment
+                        reg = <2000 100>;
+                        interrupts = <2 1 0>;
+                        interrupt-parent = <500>;
+                };
+
+                // PSC2 in spi mode example
+                spi@2200 {              // PSC2
+                        device_type = "spi";
+                        compatible = "mpc5200b-psc-spi\0mpc52xx-psc-spi";
+                        reg = <2200 100>;
+                        interrupts = <2 2 0>;
+                        interrupt-parent = <500>;
+                };
+
+                // PSC3 in CODEC mode example
+                i2s@2400 {              // PSC3
+                        device_type = "sound";
+                        compatible = "mpc5200b-psc-i2s\0mpc52xx-psc-i2s";
+                        reg = <2400 100>;
+                        interrupts = <2 3 0>;
+                        interrupt-parent = <500>;
+                };
+
+                // PSC4 unconfigured
+                //serial@2600 {         // PSC4
+                //      device_type = "serial";
+                //      compatible = "mpc5200b-psc-uart\0mpc52xx-psc-uart";
+                //      reg = <2600 100>;
+                //      interrupts = <2 b 0>;
+                //      interrupt-parent = <500>;
+                //};
+
+                // PSC5 unconfigured
+                //serial@2800 {         // PSC5
+                //      device_type = "serial";
+                //      compatible = "mpc5200b-psc-uart\0mpc52xx-psc-uart";
+                //      reg = <2800 100>;
+                //      interrupts = <2 c 0>;
+                //      interrupt-parent = <500>;
+                //};
+
+                // PSC6 in AC97 mode example
+                ac97@2c00 {             // PSC6
+                        device_type = "sound";
+                        compatible = "mpc5200b-psc-ac97\0mpc52xx-psc-ac97";
+                        reg = <2c00 100>;
+                        interrupts = <2 4 0>;
+                        interrupt-parent = <500>;
+                };
+
+                ethernet@3000 {
+                        device_type = "network";
+                        compatible = "mpc5200b-fec\0mpc52xx-fec";
+                        reg = <3000 800>;
+                        mac-address = [ 02 03 04 05 06 07 ]; // Bad!
+                        interrupts = <2 5 0>;
+                        interrupt-parent = <500>;
+                };
+
+                ata@3a00 {
+                        device_type = "ata";
+                        compatible = "mpc5200b-ata\0mpc52xx-ata";
+                        reg = <3a00 100>;
+                        interrupts = <2 7 0>;
+                        interrupt-parent = <500>;
+                };
+
+                i2c@3d00 {
+                        device_type = "i2c";
+                        compatible = "mpc5200b-i2c\0mpc52xx-i2c";
+                        reg = <3d00 40>;
+                        interrupts = <2 f 0>;
+                        interrupt-parent = <500>;
+                };
+
+                i2c@3d40 {
+                        device_type = "i2c";
+                        compatible = "mpc5200b-i2c\0mpc52xx-i2c";
+                        reg = <3d40 40>;
+                        interrupts = <2 10 0>;
+                        interrupt-parent = <500>;
+                };
+                sram@8000 {
+                        device_type = "sram";
+                        compatible = "mpc5200b-sram\0mpc52xx-sram\0sram";
+                        reg = <8000 4000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc7448hpc2.dts b/arch/powerpc/boot/dts/mpc7448hpc2.dts
index d7b985e6bd2f..c4d9562cbaad 100644
--- a/arch/powerpc/boot/dts/mpc7448hpc2.dts
+++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts
@@ -161,29 +161,41 @@
                         interrupt-map = <
 
                                 /* IDSEL 0x11 */
-                                0800 0 0 1 7400 24 0
-                                0800 0 0 2 7400 25 0
-                                0800 0 0 3 7400 26 0
-                                0800 0 0 4 7400 27 0
+                                0800 0 0 1 1180 24 0
+                                0800 0 0 2 1180 25 0
+                                0800 0 0 3 1180 26 0
+                                0800 0 0 4 1180 27 0
 
                                 /* IDSEL 0x12 */
-                                1000 0 0 1 7400 25 0
-                                1000 0 0 2 7400 26 0
-                                1000 0 0 3 7400 27 0
-                                1000 0 0 4 7400 24 0
+                                1000 0 0 1 1180 25 0
+                                1000 0 0 2 1180 26 0
+                                1000 0 0 3 1180 27 0
+                                1000 0 0 4 1180 24 0
 
                                 /* IDSEL 0x13 */
-                                1800 0 0 1 7400 26 0
-                                1800 0 0 2 7400 27 0
-                                1800 0 0 3 7400 24 0
-                                1800 0 0 4 7400 25 0
+                                1800 0 0 1 1180 26 0
+                                1800 0 0 2 1180 27 0
+                                1800 0 0 3 1180 24 0
+                                1800 0 0 4 1180 25 0
 
                                 /* IDSEL 0x14 */
-                                2000 0 0 1 7400 27 0
-                                2000 0 0 2 7400 24 0
-                                2000 0 0 3 7400 25 0
-                                2000 0 0 4 7400 26 0
+                                2000 0 0 1 1180 27 0
+                                2000 0 0 2 1180 24 0
+                                2000 0 0 3 1180 25 0
+                                2000 0 0 4 1180 26 0
                                 >;
+                        router@1180 {
+                                linux,phandle = <1180>;
+                                clock-frequency = <0>;
+                                interrupt-controller;
+                                device_type = "pic-router";
+                                #address-cells = <0>;
+                                #interrupt-cells = <2>;
+                                built-in;
+                                big-endian;
+                                interrupts = <17 2>;
+                                interrupt-parent = <7400>;
+                        };
                 };
         };
 
diff --git a/arch/powerpc/boot/flatdevtree.c b/arch/powerpc/boot/flatdevtree.c
new file mode 100644
index 000000000000..c76c194715b2
--- /dev/null
+++ b/arch/powerpc/boot/flatdevtree.c
@@ -0,0 +1,880 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright Pantelis Antoniou 2006
+ * Copyright (C) IBM Corporation 2006
+ *
+ * Authors: Pantelis Antoniou <pantelis@embeddedalley.com>
+ *          Hollis Blanchard <hollisb@us.ibm.com>
+ *          Mark A. Greer <mgreer@mvista.com>
+ *          Paul Mackerras <paulus@samba.org>
+ */
+
+#include <string.h>
+#include <stddef.h>
+#include "flatdevtree.h"
+#include "flatdevtree_env.h"
+
+#define _ALIGN(x, al)   (((x) + (al) - 1) & ~((al) - 1))
+
+/* Routines for keeping node ptrs returned by ft_find_device current */
+/* First entry not used b/c it would return 0 and be taken as NULL/error */
+static void *ft_node_add(struct ft_cxt *cxt, char *node)
+{
+        unsigned int i;
+
+        for (i = 1; i < cxt->nodes_used; i++)   /* already there? */
+                if (cxt->node_tbl[i] == node)
+                        return (void *)i;
+
+        if (cxt->nodes_used < cxt->node_max) {
+                cxt->node_tbl[cxt->nodes_used] = node;
+                return (void *)cxt->nodes_used++;
+        }
+
+        return NULL;
+}
+
+static char *ft_node_ph2node(struct ft_cxt *cxt, const void *phandle)
+{
+        unsigned int i = (unsigned int)phandle;
+
+        if (i < cxt->nodes_used)
+                return cxt->node_tbl[i];
+        return NULL;
+}
+
+static void ft_node_update_before(struct ft_cxt *cxt, char *addr, int shift)
+{
+        unsigned int i;
+
+        if (shift == 0)
+                return;
+
+        for (i = 1; i < cxt->nodes_used; i++)
+                if (cxt->node_tbl[i] < addr)
+                        cxt->node_tbl[i] += shift;
+}
+
+static void ft_node_update_after(struct ft_cxt *cxt, char *addr, int shift)
+{
+        unsigned int i;
+
+        if (shift == 0)
+                return;
+
+        for (i = 1; i < cxt->nodes_used; i++)
+                if (cxt->node_tbl[i] >= addr)
+                        cxt->node_tbl[i] += shift;
+}
+
+/* Struct used to return info from ft_next() */
+struct ft_atom {
+        u32 tag;
+        const char *name;
+        void *data;
+        u32 size;
+};
+
+/* Set ptrs to current one's info; return addr of next one */
+static char *ft_next(struct ft_cxt *cxt, char *p, struct ft_atom *ret)
+{
+        u32 sz;
+
+        if (p >= cxt->rgn[FT_STRUCT].start + cxt->rgn[FT_STRUCT].size)
+                return NULL;
+
+        ret->tag = be32_to_cpu(*(u32 *) p);
+        p += 4;
+
+        switch (ret->tag) {     /* Tag */
+        case OF_DT_BEGIN_NODE:
+                ret->name = p;
+                ret->data = (void *)(p - 4);    /* start of node */
+                p += _ALIGN(strlen(p) + 1, 4);
+                break;
+        case OF_DT_PROP:
+                ret->size = sz = be32_to_cpu(*(u32 *) p);
+                ret->name = cxt->str_anchor + be32_to_cpu(*(u32 *) (p + 4));
+                ret->data = (void *)(p + 8);
+                p += 8 + _ALIGN(sz, 4);
+                break;
+        case OF_DT_END_NODE:
+        case OF_DT_NOP:
+                break;
+        case OF_DT_END:
+        default:
+                p = NULL;
+                break;
+        }
+
+        return p;
+}
+
+#define HDR_SIZE        _ALIGN(sizeof(struct boot_param_header), 8)
+#define EXPAND_INCR     1024    /* alloc this much extra when expanding */
+
+/* See if the regions are in the standard order and non-overlapping */
+static int ft_ordered(struct ft_cxt *cxt)
+{
+        char *p = (char *)cxt->bph + HDR_SIZE;
+        enum ft_rgn_id r;
+
+        for (r = FT_RSVMAP; r <= FT_STRINGS; ++r) {
+                if (p > cxt->rgn[r].start)
+                        return 0;
+                p = cxt->rgn[r].start + cxt->rgn[r].size;
+        }
+        return p <= (char *)cxt->bph + cxt->max_size;
+}
+
+/* Copy the tree to a newly-allocated region and put things in order */
+static int ft_reorder(struct ft_cxt *cxt, int nextra)
+{
+        unsigned long tot;
+        enum ft_rgn_id r;
+        char *p, *pend;
+        int stroff;
+
+        tot = HDR_SIZE + EXPAND_INCR;
+        for (r = FT_RSVMAP; r <= FT_STRINGS; ++r)
+                tot += cxt->rgn[r].size;
+        if (nextra > 0)
+                tot += nextra;
+        tot = _ALIGN(tot, 8);
+
+        if (!cxt->realloc)
+                return 0;
+        p = cxt->realloc(NULL, tot);
+        if (!p)
+                return 0;
+
+        memcpy(p, cxt->bph, sizeof(struct boot_param_header));
+        /* offsets get fixed up later */
+
+        cxt->bph = (struct boot_param_header *)p;
+        cxt->max_size = tot;
+        pend = p + tot;
+        p += HDR_SIZE;
+
+        memcpy(p, cxt->rgn[FT_RSVMAP].start, cxt->rgn[FT_RSVMAP].size);
+        cxt->rgn[FT_RSVMAP].start = p;
+        p += cxt->rgn[FT_RSVMAP].size;
+
+        memcpy(p, cxt->rgn[FT_STRUCT].start, cxt->rgn[FT_STRUCT].size);
+        ft_node_update_after(cxt, cxt->rgn[FT_STRUCT].start,
+                        p - cxt->rgn[FT_STRUCT].start);
+        cxt->p += p - cxt->rgn[FT_STRUCT].start;
+        cxt->rgn[FT_STRUCT].start = p;
+
+        p = pend - cxt->rgn[FT_STRINGS].size;
+        memcpy(p, cxt->rgn[FT_STRINGS].start, cxt->rgn[FT_STRINGS].size);
+        stroff = cxt->str_anchor - cxt->rgn[FT_STRINGS].start;
+        cxt->rgn[FT_STRINGS].start = p;
+        cxt->str_anchor = p + stroff;
+
+        cxt->isordered = 1;
+        return 1;
+}
+
+static inline char *prev_end(struct ft_cxt *cxt, enum ft_rgn_id r)
+{
+        if (r > FT_RSVMAP)
+                return cxt->rgn[r - 1].start + cxt->rgn[r - 1].size;
+        return (char *)cxt->bph + HDR_SIZE;
+}
+
+static inline char *next_start(struct ft_cxt *cxt, enum ft_rgn_id r)
+{
+        if (r < FT_STRINGS)
+                return cxt->rgn[r + 1].start;
+        return (char *)cxt->bph + cxt->max_size;
+}
+
+/*
+ * See if we can expand region rgn by nextra bytes by using up
+ * free space after or before the region.
+ */
+static int ft_shuffle(struct ft_cxt *cxt, char **pp, enum ft_rgn_id rgn,
+                int nextra)
+{
+        char *p = *pp;
+        char *rgn_start, *rgn_end;
+
+        rgn_start = cxt->rgn[rgn].start;
+        rgn_end = rgn_start + cxt->rgn[rgn].size;
+        if (nextra <= 0 || rgn_end + nextra <= next_start(cxt, rgn)) {
+                /* move following stuff */
+                if (p < rgn_end) {
+                        if (nextra < 0)
+                                memmove(p, p - nextra, rgn_end - p + nextra);
+                        else
+                                memmove(p + nextra, p, rgn_end - p);
+                        if (rgn == FT_STRUCT)
+                                ft_node_update_after(cxt, p, nextra);
+                }
+                cxt->rgn[rgn].size += nextra;
+                if (rgn == FT_STRINGS)
+                        /* assumes strings only added at beginning */
+                        cxt->str_anchor += nextra;
+                return 1;
+        }
+        if (prev_end(cxt, rgn) <= rgn_start - nextra) {
+                /* move preceding stuff */
+                if (p > rgn_start) {
+                        memmove(rgn_start - nextra, rgn_start, p - rgn_start);
+                        if (rgn == FT_STRUCT)
+                                ft_node_update_before(cxt, p, -nextra);
+                }
+                *p -= nextra;
+                cxt->rgn[rgn].start -= nextra;
+                cxt->rgn[rgn].size += nextra;
+                return 1;
+        }
+        return 0;
+}
+
+static int ft_make_space(struct ft_cxt *cxt, char **pp, enum ft_rgn_id rgn,
+                         int nextra)
+{
+        unsigned long size, ssize, tot;
+        char *str, *next;
+        enum ft_rgn_id r;
+
+        if (!cxt->isordered && !ft_reorder(cxt, nextra))
+                return 0;
+        if (ft_shuffle(cxt, pp, rgn, nextra))
+                return 1;
+
+        /* See if there is space after the strings section */
+        ssize = cxt->rgn[FT_STRINGS].size;
+        if (cxt->rgn[FT_STRINGS].start + ssize
+                        < (char *)cxt->bph + cxt->max_size) {
+                /* move strings up as far as possible */
+                str = (char *)cxt->bph + cxt->max_size - ssize;
+                cxt->str_anchor += str - cxt->rgn[FT_STRINGS].start;
+                memmove(str, cxt->rgn[FT_STRINGS].start, ssize);
+                cxt->rgn[FT_STRINGS].start = str;
+                /* enough space now? */
+                if (rgn >= FT_STRUCT && ft_shuffle(cxt, pp, rgn, nextra))
+                        return 1;
+        }
+
+        /* how much total free space is there following this region? */
+        tot = 0;
+        for (r = rgn; r < FT_STRINGS; ++r) {
+                char *r_end = cxt->rgn[r].start + cxt->rgn[r].size;
+                tot += next_start(cxt, rgn) - r_end;
+        }
+
+        /* cast is to shut gcc up; we know nextra >= 0 */
+        if (tot < (unsigned int)nextra) {
+                /* have to reallocate */
+                char *newp, *new_start;
+                int shift;
+
+                if (!cxt->realloc)
+                        return 0;
+                size = _ALIGN(cxt->max_size + (nextra - tot) + EXPAND_INCR, 8);
+                newp = cxt->realloc(cxt->bph, size);
+                if (!newp)
+                        return 0;
+                cxt->max_size = size;
+                shift = newp - (char *)cxt->bph;
+
+                if (shift) { /* realloc can return same addr */
+                        cxt->bph = (struct boot_param_header *)newp;
+                        ft_node_update_after(cxt, cxt->rgn[FT_STRUCT].start,
+                                        shift);
+                        for (r = FT_RSVMAP; r <= FT_STRINGS; ++r) {
+                                new_start = cxt->rgn[r].start + shift;
+                                cxt->rgn[r].start = new_start;
+                        }
+                        *pp += shift;
+                        cxt->str_anchor += shift;
+                }
+
+                /* move strings up to the end */
+                str = newp + size - ssize;
+                cxt->str_anchor += str - cxt->rgn[FT_STRINGS].start;
+                memmove(str, cxt->rgn[FT_STRINGS].start, ssize);
+                cxt->rgn[FT_STRINGS].start = str;
+
+                if (ft_shuffle(cxt, pp, rgn, nextra))
+                        return 1;
+        }
+
+        /* must be FT_RSVMAP and we need to move FT_STRUCT up */
+        if (rgn == FT_RSVMAP) {
+                next = cxt->rgn[FT_RSVMAP].start + cxt->rgn[FT_RSVMAP].size
+                        + nextra;
+                ssize = cxt->rgn[FT_STRUCT].size;
+                if (next + ssize >= cxt->rgn[FT_STRINGS].start)
+                        return 0;       /* "can't happen" */
+                memmove(next, cxt->rgn[FT_STRUCT].start, ssize);
+                ft_node_update_after(cxt, cxt->rgn[FT_STRUCT].start, nextra);
+                cxt->rgn[FT_STRUCT].start = next;
+
+                if (ft_shuffle(cxt, pp, rgn, nextra))
+                        return 1;
+        }
+
+        return 0;               /* "can't happen" */
+}
+
+static void ft_put_word(struct ft_cxt *cxt, u32 v)
+{
+        *(u32 *) cxt->p = cpu_to_be32(v);
+        cxt->p += 4;
+}
+
+static void ft_put_bin(struct ft_cxt *cxt, const void *data, unsigned int sz)
+{
+        unsigned long sza = _ALIGN(sz, 4);
+
+        /* zero out the alignment gap if necessary */
+        if (sz < sza)
+                *(u32 *) (cxt->p + sza - 4) = 0;
+
+        /* copy in the data */
+        memcpy(cxt->p, data, sz);
+
+        cxt->p += sza;
+}
+
+int ft_begin_node(struct ft_cxt *cxt, const char *name)
+{
+        unsigned long nlen = strlen(name) + 1;
+        unsigned long len = 8 + _ALIGN(nlen, 4);
+
+        if (!ft_make_space(cxt, &cxt->p, FT_STRUCT, len))
+                return -1;
+        ft_put_word(cxt, OF_DT_BEGIN_NODE);
+        ft_put_bin(cxt, name, strlen(name) + 1);
+        return 0;
+}
+
+void ft_end_node(struct ft_cxt *cxt)
+{
+        ft_put_word(cxt, OF_DT_END_NODE);
+}
+
+void ft_nop(struct ft_cxt *cxt)
+{
+        if (ft_make_space(cxt, &cxt->p, FT_STRUCT, 4))
+                ft_put_word(cxt, OF_DT_NOP);
+}
+
+#define NO_STRING       0x7fffffff
+
+static int lookup_string(struct ft_cxt *cxt, const char *name)
+{
+        char *p, *end;
+
+        p = cxt->rgn[FT_STRINGS].start;
+        end = p + cxt->rgn[FT_STRINGS].size;
+        while (p < end) {
+                if (strcmp(p, (char *)name) == 0)
+                        return p - cxt->str_anchor;
+                p += strlen(p) + 1;
+        }
+
+        return NO_STRING;
+}
+
+/* lookup string and insert if not found */
+static int map_string(struct ft_cxt *cxt, const char *name)
+{
+        int off;
+        char *p;
+
+        off = lookup_string(cxt, name);
+        if (off != NO_STRING)
+                return off;
+        p = cxt->rgn[FT_STRINGS].start;
+        if (!ft_make_space(cxt, &p, FT_STRINGS, strlen(name) + 1))
+                return NO_STRING;
+        strcpy(p, name);
+        return p - cxt->str_anchor;
+}
+
+int ft_prop(struct ft_cxt *cxt, const char *name, const void *data,
+                unsigned int sz)
+{
+        int off, len;
+
+        off = lookup_string(cxt, name);
+        if (off == NO_STRING)
+                return -1;
+
+        len = 12 + _ALIGN(sz, 4);
+        if (!ft_make_space(cxt, &cxt->p, FT_STRUCT, len))
+                return -1;
+
+        ft_put_word(cxt, OF_DT_PROP);
+        ft_put_word(cxt, sz);
+        ft_put_word(cxt, off);
+        ft_put_bin(cxt, data, sz);
+        return 0;
+}
+
+int ft_prop_str(struct ft_cxt *cxt, const char *name, const char *str)
+{
+        return ft_prop(cxt, name, str, strlen(str) + 1);
+}
+
+int ft_prop_int(struct ft_cxt *cxt, const char *name, unsigned int val)
+{
+        u32 v = cpu_to_be32((u32) val);
+
+        return ft_prop(cxt, name, &v, 4);
+}
+
+/* Calculate the size of the reserved map */
+static unsigned long rsvmap_size(struct ft_cxt *cxt)
+{
+        struct ft_reserve *res;
+
+        res = (struct ft_reserve *)cxt->rgn[FT_RSVMAP].start;
+        while (res->start || res->len)
+                ++res;
+        return (char *)(res + 1) - cxt->rgn[FT_RSVMAP].start;
+}
+
+/* Calculate the size of the struct region by stepping through it */
+static unsigned long struct_size(struct ft_cxt *cxt)
+{
+        char *p = cxt->rgn[FT_STRUCT].start;
+        char *next;
+        struct ft_atom atom;
+
+        /* make check in ft_next happy */
+        if (cxt->rgn[FT_STRUCT].size == 0)
+                cxt->rgn[FT_STRUCT].size = 0xfffffffful - (unsigned long)p;
+
+        while ((next = ft_next(cxt, p, &atom)) != NULL)
+                p = next;
+        return p + 4 - cxt->rgn[FT_STRUCT].start;
+}
+
+/* add `adj' on to all string offset values in the struct area */
+static void adjust_string_offsets(struct ft_cxt *cxt, int adj)
+{
+        char *p = cxt->rgn[FT_STRUCT].start;
+        char *next;
+        struct ft_atom atom;
+        int off;
+
+        while ((next = ft_next(cxt, p, &atom)) != NULL) {
+                if (atom.tag == OF_DT_PROP) {
+                        off = be32_to_cpu(*(u32 *) (p + 8));
+                        *(u32 *) (p + 8) = cpu_to_be32(off + adj);
+                }
+                p = next;
+        }
+}
+
+/* start construction of the flat OF tree from scratch */
+void ft_begin(struct ft_cxt *cxt, void *blob, unsigned int max_size,
+                void *(*realloc_fn) (void *, unsigned long))
+{
+        struct boot_param_header *bph = blob;
+        char *p;
+        struct ft_reserve *pres;
+
+        /* clear the cxt */
+        memset(cxt, 0, sizeof(*cxt));
+
+        cxt->bph = bph;
+        cxt->max_size = max_size;
+        cxt->realloc = realloc_fn;
+        cxt->isordered = 1;
+
+        /* zero everything in the header area */
+        memset(bph, 0, sizeof(*bph));
+
+        bph->magic = cpu_to_be32(OF_DT_HEADER);
+        bph->version = cpu_to_be32(0x10);
+        bph->last_comp_version = cpu_to_be32(0x10);
+
+        /* start pointers */
+        cxt->rgn[FT_RSVMAP].start = p = blob + HDR_SIZE;
+        cxt->rgn[FT_RSVMAP].size = sizeof(struct ft_reserve);
+        pres = (struct ft_reserve *)p;
+        cxt->rgn[FT_STRUCT].start = p += sizeof(struct ft_reserve);
+        cxt->rgn[FT_STRUCT].size = 4;
+        cxt->rgn[FT_STRINGS].start = blob + max_size;
+        cxt->rgn[FT_STRINGS].size = 0;
+
+        /* init rsvmap and struct */
+        pres->start = 0;
+        pres->len = 0;
+        *(u32 *) p = cpu_to_be32(OF_DT_END);
+
+        cxt->str_anchor = blob;
+}
+
+/* open up an existing blob to be examined or modified */
+int ft_open(struct ft_cxt *cxt, void *blob, unsigned int max_size,
+                unsigned int max_find_device,
+                void *(*realloc_fn) (void *, unsigned long))
+{
+        struct boot_param_header *bph = blob;
+
+        /* can't cope with version < 16 */
+        if (be32_to_cpu(bph->version) < 16)
+                return -1;
+
+        /* clear the cxt */
+        memset(cxt, 0, sizeof(*cxt));
+
+        /* alloc node_tbl to track node ptrs returned by ft_find_device */
+        ++max_find_device;
+        cxt->node_tbl = realloc_fn(NULL, max_find_device * sizeof(char *));
+        if (!cxt->node_tbl)
+                return -1;
+        memset(cxt->node_tbl, 0, max_find_device * sizeof(char *));
+        cxt->node_max = max_find_device;
+        cxt->nodes_used = 1;    /* don't use idx 0 b/c looks like NULL */
+
+        cxt->bph = bph;
+        cxt->max_size = max_size;
+        cxt->realloc = realloc_fn;
+
+        cxt->rgn[FT_RSVMAP].start = blob + be32_to_cpu(bph->off_mem_rsvmap);
+        cxt->rgn[FT_RSVMAP].size = rsvmap_size(cxt);
+        cxt->rgn[FT_STRUCT].start = blob + be32_to_cpu(bph->off_dt_struct);
+        cxt->rgn[FT_STRUCT].size = struct_size(cxt);
+        cxt->rgn[FT_STRINGS].start = blob + be32_to_cpu(bph->off_dt_strings);
+        cxt->rgn[FT_STRINGS].size = be32_to_cpu(bph->dt_strings_size);
+        /* Leave as '0' to force first ft_make_space call to do a ft_reorder
+         * and move dt to an area allocated by realloc.
+        cxt->isordered = ft_ordered(cxt);
+        */
+
+        cxt->p = cxt->rgn[FT_STRUCT].start;
+        cxt->str_anchor = cxt->rgn[FT_STRINGS].start;
+
+        return 0;
+}
+
+/* add a reserver physical area to the rsvmap */
+int ft_add_rsvmap(struct ft_cxt *cxt, u64 physaddr, u64 size)
+{
+        char *p;
+        struct ft_reserve *pres;
+
+        p = cxt->rgn[FT_RSVMAP].start + cxt->rgn[FT_RSVMAP].size
+                - sizeof(struct ft_reserve);
+        if (!ft_make_space(cxt, &p, FT_RSVMAP, sizeof(struct ft_reserve)))
+                return -1;
+
+        pres = (struct ft_reserve *)p;
+        pres->start = cpu_to_be64(physaddr);
+        pres->len = cpu_to_be64(size);
+
+        return 0;
+}
+
+void ft_begin_tree(struct ft_cxt *cxt)
+{
+        cxt->p = cxt->rgn[FT_STRUCT].start;
+}
+
+void ft_end_tree(struct ft_cxt *cxt)
+{
+        struct boot_param_header *bph = cxt->bph;
+        char *p, *oldstr, *str, *endp;
+        unsigned long ssize;
+        int adj;
+
+        if (!cxt->isordered)
+                return;         /* we haven't touched anything */
+
+        /* adjust string offsets */
+        oldstr = cxt->rgn[FT_STRINGS].start;
+        adj = cxt->str_anchor - oldstr;
+        if (adj)
+                adjust_string_offsets(cxt, adj);
+
+        /* make strings end on 8-byte boundary */
+        ssize = cxt->rgn[FT_STRINGS].size;
+        endp = (char *)_ALIGN((unsigned long)cxt->rgn[FT_STRUCT].start
+                        + cxt->rgn[FT_STRUCT].size + ssize, 8);
+        str = endp - ssize;
+
+        /* move strings down to end of structs */
+        memmove(str, oldstr, ssize);
+        cxt->str_anchor = str;
+        cxt->rgn[FT_STRINGS].start = str;
+
+        /* fill in header fields */
+        p = (char *)bph;
+        bph->totalsize = cpu_to_be32(endp - p);
+        bph->off_mem_rsvmap = cpu_to_be32(cxt->rgn[FT_RSVMAP].start - p);
+        bph->off_dt_struct = cpu_to_be32(cxt->rgn[FT_STRUCT].start - p);
+        bph->off_dt_strings = cpu_to_be32(cxt->rgn[FT_STRINGS].start - p);
+        bph->dt_strings_size = cpu_to_be32(ssize);
+}
+
+void *ft_find_device(struct ft_cxt *cxt, const char *srch_path)
+{
+        char *node;
+
+        /* require absolute path */
+        if (srch_path[0] != '/')
+                return NULL;
+        node = ft_find_descendent(cxt, cxt->rgn[FT_STRUCT].start, srch_path);
+        return ft_node_add(cxt, node);
+}
+
+void *ft_find_descendent(struct ft_cxt *cxt, void *top, const char *srch_path)
+{
+        struct ft_atom atom;
+        char *p;
+        const char *cp, *q;
+        int cl;
+        int depth = -1;
+        int dmatch = 0;
+        const char *path_comp[FT_MAX_DEPTH];
+
+        cp = srch_path;
+        cl = 0;
+        p = top;
+
+        while ((p = ft_next(cxt, p, &atom)) != NULL) {
+                switch (atom.tag) {
+                case OF_DT_BEGIN_NODE:
+                        ++depth;
+                        if (depth != dmatch)
+                                break;
+                        cxt->genealogy[depth] = atom.data;
+                        cxt->genealogy[depth + 1] = NULL;
+                        if (depth && !(strncmp(atom.name, cp, cl) == 0
+                                        && (atom.name[cl] == '/'
+                                                || atom.name[cl] == '\0'
+                                                || atom.name[cl] == '@')))
+                                break;
+                        path_comp[dmatch] = cp;
+                        /* it matches so far, advance to next path component */
+                        cp += cl;
+                        /* skip slashes */
+                        while (*cp == '/')
+                                ++cp;
+                        /* we're done if this is the end of the string */
+                        if (*cp == 0)
+                                return atom.data;
+                        /* look for end of this component */
+                        q = strchr(cp, '/');
+                        if (q)
+                                cl = q - cp;
+                        else
+                                cl = strlen(cp);
+                        ++dmatch;
+                        break;
+                case OF_DT_END_NODE:
+                        if (depth == 0)
+                                return NULL;
+                        if (dmatch > depth) {
+                                --dmatch;
+                                cl = cp - path_comp[dmatch] - 1;
+                                cp = path_comp[dmatch];
+                                while (cl > 0 && cp[cl - 1] == '/')
+                                        --cl;
+                        }
+                        --depth;
+                        break;
+                }
+        }
+        return NULL;
+}
+
+void *ft_get_parent(struct ft_cxt *cxt, const void *phandle)
+{
+        void *node;
+        int d;
+        struct ft_atom atom;
+        char *p;
+
+        node = ft_node_ph2node(cxt, phandle);
+        if (node == NULL)
+                return NULL;
+
+        for (d = 0; cxt->genealogy[d] != NULL; ++d)
+                if (cxt->genealogy[d] == node)
+                        return cxt->genealogy[d > 0 ? d - 1 : 0];
+
+        /* have to do it the hard way... */
+        p = cxt->rgn[FT_STRUCT].start;
+        d = 0;
+        while ((p = ft_next(cxt, p, &atom)) != NULL) {
+                switch (atom.tag) {
+                case OF_DT_BEGIN_NODE:
+                        cxt->genealogy[d] = atom.data;
+                        if (node == atom.data) {
+                                /* found it */
+                                cxt->genealogy[d + 1] = NULL;
+                                return d > 0 ? cxt->genealogy[d - 1] : node;
+                        }
+                        ++d;
+                        break;
+                case OF_DT_END_NODE:
+                        --d;
+                        break;
+                }
+        }
+        return NULL;
+}
+
+int ft_get_prop(struct ft_cxt *cxt, const void *phandle, const char *propname,
+                void *buf, const unsigned int buflen)
+{
+        struct ft_atom atom;
+        void *node;
+        char *p;
+        int depth;
+        unsigned int size;
+
+        node = ft_node_ph2node(cxt, phandle);
+        if (node == NULL)
+                return -1;
+
+        depth = 0;
+        p = (char *)node;
+
+        while ((p = ft_next(cxt, p, &atom)) != NULL) {
+                switch (atom.tag) {
+                case OF_DT_BEGIN_NODE:
+                        ++depth;
+                        break;
+                case OF_DT_PROP:
+                        if ((depth != 1) || strcmp(atom.name, propname))
+                                break;
+                        size = min(atom.size, buflen);
+                        memcpy(buf, atom.data, size);
+                        return atom.size;
+                case OF_DT_END_NODE:
+                        if (--depth <= 0)
+                                return -1;
+                }
+        }
+        return -1;
+}
+
+int ft_set_prop(struct ft_cxt *cxt, const void *phandle, const char *propname,
+                const void *buf, const unsigned int buflen)
+{
+        struct ft_atom atom;
+        void *node;
+        char *p, *next;
+        int nextra, depth;
+
+        node = ft_node_ph2node(cxt, phandle);
+        if (node == NULL)
+                return -1;
+
+        depth = 0;
+        p = node;
+
+        while ((next = ft_next(cxt, p, &atom)) != NULL) {
+                switch (atom.tag) {
+                case OF_DT_BEGIN_NODE:
+                        ++depth;
+                        break;
+                case OF_DT_END_NODE:
+                        if (--depth > 0)
+                                break;
+                        /* haven't found the property, insert here */
+                        cxt->p = p;
+                        return ft_prop(cxt, propname, buf, buflen);
+                case OF_DT_PROP:
+                        if ((depth != 1) || strcmp(atom.name, propname))
+                                break;
+                        /* found an existing property, overwrite it */
+                        nextra = _ALIGN(buflen, 4) - _ALIGN(atom.size, 4);
+                        cxt->p = atom.data;
+                        if (nextra && !ft_make_space(cxt, &cxt->p, FT_STRUCT,
+                                                nextra))
+                                return -1;
+                        *(u32 *) (cxt->p - 8) = cpu_to_be32(buflen);
+                        ft_put_bin(cxt, buf, buflen);
+                        return 0;
+                }
+                p = next;
+        }
+        return -1;
+}
+
+int ft_del_prop(struct ft_cxt *cxt, const void *phandle, const char *propname)
+{
+        struct ft_atom atom;
+        void *node;
+        char *p, *next;
+        int size;
+
+        node = ft_node_ph2node(cxt, phandle);
+        if (node == NULL)
+                return -1;
+
+        p = node;
+        while ((next = ft_next(cxt, p, &atom)) != NULL) {
+                switch (atom.tag) {
+                case OF_DT_BEGIN_NODE:
+                case OF_DT_END_NODE:
+                        return -1;
+                case OF_DT_PROP:
+                        if (strcmp(atom.name, propname))
+                                break;
+                        /* found the property, remove it */
+                        size = 12 + -_ALIGN(atom.size, 4);
+                        cxt->p = p;
+                        if (!ft_make_space(cxt, &cxt->p, FT_STRUCT, -size))
+                                return -1;
+                        return 0;
+                }
+                p = next;
+        }
+        return -1;
+}
+
+void *ft_create_node(struct ft_cxt *cxt, const void *parent, const char *path)
+{
+        struct ft_atom atom;
+        char *p, *next;
+        int depth = 0;
+
+        p = cxt->rgn[FT_STRUCT].start;
+        while ((next = ft_next(cxt, p, &atom)) != NULL) {
+                switch (atom.tag) {
+                case OF_DT_BEGIN_NODE:
+                        ++depth;
+                        if (depth == 1 && strcmp(atom.name, path) == 0)
+                                /* duplicate node path, return error */
+                                return NULL;
+                        break;
+                case OF_DT_END_NODE:
+                        --depth;
+                        if (depth > 0)
+                                break;
+                        /* end of node, insert here */
+                        cxt->p = p;
+                        ft_begin_node(cxt, path);
+                        ft_end_node(cxt);
+                        return p;
+                }
+                p = next;
+        }
+        return NULL;
+}
diff --git a/arch/powerpc/boot/flatdevtree.h b/arch/powerpc/boot/flatdevtree.h
index 761c8dc84008..b9cd9f61f351 100644
--- a/arch/powerpc/boot/flatdevtree.h
+++ b/arch/powerpc/boot/flatdevtree.h
@@ -17,7 +17,7 @@
 #ifndef FLATDEVTREE_H
 #define FLATDEVTREE_H
 
-#include "types.h"
+#include "flatdevtree_env.h"
 
 /* Definitions used by the flattened device tree */
 #define OF_DT_HEADER            0xd00dfeed      /* marker */
@@ -43,4 +43,64 @@ struct boot_param_header {
         u32 dt_strings_size;    /* size of the DT strings block */
 };
 
+struct ft_reserve {
+        u64 start;
+        u64 len;
+};
+
+struct ft_region {
+        char *start;
+        unsigned long size;
+};
+
+enum ft_rgn_id {
+        FT_RSVMAP,
+        FT_STRUCT,
+        FT_STRINGS,
+        FT_N_REGION
+};
+
+#define FT_MAX_DEPTH    50
+
+struct ft_cxt {
+        struct boot_param_header *bph;
+        int max_size;           /* maximum size of tree */
+        int isordered;          /* everything in standard order */
+        void *(*realloc)(void *, unsigned long);
+        char *str_anchor;
+        char *p;                /* current insertion point in structs */
+        struct ft_region rgn[FT_N_REGION];
+        void *genealogy[FT_MAX_DEPTH+1];
+        char **node_tbl;
+        unsigned int node_max;
+        unsigned int nodes_used;
+};
+
+int ft_begin_node(struct ft_cxt *cxt, const char *name);
+void ft_end_node(struct ft_cxt *cxt);
+
+void ft_begin_tree(struct ft_cxt *cxt);
+void ft_end_tree(struct ft_cxt *cxt);
+
+void ft_nop(struct ft_cxt *cxt);
+int ft_prop(struct ft_cxt *cxt, const char *name,
+            const void *data, unsigned int sz);
+int ft_prop_str(struct ft_cxt *cxt, const char *name, const char *str);
+int ft_prop_int(struct ft_cxt *cxt, const char *name, unsigned int val);
+void ft_begin(struct ft_cxt *cxt, void *blob, unsigned int max_size,
+              void *(*realloc_fn)(void *, unsigned long));
+int ft_open(struct ft_cxt *cxt, void *blob, unsigned int max_size,
+                unsigned int max_find_device,
+                void *(*realloc_fn)(void *, unsigned long));
+int ft_add_rsvmap(struct ft_cxt *cxt, u64 physaddr, u64 size);
+
+void ft_dump_blob(const void *bphp);
+void ft_merge_blob(struct ft_cxt *cxt, void *blob);
+void *ft_find_device(struct ft_cxt *cxt, const char *srch_path);
+void *ft_find_descendent(struct ft_cxt *cxt, void *top, const char *srch_path);
+int ft_get_prop(struct ft_cxt *cxt, const void *phandle, const char *propname,
+                void *buf, const unsigned int buflen);
+int ft_set_prop(struct ft_cxt *cxt, const void *phandle, const char *propname,
+                const void *buf, const unsigned int buflen);
+
 #endif /* FLATDEVTREE_H */
diff --git a/arch/powerpc/boot/flatdevtree_env.h b/arch/powerpc/boot/flatdevtree_env.h
new file mode 100644
index 000000000000..83bc1c718836
--- /dev/null
+++ b/arch/powerpc/boot/flatdevtree_env.h
@@ -0,0 +1,47 @@
+/*
+ * This file adds the header file glue so that the shared files
+ * flatdevicetree.[ch] can compile and work in the powerpc bootwrapper.
+ *
+ * strncmp & strchr copied from <file:lib/strings.c>
+ * Copyright (C) 1991, 1992  Linus Torvalds
+ *
+ * Maintained by: Mark A. Greer <mgreer@mvista.com>
+ */
+#ifndef _PPC_BOOT_FLATDEVTREE_ENV_H_
+#define _PPC_BOOT_FLATDEVTREE_ENV_H_
+
+#include <stdarg.h>
+#include <stddef.h>
+#include "types.h"
+#include "string.h"
+#include "stdio.h"
+#include "ops.h"
+
+#define be16_to_cpu(x)          (x)
+#define cpu_to_be16(x)          (x)
+#define be32_to_cpu(x)          (x)
+#define cpu_to_be32(x)          (x)
+#define be64_to_cpu(x)          (x)
+#define cpu_to_be64(x)          (x)
+
+static inline int strncmp(const char *cs, const char *ct, size_t count)
+{
+        signed char __res = 0;
+
+        while (count) {
+                if ((__res = *cs - *ct++) != 0 || !*cs++)
+                        break;
+                count--;
+        }
+        return __res;
+}
+
+static inline char *strchr(const char *s, int c)
+{
+        for (; *s != (char)c; ++s)
+                if (*s == '\0')
+                        return NULL;
+        return (char *)s;
+}
+
+#endif /* _PPC_BOOT_FLATDEVTREE_ENV_H_ */
diff --git a/arch/powerpc/boot/flatdevtree_misc.c b/arch/powerpc/boot/flatdevtree_misc.c
new file mode 100644
index 000000000000..04da38fa477f
--- /dev/null
+++ b/arch/powerpc/boot/flatdevtree_misc.c
@@ -0,0 +1,51 @@
+/*
+ * This file does the necessary interface mapping between the bootwrapper
+ * device tree operations and the interface provided by shared source
+ * files flatdevicetree.[ch].
+ *
+ * Author: Mark A. Greer <mgreer@mvista.com>
+ *
+ * 2006 (c) MontaVista Software, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+#include <stddef.h>
+#include "flatdevtree.h"
+#include "ops.h"
+
+static struct ft_cxt cxt;
+
+static void *ft_finddevice(const char *name)
+{
+        return ft_find_device(&cxt, name);
+}
+
+static int ft_getprop(const void *phandle, const char *propname, void *buf,
+                const int buflen)
+{
+        return ft_get_prop(&cxt, phandle, propname, buf, buflen);
+}
+
+static int ft_setprop(const void *phandle, const char *propname,
+                const void *buf, const int buflen)
+{
+        return ft_set_prop(&cxt, phandle, propname, buf, buflen);
+}
+
+static unsigned long ft_finalize(void)
+{
+        ft_end_tree(&cxt);
+        return (unsigned long)cxt.bph;
+}
+
+int ft_init(void *dt_blob, unsigned int max_size, unsigned int max_find_device)
+{
+        dt_ops.finddevice = ft_finddevice;
+        dt_ops.getprop = ft_getprop;
+        dt_ops.setprop = ft_setprop;
+        dt_ops.finalize = ft_finalize;
+
+        return ft_open(&cxt, dt_blob, max_size, max_find_device,
+                        platform_ops.realloc);
+}
diff --git a/arch/powerpc/boot/io.h b/arch/powerpc/boot/io.h
new file mode 100644
index 000000000000..32974ed49e02
--- /dev/null
+++ b/arch/powerpc/boot/io.h
@@ -0,0 +1,53 @@
+#ifndef _IO_H
+#define __IO_H
+/*
+ * Low-level I/O routines.
+ *
+ * Copied from <file:include/asm-powerpc/io.h> (which has no copyright)
+ */
+static inline int in_8(const volatile unsigned char *addr)
+{
+        int ret;
+
+        __asm__ __volatile__("lbz%U1%X1 %0,%1; twi 0,%0,0; isync"
+                             : "=r" (ret) : "m" (*addr));
+        return ret;
+}
+
+static inline void out_8(volatile unsigned char *addr, int val)
+{
+        __asm__ __volatile__("stb%U0%X0 %1,%0; sync"
+                             : "=m" (*addr) : "r" (val));
+}
+
+static inline unsigned in_le32(const volatile unsigned *addr)
+{
+        unsigned ret;
+
+        __asm__ __volatile__("lwbrx %0,0,%1; twi 0,%0,0; isync"
+                             : "=r" (ret) : "r" (addr), "m" (*addr));
+        return ret;
+}
+
+static inline unsigned in_be32(const volatile unsigned *addr)
+{
+        unsigned ret;
+
+        __asm__ __volatile__("lwz%U1%X1 %0,%1; twi 0,%0,0; isync"
+                             : "=r" (ret) : "m" (*addr));
+        return ret;
+}
+
+static inline void out_le32(volatile unsigned *addr, int val)
+{
+        __asm__ __volatile__("stwbrx %1,0,%2; sync" : "=m" (*addr)
+                             : "r" (val), "r" (addr));
+}
+
+static inline void out_be32(volatile unsigned *addr, int val)
+{
+        __asm__ __volatile__("stw%U0%X0 %1,%0; sync"
+                             : "=m" (*addr) : "r" (val));
+}
+
+#endif /* _IO_H */
diff --git a/arch/powerpc/boot/main.c b/arch/powerpc/boot/main.c
index d719bb9333d1..6f6b50d238b6 100644
--- a/arch/powerpc/boot/main.c
+++ b/arch/powerpc/boot/main.c
@@ -27,6 +27,8 @@ extern char _vmlinux_start[];
 extern char _vmlinux_end[];
 extern char _initrd_start[];
 extern char _initrd_end[];
+extern char _dtb_start[];
+extern char _dtb_end[];
 
 struct addr_range {
         unsigned long addr;
@@ -167,7 +169,7 @@ static int is_elf32(void *hdr)
         return 1;
 }
 
-static void prep_kernel(unsigned long *a1, unsigned long *a2)
+static void prep_kernel(unsigned long a1, unsigned long a2)
 {
         int len;
 
@@ -203,11 +205,14 @@ static void prep_kernel(unsigned long *a1, unsigned long *a2)
         }
 
         /*
-         * Now we try to alloc memory for the initrd (and copy it there)
+         * Now find the initrd
+         *
+         * First see if we have an image attached to us.  If so
+         * allocate memory for it and copy it there.
          */
         initrd.size = (unsigned long)(_initrd_end - _initrd_start);
         initrd.memsize = initrd.size;
-        if ( initrd.size > 0 ) {
+        if (initrd.size > 0) {
                 printf("Allocating 0x%lx bytes for initrd ...\n\r",
                        initrd.size);
                 initrd.addr = (unsigned long)malloc((u32)initrd.size);
@@ -216,8 +221,6 @@ static void prep_kernel(unsigned long *a1, unsigned long *a2)
                                         "ramdisk !\n\r");
                         exit();
                 }
-                *a1 = initrd.addr;
-                *a2 = initrd.size;
                 printf("initial ramdisk moving 0x%lx <- 0x%lx "
                         "(0x%lx bytes)\n\r", initrd.addr,
                         (unsigned long)_initrd_start, initrd.size);
@@ -225,6 +228,12 @@ static void prep_kernel(unsigned long *a1, unsigned long *a2)
                         initrd.size);
                 printf("initrd head: 0x%lx\n\r",
                                 *((unsigned long *)initrd.addr));
+        } else if (a2 != 0) {
+                /* Otherwise, see if yaboot or another loader gave us an initrd */
+                initrd.addr = a1;
+                initrd.memsize = initrd.size = a2;
+                printf("Using loader supplied initrd at 0x%lx (0x%lx bytes)\n\r",
+                       initrd.addr, initrd.size);
         }
 
         /* Eventually gunzip the kernel */
@@ -250,10 +259,6 @@ static void prep_kernel(unsigned long *a1, unsigned long *a2)
         flush_cache((void *)vmlinux.addr, vmlinux.size);
 }
 
-void __attribute__ ((weak)) ft_init(void *dt_blob)
-{
-}
-
 /* A buffer that may be edited by tools operating on a zImage binary so as to
  * edit the command line passed to vmlinux (by setting /chosen/bootargs).
  * The buffer is put in it's own section so that tools may locate it easier.
@@ -285,36 +290,22 @@ static void set_cmdline(char *buf)
                 setprop(devp, "bootargs", buf, strlen(buf) + 1);
 }
 
-/* Section where ft can be tacked on after zImage is built */
-union blobspace {
-        struct boot_param_header hdr;
-        char space[8*1024];
-} dt_blob __attribute__((__section__("__builtin_ft")));
-
 struct platform_ops platform_ops;
 struct dt_ops dt_ops;
 struct console_ops console_ops;
 
 void start(unsigned long a1, unsigned long a2, void *promptr, void *sp)
 {
-        int have_dt = 0;
         kernel_entry_t kentry;
         char cmdline[COMMAND_LINE_SIZE];
+        unsigned long ft_addr = 0;
 
         memset(__bss_start, 0, _end - __bss_start);
         memset(&platform_ops, 0, sizeof(platform_ops));
         memset(&dt_ops, 0, sizeof(dt_ops));
         memset(&console_ops, 0, sizeof(console_ops));
 
-        /* Override the dt_ops and device tree if there was an flat dev
-         * tree attached to the zImage.
-         */
-        if (dt_blob.hdr.magic == OF_DT_HEADER) {
-                have_dt = 1;
-                ft_init(&dt_blob);
-        }
-
-        if (platform_init(promptr))
+        if (platform_init(promptr, _dtb_start, _dtb_end))
                 exit();
         if (console_ops.open && (console_ops.open() < 0))
                 exit();
@@ -324,7 +315,7 @@ void start(unsigned long a1, unsigned long a2, void *promptr, void *sp)
         printf("\n\rzImage starting: loaded at 0x%p (sp: 0x%p)\n\r",
                _start, sp);
 
-        prep_kernel(&a1, &a2);
+        prep_kernel(a1, a2);
 
         /* If cmdline came from zimage wrapper or if we can edit the one
          * in the dt, print it out and edit it, if possible.
@@ -338,15 +329,23 @@ void start(unsigned long a1, unsigned long a2, void *promptr, void *sp)
                 set_cmdline(cmdline);
         }
 
+        printf("Finalizing device tree...");
+        if (dt_ops.finalize)
+                ft_addr = dt_ops.finalize();
+        if (ft_addr)
+                printf(" flat tree at 0x%lx\n\r", ft_addr);
+        else
+                printf(" using OF tree (promptr=%p)\n\r", promptr);
+
         if (console_ops.close)
                 console_ops.close();
 
         kentry = (kernel_entry_t) vmlinux.addr;
-        if (have_dt)
-                kentry(dt_ops.ft_addr(), 0, NULL);
+        if (ft_addr)
+                kentry(ft_addr, 0, NULL);
         else
                 /* XXX initrd addr/size should be passed in properties */
-                kentry(a1, a2, promptr);
+                kentry(initrd.addr, initrd.size, promptr);
 
         /* console closed so printf below may not work */
         printf("Error: Linux kernel returned to zImage boot wrapper!\n\r");
diff --git a/arch/powerpc/boot/mktree.c b/arch/powerpc/boot/mktree.c
new file mode 100644
index 000000000000..4cb892993651
--- /dev/null
+++ b/arch/powerpc/boot/mktree.c
@@ -0,0 +1,152 @@
+/*
+ * Makes a tree bootable image for IBM Evaluation boards.
+ * Basically, just take a zImage, skip the ELF header, and stuff
+ * a 32 byte header on the front.
+ *
+ * We use htonl, which is a network macro, to make sure we're doing
+ * The Right Thing on an LE machine.  It's non-obvious, but it should
+ * work on anything BSD'ish.
+ */
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <netinet/in.h>
+#ifdef __sun__
+#include <inttypes.h>
+#else
+#include <stdint.h>
+#endif
+
+/* This gets tacked on the front of the image.  There are also a few
+ * bytes allocated after the _start label used by the boot rom (see
+ * head.S for details).
+ */
+typedef struct boot_block {
+        uint32_t bb_magic;              /* 0x0052504F */
+        uint32_t bb_dest;               /* Target address of the image */
+        uint32_t bb_num_512blocks;      /* Size, rounded-up, in 512 byte blks */
+        uint32_t bb_debug_flag; /* Run debugger or image after load */
+        uint32_t bb_entry_point;        /* The image address to start */
+        uint32_t bb_checksum;   /* 32 bit checksum including header */
+        uint32_t reserved[2];
+} boot_block_t;
+
+#define IMGBLK  512
+char    tmpbuf[IMGBLK];
+
+int main(int argc, char *argv[])
+{
+        int     in_fd, out_fd;
+        int     nblks, i;
+        uint    cksum, *cp;
+        struct  stat    st;
+        boot_block_t    bt;
+
+        if (argc < 3) {
+                fprintf(stderr, "usage: %s <zImage-file> <boot-image> [entry-point]\n",argv[0]);
+                exit(1);
+        }
+
+        if (stat(argv[1], &st) < 0) {
+                perror("stat");
+                exit(2);
+        }
+
+        nblks = (st.st_size + IMGBLK) / IMGBLK;
+
+        bt.bb_magic = htonl(0x0052504F);
+
+        /* If we have the optional entry point parameter, use it */
+        if (argc == 4)
+                bt.bb_dest = bt.bb_entry_point = htonl(strtoul(argv[3], NULL, 0));
+        else
+                bt.bb_dest = bt.bb_entry_point = htonl(0x500000);
+
+        /* We know these from the linker command.
+         * ...and then move it up into memory a little more so the
+         * relocation can happen.
+         */
+        bt.bb_num_512blocks = htonl(nblks);
+        bt.bb_debug_flag = 0;
+
+        bt.bb_checksum = 0;
+
+        /* To be neat and tidy :-).
+        */
+        bt.reserved[0] = 0;
+        bt.reserved[1] = 0;
+
+        if ((in_fd = open(argv[1], O_RDONLY)) < 0) {
+                perror("zImage open");
+                exit(3);
+        }
+
+        if ((out_fd = open(argv[2], (O_RDWR | O_CREAT | O_TRUNC), 0666)) < 0) {
+                perror("bootfile open");
+                exit(3);
+        }
+
+        cksum = 0;
+        cp = (void *)&bt;
+        for (i=0; i<sizeof(bt)/sizeof(uint); i++)
+                cksum += *cp++;
+
+        /* Assume zImage is an ELF file, and skip the 64K header.
+        */
+        if (read(in_fd, tmpbuf, IMGBLK) != IMGBLK) {
+                fprintf(stderr, "%s is too small to be an ELF image\n",
+                                argv[1]);
+                exit(4);
+        }
+
+        if ((*(uint *)tmpbuf) != htonl(0x7f454c46)) {
+                fprintf(stderr, "%s is not an ELF image\n", argv[1]);
+                exit(4);
+        }
+
+        if (lseek(in_fd, (64 * 1024), SEEK_SET) < 0) {
+                fprintf(stderr, "%s failed to seek in ELF image\n", argv[1]);
+                exit(4);
+        }
+
+        nblks -= (64 * 1024) / IMGBLK;
+
+        /* And away we go......
+        */
+        if (write(out_fd, &bt, sizeof(bt)) != sizeof(bt)) {
+                perror("boot-image write");
+                exit(5);
+        }
+
+        while (nblks-- > 0) {
+                if (read(in_fd, tmpbuf, IMGBLK) < 0) {
+                        perror("zImage read");
+                        exit(5);
+                }
+                cp = (uint *)tmpbuf;
+                for (i=0; i<sizeof(tmpbuf)/sizeof(uint); i++)
+                        cksum += *cp++;
+                if (write(out_fd, tmpbuf, sizeof(tmpbuf)) != sizeof(tmpbuf)) {
+                        perror("boot-image write");
+                        exit(5);
+                }
+        }
+
+        /* rewrite the header with the computed checksum.
+        */
+        bt.bb_checksum = htonl(cksum);
+        if (lseek(out_fd, 0, SEEK_SET) < 0) {
+                perror("rewrite seek");
+                exit(1);
+        }
+        if (write(out_fd, &bt, sizeof(bt)) != sizeof(bt)) {
+                perror("boot-image rewrite");
+                exit(1);
+        }
+
+        exit(0);
+}
diff --git a/arch/powerpc/boot/ns16550.c b/arch/powerpc/boot/ns16550.c
new file mode 100644
index 000000000000..1ffe72e35cdc
--- /dev/null
+++ b/arch/powerpc/boot/ns16550.c
@@ -0,0 +1,74 @@
+/*
+ * 16550 serial console support.
+ *
+ * Original copied from <file:arch/ppc/boot/common/ns16550.c>
+ * (which had no copyright)
+ * Modifications: 2006 (c) MontaVista Software, Inc.
+ *
+ * Modified by: Mark A. Greer <mgreer@mvista.com>
+ */
+#include <stdarg.h>
+#include <stddef.h>
+#include "types.h"
+#include "string.h"
+#include "stdio.h"
+#include "io.h"
+#include "ops.h"
+
+#define UART_DLL        0       /* Out: Divisor Latch Low */
+#define UART_DLM        1       /* Out: Divisor Latch High */
+#define UART_FCR        2       /* Out: FIFO Control Register */
+#define UART_LCR        3       /* Out: Line Control Register */
+#define UART_MCR        4       /* Out: Modem Control Register */
+#define UART_LSR        5       /* In:  Line Status Register */
+#define UART_LSR_THRE   0x20    /* Transmit-hold-register empty */
+#define UART_LSR_DR     0x01    /* Receiver data ready */
+#define UART_MSR        6       /* In:  Modem Status Register */
+#define UART_SCR        7       /* I/O: Scratch Register */
+
+static unsigned char *reg_base;
+static u32 reg_shift;
+
+static int ns16550_open(void)
+{
+        out_8(reg_base + (UART_FCR << reg_shift), 0x06);
+        return 0;
+}
+
+static void ns16550_putc(unsigned char c)
+{
+        while ((in_8(reg_base + (UART_LSR << reg_shift)) & UART_LSR_THRE) == 0);
+        out_8(reg_base, c);
+}
+
+static unsigned char ns16550_getc(void)
+{
+        while ((in_8(reg_base + (UART_LSR << reg_shift)) & UART_LSR_DR) == 0);
+        return in_8(reg_base);
+}
+
+static u8 ns16550_tstc(void)
+{
+        return ((in_8(reg_base + (UART_LSR << reg_shift)) & UART_LSR_DR) != 0);
+}
+
+int ns16550_console_init(void *devp, struct serial_console_data *scdp)
+{
+        int n;
+
+        n = getprop(devp, "virtual-reg", &reg_base, sizeof(reg_base));
+        if (n != sizeof(reg_base))
+                return -1;
+
+        n = getprop(devp, "reg-shift", &reg_shift, sizeof(reg_shift));
+        if (n != sizeof(reg_shift))
+                reg_shift = 0;
+
+        scdp->open = ns16550_open;
+        scdp->putc = ns16550_putc;
+        scdp->getc = ns16550_getc;
+        scdp->tstc = ns16550_tstc;
+        scdp->close = NULL;
+
+        return 0;
+}
diff --git a/arch/powerpc/boot/of.c b/arch/powerpc/boot/of.c
index 3a71845afc6c..0182f384f3e6 100644
--- a/arch/powerpc/boot/of.c
+++ b/arch/powerpc/boot/of.c
@@ -256,24 +256,18 @@ static void of_console_write(char *buf, int len)
         call_prom("write", 3, 1, of_stdout_handle, buf, len);
 }
 
-int platform_init(void *promptr)
+int platform_init(void *promptr, char *dt_blob_start, char *dt_blob_end)
 {
-        platform_ops.fixups = NULL;
         platform_ops.image_hdr = of_image_hdr;
         platform_ops.malloc = of_try_claim;
-        platform_ops.free = NULL;
         platform_ops.exit = of_exit;
 
         dt_ops.finddevice = of_finddevice;
         dt_ops.getprop = of_getprop;
         dt_ops.setprop = of_setprop;
-        dt_ops.translate_addr = NULL;
 
         console_ops.open = of_console_open;
         console_ops.write = of_console_write;
-        console_ops.edit_cmdline = NULL;
-        console_ops.close = NULL;
-        console_ops.data = NULL;
 
         prom = (int (*)(void *))promptr;
         return 0;
diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h
index 135eb4bb03b4..8abb6516bb7c 100644
--- a/arch/powerpc/boot/ops.h
+++ b/arch/powerpc/boot/ops.h
@@ -22,7 +22,8 @@ struct platform_ops {
         void    (*fixups)(void);
         void    (*image_hdr)(const void *);
         void *  (*malloc)(u32 size);
-        void    (*free)(void *ptr, u32 size);
+        void    (*free)(void *ptr);
+        void *  (*realloc)(void *ptr, unsigned long size);
         void    (*exit)(void);
 };
 extern struct platform_ops platform_ops;
@@ -30,13 +31,11 @@ extern struct platform_ops platform_ops;
 /* Device Tree operations */
 struct dt_ops {
         void *  (*finddevice)(const char *name);
-        int     (*getprop)(const void *node, const char *name, void *buf,
+        int     (*getprop)(const void *phandle, const char *name, void *buf,
                         const int buflen);
-        int     (*setprop)(const void *node, const char *name,
+        int     (*setprop)(const void *phandle, const char *name,
                         const void *buf, const int buflen);
-        u64     (*translate_addr)(const char *path, const u32 *in_addr,
-                        const u32 addr_len);
-        unsigned long (*ft_addr)(void);
+        unsigned long (*finalize)(void);
 };
 extern struct dt_ops dt_ops;
 
@@ -59,10 +58,13 @@ struct serial_console_data {
         void            (*close)(void);
 };
 
-extern int platform_init(void *promptr);
-extern void simple_alloc_init(void);
-extern void ft_init(void *dt_blob);
-extern int serial_console_init(void);
+int platform_init(void *promptr, char *dt_blob_start, char *dt_blob_end);
+int ft_init(void *dt_blob, unsigned int max_size, unsigned int max_find_device);
+int serial_console_init(void);
+int ns16550_console_init(void *devp, struct serial_console_data *scdp);
+void *simple_alloc_init(char *base, u32 heap_size, u32 granularity,
+                u32 max_allocs);
+
 
 static inline void *finddevice(const char *name)
 {
@@ -84,10 +86,10 @@ static inline void *malloc(u32 size)
         return (platform_ops.malloc) ? platform_ops.malloc(size) : NULL;
 }
 
-static inline void free(void *ptr, u32 size)
+static inline void free(void *ptr)
 {
         if (platform_ops.free)
-                platform_ops.free(ptr, size);
+                platform_ops.free(ptr);
 }
 
 static inline void exit(void)
diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
new file mode 100644
index 000000000000..e8de4cf59be7
--- /dev/null
+++ b/arch/powerpc/boot/serial.c
@@ -0,0 +1,142 @@
+/*
+ * Generic serial console support
+ *
+ * Author: Mark A. Greer <mgreer@mvista.com>
+ *
+ * Code in serial_edit_cmdline() copied from <file:arch/ppc/boot/simple/misc.c>
+ * and was written by Matt Porter <mporter@kernel.crashing.org>.
+ *
+ * 2001,2006 (c) MontaVista Software, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+#include <stdarg.h>
+#include <stddef.h>
+#include "types.h"
+#include "string.h"
+#include "stdio.h"
+#include "io.h"
+#include "ops.h"
+
+extern void udelay(long delay);
+
+static int serial_open(void)
+{
+        struct serial_console_data *scdp = console_ops.data;
+        return scdp->open();
+}
+
+static void serial_write(char *buf, int len)
+{
+        struct serial_console_data *scdp = console_ops.data;
+
+        while (*buf != '\0')
+                scdp->putc(*buf++);
+}
+
+static void serial_edit_cmdline(char *buf, int len)
+{
+        int timer = 0, count;
+        char ch, *cp;
+        struct serial_console_data *scdp = console_ops.data;
+
+        cp = buf;
+        count = strlen(buf);
+        cp = &buf[count];
+        count++;
+
+        while (timer++ < 5*1000) {
+                if (scdp->tstc()) {
+                        while (((ch = scdp->getc()) != '\n') && (ch != '\r')) {
+                                /* Test for backspace/delete */
+                                if ((ch == '\b') || (ch == '\177')) {
+                                        if (cp != buf) {
+                                                cp--;
+                                                count--;
+                                                printf("\b \b");
+                                        }
+                                /* Test for ^x/^u (and wipe the line) */
+                                } else if ((ch == '\030') || (ch == '\025')) {
+                                        while (cp != buf) {
+                                                cp--;
+                                                count--;
+                                                printf("\b \b");
+                                        }
+                                } else if (count < len) {
+                                                *cp++ = ch;
+                                                count++;
+                                                scdp->putc(ch);
+                                }
+                        }
+                        break;  /* Exit 'timer' loop */
+                }
+                udelay(1000);  /* 1 msec */
+        }
+        *cp = 0;
+}
+
+static void serial_close(void)
+{
+        struct serial_console_data *scdp = console_ops.data;
+
+        if (scdp->close)
+                scdp->close();
+}
+
+static void *serial_get_stdout_devp(void)
+{
+        void *devp;
+        char devtype[MAX_PROP_LEN];
+        char path[MAX_PATH_LEN];
+
+        devp = finddevice("/chosen");
+        if (devp == NULL)
+                goto err_out;
+
+        if (getprop(devp, "linux,stdout-path", path, MAX_PATH_LEN) > 0) {
+                devp = finddevice(path);
+                if (devp == NULL)
+                        goto err_out;
+
+                if ((getprop(devp, "device_type", devtype, sizeof(devtype)) > 0)
+                                && !strcmp(devtype, "serial"))
+                        return devp;
+        }
+err_out:
+        return NULL;
+}
+
+static struct serial_console_data serial_cd;
+
+/* Node's "compatible" property determines which serial driver to use */
+int serial_console_init(void)
+{
+        void *devp;
+        int rc = -1;
+        char compat[MAX_PROP_LEN];
+
+        devp = serial_get_stdout_devp();
+        if (devp == NULL)
+                goto err_out;
+
+        if (getprop(devp, "compatible", compat, sizeof(compat)) < 0)
+                goto err_out;
+
+        if (!strcmp(compat, "ns16550"))
+                rc = ns16550_console_init(devp, &serial_cd);
+
+        /* Add other serial console driver calls here */
+
+        if (!rc) {
+                console_ops.open = serial_open;
+                console_ops.write = serial_write;
+                console_ops.edit_cmdline = serial_edit_cmdline;
+                console_ops.close = serial_close;
+                console_ops.data = &serial_cd;
+
+                return 0;
+        }
+err_out:
+        return -1;
+}
diff --git a/arch/powerpc/boot/simple_alloc.c b/arch/powerpc/boot/simple_alloc.c
new file mode 100644
index 000000000000..cfe3a7505ba0
--- /dev/null
+++ b/arch/powerpc/boot/simple_alloc.c
@@ -0,0 +1,149 @@
+/*
+ * Implement primitive realloc(3) functionality.
+ *
+ * Author: Mark A. Greer <mgreer@mvista.com>
+ *
+ * 2006 (c) MontaVista, Software, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#include <stddef.h>
+#include "types.h"
+#include "page.h"
+#include "string.h"
+#include "ops.h"
+
+#define ENTRY_BEEN_USED 0x01
+#define ENTRY_IN_USE    0x02
+
+static struct alloc_info {
+        u32     flags;
+        u32     base;
+        u32     size;
+} *alloc_tbl;
+
+static u32 tbl_entries;
+static u32 alloc_min;
+static u32 next_base;
+static u32 space_left;
+
+/*
+ * First time an entry is used, its base and size are set.
+ * An entry can be freed and re-malloc'd but its base & size don't change.
+ * Should be smart enough for needs of bootwrapper.
+ */
+static void *simple_malloc(u32 size)
+{
+        u32 i;
+        struct alloc_info *p = alloc_tbl;
+
+        if (size == 0)
+                goto err_out;
+
+        size = _ALIGN_UP(size, alloc_min);
+
+        for (i=0; i<tbl_entries; i++, p++)
+                if (!(p->flags & ENTRY_BEEN_USED)) { /* never been used */
+                        if (size <= space_left) {
+                                p->base = next_base;
+                                p->size = size;
+                                p->flags = ENTRY_BEEN_USED | ENTRY_IN_USE;
+                                next_base += size;
+                                space_left -= size;
+                                return (void *)p->base;
+                        }
+                        goto err_out; /* not enough space left */
+                }
+                /* reuse an entry keeping same base & size */
+                else if (!(p->flags & ENTRY_IN_USE) && (size <= p->size)) {
+                        p->flags |= ENTRY_IN_USE;
+                        return (void *)p->base;
+                }
+err_out:
+        return NULL;
+}
+
+static struct alloc_info *simple_find_entry(void *ptr)
+{
+        u32 i;
+        struct alloc_info *p = alloc_tbl;
+
+        for (i=0; i<tbl_entries; i++,p++) {
+                if (!(p->flags & ENTRY_BEEN_USED))
+                        break;
+                if ((p->flags & ENTRY_IN_USE) && (p->base == (u32)ptr))
+                        return p;
+        }
+        return NULL;
+}
+
+static void simple_free(void *ptr)
+{
+        struct alloc_info *p = simple_find_entry(ptr);
+
+        if (p != NULL)
+                p->flags &= ~ENTRY_IN_USE;
+}
+
+/*
+ * Change size of area pointed to by 'ptr' to 'size'.
+ * If 'ptr' is NULL, then its a malloc().  If 'size' is 0, then its a free().
+ * 'ptr' must be NULL or a pointer to a non-freed area previously returned by
+ * simple_realloc() or simple_malloc().
+ */
+static void *simple_realloc(void *ptr, unsigned long size)
+{
+        struct alloc_info *p;
+        void *new;
+
+        if (size == 0) {
+                simple_free(ptr);
+                return NULL;
+        }
+
+        if (ptr == NULL)
+                return simple_malloc(size);
+
+        p = simple_find_entry(ptr);
+        if (p == NULL) /* ptr not from simple_malloc/simple_realloc */
+                return NULL;
+        if (size <= p->size) /* fits in current block */
+                return ptr;
+
+        new = simple_malloc(size);
+        memcpy(new, ptr, p->size);
+        simple_free(ptr);
+        return new;
+}
+
+/*
+ * Returns addr of first byte after heap so caller can see if it took
+ * too much space.  If so, change args & try again.
+ */
+void *simple_alloc_init(char *base, u32 heap_size, u32 granularity,
+                u32 max_allocs)
+{
+        u32 heap_base, tbl_size;
+
+        heap_size = _ALIGN_UP(heap_size, granularity);
+        alloc_min = granularity;
+        tbl_entries = max_allocs;
+
+        tbl_size = tbl_entries * sizeof(struct alloc_info);
+
+        alloc_tbl = (struct alloc_info *)_ALIGN_UP((unsigned long)base, 8);
+        memset(alloc_tbl, 0, tbl_size);
+
+        heap_base = _ALIGN_UP((u32)alloc_tbl + tbl_size, alloc_min);
+
+        next_base = heap_base;
+        space_left = heap_size;
+
+        platform_ops.malloc = simple_malloc;
+        platform_ops.free = simple_free;
+        platform_ops.realloc = simple_realloc;
+
+        return (void *)(heap_base + heap_size);
+}
diff --git a/arch/powerpc/boot/stdio.c b/arch/powerpc/boot/stdio.c
index 6d5f6382e1ce..0a9feeb98342 100644
--- a/arch/powerpc/boot/stdio.c
+++ b/arch/powerpc/boot/stdio.c
@@ -320,6 +320,7 @@ printf(const char *fmt, ...)
         va_start(args, fmt);
         n = vsprintf(sprint_buf, fmt, args);
         va_end(args);
-        console_ops.write(sprint_buf, n);
+        if (console_ops.write)
+                console_ops.write(sprint_buf, n);
         return n;
 }
diff --git a/arch/powerpc/boot/util.S b/arch/powerpc/boot/util.S
new file mode 100644
index 000000000000..427ddfc11991
--- /dev/null
+++ b/arch/powerpc/boot/util.S
@@ -0,0 +1,88 @@
+/*
+ * Copied from <file:arch/powerpc/kernel/misc_32.S>
+ *
+ * This file contains miscellaneous low-level functions.
+ *    Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
+ *
+ * Largely rewritten by Cort Dougan (cort@cs.nmt.edu)
+ * and Paul Mackerras.
+ *
+ * kexec bits:
+ * Copyright (C) 2002-2003 Eric Biederman  <ebiederm@xmission.com>
+ * GameCube/ppc32 port Copyright (C) 2004 Albert Herranz
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ */
+#include "ppc_asm.h"
+
+#define SPRN_PVR        0x11F   /* Processor Version Register */
+
+        .text
+
+/* udelay (on non-601 processors) needs to know the period of the
+ * timebase in nanoseconds.  This used to be hardcoded to be 60ns
+ * (period of 66MHz/4).  Now a variable is used that is initialized to
+ * 60 for backward compatibility, but it can be overridden as necessary
+ * with code something like this:
+ *    extern unsigned long timebase_period_ns;
+ *    timebase_period_ns = 1000000000 / bd->bi_tbfreq;
+ */
+        .data
+        .globl timebase_period_ns
+timebase_period_ns:
+        .long   60
+
+        .text
+/*
+ * Delay for a number of microseconds
+ */
+        .globl  udelay
+udelay:
+        mfspr   r4,SPRN_PVR
+        srwi    r4,r4,16
+        cmpwi   0,r4,1          /* 601 ? */
+        bne     .udelay_not_601
+00:     li      r0,86   /* Instructions / microsecond? */
+        mtctr   r0
+10:     addi    r0,r0,0 /* NOP */
+        bdnz    10b
+        subic.  r3,r3,1
+        bne     00b
+        blr
+
+.udelay_not_601:
+        mulli   r4,r3,1000      /* nanoseconds */
+        /*  Change r4 to be the number of ticks using:
+         *      (nanoseconds + (timebase_period_ns - 1 )) / timebase_period_ns
+         *  timebase_period_ns defaults to 60 (16.6MHz) */
+        mflr    r5
+        bl      0f
+0:      mflr    r6
+        mtlr    r5
+        lis     r5,0b@ha
+        addi    r5,r5,0b@l
+        subf    r5,r5,r6        /* In case we're relocated */
+        addis   r5,r5,timebase_period_ns@ha
+        lwz     r5,timebase_period_ns@l(r5)
+        add     r4,r4,r5
+        addi    r4,r4,-1
+        divw    r4,r4,r5        /* BUS ticks */
+1:      mftbu   r5
+        mftb    r6
+        mftbu   r7
+        cmpw    0,r5,r7
+        bne     1b              /* Get [synced] base time */
+        addc    r9,r6,r4        /* Compute end time */
+        addze   r8,r5
+2:      mftbu   r5
+        cmpw    0,r5,r8
+        blt     2b
+        bgt     3f
+        mftb    r6
+        cmpw    0,r6,r9
+        blt     2b
+3:      blr
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index b5fb1fee76f8..024e4d425c59 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -184,6 +184,9 @@ fi
 
 if [ -n "$dtb" ]; then
     addsec $tmp "$dtb" .kernel:dtb
+    if [ -n "$dts" ]; then
+        rm $dtb
+    fi
 fi
 
 if [ "$platform" != "miboot" ]; then
diff --git a/arch/powerpc/boot/zImage.coff.lds.S b/arch/powerpc/boot/zImage.coff.lds.S
index 05f32388b953..a360905e5428 100644
--- a/arch/powerpc/boot/zImage.coff.lds.S
+++ b/arch/powerpc/boot/zImage.coff.lds.S
@@ -21,6 +21,10 @@ SECTIONS
     *(.got2)
     __got2_end = .;
 
+    _dtb_start = .;
+    *(.kernel:dtb)
+    _dtb_end = .;
+
     _vmlinux_start =  .;
     *(.kernel:vmlinux.strip)
     _vmlinux_end =  .;
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index 0aba06d7d2ec..d1d25152f74f 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18
-# Wed Oct  4 15:30:50 2006
+# Linux kernel version: 2.6.20-rc1
+# Tue Dec 19 14:59:53 2006
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -10,6 +10,8 @@ CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_IRQ_PER_CPU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_ARCH_HAS_ILOG2_U64=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -23,6 +25,7 @@ CONFIG_PPC_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
 
 #
@@ -32,6 +35,10 @@ CONFIG_AUDIT_ARCH=y
 CONFIG_POWER3=y
 CONFIG_POWER4=y
 CONFIG_PPC_FPU=y
+# CONFIG_PPC_DCR_NATIVE is not set
+CONFIG_PPC_DCR_MMIO=y
+CONFIG_PPC_DCR=y
+CONFIG_PPC_OF_PLATFORM_PCI=y
 CONFIG_ALTIVEC=y
 CONFIG_PPC_STD_MMU=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
@@ -62,12 +69,13 @@ CONFIG_SYSVIPC=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CPUSETS=y
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
-# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -124,12 +132,15 @@ CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_APUS is not set
 # CONFIG_PPC_PSERIES is not set
 # CONFIG_PPC_ISERIES is not set
+# CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_PMAC is not set
 # CONFIG_PPC_MAPLE is not set
 # CONFIG_PPC_PASEMI is not set
 CONFIG_PPC_CELL=y
 CONFIG_PPC_CELL_NATIVE=y
 CONFIG_PPC_IBM_CELL_BLADE=y
+CONFIG_PPC_PS3=y
+CONFIG_PPC_NATIVE=y
 CONFIG_UDBG_RTAS_CONSOLE=y
 # CONFIG_U3_DART is not set
 CONFIG_PPC_RTAS=y
@@ -139,9 +150,23 @@ CONFIG_RTAS_FLASH=y
 CONFIG_MMIO_NVRAM=y
 # CONFIG_PPC_MPC106 is not set
 # CONFIG_PPC_970_NAP is not set
-# CONFIG_CPU_FREQ is not set
+CONFIG_PPC_INDIRECT_IO=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_DEBUG=y
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+# CONFIG_CPU_FREQ_PMAC64 is not set
 # CONFIG_WANT_EARLY_SERIAL is not set
-# CONFIG_MPIC is not set
+CONFIG_MPIC=y
 
 #
 # Cell Broadband Engine options
@@ -149,12 +174,23 @@ CONFIG_MMIO_NVRAM=y
 CONFIG_SPU_FS=m
 CONFIG_SPU_BASE=y
 CONFIG_CBE_RAS=y
+CONFIG_CBE_THERM=m
+CONFIG_CBE_CPUFREQ=m
+
+#
+# PS3 Platform Options
+#
+CONFIG_PS3_HTAB_SIZE=20
+# CONFIG_PS3_DYNAMIC_DMA is not set
+CONFIG_PS3_USE_LPAR_ADDR=y
+CONFIG_PS3_VUART=y
 
 #
 # Kernel options
 #
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
@@ -166,13 +202,14 @@ CONFIG_BINFMT_MISC=m
 CONFIG_FORCE_MAX_ZONEORDER=9
 # CONFIG_IOMMU_VMERGE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_KEXEC=y
+# CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_NUMA=y
 CONFIG_NODES_SHIFT=4
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_FLATMEM_MANUAL is not set
@@ -189,6 +226,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MIGRATION=y
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_NODES_SPAN_OTHER_NODES=y
 CONFIG_PPC_64K_PAGES=y
 CONFIG_SCHED_SMT=y
 CONFIG_PROC_DEVICETREE=y
@@ -241,7 +279,10 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_PNP is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
 CONFIG_NET_IPIP=y
 # CONFIG_NET_IPGRE is not set
 # CONFIG_IP_MROUTE is not set
@@ -260,6 +301,7 @@ CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 
 #
 # IP: Virtual Server Configuration
@@ -280,7 +322,6 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
 # CONFIG_IPV6_SIT is not set
 CONFIG_IPV6_TUNNEL=m
-# CONFIG_IPV6_SUBTREES is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
@@ -289,31 +330,67 @@ CONFIG_NETFILTER=y
 #
 # Core Netfilter Configuration
 #
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_XTABLES is not set
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 #
 # IP: Netfilter Configuration
 #
-CONFIG_IP_NF_CONNTRACK=y
-# CONFIG_IP_NF_CT_ACCT is not set
-# CONFIG_IP_NF_CONNTRACK_MARK is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CT_PROTO_SCTP=y
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-# CONFIG_IP_NF_NETBIOS_NS is not set
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_H323 is not set
-# CONFIG_IP_NF_SIP is not set
 CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 
 #
 # IPv6: Netfilter Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
 
 #
 # DCCP Configuration (EXPERIMENTAL)
@@ -345,6 +422,7 @@ CONFIG_IP_NF_QUEUE=m
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
+CONFIG_NET_CLS_ROUTE=y
 
 #
 # Network testing
@@ -400,6 +478,7 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=131072
@@ -429,6 +508,7 @@ CONFIG_IDEDISK_MULTI_MODE=y
 # CONFIG_BLK_DEV_IDECD is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
 
 #
@@ -440,7 +520,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
 # CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
 CONFIG_IDEDMA_PCI_AUTO=y
@@ -464,6 +543,7 @@ CONFIG_BLK_DEV_AEC62XX=y
 # CONFIG_BLK_DEV_PDC202XX_NEW is not set
 # CONFIG_BLK_DEV_SVWKS is not set
 CONFIG_BLK_DEV_SIIMAGE=y
+# CONFIG_BLK_DEV_SL82C105 is not set
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -477,8 +557,74 @@ CONFIG_IDEDMA_AUTO=y
 # SCSI device support
 #
 # CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
+CONFIG_SCSI=m
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
 
 #
 # Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -510,6 +656,9 @@ CONFIG_DM_MULTIPATH=m
 # Fusion MPT device support
 #
 # CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
 
 #
 # IEEE 1394 (FireWire) support
@@ -524,6 +673,7 @@ CONFIG_DM_MULTIPATH=m
 #
 # Macintosh device drivers
 #
+# CONFIG_MAC_EMUMOUSEBTN is not set
 # CONFIG_WINDFARM is not set
 
 #
@@ -531,7 +681,7 @@ CONFIG_DM_MULTIPATH=m
 #
 CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
-CONFIG_BONDING=y
+CONFIG_BONDING=m
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=y
 
@@ -576,11 +726,11 @@ CONFIG_E1000_NAPI=y
 # CONFIG_R8169 is not set
 # CONFIG_SIS190 is not set
 CONFIG_SKGE=m
-# CONFIG_SKY2 is not set
+CONFIG_SKY2=m
 # CONFIG_SK98LIN is not set
-# CONFIG_TIGON3 is not set
+CONFIG_TIGON3=y
 # CONFIG_BNX2 is not set
-CONFIG_SPIDER_NET=m
+CONFIG_SPIDER_NET=y
 # CONFIG_QLA3XXX is not set
 
 #
@@ -590,6 +740,7 @@ CONFIG_SPIDER_NET=m
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
 
 #
 # Token Ring devices
@@ -609,6 +760,7 @@ CONFIG_SPIDER_NET=m
 # CONFIG_HIPPI is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
@@ -675,6 +827,7 @@ CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_DIGIEPCA is not set
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
+# CONFIG_MOXA_SMARTIO_NEW is not set
 # CONFIG_ISI is not set
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set
@@ -701,6 +854,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_HVC_DRIVER=y
@@ -728,16 +882,17 @@ CONFIG_WATCHDOG_RTAS=y
 #
 # CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
@@ -827,12 +982,14 @@ CONFIG_I2C_ALGOBIT=y
 # Digital Video Broadcasting Devices
 #
 # CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
 
 #
 # Graphics support
 #
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB is not set
+# CONFIG_FB_IBM_GXT4500 is not set
 
 #
 # Console display driver support
@@ -847,18 +1004,145 @@ CONFIG_DUMMY_CONSOLE=y
 # CONFIG_SOUND is not set
 
 #
+# HID Devices
+#
+CONFIG_HID=m
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_MULTITHREAD_PROBE is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
 
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
 
 #
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
@@ -884,7 +1168,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 # InfiniBand support
 #
-CONFIG_INFINIBAND=y
+CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_ADDR_TRANS=y
@@ -894,6 +1178,8 @@ CONFIG_INFINIBAND_MTHCA_DEBUG=y
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_SRP is not set
+# CONFIG_INFINIBAND_ISER is not set
 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
@@ -918,6 +1204,10 @@ CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
 #
 
 #
+# Virtualization
+#
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1000,23 +1290,18 @@ CONFIG_RAMFS=y
 #
 # Network File Systems
 #
-CONFIG_NFS_FS=m
+CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 # CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-# CONFIG_NFSD_V4 is not set
-CONFIG_NFSD_TCP=y
-CONFIG_LOCKD=m
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
-CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
+CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1092,8 +1377,14 @@ CONFIG_NLS_ISO8859_15=m
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
@@ -1102,12 +1393,16 @@ CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
 CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
 
 #
 # Instrumentation Support
 #
-# CONFIG_PROFILING is not set
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=y
 # CONFIG_KPROBES is not set
 
 #
@@ -1117,6 +1412,8 @@ CONFIG_PLIST=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=15
 CONFIG_DETECT_SOFTLOCKUP=y
@@ -1130,18 +1427,18 @@ CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
-CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_FORCED_INLINING is not set
-# CONFIG_HEADERS_CHECK is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 CONFIG_DEBUGGER=y
 CONFIG_XMON=y
 CONFIG_XMON_DEFAULT=y
+CONFIG_XMON_DISASSEMBLY=y
 CONFIG_IRQSTACKS=y
 # CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
@@ -1159,8 +1456,9 @@ CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_CRYPTO_HASH=y
-# CONFIG_CRYPTO_MANAGER is not set
+CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=m
@@ -1169,8 +1467,10 @@ CONFIG_CRYPTO_SHA1=m
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_LRW is not set
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
new file mode 100644
index 000000000000..23fd210eb56a
--- /dev/null
+++ b/arch/powerpc/configs/linkstation_defconfig
@@ -0,0 +1,1583 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.19-rc4
+# Wed Nov 15 20:36:30 2006
+#
+# CONFIG_PPC64 is not set
+CONFIG_PPC32=y
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_IRQ_PER_CPU=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_PPC_UDBG_16550=y
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+# CONFIG_DEFAULT_UIMAGE is not set
+
+#
+# Processor support
+#
+CONFIG_CLASSIC32=y
+# CONFIG_PPC_52xx is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_86xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_8xx is not set
+# CONFIG_E200 is not set
+CONFIG_6xx=y
+CONFIG_PPC_FPU=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+# CONFIG_ALTIVEC is not set
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_SMP is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION="-kuroboxHG"
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_POSIX_MQUEUE=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# Platform support
+#
+# CONFIG_PPC_MULTIPLATFORM is not set
+CONFIG_EMBEDDED6xx=y
+# CONFIG_APUS is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_TAU is not set
+# CONFIG_KATANA is not set
+# CONFIG_WILLOW is not set
+# CONFIG_CPCI690 is not set
+# CONFIG_POWERPMC250 is not set
+# CONFIG_CHESTNUT is not set
+# CONFIG_SPRUCE is not set
+# CONFIG_HDPU is not set
+# CONFIG_EV64260 is not set
+# CONFIG_LOPEC is not set
+# CONFIG_MVME5100 is not set
+# CONFIG_PPLUS is not set
+# CONFIG_PRPMC750 is not set
+# CONFIG_PRPMC800 is not set
+# CONFIG_SANDPOINT is not set
+CONFIG_LINKSTATION=y
+# CONFIG_MPC7448HPC2 is not set
+# CONFIG_RADSTONE_PPC7D is not set
+# CONFIG_PAL4 is not set
+# CONFIG_GEMINI is not set
+# CONFIG_EST8260 is not set
+# CONFIG_SBC82xx is not set
+# CONFIG_SBS8260 is not set
+# CONFIG_RPX8260 is not set
+# CONFIG_TQM8260 is not set
+# CONFIG_ADS8272 is not set
+# CONFIG_PQ2FADS is not set
+# CONFIG_LITE5200 is not set
+# CONFIG_EV64360 is not set
+CONFIG_PPC_GEN550=y
+CONFIG_MPC10X_BRIDGE=y
+CONFIG_MPC10X_OPENPIC=y
+# CONFIG_MPC10X_STORE_GATHERING is not set
+# CONFIG_WANT_EARLY_SERIAL is not set
+CONFIG_MPIC=y
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+CONFIG_HZ_100=y
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=100
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+# CONFIG_SECCOMP is not set
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_GENERIC_ISA_DMA=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_FSL_SOC=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
+# CONFIG_PCI_MULTITHREAD_PROBE is not set
+# CONFIG_PCI_DEBUG is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_HIGHMEM_START=0xfe000000
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_TASK_SIZE=0x80000000
+CONFIG_BOOT_LOAD=0x00800000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
+# CONFIG_IP_NF_CT_PROTO_SCTP is not set
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+# CONFIG_IP_NF_NETBIOS_NS is not set
+CONFIG_IP_NF_TFTP=m
+# CONFIG_IP_NF_AMANDA is not set
+# CONFIG_IP_NF_PPTP is not set
+# CONFIG_IP_NF_H323 is not set
+# CONFIG_IP_NF_SIP is not set
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+# CONFIG_IP_NF_MATCH_TOS is not set
+# CONFIG_IP_NF_MATCH_RECENT is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+# CONFIG_IP_NF_MATCH_OWNER is not set
+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
+# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_NF_TARGET_TCPMSS is not set
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+CONFIG_IEEE80211=m
+CONFIG_IEEE80211_DEBUG=y
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
+CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_WIRELESS_EXT=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+# CONFIG_MTD_CFI_I2 is not set
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0xffc00000
+CONFIG_MTD_PHYSMAP_LEN=0x400000
+CONFIG_MTD_PHYSMAP_BANKWIDTH=1
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=2
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# Misc devices
+#
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+CONFIG_ATA=y
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+CONFIG_PATA_SIL680=y
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Macintosh device drivers
+#
+# CONFIG_WINDFARM is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# PHY device support
+#
+
+#
+# Ethernet (10 or 100Mbit)
+#
+# CONFIG_NET_ETHERNET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+CONFIG_R8169=y
+# CONFIG_R8169_NAPI is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+# CONFIG_NET_WIRELESS_RTNETLINK is not set
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+# CONFIG_AIRO is not set
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
+#
+# CONFIG_PRISM54 is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_BCM43XX is not set
+# CONFIG_ZD1211RW is not set
+CONFIG_NET_WIRELESS=y
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+CONFIG_NETCONSOLE=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_RX is not set
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_I8042 is not set
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_NVRAM is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+CONFIG_I2C_MPC=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+CONFIG_SENSORS_EEPROM=m
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_M41T00 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_CONSOLE=y
+# CONFIG_USB_SERIAL_GENERIC is not set
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_AIRPRIME is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_CP2101 is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+CONFIG_USB_SERIAL_FTDI_SIO=y
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+
+#
+# RTC drivers
+#
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+CONFIG_RTC_DRV_RS5C372=y
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_ZISOFS_FS=m
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=m
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=m
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_PLIST=y
+
+#
+# Instrumentation Support
+#
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_DEBUGGER is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_BOOTX_TEXT is not set
+# CONFIG_SERIAL_TEXT_DEBUG is not set
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=m
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Hardware crypto devices
+#
diff --git a/arch/powerpc/configs/lite5200_defconfig b/arch/powerpc/configs/lite5200_defconfig
new file mode 100644
index 000000000000..ee7655776d45
--- /dev/null
+++ b/arch/powerpc/configs/lite5200_defconfig
@@ -0,0 +1,931 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.19-rc6
+# Mon Nov 27 11:08:20 2006
+#
+# CONFIG_PPC64 is not set
+CONFIG_PPC32=y
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_IRQ_PER_CPU=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+# CONFIG_PPC_UDBG_16550 is not set
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+# CONFIG_DEFAULT_UIMAGE is not set
+
+#
+# Processor support
+#
+CONFIG_CLASSIC32=y
+# CONFIG_PPC_52xx is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_86xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_8xx is not set
+# CONFIG_E200 is not set
+CONFIG_6xx=y
+CONFIG_PPC_FPU=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+# CONFIG_ALTIVEC is not set
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_SMP is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_KALLSYMS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+# CONFIG_EPOLL is not set
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_KMOD is not set
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# Platform support
+#
+CONFIG_PPC_MULTIPLATFORM=y
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_APUS is not set
+# CONFIG_PPC_CHRP is not set
+CONFIG_PPC_MPC52xx=y
+# CONFIG_PPC_EFIKA is not set
+CONFIG_PPC_LITE5200=y
+# CONFIG_PPC_PMAC is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_TAU is not set
+# CONFIG_WANT_EARLY_SERIAL is not set
+# CONFIG_MPIC is not set
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+# CONFIG_KEXEC is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_SOFTWARE_SUSPEND is not set
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_GENERIC_ISA_DMA=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_INDIRECT_PCI is not set
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
+# CONFIG_PCI_DEBUG is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_HIGHMEM_START=0xfe000000
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_TASK_SIZE=0x80000000
+CONFIG_BOOT_LOAD=0x00800000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=32768
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# Misc devices
+#
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_SCSI_PROC_FS is not set
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+# CONFIG_BLK_DEV_SD is not set
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+CONFIG_ATA=y
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+CONFIG_PATA_MPC52xx=y
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Macintosh device drivers
+#
+# CONFIG_WINDFARM is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# PHY device support
+#
+
+#
+# Ethernet (10 or 100Mbit)
+#
+# CONFIG_NET_ETHERNET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_MV643XX_ETH is not set
+# CONFIG_QLA3XXX is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+# CONFIG_INPUT is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_MPC52xx=y
+CONFIG_SERIAL_MPC52xx_CONSOLE=y
+CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+
+#
+# Real Time Clock
+#
+# CONFIG_RTC_CLASS is not set
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC32 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_PLIST=y
+
+#
+# Instrumentation Support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_DEBUGGER is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_BOOTX_TEXT is not set
+# CONFIG_SERIAL_TEXT_DEBUG is not set
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index be11df7c11aa..340376a47001 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-rc6
-# Sun Sep 10 10:45:11 2006
+# Linux kernel version: 2.6.20-rc3
+# Tue Jan  2 15:32:44 2007
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -10,6 +10,8 @@ CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_IRQ_PER_CPU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_ARCH_HAS_ILOG2_U64=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -22,6 +24,8 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
 CONFIG_PPC_UDBG_16550=y
 CONFIG_GENERIC_TBSYNC=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
 
 #
@@ -31,6 +35,10 @@ CONFIG_GENERIC_TBSYNC=y
 CONFIG_POWER3=y
 CONFIG_POWER4=y
 CONFIG_PPC_FPU=y
+# CONFIG_PPC_DCR_NATIVE is not set
+CONFIG_PPC_DCR_MMIO=y
+CONFIG_PPC_DCR=y
+CONFIG_PPC_OF_PLATFORM_PCI=y
 CONFIG_ALTIVEC=y
 CONFIG_PPC_STD_MMU=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
@@ -52,19 +60,24 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
-CONFIG_SYSCTL=y
+# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CPUSETS=y
+CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_TASK_XACCT is not set
+CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -73,12 +86,12 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
-CONFIG_RT_MUTEXES=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
 CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -97,6 +110,7 @@ CONFIG_STOP_MACHINE=y
 #
 # Block layer
 #
+CONFIG_BLOCK=y
 CONFIG_BLK_DEV_IO_TRACE=y
 
 #
@@ -116,16 +130,20 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # Platform support
 #
 CONFIG_PPC_MULTIPLATFORM=y
-# CONFIG_PPC_ISERIES is not set
 # CONFIG_EMBEDDED6xx is not set
 # CONFIG_APUS is not set
 CONFIG_PPC_PSERIES=y
+CONFIG_PPC_ISERIES=y
+# CONFIG_PPC_MPC52xx is not set
 CONFIG_PPC_PMAC=y
 CONFIG_PPC_PMAC64=y
 CONFIG_PPC_MAPLE=y
+# CONFIG_PPC_PASEMI is not set
 CONFIG_PPC_CELL=y
 CONFIG_PPC_CELL_NATIVE=y
 CONFIG_PPC_IBM_CELL_BLADE=y
+# CONFIG_PPC_PS3 is not set
+CONFIG_PPC_NATIVE=y
 CONFIG_UDBG_RTAS_CONSOLE=y
 CONFIG_XICS=y
 CONFIG_U3_DART=y
@@ -139,6 +157,8 @@ CONFIG_IBMVIO=y
 # CONFIG_IBMEBUS is not set
 # CONFIG_PPC_MPC106 is not set
 CONFIG_PPC_970_NAP=y
+CONFIG_PPC_INDIRECT_IO=y
+CONFIG_GENERIC_IOMAP=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
 # CONFIG_CPU_FREQ_DEBUG is not set
@@ -160,14 +180,16 @@ CONFIG_MPIC=y
 #
 CONFIG_SPU_FS=m
 CONFIG_SPU_BASE=y
-CONFIG_SPUFS_MMAP=y
 CONFIG_CBE_RAS=y
+CONFIG_CBE_THERM=m
+CONFIG_CBE_CPUFREQ=m
 
 #
 # Kernel options
 #
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
@@ -192,6 +214,7 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_FLATMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -201,6 +224,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ARCH_MEMORY_PROBE=y
@@ -222,6 +246,7 @@ CONFIG_PPC_I8259=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+# CONFIG_PCI_MULTITHREAD_PROBE is not set
 # CONFIG_PCI_DEBUG is not set
 
 #
@@ -254,6 +279,7 @@ CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
 CONFIG_NET_KEY=m
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -272,10 +298,13 @@ CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 
 #
 # IP: Virtual Server Configuration
@@ -294,25 +323,31 @@ CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK=y
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_NF_CONNTRACK_SUPPORT=y
+# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
 # CONFIG_NETFILTER_XTABLES is not set
 
 #
 # IP: Netfilter Configuration
 #
-CONFIG_IP_NF_CONNTRACK=m
-CONFIG_IP_NF_CT_ACCT=y
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK_EVENTS=y
-CONFIG_IP_NF_CONNTRACK_NETLINK=m
-CONFIG_IP_NF_CT_PROTO_SCTP=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-# CONFIG_IP_NF_NETBIOS_NS is not set
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_H323 is not set
-CONFIG_IP_NF_SIP=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 
 #
@@ -339,7 +374,6 @@ CONFIG_LLC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 
@@ -412,6 +446,12 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_ATA_OVER_ETH is not set
 
 #
+# Misc devices
+#
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+
+#
 # ATA/ATAPI/MFM/RLL support
 #
 CONFIG_IDE=y
@@ -438,7 +478,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
 # CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_SL82C105=y
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
 CONFIG_IDEDMA_PCI_AUTO=y
@@ -453,6 +492,7 @@ CONFIG_BLK_DEV_AMD74XX=y
 # CONFIG_BLK_DEV_CS5530 is not set
 # CONFIG_BLK_DEV_HPT34X is not set
 # CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
 # CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_PIIX is not set
 # CONFIG_BLK_DEV_IT821X is not set
@@ -461,6 +501,7 @@ CONFIG_BLK_DEV_AMD74XX=y
 # CONFIG_BLK_DEV_PDC202XX_NEW is not set
 # CONFIG_BLK_DEV_SVWKS is not set
 # CONFIG_BLK_DEV_SIIMAGE is not set
+CONFIG_BLK_DEV_SL82C105=y
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -478,6 +519,8 @@ CONFIG_IDEDMA_AUTO=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
+CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -497,14 +540,16 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
 
 #
-# SCSI Transport Attributes
+# SCSI Transports
 #
 CONFIG_SCSI_SPI_ATTRS=y
 CONFIG_SCSI_FC_ATTRS=y
 CONFIG_SCSI_ISCSI_ATTRS=m
 # CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
 
 #
 # SCSI low-level drivers
@@ -517,26 +562,12 @@ CONFIG_SCSI_ISCSI_ATTRS=m
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_ARCMSR is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-CONFIG_ATA=y
-# CONFIG_SATA_AHCI is not set
-CONFIG_SATA_SVW=y
-# CONFIG_SCSI_ATA_PIIX is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SCSI_PDC_ADMA is not set
 # CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_EATA is not set
@@ -546,6 +577,7 @@ CONFIG_SATA_SVW=y
 CONFIG_SCSI_IBMVSCSI=y
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
 CONFIG_SCSI_SYM53C8XX_2=y
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
@@ -556,10 +588,66 @@ CONFIG_SCSI_IPR_TRACE=y
 CONFIG_SCSI_IPR_DUMP=y
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
 CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
 CONFIG_SCSI_DEBUG=m
+# CONFIG_SCSI_SRP is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+CONFIG_ATA=y
+# CONFIG_SATA_AHCI is not set
+CONFIG_SATA_SVW=y
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
 
 #
 # Multi-device support (RAID and LVM)
@@ -575,6 +663,7 @@ CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
@@ -630,11 +719,13 @@ CONFIG_IEEE1394_RAWIO=y
 CONFIG_ADB_PMU=y
 # CONFIG_ADB_PMU_LED is not set
 CONFIG_PMAC_SMU=y
+# CONFIG_MAC_EMUMOUSEBTN is not set
 CONFIG_THERM_PM72=y
 CONFIG_WINDFARM=y
 CONFIG_WINDFARM_PM81=y
 CONFIG_WINDFARM_PM91=y
 CONFIG_WINDFARM_PM112=y
+# CONFIG_PMAC_RACKMETER is not set
 
 #
 # Network device support
@@ -675,6 +766,7 @@ CONFIG_VORTEX=y
 CONFIG_IBMVETH=m
 CONFIG_NET_PCI=y
 CONFIG_PCNET32=y
+# CONFIG_PCNET32_NAPI is not set
 # CONFIG_AMD8111_ETH is not set
 # CONFIG_ADAPTEC_STARFIRE is not set
 # CONFIG_B44 is not set
@@ -713,7 +805,7 @@ CONFIG_E1000=y
 CONFIG_TIGON3=y
 # CONFIG_BNX2 is not set
 CONFIG_SPIDER_NET=m
-# CONFIG_MV643XX_ETH is not set
+# CONFIG_QLA3XXX is not set
 
 #
 # Ethernet (10000 Mbit)
@@ -723,6 +815,7 @@ CONFIG_IXGB=m
 # CONFIG_IXGB_NAPI is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
 
 #
 # Token Ring devices
@@ -741,6 +834,7 @@ CONFIG_IBMOL=y
 # Wan interfaces
 #
 # CONFIG_WAN is not set
+CONFIG_ISERIES_VETH=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_PPP=m
@@ -753,6 +847,7 @@ CONFIG_PPP_BSDCOMP=m
 # CONFIG_PPP_MPPE is not set
 CONFIG_PPPOE=m
 # CONFIG_SLIP is not set
+CONFIG_SLHC=m
 # CONFIG_NET_FC is not set
 # CONFIG_SHAPER is not set
 CONFIG_NETCONSOLE=y
@@ -775,6 +870,7 @@ CONFIG_NET_POLL_CONTROLLER=y
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
 
 #
 # Userland interfaces
@@ -797,6 +893,7 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
 # CONFIG_MOUSE_SERIAL is not set
@@ -850,6 +947,7 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_CONSOLE=y
+CONFIG_HVC_ISERIES=y
 CONFIG_HVC_RTAS=y
 CONFIG_HVCS=m
 
@@ -868,10 +966,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 CONFIG_RAW_DRIVER=y
@@ -882,7 +976,6 @@ CONFIG_MAX_RAW_DEVS=256
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
 
 #
 # I2C support
@@ -947,6 +1040,7 @@ CONFIG_I2C_POWERMAC=y
 #
 # Dallas's 1-wire bus
 #
+# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
@@ -955,14 +1049,9 @@ CONFIG_I2C_POWERMAC=y
 # CONFIG_HWMON_VID is not set
 
 #
-# Misc devices
-#
-
-#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
@@ -975,6 +1064,7 @@ CONFIG_VIDEO_V4L2=y
 #
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB=y
+CONFIG_FB_DDC=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
@@ -1011,6 +1101,7 @@ CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_TRIDENT is not set
+CONFIG_FB_IBM_GXT4500=y
 # CONFIG_FB_VIRTUAL is not set
 
 #
@@ -1159,6 +1250,11 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
 # CONFIG_SOUND_PRIME is not set
 
 #
+# HID Devices
+#
+CONFIG_HID=y
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -1173,6 +1269,7 @@ CONFIG_USB=y
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_MULTITHREAD_PROBE is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -1214,13 +1311,13 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_STORAGE_ALAUDA is not set
 # CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_LIBUSUAL is not set
 
 #
 # USB Input Devices
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_HID_FF is not set
 CONFIG_USB_HIDDEV=y
@@ -1250,6 +1347,7 @@ CONFIG_USB_HIDDEV=y
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_USBNET is not set
 # CONFIG_USB_MON is not set
 
@@ -1267,6 +1365,7 @@ CONFIG_USB_HIDDEV=y
 #
 # CONFIG_USB_EMI62 is not set
 # CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
 # CONFIG_USB_AUERSWALD is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
@@ -1274,12 +1373,13 @@ CONFIG_USB_HIDDEV=y
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_PHIDGET is not set
 # CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
 CONFIG_USB_APPLEDISPLAY=m
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_TEST is not set
 
 #
@@ -1318,6 +1418,7 @@ CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
+# CONFIG_INFINIBAND_AMSO1100 is not set
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
@@ -1347,6 +1448,10 @@ CONFIG_INFINIBAND_ISER=m
 #
 
 #
+# Virtualization
+#
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1359,6 +1464,7 @@ CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_EXT4DEV_FS is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=y
@@ -1379,6 +1485,7 @@ CONFIG_XFS_FS=m
 CONFIG_XFS_SECURITY=y
 CONFIG_XFS_POSIX_ACL=y
 # CONFIG_XFS_RT is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -1386,8 +1493,8 @@ CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
-CONFIG_AUTOFS_FS=y
-# CONFIG_AUTOFS4_FS is not set
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=m
 # CONFIG_FUSE_FS is not set
 
 #
@@ -1414,8 +1521,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 #
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_RAMFS=y
@@ -1540,8 +1649,23 @@ CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=m
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
+# iSeries device drivers
+#
+# CONFIG_VIOCONS is not set
+CONFIG_VIODASD=y
+CONFIG_VIOCD=m
+CONFIG_VIOTAPE=m
+CONFIG_VIOPATH=y
+
+#
 # Library routines
 #
+CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
@@ -1551,6 +1675,7 @@ CONFIG_ZLIB_DEFLATE=m
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
 
 #
 # Instrumentation Support
@@ -1563,8 +1688,11 @@ CONFIG_OPROFILE=y
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_DETECT_SOFTLOCKUP=y
@@ -1578,16 +1706,19 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
-CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_DEBUG_STACK_USAGE=y
+# CONFIG_HCALL_STATS is not set
 CONFIG_DEBUGGER=y
 CONFIG_XMON=y
 # CONFIG_XMON_DEFAULT is not set
+CONFIG_XMON_DISASSEMBLY=y
 CONFIG_IRQSTACKS=y
 CONFIG_BOOTX_TEXT=y
 # CONFIG_PPC_EARLY_DEBUG is not set
@@ -1602,7 +1733,12 @@ CONFIG_BOOTX_TEXT=y
 # Cryptographic options
 #
 CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -1611,9 +1747,14 @@ CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_TGR192=m
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_LRW is not set
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_CAST5=m
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
new file mode 100644
index 000000000000..70ed61337f5c
--- /dev/null
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -0,0 +1,838 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.19-rc6
+# Tue Nov 21 19:38:53 2006
+#
+CONFIG_PPC64=y
+CONFIG_64BIT=y
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_IRQ_PER_CPU=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_COMPAT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+# CONFIG_PPC_UDBG_16550 is not set
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+# CONFIG_DEFAULT_UIMAGE is not set
+
+#
+# Processor support
+#
+# CONFIG_POWER4_ONLY is not set
+CONFIG_POWER3=y
+CONFIG_POWER4=y
+CONFIG_PPC_FPU=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+# CONFIG_PPC_OF_PLATFORM_PCI is not set
+CONFIG_ALTIVEC=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=2
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_CPUSETS is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_STOP_MACHINE=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# Platform support
+#
+CONFIG_PPC_MULTIPLATFORM=y
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_APUS is not set
+# CONFIG_PPC_PSERIES is not set
+# CONFIG_PPC_ISERIES is not set
+# CONFIG_PPC_PMAC is not set
+# CONFIG_PPC_MAPLE is not set
+# CONFIG_PPC_PASEMI is not set
+CONFIG_PPC_CELL=y
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PPC_IBM_CELL_BLADE is not set
+CONFIG_PPC_PS3=y
+# CONFIG_U3_DART is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_WANT_EARLY_SERIAL is not set
+# CONFIG_MPIC is not set
+
+#
+# Cell Broadband Engine options
+#
+CONFIG_SPU_FS=y
+CONFIG_SPU_BASE=y
+# CONFIG_CBE_RAS is not set
+
+#
+# PS3 Platform Options
+#
+CONFIG_PS3_HTAB_SIZE=20
+CONFIG_PS3_DYNAMIC_DMA=y
+CONFIG_PS3_USE_LPAR_ADDR=y
+CONFIG_PS3_VUART=y
+
+#
+# Kernel options
+#
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_BKL is not set
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=y
+CONFIG_FORCE_MAX_ZONEORDER=9
+# CONFIG_IOMMU_VMERGE is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_IRQ_ALL_CPUS is not set
+# CONFIG_NUMA is not set
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_FLATMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_RESOURCES_64BIT=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_PPC_64K_PAGES=y
+# CONFIG_SCHED_SMT is not set
+CONFIG_PROC_DEVICETREE=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="root=/dev/nfs rw ip=dhcp"
+# CONFIG_PM is not set
+# CONFIG_SECCOMP is not set
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_GENERIC_ISA_DMA=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PCI is not set
+# CONFIG_PCI_DOMAINS is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# PCI Hotplug Support
+#
+CONFIG_KERNEL_START=0xc000000000000000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+# CONFIG_PACKET is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# Misc devices
+#
+# CONFIG_TIFM_CORE is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+# CONFIG_BLK_DEV_SD is not set
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Macintosh device drivers
+#
+# CONFIG_WINDFARM is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# PHY device support
+#
+
+#
+# Ethernet (10 or 100Mbit)
+#
+# CONFIG_NET_ETHERNET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+CONFIG_GEN_RTC=y
+# CONFIG_GEN_RTC_X is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HANGCHECK_TIMER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# InfiniBand support
+#
+
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+
+#
+# Real Time Clock
+#
+# CONFIG_RTC_CLASS is not set
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC32 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_PLIST=y
+
+#
+# Instrumentation Support
+#
+# CONFIG_PROFILING is not set
+# CONFIG_KPROBES is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+CONFIG_DEBUG_SPINLOCK=y
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RWSEMS is not set
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
+CONFIG_DEBUG_LIST=y
+CONFIG_FORCED_INLINING=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUGGER is not set
+CONFIG_IRQSTACKS=y
+# CONFIG_BOOTX_TEXT is not set
+CONFIG_PPC_EARLY_DEBUG=y
+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
+# CONFIG_PPC_EARLY_DEBUG_G5 is not set
+# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
+# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 7af23c43fd4b..d2ded19e4064 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -17,11 +17,11 @@ obj-y				+= vdso32/
 obj-$(CONFIG_PPC64)             += setup_64.o binfmt_elf32.o sys_ppc32.o \
                                    signal_64.o ptrace32.o \
                                    paca.o cpu_setup_ppc970.o \
-                                   firmware.o sysfs.o
+                                   firmware.o sysfs.o nvram_64.o
 obj-$(CONFIG_PPC64)             += vdso64/
 obj-$(CONFIG_ALTIVEC)           += vecemu.o vector.o
 obj-$(CONFIG_PPC_970_NAP)       += idle_power4.o
-obj-$(CONFIG_PPC_OF)            += of_device.o prom_parse.o
+obj-$(CONFIG_PPC_OF)            += of_device.o of_platform.o prom_parse.o
 procfs-$(CONFIG_PPC64)          := proc_ppc64.o
 obj-$(CONFIG_PROC_FS)           += $(procfs-y)
 rtaspci-$(CONFIG_PPC64)         := rtas_pci.o
@@ -32,7 +32,6 @@ obj-$(CONFIG_LPARCFG)		+= lparcfg.o
 obj-$(CONFIG_IBMVIO)            += vio.o
 obj-$(CONFIG_IBMEBUS)           += ibmebus.o
 obj-$(CONFIG_GENERIC_TBSYNC)    += smp-tbsync.o
-obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o
 obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
 obj-$(CONFIG_6xx)               += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
 obj-$(CONFIG_TAU)               += tau_6xx.o
@@ -59,11 +58,11 @@ obj-$(CONFIG_BOOTX_TEXT)	+= btext.o
 obj-$(CONFIG_SMP)               += smp.o
 obj-$(CONFIG_KPROBES)           += kprobes.o
 obj-$(CONFIG_PPC_UDBG_16550)    += legacy_serial.o udbg_16550.o
+
 module-$(CONFIG_PPC64)          += module_64.o
 obj-$(CONFIG_MODULES)           += $(module-y)
 
-pci64-$(CONFIG_PPC64)           += pci_64.o pci_dn.o pci_iommu.o \
-                                   pci_direct_iommu.o iomap.o
+pci64-$(CONFIG_PPC64)           += pci_64.o pci_dn.o
 pci32-$(CONFIG_PPC32)           := pci_32.o
 obj-$(CONFIG_PCI)               += $(pci64-y) $(pci32-y)
 kexec-$(CONFIG_PPC64)           := machine_kexec_64.o
@@ -72,8 +71,13 @@ obj-$(CONFIG_KEXEC)		+= machine_kexec.o crash.o $(kexec-y)
 obj-$(CONFIG_AUDIT)             += audit.o
 obj64-$(CONFIG_AUDIT)           += compat_audit.o
 
+ifneq ($(CONFIG_PPC_INDIRECT_IO),y)
+obj-y                           += iomap.o
+endif
+
 ifeq ($(CONFIG_PPC_ISERIES),y)
-$(obj)/head_64.o: $(obj)/lparmap.s
+extra-y += lparmap.s
+$(obj)/head_64.o:       $(obj)/lparmap.s
 AFLAGS_head_64.o += -I$(obj)
 endif
 
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index d06f378597bb..030d300cd71c 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -118,7 +118,8 @@ int main(void)
         DEFINE(PACASTABRR, offsetof(struct paca_struct, stab_rr));
         DEFINE(PACAR1, offsetof(struct paca_struct, saved_r1));
         DEFINE(PACATOC, offsetof(struct paca_struct, kernel_toc));
-        DEFINE(PACAPROCENABLED, offsetof(struct paca_struct, proc_enabled));
+        DEFINE(PACASOFTIRQEN, offsetof(struct paca_struct, soft_enabled));
+        DEFINE(PACAHARDIRQEN, offsetof(struct paca_struct, hard_enabled));
         DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache));
         DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr));
         DEFINE(PACACONTEXTID, offsetof(struct paca_struct, context.id));
@@ -302,5 +303,8 @@ int main(void)
         DEFINE(NSEC_PER_SEC, NSEC_PER_SEC);
         DEFINE(CLOCK_REALTIME_RES, TICK_NSEC);
 
+#ifdef CONFIG_BUG
+        DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));
+#endif
         return 0;
 }
diff --git a/arch/powerpc/kernel/cpu_setup_ppc970.S b/arch/powerpc/kernel/cpu_setup_ppc970.S
index 652594891d58..bf118c385752 100644
--- a/arch/powerpc/kernel/cpu_setup_ppc970.S
+++ b/arch/powerpc/kernel/cpu_setup_ppc970.S
@@ -83,6 +83,22 @@ _GLOBAL(__setup_cpu_ppc970)
         rldimi  r0,r11,52,8             /* set NAP and DPM */
         li      r11,0
         rldimi  r0,r11,32,31            /* clear EN_ATTN */
+        b       load_hids               /* Jump to shared code */
+
+
+_GLOBAL(__setup_cpu_ppc970MP)
+        /* Do nothing if not running in HV mode */
+        mfmsr   r0
+        rldicl. r0,r0,4,63
+        beqlr
+
+        mfspr   r0,SPRN_HID0
+        li      r11,0x15                /* clear DOZE and SLEEP */
+        rldimi  r0,r11,52,6             /* set DEEPNAP, NAP and DPM */
+        li      r11,0
+        rldimi  r0,r11,32,31            /* clear EN_ATTN */
+
+load_hids:
         mtspr   SPRN_HID0,r0
         mfspr   r0,SPRN_HID0
         mfspr   r0,SPRN_HID0
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index bfd499ee3753..b742013bb9da 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -42,6 +42,7 @@ extern void __setup_cpu_745x(unsigned long offset, struct cpu_spec* spec);
 #endif /* CONFIG_PPC32 */
 #ifdef CONFIG_PPC64
 extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec);
+extern void __setup_cpu_ppc970MP(unsigned long offset, struct cpu_spec* spec);
 extern void __restore_cpu_ppc970(void);
 #endif /* CONFIG_PPC64 */
 
@@ -222,9 +223,9 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
-                .cpu_setup              = __setup_cpu_ppc970,
+                .cpu_setup              = __setup_cpu_ppc970MP,
                 .cpu_restore            = __restore_cpu_ppc970,
-                .oprofile_cpu_type      = "ppc64/970",
+                .oprofile_cpu_type      = "ppc64/970MP",
                 .oprofile_type          = PPC_OPROFILE_POWER4,
                 .platform               = "ppc970",
         },
@@ -276,10 +277,45 @@ static struct cpu_spec cpu_specs[] = {
                 .oprofile_mmcra_sipr    = MMCRA_SIPR,
                 .platform               = "power5+",
         },
+        {       /* POWER6 in P5+ mode; 2.04-compliant processor */
+                .pvr_mask               = 0xffffffff,
+                .pvr_value              = 0x0f000001,
+                .cpu_name               = "POWER5+",
+                .cpu_features           = CPU_FTRS_POWER5,
+                .cpu_user_features      = COMMON_USER_POWER5_PLUS,
+                .icache_bsize           = 128,
+                .dcache_bsize           = 128,
+                .num_pmcs               = 6,
+                .oprofile_cpu_type      = "ppc64/power6",
+                .oprofile_type          = PPC_OPROFILE_POWER4,
+                .oprofile_mmcra_sihv    = POWER6_MMCRA_SIHV,
+                .oprofile_mmcra_sipr    = POWER6_MMCRA_SIPR,
+                .oprofile_mmcra_clear   = POWER6_MMCRA_THRM |
+                        POWER6_MMCRA_OTHER,
+                .platform               = "power5+",
+        },
         {       /* Power6 */
                 .pvr_mask               = 0xffff0000,
                 .pvr_value              = 0x003e0000,
-                .cpu_name               = "POWER6",
+                .cpu_name               = "POWER6 (raw)",
+                .cpu_features           = CPU_FTRS_POWER6,
+                .cpu_user_features      = COMMON_USER_POWER6 |
+                        PPC_FEATURE_POWER6_EXT,
+                .icache_bsize           = 128,
+                .dcache_bsize           = 128,
+                .num_pmcs               = 6,
+                .oprofile_cpu_type      = "ppc64/power6",
+                .oprofile_type          = PPC_OPROFILE_POWER4,
+                .oprofile_mmcra_sihv    = POWER6_MMCRA_SIHV,
+                .oprofile_mmcra_sipr    = POWER6_MMCRA_SIPR,
+                .oprofile_mmcra_clear   = POWER6_MMCRA_THRM |
+                        POWER6_MMCRA_OTHER,
+                .platform               = "power6x",
+        },
+        {       /* 2.05-compliant processor, i.e. Power6 "architected" mode */
+                .pvr_mask               = 0xffffffff,
+                .pvr_value              = 0x0f000002,
+                .cpu_name               = "POWER6 (architected)",
                 .cpu_features           = CPU_FTRS_POWER6,
                 .cpu_user_features      = COMMON_USER_POWER6,
                 .icache_bsize           = 128,
@@ -303,6 +339,9 @@ static struct cpu_spec cpu_specs[] = {
                         PPC_FEATURE_SMT,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 4,
+                .oprofile_cpu_type      = "ppc64/cell-be",
+                .oprofile_type          = PPC_OPROFILE_CELL,
                 .platform               = "ppc-cell-be",
         },
         {       /* PA Semi PA6T */
@@ -794,13 +833,24 @@ static struct cpu_spec cpu_specs[] = {
                 .pvr_mask               = 0x7fff0000,
                 .pvr_value              = 0x00840000,
                 .cpu_name               = "e300c2",
-                .cpu_features           = CPU_FTRS_E300,
+                .cpu_features           = CPU_FTRS_E300C2,
                 .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .cpu_setup              = __setup_cpu_603,
                 .platform               = "ppc603",
         },
+        {       /* e300c3 on 83xx  */
+                .pvr_mask               = 0x7fff0000,
+                .pvr_value              = 0x00850000,
+                .cpu_name               = "e300c3",
+                .cpu_features           = CPU_FTRS_E300,
+                .cpu_user_features      = COMMON_USER,
+                .icache_bsize           = 32,
+                .dcache_bsize           = 32,
+                .cpu_setup              = __setup_cpu_603,
+                .platform               = "ppc603",
+        },
         {       /* default match, we assume split I/D cache & TB (non-601)... */
                 .pvr_mask               = 0x00000000,
                 .pvr_value              = 0x00000000,
@@ -1086,8 +1136,7 @@ static struct cpu_spec cpu_specs[] = {
                 .pvr_mask               = 0xff000fff,
                 .pvr_value              = 0x53000890,
                 .cpu_name               = "440SPe Rev. A",
-                .cpu_features           = CPU_FTR_SPLIT_ID_CACHE |
-                        CPU_FTR_USE_TB,
+                .cpu_features           = CPU_FTRS_44X,
                 .cpu_user_features      = COMMON_USER_BOOKE,
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
@@ -1169,19 +1218,15 @@ static struct cpu_spec cpu_specs[] = {
 #endif /* CONFIG_PPC32 */
 };
 
-struct cpu_spec *identify_cpu(unsigned long offset)
+struct cpu_spec *identify_cpu(unsigned long offset, unsigned int pvr)
 {
         struct cpu_spec *s = cpu_specs;
         struct cpu_spec **cur = &cur_cpu_spec;
-        unsigned int pvr = mfspr(SPRN_PVR);
         int i;
 
         s = PTRRELOC(s);
         cur = PTRRELOC(cur);
 
-        if (*cur != NULL)
-                return PTRRELOC(*cur);
-
         for (i = 0; i < ARRAY_SIZE(cpu_specs); i++,s++)
                 if ((pvr & s->pvr_mask) == s->pvr_value) {
                         *cur = cpu_specs + i;
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index 1af41f7616dc..d3f2080d2eee 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -46,61 +46,6 @@ int crashing_cpu = -1;
 static cpumask_t cpus_in_crash = CPU_MASK_NONE;
 cpumask_t cpus_in_sr = CPU_MASK_NONE;
 
-static u32 *append_elf_note(u32 *buf, char *name, unsigned type, void *data,
-                                                               size_t data_len)
-{
-        struct elf_note note;
-
-        note.n_namesz = strlen(name) + 1;
-        note.n_descsz = data_len;
-        note.n_type   = type;
-        memcpy(buf, &note, sizeof(note));
-        buf += (sizeof(note) +3)/4;
-        memcpy(buf, name, note.n_namesz);
-        buf += (note.n_namesz + 3)/4;
-        memcpy(buf, data, note.n_descsz);
-        buf += (note.n_descsz + 3)/4;
-
-        return buf;
-}
-
-static void final_note(u32 *buf)
-{
-        struct elf_note note;
-
-        note.n_namesz = 0;
-        note.n_descsz = 0;
-        note.n_type   = 0;
-        memcpy(buf, &note, sizeof(note));
-}
-
-static void crash_save_this_cpu(struct pt_regs *regs, int cpu)
-{
-        struct elf_prstatus prstatus;
-        u32 *buf;
-
-        if ((cpu < 0) || (cpu >= NR_CPUS))
-                return;
-
-        /* Using ELF notes here is opportunistic.
-         * I need a well defined structure format
-         * for the data I pass, and I need tags
-         * on the data to indicate what information I have
-         * squirrelled away.  ELF notes happen to provide
-         * all of that that no need to invent something new.
-         */
-        buf = (u32*)per_cpu_ptr(crash_notes, cpu);
-        if (!buf) 
-                return;
-
-        memset(&prstatus, 0, sizeof(prstatus));
-        prstatus.pr_pid = current->pid;
-        elf_core_copy_regs(&prstatus.pr_reg, regs);
-        buf = append_elf_note(buf, "CORE", NT_PRSTATUS, &prstatus,
-                        sizeof(prstatus));
-        final_note(buf);
-}
-
 #ifdef CONFIG_SMP
 static atomic_t enter_on_soft_reset = ATOMIC_INIT(0);
 
@@ -111,9 +56,9 @@ void crash_ipi_callback(struct pt_regs *regs)
         if (!cpu_online(cpu))
                 return;
 
-        local_irq_disable();
+        hard_irq_disable();
         if (!cpu_isset(cpu, cpus_in_crash))
-                crash_save_this_cpu(regs, cpu);
+                crash_save_cpu(regs, cpu);
         cpu_set(cpu, cpus_in_crash);
 
         /*
@@ -289,7 +234,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
          * an SMP system.
          * The kernel is broken so disable interrupts.
          */
-        local_irq_disable();
+        hard_irq_disable();
 
         for_each_irq(irq) {
                 struct irq_desc *desc = irq_desc + irq;
@@ -306,7 +251,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
          * such that another IPI will not be sent.
          */
         crashing_cpu = smp_processor_id();
-        crash_save_this_cpu(regs, crashing_cpu);
+        crash_save_cpu(regs, crashing_cpu);
         crash_kexec_prepare_cpus(crashing_cpu);
         cpu_set(crashing_cpu, cpus_in_crash);
         if (ppc_md.kexec_cpu_down)
diff --git a/arch/powerpc/kernel/dma_64.c b/arch/powerpc/kernel/dma_64.c
index 6c168f6ea142..7b0e754383cf 100644
--- a/arch/powerpc/kernel/dma_64.c
+++ b/arch/powerpc/kernel/dma_64.c
@@ -1,151 +1,194 @@
 /*
- * Copyright (C) 2004 IBM Corporation
+ * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corporation
  *
- * Implements the generic device dma API for ppc64. Handles
- * the pci and vio busses
+ * Provide default implementations of the DMA mapping callbacks for
+ * directly mapped busses and busses using the iommu infrastructure
  */
 
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
-/* Include the busses we support */
-#include <linux/pci.h>
-#include <asm/vio.h>
-#include <asm/ibmebus.h>
-#include <asm/scatterlist.h>
 #include <asm/bug.h>
+#include <asm/iommu.h>
+#include <asm/abs_addr.h>
 
-static struct dma_mapping_ops *get_dma_ops(struct device *dev)
-{
-#ifdef CONFIG_PCI
-        if (dev->bus == &pci_bus_type)
-                return &pci_dma_ops;
-#endif
-#ifdef CONFIG_IBMVIO
-        if (dev->bus == &vio_bus_type)
-                return &vio_dma_ops;
-#endif
-#ifdef CONFIG_IBMEBUS
-        if (dev->bus == &ibmebus_bus_type)
-                return &ibmebus_dma_ops;
-#endif
-        return NULL;
-}
+/*
+ * Generic iommu implementation
+ */
 
-int dma_supported(struct device *dev, u64 mask)
+static inline unsigned long device_to_mask(struct device *dev)
 {
-        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
+        if (dev->dma_mask && *dev->dma_mask)
+                return *dev->dma_mask;
+        /* Assume devices without mask can take 32 bit addresses */
+        return 0xfffffffful;
+}
 
-        BUG_ON(!dma_ops);
 
-        return dma_ops->dma_supported(dev, mask);
+/* Allocates a contiguous real buffer and creates mappings over it.
+ * Returns the virtual address of the buffer and sets dma_handle
+ * to the dma address (mapping) of the first page.
+ */
+static void *dma_iommu_alloc_coherent(struct device *dev, size_t size,
+                                      dma_addr_t *dma_handle, gfp_t flag)
+{
+        return iommu_alloc_coherent(dev->archdata.dma_data, size, dma_handle,
+                                    device_to_mask(dev), flag,
+                                    dev->archdata.numa_node);
 }
-EXPORT_SYMBOL(dma_supported);
 
-int dma_set_mask(struct device *dev, u64 dma_mask)
+static void dma_iommu_free_coherent(struct device *dev, size_t size,
+                                    void *vaddr, dma_addr_t dma_handle)
 {
-#ifdef CONFIG_PCI
-        if (dev->bus == &pci_bus_type)
-                return pci_set_dma_mask(to_pci_dev(dev), dma_mask);
-#endif
-#ifdef CONFIG_IBMVIO
-        if (dev->bus == &vio_bus_type)
-                return -EIO;
-#endif /* CONFIG_IBMVIO */
-#ifdef CONFIG_IBMEBUS
-        if (dev->bus == &ibmebus_bus_type)
-                return -EIO;
-#endif
-        BUG();
-        return 0;
+        iommu_free_coherent(dev->archdata.dma_data, size, vaddr, dma_handle);
 }
-EXPORT_SYMBOL(dma_set_mask);
 
-void *dma_alloc_coherent(struct device *dev, size_t size,
-                dma_addr_t *dma_handle, gfp_t flag)
+/* Creates TCEs for a user provided buffer.  The user buffer must be
+ * contiguous real kernel storage (not vmalloc).  The address of the buffer
+ * passed here is the kernel (virtual) address of the buffer.  The buffer
+ * need not be page aligned, the dma_addr_t returned will point to the same
+ * byte within the page as vaddr.
+ */
+static dma_addr_t dma_iommu_map_single(struct device *dev, void *vaddr,
+                                       size_t size,
+                                       enum dma_data_direction direction)
 {
-        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
-
-        BUG_ON(!dma_ops);
-
-        return dma_ops->alloc_coherent(dev, size, dma_handle, flag);
+        return iommu_map_single(dev->archdata.dma_data, vaddr, size,
+                                device_to_mask(dev), direction);
 }
-EXPORT_SYMBOL(dma_alloc_coherent);
 
-void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
-                dma_addr_t dma_handle)
+
+static void dma_iommu_unmap_single(struct device *dev, dma_addr_t dma_handle,
+                                   size_t size,
+                                   enum dma_data_direction direction)
 {
-        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
+        iommu_unmap_single(dev->archdata.dma_data, dma_handle, size, direction);
+}
 
-        BUG_ON(!dma_ops);
 
-        dma_ops->free_coherent(dev, size, cpu_addr, dma_handle);
+static int dma_iommu_map_sg(struct device *dev, struct scatterlist *sglist,
+                            int nelems, enum dma_data_direction direction)
+{
+        return iommu_map_sg(dev->archdata.dma_data, sglist, nelems,
+                            device_to_mask(dev), direction);
 }
-EXPORT_SYMBOL(dma_free_coherent);
 
-dma_addr_t dma_map_single(struct device *dev, void *cpu_addr, size_t size,
-                enum dma_data_direction direction)
+static void dma_iommu_unmap_sg(struct device *dev, struct scatterlist *sglist,
+                int nelems, enum dma_data_direction direction)
 {
-        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
-
-        BUG_ON(!dma_ops);
-
-        return dma_ops->map_single(dev, cpu_addr, size, direction);
+        iommu_unmap_sg(dev->archdata.dma_data, sglist, nelems, direction);
 }
-EXPORT_SYMBOL(dma_map_single);
 
-void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-                enum dma_data_direction direction)
+/* We support DMA to/from any memory page via the iommu */
+static int dma_iommu_dma_supported(struct device *dev, u64 mask)
 {
-        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
-
-        BUG_ON(!dma_ops);
-
-        dma_ops->unmap_single(dev, dma_addr, size, direction);
+        struct iommu_table *tbl = dev->archdata.dma_data;
+
+        if (!tbl || tbl->it_offset > mask) {
+                printk(KERN_INFO
+                       "Warning: IOMMU offset too big for device mask\n");
+                if (tbl)
+                        printk(KERN_INFO
+                               "mask: 0x%08lx, table offset: 0x%08lx\n",
+                                mask, tbl->it_offset);
+                else
+                        printk(KERN_INFO "mask: 0x%08lx, table unavailable\n",
+                                mask);
+                return 0;
+        } else
+                return 1;
 }
-EXPORT_SYMBOL(dma_unmap_single);
 
-dma_addr_t dma_map_page(struct device *dev, struct page *page,
-                unsigned long offset, size_t size,
-                enum dma_data_direction direction)
-{
-        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
+struct dma_mapping_ops dma_iommu_ops = {
+        .alloc_coherent = dma_iommu_alloc_coherent,
+        .free_coherent  = dma_iommu_free_coherent,
+        .map_single     = dma_iommu_map_single,
+        .unmap_single   = dma_iommu_unmap_single,
+        .map_sg         = dma_iommu_map_sg,
+        .unmap_sg       = dma_iommu_unmap_sg,
+        .dma_supported  = dma_iommu_dma_supported,
+};
+EXPORT_SYMBOL(dma_iommu_ops);
 
-        BUG_ON(!dma_ops);
+/*
+ * Generic direct DMA implementation
+ *
+ * This implementation supports a global offset that can be applied if
+ * the address at which memory is visible to devices is not 0.
+ */
+unsigned long dma_direct_offset;
 
-        return dma_ops->map_single(dev, page_address(page) + offset, size,
-                        direction);
+static void *dma_direct_alloc_coherent(struct device *dev, size_t size,
+                                       dma_addr_t *dma_handle, gfp_t flag)
+{
+        struct page *page;
+        void *ret;
+        int node = dev->archdata.numa_node;
+
+        /* TODO: Maybe use the numa node here too ? */
+        page = alloc_pages_node(node, flag, get_order(size));
+        if (page == NULL)
+                return NULL;
+        ret = page_address(page);
+        memset(ret, 0, size);
+        *dma_handle = virt_to_abs(ret) | dma_direct_offset;
+
+        return ret;
 }
-EXPORT_SYMBOL(dma_map_page);
 
-void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
-                enum dma_data_direction direction)
+static void dma_direct_free_coherent(struct device *dev, size_t size,
+                                     void *vaddr, dma_addr_t dma_handle)
 {
-        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
+        free_pages((unsigned long)vaddr, get_order(size));
+}
 
-        BUG_ON(!dma_ops);
+static dma_addr_t dma_direct_map_single(struct device *dev, void *ptr,
+                                        size_t size,
+                                        enum dma_data_direction direction)
+{
+        return virt_to_abs(ptr) | dma_direct_offset;
+}
 
-        dma_ops->unmap_single(dev, dma_address, size, direction);
+static void dma_direct_unmap_single(struct device *dev, dma_addr_t dma_addr,
+                                    size_t size,
+                                    enum dma_data_direction direction)
+{
 }
-EXPORT_SYMBOL(dma_unmap_page);
 
-int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
-                enum dma_data_direction direction)
+static int dma_direct_map_sg(struct device *dev, struct scatterlist *sg,
+                             int nents, enum dma_data_direction direction)
 {
-        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
+        int i;
 
-        BUG_ON(!dma_ops);
+        for (i = 0; i < nents; i++, sg++) {
+                sg->dma_address = (page_to_phys(sg->page) + sg->offset) |
+                        dma_direct_offset;
+                sg->dma_length = sg->length;
+        }
 
-        return dma_ops->map_sg(dev, sg, nents, direction);
+        return nents;
 }
-EXPORT_SYMBOL(dma_map_sg);
 
-void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
-                enum dma_data_direction direction)
+static void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sg,
+                                int nents, enum dma_data_direction direction)
 {
-        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
-
-        BUG_ON(!dma_ops);
+}
 
-        dma_ops->unmap_sg(dev, sg, nhwentries, direction);
+static int dma_direct_dma_supported(struct device *dev, u64 mask)
+{
+        /* Could be improved to check for memory though it better be
+         * done via some global so platforms can set the limit in case
+         * they have limited DMA windows
+         */
+        return mask >= DMA_32BIT_MASK;
 }
-EXPORT_SYMBOL(dma_unmap_sg);
+
+struct dma_mapping_ops dma_direct_ops = {
+        .alloc_coherent = dma_direct_alloc_coherent,
+        .free_coherent  = dma_direct_free_coherent,
+        .map_single     = dma_direct_map_single,
+        .unmap_single   = dma_direct_unmap_single,
+        .map_sg         = dma_direct_map_sg,
+        .unmap_sg       = dma_direct_unmap_sg,
+        .dma_supported  = dma_direct_dma_supported,
+};
+EXPORT_SYMBOL(dma_direct_ops);
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 748e74fcf541..2551c0884afc 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -28,6 +28,7 @@
 #include <asm/asm-offsets.h>
 #include <asm/cputable.h>
 #include <asm/firmware.h>
+#include <asm/bug.h>
 
 /*
  * System calls.
@@ -87,15 +88,19 @@ system_call_common:
         addi    r9,r1,STACK_FRAME_OVERHEAD
         ld      r11,exception_marker@toc(r2)
         std     r11,-16(r9)             /* "regshere" marker */
+        li      r10,1
+        stb     r10,PACASOFTIRQEN(r13)
+        stb     r10,PACAHARDIRQEN(r13)
+        std     r10,SOFTE(r1)
 #ifdef CONFIG_PPC_ISERIES
 BEGIN_FW_FTR_SECTION
         /* Hack for handling interrupts when soft-enabling on iSeries */
         cmpdi   cr1,r0,0x5555           /* syscall 0x5555 */
         andi.   r10,r12,MSR_PR          /* from kernel */
         crand   4*cr0+eq,4*cr1+eq,4*cr0+eq
-        beq     hardware_interrupt_entry
-        lbz     r10,PACAPROCENABLED(r13)
-        std     r10,SOFTE(r1)
+        bne     2f
+        b       hardware_interrupt_entry
+2:
 END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
 #endif
         mfmsr   r11
@@ -460,9 +465,9 @@ _GLOBAL(ret_from_except_lite)
 #endif
 
 restore:
+        ld      r5,SOFTE(r1)
 #ifdef CONFIG_PPC_ISERIES
 BEGIN_FW_FTR_SECTION
-        ld      r5,SOFTE(r1)
         cmpdi   0,r5,0
         beq     4f
         /* Check for pending interrupts (iSeries) */
@@ -472,21 +477,25 @@ BEGIN_FW_FTR_SECTION
         beq+    4f                      /* skip do_IRQ if no interrupts */
 
         li      r3,0
-        stb     r3,PACAPROCENABLED(r13) /* ensure we are soft-disabled */
+        stb     r3,PACASOFTIRQEN(r13)   /* ensure we are soft-disabled */
         ori     r10,r10,MSR_EE
         mtmsrd  r10                     /* hard-enable again */
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      .do_IRQ
         b       .ret_from_except_lite           /* loop back and handle more */
-
-4:      stb     r5,PACAPROCENABLED(r13)
+4:
 END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
 #endif
+        stb     r5,PACASOFTIRQEN(r13)
 
         ld      r3,_MSR(r1)
         andi.   r0,r3,MSR_RI
         beq-    unrecov_restore
 
+        /* extract EE bit and use it to restore paca->hard_enabled */
+        rldicl  r4,r3,49,63             /* r0 = (r3 >> 15) & 1 */
+        stb     r4,PACAHARDIRQEN(r13)
+
         andi.   r0,r3,MSR_PR
 
         /*
@@ -538,25 +547,15 @@ do_work:
         /* Check that preempt_count() == 0 and interrupts are enabled */
         lwz     r8,TI_PREEMPT(r9)
         cmpwi   cr1,r8,0
-#ifdef CONFIG_PPC_ISERIES
-BEGIN_FW_FTR_SECTION
         ld      r0,SOFTE(r1)
         cmpdi   r0,0
-END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
-#endif
-BEGIN_FW_FTR_SECTION
-        andi.   r0,r3,MSR_EE
-END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES)
         crandc  eq,cr1*4+eq,eq
         bne     restore
         /* here we are preempting the current task */
 1:
-#ifdef CONFIG_PPC_ISERIES
-BEGIN_FW_FTR_SECTION
         li      r0,1
-        stb     r0,PACAPROCENABLED(r13)
-END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
-#endif
+        stb     r0,PACASOFTIRQEN(r13)
+        stb     r0,PACAHARDIRQEN(r13)
         ori     r10,r10,MSR_EE
         mtmsrd  r10,1           /* reenable interrupts */
         bl      .preempt_schedule
@@ -636,20 +635,21 @@ _GLOBAL(enter_rtas)
         li      r0,0
         mtcr    r0
 
+#ifdef CONFIG_BUG       
         /* There is no way it is acceptable to get here with interrupts enabled,
          * check it with the asm equivalent of WARN_ON
          */
-        mfmsr   r6
-        andi.   r0,r6,MSR_EE
+        lbz     r0,PACASOFTIRQEN(r13)
 1:      tdnei   r0,0
-.section __bug_table,"a"
-        .llong  1b,__LINE__ + 0x1000000, 1f, 2f
-.previous
-.section .rodata,"a"
-1:      .asciz  __FILE__
-2:      .asciz "enter_rtas"
-.previous
+        EMIT_BUG_ENTRY 1b,__FILE__,__LINE__,BUGFLAG_WARNING
+#endif
         
+        /* Hard-disable interrupts */
+        mfmsr   r6
+        rldicl  r7,r6,48,1
+        rotldi  r7,r7,16
+        mtmsrd  r7,1
+
         /* Unfortunately, the stack pointer and the MSR are also clobbered,
          * so they are saved in the PACA which allows us to restore
          * our original state after RTAS returns.
@@ -735,8 +735,6 @@ _STATIC(rtas_restore_regs)
 
 #endif /* CONFIG_PPC_RTAS */
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
-
 _GLOBAL(enter_prom)
         mflr    r0
         std     r0,16(r1)
@@ -821,5 +819,3 @@ _GLOBAL(enter_prom)
         ld      r0,16(r1)
         mtlr    r0
         blr
-        
-#endif  /* CONFIG_PPC_MULTIPLATFORM */
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index d88e182e40b3..9417cf5b4b7e 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -437,6 +437,13 @@ Alignment:
 /* Floating-point unavailable */
         . = 0x800
 FPUnavailable:
+BEGIN_FTR_SECTION
+/*
+ * Certain Freescale cores don't have a FPU and treat fp instructions
+ * as a FP Unavailable exception.  Redirect to illegal/emulation handling.
+ */
+        b       ProgramCheck
+END_FTR_SECTION_IFSET(CPU_FTR_FPU_UNAVAILABLE)
         EXCEPTION_PROLOG
         bne     load_up_fpu             /* if from user, just load it up */
         addi    r3,r1,STACK_FRAME_OVERHEAD
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index e720729f3e55..71b1fe58e9e4 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -35,9 +35,7 @@
 #include <asm/thread_info.h>
 #include <asm/firmware.h>
 
-#ifdef CONFIG_PPC_ISERIES
 #define DO_SOFT_DISABLE
-#endif
 
 /*
  * We layout physical memory as follows:
@@ -74,13 +72,11 @@
         .text
         .globl  _stext
 _stext:
-#ifdef CONFIG_PPC_MULTIPLATFORM
 _GLOBAL(__start)
         /* NOP this out unconditionally */
 BEGIN_FTR_SECTION
         b       .__start_initialization_multiplatform
 END_FTR_SECTION(0, 1)
-#endif /* CONFIG_PPC_MULTIPLATFORM */
 
         /* Catch branch to 0 in real mode */
         trap
@@ -308,7 +304,9 @@ exception_marker:
         std     r9,_LINK(r1);                                              \
         mfctr   r10;                    /* save CTR in stackframe       */ \
         std     r10,_CTR(r1);                                              \
+        lbz     r10,PACASOFTIRQEN(r13);                            \
         mfspr   r11,SPRN_XER;           /* save XER in stackframe       */ \
+        std     r10,SOFTE(r1);                                             \
         std     r11,_XER(r1);                                              \
         li      r9,(n)+1;                                                  \
         std     r9,_TRAP(r1);           /* set trap number              */ \
@@ -343,6 +341,34 @@ label##_pSeries:					\
         EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common)
 
 
+#define MASKABLE_EXCEPTION_PSERIES(n, label)                            \
+        . = n;                                                          \
+        .globl label##_pSeries;                                         \
+label##_pSeries:                                                        \
+        HMT_MEDIUM;                                                     \
+        mtspr   SPRN_SPRG1,r13;         /* save r13 */                  \
+        mfspr   r13,SPRN_SPRG3;         /* get paca address into r13 */ \
+        std     r9,PACA_EXGEN+EX_R9(r13);       /* save r9, r10 */      \
+        std     r10,PACA_EXGEN+EX_R10(r13);                             \
+        lbz     r10,PACASOFTIRQEN(r13);                                 \
+        mfcr    r9;                                                     \
+        cmpwi   r10,0;                                                  \
+        beq     masked_interrupt;                                       \
+        mfspr   r10,SPRN_SPRG1;                                         \
+        std     r10,PACA_EXGEN+EX_R13(r13);                             \
+        std     r11,PACA_EXGEN+EX_R11(r13);                             \
+        std     r12,PACA_EXGEN+EX_R12(r13);                             \
+        clrrdi  r12,r13,32;             /* get high part of &label */   \
+        mfmsr   r10;                                                    \
+        mfspr   r11,SPRN_SRR0;          /* save SRR0 */                 \
+        LOAD_HANDLER(r12,label##_common)                                \
+        ori     r10,r10,MSR_IR|MSR_DR|MSR_RI;                           \
+        mtspr   SPRN_SRR0,r12;                                          \
+        mfspr   r12,SPRN_SRR1;          /* and SRR1 */                  \
+        mtspr   SPRN_SRR1,r10;                                          \
+        rfid;                                                           \
+        b       .       /* prevent speculative execution */
+
 #define STD_EXCEPTION_ISERIES(n, label, area)           \
         .globl label##_iSeries;                         \
 label##_iSeries:                                        \
@@ -358,40 +384,32 @@ label##_iSeries:							\
         HMT_MEDIUM;                                                     \
         mtspr   SPRN_SPRG1,r13;         /* save r13 */                  \
         EXCEPTION_PROLOG_ISERIES_1(PACA_EXGEN);                         \
-        lbz     r10,PACAPROCENABLED(r13);                               \
+        lbz     r10,PACASOFTIRQEN(r13);                                 \
         cmpwi   0,r10,0;                                                \
         beq-    label##_iSeries_masked;                                 \
         EXCEPTION_PROLOG_ISERIES_2;                                     \
         b       label##_common;                                         \
 
-#ifdef DO_SOFT_DISABLE
+#ifdef CONFIG_PPC_ISERIES
 #define DISABLE_INTS                            \
-BEGIN_FW_FTR_SECTION;                           \
-        lbz     r10,PACAPROCENABLED(r13);       \
         li      r11,0;                          \
-        std     r10,SOFTE(r1);                  \
+        stb     r11,PACASOFTIRQEN(r13);         \
+BEGIN_FW_FTR_SECTION;                           \
+        stb     r11,PACAHARDIRQEN(r13);         \
+END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES);   \
+BEGIN_FW_FTR_SECTION;                           \
         mfmsr   r10;                            \
-        stb     r11,PACAPROCENABLED(r13);       \
         ori     r10,r10,MSR_EE;                 \
         mtmsrd  r10,1;                          \
 END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
 
-#define ENABLE_INTS                             \
-BEGIN_FW_FTR_SECTION;                           \
-        lbz     r10,PACAPROCENABLED(r13);       \
-        mfmsr   r11;                            \
-        std     r10,SOFTE(r1);                  \
-        ori     r11,r11,MSR_EE;                 \
-END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES);   \
-BEGIN_FW_FTR_SECTION;                           \
-        ld      r12,_MSR(r1);                   \
-        mfmsr   r11;                            \
-        rlwimi  r11,r12,0,MSR_EE;               \
-END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES);   \
-        mtmsrd  r11,1
+#else
+#define DISABLE_INTS                            \
+        li      r11,0;                          \
+        stb     r11,PACASOFTIRQEN(r13);         \
+        stb     r11,PACAHARDIRQEN(r13)
 
-#else   /* hard enable/disable interrupts */
-#define DISABLE_INTS
+#endif /* CONFIG_PPC_ISERIES */
 
 #define ENABLE_INTS                             \
         ld      r12,_MSR(r1);                   \
@@ -399,8 +417,6 @@ END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES);	\
         rlwimi  r11,r12,0,MSR_EE;               \
         mtmsrd  r11,1
 
-#endif
-
 #define STD_EXCEPTION_COMMON(trap, label, hdlr)         \
         .align  7;                                      \
         .globl label##_common;                          \
@@ -541,11 +557,11 @@ instruction_access_slb_pSeries:
         mfspr   r12,SPRN_SRR1           /* and SRR1 */
         b       .slb_miss_realmode      /* Rel. branch works in real mode */
 
-        STD_EXCEPTION_PSERIES(0x500, hardware_interrupt)
+        MASKABLE_EXCEPTION_PSERIES(0x500, hardware_interrupt)
         STD_EXCEPTION_PSERIES(0x600, alignment)
         STD_EXCEPTION_PSERIES(0x700, program_check)
         STD_EXCEPTION_PSERIES(0x800, fp_unavailable)
-        STD_EXCEPTION_PSERIES(0x900, decrementer)
+        MASKABLE_EXCEPTION_PSERIES(0x900, decrementer)
         STD_EXCEPTION_PSERIES(0xa00, trap_0a)
         STD_EXCEPTION_PSERIES(0xb00, trap_0b)
 
@@ -597,7 +613,24 @@ system_call_pSeries:
 /*** pSeries interrupt support ***/
 
         /* moved from 0xf00 */
-        STD_EXCEPTION_PSERIES(., performance_monitor)
+        MASKABLE_EXCEPTION_PSERIES(., performance_monitor)
+
+/*
+ * An interrupt came in while soft-disabled; clear EE in SRR1,
+ * clear paca->hard_enabled and return.
+ */
+masked_interrupt:
+        stb     r10,PACAHARDIRQEN(r13)
+        mtcrf   0x80,r9
+        ld      r9,PACA_EXGEN+EX_R9(r13)
+        mfspr   r10,SPRN_SRR1
+        rldicl  r10,r10,48,1            /* clear MSR_EE */
+        rotldi  r10,r10,16
+        mtspr   SPRN_SRR1,r10
+        ld      r10,PACA_EXGEN+EX_R10(r13)
+        mfspr   r13,SPRN_SPRG1
+        rfid
+        b       .
 
         .align  7
 do_stab_bolted_pSeries:
@@ -792,7 +825,7 @@ system_reset_iSeries:
 
         cmpwi   0,r23,0
         beq     iSeries_secondary_smp_loop      /* Loop until told to go */
-        bne     .__secondary_start              /* Loop until told to go */
+        bne     __secondary_start               /* Loop until told to go */
 iSeries_secondary_smp_loop:
         /* Let the Hypervisor know we are alive */
         /* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */
@@ -813,7 +846,6 @@ iSeries_secondary_smp_loop:
         b       1b                      /* If SMP not configured, secondaries
                                          * loop forever */
 
-        .globl decrementer_iSeries_masked
 decrementer_iSeries_masked:
         /* We may not have a valid TOC pointer in here. */
         li      r11,1
@@ -824,7 +856,6 @@ decrementer_iSeries_masked:
         mtspr   SPRN_DEC,r12
         /* fall through */
 
-        .globl hardware_interrupt_iSeries_masked
 hardware_interrupt_iSeries_masked:
         mtcrf   0x80,r9         /* Restore regs */
         ld      r12,PACALPPACAPTR(r13)
@@ -926,10 +957,18 @@ bad_stack:
  * any task or sent any task a signal, you should use
  * ret_from_except or ret_from_except_lite instead of this.
  */
+fast_exc_return_irq:                    /* restores irq state too */
+        ld      r3,SOFTE(r1)
+        ld      r12,_MSR(r1)
+        stb     r3,PACASOFTIRQEN(r13)   /* restore paca->soft_enabled */
+        rldicl  r4,r12,49,63            /* get MSR_EE to LSB */
+        stb     r4,PACAHARDIRQEN(r13)   /* restore paca->hard_enabled */
+        b       1f
+
         .globl  fast_exception_return
 fast_exception_return:
         ld      r12,_MSR(r1)
-        ld      r11,_NIP(r1)
+1:      ld      r11,_NIP(r1)
         andi.   r3,r12,MSR_RI           /* check if RI is set */
         beq-    unrecov_fer
 
@@ -952,7 +991,8 @@ fast_exception_return:
         REST_8GPRS(2, r1)
 
         mfmsr   r10
-        clrrdi  r10,r10,2               /* clear RI (LE is 0 already) */
+        rldicl  r10,r10,48,1            /* clear EE */
+        rldicr  r10,r10,16,61           /* clear RI (LE is 0 already) */
         mtmsrd  r10,1
 
         mtspr   SPRN_SRR1,r12
@@ -1326,6 +1366,16 @@ BEGIN_FW_FTR_SECTION
          * interrupts if necessary.
          */
         beq     13f
+END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
+#endif
+BEGIN_FW_FTR_SECTION
+        /*
+         * Here we have interrupts hard-disabled, so it is sufficient
+         * to restore paca->{soft,hard}_enable and get out.
+         */
+        beq     fast_exc_return_irq     /* Return from exception on success */
+END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES)
+
         /* For a hash failure, we don't bother re-enabling interrupts */
         ble-    12f
 
@@ -1337,14 +1387,6 @@ BEGIN_FW_FTR_SECTION
         ld      r3,SOFTE(r1)
         bl      .local_irq_restore
         b       11f
-END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
-#endif
-BEGIN_FW_FTR_SECTION
-        beq     fast_exception_return   /* Return from exception on success */
-        ble-    12f                     /* Failure return from hash_page */
-
-        /* fall through */
-END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES)
 
 /* Here we have a page fault that hash_page can't handle. */
 handle_page_fault:
@@ -1362,6 +1404,8 @@ handle_page_fault:
         bl      .bad_page_fault
         b       .ret_from_except
 
+13:     b       .ret_from_except_lite
+
 /* We have a page fault that hash_page could handle but HV refused
  * the PTE insertion
  */
@@ -1371,8 +1415,6 @@ handle_page_fault:
         bl      .low_hash_fault
         b       .ret_from_except
 
-13:     b       .ret_from_except_lite
-
         /* here we have a segment miss */
 do_ste_alloc:
         bl      .ste_allocate           /* try to insert stab entry */
@@ -1560,7 +1602,7 @@ _GLOBAL(generic_secondary_smp_init)
         ld      r1,PACAEMERGSP(r13)
         subi    r1,r1,STACK_FRAME_OVERHEAD
 
-        b       .__secondary_start
+        b       __secondary_start
 #endif
 
 #ifdef CONFIG_PPC_ISERIES
@@ -1595,7 +1637,6 @@ _STATIC(__start_initialization_iSeries)
         b       .start_here_common
 #endif /* CONFIG_PPC_ISERIES */
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
 
 _STATIC(__mmu_off)
         mfmsr   r3
@@ -1621,13 +1662,11 @@ _STATIC(__mmu_off)
  *
  */
 _GLOBAL(__start_initialization_multiplatform)
-#ifdef CONFIG_PPC_MULTIPLATFORM
         /*
          * Are we booted from a PROM Of-type client-interface ?
          */
         cmpldi  cr0,r5,0
         bne     .__boot_from_prom               /* yes -> prom */
-#endif
 
         /* Save parameters */
         mr      r31,r3
@@ -1656,7 +1695,6 @@ _GLOBAL(__start_initialization_multiplatform)
         bl      .__mmu_off
         b       .__after_prom_start
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
 _STATIC(__boot_from_prom)
         /* Save parameters */
         mr      r31,r3
@@ -1696,7 +1734,6 @@ _STATIC(__boot_from_prom)
         bl      .prom_init
         /* We never return */
         trap
-#endif
 
 /*
  * At this point, r3 contains the physical address we are running at,
@@ -1752,8 +1789,6 @@ _STATIC(__after_prom_start)
         bl      .copy_and_flush         /* copy the rest */
         b       .start_here_multiplatform
 
-#endif /* CONFIG_PPC_MULTIPLATFORM */
-
 /*
  * Copy routine used to copy the kernel to start at physical address 0
  * and flush and invalidate the caches as needed.
@@ -1836,7 +1871,7 @@ _GLOBAL(pmac_secondary_start)
         ld      r1,PACAEMERGSP(r13)
         subi    r1,r1,STACK_FRAME_OVERHEAD
 
-        b       .__secondary_start
+        b       __secondary_start
 
 #endif /* CONFIG_PPC_PMAC */
 
@@ -1853,7 +1888,7 @@ _GLOBAL(pmac_secondary_start)
  *   r13   = paca virtual address
  *   SPRG3 = paca virtual address
  */
-_GLOBAL(__secondary_start)
+__secondary_start:
         /* Set thread priority to MEDIUM */
         HMT_MEDIUM
 
@@ -1877,11 +1912,16 @@ _GLOBAL(__secondary_start)
         /* enable MMU and jump to start_secondary */
         LOAD_REG_ADDR(r3, .start_secondary_prolog)
         LOAD_REG_IMMEDIATE(r4, MSR_KERNEL)
-#ifdef DO_SOFT_DISABLE
+#ifdef CONFIG_PPC_ISERIES
 BEGIN_FW_FTR_SECTION
         ori     r4,r4,MSR_EE
 END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
 #endif
+BEGIN_FW_FTR_SECTION
+        stb     r7,PACASOFTIRQEN(r13)
+        stb     r7,PACAHARDIRQEN(r13)
+END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES)
+
         mtspr   SPRN_SRR0,r3
         mtspr   SPRN_SRR1,r4
         rfid
@@ -1913,7 +1953,6 @@ _GLOBAL(enable_64b_mode)
         isync
         blr
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
 /*
  * This is where the main kernel code starts.
  */
@@ -1977,7 +2016,6 @@ _STATIC(start_here_multiplatform)
         mtspr   SPRN_SRR1,r4
         rfid
         b       .       /* prevent speculative execution */
-#endif /* CONFIG_PPC_MULTIPLATFORM */
         
         /* This is where all platforms converge execution */
 _STATIC(start_here_common)
@@ -2005,15 +2043,18 @@ _STATIC(start_here_common)
 
         /* Load up the kernel context */
 5:
-#ifdef DO_SOFT_DISABLE
-BEGIN_FW_FTR_SECTION
         li      r5,0
-        stb     r5,PACAPROCENABLED(r13) /* Soft Disabled */
+        stb     r5,PACASOFTIRQEN(r13)   /* Soft Disabled */
+#ifdef CONFIG_PPC_ISERIES
+BEGIN_FW_FTR_SECTION
         mfmsr   r5
         ori     r5,r5,MSR_EE            /* Hard Enabled */
         mtmsrd  r5
 END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
 #endif
+BEGIN_FW_FTR_SECTION
+        stb     r5,PACAHARDIRQEN(r13)
+END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES)
 
         bl .start_kernel
 
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 39db7a3affe1..82bd2f10770f 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -112,7 +112,7 @@ static int ibmebus_dma_supported(struct device *dev, u64 mask)
         return 1;
 }
 
-struct dma_mapping_ops ibmebus_dma_ops = {
+static struct dma_mapping_ops ibmebus_dma_ops = {
         .alloc_coherent = ibmebus_alloc_coherent,
         .free_coherent  = ibmebus_free_coherent,
         .map_single     = ibmebus_map_single,
@@ -176,6 +176,10 @@ static struct ibmebus_dev* __devinit ibmebus_register_device_common(
         dev->ofdev.dev.bus     = &ibmebus_bus_type;
         dev->ofdev.dev.release = ibmebus_dev_release;
 
+        dev->ofdev.dev.archdata.of_node = dev->ofdev.node;
+        dev->ofdev.dev.archdata.dma_ops = &ibmebus_dma_ops;
+        dev->ofdev.dev.archdata.numa_node = of_node_to_nid(dev->ofdev.node);
+
         /* An ibmebusdev is based on a of_device. We have to change the
          * bus type to use our own DMA mapping operations. 
          */       
@@ -210,11 +214,10 @@ static struct ibmebus_dev* __devinit ibmebus_register_device_node(
                 return NULL;
         }
 
-        dev = kmalloc(sizeof(struct ibmebus_dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(struct ibmebus_dev), GFP_KERNEL);
         if (!dev) {
                 return NULL;
         }
-        memset(dev, 0, sizeof(struct ibmebus_dev));
 
         dev->ofdev.node = of_node_get(dn);
        
diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c
index 4180c3998b39..8994af327b47 100644
--- a/arch/powerpc/kernel/idle.c
+++ b/arch/powerpc/kernel/idle.c
@@ -39,6 +39,13 @@
 #define cpu_should_die()        0
 #endif
 
+static int __init powersave_off(char *arg)
+{
+        ppc_md.power_save = NULL;
+        return 0;
+}
+__setup("powersave=off", powersave_off);
+
 /*
  * The body of the idle task.
  */
diff --git a/arch/powerpc/kernel/idle_power4.S b/arch/powerpc/kernel/idle_power4.S
index 30de81da7b40..ba3195478600 100644
--- a/arch/powerpc/kernel/idle_power4.S
+++ b/arch/powerpc/kernel/idle_power4.S
@@ -30,6 +30,13 @@ END_FTR_SECTION_IFCLR(CPU_FTR_CAN_NAP)
         beqlr
 
         /* Go to NAP now */
+        mfmsr   r7
+        rldicl  r0,r7,48,1
+        rotldi  r0,r0,16
+        mtmsrd  r0,1                    /* hard-disable interrupts */
+        li      r0,1
+        stb     r0,PACASOFTIRQEN(r13)   /* we'll hard-enable shortly */
+        stb     r0,PACAHARDIRQEN(r13)
 BEGIN_FTR_SECTION
         DSSALL
         sync
@@ -38,7 +45,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
         ld      r8,TI_LOCAL_FLAGS(r9)   /* set napping bit */
         ori     r8,r8,_TLF_NAPPING      /* so when we take an exception */
         std     r8,TI_LOCAL_FLAGS(r9)   /* it will return to our caller */
-        mfmsr   r7
         ori     r7,r7,MSR_EE
         oris    r7,r7,MSR_POW@h
 1:      sync
diff --git a/arch/powerpc/kernel/io.c b/arch/powerpc/kernel/io.c
index e98180686b35..34ae11494ddc 100644
--- a/arch/powerpc/kernel/io.c
+++ b/arch/powerpc/kernel/io.c
@@ -25,13 +25,11 @@
 #include <asm/firmware.h>
 #include <asm/bug.h>
 
-void _insb(volatile u8 __iomem *port, void *buf, long count)
+void _insb(const volatile u8 __iomem *port, void *buf, long count)
 {
         u8 *tbuf = buf;
         u8 tmp;
 
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
         if (unlikely(count <= 0))
                 return;
         asm volatile("sync");
@@ -48,8 +46,6 @@ void _outsb(volatile u8 __iomem *port, const void *buf, long count)
 {
         const u8 *tbuf = buf;
 
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
         if (unlikely(count <= 0))
                 return;
         asm volatile("sync");
@@ -60,13 +56,11 @@ void _outsb(volatile u8 __iomem *port, const void *buf, long count)
 }
 EXPORT_SYMBOL(_outsb);
 
-void _insw_ns(volatile u16 __iomem *port, void *buf, long count)
+void _insw_ns(const volatile u16 __iomem *port, void *buf, long count)
 {
         u16 *tbuf = buf;
         u16 tmp;
 
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
         if (unlikely(count <= 0))
                 return;
         asm volatile("sync");
@@ -83,8 +77,6 @@ void _outsw_ns(volatile u16 __iomem *port, const void *buf, long count)
 {
         const u16 *tbuf = buf;
 
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
         if (unlikely(count <= 0))
                 return;
         asm volatile("sync");
@@ -95,13 +87,11 @@ void _outsw_ns(volatile u16 __iomem *port, const void *buf, long count)
 }
 EXPORT_SYMBOL(_outsw_ns);
 
-void _insl_ns(volatile u32 __iomem *port, void *buf, long count)
+void _insl_ns(const volatile u32 __iomem *port, void *buf, long count)
 {
         u32 *tbuf = buf;
         u32 tmp;
 
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
         if (unlikely(count <= 0))
                 return;
         asm volatile("sync");
@@ -118,8 +108,6 @@ void _outsl_ns(volatile u32 __iomem *port, const void *buf, long count)
 {
         const u32 *tbuf = buf;
 
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
         if (unlikely(count <= 0))
                 return;
         asm volatile("sync");
@@ -129,3 +117,90 @@ void _outsl_ns(volatile u32 __iomem *port, const void *buf, long count)
         asm volatile("sync");
 }
 EXPORT_SYMBOL(_outsl_ns);
+
+#define IO_CHECK_ALIGN(v,a) ((((unsigned long)(v)) & ((a) - 1)) == 0)
+
+void _memset_io(volatile void __iomem *addr, int c, unsigned long n)
+{
+        void *p = (void __force *)addr;
+        u32 lc = c;
+        lc |= lc << 8;
+        lc |= lc << 16;
+
+        __asm__ __volatile__ ("sync" : : : "memory");
+        while(n && !IO_CHECK_ALIGN(p, 4)) {
+                *((volatile u8 *)p) = c;
+                p++;
+                n--;
+        }
+        while(n >= 4) {
+                *((volatile u32 *)p) = lc;
+                p += 4;
+                n -= 4;
+        }
+        while(n) {
+                *((volatile u8 *)p) = c;
+                p++;
+                n--;
+        }
+        __asm__ __volatile__ ("sync" : : : "memory");
+}
+EXPORT_SYMBOL(_memset_io);
+
+void _memcpy_fromio(void *dest, const volatile void __iomem *src,
+                    unsigned long n)
+{
+        void *vsrc = (void __force *) src;
+
+        __asm__ __volatile__ ("sync" : : : "memory");
+        while(n && (!IO_CHECK_ALIGN(vsrc, 4) || !IO_CHECK_ALIGN(dest, 4))) {
+                *((u8 *)dest) = *((volatile u8 *)vsrc);
+                __asm__ __volatile__ ("eieio" : : : "memory");
+                vsrc++;
+                dest++;
+                n--;
+        }
+        while(n > 4) {
+                *((u32 *)dest) = *((volatile u32 *)vsrc);
+                __asm__ __volatile__ ("eieio" : : : "memory");
+                vsrc += 4;
+                dest += 4;
+                n -= 4;
+        }
+        while(n) {
+                *((u8 *)dest) = *((volatile u8 *)vsrc);
+                __asm__ __volatile__ ("eieio" : : : "memory");
+                vsrc++;
+                dest++;
+                n--;
+        }
+        __asm__ __volatile__ ("sync" : : : "memory");
+}
+EXPORT_SYMBOL(_memcpy_fromio);
+
+void _memcpy_toio(volatile void __iomem *dest, const void *src, unsigned long n)
+{
+        void *vdest = (void __force *) dest;
+
+        __asm__ __volatile__ ("sync" : : : "memory");
+        while(n && (!IO_CHECK_ALIGN(vdest, 4) || !IO_CHECK_ALIGN(src, 4))) {
+                *((volatile u8 *)vdest) = *((u8 *)src);
+                src++;
+                vdest++;
+                n--;
+        }
+        while(n > 4) {
+                *((volatile u32 *)vdest) = *((volatile u32 *)src);
+                src += 4;
+                vdest += 4;
+                n-=4;
+        }
+        while(n) {
+                *((volatile u8 *)vdest) = *((u8 *)src);
+                src++;
+                vdest++;
+                n--;
+        }
+        __asm__ __volatile__ ("sync" : : : "memory");
+}
+EXPORT_SYMBOL(_memcpy_toio);
diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c
index a13a93dfc655..c68113371050 100644
--- a/arch/powerpc/kernel/iomap.c
+++ b/arch/powerpc/kernel/iomap.c
@@ -106,7 +106,7 @@ EXPORT_SYMBOL(iowrite32_rep);
 
 void __iomem *ioport_map(unsigned long port, unsigned int len)
 {
-        return (void __iomem *) (port+pci_io_base);
+        return (void __iomem *) (port + _IO_BASE);
 }
 
 void ioport_unmap(void __iomem *addr)
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index ba6b7256084b..95edad4faf26 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -258,9 +258,9 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr,
         spin_unlock_irqrestore(&(tbl->it_lock), flags);
 }
 
-int iommu_map_sg(struct device *dev, struct iommu_table *tbl,
-                struct scatterlist *sglist, int nelems,
-                unsigned long mask, enum dma_data_direction direction)
+int iommu_map_sg(struct iommu_table *tbl, struct scatterlist *sglist,
+                 int nelems, unsigned long mask,
+                 enum dma_data_direction direction)
 {
         dma_addr_t dma_next = 0, dma_addr;
         unsigned long flags;
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 5e37bf14ef2d..0bd8c7665834 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -64,8 +64,9 @@
 #include <asm/ptrace.h>
 #include <asm/machdep.h>
 #include <asm/udbg.h>
-#ifdef CONFIG_PPC_ISERIES
+#ifdef CONFIG_PPC64
 #include <asm/paca.h>
+#include <asm/firmware.h>
 #endif
 
 int __irq_offset_value;
@@ -95,6 +96,74 @@ extern atomic_t ipi_sent;
 EXPORT_SYMBOL(irq_desc);
 
 int distribute_irqs = 1;
+
+static inline unsigned long get_hard_enabled(void)
+{
+        unsigned long enabled;
+
+        __asm__ __volatile__("lbz %0,%1(13)"
+        : "=r" (enabled) : "i" (offsetof(struct paca_struct, hard_enabled)));
+
+        return enabled;
+}
+
+static inline void set_soft_enabled(unsigned long enable)
+{
+        __asm__ __volatile__("stb %0,%1(13)"
+        : : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled)));
+}
+
+void local_irq_restore(unsigned long en)
+{
+        /*
+         * get_paca()->soft_enabled = en;
+         * Is it ever valid to use local_irq_restore(0) when soft_enabled is 1?
+         * That was allowed before, and in such a case we do need to take care
+         * that gcc will set soft_enabled directly via r13, not choose to use
+         * an intermediate register, lest we're preempted to a different cpu.
+         */
+        set_soft_enabled(en);
+        if (!en)
+                return;
+
+        if (firmware_has_feature(FW_FEATURE_ISERIES)) {
+                /*
+                 * Do we need to disable preemption here?  Not really: in the
+                 * unlikely event that we're preempted to a different cpu in
+                 * between getting r13, loading its lppaca_ptr, and loading
+                 * its any_int, we might call iseries_handle_interrupts without
+                 * an interrupt pending on the new cpu, but that's no disaster,
+                 * is it?  And the business of preempting us off the old cpu
+                 * would itself involve a local_irq_restore which handles the
+                 * interrupt to that cpu.
+                 *
+                 * But use "local_paca->lppaca_ptr" instead of "get_lppaca()"
+                 * to avoid any preemption checking added into get_paca().
+                 */
+                if (local_paca->lppaca_ptr->int_dword.any_int)
+                        iseries_handle_interrupts();
+                return;
+        }
+
+        /*
+         * if (get_paca()->hard_enabled) return;
+         * But again we need to take care that gcc gets hard_enabled directly
+         * via r13, not choose to use an intermediate register, lest we're
+         * preempted to a different cpu in between the two instructions.
+         */
+        if (get_hard_enabled())
+                return;
+
+        /*
+         * Need to hard-enable interrupts here.  Since currently disabled,
+         * no need to take further asm precautions against preemption; but
+         * use local_paca instead of get_paca() to avoid preemption checking.
+         */
+        local_paca->hard_enabled = en;
+        if ((int)mfspr(SPRN_DEC) < 0)
+                mtspr(SPRN_DEC, 1);
+        hard_irq_enable();
+}
 #endif /* CONFIG_PPC64 */
 
 int show_interrupts(struct seq_file *p, void *v)
@@ -246,7 +315,8 @@ void do_IRQ(struct pt_regs *regs)
         set_irq_regs(old_regs);
 
 #ifdef CONFIG_PPC_ISERIES
-        if (get_lppaca()->int_dword.fields.decr_int) {
+        if (firmware_has_feature(FW_FEATURE_ISERIES) &&
+                        get_lppaca()->int_dword.fields.decr_int) {
                 get_lppaca()->int_dword.fields.decr_int = 0;
                 /* Signal a fake decrementer interrupt */
                 timer_interrupt(regs);
@@ -626,10 +696,14 @@ EXPORT_SYMBOL_GPL(irq_of_parse_and_map);
 
 void irq_dispose_mapping(unsigned int virq)
 {
-        struct irq_host *host = irq_map[virq].host;
+        struct irq_host *host;
         irq_hw_number_t hwirq;
         unsigned long flags;
 
+        if (virq == NO_IRQ)
+                return;
+
+        host = irq_map[virq].host;
         WARN_ON (host == NULL);
         if (host == NULL)
                 return;
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 7b8d12b9026c..4657563f8813 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -85,7 +85,7 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
 void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
         mutex_lock(&kprobe_mutex);
-        free_insn_slot(p->ainsn.insn);
+        free_insn_slot(p->ainsn.insn, 0);
         mutex_unlock(&kprobe_mutex);
 }
 
diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
index e2c3c6a85f33..8339fd609de0 100644
--- a/arch/powerpc/kernel/module_32.c
+++ b/arch/powerpc/kernel/module_32.c
@@ -23,6 +23,7 @@
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/cache.h>
+#include <linux/bug.h>
 
 #include "setup.h"
 
@@ -290,23 +291,11 @@ int module_finalize(const Elf_Ehdr *hdr,
                     struct module *me)
 {
         const Elf_Shdr *sect;
+        int err;
 
-        me->arch.bug_table = NULL;
-        me->arch.num_bugs = 0;
-
-        /* Find the __bug_table section, if present */
-        sect = find_section(hdr, sechdrs, "__bug_table");
-        if (sect != NULL) {
-                me->arch.bug_table = (void *) sect->sh_addr;
-                me->arch.num_bugs = sect->sh_size / sizeof(struct bug_entry);
-        }
-
-        /*
-         * Strictly speaking this should have a spinlock to protect against
-         * traversals, but since we only traverse on BUG()s, a spinlock
-         * could potentially lead to deadlock and thus be counter-productive.
-         */
-        list_add(&me->arch.bug_list, &module_bug_list);
+        err = module_bug_finalize(hdr, sechdrs, me);
+        if (err)                /* never true, currently */
+                return err;
 
         /* Apply feature fixups */
         sect = find_section(hdr, sechdrs, "__ftr_fixup");
@@ -320,7 +309,7 @@ int module_finalize(const Elf_Ehdr *hdr,
 
 void module_arch_cleanup(struct module *mod)
 {
-        list_del(&mod->arch.bug_list);
+        module_bug_cleanup(mod);
 }
 
 struct bug_entry *module_find_bug(unsigned long bugaddr)
diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c
index 8dd1f0aae5d6..75c7c4f19280 100644
--- a/arch/powerpc/kernel/module_64.c
+++ b/arch/powerpc/kernel/module_64.c
@@ -20,6 +20,7 @@
 #include <linux/moduleloader.h>
 #include <linux/err.h>
 #include <linux/vmalloc.h>
+#include <linux/bug.h>
 #include <asm/module.h>
 #include <asm/uaccess.h>
 #include <asm/firmware.h>
@@ -439,23 +440,11 @@ int module_finalize(const Elf_Ehdr *hdr,
                 const Elf_Shdr *sechdrs, struct module *me)
 {
         const Elf_Shdr *sect;
+        int err;
 
-        me->arch.bug_table = NULL;
-        me->arch.num_bugs = 0;
-
-        /* Find the __bug_table section, if present */
-        sect = find_section(hdr, sechdrs, "__bug_table");
-        if (sect != NULL) {
-                me->arch.bug_table = (void *) sect->sh_addr;
-                me->arch.num_bugs = sect->sh_size / sizeof(struct bug_entry);
-        }
-
-        /*
-         * Strictly speaking this should have a spinlock to protect against
-         * traversals, but since we only traverse on BUG()s, a spinlock
-         * could potentially lead to deadlock and thus be counter-productive.
-         */
-        list_add(&me->arch.bug_list, &module_bug_list);
+        err = module_bug_finalize(hdr, sechdrs, me);
+        if (err)
+                return err;
 
         /* Apply feature fixups */
         sect = find_section(hdr, sechdrs, "__ftr_fixup");
@@ -475,7 +464,7 @@ int module_finalize(const Elf_Ehdr *hdr,
 
 void module_arch_cleanup(struct module *mod)
 {
-        list_del(&mod->arch.bug_list);
+        module_bug_cleanup(mod);
 }
 
 struct bug_entry *module_find_bug(unsigned long bugaddr)
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index 6960f090991e..869cebbba967 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -505,7 +505,7 @@ static int nvram_scan_partitions(void)
                 return -ENODEV;
         total_size = ppc_md.nvram_size();
         
-        header = (char *) kmalloc(NVRAM_HEADER_LEN, GFP_KERNEL);
+        header = kmalloc(NVRAM_HEADER_LEN, GFP_KERNEL);
         if (!header) {
                 printk(KERN_ERR "nvram_scan_partitions: Failed kmalloc\n");
                 return -ENOMEM;
@@ -574,7 +574,7 @@ static int __init nvram_init(void)
         }
         
         /* initialize our anchor for the nvram partition list */
-        nvram_part = (struct nvram_partition *) kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);
+        nvram_part = kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);
         if (!nvram_part) {
                 printk(KERN_ERR "nvram_init: Failed kmalloc\n");
                 return -ENOMEM;
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index 397c83eda20e..e921514e655b 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -9,30 +9,26 @@
 #include <asm/of_device.h>
 
 /**
- * of_match_device - Tell if an of_device structure has a matching
- * of_match structure
+ * of_match_node - Tell if an device_node has a matching of_match structure
  * @ids: array of of device match structures to search in
- * @dev: the of device structure to match against
+ * @node: the of device structure to match against
  *
- * Used by a driver to check whether an of_device present in the
- * system is in its list of supported devices.
+ * Low level utility function used by device matching.
  */
-const struct of_device_id *of_match_device(const struct of_device_id *matches,
-                                        const struct of_device *dev)
+const struct of_device_id *of_match_node(const struct of_device_id *matches,
+                                         const struct device_node *node)
 {
-        if (!dev->node)
-                return NULL;
         while (matches->name[0] || matches->type[0] || matches->compatible[0]) {
                 int match = 1;
                 if (matches->name[0])
-                        match &= dev->node->name
-                                && !strcmp(matches->name, dev->node->name);
+                        match &= node->name
+                                && !strcmp(matches->name, node->name);
                 if (matches->type[0])
-                        match &= dev->node->type
-                                && !strcmp(matches->type, dev->node->type);
+                        match &= node->type
+                                && !strcmp(matches->type, node->type);
                 if (matches->compatible[0])
-                        match &= device_is_compatible(dev->node,
-                                matches->compatible);
+                        match &= device_is_compatible(node,
+                                                      matches->compatible);
                 if (match)
                         return matches;
                 matches++;
@@ -40,16 +36,21 @@ const struct of_device_id *of_match_device(const struct of_device_id *matches,
         return NULL;
 }
 
-static int of_platform_bus_match(struct device *dev, struct device_driver *drv)
+/**
+ * of_match_device - Tell if an of_device structure has a matching
+ * of_match structure
+ * @ids: array of of device match structures to search in
+ * @dev: the of device structure to match against
+ *
+ * Used by a driver to check whether an of_device present in the
+ * system is in its list of supported devices.
+ */
+const struct of_device_id *of_match_device(const struct of_device_id *matches,
+                                        const struct of_device *dev)
 {
-        struct of_device * of_dev = to_of_device(dev);
-        struct of_platform_driver * of_drv = to_of_platform_driver(drv);
-        const struct of_device_id * matches = of_drv->match_table;
-
-        if (!matches)
-                return 0;
-
-        return of_match_device(matches, of_dev) != NULL;
+        if (!dev->node)
+                return NULL;
+        return of_match_node(matches, dev->node);
 }
 
 struct of_device *of_dev_get(struct of_device *dev)
@@ -71,96 +72,8 @@ void of_dev_put(struct of_device *dev)
                 put_device(&dev->dev);
 }
 
-
-static int of_device_probe(struct device *dev)
-{
-        int error = -ENODEV;
-        struct of_platform_driver *drv;
-        struct of_device *of_dev;
-        const struct of_device_id *match;
-
-        drv = to_of_platform_driver(dev->driver);
-        of_dev = to_of_device(dev);
-
-        if (!drv->probe)
-                return error;
-
-        of_dev_get(of_dev);
-
-        match = of_match_device(drv->match_table, of_dev);
-        if (match)
-                error = drv->probe(of_dev, match);
-        if (error)
-                of_dev_put(of_dev);
-
-        return error;
-}
-
-static int of_device_remove(struct device *dev)
-{
-        struct of_device * of_dev = to_of_device(dev);
-        struct of_platform_driver * drv = to_of_platform_driver(dev->driver);
-
-        if (dev->driver && drv->remove)
-                drv->remove(of_dev);
-        return 0;
-}
-
-static int of_device_suspend(struct device *dev, pm_message_t state)
-{
-        struct of_device * of_dev = to_of_device(dev);
-        struct of_platform_driver * drv = to_of_platform_driver(dev->driver);
-        int error = 0;
-
-        if (dev->driver && drv->suspend)
-                error = drv->suspend(of_dev, state);
-        return error;
-}
-
-static int of_device_resume(struct device * dev)
-{
-        struct of_device * of_dev = to_of_device(dev);
-        struct of_platform_driver * drv = to_of_platform_driver(dev->driver);
-        int error = 0;
-
-        if (dev->driver && drv->resume)
-                error = drv->resume(of_dev);
-        return error;
-}
-
-struct bus_type of_platform_bus_type = {
-       .name    = "of_platform",
-       .match   = of_platform_bus_match,
-       .probe   = of_device_probe,
-       .remove  = of_device_remove,
-       .suspend = of_device_suspend,
-       .resume  = of_device_resume,
-};
-
-static int __init of_bus_driver_init(void)
-{
-        return bus_register(&of_platform_bus_type);
-}
-
-postcore_initcall(of_bus_driver_init);
-
-int of_register_driver(struct of_platform_driver *drv)
-{
-        /* initialize common driver fields */
-        drv->driver.name = drv->name;
-        drv->driver.bus = &of_platform_bus_type;
-
-        /* register with core */
-        return driver_register(&drv->driver);
-}
-
-void of_unregister_driver(struct of_platform_driver *drv)
-{
-        driver_unregister(&drv->driver);
-}
-
-
-static ssize_t dev_show_devspec(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t dev_show_devspec(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         struct of_device *ofdev;
 
@@ -196,9 +109,7 @@ int of_device_register(struct of_device *ofdev)
         if (rc)
                 return rc;
 
-        device_create_file(&ofdev->dev, &dev_attr_devspec);
-
-        return 0;
+        return device_create_file(&ofdev->dev, &dev_attr_devspec);
 }
 
 void of_device_unregister(struct of_device *ofdev)
@@ -208,41 +119,11 @@ void of_device_unregister(struct of_device *ofdev)
         device_unregister(&ofdev->dev);
 }
 
-struct of_device* of_platform_device_create(struct device_node *np,
-                                            const char *bus_id,
-                                            struct device *parent)
-{
-        struct of_device *dev;
-
-        dev = kmalloc(sizeof(*dev), GFP_KERNEL);
-        if (!dev)
-                return NULL;
-        memset(dev, 0, sizeof(*dev));
-
-        dev->node = of_node_get(np);
-        dev->dma_mask = 0xffffffffUL;
-        dev->dev.dma_mask = &dev->dma_mask;
-        dev->dev.parent = parent;
-        dev->dev.bus = &of_platform_bus_type;
-        dev->dev.release = of_release_dev;
-
-        strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE);
-
-        if (of_device_register(dev) != 0) {
-                kfree(dev);
-                return NULL;
-        }
-
-        return dev;
-}
 
+EXPORT_SYMBOL(of_match_node);
 EXPORT_SYMBOL(of_match_device);
-EXPORT_SYMBOL(of_platform_bus_type);
-EXPORT_SYMBOL(of_register_driver);
-EXPORT_SYMBOL(of_unregister_driver);
 EXPORT_SYMBOL(of_device_register);
 EXPORT_SYMBOL(of_device_unregister);
 EXPORT_SYMBOL(of_dev_get);
 EXPORT_SYMBOL(of_dev_put);
-EXPORT_SYMBOL(of_platform_device_create);
 EXPORT_SYMBOL(of_release_dev);
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
new file mode 100644
index 000000000000..b7345176b399
--- /dev/null
+++ b/arch/powerpc/kernel/of_platform.c
@@ -0,0 +1,490 @@
+/*
+ *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
+ *                       <benh@kernel.crashing.org>
+ *    and                Arnd Bergmann, IBM Corp.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ *
+ */
+
+#undef DEBUG
+
+#include <linux/string.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/mod_devicetable.h>
+#include <linux/slab.h>
+#include <linux/pci.h>
+
+#include <asm/errno.h>
+#include <asm/dcr.h>
+#include <asm/of_device.h>
+#include <asm/of_platform.h>
+#include <asm/topology.h>
+#include <asm/pci-bridge.h>
+#include <asm/ppc-pci.h>
+#include <asm/atomic.h>
+
+
+/*
+ * The list of OF IDs below is used for matching bus types in the
+ * system whose devices are to be exposed as of_platform_devices.
+ *
+ * This is the default list valid for most platforms. This file provides
+ * functions who can take an explicit list if necessary though
+ *
+ * The search is always performed recursively looking for children of
+ * the provided device_node and recursively if such a children matches
+ * a bus type in the list
+ */
+
+static struct of_device_id of_default_bus_ids[] = {
+        { .type = "soc", },
+        { .compatible = "soc", },
+        { .type = "spider", },
+        { .type = "axon", },
+        { .type = "plb5", },
+        { .type = "plb4", },
+        { .type = "opb", },
+        { .type = "ebc", },
+        {},
+};
+
+static atomic_t bus_no_reg_magic;
+
+/*
+ *
+ * OF platform device type definition & base infrastructure
+ *
+ */
+
+static int of_platform_bus_match(struct device *dev, struct device_driver *drv)
+{
+        struct of_device * of_dev = to_of_device(dev);
+        struct of_platform_driver * of_drv = to_of_platform_driver(drv);
+        const struct of_device_id * matches = of_drv->match_table;
+
+        if (!matches)
+                return 0;
+
+        return of_match_device(matches, of_dev) != NULL;
+}
+
+static int of_platform_device_probe(struct device *dev)
+{
+        int error = -ENODEV;
+        struct of_platform_driver *drv;
+        struct of_device *of_dev;
+        const struct of_device_id *match;
+
+        drv = to_of_platform_driver(dev->driver);
+        of_dev = to_of_device(dev);
+
+        if (!drv->probe)
+                return error;
+
+        of_dev_get(of_dev);
+
+        match = of_match_device(drv->match_table, of_dev);
+        if (match)
+                error = drv->probe(of_dev, match);
+        if (error)
+                of_dev_put(of_dev);
+
+        return error;
+}
+
+static int of_platform_device_remove(struct device *dev)
+{
+        struct of_device * of_dev = to_of_device(dev);
+        struct of_platform_driver * drv = to_of_platform_driver(dev->driver);
+
+        if (dev->driver && drv->remove)
+                drv->remove(of_dev);
+        return 0;
+}
+
+static int of_platform_device_suspend(struct device *dev, pm_message_t state)
+{
+        struct of_device * of_dev = to_of_device(dev);
+        struct of_platform_driver * drv = to_of_platform_driver(dev->driver);
+        int error = 0;
+
+        if (dev->driver && drv->suspend)
+                error = drv->suspend(of_dev, state);
+        return error;
+}
+
+static int of_platform_device_resume(struct device * dev)
+{
+        struct of_device * of_dev = to_of_device(dev);
+        struct of_platform_driver * drv = to_of_platform_driver(dev->driver);
+        int error = 0;
+
+        if (dev->driver && drv->resume)
+                error = drv->resume(of_dev);
+        return error;
+}
+
+struct bus_type of_platform_bus_type = {
+       .name    = "of_platform",
+       .match   = of_platform_bus_match,
+       .probe   = of_platform_device_probe,
+       .remove  = of_platform_device_remove,
+       .suspend = of_platform_device_suspend,
+       .resume  = of_platform_device_resume,
+};
+EXPORT_SYMBOL(of_platform_bus_type);
+
+static int __init of_bus_driver_init(void)
+{
+        return bus_register(&of_platform_bus_type);
+}
+
+postcore_initcall(of_bus_driver_init);
+
+int of_register_platform_driver(struct of_platform_driver *drv)
+{
+        /* initialize common driver fields */
+        drv->driver.name = drv->name;
+        drv->driver.bus = &of_platform_bus_type;
+
+        /* register with core */
+        return driver_register(&drv->driver);
+}
+EXPORT_SYMBOL(of_register_platform_driver);
+
+void of_unregister_platform_driver(struct of_platform_driver *drv)
+{
+        driver_unregister(&drv->driver);
+}
+EXPORT_SYMBOL(of_unregister_platform_driver);
+
+static void of_platform_make_bus_id(struct of_device *dev)
+{
+        struct device_node *node = dev->node;
+        char *name = dev->dev.bus_id;
+        const u32 *reg;
+        u64 addr;
+        int magic;
+
+        /*
+         * If it's a DCR based device, use 'd' for native DCRs
+         * and 'D' for MMIO DCRs.
+         */
+#ifdef CONFIG_PPC_DCR
+        reg = get_property(node, "dcr-reg", NULL);
+        if (reg) {
+#ifdef CONFIG_PPC_DCR_NATIVE
+                snprintf(name, BUS_ID_SIZE, "d%x.%s",
+                         *reg, node->name);
+#else /* CONFIG_PPC_DCR_NATIVE */
+                addr = of_translate_dcr_address(node, *reg, NULL);
+                if (addr != OF_BAD_ADDR) {
+                        snprintf(name, BUS_ID_SIZE,
+                                 "D%llx.%s", (unsigned long long)addr,
+                                 node->name);
+                        return;
+                }
+#endif /* !CONFIG_PPC_DCR_NATIVE */
+        }
+#endif /* CONFIG_PPC_DCR */
+
+        /*
+         * For MMIO, get the physical address
+         */
+        reg = get_property(node, "reg", NULL);
+        if (reg) {
+                addr = of_translate_address(node, reg);
+                if (addr != OF_BAD_ADDR) {
+                        snprintf(name, BUS_ID_SIZE,
+                                 "%llx.%s", (unsigned long long)addr,
+                                 node->name);
+                        return;
+                }
+        }
+
+        /*
+         * No BusID, use the node name and add a globally incremented
+         * counter (and pray...)
+         */
+        magic = atomic_add_return(1, &bus_no_reg_magic);
+        snprintf(name, BUS_ID_SIZE, "%s.%d", node->name, magic - 1);
+}
+
+struct of_device* of_platform_device_create(struct device_node *np,
+                                            const char *bus_id,
+                                            struct device *parent)
+{
+        struct of_device *dev;
+
+        dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev)
+                return NULL;
+        memset(dev, 0, sizeof(*dev));
+
+        dev->node = of_node_get(np);
+        dev->dma_mask = 0xffffffffUL;
+        dev->dev.dma_mask = &dev->dma_mask;
+        dev->dev.parent = parent;
+        dev->dev.bus = &of_platform_bus_type;
+        dev->dev.release = of_release_dev;
+        dev->dev.archdata.of_node = np;
+        dev->dev.archdata.numa_node = of_node_to_nid(np);
+
+        /* We do not fill the DMA ops for platform devices by default.
+         * This is currently the responsibility of the platform code
+         * to do such, possibly using a device notifier
+         */
+
+        if (bus_id)
+                strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE);
+        else
+                of_platform_make_bus_id(dev);
+
+        if (of_device_register(dev) != 0) {
+                kfree(dev);
+                return NULL;
+        }
+
+        return dev;
+}
+EXPORT_SYMBOL(of_platform_device_create);
+
+
+
+/**
+ * of_platform_bus_create - Create an OF device for a bus node and all its
+ * children. Optionally recursively instanciate matching busses.
+ * @bus: device node of the bus to instanciate
+ * @matches: match table, NULL to use the default, OF_NO_DEEP_PROBE to
+ * disallow recursive creation of child busses
+ */
+static int of_platform_bus_create(struct device_node *bus,
+                                  struct of_device_id *matches,
+                                  struct device *parent)
+{
+        struct device_node *child;
+        struct of_device *dev;
+        int rc = 0;
+
+        for (child = NULL; (child = of_get_next_child(bus, child)); ) {
+                pr_debug("   create child: %s\n", child->full_name);
+                dev = of_platform_device_create(child, NULL, parent);
+                if (dev == NULL)
+                        rc = -ENOMEM;
+                else if (!of_match_node(matches, child))
+                        continue;
+                if (rc == 0) {
+                        pr_debug("   and sub busses\n");
+                        rc = of_platform_bus_create(child, matches, &dev->dev);
+                } if (rc) {
+                        of_node_put(child);
+                        break;
+                }
+        }
+        return rc;
+}
+
+/**
+ * of_platform_bus_probe - Probe the device-tree for platform busses
+ * @root: parent of the first level to probe or NULL for the root of the tree
+ * @matches: match table, NULL to use the default
+ * @parent: parent to hook devices from, NULL for toplevel
+ *
+ * Note that children of the provided root are not instanciated as devices
+ * unless the specified root itself matches the bus list and is not NULL.
+ */
+
+int of_platform_bus_probe(struct device_node *root,
+                          struct of_device_id *matches,
+                          struct device *parent)
+{
+        struct device_node *child;
+        struct of_device *dev;
+        int rc = 0;
+
+        if (matches == NULL)
+                matches = of_default_bus_ids;
+        if (matches == OF_NO_DEEP_PROBE)
+                return -EINVAL;
+        if (root == NULL)
+                root = of_find_node_by_path("/");
+        else
+                of_node_get(root);
+
+        pr_debug("of_platform_bus_probe()\n");
+        pr_debug(" starting at: %s\n", root->full_name);
+
+        /* Do a self check of bus type, if there's a match, create
+         * children
+         */
+        if (of_match_node(matches, root)) {
+                pr_debug(" root match, create all sub devices\n");
+                dev = of_platform_device_create(root, NULL, parent);
+                if (dev == NULL) {
+                        rc = -ENOMEM;
+                        goto bail;
+                }
+                pr_debug(" create all sub busses\n");
+                rc = of_platform_bus_create(root, matches, &dev->dev);
+                goto bail;
+        }
+        for (child = NULL; (child = of_get_next_child(root, child)); ) {
+                if (!of_match_node(matches, child))
+                        continue;
+
+                pr_debug("  match: %s\n", child->full_name);
+                dev = of_platform_device_create(child, NULL, parent);
+                if (dev == NULL)
+                        rc = -ENOMEM;
+                else
+                        rc = of_platform_bus_create(child, matches, &dev->dev);
+                if (rc) {
+                        of_node_put(child);
+                        break;
+                }
+        }
+ bail:
+        of_node_put(root);
+        return rc;
+}
+EXPORT_SYMBOL(of_platform_bus_probe);
+
+static int of_dev_node_match(struct device *dev, void *data)
+{
+        return to_of_device(dev)->node == data;
+}
+
+struct of_device *of_find_device_by_node(struct device_node *np)
+{
+        struct device *dev;
+
+        dev = bus_find_device(&of_platform_bus_type,
+                              NULL, np, of_dev_node_match);
+        if (dev)
+                return to_of_device(dev);
+        return NULL;
+}
+EXPORT_SYMBOL(of_find_device_by_node);
+
+static int of_dev_phandle_match(struct device *dev, void *data)
+{
+        phandle *ph = data;
+        return to_of_device(dev)->node->linux_phandle == *ph;
+}
+
+struct of_device *of_find_device_by_phandle(phandle ph)
+{
+        struct device *dev;
+
+        dev = bus_find_device(&of_platform_bus_type,
+                              NULL, &ph, of_dev_phandle_match);
+        if (dev)
+                return to_of_device(dev);
+        return NULL;
+}
+EXPORT_SYMBOL(of_find_device_by_phandle);
+
+
+#ifdef CONFIG_PPC_OF_PLATFORM_PCI
+
+/* The probing of PCI controllers from of_platform is currently
+ * 64 bits only, mostly due to gratuitous differences between
+ * the 32 and 64 bits PCI code on PowerPC and the 32 bits one
+ * lacking some bits needed here.
+ */
+
+static int __devinit of_pci_phb_probe(struct of_device *dev,
+                                      const struct of_device_id *match)
+{
+        struct pci_controller *phb;
+
+        /* Check if we can do that ... */
+        if (ppc_md.pci_setup_phb == NULL)
+                return -ENODEV;
+
+        printk(KERN_INFO "Setting up PCI bus %s\n", dev->node->full_name);
+
+        /* Alloc and setup PHB data structure */
+        phb = pcibios_alloc_controller(dev->node);
+        if (!phb)
+                return -ENODEV;
+
+        /* Setup parent in sysfs */
+        phb->parent = &dev->dev;
+
+        /* Setup the PHB using arch provided callback */
+        if (ppc_md.pci_setup_phb(phb)) {
+                pcibios_free_controller(phb);
+                return -ENODEV;
+        }
+
+        /* Process "ranges" property */
+        pci_process_bridge_OF_ranges(phb, dev->node, 0);
+
+        /* Setup IO space.
+         * This will not work properly for ISA IOs, something needs to be done
+         * about it if we ever generalize that way of probing PCI brigdes
+         */
+        pci_setup_phb_io_dynamic(phb, 0);
+
+        /* Init pci_dn data structures */
+        pci_devs_phb_init_dynamic(phb);
+
+        /* Register devices with EEH */
+#ifdef CONFIG_EEH
+        if (dev->node->child)
+                eeh_add_device_tree_early(dev->node);
+#endif /* CONFIG_EEH */
+
+        /* Scan the bus */
+        scan_phb(phb);
+
+        /* Claim resources. This might need some rework as well depending
+         * wether we are doing probe-only or not, like assigning unassigned
+         * resources etc...
+         */
+        pcibios_claim_one_bus(phb->bus);
+
+        /* Finish EEH setup */
+#ifdef CONFIG_EEH
+        eeh_add_device_tree_late(phb->bus);
+#endif
+
+        /* Add probed PCI devices to the device model */
+        pci_bus_add_devices(phb->bus);
+
+        return 0;
+}
+
+static struct of_device_id of_pci_phb_ids[] = {
+        { .type = "pci", },
+        { .type = "pcix", },
+        { .type = "pcie", },
+        { .type = "pciex", },
+        { .type = "ht", },
+        {}
+};
+
+static struct of_platform_driver of_pci_phb_driver = {
+       .name = "of-pci",
+       .match_table = of_pci_phb_ids,
+       .probe = of_pci_phb_probe,
+       .driver = {
+               .multithread_probe = 1,
+       },
+};
+
+static __init int of_pci_phb_init(void)
+{
+        return of_register_platform_driver(&of_pci_phb_driver);
+}
+
+device_initcall(of_pci_phb_init);
+
+#endif /* CONFIG_PPC_OF_PLATFORM_PCI */
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 0d9ff72e2852..2847cd51a2d7 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <linux/bootmem.h>
 #include <linux/irq.h>
+#include <linux/list.h>
 
 #include <asm/processor.h>
 #include <asm/io.h>
@@ -99,7 +100,7 @@ pcibios_fixup_resources(struct pci_dev *dev)
                         continue;
                 if (res->end == 0xffffffff) {
                         DBG("PCI:%s Resource %d [%016llx-%016llx] is unassigned\n",
-                            pci_name(dev), i, res->start, res->end);
+                            pci_name(dev), i, (u64)res->start, (u64)res->end);
                         res->end -= res->start;
                         res->start = 0;
                         res->flags |= IORESOURCE_UNSET;
@@ -115,11 +116,9 @@ pcibios_fixup_resources(struct pci_dev *dev)
                 if (offset != 0) {
                         res->start += offset;
                         res->end += offset;
-#ifdef DEBUG
-                        printk("Fixup res %d (%lx) of dev %s: %llx -> %llx\n",
-                               i, res->flags, pci_name(dev),
-                               res->start - offset, res->start);
-#endif
+                        DBG("Fixup res %d (%lx) of dev %s: %llx -> %llx\n",
+                            i, res->flags, pci_name(dev),
+                            (u64)res->start - offset, (u64)res->start);
                 }
         }
 
@@ -255,7 +254,7 @@ pcibios_allocate_bus_resources(struct list_head *bus_list)
                         }
 
                         DBG("PCI: bridge rsrc %llx..%llx (%lx), parent %p\n",
-                                res->start, res->end, res->flags, pr);
+                            (u64)res->start, (u64)res->end, res->flags, pr);
                         if (pr) {
                                 if (request_resource(pr, res) == 0)
                                         continue;
@@ -306,7 +305,7 @@ reparent_resources(struct resource *parent, struct resource *res)
         for (p = res->child; p != NULL; p = p->sibling) {
                 p->parent = res;
                 DBG(KERN_INFO "PCI: reparented %s [%llx..%llx] under %s\n",
-                    p->name, p->start, p->end, res->name);
+                    p->name, (u64)p->start, (u64)p->end, res->name);
         }
         return 0;
 }
@@ -362,7 +361,7 @@ pci_relocate_bridge_resource(struct pci_bus *bus, int i)
         }
         if (request_resource(pr, res)) {
                 DBG(KERN_ERR "PCI: huh? couldn't move to %llx..%llx\n",
-                    res->start, res->end);
+                    (u64)res->start, (u64)res->end);
                 return -1;              /* "can't happen" */
         }
         update_bridge_base(bus, i);
@@ -480,14 +479,14 @@ static inline void alloc_resource(struct pci_dev *dev, int idx)
         struct resource *pr, *r = &dev->resource[idx];
 
         DBG("PCI:%s: Resource %d: %016llx-%016llx (f=%lx)\n",
-            pci_name(dev), idx, r->start, r->end, r->flags);
+            pci_name(dev), idx, (u64)r->start, (u64)r->end, r->flags);
         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));
                 if (pr)
                         DBG("PCI:  parent is %p: %016llx-%016llx (f=%lx)\n",
-                            pr, pr->start, pr->end, pr->flags);
+                            pr, (u64)pr->start, (u64)pr->end, pr->flags);
                 /* We'll assign a new address later */
                 r->flags |= IORESOURCE_UNSET;
                 r->end -= r->start;
@@ -671,7 +670,7 @@ pcibios_make_OF_bus_map(void)
         struct pci_controller* hose;
         struct property *map_prop;
 
-        pci_to_OF_bus_map = (u8*)kmalloc(pci_bus_count, GFP_KERNEL);
+        pci_to_OF_bus_map = kmalloc(pci_bus_count, GFP_KERNEL);
         if (!pci_to_OF_bus_map) {
                 printk(KERN_ERR "Can't allocate OF bus map !\n");
                 return;
@@ -737,25 +736,51 @@ scan_OF_pci_childs(struct device_node* node, pci_OF_scan_iterator filter, void*
         return NULL;
 }
 
-static int
-scan_OF_pci_childs_iterator(struct device_node* node, void* data)
+static struct device_node *scan_OF_for_pci_dev(struct device_node *parent,
+                                               unsigned int devfn)
 {
-        const unsigned int *reg;
-        u8* fdata = (u8*)data;
-        
-        reg = get_property(node, "reg", NULL);
-        if (reg && ((reg[0] >> 8) & 0xff) == fdata[1]
-                && ((reg[0] >> 16) & 0xff) == fdata[0])
-                return 1;
-        return 0;
+        struct device_node *np = NULL;
+        const u32 *reg;
+        unsigned int psize;
+
+        while ((np = of_get_next_child(parent, np)) != NULL) {
+                reg = get_property(np, "reg", &psize);
+                if (reg == NULL || psize < 4)
+                        continue;
+                if (((reg[0] >> 8) & 0xff) == devfn)
+                        return np;
+        }
+        return NULL;
 }
 
-static struct device_node*
-scan_OF_childs_for_device(struct device_node* node, u8 bus, u8 dev_fn)
+
+static struct device_node *scan_OF_for_pci_bus(struct pci_bus *bus)
 {
-        u8 filter_data[2] = {bus, dev_fn};
+        struct device_node *parent, *np;
+
+        /* Are we a root bus ? */
+        if (bus->self == NULL || bus->parent == NULL) {
+                struct pci_controller *hose = pci_bus_to_hose(bus->number);
+                if (hose == NULL)
+                        return NULL;
+                return of_node_get(hose->arch_data);
+        }
 
-        return scan_OF_pci_childs(node, scan_OF_pci_childs_iterator, filter_data);
+        /* not a root bus, we need to get our parent */
+        parent = scan_OF_for_pci_bus(bus->parent);
+        if (parent == NULL)
+                return NULL;
+
+        /* now iterate for children for a match */
+        np = scan_OF_for_pci_dev(parent, bus->self->devfn);
+        of_node_put(parent);
+
+        /* sanity check */
+        if (strcmp(np->type, "pci") != 0)
+                printk(KERN_WARNING "pci: wrong type \"%s\" for bridge %s\n",
+                       np->type, np->full_name);
+
+        return np;
 }
 
 /*
@@ -764,43 +789,25 @@ scan_OF_childs_for_device(struct device_node* node, u8 bus, u8 dev_fn)
 struct device_node *
 pci_busdev_to_OF_node(struct pci_bus *bus, int devfn)
 {
-        struct pci_controller *hose;
-        struct device_node *node;
-        int busnr;
+        struct device_node *parent, *np;
 
         if (!have_of)
                 return NULL;
-        
-        /* Lookup the hose */
-        busnr = bus->number;
-        hose = pci_bus_to_hose(busnr);
-        if (!hose)
-                return NULL;
 
-        /* Check it has an OF node associated */
-        node = (struct device_node *) hose->arch_data;
-        if (!node)
+        DBG("pci_busdev_to_OF_node(%d,0x%x)\n", bus->number, devfn);
+        parent = scan_OF_for_pci_bus(bus);
+        if (parent == NULL)
                 return NULL;
-
-        /* Fixup bus number according to what OF think it is. */
-#ifdef CONFIG_PPC_PMAC
-        /* The G5 need a special case here. Basically, we don't remap all
-         * busses on it so we don't create the pci-OF-map. However, we do
-         * remap the AGP bus and so have to deal with it. A future better
-         * fix has to be done by making the remapping per-host and always
-         * filling the pci_to_OF map. --BenH
+        DBG(" parent is %s\n", parent ? parent->full_name : "<NULL>");
+        np = scan_OF_for_pci_dev(parent, devfn);
+        of_node_put(parent);
+        DBG(" result is %s\n", np ? np->full_name : "<NULL>");
+
+        /* XXX most callers don't release the returned node
+         * mostly because ppc64 doesn't increase the refcount,
+         * we need to fix that.
          */
-        if (machine_is(powermac) && busnr >= 0xf0)
-                busnr -= 0xf0;
-        else
-#endif
-        if (pci_to_OF_bus_map)
-                busnr = pci_to_OF_bus_map[busnr];
-        if (busnr == 0xff)
-                return NULL;
-        
-        /* Now, lookup childs of the hose */
-        return scan_OF_childs_for_device(node->child, busnr, devfn);
+        return np;
 }
 EXPORT_SYMBOL(pci_busdev_to_OF_node);
 
@@ -960,7 +967,7 @@ pci_process_bridge_OF_ranges(struct pci_controller *hose,
                         res->flags = IORESOURCE_IO;
                         res->start = ranges[2];
                         DBG("PCI: IO 0x%llx -> 0x%llx\n",
-                                    res->start, res->start + size - 1);
+                            (u64)res->start, (u64)res->start + size - 1);
                         break;
                 case 2:         /* memory space */
                         memno = 0;
@@ -982,7 +989,7 @@ pci_process_bridge_OF_ranges(struct pci_controller *hose,
                                         res->flags |= IORESOURCE_PREFETCH;
                                 res->start = ranges[na+2];
                                 DBG("PCI: MEM[%d] 0x%llx -> 0x%llx\n", memno,
-                                            res->start, res->start + size - 1);
+                                    (u64)res->start, (u64)res->start + size - 1);
                         }
                         break;
                 }
@@ -1268,7 +1275,10 @@ pcibios_init(void)
                 if (pci_assign_all_buses)
                         hose->first_busno = next_busno;
                 hose->last_busno = 0xff;
-                bus = pci_scan_bus(hose->first_busno, hose->ops, hose);
+                bus = pci_scan_bus_parented(hose->parent, hose->first_busno,
+                                            hose->ops, hose);
+                if (bus)
+                        pci_bus_add_devices(bus);
                 hose->last_busno = bus->subordinate;
                 if (pci_assign_all_buses || next_busno <= hose->last_busno)
                         next_busno = hose->last_busno + pcibios_assign_bus_offset;
@@ -1282,10 +1292,6 @@ pcibios_init(void)
         if (pci_assign_all_buses && have_of)
                 pcibios_make_OF_bus_map();
 
-        /* Do machine dependent PCI interrupt routing */
-        if (ppc_md.pci_swizzle && ppc_md.pci_map_irq)
-                pci_fixup_irqs(ppc_md.pci_swizzle, ppc_md.pci_map_irq);
-
         /* Call machine dependent fixup */
         if (ppc_md.pcibios_fixup)
                 ppc_md.pcibios_fixup();
@@ -1308,25 +1314,6 @@ pcibios_init(void)
 
 subsys_initcall(pcibios_init);
 
-unsigned char __init
-common_swizzle(struct pci_dev *dev, unsigned char *pinp)
-{
-        struct pci_controller *hose = dev->sysdata;
-
-        if (dev->bus->number != hose->first_busno) {
-                u8 pin = *pinp;
-                do {
-                        pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn));
-                        /* Move up the chain of bridges. */
-                        dev = dev->bus->self;
-                } while (dev->bus->self);
-                *pinp = pin;
-
-                /* The slot is the idsel of the last bridge. */
-        }
-        return PCI_SLOT(dev->devfn);
-}
-
 unsigned long resource_fixup(struct pci_dev * dev, struct resource * res,
                              unsigned long start, unsigned long size)
 {
@@ -1338,6 +1325,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
         struct pci_controller *hose = (struct pci_controller *) bus->sysdata;
         unsigned long io_offset;
         struct resource *res;
+        struct pci_dev *dev;
         int i;
 
         io_offset = (unsigned long)hose->io_base_virt - isa_io_base;
@@ -1390,8 +1378,16 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
                 }
         }
 
+        /* Platform specific bus fixups */
         if (ppc_md.pcibios_fixup_bus)
                 ppc_md.pcibios_fixup_bus(bus);
+
+        /* Read default IRQs and fixup if necessary */
+        list_for_each_entry(dev, &bus->devices, bus_list) {
+                pci_read_irq_line(dev);
+                if (ppc_md.pci_irq_fixup)
+                        ppc_md.pci_irq_fixup(dev);
+        }
 }
 
 char __init *pcibios_setup(char *str)
@@ -1556,7 +1552,7 @@ pci_resource_to_bus(struct pci_dev *pdev, struct resource *res)
 
 
 static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
-                                               unsigned long *offset,
+                                               resource_size_t *offset,
                                                enum pci_mmap_state mmap_state)
 {
         struct pci_controller *hose = pci_bus_to_hose(dev->bus->number);
@@ -1568,10 +1564,12 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
 
         /* If memory, add on the PCI bridge address offset */
         if (mmap_state == pci_mmap_mem) {
+#if 0 /* See comment in pci_resource_to_user() for why this is disabled */
                 *offset += hose->pci_mem_offset;
+#endif
                 res_bit = IORESOURCE_MEM;
         } else {
-                io_offset = hose->io_base_virt - ___IO_BASE;
+                io_offset = hose->io_base_virt - (void __iomem *)_IO_BASE;
                 *offset += io_offset;
                 res_bit = IORESOURCE_IO;
         }
@@ -1636,9 +1634,6 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
         else
                 prot |= _PAGE_GUARDED;
 
-        printk("PCI map for %s:%llx, prot: %lx\n", pci_name(dev),
-                (unsigned long long)rp->start, prot);
-
         return __pgprot(prot);
 }
 
@@ -1707,7 +1702,7 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                         enum pci_mmap_state mmap_state,
                         int write_combine)
 {
-        unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
+        resource_size_t offset = vma->vm_pgoff << PAGE_SHIFT;
         struct resource *rp;
         int ret;
 
@@ -1820,21 +1815,42 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar,
                           resource_size_t *start, resource_size_t *end)
 {
         struct pci_controller *hose = pci_bus_to_hose(dev->bus->number);
-        unsigned long offset = 0;
+        resource_size_t offset = 0;
 
         if (hose == NULL)
                 return;
 
         if (rsrc->flags & IORESOURCE_IO)
-                offset = ___IO_BASE - hose->io_base_virt + hose->io_base_phys;
+                offset = (unsigned long)hose->io_base_virt - _IO_BASE;
+
+        /* We pass a fully fixed up address to userland for MMIO instead of
+         * a BAR value because X is lame and expects to be able to use that
+         * to pass to /dev/mem !
+         *
+         * That means that we'll have potentially 64 bits values where some
+         * userland apps only expect 32 (like X itself since it thinks only
+         * Sparc has 64 bits MMIO) but if we don't do that, we break it on
+         * 32 bits CHRPs :-(
+         *
+         * Hopefully, the sysfs insterface is immune to that gunk. Once X
+         * has been fixed (and the fix spread enough), we can re-enable the
+         * 2 lines below and pass down a BAR value to userland. In that case
+         * we'll also have to re-enable the matching code in
+         * __pci_mmap_make_offset().
+         *
+         * BenH.
+         */
+#if 0
+        else if (rsrc->flags & IORESOURCE_MEM)
+                offset = hose->pci_mem_offset;
+#endif
 
-        *start = rsrc->start + offset;
-        *end = rsrc->end + offset;
+        *start = rsrc->start - offset;
+        *end = rsrc->end - offset;
 }
 
-void __init
-pci_init_resource(struct resource *res, unsigned long start, unsigned long end,
-                  int flags, char *name)
+void __init pci_init_resource(struct resource *res, resource_size_t start,
+                              resource_size_t end, int flags, char *name)
 {
         res->start = start;
         res->end = end;
@@ -1845,35 +1861,6 @@ pci_init_resource(struct resource *res, unsigned long start, unsigned long end,
         res->child = NULL;
 }
 
-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
-{
-        unsigned long start = pci_resource_start(dev, bar);
-        unsigned long len = pci_resource_len(dev, bar);
-        unsigned long flags = pci_resource_flags(dev, bar);
-
-        if (!len)
-                return NULL;
-        if (max && len > max)
-                len = max;
-        if (flags & IORESOURCE_IO)
-                return ioport_map(start, len);
-        if (flags & IORESOURCE_MEM)
-                /* Not checking IORESOURCE_CACHEABLE because PPC does
-                 * not currently distinguish between ioremap and
-                 * ioremap_nocache.
-                 */
-                return ioremap(start, len);
-        /* What? */
-        return NULL;
-}
-
-void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
-{
-        /* Nothing to do */
-}
-EXPORT_SYMBOL(pci_iomap);
-EXPORT_SYMBOL(pci_iounmap);
-
 unsigned long pci_address_to_pio(phys_addr_t address)
 {
         struct pci_controller* hose = hose_head;
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 9bae8a5bf671..73c59ec49120 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -42,11 +42,9 @@
 unsigned long pci_probe_only = 1;
 int pci_assign_all_buses = 0;
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
 static void fixup_resource(struct resource *res, struct pci_dev *dev);
 static void do_bus_setup(struct pci_bus *bus);
 static void phbs_remap_io(void);
-#endif
 
 /* pci_io_base -- the base address from which io bars are offsets.
  * This is the lowest I/O base address (so bar values are always positive),
@@ -63,7 +61,7 @@ void iSeries_pcibios_init(void);
 
 LIST_HEAD(hose_list);
 
-struct dma_mapping_ops pci_dma_ops;
+struct dma_mapping_ops *pci_dma_ops;
 EXPORT_SYMBOL(pci_dma_ops);
 
 int global_phb_number;          /* Global phb counter */
@@ -212,6 +210,10 @@ struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
 
 void pcibios_free_controller(struct pci_controller *phb)
 {
+        spin_lock(&hose_spinlock);
+        list_del(&phb->list_node);
+        spin_unlock(&hose_spinlock);
+
         if (phb->is_dynamic)
                 kfree(phb);
 }
@@ -251,7 +253,6 @@ static void __init pcibios_claim_of_setup(void)
                 pcibios_claim_one_bus(b);
 }
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
 static u32 get_int_prop(struct device_node *np, const char *name, u32 def)
 {
         const u32 *prop;
@@ -329,7 +330,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
         struct pci_dev *dev;
         const char *type;
 
-        dev = kmalloc(sizeof(struct pci_dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(struct pci_dev), GFP_KERNEL);
         if (!dev)
                 return NULL;
         type = get_property(node, "device_type", NULL);
@@ -338,7 +339,6 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
 
         DBG("    create device, devfn: %x, type: %s\n", devfn, type);
 
-        memset(dev, 0, sizeof(struct pci_dev));
         dev->bus = bus;
         dev->sysdata = node;
         dev->dev.parent = bus->bridge;
@@ -360,6 +360,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
         DBG("    class: 0x%x\n", dev->class);
 
         dev->current_state = 4;         /* unknown power state */
+        dev->error_state = pci_channel_io_normal;
 
         if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {
                 /* a PCI-PCI bridge */
@@ -506,7 +507,6 @@ void __devinit of_scan_pci_bridge(struct device_node *node,
                 pci_scan_child_bus(bus);
 }
 EXPORT_SYMBOL(of_scan_pci_bridge);
-#endif /* CONFIG_PPC_MULTIPLATFORM */
 
 void __devinit scan_phb(struct pci_controller *hose)
 {
@@ -517,7 +517,7 @@ void __devinit scan_phb(struct pci_controller *hose)
 
         DBG("Scanning PHB %s\n", node ? node->full_name : "<NO NAME>");
 
-        bus = pci_create_bus(NULL, hose->first_busno, hose->ops, node);
+        bus = pci_create_bus(hose->parent, hose->first_busno, hose->ops, node);
         if (bus == NULL) {
                 printk(KERN_ERR "Failed to create bus for PCI domain %04x\n",
                        hose->global_number);
@@ -540,7 +540,7 @@ void __devinit scan_phb(struct pci_controller *hose)
         }
 
         mode = PCI_PROBE_NORMAL;
-#ifdef CONFIG_PPC_MULTIPLATFORM
+
         if (node && ppc_md.pci_probe_mode)
                 mode = ppc_md.pci_probe_mode(bus);
         DBG("    probe mode: %d\n", mode);
@@ -548,7 +548,7 @@ void __devinit scan_phb(struct pci_controller *hose)
                 bus->subordinate = hose->last_busno;
                 of_scan_bus(node, bus);
         }
-#endif /* CONFIG_PPC_MULTIPLATFORM */
+
         if (mode == PCI_PROBE_NORMAL)
                 hose->last_busno = bus->subordinate = pci_scan_child_bus(bus);
 }
@@ -592,11 +592,9 @@ static int __init pcibios_init(void)
         if (ppc64_isabridge_dev != NULL)
                 printk(KERN_DEBUG "ISA bridge at %s\n", pci_name(ppc64_isabridge_dev));
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
         if (!firmware_has_feature(FW_FEATURE_ISERIES))
                 /* map in PCI I/O space */
                 phbs_remap_io();
-#endif
 
         printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");
 
@@ -685,7 +683,7 @@ int pci_proc_domain(struct pci_bus *bus)
  * Returns negative error code on failure, zero on success.
  */
 static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
-                                               unsigned long *offset,
+                                               resource_size_t *offset,
                                                enum pci_mmap_state mmap_state)
 {
         struct pci_controller *hose = pci_bus_to_host(dev->bus);
@@ -697,7 +695,9 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
 
         /* If memory, add on the PCI bridge address offset */
         if (mmap_state == pci_mmap_mem) {
+#if 0 /* See comment in pci_resource_to_user() for why this is disabled */
                 *offset += hose->pci_mem_offset;
+#endif
                 res_bit = IORESOURCE_MEM;
         } else {
                 io_offset = (unsigned long)hose->io_base_virt - pci_io_base;
@@ -765,9 +765,6 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
         else
                 prot |= _PAGE_GUARDED;
 
-        printk(KERN_DEBUG "PCI map for %s:%lx, prot: %lx\n", pci_name(dev), rp->start,
-               prot);
-
         return __pgprot(prot);
 }
 
@@ -835,7 +832,7 @@ pgprot_t pci_phys_mem_access_prot(struct file *file,
 int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                         enum pci_mmap_state mmap_state, int write_combine)
 {
-        unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
+        resource_size_t offset = vma->vm_pgoff << PAGE_SHIFT;
         struct resource *rp;
         int ret;
 
@@ -873,8 +870,6 @@ void pcibios_add_platform_entries(struct pci_dev *pdev)
         device_create_file(&pdev->dev, &dev_attr_devspec);
 }
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
-
 #define ISA_SPACE_MASK 0x1
 #define ISA_SPACE_IO 0x1
 
@@ -975,11 +970,7 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
                 res = NULL;
                 pci_space = ranges[0];
                 pci_addr = ((unsigned long)ranges[1] << 32) | ranges[2];
-
-                cpu_phys_addr = ranges[3];
-                if (na >= 2)
-                        cpu_phys_addr = (cpu_phys_addr << 32) | ranges[4];
-
+                cpu_phys_addr = of_translate_address(dev, &ranges[3]);
                 size = ((unsigned long)ranges[na+3] << 32) | ranges[na+4];
                 ranges += np;
                 if (size == 0)
@@ -1145,7 +1136,7 @@ int unmap_bus_range(struct pci_bus *bus)
         
         if (get_bus_io_range(bus, &start_phys, &start_virt, &size))
                 return 1;
-        if (iounmap_explicit((void __iomem *) start_virt, size))
+        if (__iounmap_explicit((void __iomem *) start_virt, size))
                 return 1;
 
         return 0;
@@ -1213,23 +1204,52 @@ void __devinit pcibios_fixup_device_resources(struct pci_dev *dev,
 }
 EXPORT_SYMBOL(pcibios_fixup_device_resources);
 
+void __devinit pcibios_setup_new_device(struct pci_dev *dev)
+{
+        struct dev_archdata *sd = &dev->dev.archdata;
+
+        sd->of_node = pci_device_to_OF_node(dev);
+
+        DBG("PCI device %s OF node: %s\n", pci_name(dev),
+            sd->of_node ? sd->of_node->full_name : "<none>");
+
+        sd->dma_ops = pci_dma_ops;
+#ifdef CONFIG_NUMA
+        sd->numa_node = pcibus_to_node(dev->bus);
+#else
+        sd->numa_node = -1;
+#endif
+        if (ppc_md.pci_dma_dev_setup)
+                ppc_md.pci_dma_dev_setup(dev);
+}
+EXPORT_SYMBOL(pcibios_setup_new_device);
 
 static void __devinit do_bus_setup(struct pci_bus *bus)
 {
         struct pci_dev *dev;
 
-        ppc_md.iommu_bus_setup(bus);
+        if (ppc_md.pci_dma_bus_setup)
+                ppc_md.pci_dma_bus_setup(bus);
 
         list_for_each_entry(dev, &bus->devices, bus_list)
-                ppc_md.iommu_dev_setup(dev);
+                pcibios_setup_new_device(dev);
 
-        if (ppc_md.irq_bus_setup)
-                ppc_md.irq_bus_setup(bus);
+        /* Read default IRQs and fixup if necessary */
+        list_for_each_entry(dev, &bus->devices, bus_list) {
+                pci_read_irq_line(dev);
+                if (ppc_md.pci_irq_fixup)
+                        ppc_md.pci_irq_fixup(dev);
+        }
 }
 
 void __devinit pcibios_fixup_bus(struct pci_bus *bus)
 {
         struct pci_dev *dev = bus->self;
+        struct device_node *np;
+
+        np = pci_bus_to_OF_node(bus);
+
+        DBG("pcibios_fixup_bus(%s)\n", np ? np->full_name : "<???>");
 
         if (dev && pci_probe_only &&
             (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
@@ -1313,20 +1333,41 @@ EXPORT_SYMBOL(pci_read_irq_line);
 
 void pci_resource_to_user(const struct pci_dev *dev, int bar,
                           const struct resource *rsrc,
-                          u64 *start, u64 *end)
+                          resource_size_t *start, resource_size_t *end)
 {
         struct pci_controller *hose = pci_bus_to_host(dev->bus);
-        unsigned long offset = 0;
+        resource_size_t offset = 0;
 
         if (hose == NULL)
                 return;
 
         if (rsrc->flags & IORESOURCE_IO)
-                offset = pci_io_base - (unsigned long)hose->io_base_virt +
-                        hose->io_base_phys;
+                offset = (unsigned long)hose->io_base_virt - pci_io_base;
 
-        *start = rsrc->start + offset;
-        *end = rsrc->end + offset;
+        /* We pass a fully fixed up address to userland for MMIO instead of
+         * a BAR value because X is lame and expects to be able to use that
+         * to pass to /dev/mem !
+         *
+         * That means that we'll have potentially 64 bits values where some
+         * userland apps only expect 32 (like X itself since it thinks only
+         * Sparc has 64 bits MMIO) but if we don't do that, we break it on
+         * 32 bits CHRPs :-(
+         *
+         * Hopefully, the sysfs insterface is immune to that gunk. Once X
+         * has been fixed (and the fix spread enough), we can re-enable the
+         * 2 lines below and pass down a BAR value to userland. In that case
+         * we'll also have to re-enable the matching code in
+         * __pci_mmap_make_offset().
+         *
+         * BenH.
+         */
+#if 0
+        else if (rsrc->flags & IORESOURCE_MEM)
+                offset = hose->pci_mem_offset;
+#endif
+
+        *start = rsrc->start - offset;
+        *end = rsrc->end - offset;
 }
 
 struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)
@@ -1343,8 +1384,6 @@ struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)
         return NULL;
 }
 
-#endif /* CONFIG_PPC_MULTIPLATFORM */
-
 unsigned long pci_address_to_pio(phys_addr_t address)
 {
         struct pci_controller *hose, *tmp;
diff --git a/arch/powerpc/kernel/pci_direct_iommu.c b/arch/powerpc/kernel/pci_direct_iommu.c
deleted file mode 100644
index 72ce082ce738..000000000000
--- a/arch/powerpc/kernel/pci_direct_iommu.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Support for DMA from PCI devices to main memory on
- * machines without an iommu or with directly addressable
- * RAM (typically a pmac with 2Gb of RAM or less)
- *
- * Copyright (C) 2003 Benjamin Herrenschmidt (benh@kernel.crashing.org)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/string.h>
-#include <linux/init.h>
-#include <linux/bootmem.h>
-#include <linux/mm.h>
-#include <linux/dma-mapping.h>
-
-#include <asm/sections.h>
-#include <asm/io.h>
-#include <asm/prom.h>
-#include <asm/pci-bridge.h>
-#include <asm/machdep.h>
-#include <asm/pmac_feature.h>
-#include <asm/abs_addr.h>
-#include <asm/ppc-pci.h>
-
-static void *pci_direct_alloc_coherent(struct device *hwdev, size_t size,
-                                   dma_addr_t *dma_handle, gfp_t flag)
-{
-        void *ret;
-
-        ret = (void *)__get_free_pages(flag, get_order(size));
-        if (ret != NULL) {
-                memset(ret, 0, size);
-                *dma_handle = virt_to_abs(ret);
-        }
-        return ret;
-}
-
-static void pci_direct_free_coherent(struct device *hwdev, size_t size,
-                                 void *vaddr, dma_addr_t dma_handle)
-{
-        free_pages((unsigned long)vaddr, get_order(size));
-}
-
-static dma_addr_t pci_direct_map_single(struct device *hwdev, void *ptr,
-                size_t size, enum dma_data_direction direction)
-{
-        return virt_to_abs(ptr);
-}
-
-static void pci_direct_unmap_single(struct device *hwdev, dma_addr_t dma_addr,
-                size_t size, enum dma_data_direction direction)
-{
-}
-
-static int pci_direct_map_sg(struct device *hwdev, struct scatterlist *sg,
-                int nents, enum dma_data_direction direction)
-{
-        int i;
-
-        for (i = 0; i < nents; i++, sg++) {
-                sg->dma_address = page_to_phys(sg->page) + sg->offset;
-                sg->dma_length = sg->length;
-        }
-
-        return nents;
-}
-
-static void pci_direct_unmap_sg(struct device *hwdev, struct scatterlist *sg,
-                int nents, enum dma_data_direction direction)
-{
-}
-
-static int pci_direct_dma_supported(struct device *dev, u64 mask)
-{
-        return mask < 0x100000000ull;
-}
-
-static struct dma_mapping_ops pci_direct_ops = {
-        .alloc_coherent = pci_direct_alloc_coherent,
-        .free_coherent = pci_direct_free_coherent,
-        .map_single = pci_direct_map_single,
-        .unmap_single = pci_direct_unmap_single,
-        .map_sg = pci_direct_map_sg,
-        .unmap_sg = pci_direct_unmap_sg,
-        .dma_supported = pci_direct_dma_supported,
-};
-
-void __init pci_direct_iommu_init(void)
-{
-        pci_dma_ops = pci_direct_ops;
-}
diff --git a/arch/powerpc/kernel/pci_iommu.c b/arch/powerpc/kernel/pci_iommu.c
deleted file mode 100644
index 0688b2534acb..000000000000
--- a/arch/powerpc/kernel/pci_iommu.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (C) 2001 Mike Corrigan & Dave Engebretsen, IBM Corporation
- *
- * Rewrite, cleanup, new allocation schemes:
- * Copyright (C) 2004 Olof Johansson, IBM Corporation
- *
- * Dynamic DMA mapping support, platform-independent parts.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-
-
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <linux/mm.h>
-#include <linux/spinlock.h>
-#include <linux/string.h>
-#include <linux/pci.h>
-#include <linux/dma-mapping.h>
-#include <asm/io.h>
-#include <asm/prom.h>
-#include <asm/iommu.h>
-#include <asm/pci-bridge.h>
-#include <asm/machdep.h>
-#include <asm/ppc-pci.h>
-
-/*
- * We can use ->sysdata directly and avoid the extra work in
- * pci_device_to_OF_node since ->sysdata will have been initialised
- * in the iommu init code for all devices.
- */
-#define PCI_GET_DN(dev) ((struct device_node *)((dev)->sysdata))
-
-static inline struct iommu_table *device_to_table(struct device *hwdev)
-{
-        struct pci_dev *pdev;
-
-        if (!hwdev) {
-                pdev = ppc64_isabridge_dev;
-                if (!pdev)
-                        return NULL;
-        } else
-                pdev = to_pci_dev(hwdev);
-
-        return PCI_DN(PCI_GET_DN(pdev))->iommu_table;
-}
-
-
-static inline unsigned long device_to_mask(struct device *hwdev)
-{
-        struct pci_dev *pdev;
-
-        if (!hwdev) {
-                pdev = ppc64_isabridge_dev;
-                if (!pdev) /* This is the best guess we can do */
-                        return 0xfffffffful;
-        } else
-                pdev = to_pci_dev(hwdev);
-
-        if (pdev->dma_mask)
-                return pdev->dma_mask;
-
-        /* Assume devices without mask can take 32 bit addresses */
-        return 0xfffffffful;
-}
-
-
-/* Allocates a contiguous real buffer and creates mappings over it.
- * Returns the virtual address of the buffer and sets dma_handle
- * to the dma address (mapping) of the first page.
- */
-static void *pci_iommu_alloc_coherent(struct device *hwdev, size_t size,
-                           dma_addr_t *dma_handle, gfp_t flag)
-{
-        return iommu_alloc_coherent(device_to_table(hwdev), size, dma_handle,
-                        device_to_mask(hwdev), flag,
-                        pcibus_to_node(to_pci_dev(hwdev)->bus));
-}
-
-static void pci_iommu_free_coherent(struct device *hwdev, size_t size,
-                         void *vaddr, dma_addr_t dma_handle)
-{
-        iommu_free_coherent(device_to_table(hwdev), size, vaddr, dma_handle);
-}
-
-/* Creates TCEs for a user provided buffer.  The user buffer must be 
- * contiguous real kernel storage (not vmalloc).  The address of the buffer
- * passed here is the kernel (virtual) address of the buffer.  The buffer
- * need not be page aligned, the dma_addr_t returned will point to the same
- * byte within the page as vaddr.
- */
-static dma_addr_t pci_iommu_map_single(struct device *hwdev, void *vaddr,
-                size_t size, enum dma_data_direction direction)
-{
-        return iommu_map_single(device_to_table(hwdev), vaddr, size,
-                                device_to_mask(hwdev), direction);
-}
-
-
-static void pci_iommu_unmap_single(struct device *hwdev, dma_addr_t dma_handle,
-                size_t size, enum dma_data_direction direction)
-{
-        iommu_unmap_single(device_to_table(hwdev), dma_handle, size, direction);
-}
-
-
-static int pci_iommu_map_sg(struct device *pdev, struct scatterlist *sglist,
-                int nelems, enum dma_data_direction direction)
-{
-        return iommu_map_sg(pdev, device_to_table(pdev), sglist,
-                        nelems, device_to_mask(pdev), direction);
-}
-
-static void pci_iommu_unmap_sg(struct device *pdev, struct scatterlist *sglist,
-                int nelems, enum dma_data_direction direction)
-{
-        iommu_unmap_sg(device_to_table(pdev), sglist, nelems, direction);
-}
-
-/* We support DMA to/from any memory page via the iommu */
-static int pci_iommu_dma_supported(struct device *dev, u64 mask)
-{
-        struct iommu_table *tbl = device_to_table(dev);
-
-        if (!tbl || tbl->it_offset > mask) {
-                printk(KERN_INFO "Warning: IOMMU table offset too big for device mask\n");
-                if (tbl)
-                        printk(KERN_INFO "mask: 0x%08lx, table offset: 0x%08lx\n",
-                                mask, tbl->it_offset);
-                else
-                        printk(KERN_INFO "mask: 0x%08lx, table unavailable\n",
-                                mask);
-                return 0;
-        } else
-                return 1;
-}
-
-struct dma_mapping_ops pci_iommu_ops = {
-        .alloc_coherent = pci_iommu_alloc_coherent,
-        .free_coherent = pci_iommu_free_coherent,
-        .map_single = pci_iommu_map_single,
-        .unmap_single = pci_iommu_unmap_single,
-        .map_sg = pci_iommu_map_sg,
-        .unmap_sg = pci_iommu_unmap_sg,
-        .dma_supported = pci_iommu_dma_supported,
-};
-
-void pci_iommu_init(void)
-{
-        pci_dma_ops = pci_iommu_ops;
-}
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index 807193a3c784..95776b6af4e2 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -49,6 +49,10 @@
 #include <asm/commproc.h>
 #endif
 
+#ifdef CONFIG_PPC64
+EXPORT_SYMBOL(local_irq_restore);
+#endif
+
 #ifdef CONFIG_PPC32
 extern void transfer_to_handler(void);
 extern void do_IRQ(struct pt_regs *regs);
@@ -204,7 +208,7 @@ EXPORT_SYMBOL(mmu_hash_lock); /* For MOL */
 extern long *intercept_table;
 EXPORT_SYMBOL(intercept_table);
 #endif /* CONFIG_PPC_STD_MMU_32 */
-#if defined(CONFIG_40x) || defined(CONFIG_BOOKE)
+#ifdef CONFIG_PPC_DCR_NATIVE
 EXPORT_SYMBOL(__mtdcr);
 EXPORT_SYMBOL(__mfdcr);
 #endif
diff --git a/arch/powerpc/kernel/proc_ppc64.c b/arch/powerpc/kernel/proc_ppc64.c
index f598cb519539..dd7001cacf75 100644
--- a/arch/powerpc/kernel/proc_ppc64.c
+++ b/arch/powerpc/kernel/proc_ppc64.c
@@ -83,7 +83,7 @@ __initcall(proc_ppc64_init);
 static loff_t page_map_seek( struct file *file, loff_t off, int whence)
 {
         loff_t new;
-        struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
 
         switch(whence) {
         case 0:
@@ -106,13 +106,13 @@ static loff_t page_map_seek( struct file *file, loff_t off, int whence)
 static ssize_t page_map_read( struct file *file, char __user *buf, size_t nbytes,
                               loff_t *ppos)
 {
-        struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
         return simple_read_from_buffer(buf, nbytes, ppos, dp->data, dp->size);
 }
 
 static int page_map_mmap( struct file *file, struct vm_area_struct *vma )
 {
-        struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
 
         if ((vma->vm_end - vma->vm_start) > dp->size)
                 return -EINVAL;
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index bdb412d4b748..1fc732a552db 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -538,35 +538,31 @@ static struct ibm_pa_feature {
         {CPU_FTR_REAL_LE, PPC_FEATURE_TRUE_LE, 5, 0, 0},
 };
 
-static void __init check_cpu_pa_features(unsigned long node)
+static void __init scan_features(unsigned long node, unsigned char *ftrs,
+                                 unsigned long tablelen,
+                                 struct ibm_pa_feature *fp,
+                                 unsigned long ft_size)
 {
-        unsigned char *pa_ftrs;
-        unsigned long len, tablelen, i, bit;
-
-        pa_ftrs = of_get_flat_dt_prop(node, "ibm,pa-features", &tablelen);
-        if (pa_ftrs == NULL)
-                return;
+        unsigned long i, len, bit;
 
         /* find descriptor with type == 0 */
         for (;;) {
                 if (tablelen < 3)
                         return;
-                len = 2 + pa_ftrs[0];
+                len = 2 + ftrs[0];
                 if (tablelen < len)
                         return;         /* descriptor 0 not found */
-                if (pa_ftrs[1] == 0)
+                if (ftrs[1] == 0)
                         break;
                 tablelen -= len;
-                pa_ftrs += len;
+                ftrs += len;
         }
 
         /* loop over bits we know about */
-        for (i = 0; i < ARRAY_SIZE(ibm_pa_features); ++i) {
-                struct ibm_pa_feature *fp = &ibm_pa_features[i];
-
-                if (fp->pabyte >= pa_ftrs[0])
+        for (i = 0; i < ft_size; ++i, ++fp) {
+                if (fp->pabyte >= ftrs[0])
                         continue;
-                bit = (pa_ftrs[2 + fp->pabyte] >> (7 - fp->pabit)) & 1;
+                bit = (ftrs[2 + fp->pabyte] >> (7 - fp->pabit)) & 1;
                 if (bit ^ fp->invert) {
                         cur_cpu_spec->cpu_features |= fp->cpu_features;
                         cur_cpu_spec->cpu_user_features |= fp->cpu_user_ftrs;
@@ -577,16 +573,59 @@ static void __init check_cpu_pa_features(unsigned long node)
         }
 }
 
+static void __init check_cpu_pa_features(unsigned long node)
+{
+        unsigned char *pa_ftrs;
+        unsigned long tablelen;
+
+        pa_ftrs = of_get_flat_dt_prop(node, "ibm,pa-features", &tablelen);
+        if (pa_ftrs == NULL)
+                return;
+
+        scan_features(node, pa_ftrs, tablelen,
+                      ibm_pa_features, ARRAY_SIZE(ibm_pa_features));
+}
+
+static struct feature_property {
+        const char *name;
+        u32 min_value;
+        unsigned long cpu_feature;
+        unsigned long cpu_user_ftr;
+} feature_properties[] __initdata = {
+#ifdef CONFIG_ALTIVEC
+        {"altivec", 0, CPU_FTR_ALTIVEC, PPC_FEATURE_HAS_ALTIVEC},
+        {"ibm,vmx", 1, CPU_FTR_ALTIVEC, PPC_FEATURE_HAS_ALTIVEC},
+#endif /* CONFIG_ALTIVEC */
+#ifdef CONFIG_PPC64
+        {"ibm,dfp", 1, 0, PPC_FEATURE_HAS_DFP},
+        {"ibm,purr", 1, CPU_FTR_PURR, 0},
+        {"ibm,spurr", 1, CPU_FTR_SPURR, 0},
+#endif /* CONFIG_PPC64 */
+};
+
+static void __init check_cpu_feature_properties(unsigned long node)
+{
+        unsigned long i;
+        struct feature_property *fp = feature_properties;
+        const u32 *prop;
+
+        for (i = 0; i < ARRAY_SIZE(feature_properties); ++i, ++fp) {
+                prop = of_get_flat_dt_prop(node, fp->name, NULL);
+                if (prop && *prop >= fp->min_value) {
+                        cur_cpu_spec->cpu_features |= fp->cpu_feature;
+                        cur_cpu_spec->cpu_user_features |= fp->cpu_user_ftr;
+                }
+        }
+}
+
 static int __init early_init_dt_scan_cpus(unsigned long node,
                                           const char *uname, int depth,
                                           void *data)
 {
         static int logical_cpuid = 0;
         char *type = of_get_flat_dt_prop(node, "device_type", NULL);
-#ifdef CONFIG_ALTIVEC
-        u32 *prop;
-#endif
-        u32 *intserv;
+        const u32 *prop;
+        const u32 *intserv;
         int i, nthreads;
         unsigned long len;
         int found = 0;
@@ -643,24 +682,27 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
                         intserv[i]);
                 boot_cpuid = logical_cpuid;
                 set_hard_smp_processor_id(boot_cpuid, intserv[i]);
-        }
 
-#ifdef CONFIG_ALTIVEC
-        /* Check if we have a VMX and eventually update CPU features */
-        prop = (u32 *)of_get_flat_dt_prop(node, "ibm,vmx", NULL);
-        if (prop && (*prop) > 0) {
-                cur_cpu_spec->cpu_features |= CPU_FTR_ALTIVEC;
-                cur_cpu_spec->cpu_user_features |= PPC_FEATURE_HAS_ALTIVEC;
-        }
-
-        /* Same goes for Apple's "altivec" property */
-        prop = (u32 *)of_get_flat_dt_prop(node, "altivec", NULL);
-        if (prop) {
-                cur_cpu_spec->cpu_features |= CPU_FTR_ALTIVEC;
-                cur_cpu_spec->cpu_user_features |= PPC_FEATURE_HAS_ALTIVEC;
+                /*
+                 * PAPR defines "logical" PVR values for cpus that
+                 * meet various levels of the architecture:
+                 * 0x0f000001   Architecture version 2.04
+                 * 0x0f000002   Architecture version 2.05
+                 * If the cpu-version property in the cpu node contains
+                 * such a value, we call identify_cpu again with the
+                 * logical PVR value in order to use the cpu feature
+                 * bits appropriate for the architecture level.
+                 *
+                 * A POWER6 partition in "POWER6 architected" mode
+                 * uses the 0x0f000002 PVR value; in POWER5+ mode
+                 * it uses 0x0f000001.
+                 */
+                prop = of_get_flat_dt_prop(node, "cpu-version", NULL);
+                if (prop && (*prop & 0xff000000) == 0x0f000000)
+                        identify_cpu(0, *prop);
         }
-#endif /* CONFIG_ALTIVEC */
 
+        check_cpu_feature_properties(node);
         check_cpu_pa_features(node);
 
 #ifdef CONFIG_PPC_PSERIES
@@ -762,6 +804,56 @@ static unsigned long __init dt_mem_next_cell(int s, cell_t **cellp)
         return of_read_ulong(p, s);
 }
 
+#ifdef CONFIG_PPC_PSERIES
+/*
+ * Interpret the ibm,dynamic-memory property in the
+ * /ibm,dynamic-reconfiguration-memory node.
+ * This contains a list of memory blocks along with NUMA affinity
+ * information.
+ */
+static int __init early_init_dt_scan_drconf_memory(unsigned long node)
+{
+        cell_t *dm, *ls;
+        unsigned long l, n;
+        unsigned long base, size, lmb_size, flags;
+
+        ls = (cell_t *)of_get_flat_dt_prop(node, "ibm,lmb-size", &l);
+        if (ls == NULL || l < dt_root_size_cells * sizeof(cell_t))
+                return 0;
+        lmb_size = dt_mem_next_cell(dt_root_size_cells, &ls);
+
+        dm = (cell_t *)of_get_flat_dt_prop(node, "ibm,dynamic-memory", &l);
+        if (dm == NULL || l < sizeof(cell_t))
+                return 0;
+
+        n = *dm++;      /* number of entries */
+        if (l < (n * (dt_root_addr_cells + 4) + 1) * sizeof(cell_t))
+                return 0;
+
+        for (; n != 0; --n) {
+                base = dt_mem_next_cell(dt_root_addr_cells, &dm);
+                flags = dm[3];
+                /* skip DRC index, pad, assoc. list index, flags */
+                dm += 4;
+                /* skip this block if the reserved bit is set in flags (0x80)
+                   or if the block is not assigned to this partition (0x8) */
+                if ((flags & 0x80) || !(flags & 0x8))
+                        continue;
+                size = lmb_size;
+                if (iommu_is_off) {
+                        if (base >= 0x80000000ul)
+                                continue;
+                        if ((base + size) > 0x80000000ul)
+                                size = 0x80000000ul - base;
+                }
+                lmb_add(base, size);
+        }
+        lmb_dump_all();
+        return 0;
+}
+#else
+#define early_init_dt_scan_drconf_memory(node)  0
+#endif /* CONFIG_PPC_PSERIES */
 
 static int __init early_init_dt_scan_memory(unsigned long node,
                                             const char *uname, int depth, void *data)
@@ -770,6 +862,11 @@ static int __init early_init_dt_scan_memory(unsigned long node,
         cell_t *reg, *endp;
         unsigned long l;
 
+        /* Look for the ibm,dynamic-reconfiguration-memory node */
+        if (depth == 1 &&
+            strcmp(uname, "ibm,dynamic-reconfiguration-memory") == 0)
+                return early_init_dt_scan_drconf_memory(node);
+
         /* We are scanning "memory" nodes only */
         if (type == NULL) {
                 /*
@@ -1674,6 +1771,7 @@ struct device_node *of_get_cpu_node(int cpu, unsigned int *thread)
         }
         return NULL;
 }
+EXPORT_SYMBOL(of_get_cpu_node);
 
 #ifdef DEBUG
 static struct debugfs_blob_wrapper flat_dt_blob;
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index b91761639d96..520ef42f642e 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -173,8 +173,8 @@ static unsigned long __initdata dt_string_start, dt_string_end;
 static unsigned long __initdata prom_initrd_start, prom_initrd_end;
 
 #ifdef CONFIG_PPC64
-static int __initdata iommu_force_on;
-static int __initdata ppc64_iommu_off;
+static int __initdata prom_iommu_force_on;
+static int __initdata prom_iommu_off;
 static unsigned long __initdata prom_tce_alloc_start;
 static unsigned long __initdata prom_tce_alloc_end;
 #endif
@@ -582,9 +582,9 @@ static void __init early_cmdline_parse(void)
                 while (*opt && *opt == ' ')
                         opt++;
                 if (!strncmp(opt, RELOC("off"), 3))
-                        RELOC(ppc64_iommu_off) = 1;
+                        RELOC(prom_iommu_off) = 1;
                 else if (!strncmp(opt, RELOC("force"), 5))
-                        RELOC(iommu_force_on) = 1;
+                        RELOC(prom_iommu_force_on) = 1;
         }
 #endif
 }
@@ -627,6 +627,7 @@ static void __init early_cmdline_parse(void)
 /* Option vector 3: processor options supported */
 #define OV3_FP                  0x80    /* floating point */
 #define OV3_VMX                 0x40    /* VMX/Altivec */
+#define OV3_DFP                 0x20    /* decimal FP */
 
 /* Option vector 5: PAPR/OF options supported */
 #define OV5_LPAR                0x80    /* logical partitioning supported */
@@ -642,6 +643,7 @@ static void __init early_cmdline_parse(void)
 static unsigned char ibm_architecture_vec[] = {
         W(0xfffe0000), W(0x003a0000),   /* POWER5/POWER5+ */
         W(0xffff0000), W(0x003e0000),   /* POWER6 */
+        W(0xffffffff), W(0x0f000002),   /* all 2.05-compliant */
         W(0xfffffffe), W(0x0f000001),   /* all 2.04-compliant and earlier */
         5 - 1,                          /* 5 option vectors */
 
@@ -668,7 +670,7 @@ static unsigned char ibm_architecture_vec[] = {
         /* option vector 3: processor options supported */
         3 - 2,                          /* length */
         0,                              /* don't ignore, don't halt */
-        OV3_FP | OV3_VMX,
+        OV3_FP | OV3_VMX | OV3_DFP,
 
         /* option vector 4: IBM PAPR implementation */
         2 - 2,                          /* length */
@@ -677,7 +679,7 @@ static unsigned char ibm_architecture_vec[] = {
         /* option vector 5: PAPR/OF options */
         3 - 2,                          /* length */
         0,                              /* don't ignore, don't halt */
-        OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES,
+        OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES | OV5_DRCONF_MEMORY,
 };
 
 /* Old method - ELF header with PT_NOTE sections */
@@ -1167,7 +1169,7 @@ static void __init prom_initialize_tce_table(void)
         u64 local_alloc_top, local_alloc_bottom;
         u64 i;
 
-        if (RELOC(ppc64_iommu_off))
+        if (RELOC(prom_iommu_off))
                 return;
 
         prom_debug("starting prom_initialize_tce_table\n");
@@ -2283,11 +2285,11 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
          * Fill in some infos for use by the kernel later on
          */
 #ifdef CONFIG_PPC64
-        if (RELOC(ppc64_iommu_off))
+        if (RELOC(prom_iommu_off))
                 prom_setprop(_prom->chosen, "/chosen", "linux,iommu-off",
                              NULL, 0);
 
-        if (RELOC(iommu_force_on))
+        if (RELOC(prom_iommu_force_on))
                 prom_setprop(_prom->chosen, "/chosen", "linux,iommu-force-on",
                              NULL, 0);
 
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index 603dff3ad62a..12c51e4ad2b4 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -25,6 +25,12 @@
 #define OF_CHECK_COUNTS(na, ns) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS && \
                         (ns) > 0)
 
+static struct of_bus *of_match_bus(struct device_node *np);
+static int __of_address_to_resource(struct device_node *dev,
+                const u32 *addrp, u64 size, unsigned int flags,
+                struct resource *r);
+
+
 /* Debug utility */
 #ifdef DEBUG
 static void of_dump_addr(const char *s, const u32 *addr, int na)
@@ -101,6 +107,7 @@ static unsigned int of_bus_default_get_flags(const u32 *addr)
 }
 
 
+#ifdef CONFIG_PCI
 /*
  * PCI bus specific translator
  */
@@ -153,15 +160,156 @@ static unsigned int of_bus_pci_get_flags(const u32 *addr)
         switch((w >> 24) & 0x03) {
         case 0x01:
                 flags |= IORESOURCE_IO;
+                break;
         case 0x02: /* 32 bits */
         case 0x03: /* 64 bits */
                 flags |= IORESOURCE_MEM;
+                break;
         }
         if (w & 0x40000000)
                 flags |= IORESOURCE_PREFETCH;
         return flags;
 }
 
+const u32 *of_get_pci_address(struct device_node *dev, int bar_no, u64 *size,
+                        unsigned int *flags)
+{
+        const u32 *prop;
+        unsigned int psize;
+        struct device_node *parent;
+        struct of_bus *bus;
+        int onesize, i, na, ns;
+
+        /* Get parent & match bus type */
+        parent = of_get_parent(dev);
+        if (parent == NULL)
+                return NULL;
+        bus = of_match_bus(parent);
+        if (strcmp(bus->name, "pci")) {
+                of_node_put(parent);
+                return NULL;
+        }
+        bus->count_cells(dev, &na, &ns);
+        of_node_put(parent);
+        if (!OF_CHECK_COUNTS(na, ns))
+                return NULL;
+
+        /* Get "reg" or "assigned-addresses" property */
+        prop = get_property(dev, bus->addresses, &psize);
+        if (prop == NULL)
+                return NULL;
+        psize /= 4;
+
+        onesize = na + ns;
+        for (i = 0; psize >= onesize; psize -= onesize, prop += onesize, i++)
+                if ((prop[0] & 0xff) == ((bar_no * 4) + PCI_BASE_ADDRESS_0)) {
+                        if (size)
+                                *size = of_read_number(prop + na, ns);
+                        if (flags)
+                                *flags = bus->get_flags(prop);
+                        return prop;
+                }
+        return NULL;
+}
+EXPORT_SYMBOL(of_get_pci_address);
+
+int of_pci_address_to_resource(struct device_node *dev, int bar,
+                               struct resource *r)
+{
+        const u32       *addrp;
+        u64             size;
+        unsigned int    flags;
+
+        addrp = of_get_pci_address(dev, bar, &size, &flags);
+        if (addrp == NULL)
+                return -EINVAL;
+        return __of_address_to_resource(dev, addrp, size, flags, r);
+}
+EXPORT_SYMBOL_GPL(of_pci_address_to_resource);
+
+static u8 of_irq_pci_swizzle(u8 slot, u8 pin)
+{
+        return (((pin - 1) + slot) % 4) + 1;
+}
+
+int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)
+{
+        struct device_node *dn, *ppnode;
+        struct pci_dev *ppdev;
+        u32 lspec;
+        u32 laddr[3];
+        u8 pin;
+        int rc;
+
+        /* Check if we have a device node, if yes, fallback to standard OF
+         * parsing
+         */
+        dn = pci_device_to_OF_node(pdev);
+        if (dn)
+                return of_irq_map_one(dn, 0, out_irq);
+
+        /* Ok, we don't, time to have fun. Let's start by building up an
+         * interrupt spec.  we assume #interrupt-cells is 1, which is standard
+         * for PCI. If you do different, then don't use that routine.
+         */
+        rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pin);
+        if (rc != 0)
+                return rc;
+        /* No pin, exit */
+        if (pin == 0)
+                return -ENODEV;
+
+        /* Now we walk up the PCI tree */
+        lspec = pin;
+        for (;;) {
+                /* Get the pci_dev of our parent */
+                ppdev = pdev->bus->self;
+
+                /* Ouch, it's a host bridge... */
+                if (ppdev == NULL) {
+#ifdef CONFIG_PPC64
+                        ppnode = pci_bus_to_OF_node(pdev->bus);
+#else
+                        struct pci_controller *host;
+                        host = pci_bus_to_host(pdev->bus);
+                        ppnode = host ? host->arch_data : NULL;
+#endif
+                        /* No node for host bridge ? give up */
+                        if (ppnode == NULL)
+                                return -EINVAL;
+                } else
+                        /* We found a P2P bridge, check if it has a node */
+                        ppnode = pci_device_to_OF_node(ppdev);
+
+                /* Ok, we have found a parent with a device-node, hand over to
+                 * the OF parsing code.
+                 * We build a unit address from the linux device to be used for
+                 * resolution. Note that we use the linux bus number which may
+                 * not match your firmware bus numbering.
+                 * Fortunately, in most cases, interrupt-map-mask doesn't include
+                 * the bus number as part of the matching.
+                 * You should still be careful about that though if you intend
+                 * to rely on this function (you ship  a firmware that doesn't
+                 * create device nodes for all PCI devices).
+                 */
+                if (ppnode)
+                        break;
+
+                /* We can only get here if we hit a P2P bridge with no node,
+                 * let's do standard swizzling and try again
+                 */
+                lspec = of_irq_pci_swizzle(PCI_SLOT(pdev->devfn), lspec);
+                pdev = ppdev;
+        }
+
+        laddr[0] = (pdev->bus->number << 16)
+                | (pdev->devfn << 8);
+        laddr[1]  = laddr[2] = 0;
+        return of_irq_map_raw(ppnode, &lspec, 1, laddr, out_irq);
+}
+EXPORT_SYMBOL_GPL(of_irq_map_pci);
+#endif /* CONFIG_PCI */
+
 /*
  * ISA bus specific translator
  */
@@ -223,6 +371,7 @@ static unsigned int of_bus_isa_get_flags(const u32 *addr)
  */
 
 static struct of_bus of_busses[] = {
+#ifdef CONFIG_PCI
         /* PCI */
         {
                 .name = "pci",
@@ -233,6 +382,7 @@ static struct of_bus of_busses[] = {
                 .translate = of_bus_pci_translate,
                 .get_flags = of_bus_pci_get_flags,
         },
+#endif /* CONFIG_PCI */
         /* ISA */
         {
                 .name = "isa",
@@ -445,48 +595,6 @@ const u32 *of_get_address(struct device_node *dev, int index, u64 *size,
 }
 EXPORT_SYMBOL(of_get_address);
 
-const u32 *of_get_pci_address(struct device_node *dev, int bar_no, u64 *size,
-                        unsigned int *flags)
-{
-        const u32 *prop;
-        unsigned int psize;
-        struct device_node *parent;
-        struct of_bus *bus;
-        int onesize, i, na, ns;
-
-        /* Get parent & match bus type */
-        parent = of_get_parent(dev);
-        if (parent == NULL)
-                return NULL;
-        bus = of_match_bus(parent);
-        if (strcmp(bus->name, "pci")) {
-                of_node_put(parent);
-                return NULL;
-        }
-        bus->count_cells(dev, &na, &ns);
-        of_node_put(parent);
-        if (!OF_CHECK_COUNTS(na, ns))
-                return NULL;
-
-        /* Get "reg" or "assigned-addresses" property */
-        prop = get_property(dev, bus->addresses, &psize);
-        if (prop == NULL)
-                return NULL;
-        psize /= 4;
-
-        onesize = na + ns;
-        for (i = 0; psize >= onesize; psize -= onesize, prop += onesize, i++)
-                if ((prop[0] & 0xff) == ((bar_no * 4) + PCI_BASE_ADDRESS_0)) {
-                        if (size)
-                                *size = of_read_number(prop + na, ns);
-                        if (flags)
-                                *flags = bus->get_flags(prop);
-                        return prop;
-                }
-        return NULL;
-}
-EXPORT_SYMBOL(of_get_pci_address);
-
 static int __of_address_to_resource(struct device_node *dev, const u32 *addrp,
                                     u64 size, unsigned int flags,
                                     struct resource *r)
@@ -529,20 +637,6 @@ int of_address_to_resource(struct device_node *dev, int index,
 }
 EXPORT_SYMBOL_GPL(of_address_to_resource);
 
-int of_pci_address_to_resource(struct device_node *dev, int bar,
-                               struct resource *r)
-{
-        const u32       *addrp;
-        u64             size;
-        unsigned int    flags;
-
-        addrp = of_get_pci_address(dev, bar, &size, &flags);
-        if (addrp == NULL)
-                return -EINVAL;
-        return __of_address_to_resource(dev, addrp, size, flags, r);
-}
-EXPORT_SYMBOL_GPL(of_pci_address_to_resource);
-
 void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
                 unsigned long *busno, unsigned long *phys, unsigned long *size)
 {
@@ -826,9 +920,20 @@ static int of_irq_map_oldworld(struct device_node *device, int index,
 
         /*
          * Old machines just have a list of interrupt numbers
-         * and no interrupt-controller nodes.
+         * and no interrupt-controller nodes. We also have dodgy
+         * cases where the APPL,interrupts property is completely
+         * missing behind pci-pci bridges and we have to get it
+         * from the parent (the bridge itself, as apple just wired
+         * everything together on these)
          */
-        ints = get_property(device, "AAPL,interrupts", &intlen);
+        while (device) {
+                ints = get_property(device, "AAPL,interrupts", &intlen);
+                if (ints != NULL)
+                        break;
+                device = device->parent;
+                if (device && strcmp(device->type, "pci") != 0)
+                        break;
+        }
         if (ints == NULL)
                 return -EINVAL;
         intlen /= sizeof(u32);
@@ -898,87 +1003,3 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq
         return res;
 }
 EXPORT_SYMBOL_GPL(of_irq_map_one);
-
-#ifdef CONFIG_PCI
-static u8 of_irq_pci_swizzle(u8 slot, u8 pin)
-{
-        return (((pin - 1) + slot) % 4) + 1;
-}
-
-int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)
-{
-        struct device_node *dn, *ppnode;
-        struct pci_dev *ppdev;
-        u32 lspec;
-        u32 laddr[3];
-        u8 pin;
-        int rc;
-
-        /* Check if we have a device node, if yes, fallback to standard OF
-         * parsing
-         */
-        dn = pci_device_to_OF_node(pdev);
-        if (dn)
-                return of_irq_map_one(dn, 0, out_irq);
-
-        /* Ok, we don't, time to have fun. Let's start by building up an
-         * interrupt spec.  we assume #interrupt-cells is 1, which is standard
-         * for PCI. If you do different, then don't use that routine.
-         */
-        rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pin);
-        if (rc != 0)
-                return rc;
-        /* No pin, exit */
-        if (pin == 0)
-                return -ENODEV;
-
-        /* Now we walk up the PCI tree */
-        lspec = pin;
-        for (;;) {
-                /* Get the pci_dev of our parent */
-                ppdev = pdev->bus->self;
-
-                /* Ouch, it's a host bridge... */
-                if (ppdev == NULL) {
-#ifdef CONFIG_PPC64
-                        ppnode = pci_bus_to_OF_node(pdev->bus);
-#else
-                        struct pci_controller *host;
-                        host = pci_bus_to_host(pdev->bus);
-                        ppnode = host ? host->arch_data : NULL;
-#endif
-                        /* No node for host bridge ? give up */
-                        if (ppnode == NULL)
-                                return -EINVAL;
-                } else
-                        /* We found a P2P bridge, check if it has a node */
-                        ppnode = pci_device_to_OF_node(ppdev);
-
-                /* Ok, we have found a parent with a device-node, hand over to
-                 * the OF parsing code.
-                 * We build a unit address from the linux device to be used for
-                 * resolution. Note that we use the linux bus number which may
-                 * not match your firmware bus numbering.
-                 * Fortunately, in most cases, interrupt-map-mask doesn't include
-                 * the bus number as part of the matching.
-                 * You should still be careful about that though if you intend
-                 * to rely on this function (you ship  a firmware that doesn't
-                 * create device nodes for all PCI devices).
-                 */
-                if (ppnode)
-                        break;
-
-                /* We can only get here if we hit a P2P bridge with no node,
-                 * let's do standard swizzling and try again
-                 */
-                lspec = of_irq_pci_swizzle(PCI_SLOT(pdev->devfn), lspec);
-                pdev = ppdev;
-        }
-
-        laddr[0] = (pdev->bus->number << 16)
-                | (pdev->devfn << 8);
-        laddr[1]  = laddr[2] = 0;
-        return of_irq_map_raw(ppnode, &lspec, 1, laddr, out_irq);
-}
-EXPORT_SYMBOL_GPL(of_irq_map_pci);
-#endif /* CONFIG_PCI */
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 6ef80d4e38d3..76b5d7ebdcc6 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -303,6 +303,12 @@ int rtas_token(const char *service)
 }
 EXPORT_SYMBOL(rtas_token);
 
+int rtas_service_present(const char *service)
+{
+        return rtas_token(service) != RTAS_UNKNOWN_SERVICE;
+}
+EXPORT_SYMBOL(rtas_service_present);
+
 #ifdef CONFIG_RTAS_ERROR_LOGGING
 /*
  * Return the firmware-specified size of the error log buffer
@@ -810,31 +816,6 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
         return 0;
 }
 
-/* This version can't take the spinlock, because it never returns */
-
-struct rtas_args rtas_stop_self_args = {
-        /* The token is initialized for real in setup_system() */
-        .token = RTAS_UNKNOWN_SERVICE,
-        .nargs = 0,
-        .nret = 1,
-        .rets = &rtas_stop_self_args.args[0],
-};
-
-void rtas_stop_self(void)
-{
-        struct rtas_args *rtas_args = &rtas_stop_self_args;
-
-        local_irq_disable();
-
-        BUG_ON(rtas_args->token == RTAS_UNKNOWN_SERVICE);
-
-        printk("cpu %u (hwid %u) Ready to die...\n",
-               smp_processor_id(), hard_smp_processor_id());
-        enter_rtas(__pa(rtas_args));
-
-        panic("Alas, I survived.\n");
-}
-
 /*
  * Call early during boot, before mem init or bootmem, to retrieve the RTAS
  * informations from the device-tree and allocate the RMO buffer for userland
@@ -879,9 +860,6 @@ void __init rtas_initialize(void)
 #endif
         rtas_rmo_buf = lmb_alloc_base(RTAS_RMOBUF_MAX, PAGE_SIZE, rtas_region);
 
-#ifdef CONFIG_HOTPLUG_CPU
-        rtas_stop_self_args.token = rtas_token("stop-self");
-#endif /* CONFIG_HOTPLUG_CPU */
 #ifdef CONFIG_RTAS_ERROR_LOGGING
         rtas_last_error_token = rtas_token("rtas-last-error");
 #endif
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c
index 6f6fc977cb39..0c4fcd34bfe5 100644
--- a/arch/powerpc/kernel/rtas_flash.c
+++ b/arch/powerpc/kernel/rtas_flash.c
@@ -101,7 +101,7 @@ struct flash_block_list_header { /* just the header of flash_block_list */
 static struct flash_block_list_header rtas_firmware_flash_list = {0, NULL};
 
 /* Use slab cache to guarantee 4k alignment */
-static kmem_cache_t *flash_block_cache = NULL;
+static struct kmem_cache *flash_block_cache = NULL;
 
 #define FLASH_BLOCK_LIST_VERSION (1UL)
 
@@ -193,7 +193,7 @@ static void free_flash_list(struct flash_block_list *f)
 
 static int rtas_flash_release(struct inode *inode, struct file *file)
 {
-        struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
         struct rtas_update_flash_t *uf;
         
         uf = (struct rtas_update_flash_t *) dp->data;
@@ -255,7 +255,7 @@ static void get_flash_status_msg(int status, char *buf)
 static ssize_t rtas_flash_read(struct file *file, char __user *buf,
                                size_t count, loff_t *ppos)
 {
-        struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
         struct rtas_update_flash_t *uf;
         char msg[RTAS_MSG_MAXLEN];
         int msglen;
@@ -286,7 +286,7 @@ static ssize_t rtas_flash_read(struct file *file, char __user *buf,
 }
 
 /* constructor for flash_block_cache */
-void rtas_block_ctor(void *ptr, kmem_cache_t *cache, unsigned long flags)
+void rtas_block_ctor(void *ptr, struct kmem_cache *cache, unsigned long flags)
 {
         memset(ptr, 0, RTAS_BLK_SIZE);
 }
@@ -299,7 +299,7 @@ void rtas_block_ctor(void *ptr, kmem_cache_t *cache, unsigned long flags)
 static ssize_t rtas_flash_write(struct file *file, const char __user *buffer,
                                 size_t count, loff_t *off)
 {
-        struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
         struct rtas_update_flash_t *uf;
         char *p;
         int next_free;
@@ -391,7 +391,7 @@ static void manage_flash(struct rtas_manage_flash_t *args_buf)
 static ssize_t manage_flash_read(struct file *file, char __user *buf,
                                size_t count, loff_t *ppos)
 {
-        struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
         struct rtas_manage_flash_t *args_buf;
         char msg[RTAS_MSG_MAXLEN];
         int msglen;
@@ -421,7 +421,7 @@ static ssize_t manage_flash_read(struct file *file, char __user *buf,
 static ssize_t manage_flash_write(struct file *file, const char __user *buf,
                                 size_t count, loff_t *off)
 {
-        struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
         struct rtas_manage_flash_t *args_buf;
         const char reject_str[] = "0";
         const char commit_str[] = "1";
@@ -492,7 +492,7 @@ static int get_validate_flash_msg(struct rtas_validate_flash_t *args_buf,
 static ssize_t validate_flash_read(struct file *file, char __user *buf,
                                size_t count, loff_t *ppos)
 {
-        struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
         struct rtas_validate_flash_t *args_buf;
         char msg[RTAS_MSG_MAXLEN];
         int msglen;
@@ -520,7 +520,7 @@ static ssize_t validate_flash_read(struct file *file, char __user *buf,
 static ssize_t validate_flash_write(struct file *file, const char __user *buf,
                                     size_t count, loff_t *off)
 {
-        struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
         struct rtas_validate_flash_t *args_buf;
         int rc;
 
@@ -569,7 +569,7 @@ done:
 
 static int validate_flash_release(struct inode *inode, struct file *file)
 {
-        struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
         struct rtas_validate_flash_t *args_buf;
 
         args_buf = (struct rtas_validate_flash_t *) dp->data;
@@ -681,14 +681,12 @@ static int initialize_flash_pde_data(const char *rtas_call_name,
         int *status;
         int token;
 
-        dp->data = kmalloc(buf_size, GFP_KERNEL);
+        dp->data = kzalloc(buf_size, GFP_KERNEL);
         if (dp->data == NULL) {
                 remove_flash_pde(dp);
                 return -ENOMEM;
         }
 
-        memset(dp->data, 0, buf_size);
-
         /*
          * This code assumes that the status int is the first member of the
          * struct 
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index b4a0de79c060..ace9f4c86e67 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -38,6 +38,7 @@
 #include <asm/rtas.h>
 #include <asm/mpic.h>
 #include <asm/ppc-pci.h>
+#include <asm/eeh.h>
 
 /* RTAS tokens */
 static int read_pci_config;
@@ -231,32 +232,13 @@ void __init init_pci_config_tokens (void)
 
 unsigned long __devinit get_phb_buid (struct device_node *phb)
 {
-        int addr_cells;
-        const unsigned int *buid_vals;
-        unsigned int len;
-        unsigned long buid;
-
-        if (ibm_read_pci_config == -1) return 0;
+        struct resource r;
 
-        /* PHB's will always be children of the root node,
-         * or so it is promised by the current firmware. */
-        if (phb->parent == NULL)
+        if (ibm_read_pci_config == -1)
                 return 0;
-        if (phb->parent->parent)
-                return 0;
-
-        buid_vals = get_property(phb, "reg", &len);
-        if (buid_vals == NULL)
+        if (of_address_to_resource(phb, 0, &r))
                 return 0;
-
-        addr_cells = prom_n_addr_cells(phb);
-        if (addr_cells == 1) {
-                buid = (unsigned long) buid_vals[0];
-        } else {
-                buid = (((unsigned long)buid_vals[0]) << 32UL) |
-                        (((unsigned long)buid_vals[1]) & 0xffffffff);
-        }
-        return buid;
+        return r.start;
 }
 
 static int phb_set_bus_ranges(struct device_node *dev,
@@ -276,8 +258,10 @@ static int phb_set_bus_ranges(struct device_node *dev,
         return 0;
 }
 
-int __devinit setup_phb(struct device_node *dev, struct pci_controller *phb)
+int __devinit rtas_setup_phb(struct pci_controller *phb)
 {
+        struct device_node *dev = phb->arch_data;
+
         if (is_python(dev))
                 python_countermeasures(dev);
 
@@ -309,7 +293,7 @@ unsigned long __init find_and_init_phbs(void)
                 phb = pcibios_alloc_controller(node);
                 if (!phb)
                         continue;
-                setup_phb(node, phb);
+                rtas_setup_phb(phb);
                 pci_process_bridge_OF_ranges(phb, node, 0);
                 pci_setup_phb_io(phb, index == 0);
                 index++;
@@ -381,7 +365,6 @@ int pcibios_remove_root_bus(struct pci_controller *phb)
                 }
         }
 
-        list_del(&phb->list_node);
         pcibios_free_controller(phb);
 
         return 0;
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index a4c2964a3ca6..61c65d19ef06 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -63,10 +63,6 @@ unsigned int DMA_MODE_WRITE;
 
 int have_of = 1;
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
-dev_t boot_dev;
-#endif /* CONFIG_PPC_MULTIPLATFORM */
-
 #ifdef CONFIG_VGA_CONSOLE
 unsigned long vgacon_remap_base;
 #endif
@@ -101,7 +97,7 @@ unsigned long __init early_init(unsigned long dt_ptr)
          * Identify the CPU type and fix up code sections
          * that depend on which cpu we have.
          */
-        spec = identify_cpu(offset);
+        spec = identify_cpu(offset, mfspr(SPRN_PVR));
 
         do_feature_fixups(spec->cpu_features,
                           PTRRELOC(&__start___ftr_fixup),
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 16278968dab6..3733de30e84d 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -33,6 +33,7 @@
 #include <linux/serial.h>
 #include <linux/serial_8250.h>
 #include <linux/bootmem.h>
+#include <linux/pci.h>
 #include <asm/io.h>
 #include <asm/kdump.h>
 #include <asm/prom.h>
@@ -71,7 +72,6 @@
 
 int have_of = 1;
 int boot_cpuid = 0;
-dev_t boot_dev;
 u64 ppc64_pft_size;
 
 /* Pick defaults since we might want to patch instructions
@@ -171,7 +171,7 @@ void __init setup_paca(int cpu)
 void __init early_setup(unsigned long dt_ptr)
 {
         /* Identify CPU type */
-        identify_cpu(0);
+        identify_cpu(0, mfspr(SPRN_PVR));
 
         /* Assume we're on cpu 0 for now. Don't write to the paca yet! */
         setup_paca(0);
@@ -226,8 +226,8 @@ void early_setup_secondary(void)
 {
         struct paca_struct *lpaca = get_paca();
 
-        /* Mark enabled in PACA */
-        lpaca->proc_enabled = 0;
+        /* Mark interrupts enabled in PACA */
+        lpaca->soft_enabled = 0;
 
         /* Initialize hash table for that CPU */
         htab_initialize_secondary();
@@ -392,7 +392,8 @@ void __init setup_system(void)
          * setting up the hash table pointers. It also sets up some interrupt-mapping
          * related options that will be used by finish_device_tree()
          */
-        ppc_md.init_early();
+        if (ppc_md.init_early)
+                ppc_md.init_early();
 
         /*
          * We can discover serial ports now since the above did setup the
@@ -598,3 +599,10 @@ void __init setup_per_cpu_areas(void)
         }
 }
 #endif
+
+
+#ifdef CONFIG_PPC_INDIRECT_IO
+struct ppc_pci_io ppc_pci_io;
+EXPORT_SYMBOL(ppc_pci_io);
+#endif /* CONFIG_PPC_INDIRECT_IO */
+
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index 320353f0926f..6b405a3f43f9 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -36,7 +36,7 @@
 #include <linux/stddef.h>
 #include <linux/tty.h>
 #include <linux/binfmts.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #endif
 
 #include <asm/uaccess.h>
@@ -835,11 +835,21 @@ long sys_swapcontext(struct ucontext __user *old_ctx,
                 return -EINVAL;
 
         if (old_ctx != NULL) {
+                struct mcontext __user *mctx;
+
+                /*
+                 * old_ctx might not be 16-byte aligned, in which
+                 * case old_ctx->uc_mcontext won't be either.
+                 * Because we have the old_ctx->uc_pad2 field
+                 * before old_ctx->uc_mcontext, we need to round down
+                 * from &old_ctx->uc_mcontext to a 16-byte boundary.
+                 */
+                mctx = (struct mcontext __user *)
+                        ((unsigned long) &old_ctx->uc_mcontext & ~0xfUL);
                 if (!access_ok(VERIFY_WRITE, old_ctx, sizeof(*old_ctx))
-                    || save_user_regs(regs, &old_ctx->uc_mcontext, 0)
+                    || save_user_regs(regs, mctx, 0)
                     || put_sigset_t(&old_ctx->uc_sigmask, &current->blocked)
-                    || __put_user(to_user_ptr(&old_ctx->uc_mcontext),
-                            &old_ctx->uc_regs))
+                    || __put_user(to_user_ptr(mctx), &old_ctx->uc_regs))
                         return -EFAULT;
         }
         if (new_ctx == NULL)
diff --git a/arch/powerpc/kernel/smp-tbsync.c b/arch/powerpc/kernel/smp-tbsync.c
index de59c6c31a5b..bc892e69b4f7 100644
--- a/arch/powerpc/kernel/smp-tbsync.c
+++ b/arch/powerpc/kernel/smp-tbsync.c
@@ -78,7 +78,7 @@ static int __devinit start_contest(int cmd, long offset, int num)
 {
         int i, score=0;
         u64 tb;
-        long mark;
+        u64 mark;
 
         tbsync->cmd = cmd;
 
@@ -116,8 +116,7 @@ void __devinit smp_generic_give_timebase(void)
         printk("Synchronizing timebase\n");
 
         /* if this fails then this kernel won't work anyway... */
-        tbsync = kmalloc( sizeof(*tbsync), GFP_KERNEL );
-        memset( tbsync, 0, sizeof(*tbsync) );
+        tbsync = kzalloc( sizeof(*tbsync), GFP_KERNEL );
         mb();
         running = 1;
 
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 35c6309bdb76..0e8beca460af 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -65,6 +65,7 @@ cpumask_t cpu_sibling_map[NR_CPUS] = { [0 ... NR_CPUS-1] = CPU_MASK_NONE };
 
 EXPORT_SYMBOL(cpu_online_map);
 EXPORT_SYMBOL(cpu_possible_map);
+EXPORT_SYMBOL(cpu_sibling_map);
 
 /* SMP operations for this machine */
 struct smp_ops_t *smp_ops;
@@ -467,7 +468,7 @@ static int __devinit cpu_enable(unsigned int cpu)
         return -ENOSYS;
 }
 
-int __devinit __cpu_up(unsigned int cpu)
+int __cpuinit __cpu_up(unsigned int cpu)
 {
         int c;
 
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index d15c33e95959..03a2a2f30d66 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -51,6 +51,7 @@
 #include <asm/time.h>
 #include <asm/mmu_context.h>
 #include <asm/ppc-pci.h>
+#include <asm/syscalls.h>
 
 /* readdir & getdents */
 #define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de)))
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index d45a168bdaca..400ab2b946e7 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -181,6 +181,8 @@ SYSFS_PMCSETUP(pmc6, SPRN_PMC6);
 SYSFS_PMCSETUP(pmc7, SPRN_PMC7);
 SYSFS_PMCSETUP(pmc8, SPRN_PMC8);
 SYSFS_PMCSETUP(purr, SPRN_PURR);
+SYSFS_PMCSETUP(spurr, SPRN_SPURR);
+SYSFS_PMCSETUP(dscr, SPRN_DSCR);
 
 static SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0);
 static SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1);
@@ -194,16 +196,17 @@ static SYSDEV_ATTR(pmc6, 0600, show_pmc6, store_pmc6);
 static SYSDEV_ATTR(pmc7, 0600, show_pmc7, store_pmc7);
 static SYSDEV_ATTR(pmc8, 0600, show_pmc8, store_pmc8);
 static SYSDEV_ATTR(purr, 0600, show_purr, NULL);
+static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL);
+static SYSDEV_ATTR(dscr, 0600, show_dscr, store_dscr);
 
 static void register_cpu_online(unsigned int cpu)
 {
         struct cpu *c = &per_cpu(cpu_devices, cpu);
         struct sys_device *s = &c->sysdev;
 
-#ifndef CONFIG_PPC_ISERIES
-        if (cpu_has_feature(CPU_FTR_SMT))
+        if (!firmware_has_feature(FW_FEATURE_ISERIES) &&
+                        cpu_has_feature(CPU_FTR_SMT))
                 sysdev_create_file(s, &attr_smt_snooze_delay);
-#endif
 
         /* PMC stuff */
 
@@ -232,6 +235,12 @@ static void register_cpu_online(unsigned int cpu)
 
         if (cpu_has_feature(CPU_FTR_PURR))
                 sysdev_create_file(s, &attr_purr);
+
+        if (cpu_has_feature(CPU_FTR_SPURR))
+                sysdev_create_file(s, &attr_spurr);
+
+        if (cpu_has_feature(CPU_FTR_DSCR))
+                sysdev_create_file(s, &attr_dscr);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
@@ -240,12 +249,11 @@ static void unregister_cpu_online(unsigned int cpu)
         struct cpu *c = &per_cpu(cpu_devices, cpu);
         struct sys_device *s = &c->sysdev;
 
-        BUG_ON(c->no_control);
+        BUG_ON(!c->hotpluggable);
 
-#ifndef CONFIG_PPC_ISERIES
-        if (cpu_has_feature(CPU_FTR_SMT))
+        if (!firmware_has_feature(FW_FEATURE_ISERIES) &&
+                        cpu_has_feature(CPU_FTR_SMT))
                 sysdev_remove_file(s, &attr_smt_snooze_delay);
-#endif
 
         /* PMC stuff */
 
@@ -274,6 +282,12 @@ static void unregister_cpu_online(unsigned int cpu)
 
         if (cpu_has_feature(CPU_FTR_PURR))
                 sysdev_remove_file(s, &attr_purr);
+
+        if (cpu_has_feature(CPU_FTR_SPURR))
+                sysdev_remove_file(s, &attr_spurr);
+
+        if (cpu_has_feature(CPU_FTR_DSCR))
+                sysdev_remove_file(s, &attr_dscr);
 }
 #endif /* CONFIG_HOTPLUG_CPU */
 
@@ -299,6 +313,72 @@ static struct notifier_block __cpuinitdata sysfs_cpu_nb = {
         .notifier_call  = sysfs_cpu_notify,
 };
 
+static DEFINE_MUTEX(cpu_mutex);
+
+int cpu_add_sysdev_attr(struct sysdev_attribute *attr)
+{
+        int cpu;
+
+        mutex_lock(&cpu_mutex);
+
+        for_each_possible_cpu(cpu) {
+                sysdev_create_file(get_cpu_sysdev(cpu), attr);
+        }
+
+        mutex_unlock(&cpu_mutex);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(cpu_add_sysdev_attr);
+
+int cpu_add_sysdev_attr_group(struct attribute_group *attrs)
+{
+        int cpu;
+        struct sys_device *sysdev;
+
+        mutex_lock(&cpu_mutex);
+
+        for_each_possible_cpu(cpu) {
+                sysdev = get_cpu_sysdev(cpu);
+                sysfs_create_group(&sysdev->kobj, attrs);
+        }
+
+        mutex_unlock(&cpu_mutex);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(cpu_add_sysdev_attr_group);
+
+
+void cpu_remove_sysdev_attr(struct sysdev_attribute *attr)
+{
+        int cpu;
+
+        mutex_lock(&cpu_mutex);
+
+        for_each_possible_cpu(cpu) {
+                sysdev_remove_file(get_cpu_sysdev(cpu), attr);
+        }
+
+        mutex_unlock(&cpu_mutex);
+}
+EXPORT_SYMBOL_GPL(cpu_remove_sysdev_attr);
+
+void cpu_remove_sysdev_attr_group(struct attribute_group *attrs)
+{
+        int cpu;
+        struct sys_device *sysdev;
+
+        mutex_lock(&cpu_mutex);
+
+        for_each_possible_cpu(cpu) {
+                sysdev = get_cpu_sysdev(cpu);
+                sysfs_remove_group(&sysdev->kobj, attrs);
+        }
+
+        mutex_unlock(&cpu_mutex);
+}
+EXPORT_SYMBOL_GPL(cpu_remove_sysdev_attr_group);
+
+
 /* NUMA stuff */
 
 #ifdef CONFIG_NUMA
@@ -360,10 +440,10 @@ static int __init topology_init(void)
                  * CPU.  For instance, the boot cpu might never be valid
                  * for hotplugging.
                  */
-                if (!ppc_md.cpu_die)
-                        c->no_control = 1;
+                if (ppc_md.cpu_die)
+                        c->hotpluggable = 1;
 
-                if (cpu_online(cpu) || (c->no_control == 0)) {
+                if (cpu_online(cpu) || c->hotpluggable) {
                         register_cpu(c, cpu);
 
                         sysdev_create_file(&c->sysdev, &attr_physical_id);
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 46a24de36fec..f6f0c6b07c4c 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -631,7 +631,8 @@ void timer_interrupt(struct pt_regs * regs)
         calculate_steal_time();
 
 #ifdef CONFIG_PPC_ISERIES
-        get_lppaca()->int_dword.fields.decr_int = 0;
+        if (firmware_has_feature(FW_FEATURE_ISERIES))
+                get_lppaca()->int_dword.fields.decr_int = 0;
 #endif
 
         while ((ticks = tb_ticks_since(per_cpu(last_jiffy, cpu)))
@@ -674,7 +675,7 @@ void timer_interrupt(struct pt_regs * regs)
         set_dec(next_dec);
 
 #ifdef CONFIG_PPC_ISERIES
-        if (hvlpevent_is_pending())
+        if (firmware_has_feature(FW_FEATURE_ISERIES) && hvlpevent_is_pending())
                 process_hvlpevents();
 #endif
 
@@ -774,7 +775,7 @@ int do_settimeofday(struct timespec *tv)
          * settimeofday to perform this operation.
          */
 #ifdef CONFIG_PPC_ISERIES
-        if (first_settimeofday) {
+        if (firmware_has_feature(FW_FEATURE_ISERIES) && first_settimeofday) {
                 iSeries_tb_recal();
                 first_settimeofday = 0;
         }
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index c66b4771ef44..535f50665647 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -32,6 +32,7 @@
 #include <linux/kprobes.h>
 #include <linux/kexec.h>
 #include <linux/backlight.h>
+#include <linux/bug.h>
 
 #include <asm/kdebug.h>
 #include <asm/pgtable.h>
@@ -53,10 +54,6 @@
 #endif
 #include <asm/kexec.h>
 
-#ifdef CONFIG_PPC64     /* XXX */
-#define _IO_BASE        pci_io_base
-#endif
-
 #ifdef CONFIG_DEBUGGER
 int (*__debugger)(struct pt_regs *regs);
 int (*__debugger_ipi)(struct pt_regs *regs);
@@ -241,7 +238,7 @@ void system_reset_exception(struct pt_regs *regs)
  */
 static inline int check_io_access(struct pt_regs *regs)
 {
-#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32)
+#ifdef CONFIG_PPC32
         unsigned long msr = regs->msr;
         const struct exception_table_entry *entry;
         unsigned int *nip = (unsigned int *)regs->nip;
@@ -274,7 +271,7 @@ static inline int check_io_access(struct pt_regs *regs)
                         return 1;
                 }
         }
-#endif /* CONFIG_PPC_PMAC && CONFIG_PPC32 */
+#endif /* CONFIG_PPC32 */
         return 0;
 }
 
@@ -731,54 +728,9 @@ static int emulate_instruction(struct pt_regs *regs)
         return -EINVAL;
 }
 
-/*
- * Look through the list of trap instructions that are used for BUG(),
- * BUG_ON() and WARN_ON() and see if we hit one.  At this point we know
- * that the exception was caused by a trap instruction of some kind.
- * Returns 1 if we should continue (i.e. it was a WARN_ON) or 0
- * otherwise.
- */
-extern struct bug_entry __start___bug_table[], __stop___bug_table[];
-
-#ifndef CONFIG_MODULES
-#define module_find_bug(x)      NULL
-#endif
-
-struct bug_entry *find_bug(unsigned long bugaddr)
-{
-        struct bug_entry *bug;
-
-        for (bug = __start___bug_table; bug < __stop___bug_table; ++bug)
-                if (bugaddr == bug->bug_addr)
-                        return bug;
-        return module_find_bug(bugaddr);
-}
-
-static int check_bug_trap(struct pt_regs *regs)
+int is_valid_bugaddr(unsigned long addr)
 {
-        struct bug_entry *bug;
-        unsigned long addr;
-
-        if (regs->msr & MSR_PR)
-                return 0;       /* not in kernel */
-        addr = regs->nip;       /* address of trap instruction */
-        if (addr < PAGE_OFFSET)
-                return 0;
-        bug = find_bug(regs->nip);
-        if (bug == NULL)
-                return 0;
-        if (bug->line & BUG_WARNING_TRAP) {
-                /* this is a WARN_ON rather than BUG/BUG_ON */
-                printk(KERN_ERR "Badness in %s at %s:%ld\n",
-                       bug->function, bug->file,
-                       bug->line & ~BUG_WARNING_TRAP);
-                dump_stack();
-                return 1;
-        }
-        printk(KERN_CRIT "kernel BUG in %s at %s:%ld!\n",
-               bug->function, bug->file, bug->line);
-
-        return 0;
+        return is_kernel_addr(addr);
 }
 
 void __kprobes program_check_exception(struct pt_regs *regs)
@@ -786,6 +738,8 @@ void __kprobes program_check_exception(struct pt_regs *regs)
         unsigned int reason = get_reason(regs);
         extern int do_mathemu(struct pt_regs *regs);
 
+        /* We can now get here via a FP Unavailable exception if the core
+         * has no FPU, in that case no reason flags will be set */
 #ifdef CONFIG_MATH_EMULATION
         /* (reason & REASON_ILLEGAL) would be the obvious thing here,
          * but there seems to be a hardware bug on the 405GP (RevD)
@@ -812,7 +766,9 @@ void __kprobes program_check_exception(struct pt_regs *regs)
                         return;
                 if (debugger_bpt(regs))
                         return;
-                if (check_bug_trap(regs)) {
+
+                if (!(regs->msr & MSR_PR) &&  /* not user-mode */
+                    report_bug(regs->nip) == BUG_TRAP_TYPE_WARN) {
                         regs->nip += 4;
                         return;
                 }
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index c913ad5cad29..a4b28c73bba0 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -264,7 +264,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
 
 
         /* Allocate a VMA structure and fill it up */
-        vma = kmem_cache_zalloc(vm_area_cachep, SLAB_KERNEL);
+        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
         if (vma == NULL) {
                 rc = -ENOMEM;
                 goto fail_mmapsem;
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index ed007878d1bf..a80f8f1d2e5d 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -81,15 +81,15 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
                 struct iommu_table *tbl;
                 unsigned long offset, size;
 
-                dma_window = get_property(dev->dev.platform_data,
-                                "ibm,my-dma-window", NULL);
+                dma_window = get_property(dev->dev.archdata.of_node,
+                                          "ibm,my-dma-window", NULL);
                 if (!dma_window)
                         return NULL;
 
                 tbl = kmalloc(sizeof(*tbl), GFP_KERNEL);
 
-                of_parse_dma_window(dev->dev.platform_data, dma_window,
-                                &tbl->it_index, &offset, &size);
+                of_parse_dma_window(dev->dev.archdata.of_node, dma_window,
+                                    &tbl->it_index, &offset, &size);
 
                 /* TCE table size - measured in tce entries */
                 tbl->it_size = size >> IOMMU_PAGE_SHIFT;
@@ -117,7 +117,8 @@ static const struct vio_device_id *vio_match_device(
 {
         while (ids->type[0] != '\0') {
                 if ((strncmp(dev->type, ids->type, strlen(ids->type)) == 0) &&
-                    device_is_compatible(dev->dev.platform_data, ids->compat))
+                    device_is_compatible(dev->dev.archdata.of_node,
+                                         ids->compat))
                         return ids;
                 ids++;
         }
@@ -198,9 +199,9 @@ EXPORT_SYMBOL(vio_unregister_driver);
 /* vio_dev refcount hit 0 */
 static void __devinit vio_dev_release(struct device *dev)
 {
-        if (dev->platform_data) {
-                /* XXX free TCE table */
-                of_node_put(dev->platform_data);
+        if (dev->archdata.of_node) {
+                /* XXX should free TCE table */
+                of_node_put(dev->archdata.of_node);
         }
         kfree(to_vio_dev(dev));
 }
@@ -210,7 +211,7 @@ static void __devinit vio_dev_release(struct device *dev)
  * @of_node:    The OF node for this device.
  *
  * Creates and initializes a vio_dev structure from the data in
- * of_node (dev.platform_data) and adds it to the list of virtual devices.
+ * of_node and adds it to the list of virtual devices.
  * Returns a pointer to the created vio_dev or NULL if node has
  * NULL device_type or compatible fields.
  */
@@ -240,8 +241,6 @@ struct vio_dev * __devinit vio_register_device_node(struct device_node *of_node)
         if (viodev == NULL)
                 return NULL;
 
-        viodev->dev.platform_data = of_node_get(of_node);
-
         viodev->irq = irq_of_parse_and_map(of_node, 0);
 
         snprintf(viodev->dev.bus_id, BUS_ID_SIZE, "%x", *unit_address);
@@ -254,7 +253,10 @@ struct vio_dev * __devinit vio_register_device_node(struct device_node *of_node)
                 if (unit_address != NULL)
                         viodev->unit_address = *unit_address;
         }
-        viodev->iommu_table = vio_build_iommu_table(viodev);
+        viodev->dev.archdata.of_node = of_node_get(of_node);
+        viodev->dev.archdata.dma_ops = &dma_iommu_ops;
+        viodev->dev.archdata.dma_data = vio_build_iommu_table(viodev);
+        viodev->dev.archdata.numa_node = of_node_to_nid(of_node);
 
         /* init generic 'struct device' fields: */
         viodev->dev.parent = &vio_bus_device.dev;
@@ -285,10 +287,11 @@ static int __init vio_bus_init(void)
 #ifdef CONFIG_PPC_ISERIES
         if (firmware_has_feature(FW_FEATURE_ISERIES)) {
                 iommu_vio_init();
-                vio_bus_device.iommu_table = &vio_iommu_table;
+                vio_bus_device.dev.archdata.dma_ops = &dma_iommu_ops;
+                vio_bus_device.dev.archdata.dma_data = &vio_iommu_table;
                 iSeries_vio_dev = &vio_bus_device.dev;
         }
-#endif
+#endif /* CONFIG_PPC_ISERIES */
 
         err = bus_register(&vio_bus_type);
         if (err) {
@@ -336,7 +339,7 @@ static ssize_t name_show(struct device *dev,
 static ssize_t devspec_show(struct device *dev,
                 struct device_attribute *attr, char *buf)
 {
-        struct device_node *of_node = dev->platform_data;
+        struct device_node *of_node = dev->archdata.of_node;
 
         return sprintf(buf, "%s\n", of_node ? of_node->full_name : "none");
 }
@@ -353,62 +356,6 @@ void __devinit vio_unregister_device(struct vio_dev *viodev)
 }
 EXPORT_SYMBOL(vio_unregister_device);
 
-static dma_addr_t vio_map_single(struct device *dev, void *vaddr,
-                          size_t size, enum dma_data_direction direction)
-{
-        return iommu_map_single(to_vio_dev(dev)->iommu_table, vaddr, size,
-                        ~0ul, direction);
-}
-
-static void vio_unmap_single(struct device *dev, dma_addr_t dma_handle,
-                      size_t size, enum dma_data_direction direction)
-{
-        iommu_unmap_single(to_vio_dev(dev)->iommu_table, dma_handle, size,
-                        direction);
-}
-
-static int vio_map_sg(struct device *dev, struct scatterlist *sglist,
-                int nelems, enum dma_data_direction direction)
-{
-        return iommu_map_sg(dev, to_vio_dev(dev)->iommu_table, sglist,
-                        nelems, ~0ul, direction);
-}
-
-static void vio_unmap_sg(struct device *dev, struct scatterlist *sglist,
-                int nelems, enum dma_data_direction direction)
-{
-        iommu_unmap_sg(to_vio_dev(dev)->iommu_table, sglist, nelems, direction);
-}
-
-static void *vio_alloc_coherent(struct device *dev, size_t size,
-                           dma_addr_t *dma_handle, gfp_t flag)
-{
-        return iommu_alloc_coherent(to_vio_dev(dev)->iommu_table, size,
-                        dma_handle, ~0ul, flag, -1);
-}
-
-static void vio_free_coherent(struct device *dev, size_t size,
-                         void *vaddr, dma_addr_t dma_handle)
-{
-        iommu_free_coherent(to_vio_dev(dev)->iommu_table, size, vaddr,
-                        dma_handle);
-}
-
-static int vio_dma_supported(struct device *dev, u64 mask)
-{
-        return 1;
-}
-
-struct dma_mapping_ops vio_dma_ops = {
-        .alloc_coherent = vio_alloc_coherent,
-        .free_coherent = vio_free_coherent,
-        .map_single = vio_map_single,
-        .unmap_single = vio_unmap_single,
-        .map_sg = vio_map_sg,
-        .unmap_sg = vio_unmap_sg,
-        .dma_supported = vio_dma_supported,
-};
-
 static int vio_bus_match(struct device *dev, struct device_driver *drv)
 {
         const struct vio_dev *vio_dev = to_vio_dev(dev);
@@ -422,13 +369,14 @@ static int vio_hotplug(struct device *dev, char **envp, int num_envp,
                         char *buffer, int buffer_size)
 {
         const struct vio_dev *vio_dev = to_vio_dev(dev);
-        struct device_node *dn = dev->platform_data;
+        struct device_node *dn;
         const char *cp;
         int length;
 
         if (!num_envp)
                 return -ENOMEM;
 
+        dn = dev->archdata.of_node;
         if (!dn)
                 return -ENODEV;
         cp = get_property(dn, "compatible", &length);
@@ -465,7 +413,7 @@ struct bus_type vio_bus_type = {
 */
 const void *vio_get_attribute(struct vio_dev *vdev, char *which, int *length)
 {
-        return get_property(vdev->dev.platform_data, which, length);
+        return get_property(vdev->dev.archdata.of_node, which, length);
 }
 EXPORT_SYMBOL(vio_get_attribute);
 
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index e8342d867536..04b8e71bf5b0 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -33,6 +33,7 @@ SECTIONS
 
         /* Text and gots */
         .text : {
+                _text = .;
                 *(.text .text.*)
                 SCHED_TEXT
                 LOCK_TEXT
@@ -61,11 +62,7 @@ SECTIONS
                 __stop___ex_table = .;
         }
 
-        __bug_table : {
-                __start___bug_table = .;
-                *(__bug_table)
-                __stop___bug_table = .;
-        }
+        BUG_TABLE
 
 /*
  * Init sections discarded at runtime
diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile
index 93441e7a2921..38a81967ca07 100644
--- a/arch/powerpc/mm/Makefile
+++ b/arch/powerpc/mm/Makefile
@@ -8,7 +8,7 @@ endif
 
 obj-y                           := fault.o mem.o lmb.o
 obj-$(CONFIG_PPC32)             += init_32.o pgtable_32.o mmu_context_32.o
-hash-$(CONFIG_PPC_MULTIPLATFORM) := hash_native_64.o
+hash-$(CONFIG_PPC_NATIVE)       := hash_native_64.o
 obj-$(CONFIG_PPC64)             += init_64.o pgtable_64.o mmu_context_64.o \
                                    hash_utils_64.o hash_low_64.o tlb_64.o \
                                    slb_low.o slb.o stab.o mmap.o imalloc.o \
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index e8fa50624b70..03aeb3a46077 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -426,18 +426,21 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
 
         /* kernel has accessed a bad area */
 
-        printk(KERN_ALERT "Unable to handle kernel paging request for ");
         switch (regs->trap) {
-                case 0x300:
-                case 0x380:
-                        printk("data at address 0x%08lx\n", regs->dar);
-                        break;
-                case 0x400:
-                case 0x480:
-                        printk("instruction fetch\n");
-                        break;
-                default:
-                        printk("unknown fault\n");
+        case 0x300:
+        case 0x380:
+                printk(KERN_ALERT "Unable to handle kernel paging request for "
+                        "data at address 0x%08lx\n", regs->dar);
+                break;
+        case 0x400:
+        case 0x480:
+                printk(KERN_ALERT "Unable to handle kernel paging request for "
+                        "instruction fetch\n");
+                break;
+        default:
+                printk(KERN_ALERT "Unable to handle kernel paging request for "
+                        "unknown fault\n");
+                break;
         }
         printk(KERN_ALERT "Faulting instruction address: 0x%08lx\n",
                 regs->nip);
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
index c90f124f3c71..6f1016acdbf6 100644
--- a/arch/powerpc/mm/hash_native_64.c
+++ b/arch/powerpc/mm/hash_native_64.c
@@ -123,7 +123,7 @@ static inline void native_unlock_hpte(hpte_t *hptep)
         clear_bit(HPTE_LOCK_BIT, word);
 }
 
-long native_hpte_insert(unsigned long hpte_group, unsigned long va,
+static long native_hpte_insert(unsigned long hpte_group, unsigned long va,
                         unsigned long pa, unsigned long rflags,
                         unsigned long vflags, int psize)
 {
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 1915661c2c81..c0d2a694fa30 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -277,7 +277,7 @@ static void __init htab_init_page_sizes(void)
          * Not in the device-tree, let's fallback on known size
          * list for 16M capable GP & GR
          */
-        if (cpu_has_feature(CPU_FTR_16M_PAGE) && !machine_is(iseries))
+        if (cpu_has_feature(CPU_FTR_16M_PAGE))
                 memcpy(mmu_psize_defs, mmu_psize_defaults_gp,
                        sizeof(mmu_psize_defaults_gp));
  found:
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 506d89768d45..1bb20d841080 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -146,6 +146,11 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr)
         return hugepte_offset(hpdp, addr);
 }
 
+int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
+{
+        return 0;
+}
+
 static void free_hugepte_range(struct mmu_gather *tlb, hugepd_t *hpdp)
 {
         pte_t *hugepte = hugepd_page(*hpdp);
@@ -739,7 +744,8 @@ static int htlb_check_hinted_area(unsigned long addr, unsigned long len)
         struct vm_area_struct *vma;
 
         vma = find_vma(current->mm, addr);
-        if (!vma || ((addr + len) <= vma->vm_start))
+        if (TASK_SIZE - len >= addr &&
+            (!vma || ((addr + len) <= vma->vm_start)))
                 return 0;
 
         return -ENOMEM;
@@ -810,6 +816,8 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
                 return -EINVAL;
         if (len & ~HPAGE_MASK)
                 return -EINVAL;
+        if (len > TASK_SIZE)
+                return -ENOMEM;
 
         if (!cpu_has_feature(CPU_FTR_16M_PAGE))
                 return -EINVAL;
@@ -818,9 +826,6 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
         BUG_ON((addr + len)  < addr);
 
         if (test_thread_flag(TIF_32BIT)) {
-                /* Paranoia, caller should have dealt with this */
-                BUG_ON((addr + len) > 0x100000000UL);
-
                 curareas = current->mm->context.low_htlb_areas;
 
                 /* First see if we can use the hint address */
@@ -1042,7 +1047,7 @@ repeat:
         return err;
 }
 
-static void zero_ctor(void *addr, kmem_cache_t *cache, unsigned long flags)
+static void zero_ctor(void *addr, struct kmem_cache *cache, unsigned long flags)
 {
         memset(addr, 0, kmem_cache_size(cache));
 }
diff --git a/arch/powerpc/mm/imalloc.c b/arch/powerpc/mm/imalloc.c
index add8c1a9af68..c831815c31f0 100644
--- a/arch/powerpc/mm/imalloc.c
+++ b/arch/powerpc/mm/imalloc.c
@@ -138,7 +138,7 @@ static struct vm_struct * split_im_region(unsigned long v_addr,
         struct vm_struct *vm2 = NULL;
         struct vm_struct *new_vm = NULL;
         
-        vm1 = (struct vm_struct *) kmalloc(sizeof(*vm1), GFP_KERNEL);
+        vm1 = kmalloc(sizeof(*vm1), GFP_KERNEL);
         if (vm1 == NULL) {
                 printk(KERN_ERR "%s() out of memory\n", __FUNCTION__);
                 return NULL;
@@ -172,7 +172,7 @@ static struct vm_struct * split_im_region(unsigned long v_addr,
                  * uppermost remainder, and use existing parent one for the
                  * lower remainder of parent range
                  */
-                vm2 = (struct vm_struct *) kmalloc(sizeof(*vm2), GFP_KERNEL);
+                vm2 = kmalloc(sizeof(*vm2), GFP_KERNEL);
                 if (vm2 == NULL) {
                         printk(KERN_ERR "%s() out of memory\n", __FUNCTION__);
                         kfree(vm1);
@@ -206,7 +206,7 @@ static struct vm_struct * __add_new_im_area(unsigned long req_addr,
                         break;
         }
         
-        area = (struct vm_struct *) kmalloc(sizeof(*area), GFP_KERNEL);
+        area = kmalloc(sizeof(*area), GFP_KERNEL);
         if (!area)
                 return NULL;
         area->flags = 0;
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 3ff374697e34..d12a87ec5ae9 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -130,7 +130,7 @@ static int __init setup_kcore(void)
                 /* GFP_ATOMIC to avoid might_sleep warnings during boot */
                 kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
                 if (!kcore_mem)
-                        panic("mem_init: kmalloc failed\n");
+                        panic("%s: kmalloc failed\n", __FUNCTION__);
 
                 kclist_add(kcore_mem, __va(base), size);
         }
@@ -141,7 +141,7 @@ static int __init setup_kcore(void)
 }
 module_init(setup_kcore);
 
-static void zero_ctor(void *addr, kmem_cache_t *cache, unsigned long flags)
+static void zero_ctor(void *addr, struct kmem_cache *cache, unsigned long flags)
 {
         memset(addr, 0, kmem_cache_size(cache));
 }
@@ -166,9 +166,9 @@ static const char *pgtable_cache_name[ARRAY_SIZE(pgtable_cache_size)] = {
 /* Hugepages need one extra cache, initialized in hugetlbpage.c.  We
  * can't put into the tables above, because HPAGE_SHIFT is not compile
  * time constant. */
-kmem_cache_t *pgtable_cache[ARRAY_SIZE(pgtable_cache_size)+1];
+struct kmem_cache *pgtable_cache[ARRAY_SIZE(pgtable_cache_size)+1];
 #else
-kmem_cache_t *pgtable_cache[ARRAY_SIZE(pgtable_cache_size)];
+struct kmem_cache *pgtable_cache[ARRAY_SIZE(pgtable_cache_size)];
 #endif
 
 void pgtable_cache_init(void)
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 9da01dc8cfd9..262790910ff2 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -295,6 +295,63 @@ static unsigned long __init numa_enforce_memory_limit(unsigned long start,
         return lmb_end_of_DRAM() - start;
 }
 
+/*
+ * Extract NUMA information from the ibm,dynamic-reconfiguration-memory
+ * node.  This assumes n_mem_{addr,size}_cells have been set.
+ */
+static void __init parse_drconf_memory(struct device_node *memory)
+{
+        const unsigned int *lm, *dm, *aa;
+        unsigned int ls, ld, la;
+        unsigned int n, aam, aalen;
+        unsigned long lmb_size, size;
+        int nid, default_nid = 0;
+        unsigned int start, ai, flags;
+
+        lm = get_property(memory, "ibm,lmb-size", &ls);
+        dm = get_property(memory, "ibm,dynamic-memory", &ld);
+        aa = get_property(memory, "ibm,associativity-lookup-arrays", &la);
+        if (!lm || !dm || !aa ||
+            ls < sizeof(unsigned int) || ld < sizeof(unsigned int) ||
+            la < 2 * sizeof(unsigned int))
+                return;
+
+        lmb_size = read_n_cells(n_mem_size_cells, &lm);
+        n = *dm++;              /* number of LMBs */
+        aam = *aa++;            /* number of associativity lists */
+        aalen = *aa++;          /* length of each associativity list */
+        if (ld < (n * (n_mem_addr_cells + 4) + 1) * sizeof(unsigned int) ||
+            la < (aam * aalen + 2) * sizeof(unsigned int))
+                return;
+
+        for (; n != 0; --n) {
+                start = read_n_cells(n_mem_addr_cells, &dm);
+                ai = dm[2];
+                flags = dm[3];
+                dm += 4;
+                /* 0x80 == reserved, 0x8 = assigned to us */
+                if ((flags & 0x80) || !(flags & 0x8))
+                        continue;
+                nid = default_nid;
+                /* flags & 0x40 means associativity index is invalid */
+                if (min_common_depth > 0 && min_common_depth <= aalen &&
+                    (flags & 0x40) == 0 && ai < aam) {
+                        /* this is like of_node_to_nid_single */
+                        nid = aa[ai * aalen + min_common_depth - 1];
+                        if (nid == 0xffff || nid >= MAX_NUMNODES)
+                                nid = default_nid;
+                }
+                node_set_online(nid);
+
+                size = numa_enforce_memory_limit(start, lmb_size);
+                if (!size)
+                        continue;
+
+                add_active_range(nid, start >> PAGE_SHIFT,
+                                 (start >> PAGE_SHIFT) + (size >> PAGE_SHIFT));
+        }
+}
+
 static int __init parse_numa_properties(void)
 {
         struct device_node *cpu = NULL;
@@ -385,6 +442,14 @@ new_range:
                         goto new_range;
         }
 
+        /*
+         * Now do the same thing for each LMB listed in the ibm,dynamic-memory
+         * property in the ibm,dynamic-reconfiguration-memory node.
+         */
+        memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
+        if (memory)
+                parse_drconf_memory(memory);
+
         return 0;
 }
 
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index 8fcacb0239da..1891dbeeb8e9 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -141,29 +141,19 @@ void pte_free(struct page *ptepage)
         __free_page(ptepage);
 }
 
-#ifndef CONFIG_PHYS_64BIT
 void __iomem *
 ioremap(phys_addr_t addr, unsigned long size)
 {
         return __ioremap(addr, size, _PAGE_NO_CACHE);
 }
-#else /* CONFIG_PHYS_64BIT */
-void __iomem *
-ioremap64(unsigned long long addr, unsigned long size)
-{
-        return __ioremap(addr, size, _PAGE_NO_CACHE);
-}
-EXPORT_SYMBOL(ioremap64);
+EXPORT_SYMBOL(ioremap);
 
 void __iomem *
-ioremap(phys_addr_t addr, unsigned long size)
+ioremap_flags(phys_addr_t addr, unsigned long size, unsigned long flags)
 {
-        phys_addr_t addr64 = fixup_bigphys_addr(addr, size);
-
-        return ioremap64(addr64, size);
+        return __ioremap(addr, size, flags);
 }
-#endif /* CONFIG_PHYS_64BIT */
-EXPORT_SYMBOL(ioremap);
+EXPORT_SYMBOL(ioremap_flags);
 
 void __iomem *
 __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
@@ -264,20 +254,7 @@ void iounmap(volatile void __iomem *addr)
 }
 EXPORT_SYMBOL(iounmap);
 
-void __iomem *ioport_map(unsigned long port, unsigned int len)
-{
-        return (void __iomem *) (port + _IO_BASE);
-}
-
-void ioport_unmap(void __iomem *addr)
-{
-        /* Nothing to do */
-}
-EXPORT_SYMBOL(ioport_map);
-EXPORT_SYMBOL(ioport_unmap);
-
-int
-map_page(unsigned long va, phys_addr_t pa, int flags)
+int map_page(unsigned long va, phys_addr_t pa, int flags)
 {
         pmd_t *pd;
         pte_t *pg;
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index ac64f4aaa509..16e4ee1c2318 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -113,7 +113,7 @@ static int map_io_page(unsigned long ea, unsigned long pa, int flags)
 }
 
 
-static void __iomem * __ioremap_com(unsigned long addr, unsigned long pa,
+static void __iomem * __ioremap_com(phys_addr_t addr, unsigned long pa,
                             unsigned long ea, unsigned long size,
                             unsigned long flags)
 {
@@ -129,22 +129,12 @@ static void __iomem * __ioremap_com(unsigned long addr, unsigned long pa,
         return (void __iomem *) (ea + (addr & ~PAGE_MASK));
 }
 
-
-void __iomem *
-ioremap(unsigned long addr, unsigned long size)
-{
-        return __ioremap(addr, size, _PAGE_NO_CACHE | _PAGE_GUARDED);
-}
-
-void __iomem * __ioremap(unsigned long addr, unsigned long size,
+void __iomem * __ioremap(phys_addr_t addr, unsigned long size,
                          unsigned long flags)
 {
         unsigned long pa, ea;
         void __iomem *ret;
 
-        if (firmware_has_feature(FW_FEATURE_ISERIES))
-                return (void __iomem *)addr;
-
         /*
          * Choose an address to map it to.
          * Once the imalloc system is running, we use it.
@@ -178,9 +168,28 @@ void __iomem * __ioremap(unsigned long addr, unsigned long size,
         return ret;
 }
 
+
+void __iomem * ioremap(phys_addr_t addr, unsigned long size)
+{
+        unsigned long flags = _PAGE_NO_CACHE | _PAGE_GUARDED;
+
+        if (ppc_md.ioremap)
+                return ppc_md.ioremap(addr, size, flags);
+        return __ioremap(addr, size, flags);
+}
+
+void __iomem * ioremap_flags(phys_addr_t addr, unsigned long size,
+                             unsigned long flags)
+{
+        if (ppc_md.ioremap)
+                return ppc_md.ioremap(addr, size, flags);
+        return __ioremap(addr, size, flags);
+}
+
+
 #define IS_PAGE_ALIGNED(_val) ((_val) == ((_val) & PAGE_MASK))
 
-int __ioremap_explicit(unsigned long pa, unsigned long ea,
+int __ioremap_explicit(phys_addr_t pa, unsigned long ea,
                        unsigned long size, unsigned long flags)
 {
         struct vm_struct *area;
@@ -235,13 +244,10 @@ int __ioremap_explicit(unsigned long pa, unsigned long ea,
  *
  * XXX  what about calls before mem_init_done (ie python_countermeasures())
  */
-void iounmap(volatile void __iomem *token)
+void __iounmap(volatile void __iomem *token)
 {
         void *addr;
 
-        if (firmware_has_feature(FW_FEATURE_ISERIES))
-                return;
-
         if (!mem_init_done)
                 return;
         
@@ -250,6 +256,14 @@ void iounmap(volatile void __iomem *token)
         im_free(addr);
 }
 
+void iounmap(volatile void __iomem *token)
+{
+        if (ppc_md.iounmap)
+                ppc_md.iounmap(token);
+        else
+                __iounmap(token);
+}
+
 static int iounmap_subset_regions(unsigned long addr, unsigned long size)
 {
         struct vm_struct *area;
@@ -268,7 +282,7 @@ static int iounmap_subset_regions(unsigned long addr, unsigned long size)
         return 0;
 }
 
-int iounmap_explicit(volatile void __iomem *start, unsigned long size)
+int __iounmap_explicit(volatile void __iomem *start, unsigned long size)
 {
         struct vm_struct *area;
         unsigned long addr;
@@ -303,8 +317,10 @@ int iounmap_explicit(volatile void __iomem *start, unsigned long size)
 }
 
 EXPORT_SYMBOL(ioremap);
+EXPORT_SYMBOL(ioremap_flags);
 EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(iounmap);
+EXPORT_SYMBOL(__iounmap);
 
 void __iomem * reserve_phb_iospace(unsigned long size)
 {
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index d3733912adb4..224e960650a0 100644
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -23,6 +23,7 @@
 #include <asm/cputable.h>
 #include <asm/cacheflush.h>
 #include <asm/smp.h>
+#include <asm/firmware.h>
 #include <linux/compiler.h>
 
 #ifdef DEBUG
@@ -193,6 +194,7 @@ static inline void patch_slb_encoding(unsigned int *insn_addr,
 void slb_initialize(void)
 {
         unsigned long linear_llp, vmalloc_llp, io_llp;
+        unsigned long lflags, vflags;
         static int slb_encoding_inited;
         extern unsigned int *slb_miss_kernel_load_linear;
         extern unsigned int *slb_miss_kernel_load_io;
@@ -225,11 +227,12 @@ void slb_initialize(void)
 #endif
         }
 
+        get_paca()->stab_rr = SLB_NUM_BOLTED;
+
         /* On iSeries the bolted entries have already been set up by
          * the hypervisor from the lparMap data in head.S */
-#ifndef CONFIG_PPC_ISERIES
- {
-        unsigned long lflags, vflags;
+        if (firmware_has_feature(FW_FEATURE_ISERIES))
+                return;
 
         lflags = SLB_VSID_KERNEL | linear_llp;
         vflags = SLB_VSID_KERNEL | vmalloc_llp;
@@ -247,8 +250,4 @@ void slb_initialize(void)
          * elsewhere, we'll call _switch() which will bolt in the new
          * one. */
         asm volatile("isync":::"memory");
- }
-#endif /* CONFIG_PPC_ISERIES */
-
-        get_paca()->stab_rr = SLB_NUM_BOLTED;
 }
diff --git a/arch/powerpc/oprofile/Makefile b/arch/powerpc/oprofile/Makefile
index 0b5df9c96ae0..4ccef2d5530c 100644
--- a/arch/powerpc/oprofile/Makefile
+++ b/arch/powerpc/oprofile/Makefile
@@ -11,6 +11,7 @@ DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \
                 timer_int.o )
 
 oprofile-y := $(DRIVER_OBJS) common.o backtrace.o
+oprofile-$(CONFIG_PPC_CELL_NATIVE) += op_model_cell.o
 oprofile-$(CONFIG_PPC64) += op_model_rs64.o op_model_power4.o
 oprofile-$(CONFIG_FSL_BOOKE) += op_model_fsl_booke.o
 oprofile-$(CONFIG_6xx) += op_model_7450.o
diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index 63bbef3b63f1..b6d82390b6a6 100644
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -69,7 +69,10 @@ static void op_powerpc_cpu_start(void *dummy)
 
 static int op_powerpc_start(void)
 {
-        on_each_cpu(op_powerpc_cpu_start, NULL, 0, 1);
+        if (model->global_start)
+                model->global_start(ctr);
+        if (model->start)
+                on_each_cpu(op_powerpc_cpu_start, NULL, 0, 1);
         return 0;
 }
 
@@ -80,7 +83,10 @@ static inline void op_powerpc_cpu_stop(void *dummy)
 
 static void op_powerpc_stop(void)
 {
-        on_each_cpu(op_powerpc_cpu_stop, NULL, 0, 1);
+        if (model->stop)
+                on_each_cpu(op_powerpc_cpu_stop, NULL, 0, 1);
+        if (model->global_stop)
+                model->global_stop();
 }
 
 static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
@@ -141,6 +147,11 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 
         switch (cur_cpu_spec->oprofile_type) {
 #ifdef CONFIG_PPC64
+#ifdef CONFIG_PPC_CELL_NATIVE
+                case PPC_OPROFILE_CELL:
+                        model = &op_model_cell;
+                        break;
+#endif
                 case PPC_OPROFILE_RS64:
                         model = &op_model_rs64;
                         break;
diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c
new file mode 100644
index 000000000000..2eb15f388103
--- /dev/null
+++ b/arch/powerpc/oprofile/op_model_cell.c
@@ -0,0 +1,724 @@
+/*
+ * Cell Broadband Engine OProfile Support
+ *
+ * (C) Copyright IBM Corporation 2006
+ *
+ * Author: David Erb (djerb@us.ibm.com)
+ * Modifications:
+ *         Carl Love <carll@us.ibm.com>
+ *         Maynard Johnson <maynardj@us.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/cpufreq.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/jiffies.h>
+#include <linux/kthread.h>
+#include <linux/oprofile.h>
+#include <linux/percpu.h>
+#include <linux/smp.h>
+#include <linux/spinlock.h>
+#include <linux/timer.h>
+#include <asm/cell-pmu.h>
+#include <asm/cputable.h>
+#include <asm/firmware.h>
+#include <asm/io.h>
+#include <asm/oprofile_impl.h>
+#include <asm/processor.h>
+#include <asm/prom.h>
+#include <asm/ptrace.h>
+#include <asm/reg.h>
+#include <asm/rtas.h>
+#include <asm/system.h>
+
+#include "../platforms/cell/interrupt.h"
+
+#define PPU_CYCLES_EVENT_NUM 1  /*  event number for CYCLES */
+#define CBE_COUNT_ALL_CYCLES 0x42800000 /* PPU cycle event specifier */
+
+#define NUM_THREADS 2
+#define VIRT_CNTR_SW_TIME_NS 100000000  // 0.5 seconds
+
+struct pmc_cntrl_data {
+        unsigned long vcntr;
+        unsigned long evnts;
+        unsigned long masks;
+        unsigned long enabled;
+};
+
+/*
+ * ibm,cbe-perftools rtas parameters
+ */
+
+struct pm_signal {
+        u16 cpu;                /* Processor to modify */
+        u16 sub_unit;           /* hw subunit this applies to (if applicable) */
+        u16 signal_group;       /* Signal Group to Enable/Disable */
+        u8 bus_word;            /* Enable/Disable on this Trace/Trigger/Event
+                                 * Bus Word(s) (bitmask)
+                                 */
+        u8 bit;                 /* Trigger/Event bit (if applicable) */
+};
+
+/*
+ * rtas call arguments
+ */
+enum {
+        SUBFUNC_RESET = 1,
+        SUBFUNC_ACTIVATE = 2,
+        SUBFUNC_DEACTIVATE = 3,
+
+        PASSTHRU_IGNORE = 0,
+        PASSTHRU_ENABLE = 1,
+        PASSTHRU_DISABLE = 2,
+};
+
+struct pm_cntrl {
+        u16 enable;
+        u16 stop_at_max;
+        u16 trace_mode;
+        u16 freeze;
+        u16 count_mode;
+};
+
+static struct {
+        u32 group_control;
+        u32 debug_bus_control;
+        struct pm_cntrl pm_cntrl;
+        u32 pm07_cntrl[NR_PHYS_CTRS];
+} pm_regs;
+
+
+#define GET_SUB_UNIT(x) ((x & 0x0000f000) >> 12)
+#define GET_BUS_WORD(x) ((x & 0x000000f0) >> 4)
+#define GET_BUS_TYPE(x) ((x & 0x00000300) >> 8)
+#define GET_POLARITY(x) ((x & 0x00000002) >> 1)
+#define GET_COUNT_CYCLES(x) (x & 0x00000001)
+#define GET_INPUT_CONTROL(x) ((x & 0x00000004) >> 2)
+
+
+static DEFINE_PER_CPU(unsigned long[NR_PHYS_CTRS], pmc_values);
+
+static struct pmc_cntrl_data pmc_cntrl[NUM_THREADS][NR_PHYS_CTRS];
+
+/* Interpetation of hdw_thread:
+ * 0 - even virtual cpus 0, 2, 4,...
+ * 1 - odd virtual cpus 1, 3, 5, ...
+ */
+static u32 hdw_thread;
+
+static u32 virt_cntr_inter_mask;
+static struct timer_list timer_virt_cntr;
+
+/* pm_signal needs to be global since it is initialized in
+ * cell_reg_setup at the time when the necessary information
+ * is available.
+ */
+static struct pm_signal pm_signal[NR_PHYS_CTRS];
+static int pm_rtas_token;
+
+static u32 reset_value[NR_PHYS_CTRS];
+static int num_counters;
+static int oprofile_running;
+static spinlock_t virt_cntr_lock = SPIN_LOCK_UNLOCKED;
+
+static u32 ctr_enabled;
+
+static unsigned char trace_bus[4];
+static unsigned char input_bus[2];
+
+/*
+ * Firmware interface functions
+ */
+static int
+rtas_ibm_cbe_perftools(int subfunc, int passthru,
+                       void *address, unsigned long length)
+{
+        u64 paddr = __pa(address);
+
+        return rtas_call(pm_rtas_token, 5, 1, NULL, subfunc, passthru,
+                         paddr >> 32, paddr & 0xffffffff, length);
+}
+
+static void pm_rtas_reset_signals(u32 node)
+{
+        int ret;
+        struct pm_signal pm_signal_local;
+
+        /*  The debug bus is being set to the passthru disable state.
+         *  However, the FW still expects atleast one legal signal routing
+         *  entry or it will return an error on the arguments.  If we don't
+         *  supply a valid entry, we must ignore all return values.  Ignoring
+         *  all return values means we might miss an error we should be
+         *  concerned about.
+         */
+
+        /*  fw expects physical cpu #. */
+        pm_signal_local.cpu = node;
+        pm_signal_local.signal_group = 21;
+        pm_signal_local.bus_word = 1;
+        pm_signal_local.sub_unit = 0;
+        pm_signal_local.bit = 0;
+
+        ret = rtas_ibm_cbe_perftools(SUBFUNC_RESET, PASSTHRU_DISABLE,
+                                     &pm_signal_local,
+                                     sizeof(struct pm_signal));
+
+        if (ret)
+                printk(KERN_WARNING "%s: rtas returned: %d\n",
+                       __FUNCTION__, ret);
+}
+
+static void pm_rtas_activate_signals(u32 node, u32 count)
+{
+        int ret;
+        int j;
+        struct pm_signal pm_signal_local[NR_PHYS_CTRS];
+
+        for (j = 0; j < count; j++) {
+                /* fw expects physical cpu # */
+                pm_signal_local[j].cpu = node;
+                pm_signal_local[j].signal_group = pm_signal[j].signal_group;
+                pm_signal_local[j].bus_word = pm_signal[j].bus_word;
+                pm_signal_local[j].sub_unit = pm_signal[j].sub_unit;
+                pm_signal_local[j].bit = pm_signal[j].bit;
+        }
+
+        ret = rtas_ibm_cbe_perftools(SUBFUNC_ACTIVATE, PASSTHRU_ENABLE,
+                                     pm_signal_local,
+                                     count * sizeof(struct pm_signal));
+
+        if (ret)
+                printk(KERN_WARNING "%s: rtas returned: %d\n",
+                       __FUNCTION__, ret);
+}
+
+/*
+ * PM Signal functions
+ */
+static void set_pm_event(u32 ctr, int event, u32 unit_mask)
+{
+        struct pm_signal *p;
+        u32 signal_bit;
+        u32 bus_word, bus_type, count_cycles, polarity, input_control;
+        int j, i;
+
+        if (event == PPU_CYCLES_EVENT_NUM) {
+                /* Special Event: Count all cpu cycles */
+                pm_regs.pm07_cntrl[ctr] = CBE_COUNT_ALL_CYCLES;
+                p = &(pm_signal[ctr]);
+                p->signal_group = 21;
+                p->bus_word = 1;
+                p->sub_unit = 0;
+                p->bit = 0;
+                goto out;
+        } else {
+                pm_regs.pm07_cntrl[ctr] = 0;
+        }
+
+        bus_word = GET_BUS_WORD(unit_mask);
+        bus_type = GET_BUS_TYPE(unit_mask);
+        count_cycles = GET_COUNT_CYCLES(unit_mask);
+        polarity = GET_POLARITY(unit_mask);
+        input_control = GET_INPUT_CONTROL(unit_mask);
+        signal_bit = (event % 100);
+
+        p = &(pm_signal[ctr]);
+
+        p->signal_group = event / 100;
+        p->bus_word = bus_word;
+        p->sub_unit = unit_mask & 0x0000f000;
+
+        pm_regs.pm07_cntrl[ctr] = 0;
+        pm_regs.pm07_cntrl[ctr] |= PM07_CTR_COUNT_CYCLES(count_cycles);
+        pm_regs.pm07_cntrl[ctr] |= PM07_CTR_POLARITY(polarity);
+        pm_regs.pm07_cntrl[ctr] |= PM07_CTR_INPUT_CONTROL(input_control);
+
+        if (input_control == 0) {
+                if (signal_bit > 31) {
+                        signal_bit -= 32;
+                        if (bus_word == 0x3)
+                                bus_word = 0x2;
+                        else if (bus_word == 0xc)
+                                bus_word = 0x8;
+                }
+
+                if ((bus_type == 0) && p->signal_group >= 60)
+                        bus_type = 2;
+                if ((bus_type == 1) && p->signal_group >= 50)
+                        bus_type = 0;
+
+                pm_regs.pm07_cntrl[ctr] |= PM07_CTR_INPUT_MUX(signal_bit);
+        } else {
+                pm_regs.pm07_cntrl[ctr] = 0;
+                p->bit = signal_bit;
+        }
+
+        for (i = 0; i < 4; i++) {
+                if (bus_word & (1 << i)) {
+                        pm_regs.debug_bus_control |=
+                            (bus_type << (31 - (2 * i) + 1));
+
+                        for (j = 0; j < 2; j++) {
+                                if (input_bus[j] == 0xff) {
+                                        input_bus[j] = i;
+                                        pm_regs.group_control |=
+                                            (i << (31 - i));
+                                        break;
+                                }
+                        }
+                }
+        }
+out:
+        ;
+}
+
+static void write_pm_cntrl(int cpu, struct pm_cntrl *pm_cntrl)
+{
+        /* Oprofile will use 32 bit counters, set bits 7:10 to 0 */
+        u32 val = 0;
+        if (pm_cntrl->enable == 1)
+                val |= CBE_PM_ENABLE_PERF_MON;
+
+        if (pm_cntrl->stop_at_max == 1)
+                val |= CBE_PM_STOP_AT_MAX;
+
+        if (pm_cntrl->trace_mode == 1)
+                val |= CBE_PM_TRACE_MODE_SET(pm_cntrl->trace_mode);
+
+        if (pm_cntrl->freeze == 1)
+                val |= CBE_PM_FREEZE_ALL_CTRS;
+
+        /* Routine set_count_mode must be called previously to set
+         * the count mode based on the user selection of user and kernel.
+         */
+        val |= CBE_PM_COUNT_MODE_SET(pm_cntrl->count_mode);
+        cbe_write_pm(cpu, pm_control, val);
+}
+
+static inline void
+set_count_mode(u32 kernel, u32 user, struct pm_cntrl *pm_cntrl)
+{
+        /* The user must specify user and kernel if they want them. If
+         *  neither is specified, OProfile will count in hypervisor mode
+         */
+        if (kernel) {
+                if (user)
+                        pm_cntrl->count_mode = CBE_COUNT_ALL_MODES;
+                else
+                        pm_cntrl->count_mode = CBE_COUNT_SUPERVISOR_MODE;
+        } else {
+                if (user)
+                        pm_cntrl->count_mode = CBE_COUNT_PROBLEM_MODE;
+                else
+                        pm_cntrl->count_mode = CBE_COUNT_HYPERVISOR_MODE;
+        }
+}
+
+static inline void enable_ctr(u32 cpu, u32 ctr, u32 * pm07_cntrl)
+{
+
+        pm07_cntrl[ctr] |= PM07_CTR_ENABLE(1);
+        cbe_write_pm07_control(cpu, ctr, pm07_cntrl[ctr]);
+}
+
+/*
+ * Oprofile is expected to collect data on all CPUs simultaneously.
+ * However, there is one set of performance counters per node.  There are
+ * two hardware threads or virtual CPUs on each node.  Hence, OProfile must
+ * multiplex in time the performance counter collection on the two virtual
+ * CPUs.  The multiplexing of the performance counters is done by this
+ * virtual counter routine.
+ *
+ * The pmc_values used below is defined as 'per-cpu' but its use is
+ * more akin to 'per-node'.  We need to store two sets of counter
+ * values per node -- one for the previous run and one for the next.
+ * The per-cpu[NR_PHYS_CTRS] gives us the storage we need.  Each odd/even
+ * pair of per-cpu arrays is used for storing the previous and next
+ * pmc values for a given node.
+ * NOTE: We use the per-cpu variable to improve cache performance.
+ */
+static void cell_virtual_cntr(unsigned long data)
+{
+        /* This routine will alternate loading the virtual counters for
+         * virtual CPUs
+         */
+        int i, prev_hdw_thread, next_hdw_thread;
+        u32 cpu;
+        unsigned long flags;
+
+        /* Make sure that the interrupt_hander and
+         * the virt counter are not both playing with
+         * the counters on the same node.
+         */
+
+        spin_lock_irqsave(&virt_cntr_lock, flags);
+
+        prev_hdw_thread = hdw_thread;
+
+        /* switch the cpu handling the interrupts */
+        hdw_thread = 1 ^ hdw_thread;
+        next_hdw_thread = hdw_thread;
+
+        /* The following is done only once per each node, but
+         * we need cpu #, not node #, to pass to the cbe_xxx functions.
+         */
+        for_each_online_cpu(cpu) {
+                if (cbe_get_hw_thread_id(cpu))
+                        continue;
+
+                /* stop counters, save counter values, restore counts
+                 * for previous thread
+                 */
+                cbe_disable_pm(cpu);
+                cbe_disable_pm_interrupts(cpu);
+                for (i = 0; i < num_counters; i++) {
+                        per_cpu(pmc_values, cpu + prev_hdw_thread)[i]
+                            = cbe_read_ctr(cpu, i);
+
+                        if (per_cpu(pmc_values, cpu + next_hdw_thread)[i]
+                            == 0xFFFFFFFF)
+                                /* If the cntr value is 0xffffffff, we must
+                                 * reset that to 0xfffffff0 when the current
+                                 * thread is restarted.  This will generate a new
+                                 * interrupt and make sure that we never restore
+                                 * the counters to the max value.  If the counters
+                                 * were restored to the max value, they do not
+                                 * increment and no interrupts are generated.  Hence
+                                 * no more samples will be collected on that cpu.
+                                 */
+                                cbe_write_ctr(cpu, i, 0xFFFFFFF0);
+                        else
+                                cbe_write_ctr(cpu, i,
+                                              per_cpu(pmc_values,
+                                                      cpu +
+                                                      next_hdw_thread)[i]);
+                }
+
+                /* Switch to the other thread. Change the interrupt
+                 * and control regs to be scheduled on the CPU
+                 * corresponding to the thread to execute.
+                 */
+                for (i = 0; i < num_counters; i++) {
+                        if (pmc_cntrl[next_hdw_thread][i].enabled) {
+                                /* There are some per thread events.
+                                 * Must do the set event, enable_cntr
+                                 * for each cpu.
+                                 */
+                                set_pm_event(i,
+                                     pmc_cntrl[next_hdw_thread][i].evnts,
+                                     pmc_cntrl[next_hdw_thread][i].masks);
+                                enable_ctr(cpu, i,
+                                           pm_regs.pm07_cntrl);
+                        } else {
+                                cbe_write_pm07_control(cpu, i, 0);
+                        }
+                }
+
+                /* Enable interrupts on the CPU thread that is starting */
+                cbe_enable_pm_interrupts(cpu, next_hdw_thread,
+                                         virt_cntr_inter_mask);
+                cbe_enable_pm(cpu);
+        }
+
+        spin_unlock_irqrestore(&virt_cntr_lock, flags);
+
+        mod_timer(&timer_virt_cntr, jiffies + HZ / 10);
+}
+
+static void start_virt_cntrs(void)
+{
+        init_timer(&timer_virt_cntr);
+        timer_virt_cntr.function = cell_virtual_cntr;
+        timer_virt_cntr.data = 0UL;
+        timer_virt_cntr.expires = jiffies + HZ / 10;
+        add_timer(&timer_virt_cntr);
+}
+
+/* This function is called once for all cpus combined */
+static void
+cell_reg_setup(struct op_counter_config *ctr,
+               struct op_system_config *sys, int num_ctrs)
+{
+        int i, j, cpu;
+
+        pm_rtas_token = rtas_token("ibm,cbe-perftools");
+        if (pm_rtas_token == RTAS_UNKNOWN_SERVICE) {
+                printk(KERN_WARNING "%s: RTAS_UNKNOWN_SERVICE\n",
+                       __FUNCTION__);
+                goto out;
+        }
+
+        num_counters = num_ctrs;
+
+        pm_regs.group_control = 0;
+        pm_regs.debug_bus_control = 0;
+
+        /* setup the pm_control register */
+        memset(&pm_regs.pm_cntrl, 0, sizeof(struct pm_cntrl));
+        pm_regs.pm_cntrl.stop_at_max = 1;
+        pm_regs.pm_cntrl.trace_mode = 0;
+        pm_regs.pm_cntrl.freeze = 1;
+
+        set_count_mode(sys->enable_kernel, sys->enable_user,
+                       &pm_regs.pm_cntrl);
+
+        /* Setup the thread 0 events */
+        for (i = 0; i < num_ctrs; ++i) {
+
+                pmc_cntrl[0][i].evnts = ctr[i].event;
+                pmc_cntrl[0][i].masks = ctr[i].unit_mask;
+                pmc_cntrl[0][i].enabled = ctr[i].enabled;
+                pmc_cntrl[0][i].vcntr = i;
+
+                for_each_possible_cpu(j)
+                        per_cpu(pmc_values, j)[i] = 0;
+        }
+
+        /* Setup the thread 1 events, map the thread 0 event to the
+         * equivalent thread 1 event.
+         */
+        for (i = 0; i < num_ctrs; ++i) {
+                if ((ctr[i].event >= 2100) && (ctr[i].event <= 2111))
+                        pmc_cntrl[1][i].evnts = ctr[i].event + 19;
+                else if (ctr[i].event == 2203)
+                        pmc_cntrl[1][i].evnts = ctr[i].event;
+                else if ((ctr[i].event >= 2200) && (ctr[i].event <= 2215))
+                        pmc_cntrl[1][i].evnts = ctr[i].event + 16;
+                else
+                        pmc_cntrl[1][i].evnts = ctr[i].event;
+
+                pmc_cntrl[1][i].masks = ctr[i].unit_mask;
+                pmc_cntrl[1][i].enabled = ctr[i].enabled;
+                pmc_cntrl[1][i].vcntr = i;
+        }
+
+        for (i = 0; i < 4; i++)
+                trace_bus[i] = 0xff;
+
+        for (i = 0; i < 2; i++)
+                input_bus[i] = 0xff;
+
+        /* Our counters count up, and "count" refers to
+         * how much before the next interrupt, and we interrupt
+         * on overflow.  So we calculate the starting value
+         * which will give us "count" until overflow.
+         * Then we set the events on the enabled counters.
+         */
+        for (i = 0; i < num_counters; ++i) {
+                /* start with virtual counter set 0 */
+                if (pmc_cntrl[0][i].enabled) {
+                        /* Using 32bit counters, reset max - count */
+                        reset_value[i] = 0xFFFFFFFF - ctr[i].count;
+                        set_pm_event(i,
+                                     pmc_cntrl[0][i].evnts,
+                                     pmc_cntrl[0][i].masks);
+
+                        /* global, used by cell_cpu_setup */
+                        ctr_enabled |= (1 << i);
+                }
+        }
+
+        /* initialize the previous counts for the virtual cntrs */
+        for_each_online_cpu(cpu)
+                for (i = 0; i < num_counters; ++i) {
+                        per_cpu(pmc_values, cpu)[i] = reset_value[i];
+                }
+out:
+        ;
+}
+
+/* This function is called once for each cpu */
+static void cell_cpu_setup(struct op_counter_config *cntr)
+{
+        u32 cpu = smp_processor_id();
+        u32 num_enabled = 0;
+        int i;
+
+        /* There is one performance monitor per processor chip (i.e. node),
+         * so we only need to perform this function once per node.
+         */
+        if (cbe_get_hw_thread_id(cpu))
+                goto out;
+
+        if (pm_rtas_token == RTAS_UNKNOWN_SERVICE) {
+                printk(KERN_WARNING "%s: RTAS_UNKNOWN_SERVICE\n",
+                       __FUNCTION__);
+                goto out;
+        }
+
+        /* Stop all counters */
+        cbe_disable_pm(cpu);
+        cbe_disable_pm_interrupts(cpu);
+
+        cbe_write_pm(cpu, pm_interval, 0);
+        cbe_write_pm(cpu, pm_start_stop, 0);
+        cbe_write_pm(cpu, group_control, pm_regs.group_control);
+        cbe_write_pm(cpu, debug_bus_control, pm_regs.debug_bus_control);
+        write_pm_cntrl(cpu, &pm_regs.pm_cntrl);
+
+        for (i = 0; i < num_counters; ++i) {
+                if (ctr_enabled & (1 << i)) {
+                        pm_signal[num_enabled].cpu = cbe_cpu_to_node(cpu);
+                        num_enabled++;
+                }
+        }
+
+        pm_rtas_activate_signals(cbe_cpu_to_node(cpu), num_enabled);
+out:
+        ;
+}
+
+static void cell_global_start(struct op_counter_config *ctr)
+{
+        u32 cpu;
+        u32 interrupt_mask = 0;
+        u32 i;
+
+        /* This routine gets called once for the system.
+         * There is one performance monitor per node, so we
+         * only need to perform this function once per node.
+         */
+        for_each_online_cpu(cpu) {
+                if (cbe_get_hw_thread_id(cpu))
+                        continue;
+
+                interrupt_mask = 0;
+
+                for (i = 0; i < num_counters; ++i) {
+                        if (ctr_enabled & (1 << i)) {
+                                cbe_write_ctr(cpu, i, reset_value[i]);
+                                enable_ctr(cpu, i, pm_regs.pm07_cntrl);
+                                interrupt_mask |=
+                                    CBE_PM_CTR_OVERFLOW_INTR(i);
+                        } else {
+                                /* Disable counter */
+                                cbe_write_pm07_control(cpu, i, 0);
+                        }
+                }
+
+                cbe_clear_pm_interrupts(cpu);
+                cbe_enable_pm_interrupts(cpu, hdw_thread, interrupt_mask);
+                cbe_enable_pm(cpu);
+        }
+
+        virt_cntr_inter_mask = interrupt_mask;
+        oprofile_running = 1;
+        smp_wmb();
+
+        /* NOTE: start_virt_cntrs will result in cell_virtual_cntr() being
+         * executed which manipulates the PMU.  We start the "virtual counter"
+         * here so that we do not need to synchronize access to the PMU in
+         * the above for-loop.
+         */
+        start_virt_cntrs();
+}
+
+static void cell_global_stop(void)
+{
+        int cpu;
+
+        /* This routine will be called once for the system.
+         * There is one performance monitor per node, so we
+         * only need to perform this function once per node.
+         */
+        del_timer_sync(&timer_virt_cntr);
+        oprofile_running = 0;
+        smp_wmb();
+
+        for_each_online_cpu(cpu) {
+                if (cbe_get_hw_thread_id(cpu))
+                        continue;
+
+                cbe_sync_irq(cbe_cpu_to_node(cpu));
+                /* Stop the counters */
+                cbe_disable_pm(cpu);
+
+                /* Deactivate the signals */
+                pm_rtas_reset_signals(cbe_cpu_to_node(cpu));
+
+                /* Deactivate interrupts */
+                cbe_disable_pm_interrupts(cpu);
+        }
+}
+
+static void
+cell_handle_interrupt(struct pt_regs *regs, struct op_counter_config *ctr)
+{
+        u32 cpu;
+        u64 pc;
+        int is_kernel;
+        unsigned long flags = 0;
+        u32 interrupt_mask;
+        int i;
+
+        cpu = smp_processor_id();
+
+        /* Need to make sure the interrupt handler and the virt counter
+         * routine are not running at the same time. See the
+         * cell_virtual_cntr() routine for additional comments.
+         */
+        spin_lock_irqsave(&virt_cntr_lock, flags);
+
+        /* Need to disable and reenable the performance counters
+         * to get the desired behavior from the hardware.  This
+         * is hardware specific.
+         */
+
+        cbe_disable_pm(cpu);
+
+        interrupt_mask = cbe_clear_pm_interrupts(cpu);
+
+        /* If the interrupt mask has been cleared, then the virt cntr
+         * has cleared the interrupt.  When the thread that generated
+         * the interrupt is restored, the data count will be restored to
+         * 0xffffff0 to cause the interrupt to be regenerated.
+         */
+
+        if ((oprofile_running == 1) && (interrupt_mask != 0)) {
+                pc = regs->nip;
+                is_kernel = is_kernel_addr(pc);
+
+                for (i = 0; i < num_counters; ++i) {
+                        if ((interrupt_mask & CBE_PM_CTR_OVERFLOW_INTR(i))
+                            && ctr[i].enabled) {
+                                oprofile_add_pc(pc, is_kernel, i);
+                                cbe_write_ctr(cpu, i, reset_value[i]);
+                        }
+                }
+
+                /* The counters were frozen by the interrupt.
+                 * Reenable the interrupt and restart the counters.
+                 * If there was a race between the interrupt handler and
+                 * the virtual counter routine.  The virutal counter
+                 * routine may have cleared the interrupts.  Hence must
+                 * use the virt_cntr_inter_mask to re-enable the interrupts.
+                 */
+                cbe_enable_pm_interrupts(cpu, hdw_thread,
+                                         virt_cntr_inter_mask);
+
+                /* The writes to the various performance counters only writes
+                 * to a latch.  The new values (interrupt setting bits, reset
+                 * counter value etc.) are not copied to the actual registers
+                 * until the performance monitor is enabled.  In order to get
+                 * this to work as desired, the permormance monitor needs to
+                 * be disabled while writting to the latches.  This is a
+                 * HW design issue.
+                 */
+                cbe_enable_pm(cpu);
+        }
+        spin_unlock_irqrestore(&virt_cntr_lock, flags);
+}
+
+struct op_powerpc_model op_model_cell = {
+        .reg_setup = cell_reg_setup,
+        .cpu_setup = cell_cpu_setup,
+        .global_start = cell_global_start,
+        .global_stop = cell_global_stop,
+        .handle_interrupt = cell_handle_interrupt,
+};
diff --git a/arch/powerpc/platforms/4xx/Kconfig b/arch/powerpc/platforms/4xx/Kconfig
index ed39d6a3d22a..2f2a13ed7667 100644
--- a/arch/powerpc/platforms/4xx/Kconfig
+++ b/arch/powerpc/platforms/4xx/Kconfig
@@ -179,7 +179,7 @@ config BIOS_FIXUP
 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
 config 403GCX
         bool
-        depends OAK
+        depends on OAK
         default y
 
 config 405EP
diff --git a/arch/powerpc/platforms/52xx/Makefile b/arch/powerpc/platforms/52xx/Makefile
new file mode 100644
index 000000000000..a46184a0c750
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/Makefile
@@ -0,0 +1,9 @@
+#
+# Makefile for 52xx based boards
+#
+ifeq ($(CONFIG_PPC_MERGE),y)
+obj-y                           += mpc52xx_pic.o mpc52xx_common.o
+endif
+
+obj-$(CONFIG_PPC_EFIKA)         += efika-setup.o efika-pci.o
+obj-$(CONFIG_PPC_LITE5200)      += lite5200.o
diff --git a/arch/powerpc/platforms/52xx/efika-pci.c b/arch/powerpc/platforms/52xx/efika-pci.c
new file mode 100644
index 000000000000..62e05b2a9227
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/efika-pci.c
@@ -0,0 +1,119 @@
+
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/string.h>
+#include <linux/init.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+#include <asm/sections.h>
+#include <asm/pci-bridge.h>
+#include <asm/rtas.h>
+
+#include "efika.h"
+
+#ifdef CONFIG_PCI
+/*
+ * Access functions for PCI config space using RTAS calls.
+ */
+static int rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
+                            int len, u32 * val)
+{
+        struct pci_controller *hose = bus->sysdata;
+        unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
+            | (((bus->number - hose->first_busno) & 0xff) << 16)
+            | (hose->index << 24);
+        int ret = -1;
+        int rval;
+
+        rval = rtas_call(rtas_token("read-pci-config"), 2, 2, &ret, addr, len);
+        *val = ret;
+        return rval ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
+}
+
+static int rtas_write_config(struct pci_bus *bus, unsigned int devfn,
+                             int offset, int len, u32 val)
+{
+        struct pci_controller *hose = bus->sysdata;
+        unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
+            | (((bus->number - hose->first_busno) & 0xff) << 16)
+            | (hose->index << 24);
+        int rval;
+
+        rval = rtas_call(rtas_token("write-pci-config"), 3, 1, NULL,
+                         addr, len, val);
+        return rval ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
+}
+
+static struct pci_ops rtas_pci_ops = {
+        rtas_read_config,
+        rtas_write_config
+};
+
+void __init efika_pcisetup(void)
+{
+        const int *bus_range;
+        int len;
+        struct pci_controller *hose;
+        struct device_node *root;
+        struct device_node *pcictrl;
+
+        root = of_find_node_by_path("/");
+        if (root == NULL) {
+                printk(KERN_WARNING EFIKA_PLATFORM_NAME
+                       ": Unable to find the root node\n");
+                return;
+        }
+
+        for (pcictrl = NULL;;) {
+                pcictrl = of_get_next_child(root, pcictrl);
+                if ((pcictrl == NULL) || (strcmp(pcictrl->name, "pci") == 0))
+                        break;
+        }
+
+        of_node_put(root);
+
+        if (pcictrl == NULL) {
+                printk(KERN_WARNING EFIKA_PLATFORM_NAME
+                       ": Unable to find the PCI bridge node\n");
+                return;
+        }
+
+        bus_range = get_property(pcictrl, "bus-range", &len);
+        if (bus_range == NULL || len < 2 * sizeof(int)) {
+                printk(KERN_WARNING EFIKA_PLATFORM_NAME
+                       ": Can't get bus-range for %s\n", pcictrl->full_name);
+                return;
+        }
+
+        if (bus_range[1] == bus_range[0])
+                printk(KERN_INFO EFIKA_PLATFORM_NAME ": PCI bus %d",
+                       bus_range[0]);
+        else
+                printk(KERN_INFO EFIKA_PLATFORM_NAME ": PCI buses %d..%d",
+                       bus_range[0], bus_range[1]);
+        printk(" controlled by %s\n", pcictrl->full_name);
+        printk("\n");
+
+        hose = pcibios_alloc_controller();
+        if (!hose) {
+                printk(KERN_WARNING EFIKA_PLATFORM_NAME
+                       ": Can't allocate PCI controller structure for %s\n",
+                       pcictrl->full_name);
+                return;
+        }
+
+        hose->arch_data = of_node_get(pcictrl);
+        hose->first_busno = bus_range[0];
+        hose->last_busno = bus_range[1];
+        hose->ops = &rtas_pci_ops;
+
+        pci_process_bridge_OF_ranges(hose, pcictrl, 0);
+}
+
+#else
+void __init efika_pcisetup(void)
+{}
+#endif
diff --git a/arch/powerpc/platforms/52xx/efika-setup.c b/arch/powerpc/platforms/52xx/efika-setup.c
new file mode 100644
index 000000000000..110c980ed1e0
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/efika-setup.c
@@ -0,0 +1,150 @@
+/*
+ *
+ * Efika 5K2 platform setup
+ * Some code really inspired from the lite5200b platform.
+ * 
+ * Copyright (C) 2006 bplan GmbH
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ *
+ */
+
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/reboot.h>
+#include <linux/init.h>
+#include <linux/utsrelease.h>
+#include <linux/seq_file.h>
+#include <linux/root_dev.h>
+#include <linux/initrd.h>
+#include <linux/timer.h>
+#include <linux/pci.h>
+
+#include <asm/pgtable.h>
+#include <asm/prom.h>
+#include <asm/time.h>
+#include <asm/machdep.h>
+#include <asm/rtas.h>
+#include <asm/of_device.h>
+#include <asm/of_platform.h>
+#include <asm/mpc52xx.h>
+
+#include "efika.h"
+
+static void efika_show_cpuinfo(struct seq_file *m)
+{
+        struct device_node *root;
+        const char *revision = NULL;
+        const char *codegendescription = NULL;
+        const char *codegenvendor = NULL;
+
+        root = of_find_node_by_path("/");
+        if (root) {
+                revision = get_property(root, "revision", NULL);
+                codegendescription =
+                    get_property(root, "CODEGEN,description", NULL);
+                codegenvendor = get_property(root, "CODEGEN,vendor", NULL);
+
+                of_node_put(root);
+        }
+
+        if (codegendescription)
+                seq_printf(m, "machine\t\t: %s\n", codegendescription);
+        else
+                seq_printf(m, "machine\t\t: Efika\n");
+
+        if (revision)
+                seq_printf(m, "revision\t: %s\n", revision);
+
+        if (codegenvendor)
+                seq_printf(m, "vendor\t\t: %s\n", codegenvendor);
+
+        of_node_put(root);
+}
+
+static void __init efika_setup_arch(void)
+{
+        rtas_initialize();
+
+#ifdef CONFIG_BLK_DEV_INITRD
+        initrd_below_start_ok = 1;
+
+        if (initrd_start)
+                ROOT_DEV = Root_RAM0;
+        else
+#endif
+                ROOT_DEV = Root_SDA2;   /* sda2 (sda1 is for the kernel) */
+
+        efika_pcisetup();
+
+        if (ppc_md.progress)
+                ppc_md.progress("Linux/PPC " UTS_RELEASE " runnung on Efika ;-)\n", 0x0);
+}
+
+static void __init efika_init(void)
+{
+        struct device_node *np;
+        struct device_node *cnp = NULL;
+        const u32 *base;
+
+        /* Find every child of the SOC node and add it to of_platform */
+        np = of_find_node_by_name(NULL, "builtin");
+        if (np) {
+                char name[BUS_ID_SIZE];
+                while ((cnp = of_get_next_child(np, cnp))) {
+                        strcpy(name, cnp->name);
+
+                        base = get_property(cnp, "reg", NULL);
+                        if (base == NULL)
+                                continue;
+
+                        snprintf(name+strlen(name), BUS_ID_SIZE, "@%x", *base);
+                        of_platform_device_create(cnp, name, NULL);
+
+                        printk(KERN_INFO EFIKA_PLATFORM_NAME" : Added %s (type '%s' at '%s') to the known devices\n", name, cnp->type, cnp->full_name);
+                }
+        }
+
+        if (ppc_md.progress)
+                ppc_md.progress("  Have fun with your Efika!    ", 0x7777);
+}
+
+static int __init efika_probe(void)
+{
+        char *model = of_get_flat_dt_prop(of_get_flat_dt_root(),
+                                          "model", NULL);
+
+        if (model == NULL)
+                return 0;
+        if (strcmp(model, "EFIKA5K2"))
+                return 0;
+
+        ISA_DMA_THRESHOLD = ~0L;
+        DMA_MODE_READ = 0x44;
+        DMA_MODE_WRITE = 0x48;
+
+        return 1;
+}
+
+define_machine(efika)
+{
+        .name = EFIKA_PLATFORM_NAME,
+        .probe = efika_probe,
+        .setup_arch = efika_setup_arch,
+        .init = efika_init,
+        .show_cpuinfo = efika_show_cpuinfo,
+        .init_IRQ = mpc52xx_init_irq,
+        .get_irq = mpc52xx_get_irq,
+        .restart = rtas_restart,
+        .power_off = rtas_power_off,
+        .halt = rtas_halt,
+        .set_rtc_time = rtas_set_rtc_time,
+        .get_rtc_time = rtas_get_rtc_time,
+        .progress = rtas_progress,
+        .get_boot_time = rtas_get_boot_time,
+        .calibrate_decr = generic_calibrate_decr,
+        .phys_mem_access_prot = pci_phys_mem_access_prot,
+};
diff --git a/arch/powerpc/platforms/52xx/efika.h b/arch/powerpc/platforms/52xx/efika.h
new file mode 100644
index 000000000000..2f060fd097d7
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/efika.h
@@ -0,0 +1,19 @@
+/*
+ * Efika 5K2 platform setup - Header file
+ *
+ * Copyright (C) 2006 bplan GmbH
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ *
+ */
+
+#ifndef __ARCH_POWERPC_EFIKA__
+#define __ARCH_POWERPC_EFIKA__
+
+#define EFIKA_PLATFORM_NAME "Efika"
+
+extern void __init efika_pcisetup(void);
+
+#endif
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
new file mode 100644
index 000000000000..0f21bab33f6c
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -0,0 +1,161 @@
+/*
+ * Freescale Lite5200 board support
+ *
+ * Written by: Grant Likely <grant.likely@secretlab.ca>
+ *
+ * Copyright (C) Secret Lab Technologies Ltd. 2006. All rights reserved.
+ * Copyright (C) Freescale Semicondutor, Inc. 2006. All rights reserved.
+ *
+ * Description:
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#undef DEBUG
+
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/reboot.h>
+#include <linux/pci.h>
+#include <linux/kdev_t.h>
+#include <linux/major.h>
+#include <linux/console.h>
+#include <linux/delay.h>
+#include <linux/seq_file.h>
+#include <linux/root_dev.h>
+#include <linux/initrd.h>
+
+#include <asm/system.h>
+#include <asm/atomic.h>
+#include <asm/time.h>
+#include <asm/io.h>
+#include <asm/machdep.h>
+#include <asm/ipic.h>
+#include <asm/bootinfo.h>
+#include <asm/irq.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <sysdev/fsl_soc.h>
+#include <asm/of_platform.h>
+
+#include <asm/mpc52xx.h>
+
+/* ************************************************************************
+ *
+ * Setup the architecture
+ *
+ */
+
+static void __init
+lite52xx_setup_cpu(void)
+{
+        struct mpc52xx_gpio __iomem *gpio;
+        u32 port_config;
+
+        /* Map zones */
+        gpio = mpc52xx_find_and_map("mpc52xx-gpio");
+        if (!gpio) {
+                printk(KERN_ERR __FILE__ ": "
+                        "Error while mapping GPIO register for port config. "
+                        "Expect some abnormal behavior\n");
+                goto error;
+        }
+
+        /* Set port config */
+        port_config = in_be32(&gpio->port_config);
+
+        port_config &= ~0x00800000;     /* 48Mhz internal, pin is GPIO  */
+
+        port_config &= ~0x00007000;     /* USB port : Differential mode */
+        port_config |=  0x00001000;     /*            USB 1 only        */
+
+        port_config &= ~0x03000000;     /* ATA CS is on csb_4/5         */
+        port_config |=  0x01000000;
+
+        pr_debug("port_config: old:%x new:%x\n",
+                 in_be32(&gpio->port_config), port_config);
+        out_be32(&gpio->port_config, port_config);
+
+        /* Unmap zone */
+error:
+        iounmap(gpio);
+}
+
+static void __init lite52xx_setup_arch(void)
+{
+        struct device_node *np;
+
+        if (ppc_md.progress)
+                ppc_md.progress("lite52xx_setup_arch()", 0);
+
+        np = of_find_node_by_type(NULL, "cpu");
+        if (np) {
+                unsigned int *fp =
+                    (int *)get_property(np, "clock-frequency", NULL);
+                if (fp != 0)
+                        loops_per_jiffy = *fp / HZ;
+                else
+                        loops_per_jiffy = 50000000 / HZ;
+                of_node_put(np);
+        }
+
+        /* CPU & Port mux setup */
+        mpc52xx_setup_cpu();    /* Generic */
+        lite52xx_setup_cpu();   /* Platorm specific */
+
+#ifdef CONFIG_BLK_DEV_INITRD
+        if (initrd_start)
+                ROOT_DEV = Root_RAM0;
+        else
+#endif
+#ifdef  CONFIG_ROOT_NFS
+                ROOT_DEV = Root_NFS;
+#else
+                ROOT_DEV = Root_HDA1;
+#endif
+
+}
+
+void lite52xx_show_cpuinfo(struct seq_file *m)
+{
+        struct device_node* np = of_find_all_nodes(NULL);
+        const char *model = NULL;
+
+        if (np)
+                model = get_property(np, "model", NULL);
+
+        seq_printf(m, "vendor\t\t:      Freescale Semiconductor\n");
+        seq_printf(m, "machine\t\t:     %s\n", model ? model : "unknown");
+
+        of_node_put(np);
+}
+
+/*
+ * Called very early, MMU is off, device-tree isn't unflattened
+ */
+static int __init lite52xx_probe(void)
+{
+        unsigned long node = of_get_flat_dt_root();
+        const char *model = of_get_flat_dt_prop(node, "model", NULL);
+
+        if (!of_flat_dt_is_compatible(node, "lite52xx"))
+                return 0;
+        pr_debug("%s board w/ mpc52xx found\n", model ? model : "unknown");
+
+        return 1;
+}
+
+define_machine(lite52xx) {
+        .name           = "lite52xx",
+        .probe          = lite52xx_probe,
+        .setup_arch     = lite52xx_setup_arch,
+        .init           = mpc52xx_declare_of_platform_devices,
+        .init_IRQ       = mpc52xx_init_irq,
+        .get_irq        = mpc52xx_get_irq,
+        .show_cpuinfo   = lite52xx_show_cpuinfo,
+        .calibrate_decr = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c
new file mode 100644
index 000000000000..cc40889074bd
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c
@@ -0,0 +1,127 @@
+/*
+ *
+ * Utility functions for the Freescale MPC52xx.
+ *
+ * Copyright (C) 2006 Sylvain Munaut <tnt@246tNt.com>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ *
+ */
+
+#undef DEBUG
+
+#include <linux/kernel.h>
+
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <asm/of_platform.h>
+#include <asm/mpc52xx.h>
+
+
+void __iomem *
+mpc52xx_find_and_map(const char *compatible)
+{
+        struct device_node *ofn;
+        const u32 *regaddr_p;
+        u64 regaddr64, size64;
+
+        ofn = of_find_compatible_node(NULL, NULL, compatible);
+        if (!ofn)
+                return NULL;
+
+        regaddr_p = of_get_address(ofn, 0, &size64, NULL);
+        if (!regaddr_p) {
+                of_node_put(ofn);
+                return NULL;
+        }
+
+        regaddr64 = of_translate_address(ofn, regaddr_p);
+
+        of_node_put(ofn);
+
+        return ioremap((u32)regaddr64, (u32)size64);
+}
+EXPORT_SYMBOL(mpc52xx_find_and_map);
+
+
+/**
+ *      mpc52xx_find_ipb_freq - Find the IPB bus frequency for a device
+ *      @node:  device node
+ *
+ *      Returns IPB bus frequency, or 0 if the bus frequency cannot be found.
+ */
+unsigned int
+mpc52xx_find_ipb_freq(struct device_node *node)
+{
+        struct device_node *np;
+        const unsigned int *p_ipb_freq = NULL;
+
+        of_node_get(node);
+        while (node) {
+                p_ipb_freq = get_property(node, "bus-frequency", NULL);
+                if (p_ipb_freq)
+                        break;
+
+                np = of_get_parent(node);
+                of_node_put(node);
+                node = np;
+        }
+        if (node)
+                of_node_put(node);
+
+        return p_ipb_freq ? *p_ipb_freq : 0;
+}
+EXPORT_SYMBOL(mpc52xx_find_ipb_freq);
+
+
+void __init
+mpc52xx_setup_cpu(void)
+{
+        struct mpc52xx_cdm  __iomem *cdm;
+        struct mpc52xx_xlb  __iomem *xlb;
+
+        /* Map zones */
+        cdm = mpc52xx_find_and_map("mpc52xx-cdm");
+        xlb = mpc52xx_find_and_map("mpc52xx-xlb");
+
+        if (!cdm || !xlb) {
+                printk(KERN_ERR __FILE__ ": "
+                        "Error while mapping CDM/XLB during mpc52xx_setup_cpu. "
+                        "Expect some abnormal behavior\n");
+                goto unmap_regs;
+        }
+
+        /* Use internal 48 Mhz */
+        out_8(&cdm->ext_48mhz_en, 0x00);
+        out_8(&cdm->fd_enable, 0x01);
+        if (in_be32(&cdm->rstcfg) & 0x40)       /* Assumes 33Mhz clock */
+                out_be16(&cdm->fd_counters, 0x0001);
+        else
+                out_be16(&cdm->fd_counters, 0x5555);
+
+        /* Configure the XLB Arbiter priorities */
+        out_be32(&xlb->master_pri_enable, 0xff);
+        out_be32(&xlb->master_priority, 0x11111111);
+
+        /* Disable XLB pipelining */
+        /* (cfr errate 292. We could do this only just before ATA PIO
+            transaction and re-enable it afterwards ...) */
+        out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_PLDIS);
+
+        /* Unmap zones */
+unmap_regs:
+        if (cdm) iounmap(cdm);
+        if (xlb) iounmap(xlb);
+}
+
+void __init
+mpc52xx_declare_of_platform_devices(void)
+{
+        /* Find every child of the SOC node and add it to of_platform */
+        if (of_platform_bus_probe(NULL, NULL, NULL))
+                printk(KERN_ERR __FILE__ ": "
+                        "Error while probing of_platform bus\n");
+}
+
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
new file mode 100644
index 000000000000..cd91a6c3aafa
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -0,0 +1,473 @@
+/*
+ *
+ * Programmable Interrupt Controller functions for the Freescale MPC52xx.
+ *
+ * Copyright (C) 2006 bplan GmbH
+ *
+ * Based on the code from the 2.4 kernel by
+ * Dale Farnsworth <dfarnsworth@mvista.com> and Kent Borg.
+ *
+ * Copyright (C) 2004 Sylvain Munaut <tnt@246tNt.com>
+ * Copyright (C) 2003 Montavista Software, Inc
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ *
+ */
+
+#undef DEBUG
+
+#include <linux/stddef.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/signal.h>
+#include <linux/stddef.h>
+#include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/hardirq.h>
+
+#include <asm/io.h>
+#include <asm/processor.h>
+#include <asm/system.h>
+#include <asm/irq.h>
+#include <asm/prom.h>
+#include <asm/mpc52xx.h>
+#include "mpc52xx_pic.h"
+
+/*
+ *
+*/
+
+static struct mpc52xx_intr __iomem *intr;
+static struct mpc52xx_sdma __iomem *sdma;
+static struct irq_host *mpc52xx_irqhost = NULL;
+
+static unsigned char mpc52xx_map_senses[4] = {
+        IRQ_TYPE_LEVEL_HIGH,
+        IRQ_TYPE_EDGE_RISING,
+        IRQ_TYPE_EDGE_FALLING,
+        IRQ_TYPE_LEVEL_LOW,
+};
+
+/*
+ *
+*/
+
+static inline void io_be_setbit(u32 __iomem *addr, int bitno)
+{
+        out_be32(addr, in_be32(addr) | (1 << bitno));
+}
+
+static inline void io_be_clrbit(u32 __iomem *addr, int bitno)
+{
+        out_be32(addr, in_be32(addr) & ~(1 << bitno));
+}
+
+/*
+ * IRQ[0-3] interrupt irq_chip
+*/
+
+static void mpc52xx_extirq_mask(unsigned int virq)
+{
+        int irq;
+        int l2irq;
+
+        irq = irq_map[virq].hwirq;
+        l2irq = (irq & MPC52xx_IRQ_L2_MASK) >> MPC52xx_IRQ_L2_OFFSET;
+
+        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
+
+        io_be_clrbit(&intr->ctrl, 11 - l2irq);
+}
+
+static void mpc52xx_extirq_unmask(unsigned int virq)
+{
+        int irq;
+        int l2irq;
+
+        irq = irq_map[virq].hwirq;
+        l2irq = (irq & MPC52xx_IRQ_L2_MASK) >> MPC52xx_IRQ_L2_OFFSET;
+
+        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
+
+        io_be_setbit(&intr->ctrl, 11 - l2irq);
+}
+
+static void mpc52xx_extirq_ack(unsigned int virq)
+{
+        int irq;
+        int l2irq;
+
+        irq = irq_map[virq].hwirq;
+        l2irq = (irq & MPC52xx_IRQ_L2_MASK) >> MPC52xx_IRQ_L2_OFFSET;
+
+        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
+
+        io_be_setbit(&intr->ctrl, 27-l2irq);
+}
+
+static struct irq_chip mpc52xx_extirq_irqchip = {
+        .typename = " MPC52xx IRQ[0-3] ",
+        .mask = mpc52xx_extirq_mask,
+        .unmask = mpc52xx_extirq_unmask,
+        .ack = mpc52xx_extirq_ack,
+};
+
+/*
+ * Main interrupt irq_chip
+*/
+
+static void mpc52xx_main_mask(unsigned int virq)
+{
+        int irq;
+        int l2irq;
+
+        irq = irq_map[virq].hwirq;
+        l2irq = (irq & MPC52xx_IRQ_L2_MASK) >> MPC52xx_IRQ_L2_OFFSET;
+
+        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
+
+        io_be_setbit(&intr->main_mask, 15 - l2irq);
+}
+
+static void mpc52xx_main_unmask(unsigned int virq)
+{
+        int irq;
+        int l2irq;
+
+        irq = irq_map[virq].hwirq;
+        l2irq = (irq & MPC52xx_IRQ_L2_MASK) >> MPC52xx_IRQ_L2_OFFSET;
+
+        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
+
+        io_be_clrbit(&intr->main_mask, 15 - l2irq);
+}
+
+static struct irq_chip mpc52xx_main_irqchip = {
+        .typename = "MPC52xx Main",
+        .mask = mpc52xx_main_mask,
+        .mask_ack = mpc52xx_main_mask,
+        .unmask = mpc52xx_main_unmask,
+};
+
+/*
+ * Peripherals interrupt irq_chip
+*/
+
+static void mpc52xx_periph_mask(unsigned int virq)
+{
+        int irq;
+        int l2irq;
+
+        irq = irq_map[virq].hwirq;
+        l2irq = (irq & MPC52xx_IRQ_L2_MASK) >> MPC52xx_IRQ_L2_OFFSET;
+
+        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
+
+        io_be_setbit(&intr->per_mask, 31 - l2irq);
+}
+
+static void mpc52xx_periph_unmask(unsigned int virq)
+{
+        int irq;
+        int l2irq;
+
+        irq = irq_map[virq].hwirq;
+        l2irq = (irq & MPC52xx_IRQ_L2_MASK) >> MPC52xx_IRQ_L2_OFFSET;
+
+        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
+
+        io_be_clrbit(&intr->per_mask, 31 - l2irq);
+}
+
+static struct irq_chip mpc52xx_periph_irqchip = {
+        .typename = "MPC52xx Peripherals",
+        .mask = mpc52xx_periph_mask,
+        .mask_ack = mpc52xx_periph_mask,
+        .unmask = mpc52xx_periph_unmask,
+};
+
+/*
+ * SDMA interrupt irq_chip
+*/
+
+static void mpc52xx_sdma_mask(unsigned int virq)
+{
+        int irq;
+        int l2irq;
+
+        irq = irq_map[virq].hwirq;
+        l2irq = (irq & MPC52xx_IRQ_L2_MASK) >> MPC52xx_IRQ_L2_OFFSET;
+
+        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
+
+        io_be_setbit(&sdma->IntMask, l2irq);
+}
+
+static void mpc52xx_sdma_unmask(unsigned int virq)
+{
+        int irq;
+        int l2irq;
+
+        irq = irq_map[virq].hwirq;
+        l2irq = (irq & MPC52xx_IRQ_L2_MASK) >> MPC52xx_IRQ_L2_OFFSET;
+
+        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
+
+        io_be_clrbit(&sdma->IntMask, l2irq);
+}
+
+static void mpc52xx_sdma_ack(unsigned int virq)
+{
+        int irq;
+        int l2irq;
+
+        irq = irq_map[virq].hwirq;
+        l2irq = (irq & MPC52xx_IRQ_L2_MASK) >> MPC52xx_IRQ_L2_OFFSET;
+
+        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
+
+        out_be32(&sdma->IntPend, 1 << l2irq);
+}
+
+static struct irq_chip mpc52xx_sdma_irqchip = {
+        .typename = "MPC52xx SDMA",
+        .mask = mpc52xx_sdma_mask,
+        .unmask = mpc52xx_sdma_unmask,
+        .ack = mpc52xx_sdma_ack,
+};
+
+/*
+ * irq_host
+*/
+
+static int mpc52xx_irqhost_match(struct irq_host *h, struct device_node *node)
+{
+        pr_debug("%s: node=%p\n", __func__, node);
+        return mpc52xx_irqhost->host_data == node;
+}
+
+static int mpc52xx_irqhost_xlate(struct irq_host *h, struct device_node *ct,
+                                 u32 * intspec, unsigned int intsize,
+                                 irq_hw_number_t * out_hwirq,
+                                 unsigned int *out_flags)
+{
+        int intrvect_l1;
+        int intrvect_l2;
+        int intrvect_type;
+        int intrvect_linux;
+
+        if (intsize != 3)
+                return -1;
+
+        intrvect_l1 = (int)intspec[0];
+        intrvect_l2 = (int)intspec[1];
+        intrvect_type = (int)intspec[2];
+
+        intrvect_linux =
+            (intrvect_l1 << MPC52xx_IRQ_L1_OFFSET) & MPC52xx_IRQ_L1_MASK;
+        intrvect_linux |=
+            (intrvect_l2 << MPC52xx_IRQ_L2_OFFSET) & MPC52xx_IRQ_L2_MASK;
+
+        pr_debug("return %x, l1=%d, l2=%d\n", intrvect_linux, intrvect_l1,
+                 intrvect_l2);
+
+        *out_hwirq = intrvect_linux;
+        *out_flags = mpc52xx_map_senses[intrvect_type];
+
+        return 0;
+}
+
+/*
+ * this function retrieves the correct IRQ type out
+ * of the MPC regs
+ * Only externals IRQs needs this
+*/
+static int mpc52xx_irqx_gettype(int irq)
+{
+        int type;
+        u32 ctrl_reg;
+
+        ctrl_reg = in_be32(&intr->ctrl);
+        type = (ctrl_reg >> (22 - irq * 2)) & 0x3;
+
+        return mpc52xx_map_senses[type];
+}
+
+static int mpc52xx_irqhost_map(struct irq_host *h, unsigned int virq,
+                               irq_hw_number_t irq)
+{
+        int l1irq;
+        int l2irq;
+        struct irq_chip *good_irqchip;
+        void *good_handle;
+        int type;
+
+        l1irq = (irq & MPC52xx_IRQ_L1_MASK) >> MPC52xx_IRQ_L1_OFFSET;
+        l2irq = (irq & MPC52xx_IRQ_L2_MASK) >> MPC52xx_IRQ_L2_OFFSET;
+
+        /*
+         * Most of ours IRQs will be level low
+         * Only external IRQs on some platform may be others
+         */
+        type = IRQ_TYPE_LEVEL_LOW;
+
+        switch (l1irq) {
+        case MPC52xx_IRQ_L1_CRIT:
+                pr_debug("%s: Critical. l2=%x\n", __func__, l2irq);
+
+                BUG_ON(l2irq != 0);
+
+                type = mpc52xx_irqx_gettype(l2irq);
+                good_irqchip = &mpc52xx_extirq_irqchip;
+                break;
+
+        case MPC52xx_IRQ_L1_MAIN:
+                pr_debug("%s: Main IRQ[1-3] l2=%x\n", __func__, l2irq);
+
+                if ((l2irq >= 1) && (l2irq <= 3)) {
+                        type = mpc52xx_irqx_gettype(l2irq);
+                        good_irqchip = &mpc52xx_extirq_irqchip;
+                } else {
+                        good_irqchip = &mpc52xx_main_irqchip;
+                }
+                break;
+
+        case MPC52xx_IRQ_L1_PERP:
+                pr_debug("%s: Peripherals. l2=%x\n", __func__, l2irq);
+                good_irqchip = &mpc52xx_periph_irqchip;
+                break;
+
+        case MPC52xx_IRQ_L1_SDMA:
+                pr_debug("%s: SDMA. l2=%x\n", __func__, l2irq);
+                good_irqchip = &mpc52xx_sdma_irqchip;
+                break;
+
+        default:
+                pr_debug("%s: Error, unknown L1 IRQ (0x%x)\n", __func__, l1irq);
+                printk(KERN_ERR "Unknow IRQ!\n");
+                return -EINVAL;
+        }
+
+        switch (type) {
+        case IRQ_TYPE_EDGE_FALLING:
+        case IRQ_TYPE_EDGE_RISING:
+                good_handle = handle_edge_irq;
+                break;
+        default:
+                good_handle = handle_level_irq;
+        }
+
+        set_irq_chip_and_handler(virq, good_irqchip, good_handle);
+
+        pr_debug("%s: virq=%x, hw=%x. type=%x\n", __func__, virq,
+                 (int)irq, type);
+
+        return 0;
+}
+
+static struct irq_host_ops mpc52xx_irqhost_ops = {
+        .match = mpc52xx_irqhost_match,
+        .xlate = mpc52xx_irqhost_xlate,
+        .map = mpc52xx_irqhost_map,
+};
+
+/*
+ * init (public)
+*/
+
+void __init mpc52xx_init_irq(void)
+{
+        u32 intr_ctrl;
+        struct device_node *picnode;
+
+        /* Remap the necessary zones */
+        picnode = of_find_compatible_node(NULL, NULL, "mpc52xx-pic");
+
+        intr = mpc52xx_find_and_map("mpc52xx-pic");
+        if (!intr)
+                panic(__FILE__  ": find_and_map failed on 'mpc52xx-pic'. "
+                                "Check node !");
+
+        sdma = mpc52xx_find_and_map("mpc52xx-bestcomm");
+        if (!sdma)
+                panic(__FILE__  ": find_and_map failed on 'mpc52xx-bestcomm'. "
+                                "Check node !");
+
+        /* Disable all interrupt sources. */
+        out_be32(&sdma->IntPend, 0xffffffff);   /* 1 means clear pending */
+        out_be32(&sdma->IntMask, 0xffffffff);   /* 1 means disabled */
+        out_be32(&intr->per_mask, 0x7ffffc00);  /* 1 means disabled */
+        out_be32(&intr->main_mask, 0x00010fff); /* 1 means disabled */
+        intr_ctrl = in_be32(&intr->ctrl);
+        intr_ctrl &= 0x00ff0000;        /* Keeps IRQ[0-3] config */
+        intr_ctrl |=    0x0f000000 |    /* clear IRQ 0-3 */
+                        0x00001000 |    /* MEE master external enable */
+                        0x00000000 |    /* 0 means disable IRQ 0-3 */
+                        0x00000001;     /* CEb route critical normally */
+        out_be32(&intr->ctrl, intr_ctrl);
+
+        /* Zero a bunch of the priority settings. */
+        out_be32(&intr->per_pri1, 0);
+        out_be32(&intr->per_pri2, 0);
+        out_be32(&intr->per_pri3, 0);
+        out_be32(&intr->main_pri1, 0);
+        out_be32(&intr->main_pri2, 0);
+
+        /*
+         * As last step, add an irq host to translate the real
+         * hw irq information provided by the ofw to linux virq
+         */
+
+        mpc52xx_irqhost = irq_alloc_host(IRQ_HOST_MAP_LINEAR,
+                                         MPC52xx_IRQ_HIGHTESTHWIRQ,
+                                         &mpc52xx_irqhost_ops, -1);
+
+        if (!mpc52xx_irqhost)
+                panic(__FILE__ ": Cannot allocate the IRQ host\n");
+
+        mpc52xx_irqhost->host_data = picnode;
+        printk(KERN_INFO "MPC52xx PIC is up and running!\n");
+}
+
+/*
+ * get_irq (public)
+*/
+unsigned int mpc52xx_get_irq(void)
+{
+        u32 status;
+        int irq = NO_IRQ_IGNORE;
+
+        status = in_be32(&intr->enc_status);
+        if (status & 0x00000400) {      /* critical */
+                irq = (status >> 8) & 0x3;
+                if (irq == 2)   /* high priority peripheral */
+                        goto peripheral;
+                irq |=  (MPC52xx_IRQ_L1_CRIT << MPC52xx_IRQ_L1_OFFSET) &
+                        MPC52xx_IRQ_L1_MASK;
+        } else if (status & 0x00200000) {       /* main */
+                irq = (status >> 16) & 0x1f;
+                if (irq == 4)   /* low priority peripheral */
+                        goto peripheral;
+                irq |=  (MPC52xx_IRQ_L1_MAIN << MPC52xx_IRQ_L1_OFFSET) &
+                        MPC52xx_IRQ_L1_MASK;
+        } else if (status & 0x20000000) {       /* peripheral */
+              peripheral:
+                irq = (status >> 24) & 0x1f;
+                if (irq == 0) { /* bestcomm */
+                        status = in_be32(&sdma->IntPend);
+                        irq = ffs(status) - 1;
+                        irq |=  (MPC52xx_IRQ_L1_SDMA << MPC52xx_IRQ_L1_OFFSET) &
+                                MPC52xx_IRQ_L1_MASK;
+                } else {
+                        irq |=  (MPC52xx_IRQ_L1_PERP << MPC52xx_IRQ_L1_OFFSET) &
+                                MPC52xx_IRQ_L1_MASK;
+                }
+        }
+
+        pr_debug("%s: irq=%x. virq=%d\n", __func__, irq,
+                 irq_linear_revmap(mpc52xx_irqhost, irq));
+
+        return irq_linear_revmap(mpc52xx_irqhost, irq);
+}
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.h b/arch/powerpc/platforms/52xx/mpc52xx_pic.h
new file mode 100644
index 000000000000..1a26bcdb3049
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.h
@@ -0,0 +1,53 @@
+/*
+ * Header file for Freescale MPC52xx Interrupt controller
+ *
+ * Copyright (C) 2004-2005 Sylvain Munaut <tnt@246tNt.com>
+ * Copyright (C) 2003 MontaVista, Software, Inc.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#ifndef __POWERPC_SYSDEV_MPC52xx_PIC_H__
+#define __POWERPC_SYSDEV_MPC52xx_PIC_H__
+
+#include <asm/types.h>
+
+
+/* HW IRQ mapping */
+#define MPC52xx_IRQ_L1_CRIT     (0)
+#define MPC52xx_IRQ_L1_MAIN     (1)
+#define MPC52xx_IRQ_L1_PERP     (2)
+#define MPC52xx_IRQ_L1_SDMA     (3)
+
+#define MPC52xx_IRQ_L1_OFFSET   (6)
+#define MPC52xx_IRQ_L1_MASK     (0x00c0)
+
+#define MPC52xx_IRQ_L2_OFFSET   (0)
+#define MPC52xx_IRQ_L2_MASK     (0x003f)
+
+#define MPC52xx_IRQ_HIGHTESTHWIRQ (0xd0)
+
+
+/* Interrupt controller Register set */
+struct mpc52xx_intr {
+        u32 per_mask;           /* INTR + 0x00 */
+        u32 per_pri1;           /* INTR + 0x04 */
+        u32 per_pri2;           /* INTR + 0x08 */
+        u32 per_pri3;           /* INTR + 0x0c */
+        u32 ctrl;               /* INTR + 0x10 */
+        u32 main_mask;          /* INTR + 0x14 */
+        u32 main_pri1;          /* INTR + 0x18 */
+        u32 main_pri2;          /* INTR + 0x1c */
+        u32 reserved1;          /* INTR + 0x20 */
+        u32 enc_status;         /* INTR + 0x24 */
+        u32 crit_status;        /* INTR + 0x28 */
+        u32 main_status;        /* INTR + 0x2c */
+        u32 per_status;         /* INTR + 0x30 */
+        u32 reserved2;          /* INTR + 0x34 */
+        u32 per_error;          /* INTR + 0x38 */
+};
+
+#endif /* __POWERPC_SYSDEV_MPC52xx_PIC_H__ */
+
diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
index bb9acbb98176..ea880f1f0dcd 100644
--- a/arch/powerpc/platforms/82xx/mpc82xx_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
@@ -515,16 +515,6 @@ static int m82xx_pci_exclude_device(u_char bus, u_char devfn)
                 return PCIBIOS_SUCCESSFUL;
 }
 
-static void
-__init mpc82xx_pcibios_fixup(void)
-{
-        struct pci_dev *dev = NULL;
-
-        for_each_pci_dev(dev) {
-                pci_read_irq_line(dev);
-        }
-}
-
 void __init add_bridge(struct device_node *np)
 {
         int len;
@@ -597,9 +587,6 @@ static void __init mpc82xx_ads_setup_arch(void)
                 add_bridge(np);
 
         of_node_put(np);
-        ppc_md.pci_map_irq = NULL;
-        ppc_md.pcibios_fixup = mpc82xx_pcibios_fixup;
-        ppc_md.pcibios_fixup_bus = NULL;
 #endif
 
 #ifdef  CONFIG_ROOT_NFS
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/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index a43ac71ab740..f58c9780b66f 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -97,8 +97,6 @@ static void __init mpc832x_sys_setup_arch(void)
 #ifdef CONFIG_PCI
         for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
                 add_bridge(np);
-
-        ppc_md.pci_swizzle = common_swizzle;
         ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
 
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index e2bcaaf6b329..314c42ac6048 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -118,7 +118,4 @@ define_machine(mpc834x_itx) {
         .time_init              = mpc83xx_time_init,
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
-#ifdef CONFIG_PCI
-        .pcibios_fixup          = mpc83xx_pcibios_fixup,
-#endif
 };
diff --git a/arch/powerpc/platforms/83xx/mpc834x_sys.c b/arch/powerpc/platforms/83xx/mpc834x_sys.c
index 677196187a4e..80b735a414d9 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_sys.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_sys.c
@@ -137,7 +137,4 @@ define_machine(mpc834x_sys) {
         .time_init              = mpc83xx_time_init,
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
-#ifdef CONFIG_PCI
-        .pcibios_fixup          = mpc83xx_pcibios_fixup,
-#endif
 };
diff --git a/arch/powerpc/platforms/83xx/mpc8360e_pb.c b/arch/powerpc/platforms/83xx/mpc8360e_pb.c
index 1a523c81c06e..7bfd47ad7233 100644
--- a/arch/powerpc/platforms/83xx/mpc8360e_pb.c
+++ b/arch/powerpc/platforms/83xx/mpc8360e_pb.c
@@ -102,8 +102,6 @@ static void __init mpc8360_sys_setup_arch(void)
 #ifdef CONFIG_PCI
         for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
                 add_bridge(np);
-
-        ppc_md.pci_swizzle = common_swizzle;
         ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
 
diff --git a/arch/powerpc/platforms/83xx/mpc83xx.h b/arch/powerpc/platforms/83xx/mpc83xx.h
index 2c82bca9bfbb..01cae106912b 100644
--- a/arch/powerpc/platforms/83xx/mpc83xx.h
+++ b/arch/powerpc/platforms/83xx/mpc83xx.h
@@ -11,7 +11,6 @@
 
 extern int add_bridge(struct device_node *dev);
 extern int mpc83xx_exclude_device(u_char bus, u_char devfn);
-extern void mpc83xx_pcibios_fixup(void);
 extern void mpc83xx_restart(char *cmd);
 extern long mpc83xx_time_init(void);
 
diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c
index 4557ac5255c1..9c3650555144 100644
--- a/arch/powerpc/platforms/83xx/pci.c
+++ b/arch/powerpc/platforms/83xx/pci.c
@@ -45,15 +45,6 @@ int mpc83xx_exclude_device(u_char bus, u_char devfn)
         return PCIBIOS_SUCCESSFUL;
 }
 
-void __init mpc83xx_pcibios_fixup(void)
-{
-        struct pci_dev *dev = NULL;
-
-        /* map all the PCI irqs */
-        for_each_pci_dev(dev)
-                pci_read_irq_line(dev);
-}
-
 int __init add_bridge(struct device_node *dev)
 {
         int len;
diff --git a/arch/powerpc/platforms/85xx/misc.c b/arch/powerpc/platforms/85xx/misc.c
index 26c5e822c7c8..3e62fcb04c1c 100644
--- a/arch/powerpc/platforms/85xx/misc.c
+++ b/arch/powerpc/platforms/85xx/misc.c
@@ -21,11 +21,3 @@ void mpc85xx_restart(char *cmd)
         local_irq_disable();
         abort();
 }
-
-/* For now this is a pass through */
-phys_addr_t fixup_bigphys_addr(phys_addr_t addr, phys_addr_t size)
-{
-        return addr;
-};
-
-EXPORT_SYMBOL(fixup_bigphys_addr);
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index d3e669d69c73..bda2e55e6c4c 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -53,15 +53,6 @@ mpc85xx_exclude_device(u_char bus, u_char devfn)
         else
                 return PCIBIOS_SUCCESSFUL;
 }
-
-void __init
-mpc85xx_pcibios_fixup(void)
-{
-        struct pci_dev *dev = NULL;
-
-        for_each_pci_dev(dev)
-                pci_read_irq_line(dev);
-}
 #endif /* CONFIG_PCI */
 
 #ifdef CONFIG_CPM2
@@ -253,8 +244,6 @@ static void __init mpc85xx_ads_setup_arch(void)
 #ifdef CONFIG_PCI
         for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
                 add_bridge(np);
-
-        ppc_md.pcibios_fixup = mpc85xx_pcibios_fixup;
         ppc_md.pci_exclude_device = mpc85xx_exclude_device;
 #endif
 
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 1a1c226ad4d9..f4dd5f2f8a28 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -398,15 +398,6 @@ mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
 }
 
 
-void __init mpc86xx_hpcn_pcibios_fixup(void)
-{
-        struct pci_dev *dev = NULL;
-
-        for_each_pci_dev(dev)
-                pci_read_irq_line(dev);
-}
-
-
 /*
  * Called very early, device-tree isn't unflattened
  */
@@ -461,7 +452,6 @@ define_machine(mpc86xx_hpcn) {
         .setup_arch             = mpc86xx_hpcn_setup_arch,
         .init_IRQ               = mpc86xx_hpcn_init_irq,
         .show_cpuinfo           = mpc86xx_hpcn_show_cpuinfo,
-        .pcibios_fixup          = mpc86xx_hpcn_pcibios_fixup,
         .get_irq                = mpic_get_irq,
         .restart                = mpc86xx_restart,
         .time_init              = mpc86xx_time_init,
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index e58fa953a50b..507d1b98f270 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -5,6 +5,7 @@ ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_PPC_PMAC)          += powermac/
 endif
 endif
+obj-$(CONFIG_PPC_MPC52xx)       += 52xx/
 obj-$(CONFIG_PPC_CHRP)          += chrp/
 obj-$(CONFIG_4xx)               += 4xx/
 obj-$(CONFIG_PPC_83xx)          += 83xx/
@@ -13,6 +14,7 @@ obj-$(CONFIG_PPC_86xx)		+= 86xx/
 obj-$(CONFIG_PPC_PSERIES)       += pseries/
 obj-$(CONFIG_PPC_ISERIES)       += iseries/
 obj-$(CONFIG_PPC_MAPLE)         += maple/
-obj-$(CONFIG_PPC_PASEMI)                += pasemi/
+obj-$(CONFIG_PPC_PASEMI)        += pasemi/
 obj-$(CONFIG_PPC_CELL)          += cell/
+obj-$(CONFIG_PPC_PS3)           += ps3/
 obj-$(CONFIG_EMBEDDED6xx)       += embedded6xx/
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 3e430b489bb7..06a85b704331 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -20,4 +20,18 @@ config CBE_RAS
         bool "RAS features for bare metal Cell BE"
         default y
 
+config CBE_THERM
+        tristate "CBE thermal support"
+        default m
+        depends on CBE_RAS
+
+config CBE_CPUFREQ
+        tristate "CBE frequency scaling"
+        depends on CBE_RAS && CPU_FREQ
+        default m
+        help
+          This adds the cpufreq driver for Cell BE processors.
+          For details, take a look at <file:Documentation/cpu-freq/>.
+          If you don't have such processor, say N
+
 endmenu
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index c89cdd67383b..f90e8337796c 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -1,7 +1,11 @@
 obj-$(CONFIG_PPC_CELL_NATIVE)           += interrupt.o iommu.o setup.o \
-                                           cbe_regs.o spider-pic.o pervasive.o
+                                           cbe_regs.o spider-pic.o \
+                                           pervasive.o pmu.o io-workarounds.o
 obj-$(CONFIG_CBE_RAS)                   += ras.o
 
+obj-$(CONFIG_CBE_THERM)                 += cbe_thermal.o
+obj-$(CONFIG_CBE_CPUFREQ)               += cbe_cpufreq.o
+
 ifeq ($(CONFIG_SMP),y)
 obj-$(CONFIG_PPC_CELL_NATIVE)           += smp.o
 endif
@@ -11,5 +15,6 @@ spufs-modular-$(CONFIG_SPU_FS)		+= spu_syscalls.o
 spu-priv1-$(CONFIG_PPC_CELL_NATIVE)     += spu_priv1_mmio.o
 
 obj-$(CONFIG_SPU_BASE)                  += spu_callbacks.o spu_base.o \
+                                           spu_coredump.o \
                                            $(spufs-modular-m) \
                                            $(spu-priv1-y) spufs/
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq.c b/arch/powerpc/platforms/cell/cbe_cpufreq.c
new file mode 100644
index 000000000000..a3850fd1e94c
--- /dev/null
+++ b/arch/powerpc/platforms/cell/cbe_cpufreq.c
@@ -0,0 +1,248 @@
+/*
+ * cpufreq driver for the cell processor
+ *
+ * (C) Copyright IBM Deutschland Entwicklung GmbH 2005
+ *
+ * Author: Christian Krafft <krafft@de.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/cpufreq.h>
+#include <linux/timer.h>
+
+#include <asm/hw_irq.h>
+#include <asm/io.h>
+#include <asm/processor.h>
+#include <asm/prom.h>
+#include <asm/time.h>
+
+#include "cbe_regs.h"
+
+static DEFINE_MUTEX(cbe_switch_mutex);
+
+
+/* the CBE supports an 8 step frequency scaling */
+static struct cpufreq_frequency_table cbe_freqs[] = {
+        {1,     0},
+        {2,     0},
+        {3,     0},
+        {4,     0},
+        {5,     0},
+        {6,     0},
+        {8,     0},
+        {10,    0},
+        {0,     CPUFREQ_TABLE_END},
+};
+
+/* to write to MIC register */
+static u64 MIC_Slow_Fast_Timer_table[] = {
+        [0 ... 7] = 0x007fc00000000000ull,
+};
+
+/* more values for the MIC */
+static u64 MIC_Slow_Next_Timer_table[] = {
+        0x0000240000000000ull,
+        0x0000268000000000ull,
+        0x000029C000000000ull,
+        0x00002D0000000000ull,
+        0x0000300000000000ull,
+        0x0000334000000000ull,
+        0x000039C000000000ull,
+        0x00003FC000000000ull,
+};
+
+/*
+ * hardware specific functions
+ */
+
+static int get_pmode(int cpu)
+{
+        int ret;
+        struct cbe_pmd_regs __iomem *pmd_regs;
+
+        pmd_regs = cbe_get_cpu_pmd_regs(cpu);
+        ret = in_be64(&pmd_regs->pmsr) & 0x07;
+
+        return ret;
+}
+
+static int set_pmode(int cpu, unsigned int pmode)
+{
+        struct cbe_pmd_regs __iomem *pmd_regs;
+        struct cbe_mic_tm_regs __iomem *mic_tm_regs;
+        u64 flags;
+        u64 value;
+
+        local_irq_save(flags);
+
+        mic_tm_regs = cbe_get_cpu_mic_tm_regs(cpu);
+        pmd_regs = cbe_get_cpu_pmd_regs(cpu);
+
+        pr_debug("pm register is mapped at %p\n", &pmd_regs->pmcr);
+        pr_debug("mic register is mapped at %p\n", &mic_tm_regs->slow_fast_timer_0);
+
+        out_be64(&mic_tm_regs->slow_fast_timer_0, MIC_Slow_Fast_Timer_table[pmode]);
+        out_be64(&mic_tm_regs->slow_fast_timer_1, MIC_Slow_Fast_Timer_table[pmode]);
+
+        out_be64(&mic_tm_regs->slow_next_timer_0, MIC_Slow_Next_Timer_table[pmode]);
+        out_be64(&mic_tm_regs->slow_next_timer_1, MIC_Slow_Next_Timer_table[pmode]);
+
+        value = in_be64(&pmd_regs->pmcr);
+        /* set bits to zero */
+        value &= 0xFFFFFFFFFFFFFFF8ull;
+        /* set bits to next pmode */
+        value |= pmode;
+
+        out_be64(&pmd_regs->pmcr, value);
+
+        /* wait until new pmode appears in status register */
+        value = in_be64(&pmd_regs->pmsr) & 0x07;
+        while(value != pmode) {
+                cpu_relax();
+                value = in_be64(&pmd_regs->pmsr) & 0x07;
+        }
+
+        local_irq_restore(flags);
+
+        return 0;
+}
+
+/*
+ * cpufreq functions
+ */
+
+static int cbe_cpufreq_cpu_init (struct cpufreq_policy *policy)
+{
+        u32 *max_freq;
+        int i, cur_pmode;
+        struct device_node *cpu;
+
+        cpu = of_get_cpu_node(policy->cpu, NULL);
+
+        if(!cpu)
+                return -ENODEV;
+
+        pr_debug("init cpufreq on CPU %d\n", policy->cpu);
+
+        max_freq = (u32*) get_property(cpu, "clock-frequency", NULL);
+
+        if(!max_freq)
+                return -EINVAL;
+
+        // we need the freq in kHz
+        *max_freq /= 1000;
+
+        pr_debug("max clock-frequency is at %u kHz\n", *max_freq);
+        pr_debug("initializing frequency table\n");
+
+        // initialize frequency table
+        for (i=0; cbe_freqs[i].frequency!=CPUFREQ_TABLE_END; i++) {
+                cbe_freqs[i].frequency = *max_freq / cbe_freqs[i].index;
+                pr_debug("%d: %d\n", i, cbe_freqs[i].frequency);
+        }
+
+        policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
+        /* if DEBUG is enabled set_pmode() measures the correct latency of a transition */
+        policy->cpuinfo.transition_latency = 25000;
+
+        cur_pmode = get_pmode(policy->cpu);
+        pr_debug("current pmode is at %d\n",cur_pmode);
+
+        policy->cur = cbe_freqs[cur_pmode].frequency;
+
+#ifdef CONFIG_SMP
+        policy->cpus = cpu_sibling_map[policy->cpu];
+#endif
+
+        cpufreq_frequency_table_get_attr (cbe_freqs, policy->cpu);
+
+        /* this ensures that policy->cpuinfo_min and policy->cpuinfo_max are set correctly */
+        return cpufreq_frequency_table_cpuinfo (policy, cbe_freqs);
+}
+
+static int cbe_cpufreq_cpu_exit(struct cpufreq_policy *policy)
+{
+        cpufreq_frequency_table_put_attr(policy->cpu);
+        return 0;
+}
+
+static int cbe_cpufreq_verify(struct cpufreq_policy *policy)
+{
+        return cpufreq_frequency_table_verify(policy, cbe_freqs);
+}
+
+
+static int cbe_cpufreq_target(struct cpufreq_policy *policy, unsigned int target_freq,
+                            unsigned int relation)
+{
+        int rc;
+        struct cpufreq_freqs freqs;
+        int cbe_pmode_new;
+
+        cpufreq_frequency_table_target(policy,
+                                       cbe_freqs,
+                                       target_freq,
+                                       relation,
+                                       &cbe_pmode_new);
+
+        freqs.old = policy->cur;
+        freqs.new = cbe_freqs[cbe_pmode_new].frequency;
+        freqs.cpu = policy->cpu;
+
+        mutex_lock (&cbe_switch_mutex);
+        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+
+        pr_debug("setting frequency for cpu %d to %d kHz, 1/%d of max frequency\n",
+                 policy->cpu,
+                 cbe_freqs[cbe_pmode_new].frequency,
+                 cbe_freqs[cbe_pmode_new].index);
+
+        rc = set_pmode(policy->cpu, cbe_pmode_new);
+        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        mutex_unlock(&cbe_switch_mutex);
+
+        return rc;
+}
+
+static struct cpufreq_driver cbe_cpufreq_driver = {
+        .verify         = cbe_cpufreq_verify,
+        .target         = cbe_cpufreq_target,
+        .init           = cbe_cpufreq_cpu_init,
+        .exit           = cbe_cpufreq_cpu_exit,
+        .name           = "cbe-cpufreq",
+        .owner          = THIS_MODULE,
+        .flags          = CPUFREQ_CONST_LOOPS,
+};
+
+/*
+ * module init and destoy
+ */
+
+static int __init cbe_cpufreq_init(void)
+{
+        return cpufreq_register_driver(&cbe_cpufreq_driver);
+}
+
+static void __exit cbe_cpufreq_exit(void)
+{
+        cpufreq_unregister_driver(&cbe_cpufreq_driver);
+}
+
+module_init(cbe_cpufreq_init);
+module_exit(cbe_cpufreq_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Christian Krafft <krafft@de.ibm.com>");
diff --git a/arch/powerpc/platforms/cell/cbe_regs.c b/arch/powerpc/platforms/cell/cbe_regs.c
index 2f194ba29899..9a0ee62691d5 100644
--- a/arch/powerpc/platforms/cell/cbe_regs.c
+++ b/arch/powerpc/platforms/cell/cbe_regs.c
@@ -8,6 +8,7 @@
 
 #include <linux/percpu.h>
 #include <linux/types.h>
+#include <linux/module.h>
 
 #include <asm/io.h>
 #include <asm/pgtable.h>
@@ -16,8 +17,6 @@
 
 #include "cbe_regs.h"
 
-#define MAX_CBE         2
-
 /*
  * Current implementation uses "cpu" nodes. We build our own mapping
  * array of cpu numbers to cpu nodes locally for now to allow interrupt
@@ -30,6 +29,8 @@ static struct cbe_regs_map
         struct device_node *cpu_node;
         struct cbe_pmd_regs __iomem *pmd_regs;
         struct cbe_iic_regs __iomem *iic_regs;
+        struct cbe_mic_tm_regs __iomem *mic_tm_regs;
+        struct cbe_pmd_shadow_regs pmd_shadow_regs;
 } cbe_regs_maps[MAX_CBE];
 static int cbe_regs_map_count;
 
@@ -42,6 +43,19 @@ static struct cbe_thread_map
 static struct cbe_regs_map *cbe_find_map(struct device_node *np)
 {
         int i;
+        struct device_node *tmp_np;
+
+        if (strcasecmp(np->type, "spe") == 0) {
+                if (np->data == NULL) {
+                        /* walk up path until cpu node was found */
+                        tmp_np = np->parent;
+                        while (tmp_np != NULL && strcasecmp(tmp_np->type, "cpu") != 0)
+                                tmp_np = tmp_np->parent;
+
+                        np->data = cbe_find_map(tmp_np);
+                }
+                return np->data;
+        }
 
         for (i = 0; i < cbe_regs_map_count; i++)
                 if (cbe_regs_maps[i].cpu_node == np)
@@ -56,6 +70,7 @@ struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np)
                 return NULL;
         return map->pmd_regs;
 }
+EXPORT_SYMBOL_GPL(cbe_get_pmd_regs);
 
 struct cbe_pmd_regs __iomem *cbe_get_cpu_pmd_regs(int cpu)
 {
@@ -64,7 +79,23 @@ struct cbe_pmd_regs __iomem *cbe_get_cpu_pmd_regs(int cpu)
                 return NULL;
         return map->pmd_regs;
 }
+EXPORT_SYMBOL_GPL(cbe_get_cpu_pmd_regs);
 
+struct cbe_pmd_shadow_regs *cbe_get_pmd_shadow_regs(struct device_node *np)
+{
+        struct cbe_regs_map *map = cbe_find_map(np);
+        if (map == NULL)
+                return NULL;
+        return &map->pmd_shadow_regs;
+}
+
+struct cbe_pmd_shadow_regs *cbe_get_cpu_pmd_shadow_regs(int cpu)
+{
+        struct cbe_regs_map *map = cbe_thread_map[cpu].regs;
+        if (map == NULL)
+                return NULL;
+        return &map->pmd_shadow_regs;
+}
 
 struct cbe_iic_regs __iomem *cbe_get_iic_regs(struct device_node *np)
 {
@@ -73,6 +104,7 @@ struct cbe_iic_regs __iomem *cbe_get_iic_regs(struct device_node *np)
                 return NULL;
         return map->iic_regs;
 }
+
 struct cbe_iic_regs __iomem *cbe_get_cpu_iic_regs(int cpu)
 {
         struct cbe_regs_map *map = cbe_thread_map[cpu].regs;
@@ -81,6 +113,36 @@ struct cbe_iic_regs __iomem *cbe_get_cpu_iic_regs(int cpu)
         return map->iic_regs;
 }
 
+struct cbe_mic_tm_regs __iomem *cbe_get_mic_tm_regs(struct device_node *np)
+{
+        struct cbe_regs_map *map = cbe_find_map(np);
+        if (map == NULL)
+                return NULL;
+        return map->mic_tm_regs;
+}
+
+struct cbe_mic_tm_regs __iomem *cbe_get_cpu_mic_tm_regs(int cpu)
+{
+        struct cbe_regs_map *map = cbe_thread_map[cpu].regs;
+        if (map == NULL)
+                return NULL;
+        return map->mic_tm_regs;
+}
+EXPORT_SYMBOL_GPL(cbe_get_cpu_mic_tm_regs);
+
+/* FIXME
+ * This is little more than a stub at the moment.  It should be
+ * fleshed out so that it works for both SMT and non-SMT, no
+ * matter if the passed cpu is odd or even.
+ * For SMT enabled, returns 0 for even-numbered cpu; otherwise 1.
+ * For SMT disabled, returns 0 for all cpus.
+ */
+u32 cbe_get_hw_thread_id(int cpu)
+{
+        return (cpu & 1);
+}
+EXPORT_SYMBOL_GPL(cbe_get_hw_thread_id);
+
 void __init cbe_regs_init(void)
 {
         int i;
@@ -119,6 +181,11 @@ void __init cbe_regs_init(void)
                 prop = get_property(cpu, "iic", NULL);
                 if (prop != NULL)
                         map->iic_regs = ioremap(prop->address, prop->len);
+
+                prop = (struct address_prop *)get_property(cpu, "mic-tm",
+                                                           NULL);
+                if (prop != NULL)
+                        map->mic_tm_regs = ioremap(prop->address, prop->len);
         }
 }
 
diff --git a/arch/powerpc/platforms/cell/cbe_regs.h b/arch/powerpc/platforms/cell/cbe_regs.h
index e76e4a6af5bc..440a7ecc66ea 100644
--- a/arch/powerpc/platforms/cell/cbe_regs.h
+++ b/arch/powerpc/platforms/cell/cbe_regs.h
@@ -4,12 +4,19 @@
  * This file is intended to hold the various register definitions for CBE
  * on-chip system devices (memory controller, IO controller, etc...)
  *
+ * (C) Copyright IBM Corporation 2001,2006
+ *
+ * Authors: Maximino Aguilar (maguilar@us.ibm.com)
+ *          David J. Erb (djerb@us.ibm.com)
+ *
  * (c) 2006 Benjamin Herrenschmidt <benh@kernel.crashing.org>, IBM Corp.
  */
 
 #ifndef CBE_REGS_H
 #define CBE_REGS_H
 
+#include <asm/cell-pmu.h>
+
 /*
  *
  * Some HID register definitions
@@ -22,6 +29,7 @@
 #define HID0_CBE_THERM_INT_EN   0x0000000400000000ul
 #define HID0_CBE_SYSERR_INT_EN  0x0000000200000000ul
 
+#define MAX_CBE         2
 
 /*
  *
@@ -29,51 +37,124 @@
  *
  */
 
+union spe_reg {
+        u64 val;
+        u8 spe[8];
+};
+
+union ppe_spe_reg {
+        u64 val;
+        struct {
+                u32 ppe;
+                u32 spe;
+        };
+};
+
+
 struct cbe_pmd_regs {
-        u8 pad_0x0000_0x0800[0x0800 - 0x0000];                  /* 0x0000 */
+        /* Debug Bus Control */
+        u64     pad_0x0000;                                     /* 0x0000 */
+
+        u64     group_control;                                  /* 0x0008 */
+
+        u8      pad_0x0010_0x00a8 [0x00a8 - 0x0010];            /* 0x0010 */
+
+        u64     debug_bus_control;                              /* 0x00a8 */
+
+        u8      pad_0x00b0_0x0100 [0x0100 - 0x00b0];            /* 0x00b0 */
+
+        u64     trace_aux_data;                                 /* 0x0100 */
+        u64     trace_buffer_0_63;                              /* 0x0108 */
+        u64     trace_buffer_64_127;                            /* 0x0110 */
+        u64     trace_address;                                  /* 0x0118 */
+        u64     ext_tr_timer;                                   /* 0x0120 */
+
+        u8      pad_0x0128_0x0400 [0x0400 - 0x0128];            /* 0x0128 */
+
+        /* Performance Monitor */
+        u64     pm_status;                                      /* 0x0400 */
+        u64     pm_control;                                     /* 0x0408 */
+        u64     pm_interval;                                    /* 0x0410 */
+        u64     pm_ctr[4];                                      /* 0x0418 */
+        u64     pm_start_stop;                                  /* 0x0438 */
+        u64     pm07_control[8];                                /* 0x0440 */
+
+        u8      pad_0x0480_0x0800 [0x0800 - 0x0480];            /* 0x0480 */
 
         /* Thermal Sensor Registers */
-        u64  ts_ctsr1;                                          /* 0x0800 */
-        u64  ts_ctsr2;                                          /* 0x0808 */
-        u64  ts_mtsr1;                                          /* 0x0810 */
-        u64  ts_mtsr2;                                          /* 0x0818 */
-        u64  ts_itr1;                                           /* 0x0820 */
-        u64  ts_itr2;                                           /* 0x0828 */
-        u64  ts_gitr;                                           /* 0x0830 */
-        u64  ts_isr;                                            /* 0x0838 */
-        u64  ts_imr;                                            /* 0x0840 */
-        u64  tm_cr1;                                            /* 0x0848 */
-        u64  tm_cr2;                                            /* 0x0850 */
-        u64  tm_simr;                                           /* 0x0858 */
-        u64  tm_tpr;                                            /* 0x0860 */
-        u64  tm_str1;                                           /* 0x0868 */
-        u64  tm_str2;                                           /* 0x0870 */
-        u64  tm_tsr;                                            /* 0x0878 */
+        union   spe_reg ts_ctsr1;                               /* 0x0800 */
+        u64     ts_ctsr2;                                       /* 0x0808 */
+        union   spe_reg ts_mtsr1;                               /* 0x0810 */
+        u64     ts_mtsr2;                                       /* 0x0818 */
+        union   spe_reg ts_itr1;                                /* 0x0820 */
+        u64     ts_itr2;                                        /* 0x0828 */
+        u64     ts_gitr;                                        /* 0x0830 */
+        u64     ts_isr;                                         /* 0x0838 */
+        u64     ts_imr;                                         /* 0x0840 */
+        union   spe_reg tm_cr1;                                 /* 0x0848 */
+        u64     tm_cr2;                                         /* 0x0850 */
+        u64     tm_simr;                                        /* 0x0858 */
+        union   ppe_spe_reg tm_tpr;                             /* 0x0860 */
+        union   spe_reg tm_str1;                                /* 0x0868 */
+        u64     tm_str2;                                        /* 0x0870 */
+        union   ppe_spe_reg tm_tsr;                             /* 0x0878 */
 
         /* Power Management */
-        u64  pm_control;                                        /* 0x0880 */
-#define CBE_PMD_PAUSE_ZERO_CONTROL              0x10000
-        u64  pm_status;                                         /* 0x0888 */
+        u64     pmcr;                                           /* 0x0880 */
+#define CBE_PMD_PAUSE_ZERO_CONTROL      0x10000
+        u64     pmsr;                                           /* 0x0888 */
 
         /* Time Base Register */
-        u64  tbr;                                               /* 0x0890 */
+        u64     tbr;                                            /* 0x0890 */
 
-        u8   pad_0x0898_0x0c00 [0x0c00 - 0x0898];               /* 0x0898 */
+        u8      pad_0x0898_0x0c00 [0x0c00 - 0x0898];            /* 0x0898 */
 
         /* Fault Isolation Registers */
-        u64  checkstop_fir;                                     /* 0x0c00 */
-        u64  recoverable_fir;
-        u64  spec_att_mchk_fir;
-        u64  fir_mode_reg;
-        u64  fir_enable_mask;
+        u64     checkstop_fir;                                  /* 0x0c00 */
+        u64     recoverable_fir;                                /* 0x0c08 */
+        u64     spec_att_mchk_fir;                              /* 0x0c10 */
+        u64     fir_mode_reg;                                   /* 0x0c18 */
+        u64     fir_enable_mask;                                /* 0x0c20 */
 
-        u8   pad_0x0c28_0x1000 [0x1000 - 0x0c28];               /* 0x0c28 */
+        u8      pad_0x0c28_0x1000 [0x1000 - 0x0c28];            /* 0x0c28 */
 };
 
 extern struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np);
 extern struct cbe_pmd_regs __iomem *cbe_get_cpu_pmd_regs(int cpu);
 
 /*
+ * PMU shadow registers
+ *
+ * Many of the registers in the performance monitoring unit are write-only,
+ * so we need to save a copy of what we write to those registers.
+ *
+ * The actual data counters are read/write. However, writing to the counters
+ * only takes effect if the PMU is enabled. Otherwise the value is stored in
+ * a hardware latch until the next time the PMU is enabled. So we save a copy
+ * of the counter values if we need to read them back while the PMU is
+ * disabled. The counter_value_in_latch field is a bitmap indicating which
+ * counters currently have a value waiting to be written.
+ */
+
+struct cbe_pmd_shadow_regs {
+        u32 group_control;
+        u32 debug_bus_control;
+        u32 trace_address;
+        u32 ext_tr_timer;
+        u32 pm_status;
+        u32 pm_control;
+        u32 pm_interval;
+        u32 pm_start_stop;
+        u32 pm07_control[NR_CTRS];
+
+        u32 pm_ctr[NR_PHYS_CTRS];
+        u32 counter_value_in_latch;
+};
+
+extern struct cbe_pmd_shadow_regs *cbe_get_pmd_shadow_regs(struct device_node *np);
+extern struct cbe_pmd_shadow_regs *cbe_get_cpu_pmd_shadow_regs(int cpu);
+
+/*
  *
  * IIC unit register definitions
  *
@@ -102,18 +183,28 @@ struct cbe_iic_regs {
 
         /* IIC interrupt registers */
         struct  cbe_iic_thread_regs thread[2];                  /* 0x0400 */
-        u64     iic_ir;                                         /* 0x0440 */
-        u64     iic_is;                                         /* 0x0448 */
+
+        u64     iic_ir;                                         /* 0x0440 */
+#define CBE_IIC_IR_PRIO(x)      (((x) & 0xf) << 12)
+#define CBE_IIC_IR_DEST_NODE(x) (((x) & 0xf) << 4)
+#define CBE_IIC_IR_DEST_UNIT(x) ((x) & 0xf)
+#define CBE_IIC_IR_IOC_0        0x0
+#define CBE_IIC_IR_IOC_1S       0xb
+#define CBE_IIC_IR_PT_0         0xe
+#define CBE_IIC_IR_PT_1         0xf
+
+        u64     iic_is;                                         /* 0x0448 */
+#define CBE_IIC_IS_PMI          0x2
 
         u8      pad_0x0450_0x0500[0x0500 - 0x0450];             /* 0x0450 */
 
         /* IOC FIR */
         u64     ioc_fir_reset;                                  /* 0x0500 */
-        u64     ioc_fir_set;
-        u64     ioc_checkstop_enable;
-        u64     ioc_fir_error_mask;
-        u64     ioc_syserr_enable;
-        u64     ioc_fir;
+        u64     ioc_fir_set;                                    /* 0x0508 */
+        u64     ioc_checkstop_enable;                           /* 0x0510 */
+        u64     ioc_fir_error_mask;                             /* 0x0518 */
+        u64     ioc_syserr_enable;                              /* 0x0520 */
+        u64     ioc_fir;                                        /* 0x0528 */
 
         u8      pad_0x0530_0x1000[0x1000 - 0x0530];             /* 0x0530 */
 };
@@ -122,6 +213,48 @@ extern struct cbe_iic_regs __iomem *cbe_get_iic_regs(struct device_node *np);
 extern struct cbe_iic_regs __iomem *cbe_get_cpu_iic_regs(int cpu);
 
 
+struct cbe_mic_tm_regs {
+        u8      pad_0x0000_0x0040[0x0040 - 0x0000];             /* 0x0000 */
+
+        u64     mic_ctl_cnfg2;                                  /* 0x0040 */
+#define CBE_MIC_ENABLE_AUX_TRC          0x8000000000000000LL
+#define CBE_MIC_DISABLE_PWR_SAV_2       0x0200000000000000LL
+#define CBE_MIC_DISABLE_AUX_TRC_WRAP    0x0100000000000000LL
+#define CBE_MIC_ENABLE_AUX_TRC_INT      0x0080000000000000LL
+
+        u64     pad_0x0048;                                     /* 0x0048 */
+
+        u64     mic_aux_trc_base;                               /* 0x0050 */
+        u64     mic_aux_trc_max_addr;                           /* 0x0058 */
+        u64     mic_aux_trc_cur_addr;                           /* 0x0060 */
+        u64     mic_aux_trc_grf_addr;                           /* 0x0068 */
+        u64     mic_aux_trc_grf_data;                           /* 0x0070 */
+
+        u64     pad_0x0078;                                     /* 0x0078 */
+
+        u64     mic_ctl_cnfg_0;                                 /* 0x0080 */
+#define CBE_MIC_DISABLE_PWR_SAV_0       0x8000000000000000LL
+
+        u64     pad_0x0088;                                     /* 0x0088 */
+
+        u64     slow_fast_timer_0;                              /* 0x0090 */
+        u64     slow_next_timer_0;                              /* 0x0098 */
+
+        u8      pad_0x00a0_0x01c0[0x01c0 - 0x0a0];              /* 0x00a0 */
+
+        u64     mic_ctl_cnfg_1;                                 /* 0x01c0 */
+#define CBE_MIC_DISABLE_PWR_SAV_1       0x8000000000000000LL
+        u64     pad_0x01c8;                                     /* 0x01c8 */
+
+        u64     slow_fast_timer_1;                              /* 0x01d0 */
+        u64     slow_next_timer_1;                              /* 0x01d8 */
+
+        u8      pad_0x01e0_0x1000[0x1000 - 0x01e0];             /* 0x01e0 */
+};
+
+extern struct cbe_mic_tm_regs __iomem *cbe_get_mic_tm_regs(struct device_node *np);
+extern struct cbe_mic_tm_regs __iomem *cbe_get_cpu_mic_tm_regs(int cpu);
+
 /* Init this module early */
 extern void cbe_regs_init(void);
 
diff --git a/arch/powerpc/platforms/cell/cbe_thermal.c b/arch/powerpc/platforms/cell/cbe_thermal.c
new file mode 100644
index 000000000000..70e0d968d30f
--- /dev/null
+++ b/arch/powerpc/platforms/cell/cbe_thermal.c
@@ -0,0 +1,228 @@
+/*
+ * thermal support for the cell processor
+ *
+ * (C) Copyright IBM Deutschland Entwicklung GmbH 2005
+ *
+ * Author: Christian Krafft <krafft@de.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/sysdev.h>
+#include <linux/kernel.h>
+#include <linux/cpu.h>
+#include <asm/spu.h>
+#include <asm/io.h>
+#include <asm/prom.h>
+
+#include "cbe_regs.h"
+#include "spu_priv1_mmio.h"
+
+static struct cbe_pmd_regs __iomem *get_pmd_regs(struct sys_device *sysdev)
+{
+        struct spu *spu;
+
+        spu = container_of(sysdev, struct spu, sysdev);
+
+        return cbe_get_pmd_regs(spu_devnode(spu));
+}
+
+/* returns the value for a given spu in a given register */
+static u8 spu_read_register_value(struct sys_device *sysdev, union spe_reg __iomem *reg)
+{
+        unsigned int *id;
+        union spe_reg value;
+        struct spu *spu;
+
+        /* getting the id from the reg attribute will not work on future device-tree layouts
+         * in future we should store the id to the spu struct and use it here */
+        spu = container_of(sysdev, struct spu, sysdev);
+        id = (unsigned int *)get_property(spu_devnode(spu), "reg", NULL);
+        value.val = in_be64(&reg->val);
+
+        return value.spe[*id];
+}
+
+static ssize_t spu_show_temp(struct sys_device *sysdev, char *buf)
+{
+        int value;
+        struct cbe_pmd_regs __iomem *pmd_regs;
+
+        pmd_regs = get_pmd_regs(sysdev);
+
+        value = spu_read_register_value(sysdev, &pmd_regs->ts_ctsr1);
+        /* clear all other bits */
+        value &= 0x3F;
+        /* temp is stored in steps of 2 degrees */
+        value *= 2;
+        /* base temp is 65 degrees */
+        value += 65;
+
+        return sprintf(buf, "%d\n", (int) value);
+}
+
+static ssize_t ppe_show_temp(struct sys_device *sysdev, char *buf, int pos)
+{
+        struct cbe_pmd_regs __iomem *pmd_regs;
+        u64 value;
+
+        pmd_regs = cbe_get_cpu_pmd_regs(sysdev->id);
+        value = in_be64(&pmd_regs->ts_ctsr2);
+
+        /* access the corresponding byte */
+        value >>= pos;
+        /* clear all other bits */
+        value &= 0x3F;
+        /* temp is stored in steps of 2 degrees */
+        value *= 2;
+        /* base temp is 65 degrees */
+        value += 65;
+
+        return sprintf(buf, "%d\n", (int) value);
+}
+
+
+/* shows the temperature of the DTS on the PPE,
+ * located near the linear thermal sensor */
+static ssize_t ppe_show_temp0(struct sys_device *sysdev, char *buf)
+{
+        return ppe_show_temp(sysdev, buf, 32);
+}
+
+/* shows the temperature of the second DTS on the PPE */
+static ssize_t ppe_show_temp1(struct sys_device *sysdev, char *buf)
+{
+        return ppe_show_temp(sysdev, buf, 0);
+}
+
+static struct sysdev_attribute attr_spu_temperature = {
+        .attr = {.name = "temperature", .mode = 0400 },
+        .show = spu_show_temp,
+};
+
+static struct attribute *spu_attributes[] = {
+        &attr_spu_temperature.attr,
+        NULL,
+};
+
+static struct attribute_group spu_attribute_group = {
+        .name   = "thermal",
+        .attrs  = spu_attributes,
+};
+
+static struct sysdev_attribute attr_ppe_temperature0 = {
+        .attr = {.name = "temperature0", .mode = 0400 },
+        .show = ppe_show_temp0,
+};
+
+static struct sysdev_attribute attr_ppe_temperature1 = {
+        .attr = {.name = "temperature1", .mode = 0400 },
+        .show = ppe_show_temp1,
+};
+
+static struct attribute *ppe_attributes[] = {
+        &attr_ppe_temperature0.attr,
+        &attr_ppe_temperature1.attr,
+        NULL,
+};
+
+static struct attribute_group ppe_attribute_group = {
+        .name   = "thermal",
+        .attrs  = ppe_attributes,
+};
+
+/*
+ * initialize throttling with default values
+ */
+static void __init init_default_values(void)
+{
+        int cpu;
+        struct cbe_pmd_regs __iomem *pmd_regs;
+        struct sys_device *sysdev;
+        union ppe_spe_reg tpr;
+        union spe_reg str1;
+        u64 str2;
+        union spe_reg cr1;
+        u64 cr2;
+
+        /* TPR defaults */
+        /* ppe
+         *      1F - no full stop
+         *      08 - dynamic throttling starts if over 80 degrees
+         *      03 - dynamic throttling ceases if below 70 degrees */
+        tpr.ppe = 0x1F0803;
+        /* spe
+         *      10 - full stopped when over 96 degrees
+         *      08 - dynamic throttling starts if over 80 degrees
+         *      03 - dynamic throttling ceases if below 70 degrees
+         */
+        tpr.spe = 0x100803;
+
+        /* STR defaults */
+        /* str1
+         *      10 - stop 16 of 32 cycles
+         */
+        str1.val = 0x1010101010101010ull;
+        /* str2
+         *      10 - stop 16 of 32 cycles
+         */
+        str2 = 0x10;
+
+        /* CR defaults */
+        /* cr1
+         *      4 - normal operation
+         */
+        cr1.val = 0x0404040404040404ull;
+        /* cr2
+         *      4 - normal operation
+         */
+        cr2 = 0x04;
+
+        for_each_possible_cpu (cpu) {
+                pr_debug("processing cpu %d\n", cpu);
+                sysdev = get_cpu_sysdev(cpu);
+                pmd_regs = cbe_get_cpu_pmd_regs(sysdev->id);
+
+                out_be64(&pmd_regs->tm_str2, str2);
+                out_be64(&pmd_regs->tm_str1.val, str1.val);
+                out_be64(&pmd_regs->tm_tpr.val, tpr.val);
+                out_be64(&pmd_regs->tm_cr1.val, cr1.val);
+                out_be64(&pmd_regs->tm_cr2, cr2);
+        }
+}
+
+
+static int __init thermal_init(void)
+{
+        init_default_values();
+
+        spu_add_sysdev_attr_group(&spu_attribute_group);
+        cpu_add_sysdev_attr_group(&ppe_attribute_group);
+
+        return 0;
+}
+module_init(thermal_init);
+
+static void __exit thermal_exit(void)
+{
+        spu_remove_sysdev_attr_group(&spu_attribute_group);
+        cpu_remove_sysdev_attr_group(&ppe_attribute_group);
+}
+module_exit(thermal_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Christian Krafft <krafft@de.ibm.com>");
+
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index a914c12b4060..6666d037eb44 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -396,3 +396,19 @@ void __init iic_init_IRQ(void)
         /* Enable on current CPU */
         iic_setup_cpu();
 }
+
+void iic_set_interrupt_routing(int cpu, int thread, int priority)
+{
+        struct cbe_iic_regs __iomem *iic_regs = cbe_get_cpu_iic_regs(cpu);
+        u64 iic_ir = 0;
+        int node = cpu >> 1;
+
+        /* Set which node and thread will handle the next interrupt */
+        iic_ir |= CBE_IIC_IR_PRIO(priority) |
+                  CBE_IIC_IR_DEST_NODE(node);
+        if (thread == 0)
+                iic_ir |= CBE_IIC_IR_DEST_UNIT(CBE_IIC_IR_PT_0);
+        else
+                iic_ir |= CBE_IIC_IR_DEST_UNIT(CBE_IIC_IR_PT_1);
+        out_be64(&iic_regs->iic_ir, iic_ir);
+}
diff --git a/arch/powerpc/platforms/cell/interrupt.h b/arch/powerpc/platforms/cell/interrupt.h
index 9ba1d3c17b4b..942dc39d6045 100644
--- a/arch/powerpc/platforms/cell/interrupt.h
+++ b/arch/powerpc/platforms/cell/interrupt.h
@@ -83,5 +83,7 @@ extern u8 iic_get_target_id(int cpu);
 
 extern void spider_init_IRQ(void);
 
+extern void iic_set_interrupt_routing(int cpu, int thread, int priority);
+
 #endif
 #endif /* ASM_CELL_PIC_H */
diff --git a/arch/powerpc/platforms/cell/io-workarounds.c b/arch/powerpc/platforms/cell/io-workarounds.c
new file mode 100644
index 000000000000..7c73128305ec
--- /dev/null
+++ b/arch/powerpc/platforms/cell/io-workarounds.c
@@ -0,0 +1,346 @@
+/*
+ *  Copyright (C) 2006 Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ *                     IBM, Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#undef DEBUG
+
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/pci.h>
+#include <asm/io.h>
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <asm/ppc-pci.h>
+
+
+#define SPIDER_PCI_REG_BASE             0xd000
+#define SPIDER_PCI_VCI_CNTL_STAT        0x0110
+#define SPIDER_PCI_DUMMY_READ           0x0810
+#define SPIDER_PCI_DUMMY_READ_BASE      0x0814
+
+/* Undefine that to re-enable bogus prefetch
+ *
+ * Without that workaround, the chip will do bogus prefetch past
+ * page boundary from system memory. This setting will disable that,
+ * though the documentation is unclear as to the consequences of doing
+ * so, either purely performances, or possible misbehaviour... It's not
+ * clear wether the chip can handle unaligned accesses at all without
+ * prefetching enabled.
+ *
+ * For now, things appear to be behaving properly with that prefetching
+ * disabled and IDE, possibly because IDE isn't doing any unaligned
+ * access.
+ */
+#define SPIDER_DISABLE_PREFETCH
+
+#define MAX_SPIDERS     3
+
+static struct spider_pci_bus {
+        void __iomem    *regs;
+        unsigned long   mmio_start;
+        unsigned long   mmio_end;
+        unsigned long   pio_vstart;
+        unsigned long   pio_vend;
+} spider_pci_busses[MAX_SPIDERS];
+static int spider_pci_count;
+
+static struct spider_pci_bus *spider_pci_find(unsigned long vaddr,
+                                              unsigned long paddr)
+{
+        int i;
+
+        for (i = 0; i < spider_pci_count; i++) {
+                struct spider_pci_bus *bus = &spider_pci_busses[i];
+                if (paddr && paddr >= bus->mmio_start && paddr < bus->mmio_end)
+                        return bus;
+                if (vaddr && vaddr >= bus->pio_vstart && vaddr < bus->pio_vend)
+                        return bus;
+        }
+        return NULL;
+}
+
+static void spider_io_flush(const volatile void __iomem *addr)
+{
+        struct spider_pci_bus *bus;
+        int token;
+
+        /* Get platform token (set by ioremap) from address */
+        token = PCI_GET_ADDR_TOKEN(addr);
+
+        /* Fast path if we have a non-0 token, it indicates which bus we
+         * are on.
+         *
+         * If the token is 0, that means either the the ioremap was done
+         * before we initialized this layer, or it's a PIO operation. We
+         * fallback to a low path in this case. Hopefully, internal devices
+         * which are ioremap'ed early should use in_XX/out_XX functions
+         * instead of the PCI ones and thus not suffer from the slowdown.
+         *
+         * Also note that currently, the workaround will not work for areas
+         * that are not mapped with PTEs (bolted in the hash table). This
+         * is the case for ioremaps done very early at boot (before
+         * mem_init_done) and includes the mapping of the ISA IO space.
+         *
+         * Fortunately, none of the affected devices is expected to do DMA
+         * and thus there should be no problem in practice.
+         *
+         * In order to improve performances, we only do the PTE search for
+         * addresses falling in the PHB IO space area. That means it will
+         * not work for hotplug'ed PHBs but those don't exist with Spider.
+         */
+        if (token && token <= spider_pci_count)
+                bus = &spider_pci_busses[token - 1];
+        else {
+                unsigned long vaddr, paddr;
+                pte_t *ptep;
+
+                /* Fixup physical address */
+                vaddr = (unsigned long)PCI_FIX_ADDR(addr);
+
+                /* Check if it's in allowed range for  PIO */
+                if (vaddr < PHBS_IO_BASE || vaddr >= IMALLOC_BASE)
+                        return;
+
+                /* Try to find a PTE. If not, clear the paddr, we'll do
+                 * a vaddr only lookup (PIO only)
+                 */
+                ptep = find_linux_pte(init_mm.pgd, vaddr);
+                if (ptep == NULL)
+                        paddr = 0;
+                else
+                        paddr = pte_pfn(*ptep) << PAGE_SHIFT;
+
+                bus = spider_pci_find(vaddr, paddr);
+                if (bus == NULL)
+                        return;
+        }
+
+        /* Now do the workaround
+         */
+        (void)in_be32(bus->regs + SPIDER_PCI_DUMMY_READ);
+}
+
+static u8 spider_readb(const volatile void __iomem *addr)
+{
+        u8 val = __do_readb(addr);
+        spider_io_flush(addr);
+        return val;
+}
+
+static u16 spider_readw(const volatile void __iomem *addr)
+{
+        u16 val = __do_readw(addr);
+        spider_io_flush(addr);
+        return val;
+}
+
+static u32 spider_readl(const volatile void __iomem *addr)
+{
+        u32 val = __do_readl(addr);
+        spider_io_flush(addr);
+        return val;
+}
+
+static u64 spider_readq(const volatile void __iomem *addr)
+{
+        u64 val = __do_readq(addr);
+        spider_io_flush(addr);
+        return val;
+}
+
+static u16 spider_readw_be(const volatile void __iomem *addr)
+{
+        u16 val = __do_readw_be(addr);
+        spider_io_flush(addr);
+        return val;
+}
+
+static u32 spider_readl_be(const volatile void __iomem *addr)
+{
+        u32 val = __do_readl_be(addr);
+        spider_io_flush(addr);
+        return val;
+}
+
+static u64 spider_readq_be(const volatile void __iomem *addr)
+{
+        u64 val = __do_readq_be(addr);
+        spider_io_flush(addr);
+        return val;
+}
+
+static void spider_readsb(const volatile void __iomem *addr, void *buf,
+                          unsigned long count)
+{
+        __do_readsb(addr, buf, count);
+        spider_io_flush(addr);
+}
+
+static void spider_readsw(const volatile void __iomem *addr, void *buf,
+                          unsigned long count)
+{
+        __do_readsw(addr, buf, count);
+        spider_io_flush(addr);
+}
+
+static void spider_readsl(const volatile void __iomem *addr, void *buf,
+                          unsigned long count)
+{
+        __do_readsl(addr, buf, count);
+        spider_io_flush(addr);
+}
+
+static void spider_memcpy_fromio(void *dest, const volatile void __iomem *src,
+                                 unsigned long n)
+{
+        __do_memcpy_fromio(dest, src, n);
+        spider_io_flush(src);
+}
+
+
+static void __iomem * spider_ioremap(unsigned long addr, unsigned long size,
+                                     unsigned long flags)
+{
+        struct spider_pci_bus *bus;
+        void __iomem *res = __ioremap(addr, size, flags);
+        int busno;
+
+        pr_debug("spider_ioremap(0x%lx, 0x%lx, 0x%lx) -> 0x%p\n",
+                 addr, size, flags, res);
+
+        bus = spider_pci_find(0, addr);
+        if (bus != NULL) {
+                busno = bus - spider_pci_busses;
+                pr_debug(" found bus %d, setting token\n", busno);
+                PCI_SET_ADDR_TOKEN(res, busno + 1);
+        }
+        pr_debug(" result=0x%p\n", res);
+
+        return res;
+}
+
+static void __init spider_pci_setup_chip(struct spider_pci_bus *bus)
+{
+#ifdef SPIDER_DISABLE_PREFETCH
+        u32 val = in_be32(bus->regs + SPIDER_PCI_VCI_CNTL_STAT);
+        pr_debug(" PVCI_Control_Status was 0x%08x\n", val);
+        out_be32(bus->regs + SPIDER_PCI_VCI_CNTL_STAT, val | 0x8);
+#endif
+
+        /* Configure the dummy address for the workaround */
+        out_be32(bus->regs + SPIDER_PCI_DUMMY_READ_BASE, 0x80000000);
+}
+
+static void __init spider_pci_add_one(struct pci_controller *phb)
+{
+        struct spider_pci_bus *bus = &spider_pci_busses[spider_pci_count];
+        struct device_node *np = phb->arch_data;
+        struct resource rsrc;
+        void __iomem *regs;
+
+        if (spider_pci_count >= MAX_SPIDERS) {
+                printk(KERN_ERR "Too many spider bridges, workarounds"
+                       " disabled for %s\n", np->full_name);
+                return;
+        }
+
+        /* Get the registers for the beast */
+        if (of_address_to_resource(np, 0, &rsrc)) {
+                printk(KERN_ERR "Failed to get registers for spider %s"
+                       " workarounds disabled\n", np->full_name);
+                return;
+        }
+
+        /* Mask out some useless bits in there to get to the base of the
+         * spider chip
+         */
+        rsrc.start &= ~0xfffffffful;
+
+        /* Map them */
+        regs = ioremap(rsrc.start + SPIDER_PCI_REG_BASE, 0x1000);
+        if (regs == NULL) {
+                printk(KERN_ERR "Failed to map registers for spider %s"
+                       " workarounds disabled\n", np->full_name);
+                return;
+        }
+
+        spider_pci_count++;
+
+        /* We assume spiders only have one MMIO resource */
+        bus->mmio_start = phb->mem_resources[0].start;
+        bus->mmio_end = phb->mem_resources[0].end + 1;
+
+        bus->pio_vstart = (unsigned long)phb->io_base_virt;
+        bus->pio_vend = bus->pio_vstart + phb->pci_io_size;
+
+        bus->regs = regs;
+
+        printk(KERN_INFO "PCI: Spider MMIO workaround for %s\n",np->full_name);
+
+        pr_debug(" mmio (P) = 0x%016lx..0x%016lx\n",
+                 bus->mmio_start, bus->mmio_end);
+        pr_debug("  pio (V) = 0x%016lx..0x%016lx\n",
+                 bus->pio_vstart, bus->pio_vend);
+        pr_debug(" regs (P) = 0x%016lx (V) = 0x%p\n",
+                 rsrc.start + SPIDER_PCI_REG_BASE, bus->regs);
+
+        spider_pci_setup_chip(bus);
+}
+
+static struct ppc_pci_io __initdata spider_pci_io = {
+        .readb = spider_readb,
+        .readw = spider_readw,
+        .readl = spider_readl,
+        .readq = spider_readq,
+        .readw_be = spider_readw_be,
+        .readl_be = spider_readl_be,
+        .readq_be = spider_readq_be,
+        .readsb = spider_readsb,
+        .readsw = spider_readsw,
+        .readsl = spider_readsl,
+        .memcpy_fromio = spider_memcpy_fromio,
+};
+
+static int __init spider_pci_workaround_init(void)
+{
+        struct pci_controller *phb;
+
+        if (!machine_is(cell))
+                return 0;
+
+        /* Find spider bridges. We assume they have been all probed
+         * in setup_arch(). If that was to change, we would need to
+         * update this code to cope with dynamically added busses
+         */
+        list_for_each_entry(phb, &hose_list, list_node) {
+                struct device_node *np = phb->arch_data;
+                const char *model = get_property(np, "model", NULL);
+
+                /* If no model property or name isn't exactly "pci", skip */
+                if (model == NULL || strcmp(np->name, "pci"))
+                        continue;
+                /* If model is not "Spider", skip */
+                if (strcmp(model, "Spider"))
+                        continue;
+                spider_pci_add_one(phb);
+        }
+
+        /* No Spider PCI found, exit */
+        if (spider_pci_count == 0)
+                return 0;
+
+        /* Setup IO callbacks. We only setup MMIO reads. PIO reads will
+         * fallback to MMIO reads (though without a token, thus slower)
+         */
+        ppc_pci_io = spider_pci_io;
+
+        /* Setup ioremap callback */
+        ppc_md.ioremap = spider_ioremap;
+
+        return 0;
+}
+arch_initcall(spider_pci_workaround_init);
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index aca4c3db0dde..b43466ba8096 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -1,514 +1,747 @@
 /*
  * IOMMU implementation for Cell Broadband Processor Architecture
- * We just establish a linear mapping at boot by setting all the
- * IOPT cache entries in the CPU.
- * The mapping functions should be identical to pci_direct_iommu, 
- * except for the handling of the high order bit that is required
- * by the Spider bridge. These should be split into a separate
- * file at the point where we get a different bridge chip.
  *
- * Copyright (C) 2005 IBM Deutschland Entwicklung GmbH,
- *                       Arnd Bergmann <arndb@de.ibm.com>
+ * (C) Copyright IBM Corporation 2006
  *
- * Based on linear mapping
- * Copyright (C) 2003 Benjamin Herrenschmidt (benh@kernel.crashing.org)
+ * Author: Jeremy Kerr <jk@ozlabs.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #undef DEBUG
 
 #include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/string.h>
 #include <linux/init.h>
-#include <linux/bootmem.h>
-#include <linux/mm.h>
-#include <linux/dma-mapping.h>
-#include <linux/kernel.h>
-#include <linux/compiler.h>
+#include <linux/interrupt.h>
+#include <linux/notifier.h>
 
-#include <asm/sections.h>
-#include <asm/iommu.h>
-#include <asm/io.h>
 #include <asm/prom.h>
-#include <asm/pci-bridge.h>
+#include <asm/iommu.h>
 #include <asm/machdep.h>
-#include <asm/pmac_feature.h>
-#include <asm/abs_addr.h>
-#include <asm/system.h>
-#include <asm/ppc-pci.h>
+#include <asm/pci-bridge.h>
 #include <asm/udbg.h>
+#include <asm/of_platform.h>
+#include <asm/lmb.h>
 
-#include "iommu.h"
+#include "cbe_regs.h"
+#include "interrupt.h"
 
-static inline unsigned long 
-get_iopt_entry(unsigned long real_address, unsigned long ioid,
-                         unsigned long prot)
-{
-        return (prot & IOPT_PROT_MASK)
-             | (IOPT_COHERENT)
-             | (IOPT_ORDER_VC)
-             | (real_address & IOPT_RPN_MASK)
-             | (ioid & IOPT_IOID_MASK);
-}
+/* Define CELL_IOMMU_REAL_UNMAP to actually unmap non-used pages
+ * instead of leaving them mapped to some dummy page. This can be
+ * enabled once the appropriate workarounds for spider bugs have
+ * been enabled
+ */
+#define CELL_IOMMU_REAL_UNMAP
 
-typedef struct {
-        unsigned long val;
-} ioste;
+/* Define CELL_IOMMU_STRICT_PROTECTION to enforce protection of
+ * IO PTEs based on the transfer direction. That can be enabled
+ * once spider-net has been fixed to pass the correct direction
+ * to the DMA mapping functions
+ */
+#define CELL_IOMMU_STRICT_PROTECTION
+
+
+#define NR_IOMMUS                       2
+
+/* IOC mmap registers */
+#define IOC_Reg_Size                    0x2000
+
+#define IOC_IOPT_CacheInvd              0x908
+#define IOC_IOPT_CacheInvd_NE_Mask      0xffe0000000000000ul
+#define IOC_IOPT_CacheInvd_IOPTE_Mask   0x000003fffffffff8ul
+#define IOC_IOPT_CacheInvd_Busy         0x0000000000000001ul
+
+#define IOC_IOST_Origin                 0x918
+#define IOC_IOST_Origin_E               0x8000000000000000ul
+#define IOC_IOST_Origin_HW              0x0000000000000800ul
+#define IOC_IOST_Origin_HL              0x0000000000000400ul
+
+#define IOC_IO_ExcpStat                 0x920
+#define IOC_IO_ExcpStat_V               0x8000000000000000ul
+#define IOC_IO_ExcpStat_SPF_Mask        0x6000000000000000ul
+#define IOC_IO_ExcpStat_SPF_S           0x6000000000000000ul
+#define IOC_IO_ExcpStat_SPF_P           0x4000000000000000ul
+#define IOC_IO_ExcpStat_ADDR_Mask       0x00000007fffff000ul
+#define IOC_IO_ExcpStat_RW_Mask         0x0000000000000800ul
+#define IOC_IO_ExcpStat_IOID_Mask       0x00000000000007fful
+
+#define IOC_IO_ExcpMask                 0x928
+#define IOC_IO_ExcpMask_SFE             0x4000000000000000ul
+#define IOC_IO_ExcpMask_PFE             0x2000000000000000ul
+
+#define IOC_IOCmd_Offset                0x1000
+
+#define IOC_IOCmd_Cfg                   0xc00
+#define IOC_IOCmd_Cfg_TE                0x0000800000000000ul
+
+
+/* Segment table entries */
+#define IOSTE_V                 0x8000000000000000ul /* valid */
+#define IOSTE_H                 0x4000000000000000ul /* cache hint */
+#define IOSTE_PT_Base_RPN_Mask  0x3ffffffffffff000ul /* base RPN of IOPT */
+#define IOSTE_NPPT_Mask         0x0000000000000fe0ul /* no. pages in IOPT */
+#define IOSTE_PS_Mask           0x0000000000000007ul /* page size */
+#define IOSTE_PS_4K             0x0000000000000001ul /*   - 4kB  */
+#define IOSTE_PS_64K            0x0000000000000003ul /*   - 64kB */
+#define IOSTE_PS_1M             0x0000000000000005ul /*   - 1MB  */
+#define IOSTE_PS_16M            0x0000000000000007ul /*   - 16MB */
+
+/* Page table entries */
+#define IOPTE_PP_W              0x8000000000000000ul /* protection: write */
+#define IOPTE_PP_R              0x4000000000000000ul /* protection: read */
+#define IOPTE_M                 0x2000000000000000ul /* coherency required */
+#define IOPTE_SO_R              0x1000000000000000ul /* ordering: writes */
+#define IOPTE_SO_RW             0x1800000000000000ul /* ordering: r & w */
+#define IOPTE_RPN_Mask          0x07fffffffffff000ul /* RPN */
+#define IOPTE_H                 0x0000000000000800ul /* cache hint */
+#define IOPTE_IOID_Mask         0x00000000000007fful /* ioid */
+
+
+/* IOMMU sizing */
+#define IO_SEGMENT_SHIFT        28
+#define IO_PAGENO_BITS          (IO_SEGMENT_SHIFT - IOMMU_PAGE_SHIFT)
+
+/* The high bit needs to be set on every DMA address */
+#define SPIDER_DMA_OFFSET       0x80000000ul
+
+struct iommu_window {
+        struct list_head list;
+        struct cbe_iommu *iommu;
+        unsigned long offset;
+        unsigned long size;
+        unsigned long pte_offset;
+        unsigned int ioid;
+        struct iommu_table table;
+};
 
-static inline ioste
-mk_ioste(unsigned long val)
-{
-        ioste ioste = { .val = val, };
-        return ioste;
-}
+#define NAMESIZE 8
+struct cbe_iommu {
+        int nid;
+        char name[NAMESIZE];
+        void __iomem *xlate_regs;
+        void __iomem *cmd_regs;
+        unsigned long *stab;
+        unsigned long *ptab;
+        void *pad_page;
+        struct list_head windows;
+};
+
+/* Static array of iommus, one per node
+ *   each contains a list of windows, keyed from dma_window property
+ *   - on bus setup, look for a matching window, or create one
+ *   - on dev setup, assign iommu_table ptr
+ */
+static struct cbe_iommu iommus[NR_IOMMUS];
+static int cbe_nr_iommus;
 
-static inline ioste
-get_iost_entry(unsigned long iopt_base, unsigned long io_address, unsigned page_size)
+static void invalidate_tce_cache(struct cbe_iommu *iommu, unsigned long *pte,
+                long n_ptes)
 {
-        unsigned long ps;
-        unsigned long iostep;
-        unsigned long nnpt;
-        unsigned long shift;
-
-        switch (page_size) {
-        case 0x1000000:
-                ps = IOST_PS_16M;
-                nnpt = 0;  /* one page per segment */
-                shift = 5; /* segment has 16 iopt entries */
-                break;
-
-        case 0x100000:
-                ps = IOST_PS_1M;
-                nnpt = 0;  /* one page per segment */
-                shift = 1; /* segment has 256 iopt entries */
-                break;
-
-        case 0x10000:
-                ps = IOST_PS_64K;
-                nnpt = 0x07; /* 8 pages per io page table */
-                shift = 0;   /* all entries are used */
-                break;
-
-        case 0x1000:
-                ps = IOST_PS_4K;
-                nnpt = 0x7f; /* 128 pages per io page table */
-                shift = 0;   /* all entries are used */
-                break;
-
-        default: /* not a known compile time constant */
-                {
-                        /* BUILD_BUG_ON() is not usable here */
-                        extern void __get_iost_entry_bad_page_size(void);
-                        __get_iost_entry_bad_page_size();
-                }
-                break;
-        }
+        unsigned long *reg, val;
+        long n;
 
-        iostep = iopt_base +
-                         /* need 8 bytes per iopte */
-                        (((io_address / page_size * 8)
-                         /* align io page tables on 4k page boundaries */
-                                 << shift) 
-                         /* nnpt+1 pages go into each iopt */
-                                 & ~(nnpt << 12));
-
-        nnpt++; /* this seems to work, but the documentation is not clear
-                   about wether we put nnpt or nnpt-1 into the ioste bits.
-                   In theory, this can't work for 4k pages. */
-        return mk_ioste(IOST_VALID_MASK
-                        | (iostep & IOST_PT_BASE_MASK)
-                        | ((nnpt << 5) & IOST_NNPT_MASK)
-                        | (ps & IOST_PS_MASK));
-}
+        reg = iommu->xlate_regs + IOC_IOPT_CacheInvd;
 
-/* compute the address of an io pte */
-static inline unsigned long
-get_ioptep(ioste iost_entry, unsigned long io_address)
-{
-        unsigned long iopt_base;
-        unsigned long page_size;
-        unsigned long page_number;
-        unsigned long iopt_offset;
-
-        iopt_base = iost_entry.val & IOST_PT_BASE_MASK;
-        page_size = iost_entry.val & IOST_PS_MASK;
-
-        /* decode page size to compute page number */
-        page_number = (io_address & 0x0fffffff) >> (10 + 2 * page_size);
-        /* page number is an offset into the io page table */
-        iopt_offset = (page_number << 3) & 0x7fff8ul;
-        return iopt_base + iopt_offset;
-}
+        while (n_ptes > 0) {
+                /* we can invalidate up to 1 << 11 PTEs at once */
+                n = min(n_ptes, 1l << 11);
+                val = (((n /*- 1*/) << 53) & IOC_IOPT_CacheInvd_NE_Mask)
+                        | (__pa(pte) & IOC_IOPT_CacheInvd_IOPTE_Mask)
+                        | IOC_IOPT_CacheInvd_Busy;
 
-/* compute the tag field of the iopt cache entry */
-static inline unsigned long
-get_ioc_tag(ioste iost_entry, unsigned long io_address)
-{
-        unsigned long iopte = get_ioptep(iost_entry, io_address);
+                out_be64(reg, val);
+                while (in_be64(reg) & IOC_IOPT_CacheInvd_Busy)
+                        ;
 
-        return IOPT_VALID_MASK
-             | ((iopte & 0x00000000000000ff8ul) >> 3)
-             | ((iopte & 0x0000003fffffc0000ul) >> 9);
+                n_ptes -= n;
+                pte += n;
+        }
 }
 
-/* compute the hashed 6 bit index for the 4-way associative pte cache */
-static inline unsigned long
-get_ioc_hash(ioste iost_entry, unsigned long io_address)
+static void tce_build_cell(struct iommu_table *tbl, long index, long npages,
+                unsigned long uaddr, enum dma_data_direction direction)
 {
-        unsigned long iopte = get_ioptep(iost_entry, io_address);
-
-        return ((iopte & 0x000000000000001f8ul) >> 3)
-             ^ ((iopte & 0x00000000000020000ul) >> 17)
-             ^ ((iopte & 0x00000000000010000ul) >> 15)
-             ^ ((iopte & 0x00000000000008000ul) >> 13)
-             ^ ((iopte & 0x00000000000004000ul) >> 11)
-             ^ ((iopte & 0x00000000000002000ul) >> 9)
-             ^ ((iopte & 0x00000000000001000ul) >> 7);
+        int i;
+        unsigned long *io_pte, base_pte;
+        struct iommu_window *window =
+                container_of(tbl, struct iommu_window, table);
+
+        /* implementing proper protection causes problems with the spidernet
+         * driver - check mapping directions later, but allow read & write by
+         * default for now.*/
+#ifdef CELL_IOMMU_STRICT_PROTECTION
+        /* to avoid referencing a global, we use a trick here to setup the
+         * protection bit. "prot" is setup to be 3 fields of 4 bits apprended
+         * together for each of the 3 supported direction values. It is then
+         * shifted left so that the fields matching the desired direction
+         * lands on the appropriate bits, and other bits are masked out.
+         */
+        const unsigned long prot = 0xc48;
+        base_pte =
+                ((prot << (52 + 4 * direction)) & (IOPTE_PP_W | IOPTE_PP_R))
+                | IOPTE_M | IOPTE_SO_RW | (window->ioid & IOPTE_IOID_Mask);
+#else
+        base_pte = IOPTE_PP_W | IOPTE_PP_R | IOPTE_M | IOPTE_SO_RW |
+                (window->ioid & IOPTE_IOID_Mask);
+#endif
+
+        io_pte = (unsigned long *)tbl->it_base + (index - window->pte_offset);
+
+        for (i = 0; i < npages; i++, uaddr += IOMMU_PAGE_SIZE)
+                io_pte[i] = base_pte | (__pa(uaddr) & IOPTE_RPN_Mask);
+
+        mb();
+
+        invalidate_tce_cache(window->iommu, io_pte, npages);
+
+        pr_debug("tce_build_cell(index=%lx,n=%lx,dir=%d,base_pte=%lx)\n",
+                 index, npages, direction, base_pte);
 }
 
-/* same as above, but pretend that we have a simpler 1-way associative
-   pte cache with an 8 bit index */
-static inline unsigned long
-get_ioc_hash_1way(ioste iost_entry, unsigned long io_address)
+static void tce_free_cell(struct iommu_table *tbl, long index, long npages)
 {
-        unsigned long iopte = get_ioptep(iost_entry, io_address);
-
-        return ((iopte & 0x000000000000001f8ul) >> 3)
-             ^ ((iopte & 0x00000000000020000ul) >> 17)
-             ^ ((iopte & 0x00000000000010000ul) >> 15)
-             ^ ((iopte & 0x00000000000008000ul) >> 13)
-             ^ ((iopte & 0x00000000000004000ul) >> 11)
-             ^ ((iopte & 0x00000000000002000ul) >> 9)
-             ^ ((iopte & 0x00000000000001000ul) >> 7)
-             ^ ((iopte & 0x0000000000000c000ul) >> 8);
-}
 
-static inline ioste
-get_iost_cache(void __iomem *base, unsigned long index)
-{
-        unsigned long __iomem *p = (base + IOC_ST_CACHE_DIR);
-        return mk_ioste(in_be64(&p[index]));
-}
+        int i;
+        unsigned long *io_pte, pte;
+        struct iommu_window *window =
+                container_of(tbl, struct iommu_window, table);
 
-static inline void
-set_iost_cache(void __iomem *base, unsigned long index, ioste ste)
-{
-        unsigned long __iomem *p = (base + IOC_ST_CACHE_DIR);
-        pr_debug("ioste %02lx was %016lx, store %016lx", index,
-                        get_iost_cache(base, index).val, ste.val);
-        out_be64(&p[index], ste.val);
-        pr_debug(" now %016lx\n", get_iost_cache(base, index).val);
-}
+        pr_debug("tce_free_cell(index=%lx,n=%lx)\n", index, npages);
 
-static inline unsigned long
-get_iopt_cache(void __iomem *base, unsigned long index, unsigned long *tag)
-{
-        unsigned long __iomem *tags = (void *)(base + IOC_PT_CACHE_DIR);
-        unsigned long __iomem *p = (void *)(base + IOC_PT_CACHE_REG);   
+#ifdef CELL_IOMMU_REAL_UNMAP
+        pte = 0;
+#else
+        /* spider bridge does PCI reads after freeing - insert a mapping
+         * to a scratch page instead of an invalid entry */
+        pte = IOPTE_PP_R | IOPTE_M | IOPTE_SO_RW | __pa(window->iommu->pad_page)
+                | (window->ioid & IOPTE_IOID_Mask);
+#endif
 
-        *tag = tags[index];
-        rmb();
-        return *p;
-}
+        io_pte = (unsigned long *)tbl->it_base + (index - window->pte_offset);
 
-static inline void
-set_iopt_cache(void __iomem *base, unsigned long index,
-                 unsigned long tag, unsigned long val)
-{
-        unsigned long __iomem *tags = base + IOC_PT_CACHE_DIR;
-        unsigned long __iomem *p = base + IOC_PT_CACHE_REG;
+        for (i = 0; i < npages; i++)
+                io_pte[i] = pte;
+
+        mb();
 
-        out_be64(p, val);
-        out_be64(&tags[index], tag);
+        invalidate_tce_cache(window->iommu, io_pte, npages);
 }
 
-static inline void
-set_iost_origin(void __iomem *base)
+static irqreturn_t ioc_interrupt(int irq, void *data)
 {
-        unsigned long __iomem *p = base + IOC_ST_ORIGIN;
-        unsigned long origin = IOSTO_ENABLE | IOSTO_SW;
-
-        pr_debug("iost_origin %016lx, now %016lx\n", in_be64(p), origin);
-        out_be64(p, origin);
+        unsigned long stat;
+        struct cbe_iommu *iommu = data;
+
+        stat = in_be64(iommu->xlate_regs + IOC_IO_ExcpStat);
+
+        /* Might want to rate limit it */
+        printk(KERN_ERR "iommu: DMA exception 0x%016lx\n", stat);
+        printk(KERN_ERR "  V=%d, SPF=[%c%c], RW=%s, IOID=0x%04x\n",
+               !!(stat & IOC_IO_ExcpStat_V),
+               (stat & IOC_IO_ExcpStat_SPF_S) ? 'S' : ' ',
+               (stat & IOC_IO_ExcpStat_SPF_P) ? 'P' : ' ',
+               (stat & IOC_IO_ExcpStat_RW_Mask) ? "Read" : "Write",
+               (unsigned int)(stat & IOC_IO_ExcpStat_IOID_Mask));
+        printk(KERN_ERR "  page=0x%016lx\n",
+               stat & IOC_IO_ExcpStat_ADDR_Mask);
+
+        /* clear interrupt */
+        stat &= ~IOC_IO_ExcpStat_V;
+        out_be64(iommu->xlate_regs + IOC_IO_ExcpStat, stat);
+
+        return IRQ_HANDLED;
 }
 
-static inline void
-set_iocmd_config(void __iomem *base)
+static int cell_iommu_find_ioc(int nid, unsigned long *base)
 {
-        unsigned long __iomem *p = base + 0xc00;
-        unsigned long conf;
+        struct device_node *np;
+        struct resource r;
+
+        *base = 0;
+
+        /* First look for new style /be nodes */
+        for_each_node_by_name(np, "ioc") {
+                if (of_node_to_nid(np) != nid)
+                        continue;
+                if (of_address_to_resource(np, 0, &r)) {
+                        printk(KERN_ERR "iommu: can't get address for %s\n",
+                               np->full_name);
+                        continue;
+                }
+                *base = r.start;
+                of_node_put(np);
+                return 0;
+        }
 
-        conf = in_be64(p);
-        pr_debug("iost_conf %016lx, now %016lx\n", conf, conf | IOCMD_CONF_TE);
-        out_be64(p, conf | IOCMD_CONF_TE);
+        /* Ok, let's try the old way */
+        for_each_node_by_type(np, "cpu") {
+                const unsigned int *nidp;
+                const unsigned long *tmp;
+
+                nidp = get_property(np, "node-id", NULL);
+                if (nidp && *nidp == nid) {
+                        tmp = get_property(np, "ioc-translation", NULL);
+                        if (tmp) {
+                                *base = *tmp;
+                                of_node_put(np);
+                                return 0;
+                        }
+                }
+        }
+
+        return -ENODEV;
 }
 
-static void enable_mapping(void __iomem *base, void __iomem *mmio_base)
+static void cell_iommu_setup_hardware(struct cbe_iommu *iommu, unsigned long size)
 {
-        set_iocmd_config(base);
-        set_iost_origin(mmio_base);
-}
+        struct page *page;
+        int ret, i;
+        unsigned long reg, segments, pages_per_segment, ptab_size, n_pte_pages;
+        unsigned long xlate_base;
+        unsigned int virq;
+
+        if (cell_iommu_find_ioc(iommu->nid, &xlate_base))
+                panic("%s: missing IOC register mappings for node %d\n",
+                      __FUNCTION__, iommu->nid);
+
+        iommu->xlate_regs = ioremap(xlate_base, IOC_Reg_Size);
+        iommu->cmd_regs = iommu->xlate_regs + IOC_IOCmd_Offset;
+
+        segments = size >> IO_SEGMENT_SHIFT;
+        pages_per_segment = 1ull << IO_PAGENO_BITS;
+
+        pr_debug("%s: iommu[%d]: segments: %lu, pages per segment: %lu\n",
+                        __FUNCTION__, iommu->nid, segments, pages_per_segment);
+
+        /* set up the segment table */
+        page = alloc_pages_node(iommu->nid, GFP_KERNEL, 0);
+        BUG_ON(!page);
+        iommu->stab = page_address(page);
+        clear_page(iommu->stab);
+
+        /* ... and the page tables. Since these are contiguous, we can treat
+         * the page tables as one array of ptes, like pSeries does.
+         */
+        ptab_size = segments * pages_per_segment * sizeof(unsigned long);
+        pr_debug("%s: iommu[%d]: ptab_size: %lu, order: %d\n", __FUNCTION__,
+                        iommu->nid, ptab_size, get_order(ptab_size));
+        page = alloc_pages_node(iommu->nid, GFP_KERNEL, get_order(ptab_size));
+        BUG_ON(!page);
+
+        iommu->ptab = page_address(page);
+        memset(iommu->ptab, 0, ptab_size);
+
+        /* allocate a bogus page for the end of each mapping */
+        page = alloc_pages_node(iommu->nid, GFP_KERNEL, 0);
+        BUG_ON(!page);
+        iommu->pad_page = page_address(page);
+        clear_page(iommu->pad_page);
+
+        /* number of pages needed for a page table */
+        n_pte_pages = (pages_per_segment *
+                       sizeof(unsigned long)) >> IOMMU_PAGE_SHIFT;
+
+        pr_debug("%s: iommu[%d]: stab at %p, ptab at %p, n_pte_pages: %lu\n",
+                        __FUNCTION__, iommu->nid, iommu->stab, iommu->ptab,
+                        n_pte_pages);
+
+        /* initialise the STEs */
+        reg = IOSTE_V | ((n_pte_pages - 1) << 5);
+
+        if (IOMMU_PAGE_SIZE == 0x1000)
+                reg |= IOSTE_PS_4K;
+        else if (IOMMU_PAGE_SIZE == 0x10000)
+                reg |= IOSTE_PS_64K;
+        else {
+                extern void __unknown_page_size_error(void);
+                __unknown_page_size_error();
+        }
+
+        pr_debug("Setting up IOMMU stab:\n");
+        for (i = 0; i * (1ul << IO_SEGMENT_SHIFT) < size; i++) {
+                iommu->stab[i] = reg |
+                        (__pa(iommu->ptab) + n_pte_pages * IOMMU_PAGE_SIZE * i);
+                pr_debug("\t[%d] 0x%016lx\n", i, iommu->stab[i]);
+        }
 
-static void iommu_dev_setup_null(struct pci_dev *d) { }
-static void iommu_bus_setup_null(struct pci_bus *b) { }
+        /* ensure that the STEs have updated */
+        mb();
 
-struct cell_iommu {
-        unsigned long base;
-        unsigned long mmio_base;
-        void __iomem *mapped_base;
-        void __iomem *mapped_mmio_base;
-};
+        /* setup interrupts for the iommu. */
+        reg = in_be64(iommu->xlate_regs + IOC_IO_ExcpStat);
+        out_be64(iommu->xlate_regs + IOC_IO_ExcpStat,
+                        reg & ~IOC_IO_ExcpStat_V);
+        out_be64(iommu->xlate_regs + IOC_IO_ExcpMask,
+                        IOC_IO_ExcpMask_PFE | IOC_IO_ExcpMask_SFE);
 
-static struct cell_iommu cell_iommus[NR_CPUS];
+        virq = irq_create_mapping(NULL,
+                        IIC_IRQ_IOEX_ATI | (iommu->nid << IIC_IRQ_NODE_SHIFT));
+        BUG_ON(virq == NO_IRQ);
 
-/* initialize the iommu to support a simple linear mapping
- * for each DMA window used by any device. For now, we
- * happen to know that there is only one DMA window in use,
- * starting at iopt_phys_offset. */
-static void cell_do_map_iommu(struct cell_iommu *iommu,
-                              unsigned int ioid,
-                              unsigned long map_start,
-                              unsigned long map_size)
-{
-        unsigned long io_address, real_address;
-        void __iomem *ioc_base, *ioc_mmio_base;
-        ioste ioste;
-        unsigned long index;
+        ret = request_irq(virq, ioc_interrupt, IRQF_DISABLED,
+                        iommu->name, iommu);
+        BUG_ON(ret);
 
-        /* we pretend the io page table was at a very high address */
-        const unsigned long fake_iopt = 0x10000000000ul;
-        const unsigned long io_page_size = 0x1000000; /* use 16M pages */
-        const unsigned long io_segment_size = 0x10000000; /* 256M */
-
-        ioc_base = iommu->mapped_base;
-        ioc_mmio_base = iommu->mapped_mmio_base;
-
-        for (real_address = 0, io_address = map_start;
-             io_address <= map_start + map_size;
-             real_address += io_page_size, io_address += io_page_size) {
-                ioste = get_iost_entry(fake_iopt, io_address, io_page_size);
-                if ((real_address % io_segment_size) == 0) /* segment start */
-                        set_iost_cache(ioc_mmio_base,
-                                       io_address >> 28, ioste);
-                index = get_ioc_hash_1way(ioste, io_address);
-                pr_debug("addr %08lx, index %02lx, ioste %016lx\n",
-                                         io_address, index, ioste.val);
-                set_iopt_cache(ioc_mmio_base,
-                        get_ioc_hash_1way(ioste, io_address),
-                        get_ioc_tag(ioste, io_address),
-                        get_iopt_entry(real_address, ioid, IOPT_PROT_RW));
-        }
+        /* set the IOC segment table origin register (and turn on the iommu) */
+        reg = IOC_IOST_Origin_E | __pa(iommu->stab) | IOC_IOST_Origin_HW;
+        out_be64(iommu->xlate_regs + IOC_IOST_Origin, reg);
+        in_be64(iommu->xlate_regs + IOC_IOST_Origin);
+
+        /* turn on IO translation */
+        reg = in_be64(iommu->cmd_regs + IOC_IOCmd_Cfg) | IOC_IOCmd_Cfg_TE;
+        out_be64(iommu->cmd_regs + IOC_IOCmd_Cfg, reg);
 }
 
-static void iommu_devnode_setup(struct device_node *d)
+#if 0/* Unused for now */
+static struct iommu_window *find_window(struct cbe_iommu *iommu,
+                unsigned long offset, unsigned long size)
 {
-        const unsigned int *ioid;
-        unsigned long map_start, map_size, token;
-        const unsigned long *dma_window;
-        struct cell_iommu *iommu;
+        struct iommu_window *window;
 
-        ioid = get_property(d, "ioid", NULL);
-        if (!ioid)
-                pr_debug("No ioid entry found !\n");
+        /* todo: check for overlapping (but not equal) windows) */
 
-        dma_window = get_property(d, "ibm,dma-window", NULL);
-        if (!dma_window)
-                pr_debug("No ibm,dma-window entry found !\n");
+        list_for_each_entry(window, &(iommu->windows), list) {
+                if (window->offset == offset && window->size == size)
+                        return window;
+        }
 
-        map_start = dma_window[1];
-        map_size = dma_window[2];
-        token = dma_window[0] >> 32;
+        return NULL;
+}
+#endif
 
-        iommu = &cell_iommus[token];
+static struct iommu_window * __init
+cell_iommu_setup_window(struct cbe_iommu *iommu, struct device_node *np,
+                        unsigned long offset, unsigned long size,
+                        unsigned long pte_offset)
+{
+        struct iommu_window *window;
+        const unsigned int *ioid;
 
-        cell_do_map_iommu(iommu, *ioid, map_start, map_size);
+        ioid = get_property(np, "ioid", NULL);
+        if (ioid == NULL)
+                printk(KERN_WARNING "iommu: missing ioid for %s using 0\n",
+                       np->full_name);
+
+        window = kmalloc_node(sizeof(*window), GFP_KERNEL, iommu->nid);
+        BUG_ON(window == NULL);
+
+        window->offset = offset;
+        window->size = size;
+        window->ioid = ioid ? *ioid : 0;
+        window->iommu = iommu;
+        window->pte_offset = pte_offset;
+
+        window->table.it_blocksize = 16;
+        window->table.it_base = (unsigned long)iommu->ptab;
+        window->table.it_index = iommu->nid;
+        window->table.it_offset = (offset >> IOMMU_PAGE_SHIFT) +
+                window->pte_offset;
+        window->table.it_size = size >> IOMMU_PAGE_SHIFT;
+
+        iommu_init_table(&window->table, iommu->nid);
+
+        pr_debug("\tioid      %d\n", window->ioid);
+        pr_debug("\tblocksize %ld\n", window->table.it_blocksize);
+        pr_debug("\tbase      0x%016lx\n", window->table.it_base);
+        pr_debug("\toffset    0x%lx\n", window->table.it_offset);
+        pr_debug("\tsize      %ld\n", window->table.it_size);
+
+        list_add(&window->list, &iommu->windows);
+
+        if (offset != 0)
+                return window;
+
+        /* We need to map and reserve the first IOMMU page since it's used
+         * by the spider workaround. In theory, we only need to do that when
+         * running on spider but it doesn't really matter.
+         *
+         * This code also assumes that we have a window that starts at 0,
+         * which is the case on all spider based blades.
+         */
+        __set_bit(0, window->table.it_map);
+        tce_build_cell(&window->table, window->table.it_offset, 1,
+                       (unsigned long)iommu->pad_page, DMA_TO_DEVICE);
+        window->table.it_hint = window->table.it_blocksize;
+
+        return window;
 }
 
-static void iommu_bus_setup(struct pci_bus *b)
+static struct cbe_iommu *cell_iommu_for_node(int nid)
 {
-        struct device_node *d = (struct device_node *)b->sysdata;
-        iommu_devnode_setup(d);
-}
+        int i;
 
+        for (i = 0; i < cbe_nr_iommus; i++)
+                if (iommus[i].nid == nid)
+                        return &iommus[i];
+        return NULL;
+}
 
-static int cell_map_iommu_hardcoded(int num_nodes)
+static void cell_dma_dev_setup(struct device *dev)
 {
-        struct cell_iommu *iommu = NULL;
-
-        pr_debug("%s(%d): Using hardcoded defaults\n", __FUNCTION__, __LINE__);
+        struct iommu_window *window;
+        struct cbe_iommu *iommu;
+        struct dev_archdata *archdata = &dev->archdata;
+
+        /* If we run without iommu, no need to do anything */
+        if (pci_dma_ops == &dma_direct_ops)
+                return;
+
+        /* Current implementation uses the first window available in that
+         * node's iommu. We -might- do something smarter later though it may
+         * never be necessary
+         */
+        iommu = cell_iommu_for_node(archdata->numa_node);
+        if (iommu == NULL || list_empty(&iommu->windows)) {
+                printk(KERN_ERR "iommu: missing iommu for %s (node %d)\n",
+                       archdata->of_node ? archdata->of_node->full_name : "?",
+                       archdata->numa_node);
+                return;
+        }
+        window = list_entry(iommu->windows.next, struct iommu_window, list);
 
-        /* node 0 */
-        iommu = &cell_iommus[0];
-        iommu->mapped_base = ioremap(0x20000511000ul, 0x1000);
-        iommu->mapped_mmio_base = ioremap(0x20000510000ul, 0x1000);
+        archdata->dma_data = &window->table;
+}
 
-        enable_mapping(iommu->mapped_base, iommu->mapped_mmio_base);
+static void cell_pci_dma_dev_setup(struct pci_dev *dev)
+{
+        cell_dma_dev_setup(&dev->dev);
+}
 
-        cell_do_map_iommu(iommu, 0x048a,
-                          0x20000000ul,0x20000000ul);
+static int cell_of_bus_notify(struct notifier_block *nb, unsigned long action,
+                              void *data)
+{
+        struct device *dev = data;
 
-        if (num_nodes < 2)
+        /* We are only intereted in device addition */
+        if (action != BUS_NOTIFY_ADD_DEVICE)
                 return 0;
 
-        /* node 1 */
-        iommu = &cell_iommus[1];
-        iommu->mapped_base = ioremap(0x30000511000ul, 0x1000);
-        iommu->mapped_mmio_base = ioremap(0x30000510000ul, 0x1000);
-
-        enable_mapping(iommu->mapped_base, iommu->mapped_mmio_base);
+        /* We use the PCI DMA ops */
+        dev->archdata.dma_ops = pci_dma_ops;
 
-        cell_do_map_iommu(iommu, 0x048a,
-                          0x20000000,0x20000000ul);
+        cell_dma_dev_setup(dev);
 
         return 0;
 }
 
+static struct notifier_block cell_of_bus_notifier = {
+        .notifier_call = cell_of_bus_notify
+};
 
-static int cell_map_iommu(void)
+static int __init cell_iommu_get_window(struct device_node *np,
+                                         unsigned long *base,
+                                         unsigned long *size)
 {
-        unsigned int num_nodes = 0;
-        const unsigned int *node_id;
-        const unsigned long *base, *mmio_base;
-        struct device_node *dn;
-        struct cell_iommu *iommu = NULL;
-
-        /* determine number of nodes (=iommus) */
-        pr_debug("%s(%d): determining number of nodes...", __FUNCTION__, __LINE__);
-        for(dn = of_find_node_by_type(NULL, "cpu");
-            dn;
-            dn = of_find_node_by_type(dn, "cpu")) {
-                node_id = get_property(dn, "node-id", NULL);
-
-                if (num_nodes < *node_id)
-                        num_nodes = *node_id;
-                }
-
-        num_nodes++;
-        pr_debug("%i found.\n", num_nodes);
+        const void *dma_window;
+        unsigned long index;
 
-        /* map the iommu registers for each node */
-        pr_debug("%s(%d): Looping through nodes\n", __FUNCTION__, __LINE__);
-        for(dn = of_find_node_by_type(NULL, "cpu");
-            dn;
-            dn = of_find_node_by_type(dn, "cpu")) {
+        /* Use ibm,dma-window if available, else, hard code ! */
+        dma_window = get_property(np, "ibm,dma-window", NULL);
+        if (dma_window == NULL) {
+                *base = 0;
+                *size = 0x80000000u;
+                return -ENODEV;
+        }
 
-                node_id = get_property(dn, "node-id", NULL);
-                base = get_property(dn, "ioc-cache", NULL);
-                mmio_base = get_property(dn, "ioc-translation", NULL);
+        of_parse_dma_window(np, dma_window, &index, base, size);
+        return 0;
+}
 
-                if (!base || !mmio_base || !node_id)
-                        return cell_map_iommu_hardcoded(num_nodes);
+static void __init cell_iommu_init_one(struct device_node *np, unsigned long offset)
+{
+        struct cbe_iommu *iommu;
+        unsigned long base, size;
+        int nid, i;
+
+        /* Get node ID */
+        nid = of_node_to_nid(np);
+        if (nid < 0) {
+                printk(KERN_ERR "iommu: failed to get node for %s\n",
+                       np->full_name);
+                return;
+        }
+        pr_debug("iommu: setting up iommu for node %d (%s)\n",
+                 nid, np->full_name);
+
+        /* XXX todo: If we can have multiple windows on the same IOMMU, which
+         * isn't the case today, we probably want here to check wether the
+         * iommu for that node is already setup.
+         * However, there might be issue with getting the size right so let's
+         * ignore that for now. We might want to completely get rid of the
+         * multiple window support since the cell iommu supports per-page ioids
+         */
+
+        if (cbe_nr_iommus >= NR_IOMMUS) {
+                printk(KERN_ERR "iommu: too many IOMMUs detected ! (%s)\n",
+                       np->full_name);
+                return;
+        }
 
-                iommu = &cell_iommus[*node_id];
-                iommu->base = *base;
-                iommu->mmio_base = *mmio_base;
+        /* Init base fields */
+        i = cbe_nr_iommus++;
+        iommu = &iommus[i];
+        iommu->stab = 0;
+        iommu->nid = nid;
+        snprintf(iommu->name, sizeof(iommu->name), "iommu%d", i);
+        INIT_LIST_HEAD(&iommu->windows);
 
-                iommu->mapped_base = ioremap(*base, 0x1000);
-                iommu->mapped_mmio_base = ioremap(*mmio_base, 0x1000);
+        /* Obtain a window for it */
+        cell_iommu_get_window(np, &base, &size);
 
-                enable_mapping(iommu->mapped_base,
-                               iommu->mapped_mmio_base);
+        pr_debug("\ttranslating window 0x%lx...0x%lx\n",
+                 base, base + size - 1);
 
-                /* everything else will be done in iommu_bus_setup */
-        }
+        /* Initialize the hardware */
+        cell_iommu_setup_hardware(iommu, size);
 
-        return 1;
+        /* Setup the iommu_table */
+        cell_iommu_setup_window(iommu, np, base, size,
+                                offset >> IOMMU_PAGE_SHIFT);
 }
 
-static void *cell_alloc_coherent(struct device *hwdev, size_t size,
-                           dma_addr_t *dma_handle, gfp_t flag)
+static void __init cell_disable_iommus(void)
 {
-        void *ret;
-
-        ret = (void *)__get_free_pages(flag, get_order(size));
-        if (ret != NULL) {
-                memset(ret, 0, size);
-                *dma_handle = virt_to_abs(ret) | CELL_DMA_VALID;
+        int node;
+        unsigned long base, val;
+        void __iomem *xregs, *cregs;
+
+        /* Make sure IOC translation is disabled on all nodes */
+        for_each_online_node(node) {
+                if (cell_iommu_find_ioc(node, &base))
+                        continue;
+                xregs = ioremap(base, IOC_Reg_Size);
+                if (xregs == NULL)
+                        continue;
+                cregs = xregs + IOC_IOCmd_Offset;
+
+                pr_debug("iommu: cleaning up iommu on node %d\n", node);
+
+                out_be64(xregs + IOC_IOST_Origin, 0);
+                (void)in_be64(xregs + IOC_IOST_Origin);
+                val = in_be64(cregs + IOC_IOCmd_Cfg);
+                val &= ~IOC_IOCmd_Cfg_TE;
+                out_be64(cregs + IOC_IOCmd_Cfg, val);
+                (void)in_be64(cregs + IOC_IOCmd_Cfg);
+
+                iounmap(xregs);
         }
-        return ret;
 }
 
-static void cell_free_coherent(struct device *hwdev, size_t size,
-                                 void *vaddr, dma_addr_t dma_handle)
+static int __init cell_iommu_init_disabled(void)
 {
-        free_pages((unsigned long)vaddr, get_order(size));
-}
+        struct device_node *np = NULL;
+        unsigned long base = 0, size;
+
+        /* When no iommu is present, we use direct DMA ops */
+        pci_dma_ops = &dma_direct_ops;
+
+        /* First make sure all IOC translation is turned off */
+        cell_disable_iommus();
+
+        /* If we have no Axon, we set up the spider DMA magic offset */
+        if (of_find_node_by_name(NULL, "axon") == NULL)
+                dma_direct_offset = SPIDER_DMA_OFFSET;
+
+        /* Now we need to check to see where the memory is mapped
+         * in PCI space. We assume that all busses use the same dma
+         * window which is always the case so far on Cell, thus we
+         * pick up the first pci-internal node we can find and check
+         * the DMA window from there.
+         */
+        for_each_node_by_name(np, "axon") {
+                if (np->parent == NULL || np->parent->parent != NULL)
+                        continue;
+                if (cell_iommu_get_window(np, &base, &size) == 0)
+                        break;
+        }
+        if (np == NULL) {
+                for_each_node_by_name(np, "pci-internal") {
+                        if (np->parent == NULL || np->parent->parent != NULL)
+                                continue;
+                        if (cell_iommu_get_window(np, &base, &size) == 0)
+                                break;
+                }
+        }
+        of_node_put(np);
+
+        /* If we found a DMA window, we check if it's big enough to enclose
+         * all of physical memory. If not, we force enable IOMMU
+         */
+        if (np && size < lmb_end_of_DRAM()) {
+                printk(KERN_WARNING "iommu: force-enabled, dma window"
+                       " (%ldMB) smaller than total memory (%ldMB)\n",
+                       size >> 20, lmb_end_of_DRAM() >> 20);
+                return -ENODEV;
+        }
 
-static dma_addr_t cell_map_single(struct device *hwdev, void *ptr,
-                size_t size, enum dma_data_direction direction)
-{
-        return virt_to_abs(ptr) | CELL_DMA_VALID;
-}
+        dma_direct_offset += base;
 
-static void cell_unmap_single(struct device *hwdev, dma_addr_t dma_addr,
-                size_t size, enum dma_data_direction direction)
-{
+        printk("iommu: disabled, direct DMA offset is 0x%lx\n",
+               dma_direct_offset);
+
+        return 0;
 }
 
-static int cell_map_sg(struct device *hwdev, struct scatterlist *sg,
-                int nents, enum dma_data_direction direction)
+static int __init cell_iommu_init(void)
 {
-        int i;
+        struct device_node *np;
+
+        if (!machine_is(cell))
+                return -ENODEV;
+
+        /* If IOMMU is disabled or we have little enough RAM to not need
+         * to enable it, we setup a direct mapping.
+         *
+         * Note: should we make sure we have the IOMMU actually disabled ?
+         */
+        if (iommu_is_off ||
+            (!iommu_force_on && lmb_end_of_DRAM() <= 0x80000000ull))
+                if (cell_iommu_init_disabled() == 0)
+                        goto bail;
+
+        /* Setup various ppc_md. callbacks */
+        ppc_md.pci_dma_dev_setup = cell_pci_dma_dev_setup;
+        ppc_md.tce_build = tce_build_cell;
+        ppc_md.tce_free = tce_free_cell;
+
+        /* Create an iommu for each /axon node.  */
+        for_each_node_by_name(np, "axon") {
+                if (np->parent == NULL || np->parent->parent != NULL)
+                        continue;
+                cell_iommu_init_one(np, 0);
+        }
 
-        for (i = 0; i < nents; i++, sg++) {
-                sg->dma_address = (page_to_phys(sg->page) + sg->offset)
-                                        | CELL_DMA_VALID;
-                sg->dma_length = sg->length;
+        /* Create an iommu for each toplevel /pci-internal node for
+         * old hardware/firmware
+         */
+        for_each_node_by_name(np, "pci-internal") {
+                if (np->parent == NULL || np->parent->parent != NULL)
+                        continue;
+                cell_iommu_init_one(np, SPIDER_DMA_OFFSET);
         }
 
-        return nents;
-}
+        /* Setup default PCI iommu ops */
+        pci_dma_ops = &dma_iommu_ops;
 
-static void cell_unmap_sg(struct device *hwdev, struct scatterlist *sg,
-                int nents, enum dma_data_direction direction)
-{
-}
+ bail:
+        /* Register callbacks on OF platform device addition/removal
+         * to handle linking them to the right DMA operations
+         */
+        bus_register_notifier(&of_platform_bus_type, &cell_of_bus_notifier);
 
-static int cell_dma_supported(struct device *dev, u64 mask)
-{
-        return mask < 0x100000000ull;
+        return 0;
 }
+arch_initcall(cell_iommu_init);
 
-static struct dma_mapping_ops cell_iommu_ops = {
-        .alloc_coherent = cell_alloc_coherent,
-        .free_coherent = cell_free_coherent,
-        .map_single = cell_map_single,
-        .unmap_single = cell_unmap_single,
-        .map_sg = cell_map_sg,
-        .unmap_sg = cell_unmap_sg,
-        .dma_supported = cell_dma_supported,
-};
-
-void cell_init_iommu(void)
-{
-        int setup_bus = 0;
-
-        if (of_find_node_by_path("/mambo")) {
-                pr_info("Not using iommu on systemsim\n");
-        } else {
-
-                if (!(of_chosen &&
-                      get_property(of_chosen, "linux,iommu-off", NULL)))
-                        setup_bus = cell_map_iommu();
-
-                if (setup_bus) {
-                        pr_debug("%s: IOMMU mapping activated\n", __FUNCTION__);
-                        ppc_md.iommu_dev_setup = iommu_dev_setup_null;
-                        ppc_md.iommu_bus_setup = iommu_bus_setup;
-                } else {
-                        pr_debug("%s: IOMMU mapping activated, "
-                                 "no device action necessary\n", __FUNCTION__);
-                        /* Direct I/O, IOMMU off */
-                        ppc_md.iommu_dev_setup = iommu_dev_setup_null;
-                        ppc_md.iommu_bus_setup = iommu_bus_setup_null;
-                }
-        }
-
-        pci_dma_ops = cell_iommu_ops;
-}
diff --git a/arch/powerpc/platforms/cell/iommu.h b/arch/powerpc/platforms/cell/iommu.h
deleted file mode 100644
index 490d77abfe85..000000000000
--- a/arch/powerpc/platforms/cell/iommu.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef CELL_IOMMU_H
-#define CELL_IOMMU_H
-
-/* some constants */
-enum {
-        /* segment table entries */
-        IOST_VALID_MASK   = 0x8000000000000000ul,
-        IOST_TAG_MASK     = 0x3000000000000000ul,
-        IOST_PT_BASE_MASK = 0x000003fffffff000ul,
-        IOST_NNPT_MASK    = 0x0000000000000fe0ul,
-        IOST_PS_MASK      = 0x000000000000000ful,
-
-        IOST_PS_4K        = 0x1,
-        IOST_PS_64K       = 0x3,
-        IOST_PS_1M        = 0x5,
-        IOST_PS_16M       = 0x7,
-
-        /* iopt tag register */
-        IOPT_VALID_MASK   = 0x0000000200000000ul,
-        IOPT_TAG_MASK     = 0x00000001fffffffful,
-
-        /* iopt cache register */
-        IOPT_PROT_MASK    = 0xc000000000000000ul,
-        IOPT_PROT_NONE    = 0x0000000000000000ul,
-        IOPT_PROT_READ    = 0x4000000000000000ul,
-        IOPT_PROT_WRITE   = 0x8000000000000000ul,
-        IOPT_PROT_RW      = 0xc000000000000000ul,
-        IOPT_COHERENT     = 0x2000000000000000ul,
-        
-        IOPT_ORDER_MASK   = 0x1800000000000000ul,
-        /* order access to same IOID/VC on same address */
-        IOPT_ORDER_ADDR   = 0x0800000000000000ul,
-        /* similar, but only after a write access */
-        IOPT_ORDER_WRITES = 0x1000000000000000ul,
-        /* Order all accesses to same IOID/VC */
-        IOPT_ORDER_VC     = 0x1800000000000000ul,
-        
-        IOPT_RPN_MASK     = 0x000003fffffff000ul,
-        IOPT_HINT_MASK    = 0x0000000000000800ul,
-        IOPT_IOID_MASK    = 0x00000000000007fful,
-
-        IOSTO_ENABLE      = 0x8000000000000000ul,
-        IOSTO_ORIGIN      = 0x000003fffffff000ul,
-        IOSTO_HW          = 0x0000000000000800ul,
-        IOSTO_SW          = 0x0000000000000400ul,
-
-        IOCMD_CONF_TE     = 0x0000800000000000ul,
-
-        /* memory mapped registers */
-        IOC_PT_CACHE_DIR  = 0x000,
-        IOC_ST_CACHE_DIR  = 0x800,
-        IOC_PT_CACHE_REG  = 0x910,
-        IOC_ST_ORIGIN     = 0x918,
-        IOC_CONF          = 0x930,
-
-        /* The high bit needs to be set on every DMA address,
-           only 2GB are addressable */
-        CELL_DMA_VALID    = 0x80000000,
-        CELL_DMA_MASK     = 0x7fffffff,
-};
-
-
-void cell_init_iommu(void);
-
-#endif
diff --git a/arch/powerpc/platforms/cell/pervasive.c b/arch/powerpc/platforms/cell/pervasive.c
index 9f2e4ed20a57..8c20f0fb8651 100644
--- a/arch/powerpc/platforms/cell/pervasive.c
+++ b/arch/powerpc/platforms/cell/pervasive.c
@@ -38,32 +38,25 @@
 #include "pervasive.h"
 #include "cbe_regs.h"
 
-static DEFINE_SPINLOCK(cbe_pervasive_lock);
-
-static void __init cbe_enable_pause_zero(void)
+static void cbe_power_save(void)
 {
-        unsigned long thread_switch_control;
-        unsigned long temp_register;
-        struct cbe_pmd_regs __iomem *pregs;
-
-        spin_lock_irq(&cbe_pervasive_lock);
-        pregs = cbe_get_cpu_pmd_regs(smp_processor_id());
-        if (pregs == NULL)
-                goto out;
+        unsigned long ctrl, thread_switch_control;
 
-        pr_debug("Power Management: CPU %d\n", smp_processor_id());
-
-         /* Enable Pause(0) control bit */
-        temp_register = in_be64(&pregs->pm_control);
+        /*
+         * We need to hard disable interrupts, but we also need to mark them
+         * hard disabled in the PACA so that the local_irq_enable() done by
+         * our caller upon return propertly hard enables.
+         */
+        hard_irq_disable();
+        get_paca()->hard_enabled = 0;
 
-        out_be64(&pregs->pm_control,
-                 temp_register | CBE_PMD_PAUSE_ZERO_CONTROL);
+        ctrl = mfspr(SPRN_CTRLF);
 
         /* Enable DEC and EE interrupt request */
         thread_switch_control  = mfspr(SPRN_TSC_CELL);
         thread_switch_control |= TSC_CELL_EE_ENABLE | TSC_CELL_EE_BOOST;
 
-        switch ((mfspr(SPRN_CTRLF) & CTRL_CT)) {
+        switch (ctrl & CTRL_CT) {
         case CTRL_CT0:
                 thread_switch_control |= TSC_CELL_DEC_ENABLE_0;
                 break;
@@ -75,58 +68,21 @@ static void __init cbe_enable_pause_zero(void)
                         __FUNCTION__);
                 break;
         }
-
         mtspr(SPRN_TSC_CELL, thread_switch_control);
 
-out:
-        spin_unlock_irq(&cbe_pervasive_lock);
-}
-
-static void cbe_idle(void)
-{
-        unsigned long ctrl;
+        /*
+         * go into low thread priority, medium priority will be
+         * restored for us after wake-up.
+         */
+        HMT_low();
 
-        /* Why do we do that on every idle ? Couldn't that be done once for
-         * all or do we lose the state some way ? Also, the pm_control
-         * register setting, that can't be set once at boot ? We really want
-         * to move that away in order to implement a simple powersave
+        /*
+         * atomically disable thread execution and runlatch.
+         * External and Decrementer exceptions are still handled when the
+         * thread is disabled but now enter in cbe_system_reset_exception()
          */
-        cbe_enable_pause_zero();
-
-        while (1) {
-                if (!need_resched()) {
-                        local_irq_disable();
-                        while (!need_resched()) {
-                                /* go into low thread priority */
-                                HMT_low();
-
-                                /*
-                                 * atomically disable thread execution
-                                 * and runlatch.
-                                 * External and Decrementer exceptions
-                                 * are still handled when the thread
-                                 * is disabled but now enter in
-                                 * cbe_system_reset_exception()
-                                 */
-                                ctrl = mfspr(SPRN_CTRLF);
-                                ctrl &= ~(CTRL_RUNLATCH | CTRL_TE);
-                                mtspr(SPRN_CTRLT, ctrl);
-                        }
-                        /* restore thread prio */
-                        HMT_medium();
-                        local_irq_enable();
-                }
-
-                /*
-                 * turn runlatch on again before scheduling the
-                 * process we just woke up
-                 */
-                ppc64_runlatch_on();
-
-                preempt_enable_no_resched();
-                schedule();
-                preempt_disable();
-        }
+        ctrl &= ~(CTRL_RUNLATCH | CTRL_TE);
+        mtspr(SPRN_CTRLT, ctrl);
 }
 
 static int cbe_system_reset_exception(struct pt_regs *regs)
@@ -158,9 +114,20 @@ static int cbe_system_reset_exception(struct pt_regs *regs)
 
 void __init cbe_pervasive_init(void)
 {
+        int cpu;
         if (!cpu_has_feature(CPU_FTR_PAUSE_ZERO))
                 return;
 
-        ppc_md.idle_loop = cbe_idle;
+        for_each_possible_cpu(cpu) {
+                struct cbe_pmd_regs __iomem *regs = cbe_get_cpu_pmd_regs(cpu);
+                if (!regs)
+                        continue;
+
+                 /* Enable Pause(0) control bit */
+                out_be64(&regs->pmcr, in_be64(&regs->pmcr) |
+                                            CBE_PMD_PAUSE_ZERO_CONTROL);
+        }
+
+        ppc_md.power_save = cbe_power_save;
         ppc_md.system_reset_exception = cbe_system_reset_exception;
 }
diff --git a/arch/powerpc/platforms/cell/pmu.c b/arch/powerpc/platforms/cell/pmu.c
new file mode 100644
index 000000000000..d04ae1671e6c
--- /dev/null
+++ b/arch/powerpc/platforms/cell/pmu.c
@@ -0,0 +1,432 @@
+/*
+ * Cell Broadband Engine Performance Monitor
+ *
+ * (C) Copyright IBM Corporation 2001,2006
+ *
+ * Author:
+ *    David Erb (djerb@us.ibm.com)
+ *    Kevin Corry (kevcorry@us.ibm.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/types.h>
+#include <asm/io.h>
+#include <asm/irq_regs.h>
+#include <asm/machdep.h>
+#include <asm/pmc.h>
+#include <asm/reg.h>
+#include <asm/spu.h>
+
+#include "cbe_regs.h"
+#include "interrupt.h"
+
+/*
+ * When writing to write-only mmio addresses, save a shadow copy. All of the
+ * registers are 32-bit, but stored in the upper-half of a 64-bit field in
+ * pmd_regs.
+ */
+
+#define WRITE_WO_MMIO(reg, x)                                   \
+        do {                                                    \
+                u32 _x = (x);                                   \
+                struct cbe_pmd_regs __iomem *pmd_regs;          \
+                struct cbe_pmd_shadow_regs *shadow_regs;        \
+                pmd_regs = cbe_get_cpu_pmd_regs(cpu);           \
+                shadow_regs = cbe_get_cpu_pmd_shadow_regs(cpu); \
+                out_be64(&(pmd_regs->reg), (((u64)_x) << 32));  \
+                shadow_regs->reg = _x;                          \
+        } while (0)
+
+#define READ_SHADOW_REG(val, reg)                               \
+        do {                                                    \
+                struct cbe_pmd_shadow_regs *shadow_regs;        \
+                shadow_regs = cbe_get_cpu_pmd_shadow_regs(cpu); \
+                (val) = shadow_regs->reg;                       \
+        } while (0)
+
+#define READ_MMIO_UPPER32(val, reg)                             \
+        do {                                                    \
+                struct cbe_pmd_regs __iomem *pmd_regs;          \
+                pmd_regs = cbe_get_cpu_pmd_regs(cpu);           \
+                (val) = (u32)(in_be64(&pmd_regs->reg) >> 32);   \
+        } while (0)
+
+/*
+ * Physical counter registers.
+ * Each physical counter can act as one 32-bit counter or two 16-bit counters.
+ */
+
+u32 cbe_read_phys_ctr(u32 cpu, u32 phys_ctr)
+{
+        u32 val_in_latch, val = 0;
+
+        if (phys_ctr < NR_PHYS_CTRS) {
+                READ_SHADOW_REG(val_in_latch, counter_value_in_latch);
+
+                /* Read the latch or the actual counter, whichever is newer. */
+                if (val_in_latch & (1 << phys_ctr)) {
+                        READ_SHADOW_REG(val, pm_ctr[phys_ctr]);
+                } else {
+                        READ_MMIO_UPPER32(val, pm_ctr[phys_ctr]);
+                }
+        }
+
+        return val;
+}
+EXPORT_SYMBOL_GPL(cbe_read_phys_ctr);
+
+void cbe_write_phys_ctr(u32 cpu, u32 phys_ctr, u32 val)
+{
+        struct cbe_pmd_shadow_regs *shadow_regs;
+        u32 pm_ctrl;
+
+        if (phys_ctr < NR_PHYS_CTRS) {
+                /* Writing to a counter only writes to a hardware latch.
+                 * The new value is not propagated to the actual counter
+                 * until the performance monitor is enabled.
+                 */
+                WRITE_WO_MMIO(pm_ctr[phys_ctr], val);
+
+                pm_ctrl = cbe_read_pm(cpu, pm_control);
+                if (pm_ctrl & CBE_PM_ENABLE_PERF_MON) {
+                        /* The counters are already active, so we need to
+                         * rewrite the pm_control register to "re-enable"
+                         * the PMU.
+                         */
+                        cbe_write_pm(cpu, pm_control, pm_ctrl);
+                } else {
+                        shadow_regs = cbe_get_cpu_pmd_shadow_regs(cpu);
+                        shadow_regs->counter_value_in_latch |= (1 << phys_ctr);
+                }
+        }
+}
+EXPORT_SYMBOL_GPL(cbe_write_phys_ctr);
+
+/*
+ * "Logical" counter registers.
+ * These will read/write 16-bits or 32-bits depending on the
+ * current size of the counter. Counters 4 - 7 are always 16-bit.
+ */
+
+u32 cbe_read_ctr(u32 cpu, u32 ctr)
+{
+        u32 val;
+        u32 phys_ctr = ctr & (NR_PHYS_CTRS - 1);
+
+        val = cbe_read_phys_ctr(cpu, phys_ctr);
+
+        if (cbe_get_ctr_size(cpu, phys_ctr) == 16)
+                val = (ctr < NR_PHYS_CTRS) ? (val >> 16) : (val & 0xffff);
+
+        return val;
+}
+EXPORT_SYMBOL_GPL(cbe_read_ctr);
+
+void cbe_write_ctr(u32 cpu, u32 ctr, u32 val)
+{
+        u32 phys_ctr;
+        u32 phys_val;
+
+        phys_ctr = ctr & (NR_PHYS_CTRS - 1);
+
+        if (cbe_get_ctr_size(cpu, phys_ctr) == 16) {
+                phys_val = cbe_read_phys_ctr(cpu, phys_ctr);
+
+                if (ctr < NR_PHYS_CTRS)
+                        val = (val << 16) | (phys_val & 0xffff);
+                else
+                        val = (val & 0xffff) | (phys_val & 0xffff0000);
+        }
+
+        cbe_write_phys_ctr(cpu, phys_ctr, val);
+}
+EXPORT_SYMBOL_GPL(cbe_write_ctr);
+
+/*
+ * Counter-control registers.
+ * Each "logical" counter has a corresponding control register.
+ */
+
+u32 cbe_read_pm07_control(u32 cpu, u32 ctr)
+{
+        u32 pm07_control = 0;
+
+        if (ctr < NR_CTRS)
+                READ_SHADOW_REG(pm07_control, pm07_control[ctr]);
+
+        return pm07_control;
+}
+EXPORT_SYMBOL_GPL(cbe_read_pm07_control);
+
+void cbe_write_pm07_control(u32 cpu, u32 ctr, u32 val)
+{
+        if (ctr < NR_CTRS)
+                WRITE_WO_MMIO(pm07_control[ctr], val);
+}
+EXPORT_SYMBOL_GPL(cbe_write_pm07_control);
+
+/*
+ * Other PMU control registers. Most of these are write-only.
+ */
+
+u32 cbe_read_pm(u32 cpu, enum pm_reg_name reg)
+{
+        u32 val = 0;
+
+        switch (reg) {
+        case group_control:
+                READ_SHADOW_REG(val, group_control);
+                break;
+
+        case debug_bus_control:
+                READ_SHADOW_REG(val, debug_bus_control);
+                break;
+
+        case trace_address:
+                READ_MMIO_UPPER32(val, trace_address);
+                break;
+
+        case ext_tr_timer:
+                READ_SHADOW_REG(val, ext_tr_timer);
+                break;
+
+        case pm_status:
+                READ_MMIO_UPPER32(val, pm_status);
+                break;
+
+        case pm_control:
+                READ_SHADOW_REG(val, pm_control);
+                break;
+
+        case pm_interval:
+                READ_SHADOW_REG(val, pm_interval);
+                break;
+
+        case pm_start_stop:
+                READ_SHADOW_REG(val, pm_start_stop);
+                break;
+        }
+
+        return val;
+}
+EXPORT_SYMBOL_GPL(cbe_read_pm);
+
+void cbe_write_pm(u32 cpu, enum pm_reg_name reg, u32 val)
+{
+        switch (reg) {
+        case group_control:
+                WRITE_WO_MMIO(group_control, val);
+                break;
+
+        case debug_bus_control:
+                WRITE_WO_MMIO(debug_bus_control, val);
+                break;
+
+        case trace_address:
+                WRITE_WO_MMIO(trace_address, val);
+                break;
+
+        case ext_tr_timer:
+                WRITE_WO_MMIO(ext_tr_timer, val);
+                break;
+
+        case pm_status:
+                WRITE_WO_MMIO(pm_status, val);
+                break;
+
+        case pm_control:
+                WRITE_WO_MMIO(pm_control, val);
+                break;
+
+        case pm_interval:
+                WRITE_WO_MMIO(pm_interval, val);
+                break;
+
+        case pm_start_stop:
+                WRITE_WO_MMIO(pm_start_stop, val);
+                break;
+        }
+}
+EXPORT_SYMBOL_GPL(cbe_write_pm);
+
+/*
+ * Get/set the size of a physical counter to either 16 or 32 bits.
+ */
+
+u32 cbe_get_ctr_size(u32 cpu, u32 phys_ctr)
+{
+        u32 pm_ctrl, size = 0;
+
+        if (phys_ctr < NR_PHYS_CTRS) {
+                pm_ctrl = cbe_read_pm(cpu, pm_control);
+                size = (pm_ctrl & CBE_PM_16BIT_CTR(phys_ctr)) ? 16 : 32;
+        }
+
+        return size;
+}
+EXPORT_SYMBOL_GPL(cbe_get_ctr_size);
+
+void cbe_set_ctr_size(u32 cpu, u32 phys_ctr, u32 ctr_size)
+{
+        u32 pm_ctrl;
+
+        if (phys_ctr < NR_PHYS_CTRS) {
+                pm_ctrl = cbe_read_pm(cpu, pm_control);
+                switch (ctr_size) {
+                case 16:
+                        pm_ctrl |= CBE_PM_16BIT_CTR(phys_ctr);
+                        break;
+
+                case 32:
+                        pm_ctrl &= ~CBE_PM_16BIT_CTR(phys_ctr);
+                        break;
+                }
+                cbe_write_pm(cpu, pm_control, pm_ctrl);
+        }
+}
+EXPORT_SYMBOL_GPL(cbe_set_ctr_size);
+
+/*
+ * Enable/disable the entire performance monitoring unit.
+ * When we enable the PMU, all pending writes to counters get committed.
+ */
+
+void cbe_enable_pm(u32 cpu)
+{
+        struct cbe_pmd_shadow_regs *shadow_regs;
+        u32 pm_ctrl;
+
+        shadow_regs = cbe_get_cpu_pmd_shadow_regs(cpu);
+        shadow_regs->counter_value_in_latch = 0;
+
+        pm_ctrl = cbe_read_pm(cpu, pm_control) | CBE_PM_ENABLE_PERF_MON;
+        cbe_write_pm(cpu, pm_control, pm_ctrl);
+}
+EXPORT_SYMBOL_GPL(cbe_enable_pm);
+
+void cbe_disable_pm(u32 cpu)
+{
+        u32 pm_ctrl;
+        pm_ctrl = cbe_read_pm(cpu, pm_control) & ~CBE_PM_ENABLE_PERF_MON;
+        cbe_write_pm(cpu, pm_control, pm_ctrl);
+}
+EXPORT_SYMBOL_GPL(cbe_disable_pm);
+
+/*
+ * Reading from the trace_buffer.
+ * The trace buffer is two 64-bit registers. Reading from
+ * the second half automatically increments the trace_address.
+ */
+
+void cbe_read_trace_buffer(u32 cpu, u64 *buf)
+{
+        struct cbe_pmd_regs __iomem *pmd_regs = cbe_get_cpu_pmd_regs(cpu);
+
+        *buf++ = in_be64(&pmd_regs->trace_buffer_0_63);
+        *buf++ = in_be64(&pmd_regs->trace_buffer_64_127);
+}
+EXPORT_SYMBOL_GPL(cbe_read_trace_buffer);
+
+/*
+ * Enabling/disabling interrupts for the entire performance monitoring unit.
+ */
+
+u32 cbe_query_pm_interrupts(u32 cpu)
+{
+        return cbe_read_pm(cpu, pm_status);
+}
+EXPORT_SYMBOL_GPL(cbe_query_pm_interrupts);
+
+u32 cbe_clear_pm_interrupts(u32 cpu)
+{
+        /* Reading pm_status clears the interrupt bits. */
+        return cbe_query_pm_interrupts(cpu);
+}
+EXPORT_SYMBOL_GPL(cbe_clear_pm_interrupts);
+
+void cbe_enable_pm_interrupts(u32 cpu, u32 thread, u32 mask)
+{
+        /* Set which node and thread will handle the next interrupt. */
+        iic_set_interrupt_routing(cpu, thread, 0);
+
+        /* Enable the interrupt bits in the pm_status register. */
+        if (mask)
+                cbe_write_pm(cpu, pm_status, mask);
+}
+EXPORT_SYMBOL_GPL(cbe_enable_pm_interrupts);
+
+void cbe_disable_pm_interrupts(u32 cpu)
+{
+        cbe_clear_pm_interrupts(cpu);
+        cbe_write_pm(cpu, pm_status, 0);
+}
+EXPORT_SYMBOL_GPL(cbe_disable_pm_interrupts);
+
+static irqreturn_t cbe_pm_irq(int irq, void *dev_id)
+{
+        perf_irq(get_irq_regs());
+        return IRQ_HANDLED;
+}
+
+static int __init cbe_init_pm_irq(void)
+{
+        unsigned int irq;
+        int rc, node;
+
+        if (!machine_is(cell))
+                return 0;
+
+        for_each_node(node) {
+                irq = irq_create_mapping(NULL, IIC_IRQ_IOEX_PMI |
+                                               (node << IIC_IRQ_NODE_SHIFT));
+                if (irq == NO_IRQ) {
+                        printk("ERROR: Unable to allocate irq for node %d\n",
+                               node);
+                        return -EINVAL;
+                }
+
+                rc = request_irq(irq, cbe_pm_irq,
+                                 IRQF_DISABLED, "cbe-pmu-0", NULL);
+                if (rc) {
+                        printk("ERROR: Request for irq on node %d failed\n",
+                               node);
+                        return rc;
+                }
+        }
+
+        return 0;
+}
+arch_initcall(cbe_init_pm_irq);
+
+void cbe_sync_irq(int node)
+{
+        unsigned int irq;
+
+        irq = irq_find_mapping(NULL,
+                               IIC_IRQ_IOEX_PMI
+                               | (node << IIC_IRQ_NODE_SHIFT));
+
+        if (irq == NO_IRQ) {
+                printk(KERN_WARNING "ERROR, unable to get existing irq %d " \
+                "for node %d\n", irq, node);
+                return;
+        }
+
+        synchronize_irq(irq);
+}
+EXPORT_SYMBOL_GPL(cbe_sync_irq);
+
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index 22c228a49c33..36989c2eee66 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -50,9 +50,10 @@
 #include <asm/spu.h>
 #include <asm/spu_priv1.h>
 #include <asm/udbg.h>
+#include <asm/mpic.h>
+#include <asm/of_platform.h>
 
 #include "interrupt.h"
-#include "iommu.h"
 #include "cbe_regs.h"
 #include "pervasive.h"
 #include "ras.h"
@@ -80,24 +81,72 @@ static void cell_progress(char *s, unsigned short hex)
         printk("*** %04x : %s\n", hex, s ? s : "");
 }
 
-static void __init cell_pcibios_fixup(void)
+static int __init cell_publish_devices(void)
 {
-        struct pci_dev *dev = NULL;
+        if (!machine_is(cell))
+                return 0;
+
+        /* Publish OF platform devices for southbridge IOs */
+        of_platform_bus_probe(NULL, NULL, NULL);
+
+        return 0;
+}
+device_initcall(cell_publish_devices);
+
+static void cell_mpic_cascade(unsigned int irq, struct irq_desc *desc)
+{
+        struct mpic *mpic = desc->handler_data;
+        unsigned int virq;
+
+        virq = mpic_get_one_irq(mpic);
+        if (virq != NO_IRQ)
+                generic_handle_irq(virq);
+        desc->chip->eoi(irq);
+}
 
-        for_each_pci_dev(dev)
-                pci_read_irq_line(dev);
+static void __init mpic_init_IRQ(void)
+{
+        struct device_node *dn;
+        struct mpic *mpic;
+        unsigned int virq;
+
+        for (dn = NULL;
+             (dn = of_find_node_by_name(dn, "interrupt-controller"));) {
+                if (!device_is_compatible(dn, "CBEA,platform-open-pic"))
+                        continue;
+
+                /* The MPIC driver will get everything it needs from the
+                 * device-tree, just pass 0 to all arguments
+                 */
+                mpic = mpic_alloc(dn, 0, 0, 0, 0, " MPIC     ");
+                if (mpic == NULL)
+                        continue;
+                mpic_init(mpic);
+
+                virq = irq_of_parse_and_map(dn, 0);
+                if (virq == NO_IRQ)
+                        continue;
+
+                printk(KERN_INFO "%s : hooking up to IRQ %d\n",
+                       dn->full_name, virq);
+                set_irq_data(virq, mpic);
+                set_irq_chained_handler(virq, cell_mpic_cascade);
+        }
 }
 
+
 static void __init cell_init_irq(void)
 {
         iic_init_IRQ();
         spider_init_IRQ();
+        mpic_init_IRQ();
 }
 
 static void __init cell_setup_arch(void)
 {
 #ifdef CONFIG_SPU_BASE
-        spu_priv1_ops         = &spu_priv1_mmio_ops;
+        spu_priv1_ops = &spu_priv1_mmio_ops;
+        spu_management_ops = &spu_management_of_ops;
 #endif
 
         cbe_regs_init();
@@ -109,7 +158,6 @@ static void __init cell_setup_arch(void)
 #ifdef CONFIG_SMP
         smp_init_cell();
 #endif
-
         /* init to some ~sane value until calibrate_delay() runs */
         loops_per_jiffy = 50000000;
 
@@ -129,19 +177,6 @@ static void __init cell_setup_arch(void)
         mmio_nvram_init();
 }
 
-/*
- * Early initialization.  Relocation is on but do not reference unbolted pages
- */
-static void __init cell_init_early(void)
-{
-        DBG(" -> cell_init_early()\n");
-
-        cell_init_iommu();
-
-        DBG(" <- cell_init_early()\n");
-}
-
-
 static int __init cell_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
@@ -168,7 +203,6 @@ define_machine(cell) {
         .name                   = "Cell",
         .probe                  = cell_probe,
         .setup_arch             = cell_setup_arch,
-        .init_early             = cell_init_early,
         .show_cpuinfo           = cell_show_cpuinfo,
         .restart                = rtas_restart,
         .power_off              = rtas_power_off,
@@ -180,7 +214,7 @@ define_machine(cell) {
         .check_legacy_ioport    = cell_check_legacy_ioport,
         .progress               = cell_progress,
         .init_IRQ               = cell_init_irq,
-        .pcibios_fixup          = cell_pcibios_fixup,
+        .pci_setup_phb          = rtas_setup_phb,
 #ifdef CONFIG_KEXEC
         .machine_kexec          = default_machine_kexec,
         .machine_kexec_prepare  = default_machine_kexec_prepare,
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index 7aa809d5a244..bd7bffc3ddd0 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -25,22 +25,17 @@
 #include <linux/interrupt.h>
 #include <linux/list.h>
 #include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/poll.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
 #include <linux/wait.h>
-
-#include <asm/firmware.h>
-#include <asm/io.h>
-#include <asm/prom.h>
+#include <linux/mm.h>
+#include <linux/io.h>
 #include <linux/mutex.h>
 #include <asm/spu.h>
 #include <asm/spu_priv1.h>
-#include <asm/mmu_context.h>
-
-#include "interrupt.h"
+#include <asm/xmon.h>
 
+const struct spu_management_ops *spu_management_ops;
 const struct spu_priv1_ops *spu_priv1_ops;
 
 EXPORT_SYMBOL_GPL(spu_priv1_ops);
@@ -89,7 +84,30 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea)
                 printk("%s: invalid access during switch!\n", __func__);
                 return 1;
         }
-        if (!mm || (REGION_ID(ea) != USER_REGION_ID)) {
+        esid = (ea & ESID_MASK) | SLB_ESID_V;
+
+        switch(REGION_ID(ea)) {
+        case USER_REGION_ID:
+#ifdef CONFIG_HUGETLB_PAGE
+                if (in_hugepage_area(mm->context, ea))
+                        llp = mmu_psize_defs[mmu_huge_psize].sllp;
+                else
+#endif
+                        llp = mmu_psize_defs[mmu_virtual_psize].sllp;
+                vsid = (get_vsid(mm->context.id, ea) << SLB_VSID_SHIFT) |
+                                SLB_VSID_USER | llp;
+                break;
+        case VMALLOC_REGION_ID:
+                llp = mmu_psize_defs[mmu_virtual_psize].sllp;
+                vsid = (get_kernel_vsid(ea) << SLB_VSID_SHIFT) |
+                        SLB_VSID_KERNEL | llp;
+                break;
+        case KERNEL_REGION_ID:
+                llp = mmu_psize_defs[mmu_linear_psize].sllp;
+                vsid = (get_kernel_vsid(ea) << SLB_VSID_SHIFT) |
+                        SLB_VSID_KERNEL | llp;
+                break;
+        default:
                 /* Future: support kernel segments so that drivers
                  * can use SPUs.
                  */
@@ -97,16 +115,6 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea)
                 return 1;
         }
 
-        esid = (ea & ESID_MASK) | SLB_ESID_V;
-#ifdef CONFIG_HUGETLB_PAGE
-        if (in_hugepage_area(mm->context, ea))
-                llp = mmu_psize_defs[mmu_huge_psize].sllp;
-        else
-#endif
-                llp = mmu_psize_defs[mmu_virtual_psize].sllp;
-        vsid = (get_vsid(mm->context.id, ea) << SLB_VSID_SHIFT) |
-                        SLB_VSID_USER | llp;
-
         out_be64(&priv2->slb_index_W, spu->slb_replace);
         out_be64(&priv2->slb_vsid_RW, vsid);
         out_be64(&priv2->slb_esid_RW, esid);
@@ -320,6 +328,7 @@ static void spu_free_irqs(struct spu *spu)
 }
 
 static struct list_head spu_list[MAX_NUMNODES];
+static LIST_HEAD(spu_full_list);
 static DEFINE_MUTEX(spu_mutex);
 
 static void spu_init_channels(struct spu *spu)
@@ -364,8 +373,7 @@ struct spu *spu_alloc_node(int node)
         if (!list_empty(&spu_list[node])) {
                 spu = list_entry(spu_list[node].next, struct spu, list);
                 list_del_init(&spu->list);
-                pr_debug("Got SPU %x %d %d\n",
-                         spu->isrc, spu->number, spu->node);
+                pr_debug("Got SPU %d %d\n", spu->number, spu->node);
                 spu_init_channels(spu);
         }
         mutex_unlock(&spu_mutex);
@@ -493,280 +501,65 @@ int spu_irq_class_1_bottom(struct spu *spu)
         if (!error) {
                 spu_restart_dma(spu);
         } else {
-                __spu_trap_invalid_dma(spu);
+                spu->dma_callback(spu, SPE_EVENT_SPE_DATA_STORAGE);
         }
         return ret;
 }
 
-static int __init find_spu_node_id(struct device_node *spe)
-{
-        const unsigned int *id;
-        struct device_node *cpu;
-        cpu = spe->parent->parent;
-        id = get_property(cpu, "node-id", NULL);
-        return id ? *id : 0;
-}
-
-static int __init cell_spuprop_present(struct spu *spu, struct device_node *spe,
-                const char *prop)
-{
-        static DEFINE_MUTEX(add_spumem_mutex);
-
-        const struct address_prop {
-                unsigned long address;
-                unsigned int len;
-        } __attribute__((packed)) *p;
-        int proplen;
-
-        unsigned long start_pfn, nr_pages;
-        struct pglist_data *pgdata;
-        struct zone *zone;
-        int ret;
-
-        p = get_property(spe, prop, &proplen);
-        WARN_ON(proplen != sizeof (*p));
-
-        start_pfn = p->address >> PAGE_SHIFT;
-        nr_pages = ((unsigned long)p->len + PAGE_SIZE - 1) >> PAGE_SHIFT;
-
-        pgdata = NODE_DATA(spu->nid);
-        zone = pgdata->node_zones;
-
-        /* XXX rethink locking here */
-        mutex_lock(&add_spumem_mutex);
-        ret = __add_pages(zone, start_pfn, nr_pages);
-        mutex_unlock(&add_spumem_mutex);
-
-        return ret;
-}
+struct sysdev_class spu_sysdev_class = {
+        set_kset_name("spu")
+};
 
-static void __iomem * __init map_spe_prop(struct spu *spu,
-                struct device_node *n, const char *name)
+int spu_add_sysdev_attr(struct sysdev_attribute *attr)
 {
-        const struct address_prop {
-                unsigned long address;
-                unsigned int len;
-        } __attribute__((packed)) *prop;
-
-        const void *p;
-        int proplen;
-        void __iomem *ret = NULL;
-        int err = 0;
-
-        p = get_property(n, name, &proplen);
-        if (proplen != sizeof (struct address_prop))
-                return NULL;
-
-        prop = p;
-
-        err = cell_spuprop_present(spu, n, name);
-        if (err && (err != -EEXIST))
-                goto out;
-
-        ret = ioremap(prop->address, prop->len);
-
- out:
-        return ret;
-}
+        struct spu *spu;
+        mutex_lock(&spu_mutex);
 
-static void spu_unmap(struct spu *spu)
-{
-        iounmap(spu->priv2);
-        iounmap(spu->priv1);
-        iounmap(spu->problem);
-        iounmap((__force u8 __iomem *)spu->local_store);
-}
+        list_for_each_entry(spu, &spu_full_list, full_list)
+                sysdev_create_file(&spu->sysdev, attr);
 
-/* This function shall be abstracted for HV platforms */
-static int __init spu_map_interrupts_old(struct spu *spu, struct device_node *np)
-{
-        unsigned int isrc;
-        const u32 *tmp;
-
-        /* Get the interrupt source unit from the device-tree */
-        tmp = get_property(np, "isrc", NULL);
-        if (!tmp)
-                return -ENODEV;
-        isrc = tmp[0];
-
-        /* Add the node number */
-        isrc |= spu->node << IIC_IRQ_NODE_SHIFT;
-        spu->isrc = isrc;
-
-        /* Now map interrupts of all 3 classes */
-        spu->irqs[0] = irq_create_mapping(NULL, IIC_IRQ_CLASS_0 | isrc);
-        spu->irqs[1] = irq_create_mapping(NULL, IIC_IRQ_CLASS_1 | isrc);
-        spu->irqs[2] = irq_create_mapping(NULL, IIC_IRQ_CLASS_2 | isrc);
-
-        /* Right now, we only fail if class 2 failed */
-        return spu->irqs[2] == NO_IRQ ? -EINVAL : 0;
+        mutex_unlock(&spu_mutex);
+        return 0;
 }
+EXPORT_SYMBOL_GPL(spu_add_sysdev_attr);
 
-static int __init spu_map_device_old(struct spu *spu, struct device_node *node)
+int spu_add_sysdev_attr_group(struct attribute_group *attrs)
 {
-        const char *prop;
-        int ret;
-
-        ret = -ENODEV;
-        spu->name = get_property(node, "name", NULL);
-        if (!spu->name)
-                goto out;
-
-        prop = get_property(node, "local-store", NULL);
-        if (!prop)
-                goto out;
-        spu->local_store_phys = *(unsigned long *)prop;
-
-        /* we use local store as ram, not io memory */
-        spu->local_store = (void __force *)
-                map_spe_prop(spu, node, "local-store");
-        if (!spu->local_store)
-                goto out;
-
-        prop = get_property(node, "problem", NULL);
-        if (!prop)
-                goto out_unmap;
-        spu->problem_phys = *(unsigned long *)prop;
-
-        spu->problem= map_spe_prop(spu, node, "problem");
-        if (!spu->problem)
-                goto out_unmap;
-
-        spu->priv1= map_spe_prop(spu, node, "priv1");
-        /* priv1 is not available on a hypervisor */
-
-        spu->priv2= map_spe_prop(spu, node, "priv2");
-        if (!spu->priv2)
-                goto out_unmap;
-        ret = 0;
-        goto out;
-
-out_unmap:
-        spu_unmap(spu);
-out:
-        return ret;
-}
+        struct spu *spu;
+        mutex_lock(&spu_mutex);
 
-static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
-{
-        struct of_irq oirq;
-        int ret;
-        int i;
+        list_for_each_entry(spu, &spu_full_list, full_list)
+                sysfs_create_group(&spu->sysdev.kobj, attrs);
 
-        for (i=0; i < 3; i++) {
-                ret = of_irq_map_one(np, i, &oirq);
-                if (ret) {
-                        pr_debug("spu_new: failed to get irq %d\n", i);
-                        goto err;
-                }
-                ret = -EINVAL;
-                pr_debug("  irq %d no 0x%x on %s\n", i, oirq.specifier[0],
-                         oirq.controller->full_name);
-                spu->irqs[i] = irq_create_of_mapping(oirq.controller,
-                                        oirq.specifier, oirq.size);
-                if (spu->irqs[i] == NO_IRQ) {
-                        pr_debug("spu_new: failed to map it !\n");
-                        goto err;
-                }
-        }
+        mutex_unlock(&spu_mutex);
         return 0;
-
-err:
-        pr_debug("failed to map irq %x for spu %s\n", *oirq.specifier, spu->name);
-        for (; i >= 0; i--) {
-                if (spu->irqs[i] != NO_IRQ)
-                        irq_dispose_mapping(spu->irqs[i]);
-        }
-        return ret;
 }
+EXPORT_SYMBOL_GPL(spu_add_sysdev_attr_group);
 
-static int spu_map_resource(struct device_node *node, int nr,
-                void __iomem** virt, unsigned long *phys)
-{
-        struct resource resource = { };
-        int ret;
-
-        ret = of_address_to_resource(node, nr, &resource);
-        if (ret)
-                goto out;
 
-        if (phys)
-                *phys = resource.start;
-        *virt = ioremap(resource.start, resource.end - resource.start);
-        if (!*virt)
-                ret = -EINVAL;
-
-out:
-        return ret;
-}
-
-static int __init spu_map_device(struct spu *spu, struct device_node *node)
+void spu_remove_sysdev_attr(struct sysdev_attribute *attr)
 {
-        int ret = -ENODEV;
-        spu->name = get_property(node, "name", NULL);
-        if (!spu->name)
-                goto out;
-
-        ret = spu_map_resource(node, 0, (void __iomem**)&spu->local_store,
-                                        &spu->local_store_phys);
-        if (ret) {
-                pr_debug("spu_new: failed to map %s resource 0\n",
-                         node->full_name);
-                goto out;
-        }
-        ret = spu_map_resource(node, 1, (void __iomem**)&spu->problem,
-                                        &spu->problem_phys);
-        if (ret) {
-                pr_debug("spu_new: failed to map %s resource 1\n",
-                         node->full_name);
-                goto out_unmap;
-        }
-        ret = spu_map_resource(node, 2, (void __iomem**)&spu->priv2,
-                                        NULL);
-        if (ret) {
-                pr_debug("spu_new: failed to map %s resource 2\n",
-                         node->full_name);
-                goto out_unmap;
-        }
-
-        if (!firmware_has_feature(FW_FEATURE_LPAR))
-                ret = spu_map_resource(node, 3, (void __iomem**)&spu->priv1,
-                                        NULL);
-        if (ret) {
-                pr_debug("spu_new: failed to map %s resource 3\n",
-                         node->full_name);
-                goto out_unmap;
-        }
-        pr_debug("spu_new: %s maps:\n", node->full_name);
-        pr_debug("  local store   : 0x%016lx -> 0x%p\n",
-                 spu->local_store_phys, spu->local_store);
-        pr_debug("  problem state : 0x%016lx -> 0x%p\n",
-                 spu->problem_phys, spu->problem);
-        pr_debug("  priv2         :                       0x%p\n", spu->priv2);
-        pr_debug("  priv1         :                       0x%p\n", spu->priv1);
+        struct spu *spu;
+        mutex_lock(&spu_mutex);
 
-        return 0;
+        list_for_each_entry(spu, &spu_full_list, full_list)
+                sysdev_remove_file(&spu->sysdev, attr);
 
-out_unmap:
-        spu_unmap(spu);
-out:
-        pr_debug("failed to map spe %s: %d\n", spu->name, ret);
-        return ret;
+        mutex_unlock(&spu_mutex);
 }
+EXPORT_SYMBOL_GPL(spu_remove_sysdev_attr);
 
-struct sysdev_class spu_sysdev_class = {
-        set_kset_name("spu")
-};
-
-static ssize_t spu_show_isrc(struct sys_device *sysdev, char *buf)
+void spu_remove_sysdev_attr_group(struct attribute_group *attrs)
 {
-        struct spu *spu = container_of(sysdev, struct spu, sysdev);
-        return sprintf(buf, "%d\n", spu->isrc);
+        struct spu *spu;
+        mutex_lock(&spu_mutex);
 
-}
-static SYSDEV_ATTR(isrc, 0400, spu_show_isrc, NULL);
+        list_for_each_entry(spu, &spu_full_list, full_list)
+                sysfs_remove_group(&spu->sysdev.kobj, attrs);
 
-extern int attach_sysdev_to_node(struct sys_device *dev, int nid);
+        mutex_unlock(&spu_mutex);
+}
+EXPORT_SYMBOL_GPL(spu_remove_sysdev_attr_group);
 
 static int spu_create_sysdev(struct spu *spu)
 {
@@ -781,21 +574,18 @@ static int spu_create_sysdev(struct spu *spu)
                 return ret;
         }
 
-        if (spu->isrc != 0)
-                sysdev_create_file(&spu->sysdev, &attr_isrc);
-        sysfs_add_device_to_node(&spu->sysdev, spu->nid);
+        sysfs_add_device_to_node(&spu->sysdev, spu->node);
 
         return 0;
 }
 
 static void spu_destroy_sysdev(struct spu *spu)
 {
-        sysdev_remove_file(&spu->sysdev, &attr_isrc);
-        sysfs_remove_device_from_node(&spu->sysdev, spu->nid);
+        sysfs_remove_device_from_node(&spu->sysdev, spu->node);
         sysdev_unregister(&spu->sysdev);
 }
 
-static int __init create_spu(struct device_node *spe)
+static int __init create_spu(void *data)
 {
         struct spu *spu;
         int ret;
@@ -806,57 +596,37 @@ static int __init create_spu(struct device_node *spe)
         if (!spu)
                 goto out;
 
-        spu->node = find_spu_node_id(spe);
-        if (spu->node >= MAX_NUMNODES) {
-                printk(KERN_WARNING "SPE %s on node %d ignored,"
-                       " node number too big\n", spe->full_name, spu->node);
-                printk(KERN_WARNING "Check if CONFIG_NUMA is enabled.\n");
-                return -ENODEV;
-        }
-        spu->nid = of_node_to_nid(spe);
-        if (spu->nid == -1)
-                spu->nid = 0;
+        spin_lock_init(&spu->register_lock);
+        mutex_lock(&spu_mutex);
+        spu->number = number++;
+        mutex_unlock(&spu_mutex);
+
+        ret = spu_create_spu(spu, data);
 
-        ret = spu_map_device(spu, spe);
-        /* try old method */
-        if (ret)
-                ret = spu_map_device_old(spu, spe);
         if (ret)
                 goto out_free;
 
-        ret = spu_map_interrupts(spu, spe);
-        if (ret)
-                ret = spu_map_interrupts_old(spu, spe);
-        if (ret)
-                goto out_unmap;
-        spin_lock_init(&spu->register_lock);
-        spu_mfc_sdr_set(spu, mfspr(SPRN_SDR1));
+        spu_mfc_sdr_setup(spu);
         spu_mfc_sr1_set(spu, 0x33);
-        mutex_lock(&spu_mutex);
-
-        spu->number = number++;
         ret = spu_request_irqs(spu);
         if (ret)
-                goto out_unlock;
+                goto out_destroy;
 
         ret = spu_create_sysdev(spu);
         if (ret)
                 goto out_free_irqs;
 
+        mutex_lock(&spu_mutex);
         list_add(&spu->list, &spu_list[spu->node]);
+        list_add(&spu->full_list, &spu_full_list);
         mutex_unlock(&spu_mutex);
 
-        pr_debug(KERN_DEBUG "Using SPE %s %02x %p %p %p %p %d\n",
-                spu->name, spu->isrc, spu->local_store,
-                spu->problem, spu->priv1, spu->priv2, spu->number);
         goto out;
 
 out_free_irqs:
         spu_free_irqs(spu);
-out_unlock:
-        mutex_unlock(&spu_mutex);
-out_unmap:
-        spu_unmap(spu);
+out_destroy:
+        spu_destroy_spu(spu);
 out_free:
         kfree(spu);
 out:
@@ -866,10 +636,11 @@ out:
 static void destroy_spu(struct spu *spu)
 {
         list_del_init(&spu->list);
+        list_del_init(&spu->full_list);
 
         spu_destroy_sysdev(spu);
         spu_free_irqs(spu);
-        spu_unmap(spu);
+        spu_destroy_spu(spu);
         kfree(spu);
 }
 
@@ -890,9 +661,11 @@ module_exit(cleanup_spu_base);
 
 static int __init init_spu_base(void)
 {
-        struct device_node *node;
         int i, ret;
 
+        if (!spu_management_ops)
+                return 0;
+
         /* create sysdev class for spus */
         ret = sysdev_class_register(&spu_sysdev_class);
         if (ret)
@@ -901,17 +674,17 @@ static int __init init_spu_base(void)
         for (i = 0; i < MAX_NUMNODES; i++)
                 INIT_LIST_HEAD(&spu_list[i]);
 
-        ret = -ENODEV;
-        for (node = of_find_node_by_type(NULL, "spe");
-                        node; node = of_find_node_by_type(node, "spe")) {
-                ret = create_spu(node);
-                if (ret) {
-                        printk(KERN_WARNING "%s: Error initializing %s\n",
-                                __FUNCTION__, node->name);
-                        cleanup_spu_base();
-                        break;
-                }
+        ret = spu_enumerate_spus(create_spu);
+
+        if (ret) {
+                printk(KERN_WARNING "%s: Error initializing spus\n",
+                        __FUNCTION__);
+                cleanup_spu_base();
+                return ret;
         }
+
+        xmon_register_spus(&spu_full_list);
+
         return ret;
 }
 module_init(init_spu_base);
diff --git a/arch/powerpc/platforms/cell/spu_coredump.c b/arch/powerpc/platforms/cell/spu_coredump.c
new file mode 100644
index 000000000000..6915b418ee73
--- /dev/null
+++ b/arch/powerpc/platforms/cell/spu_coredump.c
@@ -0,0 +1,81 @@
+/*
+ * SPU core dump code
+ *
+ * (C) Copyright 2006 IBM Corp.
+ *
+ * Author: Dwayne Grant McConnell <decimal@us.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/file.h>
+#include <linux/module.h>
+#include <linux/syscalls.h>
+
+#include <asm/spu.h>
+
+static struct spu_coredump_calls spu_coredump_calls;
+static DEFINE_MUTEX(spu_coredump_mutex);
+
+int arch_notes_size(void)
+{
+        long ret;
+        struct module *owner = spu_coredump_calls.owner;
+
+        ret = -ENOSYS;
+        mutex_lock(&spu_coredump_mutex);
+        if (owner && try_module_get(owner)) {
+                ret = spu_coredump_calls.arch_notes_size();
+                module_put(owner);
+        }
+        mutex_unlock(&spu_coredump_mutex);
+        return ret;
+}
+
+void arch_write_notes(struct file *file)
+{
+        struct module *owner = spu_coredump_calls.owner;
+
+        mutex_lock(&spu_coredump_mutex);
+        if (owner && try_module_get(owner)) {
+                spu_coredump_calls.arch_write_notes(file);
+                module_put(owner);
+        }
+        mutex_unlock(&spu_coredump_mutex);
+}
+
+int register_arch_coredump_calls(struct spu_coredump_calls *calls)
+{
+        if (spu_coredump_calls.owner)
+                return -EBUSY;
+
+        mutex_lock(&spu_coredump_mutex);
+        spu_coredump_calls.arch_notes_size = calls->arch_notes_size;
+        spu_coredump_calls.arch_write_notes = calls->arch_write_notes;
+        spu_coredump_calls.owner = calls->owner;
+        mutex_unlock(&spu_coredump_mutex);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(register_arch_coredump_calls);
+
+void unregister_arch_coredump_calls(struct spu_coredump_calls *calls)
+{
+        BUG_ON(spu_coredump_calls.owner != calls->owner);
+
+        mutex_lock(&spu_coredump_mutex);
+        spu_coredump_calls.owner = NULL;
+        mutex_unlock(&spu_coredump_mutex);
+}
+EXPORT_SYMBOL_GPL(unregister_arch_coredump_calls);
diff --git a/arch/powerpc/platforms/cell/spu_priv1_mmio.c b/arch/powerpc/platforms/cell/spu_priv1_mmio.c
index 71b69f0a1a48..910a926b61a2 100644
--- a/arch/powerpc/platforms/cell/spu_priv1_mmio.c
+++ b/arch/powerpc/platforms/cell/spu_priv1_mmio.c
@@ -18,120 +18,509 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <linux/interrupt.h>
+#include <linux/list.h>
 #include <linux/module.h>
+#include <linux/ptrace.h>
+#include <linux/slab.h>
+#include <linux/wait.h>
+#include <linux/mm.h>
+#include <linux/io.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
 
-#include <asm/io.h>
 #include <asm/spu.h>
 #include <asm/spu_priv1.h>
+#include <asm/firmware.h>
+#include <asm/prom.h>
 
 #include "interrupt.h"
+#include "spu_priv1_mmio.h"
+
+static DEFINE_MUTEX(add_spumem_mutex);
+
+struct spu_pdata {
+        struct device_node *devnode;
+        struct spu_priv1 __iomem *priv1;
+};
+
+static struct spu_pdata *spu_get_pdata(struct spu *spu)
+{
+        BUG_ON(!spu->pdata);
+        return spu->pdata;
+}
+
+struct device_node *spu_devnode(struct spu *spu)
+{
+        return spu_get_pdata(spu)->devnode;
+}
+
+EXPORT_SYMBOL_GPL(spu_devnode);
+
+static int __init cell_spuprop_present(struct spu *spu, struct device_node *spe,
+                const char *prop)
+{
+        const struct address_prop {
+                unsigned long address;
+                unsigned int len;
+        } __attribute__((packed)) *p;
+        int proplen;
+
+        unsigned long start_pfn, nr_pages;
+        struct pglist_data *pgdata;
+        struct zone *zone;
+        int ret;
+
+        p = get_property(spe, prop, &proplen);
+        WARN_ON(proplen != sizeof (*p));
+
+        start_pfn = p->address >> PAGE_SHIFT;
+        nr_pages = ((unsigned long)p->len + PAGE_SIZE - 1) >> PAGE_SHIFT;
+
+        pgdata = NODE_DATA(spu->node);
+        zone = pgdata->node_zones;
+
+        /* XXX rethink locking here */
+        mutex_lock(&add_spumem_mutex);
+        ret = __add_pages(zone, start_pfn, nr_pages);
+        mutex_unlock(&add_spumem_mutex);
+
+        return ret;
+}
+
+static void __iomem * __init map_spe_prop(struct spu *spu,
+                struct device_node *n, const char *name)
+{
+        const struct address_prop {
+                unsigned long address;
+                unsigned int len;
+        } __attribute__((packed)) *prop;
+
+        const void *p;
+        int proplen;
+        void __iomem *ret = NULL;
+        int err = 0;
+
+        p = get_property(n, name, &proplen);
+        if (proplen != sizeof (struct address_prop))
+                return NULL;
+
+        prop = p;
+
+        err = cell_spuprop_present(spu, n, name);
+        if (err && (err != -EEXIST))
+                goto out;
+
+        ret = ioremap(prop->address, prop->len);
+
+ out:
+        return ret;
+}
+
+static void spu_unmap(struct spu *spu)
+{
+        iounmap(spu->priv2);
+        iounmap(spu_get_pdata(spu)->priv1);
+        iounmap(spu->problem);
+        iounmap((__force u8 __iomem *)spu->local_store);
+}
+
+static int __init spu_map_interrupts_old(struct spu *spu,
+        struct device_node *np)
+{
+        unsigned int isrc;
+        const u32 *tmp;
+        int nid;
+
+        /* Get the interrupt source unit from the device-tree */
+        tmp = get_property(np, "isrc", NULL);
+        if (!tmp)
+                return -ENODEV;
+        isrc = tmp[0];
+
+        tmp = get_property(np->parent->parent, "node-id", NULL);
+        if (!tmp) {
+                printk(KERN_WARNING "%s: can't find node-id\n", __FUNCTION__);
+                nid = spu->node;
+        } else
+                nid = tmp[0];
+
+        /* Add the node number */
+        isrc |= nid << IIC_IRQ_NODE_SHIFT;
+
+        /* Now map interrupts of all 3 classes */
+        spu->irqs[0] = irq_create_mapping(NULL, IIC_IRQ_CLASS_0 | isrc);
+        spu->irqs[1] = irq_create_mapping(NULL, IIC_IRQ_CLASS_1 | isrc);
+        spu->irqs[2] = irq_create_mapping(NULL, IIC_IRQ_CLASS_2 | isrc);
+
+        /* Right now, we only fail if class 2 failed */
+        return spu->irqs[2] == NO_IRQ ? -EINVAL : 0;
+}
+
+static int __init spu_map_device_old(struct spu *spu, struct device_node *node)
+{
+        const char *prop;
+        int ret;
+
+        ret = -ENODEV;
+        spu->name = get_property(node, "name", NULL);
+        if (!spu->name)
+                goto out;
+
+        prop = get_property(node, "local-store", NULL);
+        if (!prop)
+                goto out;
+        spu->local_store_phys = *(unsigned long *)prop;
+
+        /* we use local store as ram, not io memory */
+        spu->local_store = (void __force *)
+                map_spe_prop(spu, node, "local-store");
+        if (!spu->local_store)
+                goto out;
+
+        prop = get_property(node, "problem", NULL);
+        if (!prop)
+                goto out_unmap;
+        spu->problem_phys = *(unsigned long *)prop;
+
+        spu->problem= map_spe_prop(spu, node, "problem");
+        if (!spu->problem)
+                goto out_unmap;
+
+        spu_get_pdata(spu)->priv1= map_spe_prop(spu, node, "priv1");
+
+        spu->priv2= map_spe_prop(spu, node, "priv2");
+        if (!spu->priv2)
+                goto out_unmap;
+        ret = 0;
+        goto out;
+
+out_unmap:
+        spu_unmap(spu);
+out:
+        return ret;
+}
+
+static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
+{
+        struct of_irq oirq;
+        int ret;
+        int i;
+
+        for (i=0; i < 3; i++) {
+                ret = of_irq_map_one(np, i, &oirq);
+                if (ret) {
+                        pr_debug("spu_new: failed to get irq %d\n", i);
+                        goto err;
+                }
+                ret = -EINVAL;
+                pr_debug("  irq %d no 0x%x on %s\n", i, oirq.specifier[0],
+                         oirq.controller->full_name);
+                spu->irqs[i] = irq_create_of_mapping(oirq.controller,
+                                        oirq.specifier, oirq.size);
+                if (spu->irqs[i] == NO_IRQ) {
+                        pr_debug("spu_new: failed to map it !\n");
+                        goto err;
+                }
+        }
+        return 0;
+
+err:
+        pr_debug("failed to map irq %x for spu %s\n", *oirq.specifier,
+                spu->name);
+        for (; i >= 0; i--) {
+                if (spu->irqs[i] != NO_IRQ)
+                        irq_dispose_mapping(spu->irqs[i]);
+        }
+        return ret;
+}
+
+static int spu_map_resource(struct spu *spu, int nr,
+                            void __iomem** virt, unsigned long *phys)
+{
+        struct device_node *np = spu_get_pdata(spu)->devnode;
+        unsigned long start_pfn, nr_pages;
+        struct pglist_data *pgdata;
+        struct zone *zone;
+        struct resource resource = { };
+        unsigned long len;
+        int ret;
+
+        ret = of_address_to_resource(np, nr, &resource);
+        if (ret)
+                goto out;
+
+        if (phys)
+                *phys = resource.start;
+        len = resource.end - resource.start + 1;
+        *virt = ioremap(resource.start, len);
+        if (!*virt)
+                ret = -EINVAL;
+
+        start_pfn = resource.start >> PAGE_SHIFT;
+        nr_pages = (len + PAGE_SIZE - 1) >> PAGE_SHIFT;
+
+        pgdata = NODE_DATA(spu->node);
+        zone = pgdata->node_zones;
+
+        /* XXX rethink locking here */
+        mutex_lock(&add_spumem_mutex);
+        ret = __add_pages(zone, start_pfn, nr_pages);
+        mutex_unlock(&add_spumem_mutex);
+
+out:
+        return ret;
+}
+
+static int __init spu_map_device(struct spu *spu)
+{
+        struct device_node *np = spu_get_pdata(spu)->devnode;
+        int ret = -ENODEV;
+
+        spu->name = get_property(np, "name", NULL);
+        if (!spu->name)
+                goto out;
+
+        ret = spu_map_resource(spu, 0, (void __iomem**)&spu->local_store,
+                               &spu->local_store_phys);
+        if (ret) {
+                pr_debug("spu_new: failed to map %s resource 0\n",
+                         np->full_name);
+                goto out;
+        }
+        ret = spu_map_resource(spu, 1, (void __iomem**)&spu->problem,
+                               &spu->problem_phys);
+        if (ret) {
+                pr_debug("spu_new: failed to map %s resource 1\n",
+                         np->full_name);
+                goto out_unmap;
+        }
+        ret = spu_map_resource(spu, 2, (void __iomem**)&spu->priv2, NULL);
+        if (ret) {
+                pr_debug("spu_new: failed to map %s resource 2\n",
+                         np->full_name);
+                goto out_unmap;
+        }
+        if (!firmware_has_feature(FW_FEATURE_LPAR))
+                ret = spu_map_resource(spu, 3,
+                               (void __iomem**)&spu_get_pdata(spu)->priv1, NULL);
+        if (ret) {
+                pr_debug("spu_new: failed to map %s resource 3\n",
+                         np->full_name);
+                goto out_unmap;
+        }
+        pr_debug("spu_new: %s maps:\n", np->full_name);
+        pr_debug("  local store   : 0x%016lx -> 0x%p\n",
+                 spu->local_store_phys, spu->local_store);
+        pr_debug("  problem state : 0x%016lx -> 0x%p\n",
+                 spu->problem_phys, spu->problem);
+        pr_debug("  priv2         :                       0x%p\n", spu->priv2);
+        pr_debug("  priv1         :                       0x%p\n",
+                 spu_get_pdata(spu)->priv1);
+
+        return 0;
+
+out_unmap:
+        spu_unmap(spu);
+out:
+        pr_debug("failed to map spe %s: %d\n", spu->name, ret);
+        return ret;
+}
+
+static int __init of_enumerate_spus(int (*fn)(void *data))
+{
+        int ret;
+        struct device_node *node;
+
+        ret = -ENODEV;
+        for (node = of_find_node_by_type(NULL, "spe");
+                        node; node = of_find_node_by_type(node, "spe")) {
+                ret = fn(node);
+                if (ret) {
+                        printk(KERN_WARNING "%s: Error initializing %s\n",
+                                __FUNCTION__, node->name);
+                        break;
+                }
+        }
+        return ret;
+}
+
+static int __init of_create_spu(struct spu *spu, void *data)
+{
+        int ret;
+        struct device_node *spe = (struct device_node *)data;
+
+        spu->pdata = kzalloc(sizeof(struct spu_pdata),
+                GFP_KERNEL);
+        if (!spu->pdata) {
+                ret = -ENOMEM;
+                goto out;
+        }
+        spu_get_pdata(spu)->devnode = of_node_get(spe);
+
+        spu->node = of_node_to_nid(spe);
+        if (spu->node >= MAX_NUMNODES) {
+                printk(KERN_WARNING "SPE %s on node %d ignored,"
+                       " node number too big\n", spe->full_name, spu->node);
+                printk(KERN_WARNING "Check if CONFIG_NUMA is enabled.\n");
+                ret = -ENODEV;
+                goto out_free;
+        }
+
+        ret = spu_map_device(spu);
+        /* try old method */
+        if (ret)
+                ret = spu_map_device_old(spu, spe);
+        if (ret)
+                goto out_free;
+
+        ret = spu_map_interrupts(spu, spe);
+        if (ret)
+                ret = spu_map_interrupts_old(spu, spe);
+        if (ret)
+                goto out_unmap;
+
+        pr_debug(KERN_DEBUG "Using SPE %s %p %p %p %p %d\n", spu->name,
+                spu->local_store, spu->problem, spu_get_pdata(spu)->priv1,
+                spu->priv2, spu->number);
+        goto out;
+
+out_unmap:
+        spu_unmap(spu);
+out_free:
+        kfree(spu->pdata);
+        spu->pdata = NULL;
+out:
+        return ret;
+}
+
+static int of_destroy_spu(struct spu *spu)
+{
+        spu_unmap(spu);
+        of_node_put(spu_get_pdata(spu)->devnode);
+        kfree(spu->pdata);
+        spu->pdata = NULL;
+        return 0;
+}
+
+const struct spu_management_ops spu_management_of_ops = {
+        .enumerate_spus = of_enumerate_spus,
+        .create_spu = of_create_spu,
+        .destroy_spu = of_destroy_spu,
+};
 
 static void int_mask_and(struct spu *spu, int class, u64 mask)
 {
         u64 old_mask;
 
-        old_mask = in_be64(&spu->priv1->int_mask_RW[class]);
-        out_be64(&spu->priv1->int_mask_RW[class], old_mask & mask);
+        old_mask = in_be64(&spu_get_pdata(spu)->priv1->int_mask_RW[class]);
+        out_be64(&spu_get_pdata(spu)->priv1->int_mask_RW[class],
+                old_mask & mask);
 }
 
 static void int_mask_or(struct spu *spu, int class, u64 mask)
 {
         u64 old_mask;
 
-        old_mask = in_be64(&spu->priv1->int_mask_RW[class]);
-        out_be64(&spu->priv1->int_mask_RW[class], old_mask | mask);
+        old_mask = in_be64(&spu_get_pdata(spu)->priv1->int_mask_RW[class]);
+        out_be64(&spu_get_pdata(spu)->priv1->int_mask_RW[class],
+                old_mask | mask);
 }
 
 static void int_mask_set(struct spu *spu, int class, u64 mask)
 {
-        out_be64(&spu->priv1->int_mask_RW[class], mask);
+        out_be64(&spu_get_pdata(spu)->priv1->int_mask_RW[class], mask);
 }
 
 static u64 int_mask_get(struct spu *spu, int class)
 {
-        return in_be64(&spu->priv1->int_mask_RW[class]);
+        return in_be64(&spu_get_pdata(spu)->priv1->int_mask_RW[class]);
 }
 
 static void int_stat_clear(struct spu *spu, int class, u64 stat)
 {
-        out_be64(&spu->priv1->int_stat_RW[class], stat);
+        out_be64(&spu_get_pdata(spu)->priv1->int_stat_RW[class], stat);
 }
 
 static u64 int_stat_get(struct spu *spu, int class)
 {
-        return in_be64(&spu->priv1->int_stat_RW[class]);
+        return in_be64(&spu_get_pdata(spu)->priv1->int_stat_RW[class]);
 }
 
 static void cpu_affinity_set(struct spu *spu, int cpu)
 {
         u64 target = iic_get_target_id(cpu);
         u64 route = target << 48 | target << 32 | target << 16;
-        out_be64(&spu->priv1->int_route_RW, route);
+        out_be64(&spu_get_pdata(spu)->priv1->int_route_RW, route);
 }
 
 static u64 mfc_dar_get(struct spu *spu)
 {
-        return in_be64(&spu->priv1->mfc_dar_RW);
+        return in_be64(&spu_get_pdata(spu)->priv1->mfc_dar_RW);
 }
 
 static u64 mfc_dsisr_get(struct spu *spu)
 {
-        return in_be64(&spu->priv1->mfc_dsisr_RW);
+        return in_be64(&spu_get_pdata(spu)->priv1->mfc_dsisr_RW);
 }
 
 static void mfc_dsisr_set(struct spu *spu, u64 dsisr)
 {
-        out_be64(&spu->priv1->mfc_dsisr_RW, dsisr);
+        out_be64(&spu_get_pdata(spu)->priv1->mfc_dsisr_RW, dsisr);
 }
 
-static void mfc_sdr_set(struct spu *spu, u64 sdr)
+static void mfc_sdr_setup(struct spu *spu)
 {
-        out_be64(&spu->priv1->mfc_sdr_RW, sdr);
+        out_be64(&spu_get_pdata(spu)->priv1->mfc_sdr_RW, mfspr(SPRN_SDR1));
 }
 
 static void mfc_sr1_set(struct spu *spu, u64 sr1)
 {
-        out_be64(&spu->priv1->mfc_sr1_RW, sr1);
+        out_be64(&spu_get_pdata(spu)->priv1->mfc_sr1_RW, sr1);
 }
 
 static u64 mfc_sr1_get(struct spu *spu)
 {
-        return in_be64(&spu->priv1->mfc_sr1_RW);
+        return in_be64(&spu_get_pdata(spu)->priv1->mfc_sr1_RW);
 }
 
 static void mfc_tclass_id_set(struct spu *spu, u64 tclass_id)
 {
-        out_be64(&spu->priv1->mfc_tclass_id_RW, tclass_id);
+        out_be64(&spu_get_pdata(spu)->priv1->mfc_tclass_id_RW, tclass_id);
 }
 
 static u64 mfc_tclass_id_get(struct spu *spu)
 {
-        return in_be64(&spu->priv1->mfc_tclass_id_RW);
+        return in_be64(&spu_get_pdata(spu)->priv1->mfc_tclass_id_RW);
 }
 
 static void tlb_invalidate(struct spu *spu)
 {
-        out_be64(&spu->priv1->tlb_invalidate_entry_W, 0ul);
+        out_be64(&spu_get_pdata(spu)->priv1->tlb_invalidate_entry_W, 0ul);
 }
 
 static void resource_allocation_groupID_set(struct spu *spu, u64 id)
 {
-        out_be64(&spu->priv1->resource_allocation_groupID_RW, id);
+        out_be64(&spu_get_pdata(spu)->priv1->resource_allocation_groupID_RW,
+                id);
 }
 
 static u64 resource_allocation_groupID_get(struct spu *spu)
 {
-        return in_be64(&spu->priv1->resource_allocation_groupID_RW);
+        return in_be64(
+                &spu_get_pdata(spu)->priv1->resource_allocation_groupID_RW);
 }
 
 static void resource_allocation_enable_set(struct spu *spu, u64 enable)
 {
-        out_be64(&spu->priv1->resource_allocation_enable_RW, enable);
+        out_be64(&spu_get_pdata(spu)->priv1->resource_allocation_enable_RW,
+                enable);
 }
 
 static u64 resource_allocation_enable_get(struct spu *spu)
 {
-        return in_be64(&spu->priv1->resource_allocation_enable_RW);
+        return in_be64(
+                &spu_get_pdata(spu)->priv1->resource_allocation_enable_RW);
 }
 
 const struct spu_priv1_ops spu_priv1_mmio_ops =
@@ -146,7 +535,7 @@ const struct spu_priv1_ops spu_priv1_mmio_ops =
         .mfc_dar_get = mfc_dar_get,
         .mfc_dsisr_get = mfc_dsisr_get,
         .mfc_dsisr_set = mfc_dsisr_set,
-        .mfc_sdr_set = mfc_sdr_set,
+        .mfc_sdr_setup = mfc_sdr_setup,
         .mfc_sr1_set = mfc_sr1_set,
         .mfc_sr1_get = mfc_sr1_get,
         .mfc_tclass_id_set = mfc_tclass_id_set,
diff --git a/arch/powerpc/platforms/cell/spu_priv1_mmio.h b/arch/powerpc/platforms/cell/spu_priv1_mmio.h
new file mode 100644
index 000000000000..7b62bd1cc256
--- /dev/null
+++ b/arch/powerpc/platforms/cell/spu_priv1_mmio.h
@@ -0,0 +1,26 @@
+/*
+ * spu hypervisor abstraction for direct hardware access.
+ *
+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
+ *  Copyright 2006 Sony Corp.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SPU_PRIV1_MMIO_H
+#define SPU_PRIV1_MMIO_H
+
+struct device_node *spu_devnode(struct spu *spu);
+
+#endif /* SPU_PRIV1_MMIO_H */
diff --git a/arch/powerpc/platforms/cell/spufs/Makefile b/arch/powerpc/platforms/cell/spufs/Makefile
index ecdfbb35f82e..472217d19faf 100644
--- a/arch/powerpc/platforms/cell/spufs/Makefile
+++ b/arch/powerpc/platforms/cell/spufs/Makefile
@@ -1,7 +1,7 @@
 obj-y += switch.o
 
 obj-$(CONFIG_SPU_FS) += spufs.o
-spufs-y += inode.o file.o context.o syscalls.o
+spufs-y += inode.o file.o context.o syscalls.o coredump.o
 spufs-y += sched.o backing_ops.o hw_ops.o run.o gang.o
 
 # Rules to build switch.o with the help of SPU tool chain
diff --git a/arch/powerpc/platforms/cell/spufs/backing_ops.c b/arch/powerpc/platforms/cell/spufs/backing_ops.c
index 2d22cd59d6fc..1898f0d3a8b8 100644
--- a/arch/powerpc/platforms/cell/spufs/backing_ops.c
+++ b/arch/powerpc/platforms/cell/spufs/backing_ops.c
@@ -36,6 +36,7 @@
 #include <asm/io.h>
 #include <asm/spu.h>
 #include <asm/spu_csa.h>
+#include <asm/spu_info.h>
 #include <asm/mmu_context.h>
 #include "spufs.h"
 
@@ -267,6 +268,11 @@ static char *spu_backing_get_ls(struct spu_context *ctx)
         return ctx->csa.lscsa->ls;
 }
 
+static u32 spu_backing_runcntl_read(struct spu_context *ctx)
+{
+        return ctx->csa.prob.spu_runcntl_RW;
+}
+
 static void spu_backing_runcntl_write(struct spu_context *ctx, u32 val)
 {
         spin_lock(&ctx->csa.register_lock);
@@ -279,9 +285,26 @@ static void spu_backing_runcntl_write(struct spu_context *ctx, u32 val)
         spin_unlock(&ctx->csa.register_lock);
 }
 
-static void spu_backing_runcntl_stop(struct spu_context *ctx)
+static void spu_backing_master_start(struct spu_context *ctx)
+{
+        struct spu_state *csa = &ctx->csa;
+        u64 sr1;
+
+        spin_lock(&csa->register_lock);
+        sr1 = csa->priv1.mfc_sr1_RW | MFC_STATE1_MASTER_RUN_CONTROL_MASK;
+        csa->priv1.mfc_sr1_RW = sr1;
+        spin_unlock(&csa->register_lock);
+}
+
+static void spu_backing_master_stop(struct spu_context *ctx)
 {
-        spu_backing_runcntl_write(ctx, SPU_RUNCNTL_STOP);
+        struct spu_state *csa = &ctx->csa;
+        u64 sr1;
+
+        spin_lock(&csa->register_lock);
+        sr1 = csa->priv1.mfc_sr1_RW & ~MFC_STATE1_MASTER_RUN_CONTROL_MASK;
+        csa->priv1.mfc_sr1_RW = sr1;
+        spin_unlock(&csa->register_lock);
 }
 
 static int spu_backing_set_mfc_query(struct spu_context * ctx, u32 mask,
@@ -345,8 +368,10 @@ struct spu_context_ops spu_backing_ops = {
         .npc_write = spu_backing_npc_write,
         .status_read = spu_backing_status_read,
         .get_ls = spu_backing_get_ls,
+        .runcntl_read = spu_backing_runcntl_read,
         .runcntl_write = spu_backing_runcntl_write,
-        .runcntl_stop = spu_backing_runcntl_stop,
+        .master_start = spu_backing_master_start,
+        .master_stop = spu_backing_master_stop,
         .set_mfc_query = spu_backing_set_mfc_query,
         .read_mfc_tagstatus = spu_backing_read_mfc_tagstatus,
         .get_mfc_free_elements = spu_backing_get_mfc_free_elements,
diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c
index 034cf6af53a2..0870009f56db 100644
--- a/arch/powerpc/platforms/cell/spufs/context.c
+++ b/arch/powerpc/platforms/cell/spufs/context.c
@@ -120,6 +120,33 @@ void spu_unmap_mappings(struct spu_context *ctx)
                 unmap_mapping_range(ctx->signal2, 0, 0x4000, 1);
 }
 
+int spu_acquire_exclusive(struct spu_context *ctx)
+{
+        int ret = 0;
+
+        down_write(&ctx->state_sema);
+        /* ctx is about to be freed, can't acquire any more */
+        if (!ctx->owner) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        if (ctx->state == SPU_STATE_SAVED) {
+                ret = spu_activate(ctx, 0);
+                if (ret)
+                        goto out;
+                ctx->state = SPU_STATE_RUNNABLE;
+        } else {
+                /* We need to exclude userspace access to the context. */
+                spu_unmap_mappings(ctx);
+        }
+
+out:
+        if (ret)
+                up_write(&ctx->state_sema);
+        return ret;
+}
+
 int spu_acquire_runnable(struct spu_context *ctx)
 {
         int ret = 0;
diff --git a/arch/powerpc/platforms/cell/spufs/coredump.c b/arch/powerpc/platforms/cell/spufs/coredump.c
new file mode 100644
index 000000000000..725e19561159
--- /dev/null
+++ b/arch/powerpc/platforms/cell/spufs/coredump.c
@@ -0,0 +1,238 @@
+/*
+ * SPU core dump code
+ *
+ * (C) Copyright 2006 IBM Corp.
+ *
+ * Author: Dwayne Grant McConnell <decimal@us.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/elf.h>
+#include <linux/file.h>
+#include <linux/fs.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/syscalls.h>
+
+#include <asm/uaccess.h>
+
+#include "spufs.h"
+
+struct spufs_ctx_info {
+        struct list_head list;
+        int dfd;
+        int memsize; /* in bytes */
+        struct spu_context *ctx;
+};
+
+static LIST_HEAD(ctx_info_list);
+
+static ssize_t do_coredump_read(int num, struct spu_context *ctx, void __user *buffer,
+                                size_t size, loff_t *off)
+{
+        u64 data;
+        int ret;
+
+        if (spufs_coredump_read[num].read)
+                return spufs_coredump_read[num].read(ctx, buffer, size, off);
+
+        data = spufs_coredump_read[num].get(ctx);
+        ret = copy_to_user(buffer, &data, 8);
+        return ret ? -EFAULT : 8;
+}
+
+/*
+ * These are the only things you should do on a core-file: use only these
+ * functions to write out all the necessary info.
+ */
+static int spufs_dump_write(struct file *file, const void *addr, int nr)
+{
+        return file->f_op->write(file, addr, nr, &file->f_pos) == nr;
+}
+
+static int spufs_dump_seek(struct file *file, loff_t off)
+{
+        if (file->f_op->llseek) {
+                if (file->f_op->llseek(file, off, 0) != off)
+                        return 0;
+        } else
+                file->f_pos = off;
+        return 1;
+}
+
+static void spufs_fill_memsize(struct spufs_ctx_info *ctx_info)
+{
+        struct spu_context *ctx;
+        unsigned long long lslr;
+
+        ctx = ctx_info->ctx;
+        lslr = ctx->csa.priv2.spu_lslr_RW;
+        ctx_info->memsize = lslr + 1;
+}
+
+static int spufs_ctx_note_size(struct spufs_ctx_info *ctx_info)
+{
+        int dfd, memsize, i, sz, total = 0;
+        char *name;
+        char fullname[80];
+
+        dfd = ctx_info->dfd;
+        memsize = ctx_info->memsize;
+
+        for (i = 0; spufs_coredump_read[i].name; i++) {
+                name = spufs_coredump_read[i].name;
+                sz = spufs_coredump_read[i].size;
+
+                sprintf(fullname, "SPU/%d/%s", dfd, name);
+
+                total += sizeof(struct elf_note);
+                total += roundup(strlen(fullname) + 1, 4);
+                if (!strcmp(name, "mem"))
+                        total += roundup(memsize, 4);
+                else
+                        total += roundup(sz, 4);
+        }
+
+        return total;
+}
+
+static int spufs_add_one_context(struct file *file, int dfd)
+{
+        struct spu_context *ctx;
+        struct spufs_ctx_info *ctx_info;
+        int size;
+
+        ctx = SPUFS_I(file->f_dentry->d_inode)->i_ctx;
+        if (ctx->flags & SPU_CREATE_NOSCHED)
+                return 0;
+
+        ctx_info = kzalloc(sizeof(*ctx_info), GFP_KERNEL);
+        if (unlikely(!ctx_info))
+                return -ENOMEM;
+
+        ctx_info->dfd = dfd;
+        ctx_info->ctx = ctx;
+
+        spufs_fill_memsize(ctx_info);
+
+        size = spufs_ctx_note_size(ctx_info);
+        list_add(&ctx_info->list, &ctx_info_list);
+        return size;
+}
+
+/*
+ * The additional architecture-specific notes for Cell are various
+ * context files in the spu context.
+ *
+ * This function iterates over all open file descriptors and sees
+ * if they are a directory in spufs.  In that case we use spufs
+ * internal functionality to dump them without needing to actually
+ * open the files.
+ */
+static int spufs_arch_notes_size(void)
+{
+        struct fdtable *fdt = files_fdtable(current->files);
+        int size = 0, fd;
+
+        for (fd = 0; fd < fdt->max_fds; fd++) {
+                if (FD_ISSET(fd, fdt->open_fds)) {
+                        struct file *file = fcheck(fd);
+
+                        if (file && file->f_op == &spufs_context_fops) {
+                                int rval = spufs_add_one_context(file, fd);
+                                if (rval < 0)
+                                        break;
+                                size += rval;
+                        }
+                }
+        }
+
+        return size;
+}
+
+static void spufs_arch_write_note(struct spufs_ctx_info *ctx_info, int i,
+                                struct file *file)
+{
+        struct spu_context *ctx;
+        loff_t pos = 0;
+        int sz, dfd, rc, total = 0;
+        const int bufsz = 4096;
+        char *name;
+        char fullname[80], *buf;
+        struct elf_note en;
+
+        buf = kmalloc(bufsz, GFP_KERNEL);
+        if (!buf)
+                return;
+
+        dfd = ctx_info->dfd;
+        name = spufs_coredump_read[i].name;
+
+        if (!strcmp(name, "mem"))
+                sz = ctx_info->memsize;
+        else
+                sz = spufs_coredump_read[i].size;
+
+        ctx = ctx_info->ctx;
+        if (!ctx) {
+                return;
+        }
+
+        sprintf(fullname, "SPU/%d/%s", dfd, name);
+        en.n_namesz = strlen(fullname) + 1;
+        en.n_descsz = sz;
+        en.n_type = NT_SPU;
+
+        if (!spufs_dump_write(file, &en, sizeof(en)))
+                return;
+        if (!spufs_dump_write(file, fullname, en.n_namesz))
+                return;
+        if (!spufs_dump_seek(file, roundup((unsigned long)file->f_pos, 4)))
+                return;
+
+        do {
+                rc = do_coredump_read(i, ctx, buf, bufsz, &pos);
+                if (rc > 0) {
+                        if (!spufs_dump_write(file, buf, rc))
+                                return;
+                        total += rc;
+                }
+        } while (rc == bufsz && total < sz);
+
+        spufs_dump_seek(file, roundup((unsigned long)file->f_pos
+                                                - total + sz, 4));
+}
+
+static void spufs_arch_write_notes(struct file *file)
+{
+        int j;
+        struct spufs_ctx_info *ctx_info, *next;
+
+        list_for_each_entry_safe(ctx_info, next, &ctx_info_list, list) {
+                spu_acquire_saved(ctx_info->ctx);
+                for (j = 0; j < spufs_coredump_num_notes; j++)
+                        spufs_arch_write_note(ctx_info, j, file);
+                spu_release(ctx_info->ctx);
+                list_del(&ctx_info->list);
+                kfree(ctx_info);
+        }
+}
+
+struct spu_coredump_calls spufs_coredump_calls = {
+        .arch_notes_size = spufs_arch_notes_size,
+        .arch_write_notes = spufs_arch_write_notes,
+        .owner = THIS_MODULE,
+};
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 533e2723e184..347eff56fcbd 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -32,13 +32,13 @@
 #include <asm/io.h>
 #include <asm/semaphore.h>
 #include <asm/spu.h>
+#include <asm/spu_info.h>
 #include <asm/uaccess.h>
 
 #include "spufs.h"
 
 #define SPUFS_MMAP_4K (PAGE_SIZE == 0x1000)
 
-
 static int
 spufs_mem_open(struct inode *inode, struct file *file)
 {
@@ -51,18 +51,23 @@ spufs_mem_open(struct inode *inode, struct file *file)
 }
 
 static ssize_t
+__spufs_mem_read(struct spu_context *ctx, char __user *buffer,
+                        size_t size, loff_t *pos)
+{
+        char *local_store = ctx->ops->get_ls(ctx);
+        return simple_read_from_buffer(buffer, size, pos, local_store,
+                                        LS_SIZE);
+}
+
+static ssize_t
 spufs_mem_read(struct file *file, char __user *buffer,
                                 size_t size, loff_t *pos)
 {
-        struct spu_context *ctx = file->private_data;
-        char *local_store;
         int ret;
+        struct spu_context *ctx = file->private_data;
 
         spu_acquire(ctx);
-
-        local_store = ctx->ops->get_ls(ctx);
-        ret = simple_read_from_buffer(buffer, size, pos, local_store, LS_SIZE);
-
+        ret = __spufs_mem_read(ctx, buffer, size, pos);
         spu_release(ctx);
         return ret;
 }
@@ -104,11 +109,11 @@ spufs_mem_mmap_nopage(struct vm_area_struct *vma,
 
         if (ctx->state == SPU_STATE_SAVED) {
                 vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                        & ~(_PAGE_NO_CACHE | _PAGE_GUARDED));
+                                                        & ~_PAGE_NO_CACHE);
                 page = vmalloc_to_page(ctx->csa.lscsa->ls + offset);
         } else {
                 vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                        | _PAGE_NO_CACHE | _PAGE_GUARDED);
+                                                        | _PAGE_NO_CACHE);
                 page = pfn_to_page((ctx->spu->local_store_phys + offset)
                                    >> PAGE_SHIFT);
         }
@@ -131,7 +136,7 @@ spufs_mem_mmap(struct file *file, struct vm_area_struct *vma)
         if (!(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        /* FIXME: */
+        vma->vm_flags |= VM_IO;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
                                      | _PAGE_NO_CACHE);
 
@@ -200,7 +205,7 @@ static int spufs_cntl_mmap(struct file *file, struct vm_area_struct *vma)
         if (!(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        vma->vm_flags |= VM_RESERVED;
+        vma->vm_flags |= VM_IO;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
                                      | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
@@ -261,18 +266,23 @@ spufs_regs_open(struct inode *inode, struct file *file)
 }
 
 static ssize_t
+__spufs_regs_read(struct spu_context *ctx, char __user *buffer,
+                        size_t size, loff_t *pos)
+{
+        struct spu_lscsa *lscsa = ctx->csa.lscsa;
+        return simple_read_from_buffer(buffer, size, pos,
+                                      lscsa->gprs, sizeof lscsa->gprs);
+}
+
+static ssize_t
 spufs_regs_read(struct file *file, char __user *buffer,
                 size_t size, loff_t *pos)
 {
-        struct spu_context *ctx = file->private_data;
-        struct spu_lscsa *lscsa = ctx->csa.lscsa;
         int ret;
+        struct spu_context *ctx = file->private_data;
 
         spu_acquire_saved(ctx);
-
-        ret = simple_read_from_buffer(buffer, size, pos,
-                                      lscsa->gprs, sizeof lscsa->gprs);
-
+        ret = __spufs_regs_read(ctx, buffer, size, pos);
         spu_release(ctx);
         return ret;
 }
@@ -307,18 +317,23 @@ static struct file_operations spufs_regs_fops = {
 };
 
 static ssize_t
+__spufs_fpcr_read(struct spu_context *ctx, char __user * buffer,
+                        size_t size, loff_t * pos)
+{
+        struct spu_lscsa *lscsa = ctx->csa.lscsa;
+        return simple_read_from_buffer(buffer, size, pos,
+                                      &lscsa->fpcr, sizeof(lscsa->fpcr));
+}
+
+static ssize_t
 spufs_fpcr_read(struct file *file, char __user * buffer,
                 size_t size, loff_t * pos)
 {
-        struct spu_context *ctx = file->private_data;
-        struct spu_lscsa *lscsa = ctx->csa.lscsa;
         int ret;
+        struct spu_context *ctx = file->private_data;
 
         spu_acquire_saved(ctx);
-
-        ret = simple_read_from_buffer(buffer, size, pos,
-                                      &lscsa->fpcr, sizeof(lscsa->fpcr));
-
+        ret = __spufs_fpcr_read(ctx, buffer, size, pos);
         spu_release(ctx);
         return ret;
 }
@@ -718,23 +733,41 @@ static int spufs_signal1_open(struct inode *inode, struct file *file)
         return nonseekable_open(inode, file);
 }
 
-static ssize_t spufs_signal1_read(struct file *file, char __user *buf,
+static ssize_t __spufs_signal1_read(struct spu_context *ctx, char __user *buf,
                         size_t len, loff_t *pos)
 {
-        struct spu_context *ctx = file->private_data;
+        int ret = 0;
         u32 data;
 
         if (len < 4)
                 return -EINVAL;
 
-        spu_acquire(ctx);
-        data = ctx->ops->signal1_read(ctx);
-        spu_release(ctx);
+        if (ctx->csa.spu_chnlcnt_RW[3]) {
+                data = ctx->csa.spu_chnldata_RW[3];
+                ret = 4;
+        }
+
+        if (!ret)
+                goto out;
 
         if (copy_to_user(buf, &data, 4))
                 return -EFAULT;
 
-        return 4;
+out:
+        return ret;
+}
+
+static ssize_t spufs_signal1_read(struct file *file, char __user *buf,
+                        size_t len, loff_t *pos)
+{
+        int ret;
+        struct spu_context *ctx = file->private_data;
+
+        spu_acquire_saved(ctx);
+        ret = __spufs_signal1_read(ctx, buf, len, pos);
+        spu_release(ctx);
+
+        return ret;
 }
 
 static ssize_t spufs_signal1_write(struct file *file, const char __user *buf,
@@ -782,7 +815,7 @@ static int spufs_signal1_mmap(struct file *file, struct vm_area_struct *vma)
         if (!(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        vma->vm_flags |= VM_RESERVED;
+        vma->vm_flags |= VM_IO;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
                                      | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
@@ -807,25 +840,41 @@ static int spufs_signal2_open(struct inode *inode, struct file *file)
         return nonseekable_open(inode, file);
 }
 
-static ssize_t spufs_signal2_read(struct file *file, char __user *buf,
+static ssize_t __spufs_signal2_read(struct spu_context *ctx, char __user *buf,
                         size_t len, loff_t *pos)
 {
-        struct spu_context *ctx;
+        int ret = 0;
         u32 data;
 
-        ctx = file->private_data;
-
         if (len < 4)
                 return -EINVAL;
 
-        spu_acquire(ctx);
-        data = ctx->ops->signal2_read(ctx);
-        spu_release(ctx);
+        if (ctx->csa.spu_chnlcnt_RW[4]) {
+                data =  ctx->csa.spu_chnldata_RW[4];
+                ret = 4;
+        }
+
+        if (!ret)
+                goto out;
 
         if (copy_to_user(buf, &data, 4))
                 return -EFAULT;
 
-        return 4;
+out:
+        return ret;
+}
+
+static ssize_t spufs_signal2_read(struct file *file, char __user *buf,
+                        size_t len, loff_t *pos)
+{
+        struct spu_context *ctx = file->private_data;
+        int ret;
+
+        spu_acquire_saved(ctx);
+        ret = __spufs_signal2_read(ctx, buf, len, pos);
+        spu_release(ctx);
+
+        return ret;
 }
 
 static ssize_t spufs_signal2_write(struct file *file, const char __user *buf,
@@ -874,8 +923,7 @@ static int spufs_signal2_mmap(struct file *file, struct vm_area_struct *vma)
         if (!(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        /* FIXME: */
-        vma->vm_flags |= VM_RESERVED;
+        vma->vm_flags |= VM_IO;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
                                      | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
@@ -902,13 +950,19 @@ static void spufs_signal1_type_set(void *data, u64 val)
         spu_release(ctx);
 }
 
+static u64 __spufs_signal1_type_get(void *data)
+{
+        struct spu_context *ctx = data;
+        return ctx->ops->signal1_type_get(ctx);
+}
+
 static u64 spufs_signal1_type_get(void *data)
 {
         struct spu_context *ctx = data;
         u64 ret;
 
         spu_acquire(ctx);
-        ret = ctx->ops->signal1_type_get(ctx);
+        ret = __spufs_signal1_type_get(data);
         spu_release(ctx);
 
         return ret;
@@ -925,13 +979,19 @@ static void spufs_signal2_type_set(void *data, u64 val)
         spu_release(ctx);
 }
 
+static u64 __spufs_signal2_type_get(void *data)
+{
+        struct spu_context *ctx = data;
+        return ctx->ops->signal2_type_get(ctx);
+}
+
 static u64 spufs_signal2_type_get(void *data)
 {
         struct spu_context *ctx = data;
         u64 ret;
 
         spu_acquire(ctx);
-        ret = ctx->ops->signal2_type_get(ctx);
+        ret = __spufs_signal2_type_get(data);
         spu_release(ctx);
 
         return ret;
@@ -958,7 +1018,7 @@ static int spufs_mss_mmap(struct file *file, struct vm_area_struct *vma)
         if (!(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        vma->vm_flags |= VM_RESERVED;
+        vma->vm_flags |= VM_IO;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
                                      | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
@@ -1000,7 +1060,7 @@ static int spufs_psmap_mmap(struct file *file, struct vm_area_struct *vma)
         if (!(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        vma->vm_flags |= VM_RESERVED;
+        vma->vm_flags |= VM_IO;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
                                      | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
@@ -1041,7 +1101,7 @@ static int spufs_mfc_mmap(struct file *file, struct vm_area_struct *vma)
         if (!(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        vma->vm_flags |= VM_RESERVED;
+        vma->vm_flags |= VM_IO;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
                                      | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
@@ -1265,6 +1325,7 @@ static ssize_t spufs_mfc_write(struct file *file, const char __user *buffer,
                 goto out;
 
         ctx->tagwait |= 1 << cmd.tag;
+        ret = size;
 
 out:
         return ret;
@@ -1360,7 +1421,8 @@ static u64 spufs_npc_get(void *data)
         spu_release(ctx);
         return ret;
 }
-DEFINE_SIMPLE_ATTRIBUTE(spufs_npc_ops, spufs_npc_get, spufs_npc_set, "%llx\n")
+DEFINE_SIMPLE_ATTRIBUTE(spufs_npc_ops, spufs_npc_get, spufs_npc_set,
+                        "0x%llx\n")
 
 static void spufs_decr_set(void *data, u64 val)
 {
@@ -1371,18 +1433,24 @@ static void spufs_decr_set(void *data, u64 val)
         spu_release(ctx);
 }
 
-static u64 spufs_decr_get(void *data)
+static u64 __spufs_decr_get(void *data)
 {
         struct spu_context *ctx = data;
         struct spu_lscsa *lscsa = ctx->csa.lscsa;
+        return lscsa->decr.slot[0];
+}
+
+static u64 spufs_decr_get(void *data)
+{
+        struct spu_context *ctx = data;
         u64 ret;
         spu_acquire_saved(ctx);
-        ret = lscsa->decr.slot[0];
+        ret = __spufs_decr_get(data);
         spu_release(ctx);
         return ret;
 }
 DEFINE_SIMPLE_ATTRIBUTE(spufs_decr_ops, spufs_decr_get, spufs_decr_set,
-                        "%llx\n")
+                        "0x%llx\n")
 
 static void spufs_decr_status_set(void *data, u64 val)
 {
@@ -1393,62 +1461,76 @@ static void spufs_decr_status_set(void *data, u64 val)
         spu_release(ctx);
 }
 
-static u64 spufs_decr_status_get(void *data)
+static u64 __spufs_decr_status_get(void *data)
 {
         struct spu_context *ctx = data;
         struct spu_lscsa *lscsa = ctx->csa.lscsa;
+        return lscsa->decr_status.slot[0];
+}
+
+static u64 spufs_decr_status_get(void *data)
+{
+        struct spu_context *ctx = data;
         u64 ret;
         spu_acquire_saved(ctx);
-        ret = lscsa->decr_status.slot[0];
+        ret = __spufs_decr_status_get(data);
         spu_release(ctx);
         return ret;
 }
 DEFINE_SIMPLE_ATTRIBUTE(spufs_decr_status_ops, spufs_decr_status_get,
-                        spufs_decr_status_set, "%llx\n")
+                        spufs_decr_status_set, "0x%llx\n")
 
-static void spufs_spu_tag_mask_set(void *data, u64 val)
+static void spufs_event_mask_set(void *data, u64 val)
 {
         struct spu_context *ctx = data;
         struct spu_lscsa *lscsa = ctx->csa.lscsa;
         spu_acquire_saved(ctx);
-        lscsa->tag_mask.slot[0] = (u32) val;
+        lscsa->event_mask.slot[0] = (u32) val;
         spu_release(ctx);
 }
 
-static u64 spufs_spu_tag_mask_get(void *data)
+static u64 __spufs_event_mask_get(void *data)
 {
         struct spu_context *ctx = data;
         struct spu_lscsa *lscsa = ctx->csa.lscsa;
+        return lscsa->event_mask.slot[0];
+}
+
+static u64 spufs_event_mask_get(void *data)
+{
+        struct spu_context *ctx = data;
         u64 ret;
         spu_acquire_saved(ctx);
-        ret = lscsa->tag_mask.slot[0];
+        ret = __spufs_event_mask_get(data);
         spu_release(ctx);
         return ret;
 }
-DEFINE_SIMPLE_ATTRIBUTE(spufs_spu_tag_mask_ops, spufs_spu_tag_mask_get,
-                        spufs_spu_tag_mask_set, "%llx\n")
+DEFINE_SIMPLE_ATTRIBUTE(spufs_event_mask_ops, spufs_event_mask_get,
+                        spufs_event_mask_set, "0x%llx\n")
 
-static void spufs_event_mask_set(void *data, u64 val)
+static u64 __spufs_event_status_get(void *data)
 {
         struct spu_context *ctx = data;
-        struct spu_lscsa *lscsa = ctx->csa.lscsa;
-        spu_acquire_saved(ctx);
-        lscsa->event_mask.slot[0] = (u32) val;
-        spu_release(ctx);
+        struct spu_state *state = &ctx->csa;
+        u64 stat;
+        stat = state->spu_chnlcnt_RW[0];
+        if (stat)
+                return state->spu_chnldata_RW[0];
+        return 0;
 }
 
-static u64 spufs_event_mask_get(void *data)
+static u64 spufs_event_status_get(void *data)
 {
         struct spu_context *ctx = data;
-        struct spu_lscsa *lscsa = ctx->csa.lscsa;
-        u64 ret;
+        u64 ret = 0;
+
         spu_acquire_saved(ctx);
-        ret = lscsa->event_mask.slot[0];
+        ret = __spufs_event_status_get(data);
         spu_release(ctx);
         return ret;
 }
-DEFINE_SIMPLE_ATTRIBUTE(spufs_event_mask_ops, spufs_event_mask_get,
-                        spufs_event_mask_set, "%llx\n")
+DEFINE_SIMPLE_ATTRIBUTE(spufs_event_status_ops, spufs_event_status_get,
+                        NULL, "0x%llx\n")
 
 static void spufs_srr0_set(void *data, u64 val)
 {
@@ -1470,7 +1552,7 @@ static u64 spufs_srr0_get(void *data)
         return ret;
 }
 DEFINE_SIMPLE_ATTRIBUTE(spufs_srr0_ops, spufs_srr0_get, spufs_srr0_set,
-                        "%llx\n")
+                        "0x%llx\n")
 
 static u64 spufs_id_get(void *data)
 {
@@ -1488,12 +1570,18 @@ static u64 spufs_id_get(void *data)
 }
 DEFINE_SIMPLE_ATTRIBUTE(spufs_id_ops, spufs_id_get, NULL, "0x%llx\n")
 
-static u64 spufs_object_id_get(void *data)
+static u64 __spufs_object_id_get(void *data)
 {
         struct spu_context *ctx = data;
         return ctx->object_id;
 }
 
+static u64 spufs_object_id_get(void *data)
+{
+        /* FIXME: Should there really be no locking here? */
+        return __spufs_object_id_get(data);
+}
+
 static void spufs_object_id_set(void *data, u64 id)
 {
         struct spu_context *ctx = data;
@@ -1503,6 +1591,250 @@ static void spufs_object_id_set(void *data, u64 id)
 DEFINE_SIMPLE_ATTRIBUTE(spufs_object_id_ops, spufs_object_id_get,
                 spufs_object_id_set, "0x%llx\n");
 
+static u64 __spufs_lslr_get(void *data)
+{
+        struct spu_context *ctx = data;
+        return ctx->csa.priv2.spu_lslr_RW;
+}
+
+static u64 spufs_lslr_get(void *data)
+{
+        struct spu_context *ctx = data;
+        u64 ret;
+
+        spu_acquire_saved(ctx);
+        ret = __spufs_lslr_get(data);
+        spu_release(ctx);
+
+        return ret;
+}
+DEFINE_SIMPLE_ATTRIBUTE(spufs_lslr_ops, spufs_lslr_get, NULL, "0x%llx\n")
+
+static int spufs_info_open(struct inode *inode, struct file *file)
+{
+        struct spufs_inode_info *i = SPUFS_I(inode);
+        struct spu_context *ctx = i->i_ctx;
+        file->private_data = ctx;
+        return 0;
+}
+
+static ssize_t __spufs_mbox_info_read(struct spu_context *ctx,
+                        char __user *buf, size_t len, loff_t *pos)
+{
+        u32 mbox_stat;
+        u32 data;
+
+        mbox_stat = ctx->csa.prob.mb_stat_R;
+        if (mbox_stat & 0x0000ff) {
+                data = ctx->csa.prob.pu_mb_R;
+        }
+
+        return simple_read_from_buffer(buf, len, pos, &data, sizeof data);
+}
+
+static ssize_t spufs_mbox_info_read(struct file *file, char __user *buf,
+                                   size_t len, loff_t *pos)
+{
+        int ret;
+        struct spu_context *ctx = file->private_data;
+
+        if (!access_ok(VERIFY_WRITE, buf, len))
+                return -EFAULT;
+
+        spu_acquire_saved(ctx);
+        spin_lock(&ctx->csa.register_lock);
+        ret = __spufs_mbox_info_read(ctx, buf, len, pos);
+        spin_unlock(&ctx->csa.register_lock);
+        spu_release(ctx);
+
+        return ret;
+}
+
+static struct file_operations spufs_mbox_info_fops = {
+        .open = spufs_info_open,
+        .read = spufs_mbox_info_read,
+        .llseek  = generic_file_llseek,
+};
+
+static ssize_t __spufs_ibox_info_read(struct spu_context *ctx,
+                                char __user *buf, size_t len, loff_t *pos)
+{
+        u32 ibox_stat;
+        u32 data;
+
+        ibox_stat = ctx->csa.prob.mb_stat_R;
+        if (ibox_stat & 0xff0000) {
+                data = ctx->csa.priv2.puint_mb_R;
+        }
+
+        return simple_read_from_buffer(buf, len, pos, &data, sizeof data);
+}
+
+static ssize_t spufs_ibox_info_read(struct file *file, char __user *buf,
+                                   size_t len, loff_t *pos)
+{
+        struct spu_context *ctx = file->private_data;
+        int ret;
+
+        if (!access_ok(VERIFY_WRITE, buf, len))
+                return -EFAULT;
+
+        spu_acquire_saved(ctx);
+        spin_lock(&ctx->csa.register_lock);
+        ret = __spufs_ibox_info_read(ctx, buf, len, pos);
+        spin_unlock(&ctx->csa.register_lock);
+        spu_release(ctx);
+
+        return ret;
+}
+
+static struct file_operations spufs_ibox_info_fops = {
+        .open = spufs_info_open,
+        .read = spufs_ibox_info_read,
+        .llseek  = generic_file_llseek,
+};
+
+static ssize_t __spufs_wbox_info_read(struct spu_context *ctx,
+                        char __user *buf, size_t len, loff_t *pos)
+{
+        int i, cnt;
+        u32 data[4];
+        u32 wbox_stat;
+
+        wbox_stat = ctx->csa.prob.mb_stat_R;
+        cnt = 4 - ((wbox_stat & 0x00ff00) >> 8);
+        for (i = 0; i < cnt; i++) {
+                data[i] = ctx->csa.spu_mailbox_data[i];
+        }
+
+        return simple_read_from_buffer(buf, len, pos, &data,
+                                cnt * sizeof(u32));
+}
+
+static ssize_t spufs_wbox_info_read(struct file *file, char __user *buf,
+                                   size_t len, loff_t *pos)
+{
+        struct spu_context *ctx = file->private_data;
+        int ret;
+
+        if (!access_ok(VERIFY_WRITE, buf, len))
+                return -EFAULT;
+
+        spu_acquire_saved(ctx);
+        spin_lock(&ctx->csa.register_lock);
+        ret = __spufs_wbox_info_read(ctx, buf, len, pos);
+        spin_unlock(&ctx->csa.register_lock);
+        spu_release(ctx);
+
+        return ret;
+}
+
+static struct file_operations spufs_wbox_info_fops = {
+        .open = spufs_info_open,
+        .read = spufs_wbox_info_read,
+        .llseek  = generic_file_llseek,
+};
+
+static ssize_t __spufs_dma_info_read(struct spu_context *ctx,
+                        char __user *buf, size_t len, loff_t *pos)
+{
+        struct spu_dma_info info;
+        struct mfc_cq_sr *qp, *spuqp;
+        int i;
+
+        info.dma_info_type = ctx->csa.priv2.spu_tag_status_query_RW;
+        info.dma_info_mask = ctx->csa.lscsa->tag_mask.slot[0];
+        info.dma_info_status = ctx->csa.spu_chnldata_RW[24];
+        info.dma_info_stall_and_notify = ctx->csa.spu_chnldata_RW[25];
+        info.dma_info_atomic_command_status = ctx->csa.spu_chnldata_RW[27];
+        for (i = 0; i < 16; i++) {
+                qp = &info.dma_info_command_data[i];
+                spuqp = &ctx->csa.priv2.spuq[i];
+
+                qp->mfc_cq_data0_RW = spuqp->mfc_cq_data0_RW;
+                qp->mfc_cq_data1_RW = spuqp->mfc_cq_data1_RW;
+                qp->mfc_cq_data2_RW = spuqp->mfc_cq_data2_RW;
+                qp->mfc_cq_data3_RW = spuqp->mfc_cq_data3_RW;
+        }
+
+        return simple_read_from_buffer(buf, len, pos, &info,
+                                sizeof info);
+}
+
+static ssize_t spufs_dma_info_read(struct file *file, char __user *buf,
+                              size_t len, loff_t *pos)
+{
+        struct spu_context *ctx = file->private_data;
+        int ret;
+
+        if (!access_ok(VERIFY_WRITE, buf, len))
+                return -EFAULT;
+
+        spu_acquire_saved(ctx);
+        spin_lock(&ctx->csa.register_lock);
+        ret = __spufs_dma_info_read(ctx, buf, len, pos);
+        spin_unlock(&ctx->csa.register_lock);
+        spu_release(ctx);
+
+        return ret;
+}
+
+static struct file_operations spufs_dma_info_fops = {
+        .open = spufs_info_open,
+        .read = spufs_dma_info_read,
+};
+
+static ssize_t __spufs_proxydma_info_read(struct spu_context *ctx,
+                        char __user *buf, size_t len, loff_t *pos)
+{
+        struct spu_proxydma_info info;
+        struct mfc_cq_sr *qp, *puqp;
+        int ret = sizeof info;
+        int i;
+
+        if (len < ret)
+                return -EINVAL;
+
+        if (!access_ok(VERIFY_WRITE, buf, len))
+                return -EFAULT;
+
+        info.proxydma_info_type = ctx->csa.prob.dma_querytype_RW;
+        info.proxydma_info_mask = ctx->csa.prob.dma_querymask_RW;
+        info.proxydma_info_status = ctx->csa.prob.dma_tagstatus_R;
+        for (i = 0; i < 8; i++) {
+                qp = &info.proxydma_info_command_data[i];
+                puqp = &ctx->csa.priv2.puq[i];
+
+                qp->mfc_cq_data0_RW = puqp->mfc_cq_data0_RW;
+                qp->mfc_cq_data1_RW = puqp->mfc_cq_data1_RW;
+                qp->mfc_cq_data2_RW = puqp->mfc_cq_data2_RW;
+                qp->mfc_cq_data3_RW = puqp->mfc_cq_data3_RW;
+        }
+
+        return simple_read_from_buffer(buf, len, pos, &info,
+                                sizeof info);
+}
+
+static ssize_t spufs_proxydma_info_read(struct file *file, char __user *buf,
+                                   size_t len, loff_t *pos)
+{
+        struct spu_context *ctx = file->private_data;
+        int ret;
+
+        spu_acquire_saved(ctx);
+        spin_lock(&ctx->csa.register_lock);
+        ret = __spufs_proxydma_info_read(ctx, buf, len, pos);
+        spin_unlock(&ctx->csa.register_lock);
+        spu_release(ctx);
+
+        return ret;
+}
+
+static struct file_operations spufs_proxydma_info_fops = {
+        .open = spufs_info_open,
+        .read = spufs_proxydma_info_read,
+};
+
 struct tree_descr spufs_dir_contents[] = {
         { "mem",  &spufs_mem_fops,  0666, },
         { "regs", &spufs_regs_fops,  0666, },
@@ -1516,18 +1848,70 @@ struct tree_descr spufs_dir_contents[] = {
         { "signal2", &spufs_signal2_fops, 0666, },
         { "signal1_type", &spufs_signal1_type, 0666, },
         { "signal2_type", &spufs_signal2_type, 0666, },
-        { "mss", &spufs_mss_fops, 0666, },
-        { "mfc", &spufs_mfc_fops, 0666, },
         { "cntl", &spufs_cntl_fops,  0666, },
-        { "npc", &spufs_npc_ops, 0666, },
         { "fpcr", &spufs_fpcr_fops, 0666, },
+        { "lslr", &spufs_lslr_ops, 0444, },
+        { "mfc", &spufs_mfc_fops, 0666, },
+        { "mss", &spufs_mss_fops, 0666, },
+        { "npc", &spufs_npc_ops, 0666, },
+        { "srr0", &spufs_srr0_ops, 0666, },
         { "decr", &spufs_decr_ops, 0666, },
         { "decr_status", &spufs_decr_status_ops, 0666, },
-        { "spu_tag_mask", &spufs_spu_tag_mask_ops, 0666, },
         { "event_mask", &spufs_event_mask_ops, 0666, },
-        { "srr0", &spufs_srr0_ops, 0666, },
+        { "event_status", &spufs_event_status_ops, 0444, },
+        { "psmap", &spufs_psmap_fops, 0666, },
+        { "phys-id", &spufs_id_ops, 0666, },
+        { "object-id", &spufs_object_id_ops, 0666, },
+        { "mbox_info", &spufs_mbox_info_fops, 0444, },
+        { "ibox_info", &spufs_ibox_info_fops, 0444, },
+        { "wbox_info", &spufs_wbox_info_fops, 0444, },
+        { "dma_info", &spufs_dma_info_fops, 0444, },
+        { "proxydma_info", &spufs_proxydma_info_fops, 0444, },
+        {},
+};
+
+struct tree_descr spufs_dir_nosched_contents[] = {
+        { "mem",  &spufs_mem_fops,  0666, },
+        { "mbox", &spufs_mbox_fops, 0444, },
+        { "ibox", &spufs_ibox_fops, 0444, },
+        { "wbox", &spufs_wbox_fops, 0222, },
+        { "mbox_stat", &spufs_mbox_stat_fops, 0444, },
+        { "ibox_stat", &spufs_ibox_stat_fops, 0444, },
+        { "wbox_stat", &spufs_wbox_stat_fops, 0444, },
+        { "signal1", &spufs_signal1_fops, 0666, },
+        { "signal2", &spufs_signal2_fops, 0666, },
+        { "signal1_type", &spufs_signal1_type, 0666, },
+        { "signal2_type", &spufs_signal2_type, 0666, },
+        { "mss", &spufs_mss_fops, 0666, },
+        { "mfc", &spufs_mfc_fops, 0666, },
+        { "cntl", &spufs_cntl_fops,  0666, },
+        { "npc", &spufs_npc_ops, 0666, },
         { "psmap", &spufs_psmap_fops, 0666, },
         { "phys-id", &spufs_id_ops, 0666, },
         { "object-id", &spufs_object_id_ops, 0666, },
         {},
 };
+
+struct spufs_coredump_reader spufs_coredump_read[] = {
+        { "regs", __spufs_regs_read, NULL, 128 * 16 },
+        { "fpcr", __spufs_fpcr_read, NULL, 16 },
+        { "lslr", NULL, __spufs_lslr_get, 11 },
+        { "decr", NULL, __spufs_decr_get, 11 },
+        { "decr_status", NULL, __spufs_decr_status_get, 11 },
+        { "mem", __spufs_mem_read, NULL, 256 * 1024, },
+        { "signal1", __spufs_signal1_read, NULL, 4 },
+        { "signal1_type", NULL, __spufs_signal1_type_get, 2 },
+        { "signal2", __spufs_signal2_read, NULL, 4 },
+        { "signal2_type", NULL, __spufs_signal2_type_get, 2 },
+        { "event_mask", NULL, __spufs_event_mask_get, 8 },
+        { "event_status", NULL, __spufs_event_status_get, 8 },
+        { "mbox_info", __spufs_mbox_info_read, NULL, 4 },
+        { "ibox_info", __spufs_ibox_info_read, NULL, 4 },
+        { "wbox_info", __spufs_wbox_info_read, NULL, 16 },
+        { "dma_info", __spufs_dma_info_read, NULL, 69 * 8 },
+        { "proxydma_info", __spufs_proxydma_info_read, NULL, 35 * 8 },
+        { "object-id", NULL, __spufs_object_id_get, 19 },
+        { },
+};
+int spufs_coredump_num_notes = ARRAY_SIZE(spufs_coredump_read) - 1;
+
diff --git a/arch/powerpc/platforms/cell/spufs/hw_ops.c b/arch/powerpc/platforms/cell/spufs/hw_ops.c
index d805ffed892d..ae42e03b8c86 100644
--- a/arch/powerpc/platforms/cell/spufs/hw_ops.c
+++ b/arch/powerpc/platforms/cell/spufs/hw_ops.c
@@ -135,21 +135,11 @@ static int spu_hw_wbox_write(struct spu_context *ctx, u32 data)
         return ret;
 }
 
-static u32 spu_hw_signal1_read(struct spu_context *ctx)
-{
-        return in_be32(&ctx->spu->problem->signal_notify1);
-}
-
 static void spu_hw_signal1_write(struct spu_context *ctx, u32 data)
 {
         out_be32(&ctx->spu->problem->signal_notify1, data);
 }
 
-static u32 spu_hw_signal2_read(struct spu_context *ctx)
-{
-        return in_be32(&ctx->spu->problem->signal_notify2);
-}
-
 static void spu_hw_signal2_write(struct spu_context *ctx, u32 data)
 {
         out_be32(&ctx->spu->problem->signal_notify2, data);
@@ -217,21 +207,42 @@ static char *spu_hw_get_ls(struct spu_context *ctx)
         return ctx->spu->local_store;
 }
 
-static void spu_hw_runcntl_write(struct spu_context *ctx, u32 val)
+static u32 spu_hw_runcntl_read(struct spu_context *ctx)
 {
-        eieio();
-        out_be32(&ctx->spu->problem->spu_runcntl_RW, val);
+        return in_be32(&ctx->spu->problem->spu_runcntl_RW);
 }
 
-static void spu_hw_runcntl_stop(struct spu_context *ctx)
+static void spu_hw_runcntl_write(struct spu_context *ctx, u32 val)
 {
         spin_lock_irq(&ctx->spu->register_lock);
-        out_be32(&ctx->spu->problem->spu_runcntl_RW, SPU_RUNCNTL_STOP);
-        while (in_be32(&ctx->spu->problem->spu_status_R) & SPU_STATUS_RUNNING)
-                cpu_relax();
+        if (val & SPU_RUNCNTL_ISOLATE)
+                out_be64(&ctx->spu->priv2->spu_privcntl_RW, 4LL);
+        out_be32(&ctx->spu->problem->spu_runcntl_RW, val);
         spin_unlock_irq(&ctx->spu->register_lock);
 }
 
+static void spu_hw_master_start(struct spu_context *ctx)
+{
+        struct spu *spu = ctx->spu;
+        u64 sr1;
+
+        spin_lock_irq(&spu->register_lock);
+        sr1 = spu_mfc_sr1_get(spu) | MFC_STATE1_MASTER_RUN_CONTROL_MASK;
+        spu_mfc_sr1_set(spu, sr1);
+        spin_unlock_irq(&spu->register_lock);
+}
+
+static void spu_hw_master_stop(struct spu_context *ctx)
+{
+        struct spu *spu = ctx->spu;
+        u64 sr1;
+
+        spin_lock_irq(&spu->register_lock);
+        sr1 = spu_mfc_sr1_get(spu) & ~MFC_STATE1_MASTER_RUN_CONTROL_MASK;
+        spu_mfc_sr1_set(spu, sr1);
+        spin_unlock_irq(&spu->register_lock);
+}
+
 static int spu_hw_set_mfc_query(struct spu_context * ctx, u32 mask, u32 mode)
 {
         struct spu_problem __iomem *prob = ctx->spu->problem;
@@ -291,9 +302,7 @@ struct spu_context_ops spu_hw_ops = {
         .mbox_stat_poll = spu_hw_mbox_stat_poll,
         .ibox_read = spu_hw_ibox_read,
         .wbox_write = spu_hw_wbox_write,
-        .signal1_read = spu_hw_signal1_read,
         .signal1_write = spu_hw_signal1_write,
-        .signal2_read = spu_hw_signal2_read,
         .signal2_write = spu_hw_signal2_write,
         .signal1_type_set = spu_hw_signal1_type_set,
         .signal1_type_get = spu_hw_signal1_type_get,
@@ -303,8 +312,10 @@ struct spu_context_ops spu_hw_ops = {
         .npc_write = spu_hw_npc_write,
         .status_read = spu_hw_status_read,
         .get_ls = spu_hw_get_ls,
+        .runcntl_read = spu_hw_runcntl_read,
         .runcntl_write = spu_hw_runcntl_write,
-        .runcntl_stop = spu_hw_runcntl_stop,
+        .master_start = spu_hw_master_start,
+        .master_stop = spu_hw_master_stop,
         .set_mfc_query = spu_hw_set_mfc_query,
         .read_mfc_tagstatus = spu_hw_read_mfc_tagstatus,
         .get_mfc_free_elements = spu_hw_get_mfc_free_elements,
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 427d00a4f6a0..738b9244382f 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -33,21 +33,22 @@
 #include <linux/slab.h>
 #include <linux/parser.h>
 
-#include <asm/io.h>
+#include <asm/prom.h>
 #include <asm/semaphore.h>
 #include <asm/spu.h>
 #include <asm/uaccess.h>
 
 #include "spufs.h"
 
-static kmem_cache_t *spufs_inode_cache;
+static struct kmem_cache *spufs_inode_cache;
+char *isolated_loader;
 
 static struct inode *
 spufs_alloc_inode(struct super_block *sb)
 {
         struct spufs_inode_info *ei;
 
-        ei = kmem_cache_alloc(spufs_inode_cache, SLAB_KERNEL);
+        ei = kmem_cache_alloc(spufs_inode_cache, GFP_KERNEL);
         if (!ei)
                 return NULL;
 
@@ -64,7 +65,7 @@ spufs_destroy_inode(struct inode *inode)
 }
 
 static void
-spufs_init_once(void *p, kmem_cache_t * cachep, unsigned long flags)
+spufs_init_once(void *p, struct kmem_cache * cachep, unsigned long flags)
 {
         struct spufs_inode_info *ei = p;
 
@@ -204,7 +205,7 @@ static int spufs_dir_close(struct inode *inode, struct file *file)
         struct dentry *dir;
         int ret;
 
-        dir = file->f_dentry;
+        dir = file->f_path.dentry;
         parent = dir->d_parent->d_inode;
         ctx = SPUFS_I(dir->d_inode)->i_ctx;
 
@@ -231,6 +232,7 @@ struct file_operations spufs_context_fops = {
         .readdir        = dcache_readdir,
         .fsync          = simple_sync_file,
 };
+EXPORT_SYMBOL_GPL(spufs_context_fops);
 
 static int
 spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags,
@@ -255,10 +257,14 @@ spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags,
                 goto out_iput;
 
         ctx->flags = flags;
-
         inode->i_op = &spufs_dir_inode_operations;
         inode->i_fop = &simple_dir_operations;
-        ret = spufs_fill_dir(dentry, spufs_dir_contents, mode, ctx);
+        if (flags & SPU_CREATE_NOSCHED)
+                ret = spufs_fill_dir(dentry, spufs_dir_nosched_contents,
+                                         mode, ctx);
+        else
+                ret = spufs_fill_dir(dentry, spufs_dir_contents, mode, ctx);
+
         if (ret)
                 goto out_free_ctx;
 
@@ -307,6 +313,20 @@ static int spufs_create_context(struct inode *inode,
 {
         int ret;
 
+        ret = -EPERM;
+        if ((flags & SPU_CREATE_NOSCHED) &&
+            !capable(CAP_SYS_NICE))
+                goto out_unlock;
+
+        ret = -EINVAL;
+        if ((flags & (SPU_CREATE_NOSCHED | SPU_CREATE_ISOLATE))
+            == SPU_CREATE_ISOLATE)
+                goto out_unlock;
+
+        ret = -ENODEV;
+        if ((flags & SPU_CREATE_ISOLATE) && !isolated_loader)
+                goto out_unlock;
+
         ret = spufs_mkdir(inode, dentry, flags, mode & S_IRWXUGO);
         if (ret)
                 goto out_unlock;
@@ -343,7 +363,7 @@ static int spufs_gang_close(struct inode *inode, struct file *file)
         struct dentry *dir;
         int ret;
 
-        dir = file->f_dentry;
+        dir = file->f_path.dentry;
         parent = dir->d_parent->d_inode;
 
         ret = spufs_rmgang(parent, dir);
@@ -540,6 +560,30 @@ spufs_parse_options(char *options, struct inode *root)
         return 1;
 }
 
+static void
+spufs_init_isolated_loader(void)
+{
+        struct device_node *dn;
+        const char *loader;
+        int size;
+
+        dn = of_find_node_by_path("/spu-isolation");
+        if (!dn)
+                return;
+
+        loader = get_property(dn, "loader", &size);
+        if (!loader)
+                return;
+
+        /* kmalloc should align on a 16 byte boundary..* */
+        isolated_loader = kmalloc(size, GFP_KERNEL);
+        if (!isolated_loader)
+                return;
+
+        memcpy(isolated_loader, loader, size);
+        printk(KERN_INFO "spufs: SPU isolation mode enabled\n");
+}
+
 static int
 spufs_create_root(struct super_block *sb, void *data)
 {
@@ -608,6 +652,7 @@ static struct file_system_type spufs_type = {
 static int __init spufs_init(void)
 {
         int ret;
+
         ret = -ENOMEM;
         spufs_inode_cache = kmem_cache_create("spufs_inode_cache",
                         sizeof(struct spufs_inode_info), 0,
@@ -625,6 +670,12 @@ static int __init spufs_init(void)
         ret = register_spu_syscalls(&spufs_calls);
         if (ret)
                 goto out_fs;
+        ret = register_arch_coredump_calls(&spufs_coredump_calls);
+        if (ret)
+                goto out_fs;
+
+        spufs_init_isolated_loader();
+
         return 0;
 out_fs:
         unregister_filesystem(&spufs_type);
@@ -638,6 +689,7 @@ module_init(spufs_init);
 static void __exit spufs_exit(void)
 {
         spu_sched_exit();
+        unregister_arch_coredump_calls(&spufs_coredump_calls);
         unregister_spu_syscalls(&spufs_calls);
         unregister_filesystem(&spufs_type);
         kmem_cache_destroy(spufs_inode_cache);
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c
index 63df8cf4ba16..1acc2ffef8c8 100644
--- a/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
@@ -1,7 +1,11 @@
+#define DEBUG
+
 #include <linux/wait.h>
 #include <linux/ptrace.h>
 
 #include <asm/spu.h>
+#include <asm/spu_priv1.h>
+#include <asm/io.h>
 #include <asm/unistd.h>
 
 #include "spufs.h"
@@ -24,6 +28,7 @@ void spufs_dma_callback(struct spu *spu, int type)
         } else {
                 switch (type) {
                 case SPE_EVENT_DMA_ALIGNMENT:
+                case SPE_EVENT_SPE_DATA_STORAGE:
                 case SPE_EVENT_INVALID_DMA:
                         force_sig(SIGBUS, /* info, */ current);
                         break;
@@ -48,15 +53,122 @@ static inline int spu_stopped(struct spu_context *ctx, u32 * stat)
         return (!(*stat & 0x1) || pte_fault || spu->class_0_pending) ? 1 : 0;
 }
 
+static int spu_setup_isolated(struct spu_context *ctx)
+{
+        int ret;
+        u64 __iomem *mfc_cntl;
+        u64 sr1;
+        u32 status;
+        unsigned long timeout;
+        const u32 status_loading = SPU_STATUS_RUNNING
+                | SPU_STATUS_ISOLATED_STATE | SPU_STATUS_ISOLATED_LOAD_STATUS;
+
+        if (!isolated_loader)
+                return -ENODEV;
+
+        ret = spu_acquire_exclusive(ctx);
+        if (ret)
+                goto out;
+
+        mfc_cntl = &ctx->spu->priv2->mfc_control_RW;
+
+        /* purge the MFC DMA queue to ensure no spurious accesses before we
+         * enter kernel mode */
+        timeout = jiffies + HZ;
+        out_be64(mfc_cntl, MFC_CNTL_PURGE_DMA_REQUEST);
+        while ((in_be64(mfc_cntl) & MFC_CNTL_PURGE_DMA_STATUS_MASK)
+                        != MFC_CNTL_PURGE_DMA_COMPLETE) {
+                if (time_after(jiffies, timeout)) {
+                        printk(KERN_ERR "%s: timeout flushing MFC DMA queue\n",
+                                        __FUNCTION__);
+                        ret = -EIO;
+                        goto out_unlock;
+                }
+                cond_resched();
+        }
+
+        /* put the SPE in kernel mode to allow access to the loader */
+        sr1 = spu_mfc_sr1_get(ctx->spu);
+        sr1 &= ~MFC_STATE1_PROBLEM_STATE_MASK;
+        spu_mfc_sr1_set(ctx->spu, sr1);
+
+        /* start the loader */
+        ctx->ops->signal1_write(ctx, (unsigned long)isolated_loader >> 32);
+        ctx->ops->signal2_write(ctx,
+                        (unsigned long)isolated_loader & 0xffffffff);
+
+        ctx->ops->runcntl_write(ctx,
+                        SPU_RUNCNTL_RUNNABLE | SPU_RUNCNTL_ISOLATE);
+
+        ret = 0;
+        timeout = jiffies + HZ;
+        while (((status = ctx->ops->status_read(ctx)) & status_loading) ==
+                                status_loading) {
+                if (time_after(jiffies, timeout)) {
+                        printk(KERN_ERR "%s: timeout waiting for loader\n",
+                                        __FUNCTION__);
+                        ret = -EIO;
+                        goto out_drop_priv;
+                }
+                cond_resched();
+        }
+
+        if (!(status & SPU_STATUS_RUNNING)) {
+                /* If isolated LOAD has failed: run SPU, we will get a stop-and
+                 * signal later. */
+                pr_debug("%s: isolated LOAD failed\n", __FUNCTION__);
+                ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_RUNNABLE);
+                ret = -EACCES;
+
+        } else if (!(status & SPU_STATUS_ISOLATED_STATE)) {
+                /* This isn't allowed by the CBEA, but check anyway */
+                pr_debug("%s: SPU fell out of isolated mode?\n", __FUNCTION__);
+                ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_STOP);
+                ret = -EINVAL;
+        }
+
+out_drop_priv:
+        /* Finished accessing the loader. Drop kernel mode */
+        sr1 |= MFC_STATE1_PROBLEM_STATE_MASK;
+        spu_mfc_sr1_set(ctx->spu, sr1);
+
+out_unlock:
+        spu_release_exclusive(ctx);
+out:
+        return ret;
+}
+
 static inline int spu_run_init(struct spu_context *ctx, u32 * npc)
 {
         int ret;
+        unsigned long runcntl = SPU_RUNCNTL_RUNNABLE;
 
-        if ((ret = spu_acquire_runnable(ctx)) != 0)
+        ret = spu_acquire_runnable(ctx);
+        if (ret)
                 return ret;
-        ctx->ops->npc_write(ctx, *npc);
-        ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_RUNNABLE);
-        return 0;
+
+        if (ctx->flags & SPU_CREATE_ISOLATE) {
+                if (!(ctx->ops->status_read(ctx) & SPU_STATUS_ISOLATED_STATE)) {
+                        /* Need to release ctx, because spu_setup_isolated will
+                         * acquire it exclusively.
+                         */
+                        spu_release(ctx);
+                        ret = spu_setup_isolated(ctx);
+                        if (!ret)
+                                ret = spu_acquire_runnable(ctx);
+                }
+
+                /* if userspace has set the runcntrl register (eg, to issue an
+                 * isolated exit), we need to re-set it here */
+                runcntl = ctx->ops->runcntl_read(ctx) &
+                        (SPU_RUNCNTL_RUNNABLE | SPU_RUNCNTL_ISOLATE);
+                if (runcntl == 0)
+                        runcntl = SPU_RUNCNTL_RUNNABLE;
+        } else
+                ctx->ops->npc_write(ctx, *npc);
+
+        ctx->ops->runcntl_write(ctx, runcntl);
+        return ret;
 }
 
 static inline int spu_run_fini(struct spu_context *ctx, u32 * npc,
@@ -70,13 +182,7 @@ static inline int spu_run_fini(struct spu_context *ctx, u32 * npc,
 
         if (signal_pending(current))
                 ret = -ERESTARTSYS;
-        if (unlikely(current->ptrace & PT_PTRACED)) {
-                if ((*status & SPU_STATUS_STOPPED_BY_STOP)
-                    && (*status >> SPU_STOP_STATUS_SHIFT) == 0x3fff) {
-                        force_sig(SIGTRAP, current);
-                        ret = -ERESTARTSYS;
-                }
-        }
+
         return ret;
 }
 
@@ -204,6 +310,7 @@ long spufs_run_spu(struct file *file, struct spu_context *ctx,
         if (down_interruptible(&ctx->run_sema))
                 return -ERESTARTSYS;
 
+        ctx->ops->master_start(ctx);
         ctx->event_return = 0;
         ret = spu_run_init(ctx, npc);
         if (ret)
@@ -223,7 +330,7 @@ long spufs_run_spu(struct file *file, struct spu_context *ctx,
                 if (unlikely(ctx->state != SPU_STATE_RUNNABLE)) {
                         ret = spu_reacquire_runnable(ctx, npc, &status);
                         if (ret)
-                                goto out;
+                                goto out2;
                         continue;
                 }
                 ret = spu_process_events(ctx);
@@ -231,12 +338,24 @@ long spufs_run_spu(struct file *file, struct spu_context *ctx,
         } while (!ret && !(status & (SPU_STATUS_STOPPED_BY_STOP |
                                       SPU_STATUS_STOPPED_BY_HALT)));
 
-        ctx->ops->runcntl_stop(ctx);
+        ctx->ops->master_stop(ctx);
         ret = spu_run_fini(ctx, npc, &status);
-        if (!ret)
-                ret = status;
         spu_yield(ctx);
 
+out2:
+        if ((ret == 0) ||
+            ((ret == -ERESTARTSYS) &&
+             ((status & SPU_STATUS_STOPPED_BY_HALT) ||
+              ((status & SPU_STATUS_STOPPED_BY_STOP) &&
+               (status >> SPU_STOP_STATUS_SHIFT != 0x2104)))))
+                ret = status;
+
+        if ((status & SPU_STATUS_STOPPED_BY_STOP)
+            && (status >> SPU_STOP_STATUS_SHIFT) == 0x3fff) {
+                force_sig(SIGTRAP, current);
+                ret = -ERESTARTSYS;
+        }
+
 out:
         *event = ctx->event_return;
         up(&ctx->run_sema);
diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index a0f55ca2d488..70fb13395c04 100644
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -29,6 +29,7 @@
 
 #include <asm/spu.h>
 #include <asm/spu_csa.h>
+#include <asm/spu_info.h>
 
 /* The magic number for our file system */
 enum {
@@ -114,13 +115,19 @@ struct spu_context_ops {
         void (*npc_write) (struct spu_context * ctx, u32 data);
          u32(*status_read) (struct spu_context * ctx);
         char*(*get_ls) (struct spu_context * ctx);
+         u32 (*runcntl_read) (struct spu_context * ctx);
         void (*runcntl_write) (struct spu_context * ctx, u32 data);
-        void (*runcntl_stop) (struct spu_context * ctx);
+        void (*master_start) (struct spu_context * ctx);
+        void (*master_stop) (struct spu_context * ctx);
         int (*set_mfc_query)(struct spu_context * ctx, u32 mask, u32 mode);
         u32 (*read_mfc_tagstatus)(struct spu_context * ctx);
         u32 (*get_mfc_free_elements)(struct spu_context *ctx);
-        int (*send_mfc_command)(struct spu_context *ctx,
-                                        struct mfc_dma_command *cmd);
+        int (*send_mfc_command)(struct spu_context * ctx,
+                                struct mfc_dma_command * cmd);
+        void (*dma_info_read) (struct spu_context * ctx,
+                               struct spu_dma_info * info);
+        void (*proxydma_info_read) (struct spu_context * ctx,
+                                    struct spu_proxydma_info * info);
 };
 
 extern struct spu_context_ops spu_hw_ops;
@@ -135,6 +142,7 @@ struct spufs_inode_info {
         container_of(inode, struct spufs_inode_info, vfs_inode)
 
 extern struct tree_descr spufs_dir_contents[];
+extern struct tree_descr spufs_dir_nosched_contents[];
 
 /* system call implementation */
 long spufs_run_spu(struct file *file,
@@ -162,6 +170,12 @@ void spu_acquire(struct spu_context *ctx);
 void spu_release(struct spu_context *ctx);
 int spu_acquire_runnable(struct spu_context *ctx);
 void spu_acquire_saved(struct spu_context *ctx);
+int spu_acquire_exclusive(struct spu_context *ctx);
+
+static inline void spu_release_exclusive(struct spu_context *ctx)
+{
+        up_write(&ctx->state_sema);
+}
 
 int spu_activate(struct spu_context *ctx, u64 flags);
 void spu_deactivate(struct spu_context *ctx);
@@ -169,6 +183,8 @@ void spu_yield(struct spu_context *ctx);
 int __init spu_sched_init(void);
 void __exit spu_sched_exit(void);
 
+extern char *isolated_loader;
+
 /*
  * spufs_wait
  *      Same as wait_event_interruptible(), except that here
@@ -207,4 +223,15 @@ void spufs_stop_callback(struct spu *spu);
 void spufs_mfc_callback(struct spu *spu);
 void spufs_dma_callback(struct spu *spu, int type);
 
+extern struct spu_coredump_calls spufs_coredump_calls;
+struct spufs_coredump_reader {
+        char *name;
+        ssize_t (*read)(struct spu_context *ctx,
+                        char __user *buffer, size_t size, loff_t *pos);
+        u64 (*get)(void *data);
+        size_t size;
+};
+extern struct spufs_coredump_reader spufs_coredump_read[];
+extern int spufs_coredump_num_notes;
+
 #endif
diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c
index 0f782ca662ba..c08981ff7fc6 100644
--- a/arch/powerpc/platforms/cell/spufs/switch.c
+++ b/arch/powerpc/platforms/cell/spufs/switch.c
@@ -102,7 +102,7 @@ static inline int check_spu_isolate(struct spu_state *csa, struct spu *spu)
          *     saved at this time.
          */
         isolate_state = SPU_STATUS_ISOLATED_STATE |
-            SPU_STATUS_ISOLATED_LOAD_STAUTUS | SPU_STATUS_ISOLATED_EXIT_STAUTUS;
+            SPU_STATUS_ISOLATED_LOAD_STATUS | SPU_STATUS_ISOLATED_EXIT_STATUS;
         return (in_be32(&prob->spu_status_R) & isolate_state) ? 1 : 0;
 }
 
@@ -1046,12 +1046,12 @@ static inline int suspend_spe(struct spu_state *csa, struct spu *spu)
          */
         if (in_be32(&prob->spu_status_R) & SPU_STATUS_RUNNING) {
                 if (in_be32(&prob->spu_status_R) &
-                    SPU_STATUS_ISOLATED_EXIT_STAUTUS) {
+                    SPU_STATUS_ISOLATED_EXIT_STATUS) {
                         POLL_WHILE_TRUE(in_be32(&prob->spu_status_R) &
                                         SPU_STATUS_RUNNING);
                 }
                 if ((in_be32(&prob->spu_status_R) &
-                     SPU_STATUS_ISOLATED_LOAD_STAUTUS)
+                     SPU_STATUS_ISOLATED_LOAD_STATUS)
                     || (in_be32(&prob->spu_status_R) &
                         SPU_STATUS_ISOLATED_STATE)) {
                         out_be32(&prob->spu_runcntl_RW, SPU_RUNCNTL_STOP);
@@ -1085,7 +1085,7 @@ static inline void clear_spu_status(struct spu_state *csa, struct spu *spu)
          */
         if (!(in_be32(&prob->spu_status_R) & SPU_STATUS_RUNNING)) {
                 if (in_be32(&prob->spu_status_R) &
-                    SPU_STATUS_ISOLATED_EXIT_STAUTUS) {
+                    SPU_STATUS_ISOLATED_EXIT_STATUS) {
                         spu_mfc_sr1_set(spu,
                                         MFC_STATE1_MASTER_RUN_CONTROL_MASK);
                         eieio();
@@ -1095,7 +1095,7 @@ static inline void clear_spu_status(struct spu_state *csa, struct spu *spu)
                                         SPU_STATUS_RUNNING);
                 }
                 if ((in_be32(&prob->spu_status_R) &
-                     SPU_STATUS_ISOLATED_LOAD_STAUTUS)
+                     SPU_STATUS_ISOLATED_LOAD_STATUS)
                     || (in_be32(&prob->spu_status_R) &
                         SPU_STATUS_ISOLATED_STATE)) {
                         spu_mfc_sr1_set(spu,
@@ -1916,6 +1916,51 @@ static void save_lscsa(struct spu_state *prev, struct spu *spu)
         wait_spu_stopped(prev, spu);    /* Step 57. */
 }
 
+static void force_spu_isolate_exit(struct spu *spu)
+{
+        struct spu_problem __iomem *prob = spu->problem;
+        struct spu_priv2 __iomem *priv2 = spu->priv2;
+
+        /* Stop SPE execution and wait for completion. */
+        out_be32(&prob->spu_runcntl_RW, SPU_RUNCNTL_STOP);
+        iobarrier_rw();
+        POLL_WHILE_TRUE(in_be32(&prob->spu_status_R) & SPU_STATUS_RUNNING);
+
+        /* Restart SPE master runcntl. */
+        spu_mfc_sr1_set(spu, MFC_STATE1_MASTER_RUN_CONTROL_MASK);
+        iobarrier_w();
+
+        /* Initiate isolate exit request and wait for completion. */
+        out_be64(&priv2->spu_privcntl_RW, 4LL);
+        iobarrier_w();
+        out_be32(&prob->spu_runcntl_RW, 2);
+        iobarrier_rw();
+        POLL_WHILE_FALSE((in_be32(&prob->spu_status_R)
+                                & SPU_STATUS_STOPPED_BY_STOP));
+
+        /* Reset load request to normal. */
+        out_be64(&priv2->spu_privcntl_RW, SPU_PRIVCNT_LOAD_REQUEST_NORMAL);
+        iobarrier_w();
+}
+
+/**
+ * stop_spu_isolate
+ *      Check SPU run-control state and force isolated
+ *      exit function as necessary.
+ */
+static void stop_spu_isolate(struct spu *spu)
+{
+        struct spu_problem __iomem *prob = spu->problem;
+
+        if (in_be32(&prob->spu_status_R) & SPU_STATUS_ISOLATED_STATE) {
+                /* The SPU is in isolated state; the only way
+                 * to get it out is to perform an isolated
+                 * exit (clean) operation.
+                 */
+                force_spu_isolate_exit(spu);
+        }
+}
+
 static void harvest(struct spu_state *prev, struct spu *spu)
 {
         /*
@@ -1928,6 +1973,7 @@ static void harvest(struct spu_state *prev, struct spu *spu)
         inhibit_user_access(prev, spu);         /* Step 3.  */
         terminate_spu_app(prev, spu);           /* Step 4.  */
         set_switch_pending(prev, spu);          /* Step 5.  */
+        stop_spu_isolate(spu);                  /* NEW.     */
         remove_other_spu_access(prev, spu);     /* Step 6.  */
         suspend_mfc(prev, spu);                 /* Step 7.  */
         wait_suspend_mfc_complete(prev, spu);   /* Step 8.  */
@@ -2096,11 +2142,11 @@ int spu_save(struct spu_state *prev, struct spu *spu)
         acquire_spu_lock(spu);          /* Step 1.     */
         rc = __do_spu_save(prev, spu);  /* Steps 2-53. */
         release_spu_lock(spu);
-        if (rc) {
+        if (rc != 0 && rc != 2 && rc != 6) {
                 panic("%s failed on SPU[%d], rc=%d.\n",
                       __func__, spu->number, rc);
         }
-        return rc;
+        return 0;
 }
 EXPORT_SYMBOL_GPL(spu_save);
 
@@ -2165,9 +2211,6 @@ static void init_priv1(struct spu_state *csa)
             MFC_STATE1_PROBLEM_STATE_MASK |
             MFC_STATE1_RELOCATE_MASK | MFC_STATE1_BUS_TLBIE_MASK;
 
-        /* Set storage description.  */
-        csa->priv1.mfc_sdr_RW = mfspr(SPRN_SDR1);
-
         /* Enable OS-specific set of interrupts. */
         csa->priv1.int_mask_class0_RW = CLASS0_ENABLE_DMA_ALIGNMENT_INTR |
             CLASS0_ENABLE_INVALID_DMA_COMMAND_INTR |
diff --git a/arch/powerpc/platforms/cell/spufs/syscalls.c b/arch/powerpc/platforms/cell/spufs/syscalls.c
index a6d1ae4dc2a3..8e37bdf4dfda 100644
--- a/arch/powerpc/platforms/cell/spufs/syscalls.c
+++ b/arch/powerpc/platforms/cell/spufs/syscalls.c
@@ -46,7 +46,7 @@ static long do_spu_run(struct file *filp,
         if (filp->f_op != &spufs_context_fops)
                 goto out;
 
-        i = SPUFS_I(filp->f_dentry->d_inode);
+        i = SPUFS_I(filp->f_path.dentry->d_inode);
         ret = spufs_run_spu(filp, i->i_ctx, &npc, &status);
 
         if (put_user(npc, unpc))
diff --git a/arch/powerpc/platforms/chrp/chrp.h b/arch/powerpc/platforms/chrp/chrp.h
index 996c28744e96..63f0aee4c158 100644
--- a/arch/powerpc/platforms/chrp/chrp.h
+++ b/arch/powerpc/platforms/chrp/chrp.h
@@ -9,4 +9,3 @@ extern long chrp_time_init(void);
 
 extern void chrp_find_bridges(void);
 extern void chrp_event_scan(unsigned long);
-extern void chrp_pcibios_fixup(void);
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index 0f4340506c75..ddb4a116ea89 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -156,15 +156,6 @@ hydra_init(void)
         return 1;
 }
 
-void __init
-chrp_pcibios_fixup(void)
-{
-        struct pci_dev *dev = NULL;
-
-        for_each_pci_dev(dev)
-                pci_read_irq_line(dev);
-}
-
 #define PRG_CL_RESET_VALID 0x00010000
 
 static void __init
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 49b8dabcbc99..e1f51d455984 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -588,7 +588,6 @@ static int __init chrp_probe(void)
         ISA_DMA_THRESHOLD = ~0L;
         DMA_MODE_READ = 0x44;
         DMA_MODE_WRITE = 0x48;
-        isa_io_base = CHRP_ISA_IO_BASE;         /* default value */
 
         return 1;
 }
@@ -600,7 +599,6 @@ define_machine(chrp) {
         .init                   = chrp_init2,
         .show_cpuinfo           = chrp_show_cpuinfo,
         .init_IRQ               = chrp_init_IRQ,
-        .pcibios_fixup          = chrp_pcibios_fixup,
         .restart                = rtas_restart,
         .power_off              = rtas_power_off,
         .halt                   = rtas_halt,
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 234a861870a8..b3c2ce4cb7a8 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -35,7 +35,7 @@ config HDPU
           Select HDPU if configuring a Sky Computers Compute Blade.
 
 config HDPU_FEATURES
-        depends HDPU
+        depends on HDPU
         tristate "HDPU-Features"
         help
           Select to enable HDPU enhanced features.
@@ -74,6 +74,18 @@ config SANDPOINT
           Select SANDPOINT if configuring for a Motorola Sandpoint X3
           (any flavor).
 
+config LINKSTATION
+        bool "Linkstation / Kurobox(HG) from Buffalo"
+        select MPIC
+        select FSL_SOC
+        select PPC_UDBG_16550 if SERIAL_8250
+        help
+          Select LINKSTATION if configuring for one of PPC- (MPC8241)
+          based NAS systems from Buffalo Technology. So far only
+          KuroboxHG has been tested. In the future classical Kurobox,
+          Linkstation-I HD-HLAN and HD-HGLAN versions, and PPC-based
+          Terastation systems should be supported too.
+
 config MPC7448HPC2
         bool "Freescale MPC7448HPC2(Taiga)"
         select TSI108_BRIDGE
@@ -146,15 +158,6 @@ config PQ2FADS
           Select PQ2FADS if you wish to configure for a Freescale
           PQ2FADS board (-VR or -ZU).
 
-config LITE5200
-        bool "Freescale LITE5200 / (IceCube)"
-        select PPC_MPC52xx
-        help
-          Support for the LITE5200 dev board for the MPC5200 from Freescale.
-          This is for the LITE5200 version 2.0 board. Don't know if it changes
-          much but it's only been tested on this board version. I think this
-          board is also known as IceCube.
-
 config EV64360
         bool "Marvell-EV64360BP"
         help
@@ -172,9 +175,6 @@ config TQM8xxL
         depends on 8xx && (TQM823L || TQM850L || FPS850L || TQM855L || TQM860L)
         default y
 
-config PPC_MPC52xx
-        bool
-
 config 8260
         bool "CPM2 Support" if WILLOW
         depends on 6xx
@@ -208,7 +208,7 @@ config PPC_GEN550
         depends on SANDPOINT || SPRUCE || PPLUS || \
                 PRPMC750 || PRPMC800 || LOPEC || \
                 (EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D || \
-                83xx
+                83xx || LINKSTATION
         default y
 
 config FORCE
@@ -282,13 +282,13 @@ config EPIC_SERIAL_MODE
 
 config MPC10X_BRIDGE
         bool
-        depends on POWERPMC250 || LOPEC || SANDPOINT
+        depends on POWERPMC250 || LOPEC || SANDPOINT || LINKSTATION
         select PPC_INDIRECT_PCI
         default y
 
 config MPC10X_OPENPIC
         bool
-        depends on POWERPMC250 || LOPEC || SANDPOINT
+        depends on POWERPMC250 || LOPEC || SANDPOINT || LINKSTATION
         default y
 
 config MPC10X_STORE_GATHERING
diff --git a/arch/powerpc/platforms/embedded6xx/Makefile b/arch/powerpc/platforms/embedded6xx/Makefile
index fa499fe59291..d3d11a3cd656 100644
--- a/arch/powerpc/platforms/embedded6xx/Makefile
+++ b/arch/powerpc/platforms/embedded6xx/Makefile
@@ -2,3 +2,4 @@
 # Makefile for the 6xx/7xx/7xxxx linux kernel.
 #
 obj-$(CONFIG_MPC7448HPC2)       += mpc7448_hpc2.o
+obj-$(CONFIG_LINKSTATION)       += linkstation.o ls_uart.o
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
new file mode 100644
index 000000000000..61599d919ea8
--- /dev/null
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -0,0 +1,211 @@
+/*
+ * Board setup routines for the Buffalo Linkstation / Kurobox Platform.
+ *
+ * Copyright (C) 2006 G. Liakhovetski (g.liakhovetski@gmx.de)
+ *
+ * Based on sandpoint.c by Mark A. Greer
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of
+ * any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/initrd.h>
+#include <linux/root_dev.h>
+#include <linux/mtd/physmap.h>
+
+#include <asm/time.h>
+#include <asm/prom.h>
+#include <asm/mpic.h>
+#include <asm/mpc10x.h>
+#include <asm/pci-bridge.h>
+
+static struct mtd_partition linkstation_physmap_partitions[] = {
+        {
+                .name   = "mtd_firmimg",
+                .offset = 0x000000,
+                .size   = 0x300000,
+        },
+        {
+                .name   = "mtd_bootcode",
+                .offset = 0x300000,
+                .size   = 0x070000,
+        },
+        {
+                .name   = "mtd_status",
+                .offset = 0x370000,
+                .size   = 0x010000,
+        },
+        {
+                .name   = "mtd_conf",
+                .offset = 0x380000,
+                .size   = 0x080000,
+        },
+        {
+                .name   = "mtd_allflash",
+                .offset = 0x000000,
+                .size   = 0x400000,
+        },
+        {
+                .name   = "mtd_data",
+                .offset = 0x310000,
+                .size   = 0x0f0000,
+        },
+};
+
+static int __init add_bridge(struct device_node *dev)
+{
+        int len;
+        struct pci_controller *hose;
+        int *bus_range;
+
+        printk("Adding PCI host bridge %s\n", dev->full_name);
+
+        bus_range = (int *) get_property(dev, "bus-range", &len);
+        if (bus_range == NULL || len < 2 * sizeof(int))
+                printk(KERN_WARNING "Can't get bus-range for %s, assume"
+                                " bus 0\n", dev->full_name);
+
+        hose = pcibios_alloc_controller();
+        if (hose == NULL)
+                return -ENOMEM;
+        hose->first_busno = bus_range ? bus_range[0] : 0;
+        hose->last_busno = bus_range ? bus_range[1] : 0xff;
+        hose->arch_data = dev;
+        setup_indirect_pci(hose, 0xfec00000, 0xfee00000);
+
+        /* Interpret the "ranges" property */
+        /* This also maps the I/O region and sets isa_io/mem_base */
+        pci_process_bridge_OF_ranges(hose, dev, 1);
+
+        return 0;
+}
+
+static void __init linkstation_setup_arch(void)
+{
+        struct device_node *np;
+#ifdef CONFIG_MTD_PHYSMAP
+        physmap_set_partitions(linkstation_physmap_partitions,
+                               ARRAY_SIZE(linkstation_physmap_partitions));
+#endif
+
+#ifdef CONFIG_BLK_DEV_INITRD
+        if (initrd_start)
+                ROOT_DEV = Root_RAM0;
+        else
+#endif
+#ifdef  CONFIG_ROOT_NFS
+                ROOT_DEV = Root_NFS;
+#else
+                ROOT_DEV = Root_HDA1;
+#endif
+
+        /* Lookup PCI host bridges */
+        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
+                add_bridge(np);
+
+        printk(KERN_INFO "BUFFALO Network Attached Storage Series\n");
+        printk(KERN_INFO "(C) 2002-2005 BUFFALO INC.\n");
+}
+
+/*
+ * Interrupt setup and service.  Interrrupts on the linkstation come
+ * from the four PCI slots plus onboard 8241 devices: I2C, DUART.
+ */
+static void __init linkstation_init_IRQ(void)
+{
+        struct mpic *mpic;
+        struct device_node *dnp;
+        void *prop;
+        int size;
+        phys_addr_t paddr;
+
+        dnp = of_find_node_by_type(NULL, "open-pic");
+        if (dnp == NULL)
+                return;
+
+        prop = (struct device_node *)get_property(dnp, "reg", &size);
+        paddr = (phys_addr_t)of_translate_address(dnp, prop);
+
+        mpic = mpic_alloc(dnp, paddr, MPIC_PRIMARY | MPIC_WANTS_RESET, 4, 32, " EPIC     ");
+        BUG_ON(mpic == NULL);
+
+        /* PCI IRQs */
+        mpic_assign_isu(mpic, 0, paddr + 0x10200);
+
+        /* I2C */
+        mpic_assign_isu(mpic, 1, paddr + 0x11000);
+
+        /* ttyS0, ttyS1 */
+        mpic_assign_isu(mpic, 2, paddr + 0x11100);
+
+        mpic_init(mpic);
+}
+
+extern void avr_uart_configure(void);
+extern void avr_uart_send(const char);
+
+static void linkstation_restart(char *cmd)
+{
+        local_irq_disable();
+
+        /* Reset system via AVR */
+        avr_uart_configure();
+        /* Send reboot command */
+        avr_uart_send('C');
+
+        for(;;)  /* Spin until reset happens */
+                avr_uart_send('G');     /* "kick" */
+}
+
+static void linkstation_power_off(void)
+{
+        local_irq_disable();
+
+        /* Power down system via AVR */
+        avr_uart_configure();
+        /* send shutdown command */
+        avr_uart_send('E');
+
+        for(;;)  /* Spin until power-off happens */
+                avr_uart_send('G');     /* "kick" */
+        /* NOTREACHED */
+}
+
+static void linkstation_halt(void)
+{
+        linkstation_power_off();
+        /* NOTREACHED */
+}
+
+static void linkstation_show_cpuinfo(struct seq_file *m)
+{
+        seq_printf(m, "vendor\t\t: Buffalo Technology\n");
+        seq_printf(m, "machine\t\t: Linkstation I/Kurobox(HG)\n");
+}
+
+static int __init linkstation_probe(void)
+{
+        unsigned long root;
+
+        root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "linkstation"))
+                return 0;
+        return 1;
+}
+
+define_machine(linkstation){
+        .name                   = "Buffalo Linkstation",
+        .probe                  = linkstation_probe,
+        .setup_arch             = linkstation_setup_arch,
+        .init_IRQ               = linkstation_init_IRQ,
+        .show_cpuinfo           = linkstation_show_cpuinfo,
+        .get_irq                = mpic_get_irq,
+        .restart                = linkstation_restart,
+        .power_off              = linkstation_power_off,
+        .halt                   = linkstation_halt,
+        .calibrate_decr         = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/embedded6xx/ls_uart.c b/arch/powerpc/platforms/embedded6xx/ls_uart.c
new file mode 100644
index 000000000000..0e837762cc5b
--- /dev/null
+++ b/arch/powerpc/platforms/embedded6xx/ls_uart.c
@@ -0,0 +1,131 @@
+#include <linux/workqueue.h>
+#include <linux/string.h>
+#include <linux/delay.h>
+#include <linux/serial_reg.h>
+#include <linux/serial_8250.h>
+#include <asm/io.h>
+#include <asm/mpc10x.h>
+#include <asm/ppc_sys.h>
+#include <asm/prom.h>
+#include <asm/termbits.h>
+
+static void __iomem *avr_addr;
+static unsigned long avr_clock;
+
+static struct work_struct wd_work;
+
+static void wd_stop(struct work_struct *unused)
+{
+        const char string[] = "AAAAFFFFJJJJ>>>>VVVV>>>>ZZZZVVVVKKKK";
+        int i = 0, rescue = 8;
+        int len = strlen(string);
+
+        while (rescue--) {
+                int j;
+                char lsr = in_8(avr_addr + UART_LSR);
+
+                if (lsr & (UART_LSR_THRE | UART_LSR_TEMT)) {
+                        for (j = 0; j < 16 && i < len; j++, i++)
+                                out_8(avr_addr + UART_TX, string[i]);
+                        if (i == len) {
+                                /* Read "OK" back: 4ms for the last "KKKK"
+                                   plus a couple bytes back */
+                                msleep(7);
+                                printk("linkstation: disarming the AVR watchdog: ");
+                                while (in_8(avr_addr + UART_LSR) & UART_LSR_DR)
+                                        printk("%c", in_8(avr_addr + UART_RX));
+                                break;
+                        }
+                }
+                msleep(17);
+        }
+        printk("\n");
+}
+
+#define AVR_QUOT(clock) ((clock) + 8 * 9600) / (16 * 9600)
+
+void avr_uart_configure(void)
+{
+        unsigned char cval = UART_LCR_WLEN8;
+        unsigned int quot = AVR_QUOT(avr_clock);
+
+        if (!avr_addr || !avr_clock)
+                return;
+
+        out_8(avr_addr + UART_LCR, cval);                       /* initialise UART */
+        out_8(avr_addr + UART_MCR, 0);
+        out_8(avr_addr + UART_IER, 0);
+
+        cval |= UART_LCR_STOP | UART_LCR_PARITY | UART_LCR_EPAR;
+
+        out_8(avr_addr + UART_LCR, cval);                       /* Set character format */
+
+        out_8(avr_addr + UART_LCR, cval | UART_LCR_DLAB);       /* set DLAB */
+        out_8(avr_addr + UART_DLL, quot & 0xff);                /* LS of divisor */
+        out_8(avr_addr + UART_DLM, quot >> 8);                  /* MS of divisor */
+        out_8(avr_addr + UART_LCR, cval);                       /* reset DLAB */
+        out_8(avr_addr + UART_FCR, UART_FCR_ENABLE_FIFO);       /* enable FIFO */
+}
+
+void avr_uart_send(const char c)
+{
+        if (!avr_addr || !avr_clock)
+                return;
+
+        out_8(avr_addr + UART_TX, c);
+        out_8(avr_addr + UART_TX, c);
+        out_8(avr_addr + UART_TX, c);
+        out_8(avr_addr + UART_TX, c);
+}
+
+static void __init ls_uart_init(void)
+{
+        local_irq_disable();
+
+#ifndef CONFIG_SERIAL_8250
+        out_8(avr_addr + UART_FCR, UART_FCR_ENABLE_FIFO);       /* enable FIFO */
+        out_8(avr_addr + UART_FCR, UART_FCR_ENABLE_FIFO |
+              UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);       /* clear FIFOs */
+        out_8(avr_addr + UART_FCR, 0);
+        out_8(avr_addr + UART_IER, 0);
+
+        /* Clear up interrupts */
+        (void) in_8(avr_addr + UART_LSR);
+        (void) in_8(avr_addr + UART_RX);
+        (void) in_8(avr_addr + UART_IIR);
+        (void) in_8(avr_addr + UART_MSR);
+#endif
+        avr_uart_configure();
+
+        local_irq_enable();
+}
+
+static int __init ls_uarts_init(void)
+{
+        struct device_node *avr;
+        phys_addr_t phys_addr;
+        int len;
+
+        avr = of_find_node_by_path("/soc10x/serial@80004500");
+        if (!avr)
+                return -EINVAL;
+
+        avr_clock = *(u32*)get_property(avr, "clock-frequency", &len);
+        phys_addr = ((u32*)get_property(avr, "reg", &len))[0];
+
+        if (!avr_clock || !phys_addr)
+                return -EINVAL;
+
+        avr_addr = ioremap(phys_addr, 32);
+        if (!avr_addr)
+                return -EFAULT;
+
+        ls_uart_init();
+
+        INIT_WORK(&wd_work, wd_stop);
+        schedule_work(&wd_work);
+
+        return 0;
+}
+
+late_initcall(ls_uarts_init);
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index bdb475c65cba..3fcc85f60fbf 100644
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -60,7 +60,7 @@ pci_dram_offset = MPC7448_HPC2_PCI_MEM_OFFSET;
 
 extern int tsi108_setup_pci(struct device_node *dev);
 extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
-extern void tsi108_pci_int_init(void);
+extern void tsi108_pci_int_init(struct device_node *node);
 extern void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc);
 
 int mpc7448_hpc2_exclude_device(u_char bus, u_char devfn)
@@ -71,65 +71,6 @@ int mpc7448_hpc2_exclude_device(u_char bus, u_char devfn)
                 return PCIBIOS_SUCCESSFUL;
 }
 
-/*
- * find pci slot by devfn in interrupt map of OF tree
- */
-u8 find_slot_by_devfn(unsigned int *interrupt_map, unsigned int devfn)
-{
-        int i;
-        unsigned int tmp;
-        for (i = 0; i < 4; i++){
-                tmp = interrupt_map[i*4*7];
-                if ((tmp >> 11) == (devfn >> 3))
-                        return i;
-        }
-        return i;
-}
-
-/*
- * Scans the interrupt map for pci device
- */
-void mpc7448_hpc2_fixup_irq(struct pci_dev *dev)
-{
-        struct pci_controller *hose;
-        struct device_node *node;
-        const unsigned int *interrupt;
-        int busnr;
-        int len;
-        u8 slot;
-        u8 pin;
-
-        /* Lookup the hose */
-        busnr = dev->bus->number;
-        hose = pci_bus_to_hose(busnr);
-        if (!hose)
-                printk(KERN_ERR "No pci hose found\n");
-
-        /* Check it has an OF node associated */
-        node = (struct device_node *) hose->arch_data;
-        if (!node)
-                printk(KERN_ERR "No pci node found\n");
-
-        interrupt = get_property(node, "interrupt-map", &len);
-        slot = find_slot_by_devfn(interrupt, dev->devfn);
-        pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
-        if (pin == 0 || pin > 4)
-                pin = 1;
-        pin--;
-        dev->irq  = interrupt[slot*4*7 + pin*7 + 5];
-        DBG("TSI_PCI: dev->irq = 0x%x\n", dev->irq);
-}
-/* temporary pci irq map fixup*/
-
-void __init mpc7448_hpc2_pcibios_fixup(void)
-{
-        struct pci_dev *dev = NULL;
-        for_each_pci_dev(dev) {
-                mpc7448_hpc2_fixup_irq(dev);
-                pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
-        }
-}
-
 static void __init mpc7448_hpc2_setup_arch(void)
 {
         struct device_node *cpu;
@@ -192,9 +133,12 @@ static void __init mpc7448_hpc2_init_IRQ(void)
 {
         struct mpic *mpic;
         phys_addr_t mpic_paddr = 0;
+        struct device_node *tsi_pic;
+#ifdef CONFIG_PCI
         unsigned int cascade_pci_irq;
         struct device_node *tsi_pci;
-        struct device_node *tsi_pic;
+        struct device_node *cascade_node = NULL;
+#endif
 
         tsi_pic = of_find_node_by_type(NULL, "open-pic");
         if (tsi_pic) {
@@ -208,31 +152,41 @@ static void __init mpc7448_hpc2_init_IRQ(void)
                 return;
         }
 
-        DBG("%s: tsi108pic phys_addr = 0x%x\n", __FUNCTION__,
+        DBG("%s: tsi108 pic phys_addr = 0x%x\n", __FUNCTION__,
             (u32) mpic_paddr);
 
         mpic = mpic_alloc(tsi_pic, mpic_paddr,
                         MPIC_PRIMARY | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET |
                         MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108,
-                        0, /* num_sources used */
-                        0, /* num_sources used */
+                        24,
+                        NR_IRQS-4, /* num_sources used */
                         "Tsi108_PIC");
 
-        BUG_ON(mpic == NULL); /* XXXX */
+        BUG_ON(mpic == NULL);
+
+        mpic_assign_isu(mpic, 0, mpic_paddr + 0x100);
+
         mpic_init(mpic);
 
+#ifdef CONFIG_PCI
         tsi_pci = of_find_node_by_type(NULL, "pci");
-        if (tsi_pci == 0) {
+        if (tsi_pci == NULL) {
                 printk("%s: No tsi108 pci node found !\n", __FUNCTION__);
                 return;
         }
+        cascade_node = of_find_node_by_type(NULL, "pic-router");
+        if (cascade_node == NULL) {
+                printk("%s: No tsi108 pci cascade node found !\n", __FUNCTION__);
+                return;
+        }
 
         cascade_pci_irq = irq_of_parse_and_map(tsi_pci, 0);
+        DBG("%s: tsi108 cascade_pci_irq = 0x%x\n", __FUNCTION__,
+            (u32) cascade_pci_irq);
+        tsi108_pci_int_init(cascade_node);
         set_irq_data(cascade_pci_irq, mpic);
         set_irq_chained_handler(cascade_pci_irq, tsi108_irq_cascade);
-
-        tsi108_pci_int_init();
-
+#endif
         /* Configure MPIC outputs to CPU0 */
         tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);
         of_node_put(tsi_pic);
@@ -290,7 +244,6 @@ static int mpc7448_machine_check_exception(struct pt_regs *regs)
                 return 1;
         }
         return 0;
-
 }
 
 define_machine(mpc7448_hpc2){
@@ -300,7 +253,6 @@ define_machine(mpc7448_hpc2){
         .init_IRQ               = mpc7448_hpc2_init_IRQ,
         .show_cpuinfo           = mpc7448_hpc2_show_cpuinfo,
         .get_irq                = mpic_get_irq,
-        .pcibios_fixup          = mpc7448_hpc2_pcibios_fixup,
         .restart                = mpc7448_hpc2_restart,
         .calibrate_decr         = generic_calibrate_decr,
         .machine_check_exception= mpc7448_machine_check_exception,
diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
index 887b68804e6d..54e6b3b6f261 100644
--- a/arch/powerpc/platforms/iseries/Kconfig
+++ b/arch/powerpc/platforms/iseries/Kconfig
@@ -31,5 +31,5 @@ endmenu
 
 config VIOPATH
         bool
-        depends on VIOCONS || VIODASD || VIOCD || VIOTAPE || VETH
+        depends on VIOCONS || VIODASD || VIOCD || VIOTAPE || ISERIES_VETH
         default y
diff --git a/arch/powerpc/platforms/iseries/Makefile b/arch/powerpc/platforms/iseries/Makefile
index dee4eb4d8bec..13ac3015d91c 100644
--- a/arch/powerpc/platforms/iseries/Makefile
+++ b/arch/powerpc/platforms/iseries/Makefile
@@ -1,5 +1,7 @@
 EXTRA_CFLAGS    += -mno-minimal-toc
 
+extra-y += dt.o
+
 obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o dt_mod.o mf.o lpevents.o \
         hvcall.o proc.o htab.o iommu.o misc.o irq.o
 obj-$(CONFIG_PCI) += pci.o vpdinfo.o
@@ -7,5 +9,9 @@ obj-$(CONFIG_SMP) += smp.o
 obj-$(CONFIG_VIOPATH) += viopath.o
 obj-$(CONFIG_MODULES) += ksyms.o
 
+quiet_cmd_dt_strings = DT_STR  $@
+      cmd_dt_strings = $(OBJCOPY) --rename-section .rodata.str1.8=.dt_strings \
+                                $< $@
+
 $(obj)/dt_mod.o:        $(obj)/dt.o
-        @$(OBJCOPY) --rename-section .rodata.str1.8=.dt_strings $(obj)/dt.o $(obj)/dt_mod.o
+        $(call if_changed,dt_strings)
diff --git a/arch/powerpc/platforms/iseries/dt.c b/arch/powerpc/platforms/iseries/dt.c
index e305deee7f44..9e8a334a518a 100644
--- a/arch/powerpc/platforms/iseries/dt.c
+++ b/arch/powerpc/platforms/iseries/dt.c
@@ -41,6 +41,7 @@
 #include "call_pci.h"
 #include "pci.h"
 #include "it_exp_vpd_panel.h"
+#include "naca.h"
 
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)
@@ -205,13 +206,11 @@ static void __init dt_prop_u32(struct iseries_flat_dt *dt, const char *name,
         dt_prop(dt, name, &data, sizeof(u32));
 }
 
-#ifdef notyet
 static void __init dt_prop_u64(struct iseries_flat_dt *dt, const char *name,
                 u64 data)
 {
         dt_prop(dt, name, &data, sizeof(u64));
 }
-#endif
 
 static void __init dt_prop_u64_list(struct iseries_flat_dt *dt,
                 const char *name, u64 *data, int n)
@@ -306,6 +305,17 @@ static void __init dt_model(struct iseries_flat_dt *dt)
         dt_prop_u32(dt, "ibm,partition-no", HvLpConfig_getLpIndex());
 }
 
+static void __init dt_initrd(struct iseries_flat_dt *dt)
+{
+#ifdef CONFIG_BLK_DEV_INITRD
+        if (naca.xRamDisk) {
+                dt_prop_u64(dt, "linux,initrd-start", (u64)naca.xRamDisk);
+                dt_prop_u64(dt, "linux,initrd-end",
+                        (u64)naca.xRamDisk + naca.xRamDiskSize * HW_PAGE_SIZE);
+        }
+#endif
+}
+
 static void __init dt_do_vdevice(struct iseries_flat_dt *dt,
                 const char *name, u32 reg, int unit,
                 const char *type, const char *compat, int end)
@@ -641,6 +651,7 @@ void * __init build_flat_dt(unsigned long phys_mem_size)
         /* /chosen */
         dt_start_node(iseries_dt, "chosen");
         dt_prop_str(iseries_dt, "bootargs", cmd_line);
+        dt_initrd(iseries_dt);
         dt_end_node(iseries_dt);
 
         dt_cpus(iseries_dt);
diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c
index 218817d13c5c..d7a756d5135c 100644
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
@@ -27,6 +27,7 @@
 #include <linux/types.h>
 #include <linux/dma-mapping.h>
 #include <linux/list.h>
+#include <linux/pci.h>
 
 #include <asm/iommu.h>
 #include <asm/tce.h>
@@ -114,12 +115,10 @@ void iommu_table_getparms_iSeries(unsigned long busno,
 {
         struct iommu_table_cb *parms;
 
-        parms = kmalloc(sizeof(*parms), GFP_KERNEL);
+        parms = kzalloc(sizeof(*parms), GFP_KERNEL);
         if (parms == NULL)
                 panic("PCI_DMA: TCE Table Allocation failed.");
 
-        memset(parms, 0, sizeof(*parms));
-
         parms->itc_busno = busno;
         parms->itc_slotno = slotno;
         parms->itc_virtbus = virtbus;
@@ -168,7 +167,7 @@ static struct iommu_table *iommu_table_find(struct iommu_table * tbl)
 }
 
 
-void iommu_devnode_init_iSeries(struct device_node *dn)
+void iommu_devnode_init_iSeries(struct pci_dev *pdev, struct device_node *dn)
 {
         struct iommu_table *tbl;
         struct pci_dn *pdn = PCI_DN(dn);
@@ -186,19 +185,14 @@ void iommu_devnode_init_iSeries(struct device_node *dn)
                 pdn->iommu_table = iommu_init_table(tbl, -1);
         else
                 kfree(tbl);
+        pdev->dev.archdata.dma_data = pdn->iommu_table;
 }
 #endif
 
-static void iommu_dev_setup_iSeries(struct pci_dev *dev) { }
-static void iommu_bus_setup_iSeries(struct pci_bus *bus) { }
-
 void iommu_init_early_iSeries(void)
 {
         ppc_md.tce_build = tce_build_iSeries;
         ppc_md.tce_free  = tce_free_iSeries;
 
-        ppc_md.iommu_dev_setup = iommu_dev_setup_iSeries;
-        ppc_md.iommu_bus_setup = iommu_bus_setup_iSeries;
-
-        pci_iommu_init();
+        pci_dma_ops = &dma_iommu_ops;
 }
diff --git a/arch/powerpc/platforms/iseries/ksyms.c b/arch/powerpc/platforms/iseries/ksyms.c
index a2200842f4e5..2430848b98e7 100644
--- a/arch/powerpc/platforms/iseries/ksyms.c
+++ b/arch/powerpc/platforms/iseries/ksyms.c
@@ -19,9 +19,3 @@ EXPORT_SYMBOL(HvCall4);
 EXPORT_SYMBOL(HvCall5);
 EXPORT_SYMBOL(HvCall6);
 EXPORT_SYMBOL(HvCall7);
-
-#ifdef CONFIG_SMP
-EXPORT_SYMBOL(local_get_flags);
-EXPORT_SYMBOL(local_irq_disable);
-EXPORT_SYMBOL(local_irq_restore);
-#endif
diff --git a/arch/powerpc/platforms/iseries/lpevents.c b/arch/powerpc/platforms/iseries/lpevents.c
index e3e929e1b460..c1f4502a3c6a 100644
--- a/arch/powerpc/platforms/iseries/lpevents.c
+++ b/arch/powerpc/platforms/iseries/lpevents.c
@@ -17,6 +17,7 @@
 
 #include <asm/system.h>
 #include <asm/paca.h>
+#include <asm/firmware.h>
 #include <asm/iseries/it_lp_queue.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_event.h>
@@ -318,6 +319,9 @@ static int __init proc_lpevents_init(void)
 {
         struct proc_dir_entry *e;
 
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return 0;
+
         e = create_proc_entry("iSeries/lpevents", S_IFREG|S_IRUGO, NULL);
         if (e)
                 e->proc_fops = &proc_lpevents_operations;
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index b5737d68d6c4..1ad0e4aaad1a 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -38,6 +38,7 @@
 #include <asm/uaccess.h>
 #include <asm/paca.h>
 #include <asm/abs_addr.h>
+#include <asm/firmware.h>
 #include <asm/iseries/vio.h>
 #include <asm/iseries/mf.h>
 #include <asm/iseries/hv_lp_config.h>
@@ -1178,7 +1179,7 @@ static ssize_t proc_mf_change_vmlinux(struct file *file,
                                       const char __user *buf,
                                       size_t count, loff_t *ppos)
 {
-        struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
         ssize_t rc;
         dma_addr_t dma_addr;
         char *page;
@@ -1235,6 +1236,9 @@ static int __init mf_proc_init(void)
         char name[2];
         int i;
 
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return 0;
+
         mf_proc_root = proc_mkdir("iSeries/mf", NULL);
         if (!mf_proc_root)
                 return 1;
diff --git a/arch/powerpc/platforms/iseries/misc.S b/arch/powerpc/platforms/iseries/misc.S
index 7641fc7e550a..2c6ff0fdac98 100644
--- a/arch/powerpc/platforms/iseries/misc.S
+++ b/arch/powerpc/platforms/iseries/misc.S
@@ -19,39 +19,8 @@
 
         .text
 
-/* unsigned long local_save_flags(void) */
-_GLOBAL(local_get_flags)
-        lbz     r3,PACAPROCENABLED(r13)
-        blr
-
-/* unsigned long local_irq_disable(void) */
-_GLOBAL(local_irq_disable)
-        lbz     r3,PACAPROCENABLED(r13)
-        li      r4,0
-        stb     r4,PACAPROCENABLED(r13)
-        blr                     /* Done */
-
-/* void local_irq_restore(unsigned long flags) */
-_GLOBAL(local_irq_restore)
-        lbz     r5,PACAPROCENABLED(r13)
-         /* Check if things are setup the way we want _already_. */
-        cmpw    0,r3,r5
-        beqlr
-        /* are we enabling interrupts? */
-        cmpdi   0,r3,0
-        stb     r3,PACAPROCENABLED(r13)
-        beqlr
-        /* Check pending interrupts */
-        /*   A decrementer, IPI or PMC interrupt may have occurred
-         *   while we were in the hypervisor (which enables) */
-        ld      r4,PACALPPACAPTR(r13)
-        ld      r4,LPPACAANYINT(r4)
-        cmpdi   r4,0
-        beqlr
-
-        /*
-         * Handle pending interrupts in interrupt context
-         */
+/* Handle pending interrupts in interrupt context */
+_GLOBAL(iseries_handle_interrupts)
         li      r0,0x5555
         sc
         blr
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index 4aa165e010d9..4a06d9c34986 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -156,53 +156,6 @@ static void pci_Log_Error(char *Error_Text, int Bus, int SubBus,
 }
 
 /*
- * iSeries_pcibios_init
- *
- * Description:
- *   This function checks for all possible system PCI host bridges that connect
- *   PCI buses.  The system hypervisor is queried as to the guest partition
- *   ownership status.  A pci_controller is built for any bus which is partially
- *   owned or fully owned by this guest partition.
- */
-void iSeries_pcibios_init(void)
-{
-        struct pci_controller *phb;
-        struct device_node *root = of_find_node_by_path("/");
-        struct device_node *node = NULL;
-
-        if (root == NULL) {
-                printk(KERN_CRIT "iSeries_pcibios_init: can't find root "
-                                "of device tree\n");
-                return;
-        }
-        while ((node = of_get_next_child(root, node)) != NULL) {
-                HvBusNumber bus;
-                const u32 *busp;
-
-                if ((node->type == NULL) || (strcmp(node->type, "pci") != 0))
-                        continue;
-
-                busp = get_property(node, "bus-range", NULL);
-                if (busp == NULL)
-                        continue;
-                bus = *busp;
-                printk("bus %d appears to exist\n", bus);
-                phb = pcibios_alloc_controller(node);
-                if (phb == NULL)
-                        continue;
-
-                phb->pci_mem_offset = phb->local_number = bus;
-                phb->first_busno = bus;
-                phb->last_busno = bus;
-                phb->ops = &iSeries_pci_ops;
-        }
-
-        of_node_put(root);
-
-        pci_devs_phb_init();
-}
-
-/*
  * iSeries_pci_final_fixup(void)
  */
 void __init iSeries_pci_final_fixup(void)
@@ -253,7 +206,7 @@ void __init iSeries_pci_final_fixup(void)
                         PCI_DN(node)->pcidev = pdev;
                         allocate_device_bars(pdev);
                         iSeries_Device_Information(pdev, DeviceCount);
-                        iommu_devnode_init_iSeries(node);
+                        iommu_devnode_init_iSeries(pdev, node);
                 } else
                         printk("PCI: Device Tree not found for 0x%016lX\n",
                                         (unsigned long)pdev);
@@ -438,11 +391,7 @@ static inline struct device_node *xlate_iomm_address(
 /*
  * Read MM I/O Instructions for the iSeries
  * On MM I/O error, all ones are returned and iSeries_pci_IoError is cal
- * else, data is returned in big Endian format.
- *
- * iSeries_Read_Byte = Read Byte  ( 8 bit)
- * iSeries_Read_Word = Read Word  (16 bit)
- * iSeries_Read_Long = Read Long  (32 bit)
+ * else, data is returned in Big Endian format.
  */
 static u8 iSeries_Read_Byte(const volatile void __iomem *IoAddress)
 {
@@ -462,14 +411,15 @@ static u8 iSeries_Read_Byte(const volatile void __iomem *IoAddress)
                         num_printed = 0;
                 }
                 if (num_printed++ < 10)
-                        printk(KERN_ERR "iSeries_Read_Byte: invalid access at IO address %p\n", IoAddress);
+                        printk(KERN_ERR "iSeries_Read_Byte: invalid access at IO address %p\n",
+                               IoAddress);
                 return 0xff;
         }
         do {
                 HvCall3Ret16(HvCallPciBarLoad8, &ret, dsa, BarOffset, 0);
         } while (CheckReturnCode("RDB", DevNode, &retry, ret.rc) != 0);
 
-        return (u8)ret.value;
+        return ret.value;
 }
 
 static u16 iSeries_Read_Word(const volatile void __iomem *IoAddress)
@@ -490,7 +440,8 @@ static u16 iSeries_Read_Word(const volatile void __iomem *IoAddress)
                         num_printed = 0;
                 }
                 if (num_printed++ < 10)
-                        printk(KERN_ERR "iSeries_Read_Word: invalid access at IO address %p\n", IoAddress);
+                        printk(KERN_ERR "iSeries_Read_Word: invalid access at IO address %p\n",
+                               IoAddress);
                 return 0xffff;
         }
         do {
@@ -498,7 +449,7 @@ static u16 iSeries_Read_Word(const volatile void __iomem *IoAddress)
                                 BarOffset, 0);
         } while (CheckReturnCode("RDW", DevNode, &retry, ret.rc) != 0);
 
-        return swab16((u16)ret.value);
+        return ret.value;
 }
 
 static u32 iSeries_Read_Long(const volatile void __iomem *IoAddress)
@@ -519,7 +470,8 @@ static u32 iSeries_Read_Long(const volatile void __iomem *IoAddress)
                         num_printed = 0;
                 }
                 if (num_printed++ < 10)
-                        printk(KERN_ERR "iSeries_Read_Long: invalid access at IO address %p\n", IoAddress);
+                        printk(KERN_ERR "iSeries_Read_Long: invalid access at IO address %p\n",
+                               IoAddress);
                 return 0xffffffff;
         }
         do {
@@ -527,15 +479,12 @@ static u32 iSeries_Read_Long(const volatile void __iomem *IoAddress)
                                 BarOffset, 0);
         } while (CheckReturnCode("RDL", DevNode, &retry, ret.rc) != 0);
 
-        return swab32((u32)ret.value);
+        return ret.value;
 }
 
 /*
  * Write MM I/O Instructions for the iSeries
  *
- * iSeries_Write_Byte = Write Byte (8 bit)
- * iSeries_Write_Word = Write Word(16 bit)
- * iSeries_Write_Long = Write Long(32 bit)
  */
 static void iSeries_Write_Byte(u8 data, volatile void __iomem *IoAddress)
 {
@@ -581,11 +530,12 @@ static void iSeries_Write_Word(u16 data, volatile void __iomem *IoAddress)
                         num_printed = 0;
                 }
                 if (num_printed++ < 10)
-                        printk(KERN_ERR "iSeries_Write_Word: invalid access at IO address %p\n", IoAddress);
+                        printk(KERN_ERR "iSeries_Write_Word: invalid access at IO address %p\n",
+                               IoAddress);
                 return;
         }
         do {
-                rc = HvCall4(HvCallPciBarStore16, dsa, BarOffset, swab16(data), 0);
+                rc = HvCall4(HvCallPciBarStore16, dsa, BarOffset, data, 0);
         } while (CheckReturnCode("WWW", DevNode, &retry, rc) != 0);
 }
 
@@ -607,231 +557,221 @@ static void iSeries_Write_Long(u32 data, volatile void __iomem *IoAddress)
                         num_printed = 0;
                 }
                 if (num_printed++ < 10)
-                        printk(KERN_ERR "iSeries_Write_Long: invalid access at IO address %p\n", IoAddress);
+                        printk(KERN_ERR "iSeries_Write_Long: invalid access at IO address %p\n",
+                               IoAddress);
                 return;
         }
         do {
-                rc = HvCall4(HvCallPciBarStore32, dsa, BarOffset, swab32(data), 0);
+                rc = HvCall4(HvCallPciBarStore32, dsa, BarOffset, data, 0);
         } while (CheckReturnCode("WWL", DevNode, &retry, rc) != 0);
 }
 
-extern unsigned char __raw_readb(const volatile void __iomem *addr)
+static u8 iseries_readb(const volatile void __iomem *addr)
 {
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
-        return *(volatile unsigned char __force *)addr;
+        return iSeries_Read_Byte(addr);
 }
-EXPORT_SYMBOL(__raw_readb);
 
-extern unsigned short __raw_readw(const volatile void __iomem *addr)
+static u16 iseries_readw(const volatile void __iomem *addr)
 {
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
-        return *(volatile unsigned short __force *)addr;
+        return le16_to_cpu(iSeries_Read_Word(addr));
 }
-EXPORT_SYMBOL(__raw_readw);
 
-extern unsigned int __raw_readl(const volatile void __iomem *addr)
+static u32 iseries_readl(const volatile void __iomem *addr)
 {
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
-        return *(volatile unsigned int __force *)addr;
+        return le32_to_cpu(iSeries_Read_Long(addr));
 }
-EXPORT_SYMBOL(__raw_readl);
 
-extern unsigned long __raw_readq(const volatile void __iomem *addr)
+static u16 iseries_readw_be(const volatile void __iomem *addr)
 {
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
-        return *(volatile unsigned long __force *)addr;
+        return iSeries_Read_Word(addr);
 }
-EXPORT_SYMBOL(__raw_readq);
 
-extern void __raw_writeb(unsigned char v, volatile void __iomem *addr)
+static u32 iseries_readl_be(const volatile void __iomem *addr)
 {
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
-        *(volatile unsigned char __force *)addr = v;
+        return iSeries_Read_Long(addr);
 }
-EXPORT_SYMBOL(__raw_writeb);
 
-extern void __raw_writew(unsigned short v, volatile void __iomem *addr)
+static void iseries_writeb(u8 data, volatile void __iomem *addr)
 {
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
-        *(volatile unsigned short __force *)addr = v;
+        iSeries_Write_Byte(data, addr);
 }
-EXPORT_SYMBOL(__raw_writew);
 
-extern void __raw_writel(unsigned int v, volatile void __iomem *addr)
+static void iseries_writew(u16 data, volatile void __iomem *addr)
 {
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
-        *(volatile unsigned int __force *)addr = v;
+        iSeries_Write_Word(cpu_to_le16(data), addr);
 }
-EXPORT_SYMBOL(__raw_writel);
 
-extern void __raw_writeq(unsigned long v, volatile void __iomem *addr)
+static void iseries_writel(u32 data, volatile void __iomem *addr)
 {
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
-        *(volatile unsigned long __force *)addr = v;
+        iSeries_Write_Long(cpu_to_le32(data), addr);
 }
-EXPORT_SYMBOL(__raw_writeq);
 
-int in_8(const volatile unsigned char __iomem *addr)
+static void iseries_writew_be(u16 data, volatile void __iomem *addr)
 {
-        if (firmware_has_feature(FW_FEATURE_ISERIES))
-                return iSeries_Read_Byte(addr);
-        return __in_8(addr);
+        iSeries_Write_Word(data, addr);
 }
-EXPORT_SYMBOL(in_8);
 
-void out_8(volatile unsigned char __iomem *addr, int val)
+static void iseries_writel_be(u32 data, volatile void __iomem *addr)
 {
-        if (firmware_has_feature(FW_FEATURE_ISERIES))
-                iSeries_Write_Byte(val, addr);
-        else
-                __out_8(addr, val);
+        iSeries_Write_Long(data, addr);
 }
-EXPORT_SYMBOL(out_8);
 
-int in_le16(const volatile unsigned short __iomem *addr)
+static void iseries_readsb(const volatile void __iomem *addr, void *buf,
+                           unsigned long count)
 {
-        if (firmware_has_feature(FW_FEATURE_ISERIES))
-                return iSeries_Read_Word(addr);
-        return __in_le16(addr);
+        u8 *dst = buf;
+        while(count-- > 0)
+                *(dst++) = iSeries_Read_Byte(addr);
 }
-EXPORT_SYMBOL(in_le16);
 
-int in_be16(const volatile unsigned short __iomem *addr)
+static void iseries_readsw(const volatile void __iomem *addr, void *buf,
+                           unsigned long count)
 {
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
-        return __in_be16(addr);
+        u16 *dst = buf;
+        while(count-- > 0)
+                *(dst++) = iSeries_Read_Word(addr);
 }
-EXPORT_SYMBOL(in_be16);
 
-void out_le16(volatile unsigned short __iomem *addr, int val)
+static void iseries_readsl(const volatile void __iomem *addr, void *buf,
+                           unsigned long count)
 {
-        if (firmware_has_feature(FW_FEATURE_ISERIES))
-                iSeries_Write_Word(val, addr);
-        else
-                __out_le16(addr, val);
+        u32 *dst = buf;
+        while(count-- > 0)
+                *(dst++) = iSeries_Read_Long(addr);
 }
-EXPORT_SYMBOL(out_le16);
 
-void out_be16(volatile unsigned short __iomem *addr, int val)
+static void iseries_writesb(volatile void __iomem *addr, const void *buf,
+                            unsigned long count)
 {
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
-        __out_be16(addr, val);
+        const u8 *src = buf;
+        while(count-- > 0)
+                iSeries_Write_Byte(*(src++), addr);
 }
-EXPORT_SYMBOL(out_be16);
 
-unsigned in_le32(const volatile unsigned __iomem *addr)
+static void iseries_writesw(volatile void __iomem *addr, const void *buf,
+                            unsigned long count)
 {
-        if (firmware_has_feature(FW_FEATURE_ISERIES))
-                return iSeries_Read_Long(addr);
-        return __in_le32(addr);
+        const u16 *src = buf;
+        while(count-- > 0)
+                iSeries_Write_Word(*(src++), addr);
 }
-EXPORT_SYMBOL(in_le32);
 
-unsigned in_be32(const volatile unsigned __iomem *addr)
+static void iseries_writesl(volatile void __iomem *addr, const void *buf,
+                            unsigned long count)
 {
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
-        return __in_be32(addr);
+        const u32 *src = buf;
+        while(count-- > 0)
+                iSeries_Write_Long(*(src++), addr);
 }
-EXPORT_SYMBOL(in_be32);
 
-void out_le32(volatile unsigned __iomem *addr, int val)
+static void iseries_memset_io(volatile void __iomem *addr, int c,
+                              unsigned long n)
 {
-        if (firmware_has_feature(FW_FEATURE_ISERIES))
-                iSeries_Write_Long(val, addr);
-        else
-                __out_le32(addr, val);
-}
-EXPORT_SYMBOL(out_le32);
+        volatile char __iomem *d = addr;
 
-void out_be32(volatile unsigned __iomem *addr, int val)
-{
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
-
-        __out_be32(addr, val);
+        while (n-- > 0)
+                iSeries_Write_Byte(c, d++);
 }
-EXPORT_SYMBOL(out_be32);
 
-unsigned long in_le64(const volatile unsigned long __iomem *addr)
+static void iseries_memcpy_fromio(void *dest, const volatile void __iomem *src,
+                                  unsigned long n)
 {
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
+        char *d = dest;
+        const volatile char __iomem *s = src;
 
-        return __in_le64(addr);
+        while (n-- > 0)
+                *d++ = iSeries_Read_Byte(s++);
 }
-EXPORT_SYMBOL(in_le64);
 
-unsigned long in_be64(const volatile unsigned long __iomem *addr)
+static void iseries_memcpy_toio(volatile void __iomem *dest, const void *src,
+                                unsigned long n)
 {
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
+        const char *s = src;
+        volatile char __iomem *d = dest;
 
-        return __in_be64(addr);
+        while (n-- > 0)
+                iSeries_Write_Byte(*s++, d++);
 }
-EXPORT_SYMBOL(in_be64);
-
-void out_le64(volatile unsigned long __iomem *addr, unsigned long val)
-{
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
 
-        __out_le64(addr, val);
-}
-EXPORT_SYMBOL(out_le64);
+/* We only set MMIO ops. The default PIO ops will be default
+ * to the MMIO ops + pci_io_base which is 0 on iSeries as
+ * expected so both should work.
+ *
+ * Note that we don't implement the readq/writeq versions as
+ * I don't know of an HV call for doing so. Thus, the default
+ * operation will be used instead, which will fault a the value
+ * return by iSeries for MMIO addresses always hits a non mapped
+ * area. This is as good as the BUG() we used to have there.
+ */
+static struct ppc_pci_io __initdata iseries_pci_io = {
+        .readb = iseries_readb,
+        .readw = iseries_readw,
+        .readl = iseries_readl,
+        .readw_be = iseries_readw_be,
+        .readl_be = iseries_readl_be,
+        .writeb = iseries_writeb,
+        .writew = iseries_writew,
+        .writel = iseries_writel,
+        .writew_be = iseries_writew_be,
+        .writel_be = iseries_writel_be,
+        .readsb = iseries_readsb,
+        .readsw = iseries_readsw,
+        .readsl = iseries_readsl,
+        .writesb = iseries_writesb,
+        .writesw = iseries_writesw,
+        .writesl = iseries_writesl,
+        .memset_io = iseries_memset_io,
+        .memcpy_fromio = iseries_memcpy_fromio,
+        .memcpy_toio = iseries_memcpy_toio,
+};
 
-void out_be64(volatile unsigned long __iomem *addr, unsigned long val)
+/*
+ * iSeries_pcibios_init
+ *
+ * Description:
+ *   This function checks for all possible system PCI host bridges that connect
+ *   PCI buses.  The system hypervisor is queried as to the guest partition
+ *   ownership status.  A pci_controller is built for any bus which is partially
+ *   owned or fully owned by this guest partition.
+ */
+void __init iSeries_pcibios_init(void)
 {
-        BUG_ON(firmware_has_feature(FW_FEATURE_ISERIES));
+        struct pci_controller *phb;
+        struct device_node *root = of_find_node_by_path("/");
+        struct device_node *node = NULL;
 
-        __out_be64(addr, val);
-}
-EXPORT_SYMBOL(out_be64);
+        /* Install IO hooks */
+        ppc_pci_io = iseries_pci_io;
 
-void memset_io(volatile void __iomem *addr, int c, unsigned long n)
-{
-        if (firmware_has_feature(FW_FEATURE_ISERIES)) {
-                volatile char __iomem *d = addr;
+        if (root == NULL) {
+                printk(KERN_CRIT "iSeries_pcibios_init: can't find root "
+                                "of device tree\n");
+                return;
+        }
+        while ((node = of_get_next_child(root, node)) != NULL) {
+                HvBusNumber bus;
+                const u32 *busp;
 
-                while (n-- > 0) {
-                        iSeries_Write_Byte(c, d++);
-                }
-        } else
-                eeh_memset_io(addr, c, n);
-}
-EXPORT_SYMBOL(memset_io);
+                if ((node->type == NULL) || (strcmp(node->type, "pci") != 0))
+                        continue;
 
-void memcpy_fromio(void *dest, const volatile void __iomem *src,
-                                 unsigned long n)
-{
-        if (firmware_has_feature(FW_FEATURE_ISERIES)) {
-                char *d = dest;
-                const volatile char __iomem *s = src;
+                busp = get_property(node, "bus-range", NULL);
+                if (busp == NULL)
+                        continue;
+                bus = *busp;
+                printk("bus %d appears to exist\n", bus);
+                phb = pcibios_alloc_controller(node);
+                if (phb == NULL)
+                        continue;
 
-                while (n-- > 0) {
-                        *d++ = iSeries_Read_Byte(s++);
-                }
-        } else
-                eeh_memcpy_fromio(dest, src, n);
-}
-EXPORT_SYMBOL(memcpy_fromio);
+                phb->pci_mem_offset = phb->local_number = bus;
+                phb->first_busno = bus;
+                phb->last_busno = bus;
+                phb->ops = &iSeries_pci_ops;
+        }
 
-void memcpy_toio(volatile void __iomem *dest, const void *src, unsigned long n)
-{
-        if (firmware_has_feature(FW_FEATURE_ISERIES)) {
-                const char *s = src;
-                volatile char __iomem *d = dest;
+        of_node_put(root);
 
-                while (n-- > 0) {
-                        iSeries_Write_Byte(*s++, d++);
-                }
-        } else
-                eeh_memcpy_toio(dest, src, n);
+        pci_devs_phb_init();
 }
-EXPORT_SYMBOL(memcpy_toio);
+
diff --git a/arch/powerpc/platforms/iseries/proc.c b/arch/powerpc/platforms/iseries/proc.c
index c241413629ac..b54e37101e69 100644
--- a/arch/powerpc/platforms/iseries/proc.c
+++ b/arch/powerpc/platforms/iseries/proc.c
@@ -24,6 +24,7 @@
 #include <asm/processor.h>
 #include <asm/time.h>
 #include <asm/lppaca.h>
+#include <asm/firmware.h>
 #include <asm/iseries/hv_call_xm.h>
 
 #include "processor_vpd.h"
@@ -31,7 +32,12 @@
 
 static int __init iseries_proc_create(void)
 {
-        struct proc_dir_entry *e = proc_mkdir("iSeries", 0);
+        struct proc_dir_entry *e;
+
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return 0;
+
+        e = proc_mkdir("iSeries", 0);
         if (!e)
                 return 1;
 
@@ -106,6 +112,9 @@ static int __init iseries_proc_init(void)
 {
         struct proc_dir_entry *e;
 
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return 0;
+
         e = create_proc_entry("iSeries/titanTod", S_IFREG|S_IRUGO, NULL);
         if (e)
                 e->proc_fops = &proc_titantod_operations;
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 6f73469fd3b0..cce7e309340c 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -21,7 +21,6 @@
 #include <linux/smp.h>
 #include <linux/param.h>
 #include <linux/string.h>
-#include <linux/initrd.h>
 #include <linux/seq_file.h>
 #include <linux/kdev_t.h>
 #include <linux/major.h>
@@ -80,8 +79,6 @@ extern void iSeries_pci_final_fixup(void);
 static void iSeries_pci_final_fixup(void) { }
 #endif
 
-extern int rd_size;             /* Defined in drivers/block/rd.c */
-
 extern unsigned long iSeries_recal_tb;
 extern unsigned long iSeries_recal_titan;
 
@@ -295,24 +292,6 @@ static void __init iSeries_init_early(void)
 {
         DBG(" -> iSeries_init_early()\n");
 
-#if defined(CONFIG_BLK_DEV_INITRD)
-        /*
-         * If the init RAM disk has been configured and there is
-         * a non-zero starting address for it, set it up
-         */
-        if (naca.xRamDisk) {
-                initrd_start = (unsigned long)__va(naca.xRamDisk);
-                initrd_end = initrd_start + naca.xRamDiskSize * HW_PAGE_SIZE;
-                initrd_below_start_ok = 1;      // ramdisk in kernel space
-                ROOT_DEV = Root_RAM0;
-                if (((rd_size * 1024) / HW_PAGE_SIZE) < naca.xRamDiskSize)
-                        rd_size = (naca.xRamDiskSize * HW_PAGE_SIZE) / 1024;
-        } else
-#endif /* CONFIG_BLK_DEV_INITRD */
-        {
-            /* ROOT_DEV = MKDEV(VIODASD_MAJOR, 1); */
-        }
-
         iSeries_recal_tb = get_tb();
         iSeries_recal_titan = HvCallXm_loadTod();
 
@@ -331,17 +310,6 @@ static void __init iSeries_init_early(void)
 
         mf_init();
 
-        /* If we were passed an initrd, set the ROOT_DEV properly if the values
-         * look sensible. If not, clear initrd reference.
-         */
-#ifdef CONFIG_BLK_DEV_INITRD
-        if (initrd_start >= KERNELBASE && initrd_end >= KERNELBASE &&
-            initrd_end > initrd_start)
-                ROOT_DEV = Root_RAM0;
-        else
-                initrd_start = initrd_end = 0;
-#endif /* CONFIG_BLK_DEV_INITRD */
-
         DBG(" <- iSeries_init_early()\n");
 }
 
@@ -559,7 +527,8 @@ static void __init iSeries_fixup_klimit(void)
 static int __init iSeries_src_init(void)
 {
         /* clear the progress line */
-        ppc_md.progress(" ", 0xffff);
+        if (firmware_has_feature(FW_FEATURE_ISERIES))
+                ppc_md.progress(" ", 0xffff);
         return 0;
 }
 
@@ -649,6 +618,16 @@ static void iseries_dedicated_idle(void)
 void __init iSeries_init_IRQ(void) { }
 #endif
 
+static void __iomem *iseries_ioremap(phys_addr_t address, unsigned long size,
+                                     unsigned long flags)
+{
+        return (void __iomem *)address;
+}
+
+static void iseries_iounmap(volatile void __iomem *token)
+{
+}
+
 /*
  * iSeries has no legacy IO, anything calling this function has to
  * fail or bad things will happen
@@ -665,6 +644,8 @@ static int __init iseries_probe(void)
                 return 0;
 
         hpte_init_iSeries();
+        /* iSeries does not support 16M pages */
+        cur_cpu_spec->cpu_features &= ~CPU_FTR_16M_PAGE;
 
         return 1;
 }
@@ -687,6 +668,8 @@ define_machine(iseries) {
         .progress       = iSeries_progress,
         .probe          = iseries_probe,
         .check_legacy_ioport    = iseries_check_legacy_ioport,
+        .ioremap        = iseries_ioremap,
+        .iounmap        = iseries_iounmap,
         /* XXX Implement enable_pmcs for iSeries */
 };
 
@@ -697,7 +680,7 @@ void * __init iSeries_early_setup(void)
         /* Identify CPU type. This is done again by the common code later
          * on but calling this function multiple times is fine.
          */
-        identify_cpu(0);
+        identify_cpu(0, mfspr(SPRN_PVR));
 
         powerpc_firmware_features |= FW_FEATURE_ISERIES;
         powerpc_firmware_features |= FW_FEATURE_LPAR;
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index 04e07e5da0c1..a6799ed34a66 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -42,6 +42,7 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/prom.h>
+#include <asm/firmware.h>
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_lp_config.h>
@@ -119,10 +120,9 @@ static int proc_viopath_show(struct seq_file *m, void *v)
         struct device_node *node;
         const char *sysid;
 
-        buf = kmalloc(HW_PAGE_SIZE, GFP_KERNEL);
+        buf = kzalloc(HW_PAGE_SIZE, GFP_KERNEL);
         if (!buf)
                 return 0;
-        memset(buf, 0, HW_PAGE_SIZE);
 
         handle = dma_map_single(iSeries_vio_dev, buf, HW_PAGE_SIZE,
                                 DMA_FROM_DEVICE);
@@ -184,6 +184,9 @@ static int __init vio_proc_init(void)
 {
         struct proc_dir_entry *e;
 
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return 0;
+
         e = create_proc_entry("iSeries/config", 0, NULL);
         if (e)
                 e->proc_fops = &proc_viopath_operations;
diff --git a/arch/powerpc/platforms/maple/maple.h b/arch/powerpc/platforms/maple/maple.h
index 0657c579b840..c6911ddc479f 100644
--- a/arch/powerpc/platforms/maple/maple.h
+++ b/arch/powerpc/platforms/maple/maple.h
@@ -8,5 +8,5 @@ extern void maple_get_rtc_time(struct rtc_time *tm);
 extern unsigned long maple_get_boot_time(void);
 extern void maple_calibrate_decr(void);
 extern void maple_pci_init(void);
-extern void maple_pcibios_fixup(void);
+extern void maple_pci_irq_fixup(struct pci_dev *dev);
 extern int maple_pci_get_legacy_ide_irq(struct pci_dev *dev, int channel);
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 63b4d1bff359..3f6a69f67195 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -502,38 +502,29 @@ static int __init add_bridge(struct device_node *dev)
 }
 
 
-void __init maple_pcibios_fixup(void)
+void __devinit maple_pci_irq_fixup(struct pci_dev *dev)
 {
-        struct pci_dev *dev = NULL;
-
-        DBG(" -> maple_pcibios_fixup\n");
-
-        for_each_pci_dev(dev) {
-                /* Fixup IRQ for PCIe host */
-                if (u4_pcie != NULL && dev->bus->number == 0 &&
-                    pci_bus_to_host(dev->bus) == u4_pcie) {
-                        printk(KERN_DEBUG "Fixup U4 PCIe IRQ\n");
-                        dev->irq = irq_create_mapping(NULL, 1);
-                        if (dev->irq != NO_IRQ)
-                                set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
-                        continue;
-                }
-
-                /* Hide AMD8111 IDE interrupt when in legacy mode so
-                 * the driver calls pci_get_legacy_ide_irq()
-                 */
-                if (dev->vendor == PCI_VENDOR_ID_AMD &&
-                    dev->device == PCI_DEVICE_ID_AMD_8111_IDE &&
-                    (dev->class & 5) != 5) {
-                        dev->irq = NO_IRQ;
-                        continue;
-                }
+        DBG(" -> maple_pci_irq_fixup\n");
+
+        /* Fixup IRQ for PCIe host */
+        if (u4_pcie != NULL && dev->bus->number == 0 &&
+            pci_bus_to_host(dev->bus) == u4_pcie) {
+                printk(KERN_DEBUG "Fixup U4 PCIe IRQ\n");
+                dev->irq = irq_create_mapping(NULL, 1);
+                if (dev->irq != NO_IRQ)
+                        set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
+        }
 
-                /* For all others, map the interrupt from the device-tree */
-                pci_read_irq_line(dev);
+        /* Hide AMD8111 IDE interrupt when in legacy mode so
+         * the driver calls pci_get_legacy_ide_irq()
+         */
+        if (dev->vendor == PCI_VENDOR_ID_AMD &&
+            dev->device == PCI_DEVICE_ID_AMD_8111_IDE &&
+            (dev->class & 5) != 5) {
+                dev->irq = NO_IRQ;
         }
 
-        DBG(" <- maple_pcibios_fixup\n");
+        DBG(" <- maple_pci_irq_fixup\n");
 }
 
 static void __init maple_fixup_phb_resources(void)
@@ -571,7 +562,7 @@ void __init maple_pci_init(void)
         for (np = NULL; (np = of_get_next_child(root, np)) != NULL;) {
                 if (np->name == NULL)
                         continue;
-                if (strcmp(np->name, "pci") == 0) {
+                if (!strcmp(np->name, "pci") || !strcmp(np->name, "pcie")) {
                         if (add_bridge(np) == 0)
                                 of_node_get(np);
                 }
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index fe6b9bff61b9..50855d4fd5a0 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -60,6 +60,7 @@
 #include <asm/of_device.h>
 #include <asm/lmb.h>
 #include <asm/mpic.h>
+#include <asm/rtas.h>
 #include <asm/udbg.h>
 
 #include "maple.h"
@@ -166,6 +167,16 @@ struct smp_ops_t maple_smp_ops = {
 };
 #endif /* CONFIG_SMP */
 
+static void __init maple_use_rtas_reboot_and_halt_if_present(void)
+{
+        if (rtas_service_present("system-reboot") &&
+            rtas_service_present("power-off")) {
+                ppc_md.restart = rtas_restart;
+                ppc_md.power_off = rtas_power_off;
+                ppc_md.halt = rtas_halt;
+        }
+}
+
 void __init maple_setup_arch(void)
 {
         /* init to some ~sane value until calibrate_delay() runs */
@@ -181,6 +192,7 @@ void __init maple_setup_arch(void)
 #ifdef CONFIG_DUMMY_CONSOLE
         conswitchp = &dummy_con;
 #endif
+        maple_use_rtas_reboot_and_halt_if_present();
 
         printk(KERN_DEBUG "Using native/NAP idle loop\n");
 }
@@ -242,7 +254,6 @@ static void __init maple_init_IRQ(void)
                 printk(KERN_DEBUG "OpenPIC addr: %lx, has ISUs: %d\n",
                        openpic_addr, has_isus);
         }
-        of_node_put(root);
 
         BUG_ON(openpic_addr == 0);
 
@@ -312,7 +323,7 @@ define_machine(maple_md) {
         .setup_arch             = maple_setup_arch,
         .init_early             = maple_init_early,
         .init_IRQ               = maple_init_IRQ,
-        .pcibios_fixup          = maple_pcibios_fixup,
+        .pci_irq_fixup          = maple_pci_irq_fixup,
         .pci_get_legacy_ide_irq = maple_pci_get_legacy_ide_irq,
         .restart                = maple_restart,
         .power_off              = maple_power_off,
diff --git a/arch/powerpc/platforms/pasemi/pasemi.h b/arch/powerpc/platforms/pasemi/pasemi.h
index fd71d72736b2..51c2a2397ecf 100644
--- a/arch/powerpc/platforms/pasemi/pasemi.h
+++ b/arch/powerpc/platforms/pasemi/pasemi.h
@@ -3,6 +3,5 @@
 
 extern unsigned long pas_get_boot_time(void);
 extern void pas_pci_init(void);
-extern void pas_pcibios_fixup(void);
 
 #endif /* _PASEMI_PASEMI_H */
diff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c
index 39020c1fa13d..faa618e04047 100644
--- a/arch/powerpc/platforms/pasemi/pci.c
+++ b/arch/powerpc/platforms/pasemi/pci.c
@@ -148,14 +148,6 @@ static int __init add_bridge(struct device_node *dev)
 }
 
 
-void __init pas_pcibios_fixup(void)
-{
-        struct pci_dev *dev = NULL;
-
-        for_each_pci_dev(dev)
-                pci_read_irq_line(dev);
-}
-
 static void __init pas_fixup_phb_resources(void)
 {
         struct pci_controller *hose, *tmp;
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
index 106896c3b60a..bea7d1bb1a3b 100644
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -26,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/console.h>
+#include <linux/pci.h>
 
 #include <asm/prom.h>
 #include <asm/system.h>
@@ -71,6 +72,9 @@ void __init pas_setup_arch(void)
         /* Setup SMP callback */
         smp_ops = &pas_smp_ops;
 #endif
+        /* no iommu yet */
+        pci_dma_ops = &dma_direct_ops;
+
         /* Lookup PCI hosts */
         pas_pci_init();
 
@@ -81,17 +85,6 @@ void __init pas_setup_arch(void)
         printk(KERN_DEBUG "Using default idle loop\n");
 }
 
-static void iommu_dev_setup_null(struct pci_dev *dev) { }
-static void iommu_bus_setup_null(struct pci_bus *bus) { }
-
-static void __init pas_init_early(void)
-{
-        /* No iommu code yet */
-        ppc_md.iommu_dev_setup = iommu_dev_setup_null;
-        ppc_md.iommu_bus_setup = iommu_bus_setup_null;
-        pci_direct_iommu_init();
-}
-
 /* No legacy IO on our parts */
 static int pas_check_legacy_ioport(unsigned int baseport)
 {
@@ -136,7 +129,6 @@ static __init void pas_init_IRQ(void)
         }
         openpic_addr = of_read_number(opprop, naddr);
         printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr);
-        of_node_put(root);
 
         mpic = mpic_alloc(mpic_node, openpic_addr, MPIC_PRIMARY, 0, 0,
                           " PAS-OPIC  ");
@@ -173,10 +165,8 @@ define_machine(pas) {
         .name                   = "PA Semi PA6T-1682M",
         .probe                  = pas_probe,
         .setup_arch             = pas_setup_arch,
-        .init_early             = pas_init_early,
         .init_IRQ               = pas_init_IRQ,
         .get_irq                = mpic_get_irq,
-        .pcibios_fixup          = pas_pcibios_fixup,
         .restart                = pas_restart,
         .power_off              = pas_power_off,
         .halt                   = pas_halt,
diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
index afa593a8544a..c3a89414ddc0 100644
--- a/arch/powerpc/platforms/powermac/backlight.c
+++ b/arch/powerpc/platforms/powermac/backlight.c
@@ -18,11 +18,11 @@
 
 #define OLD_BACKLIGHT_MAX 15
 
-static void pmac_backlight_key_worker(void *data);
-static void pmac_backlight_set_legacy_worker(void *data);
+static void pmac_backlight_key_worker(struct work_struct *work);
+static void pmac_backlight_set_legacy_worker(struct work_struct *work);
 
-static DECLARE_WORK(pmac_backlight_key_work, pmac_backlight_key_worker, NULL);
-static DECLARE_WORK(pmac_backlight_set_legacy_work, pmac_backlight_set_legacy_worker, NULL);
+static DECLARE_WORK(pmac_backlight_key_work, pmac_backlight_key_worker);
+static DECLARE_WORK(pmac_backlight_set_legacy_work, pmac_backlight_set_legacy_worker);
 
 /* Although these variables are used in interrupt context, it makes no sense to
  * protect them. No user is able to produce enough key events per second and
@@ -94,7 +94,7 @@ int pmac_backlight_curve_lookup(struct fb_info *info, int value)
         return level;
 }
 
-static void pmac_backlight_key_worker(void *data)
+static void pmac_backlight_key_worker(struct work_struct *work)
 {
         if (atomic_read(&kernel_backlight_disabled))
                 return;
@@ -166,7 +166,7 @@ static int __pmac_backlight_set_legacy_brightness(int brightness)
         return error;
 }
 
-static void pmac_backlight_set_legacy_worker(void *data)
+static void pmac_backlight_set_legacy_worker(struct work_struct *work)
 {
         if (atomic_read(&kernel_backlight_disabled))
                 return;
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index e49621be6640..c29a6a064d22 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -486,10 +486,6 @@ static long heathrow_sound_enable(struct device_node *node, long param,
 
 static u32 save_fcr[6];
 static u32 save_mbcr;
-static u32 save_gpio_levels[2];
-static u8 save_gpio_extint[KEYLARGO_GPIO_EXTINT_CNT];
-static u8 save_gpio_normal[KEYLARGO_GPIO_CNT];
-static u32 save_unin_clock_ctl;
 static struct dbdma_regs save_dbdma[13];
 static struct dbdma_regs save_alt_dbdma[13];
 
@@ -1548,6 +1544,10 @@ void g5_phy_disable_cpu1(void)
 
 
 #ifdef CONFIG_PM
+static u32 save_gpio_levels[2];
+static u8 save_gpio_extint[KEYLARGO_GPIO_EXTINT_CNT];
+static u8 save_gpio_normal[KEYLARGO_GPIO_CNT];
+static u32 save_unin_clock_ctl;
 
 static void keylargo_shutdown(struct macio_chip *macio, int sleep_mode)
 {
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 9923adc5248e..f42475b27c15 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];
@@ -985,30 +984,23 @@ static int __init add_bridge(struct device_node *dev)
         return 0;
 }
 
-void __init pmac_pcibios_fixup(void)
+void __devinit pmac_pci_irq_fixup(struct pci_dev *dev)
 {
-        struct pci_dev* dev = NULL;
-
-        for_each_pci_dev(dev) {
-                /* Read interrupt from the device-tree */
-                pci_read_irq_line(dev);
-
 #ifdef CONFIG_PPC32
-                /* Fixup interrupt for the modem/ethernet combo controller.
-                 * on machines with a second ohare chip.
-                 * The number in the device tree (27) is bogus (correct for
-                 * the ethernet-only board but not the combo ethernet/modem
-                 * board). The real interrupt is 28 on the second controller
-                 * -> 28+32 = 60.
-                 */
-                if (has_second_ohare &&
-                    dev->vendor == PCI_VENDOR_ID_DEC &&
-                    dev->device == PCI_DEVICE_ID_DEC_TULIP_PLUS) {
-                        dev->irq = irq_create_mapping(NULL, 60);
-                        set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
-                }
-#endif /* CONFIG_PPC32 */
+        /* Fixup interrupt for the modem/ethernet combo controller.
+         * on machines with a second ohare chip.
+         * The number in the device tree (27) is bogus (correct for
+         * the ethernet-only board but not the combo ethernet/modem
+         * board). The real interrupt is 28 on the second controller
+         * -> 28+32 = 60.
+         */
+        if (has_second_ohare &&
+            dev->vendor == PCI_VENDOR_ID_DEC &&
+            dev->device == PCI_DEVICE_ID_DEC_TULIP_PLUS) {
+                dev->irq = irq_create_mapping(NULL, 60);
+                set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
         }
+#endif /* CONFIG_PPC32 */
 }
 
 #ifdef CONFIG_PPC64
diff --git a/arch/powerpc/platforms/powermac/pmac.h b/arch/powerpc/platforms/powermac/pmac.h
index 94e7b24b840b..6e090a7dea83 100644
--- a/arch/powerpc/platforms/powermac/pmac.h
+++ b/arch/powerpc/platforms/powermac/pmac.h
@@ -20,7 +20,7 @@ extern void pmac_get_rtc_time(struct rtc_time *);
 extern int pmac_set_rtc_time(struct rtc_time *);
 extern void pmac_read_rtc_time(void);
 extern void pmac_calibrate_decr(void);
-extern void pmac_pcibios_fixup(void);
+extern void pmac_pci_irq_fixup(struct pci_dev *);
 extern void pmac_pci_init(void);
 extern unsigned long pmac_ide_get_base(int index);
 extern void pmac_ide_init_hwif_ports(hw_regs_t *hw,
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 824a618396ab..d949e9df41ef 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -70,6 +70,7 @@
 #include <asm/pmac_feature.h>
 #include <asm/time.h>
 #include <asm/of_device.h>
+#include <asm/of_platform.h>
 #include <asm/mmu_context.h>
 #include <asm/iommu.h>
 #include <asm/smu.h>
@@ -361,7 +362,7 @@ char *bootdevice;
 void *boot_host;
 int boot_target;
 int boot_part;
-extern dev_t boot_dev;
+static dev_t boot_dev;
 
 #ifdef CONFIG_SCSI
 void __init note_scsi_host(struct device_node *node, void *host)
@@ -676,8 +677,6 @@ static int __init pmac_probe(void)
 
 #ifdef CONFIG_PPC32
         /* isa_io_base gets set in pmac_pci_init */
-        isa_mem_base = PMAC_ISA_MEM_BASE;
-        pci_dram_offset = PMAC_PCI_DRAM_OFFSET;
         ISA_DMA_THRESHOLD = ~0L;
         DMA_MODE_READ = 1;
         DMA_MODE_WRITE = 2;
@@ -727,7 +726,7 @@ define_machine(powermac) {
         .show_cpuinfo           = pmac_show_cpuinfo,
         .init_IRQ               = pmac_pic_init,
         .get_irq                = NULL, /* changed later */
-        .pcibios_fixup          = pmac_pcibios_fixup,
+        .pci_irq_fixup          = pmac_pci_irq_fixup,
         .restart                = pmac_restart,
         .power_off              = pmac_power_off,
         .halt                   = pmac_halt,
diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
new file mode 100644
index 000000000000..de52ec4e9e58
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/Kconfig
@@ -0,0 +1,54 @@
+menu "PS3 Platform Options"
+        depends on PPC_PS3
+
+config PS3_HTAB_SIZE
+        depends on PPC_PS3
+        int "PS3 Platform pagetable size"
+        range 18 20
+        default 20
+        help
+          This option is only for experts who may have the desire to fine
+          tune the pagetable size on their system.  The value here is
+          expressed as the log2 of the page table size.  Valid values are
+          18, 19, and 20, corresponding to 256KB, 512KB and 1MB respectively.
+
+          If unsure, choose the default (20) with the confidence that your
+          system will have optimal runtime performance.
+
+config PS3_DYNAMIC_DMA
+        depends on PPC_PS3 && EXPERIMENTAL
+        bool "PS3 Platform dynamic DMA page table management"
+        default n
+        help
+          This option will enable kernel support to take advantage of the
+          per device dynamic DMA page table management provided by the Cell
+          processor's IO Controller.  This support incurs some runtime
+          overhead and also slightly increases kernel memory usage.  The
+          current implementation should be considered experimental.
+
+          This support is mainly for Linux kernel development.  If unsure,
+          say N.
+
+config PS3_USE_LPAR_ADDR
+        depends on PPC_PS3 && EXPERIMENTAL
+        bool "PS3 use lpar address space"
+        default y
+        help
+          This option is solely for experimentation by experts.  Disables
+          translation of lpar addresses.  SPE support currently won't work
+          without this set to y.
+
+          If you have any doubt, choose the default y.
+
+config PS3_VUART
+        depends on PPC_PS3
+        bool "PS3 Virtual UART support"
+        default y
+        help
+          Include support for the PS3 Virtual UART.
+
+          This support is required for several system services
+          including the System Manager and AV Settings.  In
+          general, all users will say Y.
+
+endmenu
diff --git a/arch/powerpc/platforms/ps3/Makefile b/arch/powerpc/platforms/ps3/Makefile
new file mode 100644
index 000000000000..3757cfabc8ce
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/Makefile
@@ -0,0 +1,4 @@
+obj-y += setup.o mm.o smp.o time.o hvcall.o htab.o repository.o
+obj-y += interrupt.o exports.o os-area.o
+
+obj-$(CONFIG_SPU_BASE) += spu.o
diff --git a/arch/powerpc/platforms/ps3/exports.c b/arch/powerpc/platforms/ps3/exports.c
new file mode 100644
index 000000000000..a7e8ffd24a65
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/exports.c
@@ -0,0 +1,27 @@
+/*
+ *  PS3 hvcall exports for modules.
+ *
+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
+ *  Copyright 2006 Sony Corp.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/module.h>
+
+#define LV1_CALL(name, in, out, num)                          \
+  extern s64 _lv1_##name(LV1_##in##_IN_##out##_OUT_ARG_DECL); \
+  EXPORT_SYMBOL(_lv1_##name);
+
+#include <asm/lv1call.h>
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c
new file mode 100644
index 000000000000..8fe1769655a3
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/htab.c
@@ -0,0 +1,277 @@
+/*
+ *  PS3 pagetable management routines.
+ *
+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
+ *  Copyright 2006 Sony Corp.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+
+#include <asm/machdep.h>
+#include <asm/lmb.h>
+#include <asm/udbg.h>
+#include <asm/ps3.h>
+#include <asm/lv1call.h>
+
+#include "platform.h"
+
+#if defined(DEBUG)
+#define DBG(fmt...) udbg_printf(fmt)
+#else
+#define DBG(fmt...) do{if(0)printk(fmt);}while(0)
+#endif
+
+static hpte_t *htab;
+static unsigned long htab_addr;
+static unsigned char *bolttab;
+static unsigned char *inusetab;
+
+static spinlock_t ps3_bolttab_lock = SPIN_LOCK_UNLOCKED;
+
+#define debug_dump_hpte(_a, _b, _c, _d, _e, _f, _g) \
+        _debug_dump_hpte(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__)
+static void _debug_dump_hpte(unsigned long pa, unsigned long va,
+        unsigned long group, unsigned long bitmap, hpte_t lhpte, int psize,
+        unsigned long slot, const char* func, int line)
+{
+        DBG("%s:%d: pa     = %lxh\n", func, line, pa);
+        DBG("%s:%d: lpar   = %lxh\n", func, line,
+                ps3_mm_phys_to_lpar(pa));
+        DBG("%s:%d: va     = %lxh\n", func, line, va);
+        DBG("%s:%d: group  = %lxh\n", func, line, group);
+        DBG("%s:%d: bitmap = %lxh\n", func, line, bitmap);
+        DBG("%s:%d: hpte.v = %lxh\n", func, line, lhpte.v);
+        DBG("%s:%d: hpte.r = %lxh\n", func, line, lhpte.r);
+        DBG("%s:%d: psize  = %xh\n", func, line, psize);
+        DBG("%s:%d: slot   = %lxh\n", func, line, slot);
+}
+
+static long ps3_hpte_insert(unsigned long hpte_group, unsigned long va,
+        unsigned long pa, unsigned long rflags, unsigned long vflags, int psize)
+{
+        unsigned long slot;
+        hpte_t lhpte;
+        int secondary = 0;
+        unsigned long result;
+        unsigned long bitmap;
+        unsigned long flags;
+        unsigned long p_pteg, s_pteg, b_index, b_mask, cb, ci;
+
+        vflags &= ~HPTE_V_SECONDARY; /* this bit is ignored */
+
+        lhpte.v = hpte_encode_v(va, psize) | vflags | HPTE_V_VALID;
+        lhpte.r = hpte_encode_r(ps3_mm_phys_to_lpar(pa), psize) | rflags;
+
+        p_pteg = hpte_group / HPTES_PER_GROUP;
+        s_pteg = ~p_pteg & htab_hash_mask;
+
+        spin_lock_irqsave(&ps3_bolttab_lock, flags);
+
+        BUG_ON(bolttab[p_pteg] == 0xff && bolttab[s_pteg] == 0xff);
+
+        bitmap = (inusetab[p_pteg] << 8) | inusetab[s_pteg];
+
+        if (bitmap == 0xffff) {
+                /*
+                 * PTEG is full. Search for victim.
+                 */
+                bitmap &= ~((bolttab[p_pteg] << 8) | bolttab[s_pteg]);
+                do {
+                        ci = mftb() & 15;
+                        cb = 0x8000UL >> ci;
+                } while ((cb & bitmap) == 0);
+        } else {
+                /*
+                 * search free slot in hardware order
+                 *      [primary]       0, 2, 4, 6, 1, 3, 5, 7
+                 *      [secondary]     0, 2, 4, 6, 1, 3, 5, 7
+                 */
+                for (ci = 0; ci < HPTES_PER_GROUP; ci += 2) {
+                        cb = 0x8000UL >> ci;
+                        if ((cb & bitmap) == 0)
+                                goto found;
+                }
+                for (ci = 1; ci < HPTES_PER_GROUP; ci += 2) {
+                        cb = 0x8000UL >> ci;
+                        if ((cb & bitmap) == 0)
+                                goto found;
+                }
+                for (ci = HPTES_PER_GROUP; ci < HPTES_PER_GROUP*2; ci += 2) {
+                        cb = 0x8000UL >> ci;
+                        if ((cb & bitmap) == 0)
+                                goto found;
+                }
+                for (ci = HPTES_PER_GROUP+1; ci < HPTES_PER_GROUP*2; ci += 2) {
+                        cb = 0x8000UL >> ci;
+                        if ((cb & bitmap) == 0)
+                                goto found;
+                }
+        }
+
+found:
+        if (ci < HPTES_PER_GROUP) {
+                slot = p_pteg * HPTES_PER_GROUP + ci;
+        } else {
+                slot = s_pteg * HPTES_PER_GROUP + (ci & 7);
+                /* lhpte.dw0.dw0.h = 1; */
+                vflags |= HPTE_V_SECONDARY;
+                lhpte.v |= HPTE_V_SECONDARY;
+        }
+
+        result = lv1_write_htab_entry(0, slot, lhpte.v, lhpte.r);
+
+        if (result) {
+                debug_dump_hpte(pa, va, hpte_group, bitmap, lhpte, psize, slot);
+                BUG();
+        }
+
+        /*
+         * If used slot is not in primary HPTE group,
+         * the slot should be in secondary HPTE group.
+         */
+
+        if ((hpte_group ^ slot) & ~(HPTES_PER_GROUP - 1)) {
+                secondary = 1;
+                b_index = s_pteg;
+        } else {
+                secondary = 0;
+                b_index = p_pteg;
+        }
+
+        b_mask = (lhpte.v & HPTE_V_BOLTED) ? 1 << 7 : 0 << 7;
+        bolttab[b_index] |= b_mask >> (slot & 7);
+        b_mask = 1 << 7;
+        inusetab[b_index] |= b_mask >> (slot & 7);
+        spin_unlock_irqrestore(&ps3_bolttab_lock, flags);
+
+        return (slot & 7) | (secondary << 3);
+}
+
+static long ps3_hpte_remove(unsigned long hpte_group)
+{
+        panic("ps3_hpte_remove() not implemented");
+        return 0;
+}
+
+static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp,
+        unsigned long va, int psize, int local)
+{
+        unsigned long flags;
+        unsigned long result;
+        unsigned long pteg, bit;
+        unsigned long hpte_v, want_v;
+
+        want_v = hpte_encode_v(va, psize);
+
+        spin_lock_irqsave(&ps3_bolttab_lock, flags);
+
+        hpte_v = htab[slot].v;
+        if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v & HPTE_V_VALID)) {
+                spin_unlock_irqrestore(&ps3_bolttab_lock, flags);
+
+                /* ps3_hpte_insert() will be used to update PTE */
+                return -1;
+        }
+
+        result = lv1_write_htab_entry(0, slot, 0, 0);
+
+        if (result) {
+                DBG("%s: va=%lx slot=%lx psize=%d result = %ld (0x%lx)\n",
+                       __func__, va, slot, psize, result, result);
+                BUG();
+        }
+
+        pteg = slot / HPTES_PER_GROUP;
+        bit = slot % HPTES_PER_GROUP;
+        inusetab[pteg] &= ~(0x80 >> bit);
+
+        spin_unlock_irqrestore(&ps3_bolttab_lock, flags);
+
+        /* ps3_hpte_insert() will be used to update PTE */
+        return -1;
+}
+
+static void ps3_hpte_updateboltedpp(unsigned long newpp, unsigned long ea,
+        int psize)
+{
+        panic("ps3_hpte_updateboltedpp() not implemented");
+}
+
+static void ps3_hpte_invalidate(unsigned long slot, unsigned long va,
+        int psize, int local)
+{
+        unsigned long flags;
+        unsigned long result;
+        unsigned long pteg, bit;
+
+        spin_lock_irqsave(&ps3_bolttab_lock, flags);
+        result = lv1_write_htab_entry(0, slot, 0, 0);
+
+        if (result) {
+                DBG("%s: va=%lx slot=%lx psize=%d result = %ld (0x%lx)\n",
+                       __func__, va, slot, psize, result, result);
+                BUG();
+        }
+
+        pteg = slot / HPTES_PER_GROUP;
+        bit = slot % HPTES_PER_GROUP;
+        inusetab[pteg] &= ~(0x80 >> bit);
+        spin_unlock_irqrestore(&ps3_bolttab_lock, flags);
+}
+
+static void ps3_hpte_clear(void)
+{
+        lv1_unmap_htab(htab_addr);
+}
+
+void __init ps3_hpte_init(unsigned long htab_size)
+{
+        long bitmap_size;
+
+        DBG(" -> %s:%d\n", __func__, __LINE__);
+
+        ppc_md.hpte_invalidate = ps3_hpte_invalidate;
+        ppc_md.hpte_updatepp = ps3_hpte_updatepp;
+        ppc_md.hpte_updateboltedpp = ps3_hpte_updateboltedpp;
+        ppc_md.hpte_insert = ps3_hpte_insert;
+        ppc_md.hpte_remove = ps3_hpte_remove;
+        ppc_md.hpte_clear_all = ps3_hpte_clear;
+
+        ppc64_pft_size = __ilog2(htab_size);
+
+        bitmap_size = htab_size / sizeof(hpte_t) / 8;
+
+        bolttab = __va(lmb_alloc(bitmap_size, 1));
+        inusetab = __va(lmb_alloc(bitmap_size, 1));
+
+        memset(bolttab, 0, bitmap_size);
+        memset(inusetab, 0, bitmap_size);
+
+        DBG(" <- %s:%d\n", __func__, __LINE__);
+}
+
+void __init ps3_map_htab(void)
+{
+        long result;
+        unsigned long htab_size = (1UL << ppc64_pft_size);
+
+        result = lv1_map_htab(0, &htab_addr);
+
+        htab = (hpte_t *)__ioremap(htab_addr, htab_size, PAGE_READONLY_X);
+
+        DBG("%s:%d: lpar %016lxh, virt %016lxh\n", __func__, __LINE__,
+                htab_addr, (unsigned long)htab);
+}
diff --git a/arch/powerpc/platforms/ps3/hvcall.S b/arch/powerpc/platforms/ps3/hvcall.S
new file mode 100644
index 000000000000..54be6523a0e8
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/hvcall.S
@@ -0,0 +1,804 @@
+/*
+ *  PS3 hvcall interface.
+ *
+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
+ *  Copyright 2006 Sony Corp.
+ *  Copyright 2003, 2004 (c) MontaVista Software, Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <asm/processor.h>
+#include <asm/ppc_asm.h>
+
+#define lv1call .long 0x44000022; extsw r3, r3
+
+#define LV1_N_IN_0_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_0_IN_0_OUT LV1_N_IN_0_OUT
+#define LV1_1_IN_0_OUT LV1_N_IN_0_OUT
+#define LV1_2_IN_0_OUT LV1_N_IN_0_OUT
+#define LV1_3_IN_0_OUT LV1_N_IN_0_OUT
+#define LV1_4_IN_0_OUT LV1_N_IN_0_OUT
+#define LV1_5_IN_0_OUT LV1_N_IN_0_OUT
+#define LV1_6_IN_0_OUT LV1_N_IN_0_OUT
+#define LV1_7_IN_0_OUT LV1_N_IN_0_OUT
+
+#define LV1_0_IN_1_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        stdu    r3, -8(r1);                     \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 8;                      \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_0_IN_2_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r3, -8(r1);                     \
+        stdu    r4, -16(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 16;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_0_IN_3_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r3, -8(r1);                     \
+        std     r4, -16(r1);                    \
+        stdu    r5, -24(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 24;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+        ld      r11, -24(r1);                   \
+        std     r6, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_0_IN_7_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r3, -8(r1);                     \
+        std     r4, -16(r1);                    \
+        std     r5, -24(r1);                    \
+        std     r6, -32(r1);                    \
+        std     r7, -40(r1);                    \
+        std     r8, -48(r1);                    \
+        stdu    r9, -56(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 56;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+        ld      r11, -24(r1);                   \
+        std     r6, 0(r11);                     \
+        ld      r11, -32(r1);                   \
+        std     r7, 0(r11);                     \
+        ld      r11, -40(r1);                   \
+        std     r8, 0(r11);                     \
+        ld      r11, -48(r1);                   \
+        std     r9, 0(r11);                     \
+        ld      r11, -56(r1);                   \
+        std     r10, 0(r11);                    \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_1_IN_1_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        stdu    r4, -8(r1);                     \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 8;                      \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_1_IN_2_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r4, -8(r1);                     \
+        stdu    r5, -16(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 16;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_1_IN_3_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r4, -8(r1);                     \
+        std     r5, -16(r1);                    \
+        stdu    r6, -24(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 24;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+        ld      r11, -24(r1);                   \
+        std     r6, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_1_IN_4_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r4, -8(r1);                     \
+        std     r5, -16(r1);                    \
+        std     r6, -24(r1);                    \
+        stdu    r7, -32(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 32;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+        ld      r11, -24(r1);                   \
+        std     r6, 0(r11);                     \
+        ld      r11, -32(r1);                   \
+        std     r7, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_1_IN_5_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r4, -8(r1);                     \
+        std     r5, -16(r1);                    \
+        std     r6, -24(r1);                    \
+        std     r7, -32(r1);                    \
+        stdu    r8, -40(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 40;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+        ld      r11, -24(r1);                   \
+        std     r6, 0(r11);                     \
+        ld      r11, -32(r1);                   \
+        std     r7, 0(r11);                     \
+        ld      r11, -40(r1);                   \
+        std     r8, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_1_IN_6_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r4, -8(r1);                     \
+        std     r5, -16(r1);                    \
+        std     r6, -24(r1);                    \
+        std     r7, -32(r1);                    \
+        std     r8, -40(r1);                    \
+        stdu    r9, -48(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 48;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+        ld      r11, -24(r1);                   \
+        std     r6, 0(r11);                     \
+        ld      r11, -32(r1);                   \
+        std     r7, 0(r11);                     \
+        ld      r11, -40(r1);                   \
+        std     r8, 0(r11);                     \
+        ld      r11, -48(r1);                   \
+        std     r9, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_1_IN_7_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r4, -8(r1);                     \
+        std     r5, -16(r1);                    \
+        std     r6, -24(r1);                    \
+        std     r7, -32(r1);                    \
+        std     r8, -40(r1);                    \
+        std     r9, -48(r1);                    \
+        stdu    r10, -56(r1);                   \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 56;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+        ld      r11, -24(r1);                   \
+        std     r6, 0(r11);                     \
+        ld      r11, -32(r1);                   \
+        std     r7, 0(r11);                     \
+        ld      r11, -40(r1);                   \
+        std     r8, 0(r11);                     \
+        ld      r11, -48(r1);                   \
+        std     r9, 0(r11);                     \
+        ld      r11, -56(r1);                   \
+        std     r10, 0(r11);                    \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_2_IN_1_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        stdu    r5, -8(r1);                     \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 8;                      \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_2_IN_2_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r5, -8(r1);                     \
+        stdu    r6, -16(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 16;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_2_IN_3_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r5, -8(r1);                     \
+        std     r6, -16(r1);                    \
+        stdu    r7, -24(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 24;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+        ld      r11, -24(r1);                   \
+        std     r6, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_2_IN_4_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r5, -8(r1);                     \
+        std     r6, -16(r1);                    \
+        std     r7, -24(r1);                    \
+        stdu    r8, -32(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 32;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+        ld      r11, -24(r1);                   \
+        std     r6, 0(r11);                     \
+        ld      r11, -32(r1);                   \
+        std     r7, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_2_IN_5_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r5, -8(r1);                     \
+        std     r6, -16(r1);                    \
+        std     r7, -24(r1);                    \
+        std     r8, -32(r1);                    \
+        stdu    r9, -40(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 40;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+        ld      r11, -24(r1);                   \
+        std     r6, 0(r11);                     \
+        ld      r11, -32(r1);                   \
+        std     r7, 0(r11);                     \
+        ld      r11, -40(r1);                   \
+        std     r8, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_3_IN_1_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        stdu    r6, -8(r1);                     \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 8;                      \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_3_IN_2_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r6, -8(r1);                     \
+        stdu    r7, -16(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 16;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_3_IN_3_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r6, -8(r1);                     \
+        std     r7, -16(r1);                    \
+        stdu    r8, -24(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 24;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+        ld      r11, -24(r1);                   \
+        std     r6, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_4_IN_1_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        stdu    r7, -8(r1);                     \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 8;                      \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_4_IN_2_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r7, -8(r1);                     \
+        stdu    r8, -16(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 16;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_4_IN_3_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r7, -8(r1);                     \
+        std     r8, -16(r1);                    \
+        stdu    r9, -24(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 24;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+        ld      r11, -24(r1);                   \
+        std     r6, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_5_IN_1_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        stdu    r8, -8(r1);                     \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 8;                      \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_5_IN_2_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r8, -8(r1);                     \
+        stdu    r9, -16(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 16;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_5_IN_3_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r8, -8(r1);                     \
+        std     r9, -16(r1);                    \
+        stdu    r10, -24(r1);                   \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 24;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+        ld      r11, -24(r1);                   \
+        std     r6, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_6_IN_1_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        stdu    r9, -8(r1);                     \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 8;                      \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_6_IN_2_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r9, -8(r1);                     \
+        stdu    r10, -16(r1);                   \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 16;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_6_IN_3_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r9, -8(r1);                     \
+        stdu    r10, -16(r1);                   \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 16;                     \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+        ld      r11, -16(r1);                   \
+        std     r5, 0(r11);                     \
+        ld      r11, 48+8*8(r1);                \
+        std     r6, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_7_IN_1_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        stdu    r10, -8(r1);                    \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        addi    r1, r1, 8;                      \
+        ld      r11, -8(r1);                    \
+        std     r4, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_7_IN_6_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        std     r10, 48+8*7(r1);                \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        ld      r11, 48+8*7(r1);                \
+        std     r4, 0(r11);                     \
+        ld      r11, 48+8*8(r1);                \
+        std     r5, 0(r11);                     \
+        ld      r11, 48+8*9(r1);                \
+        std     r6, 0(r11);                     \
+        ld      r11, 48+8*10(r1);               \
+        std     r7, 0(r11);                     \
+        ld      r11, 48+8*11(r1);               \
+        std     r8, 0(r11);                     \
+        ld      r11, 48+8*12(r1);               \
+        std     r9, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+#define LV1_8_IN_1_OUT(API_NAME, API_NUMBER)    \
+_GLOBAL(_##API_NAME)                            \
+                                                \
+        mflr    r0;                             \
+        std     r0, 16(r1);                     \
+                                                \
+        li      r11, API_NUMBER;                \
+        lv1call;                                \
+                                                \
+        ld      r11, 48+8*8(r1);                \
+        std     r4, 0(r11);                     \
+                                                \
+        ld      r0, 16(r1);                     \
+        mtlr    r0;                             \
+        blr
+
+        .text
+
+/* the lv1 underscored call definitions expand here */
+
+#define LV1_CALL(name, in, out, num) LV1_##in##_IN_##out##_OUT(lv1_##name, num)
+#include <asm/lv1call.h>
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c
new file mode 100644
index 000000000000..056c1e4141ba
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -0,0 +1,575 @@
+/*
+ *  PS3 interrupt routines.
+ *
+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
+ *  Copyright 2006 Sony Corp.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/irq.h>
+
+#include <asm/machdep.h>
+#include <asm/udbg.h>
+#include <asm/ps3.h>
+#include <asm/lv1call.h>
+
+#include "platform.h"
+
+#if defined(DEBUG)
+#define DBG(fmt...) udbg_printf(fmt)
+#else
+#define DBG(fmt...) do{if(0)printk(fmt);}while(0)
+#endif
+
+/**
+ * ps3_alloc_io_irq - Assign a virq to a system bus device.
+ * interrupt_id: The device interrupt id read from the system repository.
+ * @virq: The assigned Linux virq.
+ *
+ * An io irq represents a non-virtualized device interrupt.  interrupt_id
+ * coresponds to the interrupt number of the interrupt controller.
+ */
+
+int ps3_alloc_io_irq(unsigned int interrupt_id, unsigned int *virq)
+{
+        int result;
+        unsigned long outlet;
+
+        result = lv1_construct_io_irq_outlet(interrupt_id, &outlet);
+
+        if (result) {
+                pr_debug("%s:%d: lv1_construct_io_irq_outlet failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+                return result;
+        }
+
+        *virq = irq_create_mapping(NULL, outlet);
+
+        pr_debug("%s:%d: interrupt_id %u => outlet %lu, virq %u\n",
+                __func__, __LINE__, interrupt_id, outlet, *virq);
+
+        return 0;
+}
+
+int ps3_free_io_irq(unsigned int virq)
+{
+        int result;
+
+        result = lv1_destruct_io_irq_outlet(virq_to_hw(virq));
+
+        if (!result)
+                pr_debug("%s:%d: lv1_destruct_io_irq_outlet failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+
+        irq_dispose_mapping(virq);
+
+        return result;
+}
+
+/**
+ * ps3_alloc_event_irq - Allocate a virq for use with a system event.
+ * @virq: The assigned Linux virq.
+ *
+ * The virq can be used with lv1_connect_interrupt_event_receive_port() to
+ * arrange to receive events, or with ps3_send_event_locally() to signal
+ * events.
+ */
+
+int ps3_alloc_event_irq(unsigned int *virq)
+{
+        int result;
+        unsigned long outlet;
+
+        result = lv1_construct_event_receive_port(&outlet);
+
+        if (result) {
+                pr_debug("%s:%d: lv1_construct_event_receive_port failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+                *virq = NO_IRQ;
+                return result;
+        }
+
+        *virq = irq_create_mapping(NULL, outlet);
+
+        pr_debug("%s:%d: outlet %lu, virq %u\n", __func__, __LINE__, outlet,
+                *virq);
+
+        return 0;
+}
+
+int ps3_free_event_irq(unsigned int virq)
+{
+        int result;
+
+        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+
+        result = lv1_destruct_event_receive_port(virq_to_hw(virq));
+
+        if (result)
+                pr_debug("%s:%d: lv1_destruct_event_receive_port failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+
+        irq_dispose_mapping(virq);
+
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+
+int ps3_send_event_locally(unsigned int virq)
+{
+        return lv1_send_event_locally(virq_to_hw(virq));
+}
+
+/**
+ * ps3_connect_event_irq - Assign a virq to a system bus device.
+ * @did: The HV device identifier read from the system repository.
+ * @interrupt_id: The device interrupt id read from the system repository.
+ * @virq: The assigned Linux virq.
+ *
+ * An event irq represents a virtual device interrupt.  The interrupt_id
+ * coresponds to the software interrupt number.
+ */
+
+int ps3_connect_event_irq(const struct ps3_device_id *did,
+        unsigned int interrupt_id, unsigned int *virq)
+{
+        int result;
+
+        result = ps3_alloc_event_irq(virq);
+
+        if (result)
+                return result;
+
+        result = lv1_connect_interrupt_event_receive_port(did->bus_id,
+                did->dev_id, virq_to_hw(*virq), interrupt_id);
+
+        if (result) {
+                pr_debug("%s:%d: lv1_connect_interrupt_event_receive_port"
+                        " failed: %s\n", __func__, __LINE__,
+                        ps3_result(result));
+                ps3_free_event_irq(*virq);
+                *virq = NO_IRQ;
+                return result;
+        }
+
+        pr_debug("%s:%d: interrupt_id %u, virq %u\n", __func__, __LINE__,
+                interrupt_id, *virq);
+
+        return 0;
+}
+
+int ps3_disconnect_event_irq(const struct ps3_device_id *did,
+        unsigned int interrupt_id, unsigned int virq)
+{
+        int result;
+
+        pr_debug(" -> %s:%d: interrupt_id %u, virq %u\n", __func__, __LINE__,
+                interrupt_id, virq);
+
+        result = lv1_disconnect_interrupt_event_receive_port(did->bus_id,
+                did->dev_id, virq_to_hw(virq), interrupt_id);
+
+        if (result)
+                pr_debug("%s:%d: lv1_disconnect_interrupt_event_receive_port"
+                        " failed: %s\n", __func__, __LINE__,
+                        ps3_result(result));
+
+        ps3_free_event_irq(virq);
+
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+
+/**
+ * ps3_alloc_vuart_irq - Configure the system virtual uart virq.
+ * @virt_addr_bmp: The caller supplied virtual uart interrupt bitmap.
+ * @virq: The assigned Linux virq.
+ *
+ * The system supports only a single virtual uart, so multiple calls without
+ * freeing the interrupt will return a wrong state error.
+ */
+
+int ps3_alloc_vuart_irq(void* virt_addr_bmp, unsigned int *virq)
+{
+        int result;
+        unsigned long outlet;
+        unsigned long lpar_addr;
+
+        BUG_ON(!is_kernel_addr((unsigned long)virt_addr_bmp));
+
+        lpar_addr = ps3_mm_phys_to_lpar(__pa(virt_addr_bmp));
+
+        result = lv1_configure_virtual_uart_irq(lpar_addr, &outlet);
+
+        if (result) {
+                pr_debug("%s:%d: lv1_configure_virtual_uart_irq failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+                return result;
+        }
+
+        *virq = irq_create_mapping(NULL, outlet);
+
+        pr_debug("%s:%d: outlet %lu, virq %u\n", __func__, __LINE__,
+                outlet, *virq);
+
+        return 0;
+}
+
+int ps3_free_vuart_irq(unsigned int virq)
+{
+        int result;
+
+        result = lv1_deconfigure_virtual_uart_irq();
+
+        if (result) {
+                pr_debug("%s:%d: lv1_configure_virtual_uart_irq failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+                return result;
+        }
+
+        irq_dispose_mapping(virq);
+
+        return result;
+}
+
+/**
+ * ps3_alloc_spe_irq - Configure an spe virq.
+ * @spe_id: The spe_id returned from lv1_construct_logical_spe().
+ * @class: The spe interrupt class {0,1,2}.
+ * @virq: The assigned Linux virq.
+ *
+ */
+
+int ps3_alloc_spe_irq(unsigned long spe_id, unsigned int class,
+        unsigned int *virq)
+{
+        int result;
+        unsigned long outlet;
+
+        BUG_ON(class > 2);
+
+        result = lv1_get_spe_irq_outlet(spe_id, class, &outlet);
+
+        if (result) {
+                pr_debug("%s:%d: lv1_get_spe_irq_outlet failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+                return result;
+        }
+
+        *virq = irq_create_mapping(NULL, outlet);
+
+        pr_debug("%s:%d: spe_id %lu, class %u, outlet %lu, virq %u\n",
+                __func__, __LINE__, spe_id, class, outlet, *virq);
+
+        return 0;
+}
+
+int ps3_free_spe_irq(unsigned int virq)
+{
+        irq_dispose_mapping(virq);
+        return 0;
+}
+
+#define PS3_INVALID_OUTLET ((irq_hw_number_t)-1)
+#define PS3_PLUG_MAX 63
+
+/**
+ * struct bmp - a per cpu irq status and mask bitmap structure
+ * @status: 256 bit status bitmap indexed by plug
+ * @unused_1:
+ * @mask: 256 bit mask bitmap indexed by plug
+ * @unused_2:
+ * @lock:
+ * @ipi_debug_brk_mask:
+ *
+ * The HV mantains per SMT thread mappings of HV outlet to HV plug on
+ * behalf of the guest.  These mappings are implemented as 256 bit guest
+ * supplied bitmaps indexed by plug number.  The address of the bitmaps are
+ * registered with the HV through lv1_configure_irq_state_bitmap().
+ *
+ * The HV supports 256 plugs per thread, assigned as {0..255}, for a total
+ * of 512 plugs supported on a processor.  To simplify the logic this
+ * implementation equates HV plug value to linux virq value, constrains each
+ * interrupt to have a system wide unique plug number, and limits the range
+ * of the plug values to map into the first dword of the bitmaps.  This
+ * gives a usable range of plug values of  {NUM_ISA_INTERRUPTS..63}.  Note
+ * that there is no constraint on how many in this set an individual thread
+ * can aquire.
+ */
+
+struct bmp {
+        struct {
+                unsigned long status;
+                unsigned long unused_1[3];
+                unsigned long mask;
+                unsigned long unused_2[3];
+        } __attribute__ ((packed));
+        spinlock_t lock;
+        unsigned long ipi_debug_brk_mask;
+};
+
+/**
+ * struct private - a per cpu data structure
+ * @node: HV node id
+ * @cpu: HV thread id
+ * @bmp: an HV bmp structure
+ */
+
+struct private {
+        unsigned long node;
+        unsigned int cpu;
+        struct bmp bmp;
+};
+
+#if defined(DEBUG)
+static void _dump_64_bmp(const char *header, const unsigned long *p, unsigned cpu,
+        const char* func, int line)
+{
+        pr_debug("%s:%d: %s %u {%04lx_%04lx_%04lx_%04lx}\n",
+                func, line, header, cpu,
+                *p >> 48, (*p >> 32) & 0xffff, (*p >> 16) & 0xffff,
+                *p & 0xffff);
+}
+
+static void __attribute__ ((unused)) _dump_256_bmp(const char *header,
+        const unsigned long *p, unsigned cpu, const char* func, int line)
+{
+        pr_debug("%s:%d: %s %u {%016lx:%016lx:%016lx:%016lx}\n",
+                func, line, header, cpu, p[0], p[1], p[2], p[3]);
+}
+
+#define dump_bmp(_x) _dump_bmp(_x, __func__, __LINE__)
+static void _dump_bmp(struct private* pd, const char* func, int line)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&pd->bmp.lock, flags);
+        _dump_64_bmp("stat", &pd->bmp.status, pd->cpu, func, line);
+        _dump_64_bmp("mask", &pd->bmp.mask, pd->cpu, func, line);
+        spin_unlock_irqrestore(&pd->bmp.lock, flags);
+}
+
+#define dump_mask(_x) _dump_mask(_x, __func__, __LINE__)
+static void __attribute__ ((unused)) _dump_mask(struct private* pd,
+        const char* func, int line)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&pd->bmp.lock, flags);
+        _dump_64_bmp("mask", &pd->bmp.mask, pd->cpu, func, line);
+        spin_unlock_irqrestore(&pd->bmp.lock, flags);
+}
+#else
+static void dump_bmp(struct private* pd) {};
+#endif /* defined(DEBUG) */
+
+static void chip_mask(unsigned int virq)
+{
+        unsigned long flags;
+        struct private *pd = get_irq_chip_data(virq);
+
+        pr_debug("%s:%d: cpu %u, virq %d\n", __func__, __LINE__, pd->cpu, virq);
+
+        BUG_ON(virq < NUM_ISA_INTERRUPTS);
+        BUG_ON(virq > PS3_PLUG_MAX);
+
+        spin_lock_irqsave(&pd->bmp.lock, flags);
+        pd->bmp.mask &= ~(0x8000000000000000UL >> virq);
+        spin_unlock_irqrestore(&pd->bmp.lock, flags);
+
+        lv1_did_update_interrupt_mask(pd->node, pd->cpu);
+}
+
+static void chip_unmask(unsigned int virq)
+{
+        unsigned long flags;
+        struct private *pd = get_irq_chip_data(virq);
+
+        pr_debug("%s:%d: cpu %u, virq %d\n", __func__, __LINE__, pd->cpu, virq);
+
+        BUG_ON(virq < NUM_ISA_INTERRUPTS);
+        BUG_ON(virq > PS3_PLUG_MAX);
+
+        spin_lock_irqsave(&pd->bmp.lock, flags);
+        pd->bmp.mask |= (0x8000000000000000UL >> virq);
+        spin_unlock_irqrestore(&pd->bmp.lock, flags);
+
+        lv1_did_update_interrupt_mask(pd->node, pd->cpu);
+}
+
+static void chip_eoi(unsigned int virq)
+{
+        lv1_end_of_interrupt(virq);
+}
+
+static struct irq_chip irq_chip = {
+        .typename = "ps3",
+        .mask = chip_mask,
+        .unmask = chip_unmask,
+        .eoi = chip_eoi,
+};
+
+static void host_unmap(struct irq_host *h, unsigned int virq)
+{
+        int result;
+
+        pr_debug("%s:%d: virq %d\n", __func__, __LINE__, virq);
+
+        lv1_disconnect_irq_plug(virq);
+
+        result = set_irq_chip_data(virq, NULL);
+        BUG_ON(result);
+}
+
+static DEFINE_PER_CPU(struct private, private);
+
+static int host_map(struct irq_host *h, unsigned int virq,
+        irq_hw_number_t hwirq)
+{
+        int result;
+        unsigned int cpu;
+
+        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+        pr_debug("%s:%d: hwirq %lu => virq %u\n", __func__, __LINE__, hwirq,
+                virq);
+
+        /* bind this virq to a cpu */
+
+        preempt_disable();
+        cpu = smp_processor_id();
+        result = lv1_connect_irq_plug(virq, hwirq);
+        preempt_enable();
+
+        if (result) {
+                pr_info("%s:%d: lv1_connect_irq_plug failed:"
+                        " %s\n", __func__, __LINE__, ps3_result(result));
+                return -EPERM;
+        }
+
+        result = set_irq_chip_data(virq, &per_cpu(private, cpu));
+        BUG_ON(result);
+
+        set_irq_chip_and_handler(virq, &irq_chip, handle_fasteoi_irq);
+
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+
+static struct irq_host_ops host_ops = {
+        .map = host_map,
+        .unmap = host_unmap,
+};
+
+void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq)
+{
+        struct private *pd = &per_cpu(private, cpu);
+
+        pd->bmp.ipi_debug_brk_mask = 0x8000000000000000UL >> virq;
+
+        pr_debug("%s:%d: cpu %u, virq %u, mask %lxh\n", __func__, __LINE__,
+                cpu, virq, pd->bmp.ipi_debug_brk_mask);
+}
+
+static int bmp_get_and_clear_status_bit(struct bmp *m)
+{
+        unsigned long flags;
+        unsigned int bit;
+        unsigned long x;
+
+        spin_lock_irqsave(&m->lock, flags);
+
+        /* check for ipi break first to stop this cpu ASAP */
+
+        if (m->status & m->ipi_debug_brk_mask) {
+                m->status &= ~m->ipi_debug_brk_mask;
+                spin_unlock_irqrestore(&m->lock, flags);
+                return __ilog2(m->ipi_debug_brk_mask);
+        }
+
+        x = (m->status & m->mask);
+
+        for (bit = NUM_ISA_INTERRUPTS, x <<= bit; x; bit++, x <<= 1)
+                if (x & 0x8000000000000000UL) {
+                        m->status &= ~(0x8000000000000000UL >> bit);
+                        spin_unlock_irqrestore(&m->lock, flags);
+                        return bit;
+                }
+
+        spin_unlock_irqrestore(&m->lock, flags);
+
+        pr_debug("%s:%d: not found\n", __func__, __LINE__);
+        return -1;
+}
+
+unsigned int ps3_get_irq(void)
+{
+        int plug;
+
+        struct private *pd = &__get_cpu_var(private);
+
+        plug = bmp_get_and_clear_status_bit(&pd->bmp);
+
+        if (plug < 1) {
+                pr_debug("%s:%d: no plug found: cpu %u\n", __func__, __LINE__,
+                        pd->cpu);
+                dump_bmp(&per_cpu(private, 0));
+                dump_bmp(&per_cpu(private, 1));
+                return NO_IRQ;
+        }
+
+#if defined(DEBUG)
+        if (plug < NUM_ISA_INTERRUPTS || plug > PS3_PLUG_MAX) {
+                dump_bmp(&per_cpu(private, 0));
+                dump_bmp(&per_cpu(private, 1));
+                BUG();
+        }
+#endif
+        return plug;
+}
+
+void __init ps3_init_IRQ(void)
+{
+        int result;
+        unsigned long node;
+        unsigned cpu;
+        struct irq_host *host;
+
+        lv1_get_logical_ppe_id(&node);
+
+        host = irq_alloc_host(IRQ_HOST_MAP_NOMAP, 0, &host_ops,
+                PS3_INVALID_OUTLET);
+        irq_set_default_host(host);
+        irq_set_virq_count(PS3_PLUG_MAX + 1);
+
+        for_each_possible_cpu(cpu) {
+                struct private *pd = &per_cpu(private, cpu);
+
+                pd->node = node;
+                pd->cpu = cpu;
+                spin_lock_init(&pd->bmp.lock);
+
+                result = lv1_configure_irq_state_bitmap(node, cpu,
+                        ps3_mm_phys_to_lpar(__pa(&pd->bmp.status)));
+
+                if (result)
+                        pr_debug("%s:%d: lv1_configure_irq_state_bitmap failed:"
+                                " %s\n", __func__, __LINE__,
+                                ps3_result(result));
+        }
+
+        ppc_md.get_irq = ps3_get_irq;
+}
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
new file mode 100644
index 000000000000..49c0d010d491
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -0,0 +1,831 @@
+/*
+ *  PS3 address space management.
+ *
+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
+ *  Copyright 2006 Sony Corp.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/memory_hotplug.h>
+
+#include <asm/firmware.h>
+#include <asm/lmb.h>
+#include <asm/udbg.h>
+#include <asm/ps3.h>
+#include <asm/lv1call.h>
+
+#include "platform.h"
+
+#if defined(DEBUG)
+#define DBG(fmt...) udbg_printf(fmt)
+#else
+#define DBG(fmt...) do{if(0)printk(fmt);}while(0)
+#endif
+
+enum {
+#if defined(CONFIG_PS3_USE_LPAR_ADDR)
+        USE_LPAR_ADDR = 1,
+#else
+        USE_LPAR_ADDR = 0,
+#endif
+#if defined(CONFIG_PS3_DYNAMIC_DMA)
+        USE_DYNAMIC_DMA = 1,
+#else
+        USE_DYNAMIC_DMA = 0,
+#endif
+};
+
+enum {
+        PAGE_SHIFT_4K = 12U,
+        PAGE_SHIFT_64K = 16U,
+        PAGE_SHIFT_16M = 24U,
+};
+
+static unsigned long make_page_sizes(unsigned long a, unsigned long b)
+{
+        return (a << 56) | (b << 48);
+}
+
+enum {
+        ALLOCATE_MEMORY_TRY_ALT_UNIT = 0X04,
+        ALLOCATE_MEMORY_ADDR_ZERO = 0X08,
+};
+
+/* valid htab sizes are {18,19,20} = 256K, 512K, 1M */
+
+enum {
+        HTAB_SIZE_MAX = 20U, /* HV limit of 1MB */
+        HTAB_SIZE_MIN = 18U, /* CPU limit of 256KB */
+};
+
+/*============================================================================*/
+/* virtual address space routines                                             */
+/*============================================================================*/
+
+/**
+ * struct mem_region - memory region structure
+ * @base: base address
+ * @size: size in bytes
+ * @offset: difference between base and rm.size
+ */
+
+struct mem_region {
+        unsigned long base;
+        unsigned long size;
+        unsigned long offset;
+};
+
+/**
+ * struct map - address space state variables holder
+ * @total: total memory available as reported by HV
+ * @vas_id - HV virtual address space id
+ * @htab_size: htab size in bytes
+ *
+ * The HV virtual address space (vas) allows for hotplug memory regions.
+ * Memory regions can be created and destroyed in the vas at runtime.
+ * @rm: real mode (bootmem) region
+ * @r1: hotplug memory region(s)
+ *
+ * ps3 addresses
+ * virt_addr: a cpu 'translated' effective address
+ * phys_addr: an address in what Linux thinks is the physical address space
+ * lpar_addr: an address in the HV virtual address space
+ * bus_addr: an io controller 'translated' address on a device bus
+ */
+
+struct map {
+        unsigned long total;
+        unsigned long vas_id;
+        unsigned long htab_size;
+        struct mem_region rm;
+        struct mem_region r1;
+};
+
+#define debug_dump_map(x) _debug_dump_map(x, __func__, __LINE__)
+static void _debug_dump_map(const struct map* m, const char* func, int line)
+{
+        DBG("%s:%d: map.total     = %lxh\n", func, line, m->total);
+        DBG("%s:%d: map.rm.size   = %lxh\n", func, line, m->rm.size);
+        DBG("%s:%d: map.vas_id    = %lu\n", func, line, m->vas_id);
+        DBG("%s:%d: map.htab_size = %lxh\n", func, line, m->htab_size);
+        DBG("%s:%d: map.r1.base   = %lxh\n", func, line, m->r1.base);
+        DBG("%s:%d: map.r1.offset = %lxh\n", func, line, m->r1.offset);
+        DBG("%s:%d: map.r1.size   = %lxh\n", func, line, m->r1.size);
+}
+
+static struct map map;
+
+/**
+ * ps3_mm_phys_to_lpar - translate a linux physical address to lpar address
+ * @phys_addr: linux physical address
+ */
+
+unsigned long ps3_mm_phys_to_lpar(unsigned long phys_addr)
+{
+        BUG_ON(is_kernel_addr(phys_addr));
+        if (USE_LPAR_ADDR)
+                return phys_addr;
+        else
+                return (phys_addr < map.rm.size || phys_addr >= map.total)
+                        ? phys_addr : phys_addr + map.r1.offset;
+}
+
+EXPORT_SYMBOL(ps3_mm_phys_to_lpar);
+
+/**
+ * ps3_mm_vas_create - create the virtual address space
+ */
+
+void __init ps3_mm_vas_create(unsigned long* htab_size)
+{
+        int result;
+        unsigned long start_address;
+        unsigned long size;
+        unsigned long access_right;
+        unsigned long max_page_size;
+        unsigned long flags;
+
+        result = lv1_query_logical_partition_address_region_info(0,
+                &start_address, &size, &access_right, &max_page_size,
+                &flags);
+
+        if (result) {
+                DBG("%s:%d: lv1_query_logical_partition_address_region_info "
+                        "failed: %s\n", __func__, __LINE__,
+                        ps3_result(result));
+                goto fail;
+        }
+
+        if (max_page_size < PAGE_SHIFT_16M) {
+                DBG("%s:%d: bad max_page_size %lxh\n", __func__, __LINE__,
+                        max_page_size);
+                goto fail;
+        }
+
+        BUILD_BUG_ON(CONFIG_PS3_HTAB_SIZE > HTAB_SIZE_MAX);
+        BUILD_BUG_ON(CONFIG_PS3_HTAB_SIZE < HTAB_SIZE_MIN);
+
+        result = lv1_construct_virtual_address_space(CONFIG_PS3_HTAB_SIZE,
+                        2, make_page_sizes(PAGE_SHIFT_16M, PAGE_SHIFT_64K),
+                        &map.vas_id, &map.htab_size);
+
+        if (result) {
+                DBG("%s:%d: lv1_construct_virtual_address_space failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+                goto fail;
+        }
+
+        result = lv1_select_virtual_address_space(map.vas_id);
+
+        if (result) {
+                DBG("%s:%d: lv1_select_virtual_address_space failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+                goto fail;
+        }
+
+        *htab_size = map.htab_size;
+
+        debug_dump_map(&map);
+
+        return;
+
+fail:
+        panic("ps3_mm_vas_create failed");
+}
+
+/**
+ * ps3_mm_vas_destroy -
+ */
+
+void ps3_mm_vas_destroy(void)
+{
+        if (map.vas_id) {
+                lv1_select_virtual_address_space(0);
+                lv1_destruct_virtual_address_space(map.vas_id);
+                map.vas_id = 0;
+        }
+}
+
+/*============================================================================*/
+/* memory hotplug routines                                                    */
+/*============================================================================*/
+
+/**
+ * ps3_mm_region_create - create a memory region in the vas
+ * @r: pointer to a struct mem_region to accept initialized values
+ * @size: requested region size
+ *
+ * This implementation creates the region with the vas large page size.
+ * @size is rounded down to a multiple of the vas large page size.
+ */
+
+int ps3_mm_region_create(struct mem_region *r, unsigned long size)
+{
+        int result;
+        unsigned long muid;
+
+        r->size = _ALIGN_DOWN(size, 1 << PAGE_SHIFT_16M);
+
+        DBG("%s:%d requested  %lxh\n", __func__, __LINE__, size);
+        DBG("%s:%d actual     %lxh\n", __func__, __LINE__, r->size);
+        DBG("%s:%d difference %lxh (%luMB)\n", __func__, __LINE__,
+                (unsigned long)(size - r->size),
+                (size - r->size) / 1024 / 1024);
+
+        if (r->size == 0) {
+                DBG("%s:%d: size == 0\n", __func__, __LINE__);
+                result = -1;
+                goto zero_region;
+        }
+
+        result = lv1_allocate_memory(r->size, PAGE_SHIFT_16M, 0,
+                ALLOCATE_MEMORY_TRY_ALT_UNIT, &r->base, &muid);
+
+        if (result || r->base < map.rm.size) {
+                DBG("%s:%d: lv1_allocate_memory failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+                goto zero_region;
+        }
+
+        r->offset = r->base - map.rm.size;
+        return result;
+
+zero_region:
+        r->size = r->base = r->offset = 0;
+        return result;
+}
+
+/**
+ * ps3_mm_region_destroy - destroy a memory region
+ * @r: pointer to struct mem_region
+ */
+
+void ps3_mm_region_destroy(struct mem_region *r)
+{
+        if (r->base) {
+                lv1_release_memory(r->base);
+                r->size = r->base = r->offset = 0;
+                map.total = map.rm.size;
+        }
+}
+
+/**
+ * ps3_mm_add_memory - hot add memory
+ */
+
+static int __init ps3_mm_add_memory(void)
+{
+        int result;
+        unsigned long start_addr;
+        unsigned long start_pfn;
+        unsigned long nr_pages;
+
+        if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
+                return 0;
+
+        BUG_ON(!mem_init_done);
+
+        start_addr = USE_LPAR_ADDR ? map.r1.base : map.rm.size;
+        start_pfn = start_addr >> PAGE_SHIFT;
+        nr_pages = (map.r1.size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+
+        DBG("%s:%d: start_addr %lxh, start_pfn %lxh, nr_pages %lxh\n",
+                __func__, __LINE__, start_addr, start_pfn, nr_pages);
+
+        result = add_memory(0, start_addr, map.r1.size);
+
+        if (result) {
+                DBG("%s:%d: add_memory failed: (%d)\n",
+                        __func__, __LINE__, result);
+                return result;
+        }
+
+        result = online_pages(start_pfn, nr_pages);
+
+        if (result)
+                DBG("%s:%d: online_pages failed: (%d)\n",
+                        __func__, __LINE__, result);
+
+        return result;
+}
+
+core_initcall(ps3_mm_add_memory);
+
+/*============================================================================*/
+/* dma routines                                                               */
+/*============================================================================*/
+
+/**
+ * dma_lpar_to_bus - Translate an lpar address to ioc mapped bus address.
+ * @r: pointer to dma region structure
+ * @lpar_addr: HV lpar address
+ */
+
+static unsigned long dma_lpar_to_bus(struct ps3_dma_region *r,
+        unsigned long lpar_addr)
+{
+        BUG_ON(lpar_addr >= map.r1.base + map.r1.size);
+        return r->bus_addr + (lpar_addr <= map.rm.size ? lpar_addr
+                : lpar_addr - map.r1.offset);
+}
+
+#define dma_dump_region(_a) _dma_dump_region(_a, __func__, __LINE__)
+static void _dma_dump_region(const struct ps3_dma_region *r, const char* func,
+        int line)
+{
+        DBG("%s:%d: dev        %u:%u\n", func, line, r->did.bus_id,
+                r->did.dev_id);
+        DBG("%s:%d: page_size  %u\n", func, line, r->page_size);
+        DBG("%s:%d: bus_addr   %lxh\n", func, line, r->bus_addr);
+        DBG("%s:%d: len        %lxh\n", func, line, r->len);
+}
+
+/**
+ * dma_chunk - A chunk of dma pages mapped by the io controller.
+ * @region - The dma region that owns this chunk.
+ * @lpar_addr: Starting lpar address of the area to map.
+ * @bus_addr: Starting ioc bus address of the area to map.
+ * @len: Length in bytes of the area to map.
+ * @link: A struct list_head used with struct ps3_dma_region.chunk_list, the
+ * list of all chuncks owned by the region.
+ *
+ * This implementation uses a very simple dma page manager
+ * based on the dma_chunk structure.  This scheme assumes
+ * that all drivers use very well behaved dma ops.
+ */
+
+struct dma_chunk {
+        struct ps3_dma_region *region;
+        unsigned long lpar_addr;
+        unsigned long bus_addr;
+        unsigned long len;
+        struct list_head link;
+        unsigned int usage_count;
+};
+
+#define dma_dump_chunk(_a) _dma_dump_chunk(_a, __func__, __LINE__)
+static void _dma_dump_chunk (const struct dma_chunk* c, const char* func,
+        int line)
+{
+        DBG("%s:%d: r.dev        %u:%u\n", func, line,
+                c->region->did.bus_id, c->region->did.dev_id);
+        DBG("%s:%d: r.bus_addr   %lxh\n", func, line, c->region->bus_addr);
+        DBG("%s:%d: r.page_size  %u\n", func, line, c->region->page_size);
+        DBG("%s:%d: r.len        %lxh\n", func, line, c->region->len);
+        DBG("%s:%d: c.lpar_addr  %lxh\n", func, line, c->lpar_addr);
+        DBG("%s:%d: c.bus_addr   %lxh\n", func, line, c->bus_addr);
+        DBG("%s:%d: c.len        %lxh\n", func, line, c->len);
+}
+
+static struct dma_chunk * dma_find_chunk(struct ps3_dma_region *r,
+        unsigned long bus_addr, unsigned long len)
+{
+        struct dma_chunk *c;
+        unsigned long aligned_bus = _ALIGN_DOWN(bus_addr, 1 << r->page_size);
+        unsigned long aligned_len = _ALIGN_UP(len, 1 << r->page_size);
+
+        list_for_each_entry(c, &r->chunk_list.head, link) {
+                /* intersection */
+                if (aligned_bus >= c->bus_addr
+                        && aligned_bus < c->bus_addr + c->len
+                        && aligned_bus + aligned_len <= c->bus_addr + c->len) {
+                        return c;
+                }
+                /* below */
+                if (aligned_bus + aligned_len <= c->bus_addr) {
+                        continue;
+                }
+                /* above */
+                if (aligned_bus >= c->bus_addr + c->len) {
+                        continue;
+                }
+
+                /* we don't handle the multi-chunk case for now */
+
+                dma_dump_chunk(c);
+                BUG();
+        }
+        return NULL;
+}
+
+static int dma_free_chunk(struct dma_chunk *c)
+{
+        int result = 0;
+
+        if (c->bus_addr) {
+                result = lv1_unmap_device_dma_region(c->region->did.bus_id,
+                        c->region->did.dev_id, c->bus_addr, c->len);
+                BUG_ON(result);
+        }
+
+        kfree(c);
+        return result;
+}
+
+/**
+ * dma_map_pages - Maps dma pages into the io controller bus address space.
+ * @r: Pointer to a struct ps3_dma_region.
+ * @phys_addr: Starting physical address of the area to map.
+ * @len: Length in bytes of the area to map.
+ * c_out: A pointer to receive an allocated struct dma_chunk for this area.
+ *
+ * This is the lowest level dma mapping routine, and is the one that will
+ * make the HV call to add the pages into the io controller address space.
+ */
+
+static int dma_map_pages(struct ps3_dma_region *r, unsigned long phys_addr,
+        unsigned long len, struct dma_chunk **c_out)
+{
+        int result;
+        struct dma_chunk *c;
+
+        c = kzalloc(sizeof(struct dma_chunk), GFP_ATOMIC);
+
+        if (!c) {
+                result = -ENOMEM;
+                goto fail_alloc;
+        }
+
+        c->region = r;
+        c->lpar_addr = ps3_mm_phys_to_lpar(phys_addr);
+        c->bus_addr = dma_lpar_to_bus(r, c->lpar_addr);
+        c->len = len;
+
+        result = lv1_map_device_dma_region(c->region->did.bus_id,
+                c->region->did.dev_id, c->lpar_addr, c->bus_addr, c->len,
+                0xf800000000000000UL);
+
+        if (result) {
+                DBG("%s:%d: lv1_map_device_dma_region failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+                goto fail_map;
+        }
+
+        list_add(&c->link, &r->chunk_list.head);
+
+        *c_out = c;
+        return 0;
+
+fail_map:
+        kfree(c);
+fail_alloc:
+        *c_out = NULL;
+        DBG(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+
+/**
+ * dma_region_create - Create a device dma region.
+ * @r: Pointer to a struct ps3_dma_region.
+ *
+ * This is the lowest level dma region create routine, and is the one that
+ * will make the HV call to create the region.
+ */
+
+static int dma_region_create(struct ps3_dma_region* r)
+{
+        int result;
+
+        r->len = _ALIGN_UP(map.total, 1 << r->page_size);
+        INIT_LIST_HEAD(&r->chunk_list.head);
+        spin_lock_init(&r->chunk_list.lock);
+
+        result = lv1_allocate_device_dma_region(r->did.bus_id, r->did.dev_id,
+                r->len, r->page_size, r->region_type, &r->bus_addr);
+
+        dma_dump_region(r);
+
+        if (result) {
+                DBG("%s:%d: lv1_allocate_device_dma_region failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+                r->len = r->bus_addr = 0;
+        }
+
+        return result;
+}
+
+/**
+ * dma_region_free - Free a device dma region.
+ * @r: Pointer to a struct ps3_dma_region.
+ *
+ * This is the lowest level dma region free routine, and is the one that
+ * will make the HV call to free the region.
+ */
+
+static int dma_region_free(struct ps3_dma_region* r)
+{
+        int result;
+        struct dma_chunk *c;
+        struct dma_chunk *tmp;
+
+        list_for_each_entry_safe(c, tmp, &r->chunk_list.head, link) {
+                list_del(&c->link);
+                dma_free_chunk(c);
+        }
+
+        result = lv1_free_device_dma_region(r->did.bus_id, r->did.dev_id,
+                r->bus_addr);
+
+        if (result)
+                DBG("%s:%d: lv1_free_device_dma_region failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+
+        r->len = r->bus_addr = 0;
+
+        return result;
+}
+
+/**
+ * dma_map_area - Map an area of memory into a device dma region.
+ * @r: Pointer to a struct ps3_dma_region.
+ * @virt_addr: Starting virtual address of the area to map.
+ * @len: Length in bytes of the area to map.
+ * @bus_addr: A pointer to return the starting ioc bus address of the area to
+ * map.
+ *
+ * This is the common dma mapping routine.
+ */
+
+static int dma_map_area(struct ps3_dma_region *r, unsigned long virt_addr,
+        unsigned long len, unsigned long *bus_addr)
+{
+        int result;
+        unsigned long flags;
+        struct dma_chunk *c;
+        unsigned long phys_addr = is_kernel_addr(virt_addr) ? __pa(virt_addr)
+                : virt_addr;
+
+        *bus_addr = dma_lpar_to_bus(r, ps3_mm_phys_to_lpar(phys_addr));
+
+        if (!USE_DYNAMIC_DMA) {
+                unsigned long lpar_addr = ps3_mm_phys_to_lpar(phys_addr);
+                DBG(" -> %s:%d\n", __func__, __LINE__);
+                DBG("%s:%d virt_addr %lxh\n", __func__, __LINE__,
+                        virt_addr);
+                DBG("%s:%d phys_addr %lxh\n", __func__, __LINE__,
+                        phys_addr);
+                DBG("%s:%d lpar_addr %lxh\n", __func__, __LINE__,
+                        lpar_addr);
+                DBG("%s:%d len       %lxh\n", __func__, __LINE__, len);
+                DBG("%s:%d bus_addr  %lxh (%lxh)\n", __func__, __LINE__,
+                *bus_addr, len);
+        }
+
+        spin_lock_irqsave(&r->chunk_list.lock, flags);
+        c = dma_find_chunk(r, *bus_addr, len);
+
+        if (c) {
+                c->usage_count++;
+                spin_unlock_irqrestore(&r->chunk_list.lock, flags);
+                return 0;
+        }
+
+        result = dma_map_pages(r, _ALIGN_DOWN(phys_addr, 1 << r->page_size),
+                _ALIGN_UP(len, 1 << r->page_size), &c);
+
+        if (result) {
+                *bus_addr = 0;
+                DBG("%s:%d: dma_map_pages failed (%d)\n",
+                        __func__, __LINE__, result);
+                spin_unlock_irqrestore(&r->chunk_list.lock, flags);
+                return result;
+        }
+
+        c->usage_count = 1;
+
+        spin_unlock_irqrestore(&r->chunk_list.lock, flags);
+        return result;
+}
+
+/**
+ * dma_unmap_area - Unmap an area of memory from a device dma region.
+ * @r: Pointer to a struct ps3_dma_region.
+ * @bus_addr: The starting ioc bus address of the area to unmap.
+ * @len: Length in bytes of the area to unmap.
+ *
+ * This is the common dma unmap routine.
+ */
+
+int dma_unmap_area(struct ps3_dma_region *r, unsigned long bus_addr,
+        unsigned long len)
+{
+        unsigned long flags;
+        struct dma_chunk *c;
+
+        spin_lock_irqsave(&r->chunk_list.lock, flags);
+        c = dma_find_chunk(r, bus_addr, len);
+
+        if (!c) {
+                unsigned long aligned_bus = _ALIGN_DOWN(bus_addr,
+                        1 << r->page_size);
+                unsigned long aligned_len = _ALIGN_UP(len, 1 << r->page_size);
+                DBG("%s:%d: not found: bus_addr %lxh\n",
+                        __func__, __LINE__, bus_addr);
+                DBG("%s:%d: not found: len %lxh\n",
+                        __func__, __LINE__, len);
+                DBG("%s:%d: not found: aligned_bus %lxh\n",
+                        __func__, __LINE__, aligned_bus);
+                DBG("%s:%d: not found: aligned_len %lxh\n",
+                        __func__, __LINE__, aligned_len);
+                BUG();
+        }
+
+        c->usage_count--;
+
+        if (!c->usage_count) {
+                list_del(&c->link);
+                dma_free_chunk(c);
+        }
+
+        spin_unlock_irqrestore(&r->chunk_list.lock, flags);
+        return 0;
+}
+
+/**
+ * dma_region_create_linear - Setup a linear dma maping for a device.
+ * @r: Pointer to a struct ps3_dma_region.
+ *
+ * This routine creates an HV dma region for the device and maps all available
+ * ram into the io controller bus address space.
+ */
+
+static int dma_region_create_linear(struct ps3_dma_region *r)
+{
+        int result;
+        unsigned long tmp;
+
+        /* force 16M dma pages for linear mapping */
+
+        if (r->page_size != PS3_DMA_16M) {
+                pr_info("%s:%d: forcing 16M pages for linear map\n",
+                        __func__, __LINE__);
+                r->page_size = PS3_DMA_16M;
+        }
+
+        result = dma_region_create(r);
+        BUG_ON(result);
+
+        result = dma_map_area(r, map.rm.base, map.rm.size, &tmp);
+        BUG_ON(result);
+
+        if (USE_LPAR_ADDR)
+                result = dma_map_area(r, map.r1.base, map.r1.size,
+                        &tmp);
+        else
+                result = dma_map_area(r, map.rm.size, map.r1.size,
+                        &tmp);
+
+        BUG_ON(result);
+
+        return result;
+}
+
+/**
+ * dma_region_free_linear - Free a linear dma mapping for a device.
+ * @r: Pointer to a struct ps3_dma_region.
+ *
+ * This routine will unmap all mapped areas and free the HV dma region.
+ */
+
+static int dma_region_free_linear(struct ps3_dma_region *r)
+{
+        int result;
+
+        result = dma_unmap_area(r, dma_lpar_to_bus(r, 0), map.rm.size);
+        BUG_ON(result);
+
+        result = dma_unmap_area(r, dma_lpar_to_bus(r, map.r1.base),
+                map.r1.size);
+        BUG_ON(result);
+
+        result = dma_region_free(r);
+        BUG_ON(result);
+
+        return result;
+}
+
+/**
+ * dma_map_area_linear - Map an area of memory into a device dma region.
+ * @r: Pointer to a struct ps3_dma_region.
+ * @virt_addr: Starting virtual address of the area to map.
+ * @len: Length in bytes of the area to map.
+ * @bus_addr: A pointer to return the starting ioc bus address of the area to
+ * map.
+ *
+ * This routine just returns the coresponding bus address.  Actual mapping
+ * occurs in dma_region_create_linear().
+ */
+
+static int dma_map_area_linear(struct ps3_dma_region *r,
+        unsigned long virt_addr, unsigned long len, unsigned long *bus_addr)
+{
+        unsigned long phys_addr = is_kernel_addr(virt_addr) ? __pa(virt_addr)
+                : virt_addr;
+        *bus_addr = dma_lpar_to_bus(r, ps3_mm_phys_to_lpar(phys_addr));
+        return 0;
+}
+
+/**
+ * dma_unmap_area_linear - Unmap an area of memory from a device dma region.
+ * @r: Pointer to a struct ps3_dma_region.
+ * @bus_addr: The starting ioc bus address of the area to unmap.
+ * @len: Length in bytes of the area to unmap.
+ *
+ * This routine does nothing.  Unmapping occurs in dma_region_free_linear().
+ */
+
+static int dma_unmap_area_linear(struct ps3_dma_region *r,
+        unsigned long bus_addr, unsigned long len)
+{
+        return 0;
+}
+
+int ps3_dma_region_create(struct ps3_dma_region *r)
+{
+        return (USE_DYNAMIC_DMA)
+                ? dma_region_create(r)
+                : dma_region_create_linear(r);
+}
+
+int ps3_dma_region_free(struct ps3_dma_region *r)
+{
+        return (USE_DYNAMIC_DMA)
+                ? dma_region_free(r)
+                : dma_region_free_linear(r);
+}
+
+int ps3_dma_map(struct ps3_dma_region *r, unsigned long virt_addr,
+        unsigned long len, unsigned long *bus_addr)
+{
+        return (USE_DYNAMIC_DMA)
+                ? dma_map_area(r, virt_addr, len, bus_addr)
+                : dma_map_area_linear(r, virt_addr, len, bus_addr);
+}
+
+int ps3_dma_unmap(struct ps3_dma_region *r, unsigned long bus_addr,
+        unsigned long len)
+{
+        return (USE_DYNAMIC_DMA) ? dma_unmap_area(r, bus_addr, len)
+                : dma_unmap_area_linear(r, bus_addr, len);
+}
+
+/*============================================================================*/
+/* system startup routines                                                    */
+/*============================================================================*/
+
+/**
+ * ps3_mm_init - initialize the address space state variables
+ */
+
+void __init ps3_mm_init(void)
+{
+        int result;
+
+        DBG(" -> %s:%d\n", __func__, __LINE__);
+
+        result = ps3_repository_read_mm_info(&map.rm.base, &map.rm.size,
+                &map.total);
+
+        if (result)
+                panic("ps3_repository_read_mm_info() failed");
+
+        map.rm.offset = map.rm.base;
+        map.vas_id = map.htab_size = 0;
+
+        /* this implementation assumes map.rm.base is zero */
+
+        BUG_ON(map.rm.base);
+        BUG_ON(!map.rm.size);
+
+        lmb_add(map.rm.base, map.rm.size);
+        lmb_analyze();
+
+        /* arrange to do this in ps3_mm_add_memory */
+        ps3_mm_region_create(&map.r1, map.total - map.rm.size);
+
+        DBG(" <- %s:%d\n", __func__, __LINE__);
+}
+
+/**
+ * ps3_mm_shutdown - final cleanup of address space
+ */
+
+void ps3_mm_shutdown(void)
+{
+        ps3_mm_region_destroy(&map.r1);
+        map.total = map.rm.size;
+}
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
new file mode 100644
index 000000000000..58358305dc10
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -0,0 +1,259 @@
+/*
+ *  PS3 'Other OS' area data.
+ *
+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
+ *  Copyright 2006 Sony Corp.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/io.h>
+
+#include <asm/lmb.h>
+#include <asm/ps3.h>
+
+#include "platform.h"
+
+enum {
+        OS_AREA_SEGMENT_SIZE = 0X200,
+};
+
+enum {
+        HEADER_LDR_FORMAT_RAW = 0,
+        HEADER_LDR_FORMAT_GZIP = 1,
+};
+
+/**
+ * struct os_area_header - os area header segment.
+ * @magic_num: Always 'cell_ext_os_area'.
+ * @hdr_version: Header format version number.
+ * @os_area_offset: Starting segment number of os image area.
+ * @ldr_area_offset: Starting segment number of bootloader image area.
+ * @ldr_format: HEADER_LDR_FORMAT flag.
+ * @ldr_size: Size of bootloader image in bytes.
+ *
+ * Note that the docs refer to area offsets.  These are offsets in units of
+ * segments from the start of the os area (top of the header).  These are
+ * better thought of as segment numbers.  The os area of the os area is
+ * reserved for the os image.
+ */
+
+struct os_area_header {
+        s8 magic_num[16];
+        u32 hdr_version;
+        u32 os_area_offset;
+        u32 ldr_area_offset;
+        u32 _reserved_1;
+        u32 ldr_format;
+        u32 ldr_size;
+        u32 _reserved_2[6];
+} __attribute__ ((packed));
+
+enum {
+        PARAM_BOOT_FLAG_GAME_OS = 0,
+        PARAM_BOOT_FLAG_OTHER_OS = 1,
+};
+
+enum {
+        PARAM_AV_MULTI_OUT_NTSC = 0,
+        PARAM_AV_MULTI_OUT_PAL_RGB = 1,
+        PARAM_AV_MULTI_OUT_PAL_YCBCR = 2,
+        PARAM_AV_MULTI_OUT_SECAM = 3,
+};
+
+enum {
+        PARAM_CTRL_BUTTON_O_IS_YES = 0,
+        PARAM_CTRL_BUTTON_X_IS_YES = 1,
+};
+
+/**
+ * struct os_area_params - os area params segment.
+ * @boot_flag: User preference of operating system, PARAM_BOOT_FLAG flag.
+ * @num_params: Number of params in this (params) segment.
+ * @rtc_diff: Difference in seconds between 1970 and the ps3 rtc value.
+ * @av_multi_out: User preference of AV output, PARAM_AV_MULTI_OUT flag.
+ * @ctrl_button: User preference of controller button config, PARAM_CTRL_BUTTON
+ *      flag.
+ * @static_ip_addr: User preference of static IP address.
+ * @network_mask: User preference of static network mask.
+ * @default_gateway: User preference of static default gateway.
+ * @dns_primary: User preference of static primary dns server.
+ * @dns_secondary: User preference of static secondary dns server.
+ *
+ * User preference of zero for static_ip_addr means use dhcp.
+ */
+
+struct os_area_params {
+        u32 boot_flag;
+        u32 _reserved_1[3];
+        u32 num_params;
+        u32 _reserved_2[3];
+        /* param 0 */
+        s64 rtc_diff;
+        u8 av_multi_out;
+        u8 ctrl_button;
+        u8 _reserved_3[6];
+        /* param 1 */
+        u8 static_ip_addr[4];
+        u8 network_mask[4];
+        u8 default_gateway[4];
+        u8 _reserved_4[4];
+        /* param 2 */
+        u8 dns_primary[4];
+        u8 dns_secondary[4];
+        u8 _reserved_5[8];
+} __attribute__ ((packed));
+
+/**
+ * struct saved_params - Static working copies of data from the 'Other OS' area.
+ *
+ * For the convinience of the guest, the HV makes a copy of the 'Other OS' area
+ * in flash to a high address in the boot memory region and then puts that RAM
+ * address and the byte count into the repository for retreval by the guest.
+ * We copy the data we want into a static variable and allow the memory setup
+ * by the HV to be claimed by the lmb manager.
+ */
+
+struct saved_params {
+        /* param 0 */
+        s64 rtc_diff;
+        unsigned int av_multi_out;
+        unsigned int ctrl_button;
+        /* param 1 */
+        u8 static_ip_addr[4];
+        u8 network_mask[4];
+        u8 default_gateway[4];
+        /* param 2 */
+        u8 dns_primary[4];
+        u8 dns_secondary[4];
+} static saved_params;
+
+#define dump_header(_a) _dump_header(_a, __func__, __LINE__)
+static void _dump_header(const struct os_area_header __iomem *h, const char* func,
+        int line)
+{
+        pr_debug("%s:%d: h.magic_num:         '%s'\n", func, line,
+                h->magic_num);
+        pr_debug("%s:%d: h.hdr_version:       %u\n", func, line,
+                h->hdr_version);
+        pr_debug("%s:%d: h.os_area_offset:   %u\n", func, line,
+                h->os_area_offset);
+        pr_debug("%s:%d: h.ldr_area_offset: %u\n", func, line,
+                h->ldr_area_offset);
+        pr_debug("%s:%d: h.ldr_format:        %u\n", func, line,
+                h->ldr_format);
+        pr_debug("%s:%d: h.ldr_size:          %xh\n", func, line,
+                h->ldr_size);
+}
+
+#define dump_params(_a) _dump_params(_a, __func__, __LINE__)
+static void _dump_params(const struct os_area_params __iomem *p, const char* func,
+        int line)
+{
+        pr_debug("%s:%d: p.boot_flag:       %u\n", func, line, p->boot_flag);
+        pr_debug("%s:%d: p.num_params:      %u\n", func, line, p->num_params);
+        pr_debug("%s:%d: p.rtc_diff         %ld\n", func, line, p->rtc_diff);
+        pr_debug("%s:%d: p.av_multi_out     %u\n", func, line, p->av_multi_out);
+        pr_debug("%s:%d: p.ctrl_button:     %u\n", func, line, p->ctrl_button);
+        pr_debug("%s:%d: p.static_ip_addr:  %u.%u.%u.%u\n", func, line,
+                p->static_ip_addr[0], p->static_ip_addr[1],
+                p->static_ip_addr[2], p->static_ip_addr[3]);
+        pr_debug("%s:%d: p.network_mask:    %u.%u.%u.%u\n", func, line,
+                p->network_mask[0], p->network_mask[1],
+                p->network_mask[2], p->network_mask[3]);
+        pr_debug("%s:%d: p.default_gateway: %u.%u.%u.%u\n", func, line,
+                p->default_gateway[0], p->default_gateway[1],
+                p->default_gateway[2], p->default_gateway[3]);
+        pr_debug("%s:%d: p.dns_primary:     %u.%u.%u.%u\n", func, line,
+                p->dns_primary[0], p->dns_primary[1],
+                p->dns_primary[2], p->dns_primary[3]);
+        pr_debug("%s:%d: p.dns_secondary:   %u.%u.%u.%u\n", func, line,
+                p->dns_secondary[0], p->dns_secondary[1],
+                p->dns_secondary[2], p->dns_secondary[3]);
+}
+
+static int __init verify_header(const struct os_area_header *header)
+{
+        if (memcmp(header->magic_num, "cell_ext_os_area", 16)) {
+                pr_debug("%s:%d magic_num failed\n", __func__, __LINE__);
+                return -1;
+        }
+
+        if (header->hdr_version < 1) {
+                pr_debug("%s:%d hdr_version failed\n", __func__, __LINE__);
+                return -1;
+        }
+
+        if (header->os_area_offset > header->ldr_area_offset) {
+                pr_debug("%s:%d offsets failed\n", __func__, __LINE__);
+                return -1;
+        }
+
+        return 0;
+}
+
+int __init ps3_os_area_init(void)
+{
+        int result;
+        u64 lpar_addr;
+        unsigned int size;
+        struct os_area_header *header;
+        struct os_area_params *params;
+
+        result = ps3_repository_read_boot_dat_info(&lpar_addr, &size);
+
+        if (result) {
+                pr_debug("%s:%d ps3_repository_read_boot_dat_info failed\n",
+                        __func__, __LINE__);
+                return result;
+        }
+
+        header = (struct os_area_header *)__va(lpar_addr);
+        params = (struct os_area_params *)__va(lpar_addr + OS_AREA_SEGMENT_SIZE);
+
+        result = verify_header(header);
+
+        if (result) {
+                pr_debug("%s:%d verify_header failed\n", __func__, __LINE__);
+                dump_header(header);
+                return -EIO;
+        }
+
+        dump_header(header);
+        dump_params(params);
+
+        saved_params.rtc_diff = params->rtc_diff;
+        saved_params.av_multi_out = params->av_multi_out;
+        saved_params.ctrl_button = params->ctrl_button;
+        memcpy(saved_params.static_ip_addr, params->static_ip_addr, 4);
+        memcpy(saved_params.network_mask, params->network_mask, 4);
+        memcpy(saved_params.default_gateway, params->default_gateway, 4);
+        memcpy(saved_params.dns_secondary, params->dns_secondary, 4);
+
+        return result;
+}
+
+/**
+ * ps3_os_area_rtc_diff - Returns the ps3 rtc diff value.
+ *
+ * The ps3 rtc maintains a value that approximates seconds since
+ * 2000-01-01 00:00:00 UTC.  Returns the exact number of seconds from 1970 to
+ * 2000 when saved_params.rtc_diff has not been properly set up.
+ */
+
+u64 ps3_os_area_rtc_diff(void)
+{
+        return saved_params.rtc_diff ? saved_params.rtc_diff : 946684800UL;
+}
diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
new file mode 100644
index 000000000000..23b111bea9d0
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -0,0 +1,68 @@
+/*
+ *  PS3 platform declarations.
+ *
+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
+ *  Copyright 2006 Sony Corp.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#if !defined(_PS3_PLATFORM_H)
+#define _PS3_PLATFORM_H
+
+#include <linux/rtc.h>
+
+/* htab */
+
+void __init ps3_hpte_init(unsigned long htab_size);
+void __init ps3_map_htab(void);
+
+/* mm */
+
+void __init ps3_mm_init(void);
+void __init ps3_mm_vas_create(unsigned long* htab_size);
+void ps3_mm_vas_destroy(void);
+void ps3_mm_shutdown(void);
+
+/* irq */
+
+void ps3_init_IRQ(void);
+void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq);
+
+/* smp */
+
+void smp_init_ps3(void);
+void ps3_smp_cleanup_cpu(int cpu);
+
+/* time */
+
+void __init ps3_calibrate_decr(void);
+unsigned long __init ps3_get_boot_time(void);
+void ps3_get_rtc_time(struct rtc_time *time);
+int ps3_set_rtc_time(struct rtc_time *time);
+
+/* os area */
+
+int __init ps3_os_area_init(void);
+u64 ps3_os_area_rtc_diff(void);
+
+/* spu */
+
+#if defined(CONFIG_SPU_BASE)
+void ps3_spu_set_platform (void);
+#else
+static inline void ps3_spu_set_platform (void) {}
+#endif
+
+#endif
diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c
new file mode 100644
index 000000000000..273a0d621bdd
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/repository.c
@@ -0,0 +1,840 @@
+/*
+ *  PS3 repository routines.
+ *
+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
+ *  Copyright 2006 Sony Corp.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <asm/ps3.h>
+#include <asm/lv1call.h>
+
+enum ps3_vendor_id {
+        PS3_VENDOR_ID_NONE = 0,
+        PS3_VENDOR_ID_SONY = 0x8000000000000000UL,
+};
+
+enum ps3_lpar_id {
+        PS3_LPAR_ID_CURRENT = 0,
+        PS3_LPAR_ID_PME = 1,
+};
+
+#define dump_field(_a, _b) _dump_field(_a, _b, __func__, __LINE__)
+static void _dump_field(const char *hdr, u64 n, const char* func, int line)
+{
+#if defined(DEBUG)
+        char s[16];
+        const char *const in = (const char *)&n;
+        unsigned int i;
+
+        for (i = 0; i < 8; i++)
+                s[i] = (in[i] <= 126 && in[i] >= 32) ? in[i] : '.';
+        s[i] = 0;
+
+        pr_debug("%s:%d: %s%016lx : %s\n", func, line, hdr, n, s);
+#endif
+}
+
+#define dump_node_name(_a, _b, _c, _d, _e) \
+        _dump_node_name(_a, _b, _c, _d, _e, __func__, __LINE__)
+static void _dump_node_name (unsigned int lpar_id, u64 n1, u64 n2, u64 n3,
+        u64 n4, const char* func, int line)
+{
+        pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
+        _dump_field("n1: ", n1, func, line);
+        _dump_field("n2: ", n2, func, line);
+        _dump_field("n3: ", n3, func, line);
+        _dump_field("n4: ", n4, func, line);
+}
+
+#define dump_node(_a, _b, _c, _d, _e, _f, _g) \
+        _dump_node(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__)
+static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
+        u64 v1, u64 v2, const char* func, int line)
+{
+        pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
+        _dump_field("n1: ", n1, func, line);
+        _dump_field("n2: ", n2, func, line);
+        _dump_field("n3: ", n3, func, line);
+        _dump_field("n4: ", n4, func, line);
+        pr_debug("%s:%d: v1: %016lx\n", func, line, v1);
+        pr_debug("%s:%d: v2: %016lx\n", func, line, v2);
+}
+
+/**
+ * make_first_field - Make the first field of a repository node name.
+ * @text: Text portion of the field.
+ * @index: Numeric index portion of the field.  Use zero for 'don't care'.
+ *
+ * This routine sets the vendor id to zero (non-vendor specific).
+ * Returns field value.
+ */
+
+static u64 make_first_field(const char *text, u64 index)
+{
+        u64 n;
+
+        strncpy((char *)&n, text, 8);
+        return PS3_VENDOR_ID_NONE + (n >> 32) + index;
+}
+
+/**
+ * make_field - Make subsequent fields of a repository node name.
+ * @text: Text portion of the field.  Use "" for 'don't care'.
+ * @index: Numeric index portion of the field.  Use zero for 'don't care'.
+ *
+ * Returns field value.
+ */
+
+static u64 make_field(const char *text, u64 index)
+{
+        u64 n;
+
+        strncpy((char *)&n, text, 8);
+        return n + index;
+}
+
+/**
+ * read_node - Read a repository node from raw fields.
+ * @n1: First field of node name.
+ * @n2: Second field of node name.  Use zero for 'don't care'.
+ * @n3: Third field of node name.  Use zero for 'don't care'.
+ * @n4: Fourth field of node name.  Use zero for 'don't care'.
+ * @v1: First repository value (high word).
+ * @v2: Second repository value (low word).  Optional parameter, use zero
+ *      for 'don't care'.
+ */
+
+static int read_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
+        u64 *_v1, u64 *_v2)
+{
+        int result;
+        u64 v1;
+        u64 v2;
+
+        if (lpar_id == PS3_LPAR_ID_CURRENT) {
+                u64 id;
+                lv1_get_logical_partition_id(&id);
+                lpar_id = id;
+        }
+
+        result = lv1_get_repository_node_value(lpar_id, n1, n2, n3, n4, &v1,
+                &v2);
+
+        if (result) {
+                pr_debug("%s:%d: lv1_get_repository_node_value failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+                dump_node_name(lpar_id, n1, n2, n3, n4);
+                return result;
+        }
+
+        dump_node(lpar_id, n1, n2, n3, n4, v1, v2);
+
+        if (_v1)
+                *_v1 = v1;
+        if (_v2)
+                *_v2 = v2;
+
+        if (v1 && !_v1)
+                pr_debug("%s:%d: warning: discarding non-zero v1: %016lx\n",
+                        __func__, __LINE__, v1);
+        if (v2 && !_v2)
+                pr_debug("%s:%d: warning: discarding non-zero v2: %016lx\n",
+                        __func__, __LINE__, v2);
+
+        return result;
+}
+
+int ps3_repository_read_bus_str(unsigned int bus_index, const char *bus_str,
+        u64 *value)
+{
+        return read_node(PS3_LPAR_ID_PME,
+                make_first_field("bus", bus_index),
+                make_field(bus_str, 0),
+                0, 0,
+                value, 0);
+}
+
+int ps3_repository_read_bus_id(unsigned int bus_index, unsigned int *bus_id)
+{
+        int result;
+        u64 v1;
+        u64 v2; /* unused */
+
+        result = read_node(PS3_LPAR_ID_PME,
+                make_first_field("bus", bus_index),
+                make_field("id", 0),
+                0, 0,
+                &v1, &v2);
+        *bus_id = v1;
+        return result;
+}
+
+int ps3_repository_read_bus_type(unsigned int bus_index,
+        enum ps3_bus_type *bus_type)
+{
+        int result;
+        u64 v1;
+
+        result = read_node(PS3_LPAR_ID_PME,
+                make_first_field("bus", bus_index),
+                make_field("type", 0),
+                0, 0,
+                &v1, 0);
+        *bus_type = v1;
+        return result;
+}
+
+int ps3_repository_read_bus_num_dev(unsigned int bus_index,
+        unsigned int *num_dev)
+{
+        int result;
+        u64 v1;
+
+        result = read_node(PS3_LPAR_ID_PME,
+                make_first_field("bus", bus_index),
+                make_field("num_dev", 0),
+                0, 0,
+                &v1, 0);
+        *num_dev = v1;
+        return result;
+}
+
+int ps3_repository_read_dev_str(unsigned int bus_index,
+        unsigned int dev_index, const char *dev_str, u64 *value)
+{
+        return read_node(PS3_LPAR_ID_PME,
+                make_first_field("bus", bus_index),
+                make_field("dev", dev_index),
+                make_field(dev_str, 0),
+                0,
+                value, 0);
+}
+
+int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index,
+        unsigned int *dev_id)
+{
+        int result;
+        u64 v1;
+
+        result = read_node(PS3_LPAR_ID_PME,
+                make_first_field("bus", bus_index),
+                make_field("dev", dev_index),
+                make_field("id", 0),
+                0,
+                &v1, 0);
+        *dev_id = v1;
+        return result;
+}
+
+int ps3_repository_read_dev_type(unsigned int bus_index,
+        unsigned int dev_index, enum ps3_dev_type *dev_type)
+{
+        int result;
+        u64 v1;
+
+        result = read_node(PS3_LPAR_ID_PME,
+                make_first_field("bus", bus_index),
+                make_field("dev", dev_index),
+                make_field("type", 0),
+                0,
+                &v1, 0);
+        *dev_type = v1;
+        return result;
+}
+
+int ps3_repository_read_dev_intr(unsigned int bus_index,
+        unsigned int dev_index, unsigned int intr_index,
+        unsigned int *intr_type, unsigned int* interrupt_id)
+{
+        int result;
+        u64 v1;
+        u64 v2;
+
+        result = read_node(PS3_LPAR_ID_PME,
+                make_first_field("bus", bus_index),
+                make_field("dev", dev_index),
+                make_field("intr", intr_index),
+                0,
+                &v1, &v2);
+        *intr_type = v1;
+        *interrupt_id = v2;
+        return result;
+}
+
+int ps3_repository_read_dev_reg_type(unsigned int bus_index,
+        unsigned int dev_index, unsigned int reg_index, unsigned int *reg_type)
+{
+        int result;
+        u64 v1;
+
+        result = read_node(PS3_LPAR_ID_PME,
+                make_first_field("bus", bus_index),
+                make_field("dev", dev_index),
+                make_field("reg", reg_index),
+                make_field("type", 0),
+                &v1, 0);
+        *reg_type = v1;
+        return result;
+}
+
+int ps3_repository_read_dev_reg_addr(unsigned int bus_index,
+        unsigned int dev_index, unsigned int reg_index, u64 *bus_addr, u64 *len)
+{
+        return read_node(PS3_LPAR_ID_PME,
+                make_first_field("bus", bus_index),
+                make_field("dev", dev_index),
+                make_field("reg", reg_index),
+                make_field("data", 0),
+                bus_addr, len);
+}
+
+int ps3_repository_read_dev_reg(unsigned int bus_index,
+        unsigned int dev_index, unsigned int reg_index, unsigned int *reg_type,
+        u64 *bus_addr, u64 *len)
+{
+        int result = ps3_repository_read_dev_reg_type(bus_index, dev_index,
+                reg_index, reg_type);
+        return result ? result
+                : ps3_repository_read_dev_reg_addr(bus_index, dev_index,
+                reg_index, bus_addr, len);
+}
+
+#if defined(DEBUG)
+int ps3_repository_dump_resource_info(unsigned int bus_index,
+        unsigned int dev_index)
+{
+        int result = 0;
+        unsigned int res_index;
+
+        pr_debug(" -> %s:%d: (%u:%u)\n", __func__, __LINE__,
+                bus_index, dev_index);
+
+        for (res_index = 0; res_index < 10; res_index++) {
+                enum ps3_interrupt_type intr_type;
+                unsigned int interrupt_id;
+
+                result = ps3_repository_read_dev_intr(bus_index, dev_index,
+                        res_index, &intr_type, &interrupt_id);
+
+                if (result) {
+                        if (result !=  LV1_NO_ENTRY)
+                                pr_debug("%s:%d ps3_repository_read_dev_intr"
+                                        " (%u:%u) failed\n", __func__, __LINE__,
+                                        bus_index, dev_index);
+                        break;
+                }
+
+                pr_debug("%s:%d (%u:%u) intr_type %u, interrupt_id %u\n",
+                        __func__, __LINE__, bus_index, dev_index, intr_type,
+                        interrupt_id);
+        }
+
+        for (res_index = 0; res_index < 10; res_index++) {
+                enum ps3_region_type reg_type;
+                u64 bus_addr;
+                u64 len;
+
+                result = ps3_repository_read_dev_reg(bus_index, dev_index,
+                        res_index, &reg_type, &bus_addr, &len);
+
+                if (result) {
+                        if (result !=  LV1_NO_ENTRY)
+                                pr_debug("%s:%d ps3_repository_read_dev_reg"
+                                        " (%u:%u) failed\n", __func__, __LINE__,
+                                        bus_index, dev_index);
+                        break;
+                }
+
+                pr_debug("%s:%d (%u:%u) reg_type %u, bus_addr %lxh, len %lxh\n",
+                        __func__, __LINE__, bus_index, dev_index, reg_type,
+                        bus_addr, len);
+        }
+
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+
+static int dump_device_info(unsigned int bus_index, unsigned int num_dev)
+{
+        int result = 0;
+        unsigned int dev_index;
+
+        pr_debug(" -> %s:%d: bus_%u\n", __func__, __LINE__, bus_index);
+
+        for (dev_index = 0; dev_index < num_dev; dev_index++) {
+                enum ps3_dev_type dev_type;
+                unsigned int dev_id;
+
+                result = ps3_repository_read_dev_type(bus_index, dev_index,
+                        &dev_type);
+
+                if (result) {
+                        pr_debug("%s:%d ps3_repository_read_dev_type"
+                                " (%u:%u) failed\n", __func__, __LINE__,
+                                bus_index, dev_index);
+                        break;
+                }
+
+                result = ps3_repository_read_dev_id(bus_index, dev_index,
+                        &dev_id);
+
+                if (result) {
+                        pr_debug("%s:%d ps3_repository_read_dev_id"
+                                " (%u:%u) failed\n", __func__, __LINE__,
+                                bus_index, dev_index);
+                        continue;
+                }
+
+                pr_debug("%s:%d  (%u:%u): dev_type %u, dev_id %u\n", __func__,
+                        __LINE__, bus_index, dev_index, dev_type, dev_id);
+
+                ps3_repository_dump_resource_info(bus_index, dev_index);
+        }
+
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+
+int ps3_repository_dump_bus_info(void)
+{
+        int result = 0;
+        unsigned int bus_index;
+
+        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+
+        for (bus_index = 0; bus_index < 10; bus_index++) {
+                enum ps3_bus_type bus_type;
+                unsigned int bus_id;
+                unsigned int num_dev;
+
+                result = ps3_repository_read_bus_type(bus_index, &bus_type);
+
+                if (result) {
+                        pr_debug("%s:%d read_bus_type(%u) failed\n",
+                                __func__, __LINE__, bus_index);
+                        break;
+                }
+
+                result = ps3_repository_read_bus_id(bus_index, &bus_id);
+
+                if (result) {
+                        pr_debug("%s:%d read_bus_id(%u) failed\n",
+                                __func__, __LINE__, bus_index);
+                        continue;
+                }
+
+                if (bus_index != bus_id)
+                        pr_debug("%s:%d bus_index != bus_id\n",
+                                __func__, __LINE__);
+
+                result = ps3_repository_read_bus_num_dev(bus_index, &num_dev);
+
+                if (result) {
+                        pr_debug("%s:%d read_bus_num_dev(%u) failed\n",
+                                __func__, __LINE__, bus_index);
+                        continue;
+                }
+
+                pr_debug("%s:%d bus_%u: bus_type %u, bus_id %u, num_dev %u\n",
+                        __func__, __LINE__, bus_index, bus_type, bus_id,
+                        num_dev);
+
+                dump_device_info(bus_index, num_dev);
+        }
+
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+#endif /* defined(DEBUG) */
+
+static int find_device(unsigned int bus_index, unsigned int num_dev,
+        unsigned int start_dev_index, enum ps3_dev_type dev_type,
+        struct ps3_repository_device *dev)
+{
+        int result = 0;
+        unsigned int dev_index;
+
+        pr_debug("%s:%d: find dev_type %u\n", __func__, __LINE__, dev_type);
+
+        dev->dev_index = UINT_MAX;
+
+        for (dev_index = start_dev_index; dev_index < num_dev; dev_index++) {
+                enum ps3_dev_type x;
+
+                result = ps3_repository_read_dev_type(bus_index, dev_index,
+                        &x);
+
+                if (result) {
+                        pr_debug("%s:%d read_dev_type failed\n",
+                                __func__, __LINE__);
+                        return result;
+                }
+
+                if (x == dev_type)
+                        break;
+        }
+
+        BUG_ON(dev_index == num_dev);
+
+        pr_debug("%s:%d: found dev_type %u at dev_index %u\n",
+                __func__, __LINE__, dev_type, dev_index);
+
+        result = ps3_repository_read_dev_id(bus_index, dev_index,
+                &dev->did.dev_id);
+
+        if (result) {
+                pr_debug("%s:%d read_dev_id failed\n",
+                        __func__, __LINE__);
+                return result;
+        }
+
+        dev->dev_index = dev_index;
+
+        pr_debug("%s:%d found: dev_id %u\n", __func__, __LINE__,
+                dev->did.dev_id);
+
+        return result;
+}
+
+int ps3_repository_find_device (enum ps3_bus_type bus_type,
+        enum ps3_dev_type dev_type,
+        const struct ps3_repository_device *start_dev,
+        struct ps3_repository_device *dev)
+{
+        int result = 0;
+        unsigned int bus_index;
+        unsigned int num_dev;
+
+        pr_debug("%s:%d: find bus_type %u, dev_type %u\n", __func__, __LINE__,
+                bus_type, dev_type);
+
+        dev->bus_index = UINT_MAX;
+
+        for (bus_index = start_dev ? start_dev->bus_index : 0; bus_index < 10;
+                bus_index++) {
+                enum ps3_bus_type x;
+
+                result = ps3_repository_read_bus_type(bus_index, &x);
+
+                if (result) {
+                        pr_debug("%s:%d read_bus_type failed\n",
+                                __func__, __LINE__);
+                        return result;
+                }
+                if (x == bus_type)
+                        break;
+        }
+
+        BUG_ON(bus_index == 10);
+
+        pr_debug("%s:%d: found bus_type %u at bus_index %u\n",
+                __func__, __LINE__, bus_type, bus_index);
+
+        result = ps3_repository_read_bus_num_dev(bus_index, &num_dev);
+
+        if (result) {
+                pr_debug("%s:%d read_bus_num_dev failed\n",
+                        __func__, __LINE__);
+                return result;
+        }
+
+        result = find_device(bus_index, num_dev, start_dev
+                ? start_dev->dev_index + 1 : 0, dev_type, dev);
+
+        if (result) {
+                pr_debug("%s:%d get_did failed\n", __func__, __LINE__);
+                return result;
+        }
+
+        result = ps3_repository_read_bus_id(bus_index, &dev->did.bus_id);
+
+        if (result) {
+                pr_debug("%s:%d read_bus_id failed\n",
+                        __func__, __LINE__);
+                return result;
+        }
+
+        dev->bus_index = bus_index;
+
+        pr_debug("%s:%d found: bus_id %u, dev_id %u\n",
+                __func__, __LINE__, dev->did.bus_id, dev->did.dev_id);
+
+        return result;
+}
+
+int ps3_repository_find_interrupt(const struct ps3_repository_device *dev,
+        enum ps3_interrupt_type intr_type, unsigned int *interrupt_id)
+{
+        int result = 0;
+        unsigned int res_index;
+
+        pr_debug("%s:%d: find intr_type %u\n", __func__, __LINE__, intr_type);
+
+        *interrupt_id = UINT_MAX;
+
+        for (res_index = 0; res_index < 10; res_index++) {
+                enum ps3_interrupt_type t;
+                unsigned int id;
+
+                result = ps3_repository_read_dev_intr(dev->bus_index,
+                        dev->dev_index, res_index, &t, &id);
+
+                if (result) {
+                        pr_debug("%s:%d read_dev_intr failed\n",
+                                __func__, __LINE__);
+                        return result;
+                }
+
+                if (t == intr_type) {
+                        *interrupt_id = id;
+                        break;
+                }
+        }
+
+        BUG_ON(res_index == 10);
+
+        pr_debug("%s:%d: found intr_type %u at res_index %u\n",
+                __func__, __LINE__, intr_type, res_index);
+
+        return result;
+}
+
+int ps3_repository_find_region(const struct ps3_repository_device *dev,
+        enum ps3_region_type reg_type, u64 *bus_addr, u64 *len)
+{
+        int result = 0;
+        unsigned int res_index;
+
+        pr_debug("%s:%d: find reg_type %u\n", __func__, __LINE__, reg_type);
+
+        *bus_addr = *len = 0;
+
+        for (res_index = 0; res_index < 10; res_index++) {
+                enum ps3_region_type t;
+                u64 a;
+                u64 l;
+
+                result = ps3_repository_read_dev_reg(dev->bus_index,
+                        dev->dev_index, res_index, &t, &a, &l);
+
+                if (result) {
+                        pr_debug("%s:%d read_dev_reg failed\n",
+                                __func__, __LINE__);
+                        return result;
+                }
+
+                if (t == reg_type) {
+                        *bus_addr = a;
+                        *len = l;
+                        break;
+                }
+        }
+
+        BUG_ON(res_index == 10);
+
+        pr_debug("%s:%d: found reg_type %u at res_index %u\n",
+                __func__, __LINE__, reg_type, res_index);
+
+        return result;
+}
+
+int ps3_repository_read_rm_size(unsigned int ppe_id, u64 *rm_size)
+{
+        return read_node(PS3_LPAR_ID_CURRENT,
+                make_first_field("bi", 0),
+                make_field("pu", 0),
+                ppe_id,
+                make_field("rm_size", 0),
+                rm_size, 0);
+}
+
+int ps3_repository_read_region_total(u64 *region_total)
+{
+        return read_node(PS3_LPAR_ID_CURRENT,
+                make_first_field("bi", 0),
+                make_field("rgntotal", 0),
+                0, 0,
+                region_total, 0);
+}
+
+/**
+ * ps3_repository_read_mm_info - Read mm info for single pu system.
+ * @rm_base: Real mode memory base address.
+ * @rm_size: Real mode memory size.
+ * @region_total: Maximum memory region size.
+ */
+
+int ps3_repository_read_mm_info(u64 *rm_base, u64 *rm_size, u64 *region_total)
+{
+        int result;
+        u64 ppe_id;
+
+        lv1_get_logical_ppe_id(&ppe_id);
+        *rm_base = 0;
+        result = ps3_repository_read_rm_size(ppe_id, rm_size);
+        return result ? result
+                : ps3_repository_read_region_total(region_total);
+}
+
+/**
+ * ps3_repository_read_num_spu_reserved - Number of physical spus reserved.
+ * @num_spu: Number of physical spus.
+ */
+
+int ps3_repository_read_num_spu_reserved(unsigned int *num_spu_reserved)
+{
+        int result;
+        u64 v1;
+
+        result = read_node(PS3_LPAR_ID_CURRENT,
+                make_first_field("bi", 0),
+                make_field("spun", 0),
+                0, 0,
+                &v1, 0);
+        *num_spu_reserved = v1;
+        return result;
+}
+
+/**
+ * ps3_repository_read_num_spu_resource_id - Number of spu resource reservations.
+ * @num_resource_id: Number of spu resource ids.
+ */
+
+int ps3_repository_read_num_spu_resource_id(unsigned int *num_resource_id)
+{
+        int result;
+        u64 v1;
+
+        result = read_node(PS3_LPAR_ID_CURRENT,
+                make_first_field("bi", 0),
+                make_field("spursvn", 0),
+                0, 0,
+                &v1, 0);
+        *num_resource_id = v1;
+        return result;
+}
+
+/**
+ * ps3_repository_read_spu_resource_id - spu resource reservation id value.
+ * @res_index: Resource reservation index.
+ * @resource_type: Resource reservation type.
+ * @resource_id: Resource reservation id.
+ */
+
+int ps3_repository_read_spu_resource_id(unsigned int res_index,
+        enum ps3_spu_resource_type* resource_type, unsigned int *resource_id)
+{
+        int result;
+        u64 v1;
+        u64 v2;
+
+        result = read_node(PS3_LPAR_ID_CURRENT,
+                make_first_field("bi", 0),
+                make_field("spursv", 0),
+                res_index,
+                0,
+                &v1, &v2);
+        *resource_type = v1;
+        *resource_id = v2;
+        return result;
+}
+
+int ps3_repository_read_boot_dat_address(u64 *address)
+{
+        return read_node(PS3_LPAR_ID_CURRENT,
+                make_first_field("bi", 0),
+                make_field("boot_dat", 0),
+                make_field("address", 0),
+                0,
+                address, 0);
+}
+
+int ps3_repository_read_boot_dat_size(unsigned int *size)
+{
+        int result;
+        u64 v1;
+
+        result = read_node(PS3_LPAR_ID_CURRENT,
+                make_first_field("bi", 0),
+                make_field("boot_dat", 0),
+                make_field("size", 0),
+                0,
+                &v1, 0);
+        *size = v1;
+        return result;
+}
+
+/**
+  * ps3_repository_read_boot_dat_info - Get address and size of cell_ext_os_area.
+  * address: lpar address of cell_ext_os_area
+  * @size: size of cell_ext_os_area
+  */
+
+int ps3_repository_read_boot_dat_info(u64 *lpar_addr, unsigned int *size)
+{
+        int result;
+
+        *size = 0;
+        result = ps3_repository_read_boot_dat_address(lpar_addr);
+        return result ? result
+                : ps3_repository_read_boot_dat_size(size);
+}
+
+int ps3_repository_read_num_be(unsigned int *num_be)
+{
+        int result;
+        u64 v1;
+
+        result = read_node(PS3_LPAR_ID_PME,
+                make_first_field("ben", 0),
+                0,
+                0,
+                0,
+                &v1, 0);
+        *num_be = v1;
+        return result;
+}
+
+int ps3_repository_read_be_node_id(unsigned int be_index, u64 *node_id)
+{
+        return read_node(PS3_LPAR_ID_PME,
+                make_first_field("be", be_index),
+                0,
+                0,
+                0,
+                node_id, 0);
+}
+
+int ps3_repository_read_tb_freq(u64 node_id, u64 *tb_freq)
+{
+        return read_node(PS3_LPAR_ID_PME,
+                make_first_field("be", 0),
+                node_id,
+                make_field("clock", 0),
+                0,
+                tb_freq, 0);
+}
+
+int ps3_repository_read_be_tb_freq(unsigned int be_index, u64 *tb_freq)
+{
+        int result;
+        u64 node_id;
+
+        *tb_freq = 0;
+        result = ps3_repository_read_be_node_id(0, &node_id);
+        return result ? result
+                : ps3_repository_read_tb_freq(node_id, tb_freq);
+}
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
new file mode 100644
index 000000000000..d8b5cadbe80e
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -0,0 +1,173 @@
+/*
+ *  PS3 platform setup routines.
+ *
+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
+ *  Copyright 2006 Sony Corp.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/fs.h>
+#include <linux/root_dev.h>
+#include <linux/console.h>
+#include <linux/kexec.h>
+
+#include <asm/machdep.h>
+#include <asm/firmware.h>
+#include <asm/time.h>
+#include <asm/iommu.h>
+#include <asm/udbg.h>
+#include <asm/prom.h>
+#include <asm/lv1call.h>
+
+#include "platform.h"
+
+#if defined(DEBUG)
+#define DBG(fmt...) udbg_printf(fmt)
+#else
+#define DBG(fmt...) do{if(0)printk(fmt);}while(0)
+#endif
+
+static void ps3_show_cpuinfo(struct seq_file *m)
+{
+        seq_printf(m, "machine\t\t: %s\n", ppc_md.name);
+}
+
+static void ps3_power_save(void)
+{
+        /*
+         * lv1_pause() puts the PPE thread into inactive state until an
+         * irq on an unmasked plug exists. MSR[EE] has no effect.
+         * flags: 0 = wake on DEC interrupt, 1 = ignore DEC interrupt.
+         */
+
+        lv1_pause(0);
+}
+
+static void ps3_panic(char *str)
+{
+        DBG("%s:%d %s\n", __func__, __LINE__, str);
+
+#ifdef CONFIG_SMP
+        smp_send_stop();
+#endif
+        printk("\n");
+        printk("   System does not reboot automatically.\n");
+        printk("   Please press POWER button.\n");
+        printk("\n");
+
+        for (;;) ;
+}
+
+static void __init ps3_setup_arch(void)
+{
+        DBG(" -> %s:%d\n", __func__, __LINE__);
+
+        ps3_spu_set_platform();
+        ps3_map_htab();
+
+#ifdef CONFIG_SMP
+        smp_init_ps3();
+#endif
+
+#ifdef CONFIG_DUMMY_CONSOLE
+        conswitchp = &dummy_con;
+#endif
+
+        ppc_md.power_save = ps3_power_save;
+
+        DBG(" <- %s:%d\n", __func__, __LINE__);
+}
+
+static void __init ps3_progress(char *s, unsigned short hex)
+{
+        printk("*** %04x : %s\n", hex, s ? s : "");
+}
+
+static int __init ps3_probe(void)
+{
+        unsigned long htab_size;
+        unsigned long dt_root;
+
+        DBG(" -> %s:%d\n", __func__, __LINE__);
+
+        dt_root = of_get_flat_dt_root();
+        if (!of_flat_dt_is_compatible(dt_root, "PS3"))
+                return 0;
+
+        powerpc_firmware_features |= FW_FEATURE_PS3_POSSIBLE;
+
+        ps3_os_area_init();
+        ps3_mm_init();
+        ps3_mm_vas_create(&htab_size);
+        ps3_hpte_init(htab_size);
+
+        DBG(" <- %s:%d\n", __func__, __LINE__);
+        return 1;
+}
+
+#if defined(CONFIG_KEXEC)
+static void ps3_kexec_cpu_down(int crash_shutdown, int secondary)
+{
+        DBG(" -> %s:%d\n", __func__, __LINE__);
+
+        if (secondary) {
+                int cpu;
+                for_each_online_cpu(cpu)
+                        if (cpu)
+                                ps3_smp_cleanup_cpu(cpu);
+        } else
+                ps3_smp_cleanup_cpu(0);
+
+        DBG(" <- %s:%d\n", __func__, __LINE__);
+}
+
+static void ps3_machine_kexec(struct kimage *image)
+{
+        unsigned long ppe_id;
+
+        DBG(" -> %s:%d\n", __func__, __LINE__);
+
+        lv1_get_logical_ppe_id(&ppe_id);
+        lv1_configure_irq_state_bitmap(ppe_id, 0, 0);
+        ps3_mm_shutdown();
+        ps3_mm_vas_destroy();
+
+        default_machine_kexec(image);
+
+        DBG(" <- %s:%d\n", __func__, __LINE__);
+}
+#endif
+
+define_machine(ps3) {
+        .name                           = "PS3",
+        .probe                          = ps3_probe,
+        .setup_arch                     = ps3_setup_arch,
+        .show_cpuinfo                   = ps3_show_cpuinfo,
+        .init_IRQ                       = ps3_init_IRQ,
+        .panic                          = ps3_panic,
+        .get_boot_time                  = ps3_get_boot_time,
+        .set_rtc_time                   = ps3_set_rtc_time,
+        .get_rtc_time                   = ps3_get_rtc_time,
+        .calibrate_decr                 = ps3_calibrate_decr,
+        .progress                       = ps3_progress,
+#if defined(CONFIG_KEXEC)
+        .kexec_cpu_down                 = ps3_kexec_cpu_down,
+        .machine_kexec                  = ps3_machine_kexec,
+        .machine_kexec_prepare          = default_machine_kexec_prepare,
+        .machine_crash_shutdown         = default_machine_crash_shutdown,
+#endif
+};
diff --git a/arch/powerpc/platforms/ps3/smp.c b/arch/powerpc/platforms/ps3/smp.c
new file mode 100644
index 000000000000..11d2080607ed
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/smp.c
@@ -0,0 +1,158 @@
+/*
+ *  PS3 SMP routines.
+ *
+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
+ *  Copyright 2006 Sony Corp.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/smp.h>
+
+#include <asm/machdep.h>
+#include <asm/udbg.h>
+#include <asm/ps3.h>
+
+#include "platform.h"
+
+#if defined(DEBUG)
+#define DBG(fmt...) udbg_printf(fmt)
+#else
+#define DBG(fmt...) do{if(0)printk(fmt);}while(0)
+#endif
+
+static irqreturn_t ipi_function_handler(int irq, void *msg)
+{
+        smp_message_recv((int)(long)msg);
+        return IRQ_HANDLED;
+}
+
+/**
+  * virqs - a per cpu array of virqs for ipi use
+  */
+
+#define MSG_COUNT 4
+static DEFINE_PER_CPU(unsigned int, virqs[MSG_COUNT]);
+
+static const char *names[MSG_COUNT] = {
+        "ipi call",
+        "ipi reschedule",
+        "ipi migrate",
+        "ipi debug brk"
+};
+
+static void do_message_pass(int target, int msg)
+{
+        int result;
+        unsigned int virq;
+
+        if (msg >= MSG_COUNT) {
+                DBG("%s:%d: bad msg: %d\n", __func__, __LINE__, msg);
+                return;
+        }
+
+        virq = per_cpu(virqs, target)[msg];
+        result = ps3_send_event_locally(virq);
+
+        if (result)
+                DBG("%s:%d: ps3_send_event_locally(%d, %d) failed"
+                        " (%d)\n", __func__, __LINE__, target, msg, result);
+}
+
+static void ps3_smp_message_pass(int target, int msg)
+{
+        int cpu;
+
+        if (target < NR_CPUS)
+                do_message_pass(target, msg);
+        else if (target == MSG_ALL_BUT_SELF) {
+                for_each_online_cpu(cpu)
+                        if (cpu != smp_processor_id())
+                                do_message_pass(cpu, msg);
+        } else {
+                for_each_online_cpu(cpu)
+                        do_message_pass(cpu, msg);
+        }
+}
+
+static int ps3_smp_probe(void)
+{
+        return 2;
+}
+
+static void __init ps3_smp_setup_cpu(int cpu)
+{
+        int result;
+        unsigned int *virqs = per_cpu(virqs, cpu);
+        int i;
+
+        DBG(" -> %s:%d: (%d)\n", __func__, __LINE__, cpu);
+
+        /*
+         * Check assumptions on virqs[] indexing. If this
+         * check fails, then a different mapping of PPC_MSG_
+         * to index needs to be setup.
+         */
+
+        BUILD_BUG_ON(PPC_MSG_CALL_FUNCTION  != 0);
+        BUILD_BUG_ON(PPC_MSG_RESCHEDULE     != 1);
+        BUILD_BUG_ON(PPC_MSG_DEBUGGER_BREAK != 3);
+
+        for (i = 0; i < MSG_COUNT; i++) {
+                result = ps3_alloc_event_irq(&virqs[i]);
+
+                if (result)
+                        continue;
+
+                DBG("%s:%d: (%d, %d) => virq %u\n",
+                        __func__, __LINE__, cpu, i, virqs[i]);
+
+
+                request_irq(virqs[i], ipi_function_handler, IRQF_DISABLED,
+                        names[i], (void*)(long)i);
+        }
+
+        ps3_register_ipi_debug_brk(cpu, virqs[PPC_MSG_DEBUGGER_BREAK]);
+
+        DBG(" <- %s:%d: (%d)\n", __func__, __LINE__, cpu);
+}
+
+void ps3_smp_cleanup_cpu(int cpu)
+{
+        unsigned int *virqs = per_cpu(virqs, cpu);
+        int i;
+
+        DBG(" -> %s:%d: (%d)\n", __func__, __LINE__, cpu);
+        for (i = 0; i < MSG_COUNT; i++) {
+                ps3_free_event_irq(virqs[i]);
+                free_irq(virqs[i], (void*)(long)i);
+                virqs[i] = NO_IRQ;
+        }
+        DBG(" <- %s:%d: (%d)\n", __func__, __LINE__, cpu);
+}
+
+static struct smp_ops_t ps3_smp_ops = {
+        .probe          = ps3_smp_probe,
+        .message_pass   = ps3_smp_message_pass,
+        .kick_cpu       = smp_generic_kick_cpu,
+        .setup_cpu      = ps3_smp_setup_cpu,
+};
+
+void smp_init_ps3(void)
+{
+        DBG(" -> %s\n", __func__);
+        smp_ops = &ps3_smp_ops;
+        DBG(" <- %s\n", __func__);
+}
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
new file mode 100644
index 000000000000..644532c3b7c4
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -0,0 +1,613 @@
+/*
+ *  PS3 Platform spu routines.
+ *
+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
+ *  Copyright 2006 Sony Corp.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/mmzone.h>
+#include <linux/io.h>
+#include <linux/mm.h>
+
+#include <asm/spu.h>
+#include <asm/spu_priv1.h>
+#include <asm/ps3.h>
+#include <asm/lv1call.h>
+
+/* spu_management_ops */
+
+/**
+ * enum spe_type - Type of spe to create.
+ * @spe_type_logical: Standard logical spe.
+ *
+ * For use with lv1_construct_logical_spe().  The current HV does not support
+ * any types other than those listed.
+ */
+
+enum spe_type {
+        SPE_TYPE_LOGICAL = 0,
+};
+
+/**
+ * struct spe_shadow - logical spe shadow register area.
+ *
+ * Read-only shadow of spe registers.
+ */
+
+struct spe_shadow {
+        u8 padding_0000[0x0140];
+        u64 int_status_class0_RW;       /* 0x0140 */
+        u64 int_status_class1_RW;       /* 0x0148 */
+        u64 int_status_class2_RW;       /* 0x0150 */
+        u8 padding_0158[0x0610-0x0158];
+        u64 mfc_dsisr_RW;               /* 0x0610 */
+        u8 padding_0618[0x0620-0x0618];
+        u64 mfc_dar_RW;                 /* 0x0620 */
+        u8 padding_0628[0x0800-0x0628];
+        u64 mfc_dsipr_R;                /* 0x0800 */
+        u8 padding_0808[0x0810-0x0808];
+        u64 mfc_lscrr_R;                /* 0x0810 */
+        u8 padding_0818[0x0c00-0x0818];
+        u64 mfc_cer_R;                  /* 0x0c00 */
+        u8 padding_0c08[0x0f00-0x0c08];
+        u64 spe_execution_status;       /* 0x0f00 */
+        u8 padding_0f08[0x1000-0x0f08];
+} __attribute__ ((packed));
+
+
+/**
+ * enum spe_ex_state - Logical spe execution state.
+ * @spe_ex_state_unexecutable: Uninitialized.
+ * @spe_ex_state_executable: Enabled, not ready.
+ * @spe_ex_state_executed: Ready for use.
+ *
+ * The execution state (status) of the logical spe as reported in
+ * struct spe_shadow:spe_execution_status.
+ */
+
+enum spe_ex_state {
+        SPE_EX_STATE_UNEXECUTABLE = 0,
+        SPE_EX_STATE_EXECUTABLE = 2,
+        SPE_EX_STATE_EXECUTED = 3,
+};
+
+/**
+ * struct priv1_cache - Cached values of priv1 registers.
+ * @masks[]: Array of cached spe interrupt masks, indexed by class.
+ * @sr1: Cached mfc_sr1 register.
+ * @tclass_id: Cached mfc_tclass_id register.
+ */
+
+struct priv1_cache {
+        u64 masks[3];
+        u64 sr1;
+        u64 tclass_id;
+};
+
+/**
+ * struct spu_pdata - Platform state variables.
+ * @spe_id: HV spe id returned by lv1_construct_logical_spe().
+ * @resource_id: HV spe resource id returned by
+ *      ps3_repository_read_spe_resource_id().
+ * @priv2_addr: lpar address of spe priv2 area returned by
+ *      lv1_construct_logical_spe().
+ * @shadow_addr: lpar address of spe register shadow area returned by
+ *      lv1_construct_logical_spe().
+ * @shadow: Virtual (ioremap) address of spe register shadow area.
+ * @cache: Cached values of priv1 registers.
+ */
+
+struct spu_pdata {
+        u64 spe_id;
+        u64 resource_id;
+        u64 priv2_addr;
+        u64 shadow_addr;
+        struct spe_shadow __iomem *shadow;
+        struct priv1_cache cache;
+};
+
+static struct spu_pdata *spu_pdata(struct spu *spu)
+{
+        return spu->pdata;
+}
+
+#define dump_areas(_a, _b, _c, _d, _e) \
+        _dump_areas(_a, _b, _c, _d, _e, __func__, __LINE__)
+static void _dump_areas(unsigned int spe_id, unsigned long priv2,
+        unsigned long problem, unsigned long ls, unsigned long shadow,
+        const char* func, int line)
+{
+        pr_debug("%s:%d: spe_id:  %xh (%u)\n", func, line, spe_id, spe_id);
+        pr_debug("%s:%d: priv2:   %lxh\n", func, line, priv2);
+        pr_debug("%s:%d: problem: %lxh\n", func, line, problem);
+        pr_debug("%s:%d: ls:      %lxh\n", func, line, ls);
+        pr_debug("%s:%d: shadow:  %lxh\n", func, line, shadow);
+}
+
+static unsigned long get_vas_id(void)
+{
+        unsigned long id;
+
+        lv1_get_logical_ppe_id(&id);
+        lv1_get_virtual_address_space_id_of_ppe(id, &id);
+
+        return id;
+}
+
+static int __init construct_spu(struct spu *spu)
+{
+        int result;
+        unsigned long unused;
+
+        result = lv1_construct_logical_spe(PAGE_SHIFT, PAGE_SHIFT, PAGE_SHIFT,
+                PAGE_SHIFT, PAGE_SHIFT, get_vas_id(), SPE_TYPE_LOGICAL,
+                &spu_pdata(spu)->priv2_addr, &spu->problem_phys,
+                &spu->local_store_phys, &unused,
+                &spu_pdata(spu)->shadow_addr,
+                &spu_pdata(spu)->spe_id);
+
+        if (result) {
+                pr_debug("%s:%d: lv1_construct_logical_spe failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+                return result;
+        }
+
+        return result;
+}
+
+static int __init add_spu_pages(unsigned long start_addr, unsigned long size)
+{
+        int result;
+        unsigned long start_pfn;
+        unsigned long nr_pages;
+        struct pglist_data *pgdata;
+        struct zone *zone;
+
+        BUG_ON(!mem_init_done);
+
+        start_pfn = start_addr >> PAGE_SHIFT;
+        nr_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+
+        pgdata = NODE_DATA(0);
+        zone = pgdata->node_zones;
+
+        result = __add_pages(zone, start_pfn, nr_pages);
+
+        if (result)
+                pr_debug("%s:%d: __add_pages failed: (%d)\n",
+                        __func__, __LINE__, result);
+
+        return result;
+}
+
+static void spu_unmap(struct spu *spu)
+{
+        iounmap(spu->priv2);
+        iounmap(spu->problem);
+        iounmap((__force u8 __iomem *)spu->local_store);
+        iounmap(spu_pdata(spu)->shadow);
+}
+
+static int __init setup_areas(struct spu *spu)
+{
+        struct table {char* name; unsigned long addr; unsigned long size;};
+        int result;
+
+        /* setup pages */
+
+        result = add_spu_pages(spu->local_store_phys, LS_SIZE);
+        if (result)
+                goto fail_add;
+
+        result = add_spu_pages(spu->problem_phys, sizeof(struct spu_problem));
+        if (result)
+                goto fail_add;
+
+        /* ioremap */
+
+        spu_pdata(spu)->shadow = __ioremap(
+                spu_pdata(spu)->shadow_addr, sizeof(struct spe_shadow),
+                PAGE_READONLY | _PAGE_NO_CACHE | _PAGE_GUARDED);
+        if (!spu_pdata(spu)->shadow) {
+                pr_debug("%s:%d: ioremap shadow failed\n", __func__, __LINE__);
+                goto fail_ioremap;
+        }
+
+        spu->local_store = ioremap(spu->local_store_phys, LS_SIZE);
+        if (!spu->local_store) {
+                pr_debug("%s:%d: ioremap local_store failed\n",
+                        __func__, __LINE__);
+                goto fail_ioremap;
+        }
+
+        spu->problem = ioremap(spu->problem_phys,
+                sizeof(struct spu_problem));
+        if (!spu->problem) {
+                pr_debug("%s:%d: ioremap problem failed\n", __func__, __LINE__);
+                goto fail_ioremap;
+        }
+
+        spu->priv2 = ioremap(spu_pdata(spu)->priv2_addr,
+                sizeof(struct spu_priv2));
+        if (!spu->priv2) {
+                pr_debug("%s:%d: ioremap priv2 failed\n", __func__, __LINE__);
+                goto fail_ioremap;
+        }
+
+        dump_areas(spu_pdata(spu)->spe_id, spu_pdata(spu)->priv2_addr,
+                spu->problem_phys, spu->local_store_phys,
+                spu_pdata(spu)->shadow_addr);
+        dump_areas(spu_pdata(spu)->spe_id, (unsigned long)spu->priv2,
+                (unsigned long)spu->problem, (unsigned long)spu->local_store,
+                (unsigned long)spu_pdata(spu)->shadow);
+
+        return 0;
+
+fail_ioremap:
+        spu_unmap(spu);
+fail_add:
+        return result;
+}
+
+static int __init setup_interrupts(struct spu *spu)
+{
+        int result;
+
+        result = ps3_alloc_spe_irq(spu_pdata(spu)->spe_id, 0,
+                &spu->irqs[0]);
+
+        if (result)
+                goto fail_alloc_0;
+
+        result = ps3_alloc_spe_irq(spu_pdata(spu)->spe_id, 1,
+                &spu->irqs[1]);
+
+        if (result)
+                goto fail_alloc_1;
+
+        result = ps3_alloc_spe_irq(spu_pdata(spu)->spe_id, 2,
+                &spu->irqs[2]);
+
+        if (result)
+                goto fail_alloc_2;
+
+        return result;
+
+fail_alloc_2:
+        ps3_free_spe_irq(spu->irqs[1]);
+fail_alloc_1:
+        ps3_free_spe_irq(spu->irqs[0]);
+fail_alloc_0:
+        spu->irqs[0] = spu->irqs[1] = spu->irqs[2] = NO_IRQ;
+        return result;
+}
+
+static int __init enable_spu(struct spu *spu)
+{
+        int result;
+
+        result = lv1_enable_logical_spe(spu_pdata(spu)->spe_id,
+                spu_pdata(spu)->resource_id);
+
+        if (result) {
+                pr_debug("%s:%d: lv1_enable_logical_spe failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+                goto fail_enable;
+        }
+
+        result = setup_areas(spu);
+
+        if (result)
+                goto fail_areas;
+
+        result = setup_interrupts(spu);
+
+        if (result)
+                goto fail_interrupts;
+
+        return 0;
+
+fail_interrupts:
+        spu_unmap(spu);
+fail_areas:
+        lv1_disable_logical_spe(spu_pdata(spu)->spe_id, 0);
+fail_enable:
+        return result;
+}
+
+static int ps3_destroy_spu(struct spu *spu)
+{
+        int result;
+
+        pr_debug("%s:%d spu_%d\n", __func__, __LINE__, spu->number);
+
+        result = lv1_disable_logical_spe(spu_pdata(spu)->spe_id, 0);
+        BUG_ON(result);
+
+        ps3_free_spe_irq(spu->irqs[2]);
+        ps3_free_spe_irq(spu->irqs[1]);
+        ps3_free_spe_irq(spu->irqs[0]);
+
+        spu->irqs[0] = spu->irqs[1] = spu->irqs[2] = NO_IRQ;
+
+        spu_unmap(spu);
+
+        result = lv1_destruct_logical_spe(spu_pdata(spu)->spe_id);
+        BUG_ON(result);
+
+        kfree(spu->pdata);
+        spu->pdata = NULL;
+
+        return 0;
+}
+
+static int __init ps3_create_spu(struct spu *spu, void *data)
+{
+        int result;
+
+        pr_debug("%s:%d spu_%d\n", __func__, __LINE__, spu->number);
+
+        spu->pdata = kzalloc(sizeof(struct spu_pdata),
+                GFP_KERNEL);
+
+        if (!spu->pdata) {
+                result = -ENOMEM;
+                goto fail_malloc;
+        }
+
+        spu_pdata(spu)->resource_id = (unsigned long)data;
+
+        /* Init cached reg values to HV defaults. */
+
+        spu_pdata(spu)->cache.sr1 = 0x33;
+
+        result = construct_spu(spu);
+
+        if (result)
+                goto fail_construct;
+
+        /* For now, just go ahead and enable it. */
+
+        result = enable_spu(spu);
+
+        if (result)
+                goto fail_enable;
+
+        /* Make sure the spu is in SPE_EX_STATE_EXECUTED. */
+
+        /* need something better here!!! */
+        while (in_be64(&spu_pdata(spu)->shadow->spe_execution_status)
+                != SPE_EX_STATE_EXECUTED)
+                (void)0;
+
+        return result;
+
+fail_enable:
+fail_construct:
+        ps3_destroy_spu(spu);
+fail_malloc:
+        return result;
+}
+
+static int __init ps3_enumerate_spus(int (*fn)(void *data))
+{
+        int result;
+        unsigned int num_resource_id;
+        unsigned int i;
+
+        result = ps3_repository_read_num_spu_resource_id(&num_resource_id);
+
+        pr_debug("%s:%d: num_resource_id %u\n", __func__, __LINE__,
+                num_resource_id);
+
+        /*
+         * For now, just create logical spus equal to the number
+         * of physical spus reserved for the partition.
+         */
+
+        for (i = 0; i < num_resource_id; i++) {
+                enum ps3_spu_resource_type resource_type;
+                unsigned int resource_id;
+
+                result = ps3_repository_read_spu_resource_id(i,
+                        &resource_type, &resource_id);
+
+                if (result)
+                        break;
+
+                if (resource_type == PS3_SPU_RESOURCE_TYPE_EXCLUSIVE) {
+                        result = fn((void*)(unsigned long)resource_id);
+
+                        if (result)
+                                break;
+                }
+        }
+
+        if (result)
+                printk(KERN_WARNING "%s:%d: Error initializing spus\n",
+                        __func__, __LINE__);
+
+        return result;
+}
+
+const struct spu_management_ops spu_management_ps3_ops = {
+        .enumerate_spus = ps3_enumerate_spus,
+        .create_spu = ps3_create_spu,
+        .destroy_spu = ps3_destroy_spu,
+};
+
+/* spu_priv1_ops */
+
+static void int_mask_and(struct spu *spu, int class, u64 mask)
+{
+        u64 old_mask;
+
+        /* are these serialized by caller??? */
+        old_mask = spu_int_mask_get(spu, class);
+        spu_int_mask_set(spu, class, old_mask & mask);
+}
+
+static void int_mask_or(struct spu *spu, int class, u64 mask)
+{
+        u64 old_mask;
+
+        old_mask = spu_int_mask_get(spu, class);
+        spu_int_mask_set(spu, class, old_mask | mask);
+}
+
+static void int_mask_set(struct spu *spu, int class, u64 mask)
+{
+        spu_pdata(spu)->cache.masks[class] = mask;
+        lv1_set_spe_interrupt_mask(spu_pdata(spu)->spe_id, class,
+                spu_pdata(spu)->cache.masks[class]);
+}
+
+static u64 int_mask_get(struct spu *spu, int class)
+{
+        return spu_pdata(spu)->cache.masks[class];
+}
+
+static void int_stat_clear(struct spu *spu, int class, u64 stat)
+{
+        /* Note that MFC_DSISR will be cleared when class1[MF] is set. */
+
+        lv1_clear_spe_interrupt_status(spu_pdata(spu)->spe_id, class,
+                stat, 0);
+}
+
+static u64 int_stat_get(struct spu *spu, int class)
+{
+        u64 stat;
+
+        lv1_get_spe_interrupt_status(spu_pdata(spu)->spe_id, class, &stat);
+        return stat;
+}
+
+static void cpu_affinity_set(struct spu *spu, int cpu)
+{
+        /* No support. */
+}
+
+static u64 mfc_dar_get(struct spu *spu)
+{
+        return in_be64(&spu_pdata(spu)->shadow->mfc_dar_RW);
+}
+
+static void mfc_dsisr_set(struct spu *spu, u64 dsisr)
+{
+        /* Nothing to do, cleared in int_stat_clear(). */
+}
+
+static u64 mfc_dsisr_get(struct spu *spu)
+{
+        return in_be64(&spu_pdata(spu)->shadow->mfc_dsisr_RW);
+}
+
+static void mfc_sdr_setup(struct spu *spu)
+{
+        /* Nothing to do. */
+}
+
+static void mfc_sr1_set(struct spu *spu, u64 sr1)
+{
+        /* Check bits allowed by HV. */
+
+        static const u64 allowed = ~(MFC_STATE1_LOCAL_STORAGE_DECODE_MASK
+                | MFC_STATE1_PROBLEM_STATE_MASK);
+
+        BUG_ON((sr1 & allowed) != (spu_pdata(spu)->cache.sr1 & allowed));
+
+        spu_pdata(spu)->cache.sr1 = sr1;
+        lv1_set_spe_privilege_state_area_1_register(
+                spu_pdata(spu)->spe_id,
+                offsetof(struct spu_priv1, mfc_sr1_RW),
+                spu_pdata(spu)->cache.sr1);
+}
+
+static u64 mfc_sr1_get(struct spu *spu)
+{
+        return spu_pdata(spu)->cache.sr1;
+}
+
+static void mfc_tclass_id_set(struct spu *spu, u64 tclass_id)
+{
+        spu_pdata(spu)->cache.tclass_id = tclass_id;
+        lv1_set_spe_privilege_state_area_1_register(
+                spu_pdata(spu)->spe_id,
+                offsetof(struct spu_priv1, mfc_tclass_id_RW),
+                spu_pdata(spu)->cache.tclass_id);
+}
+
+static u64 mfc_tclass_id_get(struct spu *spu)
+{
+        return spu_pdata(spu)->cache.tclass_id;
+}
+
+static void tlb_invalidate(struct spu *spu)
+{
+        /* Nothing to do. */
+}
+
+static void resource_allocation_groupID_set(struct spu *spu, u64 id)
+{
+        /* No support. */
+}
+
+static u64 resource_allocation_groupID_get(struct spu *spu)
+{
+        return 0; /* No support. */
+}
+
+static void resource_allocation_enable_set(struct spu *spu, u64 enable)
+{
+        /* No support. */
+}
+
+static u64 resource_allocation_enable_get(struct spu *spu)
+{
+        return 0; /* No support. */
+}
+
+const struct spu_priv1_ops spu_priv1_ps3_ops = {
+        .int_mask_and = int_mask_and,
+        .int_mask_or = int_mask_or,
+        .int_mask_set = int_mask_set,
+        .int_mask_get = int_mask_get,
+        .int_stat_clear = int_stat_clear,
+        .int_stat_get = int_stat_get,
+        .cpu_affinity_set = cpu_affinity_set,
+        .mfc_dar_get = mfc_dar_get,
+        .mfc_dsisr_set = mfc_dsisr_set,
+        .mfc_dsisr_get = mfc_dsisr_get,
+        .mfc_sdr_setup = mfc_sdr_setup,
+        .mfc_sr1_set = mfc_sr1_set,
+        .mfc_sr1_get = mfc_sr1_get,
+        .mfc_tclass_id_set = mfc_tclass_id_set,
+        .mfc_tclass_id_get = mfc_tclass_id_get,
+        .tlb_invalidate = tlb_invalidate,
+        .resource_allocation_groupID_set = resource_allocation_groupID_set,
+        .resource_allocation_groupID_get = resource_allocation_groupID_get,
+        .resource_allocation_enable_set = resource_allocation_enable_set,
+        .resource_allocation_enable_get = resource_allocation_enable_get,
+};
+
+void ps3_spu_set_platform(void)
+{
+        spu_priv1_ops = &spu_priv1_ps3_ops;
+        spu_management_ops = &spu_management_ps3_ops;
+}
diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c
new file mode 100644
index 000000000000..1bae8b19b363
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/time.c
@@ -0,0 +1,104 @@
+/*
+ *  PS3 time and rtc routines.
+ *
+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
+ *  Copyright 2006 Sony Corp.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+
+#include <asm/rtc.h>
+#include <asm/lv1call.h>
+#include <asm/ps3.h>
+
+#include "platform.h"
+
+#define dump_tm(_a) _dump_tm(_a, __func__, __LINE__)
+static void _dump_tm(const struct rtc_time *tm, const char* func, int line)
+{
+        pr_debug("%s:%d tm_sec  %d\n", func, line, tm->tm_sec);
+        pr_debug("%s:%d tm_min  %d\n", func, line, tm->tm_min);
+        pr_debug("%s:%d tm_hour %d\n", func, line, tm->tm_hour);
+        pr_debug("%s:%d tm_mday %d\n", func, line, tm->tm_mday);
+        pr_debug("%s:%d tm_mon  %d\n", func, line, tm->tm_mon);
+        pr_debug("%s:%d tm_year %d\n", func, line, tm->tm_year);
+        pr_debug("%s:%d tm_wday %d\n", func, line, tm->tm_wday);
+}
+
+#define dump_time(_a) _dump_time(_a, __func__, __LINE__)
+static void __attribute__ ((unused)) _dump_time(int time, const char* func,
+        int line)
+{
+        struct rtc_time tm;
+
+        to_tm(time, &tm);
+
+        pr_debug("%s:%d time    %d\n", func, line, time);
+        _dump_tm(&tm, func, line);
+}
+
+/**
+ * rtc_shift - Difference in seconds between 1970 and the ps3 rtc value.
+ */
+
+static s64 rtc_shift;
+
+void __init ps3_calibrate_decr(void)
+{
+        int result;
+        u64 tmp;
+
+        result = ps3_repository_read_be_tb_freq(0, &tmp);
+        BUG_ON(result);
+
+        ppc_tb_freq = tmp;
+        ppc_proc_freq = ppc_tb_freq * 40;
+
+        rtc_shift = ps3_os_area_rtc_diff();
+}
+
+static u64 read_rtc(void)
+{
+        int result;
+        u64 rtc_val;
+        u64 tb_val;
+
+        result = lv1_get_rtc(&rtc_val, &tb_val);
+        BUG_ON(result);
+
+        return rtc_val;
+}
+
+int ps3_set_rtc_time(struct rtc_time *tm)
+{
+        u64 now = mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
+                tm->tm_hour, tm->tm_min, tm->tm_sec);
+
+        rtc_shift = now - read_rtc();
+        return 0;
+}
+
+void ps3_get_rtc_time(struct rtc_time *tm)
+{
+        to_tm(read_rtc() + rtc_shift, tm);
+        tm->tm_year -= 1900;
+        tm->tm_mon -= 1;
+}
+
+unsigned long __init ps3_get_boot_time(void)
+{
+        return read_rtc() + rtc_shift;
+}
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index 997243a91be8..69590fbf83da 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -10,6 +10,8 @@ obj-$(CONFIG_XICS)	+= xics.o
 obj-$(CONFIG_SCANLOG)   += scanlog.o
 obj-$(CONFIG_EEH)       += eeh.o eeh_cache.o eeh_driver.o eeh_event.o
 
+obj-$(CONFIG_HOTPLUG_CPU)       += hotplug-cpu.o
+
 obj-$(CONFIG_HVC_CONSOLE)       += hvconsole.o
 obj-$(CONFIG_HVCS)              += hvcserver.o
 obj-$(CONFIG_HCALL_STATS)       += hvCall_inst.o
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 3c2d63ebf787..da6e5362e7cd 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -337,6 +337,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
                         printk (KERN_ERR "EEH: Device driver ignored %d bad reads, panicing\n",
                                 pdn->eeh_check_count);
                         dump_stack();
+                        msleep(5000);
                         
                         /* re-read the slot reset state */
                         if (read_slot_reset_state(pdn, rets) != 0)
diff --git a/arch/powerpc/platforms/pseries/eeh_cache.c b/arch/powerpc/platforms/pseries/eeh_cache.c
index b6b462d3c604..f2bae04424f8 100644
--- a/arch/powerpc/platforms/pseries/eeh_cache.c
+++ b/arch/powerpc/platforms/pseries/eeh_cache.c
@@ -153,7 +153,7 @@ pci_addr_cache_insert(struct pci_dev *dev, unsigned long alo,
                         return piar;
                 }
         }
-        piar = (struct pci_io_addr_range *)kmalloc(sizeof(struct pci_io_addr_range), GFP_ATOMIC);
+        piar = kmalloc(sizeof(struct pci_io_addr_range), GFP_ATOMIC);
         if (!piar)
                 return NULL;
 
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index c2bc9904f1cb..cbd6b0711ab4 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -170,14 +170,19 @@ static void eeh_report_reset(struct pci_dev *dev, void *userdata)
 static void eeh_report_resume(struct pci_dev *dev, void *userdata)
 {
         struct pci_driver *driver = dev->driver;
+        struct device_node *dn = pci_device_to_OF_node(dev);
 
         dev->error_state = pci_channel_io_normal;
 
         if (!driver)
                 return;
-        if (!driver->err_handler)
-                return;
-        if (!driver->err_handler->resume)
+
+        if ((PCI_DN(dn)->eeh_mode) & EEH_MODE_IRQ_DISABLED) {
+                PCI_DN(dn)->eeh_mode &= ~EEH_MODE_IRQ_DISABLED;
+                enable_irq(dev->irq);
+        }
+        if (!driver->err_handler ||
+            !driver->err_handler->resume)
                 return;
 
         driver->err_handler->resume(dev);
@@ -407,6 +412,8 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
 
                 if (rc)
                         result = PCI_ERS_RESULT_NEED_RESET;
+                else
+                        result = PCI_ERS_RESULT_RECOVERED;
         }
 
         /* If any device has a hard failure, then shut off everything. */
diff --git a/arch/powerpc/platforms/pseries/eeh_event.c b/arch/powerpc/platforms/pseries/eeh_event.c
index 137077451316..49037edf7d39 100644
--- a/arch/powerpc/platforms/pseries/eeh_event.c
+++ b/arch/powerpc/platforms/pseries/eeh_event.c
@@ -37,8 +37,8 @@
 /* EEH event workqueue setup. */
 static DEFINE_SPINLOCK(eeh_eventlist_lock);
 LIST_HEAD(eeh_eventlist);
-static void eeh_thread_launcher(void *);
-DECLARE_WORK(eeh_event_wq, eeh_thread_launcher, NULL);
+static void eeh_thread_launcher(struct work_struct *);
+DECLARE_WORK(eeh_event_wq, eeh_thread_launcher);
 
 /* Serialize reset sequences for a given pci device */
 DEFINE_MUTEX(eeh_event_mutex);
@@ -103,7 +103,7 @@ static int eeh_event_handler(void * dummy)
  * eeh_thread_launcher
  * @dummy - unused
  */
-static void eeh_thread_launcher(void *dummy)
+static void eeh_thread_launcher(struct work_struct *dummy)
 {
         if (kernel_thread(eeh_event_handler, NULL, CLONE_KERNEL) < 0)
                 printk(KERN_ERR "Failed to start EEH daemon\n");
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
new file mode 100644
index 000000000000..f460b9cbfd46
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -0,0 +1,275 @@
+/*
+ * pseries CPU Hotplug infrastructure.
+ *
+ * Split out from arch/powerpc/platforms/pseries/setup.c
+ *  arch/powerpc/kernel/rtas.c, and arch/powerpc/platforms/pseries/smp.c
+ *
+ * Peter Bergner, IBM   March 2001.
+ * Copyright (C) 2001 IBM.
+ * Dave Engebretsen, Peter Bergner, and
+ * Mike Corrigan {engebret|bergner|mikec}@us.ibm.com
+ * Plus various changes from other IBM teams...
+ *
+ * Copyright (C) 2006 Michael Ellerman, IBM Corporation
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/cpu.h>
+#include <asm/system.h>
+#include <asm/prom.h>
+#include <asm/rtas.h>
+#include <asm/firmware.h>
+#include <asm/machdep.h>
+#include <asm/vdso_datapage.h>
+#include <asm/pSeries_reconfig.h>
+#include "xics.h"
+
+/* This version can't take the spinlock, because it never returns */
+static struct rtas_args rtas_stop_self_args = {
+        .token = RTAS_UNKNOWN_SERVICE,
+        .nargs = 0,
+        .nret = 1,
+        .rets = &rtas_stop_self_args.args[0],
+};
+
+static void rtas_stop_self(void)
+{
+        struct rtas_args *args = &rtas_stop_self_args;
+
+        local_irq_disable();
+
+        BUG_ON(args->token == RTAS_UNKNOWN_SERVICE);
+
+        printk("cpu %u (hwid %u) Ready to die...\n",
+               smp_processor_id(), hard_smp_processor_id());
+        enter_rtas(__pa(args));
+
+        panic("Alas, I survived.\n");
+}
+
+static void pseries_mach_cpu_die(void)
+{
+        local_irq_disable();
+        idle_task_exit();
+        xics_teardown_cpu(0);
+        rtas_stop_self();
+        /* Should never get here... */
+        BUG();
+        for(;;);
+}
+
+static int qcss_tok;    /* query-cpu-stopped-state token */
+
+/* Get state of physical CPU.
+ * Return codes:
+ *      0       - The processor is in the RTAS stopped state
+ *      1       - stop-self is in progress
+ *      2       - The processor is not in the RTAS stopped state
+ *      -1      - Hardware Error
+ *      -2      - Hardware Busy, Try again later.
+ */
+static int query_cpu_stopped(unsigned int pcpu)
+{
+        int cpu_status, status;
+
+        status = rtas_call(qcss_tok, 1, 2, &cpu_status, pcpu);
+        if (status != 0) {
+                printk(KERN_ERR
+                       "RTAS query-cpu-stopped-state failed: %i\n", status);
+                return status;
+        }
+
+        return cpu_status;
+}
+
+static int pseries_cpu_disable(void)
+{
+        int cpu = smp_processor_id();
+
+        cpu_clear(cpu, cpu_online_map);
+        vdso_data->processorCount--;
+
+        /*fix boot_cpuid here*/
+        if (cpu == boot_cpuid)
+                boot_cpuid = any_online_cpu(cpu_online_map);
+
+        /* FIXME: abstract this to not be platform specific later on */
+        xics_migrate_irqs_away();
+        return 0;
+}
+
+static void pseries_cpu_die(unsigned int cpu)
+{
+        int tries;
+        int cpu_status;
+        unsigned int pcpu = get_hard_smp_processor_id(cpu);
+
+        for (tries = 0; tries < 25; tries++) {
+                cpu_status = query_cpu_stopped(pcpu);
+                if (cpu_status == 0 || cpu_status == -1)
+                        break;
+                msleep(200);
+        }
+        if (cpu_status != 0) {
+                printk("Querying DEAD? cpu %i (%i) shows %i\n",
+                       cpu, pcpu, cpu_status);
+        }
+
+        /* Isolation and deallocation are definatly done by
+         * drslot_chrp_cpu.  If they were not they would be
+         * done here.  Change isolate state to Isolate and
+         * change allocation-state to Unusable.
+         */
+        paca[cpu].cpu_start = 0;
+}
+
+/*
+ * Update cpu_present_map and paca(s) for a new cpu node.  The wrinkle
+ * here is that a cpu device node may represent up to two logical cpus
+ * in the SMT case.  We must honor the assumption in other code that
+ * the logical ids for sibling SMT threads x and y are adjacent, such
+ * that x^1 == y and y^1 == x.
+ */
+static int pseries_add_processor(struct device_node *np)
+{
+        unsigned int cpu;
+        cpumask_t candidate_map, tmp = CPU_MASK_NONE;
+        int err = -ENOSPC, len, nthreads, i;
+        const u32 *intserv;
+
+        intserv = get_property(np, "ibm,ppc-interrupt-server#s", &len);
+        if (!intserv)
+                return 0;
+
+        nthreads = len / sizeof(u32);
+        for (i = 0; i < nthreads; i++)
+                cpu_set(i, tmp);
+
+        lock_cpu_hotplug();
+
+        BUG_ON(!cpus_subset(cpu_present_map, cpu_possible_map));
+
+        /* Get a bitmap of unoccupied slots. */
+        cpus_xor(candidate_map, cpu_possible_map, cpu_present_map);
+        if (cpus_empty(candidate_map)) {
+                /* If we get here, it most likely means that NR_CPUS is
+                 * less than the partition's max processors setting.
+                 */
+                printk(KERN_ERR "Cannot add cpu %s; this system configuration"
+                       " supports %d logical cpus.\n", np->full_name,
+                       cpus_weight(cpu_possible_map));
+                goto out_unlock;
+        }
+
+        while (!cpus_empty(tmp))
+                if (cpus_subset(tmp, candidate_map))
+                        /* Found a range where we can insert the new cpu(s) */
+                        break;
+                else
+                        cpus_shift_left(tmp, tmp, nthreads);
+
+        if (cpus_empty(tmp)) {
+                printk(KERN_ERR "Unable to find space in cpu_present_map for"
+                       " processor %s with %d thread(s)\n", np->name,
+                       nthreads);
+                goto out_unlock;
+        }
+
+        for_each_cpu_mask(cpu, tmp) {
+                BUG_ON(cpu_isset(cpu, cpu_present_map));
+                cpu_set(cpu, cpu_present_map);
+                set_hard_smp_processor_id(cpu, *intserv++);
+        }
+        err = 0;
+out_unlock:
+        unlock_cpu_hotplug();
+        return err;
+}
+
+/*
+ * Update the present map for a cpu node which is going away, and set
+ * the hard id in the paca(s) to -1 to be consistent with boot time
+ * convention for non-present cpus.
+ */
+static void pseries_remove_processor(struct device_node *np)
+{
+        unsigned int cpu;
+        int len, nthreads, i;
+        const u32 *intserv;
+
+        intserv = get_property(np, "ibm,ppc-interrupt-server#s", &len);
+        if (!intserv)
+                return;
+
+        nthreads = len / sizeof(u32);
+
+        lock_cpu_hotplug();
+        for (i = 0; i < nthreads; i++) {
+                for_each_present_cpu(cpu) {
+                        if (get_hard_smp_processor_id(cpu) != intserv[i])
+                                continue;
+                        BUG_ON(cpu_online(cpu));
+                        cpu_clear(cpu, cpu_present_map);
+                        set_hard_smp_processor_id(cpu, -1);
+                        break;
+                }
+                if (cpu == NR_CPUS)
+                        printk(KERN_WARNING "Could not find cpu to remove "
+                               "with physical id 0x%x\n", intserv[i]);
+        }
+        unlock_cpu_hotplug();
+}
+
+static int pseries_smp_notifier(struct notifier_block *nb,
+                                unsigned long action, void *node)
+{
+        int err = NOTIFY_OK;
+
+        switch (action) {
+        case PSERIES_RECONFIG_ADD:
+                if (pseries_add_processor(node))
+                        err = NOTIFY_BAD;
+                break;
+        case PSERIES_RECONFIG_REMOVE:
+                pseries_remove_processor(node);
+                break;
+        default:
+                err = NOTIFY_DONE;
+                break;
+        }
+        return err;
+}
+
+static struct notifier_block pseries_smp_nb = {
+        .notifier_call = pseries_smp_notifier,
+};
+
+static int __init pseries_cpu_hotplug_init(void)
+{
+        rtas_stop_self_args.token = rtas_token("stop-self");
+        qcss_tok = rtas_token("query-cpu-stopped-state");
+
+        if (rtas_stop_self_args.token == RTAS_UNKNOWN_SERVICE ||
+                        qcss_tok == RTAS_UNKNOWN_SERVICE) {
+                printk(KERN_INFO "CPU Hotplug not supported by firmware "
+                                "- disabling.\n");
+                return 0;
+        }
+
+        ppc_md.cpu_die = pseries_mach_cpu_die;
+        smp_ops->cpu_disable = pseries_cpu_disable;
+        smp_ops->cpu_die = pseries_cpu_die;
+
+        /* Processors can be added/removed only on LPAR */
+        if (firmware_has_feature(FW_FEATURE_LPAR))
+                pSeries_reconfig_notifier_register(&pseries_smp_nb);
+
+        return 0;
+}
+arch_initcall(pseries_cpu_hotplug_init);
diff --git a/arch/powerpc/platforms/pseries/hvCall.S b/arch/powerpc/platforms/pseries/hvCall.S
index c00cfed7af2c..5c7e38789897 100644
--- a/arch/powerpc/platforms/pseries/hvCall.S
+++ b/arch/powerpc/platforms/pseries/hvCall.S
@@ -26,7 +26,7 @@
 BEGIN_FTR_SECTION;                                              \
         mfspr   r0,SPRN_PURR;           /* get PURR and */      \
         std     r0,STK_PARM(r6)(r1);    /* save for later */    \
-END_FTR_SECTION_IFCLR(CPU_FTR_PURR);
+END_FTR_SECTION_IFSET(CPU_FTR_PURR);
         
 /*
  * postcall is performed immediately before function return which
@@ -43,7 +43,7 @@ BEGIN_FTR_SECTION;						\
         mfspr   r8,SPRN_PURR;           /* PURR after */        \
         ld      r6,STK_PARM(r6)(r1);    /* PURR before */       \
         subf    r6,r6,r8;               /* delta */             \
-END_FTR_SECTION_IFCLR(CPU_FTR_PURR);                            \
+END_FTR_SECTION_IFSET(CPU_FTR_PURR);                            \
         ld      r5,STK_PARM(r5)(r1);    /* timebase before */   \
         subf    r5,r5,r7;               /* time delta */        \
                                                                 \
@@ -66,7 +66,7 @@ BEGIN_FTR_SECTION;						\
         ld      r7,HCALL_STAT_PURR(r4); /* PURR */              \
         add     r7,r7,r6;                                       \
         std     r7,HCALL_STAT_PURR(r4);                         \
-END_FTR_SECTION_IFCLR(CPU_FTR_PURR);                            \
+END_FTR_SECTION_IFSET(CPU_FTR_PURR);                            \
 1:
 #else
 #define HCALL_INST_PRECALL
@@ -145,6 +145,7 @@ _GLOBAL(plpar_hcall9)
 
         HVSC                            /* invoke the hypervisor */
 
+        mr      r0,r12
         ld      r12,STK_PARM(r4)(r1)
         std     r4,  0(r12)
         std     r5,  8(r12)
@@ -154,7 +155,7 @@ _GLOBAL(plpar_hcall9)
         std     r9, 40(r12)
         std     r10,48(r12)
         std     r11,56(r12)
-        std     r12,64(r12)
+        std     r0, 64(r12)
 
         HCALL_INST_POSTCALL
 
diff --git a/arch/powerpc/platforms/pseries/hvCall_inst.c b/arch/powerpc/platforms/pseries/hvCall_inst.c
index 446e17d162a5..3ddc04925d50 100644
--- a/arch/powerpc/platforms/pseries/hvCall_inst.c
+++ b/arch/powerpc/platforms/pseries/hvCall_inst.c
@@ -34,7 +34,7 @@ DEFINE_PER_CPU(struct hcall_stats[HCALL_STAT_ARRAY_SIZE], hcall_stats);
  */
 static void *hc_start(struct seq_file *m, loff_t *pos)
 {
-        if ((int)*pos < HCALL_STAT_ARRAY_SIZE)
+        if ((int)*pos < (HCALL_STAT_ARRAY_SIZE-1))
                 return (void *)(unsigned long)(*pos + 1);
 
         return NULL;
@@ -57,7 +57,7 @@ static int hc_show(struct seq_file *m, void *p)
         struct hcall_stats *hs = (struct hcall_stats *)m->private;
 
         if (hs[h_num].num_calls) {
-                if (!cpu_has_feature(CPU_FTR_PURR))
+                if (cpu_has_feature(CPU_FTR_PURR))
                         seq_printf(m, "%lu %lu %lu %lu\n", h_num<<2,
                                    hs[h_num].num_calls,
                                    hs[h_num].tb_total,
@@ -85,7 +85,7 @@ static int hcall_inst_seq_open(struct inode *inode, struct file *file)
 
         rc = seq_open(file, &hcall_inst_seq_ops);
         seq = file->private_data;
-        seq->private = file->f_dentry->d_inode->i_private;
+        seq->private = file->f_path.dentry->d_inode->i_private;
 
         return rc;
 }
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 556c279a789d..3c95392f4f41 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -309,7 +309,7 @@ static void iommu_table_setparms_lpar(struct pci_controller *phb,
         tbl->it_size = size >> IOMMU_PAGE_SHIFT;
 }
 
-static void iommu_bus_setup_pSeries(struct pci_bus *bus)
+static void pci_dma_bus_setup_pSeries(struct pci_bus *bus)
 {
         struct device_node *dn;
         struct iommu_table *tbl;
@@ -318,10 +318,9 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)
         struct pci_dn *pci;
         int children;
 
-        DBG("iommu_bus_setup_pSeries, bus %p, bus->self %p\n", bus, bus->self);
-
         dn = pci_bus_to_OF_node(bus);
-        pci = PCI_DN(dn);
+
+        DBG("pci_dma_bus_setup_pSeries: setting up bus %s\n", dn->full_name);
 
         if (bus->self) {
                 /* This is not a root bus, any setup will be done for the
@@ -329,6 +328,7 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)
                  */
                 return;
         }
+        pci = PCI_DN(dn);
 
         /* Check if the ISA bus on the system is under
          * this PHB.
@@ -390,17 +390,17 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)
 }
 
 
-static void iommu_bus_setup_pSeriesLP(struct pci_bus *bus)
+static void pci_dma_bus_setup_pSeriesLP(struct pci_bus *bus)
 {
         struct iommu_table *tbl;
         struct device_node *dn, *pdn;
         struct pci_dn *ppci;
         const void *dma_window = NULL;
 
-        DBG("iommu_bus_setup_pSeriesLP, bus %p, bus->self %p\n", bus, bus->self);
-
         dn = pci_bus_to_OF_node(bus);
 
+        DBG("pci_dma_bus_setup_pSeriesLP: setting up bus %s\n", dn->full_name);
+
         /* Find nearest ibm,dma-window, walking up the device tree */
         for (pdn = dn; pdn != NULL; pdn = pdn->parent) {
                 dma_window = get_property(pdn, "ibm,dma-window", NULL);
@@ -409,11 +409,15 @@ static void iommu_bus_setup_pSeriesLP(struct pci_bus *bus)
         }
 
         if (dma_window == NULL) {
-                DBG("iommu_bus_setup_pSeriesLP: bus %s seems to have no ibm,dma-window property\n", dn->full_name);
+                DBG("  no ibm,dma-window property !\n");
                 return;
         }
 
         ppci = PCI_DN(pdn);
+
+        DBG("  parent is %s, iommu_table: 0x%p\n",
+            pdn->full_name, ppci->iommu_table);
+
         if (!ppci->iommu_table) {
                 /* Bussubno hasn't been copied yet.
                  * Do it now because iommu_table_setparms_lpar needs it.
@@ -427,6 +431,7 @@ static void iommu_bus_setup_pSeriesLP(struct pci_bus *bus)
                 iommu_table_setparms_lpar(ppci->phb, pdn, tbl, dma_window);
 
                 ppci->iommu_table = iommu_init_table(tbl, ppci->phb->node);
+                DBG("  created table: %p\n", ppci->iommu_table);
         }
 
         if (pdn != dn)
@@ -434,27 +439,27 @@ static void iommu_bus_setup_pSeriesLP(struct pci_bus *bus)
 }
 
 
-static void iommu_dev_setup_pSeries(struct pci_dev *dev)
+static void pci_dma_dev_setup_pSeries(struct pci_dev *dev)
 {
-        struct device_node *dn, *mydn;
+        struct device_node *dn;
         struct iommu_table *tbl;
 
-        DBG("iommu_dev_setup_pSeries, dev %p (%s)\n", dev, pci_name(dev));
+        DBG("pci_dma_dev_setup_pSeries: %s\n", pci_name(dev));
 
-        mydn = dn = pci_device_to_OF_node(dev);
+        dn = dev->dev.archdata.of_node;
 
         /* If we're the direct child of a root bus, then we need to allocate
          * an iommu table ourselves. The bus setup code should have setup
          * the window sizes already.
          */
         if (!dev->bus->self) {
+                struct pci_controller *phb = PCI_DN(dn)->phb;
+
                 DBG(" --> first child, no bridge. Allocating iommu table.\n");
                 tbl = kmalloc_node(sizeof(struct iommu_table), GFP_KERNEL,
-                                   PCI_DN(dn)->phb->node);
-                iommu_table_setparms(PCI_DN(dn)->phb, dn, tbl);
-                PCI_DN(dn)->iommu_table = iommu_init_table(tbl,
-                                                PCI_DN(dn)->phb->node);
-
+                                   phb->node);
+                iommu_table_setparms(phb, dn, tbl);
+                dev->dev.archdata.dma_data = iommu_init_table(tbl, phb->node);
                 return;
         }
 
@@ -465,11 +470,11 @@ static void iommu_dev_setup_pSeries(struct pci_dev *dev)
         while (dn && PCI_DN(dn) && PCI_DN(dn)->iommu_table == NULL)
                 dn = dn->parent;
 
-        if (dn && PCI_DN(dn)) {
-                PCI_DN(mydn)->iommu_table = PCI_DN(dn)->iommu_table;
-        } else {
-                DBG("iommu_dev_setup_pSeries, dev %p (%s) has no iommu table\n", dev, pci_name(dev));
-        }
+        if (dn && PCI_DN(dn))
+                dev->dev.archdata.dma_data = PCI_DN(dn)->iommu_table;
+        else
+                printk(KERN_WARNING "iommu: Device %s has no iommu table\n",
+                       pci_name(dev));
 }
 
 static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *node)
@@ -495,13 +500,15 @@ static struct notifier_block iommu_reconfig_nb = {
         .notifier_call = iommu_reconfig_notifier,
 };
 
-static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)
+static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)
 {
         struct device_node *pdn, *dn;
         struct iommu_table *tbl;
         const void *dma_window = NULL;
         struct pci_dn *pci;
 
+        DBG("pci_dma_dev_setup_pSeriesLP: %s\n", pci_name(dev));
+
         /* dev setup for LPAR is a little tricky, since the device tree might
          * contain the dma-window properties per-device and not neccesarily
          * for the bus. So we need to search upwards in the tree until we
@@ -509,9 +516,7 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)
          * already allocated.
          */
         dn = pci_device_to_OF_node(dev);
-
-        DBG("iommu_dev_setup_pSeriesLP, dev %p (%s) %s\n",
-             dev, pci_name(dev), dn->full_name);
+        DBG("  node is %s\n", dn->full_name);
 
         for (pdn = dn; pdn && PCI_DN(pdn) && !PCI_DN(pdn)->iommu_table;
              pdn = pdn->parent) {
@@ -520,16 +525,17 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)
                         break;
         }
 
+        DBG("  parent is %s\n", pdn->full_name);
+
         /* Check for parent == NULL so we don't try to setup the empty EADS
          * slots on POWER4 machines.
          */
         if (dma_window == NULL || pdn->parent == NULL) {
-                DBG("No dma window for device, linking to parent\n");
-                PCI_DN(dn)->iommu_table = PCI_DN(pdn)->iommu_table;
+                DBG("  no dma window for device, linking to parent\n");
+                dev->dev.archdata.dma_data = PCI_DN(pdn)->iommu_table;
                 return;
-        } else {
-                DBG("Found DMA window, allocating table\n");
         }
+        DBG("  found DMA window, table: %p\n", pci->iommu_table);
 
         pci = PCI_DN(pdn);
         if (!pci->iommu_table) {
@@ -542,24 +548,20 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)
                 iommu_table_setparms_lpar(pci->phb, pdn, tbl, dma_window);
 
                 pci->iommu_table = iommu_init_table(tbl, pci->phb->node);
+                DBG("  created table: %p\n", pci->iommu_table);
         }
 
-        if (pdn != dn)
-                PCI_DN(dn)->iommu_table = pci->iommu_table;
+        dev->dev.archdata.dma_data = pci->iommu_table;
 }
 
-static void iommu_bus_setup_null(struct pci_bus *b) { }
-static void iommu_dev_setup_null(struct pci_dev *d) { }
-
 /* These are called very early. */
 void iommu_init_early_pSeries(void)
 {
         if (of_chosen && get_property(of_chosen, "linux,iommu-off", NULL)) {
                 /* Direct I/O, IOMMU off */
-                ppc_md.iommu_dev_setup = iommu_dev_setup_null;
-                ppc_md.iommu_bus_setup = iommu_bus_setup_null;
-                pci_direct_iommu_init();
-
+                ppc_md.pci_dma_dev_setup = NULL;
+                ppc_md.pci_dma_bus_setup = NULL;
+                pci_dma_ops = &dma_direct_ops;
                 return;
         }
 
@@ -572,19 +574,19 @@ void iommu_init_early_pSeries(void)
                         ppc_md.tce_free  = tce_free_pSeriesLP;
                 }
                 ppc_md.tce_get   = tce_get_pSeriesLP;
-                ppc_md.iommu_bus_setup = iommu_bus_setup_pSeriesLP;
-                ppc_md.iommu_dev_setup = iommu_dev_setup_pSeriesLP;
+                ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_pSeriesLP;
+                ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_pSeriesLP;
         } else {
                 ppc_md.tce_build = tce_build_pSeries;
                 ppc_md.tce_free  = tce_free_pSeries;
                 ppc_md.tce_get   = tce_get_pseries;
-                ppc_md.iommu_bus_setup = iommu_bus_setup_pSeries;
-                ppc_md.iommu_dev_setup = iommu_dev_setup_pSeries;
+                ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_pSeries;
+                ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_pSeries;
         }
 
 
         pSeries_reconfig_notifier_register(&iommu_reconfig_nb);
 
-        pci_iommu_init();
+        pci_dma_ops = &dma_iommu_ops;
 }
 
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 1820a0b0a8c6..721436db3ef0 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -282,7 +282,7 @@ void vpa_init(int cpu)
         }
 }
 
-long pSeries_lpar_hpte_insert(unsigned long hpte_group,
+static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
                               unsigned long va, unsigned long pa,
                               unsigned long rflags, unsigned long vflags,
                               int psize)
@@ -506,7 +506,7 @@ static void pSeries_lpar_hpte_invalidate(unsigned long slot, unsigned long va,
  * Take a spinlock around flushes to avoid bouncing the hypervisor tlbie
  * lock.
  */
-void pSeries_lpar_flush_hash_range(unsigned long number, int local)
+static void pSeries_lpar_flush_hash_range(unsigned long number, int local)
 {
         int i;
         unsigned long flags = 0;
diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c
index 410a6bcc4ca0..715db5c89908 100644
--- a/arch/powerpc/platforms/pseries/pci.c
+++ b/arch/powerpc/platforms/pseries/pci.c
@@ -29,8 +29,6 @@
 #include <asm/prom.h>
 #include <asm/ppc-pci.h>
 
-static int __devinitdata s7a_workaround = -1;
-
 #if 0
 void pcibios_name_device(struct pci_dev *dev)
 {
@@ -57,39 +55,6 @@ void pcibios_name_device(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_name_device);
 #endif
 
-static void __devinit check_s7a(void)
-{
-        struct device_node *root;
-        const char *model;
-
-        s7a_workaround = 0;
-        root = of_find_node_by_path("/");
-        if (root) {
-                model = get_property(root, "model", NULL);
-                if (model && !strcmp(model, "IBM,7013-S7A"))
-                        s7a_workaround = 1;
-                of_node_put(root);
-        }
-}
-
-void __devinit pSeries_irq_bus_setup(struct pci_bus *bus)
-{
-        struct pci_dev *dev;
-
-        if (s7a_workaround < 0)
-                check_s7a();
-        list_for_each_entry(dev, &bus->devices, bus_list) {
-                pci_read_irq_line(dev);
-                if (s7a_workaround) {
-                        if (dev->irq > 16) {
-                                dev->irq -= 3;
-                                pci_write_config_byte(dev, PCI_INTERRUPT_LINE,
-                                        dev->irq);
-                        }
-                }
-        }
-}
-
 static void __init pSeries_request_regions(void)
 {
         if (!isa_io_base)
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index 6bfacc217085..ac56b868913a 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -93,8 +93,8 @@ pcibios_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus)
                 if (list_empty(&dev->global_list)) {
                         int i;
 
-                        /* Need to setup IOMMU tables */
-                        ppc_md.iommu_dev_setup(dev);
+                        /* Fill device archdata and setup iommu table */
+                        pcibios_setup_new_device(dev);
 
                         if(fix_bus)
                                 pcibios_fixup_device_resources(dev, bus);
@@ -195,7 +195,7 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
         phb = pcibios_alloc_controller(dn);
         if (!phb)
                 return NULL;
-        setup_phb(dn, phb);
+        rtas_setup_phb(phb);
         pci_process_bridge_OF_ranges(phb, dn, 0);
 
         pci_setup_phb_io_dynamic(phb, primary);
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 1773103354be..4ad33e41b008 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -268,11 +268,10 @@ static char * parse_next_property(char *buf, char *end, char **name, int *length
 static struct property *new_property(const char *name, const int length,
                                      const unsigned char *value, struct property *last)
 {
-        struct property *new = kmalloc(sizeof(*new), GFP_KERNEL);
+        struct property *new = kzalloc(sizeof(*new), GFP_KERNEL);
 
         if (!new)
                 return NULL;
-        memset(new, 0, sizeof(*new));
 
         if (!(new->name = kmalloc(strlen(name) + 1, GFP_KERNEL)))
                 goto cleanup;
diff --git a/arch/powerpc/platforms/pseries/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c
index 77a5bb1d9c30..45368a57d7dd 100644
--- a/arch/powerpc/platforms/pseries/scanlog.c
+++ b/arch/powerpc/platforms/pseries/scanlog.c
@@ -47,7 +47,7 @@ static struct proc_dir_entry *proc_ppc64_scan_log_dump;	/* The proc file */
 static ssize_t scanlog_read(struct file *file, char __user *buf,
                             size_t count, loff_t *ppos)
 {
-        struct inode * inode = file->f_dentry->d_inode;
+        struct inode * inode = file->f_path.dentry->d_inode;
         struct proc_dir_entry *dp;
         unsigned int *data;
         int status;
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 89a8119f988d..042ecae107ac 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -347,17 +347,6 @@ static int __init pSeries_init_panel(void)
 }
 arch_initcall(pSeries_init_panel);
 
-static void pSeries_mach_cpu_die(void)
-{
-        local_irq_disable();
-        idle_task_exit();
-        xics_teardown_cpu(0);
-        rtas_stop_self();
-        /* Should never get here... */
-        BUG();
-        for(;;);
-}
-
 static int pseries_set_dabr(unsigned long dabr)
 {
         return plpar_hcall_norets(H_SET_DABR, dabr);
@@ -433,19 +422,14 @@ static int __init pSeries_probe_hypertas(unsigned long node,
         if (of_get_flat_dt_prop(node, "ibm,hypertas-functions", NULL) != NULL)
                 powerpc_firmware_features |= FW_FEATURE_LPAR;
 
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                hpte_init_lpar();
-        else
-                hpte_init_native();
-
         return 1;
 }
 
 static int __init pSeries_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
-        char *dtype = of_get_flat_dt_prop(of_get_flat_dt_root(),
-                                          "device_type", NULL);
+        char *dtype = of_get_flat_dt_prop(root, "device_type", NULL);
+
         if (dtype == NULL)
                 return 0;
         if (strcmp(dtype, "chrp"))
@@ -463,6 +447,11 @@ static int __init pSeries_probe(void)
         /* Now try to figure out if we are running on LPAR */
         of_scan_flat_dt(pSeries_probe_hypertas, NULL);
 
+        if (firmware_has_feature(FW_FEATURE_LPAR))
+                hpte_init_lpar();
+        else
+                hpte_init_native();
+
         DBG("Machine is%s LPAR !\n",
             (powerpc_firmware_features & FW_FEATURE_LPAR) ? "" : " not");
 
@@ -553,12 +542,10 @@ define_machine(pseries) {
         .log_error              = pSeries_log_error,
         .pcibios_fixup          = pSeries_final_fixup,
         .pci_probe_mode         = pSeries_pci_probe_mode,
-        .irq_bus_setup          = pSeries_irq_bus_setup,
         .restart                = rtas_restart,
         .power_off              = rtas_power_off,
         .halt                   = rtas_halt,
         .panic                  = rtas_os_term,
-        .cpu_die                = pSeries_mach_cpu_die,
         .get_boot_time          = rtas_get_boot_time,
         .get_rtc_time           = rtas_get_rtc_time,
         .set_rtc_time           = rtas_set_rtc_time,
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index c6624b8a0e77..4408518eaebe 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -64,197 +64,6 @@ static cpumask_t of_spin_map;
 
 extern void generic_secondary_smp_init(unsigned long);
 
-#ifdef CONFIG_HOTPLUG_CPU
-
-/* Get state of physical CPU.
- * Return codes:
- *      0       - The processor is in the RTAS stopped state
- *      1       - stop-self is in progress
- *      2       - The processor is not in the RTAS stopped state
- *      -1      - Hardware Error
- *      -2      - Hardware Busy, Try again later.
- */
-static int query_cpu_stopped(unsigned int pcpu)
-{
-        int cpu_status;
-        int status, qcss_tok;
-
-        qcss_tok = rtas_token("query-cpu-stopped-state");
-        if (qcss_tok == RTAS_UNKNOWN_SERVICE)
-                return -1;
-        status = rtas_call(qcss_tok, 1, 2, &cpu_status, pcpu);
-        if (status != 0) {
-                printk(KERN_ERR
-                       "RTAS query-cpu-stopped-state failed: %i\n", status);
-                return status;
-        }
-
-        return cpu_status;
-}
-
-static int pSeries_cpu_disable(void)
-{
-        int cpu = smp_processor_id();
-
-        cpu_clear(cpu, cpu_online_map);
-        vdso_data->processorCount--;
-
-        /*fix boot_cpuid here*/
-        if (cpu == boot_cpuid)
-                boot_cpuid = any_online_cpu(cpu_online_map);
-
-        /* FIXME: abstract this to not be platform specific later on */
-        xics_migrate_irqs_away();
-        return 0;
-}
-
-static void pSeries_cpu_die(unsigned int cpu)
-{
-        int tries;
-        int cpu_status;
-        unsigned int pcpu = get_hard_smp_processor_id(cpu);
-
-        for (tries = 0; tries < 25; tries++) {
-                cpu_status = query_cpu_stopped(pcpu);
-                if (cpu_status == 0 || cpu_status == -1)
-                        break;
-                msleep(200);
-        }
-        if (cpu_status != 0) {
-                printk("Querying DEAD? cpu %i (%i) shows %i\n",
-                       cpu, pcpu, cpu_status);
-        }
-
-        /* Isolation and deallocation are definatly done by
-         * drslot_chrp_cpu.  If they were not they would be
-         * done here.  Change isolate state to Isolate and
-         * change allocation-state to Unusable.
-         */
-        paca[cpu].cpu_start = 0;
-}
-
-/*
- * Update cpu_present_map and paca(s) for a new cpu node.  The wrinkle
- * here is that a cpu device node may represent up to two logical cpus
- * in the SMT case.  We must honor the assumption in other code that
- * the logical ids for sibling SMT threads x and y are adjacent, such
- * that x^1 == y and y^1 == x.
- */
-static int pSeries_add_processor(struct device_node *np)
-{
-        unsigned int cpu;
-        cpumask_t candidate_map, tmp = CPU_MASK_NONE;
-        int err = -ENOSPC, len, nthreads, i;
-        const u32 *intserv;
-
-        intserv = get_property(np, "ibm,ppc-interrupt-server#s", &len);
-        if (!intserv)
-                return 0;
-
-        nthreads = len / sizeof(u32);
-        for (i = 0; i < nthreads; i++)
-                cpu_set(i, tmp);
-
-        lock_cpu_hotplug();
-
-        BUG_ON(!cpus_subset(cpu_present_map, cpu_possible_map));
-
-        /* Get a bitmap of unoccupied slots. */
-        cpus_xor(candidate_map, cpu_possible_map, cpu_present_map);
-        if (cpus_empty(candidate_map)) {
-                /* If we get here, it most likely means that NR_CPUS is
-                 * less than the partition's max processors setting.
-                 */
-                printk(KERN_ERR "Cannot add cpu %s; this system configuration"
-                       " supports %d logical cpus.\n", np->full_name,
-                       cpus_weight(cpu_possible_map));
-                goto out_unlock;
-        }
-
-        while (!cpus_empty(tmp))
-                if (cpus_subset(tmp, candidate_map))
-                        /* Found a range where we can insert the new cpu(s) */
-                        break;
-                else
-                        cpus_shift_left(tmp, tmp, nthreads);
-
-        if (cpus_empty(tmp)) {
-                printk(KERN_ERR "Unable to find space in cpu_present_map for"
-                       " processor %s with %d thread(s)\n", np->name,
-                       nthreads);
-                goto out_unlock;
-        }
-
-        for_each_cpu_mask(cpu, tmp) {
-                BUG_ON(cpu_isset(cpu, cpu_present_map));
-                cpu_set(cpu, cpu_present_map);
-                set_hard_smp_processor_id(cpu, *intserv++);
-        }
-        err = 0;
-out_unlock:
-        unlock_cpu_hotplug();
-        return err;
-}
-
-/*
- * Update the present map for a cpu node which is going away, and set
- * the hard id in the paca(s) to -1 to be consistent with boot time
- * convention for non-present cpus.
- */
-static void pSeries_remove_processor(struct device_node *np)
-{
-        unsigned int cpu;
-        int len, nthreads, i;
-        const u32 *intserv;
-
-        intserv = get_property(np, "ibm,ppc-interrupt-server#s", &len);
-        if (!intserv)
-                return;
-
-        nthreads = len / sizeof(u32);
-
-        lock_cpu_hotplug();
-        for (i = 0; i < nthreads; i++) {
-                for_each_present_cpu(cpu) {
-                        if (get_hard_smp_processor_id(cpu) != intserv[i])
-                                continue;
-                        BUG_ON(cpu_online(cpu));
-                        cpu_clear(cpu, cpu_present_map);
-                        set_hard_smp_processor_id(cpu, -1);
-                        break;
-                }
-                if (cpu == NR_CPUS)
-                        printk(KERN_WARNING "Could not find cpu to remove "
-                               "with physical id 0x%x\n", intserv[i]);
-        }
-        unlock_cpu_hotplug();
-}
-
-static int pSeries_smp_notifier(struct notifier_block *nb, unsigned long action, void *node)
-{
-        int err = NOTIFY_OK;
-
-        switch (action) {
-        case PSERIES_RECONFIG_ADD:
-                if (pSeries_add_processor(node))
-                        err = NOTIFY_BAD;
-                break;
-        case PSERIES_RECONFIG_REMOVE:
-                pSeries_remove_processor(node);
-                break;
-        default:
-                err = NOTIFY_DONE;
-                break;
-        }
-        return err;
-}
-
-static struct notifier_block pSeries_smp_nb = {
-        .notifier_call = pSeries_smp_notifier,
-};
-
-#endif /* CONFIG_HOTPLUG_CPU */
-
 /**
  * smp_startup_cpu() - start the given cpu
  *
@@ -422,15 +231,6 @@ static void __init smp_init_pseries(void)
 
         DBG(" -> smp_init_pSeries()\n");
 
-#ifdef CONFIG_HOTPLUG_CPU
-        smp_ops->cpu_disable = pSeries_cpu_disable;
-        smp_ops->cpu_die = pSeries_cpu_die;
-
-        /* Processors can be added/removed only on LPAR */
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                pSeries_reconfig_notifier_register(&pSeries_smp_nb);
-#endif
-
         /* Mark threads which are still spinning in hold loops. */
         if (cpu_has_feature(CPU_FTR_SMT)) {
                 for_each_present_cpu(i) { 
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index d071abe78ab1..81d172d65038 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -224,7 +224,6 @@ static void xics_unmask_irq(unsigned int virq)
 static void xics_mask_real_irq(unsigned int irq)
 {
         int call_status;
-        unsigned int server;
 
         if (irq == XICS_IPI)
                 return;
@@ -236,9 +235,9 @@ static void xics_mask_real_irq(unsigned int irq)
                 return;
         }
 
-        server = get_irq_server(irq);
         /* Have to set XIVE to 0xff to be able to remove a slot */
-        call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server, 0xff);
+        call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq,
+                                default_server, 0xff);
         if (call_status != 0) {
                 printk(KERN_ERR "xics_disable_irq: irq=%u: ibm_set_xive(0xff)"
                        " returned %d\n", irq, call_status);
@@ -656,13 +655,38 @@ static void __init xics_setup_8259_cascade(void)
         set_irq_chained_handler(cascade, pseries_8259_cascade);
 }
 
+static struct device_node *cpuid_to_of_node(int cpu)
+{
+        struct device_node *np;
+        u32 hcpuid = get_hard_smp_processor_id(cpu);
+
+        for_each_node_by_type(np, "cpu") {
+                int i, len;
+                const u32 *intserv;
+
+                intserv = get_property(np, "ibm,ppc-interrupt-server#s", &len);
+
+                if (!intserv)
+                        intserv = get_property(np, "reg", &len);
+
+                i = len / sizeof(u32);
+
+                while (i--)
+                        if (intserv[i] == hcpuid)
+                                return np;
+        }
+
+        return NULL;
+}
+
 void __init xics_init_IRQ(void)
 {
-        int i;
+        int i, j;
         struct device_node *np;
         u32 ilen, indx = 0;
-        const u32 *ireg;
+        const u32 *ireg, *isize;
         int found = 0;
+        u32 hcpuid;
 
         ppc64_boot_msg(0x20, "XICS Init");
 
@@ -683,26 +707,31 @@ void __init xics_init_IRQ(void)
         xics_init_host();
 
         /* Find the server numbers for the boot cpu. */
-        for (np = of_find_node_by_type(NULL, "cpu");
-             np;
-             np = of_find_node_by_type(np, "cpu")) {
-                ireg = get_property(np, "reg", &ilen);
-                if (ireg && ireg[0] == get_hard_smp_processor_id(boot_cpuid)) {
-                        ireg = get_property(np,
-                                        "ibm,ppc-interrupt-gserver#s", &ilen);
-                        i = ilen / sizeof(int);
-                        if (ireg && i > 0) {
-                                default_server = ireg[0];
-                                /* take last element */
-                                default_distrib_server = ireg[i-1];
-                        }
-                        ireg = get_property(np,
+        np = cpuid_to_of_node(boot_cpuid);
+        BUG_ON(!np);
+        ireg = get_property(np, "ibm,ppc-interrupt-gserver#s", &ilen);
+        if (!ireg)
+                goto skip_gserver_check;
+        i = ilen / sizeof(int);
+        hcpuid = get_hard_smp_processor_id(boot_cpuid);
+
+        /* Global interrupt distribution server is specified in the last
+         * entry of "ibm,ppc-interrupt-gserver#s" property. Get the last
+         * entry fom this property for current boot cpu id and use it as
+         * default distribution server
+         */
+        for (j = 0; j < i; j += 2) {
+                if (ireg[j] == hcpuid) {
+                        default_server = hcpuid;
+                        default_distrib_server = ireg[j+1];
+
+                        isize = get_property(np,
                                         "ibm,interrupt-server#-size", NULL);
-                        if (ireg)
-                                interrupt_server_size = *ireg;
-                        break;
+                        if (isize)
+                                interrupt_server_size = *isize;
                 }
         }
+skip_gserver_check:
         of_node_put(np);
 
         if (firmware_has_feature(FW_FEATURE_LPAR))
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 91f052d8cce0..2621a7e72d2d 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -5,12 +5,11 @@ endif
 obj-$(CONFIG_MPIC)              += mpic.o
 obj-$(CONFIG_PPC_INDIRECT_PCI)  += indirect_pci.o
 obj-$(CONFIG_PPC_MPC106)        += grackle.o
-obj-$(CONFIG_BOOKE)             += dcr.o
-obj-$(CONFIG_40x)               += dcr.o
+obj-$(CONFIG_PPC_DCR)           += dcr.o
+obj-$(CONFIG_PPC_DCR_NATIVE)    += dcr-low.o
 obj-$(CONFIG_U3_DART)           += dart_iommu.o
 obj-$(CONFIG_MMIO_NVRAM)        += mmio_nvram.o
 obj-$(CONFIG_FSL_SOC)           += fsl_soc.o
-obj-$(CONFIG_PPC_TODC)          += todc.o
 obj-$(CONFIG_TSI108_BRIDGE)     += tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)      += qe_lib/
 
@@ -21,5 +20,6 @@ endif
 
 # Temporary hack until we have migrated to asm-powerpc
 ifeq ($(ARCH),powerpc)
+obj-$(CONFIG_MTD)               += rom.o
 obj-$(CONFIG_CPM2)              += cpm2_common.o cpm2_pic.o
 endif
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index 572b7846cc77..1488535b0e13 100644
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -48,9 +48,6 @@
 
 #include "dart.h"
 
-extern int iommu_is_off;
-extern int iommu_force_on;
-
 /* Physical base address and size of the DART table */
 unsigned long dart_tablebase; /* exported to htab_initialize */
 static unsigned long dart_tablesize;
@@ -289,24 +286,15 @@ static void iommu_table_dart_setup(void)
         set_bit(iommu_table_dart.it_size - 1, iommu_table_dart.it_map);
 }
 
-static void iommu_dev_setup_dart(struct pci_dev *dev)
+static void pci_dma_dev_setup_dart(struct pci_dev *dev)
 {
-        struct device_node *dn;
-
         /* We only have one iommu table on the mac for now, which makes
          * things simple. Setup all PCI devices to point to this table
-         *
-         * We must use pci_device_to_OF_node() to make sure that
-         * we get the real "final" pointer to the device in the
-         * pci_dev sysdata and not the temporary PHB one
          */
-        dn = pci_device_to_OF_node(dev);
-
-        if (dn)
-                PCI_DN(dn)->iommu_table = &iommu_table_dart;
+        dev->dev.archdata.dma_data = &iommu_table_dart;
 }
 
-static void iommu_bus_setup_dart(struct pci_bus *bus)
+static void pci_dma_bus_setup_dart(struct pci_bus *bus)
 {
         struct device_node *dn;
 
@@ -321,9 +309,6 @@ static void iommu_bus_setup_dart(struct pci_bus *bus)
                 PCI_DN(dn)->iommu_table = &iommu_table_dart;
 }
 
-static void iommu_dev_setup_null(struct pci_dev *dev) { }
-static void iommu_bus_setup_null(struct pci_bus *bus) { }
-
 void iommu_init_early_dart(void)
 {
         struct device_node *dn;
@@ -344,22 +329,21 @@ void iommu_init_early_dart(void)
 
         /* Initialize the DART HW */
         if (dart_init(dn) == 0) {
-                ppc_md.iommu_dev_setup = iommu_dev_setup_dart;
-                ppc_md.iommu_bus_setup = iommu_bus_setup_dart;
+                ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_dart;
+                ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_dart;
 
                 /* Setup pci_dma ops */
-                pci_iommu_init();
-
+                pci_dma_ops = &dma_iommu_ops;
                 return;
         }
 
  bail:
         /* If init failed, use direct iommu and null setup functions */
-        ppc_md.iommu_dev_setup = iommu_dev_setup_null;
-        ppc_md.iommu_bus_setup = iommu_bus_setup_null;
+        ppc_md.pci_dma_dev_setup = NULL;
+        ppc_md.pci_dma_bus_setup = NULL;
 
         /* Setup pci_dma ops */
-        pci_direct_iommu_init();
+        pci_dma_ops = &dma_direct_ops;
 }
 
 
diff --git a/arch/powerpc/sysdev/dcr.S b/arch/powerpc/sysdev/dcr-low.S
index 2078f39e2f17..2078f39e2f17 100644
--- a/arch/powerpc/sysdev/dcr.S
+++ b/arch/powerpc/sysdev/dcr-low.S
diff --git a/arch/powerpc/sysdev/dcr.c b/arch/powerpc/sysdev/dcr.c
new file mode 100644
index 000000000000..dffeeaeca1d9
--- /dev/null
+++ b/arch/powerpc/sysdev/dcr.c
@@ -0,0 +1,137 @@
+/*
+ * (c) Copyright 2006 Benjamin Herrenschmidt, IBM Corp.
+ *                    <benh@kernel.crashing.org>
+ *
+ *   This program is free software;  you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ *   the GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program;  if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#undef DEBUG
+
+#include <linux/kernel.h>
+#include <asm/prom.h>
+#include <asm/dcr.h>
+
+unsigned int dcr_resource_start(struct device_node *np, unsigned int index)
+{
+        unsigned int ds;
+        const u32 *dr = get_property(np, "dcr-reg", &ds);
+
+        if (dr == NULL || ds & 1 || index >= (ds / 8))
+                return 0;
+
+        return dr[index * 2];
+}
+
+unsigned int dcr_resource_len(struct device_node *np, unsigned int index)
+{
+        unsigned int ds;
+        const u32 *dr = get_property(np, "dcr-reg", &ds);
+
+        if (dr == NULL || ds & 1 || index >= (ds / 8))
+                return 0;
+
+        return dr[index * 2 + 1];
+}
+
+#ifndef CONFIG_PPC_DCR_NATIVE
+
+static struct device_node * find_dcr_parent(struct device_node * node)
+{
+        struct device_node *par, *tmp;
+        const u32 *p;
+
+        for (par = of_node_get(node); par;) {
+                if (get_property(par, "dcr-controller", NULL))
+                        break;
+                p = get_property(par, "dcr-parent", NULL);
+                tmp = par;
+                if (p == NULL)
+                        par = of_get_parent(par);
+                else
+                        par = of_find_node_by_phandle(*p);
+                of_node_put(tmp);
+        }
+        return par;
+}
+
+u64 of_translate_dcr_address(struct device_node *dev,
+                             unsigned int dcr_n,
+                             unsigned int *out_stride)
+{
+        struct device_node *dp;
+        const u32 *p;
+        unsigned int stride;
+        u64 ret;
+
+        dp = find_dcr_parent(dev);
+        if (dp == NULL)
+                return OF_BAD_ADDR;
+
+        /* Stride is not properly defined yet, default to 0x10 for Axon */
+        p = get_property(dp, "dcr-mmio-stride", NULL);
+        stride = (p == NULL) ? 0x10 : *p;
+
+        /* XXX FIXME: Which property name is to use of the 2 following ? */
+        p = get_property(dp, "dcr-mmio-range", NULL);
+        if (p == NULL)
+                p = get_property(dp, "dcr-mmio-space", NULL);
+        if (p == NULL)
+                return OF_BAD_ADDR;
+
+        /* Maybe could do some better range checking here */
+        ret = of_translate_address(dp, p);
+        if (ret != OF_BAD_ADDR)
+                ret += (u64)(stride) * (u64)dcr_n;
+        if (out_stride)
+                *out_stride = stride;
+        return ret;
+}
+
+dcr_host_t dcr_map(struct device_node *dev, unsigned int dcr_n,
+                   unsigned int dcr_c)
+{
+        dcr_host_t ret = { .token = NULL, .stride = 0 };
+        u64 addr;
+
+        pr_debug("dcr_map(%s, 0x%x, 0x%x)\n",
+                 dev->full_name, dcr_n, dcr_c);
+
+        addr = of_translate_dcr_address(dev, dcr_n, &ret.stride);
+        pr_debug("translates to addr: 0x%lx, stride: 0x%x\n",
+                 addr, ret.stride);
+        if (addr == OF_BAD_ADDR)
+                return ret;
+        pr_debug("mapping 0x%x bytes\n", dcr_c * ret.stride);
+        ret.token = ioremap(addr, dcr_c * ret.stride);
+        if (ret.token == NULL)
+                return ret;
+        pr_debug("mapped at 0x%p -> base is 0x%p\n",
+                 ret.token, ret.token - dcr_n * ret.stride);
+        ret.token -= dcr_n * ret.stride;
+        return ret;
+}
+
+void dcr_unmap(dcr_host_t host, unsigned int dcr_n, unsigned int dcr_c)
+{
+        dcr_host_t h = host;
+
+        if (h.token == NULL)
+                return;
+        h.token -= dcr_n * h.stride;
+        iounmap(h.token);
+        h.token = NULL;
+}
+
+#endif /* !defined(CONFIG_PPC_DCR_NATIVE) */
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index dbe92ae20333..ad31e56e892b 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -22,6 +22,7 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
+#include <linux/phy.h>
 #include <linux/fsl_devices.h>
 #include <linux/fs_enet_pd.h>
 #include <linux/fs_uart_pd.h>
@@ -146,7 +147,7 @@ static int __init gfar_mdio_of_init(void)
                 }
 
                 for (k = 0; k < 32; k++)
-                        mdio_data.irq[k] = -1;
+                        mdio_data.irq[k] = PHY_POLL;
 
                 while ((child = of_get_next_child(np, child)) != NULL) {
                         int irq = irq_of_parse_and_map(child, 0);
@@ -177,6 +178,7 @@ static const char *gfar_tx_intr = "tx";
 static const char *gfar_rx_intr = "rx";
 static const char *gfar_err_intr = "error";
 
+
 static int __init gfar_of_init(void)
 {
         struct device_node *np;
@@ -204,8 +206,7 @@ static int __init gfar_of_init(void)
                 if (ret)
                         goto err;
 
-                r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
-                r[1].flags = IORESOURCE_IRQ;
+                of_irq_to_resource(np, 0, &r[1]);
 
                 model = get_property(np, "model", NULL);
 
@@ -214,12 +215,10 @@ static int __init gfar_of_init(void)
                         r[1].name = gfar_tx_intr;
 
                         r[2].name = gfar_rx_intr;
-                        r[2].start = r[2].end = irq_of_parse_and_map(np, 1);
-                        r[2].flags = IORESOURCE_IRQ;
+                        of_irq_to_resource(np, 1, &r[2]);
 
                         r[3].name = gfar_err_intr;
-                        r[3].start = r[3].end = irq_of_parse_and_map(np, 2);
-                        r[3].flags = IORESOURCE_IRQ;
+                        of_irq_to_resource(np, 2, &r[3]);
 
                         n_res += 2;
                 }
@@ -323,8 +322,7 @@ static int __init fsl_i2c_of_init(void)
                 if (ret)
                         goto err;
 
-                r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
-                r[1].flags = IORESOURCE_IRQ;
+                of_irq_to_resource(np, 0, &r[1]);
 
                 i2c_dev = platform_device_register_simple("fsl-i2c", i, r, 2);
                 if (IS_ERR(i2c_dev)) {
@@ -459,8 +457,7 @@ static int __init fsl_usb_of_init(void)
                 if (ret)
                         goto err;
 
-                r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
-                r[1].flags = IORESOURCE_IRQ;
+                of_irq_to_resource(np, 0, &r[1]);
 
                 usb_dev_mph =
                     platform_device_register_simple("fsl-ehci", i, r, 2);
@@ -507,8 +504,7 @@ static int __init fsl_usb_of_init(void)
                 if (ret)
                         goto unreg_mph;
 
-                r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
-                r[1].flags = IORESOURCE_IRQ;
+                of_irq_to_resource(np, 0, &r[1]);
 
                 usb_dev_dr =
                     platform_device_register_simple("fsl-ehci", i, r, 2);
@@ -591,8 +587,7 @@ static int __init fs_enet_of_init(void)
                 r[2].name = fcc_regs_c;
                 fs_enet_data.fcc_regs_c = r[2].start;
 
-                r[3].start = r[3].end = irq_of_parse_and_map(np, 0);
-                r[3].flags = IORESOURCE_IRQ;
+                of_irq_to_resource(np, 0, &r[3]);
 
                 fs_enet_dev =
                     platform_device_register_simple("fsl-cpm-fcc", i, &r[0], 4);
@@ -754,8 +749,7 @@ static int __init cpm_uart_of_init(void)
                         goto err;
                 r[1].name = scc_pram;
 
-                r[2].start = r[2].end = irq_of_parse_and_map(np, 0);
-                r[2].flags = IORESOURCE_IRQ;
+                of_irq_to_resource(np, 0, &r[2]);
 
                 cpm_uart_dev =
                     platform_device_register_simple("fsl-cpm-scc:uart", i, &r[0], 3);
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index ba4833f57d47..d01ced11694d 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -147,33 +147,51 @@ static u32 mpic_infos[][MPIC_IDX_END] = {
  */
 
 
-static inline u32 _mpic_read(unsigned int be, volatile u32 __iomem *base,
-                            unsigned int reg)
+static inline u32 _mpic_read(enum mpic_reg_type type,
+                             struct mpic_reg_bank *rb,
+                             unsigned int reg)
 {
-        if (be)
-                return in_be32(base + (reg >> 2));
-        else
-                return in_le32(base + (reg >> 2));
+        switch(type) {
+#ifdef CONFIG_PPC_DCR
+        case mpic_access_dcr:
+                return dcr_read(rb->dhost,
+                                rb->dbase + reg + rb->doff);
+#endif
+        case mpic_access_mmio_be:
+                return in_be32(rb->base + (reg >> 2));
+        case mpic_access_mmio_le:
+        default:
+                return in_le32(rb->base + (reg >> 2));
+        }
 }
 
-static inline void _mpic_write(unsigned int be, volatile u32 __iomem *base,
-                              unsigned int reg, u32 value)
+static inline void _mpic_write(enum mpic_reg_type type,
+                               struct mpic_reg_bank *rb,
+                               unsigned int reg, u32 value)
 {
-        if (be)
-                out_be32(base + (reg >> 2), value);
-        else
-                out_le32(base + (reg >> 2), value);
+        switch(type) {
+#ifdef CONFIG_PPC_DCR
+        case mpic_access_dcr:
+                return dcr_write(rb->dhost,
+                                 rb->dbase + reg + rb->doff, value);
+#endif
+        case mpic_access_mmio_be:
+                return out_be32(rb->base + (reg >> 2), value);
+        case mpic_access_mmio_le:
+        default:
+                return out_le32(rb->base + (reg >> 2), value);
+        }
 }
 
 static inline u32 _mpic_ipi_read(struct mpic *mpic, unsigned int ipi)
 {
-        unsigned int be = (mpic->flags & MPIC_BIG_ENDIAN) != 0;
+        enum mpic_reg_type type = mpic->reg_type;
         unsigned int offset = MPIC_INFO(GREG_IPI_VECTOR_PRI_0) +
                               (ipi * MPIC_INFO(GREG_IPI_STRIDE));
 
-        if (mpic->flags & MPIC_BROKEN_IPI)
-                be = !be;
-        return _mpic_read(be, mpic->gregs, offset);
+        if ((mpic->flags & MPIC_BROKEN_IPI) && type == mpic_access_mmio_le)
+                type = mpic_access_mmio_be;
+        return _mpic_read(type, &mpic->gregs, offset);
 }
 
 static inline void _mpic_ipi_write(struct mpic *mpic, unsigned int ipi, u32 value)
@@ -181,7 +199,7 @@ static inline void _mpic_ipi_write(struct mpic *mpic, unsigned int ipi, u32 valu
         unsigned int offset = MPIC_INFO(GREG_IPI_VECTOR_PRI_0) +
                               (ipi * MPIC_INFO(GREG_IPI_STRIDE));
 
-        _mpic_write(mpic->flags & MPIC_BIG_ENDIAN, mpic->gregs, offset, value);
+        _mpic_write(mpic->reg_type, &mpic->gregs, offset, value);
 }
 
 static inline u32 _mpic_cpu_read(struct mpic *mpic, unsigned int reg)
@@ -190,8 +208,7 @@ static inline u32 _mpic_cpu_read(struct mpic *mpic, unsigned int reg)
 
         if (mpic->flags & MPIC_PRIMARY)
                 cpu = hard_smp_processor_id();
-        return _mpic_read(mpic->flags & MPIC_BIG_ENDIAN,
-                          mpic->cpuregs[cpu], reg);
+        return _mpic_read(mpic->reg_type, &mpic->cpuregs[cpu], reg);
 }
 
 static inline void _mpic_cpu_write(struct mpic *mpic, unsigned int reg, u32 value)
@@ -201,7 +218,7 @@ static inline void _mpic_cpu_write(struct mpic *mpic, unsigned int reg, u32 valu
         if (mpic->flags & MPIC_PRIMARY)
                 cpu = hard_smp_processor_id();
 
-        _mpic_write(mpic->flags & MPIC_BIG_ENDIAN, mpic->cpuregs[cpu], reg, value);
+        _mpic_write(mpic->reg_type, &mpic->cpuregs[cpu], reg, value);
 }
 
 static inline u32 _mpic_irq_read(struct mpic *mpic, unsigned int src_no, unsigned int reg)
@@ -209,7 +226,7 @@ static inline u32 _mpic_irq_read(struct mpic *mpic, unsigned int src_no, unsigne
         unsigned int    isu = src_no >> mpic->isu_shift;
         unsigned int    idx = src_no & mpic->isu_mask;
 
-        return _mpic_read(mpic->flags & MPIC_BIG_ENDIAN, mpic->isus[isu],
+        return _mpic_read(mpic->reg_type, &mpic->isus[isu],
                           reg + (idx * MPIC_INFO(IRQ_STRIDE)));
 }
 
@@ -219,12 +236,12 @@ static inline void _mpic_irq_write(struct mpic *mpic, unsigned int src_no,
         unsigned int    isu = src_no >> mpic->isu_shift;
         unsigned int    idx = src_no & mpic->isu_mask;
 
-        _mpic_write(mpic->flags & MPIC_BIG_ENDIAN, mpic->isus[isu],
+        _mpic_write(mpic->reg_type, &mpic->isus[isu],
                     reg + (idx * MPIC_INFO(IRQ_STRIDE)), value);
 }
 
-#define mpic_read(b,r)          _mpic_read(mpic->flags & MPIC_BIG_ENDIAN,(b),(r))
-#define mpic_write(b,r,v)       _mpic_write(mpic->flags & MPIC_BIG_ENDIAN,(b),(r),(v))
+#define mpic_read(b,r)          _mpic_read(mpic->reg_type,&(b),(r))
+#define mpic_write(b,r,v)       _mpic_write(mpic->reg_type,&(b),(r),(v))
 #define mpic_ipi_read(i)        _mpic_ipi_read(mpic,(i))
 #define mpic_ipi_write(i,v)     _mpic_ipi_write(mpic,(i),(v))
 #define mpic_cpu_read(i)        _mpic_cpu_read(mpic,(i))
@@ -238,6 +255,38 @@ static inline void _mpic_irq_write(struct mpic *mpic, unsigned int src_no,
  */
 
 
+static void _mpic_map_mmio(struct mpic *mpic, unsigned long phys_addr,
+                           struct mpic_reg_bank *rb, unsigned int offset,
+                           unsigned int size)
+{
+        rb->base = ioremap(phys_addr + offset, size);
+        BUG_ON(rb->base == NULL);
+}
+
+#ifdef CONFIG_PPC_DCR
+static void _mpic_map_dcr(struct mpic *mpic, struct mpic_reg_bank *rb,
+                          unsigned int offset, unsigned int size)
+{
+        rb->dbase = mpic->dcr_base;
+        rb->doff = offset;
+        rb->dhost = dcr_map(mpic->of_node, rb->dbase + rb->doff, size);
+        BUG_ON(!DCR_MAP_OK(rb->dhost));
+}
+
+static inline void mpic_map(struct mpic *mpic, unsigned long phys_addr,
+                            struct mpic_reg_bank *rb, unsigned int offset,
+                            unsigned int size)
+{
+        if (mpic->flags & MPIC_USES_DCR)
+                _mpic_map_dcr(mpic, rb, offset, size);
+        else
+                _mpic_map_mmio(mpic, phys_addr, rb, offset, size);
+}
+#else /* CONFIG_PPC_DCR */
+#define mpic_map(m,p,b,o,s)     _mpic_map_mmio(m,p,b,o,s)
+#endif /* !CONFIG_PPC_DCR */
+
+
 
 /* Check if we have one of those nice broken MPICs with a flipped endian on
  * reads from IPI registers
@@ -341,7 +390,7 @@ static void __init mpic_scan_ht_pic(struct mpic *mpic, u8 __iomem *devbase,
                 u8 id = readb(devbase + pos + PCI_CAP_LIST_ID);
                 if (id == PCI_CAP_ID_HT) {
                         id = readb(devbase + pos + 3);
-                        if (id == HT_CAPTYPE_IRQ)
+                        if ((id & HT_5BIT_CAP_MASK) == HT_CAPTYPE_IRQ)
                                 break;
                 }
         }
@@ -845,7 +894,7 @@ static struct irq_host_ops mpic_host_ops = {
  */
 
 struct mpic * __init mpic_alloc(struct device_node *node,
-                                unsigned long phys_addr,
+                                phys_addr_t phys_addr,
                                 unsigned int flags,
                                 unsigned int isu_size,
                                 unsigned int irq_count,
@@ -855,6 +904,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         u32             reg;
         const char      *vers;
         int             i;
+        u64             paddr = phys_addr;
 
         mpic = alloc_bootmem(sizeof(struct mpic));
         if (mpic == NULL)
@@ -883,6 +933,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         if (flags & MPIC_PRIMARY)
                 mpic->hc_ht_irq.set_affinity = mpic_set_affinity;
 #endif /* CONFIG_MPIC_BROKEN_U3 */
+
 #ifdef CONFIG_SMP
         mpic->hc_ipi = mpic_ipi_chip;
         mpic->hc_ipi.typename = name;
@@ -893,15 +944,52 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         mpic->irq_count = irq_count;
         mpic->num_sources = 0; /* so far */
 
+        /* Check for "big-endian" in device-tree */
+        if (node && get_property(node, "big-endian", NULL) != NULL)
+                mpic->flags |= MPIC_BIG_ENDIAN;
+
+
 #ifdef CONFIG_MPIC_WEIRD
         mpic->hw_set = mpic_infos[MPIC_GET_REGSET(flags)];
 #endif
 
+        /* default register type */
+        mpic->reg_type = (flags & MPIC_BIG_ENDIAN) ?
+                mpic_access_mmio_be : mpic_access_mmio_le;
+
+        /* If no physical address is passed in, a device-node is mandatory */
+        BUG_ON(paddr == 0 && node == NULL);
+
+        /* If no physical address passed in, check if it's dcr based */
+        if (paddr == 0 && get_property(node, "dcr-reg", NULL) != NULL)
+                mpic->flags |= MPIC_USES_DCR;
+
+#ifdef CONFIG_PPC_DCR
+        if (mpic->flags & MPIC_USES_DCR) {
+                const u32 *dbasep;
+                dbasep = get_property(node, "dcr-reg", NULL);
+                BUG_ON(dbasep == NULL);
+                mpic->dcr_base = *dbasep;
+                mpic->reg_type = mpic_access_dcr;
+        }
+#else
+        BUG_ON (mpic->flags & MPIC_USES_DCR);
+#endif /* CONFIG_PPC_DCR */
+
+        /* If the MPIC is not DCR based, and no physical address was passed
+         * in, try to obtain one
+         */
+        if (paddr == 0 && !(mpic->flags & MPIC_USES_DCR)) {
+                const u32 *reg;
+                reg = get_property(node, "reg", NULL);
+                BUG_ON(reg == NULL);
+                paddr = of_translate_address(node, reg);
+                BUG_ON(paddr == OF_BAD_ADDR);
+        }
+
         /* Map the global registers */
-        mpic->gregs = ioremap(phys_addr + MPIC_INFO(GREG_BASE), 0x1000);
-        mpic->tmregs = mpic->gregs +
-                       ((MPIC_INFO(TIMER_BASE) - MPIC_INFO(GREG_BASE)) >> 2);
-        BUG_ON(mpic->gregs == NULL);
+        mpic_map(mpic, paddr, &mpic->gregs, MPIC_INFO(GREG_BASE), 0x1000);
+        mpic_map(mpic, paddr, &mpic->tmregs, MPIC_INFO(TIMER_BASE), 0x1000);
 
         /* Reset */
         if (flags & MPIC_WANTS_RESET) {
@@ -926,17 +1014,16 @@ struct mpic * __init mpic_alloc(struct device_node *node,
 
         /* Map the per-CPU registers */
         for (i = 0; i < mpic->num_cpus; i++) {
-                mpic->cpuregs[i] = ioremap(phys_addr + MPIC_INFO(CPU_BASE) +
-                                           i * MPIC_INFO(CPU_STRIDE), 0x1000);
-                BUG_ON(mpic->cpuregs[i] == NULL);
+                mpic_map(mpic, paddr, &mpic->cpuregs[i],
+                         MPIC_INFO(CPU_BASE) + i * MPIC_INFO(CPU_STRIDE),
+                         0x1000);
         }
 
         /* Initialize main ISU if none provided */
         if (mpic->isu_size == 0) {
                 mpic->isu_size = mpic->num_sources;
-                mpic->isus[0] = ioremap(phys_addr + MPIC_INFO(IRQ_BASE),
-                                        MPIC_INFO(IRQ_STRIDE) * mpic->isu_size);
-                BUG_ON(mpic->isus[0] == NULL);
+                mpic_map(mpic, paddr, &mpic->isus[0],
+                         MPIC_INFO(IRQ_BASE), MPIC_INFO(IRQ_STRIDE) * mpic->isu_size);
         }
         mpic->isu_shift = 1 + __ilog2(mpic->isu_size - 1);
         mpic->isu_mask = (1 << mpic->isu_shift) - 1;
@@ -956,10 +1043,11 @@ struct mpic * __init mpic_alloc(struct device_node *node,
                 vers = "<unknown>";
                 break;
         }
-        printk(KERN_INFO "mpic: Setting up MPIC \"%s\" version %s at %lx, max %d CPUs\n",
-               name, vers, phys_addr, mpic->num_cpus);
-        printk(KERN_INFO "mpic: ISU size: %d, shift: %d, mask: %x\n", mpic->isu_size,
-               mpic->isu_shift, mpic->isu_mask);
+        printk(KERN_INFO "mpic: Setting up MPIC \"%s\" version %s at %llx,"
+               " max %d CPUs\n",
+               name, vers, (unsigned long long)paddr, mpic->num_cpus);
+        printk(KERN_INFO "mpic: ISU size: %d, shift: %d, mask: %x\n",
+               mpic->isu_size, mpic->isu_shift, mpic->isu_mask);
 
         mpic->next = mpics;
         mpics = mpic;
@@ -973,14 +1061,14 @@ struct mpic * __init mpic_alloc(struct device_node *node,
 }
 
 void __init mpic_assign_isu(struct mpic *mpic, unsigned int isu_num,
-                            unsigned long phys_addr)
+                            phys_addr_t paddr)
 {
         unsigned int isu_first = isu_num * mpic->isu_size;
 
         BUG_ON(isu_num >= MPIC_MAX_ISU);
 
-        mpic->isus[isu_num] = ioremap(phys_addr,
-                                      MPIC_INFO(IRQ_STRIDE) * mpic->isu_size);
+        mpic_map(mpic, paddr, &mpic->isus[isu_num], 0,
+                 MPIC_INFO(IRQ_STRIDE) * mpic->isu_size);
         if ((isu_first + mpic->isu_size) > mpic->num_sources)
                 mpic->num_sources = isu_first + mpic->isu_size;
 }
diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c
index e4223226a7a8..e3d71e083f35 100644
--- a/arch/powerpc/sysdev/qe_lib/qe.c
+++ b/arch/powerpc/sysdev/qe_lib/qe.c
@@ -174,8 +174,7 @@ void qe_setbrg(u32 brg, u32 rate)
         u32 divisor, tempval;
         int div16 = 0;
 
-        bp = &qe_immr->brg.brgc1;
-        bp += brg;
+        bp = &qe_immr->brg.brgc[brg];
 
         divisor = (get_brg_clk() / rate);
         if (divisor > QE_BRGC_DIVISOR_MAX + 1) {
diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c
index 6995f51b9488..74e48d94f27c 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_ic.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c
@@ -223,23 +223,15 @@ static void qe_ic_mask_irq(unsigned int virq)
         qe_ic_write(qe_ic->regs, qe_ic_info[src].mask_reg,
                     temp & ~qe_ic_info[src].mask);
 
-        spin_unlock_irqrestore(&qe_ic_lock, flags);
-}
-
-static void qe_ic_mask_irq_and_ack(unsigned int virq)
-{
-        struct qe_ic *qe_ic = qe_ic_from_irq(virq);
-        unsigned int src = virq_to_hw(virq);
-        unsigned long flags;
-        u32 temp;
-
-        spin_lock_irqsave(&qe_ic_lock, flags);
-
-        temp = qe_ic_read(qe_ic->regs, qe_ic_info[src].mask_reg);
-        qe_ic_write(qe_ic->regs, qe_ic_info[src].mask_reg,
-                    temp & ~qe_ic_info[src].mask);
-
-        /* There is nothing to do for ack here, ack is handled in ISR */
+        /* Flush the above write before enabling interrupts; otherwise,
+         * spurious interrupts will sometimes happen.  To be 100% sure
+         * that the write has reached the device before interrupts are
+         * enabled, the mask register would have to be read back; however,
+         * this is not required for correctness, only to avoid wasting
+         * time on a large number of spurious interrupts.  In testing,
+         * a sync reduced the observed spurious interrupts to zero.
+         */
+        mb();
 
         spin_unlock_irqrestore(&qe_ic_lock, flags);
 }
@@ -248,7 +240,7 @@ static struct irq_chip qe_ic_irq_chip = {
         .typename = " QEIC  ",
         .unmask = qe_ic_unmask_irq,
         .mask = qe_ic_mask_irq,
-        .mask_ack = qe_ic_mask_irq_and_ack,
+        .mask_ack = qe_ic_mask_irq,
 };
 
 static int qe_ic_host_match(struct irq_host *h, struct device_node *node)
@@ -331,34 +323,22 @@ unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic)
         return irq_linear_revmap(qe_ic->irqhost, irq);
 }
 
-/* FIXME: We mask all the QE Low interrupts while handling.  We should
- * let other interrupt come in, but BAD interrupts are generated */
 void fastcall qe_ic_cascade_low(unsigned int irq, struct irq_desc *desc)
 {
         struct qe_ic *qe_ic = desc->handler_data;
-        struct irq_chip *chip = irq_desc[irq].chip;
-
         unsigned int cascade_irq = qe_ic_get_low_irq(qe_ic);
 
-        chip->mask_ack(irq);
         if (cascade_irq != NO_IRQ)
                 generic_handle_irq(cascade_irq);
-        chip->unmask(irq);
 }
 
-/* FIXME: We mask all the QE High interrupts while handling.  We should
- * let other interrupt come in, but BAD interrupts are generated */
 void fastcall qe_ic_cascade_high(unsigned int irq, struct irq_desc *desc)
 {
         struct qe_ic *qe_ic = desc->handler_data;
-        struct irq_chip *chip = irq_desc[irq].chip;
-
         unsigned int cascade_irq = qe_ic_get_high_irq(qe_ic);
 
-        chip->mask_ack(irq);
         if (cascade_irq != NO_IRQ)
                 generic_handle_irq(cascade_irq);
-        chip->unmask(irq);
 }
 
 void __init qe_ic_init(struct device_node *node, unsigned int flags)
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_fast.c b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
index 75fa3104a43a..e657559bea93 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
@@ -216,14 +216,12 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
                 return -EINVAL;
         }
 
-        uccf = (struct ucc_fast_private *)
-                 kmalloc(sizeof(struct ucc_fast_private), GFP_KERNEL);
+        uccf = kzalloc(sizeof(struct ucc_fast_private), GFP_KERNEL);
         if (!uccf) {
                 uccf_err
                     ("ucc_fast_init: No memory for UCC slow data structure!");
                 return -ENOMEM;
         }
-        memset(uccf, 0, sizeof(struct ucc_fast_private));
 
         /* Fill fast UCC structure */
         uccf->uf_info = uf_info;
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_slow.c b/arch/powerpc/sysdev/qe_lib/ucc_slow.c
index a49da6b73ecf..47b56203f47e 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc_slow.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc_slow.c
@@ -168,14 +168,12 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
                 return -EINVAL;
         }
 
-        uccs = (struct ucc_slow_private *)
-                kmalloc(sizeof(struct ucc_slow_private), GFP_KERNEL);
+        uccs = kzalloc(sizeof(struct ucc_slow_private), GFP_KERNEL);
         if (!uccs) {
                 uccs_err
                     ("ucc_slow_init: No memory for UCC slow data structure!");
                 return -ENOMEM;
         }
-        memset(uccs, 0, sizeof(struct ucc_slow_private));
 
         /* Fill slow UCC structure */
         uccs->us_info = us_info;
diff --git a/arch/powerpc/sysdev/rom.c b/arch/powerpc/sysdev/rom.c
new file mode 100644
index 000000000000..c855a3b298a3
--- /dev/null
+++ b/arch/powerpc/sysdev/rom.c
@@ -0,0 +1,32 @@
+/*
+ * ROM device registration
+ *
+ * (C) 2006 MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#include <linux/kernel.h>
+#include <asm/of_device.h>
+#include <asm/of_platform.h>
+
+static int __init powerpc_flash_init(void)
+{
+        struct device_node *node = NULL;
+
+        /*
+         * Register all the devices which type is "rom"
+         */
+        while ((node = of_find_node_by_type(node, "rom")) != NULL) {
+                if (node->name == NULL) {
+                        printk(KERN_WARNING "powerpc_flash_init: found 'rom' "
+                                "device, but with no name, skipping...\n");
+                        continue;
+                }
+                of_platform_device_create(node, node->name, NULL);
+        }
+        return 0;
+}
+
+arch_initcall(powerpc_flash_init);
diff --git a/arch/powerpc/sysdev/todc.c b/arch/powerpc/sysdev/todc.c
deleted file mode 100644
index 0a65980efb50..000000000000
--- a/arch/powerpc/sysdev/todc.c
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * Time of Day Clock support for the M48T35, M48T37, M48T59, and MC146818
- * Real Time Clocks/Timekeepers.
- *
- * Author: Mark A. Greer <mgreer@mvista.com>
- *
- * 2001-2004 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/time.h>
-#include <linux/timex.h>
-#include <linux/bcd.h>
-#include <linux/mc146818rtc.h>
-
-#include <asm/machdep.h>
-#include <asm/io.h>
-#include <asm/time.h>
-#include <asm/todc.h>
-
-/*
- * Depending on the hardware on your board and your board design, the
- * RTC/NVRAM may be accessed either directly (like normal memory) or via
- * address/data registers.  If your board uses the direct method, set
- * 'nvram_data' to the base address of your nvram and leave 'nvram_as0' and
- * 'nvram_as1' NULL.  If your board uses address/data regs to access nvram,
- * set 'nvram_as0' to the address of the lower byte, set 'nvram_as1' to the
- * address of the upper byte (leave NULL if using mc146818), and set
- * 'nvram_data' to the address of the 8-bit data register.
- *
- * Note: Even though the documentation for the various RTC chips say that it
- *       take up to a second before it starts updating once the 'R' bit is
- *       cleared, they always seem to update even though we bang on it many
- *       times a second.  This is true, except for the Dallas Semi 1746/1747
- *       (possibly others).  Those chips seem to have a real problem whenever
- *       we set the 'R' bit before reading them, they basically stop counting.
- *                                              --MAG
- */
-
-/*
- * 'todc_info' should be initialized in your *_setup.c file to
- * point to a fully initialized 'todc_info_t' structure.
- * This structure holds all the register offsets for your particular
- * TODC/RTC chip.
- * TODC_ALLOC()/TODC_INIT() will allocate and initialize this table for you.
- */
-
-#ifdef  RTC_FREQ_SELECT
-#undef  RTC_FREQ_SELECT
-#define RTC_FREQ_SELECT         control_b       /* Register A */
-#endif
-
-#ifdef  RTC_CONTROL
-#undef  RTC_CONTROL
-#define RTC_CONTROL             control_a       /* Register B */
-#endif
-
-#ifdef  RTC_INTR_FLAGS
-#undef  RTC_INTR_FLAGS
-#define RTC_INTR_FLAGS          watchdog        /* Register C */
-#endif
-
-#ifdef  RTC_VALID
-#undef  RTC_VALID
-#define RTC_VALID               interrupts      /* Register D */
-#endif
-
-/* Access routines when RTC accessed directly (like normal memory) */
-u_char
-todc_direct_read_val(int addr)
-{
-        return readb((void __iomem *)(todc_info->nvram_data + addr));
-}
-
-void
-todc_direct_write_val(int addr, unsigned char val)
-{
-        writeb(val, (void __iomem *)(todc_info->nvram_data + addr));
-        return;
-}
-
-/* Access routines for accessing m48txx type chips via addr/data regs */
-u_char
-todc_m48txx_read_val(int addr)
-{
-        outb(addr, todc_info->nvram_as0);
-        outb(addr>>todc_info->as0_bits, todc_info->nvram_as1);
-        return inb(todc_info->nvram_data);
-}
-
-void
-todc_m48txx_write_val(int addr, unsigned char val)
-{
-        outb(addr, todc_info->nvram_as0);
-        outb(addr>>todc_info->as0_bits, todc_info->nvram_as1);
-        outb(val, todc_info->nvram_data);
-        return;
-}
-
-/* Access routines for accessing mc146818 type chips via addr/data regs */
-u_char
-todc_mc146818_read_val(int addr)
-{
-        outb_p(addr, todc_info->nvram_as0);
-        return inb_p(todc_info->nvram_data);
-}
-
-void
-todc_mc146818_write_val(int addr, unsigned char val)
-{
-        outb_p(addr, todc_info->nvram_as0);
-        outb_p(val, todc_info->nvram_data);
-}
-
-
-/*
- * Routines to make RTC chips with NVRAM buried behind an addr/data pair
- * have the NVRAM and clock regs appear at the same level.
- * The NVRAM will appear to start at addr 0 and the clock regs will appear
- * to start immediately after the NVRAM (actually, start at offset
- * todc_info->nvram_size).
- */
-static inline u_char
-todc_read_val(int addr)
-{
-        u_char  val;
-
-        if (todc_info->sw_flags & TODC_FLAG_2_LEVEL_NVRAM) {
-                if (addr < todc_info->nvram_size) { /* NVRAM */
-                        ppc_md.rtc_write_val(todc_info->nvram_addr_reg, addr);
-                        val = ppc_md.rtc_read_val(todc_info->nvram_data_reg);
-                } else { /* Clock Reg */
-                        addr -= todc_info->nvram_size;
-                        val = ppc_md.rtc_read_val(addr);
-                }
-        } else
-                val = ppc_md.rtc_read_val(addr);
-
-        return val;
-}
-
-static inline void
-todc_write_val(int addr, u_char val)
-{
-        if (todc_info->sw_flags & TODC_FLAG_2_LEVEL_NVRAM) {
-                if (addr < todc_info->nvram_size) { /* NVRAM */
-                        ppc_md.rtc_write_val(todc_info->nvram_addr_reg, addr);
-                        ppc_md.rtc_write_val(todc_info->nvram_data_reg, val);
-                } else { /* Clock Reg */
-                        addr -= todc_info->nvram_size;
-                        ppc_md.rtc_write_val(addr, val);
-                }
-        } else
-                ppc_md.rtc_write_val(addr, val);
-}
-
-/*
- * TODC routines
- *
- * There is some ugly stuff in that there are assumptions for the mc146818.
- *
- * Assumptions:
- *      - todc_info->control_a has the offset as mc146818 Register B reg
- *      - todc_info->control_b has the offset as mc146818 Register A reg
- *      - m48txx control reg's write enable or 'W' bit is same as
- *        mc146818 Register B 'SET' bit (i.e., 0x80)
- *
- * These assumptions were made to make the code simpler.
- */
-long __init
-todc_time_init(void)
-{
-        u_char  cntl_b;
-
-        if (!ppc_md.rtc_read_val)
-                ppc_md.rtc_read_val = ppc_md.nvram_read_val;
-        if (!ppc_md.rtc_write_val)
-                ppc_md.rtc_write_val = ppc_md.nvram_write_val;
-
-        cntl_b = todc_read_val(todc_info->control_b);
-
-        if (todc_info->rtc_type == TODC_TYPE_MC146818) {
-                if ((cntl_b & 0x70) != 0x20) {
-                        printk(KERN_INFO "TODC real-time-clock was stopped."
-                                "  Now starting...");
-                        cntl_b &= ~0x70;
-                        cntl_b |= 0x20;
-                }
-
-                todc_write_val(todc_info->control_b, cntl_b);
-        } else if (todc_info->rtc_type == TODC_TYPE_DS17285) {
-                u_char mode;
-
-                mode = todc_read_val(TODC_TYPE_DS17285_CNTL_A);
-                /* Make sure countdown clear is not set */
-                mode &= ~0x40;
-                /* Enable oscillator, extended register set */
-                mode |= 0x30;
-                todc_write_val(TODC_TYPE_DS17285_CNTL_A, mode);
-
-        } else if (todc_info->rtc_type == TODC_TYPE_DS1501) {
-                u_char  month;
-
-                todc_info->enable_read = TODC_DS1501_CNTL_B_TE;
-                todc_info->enable_write = TODC_DS1501_CNTL_B_TE;
-
-                month = todc_read_val(todc_info->month);
-
-                if ((month & 0x80) == 0x80) {
-                        printk(KERN_INFO "TODC %s %s\n",
-                                "real-time-clock was stopped.",
-                                "Now starting...");
-                        month &= ~0x80;
-                        todc_write_val(todc_info->month, month);
-                }
-
-                cntl_b &= ~TODC_DS1501_CNTL_B_TE;
-                todc_write_val(todc_info->control_b, cntl_b);
-        } else { /* must be a m48txx type */
-                u_char  cntl_a;
-
-                todc_info->enable_read = TODC_MK48TXX_CNTL_A_R;
-                todc_info->enable_write = TODC_MK48TXX_CNTL_A_W;
-
-                cntl_a = todc_read_val(todc_info->control_a);
-
-                /* Check & clear STOP bit in control B register */
-                if (cntl_b & TODC_MK48TXX_DAY_CB) {
-                        printk(KERN_INFO "TODC %s %s\n",
-                                "real-time-clock was stopped.",
-                                "Now starting...");
-
-                        cntl_a |= todc_info->enable_write;
-                        cntl_b &= ~TODC_MK48TXX_DAY_CB;/* Start Oscil */
-
-                        todc_write_val(todc_info->control_a, cntl_a);
-                        todc_write_val(todc_info->control_b, cntl_b);
-                }
-
-                /* Make sure READ & WRITE bits are cleared. */
-                cntl_a &= ~(todc_info->enable_write | todc_info->enable_read);
-                todc_write_val(todc_info->control_a, cntl_a);
-        }
-
-        return 0;
-}
-
-/*
- * There is some ugly stuff in that there are assumptions that for a mc146818,
- * the todc_info->control_a has the offset of the mc146818 Register B reg and
- * that the register'ss 'SET' bit is the same as the m48txx's write enable
- * bit in the control register of the m48txx (i.e., 0x80).
- *
- * It was done to make the code look simpler.
- */
-void
-todc_get_rtc_time(struct rtc_time *tm)
-{
-        uint    year = 0, mon = 0, mday = 0, hour = 0, min = 0, sec = 0;
-        uint    limit, i;
-        u_char  save_control, uip = 0;
-        extern void GregorianDay(struct rtc_time *);
-
-        spin_lock(&rtc_lock);
-        save_control = todc_read_val(todc_info->control_a);
-
-        if (todc_info->rtc_type != TODC_TYPE_MC146818) {
-                limit = 1;
-
-                switch (todc_info->rtc_type) {
-                case TODC_TYPE_DS1553:
-                case TODC_TYPE_DS1557:
-                case TODC_TYPE_DS1743:
-                case TODC_TYPE_DS1746:  /* XXXX BAD HACK -> FIX */
-                case TODC_TYPE_DS1747:
-                case TODC_TYPE_DS17285:
-                        break;
-                default:
-                        todc_write_val(todc_info->control_a,
-                                (save_control | todc_info->enable_read));
-                }
-        } else
-                limit = 100000000;
-
-        for (i=0; i<limit; i++) {
-                if (todc_info->rtc_type == TODC_TYPE_MC146818)
-                        uip = todc_read_val(todc_info->RTC_FREQ_SELECT);
-
-                sec = todc_read_val(todc_info->seconds) & 0x7f;
-                min = todc_read_val(todc_info->minutes) & 0x7f;
-                hour = todc_read_val(todc_info->hours) & 0x3f;
-                mday = todc_read_val(todc_info->day_of_month) & 0x3f;
-                mon = todc_read_val(todc_info->month) & 0x1f;
-                year = todc_read_val(todc_info->year) & 0xff;
-
-                if (todc_info->rtc_type == TODC_TYPE_MC146818) {
-                        uip |= todc_read_val(todc_info->RTC_FREQ_SELECT);
-                        if ((uip & RTC_UIP) == 0)
-                                break;
-                }
-        }
-
-        if (todc_info->rtc_type != TODC_TYPE_MC146818) {
-                switch (todc_info->rtc_type) {
-                case TODC_TYPE_DS1553:
-                case TODC_TYPE_DS1557:
-                case TODC_TYPE_DS1743:
-                case TODC_TYPE_DS1746:  /* XXXX BAD HACK -> FIX */
-                case TODC_TYPE_DS1747:
-                case TODC_TYPE_DS17285:
-                        break;
-                default:
-                        save_control &= ~(todc_info->enable_read);
-                        todc_write_val(todc_info->control_a, save_control);
-                }
-        }
-        spin_unlock(&rtc_lock);
-
-        if ((todc_info->rtc_type != TODC_TYPE_MC146818)
-                        || ((save_control & RTC_DM_BINARY) == 0)
-                        || RTC_ALWAYS_BCD) {
-                BCD_TO_BIN(sec);
-                BCD_TO_BIN(min);
-                BCD_TO_BIN(hour);
-                BCD_TO_BIN(mday);
-                BCD_TO_BIN(mon);
-                BCD_TO_BIN(year);
-        }
-
-        if ((year + 1900) < 1970) {
-                year += 100;
-        }
-
-        tm->tm_sec = sec;
-        tm->tm_min = min;
-        tm->tm_hour = hour;
-        tm->tm_mday = mday;
-        tm->tm_mon = mon;
-        tm->tm_year = year;
-
-        GregorianDay(tm);
-}
-
-int
-todc_set_rtc_time(struct rtc_time *tm)
-{
-        u_char save_control, save_freq_select = 0;
-
-        spin_lock(&rtc_lock);
-        save_control = todc_read_val(todc_info->control_a);
-
-        /* Assuming MK48T59_RTC_CA_WRITE & RTC_SET are equal */
-        todc_write_val(todc_info->control_a,
-                (save_control | todc_info->enable_write));
-        save_control &= ~(todc_info->enable_write); /* in case it was set */
-
-        if (todc_info->rtc_type == TODC_TYPE_MC146818) {
-                save_freq_select = todc_read_val(todc_info->RTC_FREQ_SELECT);
-                todc_write_val(todc_info->RTC_FREQ_SELECT,
-                        save_freq_select | RTC_DIV_RESET2);
-        }
-
-        if ((todc_info->rtc_type != TODC_TYPE_MC146818)
-                        || ((save_control & RTC_DM_BINARY) == 0)
-                        || RTC_ALWAYS_BCD) {
-                BIN_TO_BCD(tm->tm_sec);
-                BIN_TO_BCD(tm->tm_min);
-                BIN_TO_BCD(tm->tm_hour);
-                BIN_TO_BCD(tm->tm_mon);
-                BIN_TO_BCD(tm->tm_mday);
-                BIN_TO_BCD(tm->tm_year);
-        }
-
-        todc_write_val(todc_info->seconds, tm->tm_sec);
-        todc_write_val(todc_info->minutes, tm->tm_min);
-        todc_write_val(todc_info->hours, tm->tm_hour);
-        todc_write_val(todc_info->month, tm->tm_mon);
-        todc_write_val(todc_info->day_of_month, tm->tm_mday);
-        todc_write_val(todc_info->year, tm->tm_year);
-
-        todc_write_val(todc_info->control_a, save_control);
-
-        if (todc_info->rtc_type == TODC_TYPE_MC146818)
-                todc_write_val(todc_info->RTC_FREQ_SELECT, save_freq_select);
-
-        spin_unlock(&rtc_lock);
-        return 0;
-}
diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c
index 322f86e93de5..ae249c6bbbcf 100644
--- a/arch/powerpc/sysdev/tsi108_pci.c
+++ b/arch/powerpc/sysdev/tsi108_pci.c
@@ -3,6 +3,8 @@
  *
  * 2004-2005 (c) Tundra Semiconductor Corp.
  * Author: Alex Bounine (alexandreb@tundra.com)
+ * Author: Roy Zang (tie-fei.zang@freescale.com)
+ *         Add pci interrupt router host
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -48,6 +50,8 @@
 
 u32 tsi108_pci_cfg_base;
 u32 tsi108_csr_vir_base;
+static struct device_node *pci_irq_node;
+static struct irq_host *pci_irq_host;
 
 extern u32 get_vir_csrbase(void);
 extern u32 tsi108_read_reg(u32 reg_offset);
@@ -378,6 +382,38 @@ static struct irq_chip tsi108_pci_irq = {
         .unmask = tsi108_pci_irq_enable,
 };
 
+static int pci_irq_host_xlate(struct irq_host *h, struct device_node *ct,
+                            u32 *intspec, unsigned int intsize,
+                            irq_hw_number_t *out_hwirq, unsigned int *out_flags)
+{
+        *out_hwirq = intspec[0];
+        *out_flags = IRQ_TYPE_LEVEL_HIGH;
+        return 0;
+}
+
+static int pci_irq_host_map(struct irq_host *h, unsigned int virq,
+                          irq_hw_number_t hw)
+{       unsigned int irq;
+        DBG("%s(%d, 0x%lx)\n", __FUNCTION__, virq, hw);
+        if ((virq >= 1) && (virq <= 4)){
+                irq = virq + IRQ_PCI_INTAD_BASE - 1;
+                get_irq_desc(irq)->status |= IRQ_LEVEL;
+                set_irq_chip(irq, &tsi108_pci_irq);
+        }
+        return 0;
+}
+
+static int pci_irq_host_match(struct irq_host *h, struct device_node *node)
+{
+        return pci_irq_node == node;
+}
+
+static struct irq_host_ops pci_irq_host_ops = {
+        .match = pci_irq_host_match,
+        .map = pci_irq_host_map,
+        .xlate = pci_irq_host_xlate,
+};
+
 /*
  * Exported functions
  */
@@ -391,15 +427,15 @@ static struct irq_chip tsi108_pci_irq = {
  * to the MPIC.
  */
 
-void __init tsi108_pci_int_init(void)
+void __init tsi108_pci_int_init(struct device_node *node)
 {
-        u_int i;
-
         DBG("Tsi108_pci_int_init: initializing PCI interrupts\n");
 
-        for (i = 0; i < NUM_PCI_IRQS; i++) {
-                irq_desc[i + IRQ_PCI_INTAD_BASE].chip = &tsi108_pci_irq;
-                irq_desc[i + IRQ_PCI_INTAD_BASE].status |= IRQ_LEVEL;
+        pci_irq_node = of_node_get(node);
+        pci_irq_host = irq_alloc_host(IRQ_HOST_MAP_LEGACY, 0, &pci_irq_host_ops, 0);
+        if (pci_irq_host == NULL) {
+                printk(KERN_ERR "pci_irq_host: failed to allocate irq host !\n");
+                return;
         }
 
         init_pci_source();
diff --git a/arch/powerpc/xmon/Makefile b/arch/powerpc/xmon/Makefile
index 109d874ecfbe..51d97588e762 100644
--- a/arch/powerpc/xmon/Makefile
+++ b/arch/powerpc/xmon/Makefile
@@ -3,5 +3,10 @@
 ifdef CONFIG_PPC64
 EXTRA_CFLAGS += -mno-minimal-toc
 endif
-obj-y                   += xmon.o ppc-dis.o ppc-opc.o setjmp.o start.o \
-                           nonstdio.o
+
+obj-y                   += xmon.o setjmp.o start.o nonstdio.o
+
+ifdef CONFIG_XMON_DISASSEMBLY
+obj-y                   += ppc-dis.o ppc-opc.o
+obj-$(CONFIG_SPU_BASE)  += spu-dis.o spu-opc.o
+endif
diff --git a/arch/powerpc/xmon/dis-asm.h b/arch/powerpc/xmon/dis-asm.h
new file mode 100644
index 000000000000..be3533b93f30
--- /dev/null
+++ b/arch/powerpc/xmon/dis-asm.h
@@ -0,0 +1,31 @@
+#ifndef _POWERPC_XMON_DIS_ASM_H
+#define _POWERPC_XMON_DIS_ASM_H
+/*
+ * Copyright (C) 2006 Michael Ellerman, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+extern void print_address (unsigned long memaddr);
+
+#ifdef CONFIG_XMON_DISASSEMBLY
+extern int print_insn_powerpc(unsigned long insn, unsigned long memaddr);
+extern int print_insn_spu(unsigned long insn, unsigned long memaddr);
+#else
+static inline int print_insn_powerpc(unsigned long insn, unsigned long memaddr)
+{
+        printf("%.8x", insn);
+        return 0;
+}
+
+static inline int print_insn_spu(unsigned long insn, unsigned long memaddr)
+{
+        printf("%.8x", insn);
+        return 0;
+}
+#endif
+
+#endif /* _POWERPC_XMON_DIS_ASM_H */
diff --git a/arch/powerpc/xmon/ppc-dis.c b/arch/powerpc/xmon/ppc-dis.c
index ac0a9d2427e0..89098f320ad5 100644
--- a/arch/powerpc/xmon/ppc-dis.c
+++ b/arch/powerpc/xmon/ppc-dis.c
@@ -1,5 +1,6 @@
 /* ppc-dis.c -- Disassemble PowerPC instructions
-   Copyright 1994 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support
 
 This file is part of GDB, GAS, and the GNU binutils.
@@ -16,27 +17,36 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
+#include <asm/cputable.h>
 #include "nonstdio.h"
 #include "ansidecl.h"
 #include "ppc.h"
-
-extern void print_address (unsigned long memaddr);
+#include "dis-asm.h"
 
 /* Print a PowerPC or POWER instruction.  */
 
 int
-print_insn_powerpc (unsigned long insn, unsigned long memaddr, int dialect)
+print_insn_powerpc (unsigned long insn, unsigned long memaddr)
 {
   const struct powerpc_opcode *opcode;
   const struct powerpc_opcode *opcode_end;
   unsigned long op;
+  int dialect;
 
-  if (dialect == 0)
-    dialect = PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_COMMON
+  dialect = PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_COMMON
               | PPC_OPCODE_64 | PPC_OPCODE_POWER4 | PPC_OPCODE_ALTIVEC;
 
+  if (cpu_has_feature(CPU_FTRS_POWER5))
+    dialect |= PPC_OPCODE_POWER5;
+
+  if (cpu_has_feature(CPU_FTRS_CELL))
+    dialect |= PPC_OPCODE_CELL | PPC_OPCODE_ALTIVEC;
+
+  if (cpu_has_feature(CPU_FTRS_POWER6))
+    dialect |= PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_ALTIVEC;
+
   /* Get the major opcode of the instruction.  */
   op = PPC_OP (insn);
 
@@ -121,7 +131,8 @@ print_insn_powerpc (unsigned long insn, unsigned long memaddr, int dialect)
             }
 
           /* Print the operand as directed by the flags.  */
-          if ((operand->flags & PPC_OPERAND_GPR) != 0)
+          if ((operand->flags & PPC_OPERAND_GPR) != 0
+              || ((operand->flags & PPC_OPERAND_GPR_0) != 0 && value != 0))
             printf("r%ld", value);
           else if ((operand->flags & PPC_OPERAND_FPR) != 0)
             printf("f%ld", value);
@@ -137,7 +148,7 @@ print_insn_powerpc (unsigned long insn, unsigned long memaddr, int dialect)
           else
             {
               if (operand->bits == 3)
-                printf("cr%d", value);
+                printf("cr%ld", value);
               else
                 {
                   static const char *cbnames[4] = { "lt", "gt", "eq", "so" };
diff --git a/arch/powerpc/xmon/ppc-opc.c b/arch/powerpc/xmon/ppc-opc.c
index 5ee8fc32f824..5d841f4b3530 100644
--- a/arch/powerpc/xmon/ppc-opc.c
+++ b/arch/powerpc/xmon/ppc-opc.c
@@ -1,6 +1,6 @@
 /* ppc-opc.c -- PowerPC opcode list
-   Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003
-   Free Software Foundation, Inc.
+   Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support
 
    This file is part of GDB, GAS, and the GNU binutils.
@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this file; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 #include <linux/stddef.h>
 #include "nonstdio.h"
@@ -86,6 +86,8 @@ static unsigned long insert_sh6 (unsigned long, long, int, const char **);
 static long extract_sh6 (unsigned long, int, int *);
 static unsigned long insert_spr (unsigned long, long, int, const char **);
 static long extract_spr (unsigned long, int, int *);
+static unsigned long insert_sprg (unsigned long, long, int, const char **);
+static long extract_sprg (unsigned long, int, int *);
 static unsigned long insert_tbr (unsigned long, long, int, const char **);
 static long extract_tbr (unsigned long, int, int *);
 static unsigned long insert_ev2 (unsigned long, long, int, const char **);
@@ -196,8 +198,11 @@ const struct powerpc_operand powerpc_operands[] =
 #define BOE BO + 1
   { 5, 21, insert_boe, extract_boe, 0 },
 
+#define BH BOE + 1
+  { 2, 11, NULL, NULL, PPC_OPERAND_OPTIONAL },
+
   /* The BT field in an X or XL form instruction.  */
-#define BT BOE + 1
+#define BT BH + 1
   { 5, 21, NULL, NULL, PPC_OPERAND_CR },
 
   /* The condition register number portion of the BI field in a B form
@@ -301,10 +306,14 @@ const struct powerpc_operand powerpc_operands[] =
 #define L FXM4 + 1
   { 1, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
 
-  /* The LEV field in a POWER SC form instruction.  */
-#define LEV L + 1
+  /* The LEV field in a POWER SVC form instruction.  */
+#define SVC_LEV L + 1
   { 7, 5, NULL, NULL, 0 },
 
+  /* The LEV field in an SC form instruction.  */
+#define LEV SVC_LEV + 1
+  { 7, 5, NULL, NULL, PPC_OPERAND_OPTIONAL },
+
   /* The LI field in an I form instruction.  The lower two bits are
      forced to zero.  */
 #define LI LEV + 1
@@ -346,7 +355,7 @@ const struct powerpc_operand powerpc_operands[] =
 
   /* The MO field in an mbar instruction.  */
 #define MO MB6 + 1
-  { 5, 21, NULL, NULL, 0 },
+  { 5, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
 
   /* The NB field in an X form instruction.  The value 32 is stored as
      0.  */
@@ -364,30 +373,38 @@ const struct powerpc_operand powerpc_operands[] =
 #define RA_MASK (0x1f << 16)
   { 5, 16, NULL, NULL, PPC_OPERAND_GPR },
 
+  /* As above, but 0 in the RA field means zero, not r0.  */
+#define RA0 RA + 1
+  { 5, 16, NULL, NULL, PPC_OPERAND_GPR_0 },
+
   /* The RA field in the DQ form lq instruction, which has special
      value restrictions.  */
-#define RAQ RA + 1
-  { 5, 16, insert_raq, NULL, PPC_OPERAND_GPR },
+#define RAQ RA0 + 1
+  { 5, 16, insert_raq, NULL, PPC_OPERAND_GPR_0 },
 
   /* The RA field in a D or X form instruction which is an updating
      load, which means that the RA field may not be zero and may not
      equal the RT field.  */
 #define RAL RAQ + 1
-  { 5, 16, insert_ral, NULL, PPC_OPERAND_GPR },
+  { 5, 16, insert_ral, NULL, PPC_OPERAND_GPR_0 },
 
   /* The RA field in an lmw instruction, which has special value
      restrictions.  */
 #define RAM RAL + 1
-  { 5, 16, insert_ram, NULL, PPC_OPERAND_GPR },
+  { 5, 16, insert_ram, NULL, PPC_OPERAND_GPR_0 },
 
   /* The RA field in a D or X form instruction which is an updating
      store or an updating floating point load, which means that the RA
      field may not be zero.  */
 #define RAS RAM + 1
-  { 5, 16, insert_ras, NULL, PPC_OPERAND_GPR },
+  { 5, 16, insert_ras, NULL, PPC_OPERAND_GPR_0 },
+
+  /* The RA field of the tlbwe instruction, which is optional.  */
+#define RAOPT RAS + 1
+  { 5, 16, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL },
 
   /* The RB field in an X, XO, M, or MDS form instruction.  */
-#define RB RAS + 1
+#define RB RAOPT + 1
 #define RB_MASK (0x1f << 11)
   { 5, 11, NULL, NULL, PPC_OPERAND_GPR },
 
@@ -408,15 +425,20 @@ const struct powerpc_operand powerpc_operands[] =
   /* The RS field of the DS form stq instruction, which has special
      value restrictions.  */
 #define RSQ RS + 1
-  { 5, 21, insert_rsq, NULL, PPC_OPERAND_GPR },
+  { 5, 21, insert_rsq, NULL, PPC_OPERAND_GPR_0 },
 
   /* The RT field of the DQ form lq instruction, which has special
      value restrictions.  */
 #define RTQ RSQ + 1
-  { 5, 21, insert_rtq, NULL, PPC_OPERAND_GPR },
+  { 5, 21, insert_rtq, NULL, PPC_OPERAND_GPR_0 },
+
+  /* The RS field of the tlbwe instruction, which is optional.  */
+#define RSO RTQ + 1
+#define RTO RSO
+  { 5, 21, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL },
 
   /* The SH field in an X or M form instruction.  */
-#define SH RTQ + 1
+#define SH RSO + 1
 #define SH_MASK (0x1f << 11)
   { 5, 11, NULL, NULL, 0 },
 
@@ -425,8 +447,12 @@ const struct powerpc_operand powerpc_operands[] =
 #define SH6_MASK ((0x1f << 11) | (1 << 1))
   { 6, 1, insert_sh6, extract_sh6, 0 },
 
+  /* The SH field of the tlbwe instruction, which is optional.  */
+#define SHO SH6 + 1
+  { 5, 11,NULL, NULL, PPC_OPERAND_OPTIONAL },
+
   /* The SI field in a D form instruction.  */
-#define SI SH6 + 1
+#define SI SHO + 1
   { 16, 0, NULL, NULL, PPC_OPERAND_SIGNED },
 
   /* The SI field in a D form instruction when we accept a wide range
@@ -448,8 +474,7 @@ const struct powerpc_operand powerpc_operands[] =
 
   /* The SPRG register number in an XFX form m[ft]sprg instruction.  */
 #define SPRG SPRBAT + 1
-#define SPRG_MASK (0x3 << 16)
-  { 2, 16, NULL, NULL, 0 },
+  { 5, 16, insert_sprg, extract_sprg, 0 },
 
   /* The SR field in an X form instruction.  */
 #define SR SPRG + 1
@@ -536,10 +561,45 @@ const struct powerpc_operand powerpc_operands[] =
 #define WS_MASK (0x7 << 11)
   { 3, 11, NULL, NULL, 0 },
 
-  /* The L field in an mtmsrd instruction */
+  /* The L field in an mtmsrd or A form instruction.  */
 #define MTMSRD_L WS + 1
+#define A_L MTMSRD_L
   { 1, 16, NULL, NULL, PPC_OPERAND_OPTIONAL },
 
+  /* The DCM field in a Z form instruction.  */
+#define DCM MTMSRD_L + 1
+  { 6, 16, NULL, NULL, 0 },
+
+  /* Likewise, the DGM field in a Z form instruction.  */
+#define DGM DCM + 1
+  { 6, 16, NULL, NULL, 0 },
+
+#define TE DGM + 1
+  { 5, 11, NULL, NULL, 0 },
+
+#define RMC TE + 1
+  { 2, 21, NULL, NULL, 0 },
+
+#define R RMC + 1
+  { 1, 15, NULL, NULL, 0 },
+
+#define SP R + 1
+  { 2, 11, NULL, NULL, 0 },
+
+#define S SP + 1
+  { 1, 11, NULL, NULL, 0 },
+
+  /* SH field starting at bit position 16.  */
+#define SH16 S + 1
+  { 6, 10, NULL, NULL, 0 },
+
+  /* The L field in an X form with the RT field fixed instruction.  */
+#define XRT_L SH16 + 1
+  { 2, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
+
+  /* The EH field in larx instruction.  */
+#define EH XRT_L + 1
+  { 1, 0, NULL, NULL, PPC_OPERAND_OPTIONAL },
 };
 
 /* The functions used to insert and extract complicated operands.  */
@@ -550,7 +610,6 @@ const struct powerpc_operand powerpc_operands[] =
    and the extraction function just checks that the fields are the
    same.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_bat (unsigned long insn,
             long value ATTRIBUTE_UNUSED,
@@ -576,7 +635,6 @@ extract_bat (unsigned long insn,
    and the extraction function just checks that the fields are the
    same.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_bba (unsigned long insn,
             long value ATTRIBUTE_UNUSED,
@@ -599,7 +657,6 @@ extract_bba (unsigned long insn,
 /* The BD field in a B form instruction.  The lower two bits are
    forced to zero.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_bd (unsigned long insn,
            long value,
@@ -609,7 +666,6 @@ insert_bd (unsigned long insn,
   return insn | (value & 0xfffc);
 }
 
-/*ARGSUSED*/
 static long
 extract_bd (unsigned long insn,
             int dialect ATTRIBUTE_UNUSED,
@@ -631,7 +687,6 @@ extract_bd (unsigned long insn,
    in BO field, the "a" bit is 00010 for branch on CR(BI) and 01000
    for branch on CTR.  We only handle the taken/not-taken hint here.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_bdm (unsigned long insn,
             long value,
@@ -677,7 +732,6 @@ extract_bdm (unsigned long insn,
    This is like BDM, above, except that the branch is expected to be
    taken.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_bdp (unsigned long insn,
             long value,
@@ -831,7 +885,6 @@ extract_boe (unsigned long insn,
 /* The DQ field in a DQ form instruction.  This is like D, but the
    lower four bits are forced to zero. */
 
-/*ARGSUSED*/
 static unsigned long
 insert_dq (unsigned long insn,
            long value,
@@ -843,7 +896,6 @@ insert_dq (unsigned long insn,
   return insn | (value & 0xfff0);
 }
 
-/*ARGSUSED*/
 static long
 extract_dq (unsigned long insn,
             int dialect ATTRIBUTE_UNUSED,
@@ -918,7 +970,6 @@ extract_ev8 (unsigned long insn,
 /* The DS field in a DS form instruction.  This is like D, but the
    lower two bits are forced to zero.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_ds (unsigned long insn,
            long value,
@@ -930,7 +981,6 @@ insert_ds (unsigned long insn,
   return insn | (value & 0xfffc);
 }
 
-/*ARGSUSED*/
 static long
 extract_ds (unsigned long insn,
             int dialect ATTRIBUTE_UNUSED,
@@ -941,7 +991,6 @@ extract_ds (unsigned long insn,
 
 /* The DE field in a DE form instruction.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_de (unsigned long insn,
            long value,
@@ -953,7 +1002,6 @@ insert_de (unsigned long insn,
   return insn | ((value << 4) & 0xfff0);
 }
 
-/*ARGSUSED*/
 static long
 extract_de (unsigned long insn,
             int dialect ATTRIBUTE_UNUSED,
@@ -964,7 +1012,6 @@ extract_de (unsigned long insn,
 
 /* The DES field in a DES form instruction.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_des (unsigned long insn,
             long value,
@@ -978,7 +1025,6 @@ insert_des (unsigned long insn,
   return insn | ((value << 2) & 0xfff0);
 }
 
-/*ARGSUSED*/
 static long
 extract_des (unsigned long insn,
              int dialect ATTRIBUTE_UNUSED,
@@ -995,17 +1041,33 @@ insert_fxm (unsigned long insn,
             int dialect,
             const char **errmsg)
 {
+  /* If we're handling the mfocrf and mtocrf insns ensure that exactly
+     one bit of the mask field is set.  */
+  if ((insn & (1 << 20)) != 0)
+    {
+      if (value == 0 || (value & -value) != value)
+        {
+          *errmsg = _("invalid mask field");
+          value = 0;
+        }
+    }
+
   /* If the optional field on mfcr is missing that means we want to use
      the old form of the instruction that moves the whole cr.  In that
      case we'll have VALUE zero.  There doesn't seem to be a way to
      distinguish this from the case where someone writes mfcr %r3,0.  */
-  if (value == 0)
+  else if (value == 0)
     ;
 
   /* If only one bit of the FXM field is set, we can use the new form
      of the instruction, which is faster.  Unlike the Power4 branch hint
-     encoding, this is not backward compatible.  */
-  else if ((dialect & PPC_OPCODE_POWER4) != 0 && (value & -value) == value)
+     encoding, this is not backward compatible.  Do not generate the
+     new form unless -mpower4 has been given, or -many and the two
+     operand form of mfcr was used.  */
+  else if ((value & -value) == value
+           && ((dialect & PPC_OPCODE_POWER4) != 0
+               || ((dialect & PPC_OPCODE_ANY) != 0
+                   && (insn & (0x3ff << 1)) == 19 << 1)))
     insn |= 1 << 20;
 
   /* Any other value on mfcr is an error.  */
@@ -1020,7 +1082,7 @@ insert_fxm (unsigned long insn,
 
 static long
 extract_fxm (unsigned long insn,
-             int dialect,
+             int dialect ATTRIBUTE_UNUSED,
              int *invalid)
 {
   long mask = (insn >> 12) & 0xff;
@@ -1028,14 +1090,9 @@ extract_fxm (unsigned long insn,
   /* Is this a Power4 insn?  */
   if ((insn & (1 << 20)) != 0)
     {
-      if ((dialect & PPC_OPCODE_POWER4) == 0)
+      /* Exactly one bit of MASK should be set.  */
+      if (mask == 0 || (mask & -mask) != mask)
         *invalid = 1;
-      else
-        {
-          /* Exactly one bit of MASK should be set.  */
-          if (mask == 0 || (mask & -mask) != mask)
-            *invalid = 1;
-        }
     }
 
   /* Check that non-power4 form of mfcr has a zero MASK.  */
@@ -1051,7 +1108,6 @@ extract_fxm (unsigned long insn,
 /* The LI field in an I form instruction.  The lower two bits are
    forced to zero.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_li (unsigned long insn,
            long value,
@@ -1063,7 +1119,6 @@ insert_li (unsigned long insn,
   return insn | (value & 0x3fffffc);
 }
 
-/*ARGSUSED*/
 static long
 extract_li (unsigned long insn,
             int dialect ATTRIBUTE_UNUSED,
@@ -1163,7 +1218,6 @@ extract_mbe (unsigned long insn,
 /* The MB or ME field in an MD or MDS form instruction.  The high bit
    is wrapped to the low end.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_mb6 (unsigned long insn,
             long value,
@@ -1173,7 +1227,6 @@ insert_mb6 (unsigned long insn,
   return insn | ((value & 0x1f) << 6) | (value & 0x20);
 }
 
-/*ARGSUSED*/
 static long
 extract_mb6 (unsigned long insn,
              int dialect ATTRIBUTE_UNUSED,
@@ -1198,7 +1251,6 @@ insert_nb (unsigned long insn,
   return insn | ((value & 0x1f) << 11);
 }
 
-/*ARGSUSED*/
 static long
 extract_nb (unsigned long insn,
             int dialect ATTRIBUTE_UNUSED,
@@ -1217,7 +1269,6 @@ extract_nb (unsigned long insn,
    invalid, since we never want to recognize an instruction which uses
    a field of this type.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_nsi (unsigned long insn,
             long value,
@@ -1269,7 +1320,6 @@ insert_ram (unsigned long insn,
 /* The RA field in the DQ form lq instruction, which has special
    value restrictions.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_raq (unsigned long insn,
             long value,
@@ -1304,7 +1354,6 @@ insert_ras (unsigned long insn,
    function just copies the BT field into the BA field, and the
    extraction function just checks that the fields are the same.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_rbs (unsigned long insn,
             long value ATTRIBUTE_UNUSED,
@@ -1327,7 +1376,6 @@ extract_rbs (unsigned long insn,
 /* The RT field of the DQ form lq instruction, which has special
    value restrictions.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_rtq (unsigned long insn,
             long value,
@@ -1342,7 +1390,6 @@ insert_rtq (unsigned long insn,
 /* The RS field of the DS form stq instruction, which has special
    value restrictions.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_rsq (unsigned long insn,
             long value ATTRIBUTE_UNUSED,
@@ -1356,7 +1403,6 @@ insert_rsq (unsigned long insn,
 
 /* The SH field in an MD form instruction.  This is split.  */
 
-/*ARGSUSED*/
 static unsigned long
 insert_sh6 (unsigned long insn,
             long value,
@@ -1366,7 +1412,6 @@ insert_sh6 (unsigned long insn,
   return insn | ((value & 0x1f) << 11) | ((value & 0x20) >> 4);
 }
 
-/*ARGSUSED*/
 static long
 extract_sh6 (unsigned long insn,
              int dialect ATTRIBUTE_UNUSED,
@@ -1395,6 +1440,47 @@ extract_spr (unsigned long insn,
   return ((insn >> 16) & 0x1f) | ((insn >> 6) & 0x3e0);
 }
 
+/* Some dialects have 8 SPRG registers instead of the standard 4.  */
+
+static unsigned long
+insert_sprg (unsigned long insn,
+             long value,
+             int dialect,
+             const char **errmsg)
+{
+  /* This check uses PPC_OPCODE_403 because PPC405 is later defined
+     as a synonym.  If ever a 405 specific dialect is added this
+     check should use that instead.  */
+  if (value > 7
+      || (value > 3
+          && (dialect & (PPC_OPCODE_BOOKE | PPC_OPCODE_403)) == 0))
+    *errmsg = _("invalid sprg number");
+
+  /* If this is mfsprg4..7 then use spr 260..263 which can be read in
+     user mode.  Anything else must use spr 272..279.  */
+  if (value <= 3 || (insn & 0x100) != 0)
+    value |= 0x10;
+
+  return insn | ((value & 0x17) << 16);
+}
+
+static long
+extract_sprg (unsigned long insn,
+              int dialect,
+              int *invalid)
+{
+  unsigned long val = (insn >> 16) & 0x1f;
+
+  /* mfsprg can use 260..263 and 272..279.  mtsprg only uses spr 272..279
+     If not BOOKE or 405, then both use only 272..275.  */
+  if (val <= 3
+      || (val < 0x10 && (insn & 0x100) != 0)
+      || (val - 0x10 > 3
+          && (dialect & (PPC_OPCODE_BOOKE | PPC_OPCODE_403)) == 0))
+    *invalid = 1;
+  return val & 7;
+}
+
 /* The TBR field in an XFX instruction.  This is just like SPR, but it
    is optional.  When TBR is omitted, it must be inserted as 268 (the
    magic number of the TB register).  These functions treat 0
@@ -1460,6 +1546,9 @@ extract_tbr (unsigned long insn,
 /* An A_MASK with the FRA and FRC fields fixed.  */
 #define AFRAFRC_MASK (A_MASK | FRA_MASK | FRC_MASK)
 
+/* An AFRAFRC_MASK, but with L bit clear.  */
+#define AFRALFRC_MASK (AFRAFRC_MASK & ~((unsigned long) 1 << 16))
+
 /* A B form instruction.  */
 #define B(op, aa, lk) (OP (op) | ((((unsigned long)(aa)) & 1) << 1) | ((lk) & 1))
 #define B_MASK B (0x3f, 1, 1)
@@ -1494,11 +1583,11 @@ extract_tbr (unsigned long insn,
 
 /* An Context form instruction.  */
 #define CTX(op, xop)   (OP (op) | (((unsigned long)(xop)) & 0x7))
-#define CTX_MASK       CTX(0x3f, 0x7)
+#define CTX_MASK CTX(0x3f, 0x7)
 
 /* An User Context form instruction.  */
 #define UCTX(op, xop)  (OP (op) | (((unsigned long)(xop)) & 0x1f))
-#define UCTX_MASK      UCTX(0x3f, 0x1f)
+#define UCTX_MASK UCTX(0x3f, 0x1f)
 
 /* The main opcode mask with the RA field clear.  */
 #define DRA_MASK (OP_MASK | RA_MASK)
@@ -1570,12 +1659,21 @@ extract_tbr (unsigned long insn,
 /* An X form instruction.  */
 #define X(op, xop) (OP (op) | ((((unsigned long)(xop)) & 0x3ff) << 1))
 
+/* A Z form instruction.  */
+#define Z(op, xop) (OP (op) | ((((unsigned long)(xop)) & 0x1ff) << 1))
+
 /* An X form instruction with the RC bit specified.  */
 #define XRC(op, xop, rc) (X ((op), (xop)) | ((rc) & 1))
 
+/* A Z form instruction with the RC bit specified.  */
+#define ZRC(op, xop, rc) (Z ((op), (xop)) | ((rc) & 1))
+
 /* The mask for an X form instruction.  */
 #define X_MASK XRC (0x3f, 0x3ff, 1)
 
+/* The mask for a Z form instruction.  */
+#define Z_MASK ZRC (0x3f, 0x1ff, 1)
+
 /* An X_MASK with the RA field fixed.  */
 #define XRA_MASK (X_MASK | RA_MASK)
 
@@ -1585,6 +1683,9 @@ extract_tbr (unsigned long insn,
 /* An X_MASK with the RT field fixed.  */
 #define XRT_MASK (X_MASK | RT_MASK)
 
+/* An XRT_MASK mask with the L bits clear.  */
+#define XLRT_MASK (XRT_MASK & ~((unsigned long) 0x3 << 21))
+
 /* An X_MASK with the RA and RB fields fixed.  */
 #define XRARB_MASK (X_MASK | RA_MASK | RB_MASK)
 
@@ -1597,8 +1698,8 @@ extract_tbr (unsigned long insn,
 /* An XRTRA_MASK, but with L bit clear.  */
 #define XRTLRA_MASK (XRTRA_MASK & ~((unsigned long) 1 << 21))
 
-/* An X form comparison instruction.  */
-#define XCMPL(op, xop, l) (X ((op), (xop)) | ((((unsigned long)(l)) & 1) << 21))
+/* An X form instruction with the L bit specified.  */
+#define XOPL(op, xop, l) (X ((op), (xop)) | ((((unsigned long)(l)) & 1) << 21))
 
 /* The mask for an X form comparison instruction.  */
 #define XCMP_MASK (X_MASK | (((unsigned long)1) << 22))
@@ -1621,6 +1722,9 @@ extract_tbr (unsigned long insn,
 /* An X form sync instruction with everything filled in except the LS field.  */
 #define XSYNC_MASK (0xff9fffff)
 
+/* An X_MASK, but with the EH bit clear.  */
+#define XEH_MASK (X_MASK & ~((unsigned long )1))
+
 /* An X form AltiVec dss instruction.  */
 #define XDSS(op, xop, a) (X ((op), (xop)) | ((((unsigned long)(a)) & 1) << 25))
 #define XDSS_MASK XDSS(0x3f, 0x3ff, 1)
@@ -1663,6 +1767,9 @@ extract_tbr (unsigned long insn,
 #define XLYBB_MASK (XLYLK_MASK | BB_MASK)
 #define XLBOCBBB_MASK (XLOCB_MASK | BB_MASK)
 
+/* A mask for branch instructions using the BH field.  */
+#define XLBH_MASK (XL_MASK | (0x1c << 11))
+
 /* An XL_MASK with the BO and BB fields fixed.  */
 #define XLBOBB_MASK (XL_MASK | BO_MASK | BB_MASK)
 
@@ -1682,11 +1789,12 @@ extract_tbr (unsigned long insn,
 #define XS_MASK XS (0x3f, 0x1ff, 1)
 
 /* A mask for the FXM version of an XFX form instruction.  */
-#define XFXFXM_MASK (X_MASK | (1 << 11))
+#define XFXFXM_MASK (X_MASK | (1 << 11) | (1 << 20))
 
 /* An XFX form instruction with the FXM field filled in.  */
-#define XFXM(op, xop, fxm) \
-  (X ((op), (xop)) | ((((unsigned long)(fxm)) & 0xff) << 12))
+#define XFXM(op, xop, fxm, p4) \
+  (X ((op), (xop)) | ((((unsigned long)(fxm)) & 0xff) << 12) \
+   | ((unsigned long)(p4) << 20))
 
 /* An XFX form instruction with the SPR field filled in.  */
 #define XSPR(op, xop, spr) \
@@ -1699,7 +1807,7 @@ extract_tbr (unsigned long insn,
 
 /* An XFX form instruction with the SPR field filled in except for the
    SPRG field.  */
-#define XSPRG_MASK (XSPR_MASK &~ SPRG_MASK)
+#define XSPRG_MASK (XSPR_MASK & ~(0x17 << 16))
 
 /* An X form instruction with everything filled in except the E field.  */
 #define XE_MASK (0xffff7fff)
@@ -1769,6 +1877,9 @@ extract_tbr (unsigned long insn,
 #define PPCCOM  PPC_OPCODE_PPC | PPC_OPCODE_COMMON
 #define NOPOWER4 PPC_OPCODE_NOPOWER4 | PPCCOM
 #define POWER4  PPC_OPCODE_POWER4
+#define POWER5  PPC_OPCODE_POWER5
+#define POWER6  PPC_OPCODE_POWER6
+#define CELL    PPC_OPCODE_CELL
 #define PPC32   PPC_OPCODE_32 | PPC_OPCODE_PPC
 #define PPC64   PPC_OPCODE_64 | PPC_OPCODE_PPC
 #define PPC403  PPC_OPCODE_403
@@ -1776,7 +1887,7 @@ extract_tbr (unsigned long insn,
 #define PPC440  PPC_OPCODE_440
 #define PPC750  PPC
 #define PPC860  PPC
-#define PPCVEC  PPC_OPCODE_ALTIVEC | PPC_OPCODE_PPC
+#define PPCVEC  PPC_OPCODE_ALTIVEC
 #define POWER   PPC_OPCODE_POWER
 #define POWER2  PPC_OPCODE_POWER | PPC_OPCODE_POWER2
 #define PPCPWR2 PPC_OPCODE_PPC | PPC_OPCODE_POWER | PPC_OPCODE_POWER2
@@ -1790,6 +1901,7 @@ extract_tbr (unsigned long insn,
 #define BOOKE   PPC_OPCODE_BOOKE
 #define BOOKE64 PPC_OPCODE_BOOKE64
 #define CLASSIC PPC_OPCODE_CLASSIC
+#define PPCE300 PPC_OPCODE_E300
 #define PPCSPE  PPC_OPCODE_SPE
 #define PPCISEL PPC_OPCODE_ISEL
 #define PPCEFS  PPC_OPCODE_EFS
@@ -1952,6 +2064,41 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "nmaclhwso.", XO(4,494,1,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
 { "mfvscr",  VX(4, 1540), VX_MASK,      PPCVEC,         { VD } },
 { "mtvscr",  VX(4, 1604), VX_MASK,      PPCVEC,         { VB } },
+
+  /* Double-precision opcodes.  */
+  /* Some of these conflict with AltiVec, so move them before, since
+     PPCVEC includes the PPC_OPCODE_PPC set.  */
+{ "efscfd",   VX(4, 719), VX_MASK,      PPCEFS,         { RS, RB } },
+{ "efdabs",   VX(4, 740), VX_MASK,      PPCEFS,         { RS, RA } },
+{ "efdnabs",  VX(4, 741), VX_MASK,      PPCEFS,         { RS, RA } },
+{ "efdneg",   VX(4, 742), VX_MASK,      PPCEFS,         { RS, RA } },
+{ "efdadd",   VX(4, 736), VX_MASK,      PPCEFS,         { RS, RA, RB } },
+{ "efdsub",   VX(4, 737), VX_MASK,      PPCEFS,         { RS, RA, RB } },
+{ "efdmul",   VX(4, 744), VX_MASK,      PPCEFS,         { RS, RA, RB } },
+{ "efddiv",   VX(4, 745), VX_MASK,      PPCEFS,         { RS, RA, RB } },
+{ "efdcmpgt", VX(4, 748), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
+{ "efdcmplt", VX(4, 749), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
+{ "efdcmpeq", VX(4, 750), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
+{ "efdtstgt", VX(4, 764), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
+{ "efdtstlt", VX(4, 765), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
+{ "efdtsteq", VX(4, 766), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
+{ "efdcfsi",  VX(4, 753), VX_MASK,      PPCEFS,         { RS, RB } },
+{ "efdcfsid", VX(4, 739), VX_MASK,      PPCEFS,         { RS, RB } },
+{ "efdcfui",  VX(4, 752), VX_MASK,      PPCEFS,         { RS, RB } },
+{ "efdcfuid", VX(4, 738), VX_MASK,      PPCEFS,         { RS, RB } },
+{ "efdcfsf",  VX(4, 755), VX_MASK,      PPCEFS,         { RS, RB } },
+{ "efdcfuf",  VX(4, 754), VX_MASK,      PPCEFS,         { RS, RB } },
+{ "efdctsi",  VX(4, 757), VX_MASK,      PPCEFS,         { RS, RB } },
+{ "efdctsidz",VX(4, 747), VX_MASK,      PPCEFS,         { RS, RB } },
+{ "efdctsiz", VX(4, 762), VX_MASK,      PPCEFS,         { RS, RB } },
+{ "efdctui",  VX(4, 756), VX_MASK,      PPCEFS,         { RS, RB } },
+{ "efdctuidz",VX(4, 746), VX_MASK,      PPCEFS,         { RS, RB } },
+{ "efdctuiz", VX(4, 760), VX_MASK,      PPCEFS,         { RS, RB } },
+{ "efdctsf",  VX(4, 759), VX_MASK,      PPCEFS,         { RS, RB } },
+{ "efdctuf",  VX(4, 758), VX_MASK,      PPCEFS,         { RS, RB } },
+{ "efdcfs",   VX(4, 751), VX_MASK,      PPCEFS,         { RS, RB } },
+  /* End of double-precision opcodes.  */
+
 { "vaddcuw", VX(4,  384), VX_MASK,      PPCVEC,         { VD, VA, VB } },
 { "vaddfp",  VX(4,   10), VX_MASK,      PPCVEC,         { VD, VA, VB } },
 { "vaddsbs", VX(4,  768), VX_MASK,      PPCVEC,         { VD, VA, VB } },
@@ -2389,16 +2536,16 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "li",      OP(14),    DRA_MASK,       PPCCOM,         { RT, SI } },
 { "lil",     OP(14),    DRA_MASK,       PWRCOM,         { RT, SI } },
-{ "addi",    OP(14),    OP_MASK,        PPCCOM,         { RT, RA, SI } },
-{ "cal",     OP(14),    OP_MASK,        PWRCOM,         { RT, D, RA } },
-{ "subi",    OP(14),    OP_MASK,        PPCCOM,         { RT, RA, NSI } },
-{ "la",      OP(14),    OP_MASK,        PPCCOM,         { RT, D, RA } },
+{ "addi",    OP(14),    OP_MASK,        PPCCOM,         { RT, RA0, SI } },
+{ "cal",     OP(14),    OP_MASK,        PWRCOM,         { RT, D, RA0 } },
+{ "subi",    OP(14),    OP_MASK,        PPCCOM,         { RT, RA0, NSI } },
+{ "la",      OP(14),    OP_MASK,        PPCCOM,         { RT, D, RA0 } },
 
 { "lis",     OP(15),    DRA_MASK,       PPCCOM,         { RT, SISIGNOPT } },
 { "liu",     OP(15),    DRA_MASK,       PWRCOM,         { RT, SISIGNOPT } },
-{ "addis",   OP(15),    OP_MASK,        PPCCOM,         { RT,RA,SISIGNOPT } },
-{ "cau",     OP(15),    OP_MASK,        PWRCOM,         { RT,RA,SISIGNOPT } },
-{ "subis",   OP(15),    OP_MASK,        PPCCOM,         { RT, RA, NSI } },
+{ "addis",   OP(15),    OP_MASK,        PPCCOM,         { RT,RA0,SISIGNOPT } },
+{ "cau",     OP(15),    OP_MASK,        PWRCOM,         { RT,RA0,SISIGNOPT } },
+{ "subis",   OP(15),    OP_MASK,        PPCCOM,         { RT, RA0, NSI } },
 
 { "bdnz-",   BBO(16,BODNZ,0,0),      BBOATBI_MASK, PPCCOM,      { BDM } },
 { "bdnz+",   BBO(16,BODNZ,0,0),      BBOATBI_MASK, PPCCOM,      { BDP } },
@@ -2665,9 +2812,9 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "bcla+",   B(16,1,1), B_MASK,         PPCCOM,         { BOE, BI, BDPA } },
 { "bcla",    B(16,1,1), B_MASK,         COM,            { BO, BI, BDA } },
 
-{ "sc",      SC(17,1,0), 0xffffffff,    PPC,            { 0 } },
-{ "svc",     SC(17,0,0), SC_MASK,       POWER,          { LEV, FL1, FL2 } },
-{ "svcl",    SC(17,0,1), SC_MASK,       POWER,          { LEV, FL1, FL2 } },
+{ "sc",      SC(17,1,0), SC_MASK,       PPC,            { LEV } },
+{ "svc",     SC(17,0,0), SC_MASK,       POWER,          { SVC_LEV, FL1, FL2 } },
+{ "svcl",    SC(17,0,1), SC_MASK,       POWER,          { SVC_LEV, FL1, FL2 } },
 { "svca",    SC(17,1,0), SC_MASK,       PWRCOM,         { SV } },
 { "svcla",   SC(17,1,1), SC_MASK,       POWER,          { SV } },
 
@@ -2890,12 +3037,12 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "bdzflrl", XLO(19,BODZF,16,1), XLBOBB_MASK, PPCCOM,   { BI } },
 { "bdzflrl-",XLO(19,BODZF,16,1), XLBOBB_MASK, NOPOWER4, { BI } },
 { "bdzflrl+",XLO(19,BODZFP,16,1), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bclr",    XLLK(19,16,0), XLYBB_MASK, PPCCOM,         { BO, BI } },
-{ "bclrl",   XLLK(19,16,1), XLYBB_MASK, PPCCOM,         { BO, BI } },
 { "bclr+",   XLYLK(19,16,1,0), XLYBB_MASK, PPCCOM,      { BOE, BI } },
 { "bclrl+",  XLYLK(19,16,1,1), XLYBB_MASK, PPCCOM,      { BOE, BI } },
 { "bclr-",   XLYLK(19,16,0,0), XLYBB_MASK, PPCCOM,      { BOE, BI } },
 { "bclrl-",  XLYLK(19,16,0,1), XLYBB_MASK, PPCCOM,      { BOE, BI } },
+{ "bclr",    XLLK(19,16,0), XLBH_MASK,  PPCCOM,         { BO, BI, BH } },
+{ "bclrl",   XLLK(19,16,1), XLBH_MASK,  PPCCOM,         { BO, BI, BH } },
 { "bcr",     XLLK(19,16,0), XLBB_MASK,  PWRCOM,         { BO, BI } },
 { "bcrl",    XLLK(19,16,1), XLBB_MASK,  PWRCOM,         { BO, BI } },
 { "bclre",   XLLK(19,17,0), XLBB_MASK,  BOOKE64,        { BO, BI } },
@@ -2924,14 +3071,23 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "crand",   XL(19,257), XL_MASK,       COM,            { BT, BA, BB } },
 
+{ "hrfid",   XL(19,274), 0xffffffff,    POWER5 | CELL,  { 0 } },
+
 { "crset",   XL(19,289), XL_MASK,       PPCCOM,         { BT, BAT, BBA } },
 { "creqv",   XL(19,289), XL_MASK,       COM,            { BT, BA, BB } },
 
+{ "doze",    XL(19,402), 0xffffffff,    POWER6,         { 0 } },
+
 { "crorc",   XL(19,417), XL_MASK,       COM,            { BT, BA, BB } },
 
+{ "nap",     XL(19,434), 0xffffffff,    POWER6,         { 0 } },
+
 { "crmove",  XL(19,449), XL_MASK,       PPCCOM,         { BT, BA, BBA } },
 { "cror",    XL(19,449), XL_MASK,       COM,            { BT, BA, BB } },
 
+{ "sleep",   XL(19,466), 0xffffffff,    POWER6,         { 0 } },
+{ "rvwinkle", XL(19,498), 0xffffffff,   POWER6,         { 0 } },
+
 { "bctr",    XLO(19,BOU,528,0), XLBOBIBB_MASK, COM,     { 0 } },
 { "bctrl",   XLO(19,BOU,528,1), XLBOBIBB_MASK, COM,     { 0 } },
 { "bltctr",  XLOCB(19,BOT,CBLT,528,0),  XLBOCBBB_MASK, PPCCOM,  { CR } },
@@ -3074,12 +3230,12 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "bfctrl-", XLO(19,BOFM4,528,1), XLBOBB_MASK, POWER4, { BI } },
 { "bfctrl+", XLO(19,BOFP,528,1), XLBOBB_MASK, NOPOWER4, { BI } },
 { "bfctrl+", XLO(19,BOFP4,528,1), XLBOBB_MASK, POWER4, { BI } },
-{ "bcctr",   XLLK(19,528,0),     XLYBB_MASK,  PPCCOM,   { BO, BI } },
 { "bcctr-",  XLYLK(19,528,0,0),  XLYBB_MASK,  PPCCOM,   { BOE, BI } },
 { "bcctr+",  XLYLK(19,528,1,0),  XLYBB_MASK,  PPCCOM,   { BOE, BI } },
-{ "bcctrl",  XLLK(19,528,1),     XLYBB_MASK,  PPCCOM,   { BO, BI } },
 { "bcctrl-", XLYLK(19,528,0,1),  XLYBB_MASK,  PPCCOM,   { BOE, BI } },
 { "bcctrl+", XLYLK(19,528,1,1),  XLYBB_MASK,  PPCCOM,   { BOE, BI } },
+{ "bcctr",   XLLK(19,528,0),     XLBH_MASK,   PPCCOM,   { BO, BI, BH } },
+{ "bcctrl",  XLLK(19,528,1),     XLBH_MASK,   PPCCOM,   { BO, BI, BH } },
 { "bcc",     XLLK(19,528,0),     XLBB_MASK,   PWRCOM,   { BO, BI } },
 { "bccl",    XLLK(19,528,1),     XLBB_MASK,   PWRCOM,   { BO, BI } },
 { "bcctre",  XLLK(19,529,0),     XLYBB_MASK,  BOOKE64,  { BO, BI } },
@@ -3158,8 +3314,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "rldcr",   MDS(30,9,0), MDS_MASK,     PPC64,          { RA, RS, RB, ME6 } },
 { "rldcr.",  MDS(30,9,1), MDS_MASK,     PPC64,          { RA, RS, RB, ME6 } },
 
-{ "cmpw",    XCMPL(31,0,0), XCMPL_MASK, PPCCOM,         { OBF, RA, RB } },
-{ "cmpd",    XCMPL(31,0,1), XCMPL_MASK, PPC64,          { OBF, RA, RB } },
+{ "cmpw",    XOPL(31,0,0), XCMPL_MASK, PPCCOM,          { OBF, RA, RB } },
+{ "cmpd",    XOPL(31,0,1), XCMPL_MASK, PPC64,           { OBF, RA, RB } },
 { "cmp",     X(31,0),   XCMP_MASK,      PPC,            { BF, L, RA, RB } },
 { "cmp",     X(31,0),   XCMPL_MASK,     PWRCOM,         { BF, RA, RB } },
 
@@ -3228,17 +3384,18 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "iseleq",  X(31,79),      X_MASK,     PPCISEL,        { RT, RA, RB } },
 { "isel",    XISEL(31,15),  XISEL_MASK, PPCISEL,        { RT, RA, RB, CRB } },
 
-{ "mfcr",    X(31,19),  XRARB_MASK,     NOPOWER4,       { RT } },
+{ "mfocrf",  XFXM(31,19,0,1), XFXFXM_MASK, COM,         { RT, FXM } },
+{ "mfcr",    X(31,19),  XRARB_MASK,     NOPOWER4 | COM, { RT } },
 { "mfcr",    X(31,19),  XFXFXM_MASK,    POWER4,         { RT, FXM4 } },
 
-{ "lwarx",   X(31,20),  X_MASK,         PPC,            { RT, RA, RB } },
+{ "lwarx",   X(31,20),  XEH_MASK,       PPC,            { RT, RA0, RB, EH } },
 
-{ "ldx",     X(31,21),  X_MASK,         PPC64,          { RT, RA, RB } },
+{ "ldx",     X(31,21),  X_MASK,         PPC64,          { RT, RA0, RB } },
 
-{ "icbt",    X(31,22),  X_MASK,         BOOKE,          { CT, RA, RB } },
+{ "icbt",    X(31,22),  X_MASK,         BOOKE|PPCE300,  { CT, RA, RB } },
 { "icbt",    X(31,262), XRT_MASK,       PPC403,         { RA, RB } },
 
-{ "lwzx",    X(31,23),  X_MASK,         PPCCOM,         { RT, RA, RB } },
+{ "lwzx",    X(31,23),  X_MASK,         PPCCOM,         { RT, RA0, RB } },
 { "lx",      X(31,23),  X_MASK,         PWRCOM,         { RT, RA, RB } },
 
 { "slw",     XRC(31,24,0), X_MASK,      PPCCOM,         { RA, RS, RB } },
@@ -3262,10 +3419,10 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "icbte",   X(31,30),  X_MASK,         BOOKE64,        { CT, RA, RB } },
 
-{ "lwzxe",   X(31,31),  X_MASK,         BOOKE64,        { RT, RA, RB } },
+{ "lwzxe",   X(31,31),  X_MASK,         BOOKE64,        { RT, RA0, RB } },
 
-{ "cmplw",   XCMPL(31,32,0), XCMPL_MASK, PPCCOM,        { OBF, RA, RB } },
-{ "cmpld",   XCMPL(31,32,1), XCMPL_MASK, PPC64,         { OBF, RA, RB } },
+{ "cmplw",   XOPL(31,32,0), XCMPL_MASK, PPCCOM, { OBF, RA, RB } },
+{ "cmpld",   XOPL(31,32,1), XCMPL_MASK, PPC64,          { OBF, RA, RB } },
 { "cmpl",    X(31,32),  XCMP_MASK,       PPC,           { BF, L, RA, RB } },
 { "cmpl",    X(31,32),  XCMPL_MASK,      PWRCOM,        { BF, RA, RB } },
 
@@ -3324,15 +3481,16 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "mfmsr",   X(31,83),  XRARB_MASK,     COM,            { RT } },
 
-{ "ldarx",   X(31,84),  X_MASK,         PPC64,          { RT, RA, RB } },
+{ "ldarx",   X(31,84),  XEH_MASK,       PPC64,          { RT, RA0, RB, EH } },
 
-{ "dcbf",    X(31,86),  XRT_MASK,       PPC,            { RA, RB } },
+{ "dcbfl",   XOPL(31,86,1), XRT_MASK,   POWER5,         { RA, RB } },
+{ "dcbf",    X(31,86),  XLRT_MASK,      PPC,            { RA, RB, XRT_L } },
 
-{ "lbzx",    X(31,87),  X_MASK,         COM,            { RT, RA, RB } },
+{ "lbzx",    X(31,87),  X_MASK,         COM,            { RT, RA0, RB } },
 
 { "dcbfe",   X(31,94),  XRT_MASK,       BOOKE64,        { RA, RB } },
 
-{ "lbzxe",   X(31,95),  X_MASK,         BOOKE64,        { RT, RA, RB } },
+{ "lbzxe",   X(31,95),  X_MASK,         BOOKE64,        { RT, RA0, RB } },
 
 { "neg",     XO(31,104,0,0), XORB_MASK, COM,            { RT, RA } },
 { "neg.",    XO(31,104,0,1), XORB_MASK, COM,            { RT, RA } },
@@ -3350,12 +3508,14 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "lbzux",   X(31,119), X_MASK,         COM,            { RT, RAL, RB } },
 
+{ "popcntb", X(31,122), XRB_MASK,       POWER5,         { RA, RS } },
+
 { "not",     XRC(31,124,0), X_MASK,     COM,            { RA, RS, RBS } },
 { "nor",     XRC(31,124,0), X_MASK,     COM,            { RA, RS, RB } },
 { "not.",    XRC(31,124,1), X_MASK,     COM,            { RA, RS, RBS } },
 { "nor.",    XRC(31,124,1), X_MASK,     COM,            { RA, RS, RB } },
 
-{ "lwarxe",  X(31,126), X_MASK,         BOOKE64,        { RT, RA, RB } },
+{ "lwarxe",  X(31,126), X_MASK,         BOOKE64,        { RT, RA0, RB } },
 
 { "lbzuxe",  X(31,127), X_MASK,         BOOKE64,        { RT, RAL, RB } },
 
@@ -3383,21 +3543,22 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "dcbtstlse",X(31,142),X_MASK,         PPCCHLK64,      { CT, RA, RB }},
 
-{ "mtcr",    XFXM(31,144,0xff), XRARB_MASK, COM,        { RS }},
+{ "mtocrf",  XFXM(31,144,0,1), XFXFXM_MASK, COM,        { FXM, RS } },
+{ "mtcr",    XFXM(31,144,0xff,0), XRARB_MASK, COM,      { RS }},
 { "mtcrf",   X(31,144), XFXFXM_MASK,    COM,            { FXM, RS } },
 
 { "mtmsr",   X(31,146), XRARB_MASK,     COM,            { RS } },
 
-{ "stdx",    X(31,149), X_MASK,         PPC64,          { RS, RA, RB } },
+{ "stdx",    X(31,149), X_MASK,         PPC64,          { RS, RA0, RB } },
 
-{ "stwcx.",  XRC(31,150,1), X_MASK,     PPC,            { RS, RA, RB } },
+{ "stwcx.",  XRC(31,150,1), X_MASK,     PPC,            { RS, RA0, RB } },
 
-{ "stwx",    X(31,151), X_MASK,         PPCCOM,         { RS, RA, RB } },
+{ "stwx",    X(31,151), X_MASK,         PPCCOM,         { RS, RA0, RB } },
 { "stx",     X(31,151), X_MASK,         PWRCOM,         { RS, RA, RB } },
 
-{ "stwcxe.", XRC(31,158,1), X_MASK,     BOOKE64,        { RS, RA, RB } },
+{ "stwcxe.", XRC(31,158,1), X_MASK,     BOOKE64,        { RS, RA0, RB } },
 
-{ "stwxe",   X(31,159), X_MASK,         BOOKE64,        { RS, RA, RB } },
+{ "stwxe",   X(31,159), X_MASK,         BOOKE64,        { RS, RA0, RB } },
 
 { "slq",     XRC(31,152,0), X_MASK,     M601,           { RA, RS, RB } },
 { "slq.",    XRC(31,152,1), X_MASK,     M601,           { RA, RS, RB } },
@@ -3405,6 +3566,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "sle",     XRC(31,153,0), X_MASK,     M601,           { RA, RS, RB } },
 { "sle.",    XRC(31,153,1), X_MASK,     M601,           { RA, RS, RB } },
 
+{ "prtyw",   X(31,154), XRB_MASK,       POWER6,         { RA, RS } },
+
 { "wrteei",  X(31,163), XE_MASK,        PPC403 | BOOKE, { E } },
 
 { "dcbtls",  X(31,166), X_MASK,         PPCCHLK,        { CT, RA, RB }},
@@ -3415,11 +3578,13 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "stdux",   X(31,181), X_MASK,         PPC64,          { RS, RAS, RB } },
 
 { "stwux",   X(31,183), X_MASK,         PPCCOM,         { RS, RAS, RB } },
-{ "stux",    X(31,183), X_MASK,         PWRCOM,         { RS, RA, RB } },
+{ "stux",    X(31,183), X_MASK,         PWRCOM,         { RS, RA0, RB } },
 
 { "sliq",    XRC(31,184,0), X_MASK,     M601,           { RA, RS, SH } },
 { "sliq.",   XRC(31,184,1), X_MASK,     M601,           { RA, RS, SH } },
 
+{ "prtyd",   X(31,186), XRB_MASK,       POWER6,         { RA, RS } },
+
 { "stwuxe",  X(31,191), X_MASK,         BOOKE64,        { RS, RAS, RB } },
 
 { "subfze",  XO(31,200,0,0), XORB_MASK, PPCCOM,         { RT, RA } },
@@ -3442,9 +3607,9 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "mtsr",    X(31,210), XRB_MASK|(1<<20), COM32,        { SR, RS } },
 
-{ "stdcx.",  XRC(31,214,1), X_MASK,     PPC64,          { RS, RA, RB } },
+{ "stdcx.",  XRC(31,214,1), X_MASK,     PPC64,          { RS, RA0, RB } },
 
-{ "stbx",    X(31,215), X_MASK,         COM,            { RS, RA, RB } },
+{ "stbx",    X(31,215), X_MASK,         COM,            { RS, RA0, RB } },
 
 { "sllq",    XRC(31,216,0), X_MASK,     M601,           { RA, RS, RB } },
 { "sllq.",   XRC(31,216,1), X_MASK,     M601,           { RA, RS, RB } },
@@ -3452,7 +3617,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "sleq",    XRC(31,217,0), X_MASK,     M601,           { RA, RS, RB } },
 { "sleq.",   XRC(31,217,1), X_MASK,     M601,           { RA, RS, RB } },
 
-{ "stbxe",   X(31,223), X_MASK,         BOOKE64,        { RS, RA, RB } },
+{ "stbxe",   X(31,223), X_MASK,         BOOKE64,        { RS, RA0, RB } },
 
 { "icblc",   X(31,230), X_MASK,         PPCCHLK,        { CT, RA, RB }},
 
@@ -3492,7 +3657,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "mtsrin",  X(31,242), XRA_MASK,       PPC32,          { RS, RB } },
 { "mtsri",   X(31,242), XRA_MASK,       POWER32,        { RS, RB } },
 
-{ "dcbtst",  X(31,246), XRT_MASK,       PPC,            { CT, RA, RB } },
+{ "dcbtst",  X(31,246), X_MASK, PPC,                    { CT, RA, RB } },
 
 { "stbux",   X(31,247), X_MASK,         COM,            { RS, RAS, RB } },
 
@@ -3519,26 +3684,26 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "addo.",   XO(31,266,1,1), XO_MASK,   PPCCOM,         { RT, RA, RB } },
 { "caxo.",   XO(31,266,1,1), XO_MASK,   PWRCOM,         { RT, RA, RB } },
 
-{ "tlbiel",  X(31,274), XRTRA_MASK,     POWER4,         { RB } },
+{ "tlbiel",  X(31,274), XRTLRA_MASK,    POWER4,         { RB, L } },
 
 { "mfapidi", X(31,275), X_MASK,         BOOKE,          { RT, RA } },
 
 { "lscbx",   XRC(31,277,0), X_MASK,     M601,           { RT, RA, RB } },
 { "lscbx.",  XRC(31,277,1), X_MASK,     M601,           { RT, RA, RB } },
 
-{ "dcbt",    X(31,278), XRT_MASK,       PPC,            { CT, RA, RB } },
+{ "dcbt",    X(31,278), X_MASK,         PPC,            { CT, RA, RB } },
 
-{ "lhzx",    X(31,279), X_MASK,         COM,            { RT, RA, RB } },
+{ "lhzx",    X(31,279), X_MASK,         COM,            { RT, RA0, RB } },
 
 { "eqv",     XRC(31,284,0), X_MASK,     COM,            { RA, RS, RB } },
 { "eqv.",    XRC(31,284,1), X_MASK,     COM,            { RA, RS, RB } },
 
 { "dcbte",   X(31,286), X_MASK,         BOOKE64,        { CT, RA, RB } },
 
-{ "lhzxe",   X(31,287), X_MASK,         BOOKE64,        { RT, RA, RB } },
+{ "lhzxe",   X(31,287), X_MASK,         BOOKE64,        { RT, RA0, RB } },
 
 { "tlbie",   X(31,306), XRTLRA_MASK,    PPC,            { RB, L } },
-{ "tlbi",    X(31,306), XRT_MASK,       POWER,          { RA, RB } },
+{ "tlbi",    X(31,306), XRT_MASK,       POWER,          { RA0, RB } },
 
 { "eciwx",   X(31,310), X_MASK,         PPC,            { RT, RA, RB } },
 
@@ -3607,6 +3772,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "mfsdr1",     XSPR(31,339,25),   XSPR_MASK, COM,      { RT } },
 { "mfsrr0",     XSPR(31,339,26),   XSPR_MASK, COM,      { RT } },
 { "mfsrr1",     XSPR(31,339,27),   XSPR_MASK, COM,      { RT } },
+{ "mfcfar",     XSPR(31,339,28),   XSPR_MASK, POWER6,   { RT } },
 { "mfpid",      XSPR(31,339,48),   XSPR_MASK, BOOKE,    { RT } },
 { "mfpid",      XSPR(31,339,945),  XSPR_MASK, PPC403,   { RT } },
 { "mfcsrr0",    XSPR(31,339,58),   XSPR_MASK, BOOKE,    { RT } },
@@ -3634,21 +3800,21 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "mfbar",      XSPR(31,339,159),  XSPR_MASK, PPC860,   { RT } },
 { "mfvrsave",   XSPR(31,339,256),  XSPR_MASK, PPCVEC,   { RT } },
 { "mfusprg0",   XSPR(31,339,256),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfsprg4",    XSPR(31,339,260),  XSPR_MASK, PPC405,   { RT } },
-{ "mfsprg5",    XSPR(31,339,261),  XSPR_MASK, PPC405,   { RT } },
-{ "mfsprg6",    XSPR(31,339,262),  XSPR_MASK, PPC405,   { RT } },
-{ "mfsprg7",    XSPR(31,339,263),  XSPR_MASK, PPC405,   { RT } },
 { "mftb",       X(31,371),         X_MASK,    CLASSIC,  { RT, TBR } },
 { "mftb",       XSPR(31,339,268),  XSPR_MASK, BOOKE,    { RT } },
 { "mftbl",      XSPR(31,371,268),  XSPR_MASK, CLASSIC,  { RT } },
 { "mftbl",      XSPR(31,339,268),  XSPR_MASK, BOOKE,    { RT } },
 { "mftbu",      XSPR(31,371,269),  XSPR_MASK, CLASSIC,  { RT } },
 { "mftbu",      XSPR(31,339,269),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfsprg",     XSPR(31,339,272),  XSPRG_MASK, PPC,     { RT, SPRG } },
+{ "mfsprg",     XSPR(31,339,256),  XSPRG_MASK, PPC,     { RT, SPRG } },
 { "mfsprg0",    XSPR(31,339,272),  XSPR_MASK, PPC,      { RT } },
 { "mfsprg1",    XSPR(31,339,273),  XSPR_MASK, PPC,      { RT } },
 { "mfsprg2",    XSPR(31,339,274),  XSPR_MASK, PPC,      { RT } },
 { "mfsprg3",    XSPR(31,339,275),  XSPR_MASK, PPC,      { RT } },
+{ "mfsprg4",    XSPR(31,339,260),  XSPR_MASK, PPC405 | BOOKE,   { RT } },
+{ "mfsprg5",    XSPR(31,339,261),  XSPR_MASK, PPC405 | BOOKE,   { RT } },
+{ "mfsprg6",    XSPR(31,339,262),  XSPR_MASK, PPC405 | BOOKE,   { RT } },
+{ "mfsprg7",    XSPR(31,339,263),  XSPR_MASK, PPC405 | BOOKE,   { RT } },
 { "mfasr",      XSPR(31,339,280),  XSPR_MASK, PPC64,    { RT } },
 { "mfear",      XSPR(31,339,282),  XSPR_MASK, PPC,      { RT } },
 { "mfpir",      XSPR(31,339,286),  XSPR_MASK, BOOKE,    { RT } },
@@ -3699,6 +3865,10 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "mfspefscr",  XSPR(31,339,512),  XSPR_MASK, PPCSPE,   { RT } },
 { "mfbbear",    XSPR(31,339,513),  XSPR_MASK, PPCBRLK,  { RT } },
 { "mfbbtar",    XSPR(31,339,514),  XSPR_MASK, PPCBRLK,  { RT } },
+{ "mfivor32",   XSPR(31,339,528),  XSPR_MASK, PPCSPE,   { RT } },
+{ "mfivor33",   XSPR(31,339,529),  XSPR_MASK, PPCSPE,   { RT } },
+{ "mfivor34",   XSPR(31,339,530),  XSPR_MASK, PPCSPE,   { RT } },
+{ "mfivor35",   XSPR(31,339,531),  XSPR_MASK, PPCPMR,   { RT } },
 { "mfibatu",    XSPR(31,339,528),  XSPRBAT_MASK, PPC,   { RT, SPRBAT } },
 { "mfibatl",    XSPR(31,339,529),  XSPRBAT_MASK, PPC,   { RT, SPRBAT } },
 { "mfdbatu",    XSPR(31,339,536),  XSPRBAT_MASK, PPC,   { RT, SPRBAT } },
@@ -3708,10 +3878,11 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "mfic_dat",   XSPR(31,339,562),  XSPR_MASK, PPC860,   { RT } },
 { "mfdc_cst",   XSPR(31,339,568),  XSPR_MASK, PPC860,   { RT } },
 { "mfdc_adr",   XSPR(31,339,569),  XSPR_MASK, PPC860,   { RT } },
-{ "mfdc_dat",   XSPR(31,339,570),  XSPR_MASK, PPC860,   { RT } },
 { "mfmcsrr0",   XSPR(31,339,570),  XSPR_MASK, PPCRFMCI, { RT } },
+{ "mfdc_dat",   XSPR(31,339,570),  XSPR_MASK, PPC860,   { RT } },
 { "mfmcsrr1",   XSPR(31,339,571),  XSPR_MASK, PPCRFMCI, { RT } },
 { "mfmcsr",     XSPR(31,339,572),  XSPR_MASK, PPCRFMCI, { RT } },
+{ "mfmcar",     XSPR(31,339,573),  XSPR_MASK, PPCRFMCI, { RT } },
 { "mfdpdr",     XSPR(31,339,630),  XSPR_MASK, PPC860,   { RT } },
 { "mfdpir",     XSPR(31,339,631),  XSPR_MASK, PPC860,   { RT } },
 { "mfimmr",     XSPR(31,339,638),  XSPR_MASK, PPC860,   { RT } },
@@ -3775,14 +3946,14 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "mfpbu2",     XSPR(31,339,1023), XSPR_MASK, PPC403,   { RT } },
 { "mfspr",      X(31,339),         X_MASK,    COM,      { RT, SPR } },
 
-{ "lwax",    X(31,341), X_MASK,         PPC64,          { RT, RA, RB } },
+{ "lwax",    X(31,341), X_MASK,         PPC64,          { RT, RA0, RB } },
 
 { "dst",     XDSS(31,342,0), XDSS_MASK, PPCVEC,         { RA, RB, STRM } },
 { "dstt",    XDSS(31,342,1), XDSS_MASK, PPCVEC,         { RA, RB, STRM } },
 
-{ "lhax",    X(31,343), X_MASK,         COM,            { RT, RA, RB } },
+{ "lhax",    X(31,343), X_MASK,         COM,            { RT, RA0, RB } },
 
-{ "lhaxe",   X(31,351), X_MASK,         BOOKE64,        { RT, RA, RB } },
+{ "lhaxe",   X(31,351), X_MASK,         BOOKE64,        { RT, RA0, RB } },
 
 { "dstst",   XDSS(31,374,0), XDSS_MASK, PPCVEC,         { RA, RB, STRM } },
 { "dststt",  XDSS(31,374,1), XDSS_MASK, PPCVEC,         { RA, RB, STRM } },
@@ -3821,14 +3992,20 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "slbmte",  X(31,402), XRA_MASK,       PPC64,          { RS, RB } },
 
-{ "sthx",    X(31,407), X_MASK,         COM,            { RS, RA, RB } },
+{ "sthx",    X(31,407), X_MASK,         COM,            { RS, RA0, RB } },
+
+{ "cmpb",    X(31,508), X_MASK,         POWER6,         { RA, RS, RB } },
 
 { "lfqx",    X(31,791), X_MASK,         POWER2,         { FRT, RA, RB } },
 
+{ "lfdpx",   X(31,791), X_MASK,         POWER6,         { FRT, RA, RB } },
+
 { "lfqux",   X(31,823), X_MASK,         POWER2,         { FRT, RA, RB } },
 
 { "stfqx",   X(31,919), X_MASK,         POWER2,         { FRS, RA, RB } },
 
+{ "stfdpx",  X(31,919), X_MASK,         POWER6,         { FRS, RA, RB } },
+
 { "stfqux",  X(31,951), X_MASK,         POWER2,         { FRS, RA, RB } },
 
 { "orc",     XRC(31,412,0), X_MASK,     COM,            { RA, RS, RB } },
@@ -3837,7 +4014,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "sradi",   XS(31,413,0), XS_MASK,     PPC64,          { RA, RS, SH6 } },
 { "sradi.",  XS(31,413,1), XS_MASK,     PPC64,          { RA, RS, SH6 } },
 
-{ "sthxe",   X(31,415), X_MASK,         BOOKE64,        { RS, RA, RB } },
+{ "sthxe",   X(31,415), X_MASK,         BOOKE64,        { RS, RA0, RB } },
 
 { "slbie",   X(31,434), XRTRA_MASK,     PPC64,          { RB } },
 
@@ -3918,6 +4095,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "mtsdr1",    XSPR(31,467,25),   XSPR_MASK, COM,       { RS } },
 { "mtsrr0",    XSPR(31,467,26),   XSPR_MASK, COM,       { RS } },
 { "mtsrr1",    XSPR(31,467,27),   XSPR_MASK, COM,       { RS } },
+{ "mtcfar",    XSPR(31,467,28),   XSPR_MASK, POWER6,    { RS } },
 { "mtpid",     XSPR(31,467,48),   XSPR_MASK, BOOKE,     { RS } },
 { "mtpid",     XSPR(31,467,945),  XSPR_MASK, PPC403,    { RS } },
 { "mtdecar",   XSPR(31,467,54),   XSPR_MASK, BOOKE,     { RS } },
@@ -3946,7 +4124,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "mtbar",     XSPR(31,467,159),  XSPR_MASK, PPC860,    { RS } },
 { "mtvrsave",  XSPR(31,467,256),  XSPR_MASK, PPCVEC,    { RS } },
 { "mtusprg0",  XSPR(31,467,256),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtsprg",    XSPR(31,467,272),  XSPRG_MASK,PPC,       { SPRG, RS } },
+{ "mtsprg",    XSPR(31,467,256),  XSPRG_MASK,PPC,       { SPRG, RS } },
 { "mtsprg0",   XSPR(31,467,272),  XSPR_MASK, PPC,       { RS } },
 { "mtsprg1",   XSPR(31,467,273),  XSPR_MASK, PPC,       { RS } },
 { "mtsprg2",   XSPR(31,467,274),  XSPR_MASK, PPC,       { RS } },
@@ -4005,6 +4183,10 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "mtspefscr",  XSPR(31,467,512),  XSPR_MASK, PPCSPE,   { RS } },
 { "mtbbear",   XSPR(31,467,513),  XSPR_MASK, PPCBRLK,   { RS } },
 { "mtbbtar",   XSPR(31,467,514),  XSPR_MASK, PPCBRLK,  { RS } },
+{ "mtivor32",  XSPR(31,467,528),  XSPR_MASK, PPCSPE,    { RS } },
+{ "mtivor33",  XSPR(31,467,529),  XSPR_MASK, PPCSPE,    { RS } },
+{ "mtivor34",  XSPR(31,467,530),  XSPR_MASK, PPCSPE,    { RS } },
+{ "mtivor35",  XSPR(31,467,531),  XSPR_MASK, PPCPMR,    { RS } },
 { "mtibatu",   XSPR(31,467,528),  XSPRBAT_MASK, PPC,    { SPRBAT, RS } },
 { "mtibatl",   XSPR(31,467,529),  XSPRBAT_MASK, PPC,    { SPRBAT, RS } },
 { "mtdbatu",   XSPR(31,467,536),  XSPRBAT_MASK, PPC,    { SPRBAT, RS } },
@@ -4101,13 +4283,15 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "clcs",    X(31,531), XRB_MASK,       M601,           { RT, RA } },
 
-{ "lswx",    X(31,533), X_MASK,         PPCCOM,         { RT, RA, RB } },
+{ "ldbrx",   X(31,532), X_MASK,         CELL,           { RT, RA0, RB } },
+
+{ "lswx",    X(31,533), X_MASK,         PPCCOM,         { RT, RA0, RB } },
 { "lsx",     X(31,533), X_MASK,         PWRCOM,         { RT, RA, RB } },
 
-{ "lwbrx",   X(31,534), X_MASK,         PPCCOM,         { RT, RA, RB } },
+{ "lwbrx",   X(31,534), X_MASK,         PPCCOM,         { RT, RA0, RB } },
 { "lbrx",    X(31,534), X_MASK,         PWRCOM,         { RT, RA, RB } },
 
-{ "lfsx",    X(31,535), X_MASK,         COM,            { FRT, RA, RB } },
+{ "lfsx",    X(31,535), X_MASK,         COM,            { FRT, RA0, RB } },
 
 { "srw",     XRC(31,536,0), X_MASK,     PPCCOM,         { RA, RS, RB } },
 { "sr",      XRC(31,536,0), X_MASK,     PWRCOM,         { RA, RS, RB } },
@@ -4123,11 +4307,12 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "maskir",  XRC(31,541,0), X_MASK,     M601,           { RA, RS, RB } },
 { "maskir.", XRC(31,541,1), X_MASK,     M601,           { RA, RS, RB } },
 
-{ "lwbrxe",  X(31,542), X_MASK,         BOOKE64,        { RT, RA, RB } },
+{ "lwbrxe",  X(31,542), X_MASK,         BOOKE64,        { RT, RA0, RB } },
 
-{ "lfsxe",   X(31,543), X_MASK,         BOOKE64,        { FRT, RA, RB } },
+{ "lfsxe",   X(31,543), X_MASK,         BOOKE64,        { FRT, RA0, RB } },
 
 { "bbelr",   X(31,550), X_MASK,         PPCBRLK,        { 0 }},
+
 { "tlbsync", X(31,566), 0xffffffff,     PPC,            { 0 } },
 
 { "lfsux",   X(31,567), X_MASK,         COM,            { FRT, RAS, RB } },
@@ -4136,8 +4321,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "mfsr",    X(31,595), XRB_MASK|(1<<20), COM32,        { RT, SR } },
 
-{ "lswi",    X(31,597), X_MASK,         PPCCOM,         { RT, RA, NB } },
-{ "lsi",     X(31,597), X_MASK,         PWRCOM,         { RT, RA, NB } },
+{ "lswi",    X(31,597), X_MASK,         PPCCOM,         { RT, RA0, NB } },
+{ "lsi",     X(31,597), X_MASK,         PWRCOM,         { RT, RA0, NB } },
 
 { "lwsync",  XSYNC(31,598,1), 0xffffffff, PPC,          { 0 } },
 { "ptesync", XSYNC(31,598,2), 0xffffffff, PPC64,        { 0 } },
@@ -4145,9 +4330,11 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "sync",    X(31,598), XSYNC_MASK,     PPCCOM,         { LS } },
 { "dcs",     X(31,598), 0xffffffff,     PWRCOM,         { 0 } },
 
-{ "lfdx",    X(31,599), X_MASK,         COM,            { FRT, RA, RB } },
+{ "lfdx",    X(31,599), X_MASK,         COM,            { FRT, RA0, RB } },
+
+{ "lfdxe",   X(31,607), X_MASK,         BOOKE64,        { FRT, RA0, RB } },
 
-{ "lfdxe",   X(31,607), X_MASK,         BOOKE64,        { FRT, RA, RB } },
+{ "mffgpr",  XRC(31,607,0), XRA_MASK,   POWER6,         { FRT, RB } },
 
 { "mfsri",   X(31,627), X_MASK,         PWRCOM,         { RT, RA, RB } },
 
@@ -4159,13 +4346,15 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "mfsrin",  X(31,659), XRA_MASK,       PPC32,          { RT, RB } },
 
-{ "stswx",   X(31,661), X_MASK,         PPCCOM,         { RS, RA, RB } },
-{ "stsx",    X(31,661), X_MASK,         PWRCOM,         { RS, RA, RB } },
+{ "stdbrx",  X(31,660), X_MASK,         CELL,           { RS, RA0, RB } },
+
+{ "stswx",   X(31,661), X_MASK,         PPCCOM,         { RS, RA0, RB } },
+{ "stsx",    X(31,661), X_MASK,         PWRCOM,         { RS, RA0, RB } },
 
-{ "stwbrx",  X(31,662), X_MASK,         PPCCOM,         { RS, RA, RB } },
-{ "stbrx",   X(31,662), X_MASK,         PWRCOM,         { RS, RA, RB } },
+{ "stwbrx",  X(31,662), X_MASK,         PPCCOM,         { RS, RA0, RB } },
+{ "stbrx",   X(31,662), X_MASK,         PWRCOM,         { RS, RA0, RB } },
 
-{ "stfsx",   X(31,663), X_MASK,         COM,            { FRS, RA, RB } },
+{ "stfsx",   X(31,663), X_MASK,         COM,            { FRS, RA0, RB } },
 
 { "srq",     XRC(31,664,0), X_MASK,     M601,           { RA, RS, RB } },
 { "srq.",    XRC(31,664,1), X_MASK,     M601,           { RA, RS, RB } },
@@ -4173,9 +4362,9 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "sre",     XRC(31,665,0), X_MASK,     M601,           { RA, RS, RB } },
 { "sre.",    XRC(31,665,1), X_MASK,     M601,           { RA, RS, RB } },
 
-{ "stwbrxe", X(31,670), X_MASK,         BOOKE64,        { RS, RA, RB } },
+{ "stwbrxe", X(31,670), X_MASK,         BOOKE64,        { RS, RA0, RB } },
 
-{ "stfsxe",  X(31,671), X_MASK,         BOOKE64,        { FRS, RA, RB } },
+{ "stfsxe",  X(31,671), X_MASK,         BOOKE64,        { FRS, RA0, RB } },
 
 { "stfsux",  X(31,695), X_MASK,         COM,            { FRS, RAS, RB } },
 
@@ -4184,10 +4373,10 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "stfsuxe", X(31,703), X_MASK,         BOOKE64,        { FRS, RAS, RB } },
 
-{ "stswi",   X(31,725), X_MASK,         PPCCOM,         { RS, RA, NB } },
-{ "stsi",    X(31,725), X_MASK,         PWRCOM,         { RS, RA, NB } },
+{ "stswi",   X(31,725), X_MASK,         PPCCOM,         { RS, RA0, NB } },
+{ "stsi",    X(31,725), X_MASK,         PWRCOM,         { RS, RA0, NB } },
 
-{ "stfdx",   X(31,727), X_MASK,         COM,            { FRS, RA, RB } },
+{ "stfdx",   X(31,727), X_MASK,         COM,            { FRS, RA0, RB } },
 
 { "srlq",    XRC(31,728,0), X_MASK,     M601,           { RA, RS, RB } },
 { "srlq.",   XRC(31,728,1), X_MASK,     M601,           { RA, RS, RB } },
@@ -4195,7 +4384,9 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "sreq",    XRC(31,729,0), X_MASK,     M601,           { RA, RS, RB } },
 { "sreq.",   XRC(31,729,1), X_MASK,     M601,           { RA, RS, RB } },
 
-{ "stfdxe",  X(31,735), X_MASK,         BOOKE64,        { FRS, RA, RB } },
+{ "stfdxe",  X(31,735), X_MASK,         BOOKE64,        { FRS, RA0, RB } },
+
+{ "mftgpr",  XRC(31,735,0), XRA_MASK,   POWER6,         { RT, FRB } },
 
 { "dcba",    X(31,758), XRT_MASK,       PPC405 | BOOKE, { RA, RB } },
 
@@ -4211,7 +4402,9 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "tlbivax", X(31,786), XRT_MASK,       BOOKE,          { RA, RB } },
 { "tlbivaxe",X(31,787), XRT_MASK,       BOOKE64,        { RA, RB } },
 
-{ "lhbrx",   X(31,790), X_MASK,         COM,            { RT, RA, RB } },
+{ "lwzcix",  X(31,789), X_MASK,         POWER6,         { RT, RA0, RB } },
+
+{ "lhbrx",   X(31,790), X_MASK,         COM,            { RT, RA0, RB } },
 
 { "sraw",    XRC(31,792,0), X_MASK,     PPCCOM,         { RA, RS, RB } },
 { "sra",     XRC(31,792,0), X_MASK,     PWRCOM,         { RA, RS, RB } },
@@ -4221,13 +4414,15 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "srad",    XRC(31,794,0), X_MASK,     PPC64,          { RA, RS, RB } },
 { "srad.",   XRC(31,794,1), X_MASK,     PPC64,          { RA, RS, RB } },
 
-{ "lhbrxe",  X(31,798), X_MASK,         BOOKE64,        { RT, RA, RB } },
+{ "lhbrxe",  X(31,798), X_MASK,         BOOKE64,        { RT, RA0, RB } },
 
-{ "ldxe",    X(31,799), X_MASK,         BOOKE64,        { RT, RA, RB } },
-{ "lduxe",   X(31,831), X_MASK,         BOOKE64,        { RT, RA, RB } },
+{ "ldxe",    X(31,799), X_MASK,         BOOKE64,        { RT, RA0, RB } },
+{ "lduxe",   X(31,831), X_MASK,         BOOKE64,        { RT, RA0, RB } },
 
 { "rac",     X(31,818), X_MASK,         PWRCOM,         { RT, RA, RB } },
 
+{ "lhzcix",  X(31,821), X_MASK,         POWER6,         { RT, RA0, RB } },
+
 { "dss",     XDSS(31,822,0), XDSS_MASK, PPCVEC,         { STRM } },
 { "dssall",  XDSS(31,822,1), XDSS_MASK, PPCVEC,         { 0 } },
 
@@ -4238,19 +4433,25 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "slbmfev", X(31,851), XRA_MASK,       PPC64,          { RT, RB } },
 
+{ "lbzcix",  X(31,853), X_MASK,         POWER6,         { RT, RA0, RB } },
+
 { "mbar",    X(31,854), X_MASK,         BOOKE,          { MO } },
 { "eieio",   X(31,854), 0xffffffff,     PPC,            { 0 } },
 
-{ "tlbsx",   XRC(31,914,0), X_MASK,     BOOKE,          { RA, RB } },
-{ "tlbsx",   XRC(31,914,0), X_MASK,     PPC403,         { RT, RA, RB } },
-{ "tlbsx.",  XRC(31,914,1), X_MASK,     BOOKE,          { RA, RB } },
-{ "tlbsx.",  XRC(31,914,1), X_MASK,     PPC403,         { RT, RA, RB } },
+{ "lfiwax",  X(31,855), X_MASK,         POWER6,         { FRT, RA0, RB } },
+
+{ "ldcix",   X(31,885), X_MASK,         POWER6,         { RT, RA0, RB } },
+
+{ "tlbsx",   XRC(31,914,0), X_MASK,     PPC403|BOOKE,   { RTO, RA, RB } },
+{ "tlbsx.",  XRC(31,914,1), X_MASK,     PPC403|BOOKE,   { RTO, RA, RB } },
 { "tlbsxe",  XRC(31,915,0), X_MASK,     BOOKE64,        { RA, RB } },
 { "tlbsxe.", XRC(31,915,1), X_MASK,     BOOKE64,        { RA, RB } },
 
 { "slbmfee", X(31,915), XRA_MASK,       PPC64,          { RT, RB } },
 
-{ "sthbrx",  X(31,918), X_MASK,         COM,            { RS, RA, RB } },
+{ "stwcix",  X(31,917), X_MASK,         POWER6,         { RS, RA0, RB } },
+
+{ "sthbrx",  X(31,918), X_MASK,         COM,            { RS, RA0, RB } },
 
 { "sraq",    XRC(31,920,0), X_MASK,     M601,           { RA, RS, RB } },
 { "sraq.",   XRC(31,920,1), X_MASK,     M601,           { RA, RS, RB } },
@@ -4263,14 +4464,15 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "extsh.",  XRC(31,922,1), XRB_MASK,   PPCCOM,         { RA, RS } },
 { "exts.",   XRC(31,922,1), XRB_MASK,   PWRCOM,         { RA, RS } },
 
-{ "sthbrxe", X(31,926), X_MASK,         BOOKE64,        { RS, RA, RB } },
+{ "sthbrxe", X(31,926), X_MASK,         BOOKE64,        { RS, RA0, RB } },
 
-{ "stdxe",   X(31,927), X_MASK,         BOOKE64,        { RS, RA, RB } },
+{ "stdxe",   X(31,927), X_MASK,         BOOKE64,        { RS, RA0, RB } },
 
 { "tlbrehi", XTLB(31,946,0), XTLB_MASK, PPC403,         { RT, RA } },
 { "tlbrelo", XTLB(31,946,1), XTLB_MASK, PPC403,         { RT, RA } },
-{ "tlbre",   X(31,946), X_MASK,         BOOKE,          { 0 } },
-{ "tlbre",   X(31,946), X_MASK,         PPC403,         { RS, RA, SH } },
+{ "tlbre",   X(31,946), X_MASK,         PPC403|BOOKE,   { RSO, RAOPT, SHO } },
+
+{ "sthcix",  X(31,949), X_MASK,         POWER6,         { RS, RA0, RB } },
 
 { "sraiq",   XRC(31,952,0), X_MASK,     M601,           { RA, RS, SH } },
 { "sraiq.",  XRC(31,952,1), X_MASK,     M601,           { RA, RS, SH } },
@@ -4284,13 +4486,14 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "tlbwehi", XTLB(31,978,0), XTLB_MASK, PPC403,         { RT, RA } },
 { "tlbwelo", XTLB(31,978,1), XTLB_MASK, PPC403,         { RT, RA } },
-{ "tlbwe",   X(31,978), X_MASK,         BOOKE,          { 0 } },
-{ "tlbwe",   X(31,978), X_MASK,         PPC403,         { RS, RA, SH } },
+{ "tlbwe",   X(31,978), X_MASK,         PPC403|BOOKE,   { RSO, RAOPT, SHO } },
 { "tlbld",   X(31,978), XRTRA_MASK,     PPC,            { RB } },
 
+{ "stbcix",  X(31,981), X_MASK,         POWER6,         { RS, RA0, RB } },
+
 { "icbi",    X(31,982), XRT_MASK,       PPC,            { RA, RB } },
 
-{ "stfiwx",  X(31,983), X_MASK,         PPC,            { FRS, RA, RB } },
+{ "stfiwx",  X(31,983), X_MASK,         PPC,            { FRS, RA0, RB } },
 
 { "extsw",   XRC(31,986,0), XRB_MASK,   PPC64 | BOOKE64,{ RA, RS } },
 { "extsw.",  XRC(31,986,1), XRB_MASK,   PPC64,          { RA, RS } },
@@ -4298,10 +4501,13 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "icread",  X(31,998), XRT_MASK,       PPC403|PPC440,  { RA, RB } },
 
 { "icbie",   X(31,990), XRT_MASK,       BOOKE64,        { RA, RB } },
-{ "stfiwxe", X(31,991), X_MASK,         BOOKE64,        { FRS, RA, RB } },
+{ "stfiwxe", X(31,991), X_MASK,         BOOKE64,        { FRS, RA0, RB } },
 
 { "tlbli",   X(31,1010), XRTRA_MASK,    PPC,            { RB } },
 
+{ "stdcix",  X(31,1013), X_MASK,        POWER6,         { RS, RA0, RB } },
+
+{ "dcbzl",   XOPL(31,1014,1), XRT_MASK,POWER4,            { RA, RB } },
 { "dcbz",    X(31,1014), XRT_MASK,      PPC,            { RA, RB } },
 { "dclz",    X(31,1014), XRT_MASK,      PPC,            { RA, RB } },
 
@@ -4320,86 +4526,104 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "stvx",    X(31, 231), X_MASK,        PPCVEC,         { VS, RA, RB } },
 { "stvxl",   X(31, 487), X_MASK,        PPCVEC,         { VS, RA, RB } },
 
-{ "lwz",     OP(32),    OP_MASK,        PPCCOM,         { RT, D, RA } },
-{ "l",       OP(32),    OP_MASK,        PWRCOM,         { RT, D, RA } },
+/* New load/store left/right index vector instructions that are in the Cell only.  */
+{ "lvlx",    X(31, 519), X_MASK,        CELL,           { VD, RA0, RB } },
+{ "lvlxl",   X(31, 775), X_MASK,        CELL,           { VD, RA0, RB } },
+{ "lvrx",    X(31, 551), X_MASK,        CELL,           { VD, RA0, RB } },
+{ "lvrxl",   X(31, 807), X_MASK,        CELL,           { VD, RA0, RB } },
+{ "stvlx",   X(31, 647), X_MASK,        CELL,           { VS, RA0, RB } },
+{ "stvlxl",  X(31, 903), X_MASK,        CELL,           { VS, RA0, RB } },
+{ "stvrx",   X(31, 679), X_MASK,        CELL,           { VS, RA0, RB } },
+{ "stvrxl",  X(31, 935), X_MASK,        CELL,           { VS, RA0, RB } },
+
+{ "lwz",     OP(32),    OP_MASK,        PPCCOM,         { RT, D, RA0 } },
+{ "l",       OP(32),    OP_MASK,        PWRCOM,         { RT, D, RA0 } },
 
 { "lwzu",    OP(33),    OP_MASK,        PPCCOM,         { RT, D, RAL } },
-{ "lu",      OP(33),    OP_MASK,        PWRCOM,         { RT, D, RA } },
+{ "lu",      OP(33),    OP_MASK,        PWRCOM,         { RT, D, RA0 } },
 
-{ "lbz",     OP(34),    OP_MASK,        COM,            { RT, D, RA } },
+{ "lbz",     OP(34),    OP_MASK,        COM,            { RT, D, RA0 } },
 
 { "lbzu",    OP(35),    OP_MASK,        COM,            { RT, D, RAL } },
 
-{ "stw",     OP(36),    OP_MASK,        PPCCOM,         { RS, D, RA } },
-{ "st",      OP(36),    OP_MASK,        PWRCOM,         { RS, D, RA } },
+{ "stw",     OP(36),    OP_MASK,        PPCCOM,         { RS, D, RA0 } },
+{ "st",      OP(36),    OP_MASK,        PWRCOM,         { RS, D, RA0 } },
 
 { "stwu",    OP(37),    OP_MASK,        PPCCOM,         { RS, D, RAS } },
-{ "stu",     OP(37),    OP_MASK,        PWRCOM,         { RS, D, RA } },
+{ "stu",     OP(37),    OP_MASK,        PWRCOM,         { RS, D, RA0 } },
 
-{ "stb",     OP(38),    OP_MASK,        COM,            { RS, D, RA } },
+{ "stb",     OP(38),    OP_MASK,        COM,            { RS, D, RA0 } },
 
 { "stbu",    OP(39),    OP_MASK,        COM,            { RS, D, RAS } },
 
-{ "lhz",     OP(40),    OP_MASK,        COM,            { RT, D, RA } },
+{ "lhz",     OP(40),    OP_MASK,        COM,            { RT, D, RA0 } },
 
 { "lhzu",    OP(41),    OP_MASK,        COM,            { RT, D, RAL } },
 
-{ "lha",     OP(42),    OP_MASK,        COM,            { RT, D, RA } },
+{ "lha",     OP(42),    OP_MASK,        COM,            { RT, D, RA0 } },
 
 { "lhau",    OP(43),    OP_MASK,        COM,            { RT, D, RAL } },
 
-{ "sth",     OP(44),    OP_MASK,        COM,            { RS, D, RA } },
+{ "sth",     OP(44),    OP_MASK,        COM,            { RS, D, RA0 } },
 
 { "sthu",    OP(45),    OP_MASK,        COM,            { RS, D, RAS } },
 
 { "lmw",     OP(46),    OP_MASK,        PPCCOM,         { RT, D, RAM } },
-{ "lm",      OP(46),    OP_MASK,        PWRCOM,         { RT, D, RA } },
+{ "lm",      OP(46),    OP_MASK,        PWRCOM,         { RT, D, RA0 } },
 
-{ "stmw",    OP(47),    OP_MASK,        PPCCOM,         { RS, D, RA } },
-{ "stm",     OP(47),    OP_MASK,        PWRCOM,         { RS, D, RA } },
+{ "stmw",    OP(47),    OP_MASK,        PPCCOM,         { RS, D, RA0 } },
+{ "stm",     OP(47),    OP_MASK,        PWRCOM,         { RS, D, RA0 } },
 
-{ "lfs",     OP(48),    OP_MASK,        COM,            { FRT, D, RA } },
+{ "lfs",     OP(48),    OP_MASK,        COM,            { FRT, D, RA0 } },
 
 { "lfsu",    OP(49),    OP_MASK,        COM,            { FRT, D, RAS } },
 
-{ "lfd",     OP(50),    OP_MASK,        COM,            { FRT, D, RA } },
+{ "lfd",     OP(50),    OP_MASK,        COM,            { FRT, D, RA0 } },
 
 { "lfdu",    OP(51),    OP_MASK,        COM,            { FRT, D, RAS } },
 
-{ "stfs",    OP(52),    OP_MASK,        COM,            { FRS, D, RA } },
+{ "stfs",    OP(52),    OP_MASK,        COM,            { FRS, D, RA0 } },
 
 { "stfsu",   OP(53),    OP_MASK,        COM,            { FRS, D, RAS } },
 
-{ "stfd",    OP(54),    OP_MASK,        COM,            { FRS, D, RA } },
+{ "stfd",    OP(54),    OP_MASK,        COM,            { FRS, D, RA0 } },
 
 { "stfdu",   OP(55),    OP_MASK,        COM,            { FRS, D, RAS } },
 
 { "lq",      OP(56),    OP_MASK,        POWER4,         { RTQ, DQ, RAQ } },
 
-{ "lfq",     OP(56),    OP_MASK,        POWER2,         { FRT, D, RA } },
+{ "lfq",     OP(56),    OP_MASK,        POWER2,         { FRT, D, RA0 } },
+
+{ "lfqu",    OP(57),    OP_MASK,        POWER2,         { FRT, D, RA0 } },
 
-{ "lfqu",    OP(57),    OP_MASK,        POWER2,         { FRT, D, RA } },
+{ "lfdp",    OP(57),    OP_MASK,        POWER6,         { FRT, D, RA0 } },
 
-{ "lbze",    DEO(58,0), DE_MASK,        BOOKE64,        { RT, DE, RA } },
+{ "lbze",    DEO(58,0), DE_MASK,        BOOKE64,        { RT, DE, RA0 } },
 { "lbzue",   DEO(58,1), DE_MASK,        BOOKE64,        { RT, DE, RAL } },
-{ "lhze",    DEO(58,2), DE_MASK,        BOOKE64,        { RT, DE, RA } },
+{ "lhze",    DEO(58,2), DE_MASK,        BOOKE64,        { RT, DE, RA0 } },
 { "lhzue",   DEO(58,3), DE_MASK,        BOOKE64,        { RT, DE, RAL } },
-{ "lhae",    DEO(58,4), DE_MASK,        BOOKE64,        { RT, DE, RA } },
+{ "lhae",    DEO(58,4), DE_MASK,        BOOKE64,        { RT, DE, RA0 } },
 { "lhaue",   DEO(58,5), DE_MASK,        BOOKE64,        { RT, DE, RAL } },
-{ "lwze",    DEO(58,6), DE_MASK,        BOOKE64,        { RT, DE, RA } },
+{ "lwze",    DEO(58,6), DE_MASK,        BOOKE64,        { RT, DE, RA0 } },
 { "lwzue",   DEO(58,7), DE_MASK,        BOOKE64,        { RT, DE, RAL } },
-{ "stbe",    DEO(58,8), DE_MASK,        BOOKE64,        { RS, DE, RA } },
+{ "stbe",    DEO(58,8), DE_MASK,        BOOKE64,        { RS, DE, RA0 } },
 { "stbue",   DEO(58,9), DE_MASK,        BOOKE64,        { RS, DE, RAS } },
-{ "sthe",    DEO(58,10), DE_MASK,       BOOKE64,        { RS, DE, RA } },
+{ "sthe",    DEO(58,10), DE_MASK,       BOOKE64,        { RS, DE, RA0 } },
 { "sthue",   DEO(58,11), DE_MASK,       BOOKE64,        { RS, DE, RAS } },
-{ "stwe",    DEO(58,14), DE_MASK,       BOOKE64,        { RS, DE, RA } },
+{ "stwe",    DEO(58,14), DE_MASK,       BOOKE64,        { RS, DE, RA0 } },
 { "stwue",   DEO(58,15), DE_MASK,       BOOKE64,        { RS, DE, RAS } },
 
-{ "ld",      DSO(58,0), DS_MASK,        PPC64,          { RT, DS, RA } },
+{ "ld",      DSO(58,0), DS_MASK,        PPC64,          { RT, DS, RA0 } },
 
 { "ldu",     DSO(58,1), DS_MASK,        PPC64,          { RT, DS, RAL } },
 
-{ "lwa",     DSO(58,2), DS_MASK,        PPC64,          { RT, DS, RA } },
+{ "lwa",     DSO(58,2), DS_MASK,        PPC64,          { RT, DS, RA0 } },
+
+{ "dadd",    XRC(59,2,0), X_MASK,       POWER6,         { FRT, FRA, FRB } },
+{ "dadd.",   XRC(59,2,1), X_MASK,       POWER6,         { FRT, FRA, FRB } },
+
+{ "dqua",    ZRC(59,3,0), Z_MASK,       POWER6,         { FRT, FRA, FRB, RMC } },
+{ "dqua.",   ZRC(59,3,1), Z_MASK,       POWER6,         { FRT, FRA, FRB, RMC } },
 
 { "fdivs",   A(59,18,0), AFRC_MASK,     PPC,            { FRT, FRA, FRB } },
 { "fdivs.",  A(59,18,1), AFRC_MASK,     PPC,            { FRT, FRA, FRB } },
@@ -4413,12 +4637,15 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "fsqrts",  A(59,22,0), AFRAFRC_MASK,  PPC,            { FRT, FRB } },
 { "fsqrts.", A(59,22,1), AFRAFRC_MASK,  PPC,            { FRT, FRB } },
 
-{ "fres",    A(59,24,0), AFRAFRC_MASK,  PPC,            { FRT, FRB } },
-{ "fres.",   A(59,24,1), AFRAFRC_MASK,  PPC,            { FRT, FRB } },
+{ "fres",    A(59,24,0), AFRALFRC_MASK, PPC,            { FRT, FRB, A_L } },
+{ "fres.",   A(59,24,1), AFRALFRC_MASK, PPC,            { FRT, FRB, A_L } },
 
 { "fmuls",   A(59,25,0), AFRB_MASK,     PPC,            { FRT, FRA, FRC } },
 { "fmuls.",  A(59,25,1), AFRB_MASK,     PPC,            { FRT, FRA, FRC } },
 
+{ "frsqrtes", A(59,26,0), AFRALFRC_MASK,POWER5,         { FRT, FRB, A_L } },
+{ "frsqrtes.",A(59,26,1), AFRALFRC_MASK,POWER5,         { FRT, FRB, A_L } },
+
 { "fmsubs",  A(59,28,0), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
 { "fmsubs.", A(59,28,1), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
 
@@ -4431,31 +4658,103 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "fnmadds", A(59,31,0), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
 { "fnmadds.",A(59,31,1), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
 
+{ "dmul",    XRC(59,34,0), X_MASK,      POWER6,         { FRT, FRA, FRB } },
+{ "dmul.",   XRC(59,34,1), X_MASK,      POWER6,         { FRT, FRA, FRB } },
+
+{ "drrnd",   ZRC(59,35,0), Z_MASK,      POWER6,         { FRT, FRA, FRB, RMC } },
+{ "drrnd.",  ZRC(59,35,1), Z_MASK,      POWER6,         { FRT, FRA, FRB, RMC } },
+
+{ "dscli",   ZRC(59,66,0), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
+{ "dscli.",  ZRC(59,66,1), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
+
+{ "dquai",   ZRC(59,67,0), Z_MASK,      POWER6,         { TE,  FRT, FRB, RMC } },
+{ "dquai.",  ZRC(59,67,1), Z_MASK,      POWER6,         { TE,  FRT, FRB, RMC } },
+
+{ "dscri",   ZRC(59,98,0), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
+{ "dscri.",  ZRC(59,98,1), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
+
+{ "drintx",  ZRC(59,99,0), Z_MASK,      POWER6,         { R, FRT, FRB, RMC } },
+{ "drintx.", ZRC(59,99,1), Z_MASK,      POWER6,         { R, FRT, FRB, RMC } },
+
+{ "dcmpo",   X(59,130),    X_MASK,      POWER6,         { BF,  FRA, FRB } },
+
+{ "dtstex",  X(59,162),    X_MASK,      POWER6,         { BF,  FRA, FRB } },
+{ "dtstdc",  Z(59,194),    Z_MASK,      POWER6,         { BF,  FRA, DCM } },
+{ "dtstdg",  Z(59,226),    Z_MASK,      POWER6,         { BF,  FRA, DGM } },
+
+{ "drintn",  ZRC(59,227,0), Z_MASK,     POWER6,         { R, FRT, FRB, RMC } },
+{ "drintn.", ZRC(59,227,1), Z_MASK,     POWER6,         { R, FRT, FRB, RMC } },
+
+{ "dctdp",   XRC(59,258,0), X_MASK,     POWER6,         { FRT, FRB } },
+{ "dctdp.",  XRC(59,258,1), X_MASK,     POWER6,         { FRT, FRB } },
+
+{ "dctfix",  XRC(59,290,0), X_MASK,     POWER6,         { FRT, FRB } },
+{ "dctfix.", XRC(59,290,1), X_MASK,     POWER6,         { FRT, FRB } },
+
+{ "ddedpd",  XRC(59,322,0), X_MASK,     POWER6,         { SP, FRT, FRB } }, 
+{ "ddedpd.", XRC(59,322,1), X_MASK,     POWER6,         { SP, FRT, FRB } }, 
+
+{ "dxex",    XRC(59,354,0), X_MASK,     POWER6,         { FRT, FRB } },
+{ "dxex.",   XRC(59,354,1), X_MASK,     POWER6,         { FRT, FRB } },
+
+{ "dsub",    XRC(59,514,0), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+{ "dsub.",   XRC(59,514,1), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+
+{ "ddiv",    XRC(59,546,0), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+{ "ddiv.",   XRC(59,546,1), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+
+{ "dcmpu",   X(59,642),     X_MASK,     POWER6,         { BF,  FRA, FRB } },
+
+{ "dtstsf",  X(59,674),    X_MASK,      POWER6,         { BF,  FRA, FRB } },
+
+{ "drsp",    XRC(59,770,0), X_MASK,     POWER6,         { FRT, FRB } },
+{ "drsp.",   XRC(59,770,1), X_MASK,     POWER6,         { FRT, FRB } },
+
+{ "dcffix",  XRC(59,802,0), X_MASK,     POWER6,         { FRT, FRB } },
+{ "dcffix.", XRC(59,802,1), X_MASK,     POWER6,         { FRT, FRB } },
+
+{ "denbcd",  XRC(59,834,0), X_MASK,     POWER6,         { S, FRT, FRB } },
+{ "denbcd.", XRC(59,834,1), X_MASK,     POWER6,         { S, FRT, FRB } },
+
+{ "diex",    XRC(59,866,0), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+{ "diex.",   XRC(59,866,1), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+
 { "stfq",    OP(60),    OP_MASK,        POWER2,         { FRS, D, RA } },
 
 { "stfqu",   OP(61),    OP_MASK,        POWER2,         { FRS, D, RA } },
 
-{ "lde",     DEO(62,0), DE_MASK,        BOOKE64,        { RT, DES, RA } },
-{ "ldue",    DEO(62,1), DE_MASK,        BOOKE64,        { RT, DES, RA } },
-{ "lfse",    DEO(62,4), DE_MASK,        BOOKE64,        { FRT, DES, RA } },
+{ "stfdp",   OP(61),    OP_MASK,        POWER6,         { FRT, D, RA0 } },
+
+{ "lde",     DEO(62,0), DE_MASK,        BOOKE64,        { RT, DES, RA0 } },
+{ "ldue",    DEO(62,1), DE_MASK,        BOOKE64,        { RT, DES, RA0 } },
+{ "lfse",    DEO(62,4), DE_MASK,        BOOKE64,        { FRT, DES, RA0 } },
 { "lfsue",   DEO(62,5), DE_MASK,        BOOKE64,        { FRT, DES, RAS } },
-{ "lfde",    DEO(62,6), DE_MASK,        BOOKE64,        { FRT, DES, RA } },
+{ "lfde",    DEO(62,6), DE_MASK,        BOOKE64,        { FRT, DES, RA0 } },
 { "lfdue",   DEO(62,7), DE_MASK,        BOOKE64,        { FRT, DES, RAS } },
-{ "stde",    DEO(62,8), DE_MASK,        BOOKE64,        { RS, DES, RA } },
+{ "stde",    DEO(62,8), DE_MASK,        BOOKE64,        { RS, DES, RA0 } },
 { "stdue",   DEO(62,9), DE_MASK,        BOOKE64,        { RS, DES, RAS } },
-{ "stfse",   DEO(62,12), DE_MASK,       BOOKE64,        { FRS, DES, RA } },
+{ "stfse",   DEO(62,12), DE_MASK,       BOOKE64,        { FRS, DES, RA0 } },
 { "stfsue",  DEO(62,13), DE_MASK,       BOOKE64,        { FRS, DES, RAS } },
-{ "stfde",   DEO(62,14), DE_MASK,       BOOKE64,        { FRS, DES, RA } },
+{ "stfde",   DEO(62,14), DE_MASK,       BOOKE64,        { FRS, DES, RA0 } },
 { "stfdue",  DEO(62,15), DE_MASK,       BOOKE64,        { FRS, DES, RAS } },
 
-{ "std",     DSO(62,0), DS_MASK,        PPC64,          { RS, DS, RA } },
+{ "std",     DSO(62,0), DS_MASK,        PPC64,          { RS, DS, RA0 } },
 
 { "stdu",    DSO(62,1), DS_MASK,        PPC64,          { RS, DS, RAS } },
 
-{ "stq",     DSO(62,2), DS_MASK,        POWER4,         { RSQ, DS, RA } },
+{ "stq",     DSO(62,2), DS_MASK,        POWER4,         { RSQ, DS, RA0 } },
 
 { "fcmpu",   X(63,0),   X_MASK|(3<<21), COM,            { BF, FRA, FRB } },
 
+{ "daddq",   XRC(63,2,0), X_MASK,       POWER6,         { FRT, FRA, FRB } },
+{ "daddq.",  XRC(63,2,1), X_MASK,       POWER6,         { FRT, FRA, FRB } },
+
+{ "dquaq",   ZRC(63,3,0), Z_MASK,       POWER6,         { FRT, FRA, FRB, RMC } },
+{ "dquaq.",  ZRC(63,3,1), Z_MASK,       POWER6,         { FRT, FRA, FRB, RMC } },
+
+{ "fcpsgn",  XRC(63,8,0), X_MASK,       POWER6,         { FRT, FRA, FRB } },
+{ "fcpsgn.", XRC(63,8,1), X_MASK,       POWER6,         { FRT, FRA, FRB } },
+
 { "frsp",    XRC(63,12,0), XRA_MASK,    COM,            { FRT, FRB } },
 { "frsp.",   XRC(63,12,1), XRA_MASK,    COM,            { FRT, FRB } },
 
@@ -4490,13 +4789,16 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "fsel",    A(63,23,0), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
 { "fsel.",   A(63,23,1), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
 
+{ "fre",     A(63,24,0), AFRALFRC_MASK, POWER5,         { FRT, FRB, A_L } },
+{ "fre.",    A(63,24,1), AFRALFRC_MASK, POWER5,         { FRT, FRB, A_L } },
+
 { "fmul",    A(63,25,0), AFRB_MASK,     PPCCOM,         { FRT, FRA, FRC } },
 { "fm",      A(63,25,0), AFRB_MASK,     PWRCOM,         { FRT, FRA, FRC } },
 { "fmul.",   A(63,25,1), AFRB_MASK,     PPCCOM,         { FRT, FRA, FRC } },
 { "fm.",     A(63,25,1), AFRB_MASK,     PWRCOM,         { FRT, FRA, FRC } },
 
-{ "frsqrte", A(63,26,0), AFRAFRC_MASK,  PPC,            { FRT, FRB } },
-{ "frsqrte.",A(63,26,1), AFRAFRC_MASK,  PPC,            { FRT, FRB } },
+{ "frsqrte", A(63,26,0), AFRALFRC_MASK, PPC,            { FRT, FRB, A_L } },
+{ "frsqrte.",A(63,26,1), AFRALFRC_MASK, PPC,            { FRT, FRB, A_L } },
 
 { "fmsub",   A(63,28,0), A_MASK,        PPCCOM,         { FRT,FRA,FRC,FRB } },
 { "fms",     A(63,28,0), A_MASK,        PWRCOM,         { FRT,FRA,FRC,FRB } },
@@ -4520,6 +4822,12 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "fcmpo",   X(63,32),  X_MASK|(3<<21), COM,            { BF, FRA, FRB } },
 
+{ "dmulq",   XRC(63,34,0), X_MASK,      POWER6,         { FRT, FRA, FRB } },
+{ "dmulq.",  XRC(63,34,1), X_MASK,      POWER6,         { FRT, FRA, FRB } },
+
+{ "drrndq",  ZRC(63,35,0), Z_MASK,      POWER6,         { FRT, FRA, FRB, RMC } },
+{ "drrndq.", ZRC(63,35,1), Z_MASK,      POWER6,         { FRT, FRA, FRB, RMC } },
+
 { "mtfsb1",  XRC(63,38,0), XRARB_MASK,  COM,            { BT } },
 { "mtfsb1.", XRC(63,38,1), XRARB_MASK,  COM,            { BT } },
 
@@ -4528,36 +4836,100 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "mcrfs",   X(63,64),  XRB_MASK|(3<<21)|(3<<16), COM,  { BF, BFA } },
 
+{ "dscliq",  ZRC(63,66,0), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
+{ "dscliq.", ZRC(63,66,1), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
+
+{ "dquaiq",  ZRC(63,67,0), Z_MASK,      POWER6,         { TE,  FRT, FRB, RMC } },
+{ "dquaiq.", ZRC(63,67,1), Z_MASK,      POWER6,         { FRT, FRA, FRB, RMC } },
+
 { "mtfsb0",  XRC(63,70,0), XRARB_MASK,  COM,            { BT } },
 { "mtfsb0.", XRC(63,70,1), XRARB_MASK,  COM,            { BT } },
 
 { "fmr",     XRC(63,72,0), XRA_MASK,    COM,            { FRT, FRB } },
 { "fmr.",    XRC(63,72,1), XRA_MASK,    COM,            { FRT, FRB } },
 
+{ "dscriq",  ZRC(63,98,0), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
+{ "dscriq.", ZRC(63,98,1), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
+
+{ "drintxq", ZRC(63,99,0), Z_MASK,      POWER6,         { R, FRT, FRB, RMC } },
+{ "drintxq.",ZRC(63,99,1), Z_MASK,      POWER6,         { R, FRT, FRB, RMC } },
+
+{ "dcmpoq",  X(63,130),    X_MASK,      POWER6,         { BF,  FRA, FRB } },
+
 { "mtfsfi",  XRC(63,134,0), XRA_MASK|(3<<21)|(1<<11), COM, { BF, U } },
 { "mtfsfi.", XRC(63,134,1), XRA_MASK|(3<<21)|(1<<11), COM, { BF, U } },
 
 { "fnabs",   XRC(63,136,0), XRA_MASK,   COM,            { FRT, FRB } },
 { "fnabs.",  XRC(63,136,1), XRA_MASK,   COM,            { FRT, FRB } },
 
+{ "dtstexq", X(63,162),     X_MASK,     POWER6,         { BF,  FRA, FRB } },
+{ "dtstdcq", Z(63,194),     Z_MASK,     POWER6,         { BF,  FRA, DCM } },
+{ "dtstdgq", Z(63,226),     Z_MASK,     POWER6,         { BF,  FRA, DGM } },
+
+{ "drintnq", ZRC(63,227,0), Z_MASK,     POWER6,         { R, FRT, FRB, RMC } },
+{ "drintnq.",ZRC(63,227,1), Z_MASK,     POWER6,         { R, FRT, FRB, RMC } },
+
+{ "dctqpq",  XRC(63,258,0), X_MASK,     POWER6,         { FRT, FRB } },
+{ "dctqpq.", XRC(63,258,1), X_MASK,     POWER6,         { FRT, FRB } },
+
 { "fabs",    XRC(63,264,0), XRA_MASK,   COM,            { FRT, FRB } },
 { "fabs.",   XRC(63,264,1), XRA_MASK,   COM,            { FRT, FRB } },
 
+{ "dctfixq", XRC(63,290,0), X_MASK,     POWER6,         { FRT, FRB } },
+{ "dctfixq.",XRC(63,290,1), X_MASK,     POWER6,         { FRT, FRB } },
+
+{ "ddedpdq", XRC(63,322,0), X_MASK,     POWER6,         { SP, FRT, FRB } },
+{ "ddedpdq.",XRC(63,322,1), X_MASK,     POWER6,         { SP, FRT, FRB } },
+
+{ "dxexq",   XRC(63,354,0), X_MASK,     POWER6,         { FRT, FRB } },
+{ "dxexq.",  XRC(63,354,1), X_MASK,     POWER6,         { FRT, FRB } },
+
+{ "frin",    XRC(63,392,0), XRA_MASK,   POWER5,         { FRT, FRB } },
+{ "frin.",   XRC(63,392,1), XRA_MASK,   POWER5,         { FRT, FRB } },
+{ "friz",    XRC(63,424,0), XRA_MASK,   POWER5,         { FRT, FRB } },
+{ "friz.",   XRC(63,424,1), XRA_MASK,   POWER5,         { FRT, FRB } },
+{ "frip",    XRC(63,456,0), XRA_MASK,   POWER5,         { FRT, FRB } },
+{ "frip.",   XRC(63,456,1), XRA_MASK,   POWER5,         { FRT, FRB } },
+{ "frim",    XRC(63,488,0), XRA_MASK,   POWER5,         { FRT, FRB } },
+{ "frim.",   XRC(63,488,1), XRA_MASK,   POWER5,         { FRT, FRB } },
+
+{ "dsubq",   XRC(63,514,0), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+{ "dsubq.",  XRC(63,514,1), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+
+{ "ddivq",   XRC(63,546,0), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+{ "ddivq.",  XRC(63,546,1), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+
 { "mffs",    XRC(63,583,0), XRARB_MASK, COM,            { FRT } },
 { "mffs.",   XRC(63,583,1), XRARB_MASK, COM,            { FRT } },
 
+{ "dcmpuq",  X(63,642),     X_MASK,     POWER6,         { BF,  FRA, FRB } },
+
+{ "dtstsfq", X(63,674),     X_MASK,     POWER6,         { BF,  FRA, FRB } },
+
 { "mtfsf",   XFL(63,711,0), XFL_MASK,   COM,            { FLM, FRB } },
 { "mtfsf.",  XFL(63,711,1), XFL_MASK,   COM,            { FLM, FRB } },
 
+{ "drdpq",   XRC(63,770,0), X_MASK,     POWER6,         { FRT, FRB } },
+{ "drdpq.",  XRC(63,770,1), X_MASK,     POWER6,         { FRT, FRB } },
+
+{ "dcffixq", XRC(63,802,0), X_MASK,     POWER6,         { FRT, FRB } },
+{ "dcffixq.",XRC(63,802,1), X_MASK,     POWER6,         { FRT, FRB } },
+
 { "fctid",   XRC(63,814,0), XRA_MASK,   PPC64,          { FRT, FRB } },
 { "fctid.",  XRC(63,814,1), XRA_MASK,   PPC64,          { FRT, FRB } },
 
 { "fctidz",  XRC(63,815,0), XRA_MASK,   PPC64,          { FRT, FRB } },
 { "fctidz.", XRC(63,815,1), XRA_MASK,   PPC64,          { FRT, FRB } },
 
+{ "denbcdq", XRC(63,834,0), X_MASK,     POWER6,         { S, FRT, FRB } },
+{ "denbcdq.",XRC(63,834,1), X_MASK,     POWER6,         { S, FRT, FRB } },
+
 { "fcfid",   XRC(63,846,0), XRA_MASK,   PPC64,          { FRT, FRB } },
 { "fcfid.",  XRC(63,846,1), XRA_MASK,   PPC64,          { FRT, FRB } },
 
+{ "diexq",   XRC(63,866,0), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+{ "diexq.",  XRC(63,866,1), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+
 };
 
 const int powerpc_num_opcodes =
diff --git a/arch/powerpc/xmon/ppc.h b/arch/powerpc/xmon/ppc.h
index 342237e8dd69..110df96354b4 100644
--- a/arch/powerpc/xmon/ppc.h
+++ b/arch/powerpc/xmon/ppc.h
@@ -1,5 +1,5 @@
 /* ppc.h -- Header file for PowerPC opcode table
-   Copyright 1994, 1995, 1999, 2000, 2001, 2002, 2003
+   Copyright 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support
 
@@ -17,7 +17,7 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef PPC_H
 #define PPC_H
@@ -134,6 +134,18 @@ extern const int powerpc_num_opcodes;
 /* Opcode is supported by machine check APU.  */
 #define PPC_OPCODE_RFMCI          0x800000
 
+/* Opcode is only supported by Power5 architecture.  */
+#define PPC_OPCODE_POWER5        0x1000000
+
+/* Opcode is supported by PowerPC e300 family.  */
+#define PPC_OPCODE_E300          0x2000000
+
+/* Opcode is only supported by Power6 architecture.  */
+#define PPC_OPCODE_POWER6        0x4000000
+
+/* Opcode is only supported by PowerPC Cell family.  */
+#define PPC_OPCODE_CELL          0x8000000
+
 /* A macro to extract the major opcode from an instruction.  */
 #define PPC_OP(i) (((i) >> 26) & 0x3f)
 
@@ -233,25 +245,28 @@ extern const struct powerpc_operand powerpc_operands[];
    register names with a leading 'r'.  */
 #define PPC_OPERAND_GPR (040)
 
+/* Like PPC_OPERAND_GPR, but don't print a leading 'r' for r0.  */
+#define PPC_OPERAND_GPR_0 (0100)
+
 /* This operand names a floating point register.  The disassembler
    prints these with a leading 'f'.  */
-#define PPC_OPERAND_FPR (0100)
+#define PPC_OPERAND_FPR (0200)
 
 /* This operand is a relative branch displacement.  The disassembler
    prints these symbolically if possible.  */
-#define PPC_OPERAND_RELATIVE (0200)
+#define PPC_OPERAND_RELATIVE (0400)
 
 /* This operand is an absolute branch address.  The disassembler
    prints these symbolically if possible.  */
-#define PPC_OPERAND_ABSOLUTE (0400)
+#define PPC_OPERAND_ABSOLUTE (01000)
 
 /* This operand is optional, and is zero if omitted.  This is used for
-   the optional BF and L fields in the comparison instructions.  The
+   example, in the optional BF field in the comparison instructions.  The
    assembler must count the number of operands remaining on the line,
    and the number of operands remaining for the opcode, and decide
    whether this operand is present or not.  The disassembler should
    print this operand out only if it is not zero.  */
-#define PPC_OPERAND_OPTIONAL (01000)
+#define PPC_OPERAND_OPTIONAL (02000)
 
 /* This flag is only used with PPC_OPERAND_OPTIONAL.  If this operand
    is omitted, then for the next operand use this operand value plus
@@ -259,24 +274,24 @@ extern const struct powerpc_operand powerpc_operands[];
    hack is needed because the Power rotate instructions can take
    either 4 or 5 operands.  The disassembler should print this operand
    out regardless of the PPC_OPERAND_OPTIONAL field.  */
-#define PPC_OPERAND_NEXT (02000)
+#define PPC_OPERAND_NEXT (04000)
 
 /* This operand should be regarded as a negative number for the
    purposes of overflow checking (i.e., the normal most negative
    number is disallowed and one more than the normal most positive
    number is allowed).  This flag will only be set for a signed
    operand.  */
-#define PPC_OPERAND_NEGATIVE (04000)
+#define PPC_OPERAND_NEGATIVE (010000)
 
 /* This operand names a vector unit register.  The disassembler
    prints these with a leading 'v'.  */
-#define PPC_OPERAND_VR (010000)
+#define PPC_OPERAND_VR (020000)
 
 /* This operand is for the DS field in a DS form instruction.  */
-#define PPC_OPERAND_DS (020000)
+#define PPC_OPERAND_DS (040000)
 
 /* This operand is for the DQ field in a DQ form instruction.  */
-#define PPC_OPERAND_DQ (040000)
+#define PPC_OPERAND_DQ (0100000)
 
 /* The POWER and PowerPC assemblers use a few macros.  We keep them
    with the operands table for simplicity.  The macro table is an
diff --git a/arch/powerpc/xmon/spu-dis.c b/arch/powerpc/xmon/spu-dis.c
new file mode 100644
index 000000000000..ee929c641bf3
--- /dev/null
+++ b/arch/powerpc/xmon/spu-dis.c
@@ -0,0 +1,248 @@
+/* Disassemble SPU instructions
+
+   Copyright 2006 Free Software Foundation, Inc.
+
+   This file is part of GDB, GAS, and the GNU binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include <linux/string.h>
+#include "nonstdio.h"
+#include "ansidecl.h"
+#include "spu.h"
+#include "dis-asm.h"
+
+/* This file provides a disassembler function which uses
+   the disassembler interface defined in dis-asm.h.   */
+
+extern const struct spu_opcode spu_opcodes[];
+extern const int spu_num_opcodes;
+
+#define SPU_DISASM_TBL_SIZE (1 << 11)
+static const struct spu_opcode *spu_disassemble_table[SPU_DISASM_TBL_SIZE];
+
+static void
+init_spu_disassemble (void)
+{
+  int i;
+
+  /* If two instructions have the same opcode then we prefer the first
+   * one.  In most cases it is just an alternate mnemonic. */
+  for (i = 0; i < spu_num_opcodes; i++)
+    {
+      int o = spu_opcodes[i].opcode;
+      if (o >= SPU_DISASM_TBL_SIZE)
+        continue; /* abort (); */
+      if (spu_disassemble_table[o] == 0)
+        spu_disassemble_table[o] = &spu_opcodes[i];
+    }
+}
+
+/* Determine the instruction from the 10 least significant bits. */
+static const struct spu_opcode *
+get_index_for_opcode (unsigned int insn)
+{
+  const struct spu_opcode *index;
+  unsigned int opcode = insn >> (32-11);
+
+  /* Init the table.  This assumes that element 0/opcode 0 (currently
+   * NOP) is always used */
+  if (spu_disassemble_table[0] == 0)
+    init_spu_disassemble ();
+
+  if ((index = spu_disassemble_table[opcode & 0x780]) != 0
+      && index->insn_type == RRR)
+    return index;
+
+  if ((index = spu_disassemble_table[opcode & 0x7f0]) != 0
+      && (index->insn_type == RI18 || index->insn_type == LBT))
+    return index;
+
+  if ((index = spu_disassemble_table[opcode & 0x7f8]) != 0
+      && index->insn_type == RI10)
+    return index;
+
+  if ((index = spu_disassemble_table[opcode & 0x7fc]) != 0
+      && (index->insn_type == RI16))
+    return index;
+
+  if ((index = spu_disassemble_table[opcode & 0x7fe]) != 0
+      && (index->insn_type == RI8))
+    return index;
+
+  if ((index = spu_disassemble_table[opcode & 0x7ff]) != 0)
+    return index;
+
+  return 0;
+}
+
+/* Print a Spu instruction.  */
+
+int
+print_insn_spu (unsigned long insn, unsigned long memaddr)
+{
+  int value;
+  int hex_value;
+  const struct spu_opcode *index;
+  enum spu_insns tag;
+
+  index = get_index_for_opcode (insn);
+
+  if (index == 0)
+    {
+      printf(".long 0x%x", insn);
+    }
+  else
+    {
+      int i;
+      int paren = 0;
+      tag = (enum spu_insns)(index - spu_opcodes);
+      printf("%s", index->mnemonic);
+      if (tag == M_BI || tag == M_BISL || tag == M_IRET || tag == M_BISLED
+          || tag == M_BIHNZ || tag == M_BIHZ || tag == M_BINZ || tag == M_BIZ
+          || tag == M_SYNC || tag == M_HBR)
+        {
+          int fb = (insn >> (32-18)) & 0x7f;
+          if (fb & 0x40)
+            printf(tag == M_SYNC ? "c" : "p");
+          if (fb & 0x20)
+            printf("d");
+          if (fb & 0x10)
+            printf("e");
+        }
+      if (index->arg[0] != 0)
+        printf("\t");
+      hex_value = 0;
+      for (i = 1;  i <= index->arg[0]; i++)
+        {
+          int arg = index->arg[i];
+          if (arg != A_P && !paren && i > 1)
+            printf(",");
+
+          switch (arg)
+            {
+            case A_T:
+              printf("$%d",
+                                     DECODE_INSN_RT (insn));
+              break;
+            case A_A:
+              printf("$%d",
+                                     DECODE_INSN_RA (insn));
+              break;
+            case A_B:
+              printf("$%d",
+                                     DECODE_INSN_RB (insn));
+              break;
+            case A_C:
+              printf("$%d",
+                                     DECODE_INSN_RC (insn));
+              break;
+            case A_S:
+              printf("$sp%d",
+                                     DECODE_INSN_RA (insn));
+              break;
+            case A_H:
+              printf("$ch%d",
+                                     DECODE_INSN_RA (insn));
+              break;
+            case A_P:
+              paren++;
+              printf("(");
+              break;
+            case A_U7A:
+              printf("%d",
+                                     173 - DECODE_INSN_U8 (insn));
+              break;
+            case A_U7B:
+              printf("%d",
+                                     155 - DECODE_INSN_U8 (insn));
+              break;
+            case A_S3:
+            case A_S6:
+            case A_S7:
+            case A_S7N:
+            case A_U3:
+            case A_U5:
+            case A_U6:
+            case A_U7:
+              hex_value = DECODE_INSN_I7 (insn);
+              printf("%d", hex_value);
+              break;
+            case A_S11:
+              print_address(memaddr + DECODE_INSN_I9a (insn) * 4);
+              break;
+            case A_S11I:
+              print_address(memaddr + DECODE_INSN_I9b (insn) * 4);
+              break;
+            case A_S10:
+            case A_S10B:
+              hex_value = DECODE_INSN_I10 (insn);
+              printf("%d", hex_value);
+              break;
+            case A_S14:
+              hex_value = DECODE_INSN_I10 (insn) * 16;
+              printf("%d", hex_value);
+              break;
+            case A_S16:
+              hex_value = DECODE_INSN_I16 (insn);
+              printf("%d", hex_value);
+              break;
+            case A_X16:
+              hex_value = DECODE_INSN_U16 (insn);
+              printf("%u", hex_value);
+              break;
+            case A_R18:
+              value = DECODE_INSN_I16 (insn) * 4;
+              if (value == 0)
+                printf("%d", value);
+              else
+                {
+                  hex_value = memaddr + value;
+                  print_address(hex_value & 0x3ffff);
+                }
+              break;
+            case A_S18:
+              value = DECODE_INSN_U16 (insn) * 4;
+              if (value == 0)
+                printf("%d", value);
+              else
+                print_address(value);
+              break;
+            case A_U18:
+              value = DECODE_INSN_U18 (insn);
+              if (value == 0 || 1)
+                {
+                  hex_value = value;
+                  printf("%u", value);
+                }
+              else
+                print_address(value);
+              break;
+            case A_U14:
+              hex_value = DECODE_INSN_U14 (insn);
+              printf("%u", hex_value);
+              break;
+            }
+          if (arg != A_P && paren)
+            {
+              printf(")");
+              paren--;
+            }
+        }
+      if (hex_value > 16)
+        printf("\t# %x", hex_value);
+    }
+  return 4;
+}
diff --git a/arch/powerpc/xmon/spu-insns.h b/arch/powerpc/xmon/spu-insns.h
new file mode 100644
index 000000000000..99dc452821ac
--- /dev/null
+++ b/arch/powerpc/xmon/spu-insns.h
@@ -0,0 +1,410 @@
+/* SPU ELF support for BFD.
+
+   Copyright 2006 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* SPU Opcode Table
+
+-=-=-= FORMAT =-=-=-
+                                                                                                     
+       +----+-------+-------+-------+-------+                  +------------+-------+-------+-------+
+RRR    | op |  RC   |  RB   |  RA   |  RT   |           RI7    | op         |  I7   |  RA   |  RT   |
+       +----+-------+-------+-------+-------+                  +------------+-------+-------+-------+
+        0  3       1       1       2       3                    0          1       1       2       3 
+                   0       7       4       1                               0       7       4       1 
+
+       +-----------+--------+-------+-------+                  +---------+----------+-------+-------+
+RI8    | op        |   I8   |  RA   |  RT   |           RI10   | op      |   I10    |  RA   |  RT   |
+       +-----------+--------+-------+-------+                  +---------+----------+-------+-------+
+        0         9        1       2       3                    0       7          1       2       3 
+                           7       4       1                                       7       4       1 
+
+       +----------+-----------------+-------+                  +--------+-------------------+-------+
+RI16   | op       |       I16       |  RT   |           RI18   | op     |       I18         |  RT   |
+       +----------+-----------------+-------+                  +--------+-------------------+-------+
+        0        8                 2       3                    0      6                   2       3 
+                                   4       1                                               4       1 
+
+       +------------+-------+-------+-------+                  +-------+--+-----------------+-------+
+RR     | op         |  RB   |  RA   |  RT   |           LBT    | op    |RO|       I16       |  RO   |
+       +------------+-------+-------+-------+                  +-------+--+-----------------+-------+
+        0          1       1       2       3                    0     6  8                 2       3 
+                   0       7       4       1                                               4       1 
+
+                                                               +------------+----+--+-------+-------+
+                                                        LBTI   | op         | // |RO|  RA   |  RO   |
+                                                               +------------+----+--+-------+-------+
+                                                                0          1    1  1       2       3
+                                                                           0    5  7       4       1
+
+-=-=-= OPCODE =-=-=-
+
+OPCODE field specifies the most significant 11bit of the instruction. Some formats don't have 11bits for opcode field, and in this
+case, bit field other than op are defined as 0s. For example, opcode of fma instruction which is RRR format is defined as 0x700,
+since 0x700 -> 11'b11100000000, this means opcode is 4'b1110, and other 7bits are defined as 7'b0000000.
+
+-=-=-= ASM_FORMAT =-=-=-
+
+RRR category                                            RI7 category                               
+        ASM_RRR         mnemonic RC, RA, RB, RT                 ASM_RI4         mnemonic RT, RA, I4
+                                                                ASM_RI7         mnemonic RT, RA, I7
+
+RI8 category                                            RI10 category                               
+        ASM_RUI8        mnemonic RT, RA, UI8                    ASM_AI10        mnemonic RA, I10    
+                                                                ASM_RI10        mnemonic RT, RA, R10
+                                                                ASM_RI10IDX     mnemonic RT, I10(RA)
+
+RI16 category                                           RI18 category                           
+        ASM_I16W        mnemonic I16W                           ASM_RI18        mnemonic RT, I18
+        ASM_RI16        mnemonic RT, I16
+        ASM_RI16W       mnemonic RT, I16W
+
+RR category                                             LBT category                                    
+        ASM_MFSPR       mnemonic RT, SA                         ASM_LBT         mnemonic brinst, brtarg 
+        ASM_MTSPR       mnemonic SA, RT                                                                 
+        ASM_NOOP        mnemonic                        LBTI category                                   
+        ASM_RA          mnemonic RA                             ASM_LBTI        mnemonic brinst, RA     
+        ASM_RAB         mnemonic RA, RB
+        ASM_RDCH        mnemonic RT, CA
+        ASM_RR          mnemonic RT, RA, RB
+        ASM_RT          mnemonic RT
+        ASM_RTA         mnemonic RT, RA
+        ASM_WRCH        mnemonic CA, RT
+
+Note that RRR instructions have the names for RC and RT reversed from
+what's in the ISA, in order to put RT in the same position it appears
+for other formats.
+
+-=-=-= DEPENDENCY =-=-=-
+
+DEPENDENCY filed consists of 5 digits. This represents which register is used as source and which register is used as target.
+The first(most significant) digit is always 0. Then it is followd by RC, RB, RA and RT digits.
+If the digit is 0, this means the corresponding register is not used in the instruction.
+If the digit is 1, this means the corresponding register is used as a source in the instruction.
+If the digit is 2, this means the corresponding register is used as a target in the instruction.
+If the digit is 3, this means the corresponding register is used as both source and target in the instruction.
+For example, fms instruction has 00113 as the DEPENDENCY field. This means RC is not used in this operation, RB and RA are
+used as sources and RT is the target.
+
+-=-=-= PIPE =-=-=-
+
+This field shows which execution pipe is used for the instruction
+
+pipe0 execution pipelines:
+        FP6     SP floating pipeline
+        FP7     integer operations executed in SP floating pipeline
+        FPD     DP floating pipeline
+        FX2     FXU pipeline
+        FX3     Rotate/Shift pipeline
+        FXB     Byte pipeline
+        NOP     No pipeline
+
+pipe1 execution pipelines:
+        BR      Branch pipeline
+        LNOP    No pipeline
+        LS      Load/Store pipeline
+        SHUF    Shuffle pipeline
+        SPR     SPR/CH pipeline
+
+*/
+
+#define _A0() {0}
+#define _A1(a) {1,a}
+#define _A2(a,b) {2,a,b}
+#define _A3(a,b,c) {3,a,b,c}
+#define _A4(a,b,c,d) {4,a,b,c,d}
+
+/*    TAG               FORMAT  OPCODE  MNEMONIC        ASM_FORMAT      DEPENDENCY      PIPE    COMMENT                         */
+/*                                                                      0[RC][RB][RA][RT]                                       */
+/*                                                                      1:src, 2:target                                         */
+
+APUOP(M_BR,             RI16,   0x190,  "br",           _A1(A_R18),     00000,  BR)     /* BRel          IP<-IP+I16 */
+APUOP(M_BRSL,           RI16,   0x198,  "brsl",         _A2(A_T,A_R18), 00002,  BR)     /* BRelSetLink   RT,IP<-IP,IP+I16 */
+APUOP(M_BRA,            RI16,   0x180,  "bra",          _A1(A_S18),     00000,  BR)     /* BRAbs         IP<-I16 */
+APUOP(M_BRASL,          RI16,   0x188,  "brasl",        _A2(A_T,A_S18), 00002,  BR)     /* BRAbsSetLink  RT,IP<-IP,I16 */
+APUOP(M_FSMBI,          RI16,   0x194,  "fsmbi",        _A2(A_T,A_X16), 00002,  SHUF)   /* FormSelMask%I RT<-fsm(I16) */
+APUOP(M_LQA,            RI16,   0x184,  "lqa",          _A2(A_T,A_S18), 00002,  LS)     /* LoadQAbs      RT<-M[I16] */
+APUOP(M_LQR,            RI16,   0x19C,  "lqr",          _A2(A_T,A_R18), 00002,  LS)     /* LoadQRel      RT<-M[IP+I16] */
+APUOP(M_STOP,           RR,     0x000,  "stop",         _A0(),          00000,  BR)     /* STOP          stop */
+APUOP(M_STOP2,          RR,     0x000,  "stop",         _A1(A_U14),     00000,  BR)     /* STOP          stop */
+APUOP(M_STOPD,          RR,     0x140,  "stopd",        _A3(A_T,A_A,A_B),         00111,        BR)     /* STOPD         stop (with register dependencies) */
+APUOP(M_LNOP,           RR,     0x001,  "lnop",         _A0(),          00000,  LNOP)   /* LNOP          no_operation */
+APUOP(M_SYNC,           RR,     0x002,  "sync",         _A0(),          00000,  BR)     /* SYNC          flush_pipe */
+APUOP(M_DSYNC,          RR,     0x003,  "dsync",        _A0(),          00000,  BR)     /* DSYNC         flush_store_queue */
+APUOP(M_MFSPR,          RR,     0x00c,  "mfspr",        _A2(A_T,A_S),   00002,  SPR)    /* MFSPR         RT<-SA */
+APUOP(M_RDCH,           RR,     0x00d,  "rdch",         _A2(A_T,A_H),   00002,  SPR)    /* ReaDCHannel   RT<-CA:data */
+APUOP(M_RCHCNT,         RR,     0x00f,  "rchcnt",       _A2(A_T,A_H),   00002,  SPR)    /* ReaDCHanCouNT RT<-CA:count */
+APUOP(M_HBRA,           LBT,    0x080,  "hbra",         _A2(A_S11,A_S18),       00000,  LS)     /* HBRA          BTB[B9]<-M[I16] */
+APUOP(M_HBRR,           LBT,    0x090,  "hbrr",         _A2(A_S11,A_R18),       00000,  LS)     /* HBRR          BTB[B9]<-M[IP+I16] */
+APUOP(M_BRZ,            RI16,   0x100,  "brz",          _A2(A_T,A_R18), 00001,  BR)     /* BRZ           IP<-IP+I16_if(RT) */
+APUOP(M_BRNZ,           RI16,   0x108,  "brnz",         _A2(A_T,A_R18), 00001,  BR)     /* BRNZ          IP<-IP+I16_if(RT) */
+APUOP(M_BRHZ,           RI16,   0x110,  "brhz",         _A2(A_T,A_R18), 00001,  BR)     /* BRHZ          IP<-IP+I16_if(RT) */
+APUOP(M_BRHNZ,          RI16,   0x118,  "brhnz",        _A2(A_T,A_R18), 00001,  BR)     /* BRHNZ         IP<-IP+I16_if(RT) */
+APUOP(M_STQA,           RI16,   0x104,  "stqa",         _A2(A_T,A_S18), 00001,  LS)     /* SToreQAbs     M[I16]<-RT */
+APUOP(M_STQR,           RI16,   0x11C,  "stqr",         _A2(A_T,A_R18), 00001,  LS)     /* SToreQRel     M[IP+I16]<-RT */
+APUOP(M_MTSPR,          RR,     0x10c,  "mtspr",        _A2(A_S,A_T),   00001,  SPR)    /* MTSPR         SA<-RT */
+APUOP(M_WRCH,           RR,     0x10d,  "wrch",         _A2(A_H,A_T),   00001,  SPR)    /* ChanWRite     CA<-RT */
+APUOP(M_LQD,            RI10,   0x1a0,  "lqd",          _A4(A_T,A_S14,A_P,A_A), 00012,  LS)     /* LoadQDisp     RT<-M[Ra+I10] */
+APUOP(M_BI,             RR,     0x1a8,  "bi",           _A1(A_A),               00010,  BR)     /* BI            IP<-RA */
+APUOP(M_BISL,           RR,     0x1a9,  "bisl",         _A2(A_T,A_A),   00012,  BR)     /* BISL          RT,IP<-IP,RA */
+APUOP(M_IRET,           RR,     0x1aa,  "iret",         _A1(A_A),       00010,  BR)     /* IRET          IP<-SRR0 */
+APUOP(M_IRET2,          RR,     0x1aa,  "iret",         _A0(),          00010,  BR)     /* IRET          IP<-SRR0 */
+APUOP(M_BISLED,         RR,     0x1ab,  "bisled",       _A2(A_T,A_A),   00012,  BR)     /* BISLED        RT,IP<-IP,RA_if(ext) */
+APUOP(M_HBR,            LBTI,   0x1ac,  "hbr",          _A2(A_S11I,A_A),        00010,  LS)     /* HBR           BTB[B9]<-M[Ra] */
+APUOP(M_FREST,          RR,     0x1b8,  "frest",        _A2(A_T,A_A),   00012,  SHUF)   /* FREST         RT<-recip(RA) */
+APUOP(M_FRSQEST,        RR,     0x1b9,  "frsqest",      _A2(A_T,A_A),   00012,  SHUF)   /* FRSQEST       RT<-rsqrt(RA) */
+APUOP(M_FSM,            RR,     0x1b4,  "fsm",          _A2(A_T,A_A),   00012,  SHUF)   /* FormSelMask%  RT<-expand(Ra) */
+APUOP(M_FSMH,           RR,     0x1b5,  "fsmh",         _A2(A_T,A_A),   00012,  SHUF)   /* FormSelMask%  RT<-expand(Ra) */
+APUOP(M_FSMB,           RR,     0x1b6,  "fsmb",         _A2(A_T,A_A),   00012,  SHUF)   /* FormSelMask%  RT<-expand(Ra) */
+APUOP(M_GB,             RR,     0x1b0,  "gb",           _A2(A_T,A_A),   00012,  SHUF)   /* GatherBits%   RT<-gather(RA) */
+APUOP(M_GBH,            RR,     0x1b1,  "gbh",          _A2(A_T,A_A),   00012,  SHUF)   /* GatherBits%   RT<-gather(RA) */
+APUOP(M_GBB,            RR,     0x1b2,  "gbb",          _A2(A_T,A_A),   00012,  SHUF)   /* GatherBits%   RT<-gather(RA) */
+APUOP(M_CBD,            RI7,    0x1f4,  "cbd",          _A4(A_T,A_U7,A_P,A_A),  00012,  SHUF)   /* genCtl%%insD  RT<-sta(Ra+I4,siz) */
+APUOP(M_CHD,            RI7,    0x1f5,  "chd",          _A4(A_T,A_U7,A_P,A_A),  00012,  SHUF)   /* genCtl%%insD  RT<-sta(Ra+I4,siz) */
+APUOP(M_CWD,            RI7,    0x1f6,  "cwd",          _A4(A_T,A_U7,A_P,A_A),  00012,  SHUF)   /* genCtl%%insD  RT<-sta(Ra+I4,siz) */
+APUOP(M_CDD,            RI7,    0x1f7,  "cdd",          _A4(A_T,A_U7,A_P,A_A),  00012,  SHUF)   /* genCtl%%insD  RT<-sta(Ra+I4,siz) */
+APUOP(M_ROTQBII,        RI7,    0x1f8,  "rotqbii",      _A3(A_T,A_A,A_U3),      00012,  SHUF)   /* ROTQBII       RT<-RA<<<I7 */
+APUOP(M_ROTQBYI,        RI7,    0x1fc,  "rotqbyi",      _A3(A_T,A_A,A_S7N),     00012,  SHUF)   /* ROTQBYI       RT<-RA<<<(I7*8) */
+APUOP(M_ROTQMBII,       RI7,    0x1f9,  "rotqmbii",     _A3(A_T,A_A,A_S3),      00012,  SHUF)   /* ROTQMBII      RT<-RA<<I7 */
+APUOP(M_ROTQMBYI,       RI7,    0x1fd,  "rotqmbyi",     _A3(A_T,A_A,A_S6),      00012,  SHUF)   /* ROTQMBYI      RT<-RA<<I7 */
+APUOP(M_SHLQBII,        RI7,    0x1fb,  "shlqbii",      _A3(A_T,A_A,A_U3),      00012,  SHUF)   /* SHLQBII       RT<-RA<<I7 */
+APUOP(M_SHLQBYI,        RI7,    0x1ff,  "shlqbyi",      _A3(A_T,A_A,A_U5),      00012,  SHUF)   /* SHLQBYI       RT<-RA<<I7 */
+APUOP(M_STQD,           RI10,   0x120,  "stqd",         _A4(A_T,A_S14,A_P,A_A), 00011,  LS)     /* SToreQDisp    M[Ra+I10]<-RT */
+APUOP(M_BIHNZ,          RR,     0x12b,  "bihnz",        _A2(A_T,A_A),   00011,  BR)     /* BIHNZ         IP<-RA_if(RT) */
+APUOP(M_BIHZ,           RR,     0x12a,  "bihz",         _A2(A_T,A_A),   00011,  BR)     /* BIHZ          IP<-RA_if(RT) */
+APUOP(M_BINZ,           RR,     0x129,  "binz",         _A2(A_T,A_A),   00011,  BR)     /* BINZ          IP<-RA_if(RT) */
+APUOP(M_BIZ,            RR,     0x128,  "biz",          _A2(A_T,A_A),   00011,  BR)     /* BIZ           IP<-RA_if(RT) */
+APUOP(M_CBX,            RR,     0x1d4,  "cbx",          _A3(A_T,A_A,A_B),               00112,  SHUF)   /* genCtl%%insX  RT<-sta(Ra+Rb,siz) */
+APUOP(M_CHX,            RR,     0x1d5,  "chx",          _A3(A_T,A_A,A_B),               00112,  SHUF)   /* genCtl%%insX  RT<-sta(Ra+Rb,siz) */
+APUOP(M_CWX,            RR,     0x1d6,  "cwx",          _A3(A_T,A_A,A_B),               00112,  SHUF)   /* genCtl%%insX  RT<-sta(Ra+Rb,siz) */
+APUOP(M_CDX,            RR,     0x1d7,  "cdx",          _A3(A_T,A_A,A_B),               00112,  SHUF)   /* genCtl%%insX  RT<-sta(Ra+Rb,siz) */
+APUOP(M_LQX,            RR,     0x1c4,  "lqx",          _A3(A_T,A_A,A_B),               00112,  LS)     /* LoadQindeX    RT<-M[Ra+Rb] */
+APUOP(M_ROTQBI,         RR,     0x1d8,  "rotqbi",       _A3(A_T,A_A,A_B),               00112,  SHUF)   /* ROTQBI        RT<-RA<<<Rb */
+APUOP(M_ROTQMBI,        RR,     0x1d9,  "rotqmbi",      _A3(A_T,A_A,A_B),               00112,  SHUF)   /* ROTQMBI       RT<-RA<<Rb */
+APUOP(M_SHLQBI,         RR,     0x1db,  "shlqbi",       _A3(A_T,A_A,A_B),               00112,  SHUF)   /* SHLQBI        RT<-RA<<Rb */
+APUOP(M_ROTQBY,         RR,     0x1dc,  "rotqby",       _A3(A_T,A_A,A_B),               00112,          SHUF)   /* ROTQBY        RT<-RA<<<(Rb*8) */
+APUOP(M_ROTQMBY,        RR,     0x1dd,  "rotqmby",      _A3(A_T,A_A,A_B),               00112,          SHUF)   /* ROTQMBY       RT<-RA<<Rb */
+APUOP(M_SHLQBY,         RR,     0x1df,  "shlqby",       _A3(A_T,A_A,A_B),               00112,  SHUF)   /* SHLQBY        RT<-RA<<Rb */
+APUOP(M_ROTQBYBI,       RR,     0x1cc,  "rotqbybi",     _A3(A_T,A_A,A_B),               00112,          SHUF)   /* ROTQBYBI      RT<-RA<<Rb */
+APUOP(M_ROTQMBYBI,      RR,     0x1cd,  "rotqmbybi",    _A3(A_T,A_A,A_B),               00112,          SHUF)   /* ROTQMBYBI     RT<-RA<<Rb */
+APUOP(M_SHLQBYBI,       RR,     0x1cf,  "shlqbybi",     _A3(A_T,A_A,A_B),               00112,  SHUF)   /* SHLQBYBI      RT<-RA<<Rb */
+APUOP(M_STQX,           RR,     0x144,  "stqx",         _A3(A_T,A_A,A_B),               00111,  LS)     /* SToreQindeX   M[Ra+Rb]<-RT */
+APUOP(M_SHUFB,          RRR,    0x580,  "shufb",        _A4(A_C,A_A,A_B,A_T),   02111,  SHUF)   /* SHUFfleBytes  RC<-f(RA,RB,RT) */
+APUOP(M_IL,             RI16,   0x204,  "il",           _A2(A_T,A_S16), 00002,  FX2)    /* ImmLoad       RT<-sxt(I16) */
+APUOP(M_ILH,            RI16,   0x20c,  "ilh",          _A2(A_T,A_X16), 00002,  FX2)    /* ImmLoadH      RT<-I16 */
+APUOP(M_ILHU,           RI16,   0x208,  "ilhu",         _A2(A_T,A_X16), 00002,  FX2)    /* ImmLoadHUpper RT<-I16<<16 */
+APUOP(M_ILA,            RI18,   0x210,  "ila",          _A2(A_T,A_U18), 00002,  FX2)    /* ImmLoadAddr   RT<-zxt(I18) */
+APUOP(M_NOP,            RR,     0x201,  "nop",          _A1(A_T),               00000,  NOP)    /* XNOP          no_operation */
+APUOP(M_NOP2,           RR,     0x201,  "nop",          _A0(),          00000,  NOP)    /* XNOP          no_operation */
+APUOP(M_IOHL,           RI16,   0x304,  "iohl",         _A2(A_T,A_X16), 00003,  FX2)    /* AddImmeXt     RT<-RT+sxt(I16) */
+APUOP(M_ANDBI,          RI10,   0x0b0,  "andbi",        _A3(A_T,A_A,A_S10B),    00012,  FX2)    /* AND%I         RT<-RA&I10 */
+APUOP(M_ANDHI,          RI10,   0x0a8,  "andhi",        _A3(A_T,A_A,A_S10),     00012,  FX2)    /* AND%I         RT<-RA&I10 */
+APUOP(M_ANDI,           RI10,   0x0a0,  "andi",         _A3(A_T,A_A,A_S10),     00012,  FX2)    /* AND%I         RT<-RA&I10 */
+APUOP(M_ORBI,           RI10,   0x030,  "orbi",         _A3(A_T,A_A,A_S10B),    00012,  FX2)    /* OR%I          RT<-RA|I10 */
+APUOP(M_ORHI,           RI10,   0x028,  "orhi",         _A3(A_T,A_A,A_S10),     00012,  FX2)    /* OR%I          RT<-RA|I10 */
+APUOP(M_ORI,            RI10,   0x020,  "ori",          _A3(A_T,A_A,A_S10),     00012,  FX2)    /* OR%I          RT<-RA|I10 */
+APUOP(M_ORX,            RR,     0x1f0,  "orx",          _A2(A_T,A_A),           00012,  BR)     /* ORX           RT<-RA.w0|RA.w1|RA.w2|RA.w3 */
+APUOP(M_XORBI,          RI10,   0x230,  "xorbi",        _A3(A_T,A_A,A_S10B),    00012,  FX2)    /* XOR%I         RT<-RA^I10 */
+APUOP(M_XORHI,          RI10,   0x228,  "xorhi",        _A3(A_T,A_A,A_S10),     00012,  FX2)    /* XOR%I         RT<-RA^I10 */
+APUOP(M_XORI,           RI10,   0x220,  "xori",         _A3(A_T,A_A,A_S10),     00012,  FX2)    /* XOR%I         RT<-RA^I10 */
+APUOP(M_AHI,            RI10,   0x0e8,  "ahi",          _A3(A_T,A_A,A_S10),     00012,  FX2)    /* Add%Immed     RT<-RA+I10 */
+APUOP(M_AI,             RI10,   0x0e0,  "ai",           _A3(A_T,A_A,A_S10),     00012,  FX2)    /* Add%Immed     RT<-RA+I10 */
+APUOP(M_SFHI,           RI10,   0x068,  "sfhi",         _A3(A_T,A_A,A_S10),     00012,  FX2)    /* SubFrom%Imm   RT<-I10-RA */
+APUOP(M_SFI,            RI10,   0x060,  "sfi",          _A3(A_T,A_A,A_S10),     00012,  FX2)    /* SubFrom%Imm   RT<-I10-RA */
+APUOP(M_CGTBI,          RI10,   0x270,  "cgtbi",        _A3(A_T,A_A,A_S10B),    00012,  FX2)    /* CGT%I         RT<-(RA>I10) */
+APUOP(M_CGTHI,          RI10,   0x268,  "cgthi",        _A3(A_T,A_A,A_S10),     00012,  FX2)    /* CGT%I         RT<-(RA>I10) */
+APUOP(M_CGTI,           RI10,   0x260,  "cgti",         _A3(A_T,A_A,A_S10),     00012,  FX2)    /* CGT%I         RT<-(RA>I10) */
+APUOP(M_CLGTBI,         RI10,   0x2f0,  "clgtbi",       _A3(A_T,A_A,A_S10B),    00012,  FX2)    /* CLGT%I        RT<-(RA>I10) */
+APUOP(M_CLGTHI,         RI10,   0x2e8,  "clgthi",       _A3(A_T,A_A,A_S10),     00012,  FX2)    /* CLGT%I        RT<-(RA>I10) */
+APUOP(M_CLGTI,          RI10,   0x2e0,  "clgti",        _A3(A_T,A_A,A_S10),     00012,  FX2)    /* CLGT%I        RT<-(RA>I10) */
+APUOP(M_CEQBI,          RI10,   0x3f0,  "ceqbi",        _A3(A_T,A_A,A_S10B),    00012,  FX2)    /* CEQ%I         RT<-(RA=I10) */
+APUOP(M_CEQHI,          RI10,   0x3e8,  "ceqhi",        _A3(A_T,A_A,A_S10),     00012,  FX2)    /* CEQ%I         RT<-(RA=I10) */
+APUOP(M_CEQI,           RI10,   0x3e0,  "ceqi",         _A3(A_T,A_A,A_S10),     00012,  FX2)    /* CEQ%I         RT<-(RA=I10) */
+APUOP(M_HGTI,           RI10,   0x278,  "hgti",         _A3(A_T,A_A,A_S10),     00010,  FX2)    /* HaltGTI       halt_if(RA>I10) */
+APUOP(M_HGTI2,          RI10,   0x278,  "hgti",         _A2(A_A,A_S10), 00010,  FX2)    /* HaltGTI       halt_if(RA>I10) */
+APUOP(M_HLGTI,          RI10,   0x2f8,  "hlgti",        _A3(A_T,A_A,A_S10),     00010,  FX2)    /* HaltLGTI      halt_if(RA>I10) */
+APUOP(M_HLGTI2,         RI10,   0x2f8,  "hlgti",        _A2(A_A,A_S10), 00010,  FX2)    /* HaltLGTI      halt_if(RA>I10) */
+APUOP(M_HEQI,           RI10,   0x3f8,  "heqi",         _A3(A_T,A_A,A_S10),     00010,  FX2)    /* HaltEQImm     halt_if(RA=I10) */
+APUOP(M_HEQI2,          RI10,   0x3f8,  "heqi",         _A2(A_A,A_S10), 00010,  FX2)    /* HaltEQImm     halt_if(RA=I10) */
+APUOP(M_MPYI,           RI10,   0x3a0,  "mpyi",         _A3(A_T,A_A,A_S10),     00012,  FP7)    /* MPYI          RT<-RA*I10 */
+APUOP(M_MPYUI,          RI10,   0x3a8,  "mpyui",        _A3(A_T,A_A,A_S10),     00012,  FP7)    /* MPYUI         RT<-RA*I10 */
+APUOP(M_CFLTS,          RI8,    0x3b0,  "cflts",        _A3(A_T,A_A,A_U7A),     00012,  FP7)    /* CFLTS         RT<-int(RA,I8) */
+APUOP(M_CFLTU,          RI8,    0x3b2,  "cfltu",        _A3(A_T,A_A,A_U7A),     00012,  FP7)    /* CFLTU         RT<-int(RA,I8) */
+APUOP(M_CSFLT,          RI8,    0x3b4,  "csflt",        _A3(A_T,A_A,A_U7B),     00012,  FP7)    /* CSFLT         RT<-flt(RA,I8) */
+APUOP(M_CUFLT,          RI8,    0x3b6,  "cuflt",        _A3(A_T,A_A,A_U7B),     00012,  FP7)    /* CUFLT         RT<-flt(RA,I8) */
+APUOP(M_FESD,           RR,     0x3b8,  "fesd",         _A2(A_T,A_A),   00012,  FPD)    /* FESD          RT<-double(RA) */
+APUOP(M_FRDS,           RR,     0x3b9,  "frds",         _A2(A_T,A_A),   00012,  FPD)    /* FRDS          RT<-single(RA) */
+APUOP(M_FSCRRD,         RR,     0x398,  "fscrrd",       _A1(A_T),               00002,  FPD)    /* FSCRRD        RT<-FP_status */
+APUOP(M_FSCRWR,         RR,     0x3ba,  "fscrwr",       _A2(A_T,A_A),   00010,  FP7)    /* FSCRWR        FP_status<-RA */
+APUOP(M_FSCRWR2,        RR,     0x3ba,  "fscrwr",       _A1(A_A),               00010,  FP7)    /* FSCRWR        FP_status<-RA */
+APUOP(M_CLZ,            RR,     0x2a5,  "clz",          _A2(A_T,A_A),   00012,  FX2)    /* CLZ           RT<-clz(RA) */
+APUOP(M_CNTB,           RR,     0x2b4,  "cntb",         _A2(A_T,A_A),   00012,  FXB)    /* CNT           RT<-pop(RA) */
+APUOP(M_XSBH,           RR,     0x2b6,  "xsbh",         _A2(A_T,A_A),   00012,  FX2)    /* eXtSignBtoH   RT<-sign_ext(RA) */
+APUOP(M_XSHW,           RR,     0x2ae,  "xshw",         _A2(A_T,A_A),   00012,  FX2)    /* eXtSignHtoW   RT<-sign_ext(RA) */
+APUOP(M_XSWD,           RR,     0x2a6,  "xswd",         _A2(A_T,A_A),   00012,  FX2)    /* eXtSignWtoD   RT<-sign_ext(RA) */
+APUOP(M_ROTI,           RI7,    0x078,  "roti",         _A3(A_T,A_A,A_S7N),     00012,  FX3)    /* ROT%I         RT<-RA<<<I7 */
+APUOP(M_ROTMI,          RI7,    0x079,  "rotmi",        _A3(A_T,A_A,A_S7),      00012,  FX3)    /* ROT%MI        RT<-RA<<I7 */
+APUOP(M_ROTMAI,         RI7,    0x07a,  "rotmai",       _A3(A_T,A_A,A_S7),      00012,  FX3)    /* ROTMA%I       RT<-RA<<I7 */
+APUOP(M_SHLI,           RI7,    0x07b,  "shli",         _A3(A_T,A_A,A_U6),      00012,  FX3)    /* SHL%I         RT<-RA<<I7 */
+APUOP(M_ROTHI,          RI7,    0x07c,  "rothi",        _A3(A_T,A_A,A_S7N),     00012,  FX3)    /* ROT%I         RT<-RA<<<I7 */
+APUOP(M_ROTHMI,         RI7,    0x07d,  "rothmi",       _A3(A_T,A_A,A_S6),      00012,  FX3)    /* ROT%MI        RT<-RA<<I7 */
+APUOP(M_ROTMAHI,        RI7,    0x07e,  "rotmahi",      _A3(A_T,A_A,A_S6),      00012,  FX3)    /* ROTMA%I       RT<-RA<<I7 */
+APUOP(M_SHLHI,          RI7,    0x07f,  "shlhi",        _A3(A_T,A_A,A_U5),      00012,  FX3)    /* SHL%I         RT<-RA<<I7 */
+APUOP(M_A,              RR,     0x0c0,  "a",            _A3(A_T,A_A,A_B),               00112,  FX2)    /* Add%          RT<-RA+RB */
+APUOP(M_AH,             RR,     0x0c8,  "ah",           _A3(A_T,A_A,A_B),               00112,  FX2)    /* Add%          RT<-RA+RB */
+APUOP(M_SF,             RR,     0x040,  "sf",           _A3(A_T,A_A,A_B),               00112,  FX2)    /* SubFrom%      RT<-RB-RA */
+APUOP(M_SFH,            RR,     0x048,  "sfh",          _A3(A_T,A_A,A_B),               00112,  FX2)    /* SubFrom%      RT<-RB-RA */
+APUOP(M_CGT,            RR,     0x240,  "cgt",          _A3(A_T,A_A,A_B),               00112,  FX2)    /* CGT%          RT<-(RA>RB) */
+APUOP(M_CGTB,           RR,     0x250,  "cgtb",         _A3(A_T,A_A,A_B),               00112,  FX2)    /* CGT%          RT<-(RA>RB) */
+APUOP(M_CGTH,           RR,     0x248,  "cgth",         _A3(A_T,A_A,A_B),               00112,  FX2)    /* CGT%          RT<-(RA>RB) */
+APUOP(M_CLGT,           RR,     0x2c0,  "clgt",         _A3(A_T,A_A,A_B),               00112,  FX2)    /* CLGT%         RT<-(RA>RB) */
+APUOP(M_CLGTB,          RR,     0x2d0,  "clgtb",        _A3(A_T,A_A,A_B),               00112,  FX2)    /* CLGT%         RT<-(RA>RB) */
+APUOP(M_CLGTH,          RR,     0x2c8,  "clgth",        _A3(A_T,A_A,A_B),               00112,  FX2)    /* CLGT%         RT<-(RA>RB) */
+APUOP(M_CEQ,            RR,     0x3c0,  "ceq",          _A3(A_T,A_A,A_B),               00112,  FX2)    /* CEQ%          RT<-(RA=RB) */
+APUOP(M_CEQB,           RR,     0x3d0,  "ceqb",         _A3(A_T,A_A,A_B),               00112,  FX2)    /* CEQ%          RT<-(RA=RB) */
+APUOP(M_CEQH,           RR,     0x3c8,  "ceqh",         _A3(A_T,A_A,A_B),               00112,  FX2)    /* CEQ%          RT<-(RA=RB) */
+APUOP(M_HGT,            RR,     0x258,  "hgt",          _A3(A_T,A_A,A_B),               00110,  FX2)    /* HaltGT        halt_if(RA>RB) */
+APUOP(M_HGT2,           RR,     0x258,  "hgt",          _A2(A_A,A_B),   00110,  FX2)    /* HaltGT        halt_if(RA>RB) */
+APUOP(M_HLGT,           RR,     0x2d8,  "hlgt",         _A3(A_T,A_A,A_B),               00110,  FX2)    /* HaltLGT       halt_if(RA>RB) */
+APUOP(M_HLGT2,          RR,     0x2d8,  "hlgt",         _A2(A_A,A_B),   00110,  FX2)    /* HaltLGT       halt_if(RA>RB) */
+APUOP(M_HEQ,            RR,     0x3d8,  "heq",          _A3(A_T,A_A,A_B),               00110,  FX2)    /* HaltEQ        halt_if(RA=RB) */
+APUOP(M_HEQ2,           RR,     0x3d8,  "heq",          _A2(A_A,A_B),   00110,  FX2)    /* HaltEQ        halt_if(RA=RB) */
+APUOP(M_FCEQ,           RR,     0x3c2,  "fceq",         _A3(A_T,A_A,A_B),               00112,  FX2)    /* FCEQ          RT<-(RA=RB) */
+APUOP(M_FCMEQ,          RR,     0x3ca,  "fcmeq",        _A3(A_T,A_A,A_B),               00112,  FX2)    /* FCMEQ         RT<-(|RA|=|RB|) */
+APUOP(M_FCGT,           RR,     0x2c2,  "fcgt",         _A3(A_T,A_A,A_B),               00112,  FX2)    /* FCGT          RT<-(RA<RB) */
+APUOP(M_FCMGT,          RR,     0x2ca,  "fcmgt",        _A3(A_T,A_A,A_B),               00112,  FX2)    /* FCMGT         RT<-(|RA|<|RB|) */
+APUOP(M_AND,            RR,     0x0c1,  "and",          _A3(A_T,A_A,A_B),               00112,  FX2)    /* AND           RT<-RA&RB */
+APUOP(M_NAND,           RR,     0x0c9,  "nand",         _A3(A_T,A_A,A_B),               00112,  FX2)    /* NAND          RT<-!(RA&RB) */
+APUOP(M_OR,             RR,     0x041,  "or",           _A3(A_T,A_A,A_B),               00112,  FX2)    /* OR            RT<-RA|RB */
+APUOP(M_NOR,            RR,     0x049,  "nor",          _A3(A_T,A_A,A_B),               00112,  FX2)    /* NOR           RT<-!(RA&RB) */
+APUOP(M_XOR,            RR,     0x241,  "xor",          _A3(A_T,A_A,A_B),               00112,  FX2)    /* XOR           RT<-RA^RB */
+APUOP(M_EQV,            RR,     0x249,  "eqv",          _A3(A_T,A_A,A_B),               00112,  FX2)    /* EQuiValent    RT<-!(RA^RB) */
+APUOP(M_ANDC,           RR,     0x2c1,  "andc",         _A3(A_T,A_A,A_B),               00112,  FX2)    /* ANDComplement RT<-RA&!RB */
+APUOP(M_ORC,            RR,     0x2c9,  "orc",          _A3(A_T,A_A,A_B),               00112,  FX2)    /* ORComplement  RT<-RA|!RB */
+APUOP(M_ABSDB,          RR,     0x053,  "absdb",        _A3(A_T,A_A,A_B),               00112,  FXB)    /* ABSoluteDiff  RT<-|RA-RB| */
+APUOP(M_AVGB,           RR,     0x0d3,  "avgb",         _A3(A_T,A_A,A_B),               00112,  FXB)    /* AVG%          RT<-(RA+RB+1)/2 */
+APUOP(M_SUMB,           RR,     0x253,  "sumb",         _A3(A_T,A_A,A_B),               00112,  FXB)    /* SUM%          RT<-f(RA,RB) */
+APUOP(M_DFA,            RR,     0x2cc,  "dfa",          _A3(A_T,A_A,A_B),               00112,  FPD)    /* DFAdd         RT<-RA+RB */
+APUOP(M_DFM,            RR,     0x2ce,  "dfm",          _A3(A_T,A_A,A_B),               00112,  FPD)    /* DFMul         RT<-RA*RB */
+APUOP(M_DFS,            RR,     0x2cd,  "dfs",          _A3(A_T,A_A,A_B),               00112,  FPD)    /* DFSub         RT<-RA-RB */
+APUOP(M_FA,             RR,     0x2c4,  "fa",           _A3(A_T,A_A,A_B),               00112,  FP6)    /* FAdd          RT<-RA+RB */
+APUOP(M_FM,             RR,     0x2c6,  "fm",           _A3(A_T,A_A,A_B),               00112,  FP6)    /* FMul          RT<-RA*RB */
+APUOP(M_FS,             RR,     0x2c5,  "fs",           _A3(A_T,A_A,A_B),               00112,  FP6)    /* FSub          RT<-RA-RB */
+APUOP(M_MPY,            RR,     0x3c4,  "mpy",          _A3(A_T,A_A,A_B),               00112,  FP7)    /* MPY           RT<-RA*RB */
+APUOP(M_MPYH,           RR,     0x3c5,  "mpyh",         _A3(A_T,A_A,A_B),               00112,  FP7)    /* MPYH          RT<-(RAh*RB)<<16 */
+APUOP(M_MPYHH,          RR,     0x3c6,  "mpyhh",        _A3(A_T,A_A,A_B),               00112,  FP7)    /* MPYHH         RT<-RAh*RBh */
+APUOP(M_MPYHHU,         RR,     0x3ce,  "mpyhhu",       _A3(A_T,A_A,A_B),               00112,  FP7)    /* MPYHHU        RT<-RAh*RBh */
+APUOP(M_MPYS,           RR,     0x3c7,  "mpys",         _A3(A_T,A_A,A_B),               00112,  FP7)    /* MPYS          RT<-(RA*RB)>>16 */
+APUOP(M_MPYU,           RR,     0x3cc,  "mpyu",         _A3(A_T,A_A,A_B),               00112,  FP7)    /* MPYU          RT<-RA*RB */
+APUOP(M_FI,             RR,     0x3d4,  "fi",           _A3(A_T,A_A,A_B),               00112,  FP7)    /* FInterpolate  RT<-f(RA,RB) */
+APUOP(M_ROT,            RR,     0x058,  "rot",          _A3(A_T,A_A,A_B),               00112,  FX3)    /* ROT%          RT<-RA<<<RB */
+APUOP(M_ROTM,           RR,     0x059,  "rotm",         _A3(A_T,A_A,A_B),               00112,  FX3)    /* ROT%M         RT<-RA<<Rb */
+APUOP(M_ROTMA,          RR,     0x05a,  "rotma",        _A3(A_T,A_A,A_B),               00112,  FX3)    /* ROTMA%        RT<-RA<<Rb */
+APUOP(M_SHL,            RR,     0x05b,  "shl",          _A3(A_T,A_A,A_B),               00112,  FX3)    /* SHL%          RT<-RA<<Rb */
+APUOP(M_ROTH,           RR,     0x05c,  "roth",         _A3(A_T,A_A,A_B),               00112,  FX3)    /* ROT%          RT<-RA<<<RB */
+APUOP(M_ROTHM,          RR,     0x05d,  "rothm",        _A3(A_T,A_A,A_B),               00112,  FX3)    /* ROT%M         RT<-RA<<Rb */
+APUOP(M_ROTMAH,         RR,     0x05e,  "rotmah",       _A3(A_T,A_A,A_B),               00112,  FX3)    /* ROTMA%        RT<-RA<<Rb */
+APUOP(M_SHLH,           RR,     0x05f,  "shlh",         _A3(A_T,A_A,A_B),               00112,  FX3)    /* SHL%          RT<-RA<<Rb */
+APUOP(M_MPYHHA,         RR,     0x346,  "mpyhha",       _A3(A_T,A_A,A_B),               00113,  FP7)    /* MPYHHA        RT<-RAh*RBh+RT */
+APUOP(M_MPYHHAU,        RR,     0x34e,  "mpyhhau",      _A3(A_T,A_A,A_B),               00113,  FP7)    /* MPYHHAU       RT<-RAh*RBh+RT */
+APUOP(M_DFMA,           RR,     0x35c,  "dfma",         _A3(A_T,A_A,A_B),               00113,  FPD)    /* DFMAdd        RT<-RT+RA*RB */
+APUOP(M_DFMS,           RR,     0x35d,  "dfms",         _A3(A_T,A_A,A_B),               00113,  FPD)    /* DFMSub        RT<-RA*RB-RT */
+APUOP(M_DFNMS,          RR,     0x35e,  "dfnms",        _A3(A_T,A_A,A_B),               00113,  FPD)    /* DFNMSub       RT<-RT-RA*RB */
+APUOP(M_DFNMA,          RR,     0x35f,  "dfnma",        _A3(A_T,A_A,A_B),               00113,  FPD)    /* DFNMAdd       RT<-(-RT)-RA*RB */
+APUOP(M_FMA,            RRR,    0x700,  "fma",          _A4(A_C,A_A,A_B,A_T),   02111,  FP6)    /* FMAdd         RC<-RT+RA*RB */
+APUOP(M_FMS,            RRR,    0x780,  "fms",          _A4(A_C,A_A,A_B,A_T),   02111,  FP6)    /* FMSub         RC<-RA*RB-RT */
+APUOP(M_FNMS,           RRR,    0x680,  "fnms",         _A4(A_C,A_A,A_B,A_T),   02111,  FP6)    /* FNMSub        RC<-RT-RA*RB */
+APUOP(M_MPYA,           RRR,    0x600,  "mpya",         _A4(A_C,A_A,A_B,A_T),   02111,  FP7)    /* MPYA          RC<-RA*RB+RT */
+APUOP(M_SELB,           RRR,    0x400,  "selb",         _A4(A_C,A_A,A_B,A_T),   02111,  FX2)    /* SELectBits    RC<-RA&RT|RB&!RT */
+/* for system function call, this uses op-code of mtspr */
+APUOP(M_SYSCALL,        RI7,    0x10c,  "syscall",      _A3(A_T,A_A,A_S7N),     00002,  SPR)        /* System Call */
+/*
+pseudo instruction:
+system call
+value of I9     operation
+0       halt
+1               rt[0] = open(MEM[ra[0]],        ra[1])
+2               rt[0] = close(ra[0])
+3               rt[0] = read(ra[0],     MEM[ra[1]],     ra[2])
+4               rt[0] = write(ra[0],    MEM[ra[1]],     ra[2])
+5               printf(MEM[ra[0]],      ra[1],  ra[2],  ra[3])
+42              rt[0] = clock()
+52              rt[0] = lseek(ra0,      ra1,    ra2)
+
+*/
+
+
+/* new multiprecision add/sub */
+APUOP(M_ADDX,           RR,     0x340,  "addx",         _A3(A_T,A_A,A_B),               00113,          FX2)    /* Add_eXtended  RT<-RA+RB+RT */
+APUOP(M_CG,             RR,     0x0c2,  "cg",           _A3(A_T,A_A,A_B),               00112,          FX2)    /* CarryGenerate RT<-cout(RA+RB) */
+APUOP(M_CGX,            RR,     0x342,  "cgx",          _A3(A_T,A_A,A_B),               00113,          FX2)    /* CarryGen_eXtd RT<-cout(RA+RB+RT) */
+APUOP(M_SFX,            RR,     0x341,  "sfx",          _A3(A_T,A_A,A_B),               00113,          FX2)    /* Add_eXtended  RT<-RA+RB+RT */
+APUOP(M_BG,             RR,     0x042,  "bg",           _A3(A_T,A_A,A_B),               00112,          FX2)    /* CarryGenerate RT<-cout(RA+RB) */
+APUOP(M_BGX,            RR,     0x343,  "bgx",          _A3(A_T,A_A,A_B),               00113,          FX2)    /* CarryGen_eXtd RT<-cout(RA+RB+RT) */
+
+/*
+
+The following ops are a subset of above except with feature bits set.
+Feature bits are bits 11-17 of the instruction:
+
+  11 - C & P feature bit
+  12 - disable interrupts
+  13 - enable interrupts
+
+*/
+APUOPFB(M_BID,          RR,     0x1a8,  0x20,   "bid",          _A1(A_A),               00010,  BR)     /* BI            IP<-RA */
+APUOPFB(M_BIE,          RR,     0x1a8,  0x10,   "bie",          _A1(A_A),               00010,  BR)     /* BI            IP<-RA */
+APUOPFB(M_BISLD,        RR,     0x1a9,  0x20,   "bisld",        _A2(A_T,A_A),   00012,  BR)     /* BISL          RT,IP<-IP,RA */
+APUOPFB(M_BISLE,        RR,     0x1a9,  0x10,   "bisle",        _A2(A_T,A_A),   00012,  BR)     /* BISL          RT,IP<-IP,RA */
+APUOPFB(M_IRETD,        RR,     0x1aa,  0x20,   "iretd",        _A1(A_A),       00010,  BR)     /* IRET          IP<-SRR0 */
+APUOPFB(M_IRETD2,       RR,     0x1aa,  0x20,   "iretd",        _A0(),          00010,  BR)     /* IRET          IP<-SRR0 */
+APUOPFB(M_IRETE,        RR,     0x1aa,  0x10,   "irete",        _A1(A_A),       00010,  BR)     /* IRET          IP<-SRR0 */
+APUOPFB(M_IRETE2,       RR,     0x1aa,  0x10,   "irete",        _A0(),          00010,  BR)     /* IRET          IP<-SRR0 */
+APUOPFB(M_BISLEDD,      RR,     0x1ab,  0x20,   "bisledd",      _A2(A_T,A_A),   00012,  BR)     /* BISLED        RT,IP<-IP,RA_if(ext) */
+APUOPFB(M_BISLEDE,      RR,     0x1ab,  0x10,   "bislede",      _A2(A_T,A_A),   00012,  BR)     /* BISLED        RT,IP<-IP,RA_if(ext) */
+APUOPFB(M_BIHNZD,       RR,     0x12b,  0x20,   "bihnzd",       _A2(A_T,A_A),   00011,  BR)     /* BIHNZ         IP<-RA_if(RT) */
+APUOPFB(M_BIHNZE,       RR,     0x12b,  0x10,   "bihnze",       _A2(A_T,A_A),   00011,  BR)     /* BIHNZ         IP<-RA_if(RT) */
+APUOPFB(M_BIHZD,        RR,     0x12a,  0x20,   "bihzd",        _A2(A_T,A_A),   00011,  BR)     /* BIHZ          IP<-RA_if(RT) */
+APUOPFB(M_BIHZE,        RR,     0x12a,  0x10,   "bihze",        _A2(A_T,A_A),   00011,  BR)     /* BIHZ          IP<-RA_if(RT) */
+APUOPFB(M_BINZD,        RR,     0x129,  0x20,   "binzd",        _A2(A_T,A_A),   00011,  BR)     /* BINZ          IP<-RA_if(RT) */
+APUOPFB(M_BINZE,        RR,     0x129,  0x10,   "binze",        _A2(A_T,A_A),   00011,  BR)     /* BINZ          IP<-RA_if(RT) */
+APUOPFB(M_BIZD,         RR,     0x128,  0x20,   "bizd",         _A2(A_T,A_A),   00011,  BR)     /* BIZ           IP<-RA_if(RT) */
+APUOPFB(M_BIZE,         RR,     0x128,  0x10,   "bize",         _A2(A_T,A_A),   00011,  BR)     /* BIZ           IP<-RA_if(RT) */
+APUOPFB(M_SYNCC,        RR,     0x002,  0x40,   "syncc",        _A0(),          00000,  BR)     /* SYNCC          flush_pipe */
+APUOPFB(M_HBRP,         LBTI,   0x1ac,  0x40,   "hbrp",         _A0(),          00010,  LS)     /* HBR           BTB[B9]<-M[Ra] */
+
+/* Synonyms required by the AS manual. */
+APUOP(M_LR,             RI10,   0x020,  "lr",           _A2(A_T,A_A),   00012,  FX2)    /* OR%I          RT<-RA|I10 */
+APUOP(M_BIHT,           RR,     0x12b,  "biht",         _A2(A_T,A_A),   00011,  BR)     /* BIHNZ         IP<-RA_if(RT) */
+APUOP(M_BIHF,           RR,     0x12a,  "bihf",         _A2(A_T,A_A),   00011,  BR)     /* BIHZ          IP<-RA_if(RT) */
+APUOP(M_BIT,            RR,     0x129,  "bit",          _A2(A_T,A_A),   00011,  BR)     /* BINZ          IP<-RA_if(RT) */
+APUOP(M_BIF,            RR,     0x128,  "bif",          _A2(A_T,A_A),   00011,  BR)     /* BIZ           IP<-RA_if(RT) */
+APUOPFB(M_BIHTD,        RR,     0x12b,  0x20,   "bihtd",        _A2(A_T,A_A),   00011,  BR)     /* BIHNF         IP<-RA_if(RT) */
+APUOPFB(M_BIHTE,        RR,     0x12b,  0x10,   "bihte",        _A2(A_T,A_A),   00011,  BR)     /* BIHNF         IP<-RA_if(RT) */
+APUOPFB(M_BIHFD,        RR,     0x12a,  0x20,   "bihfd",        _A2(A_T,A_A),   00011,  BR)     /* BIHZ          IP<-RA_if(RT) */
+APUOPFB(M_BIHFE,        RR,     0x12a,  0x10,   "bihfe",        _A2(A_T,A_A),   00011,  BR)     /* BIHZ          IP<-RA_if(RT) */
+APUOPFB(M_BITD,         RR,     0x129,  0x20,   "bitd",         _A2(A_T,A_A),   00011,  BR)     /* BINF          IP<-RA_if(RT) */
+APUOPFB(M_BITE,         RR,     0x129,  0x10,   "bite",         _A2(A_T,A_A),   00011,  BR)     /* BINF          IP<-RA_if(RT) */
+APUOPFB(M_BIFD,         RR,     0x128,  0x20,   "bifd",         _A2(A_T,A_A),   00011,  BR)     /* BIZ           IP<-RA_if(RT) */
+APUOPFB(M_BIFE,         RR,     0x128,  0x10,   "bife",         _A2(A_T,A_A),   00011,  BR)     /* BIZ           IP<-RA_if(RT) */
+
+#undef _A0
+#undef _A1
+#undef _A2
+#undef _A3
+#undef _A4
diff --git a/arch/powerpc/xmon/spu-opc.c b/arch/powerpc/xmon/spu-opc.c
new file mode 100644
index 000000000000..efffde9edc6e
--- /dev/null
+++ b/arch/powerpc/xmon/spu-opc.c
@@ -0,0 +1,44 @@
+/* SPU opcode list
+
+   Copyright 2006 Free Software Foundation, Inc.
+
+   This file is part of GDB, GAS, and the GNU binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include "spu.h"
+
+/* This file holds the Spu opcode table */
+
+
+/*
+   Example contents of spu-insn.h
+      id_tag    mode    mode    type    opcode  mnemonic        asmtype     dependency          FPU     L/S?    branch? instruction   
+                QUAD    WORD                                               (0,RC,RB,RA,RT)    latency                                           
+   APUOP(M_LQD, 1,      0,      RI9,    0x1f8,  "lqd",          ASM_RI9IDX,     00012,          FXU,    1,      0)      Load Quadword d-form 
+ */
+
+const struct spu_opcode spu_opcodes[] = {
+#define APUOP(TAG,MACFORMAT,OPCODE,MNEMONIC,ASMFORMAT,DEP,PIPE) \
+        { MACFORMAT, OPCODE, MNEMONIC, ASMFORMAT },
+#define APUOPFB(TAG,MACFORMAT,OPCODE,FB,MNEMONIC,ASMFORMAT,DEP,PIPE) \
+        { MACFORMAT, OPCODE, MNEMONIC, ASMFORMAT },
+#include "spu-insns.h"
+#undef APUOP
+#undef APUOPFB
+};
+
+const int spu_num_opcodes =
+  sizeof (spu_opcodes) / sizeof (spu_opcodes[0]);
diff --git a/arch/powerpc/xmon/spu.h b/arch/powerpc/xmon/spu.h
new file mode 100644
index 000000000000..c761fc8f35d8
--- /dev/null
+++ b/arch/powerpc/xmon/spu.h
@@ -0,0 +1,126 @@
+/* SPU ELF support for BFD.
+
+   Copyright 2006 Free Software Foundation, Inc.
+
+   This file is part of GDB, GAS, and the GNU binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+
+/* These two enums are from rel_apu/common/spu_asm_format.h */
+/* definition of instruction format */
+typedef enum {
+  RRR,
+  RI18,
+  RI16,
+  RI10,
+  RI8,
+  RI7,
+  RR,
+  LBT,
+  LBTI,
+  IDATA,
+  UNKNOWN_IFORMAT
+} spu_iformat;
+
+/* These values describe assembly instruction arguments.  They indicate
+ * how to encode, range checking and which relocation to use. */
+typedef enum {
+  A_T,  /* register at pos 0 */
+  A_A,  /* register at pos 7 */
+  A_B,  /* register at pos 14 */
+  A_C,  /* register at pos 21 */
+  A_S,  /* special purpose register at pos 7 */
+  A_H,  /* channel register at pos 7 */
+  A_P,  /* parenthesis, this has to separate regs from immediates */
+  A_S3,
+  A_S6,
+  A_S7N,
+  A_S7,
+  A_U7A,
+  A_U7B,
+  A_S10B,
+  A_S10,
+  A_S11,
+  A_S11I,
+  A_S14,
+  A_S16,
+  A_S18,
+  A_R18,
+  A_U3,
+  A_U5,
+  A_U6,
+  A_U7,
+  A_U14,
+  A_X16,
+  A_U18,
+  A_MAX
+} spu_aformat;
+
+enum spu_insns {
+#define APUOP(TAG,MACFORMAT,OPCODE,MNEMONIC,ASMFORMAT,DEP,PIPE) \
+        TAG,
+#define APUOPFB(TAG,MACFORMAT,OPCODE,FB,MNEMONIC,ASMFORMAT,DEP,PIPE) \
+        TAG,
+#include "spu-insns.h"
+#undef APUOP
+#undef APUOPFB
+        M_SPU_MAX
+};
+
+struct spu_opcode
+{
+   spu_iformat insn_type;
+   unsigned int opcode;
+   char *mnemonic;
+   int arg[5];
+};
+
+#define SIGNED_EXTRACT(insn,size,pos) (((int)((insn) << (32-size-pos))) >> (32-size))
+#define UNSIGNED_EXTRACT(insn,size,pos) (((insn) >> pos) & ((1 << size)-1))
+
+#define DECODE_INSN_RT(insn) (insn & 0x7f)
+#define DECODE_INSN_RA(insn) ((insn >> 7) & 0x7f)
+#define DECODE_INSN_RB(insn) ((insn >> 14) & 0x7f)
+#define DECODE_INSN_RC(insn) ((insn >> 21) & 0x7f)
+
+#define DECODE_INSN_I10(insn) SIGNED_EXTRACT(insn,10,14)
+#define DECODE_INSN_U10(insn) UNSIGNED_EXTRACT(insn,10,14)
+
+/* For branching, immediate loads, hbr and  lqa/stqa. */
+#define DECODE_INSN_I16(insn) SIGNED_EXTRACT(insn,16,7)
+#define DECODE_INSN_U16(insn) UNSIGNED_EXTRACT(insn,16,7)
+
+/* for stop */
+#define DECODE_INSN_U14(insn) UNSIGNED_EXTRACT(insn,14,0)
+
+/* For ila */
+#define DECODE_INSN_I18(insn) SIGNED_EXTRACT(insn,18,7)
+#define DECODE_INSN_U18(insn) UNSIGNED_EXTRACT(insn,18,7)
+
+/* For rotate and shift and generate control mask */
+#define DECODE_INSN_I7(insn) SIGNED_EXTRACT(insn,7,14)
+#define DECODE_INSN_U7(insn) UNSIGNED_EXTRACT(insn,7,14)
+
+/* For float <-> int conversion */
+#define DECODE_INSN_I8(insn)  SIGNED_EXTRACT(insn,8,14)
+#define DECODE_INSN_U8(insn) UNSIGNED_EXTRACT(insn,8,14)
+
+/* For hbr  */
+#define DECODE_INSN_I9a(insn) ((SIGNED_EXTRACT(insn,2,23) << 7) | UNSIGNED_EXTRACT(insn,7,0))
+#define DECODE_INSN_I9b(insn) ((SIGNED_EXTRACT(insn,2,14) << 7) | UNSIGNED_EXTRACT(insn,7,0))
+#define DECODE_INSN_U9a(insn) ((UNSIGNED_EXTRACT(insn,2,23) << 7) | UNSIGNED_EXTRACT(insn,7,0))
+#define DECODE_INSN_U9b(insn) ((UNSIGNED_EXTRACT(insn,2,14) << 7) | UNSIGNED_EXTRACT(insn,7,0))
+
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index f56ffef4defa..77540a2f7704 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -22,6 +22,7 @@
 #include <linux/sysrq.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/bug.h>
 
 #include <asm/ptrace.h>
 #include <asm/string.h>
@@ -35,15 +36,19 @@
 #include <asm/cputable.h>
 #include <asm/rtas.h>
 #include <asm/sstep.h>
-#include <asm/bug.h>
 #include <asm/irq_regs.h>
+#include <asm/spu.h>
+#include <asm/spu_priv1.h>
+#include <asm/firmware.h>
 
 #ifdef CONFIG_PPC64
 #include <asm/hvcall.h>
 #include <asm/paca.h>
+#include <asm/iseries/it_lp_reg_save.h>
 #endif
 
 #include "nonstdio.h"
+#include "dis-asm.h"
 
 #define scanhex xmon_scanhex
 #define skipbl  xmon_skipbl
@@ -107,7 +112,6 @@ static int bsesc(void);
 static void dump(void);
 static void prdump(unsigned long, long);
 static int ppc_inst_dump(unsigned long, long, int);
-void print_address(unsigned long);
 static void backtrace(struct pt_regs *);
 static void excprint(struct pt_regs *);
 static void prregs(struct pt_regs *);
@@ -147,9 +151,9 @@ static void xmon_print_symbol(unsigned long address, const char *mid,
                               const char *after);
 static const char *getvecname(unsigned long vec);
 
-int xmon_no_auto_backtrace;
+static int do_spu_cmd(void);
 
-extern int print_insn_powerpc(unsigned long, unsigned long, int);
+int xmon_no_auto_backtrace;
 
 extern void xmon_enter(void);
 extern void xmon_leave(void);
@@ -209,8 +213,15 @@ Commands:\n\
   mi    show information about memory allocation\n\
   p     call a procedure\n\
   r     print registers\n\
-  s     single step\n\
-  S     print special registers\n\
+  s     single step\n"
+#ifdef CONFIG_SPU_BASE
+"  ss   stop execution on all spus\n\
+  sr    restore execution on stopped spus\n\
+  sf  # dump spu fields for spu # (in hex)\n\
+  sd  # dump spu local store for spu # (in hex)\
+  sdi # disassemble spu local store for spu # (in hex)\n"
+#endif
+"  S    print special registers\n\
   t     print backtrace\n\
   x     exit monitor and recover\n\
   X     exit monitor and dont recover\n"
@@ -518,6 +529,7 @@ int xmon(struct pt_regs *excp)
                 xmon_save_regs(&regs);
                 excp = &regs;
         }
+
         return xmon_core(excp, 0);
 }
 EXPORT_SYMBOL(xmon);
@@ -809,6 +821,8 @@ cmds(struct pt_regs *excp)
                         cacheflush();
                         break;
                 case 's':
+                        if (do_spu_cmd() == 0)
+                                break;
                         if (do_step(excp))
                                 return cmd;
                         break;
@@ -1332,7 +1346,7 @@ static void backtrace(struct pt_regs *excp)
 
 static void print_bug_trap(struct pt_regs *regs)
 {
-        struct bug_entry *bug;
+        const struct bug_entry *bug;
         unsigned long addr;
 
         if (regs->msr & MSR_PR)
@@ -1343,11 +1357,11 @@ static void print_bug_trap(struct pt_regs *regs)
         bug = find_bug(regs->nip);
         if (bug == NULL)
                 return;
-        if (bug->line & BUG_WARNING_TRAP)
+        if (is_warning_bug(bug))
                 return;
 
-        printf("kernel BUG in %s at %s:%d!\n",
-               bug->function, bug->file, (unsigned int)bug->line);
+        printf("kernel BUG at %s:%u!\n",
+               bug->file, bug->line);
 }
 
 void excprint(struct pt_regs *fp)
@@ -1555,11 +1569,6 @@ void super_regs(void)
 {
         int cmd;
         unsigned long val;
-#ifdef CONFIG_PPC_ISERIES
-        struct paca_struct *ptrPaca = NULL;
-        struct lppaca *ptrLpPaca = NULL;
-        struct ItLpRegSave *ptrLpRegSave = NULL;
-#endif
 
         cmd = skipbl();
         if (cmd == '\n') {
@@ -1576,26 +1585,32 @@ void super_regs(void)
                 printf("sp   = "REG"  sprg3= "REG"\n", sp, mfspr(SPRN_SPRG3));
                 printf("toc  = "REG"  dar  = "REG"\n", toc, mfspr(SPRN_DAR));
 #ifdef CONFIG_PPC_ISERIES
-                // Dump out relevant Paca data areas.
-                printf("Paca: \n");
-                ptrPaca = get_paca();
-    
-                printf("  Local Processor Control Area (LpPaca): \n");
-                ptrLpPaca = ptrPaca->lppaca_ptr;
-                printf("    Saved Srr0=%.16lx  Saved Srr1=%.16lx \n",
-                       ptrLpPaca->saved_srr0, ptrLpPaca->saved_srr1);
-                printf("    Saved Gpr3=%.16lx  Saved Gpr4=%.16lx \n",
-                       ptrLpPaca->saved_gpr3, ptrLpPaca->saved_gpr4);
-                printf("    Saved Gpr5=%.16lx \n", ptrLpPaca->saved_gpr5);
-    
-                printf("  Local Processor Register Save Area (LpRegSave): \n");
-                ptrLpRegSave = ptrPaca->reg_save_ptr;
-                printf("    Saved Sprg0=%.16lx  Saved Sprg1=%.16lx \n",
-                       ptrLpRegSave->xSPRG0, ptrLpRegSave->xSPRG0);
-                printf("    Saved Sprg2=%.16lx  Saved Sprg3=%.16lx \n",
-                       ptrLpRegSave->xSPRG2, ptrLpRegSave->xSPRG3);
-                printf("    Saved Msr  =%.16lx  Saved Nia  =%.16lx \n",
-                       ptrLpRegSave->xMSR, ptrLpRegSave->xNIA);
+                if (firmware_has_feature(FW_FEATURE_ISERIES)) {
+                        struct paca_struct *ptrPaca;
+                        struct lppaca *ptrLpPaca;
+                        struct ItLpRegSave *ptrLpRegSave;
+
+                        /* Dump out relevant Paca data areas. */
+                        printf("Paca: \n");
+                        ptrPaca = get_paca();
+
+                        printf("  Local Processor Control Area (LpPaca): \n");
+                        ptrLpPaca = ptrPaca->lppaca_ptr;
+                        printf("    Saved Srr0=%.16lx  Saved Srr1=%.16lx \n",
+                               ptrLpPaca->saved_srr0, ptrLpPaca->saved_srr1);
+                        printf("    Saved Gpr3=%.16lx  Saved Gpr4=%.16lx \n",
+                               ptrLpPaca->saved_gpr3, ptrLpPaca->saved_gpr4);
+                        printf("    Saved Gpr5=%.16lx \n", ptrLpPaca->saved_gpr5);
+
+                        printf("  Local Processor Register Save Area (LpRegSave): \n");
+                        ptrLpRegSave = ptrPaca->reg_save_ptr;
+                        printf("    Saved Sprg0=%.16lx  Saved Sprg1=%.16lx \n",
+                               ptrLpRegSave->xSPRG0, ptrLpRegSave->xSPRG0);
+                        printf("    Saved Sprg2=%.16lx  Saved Sprg3=%.16lx \n",
+                               ptrLpRegSave->xSPRG2, ptrLpRegSave->xSPRG3);
+                        printf("    Saved Msr  =%.16lx  Saved Nia  =%.16lx \n",
+                               ptrLpRegSave->xMSR, ptrLpRegSave->xNIA);
+                }
 #endif
 
                 return;
@@ -2053,8 +2068,11 @@ prdump(unsigned long adrs, long ndump)
         }
 }
 
+typedef int (*instruction_dump_func)(unsigned long inst, unsigned long addr);
+
 int
-ppc_inst_dump(unsigned long adr, long count, int praddr)
+generic_inst_dump(unsigned long adr, long count, int praddr,
+                        instruction_dump_func dump_func)
 {
         int nr, dotted;
         unsigned long first_adr;
@@ -2084,12 +2102,18 @@ ppc_inst_dump(unsigned long adr, long count, int praddr)
                 if (praddr)
                         printf(REG"  %.8x", adr, inst);
                 printf("\t");
-                print_insn_powerpc(inst, adr, 0);       /* always returns 4 */
+                dump_func(inst, adr);
                 printf("\n");
         }
         return adr - first_adr;
 }
 
+int
+ppc_inst_dump(unsigned long adr, long count, int praddr)
+{
+        return generic_inst_dump(adr, count, praddr, print_insn_powerpc);
+}
+
 void
 print_address(unsigned long addr)
 {
@@ -2557,6 +2581,10 @@ void dump_segments(void)
 
 void xmon_init(int enable)
 {
+#ifdef CONFIG_PPC_ISERIES
+        if (firmware_has_feature(FW_FEATURE_ISERIES))
+                return;
+#endif
         if (enable) {
                 __debugger = xmon;
                 __debugger_ipi = xmon_ipi;
@@ -2594,6 +2622,10 @@ static struct sysrq_key_op sysrq_xmon_op =
 
 static int __init setup_xmon_sysrq(void)
 {
+#ifdef CONFIG_PPC_ISERIES
+        if (firmware_has_feature(FW_FEATURE_ISERIES))
+                return 0;
+#endif
         register_sysrq_key('x', &sysrq_xmon_op);
         return 0;
 }
@@ -2630,3 +2662,263 @@ void __init xmon_setup(void)
         if (xmon_early)
                 debugger(NULL);
 }
+
+#ifdef CONFIG_SPU_BASE
+
+struct spu_info {
+        struct spu *spu;
+        u64 saved_mfc_sr1_RW;
+        u32 saved_spu_runcntl_RW;
+        unsigned long dump_addr;
+        u8 stopped_ok;
+};
+
+#define XMON_NUM_SPUS   16      /* Enough for current hardware */
+
+static struct spu_info spu_info[XMON_NUM_SPUS];
+
+void xmon_register_spus(struct list_head *list)
+{
+        struct spu *spu;
+
+        list_for_each_entry(spu, list, full_list) {
+                if (spu->number >= XMON_NUM_SPUS) {
+                        WARN_ON(1);
+                        continue;
+                }
+
+                spu_info[spu->number].spu = spu;
+                spu_info[spu->number].stopped_ok = 0;
+                spu_info[spu->number].dump_addr = (unsigned long)
+                                spu_info[spu->number].spu->local_store;
+        }
+}
+
+static void stop_spus(void)
+{
+        struct spu *spu;
+        int i;
+        u64 tmp;
+
+        for (i = 0; i < XMON_NUM_SPUS; i++) {
+                if (!spu_info[i].spu)
+                        continue;
+
+                if (setjmp(bus_error_jmp) == 0) {
+                        catch_memory_errors = 1;
+                        sync();
+
+                        spu = spu_info[i].spu;
+
+                        spu_info[i].saved_spu_runcntl_RW =
+                                in_be32(&spu->problem->spu_runcntl_RW);
+
+                        tmp = spu_mfc_sr1_get(spu);
+                        spu_info[i].saved_mfc_sr1_RW = tmp;
+
+                        tmp &= ~MFC_STATE1_MASTER_RUN_CONTROL_MASK;
+                        spu_mfc_sr1_set(spu, tmp);
+
+                        sync();
+                        __delay(200);
+
+                        spu_info[i].stopped_ok = 1;
+
+                        printf("Stopped spu %.2d (was %s)\n", i,
+                                        spu_info[i].saved_spu_runcntl_RW ?
+                                        "running" : "stopped");
+                } else {
+                        catch_memory_errors = 0;
+                        printf("*** Error stopping spu %.2d\n", i);
+                }
+                catch_memory_errors = 0;
+        }
+}
+
+static void restart_spus(void)
+{
+        struct spu *spu;
+        int i;
+
+        for (i = 0; i < XMON_NUM_SPUS; i++) {
+                if (!spu_info[i].spu)
+                        continue;
+
+                if (!spu_info[i].stopped_ok) {
+                        printf("*** Error, spu %d was not successfully stopped"
+                                        ", not restarting\n", i);
+                        continue;
+                }
+
+                if (setjmp(bus_error_jmp) == 0) {
+                        catch_memory_errors = 1;
+                        sync();
+
+                        spu = spu_info[i].spu;
+                        spu_mfc_sr1_set(spu, spu_info[i].saved_mfc_sr1_RW);
+                        out_be32(&spu->problem->spu_runcntl_RW,
+                                        spu_info[i].saved_spu_runcntl_RW);
+
+                        sync();
+                        __delay(200);
+
+                        printf("Restarted spu %.2d\n", i);
+                } else {
+                        catch_memory_errors = 0;
+                        printf("*** Error restarting spu %.2d\n", i);
+                }
+                catch_memory_errors = 0;
+        }
+}
+
+#define DUMP_WIDTH      23
+#define DUMP_VALUE(format, field, value)                                \
+do {                                                                    \
+        if (setjmp(bus_error_jmp) == 0) {                               \
+                catch_memory_errors = 1;                                \
+                sync();                                                 \
+                printf("  %-*s = "format"\n", DUMP_WIDTH,               \
+                                #field, value);                         \
+                sync();                                                 \
+                __delay(200);                                           \
+        } else {                                                        \
+                catch_memory_errors = 0;                                \
+                printf("  %-*s = *** Error reading field.\n",           \
+                                        DUMP_WIDTH, #field);            \
+        }                                                               \
+        catch_memory_errors = 0;                                        \
+} while (0)
+
+#define DUMP_FIELD(obj, format, field)  \
+        DUMP_VALUE(format, field, obj->field)
+
+static void dump_spu_fields(struct spu *spu)
+{
+        printf("Dumping spu fields at address %p:\n", spu);
+
+        DUMP_FIELD(spu, "0x%x", number);
+        DUMP_FIELD(spu, "%s", name);
+        DUMP_FIELD(spu, "0x%lx", local_store_phys);
+        DUMP_FIELD(spu, "0x%p", local_store);
+        DUMP_FIELD(spu, "0x%lx", ls_size);
+        DUMP_FIELD(spu, "0x%x", node);
+        DUMP_FIELD(spu, "0x%lx", flags);
+        DUMP_FIELD(spu, "0x%lx", dar);
+        DUMP_FIELD(spu, "0x%lx", dsisr);
+        DUMP_FIELD(spu, "%d", class_0_pending);
+        DUMP_FIELD(spu, "0x%lx", irqs[0]);
+        DUMP_FIELD(spu, "0x%lx", irqs[1]);
+        DUMP_FIELD(spu, "0x%lx", irqs[2]);
+        DUMP_FIELD(spu, "0x%x", slb_replace);
+        DUMP_FIELD(spu, "%d", pid);
+        DUMP_FIELD(spu, "%d", prio);
+        DUMP_FIELD(spu, "0x%p", mm);
+        DUMP_FIELD(spu, "0x%p", ctx);
+        DUMP_FIELD(spu, "0x%p", rq);
+        DUMP_FIELD(spu, "0x%p", timestamp);
+        DUMP_FIELD(spu, "0x%lx", problem_phys);
+        DUMP_FIELD(spu, "0x%p", problem);
+        DUMP_VALUE("0x%x", problem->spu_runcntl_RW,
+                        in_be32(&spu->problem->spu_runcntl_RW));
+        DUMP_VALUE("0x%x", problem->spu_status_R,
+                        in_be32(&spu->problem->spu_status_R));
+        DUMP_VALUE("0x%x", problem->spu_npc_RW,
+                        in_be32(&spu->problem->spu_npc_RW));
+        DUMP_FIELD(spu, "0x%p", priv2);
+        DUMP_FIELD(spu, "0x%p", pdata);
+}
+
+int
+spu_inst_dump(unsigned long adr, long count, int praddr)
+{
+        return generic_inst_dump(adr, count, praddr, print_insn_spu);
+}
+
+static void dump_spu_ls(unsigned long num, int subcmd)
+{
+        unsigned long offset, addr, ls_addr;
+
+        if (setjmp(bus_error_jmp) == 0) {
+                catch_memory_errors = 1;
+                sync();
+                ls_addr = (unsigned long)spu_info[num].spu->local_store;
+                sync();
+                __delay(200);
+        } else {
+                catch_memory_errors = 0;
+                printf("*** Error: accessing spu info for spu %d\n", num);
+                return;
+        }
+        catch_memory_errors = 0;
+
+        if (scanhex(&offset))
+                addr = ls_addr + offset;
+        else
+                addr = spu_info[num].dump_addr;
+
+        if (addr >= ls_addr + LS_SIZE) {
+                printf("*** Error: address outside of local store\n");
+                return;
+        }
+
+        switch (subcmd) {
+        case 'i':
+                addr += spu_inst_dump(addr, 16, 1);
+                last_cmd = "sdi\n";
+                break;
+        default:
+                prdump(addr, 64);
+                addr += 64;
+                last_cmd = "sd\n";
+                break;
+        }
+
+        spu_info[num].dump_addr = addr;
+}
+
+static int do_spu_cmd(void)
+{
+        static unsigned long num = 0;
+        int cmd, subcmd = 0;
+
+        cmd = inchar();
+        switch (cmd) {
+        case 's':
+                stop_spus();
+                break;
+        case 'r':
+                restart_spus();
+                break;
+        case 'd':
+                subcmd = inchar();
+                if (isxdigit(subcmd) || subcmd == '\n')
+                        termch = subcmd;
+        case 'f':
+                scanhex(&num);
+                if (num >= XMON_NUM_SPUS || !spu_info[num].spu) {
+                        printf("*** Error: invalid spu number\n");
+                        return 0;
+                }
+
+                switch (cmd) {
+                case 'f':
+                        dump_spu_fields(spu_info[num].spu);
+                        break;
+                default:
+                        dump_spu_ls(num, subcmd);
+                        break;
+                }
+
+                break;
+        default:
+                return -1;
+        }
+
+        return 0;
+}
+#else /* ! CONFIG_SPU_BASE */
+static int do_spu_cmd(void)
+{
+        return -1;
+}
+#endif
diff --git a/arch/ppc/.gitignore b/arch/ppc/.gitignore
new file mode 100644
index 000000000000..a1a869c8c840
--- /dev/null
+++ b/arch/ppc/.gitignore
@@ -0,0 +1 @@
+include
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c
index 2e1943e27819..06b84c372e58 100644
--- a/arch/ppc/8260_io/fcc_enet.c
+++ b/arch/ppc/8260_io/fcc_enet.c
@@ -385,6 +385,7 @@ struct fcc_enet_private {
         phy_info_t      *phy;
         struct work_struct phy_relink;
         struct work_struct phy_display_config;
+        struct net_device *dev;
 
         uint    sequence_done;
 
@@ -1391,10 +1392,11 @@ static phy_info_t *phy_info[] = {
         NULL
 };
 
-static void mii_display_status(void *data)
+static void mii_display_status(struct work_struct *work)
 {
-        struct net_device *dev = data;
-        volatile struct fcc_enet_private *fep = dev->priv;
+        volatile struct fcc_enet_private *fep =
+                container_of(work, struct fcc_enet_private, phy_relink);
+        struct net_device *dev = fep->dev;
         uint s = fep->phy_status;
 
         if (!fep->link && !fep->old_link) {
@@ -1428,10 +1430,12 @@ static void mii_display_status(void *data)
         printk(".\n");
 }
 
-static void mii_display_config(void *data)
+static void mii_display_config(struct work_struct *work)
 {
-        struct net_device *dev = data;
-        volatile struct fcc_enet_private *fep = dev->priv;
+        volatile struct fcc_enet_private *fep =
+                container_of(work, struct fcc_enet_private,
+                             phy_display_config);
+        struct net_device *dev = fep->dev;
         uint s = fep->phy_status;
 
         printk("%s: config: auto-negotiation ", dev->name);
@@ -1758,8 +1762,9 @@ static int __init fec_enet_init(void)
                 cep->phy_id_done = 0;
                 cep->phy_addr = fip->fc_phyaddr;
                 mii_queue(dev, mk_mii_read(MII_PHYSID1), mii_discover_phy);
-                INIT_WORK(&cep->phy_relink, mii_display_status, dev);
-                INIT_WORK(&cep->phy_display_config, mii_display_config, dev);
+                INIT_WORK(&cep->phy_relink, mii_display_status);
+                INIT_WORK(&cep->phy_display_config, mii_display_config);
+                cep->dev = dev;
 #endif  /* CONFIG_USE_MDIO */
 
                 fip++;
@@ -1887,10 +1892,10 @@ init_fcc_param(fcc_info_t *fip, struct net_device *dev,
         /* Allocate space for the buffer descriptors from regular memory.
          * Initialize base addresses for the buffer descriptors.
          */
-        cep->rx_bd_base = (cbd_t *)kmalloc(sizeof(cbd_t) * RX_RING_SIZE,
+        cep->rx_bd_base = kmalloc(sizeof(cbd_t) * RX_RING_SIZE,
                         GFP_KERNEL | GFP_DMA);
         ep->fen_genfcc.fcc_rbase = __pa(cep->rx_bd_base);
-        cep->tx_bd_base = (cbd_t *)kmalloc(sizeof(cbd_t) * TX_RING_SIZE,
+        cep->tx_bd_base = kmalloc(sizeof(cbd_t) * TX_RING_SIZE,
                         GFP_KERNEL | GFP_DMA);
         ep->fen_genfcc.fcc_tbase = __pa(cep->tx_bd_base);
 
diff --git a/arch/ppc/8xx_io/cs4218_tdm.c b/arch/ppc/8xx_io/cs4218_tdm.c
index 959d31c26cbb..b7bb5f0b3c5f 100644
--- a/arch/ppc/8xx_io/cs4218_tdm.c
+++ b/arch/ppc/8xx_io/cs4218_tdm.c
@@ -2165,7 +2165,7 @@ static int sq_release(struct inode *inode, struct file *file)
         int rc = 0;
 
         if (sq.busy)
-                rc = sq_fsync(file, file->f_dentry);
+                rc = sq_fsync(file, file->f_path.dentry);
         sound.soft = sound.dsp;
         sound.hard = sound.dsp;
         sound_silence();
@@ -2218,25 +2218,25 @@ static int sq_ioctl(struct inode *inode, struct file *file, u_int cmd,
                 return 0;
         case SNDCTL_DSP_POST:
         case SNDCTL_DSP_SYNC:
-                return sq_fsync(file, file->f_dentry);
+                return sq_fsync(file, file->f_path.dentry);
 
                 /* ++TeSche: before changing any of these it's
                  * probably wise to wait until sound playing has
                  * settled down. */
         case SNDCTL_DSP_SPEED:
-                sq_fsync(file, file->f_dentry);
+                sq_fsync(file, file->f_path.dentry);
                 IOCTL_IN(arg, data);
                 return IOCTL_OUT(arg, sound_set_speed(data));
         case SNDCTL_DSP_STEREO:
-                sq_fsync(file, file->f_dentry);
+                sq_fsync(file, file->f_path.dentry);
                 IOCTL_IN(arg, data);
                 return IOCTL_OUT(arg, sound_set_stereo(data));
         case SOUND_PCM_WRITE_CHANNELS:
-                sq_fsync(file, file->f_dentry);
+                sq_fsync(file, file->f_path.dentry);
                 IOCTL_IN(arg, data);
                 return IOCTL_OUT(arg, sound_set_stereo(data-1)+1);
         case SNDCTL_DSP_SETFMT:
-                sq_fsync(file, file->f_dentry);
+                sq_fsync(file, file->f_path.dentry);
                 IOCTL_IN(arg, data);
                 return IOCTL_OUT(arg, sound_set_format(data));
         case SNDCTL_DSP_GETFMTS:
@@ -2601,7 +2601,7 @@ int __init tdm8xx_sound_init(void)
         /* Initialize beep stuff */
         orig_mksound = kd_mksound;
         kd_mksound = cs_mksound;
-        beep_buf = (short *) kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL);
+        beep_buf = kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL);
         if (beep_buf == NULL)
                 printk(KERN_WARNING "dmasound: no memory for "
                        "beep buffer\n");
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c
index 2f9fa9e3d331..e6c28fb423b2 100644
--- a/arch/ppc/8xx_io/fec.c
+++ b/arch/ppc/8xx_io/fec.c
@@ -173,6 +173,7 @@ struct fec_enet_private {
         uint    phy_speed;
         phy_info_t      *phy;
         struct work_struct phy_task;
+        struct net_device *dev;
 
         uint    sequence_done;
 
@@ -1263,10 +1264,11 @@ static void mii_display_status(struct net_device *dev)
         printk(".\n");
 }
 
-static void mii_display_config(void *priv)
+static void mii_display_config(struct work_struct *work)
 {
-        struct net_device *dev = (struct net_device *)priv;
-        struct fec_enet_private *fep = dev->priv;
+        struct fec_enet_private *fep =
+                container_of(work, struct fec_enet_private, phy_task);
+        struct net_device *dev = fep->dev;
         volatile uint *s = &(fep->phy_status);
 
         printk("%s: config: auto-negotiation ", dev->name);
@@ -1295,10 +1297,11 @@ static void mii_display_config(void *priv)
         fep->sequence_done = 1;
 }
 
-static void mii_relink(void *priv)
+static void mii_relink(struct work_struct *work)
 {
-        struct net_device *dev = (struct net_device *)priv;
-        struct fec_enet_private *fep = dev->priv;
+        struct fec_enet_private *fep =
+                container_of(work, struct fec_enet_private, phy_task);
+        struct net_device *dev = fep->dev;
         int duplex;
 
         fep->link = (fep->phy_status & PHY_STAT_LINK) ? 1 : 0;
@@ -1325,7 +1328,8 @@ static void mii_queue_relink(uint mii_reg, struct net_device *dev)
 {
         struct fec_enet_private *fep = dev->priv;
 
-        INIT_WORK(&fep->phy_task, mii_relink, (void *)dev);
+        fep->dev = dev;
+        INIT_WORK(&fep->phy_task, mii_relink);
         schedule_work(&fep->phy_task);
 }
 
@@ -1333,7 +1337,8 @@ static void mii_queue_config(uint mii_reg, struct net_device *dev)
 {
         struct fec_enet_private *fep = dev->priv;
 
-        INIT_WORK(&fep->phy_task, mii_display_config, (void *)dev);
+        fep->dev = dev;
+        INIT_WORK(&fep->phy_task, mii_display_config);
         schedule_work(&fep->phy_task);
 }
 
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 077711e63104..8eb82efe05a1 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -19,6 +19,14 @@ config RWSEM_XCHGADD_ALGORITHM
         bool
         default y
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default y
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config GENERIC_HWEIGHT
         bool
         default y
@@ -52,6 +60,11 @@ config ARCH_MAY_HAVE_PC_FDC
         bool
         default y
 
+config GENERIC_BUG
+        bool
+        default y
+        depends on BUG
+
 source "init/Kconfig"
 
 menu "Processor"
@@ -77,9 +90,11 @@ config 6xx
 
 config 40x
         bool "40x"
+        select PPC_DCR_NATIVE
 
 config 44x
         bool "44x"
+        select PPC_DCR_NATIVE
 
 config 8xx
         bool "8xx"
@@ -95,6 +110,15 @@ endchoice
 config PPC_FPU
         bool
 
+config PPC_DCR_NATIVE
+        bool
+        default n
+
+config PPC_DCR
+        bool
+        depends on PPC_DCR_NATIVE
+        default y
+
 config BOOKE
         bool
         depends on E200 || E500
@@ -600,7 +624,7 @@ config HDPU
           Select HDPU if configuring a Sky Computers Compute Blade.
 
 config HDPU_FEATURES
-        depends HDPU
+        depends on HDPU
         tristate "HDPU-Features"
         help
           Select to enable HDPU enhanced features.
@@ -711,7 +735,7 @@ config LITE5200
 
 config LITE5200B
         bool "Freescale LITE5200B"
-        depends LITE5200
+        depends on LITE5200
         help
           Support for the LITE5200B dev board for the MPC5200 from Freescale.
           This is the new board with 2 PCI slots.
@@ -724,7 +748,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/ppc/boot/images/.gitignore b/arch/ppc/boot/images/.gitignore
new file mode 100644
index 000000000000..21c2dc5b6b78
--- /dev/null
+++ b/arch/ppc/boot/images/.gitignore
@@ -0,0 +1,6 @@
+sImage
+vmapus
+vmlinux*
+miboot*
+zImage*
+uImage
diff --git a/arch/ppc/boot/lib/.gitignore b/arch/ppc/boot/lib/.gitignore
new file mode 100644
index 000000000000..1629a6167755
--- /dev/null
+++ b/arch/ppc/boot/lib/.gitignore
@@ -0,0 +1,3 @@
+inffast.c
+inflate.c
+inftrees.c
diff --git a/arch/ppc/boot/utils/.gitignore b/arch/ppc/boot/utils/.gitignore
new file mode 100644
index 000000000000..bbdfb3b9c532
--- /dev/null
+++ b/arch/ppc/boot/utils/.gitignore
@@ -0,0 +1,3 @@
+mkprep
+mkbugboot
+mktree
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 63808e01cb0b..5e723c4c2571 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -879,7 +879,7 @@ pci_resource_to_bus(struct pci_dev *pdev, struct resource *res)
 
 
 static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
-                                               unsigned long *offset,
+                                               resource_size_t *offset,
                                                enum pci_mmap_state mmap_state)
 {
         struct pci_controller *hose = pci_bus_to_hose(dev->bus->number);
@@ -891,7 +891,9 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
 
         /* If memory, add on the PCI bridge address offset */
         if (mmap_state == pci_mmap_mem) {
+#if 0 /* See comment in pci_resource_to_user() for why this is disabled */
                 *offset += hose->pci_mem_offset;
+#endif
                 res_bit = IORESOURCE_MEM;
         } else {
                 io_offset = hose->io_base_virt - ___IO_BASE;
@@ -1030,7 +1032,7 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                         enum pci_mmap_state mmap_state,
                         int write_combine)
 {
-        unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
+        resource_size_t offset = vma->vm_pgoff << PAGE_SHIFT;
         struct resource *rp;
         int ret;
 
@@ -1132,21 +1134,42 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar,
                           resource_size_t *start, resource_size_t *end)
 {
         struct pci_controller *hose = pci_bus_to_hose(dev->bus->number);
-        unsigned long offset = 0;
+        resource_size_t offset = 0;
 
         if (hose == NULL)
                 return;
 
         if (rsrc->flags & IORESOURCE_IO)
-                offset = ___IO_BASE - hose->io_base_virt + hose->io_base_phys;
+                offset = (unsigned long)hose->io_base_virt - _IO_BASE;
+
+        /* We pass a fully fixed up address to userland for MMIO instead of
+         * a BAR value because X is lame and expects to be able to use that
+         * to pass to /dev/mem !
+         *
+         * That means that we'll have potentially 64 bits values where some
+         * userland apps only expect 32 (like X itself since it thinks only
+         * Sparc has 64 bits MMIO) but if we don't do that, we break it on
+         * 32 bits CHRPs :-(
+         *
+         * Hopefully, the sysfs insterface is immune to that gunk. Once X
+         * has been fixed (and the fix spread enough), we can re-enable the
+         * 2 lines below and pass down a BAR value to userland. In that case
+         * we'll also have to re-enable the matching code in
+         * __pci_mmap_make_offset().
+         *
+         * BenH.
+         */
+#if 0
+        else if (rsrc->flags & IORESOURCE_MEM)
+                offset = hose->pci_mem_offset;
+#endif
 
-        *start = rsrc->start + offset;
-        *end = rsrc->end + offset;
+        *start = rsrc->start - offset;
+        *end = rsrc->end - offset;
 }
 
-void __init
-pci_init_resource(struct resource *res, unsigned long start, unsigned long end,
-                  int flags, char *name)
+void __init pci_init_resource(struct resource *res, resource_size_t start,
+                              resource_size_t end, int flags, char *name)
 {
         res->start = start;
         res->end = end;
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index 27faeca2c7a2..3c506af19880 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -313,7 +313,7 @@ early_init(int r3, int r4, int r5)
          * Identify the CPU type and fix up code sections
          * that depend on which cpu we have.
          */
-        spec = identify_cpu(offset);
+        spec = identify_cpu(offset, mfspr(SPRN_PVR));
         do_feature_fixups(spec->cpu_features,
                           PTRRELOC(&__start___ftr_fixup),
                           PTRRELOC(&__stop___ftr_fixup));
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c
index 9661a91183b3..810f7aa72e92 100644
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
@@ -28,6 +28,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/prctl.h>
+#include <linux/bug.h>
 
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
@@ -316,7 +317,7 @@ void machine_check_exception(struct pt_regs *regs)
         if (reason & MCSR_BUS_RBERR)
                 printk("Bus - Read Data Bus Error\n");
         if (reason & MCSR_BUS_WBERR)
-                printk("Bus - Read Data Bus Error\n");
+                printk("Bus - Write Data Bus Error\n");
         if (reason & MCSR_BUS_IPERR)
                 printk("Bus - Instruction Parity Error\n");
         if (reason & MCSR_BUS_RPERR)
@@ -559,64 +560,9 @@ static void emulate_single_step(struct pt_regs *regs)
         }
 }
 
-/*
- * Look through the list of trap instructions that are used for BUG(),
- * BUG_ON() and WARN_ON() and see if we hit one.  At this point we know
- * that the exception was caused by a trap instruction of some kind.
- * Returns 1 if we should continue (i.e. it was a WARN_ON) or 0
- * otherwise.
- */
-extern struct bug_entry __start___bug_table[], __stop___bug_table[];
-
-#ifndef CONFIG_MODULES
-#define module_find_bug(x)      NULL
-#endif
-
-struct bug_entry *find_bug(unsigned long bugaddr)
+int is_valid_bugaddr(unsigned long addr)
 {
-        struct bug_entry *bug;
-
-        for (bug = __start___bug_table; bug < __stop___bug_table; ++bug)
-                if (bugaddr == bug->bug_addr)
-                        return bug;
-        return module_find_bug(bugaddr);
-}
-
-int check_bug_trap(struct pt_regs *regs)
-{
-        struct bug_entry *bug;
-        unsigned long addr;
-
-        if (regs->msr & MSR_PR)
-                return 0;       /* not in kernel */
-        addr = regs->nip;       /* address of trap instruction */
-        if (addr < PAGE_OFFSET)
-                return 0;
-        bug = find_bug(regs->nip);
-        if (bug == NULL)
-                return 0;
-        if (bug->line & BUG_WARNING_TRAP) {
-                /* this is a WARN_ON rather than BUG/BUG_ON */
-#ifdef CONFIG_XMON
-                xmon_printf(KERN_ERR "Badness in %s at %s:%ld\n",
-                       bug->function, bug->file,
-                       bug->line & ~BUG_WARNING_TRAP);
-#endif /* CONFIG_XMON */                
-                printk(KERN_ERR "Badness in %s at %s:%ld\n",
-                       bug->function, bug->file,
-                       bug->line & ~BUG_WARNING_TRAP);
-                dump_stack();
-                return 1;
-        }
-#ifdef CONFIG_XMON
-        xmon_printf(KERN_CRIT "kernel BUG in %s at %s:%ld!\n",
-               bug->function, bug->file, bug->line);
-        xmon(regs);
-#endif /* CONFIG_XMON */
-        printk(KERN_CRIT "kernel BUG in %s at %s:%ld!\n",
-               bug->function, bug->file, bug->line);
-
-        return 0;
+        return addr >= PAGE_OFFSET;
 }
 
 void program_check_exception(struct pt_regs *regs)
@@ -671,7 +617,9 @@ void program_check_exception(struct pt_regs *regs)
                 /* trap exception */
                 if (debugger_bpt(regs))
                         return;
-                if (check_bug_trap(regs)) {
+
+                if (!(regs->msr & MSR_PR) &&  /* not user-mode */
+                    report_bug(regs->nip) == BUG_TRAP_TYPE_WARN) {
                         regs->nip += 4;
                         return;
                 }
diff --git a/arch/ppc/kernel/vmlinux.lds.S b/arch/ppc/kernel/vmlinux.lds.S
index 16e8661e1fec..61921268a0d0 100644
--- a/arch/ppc/kernel/vmlinux.lds.S
+++ b/arch/ppc/kernel/vmlinux.lds.S
@@ -31,6 +31,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
+    _text = .;
     *(.text)
     SCHED_TEXT
     LOCK_TEXT
diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig
index 293bd489e7d9..6980de420e92 100644
--- a/arch/ppc/platforms/4xx/Kconfig
+++ b/arch/ppc/platforms/4xx/Kconfig
@@ -189,7 +189,7 @@ config BIOS_FIXUP
 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
 config 403GCX
         bool
-        depends OAK
+        depends on OAK
         default y
 
 config 405EP
diff --git a/arch/ppc/platforms/4xx/bubinga.c b/arch/ppc/platforms/4xx/bubinga.c
index 4009f4983ca6..75857b38e894 100644
--- a/arch/ppc/platforms/4xx/bubinga.c
+++ b/arch/ppc/platforms/4xx/bubinga.c
@@ -116,6 +116,7 @@ bubinga_early_serial_map(void)
 void __init
 bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 {
+#ifdef CONFIG_PCI
 
         unsigned int bar_response, bar;
         /*
@@ -212,6 +213,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
         printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la)));
 
 #endif
+#endif
 }
 
 void __init
diff --git a/arch/ppc/platforms/4xx/cpci405.c b/arch/ppc/platforms/4xx/cpci405.c
index 367430998fc5..8474b05b795a 100644
--- a/arch/ppc/platforms/4xx/cpci405.c
+++ b/arch/ppc/platforms/4xx/cpci405.c
@@ -126,6 +126,7 @@ cpci405_setup_arch(void)
 void __init
 bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 {
+#ifdef CONFIG_PCI
         unsigned int bar_response, bar;
 
         /* Disable region first */
@@ -167,6 +168,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
                                         PCI_FUNC(hose->first_busno), bar,
                                         &bar_response);
         }
+#endif
 }
 
 void __init
diff --git a/arch/ppc/platforms/4xx/ep405.c b/arch/ppc/platforms/4xx/ep405.c
index ae5c82081c95..e5adf9ba1fca 100644
--- a/arch/ppc/platforms/4xx/ep405.c
+++ b/arch/ppc/platforms/4xx/ep405.c
@@ -68,6 +68,7 @@ ep405_setup_arch(void)
 void __init
 bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 {
+#ifdef CONFIG_PCI
         unsigned int bar_response, bar;
         /*
          * Expected PCI mapping:
@@ -130,6 +131,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
                     PCI_FUNC(hose->first_busno), bar, bar_response);
         }
         /* end work arround */
+#endif
 }
 
 void __init
diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.c b/arch/ppc/platforms/83xx/mpc834x_sys.c
index 3397f0de1592..b84f8df325c4 100644
--- a/arch/ppc/platforms/83xx/mpc834x_sys.c
+++ b/arch/ppc/platforms/83xx/mpc834x_sys.c
@@ -121,8 +121,8 @@ mpc834x_sys_setup_arch(void)
 
         mdata->irq[0] = MPC83xx_IRQ_EXT1;
         mdata->irq[1] = MPC83xx_IRQ_EXT2;
-        mdata->irq[2] = -1;
-        mdata->irq[31] = -1;
+        mdata->irq[2] = PHY_POLL;
+        mdata->irq[31] = PHY_POLL;
 
         /* setup the board related information for the enet controllers */
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC83xx_TSEC1);
diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.c b/arch/ppc/platforms/85xx/mpc8540_ads.c
index 4f839da6782f..00a3ba57063f 100644
--- a/arch/ppc/platforms/85xx/mpc8540_ads.c
+++ b/arch/ppc/platforms/85xx/mpc8540_ads.c
@@ -92,9 +92,9 @@ mpc8540ads_setup_arch(void)
 
         mdata->irq[0] = MPC85xx_IRQ_EXT5;
         mdata->irq[1] = MPC85xx_IRQ_EXT5;
-        mdata->irq[2] = -1;
+        mdata->irq[2] = PHY_POLL;
         mdata->irq[3] = MPC85xx_IRQ_EXT5;
-        mdata->irq[31] = -1;
+        mdata->irq[31] = PHY_POLL;
 
         /* setup the board related information for the enet controllers */
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.c b/arch/ppc/platforms/85xx/mpc8560_ads.c
index 14ecec7bbed7..3a060468dd95 100644
--- a/arch/ppc/platforms/85xx/mpc8560_ads.c
+++ b/arch/ppc/platforms/85xx/mpc8560_ads.c
@@ -156,9 +156,9 @@ mpc8560ads_setup_arch(void)
 
         mdata->irq[0] = MPC85xx_IRQ_EXT5;
         mdata->irq[1] = MPC85xx_IRQ_EXT5;
-        mdata->irq[2] = -1;
+        mdata->irq[2] = PHY_POLL;
         mdata->irq[3] = MPC85xx_IRQ_EXT5;
-        mdata->irq[31] = -1;
+        mdata->irq[31] = PHY_POLL;
 
         /* setup the board related information for the enet controllers */
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index 5ce0f69c1db6..2d59eb776c95 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -451,9 +451,9 @@ mpc85xx_cds_setup_arch(void)
 
         mdata->irq[0] = MPC85xx_IRQ_EXT5;
         mdata->irq[1] = MPC85xx_IRQ_EXT5;
-        mdata->irq[2] = -1;
-        mdata->irq[3] = -1;
-        mdata->irq[31] = -1;
+        mdata->irq[2] = PHY_POLL;
+        mdata->irq[3] = PHY_POLL;
+        mdata->irq[31] = PHY_POLL;
 
         /* setup the board related information for the enet controllers */
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
diff --git a/arch/ppc/platforms/85xx/sbc8560.c b/arch/ppc/platforms/85xx/sbc8560.c
index 764d580ff535..1d10ab98f66d 100644
--- a/arch/ppc/platforms/85xx/sbc8560.c
+++ b/arch/ppc/platforms/85xx/sbc8560.c
@@ -129,7 +129,7 @@ sbc8560_setup_arch(void)
 
         mdata->irq[25] = MPC85xx_IRQ_EXT6;
         mdata->irq[26] = MPC85xx_IRQ_EXT7;
-        mdata->irq[31] = -1;
+        mdata->irq[31] = PHY_POLL;
 
         /* setup the board related information for the enet controllers */
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
diff --git a/arch/ppc/platforms/85xx/stx_gp3.c b/arch/ppc/platforms/85xx/stx_gp3.c
index 4bb18ab27672..b1f5b737c70d 100644
--- a/arch/ppc/platforms/85xx/stx_gp3.c
+++ b/arch/ppc/platforms/85xx/stx_gp3.c
@@ -123,7 +123,7 @@ gp3_setup_arch(void)
 
         mdata->irq[2] = MPC85xx_IRQ_EXT5;
         mdata->irq[4] = MPC85xx_IRQ_EXT5;
-        mdata->irq[31] = -1;
+        mdata->irq[31] = PHY_POLL;
 
         /* setup the board related information for the enet controllers */
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
diff --git a/arch/ppc/platforms/85xx/tqm85xx.c b/arch/ppc/platforms/85xx/tqm85xx.c
index dd45f2e18449..4ee2bd156dc5 100644
--- a/arch/ppc/platforms/85xx/tqm85xx.c
+++ b/arch/ppc/platforms/85xx/tqm85xx.c
@@ -137,9 +137,9 @@ tqm85xx_setup_arch(void)
 
         mdata->irq[0] = MPC85xx_IRQ_EXT8;
         mdata->irq[1] = MPC85xx_IRQ_EXT8;
-        mdata->irq[2] = -1;
+        mdata->irq[2] = PHY_POLL;
         mdata->irq[3] = MPC85xx_IRQ_EXT8;
-        mdata->irq[31] = -1;
+        mdata->irq[31] = PHY_POLL;
 
         /* setup the board related information for the enet controllers */
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
diff --git a/arch/ppc/platforms/mpc8272ads_setup.c b/arch/ppc/platforms/mpc8272ads_setup.c
index 1f9ea36837b1..0bc06768cf24 100644
--- a/arch/ppc/platforms/mpc8272ads_setup.c
+++ b/arch/ppc/platforms/mpc8272ads_setup.c
@@ -266,10 +266,10 @@ static void __init mpc8272ads_fixup_mdio_pdata(struct platform_device *pdev,
                                               int idx)
 {
         m82xx_mii_bb_pdata.irq[0] = PHY_INTERRUPT;
-        m82xx_mii_bb_pdata.irq[1] = -1;
-        m82xx_mii_bb_pdata.irq[2] = -1;
+        m82xx_mii_bb_pdata.irq[1] = PHY_POLL;
+        m82xx_mii_bb_pdata.irq[2] = PHY_POLL;
         m82xx_mii_bb_pdata.irq[3] = PHY_INTERRUPT;
-        m82xx_mii_bb_pdata.irq[31] = -1;
+        m82xx_mii_bb_pdata.irq[31] = PHY_POLL;
 
 
         m82xx_mii_bb_pdata.mdio_dat.offset =
diff --git a/arch/ppc/platforms/mpc866ads_setup.c b/arch/ppc/platforms/mpc866ads_setup.c
index e95d2c111747..8a0c07eb4449 100644
--- a/arch/ppc/platforms/mpc866ads_setup.c
+++ b/arch/ppc/platforms/mpc866ads_setup.c
@@ -361,7 +361,7 @@ int __init mpc866ads_init(void)
 
         fmpi->mii_speed = ((((bd->bi_intfreq + 4999999) / 2500000) / 2) & 0x3F) << 1;
         /* No PHY interrupt line here */
-        fmpi->irq[0xf] = -1;
+        fmpi->irq[0xf] = PHY_POLL;
 
 /* Since either of the uarts could be used as console, they need to ready */
 #ifdef CONFIG_SERIAL_CPM_SMC1
@@ -380,7 +380,7 @@ int __init mpc866ads_init(void)
 
         fmpi->mii_speed = ((((bd->bi_intfreq + 4999999) / 2500000) / 2) & 0x3F) << 1;
         /* No PHY interrupt line here */
-        fmpi->irq[0xf] = -1;
+        fmpi->irq[0xf] = PHY_POLL;
 
         return 0;
 }
diff --git a/arch/ppc/syslib/mpc8xx_devices.c b/arch/ppc/syslib/mpc8xx_devices.c
index cf5ab47487a7..31fb56593d17 100644
--- a/arch/ppc/syslib/mpc8xx_devices.c
+++ b/arch/ppc/syslib/mpc8xx_devices.c
@@ -78,7 +78,7 @@ struct platform_device ppc_sys_platform_devices[] = {
                         {
                                 .name   = "pram",
                                 .start  = 0x3c00,
-                                .end    = 0x3c80,
+                                .end    = 0x3c7f,
                                 .flags  = IORESOURCE_MEM,
                         },
                         {
@@ -103,7 +103,7 @@ struct platform_device ppc_sys_platform_devices[] = {
                         {
                                 .name   = "pram",
                                 .start  = 0x3d00,
-                                .end    = 0x3d80,
+                                .end    = 0x3d7f,
                                 .flags  = IORESOURCE_MEM,
                         },
 
@@ -129,7 +129,7 @@ struct platform_device ppc_sys_platform_devices[] = {
                         {
                                 .name   = "pram",
                                 .start  = 0x3e00,
-                                .end    = 0x3e80,
+                                .end    = 0x3e7f,
                                 .flags  = IORESOURCE_MEM,
                         },
 
@@ -155,7 +155,7 @@ struct platform_device ppc_sys_platform_devices[] = {
                         {
                                 .name   = "pram",
                                 .start  = 0x3f00,
-                                .end    = 0x3f80,
+                                .end    = 0x3f7f,
                                 .flags  = IORESOURCE_MEM,
                         },
 
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 245b81bc7157..12272361c018 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -22,6 +22,14 @@ config RWSEM_XCHGADD_ALGORITHM
         bool
         default y
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config GENERIC_HWEIGHT
         bool
         default y
@@ -33,9 +41,6 @@ config GENERIC_CALIBRATE_DELAY
 config GENERIC_TIME
         def_bool y
 
-config GENERIC_BUST_SPINLOCK
-        bool
-
 mainmenu "Linux Kernel Configuration"
 
 config S390
@@ -181,7 +186,7 @@ config PACK_STACK
 
 config SMALL_STACK
         bool "Use 4kb/8kb for kernel stack instead of 8kb/16kb"
-        depends on PACK_STACK
+        depends on PACK_STACK && !LOCKDEP
         help
           If you say Y here and the compiler supports the -mkernel-backchain
           option the kernel will use a smaller kernel stack size. For 31 bit
@@ -236,8 +241,14 @@ config WARN_STACK_SIZE
           This allows you to specify the maximum frame size a function may
           have without the compiler complaining about it.
 
+config ARCH_POPULATES_NODE_MAP
+        def_bool y
+
 source "mm/Kconfig"
 
+config HOLES_IN_ZONE
+        def_bool y
+
 comment "I/O subsystem configuration"
 
 config MACHCHK_WARNING
@@ -261,14 +272,6 @@ config QDIO
 
           If unsure, say Y.
 
-config QDIO_PERF_STATS
-        bool "Performance statistics in /proc"
-        depends on QDIO
-        help
-          Say Y here to get performance statistics in /proc/qdio_perf
-
-          If unsure, say N.
-
 config QDIO_DEBUG
         bool "Extended debugging information"
         depends on QDIO
@@ -404,7 +407,7 @@ config APPLDATA_BASE
 
 config APPLDATA_MEM
         tristate "Monitor memory management statistics"
-        depends on APPLDATA_BASE
+        depends on APPLDATA_BASE && VM_EVENT_COUNTERS
         help
           This provides memory management related data to the Linux - VM Monitor
           Stream, like paging/swapping rate, memory utilisation, etc.
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 5deb9f7544a1..6598e5268573 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -35,6 +35,9 @@ cflags-$(CONFIG_MARCH_Z900) += $(call cc-option,-march=z900)
 cflags-$(CONFIG_MARCH_Z990) += $(call cc-option,-march=z990)
 cflags-$(CONFIG_MARCH_Z9_109) += $(call cc-option,-march=z9-109)
 
+#KBUILD_IMAGE is necessary for make rpm
+KBUILD_IMAGE    :=arch/s390/boot/image
+
 #
 # Prevent tail-call optimizations, to get clearer backtraces:
 #
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index af1e8fc7d985..b8c237290263 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -92,8 +92,8 @@ static int appldata_timer_active;
  * Work queue
  */
 static struct workqueue_struct *appldata_wq;
-static void appldata_work_fn(void *data);
-static DECLARE_WORK(appldata_work, appldata_work_fn, NULL);
+static void appldata_work_fn(struct work_struct *work);
+static DECLARE_WORK(appldata_work, appldata_work_fn);
 
 
 /*
@@ -125,7 +125,7 @@ static void appldata_timer_function(unsigned long data)
  *
  * call data gathering function for each (active) module
  */
-static void appldata_work_fn(void *data)
+static void appldata_work_fn(struct work_struct *work)
 {
         struct list_head *lh;
         struct appldata_ops *ops;
@@ -561,7 +561,6 @@ appldata_offline_cpu(int cpu)
         spin_unlock(&appldata_timer_lock);
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
 static int __cpuinit
 appldata_cpu_notify(struct notifier_block *self,
                     unsigned long action, void *hcpu)
@@ -582,7 +581,6 @@ appldata_cpu_notify(struct notifier_block *self,
 static struct notifier_block appldata_nb = {
         .notifier_call = appldata_cpu_notify,
 };
-#endif
 
 /*
  * appldata_init()
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index 7cd51e73e274..5368cf4a350e 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -1,14 +1,15 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19-rc2
-# Wed Oct 18 17:11:10 2006
+# Linux kernel version: 2.6.20-rc1
+# Fri Dec 15 16:52:28 2006
 #
 CONFIG_MMU=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_TIME=y
 CONFIG_S390=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -37,12 +38,13 @@ CONFIG_AUDIT=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_CPUSETS is not set
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
-# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -119,6 +121,7 @@ CONFIG_PACK_STACK=y
 CONFIG_CHECK_STACK=y
 CONFIG_STACK_GUARD=256
 # CONFIG_WARN_STACK is not set
+CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -128,13 +131,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
+CONFIG_HOLES_IN_ZONE=y
 
 #
 # I/O subsystem configuration
 #
 CONFIG_MACHCHK_WARNING=y
 CONFIG_QDIO=y
-# CONFIG_QDIO_PERF_STATS is not set
 # CONFIG_QDIO_DEBUG is not set
 
 #
@@ -197,6 +200,7 @@ CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
@@ -212,7 +216,6 @@ CONFIG_INET6_XFRM_MODE_BEET=y
 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
 CONFIG_IPV6_SIT=y
 # CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IPV6_SUBTREES is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
@@ -247,6 +250,7 @@ CONFIG_IPV6_SIT=y
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_FIFO=y
 CONFIG_NET_SCH_CLK_JIFFIES=y
 # CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
 # CONFIG_NET_SCH_CLK_CPU is not set
@@ -278,6 +282,7 @@ CONFIG_NET_CLS_ROUTE=y
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 # CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 # CONFIG_NET_EMATCH is not set
@@ -316,6 +321,7 @@ CONFIG_SYS_HYPERVISOR=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
 CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
 
@@ -336,6 +342,7 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
 
 #
 # SCSI Transports
@@ -547,6 +554,7 @@ CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_FUSE_FS is not set
+CONFIG_GENERIC_ACL=y
 
 #
 # CD-ROM/DVD Filesystems
@@ -572,7 +580,7 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-# CONFIG_CONFIGFS_FS is not set
+CONFIG_CONFIGFS_FS=m
 
 #
 # Miscellaneous filesystems
@@ -617,7 +625,6 @@ CONFIG_SUNRPC=y
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
 # CONFIG_9P_FS is not set
-CONFIG_GENERIC_ACL=y
 
 #
 # Partition Types
@@ -647,6 +654,14 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 
 #
+# Distributed Lock Manager
+#
+CONFIG_DLM=m
+CONFIG_DLM_TCP=y
+# CONFIG_DLM_SCTP is not set
+# CONFIG_DLM_DEBUG is not set
+
+#
 # Instrumentation Support
 #
 
@@ -664,6 +679,8 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+CONFIG_HEADERS_CHECK=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_SCHEDSTATS is not set
@@ -680,13 +697,11 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_INFO is not set
-CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_FRAME_POINTER is not set
 # CONFIG_UNWIND_INFO is not set
 CONFIG_FORCED_INLINING=y
-CONFIG_HEADERS_CHECK=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_LKDTM is not set
 
@@ -700,10 +715,11 @@ CONFIG_HEADERS_CHECK=y
 # Cryptographic options
 #
 CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=m
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_MANAGER=y
 # CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_MD4 is not set
 # CONFIG_CRYPTO_MD5 is not set
@@ -714,8 +730,10 @@ CONFIG_CRYPTO_MANAGER=m
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_LRW is not set
 # CONFIG_CRYPTO_DES is not set
 # CONFIG_CRYPTO_DES_S390 is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
@@ -741,8 +759,10 @@ CONFIG_CRYPTO_CBC=m
 #
 # Library routines
 #
+CONFIG_BITREVERSE=m
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=m
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c
index 443fa377d9ff..2782cf9da5b4 100644
--- a/arch/s390/hypfs/hypfs_diag.c
+++ b/arch/s390/hypfs/hypfs_diag.c
@@ -379,7 +379,7 @@ static void *diag204_alloc_vbuf(int pages)
 static void *diag204_alloc_rbuf(void)
 {
         diag204_buf = (void*)__get_free_pages(GFP_KERNEL,0);
-        if (diag204_buf)
+        if (!diag204_buf)
                 return ERR_PTR(-ENOMEM);
         diag204_buf_pages = 1;
         return diag204_buf;
@@ -521,7 +521,7 @@ __init int hypfs_diag_init(void)
         }
         rc = diag224_get_name_table();
         if (rc) {
-                diag224_delete_name_table();
+                diag204_free_buffer();
                 printk(KERN_ERR "hypfs: could not get name table.\n");
         }
         return rc;
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index cd702ae45d6d..b6716c4b9934 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -109,7 +109,7 @@ static void hypfs_drop_inode(struct inode *inode)
 
 static int hypfs_open(struct inode *inode, struct file *filp)
 {
-        char *data = filp->f_dentry->d_inode->i_private;
+        char *data = filp->f_path.dentry->d_inode->i_private;
         struct hypfs_sb_info *fs_info;
 
         if (filp->f_mode & FMODE_WRITE) {
@@ -174,7 +174,7 @@ static ssize_t hypfs_aio_write(struct kiocb *iocb, const struct iovec *iov,
         struct hypfs_sb_info *fs_info;
         size_t count = iov_length(iov, nr_segs);
 
-        sb = iocb->ki_filp->f_dentry->d_inode->i_sb;
+        sb = iocb->ki_filp->f_path.dentry->d_inode->i_sb;
         fs_info = sb->s_fs_info;
         /*
          * Currently we only allow one update per second for two reasons:
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index aa978978d3d1..a81881c9b297 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -4,7 +4,7 @@
 
 EXTRA_AFLAGS    := -traditional
 
-obj-y   :=  bitmap.o traps.o time.o process.o \
+obj-y   :=  bitmap.o traps.o time.o process.o reset.o \
             setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
             semaphore.o s390_ext.o debug.o profile.o irq.o ipl.o
 
diff --git a/arch/s390/kernel/binfmt_elf32.c b/arch/s390/kernel/binfmt_elf32.c
index 9565a2dcfadc..5c46054195cb 100644
--- a/arch/s390/kernel/binfmt_elf32.c
+++ b/arch/s390/kernel/binfmt_elf32.c
@@ -176,7 +176,6 @@ struct elf_prpsinfo32
 
 #include <linux/highuid.h>
 
-#define elf_addr_t      u32
 /*
 #define init_elf_binfmt init_elf32_binfmt
 */
diff --git a/arch/s390/kernel/cpcmd.c b/arch/s390/kernel/cpcmd.c
index 1eae74e72f95..a5972f1541fe 100644
--- a/arch/s390/kernel/cpcmd.c
+++ b/arch/s390/kernel/cpcmd.c
@@ -21,14 +21,15 @@ static DEFINE_SPINLOCK(cpcmd_lock);
 static char cpcmd_buf[241];
 
 /*
- * the caller of __cpcmd has to ensure that the response buffer is below 2 GB
+ * __cpcmd has some restrictions over cpcmd
+ *  - the response buffer must reside below 2GB (if any)
+ *  - __cpcmd is unlocked and therefore not SMP-safe
  */
 int  __cpcmd(const char *cmd, char *response, int rlen, int *response_code)
 {
-        unsigned long flags, cmdlen;
+        unsigned cmdlen;
         int return_code, return_len;
 
-        spin_lock_irqsave(&cpcmd_lock, flags);
         cmdlen = strlen(cmd);
         BUG_ON(cmdlen > 240);
         memcpy(cpcmd_buf, cmd, cmdlen);
@@ -74,7 +75,6 @@ int  __cpcmd(const char *cmd, char *response, int rlen, int *response_code)
                         : "+d" (reg3) : "d" (reg2) : "cc");
                 return_code = (int) reg3;
         }
-        spin_unlock_irqrestore(&cpcmd_lock, flags);
         if (response_code != NULL)
                 *response_code = return_code;
         return return_len;
@@ -82,15 +82,18 @@ int  __cpcmd(const char *cmd, char *response, int rlen, int *response_code)
 
 EXPORT_SYMBOL(__cpcmd);
 
-#ifdef CONFIG_64BIT
 int cpcmd(const char *cmd, char *response, int rlen, int *response_code)
 {
         char *lowbuf;
         int len;
+        unsigned long flags;
 
         if ((rlen == 0) || (response == NULL)
-            || !((unsigned long)response >> 31))
+            || !((unsigned long)response >> 31)) {
+                spin_lock_irqsave(&cpcmd_lock, flags);
                 len = __cpcmd(cmd, response, rlen, response_code);
+                spin_unlock_irqrestore(&cpcmd_lock, flags);
+        }
         else {
                 lowbuf = kmalloc(rlen, GFP_KERNEL | GFP_DMA);
                 if (!lowbuf) {
@@ -98,7 +101,9 @@ int cpcmd(const char *cmd, char *response, int rlen, int *response_code)
                                 "cpcmd: could not allocate response buffer\n");
                         return -ENOMEM;
                 }
+                spin_lock_irqsave(&cpcmd_lock, flags);
                 len = __cpcmd(cmd, lowbuf, rlen, response_code);
+                spin_unlock_irqrestore(&cpcmd_lock, flags);
                 memcpy(response, lowbuf, rlen);
                 kfree(lowbuf);
         }
@@ -106,4 +111,3 @@ int cpcmd(const char *cmd, char *response, int rlen, int *response_code)
 }
 
 EXPORT_SYMBOL(cpcmd);
-#endif          /* CONFIG_64BIT */
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index 43f3d0c7e132..bb57bc0e3fc8 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -191,13 +191,13 @@ debug_areas_alloc(int pages_per_area, int nr_areas)
         debug_entry_t*** areas;
         int i,j;
 
-        areas = (debug_entry_t ***) kmalloc(nr_areas *
+        areas = kmalloc(nr_areas *
                                         sizeof(debug_entry_t**),
                                         GFP_KERNEL);
         if (!areas)
                 goto fail_malloc_areas;
         for (i = 0; i < nr_areas; i++) {
-                areas[i] = (debug_entry_t**) kmalloc(pages_per_area *
+                areas[i] = kmalloc(pages_per_area *
                                 sizeof(debug_entry_t*),GFP_KERNEL);
                 if (!areas[i]) {
                         goto fail_malloc_areas2;
@@ -242,7 +242,7 @@ debug_info_alloc(char *name, int pages_per_area, int nr_areas, int buf_size,
 
         /* alloc everything */
 
-        rc = (debug_info_t*) kmalloc(sizeof(debug_info_t), GFP_KERNEL);
+        rc = kmalloc(sizeof(debug_info_t), GFP_KERNEL);
         if(!rc)
                 goto fail_malloc_rc;
         rc->active_entries = kcalloc(nr_areas, sizeof(int), GFP_KERNEL);
@@ -603,13 +603,13 @@ debug_open(struct inode *inode, struct file *file)
         debug_info_t *debug_info, *debug_info_snapshot;
 
         down(&debug_lock);
-        debug_info = file->f_dentry->d_inode->i_private;
+        debug_info = file->f_path.dentry->d_inode->i_private;
         /* find debug view */
         for (i = 0; i < DEBUG_MAX_VIEWS; i++) {
                 if (!debug_info->views[i])
                         continue;
                 else if (debug_info->debugfs_entries[i] ==
-                         file->f_dentry) {
+                         file->f_path.dentry) {
                         goto found;     /* found view ! */
                 }
         }
@@ -634,7 +634,7 @@ found:
                 rc = -ENOMEM;
                 goto out;
         }
-        p_info = (file_private_info_t *) kmalloc(sizeof(file_private_info_t),
+        p_info = kmalloc(sizeof(file_private_info_t),
                                                 GFP_KERNEL);
         if(!p_info){
                 if(debug_info_snapshot)
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index 0cf59bb7a857..8f8c802f1bcf 100644
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -418,24 +418,6 @@ start:
 .gotr:
         l       %r10,.tbl               # EBCDIC to ASCII table
         tr      0(240,%r8),0(%r10)
-        stidp   __LC_CPUID              # Are we running on VM maybe
-        cli     __LC_CPUID,0xff
-        bnz     .test
-        .long   0x83300060              # diag 3,0,x'0060' - storage size
-        b       .done
-.test:
-        mvc     0x68(8),.pgmnw          # set up pgm check handler
-        l       %r2,.fourmeg
-        lr      %r3,%r2
-        bctr    %r3,%r0                 # 4M-1
-.loop:  iske    %r0,%r3
-        ar      %r3,%r2
-.pgmx:
-        sr      %r3,%r2
-        la      %r3,1(%r3)
-.done:
-        l       %r1,.memsize
-        st      %r3,ARCH_OFFSET(%r1)
         slr     %r0,%r0
         st      %r0,INITRD_SIZE+ARCH_OFFSET-PARMAREA(%r11)
         st      %r0,INITRD_START+ARCH_OFFSET-PARMAREA(%r11)
@@ -443,9 +425,6 @@ start:
 .tbl:   .long   _ebcasc                 # translate table
 .cmd:   .long   COMMAND_LINE            # address of command line buffer
 .parm:  .long   PARMAREA
-.memsize: .long memory_size
-.fourmeg: .long 0x00400000              # 4M
-.pgmnw: .long   0x00080000,.pgmx
 .lowcase:
         .byte 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07
         .byte 0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f
diff --git a/arch/s390/kernel/head31.S b/arch/s390/kernel/head31.S
index 0a2c929486ab..eca507050e47 100644
--- a/arch/s390/kernel/head31.S
+++ b/arch/s390/kernel/head31.S
@@ -131,10 +131,11 @@ startup_continue:
         .long   init_thread_union
 .Lpmask:
         .byte   0
-.align 8
+        .align  8
 .Lpcext:.long   0x00080000,0x80000000
 .Lcr:
         .long   0x00                    # place holder for cr0
+        .align  8
 .Lwaitsclp:
         .long 0x010a0000,0x80000000 + .Lsclph
 .Lrcp:
@@ -156,18 +157,21 @@ startup_continue:
         slr     %r4,%r4                 # set start of chunk to zero
         slr     %r5,%r5                 # set end of chunk to zero
         slr     %r6,%r6                 # set access code to zero
-        la      %r10, MEMORY_CHUNKS     # number of chunks
+        la      %r10,MEMORY_CHUNKS      # number of chunks
 .Lloop:
         tprot   0(%r5),0                # test protection of first byte
         ipm     %r7
         srl     %r7,28
         clr     %r6,%r7                 # compare cc with last access code
         be      .Lsame-.LPG1(%r13)
-        b       .Lchkmem-.LPG1(%r13)
+        lhi     %r8,0                   # no program checks
+        b       .Lsavchk-.LPG1(%r13)
 .Lsame:
         ar      %r5,%r1                 # add 128KB to end of chunk
         bno     .Lloop-.LPG1(%r13)      # r1 < 0x80000000 -> loop
 .Lchkmem:                               # > 2GB or tprot got a program check
+        lhi     %r8,1                   # set program check flag
+.Lsavchk:
         clr     %r4,%r5                 # chunk size > 0?
         be      .Lchkloop-.LPG1(%r13)
         st      %r4,0(%r3)              # store start address of chunk
@@ -176,8 +180,6 @@ startup_continue:
         st      %r0,4(%r3)              # store size of chunk
         st      %r6,8(%r3)              # store type of chunk
         la      %r3,12(%r3)
-        l       %r4,.Lmemsize-.LPG1(%r13)        # address of variable memory_size
-        st      %r5,0(%r4)              # store last end to memory size
         ahi     %r10,-1                 # update chunk number
 .Lchkloop:
         lr      %r6,%r7                 # set access code to last cc
@@ -191,8 +193,15 @@ startup_continue:
         je      .Ldonemem               # if not, leave
         chi     %r10,0                  # do we have chunks left?
         je      .Ldonemem
+        chi     %r8,1                   # program check ?
+        je      .Lpgmchk
+        lr      %r4,%r5                 # potential new chunk
+        alr     %r5,%r1                 # add 128KB to end of chunk
+        j       .Llpcnt
+.Lpgmchk:
         alr     %r5,%r1                 # add 128KB to end of chunk
         lr      %r4,%r5                 # potential new chunk
+.Llpcnt:
         clr     %r5,%r9                 # should we go on?
         jl      .Lloop
 .Ldonemem:
@@ -292,7 +301,6 @@ startup_continue:
 .Lpcmvpg:.long  0x00080000,0x80000000 + .Lchkmvpg
 .Lpcidte:.long  0x00080000,0x80000000 + .Lchkidte
 .Lpcdiag9c:.long 0x00080000,0x80000000 + .Lchkdiag9c
-.Lmemsize:.long memory_size
 .Lmchunk:.long  memory_chunk
 .Lmflags:.long  machine_flags
 .Lbss_bgn:  .long __bss_start
diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index 42f54d482441..6ba3f4512dd1 100644
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -70,7 +70,20 @@ startup_continue:
         sgr     %r5,%r5                 # set src,length and pad to zero
         mvcle   %r2,%r4,0               # clear mem
         jo      .-4                     # branch back, if not finish
+                                        # set program check new psw mask
+        mvc     __LC_PGM_NEW_PSW(8),.Lpcmsk-.LPG1(%r13)
+        larl    %r1,.Lslowmemdetect     # set program check address
+        stg     %r1,__LC_PGM_NEW_PSW+8
+        lghi    %r1,0xc
+        diag    %r0,%r1,0x260           # get memory size of virtual machine
+        cgr     %r0,%r1                 # different? -> old detection routine
+        jne     .Lslowmemdetect
+        aghi    %r1,1                   # size is one more than end
+        larl    %r2,memory_chunk
+        stg     %r1,8(%r2)              # store size of chunk
+        j       .Ldonemem
 
+.Lslowmemdetect:
         l       %r2,.Lrcp-.LPG1(%r13)   # Read SCP forced command word
 .Lservicecall:
         stosm   .Lpmask-.LPG1(%r13),0x01        # authorize ext interrupts
@@ -139,8 +152,6 @@ startup_continue:
         .int    0x100000
 
 .Lfchunk:
-                                        # set program check new psw mask
-        mvc     __LC_PGM_NEW_PSW(8),.Lpcmsk-.LPG1(%r13)
 
 #
 # find memory chunks.
@@ -161,12 +172,15 @@ startup_continue:
         srl     %r7,28
         clr     %r6,%r7                 # compare cc with last access code
         je      .Lsame
-        j       .Lchkmem
+        lghi    %r8,0                   # no program checks
+        j       .Lsavchk
 .Lsame:
         algr    %r5,%r1                 # add 128KB to end of chunk
                                         # no need to check here,
         brc     12,.Lloop               # this is the same chunk
 .Lchkmem:                               # > 16EB or tprot got a program check
+        lghi    %r8,1                   # set program check flag
+.Lsavchk:
         clgr    %r4,%r5                 # chunk size > 0?
         je      .Lchkloop
         stg     %r4,0(%r3)              # store start address of chunk
@@ -175,8 +189,6 @@ startup_continue:
         stg     %r0,8(%r3)              # store size of chunk
         st      %r6,20(%r3)             # store type of chunk
         la      %r3,24(%r3)
-        larl    %r8,memory_size
-        stg     %r5,0(%r8)              # store memory size
         ahi     %r10,-1                 # update chunk number
 .Lchkloop:
         lr      %r6,%r7                 # set access code to last cc
@@ -195,8 +207,15 @@ startup_continue:
         chi     %r10, 0                 # do we have chunks left?
         je      .Ldonemem
 .Lhsaskip:
+        chi     %r8,1                   # program check ?
+        je      .Lpgmchk
+        lgr     %r4,%r5                 # potential new chunk
+        algr    %r5,%r1                 # add 128KB to end of chunk
+        j       .Llpcnt
+.Lpgmchk:
         algr    %r5,%r1                 # add 128KB to end of chunk
         lgr     %r4,%r5                 # potential new chunk
+.Llpcnt:
         clgr    %r5,%r9                 # should we go on?
         jl      .Lloop
 .Ldonemem:
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 1f5e782b3d05..9e9972e8a52b 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -13,12 +13,21 @@
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/reboot.h>
+#include <linux/ctype.h>
 #include <asm/smp.h>
 #include <asm/setup.h>
 #include <asm/cpcmd.h>
 #include <asm/cio.h>
+#include <asm/ebcdic.h>
+#include <asm/reset.h>
 
 #define IPL_PARM_BLOCK_VERSION 0
+#define LOADPARM_LEN 8
+
+extern char s390_readinfo_sccb[];
+#define SCCB_VALID (*((__u16*)&s390_readinfo_sccb[6]) == 0x0010)
+#define SCCB_LOADPARM (&s390_readinfo_sccb[24])
+#define SCCB_FLAG (s390_readinfo_sccb[91])
 
 enum ipl_type {
         IPL_TYPE_NONE    = 1,
@@ -289,9 +298,25 @@ static struct attribute_group ipl_fcp_attr_group = {
 
 /* CCW ipl device attributes */
 
+static ssize_t ipl_ccw_loadparm_show(struct subsystem *subsys, char *page)
+{
+        char loadparm[LOADPARM_LEN + 1] = {};
+
+        if (!SCCB_VALID)
+                return sprintf(page, "#unknown#\n");
+        memcpy(loadparm, SCCB_LOADPARM, LOADPARM_LEN);
+        EBCASC(loadparm, LOADPARM_LEN);
+        strstrip(loadparm);
+        return sprintf(page, "%s\n", loadparm);
+}
+
+static struct subsys_attribute sys_ipl_ccw_loadparm_attr =
+        __ATTR(loadparm, 0444, ipl_ccw_loadparm_show, NULL);
+
 static struct attribute *ipl_ccw_attrs[] = {
         &sys_ipl_type_attr.attr,
         &sys_ipl_device_attr.attr,
+        &sys_ipl_ccw_loadparm_attr.attr,
         NULL,
 };
 
@@ -348,8 +373,57 @@ static struct attribute_group reipl_fcp_attr_group = {
 DEFINE_IPL_ATTR_RW(reipl_ccw, device, "0.0.%04llx\n", "0.0.%llx\n",
         reipl_block_ccw->ipl_info.ccw.devno);
 
+static void reipl_get_ascii_loadparm(char *loadparm)
+{
+        memcpy(loadparm, &reipl_block_ccw->ipl_info.ccw.load_param,
+               LOADPARM_LEN);
+        EBCASC(loadparm, LOADPARM_LEN);
+        loadparm[LOADPARM_LEN] = 0;
+        strstrip(loadparm);
+}
+
+static ssize_t reipl_ccw_loadparm_show(struct subsystem *subsys, char *page)
+{
+        char buf[LOADPARM_LEN + 1];
+
+        reipl_get_ascii_loadparm(buf);
+        return sprintf(page, "%s\n", buf);
+}
+
+static ssize_t reipl_ccw_loadparm_store(struct subsystem *subsys,
+                                        const char *buf, size_t len)
+{
+        int i, lp_len;
+
+        /* ignore trailing newline */
+        lp_len = len;
+        if ((len > 0) && (buf[len - 1] == '\n'))
+                lp_len--;
+        /* loadparm can have max 8 characters and must not start with a blank */
+        if ((lp_len > LOADPARM_LEN) || ((lp_len > 0) && (buf[0] == ' ')))
+                return -EINVAL;
+        /* loadparm can only contain "a-z,A-Z,0-9,SP,." */
+        for (i = 0; i < lp_len; i++) {
+                if (isalpha(buf[i]) || isdigit(buf[i]) || (buf[i] == ' ') ||
+                    (buf[i] == '.'))
+                        continue;
+                return -EINVAL;
+        }
+        /* initialize loadparm with blanks */
+        memset(&reipl_block_ccw->ipl_info.ccw.load_param, ' ', LOADPARM_LEN);
+        /* copy and convert to ebcdic */
+        memcpy(&reipl_block_ccw->ipl_info.ccw.load_param, buf, lp_len);
+        ASCEBC(reipl_block_ccw->ipl_info.ccw.load_param, LOADPARM_LEN);
+        return len;
+}
+
+static struct subsys_attribute sys_reipl_ccw_loadparm_attr =
+        __ATTR(loadparm, 0644, reipl_ccw_loadparm_show,
+               reipl_ccw_loadparm_store);
+
 static struct attribute *reipl_ccw_attrs[] = {
         &sys_reipl_ccw_device_attr.attr,
+        &sys_reipl_ccw_loadparm_attr.attr,
         NULL,
 };
 
@@ -502,23 +576,6 @@ static struct subsys_attribute dump_type_attr =
 
 static decl_subsys(dump, NULL, NULL);
 
-#ifdef CONFIG_SMP
-static void dump_smp_stop_all(void)
-{
-        int cpu;
-        preempt_disable();
-        for_each_online_cpu(cpu) {
-                if (cpu == smp_processor_id())
-                        continue;
-                while (signal_processor(cpu, sigp_stop) == sigp_busy)
-                        udelay(10);
-        }
-        preempt_enable();
-}
-#else
-#define dump_smp_stop_all() do { } while (0)
-#endif
-
 /*
  * Shutdown actions section
  */
@@ -552,48 +609,29 @@ static ssize_t on_panic_store(struct subsystem *subsys, const char *buf,
 static struct subsys_attribute on_panic_attr =
                 __ATTR(on_panic, 0644, on_panic_show, on_panic_store);
 
-static void print_fcp_block(struct ipl_parameter_block *fcp_block)
-{
-        printk(KERN_EMERG "wwpn:      %016llx\n",
-                (unsigned long long)fcp_block->ipl_info.fcp.wwpn);
-        printk(KERN_EMERG "lun:       %016llx\n",
-                (unsigned long long)fcp_block->ipl_info.fcp.lun);
-        printk(KERN_EMERG "bootprog:  %lld\n",
-                (unsigned long long)fcp_block->ipl_info.fcp.bootprog);
-        printk(KERN_EMERG "br_lba:    %lld\n",
-                (unsigned long long)fcp_block->ipl_info.fcp.br_lba);
-        printk(KERN_EMERG "device:    %llx\n",
-                (unsigned long long)fcp_block->ipl_info.fcp.devno);
-        printk(KERN_EMERG "opt:       %x\n", fcp_block->ipl_info.fcp.opt);
-}
-
 void do_reipl(void)
 {
         struct ccw_dev_id devid;
         static char buf[100];
-
-        switch (reipl_type) {
-        case IPL_TYPE_CCW:
-                printk(KERN_EMERG "reboot on ccw device: 0.0.%04x\n",
-                        reipl_block_ccw->ipl_info.ccw.devno);
-                break;
-        case IPL_TYPE_FCP:
-                printk(KERN_EMERG "reboot on fcp device:\n");
-                print_fcp_block(reipl_block_fcp);
-                break;
-        default:
-                break;
-        }
+        char loadparm[LOADPARM_LEN + 1];
 
         switch (reipl_method) {
         case IPL_METHOD_CCW_CIO:
                 devid.devno = reipl_block_ccw->ipl_info.ccw.devno;
+                if (ipl_get_type() == IPL_TYPE_CCW && devid.devno == ipl_devno)
+                        diag308(DIAG308_IPL, NULL);
                 devid.ssid  = 0;
                 reipl_ccw_dev(&devid);
                 break;
         case IPL_METHOD_CCW_VM:
-                sprintf(buf, "IPL %X", reipl_block_ccw->ipl_info.ccw.devno);
-                cpcmd(buf, NULL, 0, NULL);
+                reipl_get_ascii_loadparm(loadparm);
+                if (strlen(loadparm) == 0)
+                        sprintf(buf, "IPL %X",
+                                reipl_block_ccw->ipl_info.ccw.devno);
+                else
+                        sprintf(buf, "IPL %X LOADPARM '%s'",
+                                reipl_block_ccw->ipl_info.ccw.devno, loadparm);
+                __cpcmd(buf, NULL, 0, NULL);
                 break;
         case IPL_METHOD_CCW_DIAG:
                 diag308(DIAG308_SET, reipl_block_ccw);
@@ -607,16 +645,16 @@ void do_reipl(void)
                 diag308(DIAG308_IPL, NULL);
                 break;
         case IPL_METHOD_FCP_RO_VM:
-                cpcmd("IPL", NULL, 0, NULL);
+                __cpcmd("IPL", NULL, 0, NULL);
                 break;
         case IPL_METHOD_NONE:
         default:
                 if (MACHINE_IS_VM)
-                        cpcmd("IPL", NULL, 0, NULL);
+                        __cpcmd("IPL", NULL, 0, NULL);
                 diag308(DIAG308_IPL, NULL);
                 break;
         }
-        panic("reipl failed!\n");
+        signal_processor(smp_processor_id(), sigp_stop_and_store_status);
 }
 
 static void do_dump(void)
@@ -624,32 +662,19 @@ static void do_dump(void)
         struct ccw_dev_id devid;
         static char buf[100];
 
-        switch (dump_type) {
-        case IPL_TYPE_CCW:
-                printk(KERN_EMERG "Automatic dump on ccw device: 0.0.%04x\n",
-                       dump_block_ccw->ipl_info.ccw.devno);
-                break;
-        case IPL_TYPE_FCP:
-                printk(KERN_EMERG "Automatic dump on fcp device:\n");
-                print_fcp_block(dump_block_fcp);
-                break;
-        default:
-                return;
-        }
-
         switch (dump_method) {
         case IPL_METHOD_CCW_CIO:
-                dump_smp_stop_all();
+                smp_send_stop();
                 devid.devno = dump_block_ccw->ipl_info.ccw.devno;
                 devid.ssid  = 0;
                 reipl_ccw_dev(&devid);
                 break;
         case IPL_METHOD_CCW_VM:
-                dump_smp_stop_all();
+                smp_send_stop();
                 sprintf(buf, "STORE STATUS");
-                cpcmd(buf, NULL, 0, NULL);
+                __cpcmd(buf, NULL, 0, NULL);
                 sprintf(buf, "IPL %X", dump_block_ccw->ipl_info.ccw.devno);
-                cpcmd(buf, NULL, 0, NULL);
+                __cpcmd(buf, NULL, 0, NULL);
                 break;
         case IPL_METHOD_CCW_DIAG:
                 diag308(DIAG308_SET, dump_block_ccw);
@@ -746,6 +771,17 @@ static int __init reipl_ccw_init(void)
         reipl_block_ccw->hdr.version = IPL_PARM_BLOCK_VERSION;
         reipl_block_ccw->hdr.blk0_len = sizeof(reipl_block_ccw->ipl_info.ccw);
         reipl_block_ccw->hdr.pbt = DIAG308_IPL_TYPE_CCW;
+        /* check if read scp info worked and set loadparm */
+        if (SCCB_VALID)
+                memcpy(reipl_block_ccw->ipl_info.ccw.load_param,
+                       SCCB_LOADPARM, LOADPARM_LEN);
+        else
+                /* read scp info failed: set empty loadparm (EBCDIC blanks) */
+                memset(reipl_block_ccw->ipl_info.ccw.load_param, 0x40,
+                       LOADPARM_LEN);
+        /* FIXME: check for diag308_set_works when enabling diag ccw reipl */
+        if (!MACHINE_IS_VM)
+                sys_reipl_ccw_loadparm_attr.attr.mode = S_IRUGO;
         if (ipl_get_type() == IPL_TYPE_CCW)
                 reipl_block_ccw->ipl_info.ccw.devno = ipl_devno;
         reipl_capabilities |= IPL_TYPE_CCW;
@@ -827,13 +863,11 @@ static int __init dump_ccw_init(void)
         return 0;
 }
 
-extern char s390_readinfo_sccb[];
-
 static int __init dump_fcp_init(void)
 {
         int rc;
 
-        if(!(s390_readinfo_sccb[91] & 0x2))
+        if(!(SCCB_FLAG & 0x2) || !SCCB_VALID)
                 return 0; /* LDIPL DUMP is not installed */
         if (!diag308_set_works)
                 return 0;
@@ -931,3 +965,65 @@ static int __init s390_ipl_init(void)
 }
 
 __initcall(s390_ipl_init);
+
+static LIST_HEAD(rcall);
+static DEFINE_MUTEX(rcall_mutex);
+
+void register_reset_call(struct reset_call *reset)
+{
+        mutex_lock(&rcall_mutex);
+        list_add(&reset->list, &rcall);
+        mutex_unlock(&rcall_mutex);
+}
+EXPORT_SYMBOL_GPL(register_reset_call);
+
+void unregister_reset_call(struct reset_call *reset)
+{
+        mutex_lock(&rcall_mutex);
+        list_del(&reset->list);
+        mutex_unlock(&rcall_mutex);
+}
+EXPORT_SYMBOL_GPL(unregister_reset_call);
+
+static void do_reset_calls(void)
+{
+        struct reset_call *reset;
+
+        list_for_each_entry(reset, &rcall, list)
+                reset->fn();
+}
+
+extern void reset_mcck_handler(void);
+extern void reset_pgm_handler(void);
+extern __u32 dump_prefix_page;
+
+void s390_reset_system(void)
+{
+        struct _lowcore *lc;
+
+        lc = (struct _lowcore *)(unsigned long) store_prefix();
+
+        /* Stack for interrupt/machine check handler */
+        lc->panic_stack = S390_lowcore.panic_stack;
+
+        /* Save prefix page address for dump case */
+        dump_prefix_page = (unsigned long) lc;
+
+        /* Disable prefixing */
+        set_prefix(0);
+
+        /* Disable lowcore protection */
+        __ctl_clear_bit(0,28);
+
+        /* Set new machine check handler */
+        S390_lowcore.mcck_new_psw.mask = PSW_KERNEL_BITS & ~PSW_MASK_MCHECK;
+        S390_lowcore.mcck_new_psw.addr =
+                PSW_ADDR_AMODE | (unsigned long) &reset_mcck_handler;
+
+        /* Set new program check handler */
+        S390_lowcore.program_new_psw.mask = PSW_KERNEL_BITS & ~PSW_MASK_MCHECK;
+        S390_lowcore.program_new_psw.addr =
+                PSW_ADDR_AMODE | (unsigned long) &reset_pgm_handler;
+
+        do_reset_calls();
+}
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 67914fe7f317..576368c4f605 100644
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -200,7 +200,7 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
 void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
         mutex_lock(&kprobe_mutex);
-        free_insn_slot(p->ainsn.insn);
+        free_insn_slot(p->ainsn.insn, 0);
         mutex_unlock(&kprobe_mutex);
 }
 
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index 60b1ea9f946b..f6d9bcc0f75b 100644
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -1,15 +1,10 @@
 /*
  * arch/s390/kernel/machine_kexec.c
  *
- * (C) Copyright IBM Corp. 2005
+ * Copyright IBM Corp. 2005,2006
  *
- * Author(s): Rolf Adelsberger <adelsberger@de.ibm.com>
- *
- */
-
-/*
- * s390_machine_kexec.c - handle the transition of Linux booting another kernel
- * on the S390 architecture.
+ * Author(s): Rolf Adelsberger,
+ *            Heiko Carstens <heiko.carstens@de.ibm.com>
  */
 
 #include <linux/device.h>
@@ -22,86 +17,49 @@
 #include <asm/pgalloc.h>
 #include <asm/system.h>
 #include <asm/smp.h>
+#include <asm/reset.h>
 
-static void kexec_halt_all_cpus(void *);
-
-typedef void (*relocate_kernel_t) (kimage_entry_t *, unsigned long);
+typedef void (*relocate_kernel_t)(kimage_entry_t *, unsigned long);
 
 extern const unsigned char relocate_kernel[];
 extern const unsigned long long relocate_kernel_len;
 
-int
-machine_kexec_prepare(struct kimage *image)
+int machine_kexec_prepare(struct kimage *image)
 {
-        unsigned long reboot_code_buffer;
+        void *reboot_code_buffer;
 
         /* We don't support anything but the default image type for now. */
         if (image->type != KEXEC_TYPE_DEFAULT)
                 return -EINVAL;
 
         /* Get the destination where the assembler code should be copied to.*/
-        reboot_code_buffer = page_to_pfn(image->control_code_page)<<PAGE_SHIFT;
+        reboot_code_buffer = (void *) page_to_phys(image->control_code_page);
 
         /* Then copy it */
-        memcpy((void *) reboot_code_buffer, relocate_kernel,
-               relocate_kernel_len);
+        memcpy(reboot_code_buffer, relocate_kernel, relocate_kernel_len);
         return 0;
 }
 
-void
-machine_kexec_cleanup(struct kimage *image)
+void machine_kexec_cleanup(struct kimage *image)
 {
 }
 
-void
-machine_shutdown(void)
+void machine_shutdown(void)
 {
         printk(KERN_INFO "kexec: machine_shutdown called\n");
 }
 
-NORET_TYPE void
-machine_kexec(struct kimage *image)
+void machine_kexec(struct kimage *image)
 {
-        clear_all_subchannels();
-        cio_reset_channel_paths();
-
-        /* Disable lowcore protection */
-        ctl_clear_bit(0,28);
-
-        on_each_cpu(kexec_halt_all_cpus, image, 0, 0);
-        for (;;);
-}
-
-extern void pfault_fini(void);
-
-static void
-kexec_halt_all_cpus(void *kernel_image)
-{
-        static atomic_t cpuid = ATOMIC_INIT(-1);
-        int cpu;
-        struct kimage *image;
         relocate_kernel_t data_mover;
 
-#ifdef CONFIG_PFAULT
-        if (MACHINE_IS_VM)
-                pfault_fini();
-#endif
+        smp_send_stop();
+        pfault_fini();
+        s390_reset_system();
 
-        if (atomic_cmpxchg(&cpuid, -1, smp_processor_id()) != -1)
-                signal_processor(smp_processor_id(), sigp_stop);
-
-        /* Wait for all other cpus to enter stopped state */
-        for_each_online_cpu(cpu) {
-                if (cpu == smp_processor_id())
-                        continue;
-                while (!smp_cpu_not_running(cpu))
-                        cpu_relax();
-        }
-
-        image = (struct kimage *) kernel_image;
-        data_mover = (relocate_kernel_t)
-                (page_to_pfn(image->control_code_page) << PAGE_SHIFT);
+        data_mover = (relocate_kernel_t) page_to_phys(image->control_code_page);
 
         /* Call the moving routine */
-        (*data_mover) (&image->head, image->start);
+        (*data_mover)(&image->head, image->start);
+        for (;;);
 }
diff --git a/arch/s390/kernel/reipl.S b/arch/s390/kernel/reipl.S
index 0340477f3b08..c3f4d9b95083 100644
--- a/arch/s390/kernel/reipl.S
+++ b/arch/s390/kernel/reipl.S
@@ -11,21 +11,12 @@
                 .globl  do_reipl_asm
 do_reipl_asm:   basr    %r13,0
 .Lpg0:          lpsw    .Lnewpsw-.Lpg0(%r13)
-
-                # switch off lowcore protection
-
-.Lpg1:          stctl   %c0,%c0,.Lctlsave1-.Lpg0(%r13)
-                stctl   %c0,%c0,.Lctlsave2-.Lpg0(%r13)
-                ni      .Lctlsave1-.Lpg0(%r13),0xef
-                lctl    %c0,%c0,.Lctlsave1-.Lpg0(%r13)
-
-                # do store status of all registers
+.Lpg1:          # do store status of all registers
 
                 stm     %r0,%r15,__LC_GPREGS_SAVE_AREA
                 stctl   %c0,%c15,__LC_CREGS_SAVE_AREA
-                mvc     __LC_CREGS_SAVE_AREA(4),.Lctlsave2-.Lpg0(%r13)
                 stam    %a0,%a15,__LC_AREGS_SAVE_AREA
-                stpx    __LC_PREFIX_SAVE_AREA
+                mvc     __LC_PREFIX_SAVE_AREA(4),dump_prefix_page-.Lpg0(%r13)
                 stckc   .Lclkcmp-.Lpg0(%r13)
                 mvc     __LC_CLOCK_COMP_SAVE_AREA(8),.Lclkcmp-.Lpg0(%r13)
                 stpt    __LC_CPU_TIMER_SAVE_AREA
@@ -56,8 +47,7 @@ do_reipl_asm:	basr	%r13,0
 .L002:          tm      .Liplirb+8-.Lpg0(%r13),0xf3
                 jz      .L003
                 bas     %r14,.Ldisab-.Lpg0(%r13)
-.L003:          spx     .Lnull-.Lpg0(%r13)
-                st      %r1,__LC_SUBCHANNEL_ID
+.L003:          st      %r1,__LC_SUBCHANNEL_ID
                 lpsw    0
                 sigp    0,0,0(6)
 .Ldisab:        st      %r14,.Ldispsw+4-.Lpg0(%r13)
@@ -65,9 +55,6 @@ do_reipl_asm:	basr	%r13,0
                 .align  8
 .Lclkcmp:       .quad   0x0000000000000000
 .Lall:          .long   0xff000000
-.Lnull:         .long   0x00000000
-.Lctlsave1:     .long   0x00000000
-.Lctlsave2:     .long   0x00000000
                 .align  8
 .Lnewpsw:       .long   0x00080000,0x80000000+.Lpg1
 .Lpcnew:        .long   0x00080000,0x80000000+.Lecs
@@ -92,3 +79,7 @@ do_reipl_asm:	basr	%r13,0
                 .long   0x00000000,0x00000000
                 .long   0x00000000,0x00000000
                 .long   0x00000000,0x00000000
+        .globl dump_prefix_page
+dump_prefix_page:
+        .long 0x00000000
+
diff --git a/arch/s390/kernel/reipl64.S b/arch/s390/kernel/reipl64.S
index de7435054f7c..dbb3eed38865 100644
--- a/arch/s390/kernel/reipl64.S
+++ b/arch/s390/kernel/reipl64.S
@@ -10,28 +10,24 @@
 #include <asm/lowcore.h>
                 .globl  do_reipl_asm
 do_reipl_asm:   basr    %r13,0
+.Lpg0:          lpswe   .Lnewpsw-.Lpg0(%r13)
+.Lpg1:          # do store status of all registers
 
-                # do store status of all registers
-
-.Lpg0:          stg     %r1,.Lregsave-.Lpg0(%r13)
+                stg     %r1,.Lregsave-.Lpg0(%r13)
                 lghi    %r1,0x1000
                 stmg    %r0,%r15,__LC_GPREGS_SAVE_AREA-0x1000(%r1)
                 lg      %r0,.Lregsave-.Lpg0(%r13)
                 stg     %r0,__LC_GPREGS_SAVE_AREA-0x1000+8(%r1)
                 stctg   %c0,%c15,__LC_CREGS_SAVE_AREA-0x1000(%r1)
                 stam    %a0,%a15,__LC_AREGS_SAVE_AREA-0x1000(%r1)
-                stpx    __LC_PREFIX_SAVE_AREA-0x1000(%r1)
+                mvc     __LC_PREFIX_SAVE_AREA-0x1000(4,%r1),dump_prefix_page-.Lpg0(%r13)
                 stfpc   __LC_FP_CREG_SAVE_AREA-0x1000(%r1)
                 stckc   .Lclkcmp-.Lpg0(%r13)
                 mvc     __LC_CLOCK_COMP_SAVE_AREA-0x1000(8,%r1),.Lclkcmp-.Lpg0(%r13)
                 stpt    __LC_CPU_TIMER_SAVE_AREA-0x1000(%r1)
                 stg     %r13, __LC_PSW_SAVE_AREA-0x1000+8(%r1)
 
-                lpswe   .Lnewpsw-.Lpg0(%r13)
-.Lpg1:          lctlg   %c6,%c6,.Lall-.Lpg0(%r13)
-                stctg   %c0,%c0,.Lregsave-.Lpg0(%r13)
-                ni      .Lregsave+4-.Lpg0(%r13),0xef
-                lctlg   %c0,%c0,.Lregsave-.Lpg0(%r13)
+                lctlg   %c6,%c6,.Lall-.Lpg0(%r13)
                 lgr     %r1,%r2
                 mvc     __LC_PGM_NEW_PSW(16),.Lpcnew-.Lpg0(%r13)
                 stsch   .Lschib-.Lpg0(%r13)
@@ -56,8 +52,7 @@ do_reipl_asm:	basr	%r13,0
 .L002:          tm      .Liplirb+8-.Lpg0(%r13),0xf3
                 jz      .L003
                 bas     %r14,.Ldisab-.Lpg0(%r13)
-.L003:          spx     .Lnull-.Lpg0(%r13)
-                st      %r1,__LC_SUBCHANNEL_ID
+.L003:          st      %r1,__LC_SUBCHANNEL_ID
                 lhi     %r1,0            # mode 0 = esa
                 slr     %r0,%r0          # set cpuid to zero
                 sigp    %r1,%r0,0x12     # switch to esa mode
@@ -70,7 +65,6 @@ do_reipl_asm:	basr	%r13,0
 .Lclkcmp:       .quad   0x0000000000000000
 .Lall:          .quad   0x00000000ff000000
 .Lregsave:      .quad   0x0000000000000000
-.Lnull:         .long   0x0000000000000000
                 .align  16
 /*
  * These addresses have to be 31 bit otherwise
@@ -109,3 +103,6 @@ do_reipl_asm:	basr	%r13,0
                 .long   0x00000000,0x00000000
                 .long   0x00000000,0x00000000
                 .long   0x00000000,0x00000000
+        .globl dump_prefix_page
+dump_prefix_page:
+        .long 0x00000000
diff --git a/arch/s390/kernel/relocate_kernel.S b/arch/s390/kernel/relocate_kernel.S
index f9899ff2e5b0..3b456b80bcee 100644
--- a/arch/s390/kernel/relocate_kernel.S
+++ b/arch/s390/kernel/relocate_kernel.S
@@ -26,8 +26,7 @@
         relocate_kernel:
                 basr    %r13,0          # base address
         .base:
-                stnsm   sys_msk-.base(%r13),0xf8        # disable DAT and IRQ (external)
-                spx     zero64-.base(%r13)      # absolute addressing mode
+                stnsm   sys_msk-.base(%r13),0xfb        # disable DAT
                 stctl   %c0,%c15,ctlregs-.base(%r13)
                 stm     %r0,%r15,gprregs-.base(%r13)
                 la      %r1,load_psw-.base(%r13)
@@ -97,8 +96,6 @@
                 lpsw    0               # hopefully start new kernel...
 
                 .align  8
-        zero64:
-                .quad   0
         load_psw:
                 .long   0x00080000,0x80000000
         sys_msk:
diff --git a/arch/s390/kernel/relocate_kernel64.S b/arch/s390/kernel/relocate_kernel64.S
index 4fb443042d9c..1f9ea2067b59 100644
--- a/arch/s390/kernel/relocate_kernel64.S
+++ b/arch/s390/kernel/relocate_kernel64.S
@@ -27,8 +27,7 @@
         relocate_kernel:
                 basr    %r13,0          # base address
         .base:
-                stnsm   sys_msk-.base(%r13),0xf8        # disable DAT and IRQs
-                spx     zero64-.base(%r13)      # absolute addressing mode
+                stnsm   sys_msk-.base(%r13),0xfb        # disable DAT
                 stctg   %c0,%c15,ctlregs-.base(%r13)
                 stmg    %r0,%r15,gprregs-.base(%r13)
                 lghi    %r0,3
@@ -100,8 +99,6 @@
                 lpsw    0               # hopefully start new kernel...
 
                 .align  8
-        zero64:
-                .quad   0
         load_psw:
                 .long   0x00080000,0x80000000
         sys_msk:
diff --git a/arch/s390/kernel/reset.S b/arch/s390/kernel/reset.S
new file mode 100644
index 000000000000..8a87355161fa
--- /dev/null
+++ b/arch/s390/kernel/reset.S
@@ -0,0 +1,90 @@
+/*
+ *  arch/s390/kernel/reset.S
+ *
+ *    Copyright (C) IBM Corp. 2006
+ *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
+ *               Michael Holzheu <holzheu@de.ibm.com>
+ */
+
+#include <asm/ptrace.h>
+#include <asm/lowcore.h>
+
+#ifdef CONFIG_64BIT
+
+        .globl  reset_mcck_handler
+reset_mcck_handler:
+        basr    %r13,0
+0:      lg      %r15,__LC_PANIC_STACK   # load panic stack
+        aghi    %r15,-STACK_FRAME_OVERHEAD
+        lg      %r1,s390_reset_mcck_handler-0b(%r13)
+        ltgr    %r1,%r1
+        jz      1f
+        basr    %r14,%r1
+1:      la      %r1,4095
+        lmg     %r0,%r15,__LC_GPREGS_SAVE_AREA-4095(%r1)
+        lpswe   __LC_MCK_OLD_PSW
+
+        .globl  s390_reset_mcck_handler
+s390_reset_mcck_handler:
+        .quad   0
+
+        .globl  reset_pgm_handler
+reset_pgm_handler:
+        stmg    %r0,%r15,__LC_SAVE_AREA
+        basr    %r13,0
+0:      lg      %r15,__LC_PANIC_STACK   # load panic stack
+        aghi    %r15,-STACK_FRAME_OVERHEAD
+        lg      %r1,s390_reset_pgm_handler-0b(%r13)
+        ltgr    %r1,%r1
+        jz      1f
+        basr    %r14,%r1
+        lmg     %r0,%r15,__LC_SAVE_AREA
+        lpswe   __LC_PGM_OLD_PSW
+1:      lpswe   disabled_wait_psw-0b(%r13)
+        .globl s390_reset_pgm_handler
+s390_reset_pgm_handler:
+        .quad   0
+        .align  8
+disabled_wait_psw:
+        .quad   0x0002000180000000,0x0000000000000000 + reset_pgm_handler
+
+#else /* CONFIG_64BIT */
+
+        .globl  reset_mcck_handler
+reset_mcck_handler:
+        basr    %r13,0
+0:      l       %r15,__LC_PANIC_STACK   # load panic stack
+        ahi     %r15,-STACK_FRAME_OVERHEAD
+        l       %r1,s390_reset_mcck_handler-0b(%r13)
+        ltr     %r1,%r1
+        jz      1f
+        basr    %r14,%r1
+1:      lm      %r0,%r15,__LC_GPREGS_SAVE_AREA
+        lpsw    __LC_MCK_OLD_PSW
+
+        .globl  s390_reset_mcck_handler
+s390_reset_mcck_handler:
+        .long   0
+
+        .globl  reset_pgm_handler
+reset_pgm_handler:
+        stm     %r0,%r15,__LC_SAVE_AREA
+        basr    %r13,0
+0:      l       %r15,__LC_PANIC_STACK   # load panic stack
+        ahi     %r15,-STACK_FRAME_OVERHEAD
+        l       %r1,s390_reset_pgm_handler-0b(%r13)
+        ltr     %r1,%r1
+        jz      1f
+        basr    %r14,%r1
+        lm      %r0,%r15,__LC_SAVE_AREA
+        lpsw    __LC_PGM_OLD_PSW
+
+1:      lpsw    disabled_wait_psw-0b(%r13)
+        .globl  s390_reset_pgm_handler
+s390_reset_pgm_handler:
+        .long   0
+disabled_wait_psw:
+        .align 8
+        .long   0x000a0000,0x00000000 + reset_pgm_handler
+
+#endif /* CONFIG_64BIT */
diff --git a/arch/s390/kernel/s390_ext.c b/arch/s390/kernel/s390_ext.c
index 4faf96f8a834..bc5beaa8f98e 100644
--- a/arch/s390/kernel/s390_ext.c
+++ b/arch/s390/kernel/s390_ext.c
@@ -37,7 +37,7 @@ int register_external_interrupt(__u16 code, ext_int_handler_t handler)
         ext_int_info_t *p;
         int index;
 
-        p = (ext_int_info_t *) kmalloc(sizeof(ext_int_info_t), GFP_ATOMIC);
+        p = kmalloc(sizeof(ext_int_info_t), GFP_ATOMIC);
         if (p == NULL)
                 return -ENOMEM;
         p->code = code;
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 2aa13e8e000a..5d8ee3baac14 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -62,15 +62,10 @@ EXPORT_SYMBOL_GPL(uaccess);
 unsigned int console_mode = 0;
 unsigned int console_devno = -1;
 unsigned int console_irq = -1;
-unsigned long memory_size = 0;
 unsigned long machine_flags = 0;
-struct {
-        unsigned long addr, size, type;
-} memory_chunk[MEMORY_CHUNKS] = { { 0 } };
-#define CHUNK_READ_WRITE 0
-#define CHUNK_READ_ONLY 1
+
+struct mem_chunk __initdata memory_chunk[MEMORY_CHUNKS];
 volatile int __cpu_logical_map[NR_CPUS]; /* logical cpu to cpu address */
-unsigned long __initdata zholes_size[MAX_NR_ZONES];
 static unsigned long __initdata memory_end;
 
 /*
@@ -229,11 +224,11 @@ static void __init conmode_default(void)
         char *ptr;
 
         if (MACHINE_IS_VM) {
-                __cpcmd("QUERY CONSOLE", query_buffer, 1024, NULL);
+                cpcmd("QUERY CONSOLE", query_buffer, 1024, NULL);
                 console_devno = simple_strtoul(query_buffer + 5, NULL, 16);
                 ptr = strstr(query_buffer, "SUBCHANNEL =");
                 console_irq = simple_strtoul(ptr + 13, NULL, 16);
-                __cpcmd("QUERY TERM", query_buffer, 1024, NULL);
+                cpcmd("QUERY TERM", query_buffer, 1024, NULL);
                 ptr = strstr(query_buffer, "CONMODE");
                 /*
                  * Set the conmode to 3215 so that the device recognition 
@@ -242,7 +237,7 @@ static void __init conmode_default(void)
                  * 3215 and the 3270 driver will try to access the console
                  * device (3215 as console and 3270 as normal tty).
                  */
-                __cpcmd("TERM CONMODE 3215", NULL, 0, NULL);
+                cpcmd("TERM CONMODE 3215", NULL, 0, NULL);
                 if (ptr == NULL) {
 #if defined(CONFIG_SCLP_CONSOLE)
                         SET_CONSOLE_SCLP;
@@ -299,14 +294,14 @@ static void do_machine_restart_nonsmp(char * __unused)
 static void do_machine_halt_nonsmp(void)
 {
         if (MACHINE_IS_VM && strlen(vmhalt_cmd) > 0)
-                cpcmd(vmhalt_cmd, NULL, 0, NULL);
+                __cpcmd(vmhalt_cmd, NULL, 0, NULL);
         signal_processor(smp_processor_id(), sigp_stop_and_store_status);
 }
 
 static void do_machine_power_off_nonsmp(void)
 {
         if (MACHINE_IS_VM && strlen(vmpoff_cmd) > 0)
-                cpcmd(vmpoff_cmd, NULL, 0, NULL);
+                __cpcmd(vmpoff_cmd, NULL, 0, NULL);
         signal_processor(smp_processor_id(), sigp_stop_and_store_status);
 }
 
@@ -358,21 +353,6 @@ void machine_power_off(void)
  */
 void (*pm_power_off)(void) = machine_power_off;
 
-static void __init
-add_memory_hole(unsigned long start, unsigned long end)
-{
-        unsigned long dma_pfn = MAX_DMA_ADDRESS >> PAGE_SHIFT;
-
-        if (end <= dma_pfn)
-                zholes_size[ZONE_DMA] += end - start + 1;
-        else if (start > dma_pfn)
-                zholes_size[ZONE_NORMAL] += end - start + 1;
-        else {
-                zholes_size[ZONE_DMA] += dma_pfn - start + 1;
-                zholes_size[ZONE_NORMAL] += end - dma_pfn;
-        }
-}
-
 static int __init early_parse_mem(char *p)
 {
         memory_end = memparse(p, &p);
@@ -489,12 +469,42 @@ setup_resources(void)
         }
 }
 
+static void __init setup_memory_end(void)
+{
+        unsigned long real_size, memory_size;
+        unsigned long max_mem, max_phys;
+        int i;
+
+        memory_size = real_size = 0;
+        max_phys = VMALLOC_END_INIT - VMALLOC_MIN_SIZE;
+        memory_end &= PAGE_MASK;
+
+        max_mem = memory_end ? min(max_phys, memory_end) : max_phys;
+
+        for (i = 0; i < MEMORY_CHUNKS; i++) {
+                struct mem_chunk *chunk = &memory_chunk[i];
+
+                real_size = max(real_size, chunk->addr + chunk->size);
+                if (chunk->addr >= max_mem) {
+                        memset(chunk, 0, sizeof(*chunk));
+                        continue;
+                }
+                if (chunk->addr + chunk->size > max_mem)
+                        chunk->size = max_mem - chunk->addr;
+                memory_size = max(memory_size, chunk->addr + chunk->size);
+        }
+        if (!memory_end)
+                memory_end = memory_size;
+        if (real_size > memory_end)
+                printk("More memory detected than supported. Unused: %luk\n",
+                       (real_size - memory_end) >> 10);
+}
+
 static void __init
 setup_memory(void)
 {
         unsigned long bootmap_size;
         unsigned long start_pfn, end_pfn, init_pfn;
-        unsigned long last_rw_end;
         int i;
 
         /*
@@ -550,39 +560,27 @@ setup_memory(void)
         /*
          * Register RAM areas with the bootmem allocator.
          */
-        last_rw_end = start_pfn;
 
         for (i = 0; i < MEMORY_CHUNKS && memory_chunk[i].size > 0; i++) {
-                unsigned long start_chunk, end_chunk;
+                unsigned long start_chunk, end_chunk, pfn;
 
                 if (memory_chunk[i].type != CHUNK_READ_WRITE)
                         continue;
-                start_chunk = (memory_chunk[i].addr + PAGE_SIZE - 1);
-                start_chunk >>= PAGE_SHIFT;
-                end_chunk = (memory_chunk[i].addr + memory_chunk[i].size);
-                end_chunk >>= PAGE_SHIFT;
-                if (start_chunk < start_pfn)
-                        start_chunk = start_pfn;
-                if (end_chunk > end_pfn)
-                        end_chunk = end_pfn;
-                if (start_chunk < end_chunk) {
-                        /* Initialize storage key for RAM pages */
-                        for (init_pfn = start_chunk ; init_pfn < end_chunk;
-                             init_pfn++)
-                                page_set_storage_key(init_pfn << PAGE_SHIFT,
-                                                     PAGE_DEFAULT_KEY);
-                        free_bootmem(start_chunk << PAGE_SHIFT,
-                                     (end_chunk - start_chunk) << PAGE_SHIFT);
-                        if (last_rw_end < start_chunk)
-                                add_memory_hole(last_rw_end, start_chunk - 1);
-                        last_rw_end = end_chunk;
-                }
+                start_chunk = PFN_DOWN(memory_chunk[i].addr);
+                end_chunk = start_chunk + PFN_DOWN(memory_chunk[i].size) - 1;
+                end_chunk = min(end_chunk, end_pfn);
+                if (start_chunk >= end_chunk)
+                        continue;
+                add_active_range(0, start_chunk, end_chunk);
+                pfn = max(start_chunk, start_pfn);
+                for (; pfn <= end_chunk; pfn++)
+                        page_set_storage_key(PFN_PHYS(pfn), PAGE_DEFAULT_KEY);
         }
 
         psw_set_key(PAGE_DEFAULT_KEY);
 
-        if (last_rw_end < end_pfn - 1)
-                add_memory_hole(last_rw_end, end_pfn - 1);
+        free_bootmem_with_active_regions(0, max_pfn);
+        reserve_bootmem(0, PFN_PHYS(start_pfn));
 
         /*
          * Reserve the bootmem bitmap itself as well. We do this in two
@@ -645,8 +643,6 @@ setup_arch(char **cmdline_p)
         init_mm.end_data = (unsigned long) &_edata;
         init_mm.brk = (unsigned long) &_end;
 
-        memory_end = memory_size;
-
         if (MACHINE_HAS_MVCOS)
                 memcpy(&uaccess, &uaccess_mvcos, sizeof(uaccess));
         else
@@ -654,20 +650,7 @@ setup_arch(char **cmdline_p)
 
         parse_early_param();
 
-#ifndef CONFIG_64BIT
-        memory_end &= ~0x400000UL;
-
-        /*
-         * We need some free virtual space to be able to do vmalloc.
-         * On a machine with 2GB memory we make sure that we have at
-         * least 128 MB free space for vmalloc.
-         */
-        if (memory_end > 1920*1024*1024)
-                memory_end = 1920*1024*1024;
-#else /* CONFIG_64BIT */
-        memory_end &= ~0x200000UL;
-#endif /* CONFIG_64BIT */
-
+        setup_memory_end();
         setup_memory();
         setup_resources();
         setup_lowcore();
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 62822245f9be..c0cd255fddbd 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -230,18 +230,37 @@ static inline void do_store_status(void)
         }
 }
 
+static inline void do_wait_for_stop(void)
+{
+        int cpu;
+
+        /* Wait for all other cpus to enter stopped state */
+        for_each_online_cpu(cpu) {
+                if (cpu == smp_processor_id())
+                        continue;
+                while(!smp_cpu_not_running(cpu))
+                        cpu_relax();
+        }
+}
+
 /*
  * this function sends a 'stop' sigp to all other CPUs in the system.
  * it goes straight through.
  */
 void smp_send_stop(void)
 {
+        /* Disable all interrupts/machine checks */
+        __load_psw_mask(PSW_KERNEL_BITS & ~PSW_MASK_MCHECK);
+
         /* write magic number to zero page (absolute 0) */
         lowcore_ptr[smp_processor_id()]->panic_magic = __PANIC_MAGIC;
 
         /* stop other processors. */
         do_send_stop();
 
+        /* wait until other processors are stopped */
+        do_wait_for_stop();
+
         /* store status of other processors. */
         do_store_status();
 }
@@ -250,88 +269,28 @@ void smp_send_stop(void)
  * Reboot, halt and power_off routines for SMP.
  */
 
-static void do_machine_restart(void * __unused)
-{
-        int cpu;
-        static atomic_t cpuid = ATOMIC_INIT(-1);
-
-        if (atomic_cmpxchg(&cpuid, -1, smp_processor_id()) != -1)
-                signal_processor(smp_processor_id(), sigp_stop);
-
-        /* Wait for all other cpus to enter stopped state */
-        for_each_online_cpu(cpu) {
-                if (cpu == smp_processor_id())
-                        continue;
-                while(!smp_cpu_not_running(cpu))
-                        cpu_relax();
-        }
-
-        /* Store status of other cpus. */
-        do_store_status();
-
-        /*
-         * Finally call reipl. Because we waited for all other
-         * cpus to enter this function we know that they do
-         * not hold any s390irq-locks (the cpus have been
-         * interrupted by an external interrupt and s390irq
-         * locks are always held disabled).
-         */
-        do_reipl();
-}
-
 void machine_restart_smp(char * __unused) 
 {
-        on_each_cpu(do_machine_restart, NULL, 0, 0);
-}
-
-static void do_wait_for_stop(void)
-{
-        unsigned long cr[16];
-
-        __ctl_store(cr, 0, 15);
-        cr[0] &= ~0xffff;
-        cr[6] = 0;
-        __ctl_load(cr, 0, 15);
-        for (;;)
-                enabled_wait();
-}
-
-static void do_machine_halt(void * __unused)
-{
-        static atomic_t cpuid = ATOMIC_INIT(-1);
-
-        if (atomic_cmpxchg(&cpuid, -1, smp_processor_id()) == -1) {
-                smp_send_stop();
-                if (MACHINE_IS_VM && strlen(vmhalt_cmd) > 0)
-                        cpcmd(vmhalt_cmd, NULL, 0, NULL);
-                signal_processor(smp_processor_id(),
-                                 sigp_stop_and_store_status);
-        }
-        do_wait_for_stop();
+        smp_send_stop();
+        do_reipl();
 }
 
 void machine_halt_smp(void)
 {
-        on_each_cpu(do_machine_halt, NULL, 0, 0);
-}
-
-static void do_machine_power_off(void * __unused)
-{
-        static atomic_t cpuid = ATOMIC_INIT(-1);
-
-        if (atomic_cmpxchg(&cpuid, -1, smp_processor_id()) == -1) {
-                smp_send_stop();
-                if (MACHINE_IS_VM && strlen(vmpoff_cmd) > 0)
-                        cpcmd(vmpoff_cmd, NULL, 0, NULL);
-                signal_processor(smp_processor_id(),
-                                 sigp_stop_and_store_status);
-        }
-        do_wait_for_stop();
+        smp_send_stop();
+        if (MACHINE_IS_VM && strlen(vmhalt_cmd) > 0)
+                __cpcmd(vmhalt_cmd, NULL, 0, NULL);
+        signal_processor(smp_processor_id(), sigp_stop_and_store_status);
+        for (;;);
 }
 
 void machine_power_off_smp(void)
 {
-        on_each_cpu(do_machine_power_off, NULL, 0, 0);
+        smp_send_stop();
+        if (MACHINE_IS_VM && strlen(vmpoff_cmd) > 0)
+                __cpcmd(vmpoff_cmd, NULL, 0, NULL);
+        signal_processor(smp_processor_id(), sigp_stop_and_store_status);
+        for (;;);
 }
 
 /*
@@ -501,8 +460,6 @@ __init smp_count_cpus(void)
  */
 extern void init_cpu_timer(void);
 extern void init_cpu_vtimer(void);
-extern int pfault_init(void);
-extern void pfault_fini(void);
 
 int __devinit start_secondary(void *cpuvoid)
 {
@@ -514,11 +471,9 @@ int __devinit start_secondary(void *cpuvoid)
 #ifdef CONFIG_VIRT_TIMER
         init_cpu_vtimer();
 #endif
-#ifdef CONFIG_PFAULT
         /* Enable pfault pseudo page faults on this cpu. */
-        if (MACHINE_IS_VM)
-                pfault_init();
-#endif
+        pfault_init();
+
         /* Mark this cpu as online */
         cpu_set(smp_processor_id(), cpu_online_map);
         /* Switch on interrupts */
@@ -708,11 +663,8 @@ __cpu_disable(void)
         }
         cpu_clear(cpu, cpu_online_map);
 
-#ifdef CONFIG_PFAULT
         /* Disable pfault pseudo page faults on this cpu. */
-        if (MACHINE_IS_VM)
-                pfault_fini();
-#endif
+        pfault_fini();
 
         memset(&cr_parms.orvals, 0, sizeof(cr_parms.orvals));
         memset(&cr_parms.andvals, 0xff, sizeof(cr_parms.andvals));
@@ -842,7 +794,10 @@ static int __init topology_init(void)
         int ret;
 
         for_each_possible_cpu(cpu) {
-                ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu);
+                struct cpu *c = &per_cpu(cpu_devices, cpu);
+
+                c->hotpluggable = 1;
+                ret = register_cpu(c, cpu);
                 if (ret)
                         printk(KERN_WARNING "topology_init: register_cpu %d "
                                "failed (%d)\n", cpu, ret);
@@ -860,4 +815,3 @@ EXPORT_SYMBOL(smp_ctl_clear_bit);
 EXPORT_SYMBOL(smp_call_function);
 EXPORT_SYMBOL(smp_get_cpu);
 EXPORT_SYMBOL(smp_put_cpu);
-
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 92ecffbc8d82..3cbb0dcf1f1d 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -58,12 +58,6 @@ int sysctl_userprocess_debug = 0;
 
 extern pgm_check_handler_t do_protection_exception;
 extern pgm_check_handler_t do_dat_exception;
-#ifdef CONFIG_PFAULT
-extern int pfault_init(void);
-extern void pfault_fini(void);
-extern void pfault_interrupt(__u16 error_code);
-static ext_int_info_t ext_int_pfault;
-#endif
 extern pgm_check_handler_t do_monitor_call;
 
 #define stack_pointer ({ void **sp; asm("la %0,0(15)" : "=&d" (sp)); sp; })
@@ -135,7 +129,7 @@ __show_trace(unsigned long sp, unsigned long low, unsigned long high)
         }
 }
 
-void show_trace(struct task_struct *task, unsigned long * stack)
+void show_trace(struct task_struct *task, unsigned long *stack)
 {
         register unsigned long __r15 asm ("15");
         unsigned long sp;
@@ -157,6 +151,9 @@ void show_trace(struct task_struct *task, unsigned long * stack)
                 __show_trace(sp, S390_lowcore.thread_info,
                              S390_lowcore.thread_info + THREAD_SIZE);
         printk("\n");
+        if (!task)
+                task = current;
+        debug_show_held_locks(task);
 }
 
 void show_stack(struct task_struct *task, unsigned long *sp)
@@ -739,22 +736,5 @@ void __init trap_init(void)
         pgm_check_table[0x1C] = &space_switch_exception;
         pgm_check_table[0x1D] = &hfp_sqrt_exception;
         pgm_check_table[0x40] = &do_monitor_call;
-
-        if (MACHINE_IS_VM) {
-#ifdef CONFIG_PFAULT
-                /*
-                 * Try to get pfault pseudo page faults going.
-                 */
-                if (register_early_external_interrupt(0x2603, pfault_interrupt,
-                                                      &ext_int_pfault) != 0)
-                        panic("Couldn't request external interrupt 0x2603");
-
-                if (pfault_init() == 0) 
-                        return;
-                
-                /* Tough luck, no pfault. */
-                unregister_early_external_interrupt(0x2603, pfault_interrupt,
-                                                    &ext_int_pfault);
-#endif
-        }
+        pfault_irq_init();
 }
diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile
index b0cfa6c4883d..b5f94cf3bde8 100644
--- a/arch/s390/lib/Makefile
+++ b/arch/s390/lib/Makefile
@@ -4,7 +4,7 @@
 
 EXTRA_AFLAGS := -traditional
 
-lib-y += delay.o string.o uaccess_std.o
+lib-y += delay.o string.o uaccess_std.o uaccess_pt.o
 lib-$(CONFIG_32BIT) += div64.o
 lib-$(CONFIG_64BIT) += uaccess_mvcos.o
 lib-$(CONFIG_SMP) += spinlock.o
diff --git a/arch/s390/lib/uaccess_mvcos.c b/arch/s390/lib/uaccess_mvcos.c
index 121b2935a422..f9a23d57eb79 100644
--- a/arch/s390/lib/uaccess_mvcos.c
+++ b/arch/s390/lib/uaccess_mvcos.c
@@ -27,6 +27,9 @@
 #define SLR     "slgr"
 #endif
 
+extern size_t copy_from_user_std(size_t, const void __user *, void *);
+extern size_t copy_to_user_std(size_t, void __user *, const void *);
+
 size_t copy_from_user_mvcos(size_t size, const void __user *ptr, void *x)
 {
         register unsigned long reg0 asm("0") = 0x81UL;
@@ -66,6 +69,13 @@ size_t copy_from_user_mvcos(size_t size, const void __user *ptr, void *x)
         return size;
 }
 
+size_t copy_from_user_mvcos_check(size_t size, const void __user *ptr, void *x)
+{
+        if (size <= 256)
+                return copy_from_user_std(size, ptr, x);
+        return copy_from_user_mvcos(size, ptr, x);
+}
+
 size_t copy_to_user_mvcos(size_t size, void __user *ptr, const void *x)
 {
         register unsigned long reg0 asm("0") = 0x810000UL;
@@ -95,6 +105,13 @@ size_t copy_to_user_mvcos(size_t size, void __user *ptr, const void *x)
         return size;
 }
 
+size_t copy_to_user_mvcos_check(size_t size, void __user *ptr, const void *x)
+{
+        if (size <= 256)
+                return copy_to_user_std(size, ptr, x);
+        return copy_to_user_mvcos(size, ptr, x);
+}
+
 size_t copy_in_user_mvcos(size_t size, void __user *to, const void __user *from)
 {
         register unsigned long reg0 asm("0") = 0x810081UL;
@@ -145,18 +162,16 @@ size_t clear_user_mvcos(size_t size, void __user *to)
         return size;
 }
 
-extern size_t copy_from_user_std_small(size_t, const void __user *, void *);
-extern size_t copy_to_user_std_small(size_t, void __user *, const void *);
 extern size_t strnlen_user_std(size_t, const char __user *);
 extern size_t strncpy_from_user_std(size_t, const char __user *, char *);
 extern int futex_atomic_op(int, int __user *, int, int *);
 extern int futex_atomic_cmpxchg(int __user *, int, int);
 
 struct uaccess_ops uaccess_mvcos = {
-        .copy_from_user = copy_from_user_mvcos,
-        .copy_from_user_small = copy_from_user_std_small,
-        .copy_to_user = copy_to_user_mvcos,
-        .copy_to_user_small = copy_to_user_std_small,
+        .copy_from_user = copy_from_user_mvcos_check,
+        .copy_from_user_small = copy_from_user_std,
+        .copy_to_user = copy_to_user_mvcos_check,
+        .copy_to_user_small = copy_to_user_std,
         .copy_in_user = copy_in_user_mvcos,
         .clear_user = clear_user_mvcos,
         .strnlen_user = strnlen_user_std,
diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c
new file mode 100644
index 000000000000..49c3e46b4065
--- /dev/null
+++ b/arch/s390/lib/uaccess_pt.c
@@ -0,0 +1,157 @@
+/*
+ *  arch/s390/lib/uaccess_pt.c
+ *
+ *  User access functions based on page table walks.
+ *
+ *    Copyright IBM Corp. 2006
+ *    Author(s): Gerald Schaefer (gerald.schaefer@de.ibm.com)
+ */
+
+#include <linux/errno.h>
+#include <linux/hardirq.h>
+#include <linux/mm.h>
+#include <asm/uaccess.h>
+#include <asm/futex.h>
+
+static inline int __handle_fault(struct mm_struct *mm, unsigned long address,
+                                 int write_access)
+{
+        struct vm_area_struct *vma;
+        int ret = -EFAULT;
+
+        if (in_atomic())
+                return ret;
+        down_read(&mm->mmap_sem);
+        vma = find_vma(mm, address);
+        if (unlikely(!vma))
+                goto out;
+        if (unlikely(vma->vm_start > address)) {
+                if (!(vma->vm_flags & VM_GROWSDOWN))
+                        goto out;
+                if (expand_stack(vma, address))
+                        goto out;
+        }
+
+        if (!write_access) {
+                /* page not present, check vm flags */
+                if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))
+                        goto out;
+        } else {
+                if (!(vma->vm_flags & VM_WRITE))
+                        goto out;
+        }
+
+survive:
+        switch (handle_mm_fault(mm, vma, address, write_access)) {
+        case VM_FAULT_MINOR:
+                current->min_flt++;
+                break;
+        case VM_FAULT_MAJOR:
+                current->maj_flt++;
+                break;
+        case VM_FAULT_SIGBUS:
+                goto out_sigbus;
+        case VM_FAULT_OOM:
+                goto out_of_memory;
+        default:
+                BUG();
+        }
+        ret = 0;
+out:
+        up_read(&mm->mmap_sem);
+        return ret;
+
+out_of_memory:
+        up_read(&mm->mmap_sem);
+        if (is_init(current)) {
+                yield();
+                down_read(&mm->mmap_sem);
+                goto survive;
+        }
+        printk("VM: killing process %s\n", current->comm);
+        return ret;
+
+out_sigbus:
+        up_read(&mm->mmap_sem);
+        current->thread.prot_addr = address;
+        current->thread.trap_no = 0x11;
+        force_sig(SIGBUS, current);
+        return ret;
+}
+
+static inline size_t __user_copy_pt(unsigned long uaddr, void *kptr,
+                                    size_t n, int write_user)
+{
+        struct mm_struct *mm = current->mm;
+        unsigned long offset, pfn, done, size;
+        pgd_t *pgd;
+        pmd_t *pmd;
+        pte_t *pte;
+        void *from, *to;
+
+        done = 0;
+retry:
+        spin_lock(&mm->page_table_lock);
+        do {
+                pgd = pgd_offset(mm, uaddr);
+                if (pgd_none(*pgd) || unlikely(pgd_bad(*pgd)))
+                        goto fault;
+
+                pmd = pmd_offset(pgd, uaddr);
+                if (pmd_none(*pmd) || unlikely(pmd_bad(*pmd)))
+                        goto fault;
+
+                pte = pte_offset_map(pmd, uaddr);
+                if (!pte || !pte_present(*pte) ||
+                    (write_user && !pte_write(*pte)))
+                        goto fault;
+
+                pfn = pte_pfn(*pte);
+                if (!pfn_valid(pfn))
+                        goto out;
+
+                offset = uaddr & (PAGE_SIZE - 1);
+                size = min(n - done, PAGE_SIZE - offset);
+                if (write_user) {
+                        to = (void *)((pfn << PAGE_SHIFT) + offset);
+                        from = kptr + done;
+                } else {
+                        from = (void *)((pfn << PAGE_SHIFT) + offset);
+                        to = kptr + done;
+                }
+                memcpy(to, from, size);
+                done += size;
+                uaddr += size;
+        } while (done < n);
+out:
+        spin_unlock(&mm->page_table_lock);
+        return n - done;
+fault:
+        spin_unlock(&mm->page_table_lock);
+        if (__handle_fault(mm, uaddr, write_user))
+                return n - done;
+        goto retry;
+}
+
+size_t copy_from_user_pt(size_t n, const void __user *from, void *to)
+{
+        size_t rc;
+
+        if (segment_eq(get_fs(), KERNEL_DS)) {
+                memcpy(to, (void __kernel __force *) from, n);
+                return 0;
+        }
+        rc = __user_copy_pt((unsigned long) from, to, n, 0);
+        if (unlikely(rc))
+                memset(to + n - rc, 0, rc);
+        return rc;
+}
+
+size_t copy_to_user_pt(size_t n, void __user *to, const void *from)
+{
+        if (segment_eq(get_fs(), KERNEL_DS)) {
+                memcpy((void __kernel __force *) to, from, n);
+                return 0;
+        }
+        return __user_copy_pt((unsigned long) to, (void *) from, n, 1);
+}
diff --git a/arch/s390/lib/uaccess_std.c b/arch/s390/lib/uaccess_std.c
index f44f0078b354..56a0214e9928 100644
--- a/arch/s390/lib/uaccess_std.c
+++ b/arch/s390/lib/uaccess_std.c
@@ -11,7 +11,7 @@
 
 #include <linux/errno.h>
 #include <linux/mm.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/futex.h>
 
 #ifndef __s390x__
@@ -28,6 +28,9 @@
 #define SLR     "slgr"
 #endif
 
+extern size_t copy_from_user_pt(size_t n, const void __user *from, void *to);
+extern size_t copy_to_user_pt(size_t n, void __user *to, const void *from);
+
 size_t copy_from_user_std(size_t size, const void __user *ptr, void *x)
 {
         unsigned long tmp1, tmp2;
@@ -69,34 +72,11 @@ size_t copy_from_user_std(size_t size, const void __user *ptr, void *x)
         return size;
 }
 
-size_t copy_from_user_std_small(size_t size, const void __user *ptr, void *x)
+size_t copy_from_user_std_check(size_t size, const void __user *ptr, void *x)
 {
-        unsigned long tmp1, tmp2;
-
-        tmp1 = 0UL;
-        asm volatile(
-                "0: mvcp  0(%0,%2),0(%1),%3\n"
-                "  "SLR"  %0,%0\n"
-                "   j     5f\n"
-                "1: la    %4,255(%1)\n" /* %4 = ptr + 255 */
-                "  "LHI"  %3,-4096\n"
-                "   nr    %4,%3\n"      /* %4 = (ptr + 255) & -4096 */
-                "  "SLR"  %4,%1\n"
-                "  "CLR"  %0,%4\n"      /* copy crosses next page boundary? */
-                "   jnh   5f\n"
-                "2: mvcp  0(%4,%2),0(%1),%3\n"
-                "  "SLR"  %0,%4\n"
-                "  "ALR"  %2,%4\n"
-                "3:"LHI"  %4,-1\n"
-                "  "ALR"  %4,%0\n"      /* copy remaining size, subtract 1 */
-                "   bras  %3,4f\n"
-                "   xc    0(1,%2),0(%2)\n"
-                "4: ex    %4,0(%3)\n"
-                "5:\n"
-                EX_TABLE(0b,1b) EX_TABLE(2b,3b)
-                : "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2)
-                : : "cc", "memory");
-        return size;
+        if (size <= 1024)
+                return copy_from_user_std(size, ptr, x);
+        return copy_from_user_pt(size, ptr, x);
 }
 
 size_t copy_to_user_std(size_t size, void __user *ptr, const void *x)
@@ -130,28 +110,11 @@ size_t copy_to_user_std(size_t size, void __user *ptr, const void *x)
         return size;
 }
 
-size_t copy_to_user_std_small(size_t size, void __user *ptr, const void *x)
+size_t copy_to_user_std_check(size_t size, void __user *ptr, const void *x)
 {
-        unsigned long tmp1, tmp2;
-
-        tmp1 = 0UL;
-        asm volatile(
-                "0: mvcs  0(%0,%1),0(%2),%3\n"
-                "  "SLR"  %0,%0\n"
-                "   j     3f\n"
-                "1: la    %4,255(%1)\n" /* ptr + 255 */
-                "  "LHI"  %3,-4096\n"
-                "   nr    %4,%3\n"      /* (ptr + 255) & -4096UL */
-                "  "SLR"  %4,%1\n"
-                "  "CLR"  %0,%4\n"      /* copy crosses next page boundary? */
-                "   jnh   3f\n"
-                "2: mvcs  0(%4,%1),0(%2),%3\n"
-                "  "SLR"  %0,%4\n"
-                "3:\n"
-                EX_TABLE(0b,1b) EX_TABLE(2b,3b)
-                : "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2)
-                : : "cc", "memory");
-        return size;
+        if (size <= 1024)
+                return copy_to_user_std(size, ptr, x);
+        return copy_to_user_pt(size, ptr, x);
 }
 
 size_t copy_in_user_std(size_t size, void __user *to, const void __user *from)
@@ -295,8 +258,6 @@ int futex_atomic_op(int op, int __user *uaddr, int oparg, int *old)
 {
         int oldval = 0, newval, ret;
 
-        inc_preempt_count();
-
         switch (op) {
         case FUTEX_OP_SET:
                 __futex_atomic_op("lr %2,%5\n",
@@ -321,7 +282,6 @@ int futex_atomic_op(int op, int __user *uaddr, int oparg, int *old)
         default:
                 ret = -ENOSYS;
         }
-        dec_preempt_count();
         *old = oldval;
         return ret;
 }
@@ -343,10 +303,10 @@ int futex_atomic_cmpxchg(int __user *uaddr, int oldval, int newval)
 }
 
 struct uaccess_ops uaccess_std = {
-        .copy_from_user = copy_from_user_std,
-        .copy_from_user_small = copy_from_user_std_small,
-        .copy_to_user = copy_to_user_std,
-        .copy_to_user_small = copy_to_user_std_small,
+        .copy_from_user = copy_from_user_std_check,
+        .copy_from_user_small = copy_from_user_std,
+        .copy_to_user = copy_to_user_std_check,
+        .copy_to_user_small = copy_to_user_std,
         .copy_in_user = copy_in_user_std,
         .clear_user = clear_user_std,
         .strnlen_user = strnlen_user_std,
diff --git a/arch/s390/mm/Makefile b/arch/s390/mm/Makefile
index aa9a42b6e62d..8e09db1edbb9 100644
--- a/arch/s390/mm/Makefile
+++ b/arch/s390/mm/Makefile
@@ -2,6 +2,6 @@
 # Makefile for the linux s390-specific parts of the memory manager.
 #
 
-obj-y    := init.o fault.o ioremap.o extmem.o mmap.o
+obj-y    := init.o fault.o ioremap.o extmem.o mmap.o vmem.o
 obj-$(CONFIG_CMM) += cmm.o
 
diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c
index 226275d5c4f6..775bf19e742b 100644
--- a/arch/s390/mm/extmem.c
+++ b/arch/s390/mm/extmem.c
@@ -14,12 +14,14 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/bootmem.h>
+#include <linux/ctype.h>
 #include <asm/page.h>
+#include <asm/pgtable.h>
 #include <asm/ebcdic.h>
 #include <asm/errno.h>
 #include <asm/extmem.h>
 #include <asm/cpcmd.h>
-#include <linux/ctype.h>
+#include <asm/setup.h>
 
 #define DCSS_DEBUG      /* Debug messages on/off */
 
@@ -77,15 +79,11 @@ struct dcss_segment {
         int segcnt;
 };
 
-static DEFINE_SPINLOCK(dcss_lock);
+static DEFINE_MUTEX(dcss_lock);
 static struct list_head dcss_list = LIST_HEAD_INIT(dcss_list);
 static char *segtype_string[] = { "SW", "EW", "SR", "ER", "SN", "EN", "SC",
                                         "EW/EN-MIXED" };
 
-extern struct {
-        unsigned long addr, size, type;
-} memory_chunk[MEMORY_CHUNKS];
-
 /*
  * Create the 8 bytes, ebcdic VM segment name from
  * an ascii name.
@@ -117,7 +115,7 @@ segment_by_name (char *name)
         struct list_head *l;
         struct dcss_segment *tmp, *retval = NULL;
 
-        assert_spin_locked(&dcss_lock);
+        BUG_ON(!mutex_is_locked(&dcss_lock));
         dcss_mkname (name, dcss_name);
         list_for_each (l, &dcss_list) {
                 tmp = list_entry (l, struct dcss_segment, list);
@@ -241,65 +239,6 @@ query_segment_type (struct dcss_segment *seg)
 }
 
 /*
- * check if the given segment collides with guest storage.
- * returns 1 if this is the case, 0 if no collision was found
- */
-static int
-segment_overlaps_storage(struct dcss_segment *seg)
-{
-        int i;
-
-        for (i=0; i < MEMORY_CHUNKS && memory_chunk[i].size > 0; i++) {
-                if (memory_chunk[i].type != 0)
-                        continue;
-                if ((memory_chunk[i].addr >> 20) > (seg->end >> 20))
-                        continue;
-                if (((memory_chunk[i].addr + memory_chunk[i].size - 1) >> 20)
-                                < (seg->start_addr >> 20))
-                        continue;
-                return 1;
-        }
-        return 0;
-}
-
-/*
- * check if segment collides with other segments that are currently loaded
- * returns 1 if this is the case, 0 if no collision was found
- */
-static int
-segment_overlaps_others (struct dcss_segment *seg)
-{
-        struct list_head *l;
-        struct dcss_segment *tmp;
-
-        assert_spin_locked(&dcss_lock);
-        list_for_each(l, &dcss_list) {
-                tmp = list_entry(l, struct dcss_segment, list);
-                if ((tmp->start_addr >> 20) > (seg->end >> 20))
-                        continue;
-                if ((tmp->end >> 20) < (seg->start_addr >> 20))
-                        continue;
-                if (seg == tmp)
-                        continue;
-                return 1;
-        }
-        return 0;
-}
-
-/*
- * check if segment exceeds the kernel mapping range (detected or set via mem=)
- * returns 1 if this is the case, 0 if segment fits into the range
- */
-static inline int
-segment_exceeds_range (struct dcss_segment *seg)
-{
-        int seg_last_pfn = (seg->end) >> PAGE_SHIFT;
-        if (seg_last_pfn > max_pfn)
-                return 1;
-        return 0;
-}
-
-/*
  * get info about a segment
  * possible return values:
  * -ENOSYS  : we are not running on VM
@@ -344,24 +283,26 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long
         rc = query_segment_type (seg);
         if (rc < 0)
                 goto out_free;
-        if (segment_exceeds_range(seg)) {
-                PRINT_WARN ("segment_load: not loading segment %s - exceeds"
-                                " kernel mapping range\n",name);
-                rc = -ERANGE;
+
+        rc = add_shared_memory(seg->start_addr, seg->end - seg->start_addr + 1);
+
+        switch (rc) {
+        case 0:
+                break;
+        case -ENOSPC:
+                PRINT_WARN("segment_load: not loading segment %s - overlaps "
+                           "storage/segment\n", name);
                 goto out_free;
-        }
-        if (segment_overlaps_storage(seg)) {
-                PRINT_WARN ("segment_load: not loading segment %s - overlaps"
-                                " storage\n",name);
-                rc = -ENOSPC;
+        case -ERANGE:
+                PRINT_WARN("segment_load: not loading segment %s - exceeds "
+                           "kernel mapping range\n", name);
                 goto out_free;
-        }
-        if (segment_overlaps_others(seg)) {
-                PRINT_WARN ("segment_load: not loading segment %s - overlaps"
-                                " other segments\n",name);
-                rc = -EBUSY;
+        default:
+                PRINT_WARN("segment_load: not loading segment %s (rc: %d)\n",
+                           name, rc);
                 goto out_free;
         }
+
         if (do_nonshared)
                 dcss_command = DCSS_LOADNSR;
         else
@@ -375,7 +316,7 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long
                 rc = dcss_diag_translate_rc (seg->end);
                 dcss_diag(DCSS_PURGESEG, seg->dcss_name,
                                 &seg->start_addr, &seg->end);
-                goto out_free;
+                goto out_shared;
         }
         seg->do_nonshared = do_nonshared;
         atomic_set(&seg->ref_count, 1);
@@ -394,6 +335,8 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long
                                 (void*)seg->start_addr, (void*)seg->end,
                                 segtype_string[seg->vm_segtype]);
         goto out;
+ out_shared:
+        remove_shared_memory(seg->start_addr, seg->end - seg->start_addr + 1);
  out_free:
         kfree(seg);
  out:
@@ -429,7 +372,7 @@ segment_load (char *name, int do_nonshared, unsigned long *addr,
         if (!MACHINE_IS_VM)
                 return -ENOSYS;
 
-        spin_lock (&dcss_lock);
+        mutex_lock(&dcss_lock);
         seg = segment_by_name (name);
         if (seg == NULL)
                 rc = __segment_load (name, do_nonshared, addr, end);
@@ -444,7 +387,7 @@ segment_load (char *name, int do_nonshared, unsigned long *addr,
                         rc    = -EPERM;
                 }
         }
-        spin_unlock (&dcss_lock);
+        mutex_unlock(&dcss_lock);
         return rc;
 }
 
@@ -467,7 +410,7 @@ segment_modify_shared (char *name, int do_nonshared)
         unsigned long dummy;
         int dcss_command, rc, diag_cc;
 
-        spin_lock (&dcss_lock);
+        mutex_lock(&dcss_lock);
         seg = segment_by_name (name);
         if (seg == NULL) {
                 rc = -EINVAL;
@@ -508,7 +451,7 @@ segment_modify_shared (char *name, int do_nonshared)
                   &dummy, &dummy);
         kfree(seg);
  out_unlock:
-        spin_unlock(&dcss_lock);
+        mutex_unlock(&dcss_lock);
         return rc;
 }
 
@@ -526,21 +469,21 @@ segment_unload(char *name)
         if (!MACHINE_IS_VM)
                 return;
 
-        spin_lock(&dcss_lock);
+        mutex_lock(&dcss_lock);
         seg = segment_by_name (name);
         if (seg == NULL) {
                 PRINT_ERR ("could not find segment %s in segment_unload, "
                                 "please report to linux390@de.ibm.com\n",name);
                 goto out_unlock;
         }
-        if (atomic_dec_return(&seg->ref_count) == 0) {
-                list_del(&seg->list);
-                dcss_diag(DCSS_PURGESEG, seg->dcss_name,
-                          &dummy, &dummy);
-                kfree(seg);
-        }
+        if (atomic_dec_return(&seg->ref_count) != 0)
+                goto out_unlock;
+        remove_shared_memory(seg->start_addr, seg->end - seg->start_addr + 1);
+        list_del(&seg->list);
+        dcss_diag(DCSS_PURGESEG, seg->dcss_name, &dummy, &dummy);
+        kfree(seg);
 out_unlock:
-        spin_unlock(&dcss_lock);
+        mutex_unlock(&dcss_lock);
 }
 
 /*
@@ -559,12 +502,13 @@ segment_save(char *name)
         if (!MACHINE_IS_VM)
                 return;
 
-        spin_lock(&dcss_lock);
+        mutex_lock(&dcss_lock);
         seg = segment_by_name (name);
 
         if (seg == NULL) {
-                PRINT_ERR ("could not find segment %s in segment_save, please report to linux390@de.ibm.com\n",name);
-                return;
+                PRINT_ERR("could not find segment %s in segment_save, please "
+                          "report to linux390@de.ibm.com\n", name);
+                goto out;
         }
 
         startpfn = seg->start_addr >> PAGE_SHIFT;
@@ -591,7 +535,7 @@ segment_save(char *name)
                 goto out;
         }
 out:
-        spin_unlock(&dcss_lock);
+        mutex_unlock(&dcss_lock);
 }
 
 EXPORT_SYMBOL(segment_load);
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 1c323bbfda91..cd85e34d8703 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -31,6 +31,7 @@
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/kdebug.h>
+#include <asm/s390_ext.h>
 
 #ifndef CONFIG_64BIT
 #define __FAIL_ADDR_MASK 0x7ffff000
@@ -394,6 +395,7 @@ void do_dat_exception(struct pt_regs *regs, unsigned long error_code)
 /*
  * 'pfault' pseudo page faults routines.
  */
+static ext_int_info_t ext_int_pfault;
 static int pfault_disable = 0;
 
 static int __init nopfault(char *str)
@@ -422,7 +424,7 @@ int pfault_init(void)
                   __PF_RES_FIELD };
         int rc;
 
-        if (pfault_disable)
+        if (!MACHINE_IS_VM || pfault_disable)
                 return -1;
         asm volatile(
                 "       diag    %1,%0,0x258\n"
@@ -440,7 +442,7 @@ void pfault_fini(void)
         pfault_refbk_t refbk =
         { 0x258, 1, 5, 2, 0ULL, 0ULL, 0ULL, 0ULL };
 
-        if (pfault_disable)
+        if (!MACHINE_IS_VM || pfault_disable)
                 return;
         __ctl_clear_bit(0,9);
         asm volatile(
@@ -500,5 +502,25 @@ pfault_interrupt(__u16 error_code)
                         set_tsk_need_resched(tsk);
         }
 }
-#endif
 
+void __init pfault_irq_init(void)
+{
+        if (!MACHINE_IS_VM)
+                return;
+
+        /*
+         * Try to get pfault pseudo page faults going.
+         */
+        if (register_early_external_interrupt(0x2603, pfault_interrupt,
+                                              &ext_int_pfault) != 0)
+                panic("Couldn't request external interrupt 0x2603");
+
+        if (pfault_init() == 0)
+                return;
+
+        /* Tough luck, no pfault. */
+        pfault_disable = 1;
+        unregister_early_external_interrupt(0x2603, pfault_interrupt,
+                                            &ext_int_pfault);
+}
+#endif
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index e1881c31b1cb..4bb21be3b007 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -24,6 +24,7 @@
 #include <linux/pagemap.h>
 #include <linux/bootmem.h>
 #include <linux/pfn.h>
+#include <linux/poison.h>
 
 #include <asm/processor.h>
 #include <asm/system.h>
@@ -69,6 +70,8 @@ void show_mem(void)
         printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
         i = max_mapnr;
         while (i-- > 0) {
+                if (!pfn_valid(i))
+                        continue;
                 page = pfn_to_page(i);
                 total++;
                 if (PageReserved(page))
@@ -84,150 +87,52 @@ void show_mem(void)
         printk("%d pages swap cached\n",cached);
 }
 
-extern unsigned long __initdata zholes_size[];
-/*
- * paging_init() sets up the page tables
- */
-
-#ifndef CONFIG_64BIT
-void __init paging_init(void)
+static void __init setup_ro_region(void)
 {
-        pgd_t * pg_dir;
-        pte_t * pg_table;
-        pte_t   pte;
-        int     i;
-        unsigned long tmp;
-        unsigned long pfn = 0;
-        unsigned long pgdir_k = (__pa(swapper_pg_dir) & PAGE_MASK) | _KERNSEG_TABLE;
-        static const int ssm_mask = 0x04000000L;
-        unsigned long ro_start_pfn, ro_end_pfn;
-        unsigned long zones_size[MAX_NR_ZONES];
-
-        ro_start_pfn = PFN_DOWN((unsigned long)&__start_rodata);
-        ro_end_pfn = PFN_UP((unsigned long)&__end_rodata);
-
-        memset(zones_size, 0, sizeof(zones_size));
-        zones_size[ZONE_DMA] = max_low_pfn;
-        free_area_init_node(0, &contig_page_data, zones_size,
-                            __pa(PAGE_OFFSET) >> PAGE_SHIFT,
-                            zholes_size);
-
-        /* unmap whole virtual address space */
-        
-        pg_dir = swapper_pg_dir;
-
-        for (i = 0; i < PTRS_PER_PGD; i++)
-                pmd_clear((pmd_t *) pg_dir++);
-                
-        /*
-         * map whole physical memory to virtual memory (identity mapping) 
-         */
-
-        pg_dir = swapper_pg_dir;
-
-        while (pfn < max_low_pfn) {
-                /*
-                 * pg_table is physical at this point
-                 */
-                pg_table = (pte_t *) alloc_bootmem_pages(PAGE_SIZE);
-
-                pmd_populate_kernel(&init_mm, (pmd_t *) pg_dir, pg_table);
-                pg_dir++;
-
-                for (tmp = 0 ; tmp < PTRS_PER_PTE ; tmp++,pg_table++) {
-                        if (pfn >= ro_start_pfn && pfn < ro_end_pfn)
-                                pte = pfn_pte(pfn, __pgprot(_PAGE_RO));
-                        else
-                                pte = pfn_pte(pfn, PAGE_KERNEL);
-                        if (pfn >= max_low_pfn)
-                                pte_val(pte) = _PAGE_TYPE_EMPTY;
-                        set_pte(pg_table, pte);
-                        pfn++;
-                }
-        }
-
-        S390_lowcore.kernel_asce = pgdir_k;
-
-        /* enable virtual mapping in kernel mode */
-        __ctl_load(pgdir_k, 1, 1);
-        __ctl_load(pgdir_k, 7, 7);
-        __ctl_load(pgdir_k, 13, 13);
-        __raw_local_irq_ssm(ssm_mask);
-
-        local_flush_tlb();
+        pgd_t *pgd;
+        pmd_t *pmd;
+        pte_t *pte;
+        pte_t new_pte;
+        unsigned long address, end;
+
+        address = ((unsigned long)&__start_rodata) & PAGE_MASK;
+        end = PFN_ALIGN((unsigned long)&__end_rodata);
+
+        for (; address < end; address += PAGE_SIZE) {
+                pgd = pgd_offset_k(address);
+                pmd = pmd_offset(pgd, address);
+                pte = pte_offset_kernel(pmd, address);
+                new_pte = mk_pte_phys(address, __pgprot(_PAGE_RO));
+                set_pte(pte, new_pte);
+        }
 }
 
-#else /* CONFIG_64BIT */
+extern void vmem_map_init(void);
 
+/*
+ * paging_init() sets up the page tables
+ */
 void __init paging_init(void)
 {
-        pgd_t * pg_dir;
-        pmd_t * pm_dir;
-        pte_t * pt_dir;
-        pte_t   pte;
-        int     i,j,k;
-        unsigned long pfn = 0;
-        unsigned long pgdir_k = (__pa(swapper_pg_dir) & PAGE_MASK) |
-          _KERN_REGION_TABLE;
+        pgd_t *pg_dir;
+        int i;
+        unsigned long pgdir_k;
         static const int ssm_mask = 0x04000000L;
-        unsigned long zones_size[MAX_NR_ZONES];
-        unsigned long dma_pfn, high_pfn;
-        unsigned long ro_start_pfn, ro_end_pfn;
-
-        memset(zones_size, 0, sizeof(zones_size));
-        dma_pfn = MAX_DMA_ADDRESS >> PAGE_SHIFT;
-        high_pfn = max_low_pfn;
-        ro_start_pfn = PFN_DOWN((unsigned long)&__start_rodata);
-        ro_end_pfn = PFN_UP((unsigned long)&__end_rodata);
-
-        if (dma_pfn > high_pfn)
-                zones_size[ZONE_DMA] = high_pfn;
-        else {
-                zones_size[ZONE_DMA] = dma_pfn;
-                zones_size[ZONE_NORMAL] = high_pfn - dma_pfn;
-        }
-
-        /* Initialize mem_map[].  */
-        free_area_init_node(0, &contig_page_data, zones_size,
-                            __pa(PAGE_OFFSET) >> PAGE_SHIFT, zholes_size);
+        unsigned long max_zone_pfns[MAX_NR_ZONES];
 
-        /*
-         * map whole physical memory to virtual memory (identity mapping) 
-         */
-
-        pg_dir = swapper_pg_dir;
-        
-        for (i = 0 ; i < PTRS_PER_PGD ; i++,pg_dir++) {
+        pg_dir = swapper_pg_dir;
         
-                if (pfn >= max_low_pfn) {
-                        pgd_clear(pg_dir);
-                        continue;
-                }          
-        
-                pm_dir = (pmd_t *) alloc_bootmem_pages(PAGE_SIZE * 4);
-                pgd_populate(&init_mm, pg_dir, pm_dir);
-
-                for (j = 0 ; j < PTRS_PER_PMD ; j++,pm_dir++) {
-                        if (pfn >= max_low_pfn) {
-                                pmd_clear(pm_dir);
-                                continue; 
-                        }          
-                        
-                        pt_dir = (pte_t *) alloc_bootmem_pages(PAGE_SIZE);
-                        pmd_populate_kernel(&init_mm, pm_dir, pt_dir);
-        
-                        for (k = 0 ; k < PTRS_PER_PTE ; k++,pt_dir++) {
-                                if (pfn >= ro_start_pfn && pfn < ro_end_pfn)
-                                        pte = pfn_pte(pfn, __pgprot(_PAGE_RO));
-                                else
-                                        pte = pfn_pte(pfn, PAGE_KERNEL);
-                                if (pfn >= max_low_pfn)
-                                        pte_val(pte) = _PAGE_TYPE_EMPTY;
-                                set_pte(pt_dir, pte);
-                                pfn++;
-                        }
-                }
-        }
+#ifdef CONFIG_64BIT
+        pgdir_k = (__pa(swapper_pg_dir) & PAGE_MASK) | _KERN_REGION_TABLE;
+        for (i = 0; i < PTRS_PER_PGD; i++)
+                pgd_clear(pg_dir + i);
+#else
+        pgdir_k = (__pa(swapper_pg_dir) & PAGE_MASK) | _KERNSEG_TABLE;
+        for (i = 0; i < PTRS_PER_PGD; i++)
+                pmd_clear((pmd_t *)(pg_dir + i));
+#endif
+        vmem_map_init();
+        setup_ro_region();
 
         S390_lowcore.kernel_asce = pgdir_k;
 
@@ -237,9 +142,11 @@ void __init paging_init(void)
         __ctl_load(pgdir_k, 13, 13);
         __raw_local_irq_ssm(ssm_mask);
 
-        local_flush_tlb();
+        memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
+        max_zone_pfns[ZONE_DMA] = PFN_DOWN(MAX_DMA_ADDRESS);
+        max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
+        free_area_init_nodes(max_zone_pfns);
 }
-#endif /* CONFIG_64BIT */
 
 void __init mem_init(void)
 {
@@ -269,6 +176,8 @@ void __init mem_init(void)
         printk("Write protected kernel read-only data: %#lx - %#lx\n",
                (unsigned long)&__start_rodata,
                PFN_ALIGN((unsigned long)&__end_rodata) - 1);
+        printk("Virtual memmap size: %ldk\n",
+               (max_pfn * sizeof(struct page)) >> 10);
 }
 
 void free_initmem(void)
@@ -279,6 +188,7 @@ void free_initmem(void)
         for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
                 ClearPageReserved(virt_to_page(addr));
                 init_page_count(virt_to_page(addr));
+                memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
                 free_page(addr);
                 totalram_pages++;
         }
diff --git a/arch/s390/mm/ioremap.c b/arch/s390/mm/ioremap.c
index 0f6e9ecbefe2..3d2100a4e209 100644
--- a/arch/s390/mm/ioremap.c
+++ b/arch/s390/mm/ioremap.c
@@ -15,87 +15,8 @@
 
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/pgalloc.h>
-#include <asm/cacheflush.h>
-#include <asm/tlbflush.h>
-
-static inline void remap_area_pte(pte_t * pte, unsigned long address, unsigned long size,
-        unsigned long phys_addr, unsigned long flags)
-{
-        unsigned long end;
-        unsigned long pfn;
-
-        address &= ~PMD_MASK;
-        end = address + size;
-        if (end > PMD_SIZE)
-                end = PMD_SIZE;
-        if (address >= end)
-                BUG();
-        pfn = phys_addr >> PAGE_SHIFT;
-        do {
-                if (!pte_none(*pte)) {
-                        printk("remap_area_pte: page already exists\n");
-                        BUG();
-                }
-                set_pte(pte, pfn_pte(pfn, __pgprot(flags)));
-                address += PAGE_SIZE;
-                pfn++;
-                pte++;
-        } while (address && (address < end));
-}
-
-static inline int remap_area_pmd(pmd_t * pmd, unsigned long address, unsigned long size,
-        unsigned long phys_addr, unsigned long flags)
-{
-        unsigned long end;
-
-        address &= ~PGDIR_MASK;
-        end = address + size;
-        if (end > PGDIR_SIZE)
-                end = PGDIR_SIZE;
-        phys_addr -= address;
-        if (address >= end)
-                BUG();
-        do {
-                pte_t * pte = pte_alloc_kernel(pmd, address);
-                if (!pte)
-                        return -ENOMEM;
-                remap_area_pte(pte, address, end - address, address + phys_addr, flags);
-                address = (address + PMD_SIZE) & PMD_MASK;
-                pmd++;
-        } while (address && (address < end));
-        return 0;
-}
-
-static int remap_area_pages(unsigned long address, unsigned long phys_addr,
-                                 unsigned long size, unsigned long flags)
-{
-        int error;
-        pgd_t * dir;
-        unsigned long end = address + size;
-
-        phys_addr -= address;
-        dir = pgd_offset(&init_mm, address);
-        flush_cache_all();
-        if (address >= end)
-                BUG();
-        do {
-                pmd_t *pmd;
-                pmd = pmd_alloc(&init_mm, dir, address);
-                error = -ENOMEM;
-                if (!pmd)
-                        break;
-                if (remap_area_pmd(pmd, address, end - address,
-                                         phys_addr + address, flags))
-                        break;
-                error = 0;
-                address = (address + PGDIR_SIZE) & PGDIR_MASK;
-                dir++;
-        } while (address && (address < end));
-        flush_tlb_all();
-        return 0;
-}
 
 /*
  * Generic mapping function (not visible outside):
@@ -122,7 +43,8 @@ void * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flag
         if (!area)
                 return NULL;
         addr = area->addr;
-        if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
+        if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size,
+                               phys_addr, __pgprot(flags))) {
                 vfree(addr);
                 return NULL;
         }
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
new file mode 100644
index 000000000000..cd3d93e8c211
--- /dev/null
+++ b/arch/s390/mm/vmem.c
@@ -0,0 +1,382 @@
+/*
+ *  arch/s390/mm/vmem.c
+ *
+ *    Copyright IBM Corp. 2006
+ *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
+ */
+
+#include <linux/bootmem.h>
+#include <linux/pfn.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/list.h>
+#include <asm/pgalloc.h>
+#include <asm/pgtable.h>
+#include <asm/setup.h>
+#include <asm/tlbflush.h>
+
+unsigned long vmalloc_end;
+EXPORT_SYMBOL(vmalloc_end);
+
+static struct page *vmem_map;
+static DEFINE_MUTEX(vmem_mutex);
+
+struct memory_segment {
+        struct list_head list;
+        unsigned long start;
+        unsigned long size;
+};
+
+static LIST_HEAD(mem_segs);
+
+void memmap_init(unsigned long size, int nid, unsigned long zone,
+                 unsigned long start_pfn)
+{
+        struct page *start, *end;
+        struct page *map_start, *map_end;
+        int i;
+
+        start = pfn_to_page(start_pfn);
+        end = start + size;
+
+        for (i = 0; i < MEMORY_CHUNKS && memory_chunk[i].size > 0; i++) {
+                unsigned long cstart, cend;
+
+                cstart = PFN_DOWN(memory_chunk[i].addr);
+                cend = cstart + PFN_DOWN(memory_chunk[i].size);
+
+                map_start = mem_map + cstart;
+                map_end = mem_map + cend;
+
+                if (map_start < start)
+                        map_start = start;
+                if (map_end > end)
+                        map_end = end;
+
+                map_start -= ((unsigned long) map_start & (PAGE_SIZE - 1))
+                        / sizeof(struct page);
+                map_end += ((PFN_ALIGN((unsigned long) map_end)
+                             - (unsigned long) map_end)
+                            / sizeof(struct page));
+
+                if (map_start < map_end)
+                        memmap_init_zone((unsigned long)(map_end - map_start),
+                                         nid, zone, page_to_pfn(map_start),
+                                         MEMMAP_EARLY);
+        }
+}
+
+static inline void *vmem_alloc_pages(unsigned int order)
+{
+        if (slab_is_available())
+                return (void *)__get_free_pages(GFP_KERNEL, order);
+        return alloc_bootmem_pages((1 << order) * PAGE_SIZE);
+}
+
+static inline pmd_t *vmem_pmd_alloc(void)
+{
+        pmd_t *pmd;
+        int i;
+
+        pmd = vmem_alloc_pages(PMD_ALLOC_ORDER);
+        if (!pmd)
+                return NULL;
+        for (i = 0; i < PTRS_PER_PMD; i++)
+                pmd_clear(pmd + i);
+        return pmd;
+}
+
+static inline pte_t *vmem_pte_alloc(void)
+{
+        pte_t *pte;
+        pte_t empty_pte;
+        int i;
+
+        pte = vmem_alloc_pages(PTE_ALLOC_ORDER);
+        if (!pte)
+                return NULL;
+        pte_val(empty_pte) = _PAGE_TYPE_EMPTY;
+        for (i = 0; i < PTRS_PER_PTE; i++)
+                set_pte(pte + i, empty_pte);
+        return pte;
+}
+
+/*
+ * Add a physical memory range to the 1:1 mapping.
+ */
+static int vmem_add_range(unsigned long start, unsigned long size)
+{
+        unsigned long address;
+        pgd_t *pg_dir;
+        pmd_t *pm_dir;
+        pte_t *pt_dir;
+        pte_t  pte;
+        int ret = -ENOMEM;
+
+        for (address = start; address < start + size; address += PAGE_SIZE) {
+                pg_dir = pgd_offset_k(address);
+                if (pgd_none(*pg_dir)) {
+                        pm_dir = vmem_pmd_alloc();
+                        if (!pm_dir)
+                                goto out;
+                        pgd_populate(&init_mm, pg_dir, pm_dir);
+                }
+
+                pm_dir = pmd_offset(pg_dir, address);
+                if (pmd_none(*pm_dir)) {
+                        pt_dir = vmem_pte_alloc();
+                        if (!pt_dir)
+                                goto out;
+                        pmd_populate_kernel(&init_mm, pm_dir, pt_dir);
+                }
+
+                pt_dir = pte_offset_kernel(pm_dir, address);
+                pte = pfn_pte(address >> PAGE_SHIFT, PAGE_KERNEL);
+                set_pte(pt_dir, pte);
+        }
+        ret = 0;
+out:
+        flush_tlb_kernel_range(start, start + size);
+        return ret;
+}
+
+/*
+ * Remove a physical memory range from the 1:1 mapping.
+ * Currently only invalidates page table entries.
+ */
+static void vmem_remove_range(unsigned long start, unsigned long size)
+{
+        unsigned long address;
+        pgd_t *pg_dir;
+        pmd_t *pm_dir;
+        pte_t *pt_dir;
+        pte_t  pte;
+
+        pte_val(pte) = _PAGE_TYPE_EMPTY;
+        for (address = start; address < start + size; address += PAGE_SIZE) {
+                pg_dir = pgd_offset_k(address);
+                if (pgd_none(*pg_dir))
+                        continue;
+                pm_dir = pmd_offset(pg_dir, address);
+                if (pmd_none(*pm_dir))
+                        continue;
+                pt_dir = pte_offset_kernel(pm_dir, address);
+                set_pte(pt_dir, pte);
+        }
+        flush_tlb_kernel_range(start, start + size);
+}
+
+/*
+ * Add a backed mem_map array to the virtual mem_map array.
+ */
+static int vmem_add_mem_map(unsigned long start, unsigned long size)
+{
+        unsigned long address, start_addr, end_addr;
+        struct page *map_start, *map_end;
+        pgd_t *pg_dir;
+        pmd_t *pm_dir;
+        pte_t *pt_dir;
+        pte_t  pte;
+        int ret = -ENOMEM;
+
+        map_start = vmem_map + PFN_DOWN(start);
+        map_end = vmem_map + PFN_DOWN(start + size);
+
+        start_addr = (unsigned long) map_start & PAGE_MASK;
+        end_addr = PFN_ALIGN((unsigned long) map_end);
+
+        for (address = start_addr; address < end_addr; address += PAGE_SIZE) {
+                pg_dir = pgd_offset_k(address);
+                if (pgd_none(*pg_dir)) {
+                        pm_dir = vmem_pmd_alloc();
+                        if (!pm_dir)
+                                goto out;
+                        pgd_populate(&init_mm, pg_dir, pm_dir);
+                }
+
+                pm_dir = pmd_offset(pg_dir, address);
+                if (pmd_none(*pm_dir)) {
+                        pt_dir = vmem_pte_alloc();
+                        if (!pt_dir)
+                                goto out;
+                        pmd_populate_kernel(&init_mm, pm_dir, pt_dir);
+                }
+
+                pt_dir = pte_offset_kernel(pm_dir, address);
+                if (pte_none(*pt_dir)) {
+                        unsigned long new_page;
+
+                        new_page =__pa(vmem_alloc_pages(0));
+                        if (!new_page)
+                                goto out;
+                        pte = pfn_pte(new_page >> PAGE_SHIFT, PAGE_KERNEL);
+                        set_pte(pt_dir, pte);
+                }
+        }
+        ret = 0;
+out:
+        flush_tlb_kernel_range(start_addr, end_addr);
+        return ret;
+}
+
+static int vmem_add_mem(unsigned long start, unsigned long size)
+{
+        int ret;
+
+        ret = vmem_add_range(start, size);
+        if (ret)
+                return ret;
+        return vmem_add_mem_map(start, size);
+}
+
+/*
+ * Add memory segment to the segment list if it doesn't overlap with
+ * an already present segment.
+ */
+static int insert_memory_segment(struct memory_segment *seg)
+{
+        struct memory_segment *tmp;
+
+        if (PFN_DOWN(seg->start + seg->size) > max_pfn ||
+            seg->start + seg->size < seg->start)
+                return -ERANGE;
+
+        list_for_each_entry(tmp, &mem_segs, list) {
+                if (seg->start >= tmp->start + tmp->size)
+                        continue;
+                if (seg->start + seg->size <= tmp->start)
+                        continue;
+                return -ENOSPC;
+        }
+        list_add(&seg->list, &mem_segs);
+        return 0;
+}
+
+/*
+ * Remove memory segment from the segment list.
+ */
+static void remove_memory_segment(struct memory_segment *seg)
+{
+        list_del(&seg->list);
+}
+
+static void __remove_shared_memory(struct memory_segment *seg)
+{
+        remove_memory_segment(seg);
+        vmem_remove_range(seg->start, seg->size);
+}
+
+int remove_shared_memory(unsigned long start, unsigned long size)
+{
+        struct memory_segment *seg;
+        int ret;
+
+        mutex_lock(&vmem_mutex);
+
+        ret = -ENOENT;
+        list_for_each_entry(seg, &mem_segs, list) {
+                if (seg->start == start && seg->size == size)
+                        break;
+        }
+
+        if (seg->start != start || seg->size != size)
+                goto out;
+
+        ret = 0;
+        __remove_shared_memory(seg);
+        kfree(seg);
+out:
+        mutex_unlock(&vmem_mutex);
+        return ret;
+}
+
+int add_shared_memory(unsigned long start, unsigned long size)
+{
+        struct memory_segment *seg;
+        struct page *page;
+        unsigned long pfn, num_pfn, end_pfn;
+        int ret;
+
+        mutex_lock(&vmem_mutex);
+        ret = -ENOMEM;
+        seg = kzalloc(sizeof(*seg), GFP_KERNEL);
+        if (!seg)
+                goto out;
+        seg->start = start;
+        seg->size = size;
+
+        ret = insert_memory_segment(seg);
+        if (ret)
+                goto out_free;
+
+        ret = vmem_add_mem(start, size);
+        if (ret)
+                goto out_remove;
+
+        pfn = PFN_DOWN(start);
+        num_pfn = PFN_DOWN(size);
+        end_pfn = pfn + num_pfn;
+
+        page = pfn_to_page(pfn);
+        memset(page, 0, num_pfn * sizeof(struct page));
+
+        for (; pfn < end_pfn; pfn++) {
+                page = pfn_to_page(pfn);
+                init_page_count(page);
+                reset_page_mapcount(page);
+                SetPageReserved(page);
+                INIT_LIST_HEAD(&page->lru);
+        }
+        goto out;
+
+out_remove:
+        __remove_shared_memory(seg);
+out_free:
+        kfree(seg);
+out:
+        mutex_unlock(&vmem_mutex);
+        return ret;
+}
+
+/*
+ * map whole physical memory to virtual memory (identity mapping)
+ */
+void __init vmem_map_init(void)
+{
+        unsigned long map_size;
+        int i;
+
+        map_size = ALIGN(max_low_pfn, MAX_ORDER_NR_PAGES) * sizeof(struct page);
+        vmalloc_end = PFN_ALIGN(VMALLOC_END_INIT) - PFN_ALIGN(map_size);
+        vmem_map = (struct page *) vmalloc_end;
+        NODE_DATA(0)->node_mem_map = vmem_map;
+
+        for (i = 0; i < MEMORY_CHUNKS && memory_chunk[i].size > 0; i++)
+                vmem_add_mem(memory_chunk[i].addr, memory_chunk[i].size);
+}
+
+/*
+ * Convert memory chunk array to a memory segment list so there is a single
+ * list that contains both r/w memory and shared memory segments.
+ */
+static int __init vmem_convert_memory_chunk(void)
+{
+        struct memory_segment *seg;
+        int i;
+
+        mutex_lock(&vmem_mutex);
+        for (i = 0; i < MEMORY_CHUNKS && memory_chunk[i].size > 0; i++) {
+                if (!memory_chunk[i].size)
+                        continue;
+                seg = kzalloc(sizeof(*seg), GFP_KERNEL);
+                if (!seg)
+                        panic("Out of memory...\n");
+                seg->start = memory_chunk[i].addr;
+                seg->size = memory_chunk[i].size;
+                insert_memory_segment(seg);
+        }
+        mutex_unlock(&vmem_mutex);
+        return 0;
+}
+
+core_initcall(vmem_convert_memory_chunk);
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 6a461d4caeff..3aa3b885ab36 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -51,6 +51,22 @@ config GENERIC_TIME
 config ARCH_MAY_HAVE_PC_FDC
         bool
 
+config STACKTRACE_SUPPORT
+        bool
+        default y
+
+config LOCKDEP_SUPPORT
+        bool
+        default y
+
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 source "init/Kconfig"
 
 menu "System type"
@@ -217,7 +233,21 @@ 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_7206_SOLUTION_ENGINE
+        bool "SolutionEngine7206"
+        select CPU_SUBTYPE_SH7206
+        help
+          Select 7206 SolutionEngine if configuring for a Hitachi SH7206
+          evaluation board.
+
+config SH_7619_SOLUTION_ENGINE
+        bool "SolutionEngine7619"
+        select CPU_SUBTYPE_SH7619
+        help
+          Select 7619 SolutionEngine if configuring for a Hitachi SH7619
+          evaluation board.
 
 config SH_UNKNOWN
         bool "BareCPU"
@@ -280,12 +310,20 @@ config CF_BASE_ADDR
 
 menu "Processor features"
 
-config CPU_LITTLE_ENDIAN
-        bool "Little Endian"
+choice
+        prompt "Endianess selection" 
+        default CPU_LITTLE_ENDIAN
         help
           Some SuperH machines can be configured for either little or big
-          endian byte order. These modes require different kernels. Say Y if
-          your machine is little endian, N if it's a big endian machine.
+          endian byte order. These modes require different kernels.
+
+config CPU_LITTLE_ENDIAN
+        bool "Little Endian"
+
+config CPU_BIG_ENDIAN
+        bool "Big Endian"
+
+endchoice
 
 config SH_FPU
         bool "FPU support"
@@ -345,6 +383,9 @@ config CPU_HAS_MASKREG_IRQ
 config CPU_HAS_INTC2_IRQ
         bool
 
+config CPU_HAS_IPR_IRQ
+        bool
+
 config CPU_HAS_SR_RB
         bool "CPU has SR.RB"
         depends on CPU_SH3 || CPU_SH4
@@ -357,6 +398,9 @@ config CPU_HAS_SR_RB
           See <file:Documentation/sh/register-banks.txt> for further
           information on SR.RB and register banking in the kernel in general.
 
+config CPU_HAS_PTEA
+        bool
+
 endmenu
 
 menu "Timer support"
@@ -364,10 +408,25 @@ depends on !GENERIC_TIME
 
 config SH_TMU
         bool "TMU timer support"
+        depends on CPU_SH3 || CPU_SH4
         default y
         help
           This enables the use of the TMU as the system timer.
 
+config SH_CMT
+        bool "CMT timer support"
+        depends on CPU_SH2
+        default y
+        help
+          This enables the use of the CMT as the system timer.
+
+config SH_MTU2
+        bool "MTU2 timer support"
+        depends on CPU_SH2A
+        default n
+        help
+          This enables the use of the MTU2 as the system timer.
+
 endmenu
 
 source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"
@@ -376,19 +435,52 @@ source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
 
 source "arch/sh/boards/renesas/r7780rp/Kconfig"
 
+config SH_TIMER_IRQ
+        int
+        default "28" if CPU_SUBTYPE_SH7780
+        default "86" if CPU_SUBTYPE_SH7619
+        default "140" if CPU_SUBTYPE_SH7206
+        default "16"
+
+config NO_IDLE_HZ
+        bool "Dynamic tick timer"
+        help
+          Select this option if you want to disable continuous timer ticks
+          and have them programmed to occur as required. This option saves
+          power as the system can remain in idle state for longer.
+
+          By default dynamic tick is disabled during the boot, and can be
+          manually enabled with:
+
+            echo 1 > /sys/devices/system/timer/timer0/dyn_tick
+
+          Alternatively, if you want dynamic tick automatically enabled
+          during boot, pass "dyntick=enable" via the kernel command string.
+
+          Please note that dynamic tick may affect the accuracy of
+          timekeeping on some platforms depending on the implementation.
+
 config SH_PCLK_FREQ
         int "Peripheral clock frequency (in Hz)"
+        default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343
+        default "31250000" if CPU_SUBTYPE_SH7619
+        default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || \
+                              CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705 || \
+                              CPU_SUBTYPE_SH7206
         default "50000000" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7780
         default "60000000" if CPU_SUBTYPE_SH7751
-        default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || \
-                              CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705
-        default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343
         default "66000000" if CPU_SUBTYPE_SH4_202
         help
           This option is used to specify the peripheral clock frequency.
           This is necessary for determining the reference clock value on
           platforms lacking an RTC.
 
+config SH_CLK_MD
+        int "CPU Mode Pin Setting"
+        depends on CPU_SUBTYPE_SH7619 || CPU_SUBTYPE_SH7206
+        help
+          MD2 - MD0 pin setting.
+
 menu "CPU Frequency scaling"
 
 source "drivers/cpufreq/Kconfig"
@@ -421,6 +513,8 @@ config HEARTBEAT
           behavior is platform-dependent, but normally the flash frequency is
           a hyperbolic function of the 5-minute load average.
 
+source "arch/sh/drivers/Kconfig"
+
 endmenu
 
 config ISA_DMA_API
@@ -486,18 +580,6 @@ config NR_CPUS
 
 source "kernel/Kconfig.preempt"
 
-config CPU_HAS_SR_RB
-        bool "CPU has SR.RB"
-        depends on CPU_SH3 || CPU_SH4
-        default y
-        help
-          This will enable the use of SR.RB register bank usage. Processors
-          that are lacking this bit must have another method in place for
-          accomplishing what is taken care of by the banked registers.
-
-          See <file:Documentation/sh/register-banks.txt> for further
-          information on SR.RB and register banking in the kernel in general.
-
 config NODES_SHIFT
         int
         default "1"
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index 48479e014dac..87902e0298e2 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -1,5 +1,9 @@
 menu "Kernel hacking"
 
+config TRACE_IRQFLAGS_SUPPORT
+        bool
+        default y
+
 source "lib/Kconfig.debug"
 
 config SH_STANDARD_BIOS
@@ -17,7 +21,19 @@ config SH_STANDARD_BIOS
 
 config EARLY_SCIF_CONSOLE
         bool "Use early SCIF console"
-        depends on CPU_SH4 || CPU_SH2A && !SH_STANDARD_BIOS
+        help
+          This enables an early console using a fixed SCIF port. This can
+          be used by platforms that are either not running the SH
+          standard BIOS, or do not wish to use the BIOS callbacks for the
+          serial I/O.
+
+config EARLY_SCIF_CONSOLE_PORT
+        hex "SCIF port for early console"
+        depends on EARLY_SCIF_CONSOLE
+        default "0xffe00000" if CPU_SUBTYPE_SH7780
+        default "0xfffe9800" if CPU_SUBTYPE_SH7206
+        default "0xf8420000" if CPU_SUBTYPE_SH7619
+        default "0xffe80000" if CPU_SH4
 
 config EARLY_PRINTK
         bool "Early printk support"
@@ -30,6 +46,11 @@ config EARLY_PRINTK
           when the kernel may crash or hang before the serial console is
           initialised. If unsure, say N.
 
+          On devices that are running SH-IPL and want to keep the port
+          initialization consistent while not using the BIOS callbacks,
+          select both the EARLY_SCIF_CONSOLE and SH_STANDARD_BIOS, using
+          the kernel command line option to toggle back and forth.
+
 config DEBUG_STACKOVERFLOW
         bool "Check for stack overflows"
         depends on DEBUG_KERNEL
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 26d62ff51a64..c1dbef212634 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -13,10 +13,6 @@
 # for "archclean" and "archdep" for cleaning up and making dependencies for
 # this architecture
 #
-
-cflags-y                                := -mb
-cflags-$(CONFIG_CPU_LITTLE_ENDIAN)      := -ml
-
 isa-y                                   := any
 isa-$(CONFIG_SH_DSP)                    := sh
 isa-$(CONFIG_CPU_SH2)                   := sh2
@@ -38,13 +34,16 @@ isa-y			:= $(isa-y)-nofpu
 endif
 endif
 
-cflags-y        += $(call as-option,-Wa$(comma)-isa=$(isa-y),)
-
-cflags-$(CONFIG_CPU_SH2)                += -m2
-cflags-$(CONFIG_CPU_SH3)                += -m3
-cflags-$(CONFIG_CPU_SH4)                += -m4 \
+cflags-$(CONFIG_CPU_SH2)                := -m2
+cflags-$(CONFIG_CPU_SH3)                := -m3
+cflags-$(CONFIG_CPU_SH4)                := -m4 \
         $(call cc-option,-mno-implicit-fp,-m4-nofpu)
-cflags-$(CONFIG_CPU_SH4A)               += $(call cc-option,-m4a-nofpu,)
+cflags-$(CONFIG_CPU_SH4A)               := -m4a $(call cc-option,-m4a-nofpu,)
+
+cflags-$(CONFIG_CPU_BIG_ENDIAN)         += -mb
+cflags-$(CONFIG_CPU_LITTLE_ENDIAN)      += -ml
+
+cflags-y        += $(call as-option,-Wa$(comma)-isa=$(isa-y),) -ffreestanding
 
 cflags-$(CONFIG_SH_DSP)                 += -Wa,-dsp
 cflags-$(CONFIG_SH_KGDB)                += -g
@@ -59,7 +58,9 @@ OBJCOPYFLAGS	:= -O binary -R .note -R .comment -R .stab -R .stabstr -S
 # never be used by anyone. Use a board-specific defconfig that has a
 # reasonable chance of being current instead.
 #
-KBUILD_DEFCONFIG := rts7751r2d_defconfig
+KBUILD_DEFCONFIG := r7780rp_defconfig
+
+KBUILD_IMAGE    := arch/sh/boot/zImage
 
 #
 # Choosing incompatible machines durings configuration will result in
@@ -109,6 +110,8 @@ machdir-$(CONFIG_SH_SH4202_MICRODEV)		:= superh/microdev
 machdir-$(CONFIG_SH_LANDISK)                    := landisk
 machdir-$(CONFIG_SH_TITAN)                      := titan
 machdir-$(CONFIG_SH_SHMIN)                      := shmin
+machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE)       := se/7206
+machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE)       := se/7619
 machdir-$(CONFIG_SH_UNKNOWN)                    := unknown
 
 incdir-y                        := $(notdir $(machdir-y))
@@ -124,6 +127,7 @@ core-$(CONFIG_HD64465)		+= arch/sh/cchips/hd6446x/hd64465/
 core-$(CONFIG_VOYAGERGX)        += arch/sh/cchips/voyagergx/
 
 cpuincdir-$(CONFIG_CPU_SH2)     := cpu-sh2
+cpuincdir-$(CONFIG_CPU_SH2A)    := cpu-sh2a
 cpuincdir-$(CONFIG_CPU_SH3)     := cpu-sh3
 cpuincdir-$(CONFIG_CPU_SH4)     := cpu-sh4
 
@@ -175,7 +179,7 @@ maketools:  include/linux/version.h FORCE
 
 all: zImage
 
-zImage: vmlinux
+zImage uImage uImage.srec vmlinux.srec: vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
 compressed: zImage
@@ -186,5 +190,8 @@ archclean:
 CLEAN_FILES += include/asm-sh/machtypes.h
 
 define archhelp
-        @echo '  zImage                    - Compressed kernel image (arch/sh/boot/zImage)'
+        @echo '* zImage                    - Compressed kernel image'
+        @echo '  vmlinux.srec              - Create an ELF S-record'
+        @echo '  uImage                    - Create a bootable image for U-Boot'
+        @echo '  uImage.srec               - Create an S-record for U-Boot'
 endef
diff --git a/arch/sh/boards/landisk/irq.c b/arch/sh/boards/landisk/irq.c
index 8f2e1c68b90f..3eba6d086d7f 100644
--- a/arch/sh/boards/landisk/irq.c
+++ b/arch/sh/boards/landisk/irq.c
@@ -16,8 +16,8 @@
  */
 #include <linux/init.h>
 #include <linux/irq.h>
-#include <asm/io.h>
-#include <asm/irq.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
 #include <asm/landisk/iodata_landisk.h>
 
 static void enable_landisk_irq(unsigned int irq);
diff --git a/arch/sh/boards/renesas/r7780rp/Makefile b/arch/sh/boards/renesas/r7780rp/Makefile
index f1776d027978..574b0316ed56 100644
--- a/arch/sh/boards/renesas/r7780rp/Makefile
+++ b/arch/sh/boards/renesas/r7780rp/Makefile
@@ -3,4 +3,6 @@
 #
 
 obj-y    := setup.o io.o irq.o
-obj-$(CONFIG_HEARTBEAT) += led.o
+
+obj-$(CONFIG_HEARTBEAT)         += led.o
+obj-$(CONFIG_PUSH_SWITCH)       += psw.o
diff --git a/arch/sh/boards/renesas/r7780rp/irq.c b/arch/sh/boards/renesas/r7780rp/irq.c
index aa15ec5bc69e..cc381e197783 100644
--- a/arch/sh/boards/renesas/r7780rp/irq.c
+++ b/arch/sh/boards/renesas/r7780rp/irq.c
@@ -10,6 +10,7 @@
  */
 #include <linux/init.h>
 #include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <linux/io.h>
 #include <asm/r7780rp.h>
 
diff --git a/arch/sh/boards/renesas/r7780rp/psw.c b/arch/sh/boards/renesas/r7780rp/psw.c
new file mode 100644
index 000000000000..c844dfa5d58d
--- /dev/null
+++ b/arch/sh/boards/renesas/r7780rp/psw.c
@@ -0,0 +1,122 @@
+/*
+ * arch/sh/boards/renesas/r7780rp/psw.c
+ *
+ * push switch support for RDBRP-1/RDBREVRP-1 debug boards.
+ *
+ * Copyright (C) 2006  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/io.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <asm/mach/r7780rp.h>
+#include <asm/push-switch.h>
+
+static irqreturn_t psw_irq_handler(int irq, void *arg)
+{
+        struct platform_device *pdev = arg;
+        struct push_switch *psw = platform_get_drvdata(pdev);
+        struct push_switch_platform_info *psw_info = pdev->dev.platform_data;
+        unsigned int l, mask;
+        int ret = 0;
+
+        l = ctrl_inw(PA_DBSW);
+
+        /* Nothing to do if there's no state change */
+        if (psw->state) {
+                ret = 1;
+                goto out;
+        }
+
+        mask = l & 0x70;
+        /* Figure out who raised it */
+        if (mask & (1 << psw_info->bit)) {
+                psw->state = !!(mask & (1 << psw_info->bit));
+                if (psw->state) /* debounce */
+                        mod_timer(&psw->debounce, jiffies + 50);
+
+                ret = 1;
+        }
+
+out:
+        /* Clear the switch IRQs */
+        l |= (0x7 << 12);
+        ctrl_outw(l, PA_DBSW);
+
+        return IRQ_RETVAL(ret);
+}
+
+static struct resource psw_resources[] = {
+        [0] = {
+                .start  = IRQ_PSW,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct push_switch_platform_info s2_platform_data = {
+        .name           = "s2",
+        .bit            = 6,
+        .irq_flags      = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |
+                          IRQF_SHARED,
+        .irq_handler    = psw_irq_handler,
+};
+
+static struct platform_device s2_switch_device = {
+        .name           = "push-switch",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(psw_resources),
+        .resource       = psw_resources,
+        .dev            = {
+                .platform_data = &s2_platform_data,
+        },
+};
+
+static struct push_switch_platform_info s3_platform_data = {
+        .name           = "s3",
+        .bit            = 5,
+        .irq_flags      = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |
+                          IRQF_SHARED,
+        .irq_handler    = psw_irq_handler,
+};
+
+static struct platform_device s3_switch_device = {
+        .name           = "push-switch",
+        .id             = 1,
+        .num_resources  = ARRAY_SIZE(psw_resources),
+        .resource       = psw_resources,
+        .dev            = {
+                .platform_data = &s3_platform_data,
+        },
+};
+
+static struct push_switch_platform_info s4_platform_data = {
+        .name           = "s4",
+        .bit            = 4,
+        .irq_flags      = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |
+                          IRQF_SHARED,
+        .irq_handler    = psw_irq_handler,
+};
+
+static struct platform_device s4_switch_device = {
+        .name           = "push-switch",
+        .id             = 2,
+        .num_resources  = ARRAY_SIZE(psw_resources),
+        .resource       = psw_resources,
+        .dev            = {
+                .platform_data = &s4_platform_data,
+        },
+};
+
+static struct platform_device *psw_devices[] = {
+        &s2_switch_device, &s3_switch_device, &s4_switch_device,
+};
+
+static int __init psw_init(void)
+{
+        return platform_add_devices(psw_devices, ARRAY_SIZE(psw_devices));
+}
+module_init(psw_init);
diff --git a/arch/sh/boards/renesas/r7780rp/setup.c b/arch/sh/boards/renesas/r7780rp/setup.c
index c331caeb694b..9f89c8de9db9 100644
--- a/arch/sh/boards/renesas/r7780rp/setup.c
+++ b/arch/sh/boards/renesas/r7780rp/setup.c
@@ -44,8 +44,37 @@ static struct platform_device m66596_usb_host_device = {
         .resource       = m66596_usb_host_resources,
 };
 
+static struct resource cf_ide_resources[] = {
+        [0] = {
+                .start  = 0x1f0,
+                .end    = 0x1f0 + 8,
+                .flags  = IORESOURCE_IO,
+        },
+        [1] = {
+                .start  = 0x1f0 + 0x206,
+                .end    = 0x1f0 + 8 + 0x206 + 8,
+                .flags  = IORESOURCE_IO,
+        },
+        [2] = {
+#ifdef CONFIG_SH_R7780MP
+                .start  = 1,
+#else
+                .start  = 4,
+#endif
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device cf_ide_device  = {
+        .name           = "pata_platform",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(cf_ide_resources),
+        .resource       = cf_ide_resources,
+};
+
 static struct platform_device *r7780rp_devices[] __initdata = {
         &m66596_usb_host_device,
+        &cf_ide_device,
 };
 
 static int __init r7780rp_devices_setup(void)
diff --git a/arch/sh/boards/se/7206/Makefile b/arch/sh/boards/se/7206/Makefile
new file mode 100644
index 000000000000..63950f4f2453
--- /dev/null
+++ b/arch/sh/boards/se/7206/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the 7206 SolutionEngine specific parts of the kernel
+#
+
+obj-y    := setup.o io.o irq.o
+obj-$(CONFIG_HEARTBEAT) += led.o
+
diff --git a/arch/sh/boards/se/7206/io.c b/arch/sh/boards/se/7206/io.c
new file mode 100644
index 000000000000..b557273e0cbe
--- /dev/null
+++ b/arch/sh/boards/se/7206/io.c
@@ -0,0 +1,123 @@
+/* $Id: io.c,v 1.5 2004/02/22 23:08:43 kkojima Exp $
+ *
+ * linux/arch/sh/boards/se/7206/io.c
+ *
+ * Copyright (C) 2006 Yoshinori Sato
+ *
+ * I/O routine for Hitachi 7206 SolutionEngine.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <asm/io.h>
+#include <asm/se7206.h>
+
+
+static inline void delay(void)
+{
+        ctrl_inw(0x20000000);  /* P2 ROM Area */
+}
+
+/* MS7750 requires special versions of in*, out* routines, since
+   PC-like io ports are located at upper half byte of 16-bit word which
+   can be accessed only with 16-bit wide.  */
+
+static inline volatile __u16 *
+port2adr(unsigned int port)
+{
+        if (port >= 0x2000)
+                return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
+        else if (port >= 0x300 || port < 0x310)
+                return (volatile __u16 *) (PA_SMSC + (port - 0x300));
+}
+
+unsigned char se7206_inb(unsigned long port)
+{
+        return (*port2adr(port))&0xff; 
+}
+
+unsigned char se7206_inb_p(unsigned long port)
+{
+        unsigned long v;
+
+        v = (*port2adr(port))&0xff; 
+        delay();
+        return v;
+}
+
+unsigned short se7206_inw(unsigned long port)
+{
+        return *port2adr(port);;
+}
+
+unsigned int se7206_inl(unsigned long port)
+{
+        maybebadio(port);
+        return 0;
+}
+
+void se7206_outb(unsigned char value, unsigned long port)
+{
+        *(port2adr(port)) = value;
+}
+
+void se7206_outb_p(unsigned char value, unsigned long port)
+{
+        *(port2adr(port)) = value;
+        delay();
+}
+
+void se7206_outw(unsigned short value, unsigned long port)
+{
+        *port2adr(port) = value;
+}
+
+void se7206_outl(unsigned int value, unsigned long port)
+{
+        maybebadio(port);
+}
+
+void se7206_insb(unsigned long port, void *addr, unsigned long count)
+{
+        volatile __u16 *p = port2adr(port);
+        __u8 *ap = addr;
+
+        while (count--)
+                *ap++ = *p;
+}
+
+void se7206_insw(unsigned long port, void *addr, unsigned long count)
+{
+        volatile __u16 *p = port2adr(port);
+        __u16 *ap = addr;
+        while (count--)
+                *ap++ = *p;
+}
+
+void se7206_insl(unsigned long port, void *addr, unsigned long count)
+{
+        maybebadio(port);
+}
+
+void se7206_outsb(unsigned long port, const void *addr, unsigned long count)
+{
+        volatile __u16 *p = port2adr(port);
+        const __u8 *ap = addr;
+
+        while (count--)
+                *p = *ap++;
+}
+
+void se7206_outsw(unsigned long port, const void *addr, unsigned long count)
+{
+        volatile __u16 *p = port2adr(port);
+        const __u16 *ap = addr;
+        while (count--)
+                *p = *ap++;
+}
+
+void se7206_outsl(unsigned long port, const void *addr, unsigned long count)
+{
+        maybebadio(port);
+}
diff --git a/arch/sh/boards/se/7206/irq.c b/arch/sh/boards/se/7206/irq.c
new file mode 100644
index 000000000000..27da88486f73
--- /dev/null
+++ b/arch/sh/boards/se/7206/irq.c
@@ -0,0 +1,147 @@
+/*
+ * linux/arch/sh/boards/se/7206/irq.c
+ *
+ * Copyright (C) 2005,2006 Yoshinori Sato
+ *
+ * Hitachi SolutionEngine Support.
+ *
+ */
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <asm/se7206.h>
+
+#define INTSTS0 0x31800000
+#define INTSTS1 0x31800002
+#define INTMSK0 0x31800004
+#define INTMSK1 0x31800006
+#define INTSEL  0x31800008
+
+#define IRQ0_IRQ 64
+#define IRQ1_IRQ 65
+#define IRQ3_IRQ 67
+
+#define INTC_IPR01 0xfffe0818
+#define INTC_ICR1  0xfffe0802
+
+static void disable_se7206_irq(unsigned int irq)
+{
+        unsigned short val;
+        unsigned short mask = 0xffff ^ (0x0f << 4 * (3 - (IRQ0_IRQ - irq)));
+        unsigned short msk0,msk1;
+
+        /* Set the priority in IPR to 0 */
+        val = ctrl_inw(INTC_IPR01);
+        val &= mask;
+        ctrl_outw(val, INTC_IPR01);
+        /* FPGA mask set */
+        msk0 = ctrl_inw(INTMSK0);
+        msk1 = ctrl_inw(INTMSK1);
+
+        switch (irq) {
+        case IRQ0_IRQ:
+                msk0 |= 0x0010;
+                break;
+        case IRQ1_IRQ:
+                msk0 |= 0x000f;
+                break;
+        case IRQ3_IRQ:
+                msk0 |= 0x0f00;
+                msk1 |= 0x00ff;
+                break;
+        }
+        ctrl_outw(msk0, INTMSK0);
+        ctrl_outw(msk1, INTMSK1);
+}
+
+static void enable_se7206_irq(unsigned int irq)
+{
+        unsigned short val;
+        unsigned short value = (0x0001 << 4 * (3 - (IRQ0_IRQ - irq)));
+        unsigned short msk0,msk1;
+
+        /* Set priority in IPR back to original value */
+        val = ctrl_inw(INTC_IPR01);
+        val |= value;
+        ctrl_outw(val, INTC_IPR01);
+
+        /* FPGA mask reset */
+        msk0 = ctrl_inw(INTMSK0);
+        msk1 = ctrl_inw(INTMSK1);
+
+        switch (irq) {
+        case IRQ0_IRQ:
+                msk0 &= ~0x0010;
+                break;
+        case IRQ1_IRQ:
+                msk0 &= ~0x000f;
+                break;
+        case IRQ3_IRQ:
+                msk0 &= ~0x0f00;
+                msk1 &= ~0x00ff;
+                break;
+        }
+        ctrl_outw(msk0, INTMSK0);
+        ctrl_outw(msk1, INTMSK1);
+}
+
+static void eoi_se7206_irq(unsigned int irq)
+{
+        unsigned short sts0,sts1;
+
+        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
+                enable_se7206_irq(irq);
+        /* FPGA isr clear */
+        sts0 = ctrl_inw(INTSTS0);
+        sts1 = ctrl_inw(INTSTS1);
+
+        switch (irq) {
+        case IRQ0_IRQ:
+                sts0 &= ~0x0010;
+                break;
+        case IRQ1_IRQ:
+                sts0 &= ~0x000f;
+                break;
+        case IRQ3_IRQ:
+                sts0 &= ~0x0f00;
+                sts1 &= ~0x00ff;
+                break;
+        }
+        ctrl_outw(sts0, INTSTS0);
+        ctrl_outw(sts1, INTSTS1);
+}
+
+static struct irq_chip se7206_irq_chip __read_mostly = {
+        .name           = "SE7206-FPGA",
+        .mask           = disable_se7206_irq,
+        .unmask         = enable_se7206_irq,
+        .mask_ack       = disable_se7206_irq,
+        .eoi            = eoi_se7206_irq,
+};
+
+static void make_se7206_irq(unsigned int irq)
+{
+        disable_irq_nosync(irq);
+        set_irq_chip_and_handler_name(irq, &se7206_irq_chip,
+                                      handle_level_irq, "level");
+        disable_se7206_irq(irq);
+}
+
+/*
+ * Initialize IRQ setting
+ */
+void __init init_se7206_IRQ(void)
+{
+        make_se7206_irq(IRQ0_IRQ); /* SMC91C111 */
+        make_se7206_irq(IRQ1_IRQ); /* ATA */
+        make_se7206_irq(IRQ3_IRQ); /* SLOT / PCM */
+        ctrl_outw(inw(INTC_ICR1) | 0x000b ,INTC_ICR1 ) ; /* ICR1 */
+
+        /* FPGA System register setup*/
+        ctrl_outw(0x0000,INTSTS0); /* Clear INTSTS0 */
+        ctrl_outw(0x0000,INTSTS1); /* Clear INTSTS1 */
+        /* IRQ0=LAN, IRQ1=ATA, IRQ3=SLT,PCM */
+        ctrl_outw(0x0001,INTSEL);
+}
diff --git a/arch/sh/boards/se/7206/led.c b/arch/sh/boards/se/7206/led.c
new file mode 100644
index 000000000000..ef794601ab86
--- /dev/null
+++ b/arch/sh/boards/se/7206/led.c
@@ -0,0 +1,57 @@
+/*
+ * linux/arch/sh/kernel/led_se.c
+ *
+ * Copyright (C) 2000 Stuart Menefy <stuart.menefy@st.com>
+ *
+ * May be copied or modified under the terms of the GNU General Public
+ * License.  See linux/COPYING for more information.
+ *
+ * This file contains Solution Engine specific LED code.
+ */
+
+#include <linux/config.h>
+#include <asm/se7206.h>
+
+#ifdef CONFIG_HEARTBEAT
+
+#include <linux/sched.h>
+
+/* Cycle the LED's in the clasic Knightrider/Sun pattern */
+void heartbeat_se(void)
+{
+        static unsigned int cnt = 0, period = 0;
+        volatile unsigned short* p = (volatile unsigned short*)PA_LED;
+        static unsigned bit = 0, up = 1;
+
+        cnt += 1;
+        if (cnt < period) {
+                return;
+        }
+
+        cnt = 0;
+
+        /* Go through the points (roughly!):
+         * f(0)=10, f(1)=16, f(2)=20, f(5)=35,f(inf)->110
+         */
+        period = 110 - ( (300<<FSHIFT)/
+                         ((avenrun[0]/5) + (3<<FSHIFT)) );
+
+        if (up) {
+                if (bit == 7) {
+                        bit--;
+                        up=0;
+                } else {
+                        bit ++;
+                }
+        } else {
+                if (bit == 0) {
+                        bit++;
+                        up=1;
+                } else {
+                        bit--;
+                }
+        }
+        *p = 1<<(bit+8);
+
+}
+#endif /* CONFIG_HEARTBEAT */
diff --git a/arch/sh/boards/se/7206/setup.c b/arch/sh/boards/se/7206/setup.c
new file mode 100644
index 000000000000..0f42e91a3238
--- /dev/null
+++ b/arch/sh/boards/se/7206/setup.c
@@ -0,0 +1,79 @@
+/*
+ *
+ * linux/arch/sh/boards/se/7206/setup.c
+ *
+ * Copyright (C) 2006  Yoshinori Sato
+ *
+ * Hitachi 7206 SolutionEngine Support.
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <asm/se7206.h>
+#include <asm/io.h>
+#include <asm/machvec.h>
+
+static struct resource smc91x_resources[] = {
+        [0] = {
+                .start          = 0x300,
+                .end            = 0x300 + 0x020 - 1,
+                .flags          = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start          = 64,
+                .end            = 64,
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device smc91x_device = {
+        .name           = "smc91x",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(smc91x_resources),
+        .resource       = smc91x_resources,
+};
+
+static int __init se7206_devices_setup(void)
+{
+        return platform_device_register(&smc91x_device);
+}
+
+__initcall(se7206_devices_setup);
+
+void heartbeat_se(void);
+
+/*
+ * The Machine Vector
+ */
+
+struct sh_machine_vector mv_se __initmv = {
+        .mv_name                = "SolutionEngine",
+        .mv_nr_irqs             = 256,
+        .mv_inb                 = se7206_inb,
+        .mv_inw                 = se7206_inw,
+        .mv_inl                 = se7206_inl,
+        .mv_outb                = se7206_outb,
+        .mv_outw                = se7206_outw,
+        .mv_outl                = se7206_outl,
+
+        .mv_inb_p               = se7206_inb_p,
+        .mv_inw_p               = se7206_inw,
+        .mv_inl_p               = se7206_inl,
+        .mv_outb_p              = se7206_outb_p,
+        .mv_outw_p              = se7206_outw,
+        .mv_outl_p              = se7206_outl,
+
+        .mv_insb                = se7206_insb,
+        .mv_insw                = se7206_insw,
+        .mv_insl                = se7206_insl,
+        .mv_outsb               = se7206_outsb,
+        .mv_outsw               = se7206_outsw,
+        .mv_outsl               = se7206_outsl,
+
+        .mv_init_irq            = init_se7206_IRQ,
+#ifdef CONFIG_HEARTBEAT
+        .mv_heartbeat           = heartbeat_se,
+#endif
+};
+ALIAS_MV(se)
diff --git a/arch/sh/boards/se/7619/Makefile b/arch/sh/boards/se/7619/Makefile
new file mode 100644
index 000000000000..d21775c28cda
--- /dev/null
+++ b/arch/sh/boards/se/7619/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the 7619 SolutionEngine specific parts of the kernel
+#
+
+obj-y    := setup.o
diff --git a/arch/sh/boards/se/7619/setup.c b/arch/sh/boards/se/7619/setup.c
new file mode 100644
index 000000000000..52d2c4d5d2fa
--- /dev/null
+++ b/arch/sh/boards/se/7619/setup.c
@@ -0,0 +1,22 @@
+/*
+ * arch/sh/boards/se/7619/setup.c
+ *
+ * Copyright (C) 2006 Yoshinori Sato
+ *
+ * Hitachi SH7619 SolutionEngine Support.
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <asm/io.h>
+#include <asm/machvec.h>
+
+/*
+ * The Machine Vector
+ */
+
+struct sh_machine_vector mv_se __initmv = {
+        .mv_name                = "SolutionEngine",
+        .mv_nr_irqs             = 108,
+};
+ALIAS_MV(se)
diff --git a/arch/sh/boards/titan/setup.c b/arch/sh/boards/titan/setup.c
index a6046d93758b..6bcd939bfaed 100644
--- a/arch/sh/boards/titan/setup.c
+++ b/arch/sh/boards/titan/setup.c
@@ -1,26 +1,30 @@
 /*
- *      Setup for Titan
+ * arch/sh/boards/titan/setup.c - Setup for Titan
+ *
+ *  Copyright (C) 2006  Jamie Lenehan
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
 #include <linux/init.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
 #include <asm/titan.h>
 #include <asm/io.h>
 
-extern void __init pcibios_init_platform(void);
-
 static struct ipr_data titan_ipr_map[] = {
-        { TITAN_IRQ_WAN,        IRL0_IPR_ADDR,  IRL0_IPR_POS,   IRL0_PRIORITY },
-        { TITAN_IRQ_LAN,        IRL1_IPR_ADDR,  IRL1_IPR_POS,   IRL1_PRIORITY },
-        { TITAN_IRQ_MPCIA,      IRL2_IPR_ADDR,  IRL2_IPR_POS,   IRL2_PRIORITY },
-        { TITAN_IRQ_USB,        IRL3_IPR_ADDR,  IRL3_IPR_POS,   IRL3_PRIORITY },
+        /* IRQ, IPR idx, shift, prio */
+        { TITAN_IRQ_WAN,   3, 12, 8 },  /* eth0 (WAN) */
+        { TITAN_IRQ_LAN,   3,  8, 8 },  /* eth1 (LAN) */
+        { TITAN_IRQ_MPCIA, 3,  4, 8 },  /* mPCI A (top) */
+        { TITAN_IRQ_USB,   3,  0, 8 },  /* mPCI B (bottom), USB */
 };
 
 static void __init init_titan_irq(void)
 {
         /* enable individual interrupt mode for externals */
-        ctrl_outw(ctrl_inw(INTC_ICR) | INTC_ICR_IRLM, INTC_ICR);
-
+        ipr_irq_enable_irlm();
+        /* register ipr irqs */
         make_ipr_irq(titan_ipr_map, ARRAY_SIZE(titan_ipr_map));
 }
 
@@ -47,6 +51,5 @@ struct sh_machine_vector mv_titan __initmv = {
         .mv_ioport_map = titan_ioport_map,
 
         .mv_init_irq =  init_titan_irq,
-        .mv_init_pci =  pcibios_init_platform,
 };
 ALIAS_MV(titan)
diff --git a/arch/sh/boot/Makefile b/arch/sh/boot/Makefile
index 60797b31089c..11dc272c618e 100644
--- a/arch/sh/boot/Makefile
+++ b/arch/sh/boot/Makefile
@@ -8,13 +8,49 @@
 # Copyright (C) 1999 Stuart Menefy
 #
 
-targets := zImage
+MKIMAGE := $(srctree)/scripts/mkuboot.sh
+
+#
+# Assign safe dummy values if these variables are not defined,
+# in order to suppress error message.
+#
+CONFIG_PAGE_OFFSET      ?= 0x80000000
+CONFIG_MEMORY_START     ?= 0x0c000000
+CONFIG_BOOT_LINK_OFFSET ?= 0x00800000
+CONFIG_ZERO_PAGE_OFFSET ?= 0x00001000
+
+export CONFIG_PAGE_OFFSET CONFIG_MEMORY_START CONFIG_BOOT_LINK_OFFSET \
+       CONFIG_ZERO_PAGE_OFFSET
+
+targets := zImage vmlinux.srec uImage uImage.srec
 subdir- := compressed
 
 $(obj)/zImage: $(obj)/compressed/vmlinux FORCE
         $(call if_changed,objcopy)
-        @echo 'Kernel: $@ is ready'
+        @echo '  Kernel: $@ is ready'
 
 $(obj)/compressed/vmlinux: FORCE
         $(Q)$(MAKE) $(build)=$(obj)/compressed $@
 
+KERNEL_LOAD     := $(shell printf "0x%8x" $$[$(CONFIG_PAGE_OFFSET)  + \
+                                             $(CONFIG_MEMORY_START) + \
+                                             $(CONFIG_ZERO_PAGE_OFFSET)+0x1000])
+
+quiet_cmd_uimage = UIMAGE  $@
+      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \
+                   -C gzip -a $(KERNEL_LOAD) -e $(KERNEL_LOAD) \
+                   -n 'Linux-$(KERNELRELEASE)' -d $< $@
+
+$(obj)/uImage: $(obj)/zImage FORCE
+        $(call if_changed,uimage)
+        @echo '  Image $@ is ready'
+
+OBJCOPYFLAGS_vmlinux.srec := -I binary -O srec
+$(obj)/vmlinux.srec: $(obj)/compressed/vmlinux
+        $(call if_changed,objcopy)
+
+OBJCOPYFLAGS_uImage.srec := -I binary -O srec
+$(obj)/uImage.srec: $(obj)/uImage
+        $(call if_changed,objcopy)
+
+clean-files     += uImage uImage.srec vmlinux.srec
diff --git a/arch/sh/boot/compressed/Makefile b/arch/sh/boot/compressed/Makefile
index e5f443790079..d9512416f885 100644
--- a/arch/sh/boot/compressed/Makefile
+++ b/arch/sh/boot/compressed/Makefile
@@ -15,13 +15,7 @@ endif
 
 #
 # IMAGE_OFFSET is the load offset of the compression loader
-# Assign dummy values if these 2 variables are not defined,
-# in order to suppress error message.
 #
-CONFIG_PAGE_OFFSET      ?= 0x80000000
-CONFIG_MEMORY_START     ?= 0x0c000000
-CONFIG_BOOT_LINK_OFFSET ?= 0x00800000
-
 IMAGE_OFFSET    := $(shell printf "0x%08x" $$[$(CONFIG_PAGE_OFFSET)  + \
                                               $(CONFIG_MEMORY_START) + \
                                               $(CONFIG_BOOT_LINK_OFFSET)])
diff --git a/arch/sh/boot/compressed/head.S b/arch/sh/boot/compressed/head.S
index 4c26a192277d..a8399b013729 100644
--- a/arch/sh/boot/compressed/head.S
+++ b/arch/sh/boot/compressed/head.S
@@ -8,6 +8,7 @@
 .text
 
 #include <linux/linkage.h>
+#include <asm/page.h>
 
         .global startup
 startup:
@@ -97,7 +98,7 @@ init_stack_addr:
 decompress_kernel_addr:
         .long   decompress_kernel
 kernel_start_addr:
-        .long   _text+0x1000
+        .long   _text+PAGE_SIZE
 
         .align  9
 fake_headers_as_bzImage:
diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc.c
index f2fed5ce5cc3..df65e305acf7 100644
--- a/arch/sh/boot/compressed/misc.c
+++ b/arch/sh/boot/compressed/misc.c
@@ -12,6 +12,8 @@
  */
 
 #include <asm/uaccess.h>
+#include <asm/addrspace.h>
+#include <asm/page.h>
 #ifdef CONFIG_SH_STANDARD_BIOS
 #include <asm/sh_bios.h>
 #endif
@@ -228,7 +230,7 @@ long* stack_start = &user_stack[STACK_SIZE];
 void decompress_kernel(void)
 {
         output_data = 0;
-        output_ptr = (unsigned long)&_text+0x20001000;
+        output_ptr = P2SEGADDR((unsigned long)&_text+PAGE_SIZE);
         free_mem_ptr = (unsigned long)&_end;
         free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;
 
diff --git a/arch/sh/configs/landisk_defconfig b/arch/sh/configs/landisk_defconfig
index 238c0f109907..e7f8ddb0ada4 100644
--- a/arch/sh/configs/landisk_defconfig
+++ b/arch/sh/configs/landisk_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18
-# Tue Oct  3 11:14:13 2006
+# Linux kernel version: 2.6.19
+# Thu Dec  7 17:13:04 2006
 #
 CONFIG_SUPERH=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -10,6 +10,9 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -33,6 +36,7 @@ CONFIG_SYSVIPC=y
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -114,6 +118,8 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 CONFIG_SH_LANDISK=y
 # CONFIG_SH_TITAN is not set
 # CONFIG_SH_SHMIN is not set
+# CONFIG_SH_7206_SOLUTION_ENGINE is not set
+# CONFIG_SH_7619_SOLUTION_ENGINE is not set
 # CONFIG_SH_UNKNOWN is not set
 
 #
@@ -125,6 +131,12 @@ CONFIG_CPU_SH4=y
 # SH-2 Processor Support
 #
 # CONFIG_CPU_SUBTYPE_SH7604 is not set
+# CONFIG_CPU_SUBTYPE_SH7619 is not set
+
+#
+# SH-2A Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7206 is not set
 
 #
 # SH-3 Processor Support
@@ -160,6 +172,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
 #
 # CONFIG_CPU_SUBTYPE_SH7770 is not set
 # CONFIG_CPU_SUBTYPE_SH7780 is not set
+# CONFIG_CPU_SUBTYPE_SH7785 is not set
 
 #
 # SH4AL-DSP Processor Support
@@ -175,6 +188,9 @@ CONFIG_PAGE_OFFSET=0x80000000
 CONFIG_MEMORY_START=0x0c000000
 CONFIG_MEMORY_SIZE=0x04000000
 CONFIG_VSYSCALL=y
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -196,16 +212,21 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 # Processor features
 #
 CONFIG_CPU_LITTLE_ENDIAN=y
+# CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_SH_FPU=y
 # CONFIG_SH_DSP is not set
 # CONFIG_SH_STORE_QUEUES is not set
 CONFIG_CPU_HAS_INTEVT=y
+CONFIG_CPU_HAS_IPR_IRQ=y
 CONFIG_CPU_HAS_SR_RB=y
+CONFIG_CPU_HAS_PTEA=y
 
 #
 # Timer support
 #
 CONFIG_SH_TMU=y
+CONFIG_SH_TIMER_IRQ=16
+# CONFIG_NO_IDLE_HZ is not set
 CONFIG_SH_PCLK_FREQ=33333333
 
 #
@@ -216,9 +237,7 @@ CONFIG_SH_PCLK_FREQ=33333333
 #
 # DMA support
 #
-CONFIG_SH_DMA=y
-CONFIG_NR_ONCHIP_DMA_CHANNELS=4
-# CONFIG_NR_DMA_CHANNELS_BOOL is not set
+# CONFIG_SH_DMA is not set
 
 #
 # Companion Chips
@@ -227,6 +246,11 @@ CONFIG_NR_ONCHIP_DMA_CHANNELS=4
 CONFIG_HEARTBEAT=y
 
 #
+# Additional SuperH Device Drivers
+#
+# CONFIG_PUSH_SWITCH is not set
+
+#
 # Kernel features
 #
 # CONFIG_HZ_100 is not set
@@ -340,11 +364,13 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_TUNNEL is not set
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 
 #
 # IP: Virtual Server Configuration
@@ -361,24 +387,12 @@ CONFIG_NETFILTER=y
 # Core Netfilter Configuration
 #
 # CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NF_CONNTRACK_ENABLED is not set
 # CONFIG_NETFILTER_XTABLES is not set
 
 #
 # IP: Netfilter Configuration
 #
-CONFIG_IP_NF_CONNTRACK=m
-CONFIG_IP_NF_CT_ACCT=y
-CONFIG_IP_NF_CONNTRACK_MARK=y
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-# CONFIG_IP_NF_NETBIOS_NS is not set
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_H323 is not set
-# CONFIG_IP_NF_SIP is not set
 CONFIG_IP_NF_QUEUE=m
 
 #
@@ -477,6 +491,12 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_ATA_OVER_ETH is not set
 
 #
+# Misc devices
+#
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+
+#
 # ATA/ATAPI/MFM/RLL support
 #
 CONFIG_IDE=y
@@ -519,6 +539,7 @@ CONFIG_BLK_DEV_AEC62XX=y
 # CONFIG_BLK_DEV_CS5530 is not set
 # CONFIG_BLK_DEV_HPT34X is not set
 # CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
 # CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_PIIX is not set
 # CONFIG_BLK_DEV_IT821X is not set
@@ -542,6 +563,7 @@ CONFIG_IDEDMA_AUTO=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
@@ -561,6 +583,7 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
 
 #
 # SCSI Transports
@@ -602,12 +625,12 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_NCR53C406A is not set
 # CONFIG_SCSI_STEX is not set
 # CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_PAS16 is not set
 # CONFIG_SCSI_PSI240I is not set
 # CONFIG_SCSI_QLOGIC_FAS is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
 # CONFIG_SCSI_LPFC is not set
 # CONFIG_SCSI_SYM53C416 is not set
 # CONFIG_SCSI_DC395x is not set
@@ -615,6 +638,7 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_T128 is not set
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
 
 #
 # PCMCIA SCSI adapter support
@@ -757,6 +781,7 @@ CONFIG_8139CP=y
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
 
 #
 # Token Ring devices
@@ -871,10 +896,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_DRM is not set
 
 #
@@ -889,7 +910,6 @@ CONFIG_HW_RANDOM=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
 
 #
 # I2C support
@@ -905,6 +925,7 @@ CONFIG_HW_RANDOM=y
 #
 # Dallas's 1-wire bus
 #
+# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
@@ -917,10 +938,6 @@ CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
-# Misc devices
-#
-
-#
 # Multimedia devices
 #
 CONFIG_VIDEO_DEV=m
@@ -1037,6 +1054,7 @@ CONFIG_USB=y
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_MULTITHREAD_PROBE is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -1106,7 +1124,6 @@ CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_ATI_REMOTE2 is not set
 # CONFIG_USB_KEYSPAN_REMOTE is not set
 # CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
 
 #
 # USB Imaging devices
@@ -1121,6 +1138,7 @@ CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_KAWETH is not set
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
+# CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 
@@ -1156,6 +1174,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
 # CONFIG_USB_SERIAL_KLSI is not set
 # CONFIG_USB_SERIAL_KOBIL_SCT is not set
 # CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
 # CONFIG_USB_SERIAL_MOS7840 is not set
 # CONFIG_USB_SERIAL_NAVMAN is not set
 CONFIG_USB_SERIAL_PL2303=m
@@ -1167,6 +1186,7 @@ CONFIG_USB_SERIAL_PL2303=m
 # CONFIG_USB_SERIAL_XIRCOM is not set
 # CONFIG_USB_SERIAL_OPTION is not set
 # CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
 
 #
 # USB Miscellaneous drivers
@@ -1188,6 +1208,7 @@ CONFIG_USB_EMI26=m
 CONFIG_USB_SISUSBVGA=m
 CONFIG_USB_SISUSBVGA_CON=y
 # CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_TEST is not set
 
 #
@@ -1254,6 +1275,7 @@ CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 # CONFIG_EXT3_FS_POSIX_ACL is not set
 # CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=y
@@ -1264,6 +1286,7 @@ CONFIG_REISERFS_FS=y
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 CONFIG_ROMFS_FS=y
@@ -1414,6 +1437,7 @@ CONFIG_NLS_CODEPAGE_932=y
 #
 # Kernel hacking
 #
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
@@ -1422,6 +1446,7 @@ CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_SH_STANDARD_BIOS=y
 # CONFIG_EARLY_SCIF_CONSOLE is not set
 # CONFIG_EARLY_PRINTK is not set
@@ -1445,6 +1470,4 @@ CONFIG_SH_STANDARD_BIOS=y
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
 CONFIG_PLIST=y
diff --git a/arch/sh/configs/r7780rp_defconfig b/arch/sh/configs/r7780rp_defconfig
index 34e2046c3213..2b75b4896ba5 100644
--- a/arch/sh/configs/r7780rp_defconfig
+++ b/arch/sh/configs/r7780rp_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19-rc3
-# Tue Oct 31 12:32:06 2006
+# Linux kernel version: 2.6.19
+# Wed Dec  6 11:59:38 2006
 #
 CONFIG_SUPERH=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -11,6 +11,8 @@ CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 # CONFIG_GENERIC_TIME is not set
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -37,6 +39,7 @@ CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+# CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -118,6 +121,8 @@ CONFIG_SH_R7780RP=y
 # CONFIG_SH_LANDISK is not set
 # CONFIG_SH_TITAN is not set
 # CONFIG_SH_SHMIN is not set
+# CONFIG_SH_7206_SOLUTION_ENGINE is not set
+# CONFIG_SH_7619_SOLUTION_ENGINE is not set
 # CONFIG_SH_UNKNOWN is not set
 
 #
@@ -130,6 +135,12 @@ CONFIG_CPU_SH4A=y
 # SH-2 Processor Support
 #
 # CONFIG_CPU_SUBTYPE_SH7604 is not set
+# CONFIG_CPU_SUBTYPE_SH7619 is not set
+
+#
+# SH-2A Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7206 is not set
 
 #
 # SH-3 Processor Support
@@ -165,6 +176,7 @@ CONFIG_CPU_SH4A=y
 #
 # CONFIG_CPU_SUBTYPE_SH7770 is not set
 CONFIG_CPU_SUBTYPE_SH7780=y
+# CONFIG_CPU_SUBTYPE_SH7785 is not set
 
 #
 # SH4AL-DSP Processor Support
@@ -181,8 +193,14 @@ CONFIG_MEMORY_START=0x08000000
 CONFIG_MEMORY_SIZE=0x08000000
 # CONFIG_32BIT is not set
 CONFIG_VSYSCALL=y
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
 CONFIG_HUGETLB_PAGE_SIZE_64K=y
+# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
 # CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
+# CONFIG_HUGETLB_PAGE_SIZE_4MB is not set
+# CONFIG_HUGETLB_PAGE_SIZE_64MB is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -204,12 +222,14 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 # Processor features
 #
 CONFIG_CPU_LITTLE_ENDIAN=y
+# CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_SH_FPU=y
 # CONFIG_SH_DSP is not set
 CONFIG_SH_STORE_QUEUES=y
 CONFIG_CPU_HAS_INTEVT=y
 CONFIG_CPU_HAS_INTC2_IRQ=y
 CONFIG_CPU_HAS_SR_RB=y
+CONFIG_CPU_HAS_PTEA=y
 
 #
 # Timer support
@@ -220,6 +240,8 @@ CONFIG_SH_TMU=y
 # R7780RP options
 #
 CONFIG_SH_R7780MP=y
+CONFIG_SH_TIMER_IRQ=28
+CONFIG_NO_IDLE_HZ=y
 CONFIG_SH_PCLK_FREQ=32000000
 
 #
@@ -238,13 +260,18 @@ CONFIG_SH_PCLK_FREQ=32000000
 # CONFIG_HD6446X_SERIES is not set
 
 #
+# Additional SuperH Device Drivers
+#
+CONFIG_PUSH_SWITCH=y
+
+#
 # Kernel features
 #
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
-# CONFIG_KEXEC is not set
+CONFIG_KEXEC=y
 # CONFIG_SMP is not set
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
@@ -278,10 +305,7 @@ CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
 #
 # PCI Hotplug Support
 #
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_FAKE is not set
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-# CONFIG_HOTPLUG_PCI_SHPC is not set
+# CONFIG_HOTPLUG_PCI is not set
 
 #
 # Executable file formats
@@ -341,6 +365,7 @@ CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
@@ -556,6 +581,7 @@ CONFIG_SATA_SIL=y
 # CONFIG_PATA_IT821X is not set
 # CONFIG_PATA_JMICRON is not set
 # CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_NETCELL is not set
@@ -572,6 +598,7 @@ CONFIG_SATA_SIL=y
 # CONFIG_PATA_SIS is not set
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
+CONFIG_PATA_PLATFORM=y
 
 #
 # Multi-device support (RAID and LVM)
@@ -688,6 +715,7 @@ CONFIG_R8169=y
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
 
 #
 # Token Ring devices
@@ -830,10 +858,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
 
@@ -1020,7 +1044,7 @@ CONFIG_INOTIFY_USER=y
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
+CONFIG_FUSE_FS=m
 
 #
 # CD-ROM/DVD Filesystems
@@ -1052,7 +1076,7 @@ CONFIG_TMPFS=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_RAMFS=y
-# CONFIG_CONFIGFS_FS is not set
+CONFIG_CONFIGFS_FS=m
 
 #
 # Miscellaneous filesystems
@@ -1153,28 +1177,33 @@ CONFIG_NLS_ISO8859_1=y
 #
 # Profiling support
 #
-# CONFIG_PROFILING is not set
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
 
 #
 # Kernel hacking
 #
-# CONFIG_PRINTK_TIME is not set
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
 CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_DEBUG_SLAB is not set
-CONFIG_DEBUG_SPINLOCK=y
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
@@ -1184,7 +1213,7 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_SH_STANDARD_BIOS is not set
 # CONFIG_EARLY_SCIF_CONSOLE is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_4KSTACKS is not set
 # CONFIG_KGDB is not set
diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig
new file mode 100644
index 000000000000..87ab9080fd1d
--- /dev/null
+++ b/arch/sh/configs/se7206_defconfig
@@ -0,0 +1,890 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.19
+# Wed Dec  6 14:40:15 2006
+#
+CONFIG_SUPERH=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SYSVIPC is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+# CONFIG_UID16 is not set
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_KALLSYMS is not set
+# CONFIG_HOTPLUG is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+# CONFIG_ELF_CORE is not set
+# CONFIG_BASE_FULL is not set
+# CONFIG_FUTEX is not set
+# CONFIG_EPOLL is not set
+CONFIG_SLAB=y
+# CONFIG_VM_EVENT_COUNTERS is not set
+CONFIG_TINY_SHMEM=y
+CONFIG_BASE_SMALL=1
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+# CONFIG_MODULES is not set
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+
+#
+# System type
+#
+# CONFIG_SH_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SOLUTION_ENGINE is not set
+# CONFIG_SH_7300_SOLUTION_ENGINE is not set
+# CONFIG_SH_7343_SOLUTION_ENGINE is not set
+# CONFIG_SH_73180_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SYSTEMH is not set
+# CONFIG_SH_HP6XX is not set
+# CONFIG_SH_EC3104 is not set
+# CONFIG_SH_SATURN is not set
+# CONFIG_SH_DREAMCAST is not set
+# CONFIG_SH_BIGSUR is not set
+# CONFIG_SH_MPC1211 is not set
+# CONFIG_SH_SH03 is not set
+# CONFIG_SH_SECUREEDGE5410 is not set
+# CONFIG_SH_HS7751RVOIP is not set
+# CONFIG_SH_7710VOIPGW is not set
+# CONFIG_SH_RTS7751R2D is not set
+# CONFIG_SH_R7780RP is not set
+# CONFIG_SH_EDOSK7705 is not set
+# CONFIG_SH_SH4202_MICRODEV is not set
+# CONFIG_SH_LANDISK is not set
+# CONFIG_SH_TITAN is not set
+# CONFIG_SH_SHMIN is not set
+CONFIG_SH_7206_SOLUTION_ENGINE=y
+# CONFIG_SH_7619_SOLUTION_ENGINE is not set
+# CONFIG_SH_UNKNOWN is not set
+
+#
+# Processor selection
+#
+CONFIG_CPU_SH2=y
+CONFIG_CPU_SH2A=y
+
+#
+# SH-2 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7604 is not set
+# CONFIG_CPU_SUBTYPE_SH7619 is not set
+
+#
+# SH-2A Processor Support
+#
+CONFIG_CPU_SUBTYPE_SH7206=y
+
+#
+# SH-3 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7300 is not set
+# CONFIG_CPU_SUBTYPE_SH7705 is not set
+# CONFIG_CPU_SUBTYPE_SH7706 is not set
+# CONFIG_CPU_SUBTYPE_SH7707 is not set
+# CONFIG_CPU_SUBTYPE_SH7708 is not set
+# CONFIG_CPU_SUBTYPE_SH7709 is not set
+# CONFIG_CPU_SUBTYPE_SH7710 is not set
+
+#
+# SH-4 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
+# CONFIG_CPU_SUBTYPE_SH7091 is not set
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
+# CONFIG_CPU_SUBTYPE_SH7750S is not set
+# CONFIG_CPU_SUBTYPE_SH7751 is not set
+# CONFIG_CPU_SUBTYPE_SH7751R is not set
+# CONFIG_CPU_SUBTYPE_SH7760 is not set
+# CONFIG_CPU_SUBTYPE_SH4_202 is not set
+
+#
+# ST40 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
+# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
+
+#
+# SH-4A Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7770 is not set
+# CONFIG_CPU_SUBTYPE_SH7780 is not set
+# CONFIG_CPU_SUBTYPE_SH7785 is not set
+
+#
+# SH4AL-DSP Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH73180 is not set
+# CONFIG_CPU_SUBTYPE_SH7343 is not set
+
+#
+# Memory management options
+#
+CONFIG_PAGE_OFFSET=0x00000000
+CONFIG_MEMORY_START=0x0c000000
+CONFIG_MEMORY_SIZE=0x04000000
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+
+#
+# Cache configuration
+#
+# CONFIG_SH_DIRECT_MAPPED is not set
+# CONFIG_SH_WRITETHROUGH is not set
+# CONFIG_SH_OCRAM is not set
+
+#
+# Processor features
+#
+# CONFIG_CPU_LITTLE_ENDIAN is not set
+CONFIG_CPU_BIG_ENDIAN=y
+# CONFIG_SH_FPU is not set
+# CONFIG_SH_FPU_EMU is not set
+# CONFIG_SH_DSP is not set
+
+#
+# Timer support
+#
+CONFIG_SH_CMT=y
+# CONFIG_SH_MTU2 is not set
+CONFIG_SH_TIMER_IRQ=140
+# CONFIG_NO_IDLE_HZ is not set
+CONFIG_SH_PCLK_FREQ=33333333
+CONFIG_SH_CLK_MD=6
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# DMA support
+#
+# CONFIG_SH_DMA is not set
+
+#
+# Companion Chips
+#
+# CONFIG_HD6446X_SERIES is not set
+
+#
+# Additional SuperH Device Drivers
+#
+# CONFIG_PUSH_SWITCH is not set
+
+#
+# Kernel features
+#
+CONFIG_HZ_100=y
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=100
+# CONFIG_KEXEC is not set
+# CONFIG_SMP is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+
+#
+# Boot options
+#
+CONFIG_ZERO_PAGE_OFFSET=0x00001000
+CONFIG_BOOT_LINK_OFFSET=0x00800000
+# CONFIG_UBC_WAKEUP is not set
+# CONFIG_CMDLINE_BOOL is not set
+
+#
+# Bus options
+#
+# CONFIG_PCI is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+
+#
+# PCI Hotplug Support
+#
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_FLAT=y
+CONFIG_BINFMT_ZFLAT=y
+# CONFIG_BINFMT_SHARED_FLAT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options (EXPERIMENTAL)
+#
+# CONFIG_PM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+# CONFIG_PACKET is not set
+# CONFIG_UNIX is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+# CONFIG_STANDALONE is not set
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=y
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0x20000000
+CONFIG_MTD_PHYSMAP_LEN=0x01000000
+CONFIG_MTD_PHYSMAP_BANKWIDTH=4
+# CONFIG_MTD_SOLUTIONENGINE is not set
+# CONFIG_MTD_UCLINUX is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# Misc devices
+#
+# CONFIG_TIFM_CORE is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_STNIC is not set
+CONFIG_SMC91X=y
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=4
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_UNIX98_PTYS is not set
+# CONFIG_LEGACY_PTYS is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# InfiniBand support
+#
+
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+
+#
+# Real Time Clock
+#
+# CONFIG_RTC_CLASS is not set
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+CONFIG_ROMFS_FS=y
+# CONFIG_INOTIFY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+# CONFIG_SYSFS is not set
+# CONFIG_TMPFS is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_UNWIND_INFO is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_SH_STANDARD_BIOS is not set
+# CONFIG_EARLY_SCIF_CONSOLE is not set
+# CONFIG_KGDB is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
diff --git a/arch/sh/configs/se7619_defconfig b/arch/sh/configs/se7619_defconfig
new file mode 100644
index 000000000000..20ac7f4c53fb
--- /dev/null
+++ b/arch/sh/configs/se7619_defconfig
@@ -0,0 +1,744 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.19
+# Wed Dec  6 16:35:36 2006
+#
+CONFIG_SUPERH=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SYSVIPC is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+# CONFIG_UID16 is not set
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_KALLSYMS is not set
+# CONFIG_HOTPLUG is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+# CONFIG_ELF_CORE is not set
+# CONFIG_BASE_FULL is not set
+# CONFIG_FUTEX is not set
+# CONFIG_EPOLL is not set
+CONFIG_SLAB=y
+# CONFIG_VM_EVENT_COUNTERS is not set
+CONFIG_TINY_SHMEM=y
+CONFIG_BASE_SMALL=1
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+# CONFIG_MODULES is not set
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+
+#
+# System type
+#
+# CONFIG_SH_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SOLUTION_ENGINE is not set
+# CONFIG_SH_7300_SOLUTION_ENGINE is not set
+# CONFIG_SH_7343_SOLUTION_ENGINE is not set
+# CONFIG_SH_73180_SOLUTION_ENGINE is not set
+# CONFIG_SH_7751_SYSTEMH is not set
+# CONFIG_SH_HP6XX is not set
+# CONFIG_SH_EC3104 is not set
+# CONFIG_SH_SATURN is not set
+# CONFIG_SH_DREAMCAST is not set
+# CONFIG_SH_BIGSUR is not set
+# CONFIG_SH_MPC1211 is not set
+# CONFIG_SH_SH03 is not set
+# CONFIG_SH_SECUREEDGE5410 is not set
+# CONFIG_SH_HS7751RVOIP is not set
+# CONFIG_SH_7710VOIPGW is not set
+# CONFIG_SH_RTS7751R2D is not set
+# CONFIG_SH_R7780RP is not set
+# CONFIG_SH_EDOSK7705 is not set
+# CONFIG_SH_SH4202_MICRODEV is not set
+# CONFIG_SH_LANDISK is not set
+# CONFIG_SH_TITAN is not set
+# CONFIG_SH_SHMIN is not set
+# CONFIG_SH_7206_SOLUTION_ENGINE is not set
+CONFIG_SH_7619_SOLUTION_ENGINE=y
+# CONFIG_SH_UNKNOWN is not set
+
+#
+# Processor selection
+#
+CONFIG_CPU_SH2=y
+
+#
+# SH-2 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7604 is not set
+CONFIG_CPU_SUBTYPE_SH7619=y
+
+#
+# SH-2A Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7206 is not set
+
+#
+# SH-3 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7300 is not set
+# CONFIG_CPU_SUBTYPE_SH7705 is not set
+# CONFIG_CPU_SUBTYPE_SH7706 is not set
+# CONFIG_CPU_SUBTYPE_SH7707 is not set
+# CONFIG_CPU_SUBTYPE_SH7708 is not set
+# CONFIG_CPU_SUBTYPE_SH7709 is not set
+# CONFIG_CPU_SUBTYPE_SH7710 is not set
+
+#
+# SH-4 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
+# CONFIG_CPU_SUBTYPE_SH7091 is not set
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
+# CONFIG_CPU_SUBTYPE_SH7750S is not set
+# CONFIG_CPU_SUBTYPE_SH7751 is not set
+# CONFIG_CPU_SUBTYPE_SH7751R is not set
+# CONFIG_CPU_SUBTYPE_SH7760 is not set
+# CONFIG_CPU_SUBTYPE_SH4_202 is not set
+
+#
+# ST40 Processor Support
+#
+# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
+# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
+
+#
+# SH-4A Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH7770 is not set
+# CONFIG_CPU_SUBTYPE_SH7780 is not set
+# CONFIG_CPU_SUBTYPE_SH7785 is not set
+
+#
+# SH4AL-DSP Processor Support
+#
+# CONFIG_CPU_SUBTYPE_SH73180 is not set
+# CONFIG_CPU_SUBTYPE_SH7343 is not set
+
+#
+# Memory management options
+#
+CONFIG_PAGE_OFFSET=0x00000000
+CONFIG_MEMORY_START=0x0c000000
+CONFIG_MEMORY_SIZE=0x04000000
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+
+#
+# Cache configuration
+#
+# CONFIG_SH_DIRECT_MAPPED is not set
+CONFIG_SH_WRITETHROUGH=y
+# CONFIG_SH_OCRAM is not set
+
+#
+# Processor features
+#
+# CONFIG_CPU_LITTLE_ENDIAN is not set
+CONFIG_CPU_BIG_ENDIAN=y
+# CONFIG_SH_FPU is not set
+# CONFIG_SH_FPU_EMU is not set
+# CONFIG_SH_DSP is not set
+
+#
+# Timer support
+#
+CONFIG_SH_CMT=y
+CONFIG_SH_TIMER_IRQ=86
+# CONFIG_NO_IDLE_HZ is not set
+CONFIG_SH_PCLK_FREQ=31250000
+CONFIG_SH_CLK_MD=5
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# DMA support
+#
+# CONFIG_SH_DMA is not set
+
+#
+# Companion Chips
+#
+# CONFIG_HD6446X_SERIES is not set
+
+#
+# Additional SuperH Device Drivers
+#
+# CONFIG_PUSH_SWITCH is not set
+
+#
+# Kernel features
+#
+CONFIG_HZ_100=y
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=100
+# CONFIG_KEXEC is not set
+# CONFIG_SMP is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+
+#
+# Boot options
+#
+CONFIG_ZERO_PAGE_OFFSET=0x00001000
+CONFIG_BOOT_LINK_OFFSET=0x00800000
+# CONFIG_UBC_WAKEUP is not set
+# CONFIG_CMDLINE_BOOL is not set
+
+#
+# Bus options
+#
+# CONFIG_PCI is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+
+#
+# PCI Hotplug Support
+#
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_FLAT=y
+CONFIG_BINFMT_ZFLAT=y
+# CONFIG_BINFMT_SHARED_FLAT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options (EXPERIMENTAL)
+#
+# CONFIG_PM is not set
+
+#
+# Networking
+#
+# CONFIG_NET is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+# CONFIG_STANDALONE is not set
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=y
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0xa0000000
+CONFIG_MTD_PHYSMAP_LEN=0x01000000
+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+# CONFIG_MTD_SOLUTIONENGINE is not set
+# CONFIG_MTD_UCLINUX is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_CDROM_PKTCDVD is not set
+
+#
+# Misc devices
+#
+# CONFIG_TIFM_CORE is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# ISDN subsystem
+#
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=3
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_UNIX98_PTYS is not set
+# CONFIG_LEGACY_PTYS is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+
+#
+# Graphics support
+#
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# InfiniBand support
+#
+
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+
+#
+# Real Time Clock
+#
+# CONFIG_RTC_CLASS is not set
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+CONFIG_ROMFS_FS=y
+# CONFIG_INOTIFY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+# CONFIG_SYSFS is not set
+# CONFIG_TMPFS is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_UNWIND_INFO is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_SH_STANDARD_BIOS is not set
+# CONFIG_EARLY_SCIF_CONSOLE is not set
+# CONFIG_KGDB is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
diff --git a/arch/sh/drivers/Kconfig b/arch/sh/drivers/Kconfig
new file mode 100644
index 000000000000..c54c758e6243
--- /dev/null
+++ b/arch/sh/drivers/Kconfig
@@ -0,0 +1,9 @@
+menu "Additional SuperH Device Drivers"
+
+config PUSH_SWITCH
+        tristate "Push switch support"
+        help
+          This enables support for the push switch framework, a simple
+          framework that allows for sysfs driven switch status reporting.
+
+endmenu
diff --git a/arch/sh/drivers/Makefile b/arch/sh/drivers/Makefile
index 338c3729d270..bf18dbfb6787 100644
--- a/arch/sh/drivers/Makefile
+++ b/arch/sh/drivers/Makefile
@@ -5,4 +5,4 @@
 obj-$(CONFIG_PCI)               += pci/
 obj-$(CONFIG_SH_DMA)            += dma/
 obj-$(CONFIG_SUPERHYWAY)        += superhyway/
-
+obj-$(CONFIG_PUSH_SWITCH)       += push-switch.o
diff --git a/arch/sh/drivers/dma/Makefile b/arch/sh/drivers/dma/Makefile
index 065d4c90970e..db1295d32268 100644
--- a/arch/sh/drivers/dma/Makefile
+++ b/arch/sh/drivers/dma/Makefile
@@ -2,8 +2,8 @@
 # Makefile for the SuperH DMA specific kernel interface routines under Linux.
 #
 
-obj-y                           += dma-api.o dma-isa.o
+obj-y                           += dma-api.o
+obj-$(CONFIG_ISA_DMA_API)       += dma-isa.o
 obj-$(CONFIG_SYSFS)             += dma-sysfs.o
 obj-$(CONFIG_SH_DMA)            += dma-sh.o
 obj-$(CONFIG_SH_DREAMCAST)      += dma-pvr2.o dma-g2.o
-
diff --git a/arch/sh/drivers/dma/dma-api.c b/arch/sh/drivers/dma/dma-api.c
index 47c3e837599b..e062067edd24 100644
--- a/arch/sh/drivers/dma/dma-api.c
+++ b/arch/sh/drivers/dma/dma-api.c
@@ -11,61 +11,27 @@
  */
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/interrupt.h>
 #include <linux/spinlock.h>
 #include <linux/proc_fs.h>
 #include <linux/list.h>
 #include <linux/platform_device.h>
+#include <linux/mm.h>
 #include <asm/dma.h>
 
 DEFINE_SPINLOCK(dma_spin_lock);
 static LIST_HEAD(registered_dmac_list);
 
-/*
- * A brief note about the reasons for this API as it stands.
- *
- * For starters, the old ISA DMA API didn't work for us for a number of
- * reasons, for one, the vast majority of channels on the SH DMAC are
- * dual-address mode only, and both the new and the old DMA APIs are after the
- * concept of managing a DMA buffer, which doesn't overly fit this model very
- * well. In addition to which, the new API is largely geared at IOMMUs and
- * GARTs, and doesn't even support the channel notion very well.
- *
- * The other thing that's a marginal issue, is the sheer number of random DMA
- * engines that are present (ie, in boards like the Dreamcast), some of which
- * cascade off of the SH DMAC, and others do not. As such, there was a real
- * need for a scalable subsystem that could deal with both single and
- * dual-address mode usage, in addition to interoperating with cascaded DMACs.
- *
- * There really isn't any reason why this needs to be SH specific, though I'm
- * not aware of too many other processors (with the exception of some MIPS)
- * that have the same concept of a dual address mode, or any real desire to
- * actually make use of the DMAC even if such a subsystem were exposed
- * elsewhere.
- *
- * The idea for this was derived from the ARM port, which acted as an excellent
- * reference when trying to address these issues.
- *
- * It should also be noted that the decision to add Yet Another DMA API(tm) to
- * the kernel wasn't made easily, and was only decided upon after conferring
- * with jejb with regards to the state of the old and new APIs as they applied
- * to these circumstances. Philip Blundell was also a great help in figuring
- * out some single-address mode DMA semantics that were otherwise rather
- * confusing.
- */
-
 struct dma_info *get_dma_info(unsigned int chan)
 {
         struct dma_info *info;
-        unsigned int total = 0;
 
         /*
          * Look for each DMAC's range to determine who the owner of
          * the channel is.
          */
         list_for_each_entry(info, &registered_dmac_list, list) {
-                total += info->nr_channels;
-                if (chan > total)
+                if ((chan <  info->first_channel_nr) ||
+                    (chan >= info->first_channel_nr + info->nr_channels))
                         continue;
 
                 return info;
@@ -73,6 +39,22 @@ struct dma_info *get_dma_info(unsigned int chan)
 
         return NULL;
 }
+EXPORT_SYMBOL(get_dma_info);
+
+struct dma_info *get_dma_info_by_name(const char *dmac_name)
+{
+        struct dma_info *info;
+
+        list_for_each_entry(info, &registered_dmac_list, list) {
+                if (dmac_name && (strcmp(dmac_name, info->name) != 0))
+                        continue;
+                else
+                        return info;
+        }
+
+        return NULL;
+}
+EXPORT_SYMBOL(get_dma_info_by_name);
 
 static unsigned int get_nr_channels(void)
 {
@@ -91,63 +73,161 @@ static unsigned int get_nr_channels(void)
 struct dma_channel *get_dma_channel(unsigned int chan)
 {
         struct dma_info *info = get_dma_info(chan);
+        struct dma_channel *channel;
+        int i;
 
-        if (!info)
+        if (unlikely(!info))
                 return ERR_PTR(-EINVAL);
 
-        return info->channels + chan;
+        for (i = 0; i < info->nr_channels; i++) {
+                channel = &info->channels[i];
+                if (channel->chan == chan)
+                        return channel;
+        }
+
+        return NULL;
 }
+EXPORT_SYMBOL(get_dma_channel);
 
 int get_dma_residue(unsigned int chan)
 {
         struct dma_info *info = get_dma_info(chan);
-        struct dma_channel *channel = &info->channels[chan];
+        struct dma_channel *channel = get_dma_channel(chan);
 
         if (info->ops->get_residue)
                 return info->ops->get_residue(channel);
 
         return 0;
 }
+EXPORT_SYMBOL(get_dma_residue);
 
-int request_dma(unsigned int chan, const char *dev_id)
+static int search_cap(const char **haystack, const char *needle)
 {
-        struct dma_info *info = get_dma_info(chan);
-        struct dma_channel *channel = &info->channels[chan];
+        const char **p;
+
+        for (p = haystack; *p; p++)
+                if (strcmp(*p, needle) == 0)
+                        return 1;
+
+        return 0;
+}
+
+/**
+ * request_dma_bycap - Allocate a DMA channel based on its capabilities
+ * @dmac: List of DMA controllers to search
+ * @caps: List of capabilites
+ *
+ * Search all channels of all DMA controllers to find a channel which
+ * matches the requested capabilities. The result is the channel
+ * number if a match is found, or %-ENODEV if no match is found.
+ *
+ * Note that not all DMA controllers export capabilities, in which
+ * case they can never be allocated using this API, and so
+ * request_dma() must be used specifying the channel number.
+ */
+int request_dma_bycap(const char **dmac, const char **caps, const char *dev_id)
+{
+        unsigned int found = 0;
+        struct dma_info *info;
+        const char **p;
+        int i;
+
+        BUG_ON(!dmac || !caps);
+
+        list_for_each_entry(info, &registered_dmac_list, list)
+                if (strcmp(*dmac, info->name) == 0) {
+                        found = 1;
+                        break;
+                }
+
+        if (!found)
+                return -ENODEV;
+
+        for (i = 0; i < info->nr_channels; i++) {
+                struct dma_channel *channel = &info->channels[i];
+
+                if (unlikely(!channel->caps))
+                        continue;
+
+                for (p = caps; *p; p++) {
+                        if (!search_cap(channel->caps, *p))
+                                break;
+                        if (request_dma(channel->chan, dev_id) == 0)
+                                return channel->chan;
+                }
+        }
+
+        return -EINVAL;
+}
+EXPORT_SYMBOL(request_dma_bycap);
+
+int dmac_search_free_channel(const char *dev_id)
+{
+        struct dma_channel *channel = { 0 };
+        struct dma_info *info = get_dma_info(0);
+        int i;
+
+        for (i = 0; i < info->nr_channels; i++) {
+                channel = &info->channels[i];
+                if (unlikely(!channel))
+                        return -ENODEV;
+
+                if (atomic_read(&channel->busy) == 0)
+                        break;
+        }
 
-        down(&channel->sem);
+        if (info->ops->request) {
+                int result = info->ops->request(channel);
+                if (result)
+                        return result;
 
-        if (!info->ops || chan >= MAX_DMA_CHANNELS) {
-                up(&channel->sem);
-                return -EINVAL;
+                atomic_set(&channel->busy, 1);
+                return channel->chan;
         }
 
-        atomic_set(&channel->busy, 1);
+        return -ENOSYS;
+}
+
+int request_dma(unsigned int chan, const char *dev_id)
+{
+        struct dma_channel *channel = { 0 };
+        struct dma_info *info = get_dma_info(chan);
+        int result;
+
+        channel = get_dma_channel(chan);
+        if (atomic_xchg(&channel->busy, 1))
+                return -EBUSY;
 
         strlcpy(channel->dev_id, dev_id, sizeof(channel->dev_id));
 
-        up(&channel->sem);
+        if (info->ops->request) {
+                result = info->ops->request(channel);
+                if (result)
+                        atomic_set(&channel->busy, 0);
 
-        if (info->ops->request)
-                return info->ops->request(channel);
+                return result;
+        }
 
         return 0;
 }
+EXPORT_SYMBOL(request_dma);
 
 void free_dma(unsigned int chan)
 {
         struct dma_info *info = get_dma_info(chan);
-        struct dma_channel *channel = &info->channels[chan];
+        struct dma_channel *channel = get_dma_channel(chan);
 
         if (info->ops->free)
                 info->ops->free(channel);
 
         atomic_set(&channel->busy, 0);
 }
+EXPORT_SYMBOL(free_dma);
 
 void dma_wait_for_completion(unsigned int chan)
 {
         struct dma_info *info = get_dma_info(chan);
-        struct dma_channel *channel = &info->channels[chan];
+        struct dma_channel *channel = get_dma_channel(chan);
 
         if (channel->flags & DMA_TEI_CAPABLE) {
                 wait_event(channel->wait_queue,
@@ -158,21 +238,52 @@ void dma_wait_for_completion(unsigned int chan)
         while (info->ops->get_residue(channel))
                 cpu_relax();
 }
+EXPORT_SYMBOL(dma_wait_for_completion);
+
+int register_chan_caps(const char *dmac, struct dma_chan_caps *caps)
+{
+        struct dma_info *info;
+        unsigned int found = 0;
+        int i;
+
+        list_for_each_entry(info, &registered_dmac_list, list)
+                if (strcmp(dmac, info->name) == 0) {
+                        found = 1;
+                        break;
+                }
+
+        if (unlikely(!found))
+                return -ENODEV;
+
+        for (i = 0; i < info->nr_channels; i++, caps++) {
+                struct dma_channel *channel;
+
+                if ((info->first_channel_nr + i) != caps->ch_num)
+                        return -EINVAL;
+
+                channel = &info->channels[i];
+                channel->caps = caps->caplist;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(register_chan_caps);
 
 void dma_configure_channel(unsigned int chan, unsigned long flags)
 {
         struct dma_info *info = get_dma_info(chan);
-        struct dma_channel *channel = &info->channels[chan];
+        struct dma_channel *channel = get_dma_channel(chan);
 
         if (info->ops->configure)
                 info->ops->configure(channel, flags);
 }
+EXPORT_SYMBOL(dma_configure_channel);
 
 int dma_xfer(unsigned int chan, unsigned long from,
              unsigned long to, size_t size, unsigned int mode)
 {
         struct dma_info *info = get_dma_info(chan);
-        struct dma_channel *channel = &info->channels[chan];
+        struct dma_channel *channel = get_dma_channel(chan);
 
         channel->sar    = from;
         channel->dar    = to;
@@ -181,8 +292,20 @@ int dma_xfer(unsigned int chan, unsigned long from,
 
         return info->ops->xfer(channel);
 }
+EXPORT_SYMBOL(dma_xfer);
+
+int dma_extend(unsigned int chan, unsigned long op, void *param)
+{
+        struct dma_info *info = get_dma_info(chan);
+        struct dma_channel *channel = get_dma_channel(chan);
+
+        if (info->ops->extend)
+                return info->ops->extend(channel, op, param);
+
+        return -ENOSYS;
+}
+EXPORT_SYMBOL(dma_extend);
 
-#ifdef CONFIG_PROC_FS
 static int dma_read_proc(char *buf, char **start, off_t off,
                          int len, int *eof, void *data)
 {
@@ -214,8 +337,6 @@ static int dma_read_proc(char *buf, char **start, off_t off,
 
         return p - buf;
 }
-#endif
-
 
 int register_dmac(struct dma_info *info)
 {
@@ -224,8 +345,7 @@ int register_dmac(struct dma_info *info)
         INIT_LIST_HEAD(&info->list);
 
         printk(KERN_INFO "DMA: Registering %s handler (%d channel%s).\n",
-               info->name, info->nr_channels,
-               info->nr_channels > 1 ? "s" : "");
+               info->name, info->nr_channels, info->nr_channels > 1 ? "s" : "");
 
         BUG_ON((info->flags & DMAC_CHANNELS_CONFIGURED) && !info->channels);
 
@@ -242,28 +362,26 @@ int register_dmac(struct dma_info *info)
 
                 size = sizeof(struct dma_channel) * info->nr_channels;
 
-                info->channels = kmalloc(size, GFP_KERNEL);
+                info->channels = kzalloc(size, GFP_KERNEL);
                 if (!info->channels)
                         return -ENOMEM;
-
-                memset(info->channels, 0, size);
         }
 
         total_channels = get_nr_channels();
         for (i = 0; i < info->nr_channels; i++) {
-                struct dma_channel *chan = info->channels + i;
+                struct dma_channel *chan = &info->channels[i];
+
+                atomic_set(&chan->busy, 0);
 
-                chan->chan = i;
-                chan->vchan = i + total_channels;
+                chan->chan  = info->first_channel_nr + i;
+                chan->vchan = info->first_channel_nr + i + total_channels;
 
                 memcpy(chan->dev_id, "Unused", 7);
 
                 if (info->flags & DMAC_CHANNELS_TEI_CAPABLE)
                         chan->flags |= DMA_TEI_CAPABLE;
 
-                init_MUTEX(&chan->sem);
                 init_waitqueue_head(&chan->wait_queue);
-
                 dma_create_sysfs_files(chan, info);
         }
 
@@ -271,6 +389,7 @@ int register_dmac(struct dma_info *info)
 
         return 0;
 }
+EXPORT_SYMBOL(register_dmac);
 
 void unregister_dmac(struct dma_info *info)
 {
@@ -285,31 +404,16 @@ void unregister_dmac(struct dma_info *info)
         list_del(&info->list);
         platform_device_unregister(info->pdev);
 }
+EXPORT_SYMBOL(unregister_dmac);
 
 static int __init dma_api_init(void)
 {
-        printk("DMA: Registering DMA API.\n");
-
-#ifdef CONFIG_PROC_FS
+        printk(KERN_NOTICE "DMA: Registering DMA API.\n");
         create_proc_read_entry("dma", 0, 0, dma_read_proc, 0);
-#endif
-
         return 0;
 }
-
 subsys_initcall(dma_api_init);
 
 MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>");
 MODULE_DESCRIPTION("DMA API for SuperH");
 MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL(request_dma);
-EXPORT_SYMBOL(free_dma);
-EXPORT_SYMBOL(register_dmac);
-EXPORT_SYMBOL(get_dma_residue);
-EXPORT_SYMBOL(get_dma_info);
-EXPORT_SYMBOL(get_dma_channel);
-EXPORT_SYMBOL(dma_xfer);
-EXPORT_SYMBOL(dma_wait_for_completion);
-EXPORT_SYMBOL(dma_configure_channel);
-
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c
index 660786013350..f63721ed86c2 100644
--- a/arch/sh/drivers/dma/dma-sh.c
+++ b/arch/sh/drivers/dma/dma-sh.c
@@ -94,20 +94,13 @@ static int sh_dmac_request_dma(struct dma_channel *chan)
         if (unlikely(!chan->flags & DMA_TEI_CAPABLE))
                 return 0;
 
-        chan->name = kzalloc(32, GFP_KERNEL);
-        if (unlikely(chan->name == NULL))
-                return -ENOMEM;
-        snprintf(chan->name, 32, "DMAC Transfer End (Channel %d)",
-                 chan->chan);
-
         return request_irq(get_dmte_irq(chan->chan), dma_tei,
-                           IRQF_DISABLED, chan->name, chan);
+                           IRQF_DISABLED, chan->dev_id, chan);
 }
 
 static void sh_dmac_free_dma(struct dma_channel *chan)
 {
         free_irq(get_dmte_irq(chan->chan), chan);
-        kfree(chan->name);
 }
 
 static void
diff --git a/arch/sh/drivers/dma/dma-sysfs.c b/arch/sh/drivers/dma/dma-sysfs.c
index 29b8ef9873d1..eebcd4768bbf 100644
--- a/arch/sh/drivers/dma/dma-sysfs.c
+++ b/arch/sh/drivers/dma/dma-sysfs.c
@@ -3,7 +3,7 @@
  *
  * sysfs interface for SH DMA API
  *
- * Copyright (C) 2004, 2005  Paul Mundt
+ * Copyright (C) 2004 - 2006  Paul Mundt
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -21,7 +21,6 @@
 static struct sysdev_class dma_sysclass = {
         set_kset_name("dma"),
 };
-
 EXPORT_SYMBOL(dma_sysclass);
 
 static ssize_t dma_show_devices(struct sys_device *dev, char *buf)
@@ -31,7 +30,10 @@ static ssize_t dma_show_devices(struct sys_device *dev, char *buf)
 
         for (i = 0; i < MAX_DMA_CHANNELS; i++) {
                 struct dma_info *info = get_dma_info(i);
-                struct dma_channel *channel = &info->channels[i];
+                struct dma_channel *channel = get_dma_channel(i);
+
+                if (unlikely(!info) || !channel)
+                        continue;
 
                 len += sprintf(buf + len, "%2d: %14s    %s\n",
                                channel->chan, info->name,
@@ -125,11 +127,16 @@ int dma_create_sysfs_files(struct dma_channel *chan, struct dma_info *info)
         if (ret)
                 return ret;
 
-        sysdev_create_file(dev, &attr_dev_id);
-        sysdev_create_file(dev, &attr_count);
-        sysdev_create_file(dev, &attr_mode);
-        sysdev_create_file(dev, &attr_flags);
-        sysdev_create_file(dev, &attr_config);
+        ret |= sysdev_create_file(dev, &attr_dev_id);
+        ret |= sysdev_create_file(dev, &attr_count);
+        ret |= sysdev_create_file(dev, &attr_mode);
+        ret |= sysdev_create_file(dev, &attr_flags);
+        ret |= sysdev_create_file(dev, &attr_config);
+
+        if (unlikely(ret)) {
+                dev_err(&info->pdev->dev, "Failed creating attrs\n");
+                return ret;
+        }
 
         snprintf(name, sizeof(name), "dma%d", chan->chan);
         return sysfs_create_link(&info->pdev->dev.kobj, &dev->kobj, name);
diff --git a/arch/sh/drivers/pci/ops-titan.c b/arch/sh/drivers/pci/ops-titan.c
index cd56d53375e7..ac8ee2312cd8 100644
--- a/arch/sh/drivers/pci/ops-titan.c
+++ b/arch/sh/drivers/pci/ops-titan.c
@@ -15,25 +15,21 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/pci.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/titan.h>
 #include "pci-sh4.h"
 
+static char titan_irq_tab[] __initdata = {
+        TITAN_IRQ_WAN,
+        TITAN_IRQ_LAN,
+        TITAN_IRQ_MPCIA,
+        TITAN_IRQ_MPCIB,
+        TITAN_IRQ_USB,
+};
+
 int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
 {
-        int irq = -1;
-
-        switch (slot) {
-        case 0: irq = TITAN_IRQ_WAN;   break;   /* eth0 (WAN) */
-        case 1: irq = TITAN_IRQ_LAN;   break;   /* eth1 (LAN) */
-        case 2: irq = TITAN_IRQ_MPCIA; break;   /* mPCI A */
-        case 3: irq = TITAN_IRQ_MPCIB; break;   /* mPCI B */
-        case 4: irq = TITAN_IRQ_USB;   break;   /* USB */
-        default:
-                printk(KERN_INFO "PCI: Bad IRQ mapping "
-                                 "request for slot %d\n", slot);
-                return -1;
-        }
+        int irq = titan_irq_tab[slot];
 
         printk("PCI: Mapping TITAN IRQ for slot %d, pin %c to irq %d\n",
                 slot, pin - 1 + 'A', irq);
diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c
index d6e635296534..602b644c35ad 100644
--- a/arch/sh/drivers/pci/pci-sh7780.c
+++ b/arch/sh/drivers/pci/pci-sh7780.c
@@ -22,6 +22,20 @@
 #include <linux/delay.h>
 #include "pci-sh4.h"
 
+#define INTC_BASE       0xffd00000
+#define INTC_ICR0       (INTC_BASE+0x0)
+#define INTC_ICR1       (INTC_BASE+0x1c)
+#define INTC_INTPRI     (INTC_BASE+0x10)
+#define INTC_INTREQ     (INTC_BASE+0x24)
+#define INTC_INTMSK0    (INTC_BASE+0x44)
+#define INTC_INTMSK1    (INTC_BASE+0x48)
+#define INTC_INTMSK2    (INTC_BASE+0x40080)
+#define INTC_INTMSKCLR0 (INTC_BASE+0x64)
+#define INTC_INTMSKCLR1 (INTC_BASE+0x68)
+#define INTC_INTMSKCLR2 (INTC_BASE+0x40084)
+#define INTC_INT2MSKR   (INTC_BASE+0x40038)
+#define INTC_INT2MSKCR  (INTC_BASE+0x4003c)
+
 /*
  * Initialization. Try all known PCI access methods. Note that we support
  * using both PCI BIOS and direct access: in such cases, we use I/O ports
diff --git a/arch/sh/drivers/push-switch.c b/arch/sh/drivers/push-switch.c
new file mode 100644
index 000000000000..b3d20c0e021f
--- /dev/null
+++ b/arch/sh/drivers/push-switch.c
@@ -0,0 +1,141 @@
+/*
+ * Generic push-switch framework
+ *
+ * Copyright (C) 2006  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <asm/push-switch.h>
+
+#define DRV_NAME "push-switch"
+#define DRV_VERSION "0.1.1"
+
+static ssize_t switch_show(struct device *dev,
+                           struct device_attribute *attr,
+                           char *buf)
+{
+        struct push_switch_platform_info *psw_info = dev->platform_data;
+        return sprintf(buf, "%s\n", psw_info->name);
+}
+static DEVICE_ATTR(switch, S_IRUGO, switch_show, NULL);
+
+static void switch_timer(unsigned long data)
+{
+        struct push_switch *psw = (struct push_switch *)data;
+
+        schedule_work(&psw->work);
+}
+
+static void switch_work_handler(struct work_struct *work)
+{
+        struct push_switch *psw = container_of(work, struct push_switch, work);
+        struct platform_device *pdev = psw->pdev;
+
+        psw->state = 0;
+
+        kobject_uevent(&pdev->dev.kobj, KOBJ_CHANGE);
+}
+
+static int switch_drv_probe(struct platform_device *pdev)
+{
+        struct push_switch_platform_info *psw_info;
+        struct push_switch *psw;
+        int ret, irq;
+
+        psw = kzalloc(sizeof(struct push_switch), GFP_KERNEL);
+        if (unlikely(!psw))
+                return -ENOMEM;
+
+        irq = platform_get_irq(pdev, 0);
+        if (unlikely(irq < 0)) {
+                ret = -ENODEV;
+                goto err;
+        }
+
+        psw_info = pdev->dev.platform_data;
+        BUG_ON(!psw_info);
+
+        ret = request_irq(irq, psw_info->irq_handler,
+                          IRQF_DISABLED | psw_info->irq_flags,
+                          psw_info->name ? psw_info->name : DRV_NAME, pdev);
+        if (unlikely(ret < 0))
+                goto err;
+
+        if (psw_info->name) {
+                ret = device_create_file(&pdev->dev, &dev_attr_switch);
+                if (unlikely(ret)) {
+                        dev_err(&pdev->dev, "Failed creating device attrs\n");
+                        ret = -EINVAL;
+                        goto err_irq;
+                }
+        }
+
+        INIT_WORK(&psw->work, switch_work_handler);
+        init_timer(&psw->debounce);
+
+        psw->debounce.function = switch_timer;
+        psw->debounce.data = (unsigned long)psw;
+
+        /* Workqueue API brain-damage */
+        psw->pdev = pdev;
+
+        platform_set_drvdata(pdev, psw);
+
+        return 0;
+
+err_irq:
+        free_irq(irq, pdev);
+err:
+        kfree(psw);
+        return ret;
+}
+
+static int switch_drv_remove(struct platform_device *pdev)
+{
+        struct push_switch *psw = platform_get_drvdata(pdev);
+        struct push_switch_platform_info *psw_info = pdev->dev.platform_data;
+        int irq = platform_get_irq(pdev, 0);
+
+        if (psw_info->name)
+                device_remove_file(&pdev->dev, &dev_attr_switch);
+
+        platform_set_drvdata(pdev, NULL);
+        flush_scheduled_work();
+        del_timer_sync(&psw->debounce);
+        free_irq(irq, pdev);
+
+        kfree(psw);
+
+        return 0;
+}
+
+static struct platform_driver switch_driver = {
+        .probe          = switch_drv_probe,
+        .remove         = switch_drv_remove,
+        .driver         = {
+                .name   = DRV_NAME,
+        },
+};
+
+static int __init switch_init(void)
+{
+        printk(KERN_NOTICE DRV_NAME ": version %s loaded\n", DRV_VERSION);
+        return platform_driver_register(&switch_driver);
+}
+
+static void __exit switch_exit(void)
+{
+        platform_driver_unregister(&switch_driver);
+}
+module_init(switch_init);
+module_exit(switch_exit);
+
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Paul Mundt");
+MODULE_LICENSE("GPLv2");
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile
index 5da88a43d350..99c7e5249f7a 100644
--- a/arch/sh/kernel/Makefile
+++ b/arch/sh/kernel/Makefile
@@ -4,7 +4,7 @@
 
 extra-y := head.o init_task.o vmlinux.lds
 
-obj-y   := process.o signal.o entry.o traps.o irq.o \
+obj-y   := process.o signal.o traps.o irq.o \
         ptrace.o setup.o time.o sys_sh.o semaphore.o \
         io.o io_generic.o sh_ksyms.o syscalls.o
 
@@ -21,3 +21,4 @@ obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o
 obj-$(CONFIG_APM)               += apm.o
 obj-$(CONFIG_PM)                += pm.o
+obj-$(CONFIG_STACKTRACE)        += stacktrace.o
diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile
index fb5dac069382..d055a3ea6b4b 100644
--- a/arch/sh/kernel/cpu/Makefile
+++ b/arch/sh/kernel/cpu/Makefile
@@ -2,11 +2,13 @@
 # Makefile for the Linux/SuperH CPU-specifc backends.
 #
 
-obj-y   += irq/ init.o clock.o
-
-obj-$(CONFIG_CPU_SH2)           += sh2/
-obj-$(CONFIG_CPU_SH3)           += sh3/
-obj-$(CONFIG_CPU_SH4)           += sh4/
+obj-$(CONFIG_CPU_SH2)           = sh2/
+obj-$(CONFIG_CPU_SH2A)          = sh2a/
+obj-$(CONFIG_CPU_SH3)           = sh3/
+obj-$(CONFIG_CPU_SH4)           = sh4/
+obj-$(CONFIG_CPU_SH4A)          += sh4a/
 
 obj-$(CONFIG_UBC_WAKEUP)        += ubc.o
 obj-$(CONFIG_SH_ADC)            += adc.o
+
+obj-y   += irq/ init.o clock.o
diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c
index 51ec64cdf348..abb586b12565 100644
--- a/arch/sh/kernel/cpu/clock.c
+++ b/arch/sh/kernel/cpu/clock.c
@@ -5,9 +5,11 @@
  *
  * This clock framework is derived from the OMAP version by:
  *
- *      Copyright (C) 2004 Nokia Corporation
+ *      Copyright (C) 2004 - 2005 Nokia Corporation
  *      Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>
  *
+ *  Modified for omap shared clock framework by Tony Lindgren <tony@atomide.com>
+ *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
@@ -20,6 +22,7 @@
 #include <linux/kref.h>
 #include <linux/seq_file.h>
 #include <linux/err.h>
+#include <linux/platform_device.h>
 #include <asm/clock.h>
 #include <asm/timer.h>
 
@@ -195,17 +198,37 @@ void clk_recalc_rate(struct clk *clk)
                 propagate_rate(clk);
 }
 
-struct clk *clk_get(const char *id)
+/*
+ * Returns a clock. Note that we first try to use device id on the bus
+ * and clock name. If this fails, we try to use clock name only.
+ */
+struct clk *clk_get(struct device *dev, const char *id)
 {
         struct clk *p, *clk = ERR_PTR(-ENOENT);
+        int idno;
+
+        if (dev == NULL || dev->bus != &platform_bus_type)
+                idno = -1;
+        else
+                idno = to_platform_device(dev)->id;
 
         mutex_lock(&clock_list_sem);
         list_for_each_entry(p, &clock_list, node) {
+                if (p->id == idno &&
+                    strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
+                        clk = p;
+                        goto found;
+                }
+        }
+
+        list_for_each_entry(p, &clock_list, node) {
                 if (strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
                         clk = p;
                         break;
                 }
         }
+
+found:
         mutex_unlock(&clock_list_sem);
 
         return clk;
diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c
index bfb90eb0b7a6..48121766e8d2 100644
--- a/arch/sh/kernel/cpu/init.c
+++ b/arch/sh/kernel/cpu/init.c
@@ -68,12 +68,14 @@ static void __init cache_init(void)
 
                 waysize = cpu_data->dcache.sets;
 
+#ifdef CCR_CACHE_ORA
                 /*
                  * If the OC is already in RAM mode, we only have
                  * half of the entries to flush..
                  */
                 if (ccr & CCR_CACHE_ORA)
                         waysize >>= 1;
+#endif
 
                 waysize <<= cpu_data->dcache.entry_shift;
 
diff --git a/arch/sh/kernel/cpu/irq/Makefile b/arch/sh/kernel/cpu/irq/Makefile
index 1c034c283f59..0049d217561a 100644
--- a/arch/sh/kernel/cpu/irq/Makefile
+++ b/arch/sh/kernel/cpu/irq/Makefile
@@ -1,8 +1,9 @@
 #
 # Makefile for the Linux/SuperH CPU-specifc IRQ handlers.
 #
-obj-y   += ipr.o imask.o
+obj-y   += imask.o
 
+obj-$(CONFIG_CPU_HAS_IPR_IRQ)           += ipr.o
 obj-$(CONFIG_CPU_HAS_PINT_IRQ)          += pint.o
 obj-$(CONFIG_CPU_HAS_MASKREG_IRQ)       += maskreg.o
 obj-$(CONFIG_CPU_HAS_INTC2_IRQ)         += intc2.o
diff --git a/arch/sh/kernel/cpu/irq/imask.c b/arch/sh/kernel/cpu/irq/imask.c
index a33ae3e0a5a5..301b505c4278 100644
--- a/arch/sh/kernel/cpu/irq/imask.c
+++ b/arch/sh/kernel/cpu/irq/imask.c
@@ -53,7 +53,10 @@ void static inline set_interrupt_registers(int ip)
 {
         unsigned long __dummy;
 
-        asm volatile("ldc       %2, r6_bank\n\t"
+        asm volatile(
+#ifdef CONFIG_CPU_HAS_SR_RB
+                     "ldc       %2, r6_bank\n\t"
+#endif
                      "stc       sr, %0\n\t"
                      "and       #0xf0, %0\n\t"
                      "shlr2     %0\n\t"
diff --git a/arch/sh/kernel/cpu/irq/intc2.c b/arch/sh/kernel/cpu/irq/intc2.c
index 74ca576a7ce5..74defe76a058 100644
--- a/arch/sh/kernel/cpu/irq/intc2.c
+++ b/arch/sh/kernel/cpu/irq/intc2.c
@@ -11,22 +11,29 @@
  * Hitachi 7751, the STM ST40 STB1, SH7760, and SH7780.
  */
 #include <linux/kernel.h>
-#include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <linux/io.h>
-#include <asm/system.h>
+
+#if defined(CONFIG_CPU_SUBTYPE_SH7760)
+#define INTC2_BASE      0xfe080000
+#define INTC2_INTMSK    (INTC2_BASE + 0x40)
+#define INTC2_INTMSKCLR (INTC2_BASE + 0x60)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7780)
+#define INTC2_BASE      0xffd40000
+#define INTC2_INTMSK    (INTC2_BASE + 0x38)
+#define INTC2_INTMSKCLR (INTC2_BASE + 0x3c)
+#endif
 
 static void disable_intc2_irq(unsigned int irq)
 {
         struct intc2_data *p = get_irq_chip_data(irq);
-        ctrl_outl(1 << p->msk_shift,
-                  INTC2_BASE + INTC2_INTMSK_OFFSET + p->msk_offset);
+        ctrl_outl(1 << p->msk_shift, INTC2_INTMSK + p->msk_offset);
 }
 
 static void enable_intc2_irq(unsigned int irq)
 {
         struct intc2_data *p = get_irq_chip_data(irq);
-        ctrl_outl(1 << p->msk_shift,
-                  INTC2_BASE + INTC2_INTMSKCLR_OFFSET + p->msk_offset);
+        ctrl_outl(1 << p->msk_shift, INTC2_INTMSKCLR + p->msk_offset);
 }
 
 static struct irq_chip intc2_irq_chip = {
@@ -61,12 +68,10 @@ void make_intc2_irq(struct intc2_data *table, unsigned int nr_irqs)
                 /* Set the priority level */
                 local_irq_save(flags);
 
-                ipr = ctrl_inl(INTC2_BASE + INTC2_INTPRI_OFFSET +
-                               p->ipr_offset);
+                ipr = ctrl_inl(INTC2_BASE + p->ipr_offset);
                 ipr &= ~(0xf << p->ipr_shift);
                 ipr |= p->priority << p->ipr_shift;
-                ctrl_outl(ipr, INTC2_BASE + INTC2_INTPRI_OFFSET +
-                          p->ipr_offset);
+                ctrl_outl(ipr, INTC2_BASE + p->ipr_offset);
 
                 local_irq_restore(flags);
 
diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c
index a0089563cbfc..35eb5751a3aa 100644
--- a/arch/sh/kernel/cpu/irq/ipr.c
+++ b/arch/sh/kernel/cpu/irq/ipr.c
@@ -19,25 +19,21 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/module.h>
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/machvec.h>
-
+#include <linux/io.h>
+#include <linux/interrupt.h>
 
 static void disable_ipr_irq(unsigned int irq)
 {
         struct ipr_data *p = get_irq_chip_data(irq);
-        int shift = p->shift*4;
         /* Set the priority in IPR to 0 */
-        ctrl_outw(ctrl_inw(p->addr) & (0xffff ^ (0xf << shift)), p->addr);
+        ctrl_outw(ctrl_inw(p->addr) & (0xffff ^ (0xf << p->shift)), p->addr);
 }
 
 static void enable_ipr_irq(unsigned int irq)
 {
         struct ipr_data *p = get_irq_chip_data(irq);
-        int shift = p->shift*4;
         /* Set priority in IPR back to original value */
-        ctrl_outw(ctrl_inw(p->addr) | (p->priority << shift), p->addr);
+        ctrl_outw(ctrl_inw(p->addr) | (p->priority << p->shift), p->addr);
 }
 
 static struct irq_chip ipr_irq_chip = {
@@ -53,6 +49,10 @@ void make_ipr_irq(struct ipr_data *table, unsigned int nr_irqs)
 
         for (i = 0; i < nr_irqs; i++) {
                 unsigned int irq = table[i].irq;
+                table[i].addr = map_ipridx_to_addr(table[i].ipr_idx);
+                /* could the IPR index be mapped, if not we ignore this */
+                if (table[i].addr == 0)
+                        continue;
                 disable_irq_nosync(irq);
                 set_irq_chip_and_handler_name(irq, &ipr_irq_chip,
                                       handle_level_irq, "level");
@@ -62,83 +62,6 @@ void make_ipr_irq(struct ipr_data *table, unsigned int nr_irqs)
 }
 EXPORT_SYMBOL(make_ipr_irq);
 
-static struct ipr_data sys_ipr_map[] = {
-#ifndef CONFIG_CPU_SUBTYPE_SH7780
-        { TIMER_IRQ, TIMER_IPR_ADDR, TIMER_IPR_POS, TIMER_PRIORITY },
-        { TIMER1_IRQ, TIMER1_IPR_ADDR, TIMER1_IPR_POS, TIMER1_PRIORITY },
-#ifdef RTC_IRQ
-        { RTC_IRQ, RTC_IPR_ADDR, RTC_IPR_POS, RTC_PRIORITY },
-#endif
-#ifdef SCI_ERI_IRQ
-        { SCI_ERI_IRQ, SCI_IPR_ADDR, SCI_IPR_POS, SCI_PRIORITY },
-        { SCI_RXI_IRQ, SCI_IPR_ADDR, SCI_IPR_POS, SCI_PRIORITY },
-        { SCI_TXI_IRQ, SCI_IPR_ADDR, SCI_IPR_POS, SCI_PRIORITY },
-#endif
-#ifdef SCIF1_ERI_IRQ
-        { SCIF1_ERI_IRQ, SCIF1_IPR_ADDR, SCIF1_IPR_POS, SCIF1_PRIORITY },
-        { SCIF1_RXI_IRQ, SCIF1_IPR_ADDR, SCIF1_IPR_POS, SCIF1_PRIORITY },
-        { SCIF1_BRI_IRQ, SCIF1_IPR_ADDR, SCIF1_IPR_POS, SCIF1_PRIORITY },
-        { SCIF1_TXI_IRQ, SCIF1_IPR_ADDR, SCIF1_IPR_POS, SCIF1_PRIORITY },
-#endif
-#if defined(CONFIG_CPU_SUBTYPE_SH7300)
-        { SCIF0_IRQ, SCIF0_IPR_ADDR, SCIF0_IPR_POS, SCIF0_PRIORITY },
-        { DMTE2_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY },
-        { DMTE3_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY },
-        { VIO_IRQ, VIO_IPR_ADDR, VIO_IPR_POS, VIO_PRIORITY },
-#endif
-#ifdef SCIF_ERI_IRQ
-        { SCIF_ERI_IRQ, SCIF_IPR_ADDR, SCIF_IPR_POS, SCIF_PRIORITY },
-        { SCIF_RXI_IRQ, SCIF_IPR_ADDR, SCIF_IPR_POS, SCIF_PRIORITY },
-        { SCIF_BRI_IRQ, SCIF_IPR_ADDR, SCIF_IPR_POS, SCIF_PRIORITY },
-        { SCIF_TXI_IRQ, SCIF_IPR_ADDR, SCIF_IPR_POS, SCIF_PRIORITY },
-#endif
-#ifdef IRDA_ERI_IRQ
-        { IRDA_ERI_IRQ, IRDA_IPR_ADDR, IRDA_IPR_POS, IRDA_PRIORITY },
-        { IRDA_RXI_IRQ, IRDA_IPR_ADDR, IRDA_IPR_POS, IRDA_PRIORITY },
-        { IRDA_BRI_IRQ, IRDA_IPR_ADDR, IRDA_IPR_POS, IRDA_PRIORITY },
-        { IRDA_TXI_IRQ, IRDA_IPR_ADDR, IRDA_IPR_POS, IRDA_PRIORITY },
-#endif
-#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7706) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)
-        /*
-         * Initialize the Interrupt Controller (INTC)
-         * registers to their power on values
-         */
-
-        /*
-         * Enable external irq (INTC IRQ mode).
-         * You should set corresponding bits of PFC to "00"
-         * to enable these interrupts.
-         */
-        { IRQ0_IRQ, IRQ0_IPR_ADDR, IRQ0_IPR_POS, IRQ0_PRIORITY },
-        { IRQ1_IRQ, IRQ1_IPR_ADDR, IRQ1_IPR_POS, IRQ1_PRIORITY },
-        { IRQ2_IRQ, IRQ2_IPR_ADDR, IRQ2_IPR_POS, IRQ2_PRIORITY },
-        { IRQ3_IRQ, IRQ3_IPR_ADDR, IRQ3_IPR_POS, IRQ3_PRIORITY },
-        { IRQ4_IRQ, IRQ4_IPR_ADDR, IRQ4_IPR_POS, IRQ4_PRIORITY },
-        { IRQ5_IRQ, IRQ5_IPR_ADDR, IRQ5_IPR_POS, IRQ5_PRIORITY },
-#endif
-#endif
-};
-
-void __init init_IRQ(void)
-{
-        make_ipr_irq(sys_ipr_map, ARRAY_SIZE(sys_ipr_map));
-
-#ifdef CONFIG_CPU_HAS_PINT_IRQ
-        init_IRQ_pint();
-#endif
-
-#ifdef CONFIG_CPU_HAS_INTC2_IRQ
-        init_IRQ_intc2();
-#endif
-        /* Perform the machine specific initialisation */
-        if (sh_mv.mv_init_irq != NULL)
-                sh_mv.mv_init_irq();
-
-        irq_ctx_init(smp_processor_id());
-}
-
 #if !defined(CONFIG_CPU_HAS_PINT_IRQ)
 int ipr_irq_demux(int irq)
 {
diff --git a/arch/sh/kernel/cpu/sh2/Makefile b/arch/sh/kernel/cpu/sh2/Makefile
index 389353fba608..f0f059acfcfb 100644
--- a/arch/sh/kernel/cpu/sh2/Makefile
+++ b/arch/sh/kernel/cpu/sh2/Makefile
@@ -2,5 +2,6 @@
 # Makefile for the Linux/SuperH SH-2 backends.
 #
 
-obj-y   := probe.o
+obj-y   := ex.o probe.o entry.o
 
+obj-$(CONFIG_CPU_SUBTYPE_SH7619) += setup-sh7619.o clock-sh7619.o
diff --git a/arch/sh/kernel/cpu/sh2/clock-sh7619.c b/arch/sh/kernel/cpu/sh2/clock-sh7619.c
new file mode 100644
index 000000000000..d0440b269702
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh2/clock-sh7619.c
@@ -0,0 +1,81 @@
+/*
+ * arch/sh/kernel/cpu/sh2/clock-sh7619.c
+ *
+ * SH7619 support for the clock framework
+ *
+ *  Copyright (C) 2006  Yoshinori Sato
+ *
+ * Based on clock-sh4.c
+ *  Copyright (C) 2005  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <asm/clock.h>
+#include <asm/freq.h>
+#include <asm/io.h>
+
+const static int pll1rate[]={1,2};
+const static int pfc_divisors[]={1,2,0,4};
+
+#if (CONFIG_SH_CLK_MD == 1) || (CONFIG_SH_CLK_MD == 2)
+#define PLL2 (4)
+#elif (CONFIG_SH_CLK_MD == 5) || (CONFIG_SH_CLK_MD == 6)
+#define PLL2 (2)
+#else
+#error "Illigal Clock Mode!"
+#endif
+
+static void master_clk_init(struct clk *clk)
+{
+        clk->rate *= PLL2 * pll1rate[(ctrl_inw(FREQCR) >> 8) & 7];
+}
+
+static struct clk_ops sh7619_master_clk_ops = {
+        .init           = master_clk_init,
+};
+
+static void module_clk_recalc(struct clk *clk)
+{
+        int idx = (ctrl_inw(FREQCR) & 0x0007);
+        clk->rate = clk->parent->rate / pfc_divisors[idx];
+}
+
+static struct clk_ops sh7619_module_clk_ops = {
+        .recalc         = module_clk_recalc,
+};
+
+static void bus_clk_recalc(struct clk *clk)
+{
+        clk->rate = clk->parent->rate / pll1rate[(ctrl_inw(FREQCR) >> 8) & 7];
+}
+
+static struct clk_ops sh7619_bus_clk_ops = {
+        .recalc         = bus_clk_recalc,
+};
+
+static void cpu_clk_recalc(struct clk *clk)
+{
+        clk->rate = clk->parent->rate;
+}
+
+static struct clk_ops sh7619_cpu_clk_ops = {
+        .recalc         = cpu_clk_recalc,
+};
+
+static struct clk_ops *sh7619_clk_ops[] = {
+        &sh7619_master_clk_ops,
+        &sh7619_module_clk_ops,
+        &sh7619_bus_clk_ops,
+        &sh7619_cpu_clk_ops,
+};
+
+void __init arch_init_clk_ops(struct clk_ops **ops, int idx)
+{
+        if (idx < ARRAY_SIZE(sh7619_clk_ops))
+                *ops = sh7619_clk_ops[idx];
+}
+
diff --git a/arch/sh/kernel/cpu/sh2/entry.S b/arch/sh/kernel/cpu/sh2/entry.S
new file mode 100644
index 000000000000..d51fa5e9904a
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh2/entry.S
@@ -0,0 +1,337 @@
+/*
+ * arch/sh/kernel/cpu/sh2/entry.S
+ *
+ * The SH-2 exception entry
+ *
+ * Copyright (C) 2005,2006 Yoshinori Sato
+ * Copyright (C) 2005  AXE,Inc.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/linkage.h>
+#include <asm/asm-offsets.h>
+#include <asm/thread_info.h>
+#include <asm/cpu/mmu_context.h>
+#include <asm/unistd.h>
+#include <asm/errno.h>
+#include <asm/page.h>
+        
+/* Offsets to the stack */
+OFF_R0  =  0            /* Return value. New ABI also arg4 */
+OFF_R1  =  4            /* New ABI: arg5 */
+OFF_R2  =  8            /* New ABI: arg6 */
+OFF_R3  =  12           /* New ABI: syscall_nr */
+OFF_R4  =  16           /* New ABI: arg0 */
+OFF_R5  =  20           /* New ABI: arg1 */
+OFF_R6  =  24           /* New ABI: arg2 */
+OFF_R7  =  28           /* New ABI: arg3 */
+OFF_SP  =  (15*4)
+OFF_PC  =  (16*4)
+OFF_SR  =  (16*4+2*4)
+OFF_TRA =  (16*4+6*4)
+
+#include <asm/entry-macros.S>
+
+ENTRY(exception_handler)
+        ! already saved r0/r1
+        mov.l   r2,@-sp
+        mov.l   r3,@-sp
+        mov     r0,r1
+        cli
+        mov.l   $cpu_mode,r2
+        mov.l   @r2,r0
+        mov.l   @(5*4,r15),r3   ! previous SR
+        shll2   r3              ! set "S" flag
+        rotl    r0              ! T <- "S" flag
+        rotl    r0              ! "S" flag is LSB
+        rotcr   r3              ! T -> r3:b30
+        shlr    r3
+        shlr    r0
+        bt/s    1f
+         mov.l  r3,@(5*4,r15)   ! copy cpu mode to SR
+        ! switch to kernel mode
+        mov     #1,r0
+        rotr    r0
+        rotr    r0
+        mov.l   r0,@r2          ! enter kernel mode
+        mov.l   $current_thread_info,r2
+        mov.l   @r2,r2
+        mov     #0x20,r0
+        shll8   r0
+        add     r2,r0
+        mov     r15,r2          ! r2 = user stack top
+        mov     r0,r15          ! switch kernel stack
+        add     #-4,r15         ! dummy
+        mov.l   r1,@-r15        ! TRA
+        sts.l   macl, @-r15
+        sts.l   mach, @-r15
+        stc.l   gbr, @-r15
+        mov.l   @(4*4,r2),r0
+        mov.l   @(5*4,r2),r1
+        mov.l   r1,@-r15        ! original SR
+        sts.l   pr,@-r15
+        mov.l   r0,@-r15        ! original PC
+        mov     r2,r3
+        add     #(4+2)*4,r3     ! rewind r0 - r3 + exception frame
+        mov.l   r3,@-r15        ! original SP
+        mov.l   r14,@-r15
+        mov.l   r13,@-r15
+        mov.l   r12,@-r15
+        mov.l   r11,@-r15
+        mov.l   r10,@-r15
+        mov.l   r9,@-r15
+        mov.l   r8,@-r15
+        mov.l   r7,@-r15
+        mov.l   r6,@-r15
+        mov.l   r5,@-r15
+        mov.l   r4,@-r15
+        mov     r2,r8           ! copy user -> kernel stack
+        mov.l   @r8+,r3
+        mov.l   r3,@-r15
+        mov.l   @r8+,r2
+        mov.l   r2,@-r15
+        mov.l   @r8+,r1
+        mov.l   r1,@-r15
+        mov.l   @r8+,r0
+        bra     2f
+         mov.l  r0,@-r15
+1:
+        ! in kernel exception
+        mov     #(22-4-4-1)*4+4,r0
+        mov     r15,r2
+        sub     r0,r15
+        mov.l   @r2+,r0         ! old R3
+        mov.l   r0,@-r15        
+        mov.l   @r2+,r0         ! old R2
+        mov.l   r0,@-r15        
+        mov.l   @r2+,r0         ! old R1
+        mov.l   r0,@-r15        
+        mov.l   @r2+,r0         ! old R0
+        mov.l   r0,@-r15        
+        mov.l   @r2+,r3         ! old PC
+        mov.l   @r2+,r0         ! old SR
+        add     #-4,r2          ! exception frame stub (sr)
+        mov.l   r1,@-r2         ! TRA
+        sts.l   macl, @-r2
+        sts.l   mach, @-r2
+        stc.l   gbr, @-r2
+        mov.l   r0,@-r2         ! save old SR
+        sts.l   pr,@-r2
+        mov.l   r3,@-r2         ! save old PC
+        mov     r2,r0
+        add     #8*4,r0
+        mov.l   r0,@-r2         ! save old SP
+        mov.l   r14,@-r2
+        mov.l   r13,@-r2
+        mov.l   r12,@-r2
+        mov.l   r11,@-r2
+        mov.l   r10,@-r2
+        mov.l   r9,@-r2
+        mov.l   r8,@-r2
+        mov.l   r7,@-r2
+        mov.l   r6,@-r2
+        mov.l   r5,@-r2
+        mov.l   r4,@-r2
+        mov.l   @(OFF_R0,r15),r0
+        mov.l   @(OFF_R1,r15),r1
+        mov.l   @(OFF_R2,r15),r2
+        mov.l   @(OFF_R3,r15),r3
+2:
+        mov     #OFF_TRA,r8
+        add     r15,r8
+        mov.l   @r8,r9  
+        mov     #64,r8
+        cmp/hs  r8,r9
+        bt      interrupt_entry ! vec >= 64 is interrupt
+        mov     #32,r8
+        cmp/hs  r8,r9
+        bt      trap_entry      ! 64 > vec >= 32  is trap
+        mov.l   4f,r8
+        mov     r9,r4
+        shll2   r9
+        add     r9,r8
+        mov.l   @r8,r8
+        mov     #0,r9
+        cmp/eq  r9,r8
+        bf      3f
+        mov.l   8f,r8           ! unhandled exception
+3:
+        mov.l   5f,r10
+        jmp     @r8
+         lds    r10,pr
+
+interrupt_entry:
+        mov     r9,r4
+        mov.l   6f,r9
+        mov.l   7f,r8
+        jmp     @r8
+         lds    r9,pr
+
+        .align  2
+4:      .long   exception_handling_table
+5:      .long   ret_from_exception
+6:      .long   ret_from_irq
+7:      .long   do_IRQ
+8:      .long   do_exception_error
+        
+trap_entry:
+        /* verbose BUG trapa entry check */
+        mov     #0x3e,r8
+        cmp/ge  r8,r9
+        bf/s    1f
+         add    #-0x10,r9
+        add     #0x10,r9
+1:      
+        shll2   r9                      ! TRA
+        mov     #OFF_TRA,r8
+        add     r15,r8
+        mov.l   r9,@r8
+        mov     r9,r8
+#ifdef CONFIG_TRACE_IRQFLAGS
+        mov.l   2f, r9
+        jsr     @r9
+         nop
+#endif
+        sti
+        bra     system_call
+         nop
+        
+        .align  2
+#ifdef CONFIG_TRACE_IRQFLAGS
+2:      .long   trace_hardirqs_on
+#endif
+
+#if defined(CONFIG_SH_STANDARD_BIOS)
+        /* Unwind the stack and jmp to the debug entry */
+debug_kernel_fw:
+        mov     r15,r0
+        add     #(22-4)*4-4,r0
+        ldc.l   @r0+,gbr
+        lds.l   @r0+,mach
+        lds.l   @r0+,macl
+        mov     r15,r0
+        mov.l   @(OFF_SP,r0),r1
+        mov     #OFF_SR,r2
+        mov.l   @(r0,r2),r3
+        mov.l   r3,@-r1
+        mov     #OFF_SP,r2
+        mov.l   @(r0,r2),r3
+        mov.l   r3,@-r1
+        mov     r15,r0
+        add     #(22-4)*4-8,r0
+        mov.l   1f,r2
+        mov.l   @r2,r2
+        stc     sr,r3
+        mov.l   r2,@r0
+        mov.l   r3,@r0
+        mov.l   r1,@(8,r0)      
+        mov.l   @r15+, r0
+        mov.l   @r15+, r1
+        mov.l   @r15+, r2
+        mov.l   @r15+, r3
+        mov.l   @r15+, r4
+        mov.l   @r15+, r5
+        mov.l   @r15+, r6
+        mov.l   @r15+, r7
+        mov.l   @r15+, r8
+        mov.l   @r15+, r9
+        mov.l   @r15+, r10
+        mov.l   @r15+, r11
+        mov.l   @r15+, r12
+        mov.l   @r15+, r13
+        mov.l   @r15+, r14
+        add     #8,r15
+        lds.l   @r15+, pr
+        rte
+         mov.l  @r15+,r15
+        .align  2
+1:      .long   gdb_vbr_vector
+#endif /* CONFIG_SH_STANDARD_BIOS */
+
+ENTRY(address_error_handler)
+        mov     r15,r4                          ! regs
+        add     #4,r4
+        mov     #OFF_PC,r0
+        mov.l   @(r0,r15),r6                    ! pc
+        mov.l   1f,r0
+        jmp     @r0
+         mov    #0,r5                           ! writeaccess is unknown
+        .align  2
+
+1:      .long   do_address_error
+
+restore_all:
+        cli
+#ifdef CONFIG_TRACE_IRQFLAGS
+        mov.l   1f, r0
+        jsr     @r0
+         nop
+#endif
+        mov     r15,r0
+        mov.l   $cpu_mode,r2
+        mov     #OFF_SR,r3
+        mov.l   @(r0,r3),r1
+        mov.l   r1,@r2
+        shll2   r1                              ! clear MD bit
+        shlr2   r1
+        mov.l   @(OFF_SP,r0),r2
+        add     #-8,r2
+        mov.l   r2,@(OFF_SP,r0)                 ! point exception frame top
+        mov.l   r1,@(4,r2)                      ! set sr
+        mov     #OFF_PC,r3
+        mov.l   @(r0,r3),r1
+        mov.l   r1,@r2                          ! set pc
+        add     #4*16+4,r0
+        lds.l   @r0+,pr
+        add     #4,r0                           ! skip sr
+        ldc.l   @r0+,gbr
+        lds.l   @r0+,mach
+        lds.l   @r0+,macl
+        get_current_thread_info r0, r1
+        mov.l   $current_thread_info,r1
+        mov.l   r0,@r1
+        mov.l   @r15+,r0
+        mov.l   @r15+,r1
+        mov.l   @r15+,r2
+        mov.l   @r15+,r3
+        mov.l   @r15+,r4
+        mov.l   @r15+,r5
+        mov.l   @r15+,r6
+        mov.l   @r15+,r7
+        mov.l   @r15+,r8
+        mov.l   @r15+,r9
+        mov.l   @r15+,r10
+        mov.l   @r15+,r11
+        mov.l   @r15+,r12
+        mov.l   @r15+,r13
+        mov.l   @r15+,r14
+        mov.l   @r15,r15
+        rte
+         nop
+
+#ifdef CONFIG_TRACE_IRQFLAGS
+1:     .long   trace_hardirqs_off
+#endif
+$current_thread_info:
+        .long   __current_thread_info
+$cpu_mode:      
+        .long   __cpu_mode
+                
+! common exception handler
+#include "../../entry-common.S"
+        
+        .data
+! cpu operation mode 
+! bit30 = MD (compatible SH3/4)
+__cpu_mode:
+        .long   0x40000000
+                
+        .section        .bss
+__current_thread_info:
+        .long   0
+
+ENTRY(exception_handling_table)
+        .space  4*32
diff --git a/arch/sh/kernel/cpu/sh2/ex.S b/arch/sh/kernel/cpu/sh2/ex.S
new file mode 100644
index 000000000000..6d285af7846c
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh2/ex.S
@@ -0,0 +1,46 @@
+/*
+ * arch/sh/kernel/cpu/sh2/ex.S
+ *
+ * The SH-2 exception vector table
+ *
+ * Copyright (C) 2005 Yoshinori Sato
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/linkage.h>
+
+!
+! convert Exception Vector to Exception Number
+!
+exception_entry:        
+no      =       0
+        .rept   256
+        mov.l   r0,@-sp
+        mov     #no,r0
+        bra     exception_trampoline
+        and     #0xff,r0
+no      =       no + 1
+        .endr
+exception_trampoline:
+        mov.l   r1,@-sp
+        mov.l   $exception_handler,r1
+        jmp     @r1
+
+        .align  2
+$exception_entry:
+        .long   exception_entry
+$exception_handler:
+        .long   exception_handler
+!
+! Exception Vector Base
+!
+        .align  2
+ENTRY(vbr_base)
+vector  =       0
+        .rept   256
+        .long   exception_entry + vector * 8
+vector  =       vector + 1
+        .endr
diff --git a/arch/sh/kernel/cpu/sh2/probe.c b/arch/sh/kernel/cpu/sh2/probe.c
index f17a2a0d588e..ba527d9b5024 100644
--- a/arch/sh/kernel/cpu/sh2/probe.c
+++ b/arch/sh/kernel/cpu/sh2/probe.c
@@ -17,17 +17,23 @@
 
 int __init detect_cpu_and_cache_system(void)
 {
-        /*
-         * For now, assume SH7604 .. fix this later.
-         */
+#if defined(CONFIG_CPU_SUBTYPE_SH7604)
         cpu_data->type                  = CPU_SH7604;
         cpu_data->dcache.ways           = 4;
-        cpu_data->dcache.way_shift      = 6;
+        cpu_data->dcache.way_incr       = (1<<10);
         cpu_data->dcache.sets           = 64;
         cpu_data->dcache.entry_shift    = 4;
         cpu_data->dcache.linesz         = L1_CACHE_BYTES;
         cpu_data->dcache.flags          = 0;
-
+#elif defined(CONFIG_CPU_SUBTYPE_SH7619)
+        cpu_data->type                  = CPU_SH7619;
+        cpu_data->dcache.ways           = 4;
+        cpu_data->dcache.way_incr       = (1<<12);
+        cpu_data->dcache.sets           = 256;
+        cpu_data->dcache.entry_shift    = 4;
+        cpu_data->dcache.linesz         = L1_CACHE_BYTES;
+        cpu_data->dcache.flags          = 0;
+#endif
         /*
          * SH-2 doesn't have separate caches
          */
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
new file mode 100644
index 000000000000..79283e6c1d8f
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
@@ -0,0 +1,94 @@
+/*
+ * SH7619 Setup
+ *
+ *  Copyright (C) 2006  Yoshinori Sato
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xf8400000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           =  { 88, 89, 91, 90},
+        }, {
+                .mapbase        = 0xf8410000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           =  { 92, 93, 95, 94},
+        }, {
+                .mapbase        = 0xf8420000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           =  { 96, 97, 99, 98},
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7619_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh7619_devices_setup(void)
+{
+        return platform_add_devices(sh7619_devices,
+                                    ARRAY_SIZE(sh7619_devices));
+}
+__initcall(sh7619_devices_setup);
+
+#define INTC_IPRC      0xf8080000UL
+#define INTC_IPRD      0xf8080002UL
+
+#define CMI0_IRQ       86
+
+#define SCIF0_ERI_IRQ  88
+#define SCIF0_RXI_IRQ  89
+#define SCIF0_BRI_IRQ  90
+#define SCIF0_TXI_IRQ  91
+
+#define SCIF1_ERI_IRQ  92
+#define SCIF1_RXI_IRQ  93
+#define SCIF1_BRI_IRQ  94
+#define SCIF1_TXI_IRQ  95
+
+#define SCIF2_BRI_IRQ  96
+#define SCIF2_ERI_IRQ  97
+#define SCIF2_RXI_IRQ  98
+#define SCIF2_TXI_IRQ  99
+
+static struct ipr_data sh7619_ipr_map[] = {
+        { CMI0_IRQ,      INTC_IPRC, 1, 2 },
+        { SCIF0_ERI_IRQ, INTC_IPRD, 3, 3 },
+        { SCIF0_RXI_IRQ, INTC_IPRD, 3, 3 },
+        { SCIF0_BRI_IRQ, INTC_IPRD, 3, 3 },
+        { SCIF0_TXI_IRQ, INTC_IPRD, 3, 3 },
+        { SCIF1_ERI_IRQ, INTC_IPRD, 2, 3 },
+        { SCIF1_RXI_IRQ, INTC_IPRD, 2, 3 },
+        { SCIF1_BRI_IRQ, INTC_IPRD, 2, 3 },
+        { SCIF1_TXI_IRQ, INTC_IPRD, 2, 3 },
+        { SCIF2_ERI_IRQ, INTC_IPRD, 1, 3 },
+        { SCIF2_RXI_IRQ, INTC_IPRD, 1, 3 },
+        { SCIF2_BRI_IRQ, INTC_IPRD, 1, 3 },
+        { SCIF2_TXI_IRQ, INTC_IPRD, 1, 3 },
+};
+
+void __init init_IRQ_ipr(void)
+{
+        make_ipr_irq(sh7619_ipr_map, ARRAY_SIZE(sh7619_ipr_map));
+}
diff --git a/arch/sh/kernel/cpu/sh2a/Makefile b/arch/sh/kernel/cpu/sh2a/Makefile
new file mode 100644
index 000000000000..350972ae9410
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh2a/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for the Linux/SuperH SH-2A backends.
+#
+
+obj-y   := common.o probe.o
+
+common-y        += $(addprefix ../sh2/, ex.o)
+common-y        += $(addprefix ../sh2/, entry.o)
+
+obj-$(CONFIG_CPU_SUBTYPE_SH7206) += setup-sh7206.o clock-sh7206.o
diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7206.c b/arch/sh/kernel/cpu/sh2a/clock-sh7206.c
new file mode 100644
index 000000000000..a9ad309c6a33
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh2a/clock-sh7206.c
@@ -0,0 +1,85 @@
+/*
+ * arch/sh/kernel/cpu/sh2a/clock-sh7206.c
+ *
+ * SH7206 support for the clock framework
+ *
+ *  Copyright (C) 2006  Yoshinori Sato
+ *
+ * Based on clock-sh4.c
+ *  Copyright (C) 2005  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <asm/clock.h>
+#include <asm/freq.h>
+#include <asm/io.h>
+
+const static int pll1rate[]={1,2,3,4,6,8};
+const static int pfc_divisors[]={1,2,3,4,6,8,12};
+#define ifc_divisors pfc_divisors
+
+#if (CONFIG_SH_CLK_MD == 2)
+#define PLL2 (4)
+#elif (CONFIG_SH_CLK_MD == 6)
+#define PLL2 (2)
+#elif (CONFIG_SH_CLK_MD == 7)
+#define PLL2 (1)
+#else
+#error "Illigal Clock Mode!"
+#endif
+
+static void master_clk_init(struct clk *clk)
+{
+        clk->rate *= PLL2 * pll1rate[(ctrl_inw(FREQCR) >> 8) & 0x0007];
+}
+
+static struct clk_ops sh7206_master_clk_ops = {
+        .init           = master_clk_init,
+};
+
+static void module_clk_recalc(struct clk *clk)
+{
+        int idx = (ctrl_inw(FREQCR) & 0x0007);
+        clk->rate = clk->parent->rate / pfc_divisors[idx];
+}
+
+static struct clk_ops sh7206_module_clk_ops = {
+        .recalc         = module_clk_recalc,
+};
+
+static void bus_clk_recalc(struct clk *clk)
+{
+        clk->rate = clk->parent->rate / pll1rate[(ctrl_inw(FREQCR) >> 8) & 0x0007];
+}
+
+static struct clk_ops sh7206_bus_clk_ops = {
+        .recalc         = bus_clk_recalc,
+};
+
+static void cpu_clk_recalc(struct clk *clk)
+{
+        int idx = (ctrl_inw(FREQCR) & 0x0007);
+        clk->rate = clk->parent->rate / ifc_divisors[idx];
+}
+
+static struct clk_ops sh7206_cpu_clk_ops = {
+        .recalc         = cpu_clk_recalc,
+};
+
+static struct clk_ops *sh7206_clk_ops[] = {
+        &sh7206_master_clk_ops,
+        &sh7206_module_clk_ops,
+        &sh7206_bus_clk_ops,
+        &sh7206_cpu_clk_ops,
+};
+
+void __init arch_init_clk_ops(struct clk_ops **ops, int idx)
+{
+        if (idx < ARRAY_SIZE(sh7206_clk_ops))
+                *ops = sh7206_clk_ops[idx];
+}
+
diff --git a/arch/sh/kernel/cpu/sh2a/probe.c b/arch/sh/kernel/cpu/sh2a/probe.c
new file mode 100644
index 000000000000..87c6c0542089
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh2a/probe.c
@@ -0,0 +1,39 @@
+/*
+ * arch/sh/kernel/cpu/sh2a/probe.c
+ *
+ * CPU Subtype Probing for SH-2A.
+ *
+ * Copyright (C) 2004, 2005 Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/init.h>
+#include <asm/processor.h>
+#include <asm/cache.h>
+
+int __init detect_cpu_and_cache_system(void)
+{
+        /* Just SH7206 for now .. */
+        cpu_data->type                  = CPU_SH7206;
+
+        cpu_data->dcache.ways           = 4;
+        cpu_data->dcache.way_incr       = (1 << 11);
+        cpu_data->dcache.sets           = 128;
+        cpu_data->dcache.entry_shift    = 4;
+        cpu_data->dcache.linesz         = L1_CACHE_BYTES;
+        cpu_data->dcache.flags          = 0;
+
+        /*
+         * The icache is the same as the dcache as far as this setup is
+         * concerned. The only real difference in hardware is that the icache
+         * lacks the U bit that the dcache has, none of this has any bearing
+         * on the cache info.
+         */
+        cpu_data->icache                = cpu_data->dcache;
+
+        return 0;
+}
+
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
new file mode 100644
index 000000000000..4b60fcc7d667
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
@@ -0,0 +1,112 @@
+/*
+ * SH7206 Setup
+ *
+ *  Copyright (C) 2006  Yoshinori Sato
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xfffe8000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           =  { 241, 242, 243, 240},
+        }, {
+                .mapbase        = 0xfffe8800,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           =  { 247, 244, 245, 246},
+        }, {
+                .mapbase        = 0xfffe9000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           =  { 249, 250, 251, 248},
+        }, {
+                .mapbase        = 0xfffe9800,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           =  { 253, 254, 255, 252},
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7206_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh7206_devices_setup(void)
+{
+        return platform_add_devices(sh7206_devices,
+                                    ARRAY_SIZE(sh7206_devices));
+}
+__initcall(sh7206_devices_setup);
+
+#define INTC_IPR08     0xfffe0c04UL
+#define INTC_IPR09     0xfffe0c06UL
+#define INTC_IPR14     0xfffe0c10UL
+
+#define CMI0_IRQ       140
+
+#define MTU1_TGI1A     164
+
+#define SCIF0_BRI_IRQ  240
+#define SCIF0_ERI_IRQ  241
+#define SCIF0_RXI_IRQ  242
+#define SCIF0_TXI_IRQ  243
+
+#define SCIF1_BRI_IRQ  244
+#define SCIF1_ERI_IRQ  245
+#define SCIF1_RXI_IRQ  246
+#define SCIF1_TXI_IRQ  247
+
+#define SCIF2_BRI_IRQ  248
+#define SCIF2_ERI_IRQ  249
+#define SCIF2_RXI_IRQ  250
+#define SCIF2_TXI_IRQ  251
+
+#define SCIF3_BRI_IRQ  252
+#define SCIF3_ERI_IRQ  253
+#define SCIF3_RXI_IRQ  254
+#define SCIF3_TXI_IRQ  255
+
+static struct ipr_data sh7206_ipr_map[] = {
+        { CMI0_IRQ,      INTC_IPR08, 3, 2 },
+        { MTU2_TGI1A,    INTC_IPR09, 1, 2 },
+        { SCIF0_ERI_IRQ, INTC_IPR14, 3, 3 },
+        { SCIF0_RXI_IRQ, INTC_IPR14, 3, 3 },
+        { SCIF0_BRI_IRQ, INTC_IPR14, 3, 3 },
+        { SCIF0_TXI_IRQ, INTC_IPR14, 3, 3 },
+        { SCIF1_ERI_IRQ, INTC_IPR14, 2, 3 },
+        { SCIF1_RXI_IRQ, INTC_IPR14, 2, 3 },
+        { SCIF1_BRI_IRQ, INTC_IPR14, 2, 3 },
+        { SCIF1_TXI_IRQ, INTC_IPR14, 2, 3 },
+        { SCIF2_ERI_IRQ, INTC_IPR14, 1, 3 },
+        { SCIF2_RXI_IRQ, INTC_IPR14, 1, 3 },
+        { SCIF2_BRI_IRQ, INTC_IPR14, 1, 3 },
+        { SCIF2_TXI_IRQ, INTC_IPR14, 1, 3 },
+        { SCIF3_ERI_IRQ, INTC_IPR14, 0, 3 },
+        { SCIF3_RXI_IRQ, INTC_IPR14, 0, 3 },
+        { SCIF3_BRI_IRQ, INTC_IPR14, 0, 3 },
+        { SCIF3_TXI_IRQ, INTC_IPR14, 0, 3 },
+};
+
+void __init init_IRQ_ipr(void)
+{
+        make_ipr_irq(sh7206_ipr_map, ARRAY_SIZE(sh7206_ipr_map));
+}
diff --git a/arch/sh/kernel/cpu/sh3/Makefile b/arch/sh/kernel/cpu/sh3/Makefile
index 58d3815695ff..83905e4e4387 100644
--- a/arch/sh/kernel/cpu/sh3/Makefile
+++ b/arch/sh/kernel/cpu/sh3/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the Linux/SuperH SH-3 backends.
 #
 
-obj-y   := ex.o probe.o
+obj-y   := ex.o probe.o entry.o
 
 # CPU subtype setup
 obj-$(CONFIG_CPU_SUBTYPE_SH7705)        += setup-sh7705.o
diff --git a/arch/sh/kernel/cpu/sh3/clock-sh7709.c b/arch/sh/kernel/cpu/sh3/clock-sh7709.c
index 10461a745e5f..b791a29fdb62 100644
--- a/arch/sh/kernel/cpu/sh3/clock-sh7709.c
+++ b/arch/sh/kernel/cpu/sh3/clock-sh7709.c
@@ -24,7 +24,7 @@ static int pfc_divisors[]    = { 1, 2, 4, 1, 3, 6, 1, 1 };
 
 static void set_bus_parent(struct clk *clk)
 {
-        struct clk *bus_clk = clk_get("bus_clk");
+        struct clk *bus_clk = clk_get(NULL, "bus_clk");
         clk->parent = bus_clk;
         clk_put(bus_clk);
 }
diff --git a/arch/sh/kernel/entry.S b/arch/sh/kernel/cpu/sh3/entry.S
index 39aaefb2d83f..8c0dc2700c69 100644
--- a/arch/sh/kernel/entry.S
+++ b/arch/sh/kernel/cpu/sh3/entry.S
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/sh/entry.S
+ * arch/sh/kernel/entry.S
  *
  *  Copyright (C) 1999, 2000, 2002  Niibe Yutaka
  *  Copyright (C) 2003 - 2006  Paul Mundt
@@ -7,15 +7,16 @@
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
- *
  */
 #include <linux/sys.h>
 #include <linux/errno.h>
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
-#include <asm/cpu/mmu_context.h>
 #include <asm/unistd.h>
+#include <asm/cpu/mmu_context.h>
+#include <asm/pgtable.h>
+#include <asm/page.h>
 
 ! NOTE:
 ! GNU as (as of 2.9.1) changes bf/s into bt/s and bra, when the address
@@ -81,6 +82,8 @@ OFF_TRA	=  (16*4+6*4)
 #define k_g_imask       r6_bank /* r6_bank1 */
 #define current         r7      /* r7_bank1 */
 
+#include <asm/entry-macros.S>
+        
 /*
  * Kernel mode register usage:
  *      k0      scratch
@@ -107,26 +110,6 @@ OFF_TRA	=  (16*4+6*4)
 ! this first version depends *much* on C implementation.
 !
 
-#define CLI()                           \
-        stc     sr, r0;                 \
-        or      #0xf0, r0;              \
-        ldc     r0, sr
-
-#define STI()                           \
-        mov.l   __INV_IMASK, r11;       \
-        stc     sr, r10;                \
-        and     r11, r10;               \
-        stc     k_g_imask, r11;         \
-        or      r11, r10;               \
-        ldc     r10, sr
-
-#if defined(CONFIG_PREEMPT)
-#  define preempt_stop()        CLI()
-#else
-#  define preempt_stop()
-#  define resume_kernel         restore_all
-#endif
-
 #if defined(CONFIG_MMU)
         .align  2
 ENTRY(tlb_miss_load)
@@ -155,29 +138,14 @@ ENTRY(tlb_protection_violation_store)
 
 call_dpf:
         mov.l   1f, r0
-        mov     r5, r8
-        mov.l   @r0, r6
-        mov     r6, r9
-        mov.l   2f, r0
-        sts     pr, r10
-        jsr     @r0
-         mov    r15, r4
-        !
-        tst     r0, r0
-        bf/s    0f
-         lds    r10, pr
-        rts
-         nop
-0:      STI()
+        mov.l   @r0, r6         ! address
         mov.l   3f, r0
-        mov     r9, r6
-        mov     r8, r5
+
         jmp     @r0
-         mov    r15, r4
+         mov    r15, r4         ! regs
 
         .align 2
 1:      .long   MMU_TEA
-2:      .long   __do_page_fault
 3:      .long   do_page_fault
 
         .align  2
@@ -203,32 +171,6 @@ call_dae:
 2:      .long   do_address_error
 #endif /* CONFIG_MMU */
 
-#if defined(CONFIG_SH_STANDARD_BIOS) || defined(CONFIG_SH_KGDB)
-! Handle kernel debug if either kgdb (SW) or gdb-stub (FW) is present.
-! If both are configured, handle the debug traps (breakpoints) in SW,
-! but still allow BIOS traps to FW.
-
-        .align  2
-debug_kernel:
-#if defined(CONFIG_SH_STANDARD_BIOS) && defined(CONFIG_SH_KGDB)
-        /* Force BIOS call to FW (debug_trap put TRA in r8) */
-        mov     r8,r0
-        shlr2   r0
-        cmp/eq  #0x3f,r0
-        bt      debug_kernel_fw
-#endif /* CONFIG_SH_STANDARD_BIOS && CONFIG_SH_KGDB */
-
-debug_enter:            
-#if defined(CONFIG_SH_KGDB)
-        /* Jump to kgdb, pass stacked regs as arg */
-debug_kernel_sw:
-        mov.l   3f, r0
-        jmp     @r0
-         mov    r15, r4
-        .align  2
-3:      .long   kgdb_handle_exception
-#endif /* CONFIG_SH_KGDB */
-
 #if defined(CONFIG_SH_STANDARD_BIOS)
         /* Unwind the stack and jmp to the debug entry */
 debug_kernel_fw:
@@ -269,276 +211,6 @@ debug_kernel_fw:
 2:      .long   gdb_vbr_vector
 #endif /* CONFIG_SH_STANDARD_BIOS */
 
-#endif /* CONFIG_SH_STANDARD_BIOS || CONFIG_SH_KGDB */
-
-
-        .align  2
-debug_trap:     
-#if defined(CONFIG_SH_STANDARD_BIOS) || defined(CONFIG_SH_KGDB)
-        mov     #OFF_SR, r0
-        mov.l   @(r0,r15), r0           ! get status register
-        shll    r0
-        shll    r0                      ! kernel space?
-        bt/s    debug_kernel
-#endif
-         mov.l  @r15, r0                ! Restore R0 value
-        mov.l   1f, r8
-        jmp     @r8
-         nop
-
-        .align  2
-ENTRY(exception_error)
-        !
-        STI()
-        mov.l   2f, r0
-        jmp     @r0
-         nop
-
-!
-        .align  2
-1:      .long   break_point_trap_software
-2:      .long   do_exception_error
-
-        .align  2
-ret_from_exception:
-        preempt_stop()
-ENTRY(ret_from_irq)
-        !
-        mov     #OFF_SR, r0
-        mov.l   @(r0,r15), r0   ! get status register
-        shll    r0
-        shll    r0              ! kernel space?
-        bt/s    resume_kernel   ! Yes, it's from kernel, go back soon
-         GET_THREAD_INFO(r8)
-
-#ifdef CONFIG_PREEMPT
-        bra     resume_userspace
-         nop
-ENTRY(resume_kernel)
-        mov.l   @(TI_PRE_COUNT,r8), r0  ! current_thread_info->preempt_count
-        tst     r0, r0
-        bf      noresched
-need_resched:
-        mov.l   @(TI_FLAGS,r8), r0      ! current_thread_info->flags
-        tst     #_TIF_NEED_RESCHED, r0  ! need_resched set?
-        bt      noresched
-
-        mov     #OFF_SR, r0
-        mov.l   @(r0,r15), r0           ! get status register
-        and     #0xf0, r0               ! interrupts off (exception path)?
-        cmp/eq  #0xf0, r0
-        bt      noresched
-
-        mov.l   1f, r0
-        mov.l   r0, @(TI_PRE_COUNT,r8)
-
-        STI()
-        mov.l   2f, r0
-        jsr     @r0
-         nop
-        mov     #0, r0
-        mov.l   r0, @(TI_PRE_COUNT,r8)
-        CLI()
-
-        bra     need_resched
-         nop
-noresched:
-        bra     restore_all
-         nop
-
-        .align 2
-1:      .long   PREEMPT_ACTIVE
-2:      .long   schedule
-#endif
-
-ENTRY(resume_userspace)
-        ! r8: current_thread_info
-        CLI()
-        mov.l   @(TI_FLAGS,r8), r0              ! current_thread_info->flags
-        tst     #_TIF_WORK_MASK, r0
-        bt/s    restore_all
-         tst    #_TIF_NEED_RESCHED, r0
-
-        .align  2
-work_pending:
-        ! r0: current_thread_info->flags
-        ! r8: current_thread_info
-        ! t:  result of "tst    #_TIF_NEED_RESCHED, r0"
-        bf/s    work_resched
-         tst    #(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), r0
-work_notifysig:
-        bt/s    restore_all
-         mov    r15, r4
-        mov     r12, r5         ! set arg1(save_r0)
-        mov     r0, r6
-        mov.l   2f, r1
-        mova    restore_all, r0
-        jmp     @r1
-         lds    r0, pr
-work_resched:
-#ifndef CONFIG_PREEMPT
-        ! gUSA handling
-        mov.l   @(OFF_SP,r15), r0       ! get user space stack pointer
-        mov     r0, r1
-        shll    r0
-        bf/s    1f
-         shll   r0
-        bf/s    1f
-         mov    #OFF_PC, r0
-        !                                 SP >= 0xc0000000 : gUSA mark
-        mov.l   @(r0,r15), r2           ! get user space PC (program counter)
-        mov.l   @(OFF_R0,r15), r3       ! end point
-        cmp/hs  r3, r2                  ! r2 >= r3? 
-        bt      1f
-        add     r3, r1                  ! rewind point #2
-        mov.l   r1, @(r0,r15)           ! reset PC to rewind point #2
-        !
-1:
-#endif
-        mov.l   1f, r1
-        jsr     @r1                             ! schedule
-         nop
-        CLI()
-        !
-        mov.l   @(TI_FLAGS,r8), r0              ! current_thread_info->flags
-        tst     #_TIF_WORK_MASK, r0
-        bt      restore_all
-        bra     work_pending
-         tst    #_TIF_NEED_RESCHED, r0
-
-        .align  2
-1:      .long   schedule
-2:      .long   do_notify_resume
-
-        .align  2
-syscall_exit_work:
-        ! r0: current_thread_info->flags
-        ! r8: current_thread_info
-        tst     #_TIF_SYSCALL_TRACE, r0
-        bt/s    work_pending
-         tst    #_TIF_NEED_RESCHED, r0
-        STI()
-        ! XXX setup arguments...
-        mov.l   4f, r0                  ! do_syscall_trace
-        jsr     @r0
-         nop
-        bra     resume_userspace
-         nop
-
-        .align  2
-syscall_trace_entry:
-        !                       Yes it is traced.
-        ! XXX setup arguments...
-        mov.l   4f, r11         ! Call do_syscall_trace which notifies
-        jsr     @r11            ! superior (will chomp R[0-7])
-         nop
-        !                       Reload R0-R4 from kernel stack, where the
-        !                       parent may have modified them using
-        !                       ptrace(POKEUSR).  (Note that R0-R2 are
-        !                       used by the system call handler directly
-        !                       from the kernel stack anyway, so don't need
-        !                       to be reloaded here.)  This allows the parent
-        !                       to rewrite system calls and args on the fly.
-        mov.l   @(OFF_R4,r15), r4   ! arg0
-        mov.l   @(OFF_R5,r15), r5
-        mov.l   @(OFF_R6,r15), r6
-        mov.l   @(OFF_R7,r15), r7   ! arg3
-        mov.l   @(OFF_R3,r15), r3   ! syscall_nr
-        !                   Arrange for do_syscall_trace to be called
-        !                   again as the system call returns.
-        mov.l   2f, r10                 ! Number of syscalls
-        cmp/hs  r10, r3
-        bf      syscall_call
-        mov     #-ENOSYS, r0
-        bra     syscall_exit
-         mov.l  r0, @(OFF_R0,r15)       ! Return value
-
-/*
- * Syscall interface:
- *
- *      Syscall #: R3
- *      Arguments #0 to #3: R4--R7
- *      Arguments #4 to #6: R0, R1, R2
- *      TRA: (number of arguments + 0x10) x 4
- *
- * This code also handles delegating other traps to the BIOS/gdb stub
- * according to:
- *
- * Trap number
- * (TRA>>2)         Purpose
- * --------         -------
- * 0x0-0xf          old syscall ABI
- * 0x10-0x1f        new syscall ABI
- * 0x20-0xff        delegated through debug_trap to BIOS/gdb stub.
- *
- * Note: When we're first called, the TRA value must be shifted
- * right 2 bits in order to get the value that was used as the "trapa"
- * argument.
- */
-
-        .align  2
-        .globl  ret_from_fork
-ret_from_fork:
-        mov.l   1f, r8
-        jsr     @r8
-         mov    r0, r4
-        bra     syscall_exit
-         nop
-        .align  2
-1:      .long   schedule_tail
-        !
-ENTRY(system_call)
-        mov.l   1f, r9
-        mov.l   @r9, r8         ! Read from TRA (Trap Address) Register
-        !
-        ! Is the trap argument >= 0x20? (TRA will be >= 0x80)
-        mov     #0x7f, r9
-        cmp/hi  r9, r8
-        bt/s    0f
-         mov    #OFF_TRA, r9
-        add     r15, r9
-        !
-        mov.l   r8, @r9                 ! set TRA value to tra
-        STI()
-        !                   Call the system call handler through the table.
-        !                   First check for bad syscall number
-        mov     r3, r9
-        mov.l   2f, r8                  ! Number of syscalls
-        cmp/hs  r8, r9
-        bf/s    good_system_call
-         GET_THREAD_INFO(r8)
-syscall_badsys:                 ! Bad syscall number
-        mov     #-ENOSYS, r0
-        bra     resume_userspace
-         mov.l  r0, @(OFF_R0,r15)       ! Return value
-        !
-0:
-        bra     debug_trap
-         nop
-        !
-good_system_call:               ! Good syscall number
-        mov.l   @(TI_FLAGS,r8), r8
-        mov     #_TIF_SYSCALL_TRACE, r10
-        tst     r10, r8
-        bf      syscall_trace_entry
-        !
-syscall_call:
-        shll2   r9              ! x4
-        mov.l   3f, r8          ! Load the address of sys_call_table
-        add     r8, r9
-        mov.l   @r9, r8
-        jsr     @r8             ! jump to specific syscall handler
-         nop
-        mov.l   @(OFF_R0,r15), r12              ! save r0
-        mov.l   r0, @(OFF_R0,r15)               ! save the return value
-        !
-syscall_exit:
-        CLI()
-        !
-        GET_THREAD_INFO(r8)
-        mov.l   @(TI_FLAGS,r8), r0              ! current_thread_info->flags
-        tst     #_TIF_ALLWORK_MASK, r0
-        bf      syscall_exit_work
 restore_all:
         mov.l   @r15+, r0
         mov.l   @r15+, r1
@@ -606,7 +278,9 @@ skip_restore:
         !
         ! Calculate new SR value
         mov     k3, k2                  ! original SR value
-        mov.l   9f, k1
+        mov     #0xf0, k1
+        extu.b  k1, k1
+        not     k1, k1
         and     k1, k2                  ! Mask orignal SR value
         !
         mov     k3, k0                  ! Calculate IMASK-bits
@@ -632,16 +306,12 @@ skip_restore:
          nop
 
         .align  2
-1:      .long   TRA
-2:      .long   NR_syscalls
-3:      .long   sys_call_table
-4:      .long   do_syscall_trace
 5:      .long   0x00001000      ! DSP
 7:      .long   0x30000000
-9:
-__INV_IMASK:
-        .long   0xffffff0f      ! ~(IMASK)
 
+! common exception handler
+#include "../../entry-common.S"
+        
 ! Exception Vector Base
 !
 !       Should be aligned page boundary.
@@ -661,9 +331,176 @@ general_exception:
 2:      .long   ret_from_exception
 !
 !
+
+/* This code makes some assumptions to improve performance.
+ * Make sure they are stil true. */
+#if PTRS_PER_PGD != PTRS_PER_PTE
+#error PGD and PTE sizes don't match
+#endif
+
+/* gas doesn't flag impossible values for mov #immediate as an error */
+#if (_PAGE_PRESENT >> 2) > 0x7f
+#error cannot load PAGE_PRESENT as an immediate
+#endif
+#if _PAGE_DIRTY > 0x7f
+#error cannot load PAGE_DIRTY as an immediate
+#endif
+#if (_PAGE_PRESENT << 2) != _PAGE_ACCESSED
+#error cannot derive PAGE_ACCESSED from PAGE_PRESENT
+#endif
+
+#if defined(CONFIG_CPU_SH4)
+#define ldmmupteh(r)    mov.l   8f, r
+#else
+#define ldmmupteh(r)    mov     #MMU_PTEH, r
+#endif
+
         .balign         1024,0,1024
 tlb_miss:
-        mov.l   1f, k2
+#ifdef COUNT_EXCEPTIONS
+        ! Increment the counts
+        mov.l   9f, k1
+        mov.l   @k1, k2
+        add     #1, k2
+        mov.l   k2, @k1
+#endif
+
+        ! k0 scratch
+        ! k1 pgd and pte pointers
+        ! k2 faulting address
+        ! k3 pgd and pte index masks
+        ! k4 shift
+
+        ! Load up the pgd entry (k1)
+
+        ldmmupteh(k0)                   !  9 LS (latency=2)     MMU_PTEH
+
+        mov.w   4f, k3                  !  8 LS (latency=2)     (PTRS_PER_PGD-1) << 2
+        mov     #-(PGDIR_SHIFT-2), k4   !  6 EX
+
+        mov.l   @(MMU_TEA-MMU_PTEH,k0), k2      ! 18 LS (latency=2)
+
+        mov.l   @(MMU_TTB-MMU_PTEH,k0), k1      ! 18 LS (latency=2)
+
+        mov     k2, k0                  !   5 MT (latency=0)
+        shld    k4, k0                  !  99 EX
+
+        and     k3, k0                  !  78 EX
+
+        mov.l   @(k0, k1), k1           !  21 LS (latency=2)
+        mov     #-(PAGE_SHIFT-2), k4    !   6 EX
+
+        ! Load up the pte entry (k2)
+
+        mov     k2, k0                  !   5 MT (latency=0)
+        shld    k4, k0                  !  99 EX
+
+        tst     k1, k1                  !  86 MT
+
+        bt      20f                     ! 110 BR
+
+        and     k3, k0                  !  78 EX
+        mov.w   5f, k4                  !   8 LS (latency=2)    _PAGE_PRESENT
+
+        mov.l   @(k0, k1), k2           !  21 LS (latency=2)
+        add     k0, k1                  !  49 EX
+
+#ifdef CONFIG_CPU_HAS_PTEA
+        ! Test the entry for present and _PAGE_ACCESSED
+
+        mov     #-28, k3                !   6 EX
+        mov     k2, k0                  !   5 MT (latency=0)
+
+        tst     k4, k2                  !  68 MT
+        shld    k3, k0                  !  99 EX
+
+        bt      20f                     ! 110 BR
+
+        ! Set PTEA register
+        ! MMU_PTEA = ((pteval >> 28) & 0xe) | (pteval & 0x1)
+        !
+        ! k0=pte>>28, k1=pte*, k2=pte, k3=<unused>, k4=_PAGE_PRESENT
+
+        and     #0xe, k0                !  79 EX
+
+        mov     k0, k3                  !   5 MT (latency=0)
+        mov     k2, k0                  !   5 MT (latency=0)
+
+        and     #1, k0                  !  79 EX
+
+        or      k0, k3                  !  82 EX
+
+        ldmmupteh(k0)                   !   9 LS (latency=2)
+        shll2   k4                      ! 101 EX                _PAGE_ACCESSED
+
+        tst     k4, k2                  !  68 MT
+
+        mov.l   k3, @(MMU_PTEA-MMU_PTEH,k0)     ! 27 LS
+
+        mov.l   7f, k3                  !   9 LS (latency=2)    _PAGE_FLAGS_HARDWARE_MASK
+
+        ! k0=MMU_PTEH, k1=pte*, k2=pte, k3=_PAGE_FLAGS_HARDWARE, k4=_PAGE_ACCESSED
+#else
+
+        ! Test the entry for present and _PAGE_ACCESSED
+
+        mov.l   7f, k3                  !   9 LS (latency=2)    _PAGE_FLAGS_HARDWARE_MASK
+        tst     k4, k2                  !  68 MT
+
+        shll2   k4                      ! 101 EX                _PAGE_ACCESSED
+        ldmmupteh(k0)                   !   9 LS (latency=2)
+
+        bt      20f                     ! 110 BR
+        tst     k4, k2                  !  68 MT
+
+        ! k0=MMU_PTEH, k1=pte*, k2=pte, k3=_PAGE_FLAGS_HARDWARE, k4=_PAGE_ACCESSED
+
+#endif
+
+        ! Set up the entry
+
+        and     k2, k3                  !  78 EX
+        bt/s    10f                     ! 108 BR
+
+         mov.l  k3, @(MMU_PTEL-MMU_PTEH,k0)     ! 27 LS
+
+        ldtlb                           ! 128 CO
+
+        ! At least one instruction between ldtlb and rte
+        nop                             ! 119 NOP
+
+        rte                             ! 126 CO
+
+         nop                            ! 119 NOP
+
+
+10:     or      k4, k2                  !  82 EX
+
+        ldtlb                           ! 128 CO
+
+        ! At least one instruction between ldtlb and rte
+        mov.l   k2, @k1                 !  27 LS
+
+        rte                             ! 126 CO
+
+        ! Note we cannot execute mov here, because it is executed after
+        ! restoring SSR, so would be executed in user space.
+         nop                            ! 119 NOP
+
+
+        .align 5
+        ! Once cache line if possible...
+1:      .long   swapper_pg_dir
+4:      .short  (PTRS_PER_PGD-1) << 2
+5:      .short  _PAGE_PRESENT
+7:      .long   _PAGE_FLAGS_HARDWARE_MASK
+8:      .long   MMU_PTEH
+#ifdef COUNT_EXCEPTIONS
+9:      .long   exception_count_miss
+#endif
+
+        ! Either pgd or pte not present
+20:     mov.l   1f, k2
         mov.l   4f, k3
         bra     handle_exception
          mov.l  @k2, k2
@@ -710,8 +547,9 @@ ENTRY(handle_exception)
         bt/s    1f              ! It's a kernel to kernel transition.
          mov    r15, k0         ! save original stack to k0
         /* User space to kernel */
-        mov     #(THREAD_SIZE >> 8), k1
+        mov     #(THREAD_SIZE >> 10), k1
         shll8   k1              ! k1 := THREAD_SIZE
+        shll2   k1
         add     current, k1
         mov     k1, r15         ! change to kernel stack
         !
@@ -761,7 +599,7 @@ skip_save:
         ! Save the user registers on the stack.
         mov.l   k2, @-r15       ! EXPEVT
 
-        mov     #-1, k4
+        mov     #-1, k4
         mov.l   k4, @-r15       ! set TRA (default: -1)
         !
         sts.l   macl, @-r15
@@ -813,6 +651,15 @@ skip_save:
         bf      interrupt_exception
         shlr2   r8
         shlr    r8
+
+#ifdef COUNT_EXCEPTIONS
+        mov.l   5f, r9
+        add     r8, r9
+        mov.l   @r9, r10
+        add     #1, r10
+        mov.l   r10, @r9
+#endif
+
         mov.l   4f, r9
         add     r8, r9
         mov.l   @r9, r9
@@ -826,6 +673,9 @@ skip_save:
 2:      .long   0x000080f0      ! FD=1, IMASK=15
 3:      .long   0xcfffffff      ! RB=0, BL=0
 4:      .long   exception_handling_table
+#ifdef COUNT_EXCEPTIONS
+5:      .long   exception_count_table
+#endif
 
 interrupt_exception:
         mov.l   1f, r9
diff --git a/arch/sh/kernel/cpu/sh4/Makefile b/arch/sh/kernel/cpu/sh4/Makefile
index 8dbf3895ece7..19ca68c71884 100644
--- a/arch/sh/kernel/cpu/sh4/Makefile
+++ b/arch/sh/kernel/cpu/sh4/Makefile
@@ -2,7 +2,8 @@
 # Makefile for the Linux/SuperH SH-4 backends.
 #
 
-obj-y   := ex.o probe.o
+obj-y   := ex.o probe.o common.o
+common-y        += $(addprefix ../sh3/, entry.o)
 
 obj-$(CONFIG_SH_FPU)                    += fpu.o
 obj-$(CONFIG_SH_STORE_QUEUES)           += sq.o
@@ -11,17 +12,12 @@ obj-$(CONFIG_SH_STORE_QUEUES)		+= sq.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7750)        += setup-sh7750.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7751)        += setup-sh7750.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7760)        += setup-sh7760.o
-obj-$(CONFIG_CPU_SUBTYPE_SH7770)        += setup-sh7770.o
-obj-$(CONFIG_CPU_SUBTYPE_SH7780)        += setup-sh7780.o
-obj-$(CONFIG_CPU_SUBTYPE_SH73180)       += setup-sh73180.o
-obj-$(CONFIG_CPU_SUBTYPE_SH7343)        += setup-sh7343.o
 obj-$(CONFIG_CPU_SUBTYPE_SH4_202)       += setup-sh4-202.o
 
 # Primary on-chip clocks (common)
+ifndef CONFIG_CPU_SH4A
 clock-$(CONFIG_CPU_SH4)                 := clock-sh4.o
-clock-$(CONFIG_CPU_SUBTYPE_SH73180)     := clock-sh73180.o
-clock-$(CONFIG_CPU_SUBTYPE_SH7770)      := clock-sh7770.o
-clock-$(CONFIG_CPU_SUBTYPE_SH7780)      := clock-sh7780.o
+endif
 
 # Additional clocks by subtype
 clock-$(CONFIG_CPU_SUBTYPE_SH4_202)     += clock-sh4-202.o
diff --git a/arch/sh/kernel/cpu/sh4/clock-sh4-202.c b/arch/sh/kernel/cpu/sh4/clock-sh4-202.c
index bfdf5fe8d948..fa2019aabd74 100644
--- a/arch/sh/kernel/cpu/sh4/clock-sh4-202.c
+++ b/arch/sh/kernel/cpu/sh4/clock-sh4-202.c
@@ -97,7 +97,7 @@ static void shoc_clk_recalc(struct clk *clk)
 
 static int shoc_clk_verify_rate(struct clk *clk, unsigned long rate)
 {
-        struct clk *bclk = clk_get("bus_clk");
+        struct clk *bclk = clk_get(NULL, "bus_clk");
         unsigned long bclk_rate = clk_get_rate(bclk);
 
         clk_put(bclk);
@@ -151,7 +151,7 @@ static struct clk *sh4202_onchip_clocks[] = {
 
 static int __init sh4202_clk_init(void)
 {
-        struct clk *clk = clk_get("master_clk");
+        struct clk *clk = clk_get(NULL, "master_clk");
         int i;
 
         for (i = 0; i < ARRAY_SIZE(sh4202_onchip_clocks); i++) {
diff --git a/arch/sh/kernel/cpu/sh4/fpu.c b/arch/sh/kernel/cpu/sh4/fpu.c
index f486c07e10e2..7624677f6628 100644
--- a/arch/sh/kernel/cpu/sh4/fpu.c
+++ b/arch/sh/kernel/cpu/sh4/fpu.c
@@ -282,11 +282,8 @@ ieee_fpe_handler (struct pt_regs *regs)
                         grab_fpu(regs);
                         restore_fpu(tsk);
                         set_tsk_thread_flag(tsk, TIF_USEDFPU);
-                } else {
-                        tsk->thread.trap_no = 11;
-                        tsk->thread.error_code = 0;
+                } else
                         force_sig(SIGFPE, tsk);
-                }
 
                 regs->pc = nextpc;
                 return 1;
@@ -296,29 +293,29 @@ ieee_fpe_handler (struct pt_regs *regs)
 }
 
 asmlinkage void
-do_fpu_error(unsigned long r4, unsigned long r5, unsigned long r6, unsigned long r7,
-             struct pt_regs regs)
+do_fpu_error(unsigned long r4, unsigned long r5, unsigned long r6,
+             unsigned long r7, struct pt_regs __regs)
 {
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
         struct task_struct *tsk = current;
 
-        if (ieee_fpe_handler (&regs))
+        if (ieee_fpe_handler(regs))
                 return;
 
-        regs.pc += 2;
-        save_fpu(tsk, &regs);
-        tsk->thread.trap_no = 11;
-        tsk->thread.error_code = 0;
+        regs->pc += 2;
+        save_fpu(tsk, regs);
         force_sig(SIGFPE, tsk);
 }
 
 asmlinkage void
 do_fpu_state_restore(unsigned long r4, unsigned long r5, unsigned long r6,
-                     unsigned long r7, struct pt_regs regs)
+                     unsigned long r7, struct pt_regs __regs)
 {
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
         struct task_struct *tsk = current;
 
-        grab_fpu(&regs);
-        if (!user_mode(&regs)) {
+        grab_fpu(regs);
+        if (!user_mode(regs)) {
                 printk(KERN_ERR "BUG: FPU is used in kernel mode.\n");
                 return;
         }
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index c294de1e14a3..9031a22a2ce7 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -79,16 +79,16 @@ int __init detect_cpu_and_cache_system(void)
         case 0x205:
                 cpu_data->type = CPU_SH7750;
                 cpu_data->flags |= CPU_HAS_P2_FLUSH_BUG | CPU_HAS_FPU |
-                                   CPU_HAS_PERF_COUNTER | CPU_HAS_PTEA;
+                                   CPU_HAS_PERF_COUNTER;
                 break;
         case 0x206:
                 cpu_data->type = CPU_SH7750S;
                 cpu_data->flags |= CPU_HAS_P2_FLUSH_BUG | CPU_HAS_FPU |
-                                   CPU_HAS_PERF_COUNTER | CPU_HAS_PTEA;
+                                   CPU_HAS_PERF_COUNTER;
                 break;
         case 0x1100:
                 cpu_data->type = CPU_SH7751;
-                cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA;
+                cpu_data->flags |= CPU_HAS_FPU;
                 break;
         case 0x2000:
                 cpu_data->type = CPU_SH73180;
@@ -119,30 +119,38 @@ int __init detect_cpu_and_cache_system(void)
                 break;
         case 0x3000:
         case 0x3003:
+        case 0x3009:
                 cpu_data->type = CPU_SH7343;
                 cpu_data->icache.ways = 4;
                 cpu_data->dcache.ways = 4;
                 cpu_data->flags |= CPU_HAS_LLSC;
                 break;
+        case 0x3008:
+                if (prr == 0xa0) {
+                        cpu_data->type = CPU_SH7722;
+                        cpu_data->icache.ways = 4;
+                        cpu_data->dcache.ways = 4;
+                        cpu_data->flags |= CPU_HAS_LLSC;
+                }
+                break;
         case 0x8000:
                 cpu_data->type = CPU_ST40RA;
-                cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA;
+                cpu_data->flags |= CPU_HAS_FPU;
                 break;
         case 0x8100:
                 cpu_data->type = CPU_ST40GX1;
-                cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA;
+                cpu_data->flags |= CPU_HAS_FPU;
                 break;
         case 0x700:
                 cpu_data->type = CPU_SH4_501;
                 cpu_data->icache.ways = 2;
                 cpu_data->dcache.ways = 2;
-                cpu_data->flags |= CPU_HAS_PTEA;
                 break;
         case 0x600:
                 cpu_data->type = CPU_SH4_202;
                 cpu_data->icache.ways = 2;
                 cpu_data->dcache.ways = 2;
-                cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA;
+                cpu_data->flags |= CPU_HAS_FPU;
                 break;
         case 0x500 ... 0x501:
                 switch (prr) {
@@ -160,7 +168,7 @@ int __init detect_cpu_and_cache_system(void)
                 cpu_data->icache.ways = 2;
                 cpu_data->dcache.ways = 2;
 
-                cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA;
+                cpu_data->flags |= CPU_HAS_FPU;
 
                 break;
         default:
@@ -173,6 +181,10 @@ int __init detect_cpu_and_cache_system(void)
         cpu_data->dcache.ways = 1;
 #endif
 
+#ifdef CONFIG_CPU_HAS_PTEA
+        cpu_data->flags |= CPU_HAS_PTEA;
+#endif
+
         /*
          * On anything that's not a direct-mapped cache, look to the CVR
          * for I/D-cache specifics.
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
index 50812d57c1c1..cbac27634c0b 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
@@ -2,6 +2,7 @@
  * SH7750/SH7751 Setup
  *
  *  Copyright (C) 2006  Paul Mundt
+ *  Copyright (C) 2006  Jamie Lenehan
  *
  * 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
@@ -10,8 +11,39 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/serial.h>
+#include <linux/io.h>
 #include <asm/sci.h>
 
+static struct resource rtc_resources[] = {
+        [0] = {
+                .start  = 0xffc80000,
+                .end    = 0xffc80000 + 0x58 - 1,
+                .flags  = IORESOURCE_IO,
+        },
+        [1] = {
+                /* Period IRQ */
+                .start  = 21,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                /* Carry IRQ */
+                .start  = 22,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [3] = {
+                /* Alarm IRQ */
+                .start  = 20,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device rtc_device = {
+        .name           = "sh-rtc",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(rtc_resources),
+        .resource       = rtc_resources,
+};
+
 static struct plat_sci_port sci_platform_data[] = {
         {
                 .mapbase        = 0xffe00000,
@@ -37,6 +69,7 @@ static struct platform_device sci_device = {
 };
 
 static struct platform_device *sh7750_devices[] __initdata = {
+        &rtc_device,
         &sci_device,
 };
 
@@ -46,3 +79,71 @@ static int __init sh7750_devices_setup(void)
                                     ARRAY_SIZE(sh7750_devices));
 }
 __initcall(sh7750_devices_setup);
+
+static struct ipr_data sh7750_ipr_map[] = {
+        /* IRQ, IPR-idx, shift, priority */
+        { 16, 0, 12, 2 }, /* TMU0 TUNI*/
+        { 17, 0, 12, 2 }, /* TMU1 TUNI */
+        { 18, 0,  4, 2 }, /* TMU2 TUNI */
+        { 19, 0,  4, 2 }, /* TMU2 TIPCI */
+        { 27, 1, 12, 2 }, /* WDT ITI */
+        { 20, 0,  0, 2 }, /* RTC ATI (alarm) */
+        { 21, 0,  0, 2 }, /* RTC PRI (period) */
+        { 22, 0,  0, 2 }, /* RTC CUI (carry) */
+        { 23, 1,  4, 3 }, /* SCI ERI */
+        { 24, 1,  4, 3 }, /* SCI RXI */
+        { 25, 1,  4, 3 }, /* SCI TXI */
+        { 40, 2,  4, 3 }, /* SCIF ERI */
+        { 41, 2,  4, 3 }, /* SCIF RXI */
+        { 42, 2,  4, 3 }, /* SCIF BRI */
+        { 43, 2,  4, 3 }, /* SCIF TXI */
+        { 34, 2,  8, 7 }, /* DMAC DMTE0 */
+        { 35, 2,  8, 7 }, /* DMAC DMTE1 */
+        { 36, 2,  8, 7 }, /* DMAC DMTE2 */
+        { 37, 2,  8, 7 }, /* DMAC DMTE3 */
+        { 28, 2,  8, 7 }, /* DMAC DMAE */
+};
+
+static struct ipr_data sh7751_ipr_map[] = {
+        { 44, 2,  8, 7 }, /* DMAC DMTE4 */
+        { 45, 2,  8, 7 }, /* DMAC DMTE5 */
+        { 46, 2,  8, 7 }, /* DMAC DMTE6 */
+        { 47, 2,  8, 7 }, /* DMAC DMTE7 */
+        /* The following use INTC_INPRI00 for masking, which is a 32-bit
+           register, not a 16-bit register like the IPRx registers, so it
+           would need special support */
+        /*{ 72, INTPRI00,  8, ? },*/ /* TMU3 TUNI */
+        /*{ 76, INTPRI00, 12, ? },*/ /* TMU4 TUNI */
+};
+
+static unsigned long ipr_offsets[] = {
+        0xffd00004UL,   /* 0: IPRA */
+        0xffd00008UL,   /* 1: IPRB */
+        0xffd0000cUL,   /* 2: IPRC */
+        0xffd00010UL,   /* 3: IPRD */
+};
+
+/* given the IPR index return the address of the IPR register */
+unsigned int map_ipridx_to_addr(int idx)
+{
+        if (idx >= ARRAY_SIZE(ipr_offsets))
+                return 0;
+        return ipr_offsets[idx];
+}
+
+#define INTC_ICR        0xffd00000UL
+#define INTC_ICR_IRLM   (1<<7)
+
+/* enable individual interrupt mode for external interupts */
+void ipr_irq_enable_irlm(void)
+{
+        ctrl_outw(ctrl_inw(INTC_ICR) | INTC_ICR_IRLM, INTC_ICR);
+}
+
+void __init init_IRQ_ipr()
+{
+        make_ipr_irq(sh7750_ipr_map, ARRAY_SIZE(sh7750_ipr_map));
+#ifdef CONFIG_CPU_SUBTYPE_SH7751
+        make_ipr_irq(sh7751_ipr_map, ARRAY_SIZE(sh7751_ipr_map));
+#endif
+}
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index 7bcc73f9b8df..d7fff752e569 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -19,7 +19,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/page.h>
 #include <asm/cacheflush.h>
 #include <asm/cpu/sq.h>
@@ -38,7 +38,7 @@ struct sq_mapping {
 
 static struct sq_mapping *sq_mapping_list;
 static DEFINE_SPINLOCK(sq_mapping_lock);
-static kmem_cache_t *sq_cache;
+static struct kmem_cache *sq_cache;
 static unsigned long *sq_bitmap;
 
 #define store_queue_barrier()                   \
@@ -67,6 +67,7 @@ void sq_flush_range(unsigned long start, unsigned int len)
         /* Wait for completion */
         store_queue_barrier();
 }
+EXPORT_SYMBOL(sq_flush_range);
 
 static inline void sq_mapping_list_add(struct sq_mapping *map)
 {
@@ -110,8 +111,9 @@ static int __sq_remap(struct sq_mapping *map, unsigned long flags)
 
         vma->phys_addr = map->addr;
 
-        if (remap_area_pages((unsigned long)vma->addr, vma->phys_addr,
-                             map->size, flags)) {
+        if (ioremap_page_range((unsigned long)vma->addr,
+                               (unsigned long)vma->addr + map->size,
+                               vma->phys_addr, __pgprot(flags))) {
                 vunmap(vma->addr);
                 return -EAGAIN;
         }
@@ -166,7 +168,7 @@ unsigned long sq_remap(unsigned long phys, unsigned int size,
         map->size = size;
         map->name = name;
 
-        page = bitmap_find_free_region(sq_bitmap, 0x04000000,
+        page = bitmap_find_free_region(sq_bitmap, 0x04000000 >> PAGE_SHIFT,
                                        get_order(map->size));
         if (unlikely(page < 0)) {
                 ret = -ENOSPC;
@@ -175,7 +177,7 @@ unsigned long sq_remap(unsigned long phys, unsigned int size,
 
         map->sq_addr = P4SEG_STORE_QUE + (page << PAGE_SHIFT);
 
-        ret = __sq_remap(map, flags);
+        ret = __sq_remap(map, pgprot_val(PAGE_KERNEL_NOCACHE) | flags);
         if (unlikely(ret != 0))
                 goto out;
 
@@ -193,6 +195,7 @@ out:
         kmem_cache_free(sq_cache, map);
         return ret;
 }
+EXPORT_SYMBOL(sq_remap);
 
 /**
  * sq_unmap - Unmap a Store Queue allocation
@@ -234,6 +237,7 @@ void sq_unmap(unsigned long vaddr)
 
         kmem_cache_free(sq_cache, map);
 }
+EXPORT_SYMBOL(sq_unmap);
 
 /*
  * Needlessly complex sysfs interface. Unfortunately it doesn't seem like
@@ -402,7 +406,3 @@ module_exit(sq_api_exit);
 MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>, M. R. Brown <mrbrown@0xd6.org>");
 MODULE_DESCRIPTION("Simple API for SH-4 integrated Store Queues");
 MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL(sq_remap);
-EXPORT_SYMBOL(sq_unmap);
-EXPORT_SYMBOL(sq_flush_range);
diff --git a/arch/sh/kernel/cpu/sh4a/Makefile b/arch/sh/kernel/cpu/sh4a/Makefile
new file mode 100644
index 000000000000..a8f493f2f21f
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4a/Makefile
@@ -0,0 +1,19 @@
+#
+# Makefile for the Linux/SuperH SH-4 backends.
+#
+
+# CPU subtype setup
+obj-$(CONFIG_CPU_SUBTYPE_SH7770)        += setup-sh7770.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7780)        += setup-sh7780.o
+obj-$(CONFIG_CPU_SUBTYPE_SH73180)       += setup-sh73180.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7343)        += setup-sh7343.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7722)        += setup-sh7722.o
+
+# Primary on-chip clocks (common)
+clock-$(CONFIG_CPU_SUBTYPE_SH73180)     := clock-sh73180.o
+clock-$(CONFIG_CPU_SUBTYPE_SH7770)      := clock-sh7770.o
+clock-$(CONFIG_CPU_SUBTYPE_SH7780)      := clock-sh7780.o
+clock-$(CONFIG_CPU_SUBTYPE_SH7343)      := clock-sh7343.o
+clock-$(CONFIG_CPU_SUBTYPE_SH7722)      := clock-sh7343.o
+
+obj-y   += $(clock-y)
diff --git a/arch/sh/kernel/cpu/sh4/clock-sh73180.c b/arch/sh/kernel/cpu/sh4a/clock-sh73180.c
index 2fa5cb2ae68d..2fa5cb2ae68d 100644
--- a/arch/sh/kernel/cpu/sh4/clock-sh73180.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh73180.c
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
new file mode 100644
index 000000000000..1707a213f0cf
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
@@ -0,0 +1,99 @@
+/*
+ * arch/sh/kernel/cpu/sh4/clock-sh7343.c
+ *
+ * SH7343/SH7722 support for the clock framework
+ *
+ *  Copyright (C) 2006  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/io.h>
+#include <asm/clock.h>
+#include <asm/freq.h>
+
+/*
+ * SH7343/SH7722 uses a common set of multipliers and divisors, so this
+ * is quite simple..
+ */
+static int multipliers[] = { 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
+static int divisors[] = { 1, 3, 2, 5, 3, 4, 5, 6, 8, 10, 12, 16, 20 };
+
+#define pll_calc() (((ctrl_inl(FRQCR) >> 24) & 0x1f) + 1)
+
+static void master_clk_init(struct clk *clk)
+{
+        clk->parent = clk_get(NULL, "cpu_clk");
+}
+
+static void master_clk_recalc(struct clk *clk)
+{
+        int idx = (ctrl_inl(FRQCR) & 0x000f);
+        clk->rate *= clk->parent->rate * multipliers[idx] / divisors[idx];
+}
+
+static struct clk_ops sh7343_master_clk_ops = {
+        .init           = master_clk_init,
+        .recalc         = master_clk_recalc,
+};
+
+static void module_clk_init(struct clk *clk)
+{
+        clk->parent = NULL;
+        clk->rate = CONFIG_SH_PCLK_FREQ;
+}
+
+static struct clk_ops sh7343_module_clk_ops = {
+        .init           = module_clk_init,
+};
+
+static void bus_clk_init(struct clk *clk)
+{
+        clk->parent = clk_get(NULL, "cpu_clk");
+}
+
+static void bus_clk_recalc(struct clk *clk)
+{
+        int idx = (ctrl_inl(FRQCR) >> 8) & 0x000f;
+        clk->rate = clk->parent->rate * multipliers[idx] / divisors[idx];
+}
+
+static struct clk_ops sh7343_bus_clk_ops = {
+        .init           = bus_clk_init,
+        .recalc         = bus_clk_recalc,
+};
+
+static void cpu_clk_init(struct clk *clk)
+{
+        clk->parent = clk_get(NULL, "module_clk");
+        clk->flags |= CLK_RATE_PROPAGATES;
+        clk_set_rate(clk, clk_get_rate(clk));
+}
+
+static void cpu_clk_recalc(struct clk *clk)
+{
+        int idx = (ctrl_inl(FRQCR) >> 20) & 0x000f;
+        clk->rate = clk->parent->rate * pll_calc() *
+                multipliers[idx] / divisors[idx];
+}
+
+static struct clk_ops sh7343_cpu_clk_ops = {
+        .init           = cpu_clk_init,
+        .recalc         = cpu_clk_recalc,
+};
+
+static struct clk_ops *sh7343_clk_ops[] = {
+        &sh7343_master_clk_ops,
+        &sh7343_module_clk_ops,
+        &sh7343_bus_clk_ops,
+        &sh7343_cpu_clk_ops,
+};
+
+void __init arch_init_clk_ops(struct clk_ops **ops, int idx)
+{
+        if (idx < ARRAY_SIZE(sh7343_clk_ops))
+                *ops = sh7343_clk_ops[idx];
+}
diff --git a/arch/sh/kernel/cpu/sh4/clock-sh7770.c b/arch/sh/kernel/cpu/sh4a/clock-sh7770.c
index c8694bac6477..c8694bac6477 100644
--- a/arch/sh/kernel/cpu/sh4/clock-sh7770.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7770.c
diff --git a/arch/sh/kernel/cpu/sh4/clock-sh7780.c b/arch/sh/kernel/cpu/sh4a/clock-sh7780.c
index 93ad367342c9..9e6a216750c8 100644
--- a/arch/sh/kernel/cpu/sh4/clock-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7780.c
@@ -98,7 +98,7 @@ static struct clk *sh7780_onchip_clocks[] = {
 
 static int __init sh7780_clk_init(void)
 {
-        struct clk *clk = clk_get("master_clk");
+        struct clk *clk = clk_get(NULL, "master_clk");
         int i;
 
         for (i = 0; i < ARRAY_SIZE(sh7780_onchip_clocks); i++) {
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh73180.c b/arch/sh/kernel/cpu/sh4a/setup-sh73180.c
index cc9ea1e2e5df..cc9ea1e2e5df 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh73180.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh73180.c
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7343.c b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
index 91d61cf91ba1..91d61cf91ba1 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7343.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
new file mode 100644
index 000000000000..1143fbf65faf
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -0,0 +1,80 @@
+/*
+ * SH7722 Setup
+ *
+ *  Copyright (C) 2006  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xffe00000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 80, 81, 83, 82 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7722_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh7722_devices_setup(void)
+{
+        return platform_add_devices(sh7722_devices,
+                                    ARRAY_SIZE(sh7722_devices));
+}
+__initcall(sh7722_devices_setup);
+
+static struct ipr_data sh7722_ipr_map[] = {
+        /* IRQ, IPR-idx, shift, prio */
+        { 16, 0, 12, 2 }, /* TMU0 */
+        { 17, 0,  8, 2 }, /* TMU1 */
+        { 80, 6, 12, 3 }, /* SCIF ERI */
+        { 81, 6, 12, 3 }, /* SCIF RXI */
+        { 82, 6, 12, 3 }, /* SCIF BRI */
+        { 83, 6, 12, 3 }, /* SCIF TXI */
+};
+
+static unsigned long ipr_offsets[] = {
+        0xa4080000, /*  0: IPRA */
+        0xa4080004, /*  1: IPRB */
+        0xa4080008, /*  2: IPRC */
+        0xa408000c, /*  3: IPRD */
+        0xa4080010, /*  4: IPRE */
+        0xa4080014, /*  5: IPRF */
+        0xa4080018, /*  6: IPRG */
+        0xa408001c, /*  7: IPRH */
+        0xa4080020, /*  8: IPRI */
+        0xa4080024, /*  9: IPRJ */
+        0xa4080028, /* 10: IPRK */
+        0xa408002c, /* 11: IPRL */
+};
+
+unsigned int map_ipridx_to_addr(int idx)
+{
+        if (unlikely(idx >= ARRAY_SIZE(ipr_offsets)))
+                return 0;
+        return ipr_offsets[idx];
+}
+
+void __init init_IRQ_ipr(void)
+{
+        make_ipr_irq(sh7722_ipr_map, ARRAY_SIZE(sh7722_ipr_map));
+}
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7770.c b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
index 6a04cc5f5aca..6a04cc5f5aca 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7770.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
index 814ddb226531..9aeaa2ddaa28 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
@@ -79,25 +79,27 @@ static int __init sh7780_devices_setup(void)
 __initcall(sh7780_devices_setup);
 
 static struct intc2_data intc2_irq_table[] = {
-        { TIMER_IRQ, 0, 24, 0, INTC_TMU0_MSK, 2 },
-        { 21, 1, 0, 0, INTC_RTC_MSK, TIMER_PRIORITY },
-        { 22, 1, 1, 0, INTC_RTC_MSK, TIMER_PRIORITY },
-        { 23, 1, 2, 0, INTC_RTC_MSK, TIMER_PRIORITY },
-        { SCIF0_ERI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
-        { SCIF0_RXI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
-        { SCIF0_BRI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
-        { SCIF0_TXI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
+        { 28, 0, 24, 0, 0, 2 },         /* TMU0 */
 
-        { SCIF1_ERI_IRQ, 8, 16, 0, INTC_SCIF1_MSK, SCIF1_PRIORITY },
-        { SCIF1_RXI_IRQ, 8, 16, 0, INTC_SCIF1_MSK, SCIF1_PRIORITY },
-        { SCIF1_BRI_IRQ, 8, 16, 0, INTC_SCIF1_MSK, SCIF1_PRIORITY },
-        { SCIF1_TXI_IRQ, 8, 16, 0, INTC_SCIF1_MSK, SCIF1_PRIORITY },
+        { 21, 1,  0, 0, 2, 2 },
+        { 22, 1,  1, 0, 2, 2 },
+        { 23, 1,  2, 0, 2, 2 },
 
-        { PCIC0_IRQ, 0x10,  8, 0, INTC_PCIC0_MSK, PCIC0_PRIORITY },
-        { PCIC1_IRQ, 0x10,  0, 0, INTC_PCIC1_MSK, PCIC1_PRIORITY },
-        { PCIC2_IRQ, 0x14, 24, 0, INTC_PCIC2_MSK, PCIC2_PRIORITY },
-        { PCIC3_IRQ, 0x14, 16, 0, INTC_PCIC3_MSK, PCIC3_PRIORITY },
-        { PCIC4_IRQ, 0x14,  8, 0, INTC_PCIC4_MSK, PCIC4_PRIORITY },
+        { 40, 8, 24, 0, 3, 3 },         /* SCIF0 ERI */
+        { 41, 8, 24, 0, 3, 3 },         /* SCIF0 RXI */
+        { 42, 8, 24, 0, 3, 3 },         /* SCIF0 BRI */
+        { 43, 8, 24, 0, 3, 3 },         /* SCIF0 TXI */
+
+        { 76, 8, 16, 0, 4, 3 },         /* SCIF1 ERI */
+        { 77, 8, 16, 0, 4, 3 },         /* SCIF1 RXI */
+        { 78, 8, 16, 0, 4, 3 },         /* SCIF1 BRI */
+        { 79, 8, 16, 0, 4, 3 },         /* SCIF1 TXI */
+
+        { 64, 0x10,  8, 0, 14, 2 },     /* PCIC0 */
+        { 65, 0x10,  0, 0, 15, 2 },     /* PCIC1 */
+        { 66, 0x14, 24, 0, 16, 2 },     /* PCIC2 */
+        { 67, 0x14, 16, 0, 17, 2 },     /* PCIC3 */
+        { 68, 0x14,  8, 0, 18, 2 },     /* PCIC4 */
 };
 
 void __init init_IRQ_intc2(void)
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c
index a00022722e9e..560b91cdd15c 100644
--- a/arch/sh/kernel/early_printk.c
+++ b/arch/sh/kernel/early_printk.c
@@ -12,7 +12,7 @@
 #include <linux/console.h>
 #include <linux/tty.h>
 #include <linux/init.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #ifdef CONFIG_SH_STANDARD_BIOS
 #include <asm/sh_bios.h>
@@ -62,17 +62,9 @@ static struct console bios_console = {
 #include <linux/serial_core.h>
 #include "../../../drivers/serial/sh-sci.h"
 
-#ifdef CONFIG_CPU_SH4
-#define SCIF_REG        0xffe80000
-#elif defined(CONFIG_CPU_SUBTYPE_SH72060)
-#define SCIF_REG        0xfffe9800
-#else
-#error "Undefined SCIF for this subtype"
-#endif
-
 static struct uart_port scif_port = {
-        .mapbase        = SCIF_REG,
-        .membase        = (char __iomem *)SCIF_REG,
+        .mapbase        = CONFIG_EARLY_SCIF_CONSOLE_PORT,
+        .membase        = (char __iomem *)CONFIG_EARLY_SCIF_CONSOLE_PORT,
 };
 
 static void scif_sercon_putc(int c)
@@ -113,23 +105,29 @@ static struct console scif_console = {
         .index          = -1,
 };
 
+#if defined(CONFIG_CPU_SH4) && !defined(CONFIG_SH_STANDARD_BIOS)
+/*
+ * Simple SCIF init, primarily aimed at SH7750 and other similar SH-4
+ * devices that aren't using sh-ipl+g.
+ */
 static void scif_sercon_init(int baud)
 {
-        ctrl_outw(0, SCIF_REG + 8);
-        ctrl_outw(0, SCIF_REG);
+        ctrl_outw(0, scif_port.mapbase + 8);
+        ctrl_outw(0, scif_port.mapbase);
 
         /* Set baud rate */
         ctrl_outb((CONFIG_SH_PCLK_FREQ + 16 * baud) /
-                  (32 * baud) - 1, SCIF_REG + 4);
-
-        ctrl_outw(12, SCIF_REG + 24);
-        ctrl_outw(8, SCIF_REG + 24);
-        ctrl_outw(0, SCIF_REG + 32);
-        ctrl_outw(0x60, SCIF_REG + 16);
-        ctrl_outw(0, SCIF_REG + 36);
-        ctrl_outw(0x30, SCIF_REG + 8);
+                  (32 * baud) - 1, scif_port.mapbase + 4);
+
+        ctrl_outw(12, scif_port.mapbase + 24);
+        ctrl_outw(8, scif_port.mapbase + 24);
+        ctrl_outw(0, scif_port.mapbase + 32);
+        ctrl_outw(0x60, scif_port.mapbase + 16);
+        ctrl_outw(0, scif_port.mapbase + 36);
+        ctrl_outw(0x30, scif_port.mapbase + 8);
 }
-#endif
+#endif /* CONFIG_CPU_SH4 && !CONFIG_SH_STANDARD_BIOS */
+#endif /* CONFIG_EARLY_SCIF_CONSOLE */
 
 /*
  * Setup a default console, if more than one is compiled in, rely on the
@@ -146,16 +144,16 @@ static struct console *early_console =
         ;
 
 static int __initdata keep_early;
+static int early_console_initialized;
 
-int __init setup_early_printk(char *opt)
+int __init setup_early_printk(char *buf)
 {
-        char *space;
-        char buf[256];
+        if (!buf)
+                return 0;
 
-        strlcpy(buf, opt, sizeof(buf));
-        space = strchr(buf, ' ');
-        if (space)
-                *space = 0;
+        if (early_console_initialized)
+                return 0;
+        early_console_initialized = 1;
 
         if (strstr(buf, "keep"))
                 keep_early = 1;
@@ -168,7 +166,7 @@ int __init setup_early_printk(char *opt)
         if (!strncmp(buf, "serial", 6)) {
                 early_console = &scif_console;
 
-#ifdef CONFIG_CPU_SH4
+#if defined(CONFIG_CPU_SH4) && !defined(CONFIG_SH_STANDARD_BIOS)
                 scif_sercon_init(115200);
 #endif
         }
@@ -177,12 +175,14 @@ int __init setup_early_printk(char *opt)
         if (likely(early_console))
                 register_console(early_console);
 
-        return 1;
+        return 0;
 }
-__setup("earlyprintk=", setup_early_printk);
+early_param("earlyprintk", setup_early_printk);
 
 void __init disable_early_printk(void)
 {
+        if (!early_console_initialized || !early_console)
+                return;
         if (!keep_early) {
                 printk("disabling early console\n");
                 unregister_console(early_console);
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S
new file mode 100644
index 000000000000..fc279aeb73ab
--- /dev/null
+++ b/arch/sh/kernel/entry-common.S
@@ -0,0 +1,444 @@
+/* $Id: entry.S,v 1.37 2004/06/11 13:02:46 doyu Exp $
+ *
+ *  linux/arch/sh/entry.S
+ *
+ *  Copyright (C) 1999, 2000, 2002  Niibe Yutaka
+ *  Copyright (C) 2003  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ */
+
+! NOTE:
+! GNU as (as of 2.9.1) changes bf/s into bt/s and bra, when the address
+! to be jumped is too far, but it causes illegal slot exception.
+
+/*      
+ * entry.S contains the system-call and fault low-level handling routines.
+ * This also contains the timer-interrupt handler, as well as all interrupts
+ * and faults that can result in a task-switch.
+ *
+ * NOTE: This code handles signal-recognition, which happens every time
+ * after a timer-interrupt and after each system call.
+ *
+ * NOTE: This code uses a convention that instructions in the delay slot
+ * of a transfer-control instruction are indented by an extra space, thus:
+ *
+ *    jmp       @k0         ! control-transfer instruction
+ *     ldc      k1, ssr     ! delay slot
+ *
+ * Stack layout in 'ret_from_syscall':
+ *      ptrace needs to have all regs on the stack.
+ *      if the order here is changed, it needs to be
+ *      updated in ptrace.c and ptrace.h
+ *
+ *      r0
+ *      ...
+ *      r15 = stack pointer
+ *      spc
+ *      pr
+ *      ssr
+ *      gbr
+ *      mach
+ *      macl
+ *      syscall #
+ *
+ */
+
+#if defined(CONFIG_PREEMPT)
+#  define preempt_stop()        cli
+#else
+#  define preempt_stop()
+#  define resume_kernel         __restore_all
+#endif
+
+#if defined(CONFIG_SH_STANDARD_BIOS) || defined(CONFIG_SH_KGDB)
+! Handle kernel debug if either kgdb (SW) or gdb-stub (FW) is present.
+! If both are configured, handle the debug traps (breakpoints) in SW,
+! but still allow BIOS traps to FW.
+
+        .align  2
+debug_kernel:
+#if defined(CONFIG_SH_STANDARD_BIOS) && defined(CONFIG_SH_KGDB)
+        /* Force BIOS call to FW (debug_trap put TRA in r8) */
+        mov     r8,r0
+        shlr2   r0
+        cmp/eq  #0x3f,r0
+        bt      debug_kernel_fw
+#endif /* CONFIG_SH_STANDARD_BIOS && CONFIG_SH_KGDB */
+
+debug_enter:            
+#if defined(CONFIG_SH_KGDB)
+        /* Jump to kgdb, pass stacked regs as arg */
+debug_kernel_sw:
+        mov.l   3f, r0
+        jmp     @r0
+         mov    r15, r4
+        .align  2
+3:      .long   kgdb_handle_exception
+#endif /* CONFIG_SH_KGDB */
+#ifdef CONFIG_SH_STANDARD_BIOS
+        bra     debug_kernel_fw
+         nop
+#endif
+#endif /* CONFIG_SH_STANDARD_BIOS || CONFIG_SH_KGDB */
+
+        .align  2
+debug_trap:     
+#if defined(CONFIG_SH_STANDARD_BIOS) || defined(CONFIG_SH_KGDB)
+        mov     r8, r0
+        shlr2   r0
+        cmp/eq  #0x3f, r0               ! sh_bios() trap
+        bf      1f
+#ifdef CONFIG_SH_KGDB
+        cmp/eq  #0xff, r0               ! XXX: KGDB trap, fix for SH-2.
+        bf      1f
+#endif
+        mov     #OFF_SR, r0
+        mov.l   @(r0,r15), r0           ! get status register
+        shll    r0
+        shll    r0                      ! kernel space?
+        bt/s    debug_kernel
+1:
+#endif
+         mov.l  @r15, r0                ! Restore R0 value
+        mov.l   1f, r8
+        jmp     @r8
+         nop
+
+        .align  2
+ENTRY(exception_error)
+        !
+#ifdef CONFIG_TRACE_IRQFLAGS
+        mov.l   3f, r0
+        jsr     @r0
+         nop
+#endif
+        sti
+        mov.l   2f, r0
+        jmp     @r0
+         nop
+
+!
+        .align  2
+1:      .long   break_point_trap_software
+2:      .long   do_exception_error
+#ifdef CONFIG_TRACE_IRQFLAGS
+3:      .long   trace_hardirqs_on
+#endif
+
+        .align  2
+ret_from_exception:
+        preempt_stop()
+#ifdef CONFIG_TRACE_IRQFLAGS
+        mov.l   4f, r0
+        jsr     @r0
+         nop
+#endif
+ENTRY(ret_from_irq)
+        !
+        mov     #OFF_SR, r0
+        mov.l   @(r0,r15), r0   ! get status register
+        shll    r0
+        shll    r0              ! kernel space?
+        get_current_thread_info r8, r0
+        bt      resume_kernel   ! Yes, it's from kernel, go back soon
+
+#ifdef CONFIG_PREEMPT
+        bra     resume_userspace
+         nop
+ENTRY(resume_kernel)
+        mov.l   @(TI_PRE_COUNT,r8), r0  ! current_thread_info->preempt_count
+        tst     r0, r0
+        bf      noresched
+need_resched:
+        mov.l   @(TI_FLAGS,r8), r0      ! current_thread_info->flags
+        tst     #_TIF_NEED_RESCHED, r0  ! need_resched set?
+        bt      noresched
+
+        mov     #OFF_SR, r0
+        mov.l   @(r0,r15), r0           ! get status register
+        and     #0xf0, r0               ! interrupts off (exception path)?
+        cmp/eq  #0xf0, r0
+        bt      noresched
+
+        mov.l   1f, r0
+        mov.l   r0, @(TI_PRE_COUNT,r8)
+
+#ifdef CONFIG_TRACE_IRQFLAGS
+        mov.l   3f, r0
+        jsr     @r0
+         nop
+#endif
+        sti
+        mov.l   2f, r0
+        jsr     @r0
+         nop
+        mov     #0, r0
+        mov.l   r0, @(TI_PRE_COUNT,r8)
+        cli
+#ifdef CONFIG_TRACE_IRQFLAGS
+        mov.l   4f, r0
+        jsr     @r0
+         nop
+#endif
+
+        bra     need_resched
+         nop
+
+noresched:
+        bra     __restore_all
+         nop
+
+        .align 2
+1:      .long   PREEMPT_ACTIVE
+2:      .long   schedule
+#ifdef CONFIG_TRACE_IRQFLAGS
+3:      .long   trace_hardirqs_on
+4:      .long   trace_hardirqs_off
+#endif
+#endif
+
+ENTRY(resume_userspace)
+        ! r8: current_thread_info
+        cli
+#ifdef CONFIG_TRACE_IRQFLAGS
+        mov.l   5f, r0
+        jsr     @r0
+         nop
+#endif
+        mov.l   @(TI_FLAGS,r8), r0              ! current_thread_info->flags
+        tst     #_TIF_WORK_MASK, r0
+        bt/s    __restore_all
+         tst    #_TIF_NEED_RESCHED, r0
+
+        .align  2
+work_pending:
+        ! r0: current_thread_info->flags
+        ! r8: current_thread_info
+        ! t:  result of "tst    #_TIF_NEED_RESCHED, r0"
+        bf/s    work_resched
+         tst    #(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), r0
+work_notifysig:
+        bt/s    __restore_all
+         mov    r15, r4
+        mov     r12, r5         ! set arg1(save_r0)
+        mov     r0, r6
+        mov.l   2f, r1
+        mov.l   3f, r0
+        jmp     @r1
+         lds    r0, pr
+work_resched:
+#ifndef CONFIG_PREEMPT
+        ! gUSA handling
+        mov.l   @(OFF_SP,r15), r0       ! get user space stack pointer
+        mov     r0, r1
+        shll    r0
+        bf/s    1f
+         shll   r0
+        bf/s    1f
+         mov    #OFF_PC, r0
+        !                                 SP >= 0xc0000000 : gUSA mark
+        mov.l   @(r0,r15), r2           ! get user space PC (program counter)
+        mov.l   @(OFF_R0,r15), r3       ! end point
+        cmp/hs  r3, r2                  ! r2 >= r3? 
+        bt      1f
+        add     r3, r1                  ! rewind point #2
+        mov.l   r1, @(r0,r15)           ! reset PC to rewind point #2
+        !
+1:
+#endif
+        mov.l   1f, r1
+        jsr     @r1                             ! schedule
+         nop
+        cli
+#ifdef CONFIG_TRACE_IRQFLAGS
+        mov.l   5f, r0
+        jsr     @r0
+         nop
+#endif
+        !
+        mov.l   @(TI_FLAGS,r8), r0              ! current_thread_info->flags
+        tst     #_TIF_WORK_MASK, r0
+        bt      __restore_all
+        bra     work_pending
+         tst    #_TIF_NEED_RESCHED, r0
+
+        .align  2
+1:      .long   schedule
+2:      .long   do_notify_resume
+3:      .long   restore_all
+#ifdef CONFIG_TRACE_IRQFLAGS
+4:      .long   trace_hardirqs_on
+5:      .long   trace_hardirqs_off
+#endif
+
+        .align  2
+syscall_exit_work:
+        ! r0: current_thread_info->flags
+        ! r8: current_thread_info
+        tst     #_TIF_SYSCALL_TRACE, r0
+        bt/s    work_pending
+         tst    #_TIF_NEED_RESCHED, r0
+#ifdef CONFIG_TRACE_IRQFLAGS
+        mov.l   5f, r0
+        jsr     @r0
+         nop
+#endif
+        sti
+        ! XXX setup arguments...
+        mov.l   4f, r0                  ! do_syscall_trace
+        jsr     @r0
+         nop
+        bra     resume_userspace
+         nop
+
+        .align  2
+syscall_trace_entry:
+        !                       Yes it is traced.
+        ! XXX setup arguments...
+        mov.l   4f, r11         ! Call do_syscall_trace which notifies
+        jsr     @r11            ! superior (will chomp R[0-7])
+         nop
+        !                       Reload R0-R4 from kernel stack, where the
+        !                       parent may have modified them using
+        !                       ptrace(POKEUSR).  (Note that R0-R2 are
+        !                       used by the system call handler directly
+        !                       from the kernel stack anyway, so don't need
+        !                       to be reloaded here.)  This allows the parent
+        !                       to rewrite system calls and args on the fly.
+        mov.l   @(OFF_R4,r15), r4   ! arg0
+        mov.l   @(OFF_R5,r15), r5
+        mov.l   @(OFF_R6,r15), r6
+        mov.l   @(OFF_R7,r15), r7   ! arg3
+        mov.l   @(OFF_R3,r15), r3   ! syscall_nr
+        !
+        mov.l   2f, r10                 ! Number of syscalls
+        cmp/hs  r10, r3
+        bf      syscall_call
+        mov     #-ENOSYS, r0
+        bra     syscall_exit
+         mov.l  r0, @(OFF_R0,r15)       ! Return value
+
+__restore_all:
+        mov.l   1f, r0
+        jmp     @r0
+         nop
+
+        .align  2
+1:      .long   restore_all
+
+        .align  2
+not_syscall_tra:        
+        bra     debug_trap
+         nop
+
+        .align  2
+syscall_badsys:                 ! Bad syscall number
+        mov     #-ENOSYS, r0
+        bra     resume_userspace
+         mov.l  r0, @(OFF_R0,r15)       ! Return value
+        
+
+/*
+ * Syscall interface:
+ *
+ *      Syscall #: R3
+ *      Arguments #0 to #3: R4--R7
+ *      Arguments #4 to #6: R0, R1, R2
+ *      TRA: (number of arguments + 0x10) x 4
+ *
+ * This code also handles delegating other traps to the BIOS/gdb stub
+ * according to:
+ *
+ * Trap number
+ * (TRA>>2)         Purpose
+ * --------         -------
+ * 0x0-0xf          old syscall ABI
+ * 0x10-0x1f        new syscall ABI
+ * 0x20-0xff        delegated through debug_trap to BIOS/gdb stub.
+ *
+ * Note: When we're first called, the TRA value must be shifted
+ * right 2 bits in order to get the value that was used as the "trapa"
+ * argument.
+ */
+
+        .align  2
+        .globl  ret_from_fork
+ret_from_fork:
+        mov.l   1f, r8
+        jsr     @r8
+         mov    r0, r4
+        bra     syscall_exit
+         nop
+        .align  2
+1:      .long   schedule_tail
+        !
+ENTRY(system_call)
+#if !defined(CONFIG_CPU_SH2)
+        mov.l   1f, r9
+        mov.l   @r9, r8         ! Read from TRA (Trap Address) Register
+#endif
+        !
+        ! Is the trap argument >= 0x20? (TRA will be >= 0x80)
+        mov     #0x7f, r9
+        cmp/hi  r9, r8
+        bt/s    not_syscall_tra
+         mov    #OFF_TRA, r9
+        add     r15, r9
+        mov.l   r8, @r9                 ! set TRA value to tra
+#ifdef CONFIG_TRACE_IRQFLAGS
+        mov.l   5f, r10
+        jsr     @r10
+         nop
+#endif
+        sti
+
+        !
+        get_current_thread_info r8, r10
+        mov.l   @(TI_FLAGS,r8), r8
+        mov     #_TIF_SYSCALL_TRACE, r10
+        tst     r10, r8
+        bf      syscall_trace_entry
+        !
+        mov.l   2f, r8                  ! Number of syscalls
+        cmp/hs  r8, r3
+        bt      syscall_badsys
+        !
+syscall_call:
+        shll2   r3              ! x4
+        mov.l   3f, r8          ! Load the address of sys_call_table
+        add     r8, r3
+        mov.l   @r3, r8
+        jsr     @r8             ! jump to specific syscall handler
+         nop
+        mov.l   @(OFF_R0,r15), r12              ! save r0
+        mov.l   r0, @(OFF_R0,r15)               ! save the return value
+        !
+syscall_exit:
+        cli
+#ifdef CONFIG_TRACE_IRQFLAGS
+        mov.l   6f, r0
+        jsr     @r0
+         nop
+#endif
+        !
+        get_current_thread_info r8, r0
+        mov.l   @(TI_FLAGS,r8), r0              ! current_thread_info->flags
+        tst     #_TIF_ALLWORK_MASK, r0
+        bf      syscall_exit_work
+        bra     __restore_all
+         nop
+        .align  2
+#if !defined(CONFIG_CPU_SH2)
+1:      .long   TRA
+#endif
+2:      .long   NR_syscalls
+3:      .long   sys_call_table
+4:      .long   do_syscall_trace
+#ifdef CONFIG_TRACE_IRQFLAGS
+5:      .long   trace_hardirqs_on
+6:      .long   trace_hardirqs_off
+#endif
diff --git a/arch/sh/kernel/head.S b/arch/sh/kernel/head.S
index f5f53d14f245..71a3ad7d283e 100644
--- a/arch/sh/kernel/head.S
+++ b/arch/sh/kernel/head.S
@@ -33,7 +33,8 @@ ENTRY(empty_zero_page)
         .long   0x00360000      /* INITRD_START */
         .long   0x000a0000      /* INITRD_SIZE */
         .long   0
-        .balign 4096,0,4096
+1:
+        .skip   PAGE_SIZE - empty_zero_page - 1b
 
         .text   
 /*
@@ -53,8 +54,10 @@ ENTRY(_stext)
         ldc     r0, sr
         !                       Initialize global interrupt mask
         mov     #0, r0
+#ifdef CONFIG_CPU_HAS_SR_RB
         ldc     r0, r6_bank
-
+#endif
+        
         /*
          * Prefetch if possible to reduce cache miss penalty.
          *
@@ -68,11 +71,14 @@ ENTRY(_stext)
         !
         mov.l   2f, r0
         mov     r0, r15         ! Set initial r15 (stack pointer)
-        mov     #(THREAD_SIZE >> 8), r1
+        mov     #(THREAD_SIZE >> 10), r1
         shll8   r1              ! r1 = THREAD_SIZE
+        shll2   r1
         sub     r1, r0          !
+#ifdef CONFIG_CPU_HAS_SR_RB
         ldc     r0, r7_bank     ! ... and initial thread_info
-
+#endif
+        
         !                       Clear BSS area
         mov.l   3f, r1
         add     #4, r1
@@ -95,7 +101,11 @@ ENTRY(_stext)
          nop
 
         .balign 4
+#if defined(CONFIG_CPU_SH2)
+1:      .long   0x000000F0              ! IMASK=0xF
+#else
 1:      .long   0x400080F0              ! MD=1, RB=0, BL=0, FD=1, IMASK=0xF
+#endif
 2:      .long   init_thread_union+THREAD_SIZE
 3:      .long   __bss_start
 4:      .long   _end
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index 944128ce9706..67be2b6e8cd1 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -12,7 +12,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/seq_file.h>
 #include <linux/io.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
 #include <asm/thread_info.h>
@@ -78,15 +78,16 @@ union irq_ctx {
         u32                     stack[THREAD_SIZE/sizeof(u32)];
 };
 
-static union irq_ctx *hardirq_ctx[NR_CPUS];
-static union irq_ctx *softirq_ctx[NR_CPUS];
+static union irq_ctx *hardirq_ctx[NR_CPUS] __read_mostly;
+static union irq_ctx *softirq_ctx[NR_CPUS] __read_mostly;
 #endif
 
 asmlinkage int do_IRQ(unsigned long r4, unsigned long r5,
                       unsigned long r6, unsigned long r7,
-                      struct pt_regs regs)
+                      struct pt_regs __regs)
 {
-        struct pt_regs *old_regs = set_irq_regs(&regs);
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+        struct pt_regs *old_regs = set_irq_regs(regs);
         int irq;
 #ifdef CONFIG_4KSTACKS
         union irq_ctx *curctx, *irqctx;
@@ -111,7 +112,7 @@ asmlinkage int do_IRQ(unsigned long r4, unsigned long r5,
 #endif
 
 #ifdef CONFIG_CPU_HAS_INTEVT
-        irq = (ctrl_inl(INTEVT) >> 5) - 16;
+        irq = evt2irq(ctrl_inl(INTEVT));
 #else
         irq = r4;
 #endif
@@ -135,17 +136,24 @@ asmlinkage int do_IRQ(unsigned long r4, unsigned long r5,
                 irqctx->tinfo.task = curctx->tinfo.task;
                 irqctx->tinfo.previous_sp = current_stack_pointer;
 
+                /*
+                 * Copy the softirq bits in preempt_count so that the
+                 * softirq checks work in the hardirq context.
+                 */
+                irqctx->tinfo.preempt_count =
+                        (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
+                        (curctx->tinfo.preempt_count & SOFTIRQ_MASK);
+
                 __asm__ __volatile__ (
                         "mov    %0, r4          \n"
-                        "mov    r15, r9         \n"
+                        "mov    r15, r8         \n"
                         "jsr    @%1             \n"
                         /* swith to the irq stack */
                         " mov   %2, r15         \n"
                         /* restore the stack (ring zero) */
-                        "mov    r9, r15         \n"
+                        "mov    r8, r15         \n"
                         : /* no outputs */
                         : "r" (irq), "r" (generic_handle_irq), "r" (isp)
-                        /* XXX: A somewhat excessive clobber list? -PFM */
                         : "memory", "r0", "r1", "r2", "r3", "r4",
                           "r5", "r6", "r7", "r8", "t", "pr"
                 );
@@ -193,7 +201,7 @@ void irq_ctx_init(int cpu)
         irqctx->tinfo.task              = NULL;
         irqctx->tinfo.exec_domain       = NULL;
         irqctx->tinfo.cpu               = cpu;
-        irqctx->tinfo.preempt_count     = SOFTIRQ_OFFSET;
+        irqctx->tinfo.preempt_count     = 0;
         irqctx->tinfo.addr_limit        = MAKE_MM_SEG(0);
 
         softirq_ctx[cpu] = irqctx;
@@ -239,13 +247,38 @@ asmlinkage void do_softirq(void)
                         "mov    r9, r15         \n"
                         : /* no outputs */
                         : "r" (__do_softirq), "r" (isp)
-                        /* XXX: A somewhat excessive clobber list? -PFM */
                         : "memory", "r0", "r1", "r2", "r3", "r4",
                           "r5", "r6", "r7", "r8", "r9", "r15", "t", "pr"
                 );
+
+                /*
+                 * Shouldnt happen, we returned above if in_interrupt():
+                 */
+                WARN_ON_ONCE(softirq_count());
         }
 
         local_irq_restore(flags);
 }
 EXPORT_SYMBOL(do_softirq);
 #endif
+
+void __init init_IRQ(void)
+{
+#ifdef CONFIG_CPU_HAS_PINT_IRQ
+        init_IRQ_pint();
+#endif
+
+#ifdef CONFIG_CPU_HAS_INTC2_IRQ
+        init_IRQ_intc2();
+#endif
+
+#ifdef CONFIG_CPU_HAS_IPR_IRQ
+        init_IRQ_ipr();
+#endif
+
+        /* Perform the machine specific initialisation */
+        if (sh_mv.mv_init_irq)
+                sh_mv.mv_init_irq();
+
+        irq_ctx_init(smp_processor_id());
+}
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index a52b13ac6b7f..486c06e18033 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -385,10 +385,11 @@ struct task_struct *__switch_to(struct task_struct *prev, struct task_struct *ne
 
 asmlinkage int sys_fork(unsigned long r4, unsigned long r5,
                         unsigned long r6, unsigned long r7,
-                        struct pt_regs regs)
+                        struct pt_regs __regs)
 {
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
 #ifdef CONFIG_MMU
-        return do_fork(SIGCHLD, regs.regs[15], &regs, 0, NULL, NULL);
+        return do_fork(SIGCHLD, regs->regs[15], regs, 0, NULL, NULL);
 #else
         /* fork almost works, enough to trick you into looking elsewhere :-( */
         return -EINVAL;
@@ -398,11 +399,12 @@ asmlinkage int sys_fork(unsigned long r4, unsigned long r5,
 asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
                          unsigned long parent_tidptr,
                          unsigned long child_tidptr,
-                         struct pt_regs regs)
+                         struct pt_regs __regs)
 {
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
         if (!newsp)
-                newsp = regs.regs[15];
-        return do_fork(clone_flags, newsp, &regs, 0,
+                newsp = regs->regs[15];
+        return do_fork(clone_flags, newsp, regs, 0,
                         (int __user *)parent_tidptr, (int __user *)child_tidptr);
 }
 
@@ -418,9 +420,10 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
  */
 asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,
                          unsigned long r6, unsigned long r7,
-                         struct pt_regs regs)
+                         struct pt_regs __regs)
 {
-        return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs.regs[15], &regs,
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+        return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->regs[15], regs,
                        0, NULL, NULL);
 }
 
@@ -429,8 +432,9 @@ asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,
  */
 asmlinkage int sys_execve(char *ufilename, char **uargv,
                           char **uenvp, unsigned long r7,
-                          struct pt_regs regs)
+                          struct pt_regs __regs)
 {
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
         int error;
         char *filename;
 
@@ -442,7 +446,7 @@ asmlinkage int sys_execve(char *ufilename, char **uargv,
         error = do_execve(filename,
                           (char __user * __user *)uargv,
                           (char __user * __user *)uenvp,
-                          &regs);
+                          regs);
         if (error == 0) {
                 task_lock(current);
                 current->ptrace &= ~PT_DTRACE;
@@ -466,15 +470,14 @@ unsigned long get_wchan(struct task_struct *p)
          */
         pc = thread_saved_pc(p);
         if (in_sched_functions(pc)) {
-                schedule_frame = ((unsigned long *)(long)p->thread.sp)[1];
-                return (unsigned long)((unsigned long *)schedule_frame)[1];
+                schedule_frame = (unsigned long)p->thread.sp;
+                return ((unsigned long *)schedule_frame)[21];
         }
+
         return pc;
 }
 
-asmlinkage void break_point_trap(unsigned long r4, unsigned long r5,
-                                 unsigned long r6, unsigned long r7,
-                                 struct pt_regs regs)
+asmlinkage void break_point_trap(void)
 {
         /* Clear tracing.  */
 #if defined(CONFIG_CPU_SH4A)
@@ -492,8 +495,20 @@ asmlinkage void break_point_trap(unsigned long r4, unsigned long r5,
 
 asmlinkage void break_point_trap_software(unsigned long r4, unsigned long r5,
                                           unsigned long r6, unsigned long r7,
-                                          struct pt_regs regs)
+                                          struct pt_regs __regs)
 {
-        regs.pc -= 2;
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+
+        /* Rewind */
+        regs->pc -= 2;
+
+#ifdef CONFIG_BUG
+        if (__kernel_text_address(instruction_pointer(regs))) {
+                u16 insn = *(u16 *)instruction_pointer(regs);
+                if (insn == TRAPA_BUG_OPCODE)
+                        handle_BUG(regs);
+        }
+#endif
+
         force_sig(SIGTRAP, current);
 }
diff --git a/arch/sh/kernel/relocate_kernel.S b/arch/sh/kernel/relocate_kernel.S
index 8221b37c9773..c66cb3209db5 100644
--- a/arch/sh/kernel/relocate_kernel.S
+++ b/arch/sh/kernel/relocate_kernel.S
@@ -7,11 +7,9 @@
  * This source code is licensed under the GNU General Public License,
  * Version 2.  See the file COPYING for more details.
  */
-
 #include <linux/linkage.h>
-
-#define PAGE_SIZE      4096 /* must be same value as in <asm/page.h> */
-
+#include <asm/addrspace.h>
+#include <asm/page.h>
 
                 .globl relocate_new_kernel
 relocate_new_kernel:
@@ -20,8 +18,8 @@ relocate_new_kernel:
         /* r6 = start_address      */
         /* r7 = vbr_reg            */
 
-        mov.l   10f,r8    /* 4096 */
-        mov.l   11f,r9    /* 0xa0000000 */
+        mov.l   10f,r8    /* PAGE_SIZE */
+        mov.l   11f,r9    /* P2SEG */
 
         /*  stack setting */
         add     r8,r5
@@ -32,7 +30,7 @@ relocate_new_kernel:
 0:
         mov.l   @r4+,r0   /* cmd = *ind++ */
 
-1:      /* addr = (cmd | 0xa0000000) & 0xfffffff0 */
+1:      /* addr = (cmd | P2SEG) & 0xfffffff0 */
         mov     r0,r2
         or      r9,r2
         mov     #-16,r1
@@ -92,7 +90,7 @@ relocate_new_kernel:
 10:
         .long   PAGE_SIZE
 11:
-        .long   0xa0000000
+        .long   P2SEG
 
 relocate_new_kernel_end:
 
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 36d86f9ac38a..225f9ea5cdd7 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -84,8 +84,7 @@ unsigned long memory_start, memory_end;
 
 static inline void parse_cmdline (char ** cmdline_p, char mv_name[MV_NAME_SIZE],
                                   struct sh_machine_vector** mvp,
-                                  unsigned long *mv_io_base,
-                                  int *mv_mmio_enable)
+                                  unsigned long *mv_io_base)
 {
         char c = ' ', *to = command_line, *from = COMMAND_LINE;
         int len = 0;
@@ -112,23 +111,6 @@ static inline void parse_cmdline (char ** cmdline_p, char mv_name[MV_NAME_SIZE],
                         }
                 }
 
-#ifdef CONFIG_EARLY_PRINTK
-                if (c == ' ' && !memcmp(from, "earlyprintk=", 12)) {
-                        char *ep_end;
-
-                        if (to != command_line)
-                                to--;
-
-                        from += 12;
-                        ep_end = strchr(from, ' ');
-
-                        setup_early_printk(from);
-                        printk("early console enabled\n");
-
-                        from = ep_end;
-                }
-#endif
-
                 if (c == ' ' && !memcmp(from, "sh_mv=", 6)) {
                         char* mv_end;
                         char* mv_comma;
@@ -145,7 +127,6 @@ static inline void parse_cmdline (char ** cmdline_p, char mv_name[MV_NAME_SIZE],
                                 int ints[3];
                                 get_options(mv_comma+1, ARRAY_SIZE(ints), ints);
                                 *mv_io_base = ints[1];
-                                *mv_mmio_enable = ints[2];
                                 mv_len = mv_comma - from;
                         } else {
                                 mv_len = mv_end - from;
@@ -158,6 +139,7 @@ static inline void parse_cmdline (char ** cmdline_p, char mv_name[MV_NAME_SIZE],
 
                         *mvp = get_mv_byname(mv_name);
                 }
+
                 c = *(from++);
                 if (!c)
                         break;
@@ -177,9 +159,8 @@ static int __init sh_mv_setup(char **cmdline_p)
         struct sh_machine_vector *mv = NULL;
         char mv_name[MV_NAME_SIZE] = "";
         unsigned long mv_io_base = 0;
-        int mv_mmio_enable = 0;
 
-        parse_cmdline(cmdline_p, mv_name, &mv, &mv_io_base, &mv_mmio_enable);
+        parse_cmdline(cmdline_p, mv_name, &mv, &mv_io_base);
 
 #ifdef CONFIG_SH_UNKNOWN
         if (mv == NULL) {
@@ -258,6 +239,7 @@ void __init setup_arch(char **cmdline_p)
 
         sh_mv_setup(cmdline_p);
 
+
         /*
          * Find the highest page frame number we have available
          */
@@ -305,6 +287,7 @@ void __init setup_arch(char **cmdline_p)
                                   PFN_PHYS(pages));
         }
 
+
         /*
          * Reserve the kernel text and
          * Reserve the bootmem bitmap. We do this in two steps (first step
@@ -325,15 +308,18 @@ void __init setup_arch(char **cmdline_p)
         ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
         if (&__rd_start != &__rd_end) {
                 LOADER_TYPE = 1;
-                INITRD_START = PHYSADDR((unsigned long)&__rd_start) - __MEMORY_START;
-                INITRD_SIZE = (unsigned long)&__rd_end - (unsigned long)&__rd_start;
+                INITRD_START = PHYSADDR((unsigned long)&__rd_start) -
+                                        __MEMORY_START;
+                INITRD_SIZE = (unsigned long)&__rd_end -
+                              (unsigned long)&__rd_start;
         }
 
         if (LOADER_TYPE && INITRD_START) {
                 if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) {
-                        reserve_bootmem_node(NODE_DATA(0), INITRD_START+__MEMORY_START, INITRD_SIZE);
-                        initrd_start =
-                                INITRD_START ? INITRD_START + PAGE_OFFSET + __MEMORY_START : 0;
+                        reserve_bootmem_node(NODE_DATA(0), INITRD_START +
+                                                __MEMORY_START, INITRD_SIZE);
+                        initrd_start = INITRD_START + PAGE_OFFSET +
+                                        __MEMORY_START;
                         initrd_end = initrd_start + INITRD_SIZE;
                 } else {
                         printk("initrd extends beyond end of memory "
@@ -392,6 +378,7 @@ static int __init topology_init(void)
 subsys_initcall(topology_init);
 
 static const char *cpu_name[] = {
+        [CPU_SH7206]    = "SH7206",     [CPU_SH7619]    = "SH7619",
         [CPU_SH7604]    = "SH7604",     [CPU_SH7300]    = "SH7300",
         [CPU_SH7705]    = "SH7705",     [CPU_SH7706]    = "SH7706",
         [CPU_SH7707]    = "SH7707",     [CPU_SH7708]    = "SH7708",
@@ -404,6 +391,7 @@ static const char *cpu_name[] = {
         [CPU_SH4_202]   = "SH4-202",    [CPU_SH4_501]   = "SH4-501",
         [CPU_SH7770]    = "SH7770",     [CPU_SH7780]    = "SH7780",
         [CPU_SH7781]    = "SH7781",     [CPU_SH7343]    = "SH7343",
+        [CPU_SH7785]    = "SH7785",     [CPU_SH7722]    = "SH7722",
         [CPU_SH_NONE]   = "Unknown"
 };
 
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c
index 9daad70bc305..e6106239a0fe 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;
@@ -71,15 +70,26 @@ DECLARE_EXPORT(__sdivsi3);
 DECLARE_EXPORT(__ashrdi3);
 DECLARE_EXPORT(__ashldi3);
 DECLARE_EXPORT(__lshrdi3);
-DECLARE_EXPORT(__movstr);
 DECLARE_EXPORT(__movstrSI16);
-
-EXPORT_SYMBOL(strcpy);
+#if __GNUC__ == 4
+DECLARE_EXPORT(__movmem);
+#else
+DECLARE_EXPORT(__movstr);
+#endif
 
 #ifdef CONFIG_CPU_SH4
+#if __GNUC__ == 4
+DECLARE_EXPORT(__movmem_i4_even);
+DECLARE_EXPORT(__movmem_i4_odd);
+DECLARE_EXPORT(__movmemSI12_i4);
+DECLARE_EXPORT(__sdivsi3_i4i);
+DECLARE_EXPORT(__udiv_qrnnd_16);
+DECLARE_EXPORT(__udivsi3_i4i);
+#else /* GCC 3.x */
 DECLARE_EXPORT(__movstr_i4_even);
 DECLARE_EXPORT(__movstr_i4_odd);
 DECLARE_EXPORT(__movstrSI12_i4);
+#endif /* __GNUC__ == 4 */
 #endif
 
 #if defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB)
@@ -102,10 +112,6 @@ EXPORT_SYMBOL(__down_trylock);
 EXPORT_SYMBOL(synchronize_irq);
 #endif
 
-#ifdef CONFIG_PM
-EXPORT_SYMBOL(pm_suspend);
-#endif
-
 EXPORT_SYMBOL(csum_partial);
 #ifdef CONFIG_IPV6
 EXPORT_SYMBOL(csum_ipv6_magic);
diff --git a/arch/sh/kernel/signal.c b/arch/sh/kernel/signal.c
index 5213f5bc6ce0..379c88bf5d9a 100644
--- a/arch/sh/kernel/signal.c
+++ b/arch/sh/kernel/signal.c
@@ -23,6 +23,7 @@
 #include <linux/elf.h>
 #include <linux/personality.h>
 #include <linux/binfmts.h>
+#include <linux/freezer.h>
 
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
@@ -37,7 +38,7 @@
 asmlinkage int
 sys_sigsuspend(old_sigset_t mask,
                unsigned long r5, unsigned long r6, unsigned long r7,
-               struct pt_regs regs)
+               struct pt_regs __regs)
 {
         mask &= _BLOCKABLE;
         spin_lock_irq(&current->sighand->siglock);
@@ -52,7 +53,7 @@ sys_sigsuspend(old_sigset_t mask,
         return -ERESTARTNOHAND;
 }
 
-asmlinkage int 
+asmlinkage int
 sys_sigaction(int sig, const struct old_sigaction __user *act,
               struct old_sigaction __user *oact)
 {
@@ -87,9 +88,11 @@ sys_sigaction(int sig, const struct old_sigaction __user *act,
 asmlinkage int
 sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
                 unsigned long r6, unsigned long r7,
-                struct pt_regs regs)
+                struct pt_regs __regs)
 {
-        return do_sigaltstack(uss, uoss, regs.regs[15]);
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+
+        return do_sigaltstack(uss, uoss, regs->regs[15]);
 }
 
 
@@ -98,7 +101,11 @@ sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
  */
 
 #define MOVW(n)  (0x9300|((n)-2))       /* Move mem word at PC+n to R3 */
-#define TRAP16   0xc310                 /* Syscall w/no args (NR in R3) */
+#if defined(CONFIG_CPU_SH2)
+#define TRAP_NOARG 0xc320               /* Syscall w/no args (NR in R3) */
+#else
+#define TRAP_NOARG 0xc310               /* Syscall w/no args (NR in R3) */
+#endif
 #define OR_R0_R0 0x200b                 /* or r0,r0 (insert to avoid hardware bug) */
 
 struct sigframe
@@ -194,9 +201,10 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *r0_p
 
 asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5,
                              unsigned long r6, unsigned long r7,
-                             struct pt_regs regs)
+                             struct pt_regs __regs)
 {
-        struct sigframe __user *frame = (struct sigframe __user *)regs.regs[15];
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+        struct sigframe __user *frame = (struct sigframe __user *)regs->regs[15];
         sigset_t set;
         int r0;
 
@@ -216,7 +224,7 @@ asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5,
         recalc_sigpending();
         spin_unlock_irq(&current->sighand->siglock);
 
-        if (restore_sigcontext(&regs, &frame->sc, &r0))
+        if (restore_sigcontext(regs, &frame->sc, &r0))
                 goto badframe;
         return r0;
 
@@ -227,9 +235,10 @@ badframe:
 
 asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
                                 unsigned long r6, unsigned long r7,
-                                struct pt_regs regs)
+                                struct pt_regs __regs)
 {
-        struct rt_sigframe __user *frame = (struct rt_sigframe __user *)regs.regs[15];
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+        struct rt_sigframe __user *frame = (struct rt_sigframe __user *)regs->regs[15];
         sigset_t set;
         stack_t st;
         int r0;
@@ -246,14 +255,14 @@ asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
         recalc_sigpending();
         spin_unlock_irq(&current->sighand->siglock);
 
-        if (restore_sigcontext(&regs, &frame->uc.uc_mcontext, &r0))
+        if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &r0))
                 goto badframe;
 
         if (__copy_from_user(&st, &frame->uc.uc_stack, sizeof(st)))
                 goto badframe;
         /* It is more difficult to avoid calling this function than to
            call it and ignore errors.  */
-        do_sigaltstack(&st, NULL, regs.regs[15]);
+        do_sigaltstack(&st, NULL, regs->regs[15]);
 
         return r0;
 
@@ -350,7 +359,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,
         } else {
                 /* Generate return code (system call to sigreturn) */
                 err |= __put_user(MOVW(7), &frame->retcode[0]);
-                err |= __put_user(TRAP16, &frame->retcode[1]);
+                err |= __put_user(TRAP_NOARG, &frame->retcode[1]);
                 err |= __put_user(OR_R0_R0, &frame->retcode[2]);
                 err |= __put_user(OR_R0_R0, &frame->retcode[3]);
                 err |= __put_user(OR_R0_R0, &frame->retcode[4]);
@@ -430,7 +439,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         } else {
                 /* Generate return code (system call to rt_sigreturn) */
                 err |= __put_user(MOVW(7), &frame->retcode[0]);
-                err |= __put_user(TRAP16, &frame->retcode[1]);
+                err |= __put_user(TRAP_NOARG, &frame->retcode[1]);
                 err |= __put_user(OR_R0_R0, &frame->retcode[2]);
                 err |= __put_user(OR_R0_R0, &frame->retcode[3]);
                 err |= __put_user(OR_R0_R0, &frame->retcode[4]);
diff --git a/arch/sh/kernel/stacktrace.c b/arch/sh/kernel/stacktrace.c
new file mode 100644
index 000000000000..0d5268afe80f
--- /dev/null
+++ b/arch/sh/kernel/stacktrace.c
@@ -0,0 +1,43 @@
+/*
+ * arch/sh/kernel/stacktrace.c
+ *
+ * Stack trace management functions
+ *
+ *  Copyright (C) 2006  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/sched.h>
+#include <linux/stacktrace.h>
+#include <linux/thread_info.h>
+#include <asm/ptrace.h>
+
+/*
+ * Save stack-backtrace addresses into a stack_trace buffer.
+ */
+void save_stack_trace(struct stack_trace *trace, struct task_struct *task)
+{
+        unsigned long *sp;
+
+        if (!task)
+                task = current;
+        if (task == current)
+                sp = (unsigned long *)current_stack_pointer;
+        else
+                sp = (unsigned long *)task->thread.sp;
+
+        while (!kstack_end(sp)) {
+                unsigned long addr = *sp++;
+
+                if (__kernel_text_address(addr)) {
+                        if (trace->skip > 0)
+                                trace->skip--;
+                        else
+                                trace->entries[trace->nr_entries++] = addr;
+                        if (trace->nr_entries >= trace->max_entries)
+                                break;
+                }
+        }
+}
diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c
index 8fde95001c34..e18f183e1035 100644
--- a/arch/sh/kernel/sys_sh.c
+++ b/arch/sh/kernel/sys_sh.c
@@ -33,14 +33,15 @@
  */
 asmlinkage int sys_pipe(unsigned long r4, unsigned long r5,
         unsigned long r6, unsigned long r7,
-        struct pt_regs regs)
+        struct pt_regs __regs)
 {
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
         int fd[2];
         int error;
 
         error = do_pipe(fd);
         if (!error) {
-                regs.regs[1] = fd[1];
+                regs->regs[1] = fd[1];
                 return fd[0];
         }
         return error;
@@ -50,6 +51,7 @@ unsigned long shm_align_mask = PAGE_SIZE - 1;	/* Sane caches */
 
 EXPORT_SYMBOL(shm_align_mask);
 
+#ifdef CONFIG_MMU
 /*
  * To avoid cache aliases, we map the shared page with same color.
  */
@@ -135,6 +137,7 @@ full_search:
                         addr = COLOUR_ALIGN(addr, pgoff);
         }
 }
+#endif /* CONFIG_MMU */
 
 static inline long
 do_mmap2(unsigned long addr, unsigned long len, unsigned long prot, 
@@ -311,6 +314,12 @@ asmlinkage int sys_fadvise64_64_wrapper(int fd, u32 offset0, u32 offset1,
 #endif
 }
 
+#if defined(CONFIG_CPU_SH2) || defined(CONFIG_CPU_SH2A)
+#define SYSCALL_ARG3    "trapa #0x23"
+#else
+#define SYSCALL_ARG3    "trapa #0x13"
+#endif
+
 /*
  * Do a system call from kernel instead of calling sys_execve so we
  * end up with proper pt_regs.
@@ -321,7 +330,7 @@ int kernel_execve(const char *filename, char *const argv[], char *const envp[])
         register long __sc4 __asm__ ("r4") = (long) filename;
         register long __sc5 __asm__ ("r5") = (long) argv;
         register long __sc6 __asm__ ("r6") = (long) envp;
-        __asm__ __volatile__ ("trapa    #0x13" : "=z" (__sc0)
+        __asm__ __volatile__ (SYSCALL_ARG3 : "=z" (__sc0)       
                         : "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6)
                         : "memory");
         return __sc0;
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index 57e708d7b52d..c206c9504c4b 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -13,6 +13,8 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/profile.h>
+#include <linux/timex.h>
+#include <linux/sched.h>
 #include <asm/clock.h>
 #include <asm/rtc.h>
 #include <asm/timer.h>
@@ -50,15 +52,20 @@ unsigned long long __attribute__ ((weak)) sched_clock(void)
 #ifndef CONFIG_GENERIC_TIME
 void do_gettimeofday(struct timeval *tv)
 {
+        unsigned long flags;
         unsigned long seq;
         unsigned long usec, sec;
 
         do {
-                seq = read_seqbegin(&xtime_lock);
+                /*
+                 * Turn off IRQs when grabbing xtime_lock, so that
+                 * the sys_timer get_offset code doesn't have to handle it.
+                 */
+                seq = read_seqbegin_irqsave(&xtime_lock, flags);
                 usec = get_timer_offset();
                 sec = xtime.tv_sec;
-                usec += xtime.tv_nsec / 1000;
-        } while (read_seqretry(&xtime_lock, seq));
+                usec += xtime.tv_nsec / NSEC_PER_USEC;
+        } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
 
         while (usec >= 1000000) {
                 usec -= 1000000;
@@ -85,7 +92,7 @@ int do_settimeofday(struct timespec *tv)
          * wall time.  Discover what correction gettimeofday() would have
          * made, and then undo it!
          */
-        nsec -= 1000 * get_timer_offset();
+        nsec -= get_timer_offset() * NSEC_PER_USEC;
 
         wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
         wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
@@ -169,6 +176,108 @@ static struct sysdev_class timer_sysclass = {
         .resume  = timer_resume,
 };
 
+#ifdef CONFIG_NO_IDLE_HZ
+static int timer_dyn_tick_enable(void)
+{
+        struct dyn_tick_timer *dyn_tick = sys_timer->dyn_tick;
+        unsigned long flags;
+        int ret = -ENODEV;
+
+        if (dyn_tick) {
+                spin_lock_irqsave(&dyn_tick->lock, flags);
+                ret = 0;
+                if (!(dyn_tick->state & DYN_TICK_ENABLED)) {
+                        ret = dyn_tick->enable();
+
+                        if (ret == 0)
+                                dyn_tick->state |= DYN_TICK_ENABLED;
+                }
+                spin_unlock_irqrestore(&dyn_tick->lock, flags);
+        }
+
+        return ret;
+}
+
+static int timer_dyn_tick_disable(void)
+{
+        struct dyn_tick_timer *dyn_tick = sys_timer->dyn_tick;
+        unsigned long flags;
+        int ret = -ENODEV;
+
+        if (dyn_tick) {
+                spin_lock_irqsave(&dyn_tick->lock, flags);
+                ret = 0;
+                if (dyn_tick->state & DYN_TICK_ENABLED) {
+                        ret = dyn_tick->disable();
+
+                        if (ret == 0)
+                                dyn_tick->state &= ~DYN_TICK_ENABLED;
+                }
+                spin_unlock_irqrestore(&dyn_tick->lock, flags);
+        }
+
+        return ret;
+}
+
+/*
+ * Reprogram the system timer for at least the calculated time interval.
+ * This function should be called from the idle thread with IRQs disabled,
+ * immediately before sleeping.
+ */
+void timer_dyn_reprogram(void)
+{
+        struct dyn_tick_timer *dyn_tick = sys_timer->dyn_tick;
+        unsigned long next, seq, flags;
+
+        if (!dyn_tick)
+                return;
+
+        spin_lock_irqsave(&dyn_tick->lock, flags);
+        if (dyn_tick->state & DYN_TICK_ENABLED) {
+                next = next_timer_interrupt();
+                do {
+                        seq = read_seqbegin(&xtime_lock);
+                        dyn_tick->reprogram(next - jiffies);
+                } while (read_seqretry(&xtime_lock, seq));
+        }
+        spin_unlock_irqrestore(&dyn_tick->lock, flags);
+}
+
+static ssize_t timer_show_dyn_tick(struct sys_device *dev, char *buf)
+{
+        return sprintf(buf, "%i\n",
+                       (sys_timer->dyn_tick->state & DYN_TICK_ENABLED) >> 1);
+}
+
+static ssize_t timer_set_dyn_tick(struct sys_device *dev, const char *buf,
+                                  size_t count)
+{
+        unsigned int enable = simple_strtoul(buf, NULL, 2);
+
+        if (enable)
+                timer_dyn_tick_enable();
+        else
+                timer_dyn_tick_disable();
+
+        return count;
+}
+static SYSDEV_ATTR(dyn_tick, 0644, timer_show_dyn_tick, timer_set_dyn_tick);
+
+/*
+ * dyntick=enable|disable
+ */
+static char dyntick_str[4] __initdata = "";
+
+static int __init dyntick_setup(char *str)
+{
+        if (str)
+                strlcpy(dyntick_str, str, sizeof(dyntick_str));
+        return 1;
+}
+
+__setup("dyntick=", dyntick_setup);
+#endif
+
 static int __init timer_init_sysfs(void)
 {
         int ret = sysdev_class_register(&timer_sysclass);
@@ -176,7 +285,22 @@ static int __init timer_init_sysfs(void)
                 return ret;
 
         sys_timer->dev.cls = &timer_sysclass;
-        return sysdev_register(&sys_timer->dev);
+        ret = sysdev_register(&sys_timer->dev);
+
+#ifdef CONFIG_NO_IDLE_HZ
+        if (ret == 0 && sys_timer->dyn_tick) {
+                ret = sysdev_create_file(&sys_timer->dev, &attr_dyn_tick);
+
+                /*
+                 * Turn on dynamic tick after calibrate delay
+                 * for correct bogomips
+                 */
+                if (ret == 0 && dyntick_str[0] == 'e')
+                        ret = timer_dyn_tick_enable();
+        }
+#endif
+
+        return ret;
 }
 device_initcall(timer_init_sysfs);
 
@@ -200,6 +324,11 @@ void __init time_init(void)
         sys_timer = get_sys_timer();
         printk(KERN_INFO "Using %s for system timer\n", sys_timer->name);
 
+#ifdef CONFIG_NO_IDLE_HZ
+        if (sys_timer->dyn_tick)
+                spin_lock_init(&sys_timer->dyn_tick->lock);
+#endif
+
 #if defined(CONFIG_SH_KGDB)
         /*
          * Set up kgdb as requested. We do it here because the serial
diff --git a/arch/sh/kernel/timers/Makefile b/arch/sh/kernel/timers/Makefile
index 151a6a304cec..bcf244ff6a12 100644
--- a/arch/sh/kernel/timers/Makefile
+++ b/arch/sh/kernel/timers/Makefile
@@ -5,4 +5,6 @@
 obj-y   := timer.o
 
 obj-$(CONFIG_SH_TMU)            += timer-tmu.o
+obj-$(CONFIG_SH_MTU2)           += timer-mtu2.o
+obj-$(CONFIG_SH_CMT)            += timer-cmt.o
 
diff --git a/arch/sh/kernel/timers/timer-cmt.c b/arch/sh/kernel/timers/timer-cmt.c
new file mode 100644
index 000000000000..a574b93a4e7b
--- /dev/null
+++ b/arch/sh/kernel/timers/timer-cmt.c
@@ -0,0 +1,196 @@
+/*
+ * arch/sh/kernel/timers/timer-cmt.c - CMT Timer Support
+ *
+ *  Copyright (C) 2005  Yoshinori Sato
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/seqlock.h>
+#include <asm/timer.h>
+#include <asm/rtc.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/clock.h>
+
+#if defined(CONFIG_CPU_SUBTYPE_SH7619)
+#define CMT_CMSTR       0xf84a0070
+#define CMT_CMCSR_0     0xf84a0072
+#define CMT_CMCNT_0     0xf84a0074
+#define CMT_CMCOR_0     0xf84a0076
+#define CMT_CMCSR_1     0xf84a0078
+#define CMT_CMCNT_1     0xf84a007a
+#define CMT_CMCOR_1     0xf84a007c
+
+#define STBCR3          0xf80a0000
+#define cmt_clock_enable() do { ctrl_outb(ctrl_inb(STBCR3) & ~0x10, STBCR3); } while(0)
+#define CMT_CMCSR_INIT  0x0040
+#define CMT_CMCSR_CALIB 0x0000
+#elif defined(CONFIG_CPU_SUBTYPE_SH7206)
+#define CMT_CMSTR       0xfffec000
+#define CMT_CMCSR_0     0xfffec002
+#define CMT_CMCNT_0     0xfffec004
+#define CMT_CMCOR_0     0xfffec006
+
+#define STBCR4          0xfffe040c
+#define cmt_clock_enable() do { ctrl_outb(ctrl_inb(STBCR4) & ~0x04, STBCR4); } while(0)
+#define CMT_CMCSR_INIT  0x0040
+#define CMT_CMCSR_CALIB 0x0000
+#else
+#error "Unknown CPU SUBTYPE"
+#endif
+
+static unsigned long cmt_timer_get_offset(void)
+{
+        int count;
+        static unsigned short count_p = 0xffff;    /* for the first call after boot */
+        static unsigned long jiffies_p = 0;
+
+        /*
+         * cache volatile jiffies temporarily; we have IRQs turned off.
+         */
+        unsigned long jiffies_t;
+
+        /* timer count may underflow right here */
+        count =  ctrl_inw(CMT_CMCOR_0);
+        count -= ctrl_inw(CMT_CMCNT_0);
+
+        jiffies_t = jiffies;
+
+        /*
+         * avoiding timer inconsistencies (they are rare, but they happen)...
+         * there is one kind of problem that must be avoided here:
+         *  1. the timer counter underflows
+         */
+
+        if (jiffies_t == jiffies_p) {
+                if (count > count_p) {
+                        /* the nutcase */
+                        if (ctrl_inw(CMT_CMCSR_0) & 0x80) { /* Check CMF bit */
+                                count -= LATCH;
+                        } else {
+                                printk("%s (): hardware timer problem?\n",
+                                       __FUNCTION__);
+                        }
+                }
+        } else
+                jiffies_p = jiffies_t;
+
+        count_p = count;
+
+        count = ((LATCH-1) - count) * TICK_SIZE;
+        count = (count + LATCH/2) / LATCH;
+
+        return count;
+}
+
+static irqreturn_t cmt_timer_interrupt(int irq, void *dev_id)
+{
+        unsigned long timer_status;
+
+        /* Clear CMF bit */
+        timer_status = ctrl_inw(CMT_CMCSR_0);
+        timer_status &= ~0x80;
+        ctrl_outw(timer_status, CMT_CMCSR_0);
+
+        /*
+         * Here we are in the timer irq handler. We just have irqs locally
+         * disabled but we don't know if the timer_bh is running on the other
+         * CPU. We need to avoid to SMP race with it. NOTE: we don' t need
+         * the irq version of write_lock because as just said we have irq
+         * locally disabled. -arca
+         */
+        write_seqlock(&xtime_lock);
+        handle_timer_tick();
+        write_sequnlock(&xtime_lock);
+
+        return IRQ_HANDLED;
+}
+
+static struct irqaction cmt_irq = {
+        .name           = "timer",
+        .handler        = cmt_timer_interrupt,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
+        .mask           = CPU_MASK_NONE,
+};
+
+static void cmt_clk_init(struct clk *clk)
+{
+        u8 divisor = CMT_CMCSR_INIT & 0x3;
+        ctrl_inw(CMT_CMCSR_0);
+        ctrl_outw(CMT_CMCSR_INIT, CMT_CMCSR_0);
+        clk->parent = clk_get(NULL, "module_clk");
+        clk->rate = clk->parent->rate / (8 << (divisor << 1));
+}
+
+static void cmt_clk_recalc(struct clk *clk)
+{
+        u8 divisor = ctrl_inw(CMT_CMCSR_0) & 0x3;
+        clk->rate = clk->parent->rate / (8 << (divisor << 1));
+}
+
+static struct clk_ops cmt_clk_ops = {
+        .init           = cmt_clk_init,
+        .recalc         = cmt_clk_recalc,
+};
+
+static struct clk cmt0_clk = {
+        .name           = "cmt0_clk",
+        .ops            = &cmt_clk_ops,
+};
+
+static int cmt_timer_start(void)
+{
+        ctrl_outw(ctrl_inw(CMT_CMSTR) | 0x01, CMT_CMSTR);
+        return 0;
+}
+
+static int cmt_timer_stop(void)
+{
+        ctrl_outw(ctrl_inw(CMT_CMSTR) & ~0x01, CMT_CMSTR);
+        return 0;
+}
+
+static int cmt_timer_init(void)
+{
+        unsigned long interval;
+
+        cmt_clock_enable();
+
+        setup_irq(CONFIG_SH_TIMER_IRQ, &cmt_irq);
+
+        cmt0_clk.parent = clk_get(NULL, "module_clk");
+
+        cmt_timer_stop();
+
+        interval = cmt0_clk.parent->rate / 8 / HZ;
+        printk(KERN_INFO "Interval = %ld\n", interval);
+
+        ctrl_outw(interval, CMT_CMCOR_0);
+
+        clk_register(&cmt0_clk);
+        clk_enable(&cmt0_clk);
+
+        cmt_timer_start();
+
+        return 0;
+}
+
+struct sys_timer_ops cmt_timer_ops = {
+        .init           = cmt_timer_init,
+        .start          = cmt_timer_start,
+        .stop           = cmt_timer_stop,
+#ifndef CONFIG_GENERIC_TIME
+        .get_offset     = cmt_timer_get_offset,
+#endif
+};
+
+struct sys_timer cmt_timer = {
+        .name   = "cmt",
+        .ops    = &cmt_timer_ops,
+};
diff --git a/arch/sh/kernel/timers/timer-mtu2.c b/arch/sh/kernel/timers/timer-mtu2.c
new file mode 100644
index 000000000000..fffcd1c09873
--- /dev/null
+++ b/arch/sh/kernel/timers/timer-mtu2.c
@@ -0,0 +1,200 @@
+/*
+ * arch/sh/kernel/timers/timer-mtu2.c - MTU2 Timer Support
+ *
+ *  Copyright (C) 2005  Paul Mundt
+ *
+ * Based off of arch/sh/kernel/timers/timer-tmu.c
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/seqlock.h>
+#include <asm/timer.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/clock.h>
+
+/*
+ * We use channel 1 for our lowly system timer. Channel 2 would be the other
+ * likely candidate, but we leave it alone as it has higher divisors that
+ * would be of more use to other more interesting applications.
+ *
+ * TODO: Presently we only implement a 16-bit single-channel system timer.
+ * However, we can implement channel cascade if we go the overflow route and
+ * get away with using 2 MTU2 channels as a 32-bit timer.
+ */
+#define MTU2_TSTR       0xfffe4280
+#define MTU2_TCR_1      0xfffe4380
+#define MTU2_TMDR_1     0xfffe4381
+#define MTU2_TIOR_1     0xfffe4382
+#define MTU2_TIER_1     0xfffe4384
+#define MTU2_TSR_1      0xfffe4385
+#define MTU2_TCNT_1     0xfffe4386      /* 16-bit counter */
+#define MTU2_TGRA_1     0xfffe438a
+
+#define STBCR3          0xfffe0408
+
+#define MTU2_TSTR_CST1  (1 << 1)        /* Counter Start 1 */
+
+#define MTU2_TSR_TGFA   (1 << 0)        /* GRA compare match */
+
+#define MTU2_TIER_TGIEA (1 << 0)        /* GRA compare match  interrupt enable */
+
+#define MTU2_TCR_INIT   0x22
+
+#define MTU2_TCR_CALIB  0x00
+
+static unsigned long mtu2_timer_get_offset(void)
+{
+        int count;
+        static int count_p = 0x7fff;    /* for the first call after boot */
+        static unsigned long jiffies_p = 0;
+
+        /*
+         * cache volatile jiffies temporarily; we have IRQs turned off.
+         */
+        unsigned long jiffies_t;
+
+        /* timer count may underflow right here */
+        count = ctrl_inw(MTU2_TCNT_1);  /* read the latched count */
+
+        jiffies_t = jiffies;
+
+        /*
+         * avoiding timer inconsistencies (they are rare, but they happen)...
+         * there is one kind of problem that must be avoided here:
+         *  1. the timer counter underflows
+         */
+
+        if (jiffies_t == jiffies_p) {
+                if (count > count_p) {
+                        if (ctrl_inb(MTU2_TSR_1) & MTU2_TSR_TGFA) {
+                                count -= LATCH;
+                        } else {
+                                printk("%s (): hardware timer problem?\n",
+                                       __FUNCTION__);
+                        }
+                }
+        } else
+                jiffies_p = jiffies_t;
+
+        count_p = count;
+
+        count = ((LATCH-1) - count) * TICK_SIZE;
+        count = (count + LATCH/2) / LATCH;
+
+        return count;
+}
+
+static irqreturn_t mtu2_timer_interrupt(int irq, void *dev_id)
+{
+        unsigned long timer_status;
+
+        /* Clear TGFA bit */
+        timer_status = ctrl_inb(MTU2_TSR_1);
+        timer_status &= ~MTU2_TSR_TGFA;
+        ctrl_outb(timer_status, MTU2_TSR_1);
+
+        /* Do timer tick */
+        write_seqlock(&xtime_lock);
+        handle_timer_tick();
+        write_sequnlock(&xtime_lock);
+
+        return IRQ_HANDLED;
+}
+
+static struct irqaction mtu2_irq = {
+        .name           = "timer",
+        .handler        = mtu2_timer_interrupt,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
+        .mask           = CPU_MASK_NONE,
+};
+
+static unsigned int divisors[] = { 1, 4, 16, 64, 1, 1, 256 };
+
+static void mtu2_clk_init(struct clk *clk)
+{
+        u8 idx = MTU2_TCR_INIT & 0x7;
+
+        clk->rate = clk->parent->rate / divisors[idx];
+        /* Start TCNT counting */
+        ctrl_outb(ctrl_inb(MTU2_TSTR) | MTU2_TSTR_CST1, MTU2_TSTR);
+
+}
+
+static void mtu2_clk_recalc(struct clk *clk)
+{
+        u8 idx = ctrl_inb(MTU2_TCR_1) & 0x7;
+        clk->rate = clk->parent->rate / divisors[idx];
+}
+
+static struct clk_ops mtu2_clk_ops = {
+        .init           = mtu2_clk_init,
+        .recalc         = mtu2_clk_recalc,
+};
+
+static struct clk mtu2_clk1 = {
+        .name           = "mtu2_clk1",
+        .ops            = &mtu2_clk_ops,
+};
+
+static int mtu2_timer_start(void)
+{
+        ctrl_outb(ctrl_inb(MTU2_TSTR) | MTU2_TSTR_CST1, MTU2_TSTR);
+        return 0;
+}
+
+static int mtu2_timer_stop(void)
+{
+        ctrl_outb(ctrl_inb(MTU2_TSTR) & ~MTU2_TSTR_CST1, MTU2_TSTR);
+        return 0;
+}
+
+static int mtu2_timer_init(void)
+{
+        u8 tmp;
+        unsigned long interval;
+
+        setup_irq(CONFIG_SH_TIMER_IRQ, &mtu2_irq);
+
+        mtu2_clk1.parent = clk_get(NULL, "module_clk");
+
+        ctrl_outb(ctrl_inb(STBCR3) & (~0x20), STBCR3);
+
+        /* Normal operation */
+        ctrl_outb(0, MTU2_TMDR_1);
+        ctrl_outb(MTU2_TCR_INIT, MTU2_TCR_1);
+        ctrl_outb(0x01, MTU2_TIOR_1);
+
+        /* Enable underflow interrupt */
+        ctrl_outb(ctrl_inb(MTU2_TIER_1) | MTU2_TIER_TGIEA, MTU2_TIER_1);
+
+        interval = CONFIG_SH_PCLK_FREQ / 16 / HZ;
+        printk(KERN_INFO "Interval = %ld\n", interval);
+
+        ctrl_outw(interval, MTU2_TGRA_1);
+        ctrl_outw(0, MTU2_TCNT_1);
+
+        clk_register(&mtu2_clk1);
+        clk_enable(&mtu2_clk1);
+
+        return 0;
+}
+
+struct sys_timer_ops mtu2_timer_ops = {
+        .init           = mtu2_timer_init,
+        .start          = mtu2_timer_start,
+        .stop           = mtu2_timer_stop,
+#ifndef CONFIG_GENERIC_TIME
+        .get_offset     = mtu2_timer_get_offset,
+#endif
+};
+
+struct sys_timer mtu2_timer = {
+        .name   = "mtu2",
+        .ops    = &mtu2_timer_ops,
+};
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c
index 24927015dc31..e060e71d0785 100644
--- a/arch/sh/kernel/timers/timer-tmu.c
+++ b/arch/sh/kernel/timers/timer-tmu.c
@@ -17,7 +17,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
-#include <linux/spinlock.h>
 #include <linux/seqlock.h>
 #include <asm/timer.h>
 #include <asm/rtc.h>
@@ -31,13 +30,9 @@
 
 #define TMU0_TCR_CALIB  0x0000
 
-static DEFINE_SPINLOCK(tmu0_lock);
-
 static unsigned long tmu_timer_get_offset(void)
 {
         int count;
-        unsigned long flags;
-
         static int count_p = 0x7fffffff;    /* for the first call after boot */
         static unsigned long jiffies_p = 0;
 
@@ -46,7 +41,6 @@ static unsigned long tmu_timer_get_offset(void)
          */
         unsigned long jiffies_t;
 
-        spin_lock_irqsave(&tmu0_lock, flags);
         /* timer count may underflow right here */
         count = ctrl_inl(TMU0_TCNT);    /* read the latched count */
 
@@ -72,7 +66,6 @@ static unsigned long tmu_timer_get_offset(void)
                 jiffies_p = jiffies_t;
 
         count_p = count;
-        spin_unlock_irqrestore(&tmu0_lock, flags);
 
         count = ((LATCH-1) - count) * TICK_SIZE;
         count = (count + LATCH/2) / LATCH;
@@ -106,7 +99,7 @@ static irqreturn_t tmu_timer_interrupt(int irq, void *dummy)
 static struct irqaction tmu_irq = {
         .name           = "timer",
         .handler        = tmu_timer_interrupt,
-        .flags          = IRQF_DISABLED,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .mask           = CPU_MASK_NONE,
 };
 
@@ -149,9 +142,9 @@ static int tmu_timer_init(void)
 {
         unsigned long interval;
 
-        setup_irq(TIMER_IRQ, &tmu_irq);
+        setup_irq(CONFIG_SH_TIMER_IRQ, &tmu_irq);
 
-        tmu0_clk.parent = clk_get("module_clk");
+        tmu0_clk.parent = clk_get(NULL, "module_clk");
 
         /* Start TMU0 */
         tmu_timer_stop();
diff --git a/arch/sh/kernel/timers/timer.c b/arch/sh/kernel/timers/timer.c
index dc1f631053a8..a6bcc913d25e 100644
--- a/arch/sh/kernel/timers/timer.c
+++ b/arch/sh/kernel/timers/timer.c
@@ -17,6 +17,12 @@ static struct sys_timer *sys_timers[] __initdata = {
 #ifdef CONFIG_SH_TMU
         &tmu_timer,
 #endif
+#ifdef CONFIG_SH_MTU2
+        &mtu2_timer,
+#endif
+#ifdef CONFIG_SH_CMT
+        &cmt_timer,
+#endif
         NULL,
 };
 
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index 53dfa55f3156..ec110157992d 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -18,13 +18,15 @@
 #include <linux/module.h>
 #include <linux/kallsyms.h>
 #include <linux/io.h>
+#include <linux/debug_locks.h>
+#include <linux/limits.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
 #ifdef CONFIG_SH_KGDB
 #include <asm/kgdb.h>
-#define CHK_REMOTE_DEBUG(regs)                  \
-{                                               \
+#define CHK_REMOTE_DEBUG(regs)                  \
+{                                               \
         if (kgdb_debug_hook && !user_mode(regs))\
                 (*kgdb_debug_hook)(regs);       \
 }
@@ -33,8 +35,13 @@
 #endif
 
 #ifdef CONFIG_CPU_SH2
-#define TRAP_RESERVED_INST      4
-#define TRAP_ILLEGAL_SLOT_INST  6
+# define TRAP_RESERVED_INST     4
+# define TRAP_ILLEGAL_SLOT_INST 6
+# define TRAP_ADDRESS_ERROR     9
+# ifdef CONFIG_CPU_SH2A
+#  define TRAP_DIVZERO_ERROR    17
+#  define TRAP_DIVOVF_ERROR     18
+# endif
 #else
 #define TRAP_RESERVED_INST      12
 #define TRAP_ILLEGAL_SLOT_INST  13
@@ -88,7 +95,7 @@ void die(const char * str, struct pt_regs * regs, long err)
 
         if (!user_mode(regs) || in_interrupt())
                 dump_mem("Stack: ", regs->regs[15], THREAD_SIZE +
-                         (unsigned long)task_stack_page(current));
+                         (unsigned long)task_stack_page(current));
 
         bust_spinlocks(0);
         spin_unlock_irq(&die_lock);
@@ -102,8 +109,6 @@ static inline void die_if_kernel(const char *str, struct pt_regs *regs,
                 die(str, regs, err);
 }
 
-static int handle_unaligned_notify_count = 10;
-
 /*
  * try and fix up kernelspace address errors
  * - userspace errors just cause EFAULT to be returned, resulting in SEGV
@@ -125,6 +130,40 @@ static int die_if_no_fixup(const char * str, struct pt_regs * regs, long err)
         return -EFAULT;
 }
 
+#ifdef CONFIG_BUG
+#ifdef CONFIG_DEBUG_BUGVERBOSE
+static inline void do_bug_verbose(struct pt_regs *regs)
+{
+        struct bug_frame f;
+        long len;
+
+        if (__copy_from_user(&f, (const void __user *)regs->pc,
+                             sizeof(struct bug_frame)))
+                return;
+
+        len = __strnlen_user(f.file, PATH_MAX) - 1;
+        if (unlikely(len < 0 || len >= PATH_MAX))
+                f.file = "<bad filename>";
+        len = __strnlen_user(f.func, PATH_MAX) - 1;
+        if (unlikely(len < 0 || len >= PATH_MAX))
+                f.func = "<bad function>";
+
+        printk(KERN_ALERT "kernel BUG in %s() at %s:%d!\n",
+               f.func, f.file, f.line);
+}
+#else
+static inline void do_bug_verbose(struct pt_regs *regs)
+{
+}
+#endif /* CONFIG_DEBUG_BUGVERBOSE */
+#endif /* CONFIG_BUG */
+
+void handle_BUG(struct pt_regs *regs)
+{
+        do_bug_verbose(regs);
+        die("Kernel BUG", regs, TRAPA_BUG_OPCODE & 0xff);
+}
+
 /*
  * handle an instruction that does an unaligned memory access by emulating the
  * desired behaviour
@@ -198,7 +237,7 @@ static int handle_unaligned_ins(u16 instruction, struct pt_regs *regs)
                 if (copy_to_user(dst,src,4))
                         goto fetch_fault;
                 ret = 0;
-                break;
+                break;
 
         case 2: /* mov.[bwl] to memory, possibly with pre-decrement */
                 if (instruction & 4)
@@ -222,7 +261,7 @@ static int handle_unaligned_ins(u16 instruction, struct pt_regs *regs)
                 if (copy_from_user(dst,src,4))
                         goto fetch_fault;
                 ret = 0;
-                break;
+                break;
 
         case 6: /* mov.[bwl] from memory, possibly with post-increment */
                 src = (unsigned char*) *rm;
@@ -230,7 +269,7 @@ static int handle_unaligned_ins(u16 instruction, struct pt_regs *regs)
                         *rm += count;
                 dst = (unsigned char*) rn;
                 *(unsigned long*)dst = 0;
-                
+
 #ifdef __LITTLE_ENDIAN__
                 if (copy_from_user(dst, src, count))
                         goto fetch_fault;
@@ -241,7 +280,7 @@ static int handle_unaligned_ins(u16 instruction, struct pt_regs *regs)
                 }
 #else
                 dst += 4-count;
-                
+
                 if (copy_from_user(dst, src, count))
                         goto fetch_fault;
 
@@ -320,7 +359,8 @@ static inline int handle_unaligned_delayslot(struct pt_regs *regs)
                         return -EFAULT;
 
                 /* kernel */
-                die("delay-slot-insn faulting in handle_unaligned_delayslot", regs, 0);
+                die("delay-slot-insn faulting in handle_unaligned_delayslot",
+                    regs, 0);
         }
 
         return handle_unaligned_ins(instruction,regs);
@@ -342,6 +382,13 @@ static inline int handle_unaligned_delayslot(struct pt_regs *regs)
 #define SH_PC_8BIT_OFFSET(instr) ((((signed char)(instr))*2) + 4)
 #define SH_PC_12BIT_OFFSET(instr) ((((signed short)(instr<<4))>>3) + 4)
 
+/*
+ * XXX: SH-2A needs this too, but it needs an overhaul thanks to mixed 32-bit
+ * opcodes..
+ */
+#ifndef CONFIG_CPU_SH2A
+static int handle_unaligned_notify_count = 10;
+
 static int handle_unaligned_access(u16 instruction, struct pt_regs *regs)
 {
         u_int rm;
@@ -354,7 +401,8 @@ static int handle_unaligned_access(u16 instruction, struct pt_regs *regs)
         if (user_mode(regs) && handle_unaligned_notify_count>0) {
                 handle_unaligned_notify_count--;
 
-                printk("Fixing up unaligned userspace access in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
+                printk(KERN_NOTICE "Fixing up unaligned userspace access "
+                       "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
                        current->comm,current->pid,(u16*)regs->pc,instruction);
         }
 
@@ -478,32 +526,58 @@ static int handle_unaligned_access(u16 instruction, struct pt_regs *regs)
                 regs->pc += 2;
         return ret;
 }
+#endif /* CONFIG_CPU_SH2A */
+
+#ifdef CONFIG_CPU_HAS_SR_RB
+#define lookup_exception_vector(x)      \
+        __asm__ __volatile__ ("stc r2_bank, %0\n\t" : "=r" ((x)))
+#else
+#define lookup_exception_vector(x)      \
+        __asm__ __volatile__ ("mov r4, %0\n\t" : "=r" ((x)))
+#endif
 
 /*
- * Handle various address error exceptions
+ * Handle various address error exceptions:
+ *  - instruction address error:
+ *       misaligned PC
+ *       PC >= 0x80000000 in user mode
+ *  - data address error (read and write)
+ *       misaligned data access
+ *       access to >= 0x80000000 is user mode
+ * Unfortuntaly we can't distinguish between instruction address error
+ * and data address errors caused by read acceses.
  */
-asmlinkage void do_address_error(struct pt_regs *regs, 
+asmlinkage void do_address_error(struct pt_regs *regs,
                                  unsigned long writeaccess,
                                  unsigned long address)
 {
-        unsigned long error_code;
+        unsigned long error_code = 0;
         mm_segment_t oldfs;
+        siginfo_t info;
+#ifndef CONFIG_CPU_SH2A
         u16 instruction;
         int tmp;
+#endif
 
-        asm volatile("stc       r2_bank,%0": "=r" (error_code));
+        /* Intentional ifdef */
+#ifdef CONFIG_CPU_HAS_SR_RB
+        lookup_exception_vector(error_code);
+#endif
 
         oldfs = get_fs();
 
         if (user_mode(regs)) {
+                int si_code = BUS_ADRERR;
+
                 local_irq_enable();
-                current->thread.error_code = error_code;
-                current->thread.trap_no = (writeaccess) ? 8 : 7;
 
                 /* bad PC is not something we can fix */
-                if (regs->pc & 1)
+                if (regs->pc & 1) {
+                        si_code = BUS_ADRALN;
                         goto uspace_segv;
+                }
 
+#ifndef CONFIG_CPU_SH2A
                 set_fs(USER_DS);
                 if (copy_from_user(&instruction, (u16 *)(regs->pc), 2)) {
                         /* Argh. Fault on the instruction itself.
@@ -518,14 +592,23 @@ asmlinkage void do_address_error(struct pt_regs *regs,
 
                 if (tmp==0)
                         return; /* sorted */
+#endif
 
-        uspace_segv:
-                printk(KERN_NOTICE "Killing process \"%s\" due to unaligned access\n", current->comm);
-                force_sig(SIGSEGV, current);
+uspace_segv:
+                printk(KERN_NOTICE "Sending SIGBUS to \"%s\" due to unaligned "
+                       "access (PC %lx PR %lx)\n", current->comm, regs->pc,
+                       regs->pr);
+
+                info.si_signo = SIGBUS;
+                info.si_errno = 0;
+                info.si_code = si_code;
+                info.si_addr = (void *) address;
+                force_sig_info(SIGBUS, &info, current);
         } else {
                 if (regs->pc & 1)
                         die("unaligned program counter", regs, error_code);
 
+#ifndef CONFIG_CPU_SH2A
                 set_fs(KERNEL_DS);
                 if (copy_from_user(&instruction, (u16 *)(regs->pc), 2)) {
                         /* Argh. Fault on the instruction itself.
@@ -537,6 +620,12 @@ asmlinkage void do_address_error(struct pt_regs *regs,
 
                 handle_unaligned_access(instruction, regs);
                 set_fs(oldfs);
+#else
+                printk(KERN_NOTICE "Killing process \"%s\" due to unaligned "
+                       "access\n", current->comm);
+
+                force_sig(SIGSEGV, current);
+#endif
         }
 }
 
@@ -548,7 +637,7 @@ int is_dsp_inst(struct pt_regs *regs)
 {
         unsigned short inst;
 
-        /* 
+        /*
          * Safe guard if DSP mode is already enabled or we're lacking
          * the DSP altogether.
          */
@@ -569,27 +658,49 @@ int is_dsp_inst(struct pt_regs *regs)
 #define is_dsp_inst(regs)       (0)
 #endif /* CONFIG_SH_DSP */
 
+#ifdef CONFIG_CPU_SH2A
+asmlinkage void do_divide_error(unsigned long r4, unsigned long r5,
+                                unsigned long r6, unsigned long r7,
+                                struct pt_regs __regs)
+{
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+        siginfo_t info;
+
+        switch (r4) {
+        case TRAP_DIVZERO_ERROR:
+                info.si_code = FPE_INTDIV;
+                break;
+        case TRAP_DIVOVF_ERROR:
+                info.si_code = FPE_INTOVF;
+                break;
+        }
+
+        force_sig_info(SIGFPE, &info, current);
+}
+#endif
+
 /* arch/sh/kernel/cpu/sh4/fpu.c */
 extern int do_fpu_inst(unsigned short, struct pt_regs *);
 extern asmlinkage void do_fpu_state_restore(unsigned long r4, unsigned long r5,
-                unsigned long r6, unsigned long r7, struct pt_regs regs);
+                unsigned long r6, unsigned long r7, struct pt_regs __regs);
 
 asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5,
                                 unsigned long r6, unsigned long r7,
-                                struct pt_regs regs)
+                                struct pt_regs __regs)
 {
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
         unsigned long error_code;
         struct task_struct *tsk = current;
 
 #ifdef CONFIG_SH_FPU_EMU
-        unsigned short inst;
+        unsigned short inst = 0;
         int err;
 
-        get_user(inst, (unsigned short*)regs.pc);
+        get_user(inst, (unsigned short*)regs->pc);
 
-        err = do_fpu_inst(inst, &regs);
+        err = do_fpu_inst(inst, regs);
         if (!err) {
-                regs.pc += 2;
+                regs->pc += 2;
                 return;
         }
         /* not a FPU inst. */
@@ -597,20 +708,19 @@ asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5,
 
 #ifdef CONFIG_SH_DSP
         /* Check if it's a DSP instruction */
-        if (is_dsp_inst(&regs)) {
+        if (is_dsp_inst(regs)) {
                 /* Enable DSP mode, and restart instruction. */
-                regs.sr |= SR_DSP;
+                regs->sr |= SR_DSP;
                 return;
         }
 #endif
 
-        asm volatile("stc       r2_bank, %0": "=r" (error_code));
+        lookup_exception_vector(error_code);
+
         local_irq_enable();
-        tsk->thread.error_code = error_code;
-        tsk->thread.trap_no = TRAP_RESERVED_INST;
-        CHK_REMOTE_DEBUG(&regs);
+        CHK_REMOTE_DEBUG(regs);
         force_sig(SIGILL, tsk);
-        die_if_no_fixup("reserved instruction", &regs, error_code);
+        die_if_no_fixup("reserved instruction", regs, error_code);
 }
 
 #ifdef CONFIG_SH_FPU_EMU
@@ -658,39 +768,41 @@ static int emulate_branch(unsigned short inst, struct pt_regs* regs)
 
 asmlinkage void do_illegal_slot_inst(unsigned long r4, unsigned long r5,
                                 unsigned long r6, unsigned long r7,
-                                struct pt_regs regs)
+                                struct pt_regs __regs)
 {
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
         unsigned long error_code;
         struct task_struct *tsk = current;
 #ifdef CONFIG_SH_FPU_EMU
-        unsigned short inst;
+        unsigned short inst = 0;
 
-        get_user(inst, (unsigned short *)regs.pc + 1);
-        if (!do_fpu_inst(inst, &regs)) {
-                get_user(inst, (unsigned short *)regs.pc);
-                if (!emulate_branch(inst, &regs))
+        get_user(inst, (unsigned short *)regs->pc + 1);
+        if (!do_fpu_inst(inst, regs)) {
+                get_user(inst, (unsigned short *)regs->pc);
+                if (!emulate_branch(inst, regs))
                         return;
                 /* fault in branch.*/
         }
         /* not a FPU inst. */
 #endif
 
-        asm volatile("stc       r2_bank, %0": "=r" (error_code));
+        lookup_exception_vector(error_code);
+
         local_irq_enable();
-        tsk->thread.error_code = error_code;
-        tsk->thread.trap_no = TRAP_RESERVED_INST;
-        CHK_REMOTE_DEBUG(&regs);
+        CHK_REMOTE_DEBUG(regs);
         force_sig(SIGILL, tsk);
-        die_if_no_fixup("illegal slot instruction", &regs, error_code);
+        die_if_no_fixup("illegal slot instruction", regs, error_code);
 }
 
 asmlinkage void do_exception_error(unsigned long r4, unsigned long r5,
                                    unsigned long r6, unsigned long r7,
-                                   struct pt_regs regs)
+                                   struct pt_regs __regs)
 {
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
         long ex;
-        asm volatile("stc       r2_bank, %0" : "=r" (ex));
-        die_if_kernel("exception", &regs, ex);
+
+        lookup_exception_vector(ex);
+        die_if_kernel("exception", regs, ex);
 }
 
 #if defined(CONFIG_SH_STANDARD_BIOS)
@@ -735,12 +847,16 @@ void *set_exception_table_vec(unsigned int vec, void *handler)
 {
         extern void *exception_handling_table[];
         void *old_handler;
-        
+
         old_handler = exception_handling_table[vec];
         exception_handling_table[vec] = handler;
         return old_handler;
 }
 
+extern asmlinkage void address_error_handler(unsigned long r4, unsigned long r5,
+                                             unsigned long r6, unsigned long r7,
+                                             struct pt_regs __regs);
+
 void __init trap_init(void)
 {
         set_exception_table_vec(TRAP_RESERVED_INST, do_reserved_inst);
@@ -759,7 +875,15 @@ void __init trap_init(void)
         set_exception_table_evt(0x800, do_fpu_state_restore);
         set_exception_table_evt(0x820, do_fpu_state_restore);
 #endif
-                
+
+#ifdef CONFIG_CPU_SH2
+        set_exception_table_vec(TRAP_ADDRESS_ERROR, address_error_handler);
+#endif
+#ifdef CONFIG_CPU_SH2A
+        set_exception_table_vec(TRAP_DIVZERO_ERROR, do_divide_error);
+        set_exception_table_vec(TRAP_DIVOVF_ERROR, do_divide_error);
+#endif
+
         /* Setup VBR for boot cpu */
         per_cpu_trap_init();
 }
@@ -784,6 +908,11 @@ void show_trace(struct task_struct *tsk, unsigned long *sp,
         }
 
         printk("\n");
+
+        if (!tsk)
+                tsk = current;
+
+        debug_show_held_locks(tsk);
 }
 
 void show_stack(struct task_struct *tsk, unsigned long *sp)
diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index 77b4026d5688..f34bdcc33a7d 100644
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -51,7 +51,7 @@ SECTIONS
         }
 
   . = ALIGN(PAGE_SIZE);
-  .data.page_aligned : { *(.data.idt) }
+  .data.page_aligned : { *(.data.page_aligned) }
 
   . = ALIGN(32);
   __per_cpu_start = .;
diff --git a/arch/sh/kernel/vsyscall/vsyscall.c b/arch/sh/kernel/vsyscall/vsyscall.c
index 075d6cc1a2d7..deb46941f315 100644
--- a/arch/sh/kernel/vsyscall/vsyscall.c
+++ b/arch/sh/kernel/vsyscall/vsyscall.c
@@ -97,7 +97,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
                 goto up_fail;
         }
 
-        vma = kmem_cache_zalloc(vm_area_cachep, SLAB_KERNEL);
+        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
         if (!vma) {
                 ret = -ENOMEM;
                 goto up_fail;
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 9dd606464d23..29f4ee35c6dc 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -4,8 +4,12 @@ menu "Processor selection"
 # Processor families
 #
 config CPU_SH2
+        select SH_WRITETHROUGH if !CPU_SH2A
         bool
-        select SH_WRITETHROUGH
+
+config CPU_SH2A
+        bool
+        select CPU_SH2
 
 config CPU_SH3
         bool
@@ -16,6 +20,7 @@ config CPU_SH4
         bool
         select CPU_HAS_INTEVT
         select CPU_HAS_SR_RB
+        select CPU_HAS_PTEA if !CPU_SUBTYPE_ST40
 
 config CPU_SH4A
         bool
@@ -30,6 +35,9 @@ config CPU_SUBTYPE_ST40
         select CPU_SH4
         select CPU_HAS_INTC2_IRQ
 
+config CPU_SHX2
+        bool
+
 #
 # Processor subtypes
 #
@@ -40,6 +48,16 @@ config CPU_SUBTYPE_SH7604
         bool "Support SH7604 processor"
         select CPU_SH2
 
+config CPU_SUBTYPE_SH7619
+        bool "Support SH7619 processor"
+        select CPU_SH2
+
+comment "SH-2A Processor Support"
+
+config CPU_SUBTYPE_SH7206
+        bool "Support SH7206 processor"
+        select CPU_SH2A
+
 comment "SH-3 Processor Support"
 
 config CPU_SUBTYPE_SH7300
@@ -89,6 +107,7 @@ comment "SH-4 Processor Support"
 config CPU_SUBTYPE_SH7750
         bool "Support SH7750 processor"
         select CPU_SH4
+        select CPU_HAS_IPR_IRQ
         help
           Select SH7750 if you have a 200 Mhz SH-4 HD6417750 CPU.
 
@@ -104,15 +123,18 @@ config CPU_SUBTYPE_SH7750R
         bool "Support SH7750R processor"
         select CPU_SH4
         select CPU_SUBTYPE_SH7750
+        select CPU_HAS_IPR_IRQ
 
 config CPU_SUBTYPE_SH7750S
         bool "Support SH7750S processor"
         select CPU_SH4
         select CPU_SUBTYPE_SH7750
+        select CPU_HAS_IPR_IRQ
 
 config CPU_SUBTYPE_SH7751
         bool "Support SH7751 processor"
         select CPU_SH4
+        select CPU_HAS_IPR_IRQ
         help
           Select SH7751 if you have a 166 Mhz SH-4 HD6417751 CPU,
           or if you have a HD6417751R CPU.
@@ -121,6 +143,7 @@ config CPU_SUBTYPE_SH7751R
         bool "Support SH7751R processor"
         select CPU_SH4
         select CPU_SUBTYPE_SH7751
+        select CPU_HAS_IPR_IRQ
 
 config CPU_SUBTYPE_SH7760
         bool "Support SH7760 processor"
@@ -157,6 +180,12 @@ config CPU_SUBTYPE_SH7780
         select CPU_SH4A
         select CPU_HAS_INTC2_IRQ
 
+config CPU_SUBTYPE_SH7785
+        bool "Support SH7785 processor"
+        select CPU_SH4A
+        select CPU_SHX2
+        select CPU_HAS_INTC2_IRQ
+
 comment "SH4AL-DSP Processor Support"
 
 config CPU_SUBTYPE_SH73180
@@ -167,6 +196,12 @@ config CPU_SUBTYPE_SH7343
         bool "Support SH7343 processor"
         select CPU_SH4AL_DSP
 
+config CPU_SUBTYPE_SH7722
+        bool "Support SH7722 processor"
+        select CPU_SH4AL_DSP
+        select CPU_SHX2
+        select CPU_HAS_IPR_IRQ
+
 endmenu
 
 menu "Memory management options"
@@ -216,13 +251,22 @@ config MEMORY_SIZE
 
 config 32BIT
         bool "Support 32-bit physical addressing through PMB"
-        depends on CPU_SH4A && MMU
+        depends on CPU_SH4A && MMU && (!X2TLB || BROKEN)
         default y
         help
           If you say Y here, physical addressing will be extended to
           32-bits through the SH-4A PMB. If this is not set, legacy
           29-bit physical addressing will be used.
 
+config X2TLB
+        bool "Enable extended TLB mode"
+        depends on CPU_SHX2 && MMU && EXPERIMENTAL
+        help
+          Selecting this option will enable the extended mode of the SH-X2
+          TLB. For legacy SH-X behaviour and interoperability, say N. For
+          all of the fun new features and a willingless to submit bug reports,
+          say Y.
+
 config VSYSCALL
         bool "Support vsyscall page"
         depends on MMU
@@ -237,16 +281,52 @@ config VSYSCALL
           (the default value) say Y.
 
 choice
+        prompt "Kernel page size"
+        default PAGE_SIZE_4KB
+
+config PAGE_SIZE_4KB
+        bool "4kB"
+        help
+          This is the default page size used by all SuperH CPUs.
+
+config PAGE_SIZE_8KB
+        bool "8kB"
+        depends on EXPERIMENTAL && X2TLB
+        help
+          This enables 8kB pages as supported by SH-X2 and later MMUs.
+
+config PAGE_SIZE_64KB
+        bool "64kB"
+        depends on EXPERIMENTAL && CPU_SH4
+        help
+          This enables support for 64kB pages, possible on all SH-4
+          CPUs and later. Highly experimental, not recommended.
+
+endchoice
+
+choice
         prompt "HugeTLB page size"
         depends on HUGETLB_PAGE && CPU_SH4 && MMU
         default HUGETLB_PAGE_SIZE_64K
 
 config HUGETLB_PAGE_SIZE_64K
-        bool "64K"
+        bool "64kB"
+
+config HUGETLB_PAGE_SIZE_256K
+        bool "256kB"
+        depends on X2TLB
 
 config HUGETLB_PAGE_SIZE_1MB
         bool "1MB"
 
+config HUGETLB_PAGE_SIZE_4MB
+        bool "4MB"
+        depends on X2TLB
+
+config HUGETLB_PAGE_SIZE_64MB
+        bool "64MB"
+        depends on X2TLB
+
 endchoice
 
 source "mm/Kconfig"
@@ -274,7 +354,6 @@ config SH_DIRECT_MAPPED
 
 config SH_WRITETHROUGH
         bool "Use write-through caching"
-        default y if CPU_SH2
         help
           Selecting this option will configure the caches in write-through
           mode, as opposed to the default write-back configuration.
diff --git a/arch/sh/mm/cache-sh2.c b/arch/sh/mm/cache-sh2.c
index 2689cb24ea2b..6614033f6be9 100644
--- a/arch/sh/mm/cache-sh2.c
+++ b/arch/sh/mm/cache-sh2.c
@@ -5,6 +5,7 @@
  *
  * Released under the terms of the GNU GPL v2.0.
  */
+
 #include <linux/init.h>
 #include <linux/mm.h>
 
@@ -14,37 +15,43 @@
 #include <asm/cacheflush.h>
 #include <asm/io.h>
 
-/*
- * Calculate the OC address and set the way bit on the SH-2.
- *
- * We must have already jump_to_P2()'ed prior to calling this
- * function, since we rely on CCR manipulation to do the
- * Right Thing(tm).
- */
-unsigned long __get_oc_addr(unsigned long set, unsigned long way)
+void __flush_wback_region(void *start, int size)
 {
-        unsigned long ccr;
-
-        /*
-         * On SH-2 the way bit isn't tracked in the address field
-         * if we're doing address array access .. instead, we need
-         * to manually switch out the way in the CCR.
-         */
-        ccr = ctrl_inl(CCR);
-        ccr &= ~0x00c0;
-        ccr |= way << cpu_data->dcache.way_shift;
-
-        /*
-         * Despite the number of sets being halved, we end up losing
-         * the first 2 ways to OCRAM instead of the last 2 (if we're
-         * 4-way). As a result, forcibly setting the W1 bit handily
-         * bumps us up 2 ways.
-         */
-        if (ccr & CCR_CACHE_ORA)
-                ccr |= 1 << (cpu_data->dcache.way_shift + 1);
-
-        ctrl_outl(ccr, CCR);
-
-        return CACHE_OC_ADDRESS_ARRAY | (set << cpu_data->dcache.entry_shift);
+        unsigned long v;
+        unsigned long begin, end;
+
+        begin = (unsigned long)start & ~(L1_CACHE_BYTES-1);
+        end = ((unsigned long)start + size + L1_CACHE_BYTES-1)
+                & ~(L1_CACHE_BYTES-1);
+        for (v = begin; v < end; v+=L1_CACHE_BYTES) {
+                /* FIXME cache purge */
+                ctrl_outl((v & 0x1ffffc00), (v & 0x00000ff0) | 0x00000008);
+        }
+}
+
+void __flush_purge_region(void *start, int size)
+{
+        unsigned long v;
+        unsigned long begin, end;
+
+        begin = (unsigned long)start & ~(L1_CACHE_BYTES-1);
+        end = ((unsigned long)start + size + L1_CACHE_BYTES-1)
+                & ~(L1_CACHE_BYTES-1);
+        for (v = begin; v < end; v+=L1_CACHE_BYTES) {
+                ctrl_outl((v & 0x1ffffc00), (v & 0x00000ff0) | 0x00000008);
+        }
+}
+
+void __flush_invalidate_region(void *start, int size)
+{
+        unsigned long v;
+        unsigned long begin, end;
+
+        begin = (unsigned long)start & ~(L1_CACHE_BYTES-1);
+        end = ((unsigned long)start + size + L1_CACHE_BYTES-1)
+                & ~(L1_CACHE_BYTES-1);
+        for (v = begin; v < end; v+=L1_CACHE_BYTES) {
+                ctrl_outl((v & 0x1ffffc00), (v & 0x00000ff0) | 0x00000008);
+        }
 }
 
diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c
index e48cc22724d9..c6955157c989 100644
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
@@ -11,12 +11,8 @@
  */
 #include <linux/init.h>
 #include <linux/mm.h>
-#include <asm/addrspace.h>
-#include <asm/pgtable.h>
-#include <asm/processor.h>
-#include <asm/cache.h>
-#include <asm/io.h>
-#include <asm/pgalloc.h>
+#include <linux/io.h>
+#include <linux/mutex.h>
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
 
@@ -83,9 +79,9 @@ static void __init emit_cache_params(void)
  */
 
 /* Worst case assumed to be 64k cache, direct-mapped i.e. 4 synonym bits. */
-#define MAX_P3_SEMAPHORES 16
+#define MAX_P3_MUTEXES 16
 
-struct semaphore p3map_sem[MAX_P3_SEMAPHORES];
+struct mutex p3map_mutex[MAX_P3_MUTEXES];
 
 void __init p3_cache_init(void)
 {
@@ -111,11 +107,11 @@ void __init p3_cache_init(void)
 
         emit_cache_params();
 
-        if (remap_area_pages(P3SEG, 0, PAGE_SIZE * 4, _PAGE_CACHABLE))
+        if (ioremap_page_range(P3SEG, P3SEG + (PAGE_SIZE * 4), 0, PAGE_KERNEL))
                 panic("%s failed.", __FUNCTION__);
 
         for (i = 0; i < cpu_data->dcache.n_aliases; i++)
-                sema_init(&p3map_sem[i], 1);
+                mutex_init(&p3map_mutex[i]);
 }
 
 /*
@@ -229,7 +225,7 @@ static inline void flush_cache_4096(unsigned long start,
          */
         if ((cpu_data->flags & CPU_HAS_P2_FLUSH_BUG) ||
             (start < CACHE_OC_ADDRESS_ARRAY))
-                exec_offset = 0x20000000;
+                exec_offset = 0x20000000;
 
         local_irq_save(flags);
         __flush_cache_4096(start | SH_CACHE_ASSOC,
@@ -250,7 +246,7 @@ void flush_dcache_page(struct page *page)
 
                 /* Loop all the D-cache */
                 n = cpu_data->dcache.n_aliases;
-                for (i = 0; i < n; i++, addr += PAGE_SIZE)
+                for (i = 0; i < n; i++, addr += 4096)
                         flush_cache_4096(addr, phys);
         }
 
diff --git a/arch/sh/mm/clear_page.S b/arch/sh/mm/clear_page.S
index 7b96425ae270..8a706131e521 100644
--- a/arch/sh/mm/clear_page.S
+++ b/arch/sh/mm/clear_page.S
@@ -1,12 +1,12 @@
-/* $Id: clear_page.S,v 1.13 2003/08/25 17:03:10 lethal Exp $
- *
+/*
  * __clear_user_page, __clear_user, clear_page implementation of SuperH
  *
  * Copyright (C) 2001  Kaz Kojima
  * Copyright (C) 2001, 2002  Niibe Yutaka
- *
+ * Copyright (C) 2006  Paul Mundt
  */
 #include <linux/linkage.h>
+#include <asm/page.h>
 
 /*
  * clear_page_slow
@@ -18,11 +18,11 @@
 /*
  * r0 --- scratch
  * r4 --- to
- * r5 --- to + 4096
+ * r5 --- to + PAGE_SIZE
  */
 ENTRY(clear_page_slow)
         mov     r4,r5
-        mov.w   .Llimit,r0
+        mov.l   .Llimit,r0
         add     r0,r5
         mov     #0,r0
         !
@@ -50,7 +50,7 @@ ENTRY(clear_page_slow)
         !
         rts
          nop
-.Llimit:        .word   (4096-28)
+.Llimit:        .long   (PAGE_SIZE-28)
 
 ENTRY(__clear_user)
         !
@@ -164,10 +164,10 @@ ENTRY(__clear_user)
  * r0 --- scratch 
  * r4 --- to
  * r5 --- orig_to
- * r6 --- to + 4096
+ * r6 --- to + PAGE_SIZE
  */
 ENTRY(__clear_user_page)
-        mov.w   .L4096,r0
+        mov.l   .Lpsz,r0
         mov     r4,r6
         add     r0,r6
         mov     #0,r0
@@ -191,7 +191,7 @@ ENTRY(__clear_user_page)
         !
         rts
          nop
-.L4096: .word   4096
+.Lpsz:  .long   PAGE_SIZE
 
 #endif
 
diff --git a/arch/sh/mm/copy_page.S b/arch/sh/mm/copy_page.S
index 1addffe117c3..397c94c97315 100644
--- a/arch/sh/mm/copy_page.S
+++ b/arch/sh/mm/copy_page.S
@@ -1,12 +1,12 @@
-/* $Id: copy_page.S,v 1.8 2003/08/25 17:03:10 lethal Exp $
- *
+/*
  * copy_page, __copy_user_page, __copy_user implementation of SuperH
  *
  * Copyright (C) 2001  Niibe Yutaka & Kaz Kojima
  * Copyright (C) 2002  Toshinobu Sugioka
- *
+ * Copyright (C) 2006  Paul Mundt
  */
 #include <linux/linkage.h>
+#include <asm/page.h>
 
 /*
  * copy_page_slow
@@ -18,7 +18,7 @@
 
 /*
  * r0, r1, r2, r3, r4, r5, r6, r7 --- scratch 
- * r8 --- from + 4096
+ * r8 --- from + PAGE_SIZE
  * r9 --- not used
  * r10 --- to
  * r11 --- from
@@ -30,7 +30,7 @@ ENTRY(copy_page_slow)
         mov     r4,r10
         mov     r5,r11
         mov     r5,r8
-        mov.w   .L4096,r0
+        mov.l   .Lpsz,r0
         add     r0,r8
         !
 1:      mov.l   @r11+,r0
@@ -80,7 +80,7 @@ ENTRY(copy_page_slow)
 
 /*
  * r0, r1, r2, r3, r4, r5, r6, r7 --- scratch 
- * r8 --- from + 4096
+ * r8 --- from + PAGE_SIZE
  * r9 --- orig_to
  * r10 --- to
  * r11 --- from
@@ -94,7 +94,7 @@ ENTRY(__copy_user_page)
         mov     r5,r11
         mov     r6,r9
         mov     r5,r8
-        mov.w   .L4096,r0
+        mov.l   .Lpsz,r0
         add     r0,r8
         !
 1:      ocbi    @r9
@@ -129,7 +129,7 @@ ENTRY(__copy_user_page)
         rts
          nop
 #endif
-.L4096: .word   4096
+.Lpsz:  .long   PAGE_SIZE
 /*
  * __kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n);
  * Return the number of bytes NOT copied
diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c
index 68663b8f99ae..716ebf568af2 100644
--- a/arch/sh/mm/fault.c
+++ b/arch/sh/mm/fault.c
@@ -26,13 +26,19 @@ extern void die(const char *,struct pt_regs *,long);
  * and the problem, and then passes it off to one of the appropriate
  * routines.
  */
-asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
-                              unsigned long address)
+asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
+                                        unsigned long writeaccess,
+                                        unsigned long address)
 {
         struct task_struct *tsk;
         struct mm_struct *mm;
         struct vm_area_struct * vma;
         unsigned long page;
+        int si_code;
+        siginfo_t info;
+
+        trace_hardirqs_on();
+        local_irq_enable();
 
 #ifdef CONFIG_SH_KGDB
         if (kgdb_nofault && kgdb_bus_err_hook)
@@ -41,6 +47,46 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
 
         tsk = current;
         mm = tsk->mm;
+        si_code = SEGV_MAPERR;
+
+        if (unlikely(address >= TASK_SIZE)) {
+                /*
+                 * Synchronize this task's top level page-table
+                 * with the 'reference' page table.
+                 *
+                 * Do _not_ use "tsk" here. We might be inside
+                 * an interrupt in the middle of a task switch..
+                 */
+                int offset = pgd_index(address);
+                pgd_t *pgd, *pgd_k;
+                pud_t *pud, *pud_k;
+                pmd_t *pmd, *pmd_k;
+
+                pgd = get_TTB() + offset;
+                pgd_k = swapper_pg_dir + offset;
+
+                /* This will never happen with the folded page table. */
+                if (!pgd_present(*pgd)) {
+                        if (!pgd_present(*pgd_k))
+                                goto bad_area_nosemaphore;
+                        set_pgd(pgd, *pgd_k);
+                        return;
+                }
+
+                pud = pud_offset(pgd, address);
+                pud_k = pud_offset(pgd_k, address);
+                if (pud_present(*pud) || !pud_present(*pud_k))
+                        goto bad_area_nosemaphore;
+                set_pud(pud, *pud_k);
+
+                pmd = pmd_offset(pud, address);
+                pmd_k = pmd_offset(pud_k, address);
+                if (pmd_present(*pmd) || !pmd_present(*pmd_k))
+                        goto bad_area_nosemaphore;
+                set_pmd(pmd, *pmd_k);
+
+                return;
+        }
 
         /*
          * If we're in an interrupt or have no user
@@ -65,6 +111,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
  * we can handle it..
  */
 good_area:
+        si_code = SEGV_ACCERR;
         if (writeaccess) {
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
@@ -104,10 +151,13 @@ survive:
 bad_area:
         up_read(&mm->mmap_sem);
 
+bad_area_nosemaphore:
         if (user_mode(regs)) {
-                tsk->thread.address = address;
-                tsk->thread.error_code = writeaccess;
-                force_sig(SIGSEGV, tsk);
+                info.si_signo = SIGSEGV;
+                info.si_errno = 0;
+                info.si_code = si_code;
+                info.si_addr = (void *) address;
+                force_sig_info(SIGSEGV, &info, tsk);
                 return;
         }
 
@@ -127,11 +177,9 @@ no_context:
                 printk(KERN_ALERT "Unable to handle kernel paging request");
         printk(" at virtual address %08lx\n", address);
         printk(KERN_ALERT "pc = %08lx\n", regs->pc);
-        asm volatile("mov.l     %1, %0"
-                     : "=r" (page)
-                     : "m" (__m(MMU_TTB)));
+        page = (unsigned long)get_TTB();
         if (page) {
-                page = ((unsigned long *) page)[address >> 22];
+                page = ((unsigned long *) page)[address >> PGDIR_SHIFT];
                 printk(KERN_ALERT "*pde = %08lx\n", page);
                 if (page & _PAGE_PRESENT) {
                         page &= PAGE_MASK;
@@ -166,98 +214,13 @@ do_sigbus:
          * Send a sigbus, regardless of whether we were in kernel
          * or user mode.
          */
-        tsk->thread.address = address;
-        tsk->thread.error_code = writeaccess;
-        tsk->thread.trap_no = 14;
-        force_sig(SIGBUS, tsk);
+        info.si_signo = SIGBUS;
+        info.si_errno = 0;
+        info.si_code = BUS_ADRERR;
+        info.si_addr = (void *)address;
+        force_sig_info(SIGBUS, &info, tsk);
 
         /* Kernel mode? Handle exceptions or die */
         if (!user_mode(regs))
                 goto no_context;
 }
-
-#ifdef CONFIG_SH_STORE_QUEUES
-/*
- * This is a special case for the SH-4 store queues, as pages for this
- * space still need to be faulted in before it's possible to flush the
- * store queue cache for writeout to the remapped region.
- */
-#define P3_ADDR_MAX             (P4SEG_STORE_QUE + 0x04000000)
-#else
-#define P3_ADDR_MAX             P4SEG
-#endif
-
-/*
- * Called with interrupts disabled.
- */
-asmlinkage int __kprobes __do_page_fault(struct pt_regs *regs,
-                                         unsigned long writeaccess,
-                                         unsigned long address)
-{
-        pgd_t *pgd;
-        pud_t *pud;
-        pmd_t *pmd;
-        pte_t *pte;
-        pte_t entry;
-        struct mm_struct *mm = current->mm;
-        spinlock_t *ptl;
-        int ret = 1;
-
-#ifdef CONFIG_SH_KGDB
-        if (kgdb_nofault && kgdb_bus_err_hook)
-                kgdb_bus_err_hook();
-#endif
-
-        /*
-         * We don't take page faults for P1, P2, and parts of P4, these
-         * are always mapped, whether it be due to legacy behaviour in
-         * 29-bit mode, or due to PMB configuration in 32-bit mode.
-         */
-        if (address >= P3SEG && address < P3_ADDR_MAX) {
-                pgd = pgd_offset_k(address);
-                mm = NULL;
-        } else {
-                if (unlikely(address >= TASK_SIZE || !mm))
-                        return 1;
-
-                pgd = pgd_offset(mm, address);
-        }
-
-        pud = pud_offset(pgd, address);
-        if (pud_none_or_clear_bad(pud))
-                return 1;
-        pmd = pmd_offset(pud, address);
-        if (pmd_none_or_clear_bad(pmd))
-                return 1;
-
-        if (mm)
-                pte = pte_offset_map_lock(mm, pmd, address, &ptl);
-        else
-                pte = pte_offset_kernel(pmd, address);
-
-        entry = *pte;
-        if (unlikely(pte_none(entry) || pte_not_present(entry)))
-                goto unlock;
-        if (unlikely(writeaccess && !pte_write(entry)))
-                goto unlock;
-
-        if (writeaccess)
-                entry = pte_mkdirty(entry);
-        entry = pte_mkyoung(entry);
-
-#ifdef CONFIG_CPU_SH4
-        /*
-         * ITLB is not affected by "ldtlb" instruction.
-         * So, we need to flush the entry by ourselves.
-         */
-        __flush_tlb_page(get_asid(), address & PAGE_MASK);
-#endif
-
-        set_pte(pte, entry);
-        update_mmu_cache(NULL, address, entry);
-        ret = 0;
-unlock:
-        if (mm)
-                pte_unmap_unlock(pte, ptl);
-        return ret;
-}
diff --git a/arch/sh/mm/hugetlbpage.c b/arch/sh/mm/hugetlbpage.c
index 329059d6b54a..cf2c2ee35a37 100644
--- a/arch/sh/mm/hugetlbpage.c
+++ b/arch/sh/mm/hugetlbpage.c
@@ -63,6 +63,11 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
         return pte;
 }
 
+int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
+{
+        return 0;
+}
+
 struct page *follow_huge_addr(struct mm_struct *mm,
                               unsigned long address, int write)
 {
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 7154d1ce9785..29bd37b1488e 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -77,6 +77,7 @@ void show_mem(void)
         printk("%d pages swap cached\n",cached);
 }
 
+#ifdef CONFIG_MMU
 static void set_pte_phys(unsigned long addr, unsigned long phys, pgprot_t prot)
 {
         pgd_t *pgd;
@@ -84,30 +85,22 @@ static void set_pte_phys(unsigned long addr, unsigned long phys, pgprot_t prot)
         pmd_t *pmd;
         pte_t *pte;
 
-        pgd = swapper_pg_dir + pgd_index(addr);
+        pgd = pgd_offset_k(addr);
         if (pgd_none(*pgd)) {
                 pgd_ERROR(*pgd);
                 return;
         }
 
-        pud = pud_offset(pgd, addr);
-        if (pud_none(*pud)) {
-                pmd = (pmd_t *)get_zeroed_page(GFP_ATOMIC);
-                set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE | _PAGE_USER));
-                if (pmd != pmd_offset(pud, 0)) {
-                        pud_ERROR(*pud);
-                        return;
-                }
+        pud = pud_alloc(NULL, pgd, addr);
+        if (unlikely(!pud)) {
+                pud_ERROR(*pud);
+                return;
         }
 
-        pmd = pmd_offset(pud, addr);
-        if (pmd_none(*pmd)) {
-                pte = (pte_t *)get_zeroed_page(GFP_ATOMIC);
-                set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE | _PAGE_USER));
-                if (pte != pte_offset_kernel(pmd, 0)) {
-                        pmd_ERROR(*pmd);
-                        return;
-                }
+        pmd = pmd_alloc(NULL, pud, addr);
+        if (unlikely(!pmd)) {
+                pmd_ERROR(*pmd);
+                return;
         }
 
         pte = pte_offset_kernel(pmd, addr);
@@ -147,6 +140,7 @@ void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
 
         set_pte_phys(address, phys, prot);
 }
+#endif  /* CONFIG_MMU */
 
 /* References to section boundaries */
 
@@ -155,9 +149,6 @@ extern char __init_begin, __init_end;
 
 /*
  * paging_init() sets up the page tables
- *
- * This routines also unmaps the page at virtual kernel address 0, so
- * that we can trap those pesky NULL-reference errors in the kernel.
  */
 void __init paging_init(void)
 {
@@ -180,14 +171,11 @@ void __init paging_init(void)
          */
         {
                 unsigned long max_dma, low, start_pfn;
-                pgd_t *pg_dir;
-                int i;
 
-                /* We don't need kernel mapping as hardware support that. */
-                pg_dir = swapper_pg_dir;
-
-                for (i = 0; i < PTRS_PER_PGD; i++)
-                        pgd_val(pg_dir[i]) = 0;
+                /* We don't need to map the kernel through the TLB, as
+                 * it is permanatly mapped using P1. So clear the
+                 * entire pgd. */
+                memset(swapper_pg_dir, 0, sizeof(swapper_pg_dir));
 
                 /* Turn on the MMU */
                 enable_mmu();
@@ -206,6 +194,10 @@ void __init paging_init(void)
                 }
         }
 
+        /* Set an initial value for the MMU.TTB so we don't have to
+         * check for a null value. */
+        set_TTB(swapper_pg_dir);
+
 #elif defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4)
         /*
          * If we don't have CONFIG_MMU set and the processor in question
@@ -227,7 +219,6 @@ static struct kcore_list kcore_mem, kcore_vmalloc;
 
 void __init mem_init(void)
 {
-        extern unsigned long empty_zero_page[1024];
         int codesize, reservedpages, datasize, initsize;
         int tmp;
         extern unsigned long memory_start;
diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap.c
index a9fe80cfc233..90b494a0cf45 100644
--- a/arch/sh/mm/ioremap.c
+++ b/arch/sh/mm/ioremap.c
@@ -16,99 +16,13 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/pci.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/page.h>
 #include <asm/pgalloc.h>
 #include <asm/addrspace.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 
-static inline void remap_area_pte(pte_t * pte, unsigned long address,
-        unsigned long size, unsigned long phys_addr, unsigned long flags)
-{
-        unsigned long end;
-        unsigned long pfn;
-        pgprot_t pgprot = __pgprot(_PAGE_PRESENT | _PAGE_RW |
-                                   _PAGE_DIRTY | _PAGE_ACCESSED |
-                                   _PAGE_HW_SHARED | _PAGE_FLAGS_HARD | flags);
-
-        address &= ~PMD_MASK;
-        end = address + size;
-        if (end > PMD_SIZE)
-                end = PMD_SIZE;
-        if (address >= end)
-                BUG();
-        pfn = phys_addr >> PAGE_SHIFT;
-        do {
-                if (!pte_none(*pte)) {
-                        printk("remap_area_pte: page already exists\n");
-                        BUG();
-                }
-                set_pte(pte, pfn_pte(pfn, pgprot));
-                address += PAGE_SIZE;
-                pfn++;
-                pte++;
-        } while (address && (address < end));
-}
-
-static inline int remap_area_pmd(pmd_t * pmd, unsigned long address,
-        unsigned long size, unsigned long phys_addr, unsigned long flags)
-{
-        unsigned long end;
-
-        address &= ~PGDIR_MASK;
-        end = address + size;
-        if (end > PGDIR_SIZE)
-                end = PGDIR_SIZE;
-        phys_addr -= address;
-        if (address >= end)
-                BUG();
-        do {
-                pte_t * pte = pte_alloc_kernel(pmd, address);
-                if (!pte)
-                        return -ENOMEM;
-                remap_area_pte(pte, address, end - address, address + phys_addr, flags);
-                address = (address + PMD_SIZE) & PMD_MASK;
-                pmd++;
-        } while (address && (address < end));
-        return 0;
-}
-
-int remap_area_pages(unsigned long address, unsigned long phys_addr,
-                     unsigned long size, unsigned long flags)
-{
-        int error;
-        pgd_t * dir;
-        unsigned long end = address + size;
-
-        phys_addr -= address;
-        dir = pgd_offset_k(address);
-        flush_cache_all();
-        if (address >= end)
-                BUG();
-        do {
-                pud_t *pud;
-                pmd_t *pmd;
-
-                error = -ENOMEM;
-
-                pud = pud_alloc(&init_mm, dir, address);
-                if (!pud)
-                        break;
-                pmd = pmd_alloc(&init_mm, pud, address);
-                if (!pmd)
-                        break;
-                if (remap_area_pmd(pmd, address, end - address,
-                                        phys_addr + address, flags))
-                        break;
-                error = 0;
-                address = (address + PGDIR_SIZE) & PGDIR_MASK;
-                dir++;
-        } while (address && (address < end));
-        flush_tlb_all();
-        return error;
-}
-
 /*
  * Remap an arbitrary physical address space into the kernel virtual
  * address space. Needed when the kernel wants to access high addresses
@@ -123,6 +37,7 @@ void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
 {
         struct vm_struct * area;
         unsigned long offset, last_addr, addr, orig_addr;
+        pgprot_t pgprot;
 
         /* Don't allow wraparound or zero size */
         last_addr = phys_addr + size - 1;
@@ -192,8 +107,9 @@ void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
         }
 #endif
 
+        pgprot = __pgprot(pgprot_val(PAGE_KERNEL_NOCACHE) | flags);
         if (likely(size))
-                if (remap_area_pages(addr, phys_addr, size, flags)) {
+                if (ioremap_page_range(addr, addr + size, phys_addr, pgprot)) {
                         vunmap((void *)orig_addr);
                         return NULL;
                 }
diff --git a/arch/sh/mm/pg-dma.c b/arch/sh/mm/pg-dma.c
index 1406d2e348ca..bb23679369d6 100644
--- a/arch/sh/mm/pg-dma.c
+++ b/arch/sh/mm/pg-dma.c
@@ -39,8 +39,6 @@ static void copy_page_dma(void *to, void *from)
 
 static void clear_page_dma(void *to)
 {
-        extern unsigned long empty_zero_page[1024];
-
         /*
          * We get invoked quite early on, if the DMAC hasn't been initialized
          * yet, fall back on the slow manual implementation.
diff --git a/arch/sh/mm/pg-sh4.c b/arch/sh/mm/pg-sh4.c
index 07371ed7a313..3f98d2a4f936 100644
--- a/arch/sh/mm/pg-sh4.c
+++ b/arch/sh/mm/pg-sh4.c
@@ -6,22 +6,12 @@
  *
  * Released under the terms of the GNU GPL v2.0.
  */
-#include <linux/init.h>
-#include <linux/mman.h>
 #include <linux/mm.h>
-#include <linux/threads.h>
-#include <asm/addrspace.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/processor.h>
-#include <asm/cache.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
+#include <linux/mutex.h>
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
 
-extern struct semaphore p3map_sem[];
+extern struct mutex p3map_mutex[];
 
 #define CACHE_ALIAS (cpu_data->dcache.alias_mask)
 
@@ -37,10 +27,6 @@ void clear_user_page(void *to, unsigned long address, struct page *page)
         if (((address ^ (unsigned long)to) & CACHE_ALIAS) == 0)
                 clear_page(to);
         else {
-                pgprot_t pgprot = __pgprot(_PAGE_PRESENT |
-                                           _PAGE_RW | _PAGE_CACHABLE |
-                                           _PAGE_DIRTY | _PAGE_ACCESSED |
-                                           _PAGE_HW_SHARED | _PAGE_FLAGS_HARD);
                 unsigned long phys_addr = PHYSADDR(to);
                 unsigned long p3_addr = P3SEG + (address & CACHE_ALIAS);
                 pgd_t *pgd = pgd_offset_k(p3_addr);
@@ -50,8 +36,8 @@ void clear_user_page(void *to, unsigned long address, struct page *page)
                 pte_t entry;
                 unsigned long flags;
 
-                entry = pfn_pte(phys_addr >> PAGE_SHIFT, pgprot);
-                down(&p3map_sem[(address & CACHE_ALIAS)>>12]);
+                entry = pfn_pte(phys_addr >> PAGE_SHIFT, PAGE_KERNEL);
+                mutex_lock(&p3map_mutex[(address & CACHE_ALIAS)>>12]);
                 set_pte(pte, entry);
                 local_irq_save(flags);
                 __flush_tlb_page(get_asid(), p3_addr);
@@ -59,7 +45,7 @@ void clear_user_page(void *to, unsigned long address, struct page *page)
                 update_mmu_cache(NULL, p3_addr, entry);
                 __clear_user_page((void *)p3_addr, to);
                 pte_clear(&init_mm, p3_addr, pte);
-                up(&p3map_sem[(address & CACHE_ALIAS)>>12]);
+                mutex_unlock(&p3map_mutex[(address & CACHE_ALIAS)>>12]);
         }
 }
 
@@ -77,10 +63,6 @@ void copy_user_page(void *to, void *from, unsigned long address,
         if (((address ^ (unsigned long)to) & CACHE_ALIAS) == 0)
                 copy_page(to, from);
         else {
-                pgprot_t pgprot = __pgprot(_PAGE_PRESENT |
-                                           _PAGE_RW | _PAGE_CACHABLE |
-                                           _PAGE_DIRTY | _PAGE_ACCESSED |
-                                           _PAGE_HW_SHARED | _PAGE_FLAGS_HARD);
                 unsigned long phys_addr = PHYSADDR(to);
                 unsigned long p3_addr = P3SEG + (address & CACHE_ALIAS);
                 pgd_t *pgd = pgd_offset_k(p3_addr);
@@ -90,8 +72,8 @@ void copy_user_page(void *to, void *from, unsigned long address,
                 pte_t entry;
                 unsigned long flags;
 
-                entry = pfn_pte(phys_addr >> PAGE_SHIFT, pgprot);
-                down(&p3map_sem[(address & CACHE_ALIAS)>>12]);
+                entry = pfn_pte(phys_addr >> PAGE_SHIFT, PAGE_KERNEL);
+                mutex_lock(&p3map_mutex[(address & CACHE_ALIAS)>>12]);
                 set_pte(pte, entry);
                 local_irq_save(flags);
                 __flush_tlb_page(get_asid(), p3_addr);
@@ -99,7 +81,7 @@ void copy_user_page(void *to, void *from, unsigned long address,
                 update_mmu_cache(NULL, p3_addr, entry);
                 __copy_user_page((void *)p3_addr, from, to);
                 pte_clear(&init_mm, p3_addr, pte);
-                up(&p3map_sem[(address & CACHE_ALIAS)>>12]);
+                mutex_unlock(&p3map_mutex[(address & CACHE_ALIAS)>>12]);
         }
 }
 
@@ -122,4 +104,3 @@ inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t
         }
         return pte;
 }
-
diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c
index 92e745341e4d..b60ad83a7635 100644
--- a/arch/sh/mm/pmb.c
+++ b/arch/sh/mm/pmb.c
@@ -30,7 +30,7 @@
 
 #define NR_PMB_ENTRIES  16
 
-static kmem_cache_t *pmb_cache;
+static struct kmem_cache *pmb_cache;
 static unsigned long pmb_map;
 
 static struct pmb_entry pmb_init_map[] = {
@@ -283,7 +283,7 @@ void pmb_unmap(unsigned long addr)
         } while (pmbe);
 }
 
-static void pmb_cache_ctor(void *pmb, kmem_cache_t *cachep, unsigned long flags)
+static void pmb_cache_ctor(void *pmb, struct kmem_cache *cachep, unsigned long flags)
 {
         struct pmb_entry *pmbe = pmb;
 
@@ -297,7 +297,7 @@ static void pmb_cache_ctor(void *pmb, kmem_cache_t *cachep, unsigned long flags)
         spin_unlock_irq(&pmb_list_lock);
 }
 
-static void pmb_cache_dtor(void *pmb, kmem_cache_t *cachep, unsigned long flags)
+static void pmb_cache_dtor(void *pmb, struct kmem_cache *cachep, unsigned long flags)
 {
         spin_lock_irq(&pmb_list_lock);
         pmb_list_del(pmb);
diff --git a/arch/sh/oprofile/op_model_sh7750.c b/arch/sh/oprofile/op_model_sh7750.c
index c265185b22a7..60402eec4b4d 100644
--- a/arch/sh/oprofile/op_model_sh7750.c
+++ b/arch/sh/oprofile/op_model_sh7750.c
@@ -142,7 +142,7 @@ static u64 sh7750_read_counter(int counter)
  */
 static inline int to_counter(struct file *file)
 {
-        const unsigned char *name = file->f_dentry->d_parent->d_name.name;
+        const unsigned char *name = file->f_path.dentry->d_parent->d_name.name;
 
         return (int)simple_strtol(name, NULL, 10);
 }
diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types
index ac57638977ee..0571755e9a84 100644
--- a/arch/sh/tools/mach-types
+++ b/arch/sh/tools/mach-types
@@ -30,3 +30,5 @@ R7780MP			SH_R7780MP
 TITAN                   SH_TITAN
 SHMIN                   SH_SHMIN
 7710VOIPGW              SH_7710VOIPGW
+7206SE                  SH_7206_SOLUTION_ENGINE
+7619SE                  SH_7619_SOLUTION_ENGINE
diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index 58c678e06667..7bc0744b7ab6 100644
--- a/arch/sh64/Kconfig
+++ b/arch/sh64/Kconfig
@@ -39,6 +39,14 @@ config RWSEM_XCHGADD_ALGORITHM
 config GENERIC_ISA_DMA
         bool
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 source init/Kconfig
 
 menu "System type"
diff --git a/arch/sh64/kernel/setup.c b/arch/sh64/kernel/setup.c
index ffb310e33cef..b9e7d54d7b85 100644
--- a/arch/sh64/kernel/setup.c
+++ b/arch/sh64/kernel/setup.c
@@ -243,9 +243,7 @@ void __init setup_arch(char **cmdline_p)
                 if (INITRD_START + INITRD_SIZE <= (PFN_PHYS(last_pfn))) {
                         reserve_bootmem_node(NODE_DATA(0), INITRD_START + __MEMORY_START, INITRD_SIZE);
 
-                        initrd_start =
-                          (long) INITRD_START ? INITRD_START + PAGE_OFFSET +  __MEMORY_START : 0;
-
+                        initrd_start = (long) INITRD_START + PAGE_OFFSET + __MEMORY_START;
                         initrd_end = initrd_start + INITRD_SIZE;
                 } else {
                         printk("initrd extends beyond end of memory "
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/kernel/signal.c b/arch/sh64/kernel/signal.c
index 9e2ffc45c0e0..1666d3efb52e 100644
--- a/arch/sh64/kernel/signal.c
+++ b/arch/sh64/kernel/signal.c
@@ -22,7 +22,7 @@
 #include <linux/errno.h>
 #include <linux/wait.h>
 #include <linux/personality.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/stddef.h>
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/sh64/mm/fault.c b/arch/sh64/mm/fault.c
index 8e2f6c28b739..4f72ab33bb2b 100644
--- a/arch/sh64/mm/fault.c
+++ b/arch/sh64/mm/fault.c
@@ -154,7 +154,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
          * If we're in an interrupt or have no user
          * context, we must not take the fault..
          */
-        if (in_interrupt() || !mm)
+        if (in_atomic() || !mm)
                 goto no_context;
 
         /* TLB misses upon some cache flushes get done under cli() */
diff --git a/arch/sh64/mm/hugetlbpage.c b/arch/sh64/mm/hugetlbpage.c
index 187cf01750b8..4b455f611146 100644
--- a/arch/sh64/mm/hugetlbpage.c
+++ b/arch/sh64/mm/hugetlbpage.c
@@ -53,6 +53,11 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
         return pte;
 }
 
+int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
+{
+        return 0;
+}
+
 void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
                      pte_t *ptep, pte_t entry)
 {
diff --git a/arch/sh64/mm/ioremap.c b/arch/sh64/mm/ioremap.c
index 80c56754f513..ff26c02511aa 100644
--- a/arch/sh64/mm/ioremap.c
+++ b/arch/sh64/mm/ioremap.c
@@ -18,7 +18,7 @@
 #include <linux/vmalloc.h>
 #include <linux/sched.h>
 #include <linux/string.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 #include <linux/ioport.h>
@@ -28,96 +28,6 @@
 static void shmedia_mapioaddr(unsigned long, unsigned long);
 static unsigned long shmedia_ioremap(struct resource *, u32, int);
 
-static inline void remap_area_pte(pte_t * pte, unsigned long address, unsigned long size,
-        unsigned long phys_addr, unsigned long flags)
-{
-        unsigned long end;
-        unsigned long pfn;
-        pgprot_t pgprot = __pgprot(_PAGE_PRESENT  | _PAGE_READ   |
-                                   _PAGE_WRITE    | _PAGE_DIRTY  |
-                                   _PAGE_ACCESSED | _PAGE_SHARED | flags);
-
-        address &= ~PMD_MASK;
-        end = address + size;
-        if (end > PMD_SIZE)
-                end = PMD_SIZE;
-        if (address >= end)
-                BUG();
-
-        pfn = phys_addr >> PAGE_SHIFT;
-
-        pr_debug("    %s: pte %p address %lx size %lx phys_addr %lx\n",
-                 __FUNCTION__,pte,address,size,phys_addr);
-
-        do {
-                if (!pte_none(*pte)) {
-                        printk("remap_area_pte: page already exists\n");
-                        BUG();
-                }
-
-                set_pte(pte, pfn_pte(pfn, pgprot));
-                address += PAGE_SIZE;
-                pfn++;
-                pte++;
-        } while (address && (address < end));
-}
-
-static inline int remap_area_pmd(pmd_t * pmd, unsigned long address, unsigned long size,
-        unsigned long phys_addr, unsigned long flags)
-{
-        unsigned long end;
-
-        address &= ~PGDIR_MASK;
-        end = address + size;
-
-        if (end > PGDIR_SIZE)
-                end = PGDIR_SIZE;
-
-        phys_addr -= address;
-
-        if (address >= end)
-                BUG();
-
-        do {
-                pte_t * pte = pte_alloc_kernel(pmd, address);
-                if (!pte)
-                        return -ENOMEM;
-                remap_area_pte(pte, address, end - address, address + phys_addr, flags);
-                address = (address + PMD_SIZE) & PMD_MASK;
-                pmd++;
-        } while (address && (address < end));
-        return 0;
-}
-
-static int remap_area_pages(unsigned long address, unsigned long phys_addr,
-                                 unsigned long size, unsigned long flags)
-{
-        int error;
-        pgd_t * dir;
-        unsigned long end = address + size;
-
-        phys_addr -= address;
-        dir = pgd_offset_k(address);
-        flush_cache_all();
-        if (address >= end)
-                BUG();
-        do {
-                pmd_t *pmd = pmd_alloc(&init_mm, dir, address);
-                error = -ENOMEM;
-                if (!pmd)
-                        break;
-                if (remap_area_pmd(pmd, address, end - address,
-                                   phys_addr + address, flags)) {
-                         break;
-                }
-                error = 0;
-                address = (address + PGDIR_SIZE) & PGDIR_MASK;
-                dir++;
-        } while (address && (address < end));
-        flush_tlb_all();
-        return 0;
-}
-
 /*
  * Generic mapping function (not visible outside):
  */
@@ -136,12 +46,17 @@ void * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flag
         void * addr;
         struct vm_struct * area;
         unsigned long offset, last_addr;
+        pgprot_t pgprot;
 
         /* Don't allow wraparound or zero size */
         last_addr = phys_addr + size - 1;
         if (!size || last_addr < phys_addr)
                 return NULL;
 
+        pgprot = __pgprot(_PAGE_PRESENT  | _PAGE_READ   |
+                          _PAGE_WRITE    | _PAGE_DIRTY  |
+                          _PAGE_ACCESSED | _PAGE_SHARED | flags);
+
         /*
          * Mappings have to be page-aligned
          */
@@ -158,7 +73,8 @@ void * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flag
                 return NULL;
         area->phys_addr = phys_addr;
         addr = area->addr;
-        if (remap_area_pages((unsigned long)addr, phys_addr, size, flags)) {
+        if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size,
+                               phys_addr, pgprot)) {
                 vunmap(addr);
                 return NULL;
         }
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 2f96610a83e9..d0dec1ea2eed 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -166,6 +166,14 @@ config ARCH_MAY_HAVE_PC_FDC
         bool
         default y
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config SUN_PM
         bool
         default y
@@ -212,8 +220,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/sparc/defconfig b/arch/sparc/defconfig
index a69856263009..79e54894529d 100644
--- a/arch/sparc/defconfig
+++ b/arch/sparc/defconfig
@@ -1,41 +1,59 @@
 #
 # Automatically generated make config: don't edit
+# Linux kernel version: 2.6.20-rc1
+# Sun Dec 17 14:20:47 2006
 #
 CONFIG_MMU=y
-CONFIG_UID16=y
 CONFIG_HIGHMEM=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-CONFIG_STANDALONE=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
 
 #
 # General setup
 #
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_HOTPLUG is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
 
 #
 # Loadable module support
@@ -43,17 +61,36 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
 # CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
 
 #
-# General setup
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
+# General machine setup
 #
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
 # CONFIG_SMP is not set
+CONFIG_SPARC=y
 CONFIG_SPARC32=y
 CONFIG_SBUS=y
 CONFIG_SBUSCHAR=y
@@ -61,73 +98,170 @@ CONFIG_SERIAL_CONSOLE=y
 CONFIG_SUN_AUXIO=y
 CONFIG_SUN_IO=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_SUN_PM=y
 # CONFIG_SUN4 is not set
 CONFIG_PCI=y
-# CONFIG_PCI_LEGACY_PROC is not set
-# CONFIG_PCI_NAMES is not set
+# CONFIG_PCI_MULTITHREAD_PROBE is not set
+# CONFIG_PCI_DEBUG is not set
 CONFIG_SUN_OPENPROMFS=m
+# CONFIG_SPARC_LED is not set
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_AOUT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_SUNOS_EMUL=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
 
 #
-# Parallel port support
+# Networking
 #
-# CONFIG_PARPORT is not set
+CONFIG_NET=y
 
 #
-# Generic Driver Options
+# Networking options
 #
-# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_NET_KEY=m
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_INET_XFRM_TUNNEL=y
+CONFIG_INET_TUNNEL=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+# CONFIG_IPV6_ROUTER_PREF is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
 
 #
-# Graphics support
+# DCCP Configuration (EXPERIMENTAL)
 #
-# CONFIG_FB is not set
+# CONFIG_IP_DCCP is not set
 
 #
-# Console display driver support
+# SCTP Configuration (EXPERIMENTAL)
 #
-# CONFIG_MDA_CONSOLE is not set
-# CONFIG_PROM_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+CONFIG_SCTP_DBG_OBJCNT=y
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
 
 #
-# Memory Technology Devices (MTD)
+# TIPC Configuration (EXPERIMENTAL)
 #
-# CONFIG_MTD is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
 
 #
-# Serial drivers
+# QoS and/or fair queueing
 #
-# CONFIG_SERIAL_8250 is not set
+# CONFIG_NET_SCHED is not set
 
 #
-# Non-8250 serial port support
+# Network testing
 #
-CONFIG_SERIAL_SUNCORE=y
-CONFIG_SERIAL_SUNZILOG=y
-CONFIG_SERIAL_SUNZILOG_CONSOLE=y
-CONFIG_SERIAL_SUNSU=y
-CONFIG_SERIAL_SUNSU_CONSOLE=y
-# CONFIG_SERIAL_SUNSAB is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_NET_PKTGEN=m
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
 
 #
-# Misc Linux/SPARC drivers
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
 #
-CONFIG_SUN_OPENPROMIO=m
-CONFIG_SUN_MOSTEK_RTC=m
-# CONFIG_SUN_BPP is not set
-# CONFIG_SUN_VIDEOPIX is not set
-# CONFIG_SUN_AURORA is not set
-# CONFIG_TADPOLE_TS102_UCTRL is not set
-# CONFIG_SUN_JSFLASH is not set
-CONFIG_APM_RTC_IS_GMT=y
-CONFIG_RTC=m
 
 #
 # Block devices
@@ -137,28 +271,37 @@ CONFIG_RTC=m
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_CARMEL is not set
+# CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
 
 #
-# ATA/ATAPI/MFM/RLL support
+# Misc devices
 #
-# CONFIG_IDE is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
 
 #
-# ISDN subsystem
+# ATA/ATAPI/MFM/RLL support
 #
-# CONFIG_ISDN is not set
+# CONFIG_IDE is not set
 
 #
 # SCSI device support
 #
+# CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -170,6 +313,7 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -177,57 +321,58 @@ CONFIG_CHR_DEV_SG=m
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
 
 #
-# SCSI Transport Attributes
+# SCSI Transports
 #
 CONFIG_SCSI_SPI_ATTRS=m
 # CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
 
 #
 # SCSI low-level drivers
 #
+# CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_ACARD is not set
 # CONFIG_SCSI_AACRAID is not set
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
 # CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_MEGARAID is not set
-# CONFIG_SCSI_SATA is not set
-# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_PIO is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
 # CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
 # CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_QLOGIC_ISP is not set
-# CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 CONFIG_SCSI_QLOGICPTI=m
-CONFIG_SCSI_QLA2XXX=y
-# CONFIG_SCSI_QLA21XX is not set
-# CONFIG_SCSI_QLA22XX is not set
-# CONFIG_SCSI_QLA2300 is not set
-# CONFIG_SCSI_QLA2322 is not set
-# CONFIG_SCSI_QLA6312 is not set
-# CONFIG_SCSI_QLA6322 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_SCSI_SUNESP=y
+# CONFIG_SCSI_SRP is not set
 
 #
-# Fibre Channel support
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
 #
-# CONFIG_FC4 is not set
+# CONFIG_ATA is not set
 
 #
 # Multi-device support (RAID and LVM)
@@ -235,85 +380,31 @@ CONFIG_SCSI_SUNESP=y
 # CONFIG_MD is not set
 
 #
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
+# Fusion MPT device support
 #
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_NETLINK_DEV=y
-CONFIG_UNIX=y
-CONFIG_NET_KEY=m
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_TUNNEL=m
-# CONFIG_NETFILTER is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
 
 #
-# SCTP Configuration (EXPERIMENTAL)
+# IEEE 1394 (FireWire) support
 #
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-CONFIG_SCTP_DBG_OBJCNT=y
-# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
+# CONFIG_IEEE1394 is not set
 
 #
-# QoS and/or fair queueing
+# I2O device support
 #
-# CONFIG_NET_SCHED is not set
+# CONFIG_I2O is not set
 
 #
-# Network testing
+# Network device support
 #
-CONFIG_NET_PKTGEN=m
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=m
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
-# CONFIG_ETHERTAP is not set
 
 #
 # ARCnet devices
@@ -321,6 +412,11 @@ CONFIG_TUN=m
 # CONFIG_ARCNET is not set
 
 #
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
@@ -330,6 +426,7 @@ CONFIG_HAPPYMEAL=m
 CONFIG_SUNBMAC=m
 CONFIG_SUNQE=m
 # CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
 
 #
@@ -350,14 +447,22 @@ CONFIG_SUNQE=m
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
 # CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
 # CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
 
 #
 # Ethernet (10000 Mbit)
 #
+# CONFIG_CHELSIO_T1 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
 
 #
 # Token Ring devices
@@ -380,17 +485,24 @@ CONFIG_SUNQE=m
 # CONFIG_NET_FC is not set
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
 
 #
-# Unix98 PTY support
+# ISDN subsystem
 #
-CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=256
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
 
 #
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
 
 #
 # Userland interfaces
@@ -405,17 +517,6 @@ CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_EVBUG=m
 
 #
-# Input I/O drivers
-#
-# CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
-CONFIG_SERIO=m
-# CONFIG_SERIO_I8042 is not set
-CONFIG_SERIO_SERPORT=m
-# CONFIG_SERIO_CT82C710 is not set
-# CONFIG_SERIO_PCIPS2 is not set
-
-#
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
@@ -424,6 +525,7 @@ CONFIG_KEYBOARD_SUNKBD=m
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_SERIAL=m
@@ -433,29 +535,239 @@ CONFIG_MOUSE_SERIAL=m
 # CONFIG_INPUT_MISC is not set
 
 #
+# Hardware I/O ports
+#
+CONFIG_SERIO=m
+# CONFIG_SERIO_I8042 is not set
+CONFIG_SERIO_SERPORT=m
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=m
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_SUNCORE=y
+CONFIG_SERIAL_SUNZILOG=y
+CONFIG_SERIAL_SUNZILOG_CONSOLE=y
+CONFIG_SERIAL_SUNSU=y
+CONFIG_SERIAL_SUNSU_CONSOLE=y
+# CONFIG_SERIAL_SUNSAB is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=m
+CONFIG_RTC=m
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB is not set
+
+#
+# Console display driver support
+#
+# CONFIG_PROM_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# HID Devices
+#
+CONFIG_HID=y
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+
+#
+# Real Time Clock
+#
+# CONFIG_RTC_CLASS is not set
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# Virtualization
+#
+
+#
+# Misc Linux/SPARC drivers
+#
+CONFIG_SUN_OPENPROMIO=m
+CONFIG_SUN_MOSTEK_RTC=m
+# CONFIG_SUN_BPP is not set
+# CONFIG_SUN_VIDEOPIX is not set
+# CONFIG_TADPOLE_TS102_UCTRL is not set
+# CONFIG_SUN_JSFLASH is not set
+
+#
+# Unix98 PTY support
+#
+CONFIG_UNIX98_PTY_COUNT=256
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
 # CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
+# CONFIG_EXT4DEV_FS is not set
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_XFS_FS=m
-CONFIG_XFS_RT=y
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_SECURITY=y
 CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 CONFIG_ROMFS_FS=m
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 CONFIG_QUOTACTL=y
+CONFIG_DNOTIFY=y
 CONFIG_AUTOFS_FS=m
 CONFIG_AUTOFS4_FS=m
+# CONFIG_FUSE_FS is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -468,7 +780,8 @@ CONFIG_ISO9660_FS=m
 #
 # DOS/FAT/NT Filesystems
 #
-# CONFIG_FAT_FS is not set
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
 # CONFIG_NTFS_FS is not set
 
 #
@@ -476,13 +789,12 @@ CONFIG_ISO9660_FS=m
 #
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-CONFIG_DEVPTS_FS_XATTR=y
-# CONFIG_DEVPTS_FS_SECURITY is not set
 # CONFIG_TMPFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -512,17 +824,23 @@ CONFIG_NFS_FS=y
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
-# CONFIG_EXPORTFS is not set
+CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 CONFIG_AFS_FS=m
 CONFIG_RXRPC=m
+# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -559,6 +877,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_ISO8859_8 is not set
 # CONFIG_NLS_CODEPAGE_1250 is not set
 # CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
 # CONFIG_NLS_ISO8859_1 is not set
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
@@ -575,70 +894,104 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 
 #
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# USB support
+# Distributed Lock Manager
 #
-# CONFIG_USB is not set
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
+# CONFIG_DLM is not set
 
 #
-# Watchdog Cards
+# Instrumentation Support
 #
-# CONFIG_WATCHDOG is not set
+# CONFIG_PROFILING is not set
 
 #
 # Kernel hacking
 #
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
 # CONFIG_DEBUG_SLAB is not set
-CONFIG_MAGIC_SYSRQ=y
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
 
 #
 # Security options
 #
+# CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
 
 #
 # Cryptographic options
 #
 CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_MD4=y
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_LRW is not set
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
+# CONFIG_CRYPTO_TEA is not set
 CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_TEST is not set
 
 #
+# Hardware crypto devices
+#
+
+#
 # Library routines
 #
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 54d51b404603..987ec6782f99 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -153,7 +153,7 @@ void __iomem *of_ioremap(struct resource *res, unsigned long offset,
 }
 EXPORT_SYMBOL(of_ioremap);
 
-void of_iounmap(void __iomem *base, unsigned long size)
+void of_iounmap(struct resource *res, void __iomem *base, unsigned long size)
 {
         iounmap(base);
 }
@@ -317,9 +317,8 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp)
         if ((va = __get_free_pages(GFP_KERNEL|__GFP_COMP, order)) == 0)
                 goto err_nopages;
 
-        if ((res = kmalloc(sizeof(struct resource), GFP_KERNEL)) == NULL)
+        if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL)
                 goto err_nomem;
-        memset((char*)res, 0, sizeof(struct resource));
 
         if (allocate_resource(&_sparc_dvma, res, len_total,
             _sparc_dvma.start, _sparc_dvma.end, PAGE_SIZE, NULL, NULL) != 0) {
@@ -589,12 +588,11 @@ void *pci_alloc_consistent(struct pci_dev *pdev, size_t len, dma_addr_t *pba)
                 return NULL;
         }
 
-        if ((res = kmalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) {
+        if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) {
                 free_pages(va, order);
                 printk("pci_alloc_consistent: no core\n");
                 return NULL;
         }
-        memset((char*)res, 0, sizeof(struct resource));
 
         if (allocate_resource(&_sparc_dvma, res, len_total,
             _sparc_dvma.start, _sparc_dvma.end, PAGE_SIZE, NULL, NULL) != 0) {
@@ -728,7 +726,8 @@ int pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, int nents,
         /* IIep is write-through, not flushing. */
         for (n = 0; n < nents; n++) {
                 BUG_ON(page_address(sg->page) == NULL);
-                sg->dvma_address = virt_to_phys(page_address(sg->page));
+                sg->dvma_address =
+                        virt_to_phys(page_address(sg->page)) + sg->offset;
                 sg->dvma_length = sg->length;
                 sg++;
         }
diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index c8cb211b9072..5b4841d067c1 100644
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@@ -425,7 +425,7 @@ int request_fast_irq(unsigned int irq,
         }
         
         if (action == NULL)
-            action = (struct irqaction *)kmalloc(sizeof(struct irqaction),
+            action = kmalloc(sizeof(struct irqaction),
                                                  GFP_ATOMIC);
         
         if (!action) { 
@@ -528,7 +528,7 @@ int request_irq(unsigned int irq,
         }
         
         if (action == NULL)
-                action = (struct irqaction *)kmalloc(sizeof(struct irqaction),
+                action = kmalloc(sizeof(struct irqaction),
                                                      GFP_ATOMIC);
         
         if (!action) { 
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c
index 46200c43ffb1..dab6169e31ca 100644
--- a/arch/sparc/kernel/of_device.c
+++ b/arch/sparc/kernel/of_device.c
@@ -793,10 +793,9 @@ struct of_device* of_platform_device_create(struct device_node *np,
 {
         struct of_device *dev;
 
-        dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
         if (!dev)
                 return NULL;
-        memset(dev, 0, sizeof(*dev));
 
         dev->dev.parent = parent;
         dev->dev.bus = bus;
diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c
index 1baf13ed5c3a..003f8eed32f4 100644
--- a/arch/sparc/kernel/ptrace.c
+++ b/arch/sparc/kernel/ptrace.c
@@ -289,7 +289,10 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
 
         if (request == PTRACE_TRACEME) {
                 ret = ptrace_traceme();
-                pt_succ_return(regs, 0);
+                if (ret < 0)
+                        pt_error_return(regs, -ret);
+                else
+                        pt_succ_return(regs, 0);
                 goto out;
         }
 
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c
index 33dadd9f2871..d8e008a04e2b 100644
--- a/arch/sparc/kernel/sparc_ksyms.c
+++ b/arch/sparc/kernel/sparc_ksyms.c
@@ -83,9 +83,6 @@ extern int __divdi3(int, int);
 /* Private functions with odd calling conventions. */
 extern void ___atomic24_add(void);
 extern void ___atomic24_sub(void);
-extern void ___set_bit(void);
-extern void ___clear_bit(void);
-extern void ___change_bit(void);
 extern void ___rw_read_enter(void);
 extern void ___rw_read_try(void);
 extern void ___rw_read_exit(void);
@@ -125,11 +122,6 @@ EXPORT_SYMBOL(pfn_base);
 EXPORT_SYMBOL(___atomic24_add);
 EXPORT_SYMBOL(___atomic24_sub);
 
-/* Bit operations. */
-EXPORT_SYMBOL(___set_bit);
-EXPORT_SYMBOL(___clear_bit);
-EXPORT_SYMBOL(___change_bit);
-
 /* Per-CPU information table */
 EXPORT_PER_CPU_SYMBOL(__cpu_data);
 
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c
index d4f9da8170c5..0e27e226e0e2 100644
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@@ -327,7 +327,7 @@ int sun4d_request_irq(unsigned int irq,
         }
         
         if (action == NULL)
-                action = (struct irqaction *)kmalloc(sizeof(struct irqaction),
+                action = kmalloc(sizeof(struct irqaction),
                                                      GFP_ATOMIC);
         
         if (!action) { 
@@ -545,8 +545,11 @@ void __init sun4d_init_sbi_irq(void)
         nsbi = 0;
         for_each_sbus(sbus)
                 nsbi++;
-        sbus_actions = (struct sbus_action *)kmalloc (nsbi * 8 * 4 * sizeof(struct sbus_action), GFP_ATOMIC);
-        memset (sbus_actions, 0, (nsbi * 8 * 4 * sizeof(struct sbus_action)));
+        sbus_actions = kzalloc (nsbi * 8 * 4 * sizeof(struct sbus_action), GFP_ATOMIC);
+        if (!sbus_actions) {
+                prom_printf("SUN4D: Cannot allocate sbus_actions, halting.\n");
+                prom_halt();
+        }
         for_each_sbus(sbus) {
 #ifdef CONFIG_SMP       
                 extern unsigned char boot_cpu_id;
diff --git a/arch/sparc/kernel/sys_sunos.c b/arch/sparc/kernel/sys_sunos.c
index 6f3ac548ee66..0bf8c165fc92 100644
--- a/arch/sparc/kernel/sys_sunos.c
+++ b/arch/sparc/kernel/sys_sunos.c
@@ -94,8 +94,8 @@ asmlinkage unsigned long sunos_mmap(unsigned long addr, unsigned long len,
          * SunOS is so stupid some times... hmph!
          */
         if (file) {
-                if (imajor(file->f_dentry->d_inode) == MEM_MAJOR &&
-                    iminor(file->f_dentry->d_inode) == 5) {
+                if (imajor(file->f_path.dentry->d_inode) == MEM_MAJOR &&
+                    iminor(file->f_path.dentry->d_inode) == 5) {
                         flags |= MAP_ANONYMOUS;
                         fput(file);
                         file = NULL;
@@ -655,7 +655,7 @@ sunos_nfs_get_server_fd (int fd, struct sockaddr_in *addr)
         if (!file)
                 goto out;
 
-        inode = file->f_dentry->d_inode;
+        inode = file->f_path.dentry->d_inode;
 
         socket = SOCKET_I(inode);
         local.sin_family = AF_INET;
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index 6c7aa51b590f..2fcce000d877 100644
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -78,7 +78,6 @@ unsigned long profile_pc(struct pt_regs *regs)
         extern char __copy_user_begin[], __copy_user_end[];
         extern char __atomic_begin[], __atomic_end[];
         extern char __bzero_begin[], __bzero_end[];
-        extern char __bitops_begin[], __bitops_end[];
 
         unsigned long pc = regs->pc;
 
@@ -88,9 +87,7 @@ unsigned long profile_pc(struct pt_regs *regs)
             (pc >= (unsigned long) __atomic_begin &&
              pc < (unsigned long) __atomic_end) ||
             (pc >= (unsigned long) __bzero_begin &&
-             pc < (unsigned long) __bzero_end) ||
-            (pc >= (unsigned long) __bitops_begin &&
-             pc < (unsigned long) __bitops_end))
+             pc < (unsigned long) __bzero_end))
                 pc = regs->u_regs[UREG_RETPC];
         return pc;
 }
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S
index 5cc5ff7f8824..b73e6b9067ed 100644
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
@@ -11,6 +11,7 @@ SECTIONS
   . = 0x10000 + SIZEOF_HEADERS;
   .text 0xf0004000 :
   {
+    _text = .;
     *(.text)
     SCHED_TEXT
     LOCK_TEXT
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
index 5db7e1d85385..9ddc5b9ce3bd 100644
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
@@ -7,7 +7,7 @@ EXTRA_AFLAGS := -ansi -DST_DIV0=0x02
 lib-y := mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o memcpy.o memset.o \
          strlen.o checksum.o blockops.o memscan.o memcmp.o strncmp.o \
          strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \
-         copy_user.o locks.o atomic.o atomic32.o bitops.o \
+         copy_user.o locks.o atomic.o \
          lshrdi3.o ashldi3.o rwsem.o muldi3.o bitext.o
 
-obj-y += iomap.o
+obj-y += iomap.o atomic32.o
diff --git a/arch/sparc/lib/atomic32.c b/arch/sparc/lib/atomic32.c
index de84f8534bac..53ddcd9d1e60 100644
--- a/arch/sparc/lib/atomic32.c
+++ b/arch/sparc/lib/atomic32.c
@@ -76,3 +76,42 @@ void atomic_set(atomic_t *v, int i)
         spin_unlock_irqrestore(ATOMIC_HASH(v), flags);
 }
 EXPORT_SYMBOL(atomic_set);
+
+unsigned long ___set_bit(unsigned long *addr, unsigned long mask)
+{
+        unsigned long old, flags;
+
+        spin_lock_irqsave(ATOMIC_HASH(addr), flags);
+        old = *addr;
+        *addr = old | mask;
+        spin_unlock_irqrestore(ATOMIC_HASH(addr), flags);
+
+        return old & mask;
+}
+EXPORT_SYMBOL(___set_bit);
+
+unsigned long ___clear_bit(unsigned long *addr, unsigned long mask)
+{
+        unsigned long old, flags;
+
+        spin_lock_irqsave(ATOMIC_HASH(addr), flags);
+        old = *addr;
+        *addr = old & ~mask;
+        spin_unlock_irqrestore(ATOMIC_HASH(addr), flags);
+
+        return old & mask;
+}
+EXPORT_SYMBOL(___clear_bit);
+
+unsigned long ___change_bit(unsigned long *addr, unsigned long mask)
+{
+        unsigned long old, flags;
+
+        spin_lock_irqsave(ATOMIC_HASH(addr), flags);
+        old = *addr;
+        *addr = old ^ mask;
+        spin_unlock_irqrestore(ATOMIC_HASH(addr), flags);
+
+        return old & mask;
+}
+EXPORT_SYMBOL(___change_bit);
diff --git a/arch/sparc/lib/bitops.S b/arch/sparc/lib/bitops.S
deleted file mode 100644
index cb7fb66a40c8..000000000000
--- a/arch/sparc/lib/bitops.S
+++ /dev/null
@@ -1,109 +0,0 @@
-/* bitops.S: Low level assembler bit operations.
- *
- * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
- */
-
-#include <asm/ptrace.h>
-#include <asm/psr.h>
-
-        .text
-        .align  4
-
-        .globl  __bitops_begin
-__bitops_begin:
-
-        /* Take bits in %g2 and set them in word at %g1,
-         * return whether bits were set in original value
-         * in %g2.  %g4 holds value to restore into %o7
-         * in delay slot of jmpl return, %g3 + %g5 + %g7 can be
-         * used as temporaries and thus is considered clobbered
-         * by all callers.
-         */
-        .globl  ___set_bit
-___set_bit:
-        rd      %psr, %g3
-        nop; nop; nop;
-        or      %g3, PSR_PIL, %g5
-        wr      %g5, 0x0, %psr
-        nop; nop; nop
-#ifdef CONFIG_SMP
-        set     bitops_spinlock, %g5
-2:      ldstub  [%g5], %g7              ! Spin on the byte lock for SMP.
-        orcc    %g7, 0x0, %g0           ! Did we get it?
-        bne     2b                      ! Nope...
-#endif
-         ld     [%g1], %g7
-        or      %g7, %g2, %g5
-        and     %g7, %g2, %g2
-#ifdef CONFIG_SMP
-        st      %g5, [%g1]
-        set     bitops_spinlock, %g5
-        stb     %g0, [%g5]
-#else
-        st      %g5, [%g1]
-#endif
-        wr      %g3, 0x0, %psr
-        nop; nop; nop
-        jmpl    %o7, %g0
-         mov    %g4, %o7
-
-        /* Same as above, but clears the bits from %g2 instead. */
-        .globl  ___clear_bit
-___clear_bit:
-        rd      %psr, %g3
-        nop; nop; nop
-        or      %g3, PSR_PIL, %g5
-        wr      %g5, 0x0, %psr
-        nop; nop; nop
-#ifdef CONFIG_SMP
-        set     bitops_spinlock, %g5
-2:      ldstub  [%g5], %g7              ! Spin on the byte lock for SMP.
-        orcc    %g7, 0x0, %g0           ! Did we get it?
-        bne     2b                      ! Nope...
-#endif
-         ld     [%g1], %g7
-        andn    %g7, %g2, %g5
-        and     %g7, %g2, %g2
-#ifdef CONFIG_SMP
-        st      %g5, [%g1]
-        set     bitops_spinlock, %g5
-        stb     %g0, [%g5]
-#else
-        st      %g5, [%g1]
-#endif
-        wr      %g3, 0x0, %psr
-        nop; nop; nop
-        jmpl    %o7, %g0
-         mov    %g4, %o7
-
-        /* Same thing again, but this time toggles the bits from %g2. */
-        .globl  ___change_bit
-___change_bit:
-        rd      %psr, %g3
-        nop; nop; nop
-        or      %g3, PSR_PIL, %g5
-        wr      %g5, 0x0, %psr
-        nop; nop; nop
-#ifdef CONFIG_SMP
-        set     bitops_spinlock, %g5
-2:      ldstub  [%g5], %g7              ! Spin on the byte lock for SMP.
-        orcc    %g7, 0x0, %g0           ! Did we get it?
-        bne     2b                      ! Nope...
-#endif
-         ld     [%g1], %g7
-        xor     %g7, %g2, %g5
-        and     %g7, %g2, %g2
-#ifdef CONFIG_SMP
-        st      %g5, [%g1]
-        set     bitops_spinlock, %g5
-        stb     %g0, [%g5]
-#else
-        st      %g5, [%g1]
-#endif
-        wr      %g3, 0x0, %psr
-        nop; nop; nop
-        jmpl    %o7, %g0
-         mov    %g4, %o7
-
-        .globl  __bitops_end
-__bitops_end:
diff --git a/arch/sparc/mm/highmem.c b/arch/sparc/mm/highmem.c
index 4d8ed9c65182..01fc6c254292 100644
--- a/arch/sparc/mm/highmem.c
+++ b/arch/sparc/mm/highmem.c
@@ -35,7 +35,7 @@ void *kmap_atomic(struct page *page, enum km_type type)
         unsigned long vaddr;
 
         /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
-        inc_preempt_count();
+        pagefault_disable();
         if (!PageHighMem(page))
                 return page_address(page);
 
@@ -70,8 +70,7 @@ void kunmap_atomic(void *kvaddr, enum km_type type)
         unsigned long idx = type + KM_TYPE_NR*smp_processor_id();
 
         if (vaddr < FIXADDR_START) { // FIXME
-                dec_preempt_count();
-                preempt_check_resched();
+                pagefault_enable();
                 return;
         }
 
@@ -97,8 +96,7 @@ void kunmap_atomic(void *kvaddr, enum km_type type)
 #endif
 #endif
 
-        dec_preempt_count();
-        preempt_check_resched();
+        pagefault_enable();
 }
 
 /* We may be fed a pagetable here by ptep_to_xxx and others. */
diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c
index 2bb1309003dd..4ccda77d08d6 100644
--- a/arch/sparc/mm/io-unit.c
+++ b/arch/sparc/mm/io-unit.c
@@ -22,6 +22,7 @@
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 #include <asm/dma.h>
+#include <asm/oplib.h>
 
 /* #define IOUNIT_DEBUG */
 #ifdef IOUNIT_DEBUG
@@ -41,9 +42,12 @@ iounit_init(int sbi_node, int io_node, struct sbus_bus *sbus)
         struct linux_prom_registers iommu_promregs[PROMREG_MAX];
         struct resource r;
 
-        iounit = kmalloc(sizeof(struct iounit_struct), GFP_ATOMIC);
+        iounit = kzalloc(sizeof(struct iounit_struct), GFP_ATOMIC);
+        if (!iounit) {
+                prom_printf("SUN4D: Cannot alloc iounit, halting.\n");
+                prom_halt();
+        }
 
-        memset(iounit, 0, sizeof(*iounit));
         iounit->limit[0] = IOUNIT_BMAP1_START;
         iounit->limit[1] = IOUNIT_BMAP2_START;
         iounit->limit[2] = IOUNIT_BMAPM_START;
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index b627f8dbcaad..d41f66ac7fff 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -26,6 +26,14 @@ config MMU
         bool
         default y
 
+config STACKTRACE_SUPPORT
+        bool
+        default y
+
+config LOCKDEP_SUPPORT
+        bool
+        default y
+
 config TIME_INTERPOLATION
         bool
         default y
@@ -34,6 +42,14 @@ config ARCH_MAY_HAVE_PC_FDC
         bool
         default y
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 config AUDIT_ARCH
         bool
         default y
diff --git a/arch/sparc64/Kconfig.debug b/arch/sparc64/Kconfig.debug
index afe0a7720a26..1f130f3b6c24 100644
--- a/arch/sparc64/Kconfig.debug
+++ b/arch/sparc64/Kconfig.debug
@@ -1,5 +1,9 @@
 menu "Kernel hacking"
 
+config TRACE_IRQFLAGS_SUPPORT
+        bool
+        default y
+
 source "lib/Kconfig.debug"
 
 config DEBUG_STACK_USAGE
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 2f4612fa81f2..5a9e68b13e60 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -1,24 +1,29 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19-rc2
-# Tue Oct 17 19:29:20 2006
+# Linux kernel version: 2.6.20-rc2
+# Thu Dec 28 15:09:49 2006
 #
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TIME_INTERPOLATION=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_SPARC64_PAGE_SIZE_8KB=y
 # CONFIG_SPARC64_PAGE_SIZE_64KB is not set
 # CONFIG_SPARC64_PAGE_SIZE_512KB is not set
 # CONFIG_SPARC64_PAGE_SIZE_4MB is not set
 CONFIG_SECCOMP=y
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
+CONFIG_HZ_100=y
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
-CONFIG_HZ=250
+CONFIG_HZ=100
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -42,13 +47,14 @@ CONFIG_POSIX_MQUEUE=y
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
 CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -203,6 +209,7 @@ CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
@@ -219,7 +226,6 @@ CONFIG_INET6_XFRM_MODE_BEET=m
 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_TUNNEL=m
-# CONFIG_IPV6_SUBTREES is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
@@ -238,6 +244,8 @@ CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID2_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=m
 CONFIG_IP_DCCP_TFRC_LIB=m
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_CCID3_RTO=100
 
 #
 # DCCP Kernel Hacking
@@ -326,7 +334,7 @@ CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_SX8 is not set
-CONFIG_BLK_DEV_UB=m
+# CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CDROM_PKTCDVD=m
@@ -405,6 +413,7 @@ CONFIG_IDEDMA_AUTO=y
 #
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
 CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
 
@@ -425,6 +434,7 @@ CONFIG_CHR_DEV_SG=m
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
 
 #
 # SCSI Transports
@@ -468,6 +478,7 @@ CONFIG_ISCSI_TCP=m
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SUNESP is not set
+# CONFIG_SCSI_SRP is not set
 
 #
 # Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -598,6 +609,7 @@ CONFIG_BNX2=m
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
 
 #
 # Token Ring devices
@@ -724,10 +736,6 @@ CONFIG_RTC=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
 
@@ -832,6 +840,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
@@ -842,6 +851,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
@@ -954,7 +964,6 @@ CONFIG_SND_VERBOSE_PROCFS=y
 #
 CONFIG_SND_MPU401_UART=m
 CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_AC97_BUS=m
 CONFIG_SND_DUMMY=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_MTPAV=m
@@ -1037,6 +1046,12 @@ CONFIG_SND_SUN_CS4231=m
 # Open Sound System
 #
 # CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+
+#
+# HID Devices
+#
+CONFIG_HID=y
 
 #
 # USB support
@@ -1053,6 +1068,7 @@ CONFIG_USB=y
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_MULTITHREAD_PROBE is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -1082,14 +1098,25 @@ CONFIG_USB_UHCI_HCD=m
 #
 # may also be needed; see USB_STORAGE Help for more information
 #
-# CONFIG_USB_STORAGE is not set
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_LIBUSUAL is not set
 
 #
 # USB Input Devices
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_HID_FF is not set
 CONFIG_USB_HIDDEV=y
@@ -1119,6 +1146,7 @@ CONFIG_USB_HIDDEV=y
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_USBNET is not set
 # CONFIG_USB_MON is not set
 
@@ -1208,6 +1236,10 @@ CONFIG_USB_HIDDEV=y
 #
 
 #
+# Virtualization
+#
+
+#
 # Misc Linux/SPARC drivers
 #
 CONFIG_SUN_OPENPROMIO=m
@@ -1364,6 +1396,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Instrumentation Support
 #
 CONFIG_PROFILING=y
@@ -1373,10 +1410,13 @@ CONFIG_KPROBES=y
 #
 # Kernel hacking
 #
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_PRINTK_TIME=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_DETECT_SOFTLOCKUP=y
@@ -1387,17 +1427,16 @@ CONFIG_SCHEDSTATS=y
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
-CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
-# CONFIG_UNWIND_INFO is not set
 CONFIG_FORCED_INLINING=y
-# CONFIG_HEADERS_CHECK is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_LKDTM is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -1420,8 +1459,9 @@ CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=y
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_MD4=y
 CONFIG_CRYPTO_MD5=y
@@ -1430,8 +1470,10 @@ CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
@@ -1456,6 +1498,7 @@ CONFIG_CRYPTO_TEST=m
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC32=y
@@ -1463,3 +1506,4 @@ CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile
index e1eabebaed39..eff0c01d3579 100644
--- a/arch/sparc64/kernel/Makefile
+++ b/arch/sparc64/kernel/Makefile
@@ -14,6 +14,7 @@ obj-y		:= process.o setup.o cpu.o idprom.o \
                    power.o sbus.o iommu_common.o sparc64_ksyms.o chmc.o \
                    visemul.o prom.o of_device.o
 
+obj-$(CONFIG_STACKTRACE) += stacktrace.o
 obj-$(CONFIG_PCI)        += ebus.o isa.o pci_common.o pci_iommu.o \
                             pci_psycho.o pci_sabre.o pci_schizo.o \
                             pci_sun4v.o pci_sun4v_asm.o
diff --git a/arch/sparc64/kernel/binfmt_aout32.c b/arch/sparc64/kernel/binfmt_aout32.c
index d7caa60a0074..f205fc7cbcd0 100644
--- a/arch/sparc64/kernel/binfmt_aout32.c
+++ b/arch/sparc64/kernel/binfmt_aout32.c
@@ -209,7 +209,7 @@ static int load_aout32_binary(struct linux_binprm * bprm, struct pt_regs * regs)
         if ((N_MAGIC(ex) != ZMAGIC && N_MAGIC(ex) != OMAGIC &&
              N_MAGIC(ex) != QMAGIC && N_MAGIC(ex) != NMAGIC) ||
             N_TRSIZE(ex) || N_DRSIZE(ex) ||
-            bprm->file->f_dentry->d_inode->i_size < ex.a_text+ex.a_data+N_SYMSIZE(ex)+N_TXTOFF(ex)) {
+            bprm->file->f_path.dentry->d_inode->i_size < ex.a_text+ex.a_data+N_SYMSIZE(ex)+N_TXTOFF(ex)) {
                 return -ENOEXEC;
         }
 
@@ -349,7 +349,7 @@ static int load_aout32_library(struct file *file)
         int retval;
         struct exec ex;
 
-        inode = file->f_dentry->d_inode;
+        inode = file->f_path.dentry->d_inode;
 
         retval = -ENOEXEC;
         error = kernel_read(file, 0, (char *) &ex, sizeof(ex));
diff --git a/arch/sparc64/kernel/binfmt_elf32.c b/arch/sparc64/kernel/binfmt_elf32.c
index a98f3ae175a3..9ad84ff10a17 100644
--- a/arch/sparc64/kernel/binfmt_elf32.c
+++ b/arch/sparc64/kernel/binfmt_elf32.c
@@ -141,7 +141,6 @@ cputime_to_compat_timeval(const cputime_t cputime, struct compat_timeval *value)
         value->tv_sec = jiffies / HZ;
 }
 
-#define elf_addr_t      u32
 #undef start_thread
 #define start_thread start_thread32
 #define init_elf_binfmt init_elf32_binfmt
diff --git a/arch/sparc64/kernel/chmc.c b/arch/sparc64/kernel/chmc.c
index 259f37e516f5..9699abeb9907 100644
--- a/arch/sparc64/kernel/chmc.c
+++ b/arch/sparc64/kernel/chmc.c
@@ -341,7 +341,7 @@ static void fetch_decode_regs(struct mctrl_info *mp)
 
 static int init_one_mctrl(struct device_node *dp)
 {
-        struct mctrl_info *mp = kmalloc(sizeof(*mp), GFP_KERNEL);
+        struct mctrl_info *mp = kzalloc(sizeof(*mp), GFP_KERNEL);
         int portid = of_getintprop_default(dp, "portid", -1);
         struct linux_prom64_registers *regs;
         void *pval;
@@ -349,7 +349,6 @@ static int init_one_mctrl(struct device_node *dp)
 
         if (!mp)
                 return -1;
-        memset(mp, 0, sizeof(*mp));
         if (portid == -1)
                 goto fail;
 
diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index 6f28bec0a9bf..c15a3edcb826 100644
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
@@ -597,7 +597,12 @@ __spitfire_cee_trap_continue:
 1:      ba,pt           %xcc, etrap_irq
          rd             %pc, %g7
 
-2:      mov             %l4, %o1
+2:
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call    trace_hardirqs_off
+         nop
+#endif
+        mov             %l4, %o1
         mov             %l5, %o2
         call            spitfire_access_error
          add            %sp, PTREGS_OFF, %o0
@@ -824,6 +829,10 @@ do_cheetah_plus_data_parity:
         wrpr            %g0, 15, %pil
         ba,pt           %xcc, etrap_irq
          rd             %pc, %g7
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
         mov             0x0, %o0
         call            cheetah_plus_parity_error
          add            %sp, PTREGS_OFF, %o1
@@ -855,6 +864,10 @@ do_cheetah_plus_insn_parity:
         wrpr            %g0, 15, %pil
         ba,pt           %xcc, etrap_irq
          rd             %pc, %g7
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
         mov             0x1, %o0
         call            cheetah_plus_parity_error
          add            %sp, PTREGS_OFF, %o1
@@ -1183,6 +1196,10 @@ c_fast_ecc:
         wrpr            %g0, 15, %pil
         ba,pt           %xcc, etrap_irq
          rd             %pc, %g7
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
         mov             %l4, %o1
         mov             %l5, %o2
         call            cheetah_fecc_handler
@@ -1211,6 +1228,10 @@ c_cee:
         wrpr            %g0, 15, %pil
         ba,pt           %xcc, etrap_irq
          rd             %pc, %g7
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
         mov             %l4, %o1
         mov             %l5, %o2
         call            cheetah_cee_handler
@@ -1239,6 +1260,10 @@ c_deferred:
         wrpr            %g0, 15, %pil
         ba,pt           %xcc, etrap_irq
          rd             %pc, %g7
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
         mov             %l4, %o1
         mov             %l5, %o2
         call            cheetah_deferred_handler
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index c8e9dc9d68a9..baea10a98196 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -78,11 +78,7 @@ sparc_ramdisk_image64:
 
         /* PROM cif handler code address is in %o4.  */
 sparc64_boot:
-1:      rd      %pc, %g7
-        set     1b, %g1
-        cmp     %g1, %g7
-        be,pn   %xcc, sparc64_boot_after_remap
-         mov    %o4, %l7
+        mov     %o4, %l7
 
         /* We need to remap the kernel.  Use position independant
          * code to remap us to KERNBASE.
@@ -295,7 +291,6 @@ is_sun4v:
 
         add     %sp, (192 + 128), %sp
 
-sparc64_boot_after_remap:
         sethi   %hi(prom_root_compatible), %g1
         or      %g1, %lo(prom_root_compatible), %g1
         sethi   %hi(prom_sun4v_name), %g7
@@ -489,6 +484,14 @@ tlb_fixup_done:
         call    __bzero
          sub    %o1, %o0, %o1
 
+#ifdef CONFIG_LOCKDEP
+        /* We have this call this super early, as even prom_init can grab
+         * spinlocks and thus call into the lockdep code.
+         */
+        call    lockdep_init
+         nop
+#endif
+
         mov     %l6, %o1                        ! OpenPROM stack
         call    prom_init
          mov    %l7, %o0                        ! OpenPROM cif handler
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index d64b1ea848de..c3d068c7a412 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -372,14 +372,14 @@ static void run_pre_handler(unsigned int virt_irq)
         }
 }
 
-static struct hw_interrupt_type sun4u_irq = {
+static struct irq_chip sun4u_irq = {
         .typename       = "sun4u",
         .enable         = sun4u_irq_enable,
         .disable        = sun4u_irq_disable,
         .end            = sun4u_irq_end,
 };
 
-static struct hw_interrupt_type sun4u_irq_ack = {
+static struct irq_chip sun4u_irq_ack = {
         .typename       = "sun4u+ack",
         .enable         = sun4u_irq_enable,
         .disable        = sun4u_irq_disable,
@@ -387,14 +387,14 @@ static struct hw_interrupt_type sun4u_irq_ack = {
         .end            = sun4u_irq_end,
 };
 
-static struct hw_interrupt_type sun4v_irq = {
+static struct irq_chip sun4v_irq = {
         .typename       = "sun4v",
         .enable         = sun4v_irq_enable,
         .disable        = sun4v_irq_disable,
         .end            = sun4v_irq_end,
 };
 
-static struct hw_interrupt_type sun4v_irq_ack = {
+static struct irq_chip sun4v_irq_ack = {
         .typename       = "sun4v+ack",
         .enable         = sun4v_irq_enable,
         .disable        = sun4v_irq_disable,
@@ -493,22 +493,6 @@ out:
         return bucket->virt_irq;
 }
 
-void hw_resend_irq(struct hw_interrupt_type *handler, unsigned int virt_irq)
-{
-        struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);
-        unsigned long pstate;
-        unsigned int *ent;
-
-        __asm__ __volatile__("rdpr %%pstate, %0" : "=r" (pstate));
-        __asm__ __volatile__("wrpr %0, %1, %%pstate"
-                             : : "r" (pstate), "i" (PSTATE_IE));
-        ent = irq_work(smp_processor_id());
-        bucket->irq_chain = *ent;
-        *ent = __irq(bucket);
-        set_softint(1 << PIL_DEVICE_IRQ);
-        __asm__ __volatile__("wrpr %0, 0x0, %%pstate" : : "r" (pstate));
-}
-
 void ack_bad_irq(unsigned int virt_irq)
 {
         struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);
diff --git a/arch/sparc64/kernel/isa.c b/arch/sparc64/kernel/isa.c
index f028e68b23f2..98721a8f8619 100644
--- a/arch/sparc64/kernel/isa.c
+++ b/arch/sparc64/kernel/isa.c
@@ -22,14 +22,15 @@ static void __init report_dev(struct sparc_isa_device *isa_dev, int child)
                 printk(" [%s", isa_dev->prom_node->name);
 }
 
-static struct linux_prom_registers * __init
-isa_dev_get_resource(struct sparc_isa_device *isa_dev)
+static void __init isa_dev_get_resource(struct sparc_isa_device *isa_dev)
 {
         struct linux_prom_registers *pregs;
         unsigned long base, len;
         int prop_len;
 
         pregs = of_get_property(isa_dev->prom_node, "reg", &prop_len);
+        if (!pregs)
+                return;
 
         /* Only the first one is interesting. */
         len = pregs[0].reg_size;
@@ -44,12 +45,9 @@ isa_dev_get_resource(struct sparc_isa_device *isa_dev)
 
         request_resource(&isa_dev->bus->parent->io_space,
                          &isa_dev->resource);
-
-        return pregs;
 }
 
-static void __init isa_dev_get_irq(struct sparc_isa_device *isa_dev,
-                                   struct linux_prom_registers *pregs)
+static void __init isa_dev_get_irq(struct sparc_isa_device *isa_dev)
 {
         struct of_device *op = of_find_device_by_node(isa_dev->prom_node);
 
@@ -69,17 +67,14 @@ static void __init isa_fill_children(struct sparc_isa_device *parent_isa_dev)
 
         printk(" ->");
         while (dp) {
-                struct linux_prom_registers *regs;
                 struct sparc_isa_device *isa_dev;
 
-                isa_dev = kmalloc(sizeof(*isa_dev), GFP_KERNEL);
+                isa_dev = kzalloc(sizeof(*isa_dev), GFP_KERNEL);
                 if (!isa_dev) {
                         fatal_err("cannot allocate child isa_dev");
                         prom_halt();
                 }
 
-                memset(isa_dev, 0, sizeof(*isa_dev));
-
                 /* Link it in to parent. */
                 isa_dev->next = parent_isa_dev->child;
                 parent_isa_dev->child = isa_dev;
@@ -87,8 +82,8 @@ static void __init isa_fill_children(struct sparc_isa_device *parent_isa_dev)
                 isa_dev->bus = parent_isa_dev->bus;
                 isa_dev->prom_node = dp;
 
-                regs = isa_dev_get_resource(isa_dev);
-                isa_dev_get_irq(isa_dev, regs);
+                isa_dev_get_resource(isa_dev);
+                isa_dev_get_irq(isa_dev);
 
                 report_dev(isa_dev, 1);
 
@@ -101,17 +96,14 @@ static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br)
         struct device_node *dp = isa_br->prom_node->child;
 
         while (dp) {
-                struct linux_prom_registers *regs;
                 struct sparc_isa_device *isa_dev;
 
-                isa_dev = kmalloc(sizeof(*isa_dev), GFP_KERNEL);
+                isa_dev = kzalloc(sizeof(*isa_dev), GFP_KERNEL);
                 if (!isa_dev) {
                         printk(KERN_DEBUG "ISA: cannot allocate isa_dev");
                         return;
                 }
 
-                memset(isa_dev, 0, sizeof(*isa_dev));
-
                 isa_dev->ofdev.node = dp;
                 isa_dev->ofdev.dev.parent = &isa_br->ofdev.dev;
                 isa_dev->ofdev.dev.bus = &isa_bus_type;
@@ -141,8 +133,8 @@ static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br)
                 isa_dev->bus = isa_br;
                 isa_dev->prom_node = dp;
 
-                regs = isa_dev_get_resource(isa_dev);
-                isa_dev_get_irq(isa_dev, regs);
+                isa_dev_get_resource(isa_dev);
+                isa_dev_get_irq(isa_dev);
 
                 report_dev(isa_dev, 0);
 
@@ -180,14 +172,12 @@ void __init isa_init(void)
                 pbm = pdev_cookie->pbm;
                 dp = pdev_cookie->prom_node;
 
-                isa_br = kmalloc(sizeof(*isa_br), GFP_KERNEL);
+                isa_br = kzalloc(sizeof(*isa_br), GFP_KERNEL);
                 if (!isa_br) {
                         printk(KERN_DEBUG "isa: cannot allocate sparc_isa_bridge");
                         return;
                 }
 
-                memset(isa_br, 0, sizeof(*isa_br));
-
                 isa_br->ofdev.node = dp;
                 isa_br->ofdev.dev.parent = &pdev->dev;
                 isa_br->ofdev.dev.bus = &isa_bus_type;
diff --git a/arch/sparc64/kernel/kprobes.c b/arch/sparc64/kernel/kprobes.c
index 8e75ed762fd8..ae221f0d4a6f 100644
--- a/arch/sparc64/kernel/kprobes.c
+++ b/arch/sparc64/kernel/kprobes.c
@@ -45,7 +45,11 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
 int __kprobes arch_prepare_kprobe(struct kprobe *p)
 {
         p->ainsn.insn[0] = *p->addr;
+        flushi(&p->ainsn.insn[0]);
+
         p->ainsn.insn[1] = BREAKPOINT_INSTRUCTION_2;
+        flushi(&p->ainsn.insn[1]);
+
         p->opcode = *p->addr;
         return 0;
 }
@@ -185,16 +189,19 @@ no_kprobe:
 /* If INSN is a relative control transfer instruction,
  * return the corrected branch destination value.
  *
- * The original INSN location was REAL_PC, it actually
- * executed at PC and produced destination address NPC.
+ * regs->tpc and regs->tnpc still hold the values of the
+ * program counters at the time of trap due to the execution
+ * of the BREAKPOINT_INSTRUCTION_2 at p->ainsn.insn[1]
+ * 
  */
-static unsigned long __kprobes relbranch_fixup(u32 insn, unsigned long real_pc,
-                                               unsigned long pc,
-                                               unsigned long npc)
+static unsigned long __kprobes relbranch_fixup(u32 insn, struct kprobe *p,
+                                               struct pt_regs *regs)
 {
+        unsigned long real_pc = (unsigned long) p->addr;
+
         /* Branch not taken, no mods necessary.  */
-        if (npc == pc + 0x4UL)
-                return real_pc + 0x4UL;
+        if (regs->tnpc == regs->tpc + 0x4UL)
+                return real_pc + 0x8UL;
 
         /* The three cases are call, branch w/prediction,
          * and traditional branch.
@@ -202,14 +209,21 @@ static unsigned long __kprobes relbranch_fixup(u32 insn, unsigned long real_pc,
         if ((insn & 0xc0000000) == 0x40000000 ||
             (insn & 0xc1c00000) == 0x00400000 ||
             (insn & 0xc1c00000) == 0x00800000) {
+                unsigned long ainsn_addr;
+
+                ainsn_addr = (unsigned long) &p->ainsn.insn[0];
+
                 /* The instruction did all the work for us
                  * already, just apply the offset to the correct
                  * instruction location.
                  */
-                return (real_pc + (npc - pc));
+                return (real_pc + (regs->tnpc - ainsn_addr));
         }
 
-        return real_pc + 0x4UL;
+        /* It is jmpl or some other absolute PC modification instruction,
+         * leave NPC as-is.
+         */
+        return regs->tnpc;
 }
 
 /* If INSN is an instruction which writes it's PC location
@@ -220,12 +234,12 @@ static void __kprobes retpc_fixup(struct pt_regs *regs, u32 insn,
 {
         unsigned long *slot = NULL;
 
-        /* Simplest cast is call, which always uses %o7 */
+        /* Simplest case is 'call', which always uses %o7 */
         if ((insn & 0xc0000000) == 0x40000000) {
                 slot = &regs->u_regs[UREG_I7];
         }
 
-        /* Jmpl encodes the register inside of the opcode */
+        /* 'jmpl' encodes the register inside of the opcode */
         if ((insn & 0xc1f80000) == 0x81c00000) {
                 unsigned long rd = ((insn >> 25) & 0x1f);
 
@@ -247,11 +261,11 @@ static void __kprobes retpc_fixup(struct pt_regs *regs, u32 insn,
 
 /*
  * Called after single-stepping.  p->addr is the address of the
- * instruction whose first byte has been replaced by the breakpoint
+ * instruction which has been replaced by the breakpoint
  * instruction.  To avoid the SMP problems that can occur when we
  * temporarily put back the original opcode to single-step, we
  * single-stepped a copy of the instruction.  The address of this
- * copy is p->ainsn.insn.
+ * copy is &p->ainsn.insn[0].
  *
  * This function prepares to return from the post-single-step
  * breakpoint trap.
@@ -261,11 +275,11 @@ static void __kprobes resume_execution(struct kprobe *p,
 {
         u32 insn = p->ainsn.insn[0];
 
+        regs->tnpc = relbranch_fixup(insn, p, regs);
+
+        /* This assignment must occur after relbranch_fixup() */
         regs->tpc = kcb->kprobe_orig_tnpc;
-        regs->tnpc = relbranch_fixup(insn,
-                                     (unsigned long) p->addr,
-                                     (unsigned long) &p->ainsn.insn[0],
-                                     regs->tnpc);
+
         retpc_fixup(regs, insn, (unsigned long) p->addr);
 
         regs->tstate = ((regs->tstate & ~TSTATE_PIL) |
@@ -430,17 +444,8 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
         struct jprobe *jp = container_of(p, struct jprobe, kp);
         struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
 
-        kcb->jprobe_saved_regs_location = regs;
         memcpy(&(kcb->jprobe_saved_regs), regs, sizeof(*regs));
 
-        /* Save a whole stack frame, this gets arguments
-         * pushed onto the stack after using up all the
-         * arg registers.
-         */
-        memcpy(&(kcb->jprobe_saved_stack),
-               (char *) (regs->u_regs[UREG_FP] + STACK_BIAS),
-               sizeof(kcb->jprobe_saved_stack));
-
         regs->tpc  = (unsigned long) jp->entry;
         regs->tnpc = ((unsigned long) jp->entry) + 0x4UL;
         regs->tstate |= TSTATE_PIL;
@@ -450,10 +455,19 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
 
 void __kprobes jprobe_return(void)
 {
-        __asm__ __volatile__(
-                ".globl jprobe_return_trap_instruction\n"
+        struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
+        register unsigned long orig_fp asm("g1");
+
+        orig_fp = kcb->jprobe_saved_regs.u_regs[UREG_FP];
+        __asm__ __volatile__("\n"
+"1:     cmp             %%sp, %0\n\t"
+        "blu,a,pt       %%xcc, 1b\n\t"
+        " restore\n\t"
+        ".globl         jprobe_return_trap_instruction\n"
 "jprobe_return_trap_instruction:\n\t"
-                "ta 0x70");
+        "ta             0x70"
+        : /* no outputs */
+        : "r" (orig_fp));
 }
 
 extern void jprobe_return_trap_instruction(void);
@@ -466,26 +480,7 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
         struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
 
         if (addr == (u32 *) jprobe_return_trap_instruction) {
-                if (kcb->jprobe_saved_regs_location != regs) {
-                        printk("JPROBE: Current regs (%p) does not match "
-                               "saved regs (%p).\n",
-                               regs, kcb->jprobe_saved_regs_location);
-                        printk("JPROBE: Saved registers\n");
-                        __show_regs(kcb->jprobe_saved_regs_location);
-                        printk("JPROBE: Current registers\n");
-                        __show_regs(regs);
-                        BUG();
-                }
-                /* Restore old register state.  Do pt_regs
-                 * first so that UREG_FP is the original one for
-                 * the stack frame restore.
-                 */
                 memcpy(regs, &(kcb->jprobe_saved_regs), sizeof(*regs));
-
-                memcpy((char *) (regs->u_regs[UREG_FP] + STACK_BIAS),
-                       &(kcb->jprobe_saved_stack),
-                       sizeof(kcb->jprobe_saved_stack));
-
                 preempt_enable_no_resched();
                 return 1;
         }
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index 8cc14fc6b6f1..b0f3e0082a0d 100644
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
@@ -144,9 +144,12 @@ void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned lo
 }
 EXPORT_SYMBOL(of_ioremap);
 
-void of_iounmap(void __iomem *base, unsigned long size)
+void of_iounmap(struct resource *res, void __iomem *base, unsigned long size)
 {
-        release_region((unsigned long) base, size);
+        if (res->flags & IORESOURCE_MEM)
+                release_mem_region((unsigned long) base, size);
+        else
+                release_region((unsigned long) base, size);
 }
 EXPORT_SYMBOL(of_iounmap);
 
@@ -1007,10 +1010,9 @@ struct of_device* of_platform_device_create(struct device_node *np,
 {
         struct of_device *dev;
 
-        dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
         if (!dev)
                 return NULL;
-        memset(dev, 0, sizeof(*dev));
 
         dev->dev.parent = parent;
         dev->dev.bus = bus;
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/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index 03ad4c06758e..6b04794b7a97 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -798,7 +798,7 @@ static struct pci_ops pci_sun4v_ops = {
 static void pbm_scan_bus(struct pci_controller_info *p,
                          struct pci_pbm_info *pbm)
 {
-        struct pcidev_cookie *cookie = kmalloc(sizeof(*cookie), GFP_KERNEL);
+        struct pcidev_cookie *cookie = kzalloc(sizeof(*cookie), GFP_KERNEL);
 
         if (!cookie) {
                 prom_printf("%s: Critical allocation failure.\n", pbm->name);
@@ -806,7 +806,6 @@ static void pbm_scan_bus(struct pci_controller_info *p,
         }
 
         /* All we care about is the PBM. */
-        memset(cookie, 0, sizeof(*cookie));
         cookie->pbm = pbm;
 
         pbm->pci_bus = pci_scan_bus(pbm->pci_first_busno, p->pci_ops, pbm);
@@ -1048,12 +1047,11 @@ static void pci_sun4v_iommu_init(struct pci_pbm_info *pbm)
         /* Allocate and initialize the free area map.  */
         sz = num_tsb_entries / 8;
         sz = (sz + 7UL) & ~7UL;
-        iommu->arena.map = kmalloc(sz, GFP_KERNEL);
+        iommu->arena.map = kzalloc(sz, GFP_KERNEL);
         if (!iommu->arena.map) {
                 prom_printf("PCI_IOMMU: Error, kmalloc(arena.map) failed.\n");
                 prom_halt();
         }
-        memset(iommu->arena.map, 0, sz);
         iommu->arena.limit = num_tsb_entries;
 
         sz = probe_existing_entries(pbm, iommu);
@@ -1164,24 +1162,20 @@ void sun4v_pci_init(struct device_node *dp, char *model_name)
                 per_cpu(pci_iommu_batch, i).pglist = (u64 *) page;
         }
 
-        p = kmalloc(sizeof(struct pci_controller_info), GFP_ATOMIC);
+        p = kzalloc(sizeof(struct pci_controller_info), GFP_ATOMIC);
         if (!p)
                 goto fatal_memory_error;
 
-        memset(p, 0, sizeof(*p));
-
-        iommu = kmalloc(sizeof(struct pci_iommu), GFP_ATOMIC);
+        iommu = kzalloc(sizeof(struct pci_iommu), GFP_ATOMIC);
         if (!iommu)
                 goto fatal_memory_error;
 
-        memset(iommu, 0, sizeof(*iommu));
         p->pbm_A.iommu = iommu;
 
-        iommu = kmalloc(sizeof(struct pci_iommu), GFP_ATOMIC);
+        iommu = kzalloc(sizeof(struct pci_iommu), GFP_ATOMIC);
         if (!iommu)
                 goto fatal_memory_error;
 
-        memset(iommu, 0, sizeof(*iommu));
         p->pbm_B.iommu = iommu;
 
         p->next = pci_controller_root;
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index d31975e6d6f6..81111a12f0a8 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -202,7 +202,10 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
 #endif
         if (request == PTRACE_TRACEME) {
                 ret = ptrace_traceme();
-                pt_succ_return(regs, 0);
+                if (ret < 0)
+                        pt_error_return(regs, -ret);
+                else
+                        pt_succ_return(regs, 0);
                 goto out;
         }
 
diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S
index 3522cd66f3bb..079d18a11d24 100644
--- a/arch/sparc64/kernel/rtrap.S
+++ b/arch/sparc64/kernel/rtrap.S
@@ -165,14 +165,26 @@ rtrap:
 __handle_softirq_continue:
 rtrap_xcall:
                 sethi                   %hi(0xf << 20), %l4
-                andcc                   %l1, TSTATE_PRIV, %l3
                 and                     %l1, %l4, %l4
+                andn                    %l1, %l4, %l1
+                srl                     %l4, 20, %l4
+#ifdef CONFIG_TRACE_IRQFLAGS
+                brnz,pn                 %l4, rtrap_no_irq_enable
+                 nop
+                call                    trace_hardirqs_on
+                 nop
+                wrpr                    %l4, %pil
+rtrap_no_irq_enable:
+#endif
+                andcc                   %l1, TSTATE_PRIV, %l3
                 bne,pn                  %icc, to_kernel
-                 andn                   %l1, %l4, %l1
+                 nop
 
                 /* We must hold IRQs off and atomically test schedule+signal
                  * state, then hold them off all the way back to userspace.
-                 * If we are returning to kernel, none of this matters.
+                 * If we are returning to kernel, none of this matters.  Note
+                 * that we are disabling interrupts via PSTATE_IE, not using
+                 * %pil.
                  *
                  * If we do not do this, there is a window where we would do
                  * the tests, later the signal/resched event arrives but we do
@@ -256,7 +268,6 @@ rt_continue:	ldx			[%sp + PTREGS_OFF + PT_V9_G1], %g1
 
                 ld                      [%sp + PTREGS_OFF + PT_V9_Y], %o3
                 wr                      %o3, %g0, %y
-                srl                     %l4, 20, %l4
                 wrpr                    %l4, 0x0, %pil
                 wrpr                    %g0, 0x1, %tl
                 wrpr                    %l1, %g0, %tstate
@@ -374,8 +385,8 @@ to_kernel:
                  ldx                    [%g6 + TI_FLAGS], %l5
                 andcc                   %l5, _TIF_NEED_RESCHED, %g0
                 be,pt                   %xcc, kern_fpucheck
-                 srl                    %l4, 20, %l5
-                cmp                     %l5, 0
+                 nop
+                cmp                     %l4, 0
                 bne,pn                  %xcc, kern_fpucheck
                  sethi                  %hi(PREEMPT_ACTIVE), %l6
                 stw                     %l6, [%g6 + TI_PRE_COUNT]
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index cc09d8266414..fc99f7b8012f 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -1388,7 +1388,7 @@ void __devinit smp_prepare_boot_cpu(void)
 {
 }
 
-int __devinit __cpu_up(unsigned int cpu)
+int __cpuinit __cpu_up(unsigned int cpu)
 {
         int ret = smp_boot_one_cpu(cpu);
 
@@ -1447,11 +1447,8 @@ void __init setup_per_cpu_areas(void)
         char *ptr;
 
         /* Copy section for each CPU (we discard the original) */
-        goal = ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES);
-#ifdef CONFIG_MODULES
-        if (goal < PERCPU_ENOUGH_ROOM)
-                goal = PERCPU_ENOUGH_ROOM;
-#endif
+        goal = PERCPU_ENOUGH_ROOM;
+
         __per_cpu_shift = 0;
         for (size = 1UL; size < goal; size <<= 1UL)
                 __per_cpu_shift++;
diff --git a/arch/sparc64/kernel/stacktrace.c b/arch/sparc64/kernel/stacktrace.c
new file mode 100644
index 000000000000..c4d15f2762b9
--- /dev/null
+++ b/arch/sparc64/kernel/stacktrace.c
@@ -0,0 +1,41 @@
+#include <linux/sched.h>
+#include <linux/stacktrace.h>
+#include <linux/thread_info.h>
+#include <asm/ptrace.h>
+
+void save_stack_trace(struct stack_trace *trace, struct task_struct *task)
+{
+        unsigned long ksp, fp, thread_base;
+        struct thread_info *tp;
+
+        if (!task)
+                task = current;
+        tp = task_thread_info(task);
+        if (task == current) {
+                flushw_all();
+                __asm__ __volatile__(
+                        "mov    %%fp, %0"
+                        : "=r" (ksp)
+                );
+        } else
+                ksp = tp->ksp;
+
+        fp = ksp + STACK_BIAS;
+        thread_base = (unsigned long) tp;
+        do {
+                struct reg_window *rw;
+
+                /* Bogus frame pointer? */
+                if (fp < (thread_base + sizeof(struct thread_info)) ||
+                    fp >= (thread_base + THREAD_SIZE))
+                        break;
+
+                rw = (struct reg_window *) fp;
+                if (trace->skip > 0)
+                        trace->skip--;
+                else
+                        trace->entries[trace->nr_entries++] = rw->ins[7];
+
+                fp = rw->ins[6] + STACK_BIAS;
+        } while (trace->nr_entries < trace->max_entries);
+}
diff --git a/arch/sparc64/kernel/sun4v_ivec.S b/arch/sparc64/kernel/sun4v_ivec.S
index 49703c3c5769..405855dd886b 100644
--- a/arch/sparc64/kernel/sun4v_ivec.S
+++ b/arch/sparc64/kernel/sun4v_ivec.S
@@ -190,7 +190,10 @@ sun4v_res_mondo:
         mov     %g1, %g4
         ba,pt   %xcc, etrap_irq
          rd     %pc, %g7
-
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
         /* Log the event.  */
         add     %sp, PTREGS_OFF, %o0
         call    sun4v_resum_error
@@ -216,7 +219,10 @@ sun4v_res_mondo_queue_full:
         wrpr    %g0, 15, %pil
         ba,pt   %xcc, etrap_irq
          rd     %pc, %g7
-
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
         call    sun4v_resum_overflow
          add    %sp, PTREGS_OFF, %o0
 
@@ -295,7 +301,10 @@ sun4v_nonres_mondo:
         mov     %g1, %g4
         ba,pt   %xcc, etrap_irq
          rd     %pc, %g7
-
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
         /* Log the event.  */
         add     %sp, PTREGS_OFF, %o0
         call    sun4v_nonresum_error
@@ -321,7 +330,10 @@ sun4v_nonres_mondo_queue_full:
         wrpr    %g0, 15, %pil
         ba,pt   %xcc, etrap_irq
          rd     %pc, %g7
-
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
         call    sun4v_nonresum_overflow
          add    %sp, PTREGS_OFF, %o0
 
diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c
index 7da72d3b322a..2ebc2c051383 100644
--- a/arch/sparc64/kernel/sys_sunos32.c
+++ b/arch/sparc64/kernel/sys_sunos32.c
@@ -83,7 +83,7 @@ asmlinkage u32 sunos_mmap(u32 addr, u32 len, u32 prot, u32 flags, u32 fd, u32 of
                 file = fget(fd);
                 if (!file)
                         goto out;
-                inode = file->f_dentry->d_inode;
+                inode = file->f_path.dentry->d_inode;
                 if (imajor(inode) == MEM_MAJOR && iminor(inode) == 5) {
                         flags |= MAP_ANONYMOUS;
                         fput(file);
@@ -615,7 +615,7 @@ sunos_nfs_get_server_fd (int fd, struct sockaddr_in *addr)
         if (!file)
                 return 0;
 
-        inode = file->f_dentry->d_inode;
+        inode = file->f_path.dentry->d_inode;
 
         socket = SOCKET_I(inode);
         local.sin_family = AF_INET;
@@ -1055,7 +1055,7 @@ asmlinkage int sunos_msgsys(int op, u32 arg1, u32 arg2, u32 arg3, u32 arg4)
                 break;
         case 2:
                 rval = -EFAULT;
-                kmbuf = (struct msgbuf *)kmalloc(sizeof(struct msgbuf) + arg3,
+                kmbuf = kmalloc(sizeof(struct msgbuf) + arg3,
                                                  GFP_KERNEL);
                 if (!kmbuf)
                         break;
@@ -1078,7 +1078,7 @@ asmlinkage int sunos_msgsys(int op, u32 arg1, u32 arg2, u32 arg3, u32 arg4)
                 break;
         case 3:
                 rval = -EFAULT;
-                kmbuf = (struct msgbuf *)kmalloc(sizeof(struct msgbuf) + arg3,
+                kmbuf = kmalloc(sizeof(struct msgbuf) + arg3,
                                                  GFP_KERNEL);
                 if (!kmbuf || sunos_msgbuf_get((struct msgbuf32 __user *)(unsigned long)arg2,
                                                kmbuf, arg3))
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c
index fe1796c939c3..ad67784292db 100644
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
@@ -10,7 +10,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/sched.h>  /* for jiffies */
+#include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/kallsyms.h>
 #include <linux/signal.h>
@@ -1873,6 +1873,16 @@ void sun4v_resum_error(struct pt_regs *regs, unsigned long offset)
 
         put_cpu();
 
+        if (ent->err_type == SUN4V_ERR_TYPE_WARNING_RES) {
+                /* If err_type is 0x4, it's a powerdown request.  Do
+                 * not do the usual resumable error log because that
+                 * makes it look like some abnormal error.
+                 */
+                printk(KERN_INFO "Power down request...\n");
+                kill_cad_pid(SIGINT, 1);
+                return;
+        }
+
         sun4v_log_error(regs, &local_copy, cpu,
                         KERN_ERR "RESUMABLE ERROR",
                         &sun4v_resum_oflow_cnt);
@@ -2261,8 +2271,12 @@ void die_if_kernel(char *str, struct pt_regs *regs)
         do_exit(SIGSEGV);
 }
 
+#define VIS_OPCODE_MASK ((0x3 << 30) | (0x3f << 19))
+#define VIS_OPCODE_VAL  ((0x2 << 30) | (0x36 << 19))
+
 extern int handle_popc(u32 insn, struct pt_regs *regs);
 extern int handle_ldf_stq(u32 insn, struct pt_regs *regs);
+extern int vis_emul(struct pt_regs *, unsigned int);
 
 void do_illegal_instruction(struct pt_regs *regs)
 {
@@ -2287,10 +2301,18 @@ void do_illegal_instruction(struct pt_regs *regs)
                         if (handle_ldf_stq(insn, regs))
                                 return;
                 } else if (tlb_type == hypervisor) {
-                        extern int vis_emul(struct pt_regs *, unsigned int);
+                        if ((insn & VIS_OPCODE_MASK) == VIS_OPCODE_VAL) {
+                                if (!vis_emul(regs, insn))
+                                        return;
+                        } else {
+                                struct fpustate *f = FPUSTATE;
 
-                        if (!vis_emul(regs, insn))
-                                return;
+                                /* XXX maybe verify XFSR bits like
+                                 * XXX do_fpother() does?
+                                 */
+                                if (do_mathemu(regs, f))
+                                        return;
+                        }
                 }
         }
         info.si_signo = SIGILL;
diff --git a/arch/sparc64/kernel/unaligned.c b/arch/sparc64/kernel/unaligned.c
index a9b765271b85..bc18d480dd1c 100644
--- a/arch/sparc64/kernel/unaligned.c
+++ b/arch/sparc64/kernel/unaligned.c
@@ -243,7 +243,7 @@ static inline int ok_for_kernel(unsigned int insn)
         return !floating_point_load_or_store_p(insn);
 }
 
-static void kernel_mna_trap_fault(void)
+static void kernel_mna_trap_fault(int fixup_tstate_asi)
 {
         struct pt_regs *regs = current_thread_info()->kern_una_regs;
         unsigned int insn = current_thread_info()->kern_una_insn;
@@ -274,18 +274,15 @@ static void kernel_mna_trap_fault(void)
         regs->tpc = entry->fixup;
         regs->tnpc = regs->tpc + 4;
 
-        regs->tstate &= ~TSTATE_ASI;
-        regs->tstate |= (ASI_AIUS << 24UL);
+        if (fixup_tstate_asi) {
+                regs->tstate &= ~TSTATE_ASI;
+                regs->tstate |= (ASI_AIUS << 24UL);
+        }
 }
 
-asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn)
+static void log_unaligned(struct pt_regs *regs)
 {
         static unsigned long count, last_time;
-        enum direction dir = decode_direction(insn);
-        int size = decode_access_size(insn);
-
-        current_thread_info()->kern_una_regs = regs;
-        current_thread_info()->kern_una_insn = insn;
 
         if (jiffies - last_time > 5 * HZ)
                 count = 0;
@@ -295,6 +292,28 @@ asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn)
                 printk("Kernel unaligned access at TPC[%lx] ", regs->tpc);
                 print_symbol("%s\n", regs->tpc);
         }
+}
+
+asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn)
+{
+        enum direction dir = decode_direction(insn);
+        int size = decode_access_size(insn);
+        int orig_asi, asi;
+
+        current_thread_info()->kern_una_regs = regs;
+        current_thread_info()->kern_una_insn = insn;
+
+        orig_asi = asi = decode_asi(insn, regs);
+
+        /* If this is a {get,put}_user() on an unaligned userspace pointer,
+         * just signal a fault and do not log the event.
+         */
+        if (asi == ASI_AIUS) {
+                kernel_mna_trap_fault(0);
+                return;
+        }
+
+        log_unaligned(regs);
 
         if (!ok_for_kernel(insn) || dir == both) {
                 printk("Unsupported unaligned load/store trap for kernel "
@@ -302,10 +321,10 @@ asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn)
                 unaligned_panic("Kernel does fpu/atomic "
                                 "unaligned load/store.", regs);
 
-                kernel_mna_trap_fault();
+                kernel_mna_trap_fault(0);
         } else {
                 unsigned long addr, *reg_addr;
-                int orig_asi, asi, err;
+                int err;
 
                 addr = compute_effective_address(regs, insn,
                                                  ((insn >> 25) & 0x1f));
@@ -315,7 +334,6 @@ asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn)
                        regs->tpc, dirstrings[dir], addr, size,
                        regs->u_regs[UREG_RETPC]);
 #endif
-                orig_asi = asi = decode_asi(insn, regs);
                 switch (asi) {
                 case ASI_NL:
                 case ASI_AIUPL:
@@ -365,7 +383,7 @@ asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn)
                         /* Not reached... */
                 }
                 if (unlikely(err))
-                        kernel_mna_trap_fault();
+                        kernel_mna_trap_fault(1);
                 else
                         advance(regs);
         }
diff --git a/arch/sparc64/kernel/visemul.c b/arch/sparc64/kernel/visemul.c
index 84fedaa38aae..c3fd64706b53 100644
--- a/arch/sparc64/kernel/visemul.c
+++ b/arch/sparc64/kernel/visemul.c
@@ -128,9 +128,6 @@
 /* 001001100 - Permute bytes as specified by GSR.MASK  */
 #define BSHUFFLE_OPF    0x04c
 
-#define VIS_OPCODE_MASK ((0x3 << 30) | (0x3f << 19))
-#define VIS_OPCODE_VAL  ((0x2 << 30) | (0x36 << 19))
-
 #define VIS_OPF_SHIFT   5
 #define VIS_OPF_MASK    (0x1ff << VIS_OPF_SHIFT)
 
@@ -810,9 +807,6 @@ int vis_emul(struct pt_regs *regs, unsigned int insn)
         if (get_user(insn, (u32 __user *) pc))
                 return -EFAULT;
 
-        if ((insn & VIS_OPCODE_MASK) != VIS_OPCODE_VAL)
-                return -EINVAL;
-
         opf = (insn & VIS_OPF_MASK) >> VIS_OPF_SHIFT;
         switch (opf) {
         default:
diff --git a/arch/sparc64/kernel/vmlinux.lds.S b/arch/sparc64/kernel/vmlinux.lds.S
index bd9de8c2a2aa..4a6063f33e7a 100644
--- a/arch/sparc64/kernel/vmlinux.lds.S
+++ b/arch/sparc64/kernel/vmlinux.lds.S
@@ -13,6 +13,7 @@ SECTIONS
   . = 0x4000;
   .text 0x0000000000404000 :
   {
+    _text = .;
     *(.text)
     SCHED_TEXT
     LOCK_TEXT
diff --git a/arch/sparc64/mm/hugetlbpage.c b/arch/sparc64/mm/hugetlbpage.c
index 53b9b1f528e5..33fd0b265e70 100644
--- a/arch/sparc64/mm/hugetlbpage.c
+++ b/arch/sparc64/mm/hugetlbpage.c
@@ -235,6 +235,11 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
         return pte;
 }
 
+int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
+{
+        return 0;
+}
+
 void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
                      pte_t *ptep, pte_t entry)
 {
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 09cb7fccc03a..054822a3e05e 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -176,9 +176,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
 
 int bigkernel = 0;
 
-kmem_cache_t *pgtable_cache __read_mostly;
+struct kmem_cache *pgtable_cache __read_mostly;
 
-static void zero_ctor(void *addr, kmem_cache_t *cache, unsigned long flags)
+static void zero_ctor(void *addr, struct kmem_cache *cache, unsigned long flags)
 {
         clear_page(addr);
 }
@@ -872,6 +872,115 @@ static unsigned long __init choose_bootmap_pfn(unsigned long start_pfn,
         prom_halt();
 }
 
+static void __init trim_pavail(unsigned long *cur_size_p,
+                               unsigned long *end_of_phys_p)
+{
+        unsigned long to_trim = *cur_size_p - cmdline_memory_size;
+        unsigned long avoid_start, avoid_end;
+        int i;
+
+        to_trim = PAGE_ALIGN(to_trim);
+
+        avoid_start = avoid_end = 0;
+#ifdef CONFIG_BLK_DEV_INITRD
+        avoid_start = initrd_start;
+        avoid_end = PAGE_ALIGN(initrd_end);
+#endif
+
+        /* Trim some pavail[] entries in order to satisfy the
+         * requested "mem=xxx" kernel command line specification.
+         *
+         * We must not trim off the kernel image area nor the
+         * initial ramdisk range (if any).  Also, we must not trim
+         * any pavail[] entry down to zero in order to preserve
+         * the invariant that all pavail[] entries have a non-zero
+         * size which is assumed by all of the code in here.
+         */
+        for (i = 0; i < pavail_ents; i++) {
+                unsigned long start, end, kern_end;
+                unsigned long trim_low, trim_high, n;
+
+                kern_end = PAGE_ALIGN(kern_base + kern_size);
+
+                trim_low = start = pavail[i].phys_addr;
+                trim_high = end = start + pavail[i].reg_size;
+
+                if (kern_base >= start &&
+                    kern_base < end) {
+                        trim_low = kern_base;
+                        if (kern_end >= end)
+                                continue;
+                }
+                if (kern_end >= start &&
+                    kern_end < end) {
+                        trim_high = kern_end;
+                }
+                if (avoid_start &&
+                    avoid_start >= start &&
+                    avoid_start < end) {
+                        if (trim_low > avoid_start)
+                                trim_low = avoid_start;
+                        if (avoid_end >= end)
+                                continue;
+                }
+                if (avoid_end &&
+                    avoid_end >= start &&
+                    avoid_end < end) {
+                        if (trim_high < avoid_end)
+                                trim_high = avoid_end;
+                }
+
+                if (trim_high <= trim_low)
+                        continue;
+
+                if (trim_low == start && trim_high == end) {
+                        /* Whole chunk is available for trimming.
+                         * Trim all except one page, in order to keep
+                         * entry non-empty.
+                         */
+                        n = (end - start) - PAGE_SIZE;
+                        if (n > to_trim)
+                                n = to_trim;
+
+                        if (n) {
+                                pavail[i].phys_addr += n;
+                                pavail[i].reg_size -= n;
+                                to_trim -= n;
+                        }
+                } else {
+                        n = (trim_low - start);
+                        if (n > to_trim)
+                                n = to_trim;
+
+                        if (n) {
+                                pavail[i].phys_addr += n;
+                                pavail[i].reg_size -= n;
+                                to_trim -= n;
+                        }
+                        if (to_trim) {
+                                n = end - trim_high;
+                                if (n > to_trim)
+                                        n = to_trim;
+                                if (n) {
+                                        pavail[i].reg_size -= n;
+                                        to_trim -= n;
+                                }
+                        }
+                }
+
+                if (!to_trim)
+                        break;
+        }
+
+        /* Recalculate.  */
+        *cur_size_p = 0UL;
+        for (i = 0; i < pavail_ents; i++) {
+                *end_of_phys_p = pavail[i].phys_addr +
+                        pavail[i].reg_size;
+                *cur_size_p += pavail[i].reg_size;
+        }
+}
+
 static unsigned long __init bootmem_init(unsigned long *pages_avail,
                                          unsigned long phys_base)
 {
@@ -889,31 +998,13 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail,
                 end_of_phys_memory = pavail[i].phys_addr +
                         pavail[i].reg_size;
                 bytes_avail += pavail[i].reg_size;
-                if (cmdline_memory_size) {
-                        if (bytes_avail > cmdline_memory_size) {
-                                unsigned long slack = bytes_avail - cmdline_memory_size;
-
-                                bytes_avail -= slack;
-                                end_of_phys_memory -= slack;
-
-                                pavail[i].reg_size -= slack;
-                                if ((long)pavail[i].reg_size <= 0L) {
-                                        pavail[i].phys_addr = 0xdeadbeefUL;
-                                        pavail[i].reg_size = 0UL;
-                                        pavail_ents = i;
-                                } else {
-                                        pavail[i+1].reg_size = 0Ul;
-                                        pavail[i+1].phys_addr = 0xdeadbeefUL;
-                                        pavail_ents = i + 1;
-                                }
-                                break;
-                        }
-                }
         }
 
-        *pages_avail = bytes_avail >> PAGE_SHIFT;
-
-        end_pfn = end_of_phys_memory >> PAGE_SHIFT;
+        /* Determine the location of the initial ramdisk before trying
+         * to honor the "mem=xxx" command line argument.  We must know
+         * where the kernel image and the ramdisk image are so that we
+         * do not trim those two areas from the physical memory map.
+         */
 
 #ifdef CONFIG_BLK_DEV_INITRD
         /* Now have to check initial ramdisk, so that bootmap does not overwrite it */
@@ -932,6 +1023,16 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail,
                 }
         }
 #endif  
+
+        if (cmdline_memory_size &&
+            bytes_avail > cmdline_memory_size)
+                trim_pavail(&bytes_avail,
+                            &end_of_phys_memory);
+
+        *pages_avail = bytes_avail >> PAGE_SHIFT;
+
+        end_pfn = end_of_phys_memory >> PAGE_SHIFT;
+
         /* Initialize the boot-time allocator. */
         max_pfn = max_low_pfn = end_pfn;
         min_low_pfn = (phys_base >> PAGE_SHIFT);
diff --git a/arch/sparc64/mm/tsb.c b/arch/sparc64/mm/tsb.c
index beaa02810f0e..236d02f41a01 100644
--- a/arch/sparc64/mm/tsb.c
+++ b/arch/sparc64/mm/tsb.c
@@ -239,7 +239,7 @@ static void setup_tsb_params(struct mm_struct *mm, unsigned long tsb_idx, unsign
         }
 }
 
-static kmem_cache_t *tsb_caches[8] __read_mostly;
+static struct kmem_cache *tsb_caches[8] __read_mostly;
 
 static const char *tsb_cache_names[8] = {
         "tsb_8KB",
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S
index d70b60a3bbcc..737c26923c09 100644
--- a/arch/sparc64/mm/ultra.S
+++ b/arch/sparc64/mm/ultra.S
@@ -477,6 +477,10 @@ xcall_sync_tick:
         sethi           %hi(109f), %g7
         b,pt            %xcc, etrap_irq
 109:     or             %g7, %lo(109b), %g7
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
         call            smp_synchronize_tick_client
          nop
         clr             %l6
@@ -508,6 +512,10 @@ xcall_report_regs:
         sethi           %hi(109f), %g7
         b,pt            %xcc, etrap_irq
 109:     or             %g7, %lo(109b), %g7
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
         call            __show_regs
          add            %sp, PTREGS_OFF, %o0
         clr             %l6
diff --git a/arch/sparc64/solaris/fs.c b/arch/sparc64/solaris/fs.c
index 12a940cc791f..61be597bf430 100644
--- a/arch/sparc64/solaris/fs.c
+++ b/arch/sparc64/solaris/fs.c
@@ -449,7 +449,7 @@ asmlinkage int solaris_fstatvfs(unsigned int fd, u32 buf)
         error = -EBADF;
         file = fget(fd);
         if (file) {
-                error = report_statvfs(file->f_vfsmnt, file->f_dentry->d_inode, buf);
+                error = report_statvfs(file->f_path.mnt, file->f_path.dentry->d_inode, buf);
                 fput(file);
         }
 
@@ -481,7 +481,7 @@ asmlinkage int solaris_fstatvfs64(unsigned int fd, u32 buf)
         file = fget(fd);
         if (file) {
                 lock_kernel();
-                error = report_statvfs64(file->f_vfsmnt, file->f_dentry->d_inode, buf);
+                error = report_statvfs64(file->f_path.mnt, file->f_path.dentry->d_inode, buf);
                 unlock_kernel();
                 fput(file);
         }
diff --git a/arch/sparc64/solaris/ioctl.c b/arch/sparc64/solaris/ioctl.c
index be0a054e3ed6..330743c5b3d8 100644
--- a/arch/sparc64/solaris/ioctl.c
+++ b/arch/sparc64/solaris/ioctl.c
@@ -299,8 +299,8 @@ static inline int solaris_sockmod(unsigned int fd, unsigned int cmd, u32 arg)
         rcu_read_lock();
         fdt = files_fdtable(current->files);
         if (! fdt->fd[fd] ||
-            ! fdt->fd[fd]->f_dentry ||
-            ! (ino = fdt->fd[fd]->f_dentry->d_inode) ||
+            ! fdt->fd[fd]->f_path.dentry ||
+            ! (ino = fdt->fd[fd]->f_path.dentry->d_inode) ||
             ! S_ISSOCK(ino->i_mode)) {
                 rcu_read_unlock();
                 return TBADF;
@@ -480,7 +480,7 @@ static inline int solaris_S(struct file *filp, unsigned int fd, unsigned int cmd
         struct sol_socket_struct *sock;
         struct module_info *mi;
 
-        ino = filp->f_dentry->d_inode;
+        ino = filp->f_path.dentry->d_inode;
         if (!S_ISSOCK(ino->i_mode))
                 return -EBADF;
         sock = filp->private_data;
diff --git a/arch/sparc64/solaris/misc.c b/arch/sparc64/solaris/misc.c
index 9ed997982f8d..bca16e8c95c3 100644
--- a/arch/sparc64/solaris/misc.c
+++ b/arch/sparc64/solaris/misc.c
@@ -77,7 +77,7 @@ static u32 do_solaris_mmap(u32 addr, u32 len, u32 prot, u32 flags, u32 fd, u64 o
                 if (!file)
                         goto out;
                 else {
-                        struct inode * inode = file->f_dentry->d_inode;
+                        struct inode * inode = file->f_path.dentry->d_inode;
                         if(imajor(inode) == MEM_MAJOR &&
                            iminor(inode) == 5) {
                                 flags |= MAP_ANONYMOUS;
@@ -423,9 +423,7 @@ asmlinkage int solaris_procids(int cmd, s32 pid, s32 pgid)
                            Solaris setpgrp and setsid? */
                         ret = sys_setpgid(0, 0);
                         if (ret) return ret;
-                        mutex_lock(&tty_mutex);
-                        current->signal->tty = NULL;
-                        mutex_unlock(&tty_mutex);
+                        proc_clear_tty(current);
                         return process_group(current);
                 }
         case 2: /* getsid */
diff --git a/arch/sparc64/solaris/socksys.c b/arch/sparc64/solaris/socksys.c
index 7c90e41fd3be..89a4757f192f 100644
--- a/arch/sparc64/solaris/socksys.c
+++ b/arch/sparc64/solaris/socksys.c
@@ -96,13 +96,13 @@ static int socksys_open(struct inode * inode, struct file * filp)
          * No shit.  WTF is it supposed to do, anyway?
          *
          * Try instead:
-         * d_delete(filp->f_dentry), then d_instantiate with sock inode
+         * d_delete(filp->f_path.dentry), then d_instantiate with sock inode
          */
-        dentry = filp->f_dentry;
-        filp->f_dentry = dget(fcheck(fd)->f_dentry);
-        filp->f_dentry->d_inode->i_rdev = inode->i_rdev;
-        filp->f_dentry->d_inode->i_flock = inode->i_flock;
-        SOCKET_I(filp->f_dentry->d_inode)->file = filp;
+        dentry = filp->f_path.dentry;
+        filp->f_path.dentry = dget(fcheck(fd)->f_path.dentry);
+        filp->f_path.dentry->d_inode->i_rdev = inode->i_rdev;
+        filp->f_path.dentry->d_inode->i_flock = inode->i_flock;
+        SOCKET_I(filp->f_path.dentry->d_inode)->file = filp;
         filp->f_op = &socksys_file_ops;
         sock = (struct sol_socket_struct*) 
                 mykmalloc(sizeof(struct sol_socket_struct), GFP_KERNEL);
@@ -148,7 +148,7 @@ static unsigned int socksys_poll(struct file * filp, poll_table * wait)
         struct inode *ino;
         unsigned int mask = 0;
 
-        ino=filp->f_dentry->d_inode;
+        ino=filp->f_path.dentry->d_inode;
         if (ino && S_ISSOCK(ino->i_mode)) {
                 struct sol_socket_struct *sock;
                 sock = (struct sol_socket_struct*)filp->private_data;
diff --git a/arch/sparc64/solaris/timod.c b/arch/sparc64/solaris/timod.c
index b84e5456b025..a9d32ceabf26 100644
--- a/arch/sparc64/solaris/timod.c
+++ b/arch/sparc64/solaris/timod.c
@@ -147,7 +147,7 @@ static void timod_wake_socket(unsigned int fd)
 
         SOLD("wakeing socket");
         fdt = files_fdtable(current->files);
-        sock = SOCKET_I(fdt->fd[fd]->f_dentry->d_inode);
+        sock = SOCKET_I(fdt->fd[fd]->f_path.dentry->d_inode);
         wake_up_interruptible(&sock->wait);
         read_lock(&sock->sk->sk_callback_lock);
         if (sock->fasync_list && !test_bit(SOCK_ASYNC_WAITDATA, &sock->flags))
@@ -361,7 +361,7 @@ int timod_putmsg(unsigned int fd, char __user *ctl_buf, int ctl_len,
 
         fdt = files_fdtable(current->files);
         filp = fdt->fd[fd];
-        ino = filp->f_dentry->d_inode;
+        ino = filp->f_path.dentry->d_inode;
         sock = (struct sol_socket_struct *)filp->private_data;
         SOLD("entry");
         if (get_user(ret, (int __user *)A(ctl_buf)))
@@ -644,7 +644,7 @@ int timod_getmsg(unsigned int fd, char __user *ctl_buf, int ctl_maxlen, s32 __us
         SOLDD(("%u %p %d %p %p %d %p %d\n", fd, ctl_buf, ctl_maxlen, ctl_len, data_buf, data_maxlen, data_len, *flags_p));
         fdt = files_fdtable(current->files);
         filp = fdt->fd[fd];
-        ino = filp->f_dentry->d_inode;
+        ino = filp->f_path.dentry->d_inode;
         sock = (struct sol_socket_struct *)filp->private_data;
         SOLDD(("%p %p\n", sock->pfirst, sock->pfirst ? sock->pfirst->next : NULL));
         if ( ctl_maxlen > 0 && !sock->pfirst && SOCKET_I(ino)->type == SOCK_STREAM
@@ -865,7 +865,7 @@ asmlinkage int solaris_getmsg(unsigned int fd, u32 arg1, u32 arg2, u32 arg3)
         filp = fdt->fd[fd];
         if(!filp) goto out;
 
-        ino = filp->f_dentry->d_inode;
+        ino = filp->f_path.dentry->d_inode;
         if (!ino || !S_ISSOCK(ino->i_mode))
                 goto out;
 
@@ -933,7 +933,7 @@ asmlinkage int solaris_putmsg(unsigned int fd, u32 arg1, u32 arg2, u32 arg3)
         filp = fdt->fd[fd];
         if(!filp) goto out;
 
-        ino = filp->f_dentry->d_inode;
+        ino = filp->f_path.dentry->d_inode;
         if (!ino) goto out;
 
         if (!S_ISSOCK(ino->i_mode) &&
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 5ac1f2963ae3..d32a80e6668c 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -47,6 +47,11 @@ config GENERIC_CALIBRATE_DELAY
         bool
         default y
 
+config GENERIC_BUG
+        bool
+        default y
+        depends on BUG
+
 # Used in kernel/irq/manage.c and include/linux/irq.h
 config IRQ_RELEASE_METHOD
         bool
diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 3576b3cc505e..7d4190e55654 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -638,7 +638,7 @@ int chan_out_fd(struct list_head *chans)
         return -1;
 }
 
-void chan_interrupt(struct list_head *chans, struct work_struct *task,
+void chan_interrupt(struct list_head *chans, struct delayed_work *task,
                     struct tty_struct *tty, int irq)
 {
         struct list_head *ele, *next;
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/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c
index 824386974f88..9c2e7a758f21 100644
--- a/arch/um/drivers/daemon_kern.c
+++ b/arch/um/drivers/daemon_kern.c
@@ -98,4 +98,4 @@ static int register_daemon(void)
         return 0;
 }
 
-__initcall(register_daemon);
+late_initcall(register_daemon);
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 426633e5d6e3..83301e1ef67c 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -31,9 +31,9 @@ static irqreturn_t line_interrupt(int irq, void *data)
         return IRQ_HANDLED;
 }
 
-static void line_timer_cb(void *arg)
+static void line_timer_cb(struct work_struct *work)
 {
-        struct line *line = arg;
+        struct line *line = container_of(work, struct line, task.work);
 
         if(!line->throttled)
                 chan_interrupt(&line->chan_list, &line->task, line->tty,
@@ -246,7 +246,7 @@ out_up:
         return ret;
 }
 
-void line_set_termios(struct tty_struct *tty, struct termios * old)
+void line_set_termios(struct tty_struct *tty, struct ktermios * old)
 {
         /* nothing */
 }
@@ -443,7 +443,7 @@ int line_open(struct line *lines, struct tty_struct *tty)
                  * is registered.
                  */
                 enable_chan(line);
-                INIT_WORK(&line->task, line_timer_cb, line);
+                INIT_DELAYED_WORK(&line->task, line_timer_cb);
 
                 if(!line->sigio){
                         chan_enable_winch(&line->chan_list, tty);
diff --git a/arch/um/drivers/mcast_kern.c b/arch/um/drivers/mcast_kern.c
index c090fbd464e7..52ccb7b53cd2 100644
--- a/arch/um/drivers/mcast_kern.c
+++ b/arch/um/drivers/mcast_kern.c
@@ -127,4 +127,4 @@ static int register_mcast(void)
         return 0;
 }
 
-__initcall(register_mcast);
+late_initcall(register_mcast);
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 7b172160fe04..96f0189327af 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -56,7 +56,7 @@ static struct notifier_block reboot_notifier = {
 
 static LIST_HEAD(mc_requests);
 
-static void mc_work_proc(void *unused)
+static void mc_work_proc(struct work_struct *unused)
 {
         struct mconsole_entry *req;
         unsigned long flags;
@@ -72,7 +72,7 @@ static void mc_work_proc(void *unused)
         }
 }
 
-static DECLARE_WORK(mconsole_work, mc_work_proc, NULL);
+static DECLARE_WORK(mconsole_work, mc_work_proc);
 
 static irqreturn_t mconsole_interrupt(int irq, void *dev_id)
 {
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index ec9eb8bd9432..afe3d427ddfa 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -72,9 +72,11 @@ static int uml_net_rx(struct net_device *dev)
         return pkt_len;
 }
 
-static void uml_dev_close(void* dev)
+static void uml_dev_close(struct work_struct *work)
 {
-        dev_close( (struct net_device *) dev);
+        struct uml_net_private *lp =
+                container_of(work, struct uml_net_private, work);
+        dev_close(lp->dev);
 }
 
 irqreturn_t uml_net_interrupt(int irq, void *dev_id)
@@ -89,7 +91,6 @@ irqreturn_t uml_net_interrupt(int irq, void *dev_id)
         spin_lock(&lp->lock);
         while((err = uml_net_rx(dev)) > 0) ;
         if(err < 0) {
-                DECLARE_WORK(close_work, uml_dev_close, dev);
                 printk(KERN_ERR 
                        "Device '%s' read returned %d, shutting it down\n", 
                        dev->name, err);
@@ -97,8 +98,10 @@ irqreturn_t uml_net_interrupt(int irq, void *dev_id)
                  * again lp->lock.
                  * And dev_close() can be safely called multiple times on the
                  * same device, since it tests for (dev->flags & IFF_UP). So
-                 * there's no harm in delaying the device shutdown. */
-                schedule_work(&close_work);
+                 * there's no harm in delaying the device shutdown.
+                 * Furthermore, the workqueue will not re-enqueue an already
+                 * enqueued work item. */
+                schedule_work(&lp->work);
                 goto out;
         }
         reactivate_fd(lp->fd, UM_ETH_IRQ);
@@ -333,13 +336,12 @@ static int eth_configure(int n, void *init, char *mac,
         size = transport->private_size + sizeof(struct uml_net_private) + 
                 sizeof(((struct uml_net_private *) 0)->user);
 
-        device = kmalloc(sizeof(*device), GFP_KERNEL);
+        device = kzalloc(sizeof(*device), GFP_KERNEL);
         if (device == NULL) {
                 printk(KERN_ERR "eth_configure failed to allocate uml_net\n");
                 return(1);
         }
 
-        memset(device, 0, sizeof(*device));
         INIT_LIST_HEAD(&device->list);
         device->index = n;
 
@@ -365,6 +367,7 @@ static int eth_configure(int n, void *init, char *mac,
         /* This points to the transport private data. It's still clear, but we
          * must memset it to 0 *now*. Let's help the drivers. */
         memset(lp, 0, size);
+        INIT_WORK(&lp->work, uml_dev_close);
 
         /* sysfs register */
         if (!driver_registered) {
diff --git a/arch/um/drivers/pcap_kern.c b/arch/um/drivers/pcap_kern.c
index 6e1ef8558283..e67362acf0e7 100644
--- a/arch/um/drivers/pcap_kern.c
+++ b/arch/um/drivers/pcap_kern.c
@@ -109,4 +109,4 @@ static int register_pcap(void)
         return 0;
 }
 
-__initcall(register_pcap);
+late_initcall(register_pcap);
diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c
index ce9f3733f73e..6dfe632f1c14 100644
--- a/arch/um/drivers/port_kern.c
+++ b/arch/um/drivers/port_kern.c
@@ -132,7 +132,7 @@ static int port_accept(struct port_list *port)
 DECLARE_MUTEX(ports_sem);
 struct list_head ports = LIST_HEAD_INIT(ports);
 
-void port_work_proc(void *unused)
+void port_work_proc(struct work_struct *unused)
 {
         struct port_list *port;
         struct list_head *ele;
@@ -150,7 +150,7 @@ void port_work_proc(void *unused)
         local_irq_restore(flags);
 }
 
-DECLARE_WORK(port_work, port_work_proc, NULL);
+DECLARE_WORK(port_work, port_work_proc);
 
 static irqreturn_t port_interrupt(int irq, void *data)
 {
diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c
index 788da5439a2d..25634bd1f585 100644
--- a/arch/um/drivers/slip_kern.c
+++ b/arch/um/drivers/slip_kern.c
@@ -95,4 +95,4 @@ static int register_slip(void)
         return 0;
 }
 
-__initcall(register_slip);
+late_initcall(register_slip);
diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
index ae322e1c8a87..b3ed8fb874ab 100644
--- a/arch/um/drivers/slirp_kern.c
+++ b/arch/um/drivers/slirp_kern.c
@@ -119,4 +119,4 @@ static int register_slirp(void)
         return 0;
 }
 
-__initcall(register_slirp);
+late_initcall(register_slirp);
diff --git a/arch/um/include/chan_kern.h b/arch/um/include/chan_kern.h
index 572d286ed2c6..9003a343e148 100644
--- a/arch/um/include/chan_kern.h
+++ b/arch/um/include/chan_kern.h
@@ -27,7 +27,7 @@ struct chan {
         void *data;
 };
 
-extern void chan_interrupt(struct list_head *chans, struct work_struct *task,
+extern void chan_interrupt(struct list_head *chans, struct delayed_work *task,
                            struct tty_struct *tty, int irq);
 extern int parse_chan_pair(char *str, struct line *line, int device,
                            const struct chan_opts *opts);
diff --git a/arch/um/include/line.h b/arch/um/include/line.h
index 7be24811bb30..5f232ae89fbb 100644
--- a/arch/um/include/line.h
+++ b/arch/um/include/line.h
@@ -51,7 +51,7 @@ struct line {
         char *tail;
 
         int sigio;
-        struct work_struct task;
+        struct delayed_work task;
         const struct line_driver *driver;
         int have_irq;
 };
@@ -76,7 +76,7 @@ extern int line_setup(struct line *lines, unsigned int sizeof_lines,
 extern int line_write(struct tty_struct *tty, const unsigned char *buf,
                       int len);
 extern void line_put_char(struct tty_struct *tty, unsigned char ch);
-extern void line_set_termios(struct tty_struct *tty, struct termios * old);
+extern void line_set_termios(struct tty_struct *tty, struct ktermios * old);
 extern int line_chars_in_buffer(struct tty_struct *tty);
 extern void line_flush_buffer(struct tty_struct *tty);
 extern void line_flush_chars(struct tty_struct *tty);
diff --git a/arch/um/include/net_kern.h b/arch/um/include/net_kern.h
index 280459fb0b26..218f8b47fdcd 100644
--- a/arch/um/include/net_kern.h
+++ b/arch/um/include/net_kern.h
@@ -11,6 +11,7 @@
 #include <linux/skbuff.h>
 #include <linux/socket.h>
 #include <linux/list.h>
+#include <linux/workqueue.h>
 
 struct uml_net {
         struct list_head list;
@@ -26,6 +27,7 @@ struct uml_net_private {
         struct net_device *dev;
         struct timer_list tl;
         struct net_device_stats stats;
+        struct work_struct work;
         int fd;
         unsigned char mac[ETH_ALEN];
         unsigned short (*protocol)(struct sk_buff *);
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-i386/ptrace.h b/arch/um/include/sysdep-i386/ptrace.h
index 6670cc992ecb..52b398bcafcf 100644
--- a/arch/um/include/sysdep-i386/ptrace.h
+++ b/arch/um/include/sysdep-i386/ptrace.h
@@ -75,7 +75,7 @@ union uml_pt_regs {
 #endif
 #ifdef UML_CONFIG_MODE_SKAS
         struct skas_regs {
-                unsigned long regs[HOST_FRAME_SIZE];
+                unsigned long regs[MAX_REG_NR];
                 unsigned long fp[HOST_FP_SIZE];
                 unsigned long xfp[HOST_XFP_SIZE];
                 struct faultinfo faultinfo;
diff --git a/arch/um/include/sysdep-i386/stub.h b/arch/um/include/sysdep-i386/stub.h
index b492b12b4a10..4fffae75ba53 100644
--- a/arch/um/include/sysdep-i386/stub.h
+++ b/arch/um/include/sysdep-i386/stub.h
@@ -9,6 +9,7 @@
 #include <sys/mman.h>
 #include <asm/ptrace.h>
 #include <asm/unistd.h>
+#include <asm/page.h>
 #include "stub-data.h"
 #include "kern_constants.h"
 #include "uml-config.h"
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/include/sysdep-x86_64/ptrace.h b/arch/um/include/sysdep-x86_64/ptrace.h
index 617bb9efc934..66cb400c2c92 100644
--- a/arch/um/include/sysdep-x86_64/ptrace.h
+++ b/arch/um/include/sysdep-x86_64/ptrace.h
@@ -108,7 +108,7 @@ union uml_pt_regs {
                  * file size, while i386 uses FRAME_SIZE.  Therefore, we need
                  * to use UM_FRAME_SIZE here instead of HOST_FRAME_SIZE.
                  */
-                unsigned long regs[UM_FRAME_SIZE];
+                unsigned long regs[MAX_REG_NR];
                 unsigned long fp[HOST_FP_SIZE];
                 struct faultinfo faultinfo;
                 long syscall;
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index 0561c43b4685..8d56ec6cca79 100644
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -39,12 +39,13 @@ static long execve1(char *file, char __user * __user *argv,
                     char __user *__user *env)
 {
         long error;
+        struct tty_struct *tty;
 
 #ifdef CONFIG_TTY_LOG
         mutex_lock(&tty_mutex);
-        task_lock(current);     /* FIXME:  is this needed ? */
-        log_exec(argv, current->signal->tty);
-        task_unlock(current);
+        tty = get_current_tty();
+        if (tty)
+                log_exec(argv, tty);
         mutex_unlock(&tty_mutex);
 #endif
         error = do_execve(file, argv, env, &current->thread.regs);
diff --git a/arch/um/os-Linux/drivers/ethertap_kern.c b/arch/um/os-Linux/drivers/ethertap_kern.c
index 16385e2ada85..70541821775f 100644
--- a/arch/um/os-Linux/drivers/ethertap_kern.c
+++ b/arch/um/os-Linux/drivers/ethertap_kern.c
@@ -105,4 +105,4 @@ static int register_ethertap(void)
         return 0;
 }
 
-__initcall(register_ethertap);
+late_initcall(register_ethertap);
diff --git a/arch/um/os-Linux/drivers/tuntap_kern.c b/arch/um/os-Linux/drivers/tuntap_kern.c
index 0edbac63c527..76570a2c25c3 100644
--- a/arch/um/os-Linux/drivers/tuntap_kern.c
+++ b/arch/um/os-Linux/drivers/tuntap_kern.c
@@ -90,4 +90,4 @@ static int register_tuntap(void)
         return 0;
 }
 
-__initcall(register_tuntap);
+late_initcall(register_tuntap);
diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index 0e32adf03be1..098720be019a 100644
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -1,4 +1,4 @@
-obj-y = bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
+obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
         ptrace_user.o setjmp.o signal.o sigcontext.o syscalls.o sysrq.o \
         sys_call_table.o tls.o
 
diff --git a/arch/um/sys-i386/bug.c b/arch/um/sys-i386/bug.c
new file mode 100644
index 000000000000..200c8ba2879b
--- /dev/null
+++ b/arch/um/sys-i386/bug.c
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2006 Jeff Dike (jdike@addtoit.com)
+ * Licensed under the GPL V2
+ */
+
+#include <linux/uaccess.h>
+
+/* Mostly copied from i386/x86_86 - eliminated the eip < PAGE_OFFSET because
+ * that's not relevent in skas mode.
+ */
+
+int is_valid_bugaddr(unsigned long eip)
+{
+        unsigned short ud2;
+
+        if (probe_kernel_address((unsigned short __user *)eip, ud2))
+                return 0;
+
+        return ud2 == 0x0b0f;
+}
diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index e299ee5a753d..5db7737df0ff 100644
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
@@ -3,7 +3,6 @@
  * Licensed under the GPL
  */
 
-#include "linux/stddef.h"
 #include "linux/sched.h"
 #include "linux/slab.h"
 #include "linux/types.h"
@@ -167,7 +166,7 @@ static long read_ldt_from_host(void __user * ptr, unsigned long bytecount)
         struct ptrace_ldt ptrace_ldt = (struct ptrace_ldt) {
                         .func = 0,
                         .bytecount = bytecount,
-                        .ptr = (void *)kmalloc(bytecount, GFP_KERNEL)};
+                        .ptr = kmalloc(bytecount, GFP_KERNEL)};
         u32 cpu;
 
         if(ptrace_ldt.ptr == NULL)
@@ -427,7 +426,7 @@ void ldt_get_host_info(void)
                 host_ldt_entries = dummy_list;
         else {
                 size = (size + 1) * sizeof(dummy_list[0]);
-                host_ldt_entries = (short *)kmalloc(size, GFP_KERNEL);
+                host_ldt_entries = kmalloc(size, GFP_KERNEL);
                 if(host_ldt_entries == NULL) {
                         printk("ldt_get_host_info: couldn't allocate host ldt list\n");
                         goto out_free;
diff --git a/arch/um/sys-i386/ptrace_user.c b/arch/um/sys-i386/ptrace_user.c
index 5f3cc6685820..01212c88fcc4 100644
--- a/arch/um/sys-i386/ptrace_user.c
+++ b/arch/um/sys-i386/ptrace_user.c
@@ -4,9 +4,9 @@
  */
 
 #include <stdio.h>
+#include <stddef.h>
 #include <errno.h>
 #include <unistd.h>
-#include <linux/stddef.h>
 #include "ptrace_user.h"
 /* Grr, asm/user.h includes asm/ptrace.h, so has to follow ptrace_user.h */
 #include <asm/user.h>
diff --git a/arch/um/sys-i386/user-offsets.c b/arch/um/sys-i386/user-offsets.c
index 6f4ef2b7fa4a..447306b20aea 100644
--- a/arch/um/sys-i386/user-offsets.c
+++ b/arch/um/sys-i386/user-offsets.c
@@ -2,7 +2,7 @@
 #include <signal.h>
 #include <asm/ptrace.h>
 #include <asm/user.h>
-#include <linux/stddef.h>
+#include <stddef.h>
 #include <sys/poll.h>
 
 #define DEFINE(sym, val) \
diff --git a/arch/um/sys-x86_64/Makefile b/arch/um/sys-x86_64/Makefile
index f41768b8e25e..4d9e5efa6fb9 100644
--- a/arch/um/sys-x86_64/Makefile
+++ b/arch/um/sys-x86_64/Makefile
@@ -4,7 +4,7 @@
 # Licensed under the GPL
 #
 
-obj-y = bugs.o delay.o fault.o ldt.o mem.o ptrace.o ptrace_user.o \
+obj-y = bug.o bugs.o delay.o fault.o ldt.o mem.o ptrace.o ptrace_user.o \
         setjmp.o sigcontext.o signal.o syscalls.o syscall_table.o sysrq.o \
         ksyms.o tls.o
 
diff --git a/arch/um/sys-x86_64/bug.c b/arch/um/sys-x86_64/bug.c
new file mode 100644
index 000000000000..200c8ba2879b
--- /dev/null
+++ b/arch/um/sys-x86_64/bug.c
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2006 Jeff Dike (jdike@addtoit.com)
+ * Licensed under the GPL V2
+ */
+
+#include <linux/uaccess.h>
+
+/* Mostly copied from i386/x86_86 - eliminated the eip < PAGE_OFFSET because
+ * that's not relevent in skas mode.
+ */
+
+int is_valid_bugaddr(unsigned long eip)
+{
+        unsigned short ud2;
+
+        if (probe_kernel_address((unsigned short __user *)eip, ud2))
+                return 0;
+
+        return ud2 == 0x0b0f;
+}
diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index 37ec644603ab..f0d4d72e560f 100644
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -38,6 +38,14 @@ config TIME_LOW_RES
         bool
         default y
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 # Turn off some random 386 crap that can affect device config
 config ISA
         bool
@@ -97,17 +105,17 @@ menu "Processor type and features"
    # currently support
    config V850E_MA1
           bool
-          depends RTE_CB_MA1
+          depends on RTE_CB_MA1
           default y
    # Similarly for the RTE-V850E/NB85E-CB - V850E/TEG
    config V850E_TEG
           bool
-          depends RTE_CB_NB85E
+          depends on RTE_CB_NB85E
           default y
    # ... and the RTE-V850E/ME2-CB - V850E/ME2
    config V850E_ME2
           bool
-          depends RTE_CB_ME2
+          depends on RTE_CB_ME2
           default y
 
 
@@ -115,7 +123,7 @@ menu "Processor type and features"
 
    config V850E2_SIM85E2
           bool
-          depends V850E2_SIM85E2C || V850E2_SIM85E2S
+          depends on V850E2_SIM85E2C || V850E2_SIM85E2S
           default y
 
 
@@ -124,7 +132,7 @@ menu "Processor type and features"
    # V850E2 processors
    config V850E2
           bool
-          depends V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA
+          depends on V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA
           default y
 
 
@@ -133,7 +141,7 @@ menu "Processor type and features"
    # Boards in the RTE-x-CB series
    config RTE_CB
           bool
-          depends RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2
+          depends on RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2
           default y
 
    config RTE_CB_MULTI
@@ -141,28 +149,28 @@ menu "Processor type and features"
           # RTE_CB_NB85E can either have multi ROM support or not, but
           # other platforms (currently only RTE_CB_MA1) require it.
           prompt "Multi monitor ROM support" if RTE_CB_NB85E
-          depends RTE_CB_MA1 || RTE_CB_NB85E
+          depends on RTE_CB_MA1 || RTE_CB_NB85E
           default y
 
    config RTE_CB_MULTI_DBTRAP
           bool "Pass illegal insn trap / dbtrap to kernel"
-          depends RTE_CB_MULTI
+          depends on RTE_CB_MULTI
           default n
 
    config RTE_CB_MA1_KSRAM
           bool "Kernel in SRAM (limits size of kernel)"
-          depends RTE_CB_MA1 && RTE_CB_MULTI
+          depends on RTE_CB_MA1 && RTE_CB_MULTI
           default n
 
    config RTE_MB_A_PCI
           bool "Mother-A PCI support"
-          depends RTE_CB
+          depends on RTE_CB
           default y
 
    # The GBUS is used to talk to the RTE-MOTHER-A board
    config RTE_GBUS_INT
           bool
-          depends RTE_MB_A_PCI
+          depends on RTE_MB_A_PCI
           default y
 
    # The only PCI bus we support is on the RTE-MOTHER-A board
@@ -201,7 +209,7 @@ menu "Processor type and features"
 
    config ROM_KERNEL
           bool "Kernel in ROM"
-          depends V850E2_ANNA || V850E_AS85EP1 || RTE_CB_ME2
+          depends on V850E2_ANNA || V850E_AS85EP1 || RTE_CB_ME2
 
    # Some platforms pre-zero memory, in which case the kernel doesn't need to
    config ZERO_BSS
@@ -217,10 +225,10 @@ menu "Processor type and features"
 
    config V850E_HIGHRES_TIMER
           bool "High resolution timer support"
-          depends V850E_TIMER_D
+          depends on V850E_TIMER_D
    config TIME_BOOTUP
           bool "Time bootup"
-          depends V850E_HIGHRES_TIMER
+          depends on V850E_HIGHRES_TIMER
 
    config RESET_GUARD
           bool "Reset Guard"
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/kernel/vmlinux.lds.S b/arch/v850/kernel/vmlinux.lds.S
index 88d087f527c9..3a5fd07fe064 100644
--- a/arch/v850/kernel/vmlinux.lds.S
+++ b/arch/v850/kernel/vmlinux.lds.S
@@ -90,6 +90,7 @@
 
 /* Kernel text segment, and some constant data areas.  */
 #define TEXT_CONTENTS                                                         \
+                _text = .;                                                    \
                 __stext = . ;                                                 \
                 *(.text)                                                      \
                 SCHED_TEXT                                                    \
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/Kconfig b/arch/x86_64/Kconfig
index 010d2265f1cf..d4275537b25b 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -96,6 +96,19 @@ config AUDIT_ARCH
         bool
         default y
 
+config GENERIC_BUG
+        bool
+        default y
+        depends on BUG
+
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 source "init/Kconfig"
 
 
@@ -122,7 +135,7 @@ endchoice
 
 choice
         prompt "Processor family"
-        default MK8
+        default GENERIC_CPU
 
 config MK8
         bool "AMD-Opteron/Athlon64"
@@ -130,16 +143,31 @@ config MK8
           Optimize for AMD Opteron/Athlon64/Hammer/K8 CPUs.
 
 config MPSC
-       bool "Intel EM64T"
+       bool "Intel P4 / older Netburst based Xeon"
        help
-          Optimize for Intel Pentium 4 and Xeon CPUs with Intel
-          Extended Memory 64 Technology(EM64T). For details see
+          Optimize for Intel Pentium 4 and older Nocona/Dempsey Xeon CPUs
+          with Intel Extended Memory 64 Technology(EM64T). For details see
           <http://www.intel.com/technology/64bitextensions/>.
+          Note the the latest Xeons (Xeon 51xx and 53xx) are not based on the
+          Netburst core and shouldn't use this option. You can distingush them
+          using the cpu family field
+          in /proc/cpuinfo. Family 15 is a older Xeon, Family 6 a newer one
+          (this rule only applies to system that support EM64T)
+
+config MCORE2
+        bool "Intel Core2 / newer Xeon"
+        help
+          Optimize for Intel Core2 and newer Xeons (51xx)
+          You can distingush the newer Xeons from the older ones using
+          the cpu family field in /proc/cpuinfo. 15 is a older Xeon
+          (use CONFIG_MPSC then), 6 is a newer one. This rule only
+          applies to CPUs that support EM64T.
 
 config GENERIC_CPU
         bool "Generic-x86-64"
         help
           Generic x86-64 CPU.
+          Run equally well on all x86-64 CPUs.
 
 endchoice
 
@@ -149,12 +177,12 @@ endchoice
 config X86_L1_CACHE_BYTES
         int
         default "128" if GENERIC_CPU || MPSC
-        default "64" if MK8
+        default "64" if MK8 || MCORE2
 
 config X86_L1_CACHE_SHIFT
         int
         default "7" if GENERIC_CPU || MPSC
-        default "6" if MK8
+        default "6" if MK8 || MCORE2
 
 config X86_INTERNODE_CACHE_BYTES
         int
@@ -344,11 +372,6 @@ config ARCH_DISCONTIGMEM_ENABLE
        depends on NUMA
        default y
 
-
-config ARCH_DISCONTIGMEM_ENABLE
-        def_bool y
-        depends on NUMA
-
 config ARCH_DISCONTIGMEM_DEFAULT
         def_bool y
         depends on NUMA
@@ -455,6 +478,17 @@ config CALGARY_IOMMU
           Normally the kernel will make the right choice by itself.
           If unsure, say Y.
 
+config CALGARY_IOMMU_ENABLED_BY_DEFAULT
+        bool "Should Calgary be enabled by default?"
+        default y
+        depends on CALGARY_IOMMU
+        help
+          Should Calgary be enabled by default? if you choose 'y', Calgary
+          will be used (if it exists). If you choose 'n', Calgary will not be
+          used even if it exists. If you choose 'n' and would like to use
+          Calgary anyway, pass 'iommu=calgary' on the kernel command line.
+          If unsure, say Y.
+
 # need this always selected by IOMMU for the VIA workaround
 config SWIOTLB
         bool
@@ -550,7 +584,7 @@ config SECCOMP
           If unsure, say Y. Only embedded should say N here.
 
 config CC_STACKPROTECTOR
-        bool "Enable -fstack-protector buffer overflow detection (EXPRIMENTAL)"
+        bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
         depends on EXPERIMENTAL
         help
          This option turns on the -fstack-protector GCC feature. This
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index 6e38d4daeed7..2941a915d4ef 100644
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -30,6 +30,10 @@ cflags-y	:=
 cflags-kernel-y :=
 cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
 cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
+# gcc doesn't support -march=core2 yet as of gcc 4.3, but I hope it
+# will eventually. Use -mtune=generic as fallback
+cflags-$(CONFIG_MCORE2) += \
+        $(call cc-option,-march=core2,$(call cc-option,-mtune=generic))
 cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
 
 cflags-y += -m64
@@ -41,9 +45,7 @@ cflags-kernel-$(CONFIG_REORDER) += -ffunction-sections
 # actually it makes the kernel smaller too.
 cflags-y += -fno-reorder-blocks
 cflags-y += -Wno-sign-compare
-ifneq ($(CONFIG_UNWIND_INFO),y)
 cflags-y += -fno-asynchronous-unwind-tables
-endif
 ifneq ($(CONFIG_DEBUG_INFO),y)
 # -fweb shrinks the kernel a bit, but the difference is very small
 # it also messes up debugging, so don't use it for now.
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index 0f5d44e86be5..69584c295305 100644
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19-rc2-git4
-# Sat Oct 21 03:38:52 2006
+# Linux kernel version: 2.6.20-rc3
+# Fri Jan  5 11:54:41 2007
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -22,6 +22,9 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_DMI=y
 CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -47,13 +50,14 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_CPUSETS is not set
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
 CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -87,9 +91,7 @@ CONFIG_STOP_MACHINE=y
 # Block layer
 #
 CONFIG_BLOCK=y
-CONFIG_LBD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
 
 #
 # IO Schedulers
@@ -111,10 +113,11 @@ CONFIG_X86_PC=y
 # CONFIG_X86_VSMP is not set
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_L1_CACHE_BYTES=128
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_X86_INTERNODE_CACHE_BYTES=128
+CONFIG_MCORE2=y
+# CONFIG_GENERIC_CPU is not set
+CONFIG_X86_L1_CACHE_BYTES=64
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_INTERNODE_CACHE_BYTES=64
 CONFIG_X86_TSC=y
 CONFIG_X86_GOOD_APIC=y
 # CONFIG_MICROCODE is not set
@@ -170,6 +173,7 @@ CONFIG_SECCOMP=y
 # CONFIG_CC_STACKPROTECTOR is not set
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
 # CONFIG_REORDER is not set
@@ -322,6 +326,7 @@ CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
@@ -513,6 +518,7 @@ CONFIG_IDEDMA_AUTO=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
 CONFIG_SCSI_NETLINK=y
 # CONFIG_SCSI_PROC_FS is not set
 
@@ -533,6 +539,7 @@ CONFIG_CHR_DEV_SG=y
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
 
 #
 # SCSI Transports
@@ -586,6 +593,7 @@ CONFIG_MEGARAID_SAS=y
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
 
 #
 # Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -624,6 +632,7 @@ CONFIG_SATA_INTEL_COMBINED=y
 # CONFIG_PATA_IT821X is not set
 # CONFIG_PATA_JMICRON is not set
 # CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_NETCELL is not set
@@ -795,6 +804,7 @@ CONFIG_BNX2=y
 CONFIG_S2IO=m
 # CONFIG_S2IO_NAPI is not set
 # CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
 
 #
 # Token Ring devices
@@ -927,10 +937,6 @@ CONFIG_RTC=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 CONFIG_AGP=y
 CONFIG_AGP_AMD64=y
 CONFIG_AGP_INTEL=y
@@ -1050,6 +1056,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
@@ -1060,6 +1067,7 @@ CONFIG_SENSORS_SMSC47B397=m
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
@@ -1107,10 +1115,7 @@ CONFIG_SOUND=y
 # Open Sound System
 #
 CONFIG_SOUND_PRIME=y
-CONFIG_OSS_OBSOLETE_DRIVER=y
 # CONFIG_SOUND_BT878 is not set
-# CONFIG_SOUND_EMU10K1 is not set
-# CONFIG_SOUND_FUSION is not set
 # CONFIG_SOUND_ES1371 is not set
 CONFIG_SOUND_ICH=y
 # CONFIG_SOUND_TRIDENT is not set
@@ -1120,6 +1125,11 @@ CONFIG_SOUND_ICH=y
 # CONFIG_SOUND_OSS is not set
 
 #
+# HID Devices
+#
+CONFIG_HID=y
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -1135,6 +1145,7 @@ CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_MULTITHREAD_PROBE is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -1182,7 +1193,6 @@ CONFIG_USB_STORAGE=y
 # USB Input Devices
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_HID_FF is not set
 # CONFIG_USB_HIDDEV is not set
@@ -1212,6 +1222,7 @@ CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 
@@ -1302,6 +1313,11 @@ CONFIG_USB_MON=y
 #
 
 #
+# Virtualization
+#
+# CONFIG_KVM is not set
+
+#
 # Firmware Drivers
 #
 # CONFIG_EDD is not set
@@ -1474,6 +1490,11 @@ CONFIG_NLS_ISO8859_15=y
 CONFIG_NLS_UTF8=y
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Instrumentation Support
 #
 CONFIG_PROFILING=y
@@ -1488,6 +1509,8 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_DETECT_SOFTLOCKUP=y
@@ -1503,15 +1526,12 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
-CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_FRAME_POINTER is not set
-CONFIG_UNWIND_INFO=y
-CONFIG_STACK_UNWIND=y
 # CONFIG_FORCED_INLINING is not set
-# CONFIG_HEADERS_CHECK is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_LKDTM is not set
 # CONFIG_DEBUG_RODATA is not set
@@ -1533,9 +1553,11 @@ CONFIG_DEBUG_STACKOVERFLOW=y
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff --git a/arch/x86_64/ia32/ia32_aout.c b/arch/x86_64/ia32/ia32_aout.c
index 396d3c100011..fe83edb93c10 100644
--- a/arch/x86_64/ia32/ia32_aout.c
+++ b/arch/x86_64/ia32/ia32_aout.c
@@ -241,7 +241,7 @@ static u32 __user *create_aout_tables(char __user *p, struct linux_binprm *bprm)
                         get_user(c,p++);
                 } while (c);
         }
-        put_user(NULL,argv);
+        put_user(0, argv);
         current->mm->arg_end = current->mm->env_start = (unsigned long) p;
         while (envc-->0) {
                 char c;
@@ -250,7 +250,7 @@ static u32 __user *create_aout_tables(char __user *p, struct linux_binprm *bprm)
                         get_user(c,p++);
                 } while (c);
         }
-        put_user(NULL,envp);
+        put_user(0, envp);
         current->mm->env_end = (unsigned long) p;
         return sp;
 }
@@ -272,7 +272,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
         if ((N_MAGIC(ex) != ZMAGIC && N_MAGIC(ex) != OMAGIC &&
              N_MAGIC(ex) != QMAGIC && N_MAGIC(ex) != NMAGIC) ||
             N_TRSIZE(ex) || N_DRSIZE(ex) ||
-            i_size_read(bprm->file->f_dentry->d_inode) < ex.a_text+ex.a_data+N_SYMSIZE(ex)+N_TXTOFF(ex)) {
+            i_size_read(bprm->file->f_path.dentry->d_inode) < ex.a_text+ex.a_data+N_SYMSIZE(ex)+N_TXTOFF(ex)) {
                 return -ENOEXEC;
         }
 
@@ -357,7 +357,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
                 {
                         printk(KERN_WARNING 
                                "fd_offset is not page aligned. Please convert program: %s\n",
-                               bprm->file->f_dentry->d_name.name);
+                               bprm->file->f_path.dentry->d_name.name);
                         error_time = jiffies;
                 }
 #endif
@@ -440,7 +440,7 @@ static int load_aout_library(struct file *file)
         int retval;
         struct exec ex;
 
-        inode = file->f_dentry->d_inode;
+        inode = file->f_path.dentry->d_inode;
 
         retval = -ENOEXEC;
         error = kernel_read(file, 0, (char *) &ex, sizeof(ex));
@@ -471,7 +471,7 @@ static int load_aout_library(struct file *file)
                 {
                         printk(KERN_WARNING 
                                "N_TXTOFF is not page aligned. Please convert library: %s\n",
-                               file->f_dentry->d_name.name);
+                               file->f_path.dentry->d_name.name);
                         error_time = jiffies;
                 }
 #endif
diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86_64/ia32/ia32_binfmt.c
index 82ef182de6ae..543ef4f405e9 100644
--- a/arch/x86_64/ia32/ia32_binfmt.c
+++ b/arch/x86_64/ia32/ia32_binfmt.c
@@ -305,8 +305,6 @@ MODULE_AUTHOR("Eric Youngdale, Andi Kleen");
 #undef MODULE_DESCRIPTION
 #undef MODULE_AUTHOR
 
-#define elf_addr_t __u32
-
 static void elf32_init(struct pt_regs *);
 
 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
@@ -351,7 +349,7 @@ int ia32_setup_arg_pages(struct linux_binprm *bprm, unsigned long stack_top,
                 bprm->loader += stack_base;
         bprm->exec += stack_base;
 
-        mpnt = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+        mpnt = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
         if (!mpnt) 
                 return -ENOMEM; 
 
diff --git a/arch/x86_64/ia32/ia32_signal.c b/arch/x86_64/ia32/ia32_signal.c
index 0e0a266d976f..ff499ef2a1ba 100644
--- a/arch/x86_64/ia32/ia32_signal.c
+++ b/arch/x86_64/ia32/ia32_signal.c
@@ -584,6 +584,11 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         regs->rdx = (unsigned long) &frame->info;
         regs->rcx = (unsigned long) &frame->uc;
 
+        /* Make -mregparm=3 work */
+        regs->rax = sig;
+        regs->rdx = (unsigned long) &frame->info;
+        regs->rcx = (unsigned long) &frame->uc;
+
         asm volatile("movl %0,%%ds" :: "r" (__USER32_DS)); 
         asm volatile("movl %0,%%es" :: "r" (__USER32_DS)); 
         
diff --git a/arch/x86_64/ia32/syscall32.c b/arch/x86_64/ia32/syscall32.c
index 3a01329473ab..3e5ed20cba45 100644
--- a/arch/x86_64/ia32/syscall32.c
+++ b/arch/x86_64/ia32/syscall32.c
@@ -49,7 +49,7 @@ int syscall32_setup_pages(struct linux_binprm *bprm, int exstack)
         struct mm_struct *mm = current->mm;
         int ret;
 
-        vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+        vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
         if (!vma)
                 return -ENOMEM;
 
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
index 4d9d5ed942b2..124b2d27b4ac 100644
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
@@ -25,6 +25,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/sysdev.h>
 #include <linux/module.h>
+#include <linux/ioport.h>
 
 #include <asm/atomic.h>
 #include <asm/smp.h>
@@ -45,6 +46,12 @@ int apic_calibrate_pmtmr __initdata;
 
 int disable_apic_timer __initdata;
 
+static struct resource *ioapic_resources;
+static struct resource lapic_resource = {
+        .name = "Local APIC",
+        .flags = IORESOURCE_MEM | IORESOURCE_BUSY,
+};
+
 /*
  * cpu_mask that denotes the CPUs that needs timer interrupt coming in as
  * IPIs in place of local APIC timers
@@ -133,7 +140,6 @@ void clear_local_APIC(void)
                 apic_write(APIC_LVTERR, APIC_LVT_MASKED);
         if (maxlvt >= 4)
                 apic_write(APIC_LVTPC, APIC_LVT_MASKED);
-        v = GET_APIC_VERSION(apic_read(APIC_LVR));
         apic_write(APIC_ESR, 0);
         apic_read(APIC_ESR);
 }
@@ -452,23 +458,30 @@ static struct {
 static int lapic_suspend(struct sys_device *dev, pm_message_t state)
 {
         unsigned long flags;
+        int maxlvt;
 
         if (!apic_pm_state.active)
                 return 0;
 
+        maxlvt = get_maxlvt();
+
         apic_pm_state.apic_id = apic_read(APIC_ID);
         apic_pm_state.apic_taskpri = apic_read(APIC_TASKPRI);
         apic_pm_state.apic_ldr = apic_read(APIC_LDR);
         apic_pm_state.apic_dfr = apic_read(APIC_DFR);
         apic_pm_state.apic_spiv = apic_read(APIC_SPIV);
         apic_pm_state.apic_lvtt = apic_read(APIC_LVTT);
-        apic_pm_state.apic_lvtpc = apic_read(APIC_LVTPC);
+        if (maxlvt >= 4)
+                apic_pm_state.apic_lvtpc = apic_read(APIC_LVTPC);
         apic_pm_state.apic_lvt0 = apic_read(APIC_LVT0);
         apic_pm_state.apic_lvt1 = apic_read(APIC_LVT1);
         apic_pm_state.apic_lvterr = apic_read(APIC_LVTERR);
         apic_pm_state.apic_tmict = apic_read(APIC_TMICT);
         apic_pm_state.apic_tdcr = apic_read(APIC_TDCR);
-        apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);
+#ifdef CONFIG_X86_MCE_INTEL
+        if (maxlvt >= 5)
+                apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);
+#endif
         local_irq_save(flags);
         disable_local_APIC();
         local_irq_restore(flags);
@@ -479,10 +492,13 @@ static int lapic_resume(struct sys_device *dev)
 {
         unsigned int l, h;
         unsigned long flags;
+        int maxlvt;
 
         if (!apic_pm_state.active)
                 return 0;
 
+        maxlvt = get_maxlvt();
+
         local_irq_save(flags);
         rdmsr(MSR_IA32_APICBASE, l, h);
         l &= ~MSR_IA32_APICBASE_BASE;
@@ -496,8 +512,12 @@ static int lapic_resume(struct sys_device *dev)
         apic_write(APIC_SPIV, apic_pm_state.apic_spiv);
         apic_write(APIC_LVT0, apic_pm_state.apic_lvt0);
         apic_write(APIC_LVT1, apic_pm_state.apic_lvt1);
-        apic_write(APIC_LVTTHMR, apic_pm_state.apic_thmr);
-        apic_write(APIC_LVTPC, apic_pm_state.apic_lvtpc);
+#ifdef CONFIG_X86_MCE_INTEL
+        if (maxlvt >= 5)
+                apic_write(APIC_LVTTHMR, apic_pm_state.apic_thmr);
+#endif
+        if (maxlvt >= 4)
+                apic_write(APIC_LVTPC, apic_pm_state.apic_lvtpc);
         apic_write(APIC_LVTT, apic_pm_state.apic_lvtt);
         apic_write(APIC_TDCR, apic_pm_state.apic_tdcr);
         apic_write(APIC_TMICT, apic_pm_state.apic_tmict);
@@ -585,6 +605,64 @@ static int __init detect_init_APIC (void)
         return 0;
 }
 
+#ifdef CONFIG_X86_IO_APIC
+static struct resource * __init ioapic_setup_resources(void)
+{
+#define IOAPIC_RESOURCE_NAME_SIZE 11
+        unsigned long n;
+        struct resource *res;
+        char *mem;
+        int i;
+
+        if (nr_ioapics <= 0)
+                return NULL;
+
+        n = IOAPIC_RESOURCE_NAME_SIZE + sizeof(struct resource);
+        n *= nr_ioapics;
+
+        mem = alloc_bootmem(n);
+        res = (void *)mem;
+
+        if (mem != NULL) {
+                memset(mem, 0, n);
+                mem += sizeof(struct resource) * nr_ioapics;
+
+                for (i = 0; i < nr_ioapics; i++) {
+                        res[i].name = mem;
+                        res[i].flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+                        sprintf(mem,  "IOAPIC %u", i);
+                        mem += IOAPIC_RESOURCE_NAME_SIZE;
+                }
+        }
+
+        ioapic_resources = res;
+
+        return res;
+}
+
+static int __init ioapic_insert_resources(void)
+{
+        int i;
+        struct resource *r = ioapic_resources;
+
+        if (!r) {
+                printk("IO APIC resources could be not be allocated.\n");
+                return -1;
+        }
+
+        for (i = 0; i < nr_ioapics; i++) {
+                insert_resource(&iomem_resource, r);
+                r++;
+        }
+
+        return 0;
+}
+
+/* Insert the IO APIC resources after PCI initialization has occured to handle
+ * IO APICS that are mapped in on a BAR in PCI space. */
+late_initcall(ioapic_insert_resources);
+#endif
+
 void __init init_apic_mappings(void)
 {
         unsigned long apic_phys;
@@ -604,6 +682,11 @@ void __init init_apic_mappings(void)
         apic_mapped = 1;
         apic_printk(APIC_VERBOSE,"mapped APIC to %16lx (%16lx)\n", APIC_BASE, apic_phys);
 
+        /* Put local APIC into the resource map. */
+        lapic_resource.start = apic_phys;
+        lapic_resource.end = lapic_resource.start + PAGE_SIZE - 1;
+        insert_resource(&iomem_resource, &lapic_resource);
+
         /*
          * Fetch the APIC ID of the BSP in case we have a
          * default configuration (or the MP table is broken).
@@ -613,7 +696,9 @@ void __init init_apic_mappings(void)
         {
                 unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0;
                 int i;
+                struct resource *ioapic_res;
 
+                ioapic_res = ioapic_setup_resources();
                 for (i = 0; i < nr_ioapics; i++) {
                         if (smp_found_config) {
                                 ioapic_phys = mp_ioapics[i].mpc_apicaddr;
@@ -625,6 +710,12 @@ void __init init_apic_mappings(void)
                         apic_printk(APIC_VERBOSE,"mapped IOAPIC to %016lx (%016lx)\n",
                                         __fix_to_virt(idx), ioapic_phys);
                         idx++;
+
+                        if (ioapic_res != NULL) {
+                                ioapic_res->start = ioapic_phys;
+                                ioapic_res->end = ioapic_phys + (4 * 1024) - 1;
+                                ioapic_res++;
+                        }
                 }
         }
 }
@@ -644,10 +735,9 @@ void __init init_apic_mappings(void)
 
 static void __setup_APIC_LVTT(unsigned int clocks)
 {
-        unsigned int lvtt_value, tmp_value, ver;
+        unsigned int lvtt_value, tmp_value;
         int cpu = smp_processor_id();
 
-        ver = GET_APIC_VERSION(apic_read(APIC_LVR));
         lvtt_value = APIC_LVT_TIMER_PERIODIC | LOCAL_TIMER_VECTOR;
 
         if (cpu_isset(cpu, timer_interrupt_broadcast_ipi_mask))
diff --git a/arch/x86_64/kernel/cpufreq/Kconfig b/arch/x86_64/kernel/cpufreq/Kconfig
index 81f1562e5393..45a6a1fd14ac 100644
--- a/arch/x86_64/kernel/cpufreq/Kconfig
+++ b/arch/x86_64/kernel/cpufreq/Kconfig
@@ -27,10 +27,13 @@ config X86_POWERNOW_K8_ACPI
         default y
 
 config X86_SPEEDSTEP_CENTRINO
-        tristate "Intel Enhanced SpeedStep"
+        tristate "Intel Enhanced SpeedStep (deprecated)"
         select CPU_FREQ_TABLE
         depends on ACPI_PROCESSOR
         help
+          This is deprecated and this functionality is now merged into
+          acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of
+          speedstep_centrino.
           This adds the CPUFreq driver for Enhanced SpeedStep enabled
           mobile CPUs.  This means Intel Pentium M (Centrino) CPUs
           or 64bit enabled Intel Xeons.
@@ -46,10 +49,12 @@ config X86_SPEEDSTEP_CENTRINO_ACPI
 
 config X86_ACPI_CPUFREQ
         tristate "ACPI Processor P-States driver"
+        select CPU_FREQ_TABLE
         depends on ACPI_PROCESSOR
         help
           This driver adds a CPUFreq driver which utilizes the ACPI
           Processor Performance States.
+          This driver also supports Intel Enhanced Speedstep.
 
           For details, take a look at <file:Documentation/cpu-freq/>.
 
diff --git a/arch/x86_64/kernel/cpufreq/Makefile b/arch/x86_64/kernel/cpufreq/Makefile
index d8b593879224..753ce1dd418e 100644
--- a/arch/x86_64/kernel/cpufreq/Makefile
+++ b/arch/x86_64/kernel/cpufreq/Makefile
@@ -5,8 +5,8 @@
 SRCDIR := ../../../i386/kernel/cpu/cpufreq
 
 obj-$(CONFIG_X86_POWERNOW_K8) += powernow-k8.o
-obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO) += speedstep-centrino.o
 obj-$(CONFIG_X86_ACPI_CPUFREQ) += acpi-cpufreq.o
+obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO) += speedstep-centrino.o
 obj-$(CONFIG_X86_P4_CLOCKMOD) += p4-clockmod.o
 obj-$(CONFIG_X86_SPEEDSTEP_LIB) += speedstep-lib.o
 
diff --git a/arch/x86_64/kernel/crash.c b/arch/x86_64/kernel/crash.c
index 3525f884af82..95a7a2c13131 100644
--- a/arch/x86_64/kernel/crash.c
+++ b/arch/x86_64/kernel/crash.c
@@ -28,71 +28,6 @@
 /* This keeps a track of which one is crashing cpu. */
 static int crashing_cpu;
 
-static u32 *append_elf_note(u32 *buf, char *name, unsigned type,
-                                                void *data, size_t data_len)
-{
-        struct elf_note note;
-
-        note.n_namesz = strlen(name) + 1;
-        note.n_descsz = data_len;
-        note.n_type   = type;
-        memcpy(buf, &note, sizeof(note));
-        buf += (sizeof(note) +3)/4;
-        memcpy(buf, name, note.n_namesz);
-        buf += (note.n_namesz + 3)/4;
-        memcpy(buf, data, note.n_descsz);
-        buf += (note.n_descsz + 3)/4;
-
-        return buf;
-}
-
-static void final_note(u32 *buf)
-{
-        struct elf_note note;
-
-        note.n_namesz = 0;
-        note.n_descsz = 0;
-        note.n_type   = 0;
-        memcpy(buf, &note, sizeof(note));
-}
-
-static void crash_save_this_cpu(struct pt_regs *regs, int cpu)
-{
-        struct elf_prstatus prstatus;
-        u32 *buf;
-
-        if ((cpu < 0) || (cpu >= NR_CPUS))
-                return;
-
-        /* Using ELF notes here is opportunistic.
-         * I need a well defined structure format
-         * for the data I pass, and I need tags
-         * on the data to indicate what information I have
-         * squirrelled away.  ELF notes happen to provide
-         * all of that, no need to invent something new.
-         */
-
-        buf = (u32*)per_cpu_ptr(crash_notes, cpu);
-
-        if (!buf)
-                return;
-
-        memset(&prstatus, 0, sizeof(prstatus));
-        prstatus.pr_pid = current->pid;
-        elf_core_copy_regs(&prstatus.pr_reg, regs);
-        buf = append_elf_note(buf, "CORE", NT_PRSTATUS, &prstatus,
-                                        sizeof(prstatus));
-        final_note(buf);
-}
-
-static void crash_save_self(struct pt_regs *regs)
-{
-        int cpu;
-
-        cpu = smp_processor_id();
-        crash_save_this_cpu(regs, cpu);
-}
-
 #ifdef CONFIG_SMP
 static atomic_t waiting_for_crash_ipi;
 
@@ -117,7 +52,7 @@ static int crash_nmi_callback(struct notifier_block *self,
                 return NOTIFY_STOP;
         local_irq_disable();
 
-        crash_save_this_cpu(regs, cpu);
+        crash_save_cpu(regs, cpu);
         disable_local_APIC();
         atomic_dec(&waiting_for_crash_ipi);
         /* Assume hlt works */
@@ -196,5 +131,5 @@ void machine_crash_shutdown(struct pt_regs *regs)
 
         disable_IO_APIC();
 
-        crash_save_self(regs);
+        crash_save_cpu(regs, smp_processor_id());
 }
diff --git a/arch/x86_64/kernel/early-quirks.c b/arch/x86_64/kernel/early-quirks.c
index 68273bff58cc..49802f1bee94 100644
--- a/arch/x86_64/kernel/early-quirks.c
+++ b/arch/x86_64/kernel/early-quirks.c
@@ -76,6 +76,18 @@ static void ati_bugs(void)
         }
 }
 
+static void intel_bugs(void)
+{
+        u16 device = read_pci_config_16(0, 0, 0, PCI_DEVICE_ID);
+
+#ifdef CONFIG_SMP
+        if (device == PCI_DEVICE_ID_INTEL_E7320_MCH ||
+            device == PCI_DEVICE_ID_INTEL_E7520_MCH ||
+            device == PCI_DEVICE_ID_INTEL_E7525_MCH)
+                quirk_intel_irqbalance();
+#endif
+}
+
 struct chipset {
         u16 vendor;
         void (*f)(void);
@@ -85,6 +97,7 @@ static struct chipset early_qrk[] = {
         { PCI_VENDOR_ID_NVIDIA, nvidia_bugs },
         { PCI_VENDOR_ID_VIA, via_bugs },
         { PCI_VENDOR_ID_ATI, ati_bugs },
+        { PCI_VENDOR_ID_INTEL, intel_bugs},
         {}
 };
 
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index 7d401b00d822..9f5dac64aa8f 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -230,7 +230,6 @@ ENTRY(system_call)
         CFI_REL_OFFSET rip,RIP-ARGOFFSET
         GET_THREAD_INFO(%rcx)
         testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%rcx)
-        CFI_REMEMBER_STATE
         jnz tracesys
         cmpq $__NR_syscall_max,%rax
         ja badsys
@@ -241,7 +240,6 @@ ENTRY(system_call)
  * Syscall return path ending with SYSRET (fast path)
  * Has incomplete stack frame and undefined top of stack. 
  */             
-        .globl ret_from_sys_call
 ret_from_sys_call:
         movl $_TIF_ALLWORK_MASK,%edi
         /* edi: flagmask */
@@ -251,8 +249,8 @@ sysret_check:
         TRACE_IRQS_OFF
         movl threadinfo_flags(%rcx),%edx
         andl %edi,%edx
-        CFI_REMEMBER_STATE
         jnz  sysret_careful 
+        CFI_REMEMBER_STATE
         /*
          * sysretq will re-enable interrupts:
          */
@@ -265,10 +263,10 @@ sysret_check:
         swapgs
         sysretq
 
+        CFI_RESTORE_STATE
         /* Handle reschedules */
         /* edx: work, edi: workmask */  
 sysret_careful:
-        CFI_RESTORE_STATE
         bt $TIF_NEED_RESCHED,%edx
         jnc sysret_signal
         TRACE_IRQS_ON
@@ -306,7 +304,6 @@ badsys:
 
         /* Do syscall tracing */
 tracesys:                        
-        CFI_RESTORE_STATE
         SAVE_REST
         movq $-ENOSYS,RAX(%rsp)
         FIXUP_TOP_OF_STACK %rdi
@@ -322,32 +319,13 @@ tracesys:
         call *sys_call_table(,%rax,8)
 1:      movq %rax,RAX-ARGOFFSET(%rsp)
         /* Use IRET because user could have changed frame */
-        jmp int_ret_from_sys_call
-        CFI_ENDPROC
-END(system_call)
                 
 /* 
  * Syscall return path ending with IRET.
  * Has correct top of stack, but partial stack frame.
- */     
-ENTRY(int_ret_from_sys_call)
-        CFI_STARTPROC   simple
-        CFI_SIGNAL_FRAME
-        CFI_DEF_CFA     rsp,SS+8-ARGOFFSET
-        /*CFI_REL_OFFSET        ss,SS-ARGOFFSET*/
-        CFI_REL_OFFSET  rsp,RSP-ARGOFFSET
-        /*CFI_REL_OFFSET        rflags,EFLAGS-ARGOFFSET*/
-        /*CFI_REL_OFFSET        cs,CS-ARGOFFSET*/
-        CFI_REL_OFFSET  rip,RIP-ARGOFFSET
-        CFI_REL_OFFSET  rdx,RDX-ARGOFFSET
-        CFI_REL_OFFSET  rcx,RCX-ARGOFFSET
-        CFI_REL_OFFSET  rax,RAX-ARGOFFSET
-        CFI_REL_OFFSET  rdi,RDI-ARGOFFSET
-        CFI_REL_OFFSET  rsi,RSI-ARGOFFSET
-        CFI_REL_OFFSET  r8,R8-ARGOFFSET
-        CFI_REL_OFFSET  r9,R9-ARGOFFSET
-        CFI_REL_OFFSET  r10,R10-ARGOFFSET
-        CFI_REL_OFFSET  r11,R11-ARGOFFSET
+ */
+        .globl int_ret_from_sys_call
+int_ret_from_sys_call:
         cli
         TRACE_IRQS_OFF
         testl $3,CS-ARGOFFSET(%rsp)
@@ -394,8 +372,6 @@ int_very_careful:
         popq %rdi
         CFI_ADJUST_CFA_OFFSET -8
         andl $~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP),%edi
-        cli
-        TRACE_IRQS_OFF
         jmp int_restore_rest
         
 int_signal:
@@ -411,7 +387,7 @@ int_restore_rest:
         TRACE_IRQS_OFF
         jmp int_with_check
         CFI_ENDPROC
-END(int_ret_from_sys_call)
+END(system_call)
                 
 /* 
  * Certain special system calls that need to save a complete full stack frame.
@@ -1179,36 +1155,3 @@ ENTRY(call_softirq)
         ret
         CFI_ENDPROC
 ENDPROC(call_softirq)
-
-#ifdef CONFIG_STACK_UNWIND
-ENTRY(arch_unwind_init_running)
-        CFI_STARTPROC
-        movq    %r15, R15(%rdi)
-        movq    %r14, R14(%rdi)
-        xchgq   %rsi, %rdx
-        movq    %r13, R13(%rdi)
-        movq    %r12, R12(%rdi)
-        xorl    %eax, %eax
-        movq    %rbp, RBP(%rdi)
-        movq    %rbx, RBX(%rdi)
-        movq    (%rsp), %rcx
-        movq    %rax, R11(%rdi)
-        movq    %rax, R10(%rdi)
-        movq    %rax, R9(%rdi)
-        movq    %rax, R8(%rdi)
-        movq    %rax, RAX(%rdi)
-        movq    %rax, RCX(%rdi)
-        movq    %rax, RDX(%rdi)
-        movq    %rax, RSI(%rdi)
-        movq    %rax, RDI(%rdi)
-        movq    %rax, ORIG_RAX(%rdi)
-        movq    %rcx, RIP(%rdi)
-        leaq    8(%rsp), %rcx
-        movq    $__KERNEL_CS, CS(%rdi)
-        movq    %rax, EFLAGS(%rdi)
-        movq    %rcx, RSP(%rdi)
-        movq    $__KERNEL_DS, SS(%rdi)
-        jmpq    *%rdx
-        CFI_ENDPROC
-ENDPROC(arch_unwind_init_running)
-#endif
diff --git a/arch/x86_64/kernel/genapic.c b/arch/x86_64/kernel/genapic.c
index 8e78a75d1866..b007433f96bb 100644
--- a/arch/x86_64/kernel/genapic.c
+++ b/arch/x86_64/kernel/genapic.c
@@ -33,7 +33,7 @@ extern struct genapic apic_flat;
 extern struct genapic apic_physflat;
 
 struct genapic *genapic = &apic_flat;
-
+struct genapic *genapic_force;
 
 /*
  * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.
@@ -46,6 +46,13 @@ void __init clustered_apic_check(void)
         u8 cluster_cnt[NUM_APIC_CLUSTERS];
         int max_apic = 0;
 
+        /* genapic selection can be forced because of certain quirks.
+         */
+        if (genapic_force) {
+                genapic = genapic_force;
+                goto print;
+        }
+
 #if defined(CONFIG_ACPI)
         /*
          * Some x86_64 machines use physical APIC mode regardless of how many
diff --git a/arch/x86_64/kernel/head64.c b/arch/x86_64/kernel/head64.c
index 9561eb3c5b5c..cc230b93cd1c 100644
--- a/arch/x86_64/kernel/head64.c
+++ b/arch/x86_64/kernel/head64.c
@@ -57,10 +57,12 @@ void __init x86_64_start_kernel(char * real_mode_data)
 {
         int i;
 
-        for (i = 0; i < 256; i++)
+        /* clear bss before set_intr_gate with early_idt_handler */
+        clear_bss();
+
+        for (i = 0; i < IDT_ENTRIES; i++)
                 set_intr_gate(i, early_idt_handler);
         asm volatile("lidt %0" :: "m" (idt_descr));
-        clear_bss();
 
         early_printk("Kernel alive\n");
 
diff --git a/arch/x86_64/kernel/i387.c b/arch/x86_64/kernel/i387.c
index 3aa1e9bb781d..1d58c13bc6bc 100644
--- a/arch/x86_64/kernel/i387.c
+++ b/arch/x86_64/kernel/i387.c
@@ -82,11 +82,8 @@ int save_i387(struct _fpstate __user *buf)
         struct task_struct *tsk = current;
         int err = 0;
 
-        { 
-                extern void bad_user_i387_struct(void); 
-                if (sizeof(struct user_i387_struct) != sizeof(tsk->thread.i387.fxsave))
-                        bad_user_i387_struct();
-        } 
+        BUILD_BUG_ON(sizeof(struct user_i387_struct) !=
+                        sizeof(tsk->thread.i387.fxsave));
 
         if ((unsigned long)buf % 16) 
                 printk("save_i387: bad fpstate %p\n",buf); 
diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c
index c4ef801b765b..d73c79e821f1 100644
--- a/arch/x86_64/kernel/i8259.c
+++ b/arch/x86_64/kernel/i8259.c
@@ -76,7 +76,8 @@ BUILD_16_IRQS(0xc) BUILD_16_IRQS(0xd) BUILD_16_IRQS(0xe) BUILD_16_IRQS(0xf)
         IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \
         IRQ(x,c), IRQ(x,d), IRQ(x,e), IRQ(x,f)
 
-void (*interrupt[NR_IRQS])(void) = {
+/* for the irq vectors */
+static void (*interrupt[NR_VECTORS - FIRST_EXTERNAL_VECTOR])(void) = {
                                           IRQLIST_16(0x2), IRQLIST_16(0x3),
         IRQLIST_16(0x4), IRQLIST_16(0x5), IRQLIST_16(0x6), IRQLIST_16(0x7),
         IRQLIST_16(0x8), IRQLIST_16(0x9), IRQLIST_16(0xa), IRQLIST_16(0xb),
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index c80081a6ba41..d7bad90a5ad8 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -178,14 +178,20 @@ static struct IO_APIC_route_entry ioapic_read_entry(int apic, int pin)
  * the interrupt, and we need to make sure the entry is fully populated
  * before that happens.
  */
-static void ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e)
+static void
+__ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e)
 {
-        unsigned long flags;
         union entry_union eu;
         eu.entry = e;
-        spin_lock_irqsave(&ioapic_lock, flags);
         io_apic_write(apic, 0x11 + 2*pin, eu.w2);
         io_apic_write(apic, 0x10 + 2*pin, eu.w1);
+}
+
+static void ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&ioapic_lock, flags);
+        __ioapic_write_entry(apic, pin, e);
         spin_unlock_irqrestore(&ioapic_lock, flags);
 }
 
@@ -750,6 +756,22 @@ static int assign_irq_vector(int irq, cpumask_t mask, cpumask_t *result)
         return vector;
 }
 
+static void __clear_irq_vector(int irq)
+{
+        cpumask_t mask;
+        int cpu, vector;
+
+        BUG_ON(!irq_vector[irq]);
+
+        vector = irq_vector[irq];
+        cpus_and(mask, irq_domain[irq], cpu_online_map);
+        for_each_cpu_mask(cpu, mask)
+                per_cpu(vector_irq, cpu)[vector] = -1;
+
+        irq_vector[irq] = 0;
+        irq_domain[irq] = CPU_MASK_NONE;
+}
+
 void __setup_vector_irq(int cpu)
 {
         /* Initialize vector_irq on a new cpu */
@@ -794,27 +816,65 @@ static void ioapic_register_intr(int irq, int vector, unsigned long trigger)
                                               handle_edge_irq, "edge");
         }
 }
-
-static void __init setup_IO_APIC_irqs(void)
+static void __init setup_IO_APIC_irq(int apic, int pin, int idx, int irq)
 {
         struct IO_APIC_route_entry entry;
-        int apic, pin, idx, irq, first_notcon = 1, vector;
+        int vector;
         unsigned long flags;
 
-        apic_printk(APIC_VERBOSE, KERN_DEBUG "init IO_APIC IRQs\n");
 
-        for (apic = 0; apic < nr_ioapics; apic++) {
-        for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) {
+        /*
+         * add it to the IO-APIC irq-routing table:
+         */
+        memset(&entry,0,sizeof(entry));
 
-                /*
-                 * add it to the IO-APIC irq-routing table:
-                 */
-                memset(&entry,0,sizeof(entry));
+        entry.delivery_mode = INT_DELIVERY_MODE;
+        entry.dest_mode = INT_DEST_MODE;
+        entry.mask = 0;                         /* enable IRQ */
+        entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
 
-                entry.delivery_mode = INT_DELIVERY_MODE;
-                entry.dest_mode = INT_DEST_MODE;
-                entry.mask = 0;                         /* enable IRQ */
+        entry.trigger = irq_trigger(idx);
+        entry.polarity = irq_polarity(idx);
+
+        if (irq_trigger(idx)) {
+                entry.trigger = 1;
+                entry.mask = 1;
                 entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
+        }
+
+        if (!apic && !IO_APIC_IRQ(irq))
+                return;
+
+        if (IO_APIC_IRQ(irq)) {
+                cpumask_t mask;
+                vector = assign_irq_vector(irq, TARGET_CPUS, &mask);
+                if (vector < 0)
+                        return;
+
+                entry.dest.logical.logical_dest = cpu_mask_to_apicid(mask);
+                entry.vector = vector;
+
+                ioapic_register_intr(irq, vector, IOAPIC_AUTO);
+                if (!apic && (irq < 16))
+                        disable_8259A_irq(irq);
+        }
+
+        ioapic_write_entry(apic, pin, entry);
+
+        spin_lock_irqsave(&ioapic_lock, flags);
+        set_native_irq_info(irq, TARGET_CPUS);
+        spin_unlock_irqrestore(&ioapic_lock, flags);
+
+}
+
+static void __init setup_IO_APIC_irqs(void)
+{
+        int apic, pin, idx, irq, first_notcon = 1;
+
+        apic_printk(APIC_VERBOSE, KERN_DEBUG "init IO_APIC IRQs\n");
+
+        for (apic = 0; apic < nr_ioapics; apic++) {
+        for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) {
 
                 idx = find_irq_entry(apic,pin,mp_INT);
                 if (idx == -1) {
@@ -826,39 +886,11 @@ static void __init setup_IO_APIC_irqs(void)
                         continue;
                 }
 
-                entry.trigger = irq_trigger(idx);
-                entry.polarity = irq_polarity(idx);
-
-                if (irq_trigger(idx)) {
-                        entry.trigger = 1;
-                        entry.mask = 1;
-                        entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
-                }
-
                 irq = pin_2_irq(idx, apic, pin);
                 add_pin_to_irq(irq, apic, pin);
 
-                if (!apic && !IO_APIC_IRQ(irq))
-                        continue;
-
-                if (IO_APIC_IRQ(irq)) {
-                        cpumask_t mask;
-                        vector = assign_irq_vector(irq, TARGET_CPUS, &mask);
-                        if (vector < 0)
-                                continue;
-
-                        entry.dest.logical.logical_dest = cpu_mask_to_apicid(mask);
-                        entry.vector = vector;
+                setup_IO_APIC_irq(apic, pin, idx, irq);
 
-                        ioapic_register_intr(irq, vector, IOAPIC_AUTO);
-                        if (!apic && (irq < 16))
-                                disable_8259A_irq(irq);
-                }
-                ioapic_write_entry(apic, pin, entry);
-
-                spin_lock_irqsave(&ioapic_lock, flags);
-                set_native_irq_info(irq, TARGET_CPUS);
-                spin_unlock_irqrestore(&ioapic_lock, flags);
         }
         }
 
@@ -1837,7 +1869,7 @@ void destroy_irq(unsigned int irq)
         dynamic_irq_cleanup(irq);
 
         spin_lock_irqsave(&vector_lock, flags);
-        irq_vector[irq] = 0;
+        __clear_irq_vector(irq);
         spin_unlock_irqrestore(&vector_lock, flags);
 }
 
@@ -2139,7 +2171,15 @@ void __init setup_ioapic_dest(void)
                         if (irq_entry == -1)
                                 continue;
                         irq = pin_2_irq(irq_entry, ioapic, pin);
-                        set_ioapic_affinity_irq(irq, TARGET_CPUS);
+
+                        /* setup_IO_APIC_irqs could fail to get vector for some device
+                         * when you have too many devices, because at that time only boot
+                         * cpu is online.
+                         */
+                        if(!irq_vector[irq])
+                                setup_IO_APIC_irq(ioapic, pin, irq_entry, irq);
+                        else
+                                set_ioapic_affinity_irq(irq, TARGET_CPUS);
                 }
 
         }
diff --git a/arch/x86_64/kernel/irq.c b/arch/x86_64/kernel/irq.c
index e46c55856d40..0c06af6c13bc 100644
--- a/arch/x86_64/kernel/irq.c
+++ b/arch/x86_64/kernel/irq.c
@@ -120,7 +120,7 @@ asmlinkage unsigned int do_IRQ(struct pt_regs *regs)
 
         if (likely(irq < NR_IRQS))
                 generic_handle_irq(irq);
-        else
+        else if (printk_ratelimit())
                 printk(KERN_EMERG "%s: %d.%d No irq handler for vector\n",
                         __func__, smp_processor_id(), vector);
 
diff --git a/arch/x86_64/kernel/kprobes.c b/arch/x86_64/kernel/kprobes.c
index ac241567e682..209c8c0bec71 100644
--- a/arch/x86_64/kernel/kprobes.c
+++ b/arch/x86_64/kernel/kprobes.c
@@ -224,7 +224,7 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
 void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
         mutex_lock(&kprobe_mutex);
-        free_insn_slot(p->ainsn.insn);
+        free_insn_slot(p->ainsn.insn, 0);
         mutex_unlock(&kprobe_mutex);
 }
 
diff --git a/arch/x86_64/kernel/mce.c b/arch/x86_64/kernel/mce.c
index bbea88801d88..ac085038af29 100644
--- a/arch/x86_64/kernel/mce.c
+++ b/arch/x86_64/kernel/mce.c
@@ -306,8 +306,8 @@ void mce_log_therm_throt_event(unsigned int cpu, __u64 status)
  */
 
 static int check_interval = 5 * 60; /* 5 minutes */
-static void mcheck_timer(void *data);
-static DECLARE_WORK(mcheck_work, mcheck_timer, NULL);
+static void mcheck_timer(struct work_struct *work);
+static DECLARE_DELAYED_WORK(mcheck_work, mcheck_timer);
 
 static void mcheck_check_cpu(void *info)
 {
@@ -315,7 +315,7 @@ static void mcheck_check_cpu(void *info)
                 do_machine_check(NULL, 0);
 }
 
-static void mcheck_timer(void *data)
+static void mcheck_timer(struct work_struct *work)
 {
         on_each_cpu(mcheck_check_cpu, NULL, 1, 1);
         schedule_delayed_work(&mcheck_work, check_interval * HZ);
@@ -641,7 +641,6 @@ static __cpuinit int mce_create_device(unsigned int cpu)
         return err;
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
 static void mce_remove_device(unsigned int cpu)
 {
         int i;
@@ -652,6 +651,7 @@ static void mce_remove_device(unsigned int cpu)
         sysdev_remove_file(&per_cpu(device_mce,cpu), &attr_tolerant);
         sysdev_remove_file(&per_cpu(device_mce,cpu), &attr_check_interval);
         sysdev_unregister(&per_cpu(device_mce,cpu));
+        memset(&per_cpu(device_mce, cpu).kobj, 0, sizeof(struct kobject));
 }
 
 /* Get notified when a cpu comes on/off. Be hotplug friendly. */
@@ -674,7 +674,6 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
 static struct notifier_block mce_cpu_notifier = {
         .notifier_call = mce_cpu_callback,
 };
-#endif
 
 static __init int mce_init_device(void)
 {
diff --git a/arch/x86_64/kernel/mce_amd.c b/arch/x86_64/kernel/mce_amd.c
index 883fe747f64c..fa09debad4b7 100644
--- a/arch/x86_64/kernel/mce_amd.c
+++ b/arch/x86_64/kernel/mce_amd.c
@@ -551,7 +551,6 @@ out:
         return err;
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
 /*
  * let's be hotplug friendly.
  * in case of multiple core processors, the first core always takes ownership
@@ -594,12 +593,14 @@ static void threshold_remove_bank(unsigned int cpu, int bank)
 
         sprintf(name, "threshold_bank%i", bank);
 
+#ifdef CONFIG_SMP
         /* sibling symlink */
         if (shared_bank[bank] && b->blocks->cpu != cpu) {
                 sysfs_remove_link(&per_cpu(device_mce, cpu).kobj, name);
                 per_cpu(threshold_banks, cpu)[bank] = NULL;
                 return;
         }
+#endif
 
         /* remove all sibling symlinks before unregistering */
         for_each_cpu_mask(i, b->cpus) {
@@ -656,7 +657,6 @@ static int threshold_cpu_callback(struct notifier_block *nfb,
 static struct notifier_block threshold_cpu_notifier = {
         .notifier_call = threshold_cpu_callback,
 };
-#endif /* CONFIG_HOTPLUG_CPU */
 
 static __init int threshold_init_device(void)
 {
diff --git a/arch/x86_64/kernel/module.c b/arch/x86_64/kernel/module.c
index 9d0958ff547f..a888e67f5874 100644
--- a/arch/x86_64/kernel/module.c
+++ b/arch/x86_64/kernel/module.c
@@ -23,6 +23,7 @@
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/bug.h>
 
 #include <asm/system.h>
 #include <asm/page.h>
@@ -173,10 +174,12 @@ int module_finalize(const Elf_Ehdr *hdr,
                                             lseg, lseg + locks->sh_size,
                                             tseg, tseg + text->sh_size);
         }
-        return 0;
+
+        return module_bug_finalize(hdr, sechdrs, me);
 }
 
 void module_arch_cleanup(struct module *mod)
 {
         alternatives_smp_module_del(mod);
+        module_bug_cleanup(mod);
 }
diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c
index b147ab19fbd4..08072568847d 100644
--- a/arch/x86_64/kernel/mpparse.c
+++ b/arch/x86_64/kernel/mpparse.c
@@ -35,8 +35,6 @@
 int smp_found_config;
 unsigned int __initdata maxcpus = NR_CPUS;
 
-int acpi_found_madt;
-
 /*
  * Various Linux-internal data structures created from the
  * MP-table.
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index 7af9cb3e2d99..186aebbae32d 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -12,14 +12,15 @@
  *  Mikael Pettersson   : PM converted to driver model. Disable/enable API.
  */
 
+#include <linux/nmi.h>
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/sysdev.h>
-#include <linux/nmi.h>
 #include <linux/sysctl.h>
 #include <linux/kprobes.h>
+#include <linux/cpumask.h>
 
 #include <asm/smp.h>
 #include <asm/nmi.h>
@@ -41,6 +42,8 @@ int panic_on_unrecovered_nmi;
 static DEFINE_PER_CPU(unsigned, perfctr_nmi_owner);
 static DEFINE_PER_CPU(unsigned, evntsel_nmi_owner[2]);
 
+static cpumask_t backtrace_mask = CPU_MASK_NONE;
+
 /* this number is calculated from Intel's MSR_P4_CRU_ESCR5 register and it's
  * offset from MSR_P4_BSU_ESCR0.  It will be the max for all platforms (for now)
  */
@@ -190,6 +193,8 @@ void nmi_watchdog_default(void)
                 nmi_watchdog = NMI_IO_APIC;
 }
 
+static int endflag __initdata = 0;
+
 #ifdef CONFIG_SMP
 /* The performance counters used by NMI_LOCAL_APIC don't trigger when
  * the CPU is idle. To make sure the NMI watchdog really ticks on all
@@ -197,7 +202,6 @@ void nmi_watchdog_default(void)
  */
 static __init void nmi_cpu_busy(void *data)
 {
-        volatile int *endflag = data;
         local_irq_enable_in_hardirq();
         /* Intentionally don't use cpu_relax here. This is
            to make sure that the performance counter really ticks,
@@ -205,14 +209,13 @@ static __init void nmi_cpu_busy(void *data)
            pause instruction. On a real HT machine this is fine because
            all other CPUs are busy with "useless" delay loops and don't
            care if they get somewhat less cycles. */
-        while (*endflag == 0)
-                barrier();
+        while (endflag == 0)
+                mb();
 }
 #endif
 
 int __init check_nmi_watchdog (void)
 {
-        volatile int endflag = 0;
         int *counts;
         int cpu;
 
@@ -253,6 +256,7 @@ int __init check_nmi_watchdog (void)
         if (!atomic_read(&nmi_active)) {
                 kfree(counts);
                 atomic_set(&nmi_active, -1);
+                endflag = 1;
                 return -1;
         }
         endflag = 1;
@@ -782,6 +786,7 @@ int __kprobes nmi_watchdog_tick(struct pt_regs * regs, unsigned reason)
 {
         int sum;
         int touched = 0;
+        int cpu = smp_processor_id();
         struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk);
         u64 dummy;
         int rc=0;
@@ -799,6 +804,16 @@ int __kprobes nmi_watchdog_tick(struct pt_regs * regs, unsigned reason)
                 touched = 1;
         }
 
+        if (cpu_isset(cpu, backtrace_mask)) {
+                static DEFINE_SPINLOCK(lock);   /* Serialise the printks */
+
+                spin_lock(&lock);
+                printk("NMI backtrace for cpu %d\n", cpu);
+                dump_stack();
+                spin_unlock(&lock);
+                cpu_clear(cpu, backtrace_mask);
+        }
+
 #ifdef CONFIG_X86_MCE
         /* Could check oops_in_progress here too, but it's safer
            not too */
@@ -931,6 +946,19 @@ int proc_nmi_enabled(struct ctl_table *table, int write, struct file *file,
 
 #endif
 
+void __trigger_all_cpu_backtrace(void)
+{
+        int i;
+
+        backtrace_mask = cpu_online_map;
+        /* Wait for up to 10 seconds for all CPUs to do the backtrace */
+        for (i = 0; i < 10 * 1000; i++) {
+                if (cpus_empty(backtrace_mask))
+                        break;
+                mdelay(1);
+        }
+}
+
 EXPORT_SYMBOL(nmi_active);
 EXPORT_SYMBOL(nmi_watchdog);
 EXPORT_SYMBOL(avail_to_resrv_perfctr_nmi);
diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c
index 37a770859e71..3d65b1d4c2b3 100644
--- a/arch/x86_64/kernel/pci-calgary.c
+++ b/arch/x86_64/kernel/pci-calgary.c
@@ -41,6 +41,13 @@
 #include <asm/pci-direct.h>
 #include <asm/system.h>
 #include <asm/dma.h>
+#include <asm/rio.h>
+
+#ifdef CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT
+int use_calgary __read_mostly = 1;
+#else
+int use_calgary __read_mostly = 0;
+#endif /* CONFIG_CALGARY_DEFAULT_ENABLED */
 
 #define PCI_DEVICE_ID_IBM_CALGARY 0x02a1
 #define PCI_VENDOR_DEVICE_ID_CALGARY \
@@ -115,14 +122,35 @@ static const unsigned long phb_offsets[] = {
         0xB000 /* PHB3 */
 };
 
+/* PHB debug registers */
+
+static const unsigned long phb_debug_offsets[] = {
+        0x4000  /* PHB 0 DEBUG */,
+        0x5000  /* PHB 1 DEBUG */,
+        0x6000  /* PHB 2 DEBUG */,
+        0x7000  /* PHB 3 DEBUG */
+};
+
+/*
+ * STUFF register for each debug PHB,
+ * byte 1 = start bus number, byte 2 = end bus number
+ */
+
+#define PHB_DEBUG_STUFF_OFFSET  0x0020
+
 unsigned int specified_table_size = TCE_TABLE_SIZE_UNSPECIFIED;
 static int translate_empty_slots __read_mostly = 0;
 static int calgary_detected __read_mostly = 0;
 
+static struct rio_table_hdr     *rio_table_hdr __initdata;
+static struct scal_detail       *scal_devs[MAX_NUMNODES] __initdata;
+static struct rio_detail        *rio_devs[MAX_NUMNODES * 4] __initdata;
+
 struct calgary_bus_info {
         void *tce_space;
         unsigned char translation_disabled;
         signed char phbid;
+        void __iomem *bbar;
 };
 
 static struct calgary_bus_info bus_info[MAX_PHB_BUS_NUM] = { { NULL, 0, 0 }, };
@@ -475,6 +503,11 @@ static struct dma_mapping_ops calgary_dma_ops = {
         .unmap_sg = calgary_unmap_sg,
 };
 
+static inline void __iomem * busno_to_bbar(unsigned char num)
+{
+        return bus_info[num].bbar;
+}
+
 static inline int busno_to_phbid(unsigned char num)
 {
         return bus_info[num].phbid;
@@ -620,14 +653,9 @@ static void __init calgary_reserve_peripheral_mem_2(struct pci_dev *dev)
 static void __init calgary_reserve_regions(struct pci_dev *dev)
 {
         unsigned int npages;
-        void __iomem *bbar;
-        unsigned char busnum;
         u64 start;
         struct iommu_table *tbl = dev->sysdata;
 
-        bbar = tbl->bbar;
-        busnum = dev->bus->number;
-
         /* reserve bad_dma_address in case it's a legal address */
         iommu_range_reserve(tbl, bad_dma_address, 1);
 
@@ -740,7 +768,7 @@ static void __init calgary_increase_split_completion_timeout(void __iomem *bbar,
 {
         u64 val64;
         void __iomem *target;
-        unsigned long phb_shift = -1;
+        unsigned int phb_shift = ~0; /* silence gcc */
         u64 mask;
 
         switch (busno_to_phbid(busnum)) {
@@ -828,33 +856,6 @@ static void __init calgary_disable_translation(struct pci_dev *dev)
         del_timer_sync(&tbl->watchdog_timer);
 }
 
-static inline unsigned int __init locate_register_space(struct pci_dev *dev)
-{
-        int rionodeid;
-        u32 address;
-
-        /*
-         * Each Calgary has four busses. The first four busses (first Calgary)
-         * have RIO node ID 2, then the next four (second Calgary) have RIO
-         * node ID 3, the next four (third Calgary) have node ID 2 again, etc.
-         * We use a gross hack - relying on the dev->bus->number ordering,
-         * modulo 14 - to decide which Calgary a given bus is on. Busses 0, 1,
-         * 2 and 4 are on the first Calgary (id 2), 6, 8, a and c are on the
-         * second (id 3), and then it repeats modulo 14.
-         */
-        rionodeid = (dev->bus->number % 14 > 4) ? 3 : 2;
-        /*
-         * register space address calculation as follows:
-         * FE0MB-8MB*OneBasedChassisNumber+1MB*(RioNodeId-ChassisBase)
-         * ChassisBase is always zero for x366/x260/x460
-         * RioNodeId is 2 for first Calgary, 3 for second Calgary
-         */
-        address = START_ADDRESS -
-                (0x800000 * (ONE_BASED_CHASSIS_NUM + dev->bus->number / 14)) +
-                (0x100000) * (rionodeid - CHASSIS_BASE);
-        return address;
-}
-
 static void __init calgary_init_one_nontraslated(struct pci_dev *dev)
 {
         pci_dev_get(dev);
@@ -864,23 +865,15 @@ static void __init calgary_init_one_nontraslated(struct pci_dev *dev)
 
 static int __init calgary_init_one(struct pci_dev *dev)
 {
-        u32 address;
         void __iomem *bbar;
         int ret;
 
         BUG_ON(dev->bus->number >= MAX_PHB_BUS_NUM);
 
-        address = locate_register_space(dev);
-        /* map entire 1MB of Calgary config space */
-        bbar = ioremap_nocache(address, 1024 * 1024);
-        if (!bbar) {
-                ret = -ENODATA;
-                goto done;
-        }
-
+        bbar = busno_to_bbar(dev->bus->number);
         ret = calgary_setup_tar(dev, bbar);
         if (ret)
-                goto iounmap;
+                goto done;
 
         pci_dev_get(dev);
         dev->bus->self = dev;
@@ -888,17 +881,66 @@ static int __init calgary_init_one(struct pci_dev *dev)
 
         return 0;
 
-iounmap:
-        iounmap(bbar);
 done:
         return ret;
 }
 
+static int __init calgary_locate_bbars(void)
+{
+        int ret;
+        int rioidx, phb, bus;
+        void __iomem *bbar;
+        void __iomem *target;
+        unsigned long offset;
+        u8 start_bus, end_bus;
+        u32 val;
+
+        ret = -ENODATA;
+        for (rioidx = 0; rioidx < rio_table_hdr->num_rio_dev; rioidx++) {
+                struct rio_detail *rio = rio_devs[rioidx];
+
+                if ((rio->type != COMPAT_CALGARY) && (rio->type != ALT_CALGARY))
+                        continue;
+
+                /* map entire 1MB of Calgary config space */
+                bbar = ioremap_nocache(rio->BBAR, 1024 * 1024);
+                if (!bbar)
+                        goto error;
+
+                for (phb = 0; phb < PHBS_PER_CALGARY; phb++) {
+                        offset = phb_debug_offsets[phb] | PHB_DEBUG_STUFF_OFFSET;
+                        target = calgary_reg(bbar, offset);
+
+                        val = be32_to_cpu(readl(target));
+                        start_bus = (u8)((val & 0x00FF0000) >> 16);
+                        end_bus = (u8)((val & 0x0000FF00) >> 8);
+                        for (bus = start_bus; bus <= end_bus; bus++) {
+                                bus_info[bus].bbar = bbar;
+                                bus_info[bus].phbid = phb;
+                        }
+                }
+        }
+
+        return 0;
+
+error:
+        /* scan bus_info and iounmap any bbars we previously ioremap'd */
+        for (bus = 0; bus < ARRAY_SIZE(bus_info); bus++)
+                if (bus_info[bus].bbar)
+                        iounmap(bus_info[bus].bbar);
+
+        return ret;
+}
+
 static int __init calgary_init(void)
 {
-        int ret = -ENODEV;
+        int ret;
         struct pci_dev *dev = NULL;
 
+        ret = calgary_locate_bbars();
+        if (ret)
+                return ret;
+
         do {
                 dev = pci_get_device(PCI_VENDOR_ID_IBM,
                                      PCI_DEVICE_ID_IBM_CALGARY,
@@ -921,7 +963,7 @@ static int __init calgary_init(void)
 
 error:
         do {
-                dev = pci_find_device_reverse(PCI_VENDOR_ID_IBM,
+                dev = pci_get_device_reverse(PCI_VENDOR_ID_IBM,
                                               PCI_DEVICE_ID_IBM_CALGARY,
                                               dev);
                 if (!dev)
@@ -962,13 +1004,56 @@ static inline int __init determine_tce_table_size(u64 ram)
         return ret;
 }
 
+static int __init build_detail_arrays(void)
+{
+        unsigned long ptr;
+        int i, scal_detail_size, rio_detail_size;
+
+        if (rio_table_hdr->num_scal_dev > MAX_NUMNODES){
+                printk(KERN_WARNING
+                        "Calgary: MAX_NUMNODES too low! Defined as %d, "
+                        "but system has %d nodes.\n",
+                        MAX_NUMNODES, rio_table_hdr->num_scal_dev);
+                return -ENODEV;
+        }
+
+        switch (rio_table_hdr->version){
+        case 2:
+                scal_detail_size = 11;
+                rio_detail_size = 13;
+                break;
+        case 3:
+                scal_detail_size = 12;
+                rio_detail_size = 15;
+                break;
+        default:
+                printk(KERN_WARNING
+                       "Calgary: Invalid Rio Grande Table Version: %d\n",
+                       rio_table_hdr->version);
+                return -EPROTO;
+        }
+
+        ptr = ((unsigned long)rio_table_hdr) + 3;
+        for (i = 0; i < rio_table_hdr->num_scal_dev;
+                    i++, ptr += scal_detail_size)
+                scal_devs[i] = (struct scal_detail *)ptr;
+
+        for (i = 0; i < rio_table_hdr->num_rio_dev;
+                    i++, ptr += rio_detail_size)
+                rio_devs[i] = (struct rio_detail *)ptr;
+
+        return 0;
+}
+
 void __init detect_calgary(void)
 {
         u32 val;
         int bus;
         void *tbl;
         int calgary_found = 0;
-        int phb = -1;
+        unsigned long ptr;
+        unsigned int offset, prev_offset;
+        int ret;
 
         /*
          * if the user specified iommu=off or iommu=soft or we found
@@ -977,25 +1062,54 @@ void __init detect_calgary(void)
         if (swiotlb || no_iommu || iommu_detected)
                 return;
 
+        if (!use_calgary)
+                return;
+
         if (!early_pci_allowed())
                 return;
 
+        printk(KERN_DEBUG "Calgary: detecting Calgary via BIOS EBDA area\n");
+
+        ptr = (unsigned long)phys_to_virt(get_bios_ebda());
+
+        rio_table_hdr = NULL;
+        prev_offset = 0;
+        offset = 0x180;
+        /*
+         * The next offset is stored in the 1st word.
+         * Only parse up until the offset increases:
+         */
+        while (offset > prev_offset) {
+                /* The block id is stored in the 2nd word */
+                if (*((unsigned short *)(ptr + offset + 2)) == 0x4752){
+                        /* set the pointer past the offset & block id */
+                        rio_table_hdr = (struct rio_table_hdr *)(ptr + offset + 4);
+                        break;
+                }
+                prev_offset = offset;
+                offset = *((unsigned short *)(ptr + offset));
+        }
+        if (!rio_table_hdr) {
+                printk(KERN_DEBUG "Calgary: Unable to locate Rio Grande table "
+                       "in EBDA - bailing!\n");
+                return;
+        }
+
+        ret = build_detail_arrays();
+        if (ret) {
+                printk(KERN_DEBUG "Calgary: build_detail_arrays ret %d\n", ret);
+                return;
+        }
+
         specified_table_size = determine_tce_table_size(end_pfn * PAGE_SIZE);
 
         for (bus = 0; bus < MAX_PHB_BUS_NUM; bus++) {
                 int dev;
                 struct calgary_bus_info *info = &bus_info[bus];
-                info->phbid = -1;
 
                 if (read_pci_config(bus, 0, 0, 0) != PCI_VENDOR_DEVICE_ID_CALGARY)
                         continue;
 
-                /*
-                 * There are 4 PHBs per Calgary chip.  Set phb to which phb (0-3)
-                 * it is connected to releative to the clagary chip.
-                 */
-                phb = (phb + 1) % PHBS_PER_CALGARY;
-
                 if (info->translation_disabled)
                         continue;
 
@@ -1010,13 +1124,15 @@ void __init detect_calgary(void)
                                 if (!tbl)
                                         goto cleanup;
                                 info->tce_space = tbl;
-                                info->phbid = phb;
                                 calgary_found = 1;
                                 break;
                         }
                 }
         }
 
+        printk(KERN_DEBUG "Calgary: finished detection, Calgary %s\n",
+               calgary_found ? "found" : "not found");
+
         if (calgary_found) {
                 iommu_detected = 1;
                 calgary_detected = 1;
diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86_64/kernel/pci-dma.c
index f8d857453f8a..683b7a5c1ab3 100644
--- a/arch/x86_64/kernel/pci-dma.c
+++ b/arch/x86_64/kernel/pci-dma.c
@@ -296,6 +296,11 @@ __init int iommu_setup(char *p)
                 gart_parse_options(p);
 #endif
 
+#ifdef CONFIG_CALGARY_IOMMU
+                if (!strncmp(p, "calgary", 7))
+                        use_calgary = 1;
+#endif /* CONFIG_CALGARY_IOMMU */
+
                 p += strcspn(p, ",");
                 if (*p == ',')
                         ++p;
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c
index 16261a8a3303..fc1960f1f243 100644
--- a/arch/x86_64/kernel/pci-gart.c
+++ b/arch/x86_64/kernel/pci-gart.c
@@ -601,10 +601,9 @@ void __init gart_iommu_init(void)
             (!force_iommu && end_pfn <= MAX_DMA32_PFN) ||
             !iommu_aperture ||
             (no_agp && init_k8_gatt(&info) < 0)) {
-                printk(KERN_INFO "PCI-DMA: Disabling IOMMU.\n");
                 if (end_pfn > MAX_DMA32_PFN) {
                         printk(KERN_ERR "WARNING more than 4GB of memory "
-                                        "but IOMMU not available.\n"
+                                        "but GART IOMMU not available.\n"
                                KERN_ERR "WARNING 32bit PCI may malfunction.\n");
                 }
                 return;
diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index 7451a4c43c16..cbbc6adc1a92 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -108,17 +108,19 @@ void exit_idle(void)
  */
 static void default_idle(void)
 {
-        local_irq_enable();
-
         current_thread_info()->status &= ~TS_POLLING;
-        smp_mb__after_clear_bit();
-        while (!need_resched()) {
-                local_irq_disable();
-                if (!need_resched())
-                        safe_halt();
-                else
-                        local_irq_enable();
-        }
+        /*
+         * TS_POLLING-cleared state must be visible before we
+         * test NEED_RESCHED:
+         */
+        smp_mb();
+        local_irq_disable();
+        if (!need_resched()) {
+                /* Enables interrupts one instruction before HLT.
+                   x86 special cases this so there is no race. */
+                safe_halt();
+        } else
+                local_irq_enable();
         current_thread_info()->status |= TS_POLLING;
 }
 
@@ -130,15 +132,7 @@ static void default_idle(void)
 static void poll_idle (void)
 {
         local_irq_enable();
-
-        asm volatile(
-                "2:"
-                "testl %0,%1;"
-                "rep; nop;"
-                "je 2b;"
-                : :
-                "i" (_TIF_NEED_RESCHED),
-                "m" (current_thread_info()->flags));
+        cpu_relax();
 }
 
 void cpu_idle_wait(void)
@@ -219,6 +213,12 @@ void cpu_idle (void)
                                 idle = default_idle;
                         if (cpu_is_offline(smp_processor_id()))
                                 play_dead();
+                        /*
+                         * Idle routines should keep interrupts disabled
+                         * from here on, until they go to idle.
+                         * Otherwise, idle callbacks can misfire.
+                         */
+                        local_irq_disable();
                         enter_idle();
                         idle();
                         /* In many cases the interrupt that ended idle
@@ -256,9 +256,16 @@ void mwait_idle_with_hints(unsigned long eax, unsigned long ecx)
 /* Default MONITOR/MWAIT with no hints, used for default C1 state */
 static void mwait_idle(void)
 {
-        local_irq_enable();
-        while (!need_resched())
-                mwait_idle_with_hints(0,0);
+        if (!need_resched()) {
+                __monitor((void *)&current_thread_info()->flags, 0, 0);
+                smp_mb();
+                if (!need_resched())
+                        __sti_mwait(0, 0);
+                else
+                        local_irq_enable();
+        } else {
+                local_irq_enable();
+        }
 }
 
 void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c)
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index fc944b5e8f4a..af425a8049fb 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -471,8 +471,7 @@ void __init setup_arch(char **cmdline_p)
         if (LOADER_TYPE && INITRD_START) {
                 if (INITRD_START + INITRD_SIZE <= (end_pfn << PAGE_SHIFT)) {
                         reserve_bootmem_generic(INITRD_START, INITRD_SIZE);
-                        initrd_start =
-                                INITRD_START ? INITRD_START + PAGE_OFFSET : 0;
+                        initrd_start = INITRD_START + PAGE_OFFSET;
                         initrd_end = initrd_start+INITRD_SIZE;
                 }
                 else {
@@ -732,11 +731,8 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
         /* Fix cpuid4 emulation for more */
         num_cache_leaves = 3;
 
-        /* When there is only one core no need to synchronize RDTSC */
-        if (num_possible_cpus() == 1)
-                set_bit(X86_FEATURE_SYNC_RDTSC, &c->x86_capability);
-        else
-                clear_bit(X86_FEATURE_SYNC_RDTSC, &c->x86_capability);
+        /* RDTSC can be speculated around */
+        clear_bit(X86_FEATURE_SYNC_RDTSC, &c->x86_capability);
 }
 
 static void __cpuinit detect_ht(struct cpuinfo_x86 *c)
@@ -835,6 +831,15 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
                         set_bit(X86_FEATURE_ARCH_PERFMON, &c->x86_capability);
         }
 
+        if (cpu_has_ds) {
+                unsigned int l1, l2;
+                rdmsr(MSR_IA32_MISC_ENABLE, l1, l2);
+                if (!(l1 & (1<<11)))
+                        set_bit(X86_FEATURE_BTS, c->x86_capability);
+                if (!(l1 & (1<<12)))
+                        set_bit(X86_FEATURE_PEBS, c->x86_capability);
+        }
+
         n = c->extended_cpuid_level;
         if (n >= 0x80000008) {
                 unsigned eax = cpuid_eax(0x80000008);
@@ -854,7 +859,10 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
                 set_bit(X86_FEATURE_CONSTANT_TSC, &c->x86_capability);
         if (c->x86 == 6)
                 set_bit(X86_FEATURE_REP_GOOD, &c->x86_capability);
-        set_bit(X86_FEATURE_SYNC_RDTSC, &c->x86_capability);
+        if (c->x86 == 15)
+                set_bit(X86_FEATURE_SYNC_RDTSC, &c->x86_capability);
+        else
+                clear_bit(X86_FEATURE_SYNC_RDTSC, &c->x86_capability);
         c->x86_max_cores = intel_num_cpu_cores(c);
 
         srat_detect_node();
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c
index 9f74c883568c..af1ec4d23cf8 100644
--- a/arch/x86_64/kernel/smp.c
+++ b/arch/x86_64/kernel/smp.c
@@ -379,12 +379,17 @@ int smp_call_function_single (int cpu, void (*func) (void *info), void *info,
                 put_cpu();
                 return 0;
         }
+
+        /* Can deadlock when called with interrupts disabled */
+        WARN_ON(irqs_disabled());
+
         spin_lock_bh(&call_lock);
         __smp_call_function_single(cpu, func, info, nonatomic, wait);
         spin_unlock_bh(&call_lock);
         put_cpu();
         return 0;
 }
+EXPORT_SYMBOL(smp_call_function_single);
 
 /*
  * this function sends a 'generic call function' IPI to all other CPUs
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
index 62c2e747af58..daf19332f0dd 100644
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
@@ -60,6 +60,7 @@
 #include <asm/irq.h>
 #include <asm/hw_irq.h>
 #include <asm/numa.h>
+#include <asm/genapic.h>
 
 /* Number of siblings per CPU package */
 int smp_num_siblings = 1;
@@ -753,14 +754,16 @@ static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int sta
 }
 
 struct create_idle {
+        struct work_struct work;
         struct task_struct *idle;
         struct completion done;
         int cpu;
 };
 
-void do_fork_idle(void *_c_idle)
+void do_fork_idle(struct work_struct *work)
 {
-        struct create_idle *c_idle = _c_idle;
+        struct create_idle *c_idle =
+                container_of(work, struct create_idle, work);
 
         c_idle->idle = fork_idle(c_idle->cpu);
         complete(&c_idle->done);
@@ -775,10 +778,10 @@ static int __cpuinit do_boot_cpu(int cpu, int apicid)
         int timeout;
         unsigned long start_rip;
         struct create_idle c_idle = {
+                .work = __WORK_INITIALIZER(c_idle.work, do_fork_idle),
                 .cpu = cpu,
                 .done = COMPLETION_INITIALIZER_ONSTACK(c_idle.done),
         };
-        DECLARE_WORK(work, do_fork_idle, &c_idle);
 
         /* allocate memory for gdts of secondary cpus. Hotplug is considered */
         if (!cpu_gdt_descr[cpu].address &&
@@ -825,9 +828,9 @@ static int __cpuinit do_boot_cpu(int cpu, int apicid)
          * thread.
          */
         if (!keventd_up() || current_is_keventd())
-                work.func(work.data);
+                c_idle.work.func(&c_idle.work);
         else {
-                schedule_work(&work);
+                schedule_work(&c_idle.work);
                 wait_for_completion(&c_idle.done);
         }
 
@@ -1167,6 +1170,13 @@ int __cpuinit __cpu_up(unsigned int cpu)
 
         while (!cpu_isset(cpu, cpu_online_map))
                 cpu_relax();
+
+        if (num_online_cpus() > 8 && genapic == &apic_flat) {
+                printk(KERN_WARNING
+                       "flat APIC routing can't be used with > 8 cpus\n");
+                BUG();
+        }
+
         err = 0;
 
         return err;
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c
index e3ef544d2cfb..5cc76d0d331f 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -563,7 +563,7 @@ static unsigned int cpufreq_delayed_issched = 0;
 static unsigned int cpufreq_init = 0;
 static struct work_struct cpufreq_delayed_get_work;
 
-static void handle_cpufreq_delayed_get(void *v)
+static void handle_cpufreq_delayed_get(struct work_struct *v)
 {
         unsigned int cpu;
         for_each_online_cpu(cpu) {
@@ -639,7 +639,7 @@ static struct notifier_block time_cpufreq_notifier_block = {
 
 static int __init cpufreq_tsc(void)
 {
-        INIT_WORK(&cpufreq_delayed_get_work, handle_cpufreq_delayed_get, NULL);
+        INIT_WORK(&cpufreq_delayed_get_work, handle_cpufreq_delayed_get);
         if (!cpufreq_register_notifier(&time_cpufreq_notifier_block,
                                        CPUFREQ_TRANSITION_NOTIFIER))
                 cpufreq_init = 1;
@@ -656,6 +656,25 @@ core_initcall(cpufreq_tsc);
  */
 
 #define TICK_COUNT 100000000
+#define TICK_MIN   5000
+
+/*
+ * Some platforms take periodic SMI interrupts with 5ms duration. Make sure none
+ * occurs between the reads of the hpet & TSC.
+ */
+static void __init read_hpet_tsc(int *hpet, int *tsc)
+{
+        int tsc1, tsc2, hpet1;
+
+        do {
+                tsc1 = get_cycles_sync();
+                hpet1 = hpet_readl(HPET_COUNTER);
+                tsc2 = get_cycles_sync();
+        } while (tsc2 - tsc1 > TICK_MIN);
+        *hpet = hpet1;
+        *tsc = tsc2;
+}
+
 
 static unsigned int __init hpet_calibrate_tsc(void)
 {
@@ -666,13 +685,11 @@ static unsigned int __init hpet_calibrate_tsc(void)
         local_irq_save(flags);
         local_irq_disable();
 
-        hpet_start = hpet_readl(HPET_COUNTER);
-        rdtscl(tsc_start);
+        read_hpet_tsc(&hpet_start, &tsc_start);
 
         do {
                 local_irq_disable();
-                hpet_now = hpet_readl(HPET_COUNTER);
-                tsc_now = get_cycles_sync();
+                read_hpet_tsc(&hpet_now, &tsc_now);
                 local_irq_restore(flags);
         } while ((tsc_now - tsc_start) < TICK_COUNT &&
                  (hpet_now - hpet_start) < TICK_COUNT);
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index 0d65b22f229c..09d2e8a10a49 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -30,9 +30,10 @@
 #include <linux/kprobes.h>
 #include <linux/kexec.h>
 #include <linux/unwind.h>
+#include <linux/uaccess.h>
+#include <linux/bug.h>
 
 #include <asm/system.h>
-#include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/atomic.h>
 #include <asm/debugreg.h>
@@ -108,12 +109,7 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
         preempt_enable_no_resched();
 }
 
-static int kstack_depth_to_print = 12;
-#ifdef CONFIG_STACK_UNWIND
-static int call_trace = 1;
-#else
-#define call_trace (-1)
-#endif
+int kstack_depth_to_print = 12;
 
 #ifdef CONFIG_KALLSYMS
 void printk_address(unsigned long address)
@@ -216,24 +212,7 @@ static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,
         return NULL;
 }
 
-struct ops_and_data {
-        struct stacktrace_ops *ops;
-        void *data;
-};
-
-static int dump_trace_unwind(struct unwind_frame_info *info, void *context)
-{
-        struct ops_and_data *oad = (struct ops_and_data *)context;
-        int n = 0;
-
-        while (unwind(info) == 0 && UNW_PC(info)) {
-                n++;
-                oad->ops->address(oad->data, UNW_PC(info));
-                if (arch_unw_user_mode(info))
-                        break;
-        }
-        return n;
-}
+#define MSG(txt) ops->warning(data, txt)
 
 /*
  * x86-64 can have upto three kernel stacks: 
@@ -248,61 +227,24 @@ static inline int valid_stack_ptr(struct thread_info *tinfo, void *p)
         return p > t && p < t + THREAD_SIZE - 3;
 }
 
-void dump_trace(struct task_struct *tsk, struct pt_regs *regs, unsigned long * stack,
+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;
+        const unsigned cpu = get_cpu();
+        unsigned long *irqstack_end = (unsigned long*)cpu_pda(cpu)->irqstackptr;
         unsigned used = 0;
         struct thread_info *tinfo;
 
         if (!tsk)
                 tsk = current;
 
-        if (call_trace >= 0) {
-                int unw_ret = 0;
-                struct unwind_frame_info info;
-                struct ops_and_data oad = { .ops = ops, .data = data };
-
-                if (regs) {
-                        if (unwind_init_frame_info(&info, tsk, regs) == 0)
-                                unw_ret = dump_trace_unwind(&info, &oad);
-                } else if (tsk == current)
-                        unw_ret = unwind_init_running(&info, dump_trace_unwind, &oad);
-                else {
-                        if (unwind_init_blocked(&info, tsk) == 0)
-                                unw_ret = dump_trace_unwind(&info, &oad);
-                }
-                if (unw_ret > 0) {
-                        if (call_trace == 1 && !arch_unw_user_mode(&info)) {
-                                ops->warning_symbol(data, "DWARF2 unwinder stuck at %s\n",
-                                             UNW_PC(&info));
-                                if ((long)UNW_SP(&info) < 0) {
-                                        ops->warning(data, "Leftover inexact backtrace:\n");
-                                        stack = (unsigned long *)UNW_SP(&info);
-                                        if (!stack)
-                                                return;
-                                } else
-                                        ops->warning(data, "Full inexact backtrace again:\n");
-                        } else if (call_trace >= 1)
-                                return;
-                        else
-                                ops->warning(data, "Full inexact backtrace again:\n");
-                } else
-                        ops->warning(data, "Inexact backtrace:\n");
-        }
         if (!stack) {
                 unsigned long dummy;
                 stack = &dummy;
                 if (tsk && tsk != current)
                         stack = (unsigned long *)tsk->thread.rsp;
         }
-        /*
-         * Align the stack pointer on word boundary, later loops
-         * rely on that (and corruption / debug info bugs can cause
-         * unaligned values here):
-         */
-        stack = (unsigned long *)((unsigned long)stack & ~(sizeof(long)-1));
 
         /*
          * Print function call entries within a stack. 'cond' is the
@@ -312,9 +254,9 @@ void dump_trace(struct task_struct *tsk, struct pt_regs *regs, unsigned long * s
 #define HANDLE_STACK(cond) \
         do while (cond) { \
                 unsigned long addr = *stack++; \
-                if (oops_in_progress ?          \
-                        __kernel_text_address(addr) : \
-                        kernel_text_address(addr)) { \
+                /* Use unlocked access here because except for NMIs     \
+                   we should be already protected against module unloads */ \
+                if (__kernel_text_address(addr)) { \
                         /* \
                          * If the address is either in the text segment of the \
                          * kernel, or in the region which contains vmalloc'ed \
@@ -377,9 +319,10 @@ void dump_trace(struct task_struct *tsk, struct pt_regs *regs, unsigned long * s
         /*
          * This handles the process stack:
          */
-        tinfo = current_thread_info();
+        tinfo = task_thread_info(tsk);
         HANDLE_STACK (valid_stack_ptr(tinfo, stack));
 #undef HANDLE_STACK
+        put_cpu();
 }
 EXPORT_SYMBOL(dump_trace);
 
@@ -516,30 +459,15 @@ bad:
         printk("\n");
 }       
 
-void handle_BUG(struct pt_regs *regs)
-{ 
-        struct bug_frame f;
-        long len;
-        const char *prefix = "";
+int is_valid_bugaddr(unsigned long rip)
+{
+        unsigned short ud2;
 
-        if (user_mode(regs))
-                return; 
-        if (__copy_from_user(&f, (const void __user *) regs->rip,
-                             sizeof(struct bug_frame)))
-                return; 
-        if (f.filename >= 0 ||
-            f.ud2[0] != 0x0f || f.ud2[1] != 0x0b) 
-                return;
-        len = __strnlen_user((char *)(long)f.filename, PATH_MAX) - 1;
-        if (len < 0 || len >= PATH_MAX)
-                f.filename = (int)(long)"unmapped filename";
-        else if (len > 50) {
-                f.filename += len - 50;
-                prefix = "...";
-        }
-        printk("----------- [cut here ] --------- [please bite here ] ---------\n");
-        printk(KERN_ALERT "Kernel BUG at %s%.50s:%d\n", prefix, (char *)(long)f.filename, f.line);
-} 
+        if (__copy_from_user(&ud2, (const void __user *) rip, sizeof(ud2)))
+                return 0;
+
+        return ud2 == 0x0b0f;
+}
 
 #ifdef CONFIG_BUG
 void out_of_line_bug(void)
@@ -619,7 +547,9 @@ void die(const char * str, struct pt_regs * regs, long err)
 {
         unsigned long flags = oops_begin();
 
-        handle_BUG(regs);
+        if (!user_mode(regs))
+                report_bug(regs->rip);
+
         __die(str, regs, err);
         oops_end(flags);
         do_exit(SIGSEGV); 
@@ -786,8 +716,7 @@ mem_parity_error(unsigned char reason, struct pt_regs * regs)
 {
         printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x.\n",
                 reason);
-        printk(KERN_EMERG "You probably have a hardware problem with your "
-                "RAM chips\n");
+        printk(KERN_EMERG "You have some hardware problem, likely on the PCI bus.\n");
 
         if (panic_on_unrecovered_nmi)
                 panic("NMI: Not continuing");
@@ -1193,21 +1122,3 @@ static int __init kstack_setup(char *s)
         return 0;
 }
 early_param("kstack", kstack_setup);
-
-#ifdef CONFIG_STACK_UNWIND
-static int __init call_trace_setup(char *s)
-{
-        if (!s)
-                return -EINVAL;
-        if (strcmp(s, "old") == 0)
-                call_trace = -1;
-        else if (strcmp(s, "both") == 0)
-                call_trace = 0;
-        else if (strcmp(s, "newfallback") == 0)
-                call_trace = 1;
-        else if (strcmp(s, "new") == 0)
-                call_trace = 2;
-        return 0;
-}
-early_param("call_trace", call_trace_setup);
-#endif
diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S
index d9534e750d4f..1e54ddf2338d 100644
--- a/arch/x86_64/kernel/vmlinux.lds.S
+++ b/arch/x86_64/kernel/vmlinux.lds.S
@@ -13,6 +13,7 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
 OUTPUT_ARCH(i386:x86-64)
 ENTRY(phys_startup_64)
 jiffies_64 = jiffies;
+_proxy_pda = 0;
 PHDRS {
         text PT_LOAD FLAGS(5);  /* R_E */
         data PT_LOAD FLAGS(7);  /* RWE */
@@ -51,14 +52,7 @@ SECTIONS
 
   RODATA
 
-#ifdef CONFIG_STACK_UNWIND
-  . = ALIGN(8);
-  .eh_frame : AT(ADDR(.eh_frame) - LOAD_OFFSET) {
-        __start_unwind = .;
-        *(.eh_frame)
-        __end_unwind = .;
-  }
-#endif
+  BUG_TABLE
 
   . = ALIGN(PAGE_SIZE);        /* Align data segment to page size boundary */
                                 /* Data */
@@ -227,9 +221,7 @@ SECTIONS
   /* Sections to be discarded */
   /DISCARD/ : {
         *(.exitcall.exit)
-#ifndef CONFIG_UNWIND_INFO
         *(.eh_frame)
-#endif
         }
 
   STABS_DEBUG
diff --git a/arch/x86_64/kernel/vsyscall.c b/arch/x86_64/kernel/vsyscall.c
index 92546c1526f1..2433d6fc68b1 100644
--- a/arch/x86_64/kernel/vsyscall.c
+++ b/arch/x86_64/kernel/vsyscall.c
@@ -42,6 +42,7 @@
 #include <asm/topology.h>
 
 #define __vsyscall(nr) __attribute__ ((unused,__section__(".vsyscall_" #nr)))
+#define __syscall_clobber "r11","rcx","memory"
 
 int __sysctl_vsyscall __section_sysctl_vsyscall = 1;
 seqlock_t __xtime_lock __section_xtime_lock = SEQLOCK_UNLOCKED;
@@ -224,8 +225,7 @@ out:
 
 static int vsyscall_sysctl_nostrat(ctl_table *t, int __user *name, int nlen,
                                 void __user *oldval, size_t __user *oldlenp,
-                                void __user *newval, size_t newlen,
-                                void **context)
+                                void __user *newval, size_t newlen)
 {
         return -ENOSYS;
 }
@@ -274,7 +274,6 @@ static void __cpuinit cpu_vsyscall_init(void *arg)
         vsyscall_set_cpu(raw_smp_processor_id());
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
 static int __cpuinit
 cpu_vsyscall_notifier(struct notifier_block *n, unsigned long action, void *arg)
 {
@@ -283,13 +282,13 @@ cpu_vsyscall_notifier(struct notifier_block *n, unsigned long action, void *arg)
                 smp_call_function_single(cpu, cpu_vsyscall_init, NULL, 0, 1);
         return NOTIFY_DONE;
 }
-#endif
 
 static void __init map_vsyscall(void)
 {
         extern char __vsyscall_0;
         unsigned long physaddr_page0 = __pa_symbol(&__vsyscall_0);
 
+        /* Note that VSYSCALL_MAPPED_PAGES must agree with the code below. */
         __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_page0, PAGE_KERNEL_VSYSCALL);
 }
 
diff --git a/arch/x86_64/lib/csum-partial.c b/arch/x86_64/lib/csum-partial.c
index c493735218da..bc503f506903 100644
--- a/arch/x86_64/lib/csum-partial.c
+++ b/arch/x86_64/lib/csum-partial.c
@@ -9,8 +9,6 @@
 #include <linux/module.h>
 #include <asm/checksum.h>
 
-#define __force_inline inline __attribute__((always_inline))
-
 static inline unsigned short from32to16(unsigned a) 
 {
         unsigned short b = a >> 16; 
@@ -33,7 +31,7 @@ static inline unsigned short from32to16(unsigned a)
  * Unrolling to an 128 bytes inner loop.
  * Using interleaving with more registers to break the carry chains.
  */
-static __force_inline unsigned do_csum(const unsigned char *buff, unsigned len)
+static unsigned do_csum(const unsigned char *buff, unsigned len)
 {
         unsigned odd, count;
         unsigned long result = 0;
@@ -132,9 +130,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 +142,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);
diff --git a/arch/x86_64/lib/delay.c b/arch/x86_64/lib/delay.c
index 50be90975d04..2dbebd308347 100644
--- a/arch/x86_64/lib/delay.c
+++ b/arch/x86_64/lib/delay.c
@@ -40,13 +40,13 @@ EXPORT_SYMBOL(__delay);
 
 inline void __const_udelay(unsigned long xloops)
 {
-        __delay((xloops * HZ * cpu_data[raw_smp_processor_id()].loops_per_jiffy) >> 32);
+        __delay(((xloops * HZ * cpu_data[raw_smp_processor_id()].loops_per_jiffy) >> 32) + 1);
 }
 EXPORT_SYMBOL(__const_udelay);
 
 void __udelay(unsigned long usecs)
 {
-        __const_udelay(usecs * 0x000010c6);  /* 2**32 / 1000000 */
+        __const_udelay(usecs * 0x000010c7);  /* 2**32 / 1000000 (rounded up) */
 }
 EXPORT_SYMBOL(__udelay);
 
diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c
index 3751b4788e28..a65fc6f1dcaf 100644
--- a/arch/x86_64/mm/fault.c
+++ b/arch/x86_64/mm/fault.c
@@ -23,9 +23,9 @@
 #include <linux/compiler.h>
 #include <linux/module.h>
 #include <linux/kprobes.h>
+#include <linux/uaccess.h>
 
 #include <asm/system.h>
-#include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/smp.h>
 #include <asm/tlbflush.h>
@@ -96,7 +96,7 @@ void bust_spinlocks(int yes)
 static noinline int is_prefetch(struct pt_regs *regs, unsigned long addr,
                                 unsigned long error_code)
 { 
-        unsigned char __user *instr;
+        unsigned char *instr;
         int scan_more = 1;
         int prefetch = 0; 
         unsigned char *max_instr;
@@ -116,7 +116,7 @@ static noinline int is_prefetch(struct pt_regs *regs, unsigned long addr,
                 unsigned char instr_hi;
                 unsigned char instr_lo;
 
-                if (__get_user(opcode, (char __user *)instr))
+                if (probe_kernel_address(instr, opcode))
                         break; 
 
                 instr_hi = opcode & 0xf0; 
@@ -154,7 +154,7 @@ static noinline int is_prefetch(struct pt_regs *regs, unsigned long addr,
                 case 0x00:
                         /* Prefetch instruction is 0x0F0D or 0x0F18 */
                         scan_more = 0;
-                        if (__get_user(opcode, (char __user *)instr))
+                        if (probe_kernel_address(instr, opcode))
                                 break;
                         prefetch = (instr_lo == 0xF) &&
                                 (opcode == 0x0D || opcode == 0x18);
@@ -170,7 +170,7 @@ static noinline int is_prefetch(struct pt_regs *regs, unsigned long addr,
 static int bad_address(void *p) 
 { 
         unsigned long dummy;
-        return __get_user(dummy, (unsigned long __user *)p);
+        return probe_kernel_address((unsigned long *)p, dummy);
 } 
 
 void dump_pagetable(unsigned long address)
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index 4c0c00ef3ca7..2968b90ef8ad 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -730,14 +730,15 @@ static __init int x8664_sysctl_init(void)
 __initcall(x8664_sysctl_init);
 #endif
 
-/* A pseudo VMAs to allow ptrace access for the vsyscall page.   This only
+/* A pseudo VMA to allow ptrace access for the vsyscall page.  This only
    covers the 64bit vsyscall page now. 32bit has a real VMA now and does
    not need special handling anymore. */
 
 static struct vm_area_struct gate_vma = {
         .vm_start = VSYSCALL_START,
-        .vm_end = VSYSCALL_END,
-        .vm_page_prot = PAGE_READONLY
+        .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES << PAGE_SHIFT),
+        .vm_page_prot = PAGE_READONLY_EXEC,
+        .vm_flags = VM_READ | VM_EXEC
 };
 
 struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
diff --git a/arch/x86_64/mm/pageattr.c b/arch/x86_64/mm/pageattr.c
index 3e231d762aaa..ccb91dd996a9 100644
--- a/arch/x86_64/mm/pageattr.c
+++ b/arch/x86_64/mm/pageattr.c
@@ -61,34 +61,40 @@ static struct page *split_large_page(unsigned long address, pgprot_t prot,
         return base;
 } 
 
-
-static void flush_kernel_map(void *address) 
+static void cache_flush_page(void *adr)
 {
-        if (0 && address && cpu_has_clflush) {
-                /* is this worth it? */ 
-                int i;
-                for (i = 0; i < PAGE_SIZE; i += boot_cpu_data.x86_clflush_size) 
-                        asm volatile("clflush (%0)" :: "r" (address + i)); 
-        } else
-                asm volatile("wbinvd":::"memory"); 
-        if (address)
-                __flush_tlb_one(address);
-        else
-                __flush_tlb_all();
+        int i;
+        for (i = 0; i < PAGE_SIZE; i += boot_cpu_data.x86_clflush_size)
+                asm volatile("clflush (%0)" :: "r" (adr + i));
 }
 
+static void flush_kernel_map(void *arg)
+{
+        struct list_head *l = (struct list_head *)arg;
+        struct page *pg;
+
+        /* When clflush is available always use it because it is
+           much cheaper than WBINVD */
+        if (!cpu_has_clflush)
+                asm volatile("wbinvd" ::: "memory");
+        list_for_each_entry(pg, l, lru) {
+                void *adr = page_address(pg);
+                if (cpu_has_clflush)
+                        cache_flush_page(adr);
+                __flush_tlb_one(adr);
+        }
+}
 
-static inline void flush_map(unsigned long address)
+static inline void flush_map(struct list_head *l)
 {       
-        on_each_cpu(flush_kernel_map, (void *)address, 1, 1);
+        on_each_cpu(flush_kernel_map, l, 1, 1);
 }
 
-static struct page *deferred_pages; /* protected by init_mm.mmap_sem */
+static LIST_HEAD(deferred_pages); /* protected by init_mm.mmap_sem */
 
 static inline void save_page(struct page *fpage)
 {
-        fpage->lru.next = (struct list_head *)deferred_pages;
-        deferred_pages = fpage;
+        list_add(&fpage->lru, &deferred_pages);
 }
 
 /* 
@@ -207,18 +213,18 @@ int change_page_attr(struct page *page, int numpages, pgprot_t prot)
 
 void global_flush_tlb(void)
 { 
-        struct page *dpage;
+        struct page *pg, *next;
+        struct list_head l;
 
         down_read(&init_mm.mmap_sem);
-        dpage = xchg(&deferred_pages, NULL);
+        list_replace_init(&deferred_pages, &l);
         up_read(&init_mm.mmap_sem);
 
-        flush_map((dpage && !dpage->lru.next) ? (unsigned long)page_address(dpage) : 0);
-        while (dpage) {
-                struct page *tmp = dpage;
-                dpage = (struct page *)dpage->lru.next;
-                ClearPagePrivate(tmp);
-                __free_page(tmp);
+        flush_map(&l);
+
+        list_for_each_entry_safe(pg, next, &l, lru) {
+                ClearPagePrivate(pg);
+                __free_page(pg);
         } 
 } 
 
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index c1e69a1f92a4..2e74cb0b7807 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -34,31 +34,24 @@ config GENERIC_HARDIRQS
         bool
         default y
 
+config ARCH_HAS_ILOG2_U32
+        bool
+        default n
+
+config ARCH_HAS_ILOG2_U64
+        bool
+        default n
+
 source "init/Kconfig"
 
 menu "Processor type and features"
 
 choice
         prompt "Xtensa Processor Configuration"
-        default XTENSA_CPU_LINUX_BE
+        default XTENSA_VARIANT_FSF
 
-config XTENSA_CPU_LINUX_BE
-        bool "linux_be"
-        ---help---
-          The linux_be processor configuration is the baseline Xtensa
-          configurations included in this kernel and also used by
-          binutils, gcc, and gdb. It contains no TIE, no coprocessors,
-          and the following configuration options:
-
-          Code Density Option                2 Misc Special Registers
-          NSA/NSAU Instructions              128-bit Data Bus Width
-          Processor ID                       8K, 2-way I and D Caches
-          Zero-Overhead Loops                2 Inst Address Break Registers
-          Big Endian                         2 Data Address Break Registers
-          64 General-Purpose Registers       JTAG Interface and Trace Port
-          17 Interrupts                      MMU w/ TLBs and Autorefill
-          3 Interrupt Levels                 8 Autorefill Ways (I/D TLBs)
-          3 Timers                           Unaligned Exceptions
+config XTENSA_VARIANT_FSF
+        bool "fsf"
 endchoice
 
 config MMU
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 3a3a4c66ef87..95f836db38fa 100644
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -11,13 +11,13 @@
 # this architecture
 
 # Core configuration.
-# (Use CPU=<xtensa_config> to use another default compiler.)
+# (Use VAR=<xtensa_config> to use another default compiler.)
 
-cpu-$(CONFIG_XTENSA_CPU_LINUX_BE)       := linux_be
-cpu-$(CONFIG_XTENSA_CPU_LINUX_CUSTOM)   := linux_custom
+variant-$(CONFIG_XTENSA_VARIANT_FSF)            := fsf
+variant-$(CONFIG_XTENSA_VARIANT_LINUX_CUSTOM)   := custom
 
-CPU = $(cpu-y)
-export CPU
+VARIANT = $(variant-y)
+export VARIANT
 
 # Platform configuration
 
@@ -27,8 +27,6 @@ platform-$(CONFIG_XTENSA_PLATFORM_ISS)		:= iss
 PLATFORM = $(platform-y)
 export PLATFORM
 
-CPPFLAGS        += $(if $(KBUILD_SRC),-I$(srctree)/include/asm-xtensa/)
-CPPFLAGS        += -Iinclude/asm
 CFLAGS          += -pipe -mlongcalls
 
 KBUILD_DEFCONFIG := iss_defconfig
@@ -41,12 +39,12 @@ core-$(CONFIG_EMBEDDED_RAMDISK)	+= arch/xtensa/boot/ramdisk/
 
 # Test for cross compiling
 
-ifneq ($(CPU),)
+ifneq ($(VARIANT),)
   COMPILE_ARCH = $(shell uname -m)
 
   ifneq ($(COMPILE_ARCH), xtensa)
     ifndef CROSS_COMPILE
-      CROSS_COMPILE = xtensa_$(CPU)-
+      CROSS_COMPILE = xtensa_$(VARIANT)-
     endif
   endif
 endif
@@ -68,14 +66,13 @@ archinc		:= include/asm-xtensa
 
 archprepare: $(archinc)/.platform
 
-# Update machine cpu and platform symlinks if something which affects
+# Update processor variant and platform symlinks if something which affects
 # them changed.
 
 $(archinc)/.platform: $(wildcard include/config/arch/*.h) include/config/auto.conf
-        @echo '  SYMLINK $(archinc)/xtensa/config -> $(archinc)/xtensa/config-$(CPU)'
+        @echo '  SYMLINK $(archinc)/variant -> $(archinc)/variant-$(VARIANT)'
         $(Q)mkdir -p $(archinc)
-        $(Q)mkdir -p $(archinc)/xtensa
-        $(Q)ln -fsn $(srctree)/$(archinc)/xtensa/config-$(CPU) $(archinc)/xtensa/config
+        $(Q)ln -fsn $(srctree)/$(archinc)/variant-$(VARIANT) $(archinc)/variant
         @echo '  SYMLINK $(archinc)/platform -> $(archinc)/platform-$(PLATFORM)'
         $(Q)ln -fsn $(srctree)/$(archinc)/platform-$(PLATFORM) $(archinc)/platform
         @touch $@
@@ -89,7 +86,7 @@ zImage zImage.initrd: vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $@
 
 CLEAN_FILES     += arch/xtensa/vmlinux.lds                      \
-                   $(archinc)/platform $(archinc)/xtensa/config \
+                   $(archinc)/platform $(archinc)/variant       \
                    $(archinc)/.platform
 
 define archhelp
diff --git a/arch/xtensa/boot/boot-elf/bootstrap.S b/arch/xtensa/boot/boot-elf/bootstrap.S
index f857fc760aa8..464298bc348b 100644
--- a/arch/xtensa/boot/boot-elf/bootstrap.S
+++ b/arch/xtensa/boot/boot-elf/bootstrap.S
@@ -1,7 +1,4 @@
 
-#include <xtensa/config/specreg.h>
-#include <xtensa/config/core.h>
-
 #include <asm/bootparam.h>
 
 
diff --git a/arch/xtensa/boot/boot-redboot/bootstrap.S b/arch/xtensa/boot/boot-redboot/bootstrap.S
index ee636b0da81c..84848123e2a8 100644
--- a/arch/xtensa/boot/boot-redboot/bootstrap.S
+++ b/arch/xtensa/boot/boot-redboot/bootstrap.S
@@ -1,9 +1,7 @@
-
-#define _ASMLANGUAGE
-#include <xtensa/config/specreg.h>
-#include <xtensa/config/core.h>
-#include <xtensa/cacheasm.h>
-
+#include <asm/variant/core.h>
+#include <asm/regs.h>
+#include <asm/asmmacro.h>
+#include <asm/cacheasm.h>
         /*
          * RB-Data: RedBoot data/bss
          * P:       Boot-Parameters
@@ -77,8 +75,14 @@ _start:
         /* Note: The assembler cannot relax "addi a0, a0, ..." to an
            l32r, so we load to a4 first. */
 
-        addi    a4, a0, __start - __start_a0
-        mov     a0, a4
+        # addi  a4, a0, __start - __start_a0
+        # mov   a0, a4
+
+        movi    a4, __start
+        movi    a5, __start_a0
+        add     a4, a0, a4
+        sub     a0, a4, a5
+
         movi    a4, __start
         movi    a5, __reloc_end
 
@@ -106,9 +110,13 @@ _start:
         /* We have to flush and invalidate the caches here before we jump. */
 
 #if XCHAL_DCACHE_IS_WRITEBACK
-        dcache_writeback_all  a5, a6
+
+        ___flush_dcache_all a5 a6
+
 #endif
-        icache_invalidate_all a5, a6
+
+        ___invalidate_icache_all a5 a6
+        isync
 
         movi    a11, _reloc
         jx      a11
@@ -209,9 +217,14 @@ _reloc:
         /* jump to the kernel */
 2:
 #if XCHAL_DCACHE_IS_WRITEBACK
-        dcache_writeback_all a5, a6
+
+        ___flush_dcache_all a5 a6
+
 #endif
-        icache_invalidate_all a5, a6
+
+        ___invalidate_icache_all a5 a6
+
+        isync
 
         movi    a5, __start
         movi    a3, boot_initrd_start
diff --git a/arch/xtensa/configs/iss_defconfig b/arch/xtensa/configs/iss_defconfig
index 802621dd4867..f19854035e61 100644
--- a/arch/xtensa/configs/iss_defconfig
+++ b/arch/xtensa/configs/iss_defconfig
@@ -53,11 +53,7 @@ CONFIG_CC_ALIGN_JUMPS=0
 #
 # Processor type and features
 #
-CONFIG_XTENSA_ARCH_LINUX_BE=y
-# CONFIG_XTENSA_ARCH_LINUX_LE is not set
-# CONFIG_XTENSA_ARCH_LINUX_TEST is not set
-# CONFIG_XTENSA_ARCH_S5 is not set
-# CONFIG_XTENSA_CUSTOM is not set
+CONFIG_XTENSA_VARIANT_FSF=y
 CONFIG_MMU=y
 # CONFIG_XTENSA_UNALIGNED_USER is not set
 # CONFIG_PREEMPT is not set
diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile
index d573017a5dde..71f733c4f66d 100644
--- a/arch/xtensa/kernel/Makefile
+++ b/arch/xtensa/kernel/Makefile
@@ -6,7 +6,7 @@ extra-y := head.o vmlinux.lds
 
 
 obj-y := align.o entry.o irq.o coprocessor.o process.o ptrace.o semaphore.o  \
-         setup.o signal.o syscalls.o time.o traps.o vectors.o platform.o  \
+         setup.o signal.o syscall.o time.o traps.o vectors.o platform.o  \
          pci-dma.o
 
 ## windowspill.o
diff --git a/arch/xtensa/kernel/align.S b/arch/xtensa/kernel/align.S
index a4956578a24d..33d6e9d2e83c 100644
--- a/arch/xtensa/kernel/align.S
+++ b/arch/xtensa/kernel/align.S
@@ -16,14 +16,9 @@
  */
 
 #include <linux/linkage.h>
-#include <asm/ptrace.h>
-#include <asm/ptrace.h>
 #include <asm/current.h>
 #include <asm/asm-offsets.h>
-#include <asm/pgtable.h>
 #include <asm/processor.h>
-#include <asm/page.h>
-#include <asm/thread_info.h>
 
 #if XCHAL_UNALIGNED_LOAD_EXCEPTION || XCHAL_UNALIGNED_STORE_EXCEPTION
 
@@ -216,7 +211,7 @@ ENTRY(fast_unaligned)
 
         extui   a5, a4, INSN_OP0, 4     # get insn.op0 nibble
 
-#if XCHAL_HAVE_NARROW
+#if XCHAL_HAVE_DENSITY
         _beqi   a5, OP0_L32I_N, .Lload  # L32I.N, jump
         addi    a6, a5, -OP0_S32I_N
         _beqz   a6, .Lstore             # S32I.N, do a store
@@ -251,7 +246,7 @@ ENTRY(fast_unaligned)
 #endif
         __src_b a3, a5, a6              # a3 has the data word
 
-#if XCHAL_HAVE_NARROW
+#if XCHAL_HAVE_DENSITY
         addi    a7, a7, 2               # increment PC (assume 16-bit insn)
 
         extui   a5, a4, INSN_OP0, 4
@@ -279,14 +274,14 @@ ENTRY(fast_unaligned)
 
 1:
 
-#if XCHAL_HAVE_LOOP
-        rsr     a3, LEND                # check if we reached LEND
-        bne     a7, a3, 1f
-        rsr     a3, LCOUNT              # and LCOUNT != 0
-        beqz    a3, 1f
-        addi    a3, a3, -1              # decrement LCOUNT and set
+#if XCHAL_HAVE_LOOPS
+        rsr     a5, LEND                # check if we reached LEND
+        bne     a7, a5, 1f
+        rsr     a5, LCOUNT              # and LCOUNT != 0
+        beqz    a5, 1f
+        addi    a5, a5, -1              # decrement LCOUNT and set
         rsr     a7, LBEG                # set PC to LBEGIN
-        wsr     a3, LCOUNT
+        wsr     a5, LCOUNT
 #endif
 
 1:      wsr     a7, EPC_1               # skip load instruction
@@ -336,7 +331,7 @@ ENTRY(fast_unaligned)
 
         movi    a6, 0                   # mask: ffffffff:00000000
 
-#if XCHAL_HAVE_NARROW
+#if XCHAL_HAVE_DENSITY
         addi    a7, a7, 2               # incr. PC,assume 16-bit instruction
 
         extui   a5, a4, INSN_OP0, 4     # extract OP0
@@ -359,14 +354,14 @@ ENTRY(fast_unaligned)
         /* Get memory address */
 
 1:
-#if XCHAL_HAVE_LOOP
-        rsr     a3, LEND                # check if we reached LEND
-        bne     a7, a3, 1f
-        rsr     a3, LCOUNT              # and LCOUNT != 0
-        beqz    a3, 1f
-        addi    a3, a3, -1              # decrement LCOUNT and set
+#if XCHAL_HAVE_LOOPS
+        rsr     a4, LEND                # check if we reached LEND
+        bne     a7, a4, 1f
+        rsr     a4, LCOUNT              # and LCOUNT != 0
+        beqz    a4, 1f
+        addi    a4, a4, -1              # decrement LCOUNT and set
         rsr     a7, LBEG                # set PC to LBEGIN
-        wsr     a3, LCOUNT
+        wsr     a4, LCOUNT
 #endif
 
 1:      wsr     a7, EPC_1               # skip store instruction
@@ -416,6 +411,7 @@ ENTRY(fast_unaligned)
 
         /* Restore working register */
 
+        l32i    a8, a2, PT_AREG8
         l32i    a7, a2, PT_AREG7
         l32i    a6, a2, PT_AREG6
         l32i    a5, a2, PT_AREG5
@@ -446,7 +442,7 @@ ENTRY(fast_unaligned)
         mov     a1, a2
 
         rsr     a0, PS
-        bbsi.l  a2, PS_UM_SHIFT, 1f     # jump if user mode
+        bbsi.l  a2, PS_UM_BIT, 1f     # jump if user mode
 
         movi    a0, _kernel_exception
         jx      a0
diff --git a/arch/xtensa/kernel/asm-offsets.c b/arch/xtensa/kernel/asm-offsets.c
index 7cd1d7f8f608..b256cfbef344 100644
--- a/arch/xtensa/kernel/asm-offsets.c
+++ b/arch/xtensa/kernel/asm-offsets.c
@@ -87,6 +87,11 @@ int main(void)
         DEFINE(MM_CONTEXT, offsetof (struct mm_struct, context));
         BLANK();
         DEFINE(PT_SINGLESTEP_BIT, PT_SINGLESTEP_BIT);
+
+        /* constants */
+        DEFINE(_CLONE_VM, CLONE_VM);
+        DEFINE(_CLONE_UNTRACED, CLONE_UNTRACED);
+
         return 0;
 }
 
diff --git a/arch/xtensa/kernel/coprocessor.S b/arch/xtensa/kernel/coprocessor.S
index cf5a93fb6a2e..01bcb9fcfcbd 100644
--- a/arch/xtensa/kernel/coprocessor.S
+++ b/arch/xtensa/kernel/coprocessor.S
@@ -90,7 +90,6 @@ ENTRY(enable_coprocessor)
         rsync
         retw
 
-#endif
 
 ENTRY(save_coprocessor_extra)
         entry   sp, 16
@@ -197,4 +196,5 @@ _xtensa_reginfo_tables:
         XCHAL_CP7_SA_CONTENTS_LIBDB
         .word   0xFC000000      /* invalid register number,marks end of table*/
 _xtensa_reginfo_table_end:
+#endif
 
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index 89e409e9e0de..9e271ba009bf 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -24,7 +24,7 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/signal.h>
-#include <xtensa/coreasm.h>
+#include <asm/tlbflush.h>
 
 /* Unimplemented features. */
 
@@ -364,7 +364,7 @@ common_exception:
         movi    a2, 1
         extui   a3, a3, 0, 1            # a3 = PS.INTLEVEL[0]
         moveqz  a3, a2, a0              # a3 = 1 iff interrupt exception
-        movi    a2, PS_WOE_MASK
+        movi    a2, 1 << PS_WOE_BIT
         or      a3, a3, a2
         rsr     a0, EXCCAUSE
         xsr     a3, PS
@@ -399,7 +399,7 @@ common_exception_return:
         /* Jump if we are returning from kernel exceptions. */
 
 1:      l32i    a3, a1, PT_PS
-        _bbsi.l a3, PS_UM_SHIFT, 2f
+        _bbsi.l a3, PS_UM_BIT, 2f
         j       kernel_exception_exit
 
         /* Specific to a user exception exit:
@@ -422,7 +422,7 @@ common_exception_return:
          *       (Hint: There is only one user exception frame on stack)
          */
 
-        movi    a3, PS_WOE_MASK
+        movi    a3, 1 << PS_WOE_BIT
 
         _bbsi.l a4, TIF_NEED_RESCHED, 3f
         _bbci.l a4, TIF_SIGPENDING, 4f
@@ -694,7 +694,7 @@ common_exception_exit:
 ENTRY(debug_exception)
 
         rsr     a0, EPS + XCHAL_DEBUGLEVEL
-        bbsi.l  a0, PS_EXCM_SHIFT, 1f   # exception mode
+        bbsi.l  a0, PS_EXCM_BIT, 1f     # exception mode
 
         /* Set EPC_1 and EXCCAUSE */
 
@@ -707,7 +707,7 @@ ENTRY(debug_exception)
 
         /* Restore PS to the value before the debug exc but with PS.EXCM set.*/
 
-        movi    a2, 1 << PS_EXCM_SHIFT
+        movi    a2, 1 << PS_EXCM_BIT
         or      a2, a0, a2
         movi    a0, debug_exception     # restore a3, debug jump vector
         wsr     a2, PS
@@ -715,7 +715,7 @@ ENTRY(debug_exception)
 
         /* Switch to kernel/user stack, restore jump vector, and save a0 */
 
-        bbsi.l  a2, PS_UM_SHIFT, 2f     # jump if user mode
+        bbsi.l  a2, PS_UM_BIT, 2f       # jump if user mode
 
         addi    a2, a1, -16-PT_SIZE     # assume kernel stack
         s32i    a0, a2, PT_AREG0
@@ -778,7 +778,7 @@ ENTRY(unrecoverable_exception)
         wsr     a1, WINDOWBASE
         rsync
 
-        movi    a1, PS_WOE_MASK | 1
+        movi    a1, (1 << PS_WOE_BIT) | 1
         wsr     a1, PS
         rsync
 
@@ -1004,13 +1004,10 @@ ENTRY(fast_syscall_kernel)
 
         rsr     a0, DEPC                        # get syscall-nr
         _beqz   a0, fast_syscall_spill_registers
-
-        addi    a0, a0, -__NR_sysxtensa
-        _beqz   a0, fast_syscall_sysxtensa
+        _beqi   a0, __NR_xtensa, fast_syscall_xtensa
 
         j       kernel_exception
 
-
 ENTRY(fast_syscall_user)
 
         /* Skip syscall. */
@@ -1024,9 +1021,7 @@ ENTRY(fast_syscall_user)
 
         rsr     a0, DEPC                        # get syscall-nr
         _beqz   a0, fast_syscall_spill_registers
-
-        addi    a0, a0, -__NR_sysxtensa
-        _beqz   a0, fast_syscall_sysxtensa
+        _beqi   a0, __NR_xtensa, fast_syscall_xtensa
 
         j       user_exception
 
@@ -1047,18 +1042,19 @@ ENTRY(fast_syscall_unrecoverable)
 /*
  * sysxtensa syscall handler
  *
- * int sysxtensa (XTENSA_ATOMIC_SET, ptr, val, unused);
- * int sysxtensa (XTENSA_ATOMIC_ADD, ptr, val, unused);
- * int sysxtensa (XTENSA_ATOMIC_EXG_ADD, ptr, val, unused);
- * int sysxtensa (XTENSA_ATOMIC_CMP_SWP, ptr, oldval, newval);
- * a2                    a6              a3    a4      a5
+ * int sysxtensa (SYS_XTENSA_ATOMIC_SET,     ptr, val,    unused);
+ * int sysxtensa (SYS_XTENSA_ATOMIC_ADD,     ptr, val,    unused);
+ * int sysxtensa (SYS_XTENSA_ATOMIC_EXG_ADD, ptr, val,    unused);
+ * int sysxtensa (SYS_XTENSA_ATOMIC_CMP_SWP, ptr, oldval, newval);
+ *        a2            a6                   a3    a4      a5
  *
  * Entry condition:
  *
- *   a0:        trashed, original value saved on stack (PT_AREG0)
+ *   a0:        a2 (syscall-nr), original value saved on stack (PT_AREG0)
  *   a1:        a1
- *   a2:        new stack pointer, original in DEPC
- *   a3:        dispatch table
+ *   a2:        new stack pointer, original in a0 and DEPC
+ *   a3:        dispatch table, original in excsave_1
+ *   a4..a15:   unchanged
  *   depc:      a2, original value saved on stack (PT_DEPC)
  *   excsave_1: a3
  *
@@ -1091,59 +1087,62 @@ ENTRY(fast_syscall_unrecoverable)
 #define CATCH                                                           \
 67:
 
-ENTRY(fast_syscall_sysxtensa)
-
-        _beqz   a6, 1f
-        _blti   a6, SYSXTENSA_COUNT, 2f
+ENTRY(fast_syscall_xtensa)
 
-1:      j       user_exception
-
-2:      xsr     a3, EXCSAVE_1           # restore a3, excsave1
-        s32i    a7, a2, PT_AREG7
+        xsr     a3, EXCSAVE_1           # restore a3, excsave1
 
+        s32i    a7, a2, PT_AREG7        # we need an additional register
         movi    a7, 4                   # sizeof(unsigned int)
-        access_ok a0, a3, a7, a2, .Leac
+        access_ok a3, a7, a0, a2, .Leac # a0: scratch reg, a2: sp
 
-        _beqi   a6, SYSXTENSA_ATOMIC_SET, .Lset
-        _beqi   a6, SYSXTENSA_ATOMIC_EXG_ADD, .Lexg
-        _beqi   a6, SYSXTENSA_ATOMIC_ADD, .Ladd
+        addi    a6, a6, -1              # assuming SYS_XTENSA_ATOMIC_SET = 1
+        _bgeui  a6, SYS_XTENSA_COUNT - 1, .Lill
+        _bnei   a6, SYS_XTENSA_ATOMIC_CMP_SWP - 1, .Lnswp
 
-        /* Fall through for SYSXTENSA_ATOMIC_CMP_SWP */
+        /* Fall through for ATOMIC_CMP_SWP. */
 
 .Lswp:  /* Atomic compare and swap */
 
-TRY     l32i    a7, a3, 0               # read old value
-        bne     a7, a4, 1f              # same as old value? jump
-        s32i    a5, a3, 0               # different, modify value
-        movi    a7, 1                   # and return 1
-        j       .Lret
-
-1:      movi    a7, 0                   # same values: return 0
-        j       .Lret
-
-.Ladd:  /* Atomic add */
-.Lexg:  /* Atomic (exchange) add */
+TRY     l32i    a0, a3, 0               # read old value
+        bne     a0, a4, 1f              # same as old value? jump
+TRY     s32i    a5, a3, 0               # different, modify value
+        l32i    a7, a2, PT_AREG7        # restore a7
+        l32i    a0, a2, PT_AREG0        # restore a0
+        movi    a2, 1                   # and return 1
+        addi    a6, a6, 1               # restore a6 (really necessary?)
+        rfe
 
-TRY     l32i    a7, a3, 0
-        add     a4, a4, a7
-        s32i    a4, a3, 0
-        j       .Lret
+1:      l32i    a7, a2, PT_AREG7        # restore a7
+        l32i    a0, a2, PT_AREG0        # restore a0
+        movi    a2, 0                   # return 0 (note that we cannot set
+        addi    a6, a6, 1               # restore a6 (really necessary?)
+        rfe
 
-.Lset:  /* Atomic set */
+.Lnswp: /* Atomic set, add, and exg_add. */
 
-TRY     l32i    a7, a3, 0               # read old value as return value
-        s32i    a4, a3, 0               # write new value
+TRY     l32i    a7, a3, 0               # orig
+        add     a0, a4, a7              # + arg
+        moveqz  a0, a4, a6              # set
+TRY     s32i    a0, a3, 0               # write new value
 
-.Lret:  mov     a0, a2
+        mov     a0, a2
         mov     a2, a7
-        l32i    a7, a0, PT_AREG7
-        l32i    a3, a0, PT_AREG3
-        l32i    a0, a0, PT_AREG0
+        l32i    a7, a0, PT_AREG7        # restore a7
+        l32i    a0, a0, PT_AREG0        # restore a0
+        addi    a6, a6, 1               # restore a6 (really necessary?)
         rfe
 
 CATCH
-.Leac:  movi    a7, -EFAULT
-        j       .Lret
+.Leac:  l32i    a7, a2, PT_AREG7        # restore a7
+        l32i    a0, a2, PT_AREG0        # restore a0
+        movi    a2, -EFAULT
+        rfe
+
+.Lill:  l32i    a7, a2, PT_AREG0        # restore a7
+        l32i    a0, a2, PT_AREG0        # restore a0
+        movi    a2, -EINVAL
+        rfe
+
 
 
 
@@ -1491,7 +1490,7 @@ ENTRY(_spill_registers)
          */
 
         rsr     a0, PS
-        _bbci.l a0, PS_UM_SHIFT, 1f
+        _bbci.l a0, PS_UM_BIT, 1f
 
         /* User space: Setup a dummy frame and kill application.
          * Note: We assume EXC_TABLE_KSTK contains a valid stack pointer.
@@ -1510,7 +1509,7 @@ ENTRY(_spill_registers)
         l32i    a1, a3, EXC_TABLE_KSTK
         wsr     a3, EXCSAVE_1
 
-        movi    a4, PS_WOE_MASK | 1
+        movi    a4, (1 << PS_WOE_BIT) | 1
         wsr     a4, PS
         rsync
 
@@ -1612,7 +1611,7 @@ ENTRY(fast_second_level_miss)
         rsr     a1, PTEVADDR
         srli    a1, a1, PAGE_SHIFT
         slli    a1, a1, PAGE_SHIFT      # ptevaddr & PAGE_MASK
-        addi    a1, a1, DTLB_WAY_PGTABLE        # ... + way_number
+        addi    a1, a1, DTLB_WAY_PGD    # ... + way_number
 
         wdtlb   a0, a1
         dsync
@@ -1654,7 +1653,7 @@ ENTRY(fast_second_level_miss)
         mov     a1, a2
 
         rsr     a2, PS
-        bbsi.l  a2, PS_UM_SHIFT, 1f
+        bbsi.l  a2, PS_UM_BIT, 1f
         j       _kernel_exception
 1:      j       _user_exception
 
@@ -1753,7 +1752,7 @@ ENTRY(fast_store_prohibited)
         mov     a1, a2
 
         rsr     a2, PS
-        bbsi.l  a2, PS_UM_SHIFT, 1f
+        bbsi.l  a2, PS_UM_BIT, 1f
         j       _kernel_exception
 1:      j       _user_exception
 
@@ -1907,6 +1906,103 @@ ENTRY(fast_coprocessor)
 #endif /* XCHAL_EXTRA_SA_SIZE */
 
 /*
+ * System Calls.
+ *
+ * void system_call (struct pt_regs* regs, int exccause)
+ *                            a2                 a3
+ */
+
+ENTRY(system_call)
+        entry   a1, 32
+
+        /* regs->syscall = regs->areg[2] */
+
+        l32i    a3, a2, PT_AREG2
+        mov     a6, a2
+        movi    a4, do_syscall_trace_enter
+        s32i    a3, a2, PT_SYSCALL
+        callx4  a4
+
+        /* syscall = sys_call_table[syscall_nr] */
+
+        movi    a4, sys_call_table;
+        movi    a5, __NR_syscall_count
+        movi    a6, -ENOSYS
+        bgeu    a3, a5, 1f
+
+        addx4   a4, a3, a4
+        l32i    a4, a4, 0
+        movi    a5, sys_ni_syscall;
+        beq     a4, a5, 1f
+
+        /* Load args: arg0 - arg5 are passed via regs. */
+
+        l32i    a6, a2, PT_AREG6
+        l32i    a7, a2, PT_AREG3
+        l32i    a8, a2, PT_AREG4
+        l32i    a9, a2, PT_AREG5
+        l32i    a10, a2, PT_AREG8
+        l32i    a11, a2, PT_AREG9
+
+        /* Pass one additional argument to the syscall: pt_regs (on stack) */
+        s32i    a2, a1, 0
+
+        callx4  a4
+
+1:      /* regs->areg[2] = return_value */
+
+        s32i    a6, a2, PT_AREG2
+        movi    a4, do_syscall_trace_leave
+        mov     a6, a2
+        callx4  a4
+        retw
+
+
+/*
+ * Create a kernel thread
+ *
+ * int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
+ * a2                    a2                 a3             a4
+ */
+
+ENTRY(kernel_thread)
+        entry   a1, 16
+
+        mov     a5, a2                  # preserve fn over syscall
+        mov     a7, a3                  # preserve args over syscall
+
+        movi    a3, _CLONE_VM | _CLONE_UNTRACED
+        movi    a2, __NR_clone
+        or      a6, a4, a3              # arg0: flags
+        mov     a3, a1                  # arg1: sp
+        syscall
+
+        beq     a3, a1, 1f              # branch if parent
+        mov     a6, a7                  # args
+        callx4  a5                      # fn(args)
+
+        movi    a2, __NR_exit
+        syscall                         # return value of fn(args) still in a6
+
+1:      retw
+
+/*
+ * Do a system call from kernel instead of calling sys_execve, so we end up
+ * with proper pt_regs.
+ *
+ * int kernel_execve(const char *fname, char *const argv[], charg *const envp[])
+ * a2                        a2               a3                  a4
+ */
+
+ENTRY(kernel_execve)
+        entry   a1, 16
+        mov     a6, a2                  # arg0 is in a6
+        movi    a2, __NR_execve
+        syscall
+
+        retw
+
+/*
  * Task switch.
  *
  * struct task*  _switch_to (struct task* prev, struct task* next)
@@ -1924,7 +2020,7 @@ ENTRY(_switch_to)
 
         /* Disable ints while we manipulate the stack pointer; spill regs. */
 
-        movi    a5, PS_EXCM_MASK | LOCKLEVEL
+        movi    a5, (1 << PS_EXCM_BIT) | LOCKLEVEL
         xsr     a5, PS
         rsr     a3, EXCSAVE_1
         rsync
@@ -1964,33 +2060,9 @@ ENTRY(ret_from_fork)
         movi    a4, schedule_tail
         callx4  a4
 
-        movi    a4, do_syscall_trace
+        movi    a4, do_syscall_trace_leave
+        mov     a6, a1
         callx4  a4
 
         j       common_exception_return
 
-
-
-/*
- * Table of syscalls
- */
-
-.data
-.align  4
-.global sys_call_table
-sys_call_table:
-
-#define SYSCALL(call, narg) .word call
-#include "syscalls.h"
-
-/*
- * Number of arguments of each syscall
- */
-
-.global sys_narg_table
-sys_narg_table:
-
-#undef SYSCALL
-#define SYSCALL(call, narg) .byte narg
-#include "syscalls.h"
-
diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S
index c07cb2522993..ea89910efa44 100644
--- a/arch/xtensa/kernel/head.S
+++ b/arch/xtensa/kernel/head.S
@@ -15,9 +15,9 @@
  * Kevin Chea
  */
 
-#include <xtensa/cacheasm.h>
 #include <asm/processor.h>
 #include <asm/page.h>
+#include <asm/cacheasm.h>
 
 /*
  * This module contains the entry code for kernel images. It performs the
@@ -32,13 +32,6 @@
  *
  */
 
-        .macro  iterate from, to , cmd
-                .ifeq   ((\to - \from) & ~0xfff)
-                        \cmd    \from
-                        iterate "(\from+1)", \to, \cmd
-                .endif
-        .endm
-
 /*
  *  _start
  *
@@ -64,7 +57,7 @@ _startup:
 
         /* Disable interrupts and exceptions. */
 
-        movi    a0, XCHAL_PS_EXCM_MASK
+        movi    a0, LOCKLEVEL
         wsr     a0, PS
 
         /* Preserve the pointer to the boot parameter list in EXCSAVE_1 */
@@ -91,11 +84,11 @@ _startup:
         movi    a1, 15
         wsr     a0, ICOUNTLEVEL
 
-        .macro reset_dbreak num
-        wsr     a0, DBREAKC + \num
-        .endm
-
-        iterate 0, XCHAL_NUM_IBREAK-1, reset_dbreak
+        .set    _index, 0
+        .rept   XCHAL_NUM_DBREAK - 1
+        wsr     a0, DBREAKC + _index
+        .set    _index, _index + 1
+        .endr
 #endif
 
         /* Clear CCOUNT (not really necessary, but nice) */
@@ -110,10 +103,11 @@ _startup:
 
         /* Disable all timers. */
 
-        .macro  reset_timer     num
-        wsr     a0, CCOMPARE_0 + \num
-        .endm
-        iterate 0, XCHAL_NUM_TIMERS-1, reset_timer
+        .set    _index, 0
+        .rept   XCHAL_NUM_TIMERS - 1
+        wsr     a0, CCOMPARE + _index
+        .set    _index, _index + 1
+        .endr
 
         /* Interrupt initialization. */
 
@@ -139,12 +133,21 @@ _startup:
         rsync
 
         /*  Initialize the caches.
-         *  Does not include flushing writeback d-cache.
-         *  a6, a7 are just working registers (clobbered).
+         *  a2, a3 are just working registers (clobbered).
          */
 
-        icache_reset  a2, a3
-        dcache_reset  a2, a3
+#if XCHAL_DCACHE_LINE_LOCKABLE
+        ___unlock_dcache_all a2 a3
+#endif
+
+#if XCHAL_ICACHE_LINE_LOCKABLE
+        ___unlock_icache_all a2 a3
+#endif
+
+        ___invalidate_dcache_all a2 a3
+        ___invalidate_icache_all a2 a3
+
+        isync
 
         /* Unpack data sections
          *
@@ -181,9 +184,9 @@ _startup:
         movi    a2, _bss_start  # start of BSS
         movi    a3, _bss_end    # end of BSS
 
-1:      addi    a2, a2, 4
+        __loopt a2, a3, a4, 2
         s32i    a0, a2, 0
-        blt     a2, a3, 1b
+        __endla a2, a4, 4
 
 #if XCHAL_DCACHE_IS_WRITEBACK
 
@@ -191,7 +194,7 @@ _startup:
          * instructions/data are available.
          */
 
-        dcache_writeback_all    a2, a3
+        ___flush_dcache_all a2 a3
 #endif
 
         /* Setup stack and enable window exceptions (keep irqs disabled) */
diff --git a/arch/xtensa/kernel/irq.c b/arch/xtensa/kernel/irq.c
index 1cf744ee0959..c9ea73b7031b 100644
--- a/arch/xtensa/kernel/irq.c
+++ b/arch/xtensa/kernel/irq.c
@@ -4,7 +4,7 @@
  * Xtensa built-in interrupt controller and some generic functions copied
  * from i386.
  *
- * Copyright (C) 2002 - 2005 Tensilica, Inc.
+ * Copyright (C) 2002 - 2006 Tensilica, Inc.
  * Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar
  *
  *
@@ -22,11 +22,6 @@
 #include <asm/uaccess.h>
 #include <asm/platform.h>
 
-static void enable_xtensa_irq(unsigned int irq);
-static void disable_xtensa_irq(unsigned int irq);
-static void mask_and_ack_xtensa(unsigned int irq);
-static void end_xtensa_irq(unsigned int irq);
-
 static unsigned int cached_irq_mask;
 
 atomic_t irq_err_count;
@@ -46,8 +41,16 @@ void ack_bad_irq(unsigned int irq)
  * handlers).
  */
 
-unsigned int  do_IRQ(int irq, struct pt_regs *regs)
+asmlinkage void do_IRQ(int irq, struct pt_regs *regs)
 {
+        struct pt_regs *old_regs = set_irq_regs(regs);
+        struct irq_desc *desc = irq_desc + irq;
+
+        if (irq >= NR_IRQS) {
+                printk(KERN_EMERG "%s: cannot handle IRQ %d\n",
+                                __FUNCTION__, irq);
+        }
+
         irq_enter();
 
 #ifdef CONFIG_DEBUG_STACKOVERFLOW
@@ -63,12 +66,10 @@ unsigned int  do_IRQ(int irq, struct pt_regs *regs)
                                sp - sizeof(struct thread_info));
         }
 #endif
-
-        __do_IRQ(irq, regs);
+        desc->handle_irq(irq, desc);
 
         irq_exit();
-
-        return 1;
+        set_irq_regs(old_regs);
 }
 
 /*
@@ -118,72 +119,68 @@ skip:
         }
         return 0;
 }
-/* shutdown is same as "disable" */
-#define shutdown_xtensa_irq disable_xtensa_irq
 
-static unsigned int startup_xtensa_irq(unsigned int irq)
-{
-        enable_xtensa_irq(irq);
-        return 0;               /* never anything pending */
-}
-
-static struct hw_interrupt_type xtensa_irq_type = {
-        "Xtensa-IRQ",
-        startup_xtensa_irq,
-        shutdown_xtensa_irq,
-        enable_xtensa_irq,
-        disable_xtensa_irq,
-        mask_and_ack_xtensa,
-        end_xtensa_irq
-};
-
-static inline void mask_irq(unsigned int irq)
+static void xtensa_irq_mask(unsigned int irq)
 {
         cached_irq_mask &= ~(1 << irq);
         set_sr (cached_irq_mask, INTENABLE);
 }
 
-static inline void unmask_irq(unsigned int irq)
+static void xtensa_irq_unmask(unsigned int irq)
 {
         cached_irq_mask |= 1 << irq;
         set_sr (cached_irq_mask, INTENABLE);
 }
 
-static void disable_xtensa_irq(unsigned int irq)
+static void xtensa_irq_ack(unsigned int irq)
 {
-        unsigned long flags;
-        local_save_flags(flags);
-        mask_irq(irq);
-        local_irq_restore(flags);
+        set_sr(1 << irq, INTCLEAR);
 }
 
-static void enable_xtensa_irq(unsigned int irq)
+static int xtensa_irq_retrigger(unsigned int irq)
 {
-        unsigned long flags;
-        local_save_flags(flags);
-        unmask_irq(irq);
-        local_irq_restore(flags);
-}
-
-static void mask_and_ack_xtensa(unsigned int irq)
-{
-        disable_xtensa_irq(irq);
+        set_sr (1 << irq, INTSET);
+        return 1;
 }
 
-static void end_xtensa_irq(unsigned int irq)
-{
-        enable_xtensa_irq(irq);
-}
 
+static struct irq_chip xtensa_irq_chip = {
+        .name           = "xtensa",
+        .mask           = xtensa_irq_mask,
+        .unmask         = xtensa_irq_unmask,
+        .ack            = xtensa_irq_ack,
+        .retrigger      = xtensa_irq_retrigger,
+};
 
 void __init init_IRQ(void)
 {
-        int i;
+        int index;
 
-        for (i=0; i < XTENSA_NR_IRQS; i++)
-                irq_desc[i].chip = &xtensa_irq_type;
+        for (index = 0; index < XTENSA_NR_IRQS; index++) {
+                int mask = 1 << index;
 
-        cached_irq_mask = 0;
+                if (mask & XCHAL_INTTYPE_MASK_SOFTWARE)
+                        set_irq_chip_and_handler(index, &xtensa_irq_chip,
+                                                 handle_simple_irq);
 
-        platform_init_irq();
+                else if (mask & XCHAL_INTTYPE_MASK_EXTERN_EDGE)
+                        set_irq_chip_and_handler(index, &xtensa_irq_chip,
+                                                 handle_edge_irq);
+
+                else if (mask & XCHAL_INTTYPE_MASK_EXTERN_LEVEL)
+                        set_irq_chip_and_handler(index, &xtensa_irq_chip,
+                                                 handle_level_irq);
+
+                else if (mask & XCHAL_INTTYPE_MASK_TIMER)
+                        set_irq_chip_and_handler(index, &xtensa_irq_chip,
+                                                 handle_edge_irq);
+
+                else    /* XCHAL_INTTYPE_MASK_WRITE_ERROR */
+                        /* XCHAL_INTTYPE_MASK_NMI */
+
+                        set_irq_chip_and_handler(index, &xtensa_irq_chip,
+                                                 handle_level_irq);
+        }
+
+        cached_irq_mask = 0;
 }
diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c
index 6648fa9d9192..ca76f071666e 100644
--- a/arch/xtensa/kernel/pci-dma.c
+++ b/arch/xtensa/kernel/pci-dma.c
@@ -1,5 +1,5 @@
 /*
- * arch/xtensa/kernel/pci-dma.c
+ * arch/xtensa/pci-dma.c
  *
  * DMA coherent memory allocation.
  *
@@ -29,28 +29,48 @@
  */
 
 void *
-dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp)
+dma_alloc_coherent(struct device *dev,size_t size,dma_addr_t *handle,gfp_t flag)
 {
-        void *ret;
+        unsigned long ret;
+        unsigned long uncached = 0;
 
         /* ignore region speicifiers */
-        gfp &= ~(__GFP_DMA | __GFP_HIGHMEM);
 
-        if (dev == NULL || (*dev->dma_mask < 0xffffffff))
-                gfp |= GFP_DMA;
-        ret = (void *)__get_free_pages(gfp, get_order(size));
+        flag &= ~(__GFP_DMA | __GFP_HIGHMEM);
 
-        if (ret != NULL) {
-                memset(ret, 0, size);
-                *handle = virt_to_bus(ret);
+        if (dev == NULL || (dev->coherent_dma_mask < 0xffffffff))
+                flag |= GFP_DMA;
+        ret = (unsigned long)__get_free_pages(flag, get_order(size));
+
+        if (ret == 0)
+                return NULL;
+
+        /* We currently don't support coherent memory outside KSEG */
+
+        if (ret < XCHAL_KSEG_CACHED_VADDR
+            || ret >= XCHAL_KSEG_CACHED_VADDR + XCHAL_KSEG_SIZE)
+                BUG();
+
+
+        if (ret != 0) {
+                memset((void*) ret, 0, size);
+                uncached = ret+XCHAL_KSEG_BYPASS_VADDR-XCHAL_KSEG_CACHED_VADDR;
+                *handle = virt_to_bus((void*)ret);
+                __flush_invalidate_dcache_range(ret, size);
         }
-        return (void*) BYPASS_ADDR((unsigned long)ret);
+
+        return (void*)uncached;
 }
 
 void dma_free_coherent(struct device *hwdev, size_t size,
                          void *vaddr, dma_addr_t dma_handle)
 {
-        free_pages(CACHED_ADDR((unsigned long)vaddr), get_order(size));
+        long addr=(long)vaddr+XCHAL_KSEG_CACHED_VADDR-XCHAL_KSEG_BYPASS_VADDR;
+
+        if (addr < 0 || addr >= XCHAL_KSEG_SIZE)
+                BUG();
+
+        free_pages(addr, get_order(size));
 }
 
 
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c
index a7c4178c2a8c..795bd5ac6f4c 100644
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
@@ -1,4 +1,3 @@
-// TODO verify coprocessor handling
 /*
  * arch/xtensa/kernel/process.c
  *
@@ -43,7 +42,7 @@
 #include <asm/irq.h>
 #include <asm/atomic.h>
 #include <asm/asm-offsets.h>
-#include <asm/coprocessor.h>
+#include <asm/regs.h>
 
 extern void ret_from_fork(void);
 
@@ -67,25 +66,6 @@ void (*pm_power_off)(void) = NULL;
 EXPORT_SYMBOL(pm_power_off);
 
 
-#if XCHAL_CP_NUM > 0
-
-/*
- * Coprocessor ownership.
- */
-
-coprocessor_info_t coprocessor_info[] = {
-        { 0, XTENSA_CPE_CP0_OFFSET },
-        { 0, XTENSA_CPE_CP1_OFFSET },
-        { 0, XTENSA_CPE_CP2_OFFSET },
-        { 0, XTENSA_CPE_CP3_OFFSET },
-        { 0, XTENSA_CPE_CP4_OFFSET },
-        { 0, XTENSA_CPE_CP5_OFFSET },
-        { 0, XTENSA_CPE_CP6_OFFSET },
-        { 0, XTENSA_CPE_CP7_OFFSET },
-};
-
-#endif
-
 /*
  * Powermanagement idle function, if any is provided by the platform.
  */
@@ -110,12 +90,10 @@ void cpu_idle(void)
 
 void exit_thread(void)
 {
-        release_coprocessors(current);  /* Empty macro if no CPs are defined */
 }
 
 void flush_thread(void)
 {
-        release_coprocessors(current);  /* Empty macro if no CPs are defined */
 }
 
 /*
@@ -183,36 +161,6 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
 
 
 /*
- * Create a kernel thread
- */
-
-int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
-{
-        long retval;
-        __asm__ __volatile__
-                ("mov           a5, %4\n\t" /* preserve fn in a5 */
-                 "mov           a6, %3\n\t" /* preserve and setup arg in a6 */
-                 "movi          a2, %1\n\t" /* load __NR_clone for syscall*/
-                 "mov           a3, sp\n\t" /* sp check and sys_clone */
-                 "mov           a4, %5\n\t" /* load flags for syscall */
-                 "syscall\n\t"
-                 "beq           a3, sp, 1f\n\t" /* branch if parent */
-                 "callx4        a5\n\t"     /* call fn */
-                 "movi          a2, %2\n\t" /* load __NR_exit for syscall */
-                 "mov           a3, a6\n\t" /* load fn return value */
-                 "syscall\n"
-                 "1:\n\t"
-                 "mov           %0, a2\n\t" /* parent returns zero */
-                 :"=r" (retval)
-                 :"i" (__NR_clone), "i" (__NR_exit),
-                 "r" (arg), "r" (fn),
-                 "r" (flags | CLONE_VM)
-                 : "a2", "a3", "a4", "a5", "a6" );
-        return retval;
-}
-
-
-/*
  * These bracket the sleeping functions..
  */
 
@@ -275,7 +223,7 @@ void do_copy_regs (xtensa_gregset_t *elfregs, struct pt_regs *regs,
          */
 
         elfregs->pc             = regs->pc;
-        elfregs->ps             = (regs->ps & ~XCHAL_PS_EXCM_MASK);
+        elfregs->ps             = (regs->ps & ~(1 << PS_EXCM_BIT));
         elfregs->exccause       = regs->exccause;
         elfregs->excvaddr       = regs->excvaddr;
         elfregs->windowbase     = regs->windowbase;
@@ -325,7 +273,7 @@ void do_restore_regs (xtensa_gregset_t *elfregs, struct pt_regs *regs,
          */
 
         regs->pc                = elfregs->pc;
-        regs->ps                = (elfregs->ps | XCHAL_PS_EXCM_MASK);
+        regs->ps                = (elfregs->ps | (1 << PS_EXCM_BIT));
         regs->exccause          = elfregs->exccause;
         regs->excvaddr          = elfregs->excvaddr;
         regs->windowbase        = elfregs->windowbase;
@@ -459,16 +407,7 @@ int  do_restore_fpregs (elf_fpregset_t *fpregs, struct pt_regs *regs,
 int
 dump_task_fpu(struct pt_regs *regs, struct task_struct *task, elf_fpregset_t *r)
 {
-/* see asm/coprocessor.h for this magic number 16 */
-#if XTENSA_CP_EXTRA_SIZE > 16
-        do_save_fpregs (r, regs, task);
-
-        /*  For now, bit 16 means some extra state may be present:  */
-// FIXME!! need to track to return more accurate mask
-        return 0x10000 | XCHAL_CP_MASK;
-#else
         return 0;       /* no coprocessors active on this processor */
-#endif
 }
 
 /*
@@ -483,3 +422,44 @@ int  dump_fpu(struct pt_regs *regs, elf_fpregset_t *r)
 {
         return dump_task_fpu(regs, current, r);
 }
+
+asmlinkage
+long xtensa_clone(unsigned long clone_flags, unsigned long newsp,
+                  void __user *parent_tid, void *child_tls,
+                  void __user *child_tid, long a5,
+                  struct pt_regs *regs)
+{
+        if (!newsp)
+                newsp = regs->areg[1];
+        return do_fork(clone_flags, newsp, regs, 0, parent_tid, child_tid);
+}
+
+/*
+ *  * xtensa_execve() executes a new program.
+ *   */
+
+asmlinkage
+long xtensa_execve(char __user *name, char __user * __user *argv,
+                   char __user * __user *envp,
+                   long a3, long a4, long a5,
+                   struct pt_regs *regs)
+{
+        long error;
+        char * filename;
+
+        filename = getname(name);
+        error = PTR_ERR(filename);
+        if (IS_ERR(filename))
+                goto out;
+        // FIXME: release coprocessor??
+        error = do_execve(filename, argv, envp, regs);
+        if (error == 0) {
+                task_lock(current);
+                current->ptrace &= ~PT_DTRACE;
+                task_unlock(current);
+        }
+        putname(filename);
+out:
+        return error;
+}
+
diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c
index 9aea23cc0dc5..8b6d3d0623b6 100644
--- a/arch/xtensa/kernel/ptrace.c
+++ b/arch/xtensa/kernel/ptrace.c
@@ -96,7 +96,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                         /* Note:  PS.EXCM is not set while user task is running;
                          * its being set in regs is for exception handling
                          * convenience.  */
-                        tmp = (regs->ps & ~XCHAL_PS_EXCM_MASK);
+                        tmp = (regs->ps & ~(1 << PS_EXCM_BIT));
                         break;
                 case REG_WB:
                         tmp = regs->windowbase;
@@ -332,12 +332,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 
 void do_syscall_trace(void)
 {
-        if (!test_thread_flag(TIF_SYSCALL_TRACE))
-                return;
-
-        if (!(current->ptrace & PT_PTRACED))
-                return;
-
         /*
          * The 0x80 provides a way for the tracing parent to distinguish
          * between a syscall stop and SIGTRAP delivery
@@ -354,3 +348,23 @@ void do_syscall_trace(void)
                 current->exit_code = 0;
         }
 }
+
+void do_syscall_trace_enter(struct pt_regs *regs)
+{
+        if (test_thread_flag(TIF_SYSCALL_TRACE)
+                        && (current->ptrace & PT_PTRACED))
+                do_syscall_trace();
+
+#if 0
+        if (unlikely(current->audit_context))
+                audit_syscall_entry(current, AUDIT_ARCH_XTENSA..);
+#endif
+}
+
+void do_syscall_trace_leave(struct pt_regs *regs)
+{
+        if ((test_thread_flag(TIF_SYSCALL_TRACE))
+                        && (current->ptrace & PT_PTRACED))
+                do_syscall_trace();
+}
+
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index c99ab72b41b6..b6374c09de20 100644
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -42,8 +42,6 @@
 #include <asm/page.h>
 #include <asm/setup.h>
 
-#include <xtensa/config/system.h>
-
 #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)
 struct screen_info screen_info = { 0, 24, 0, 0, 0, 80, 0, 0, 0, 24, 1, 16};
 #endif
@@ -336,7 +334,7 @@ c_show(struct seq_file *f, void *slot)
         /* high-level stuff */
         seq_printf(f,"processor\t: 0\n"
                      "vendor_id\t: Tensilica\n"
-                     "model\t\t: Xtensa " XCHAL_HW_RELEASE_NAME "\n"
+                     "model\t\t: Xtensa " XCHAL_HW_VERSION_NAME "\n"
                      "core ID\t\t: " XCHAL_CORE_ID "\n"
                      "build ID\t: 0x%x\n"
                      "byte order\t: %s\n"
@@ -420,25 +418,6 @@ c_show(struct seq_file *f, void *slot)
                      XCHAL_NUM_TIMERS,
                      XCHAL_DEBUGLEVEL);
 
-        /* Coprocessors */
-#if XCHAL_HAVE_CP
-        seq_printf(f, "coprocessors\t: %d\n", XCHAL_CP_NUM);
-#else
-        seq_printf(f, "coprocessors\t: none\n");
-#endif
-
-        /* {I,D}{RAM,ROM} and XLMI */
-        seq_printf(f,"inst ROMs\t: %d\n"
-                     "inst RAMs\t: %d\n"
-                     "data ROMs\t: %d\n"
-                     "data RAMs\t: %d\n"
-                     "XLMI ports\t: %d\n",
-                     XCHAL_NUM_IROM,
-                     XCHAL_NUM_IRAM,
-                     XCHAL_NUM_DROM,
-                     XCHAL_NUM_DRAM,
-                     XCHAL_NUM_XLMI);
-
         /* Cache */
         seq_printf(f,"icache line size: %d\n"
                      "icache ways\t: %d\n"
@@ -466,24 +445,6 @@ c_show(struct seq_file *f, void *slot)
                      XCHAL_DCACHE_WAYS,
                      XCHAL_DCACHE_SIZE);
 
-        /* MMU */
-        seq_printf(f,"ASID bits\t: %d\n"
-                     "ASID invalid\t: %d\n"
-                     "ASID kernel\t: %d\n"
-                     "rings\t\t: %d\n"
-                     "itlb ways\t: %d\n"
-                     "itlb AR ways\t: %d\n"
-                     "dtlb ways\t: %d\n"
-                     "dtlb AR ways\t: %d\n",
-                     XCHAL_MMU_ASID_BITS,
-                     XCHAL_MMU_ASID_INVALID,
-                     XCHAL_MMU_ASID_KERNEL,
-                     XCHAL_MMU_RINGS,
-                     XCHAL_ITLB_WAYS,
-                     XCHAL_ITLB_ARF_WAYS,
-                     XCHAL_DTLB_WAYS,
-                     XCHAL_DTLB_ARF_WAYS);
-
         return 0;
 }
 
diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index c494f0826fc5..c6d9880a4cdb 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -12,8 +12,8 @@
  *
  */
 
-#include <xtensa/config/core.h>
-#include <xtensa/hal.h>
+#include <asm/variant/core.h>
+#include <asm/coprocessor.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
@@ -46,7 +46,7 @@ extern struct task_struct *coproc_owners[];
  * Atomically swap in the new signal mask, and wait for a signal.
  */
 
-int sys_sigsuspend(struct pt_regs *regs)
+int xtensa_sigsuspend(struct pt_regs *regs)
 {
         old_sigset_t mask = (old_sigset_t) regs->areg[3];
         sigset_t saveset;
@@ -68,7 +68,7 @@ int sys_sigsuspend(struct pt_regs *regs)
 }
 
 asmlinkage int
-sys_rt_sigsuspend(struct pt_regs *regs)
+xtensa_rt_sigsuspend(struct pt_regs *regs)
 {
         sigset_t *unewset = (sigset_t *) regs->areg[4];
         size_t sigsetsize = (size_t) regs->areg[3];
@@ -96,7 +96,7 @@ sys_rt_sigsuspend(struct pt_regs *regs)
 }
 
 asmlinkage int
-sys_sigaction(int sig, const struct old_sigaction *act,
+xtensa_sigaction(int sig, const struct old_sigaction *act,
               struct old_sigaction *oact)
 {
         struct k_sigaction new_ka, old_ka;
@@ -128,7 +128,7 @@ sys_sigaction(int sig, const struct old_sigaction *act,
 }
 
 asmlinkage int
-sys_sigaltstack(struct pt_regs *regs)
+xtensa_sigaltstack(struct pt_regs *regs)
 {
         const stack_t *uss = (stack_t *) regs->areg[4];
         stack_t *uoss = (stack_t *) regs->areg[3];
@@ -216,8 +216,8 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc)
          * handler, or the user mode value doesn't matter (e.g. PS.OWB).
          */
         err |= __get_user(ps, &sc->sc_ps);
-        regs->ps = (regs->ps & ~XCHAL_PS_CALLINC_MASK)
-                | (ps & XCHAL_PS_CALLINC_MASK);
+        regs->ps = (regs->ps & ~PS_CALLINC_MASK)
+                | (ps & PS_CALLINC_MASK);
 
         /* Additional corruption checks */
 
@@ -280,7 +280,7 @@ flush_my_cpstate(struct task_struct *tsk)
 static int
 save_cpextra (struct _cpstate *buf)
 {
-#if (XCHAL_EXTRA_SA_SIZE == 0) && (XCHAL_CP_NUM == 0)
+#if XCHAL_CP_NUM == 0
         return 0;
 #else
 
@@ -350,7 +350,7 @@ setup_sigcontext(struct sigcontext *sc, struct _cpstate *cpstate,
         return err;
 }
 
-asmlinkage int sys_sigreturn(struct pt_regs *regs)
+asmlinkage int xtensa_sigreturn(struct pt_regs *regs)
 {
         struct sigframe *frame = (struct sigframe *)regs->areg[1];
         sigset_t set;
@@ -382,7 +382,7 @@ badframe:
         return 0;
 }
 
-asmlinkage int sys_rt_sigreturn(struct pt_regs *regs)
+asmlinkage int xtensa_rt_sigreturn(struct pt_regs *regs)
 {
         struct rt_sigframe *frame = (struct rt_sigframe *)regs->areg[1];
         sigset_t set;
@@ -497,8 +497,10 @@ gen_return_code(unsigned char *codemem, unsigned int use_rt_sigreturn)
 
         /* Flush generated code out of the data cache */
 
-        if (err == 0)
-                __flush_invalidate_cache_range((unsigned long)codemem, 6UL);
+        if (err == 0) {
+                __invalidate_icache_range((unsigned long)codemem, 6UL);
+                __flush_invalidate_dcache_range((unsigned long)codemem, 6UL);
+        }
 
         return err;
 }
diff --git a/arch/xtensa/kernel/syscall.c b/arch/xtensa/kernel/syscall.c
new file mode 100644
index 000000000000..fe3834bc1dbf
--- /dev/null
+++ b/arch/xtensa/kernel/syscall.c
@@ -0,0 +1,95 @@
+/*
+ * arch/xtensa/kernel/syscall.c
+ *
+ * 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) 2001 - 2005 Tensilica Inc.
+ * Copyright (C) 2000 Silicon Graphics, Inc.
+ * Copyright (C) 1995 - 2000 by Ralf Baechle
+ *
+ * Joe Taylor <joe@tensilica.com, joetylr@yahoo.com>
+ * Marc Gauthier <marc@tensilica.com, marc@alumni.uwaterloo.ca>
+ * Chris Zankel <chris@zankel.net>
+ * Kevin Chea
+ *
+ */
+#include <asm/uaccess.h>
+#include <asm/syscall.h>
+#include <asm/unistd.h>
+#include <linux/linkage.h>
+#include <linux/stringify.h>
+#include <linux/errno.h>
+#include <linux/syscalls.h>
+#include <linux/file.h>
+#include <linux/fs.h>
+#include <linux/mman.h>
+#include <linux/shm.h>
+
+typedef void (*syscall_t)(void);
+
+syscall_t sys_call_table[__NR_syscall_count] /* FIXME __cacheline_aligned */= {
+        [0 ... __NR_syscall_count - 1] = (syscall_t)&sys_ni_syscall,
+
+#undef __SYSCALL
+#define __SYSCALL(nr,symbol,nargs) [ nr ] = (syscall_t)symbol,
+#undef _XTENSA_UNISTD_H
+#undef  __KERNEL_SYSCALLS__
+#include <asm/unistd.h>
+};
+
+/*
+ * xtensa_pipe() is the normal C calling standard for creating a pipe. It's not
+ * the way unix traditional does this, though.
+ */
+
+asmlinkage long xtensa_pipe(int __user *userfds)
+{
+        int fd[2];
+        int error;
+
+        error = do_pipe(fd);
+        if (!error) {
+                if (copy_to_user(userfds, fd, 2 * sizeof(int)))
+                        error = -EFAULT;
+        }
+        return error;
+}
+
+
+asmlinkage long xtensa_mmap2(unsigned long addr, unsigned long len,
+                             unsigned long prot, unsigned long flags,
+                             unsigned long fd, unsigned long pgoff)
+{
+        int error = -EBADF;
+        struct file * file = NULL;
+
+        flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
+        if (!(flags & MAP_ANONYMOUS)) {
+                file = fget(fd);
+                if (!file)
+                        goto out;
+        }
+
+        down_write(&current->mm->mmap_sem);
+        error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
+        up_write(&current->mm->mmap_sem);
+
+        if (file)
+                fput(file);
+out:
+        return error;
+}
+
+asmlinkage long xtensa_shmat(int shmid, char __user *shmaddr, int shmflg)
+{
+        unsigned long ret;
+        long err;
+
+        err = do_shmat(shmid, shmaddr, shmflg, &ret);
+        if (err)
+                return err;
+        return (long)ret;
+}
+
diff --git a/arch/xtensa/kernel/syscalls.c b/arch/xtensa/kernel/syscalls.c
deleted file mode 100644
index f49cb239e603..000000000000
--- a/arch/xtensa/kernel/syscalls.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * arch/xtensa/kernel/syscalls.c
- *
- * 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) 2001 - 2005 Tensilica Inc.
- * Copyright (C) 2000 Silicon Graphics, Inc.
- * Copyright (C) 1995 - 2000 by Ralf Baechle
- *
- * Joe Taylor <joe@tensilica.com, joetylr@yahoo.com>
- * Marc Gauthier <marc@tensilica.com, marc@alumni.uwaterloo.ca>
- * Chris Zankel <chris@zankel.net>
- * Kevin Chea
- *
- */
-
-#define DEBUG   0
-
-#include <linux/linkage.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/mman.h>
-#include <linux/sched.h>
-#include <linux/file.h>
-#include <linux/slab.h>
-#include <linux/utsname.h>
-#include <linux/unistd.h>
-#include <linux/stringify.h>
-#include <linux/syscalls.h>
-#include <linux/sem.h>
-#include <linux/msg.h>
-#include <linux/shm.h>
-#include <linux/errno.h>
-#include <asm/ptrace.h>
-#include <asm/signal.h>
-#include <asm/uaccess.h>
-#include <asm/hardirq.h>
-#include <asm/mman.h>
-#include <asm/shmparam.h>
-#include <asm/page.h>
-
-extern void do_syscall_trace(void);
-typedef int (*syscall_t)(void *a0,...);
-extern syscall_t sys_call_table[];
-extern unsigned char sys_narg_table[];
-
-/*
- * sys_pipe() is the normal C calling standard for creating a pipe. It's not
- * the way unix traditional does this, though.
- */
-
-int sys_pipe(int __user *userfds)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(userfds, fd, 2 * sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
-/*
- * Common code for old and new mmaps.
- */
-long sys_mmap(unsigned long addr, unsigned long len, unsigned long prot,
-              unsigned long flags, unsigned long fd, unsigned long pgoff)
-{
-        int error = -EBADF;
-        struct file * file = NULL;
-
-        flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-        if (!(flags & MAP_ANONYMOUS)) {
-                file = fget(fd);
-                if (!file)
-                        goto out;
-        }
-
-        down_write(&current->mm->mmap_sem);
-        error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-        up_write(&current->mm->mmap_sem);
-
-        if (file)
-                fput(file);
-out:
-        return error;
-}
-
-int sys_clone(struct pt_regs *regs)
-{
-        unsigned long clone_flags;
-        unsigned long newsp;
-        int __user *parent_tidptr, *child_tidptr;
-        clone_flags = regs->areg[4];
-        newsp = regs->areg[3];
-        parent_tidptr = (int __user *)regs->areg[5];
-        child_tidptr = (int __user *)regs->areg[6];
-        if (!newsp)
-                newsp = regs->areg[1];
-        return do_fork(clone_flags,newsp,regs,0,parent_tidptr,child_tidptr);
-}
-
-/*
- * sys_execve() executes a new program.
- */
-
-int sys_execve(struct pt_regs *regs)
-{
-        int error;
-        char * filename;
-
-        filename = getname((char *) (long)regs->areg[5]);
-        error = PTR_ERR(filename);
-        if (IS_ERR(filename))
-                goto out;
-        error = do_execve(filename, (char **) (long)regs->areg[3],
-                          (char **) (long)regs->areg[4], regs);
-        putname(filename);
-
-out:
-        return error;
-}
-
-int sys_uname(struct old_utsname * name)
-{
-        if (name && !copy_to_user(name, utsname(), sizeof (*name)))
-                return 0;
-        return -EFAULT;
-}
-
-/*
- * Build the string table for the builtin "poor man's strace".
- */
-
-#if DEBUG
-#define SYSCALL(fun, narg) #fun,
-static char *sfnames[] = {
-#include "syscalls.h"
-};
-#undef SYS
-#endif
-
-void system_call (struct pt_regs *regs)
-{
-        syscall_t syscall;
-        unsigned long parm0, parm1, parm2, parm3, parm4, parm5;
-        int nargs, res;
-        unsigned int syscallnr;
-        int ps;
-
-#if DEBUG
-        int i;
-        unsigned long parms[6];
-        char *sysname;
-#endif
-
-        regs->syscall = regs->areg[2];
-
-        do_syscall_trace();
-
-        /* Have to load after syscall_trace because strace
-         * sometimes changes regs->syscall.
-         */
-        syscallnr = regs->syscall;
-
-        parm0 = parm1 = parm2 = parm3 = parm4 = parm5 = 0;
-
-        /* Restore interrupt level to syscall invoker's.
-         * If this were in assembly, we wouldn't disable
-         * interrupts in the first place:
-         */
-        local_save_flags (ps);
-        local_irq_restore((ps & ~XCHAL_PS_INTLEVEL_MASK) |
-                          (regs->ps & XCHAL_PS_INTLEVEL_MASK) );
-
-        if (syscallnr > __NR_Linux_syscalls) {
-                regs->areg[2] = -ENOSYS;
-                return;
-        }
-
-        syscall = sys_call_table[syscallnr];
-        nargs = sys_narg_table[syscallnr];
-
-        if (syscall == NULL) {
-                regs->areg[2] = -ENOSYS;
-                return;
-        }
-
-        /* There shouldn't be more than six arguments in the table! */
-
-        if (nargs > 6)
-                panic("Internal error - too many syscall arguments (%d)!\n",
-                      nargs);
-
-        /* Linux takes system-call arguments in registers.  The ABI
-         * and Xtensa software conventions require the system-call
-         * number in a2.  If an argument exists in a2, we move it to
-         * the next available register.  Note that for improved
-         * efficiency, we do NOT shift all parameters down one
-         * register to maintain the original order.
-         *
-         * At best case (zero arguments), we just write the syscall
-         * number to a2.  At worst case (1 to 6 arguments), we move
-         * the argument in a2 to the next available register, then
-         * write the syscall number to a2.
-         *
-         * For clarity, the following truth table enumerates all
-         * possibilities.
-         *
-         * arguments    syscall number  arg0, arg1, arg2, arg3, arg4, arg5
-         * ---------    --------------  ----------------------------------
-         *      0             a2
-         *      1             a2        a3
-         *      2             a2        a4,   a3
-         *      3             a2        a5,   a3,   a4
-         *      4             a2        a6,   a3,   a4,   a5
-         *      5             a2        a7,   a3,   a4,   a5,   a6
-         *      6             a2        a8,   a3,   a4,   a5,   a6,   a7
-         */
-        if (nargs) {
-                parm0 = regs->areg[nargs+2];
-                parm1 = regs->areg[3];
-                parm2 = regs->areg[4];
-                parm3 = regs->areg[5];
-                parm4 = regs->areg[6];
-                parm5 = regs->areg[7];
-        } else /* nargs == 0 */
-                parm0 = (unsigned long) regs;
-
-#if DEBUG
-        parms[0] = parm0;
-        parms[1] = parm1;
-        parms[2] = parm2;
-        parms[3] = parm3;
-        parms[4] = parm4;
-        parms[5] = parm5;
-
-        sysname = sfnames[syscallnr];
-        if (strncmp(sysname, "sys_", 4) == 0)
-                sysname = sysname + 4;
-
-        printk("\017SYSCALL:I:%x:%d:%s  %s(", regs->pc, current->pid,
-               current->comm, sysname);
-        for (i = 0; i < nargs; i++)
-                printk((i>0) ? ", %#lx" : "%#lx", parms[i]);
-        printk(")\n");
-#endif
-
-        res = syscall((void *)parm0, parm1, parm2, parm3, parm4, parm5);
-
-#if DEBUG
-        printk("\017SYSCALL:O:%d:%s  %s(",current->pid, current->comm, sysname);
-        for (i = 0; i < nargs; i++)
-                printk((i>0) ? ", %#lx" : "%#lx", parms[i]);
-        if (res < 4096)
-                printk(") = %d\n", res);
-        else
-                printk(") = %#x\n", res);
-#endif /* DEBUG */
-
-        regs->areg[2] = res;
-        do_syscall_trace();
-}
-
-/*
- * Do a system call from kernel instead of calling sys_execve so we
- * end up with proper pt_regs.
- */
-int kernel_execve(const char *filename, char *const argv[], char *const envp[])
-{
-        long __res;
-        asm volatile (
-                "  mov   a5, %2 \n"
-                "  mov   a4, %4 \n"
-                "  mov   a3, %3 \n"
-                "  movi  a2, %1 \n"
-                "  syscall      \n"
-                "  mov   %0, a2 \n"
-                : "=a" (__res)
-                : "i" (__NR_execve), "a" (filename), "a" (argv), "a" (envp)
-                : "a2", "a3", "a4", "a5");
-        return __res;
-}
diff --git a/arch/xtensa/kernel/syscalls.h b/arch/xtensa/kernel/syscalls.h
deleted file mode 100644
index 216c10a31501..000000000000
--- a/arch/xtensa/kernel/syscalls.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * arch/xtensa/kernel/syscalls.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 1995, 1996, 1997, 1998 by Ralf Baechle
- * Copyright (C) 2001 - 2005 Tensilica Inc.
- *
- * Changes by Joe Taylor <joe@tensilica.com>
- */
-
-/*
- * This file is being included twice - once to build a list of all
- * syscalls and once to build a table of how many arguments each syscall
- * accepts.  Syscalls that receive a pointer to the saved registers are
- * marked as having zero arguments.
- *
- * The binary compatibility calls are in a separate list.
- *
- * Entry '0' used to be system_call.  It's removed to disable indirect
- * system calls for now so user tasks can't recurse.  See mips'
- * sys_syscall for a comparable example.
- */
-
-SYSCALL(0, 0)                           /* 00 */
-SYSCALL(sys_exit, 1)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_read, 3)
-SYSCALL(sys_write, 3)
-SYSCALL(sys_open, 3)                    /* 05 */
-SYSCALL(sys_close, 1)
-SYSCALL(sys_ni_syscall, 3)
-SYSCALL(sys_creat, 2)
-SYSCALL(sys_link, 2)
-SYSCALL(sys_unlink, 1)                  /* 10 */
-SYSCALL(sys_execve, 0)
-SYSCALL(sys_chdir, 1)
-SYSCALL(sys_ni_syscall, 1)
-SYSCALL(sys_mknod, 3)
-SYSCALL(sys_chmod, 2)                   /* 15 */
-SYSCALL(sys_lchown, 3)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_newstat, 2)
-SYSCALL(sys_lseek, 3)
-SYSCALL(sys_getpid, 0)                  /* 20 */
-SYSCALL(sys_mount, 5)
-SYSCALL(sys_ni_syscall, 1)
-SYSCALL(sys_setuid, 1)
-SYSCALL(sys_getuid, 0)
-SYSCALL(sys_ni_syscall, 1)              /* 25 */
-SYSCALL(sys_ptrace, 4)
-SYSCALL(sys_ni_syscall, 1)
-SYSCALL(sys_newfstat, 2)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_utime, 2)                   /* 30 */
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_access, 2)
-SYSCALL(sys_ni_syscall, 1)
-SYSCALL(sys_ni_syscall, 0)              /* 35 */
-SYSCALL(sys_sync, 0)
-SYSCALL(sys_kill, 2)
-SYSCALL(sys_rename, 2)
-SYSCALL(sys_mkdir, 2)
-SYSCALL(sys_rmdir, 1)                   /* 40 */
-SYSCALL(sys_dup, 1)
-SYSCALL(sys_pipe, 1)
-SYSCALL(sys_times, 1)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_brk, 1)                     /* 45 */
-SYSCALL(sys_setgid, 1)
-SYSCALL(sys_getgid, 0)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_geteuid, 0)
-SYSCALL(sys_getegid, 0)                 /* 50 */
-SYSCALL(sys_acct, 1)
-SYSCALL(sys_umount, 2)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_ioctl, 3)
-SYSCALL(sys_fcntl, 3)                   /* 55 */
-SYSCALL(sys_ni_syscall, 2)
-SYSCALL(sys_setpgid, 2)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_umask, 1)                   /* 60 */
-SYSCALL(sys_chroot, 1)
-SYSCALL(sys_ustat, 2)
-SYSCALL(sys_dup2, 2)
-SYSCALL(sys_getppid, 0)
-SYSCALL(sys_ni_syscall, 0)              /* 65 */
-SYSCALL(sys_setsid, 0)
-SYSCALL(sys_sigaction, 3)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_ni_syscall, 1)
-SYSCALL(sys_setreuid, 2)                /* 70 */
-SYSCALL(sys_setregid, 2)
-SYSCALL(sys_sigsuspend, 0)
-SYSCALL(sys_ni_syscall, 1)
-SYSCALL(sys_sethostname, 2)
-SYSCALL(sys_setrlimit, 2)               /* 75 */
-SYSCALL(sys_getrlimit, 2)
-SYSCALL(sys_getrusage, 2)
-SYSCALL(sys_gettimeofday, 2)
-SYSCALL(sys_settimeofday, 2)
-SYSCALL(sys_getgroups, 2)               /* 80 */
-SYSCALL(sys_setgroups, 2)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_symlink, 2)
-SYSCALL(sys_newlstat, 2)
-SYSCALL(sys_readlink, 3)                /* 85 */
-SYSCALL(sys_uselib, 1)
-SYSCALL(sys_swapon, 2)
-SYSCALL(sys_reboot, 3)
-SYSCALL(sys_ni_syscall, 3)
-SYSCALL(sys_ni_syscall, 6)              /* 90 */
-SYSCALL(sys_munmap, 2)
-SYSCALL(sys_truncate, 2)
-SYSCALL(sys_ftruncate, 2)
-SYSCALL(sys_fchmod, 2)
-SYSCALL(sys_fchown, 3)                  /* 95 */
-SYSCALL(sys_getpriority, 2)
-SYSCALL(sys_setpriority, 3)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_statfs, 2)
-SYSCALL(sys_fstatfs, 2)                 /* 100 */
-SYSCALL(sys_ni_syscall, 3)
-SYSCALL(sys_ni_syscall, 2)
-SYSCALL(sys_syslog, 3)
-SYSCALL(sys_setitimer, 3)
-SYSCALL(sys_getitimer, 2)               /* 105 */
-SYSCALL(sys_newstat, 2)
-SYSCALL(sys_newlstat, 2)
-SYSCALL(sys_newfstat, 2)
-SYSCALL(sys_uname, 1)
-SYSCALL(sys_ni_syscall, 0)              /* 110 */
-SYSCALL(sys_vhangup, 0)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_wait4, 4)
-SYSCALL(sys_swapoff, 1)                 /* 115 */
-SYSCALL(sys_sysinfo, 1)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_fsync, 1)
-SYSCALL(sys_sigreturn, 0)
-SYSCALL(sys_clone, 0)                   /* 120 */
-SYSCALL(sys_setdomainname, 2)
-SYSCALL(sys_newuname, 1)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_adjtimex, 1)
-SYSCALL(sys_mprotect, 3)                /* 125 */
-SYSCALL(sys_ni_syscall, 3)
-SYSCALL(sys_ni_syscall, 2)
-SYSCALL(sys_init_module, 2)
-SYSCALL(sys_delete_module, 1)
-SYSCALL(sys_ni_syscall, 1)              /* 130 */
-SYSCALL(sys_quotactl, 0)
-SYSCALL(sys_getpgid, 1)
-SYSCALL(sys_fchdir, 1)
-SYSCALL(sys_bdflush, 2)
-SYSCALL(sys_sysfs, 3)                   /* 135 */
-SYSCALL(sys_personality, 1)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_setfsuid, 1)
-SYSCALL(sys_setfsgid, 1)
-SYSCALL(sys_llseek, 5)                  /* 140 */
-SYSCALL(sys_getdents, 3)
-SYSCALL(sys_select, 5)
-SYSCALL(sys_flock, 2)
-SYSCALL(sys_msync, 3)
-SYSCALL(sys_readv, 3)                   /* 145 */
-SYSCALL(sys_writev, 3)
-SYSCALL(sys_ni_syscall, 3)
-SYSCALL(sys_ni_syscall, 3)
-SYSCALL(sys_ni_syscall, 4)              /* handled in fast syscall handler. */
-SYSCALL(sys_ni_syscall, 0)              /* 150 */
-SYSCALL(sys_getsid, 1)
-SYSCALL(sys_fdatasync, 1)
-SYSCALL(sys_sysctl, 1)
-SYSCALL(sys_mlock, 2)
-SYSCALL(sys_munlock, 2)                 /* 155 */
-SYSCALL(sys_mlockall, 1)
-SYSCALL(sys_munlockall, 0)
-SYSCALL(sys_sched_setparam,2)
-SYSCALL(sys_sched_getparam,2)
-SYSCALL(sys_sched_setscheduler,3)       /* 160 */
-SYSCALL(sys_sched_getscheduler,1)
-SYSCALL(sys_sched_yield,0)
-SYSCALL(sys_sched_get_priority_max,1)
-SYSCALL(sys_sched_get_priority_min,1)
-SYSCALL(sys_sched_rr_get_interval,2)    /* 165 */
-SYSCALL(sys_nanosleep,2)
-SYSCALL(sys_mremap,4)
-SYSCALL(sys_accept, 3)
-SYSCALL(sys_bind, 3)
-SYSCALL(sys_connect, 3)                 /* 170 */
-SYSCALL(sys_getpeername, 3)
-SYSCALL(sys_getsockname, 3)
-SYSCALL(sys_getsockopt, 5)
-SYSCALL(sys_listen, 2)
-SYSCALL(sys_recv, 4)                    /* 175 */
-SYSCALL(sys_recvfrom, 6)
-SYSCALL(sys_recvmsg, 3)
-SYSCALL(sys_send, 4)
-SYSCALL(sys_sendmsg, 3)
-SYSCALL(sys_sendto, 6)                  /* 180 */
-SYSCALL(sys_setsockopt, 5)
-SYSCALL(sys_shutdown, 2)
-SYSCALL(sys_socket, 3)
-SYSCALL(sys_socketpair, 4)
-SYSCALL(sys_setresuid, 3)               /* 185 */
-SYSCALL(sys_getresuid, 3)
-SYSCALL(sys_ni_syscall, 5)
-SYSCALL(sys_poll, 3)
-SYSCALL(sys_nfsservctl, 3)
-SYSCALL(sys_setresgid, 3)               /* 190 */
-SYSCALL(sys_getresgid, 3)
-SYSCALL(sys_prctl, 5)
-SYSCALL(sys_rt_sigreturn, 0)
-SYSCALL(sys_rt_sigaction, 4)
-SYSCALL(sys_rt_sigprocmask, 4)          /* 195 */
-SYSCALL(sys_rt_sigpending, 2)
-SYSCALL(sys_rt_sigtimedwait, 4)
-SYSCALL(sys_rt_sigqueueinfo, 3)
-SYSCALL(sys_rt_sigsuspend, 0)
-SYSCALL(sys_pread64, 5)                 /* 200 */
-SYSCALL(sys_pwrite64, 5)
-SYSCALL(sys_chown, 3)
-SYSCALL(sys_getcwd, 2)
-SYSCALL(sys_capget, 2)
-SYSCALL(sys_capset, 2)                  /* 205 */
-SYSCALL(sys_sigaltstack, 0)
-SYSCALL(sys_sendfile, 4)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_mmap, 6)                    /* 210 */
-SYSCALL(sys_truncate64, 2)
-SYSCALL(sys_ftruncate64, 2)
-SYSCALL(sys_stat64, 2)
-SYSCALL(sys_lstat64, 2)
-SYSCALL(sys_fstat64, 2)                 /* 215 */
-SYSCALL(sys_pivot_root, 2)
-SYSCALL(sys_mincore, 3)
-SYSCALL(sys_madvise, 3)
-SYSCALL(sys_getdents64, 3)
-SYSCALL(sys_ni_syscall, 0)              /* 220 */
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 37347e369987..a350431363a0 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -47,7 +47,7 @@ unsigned long long sched_clock(void)
         return (unsigned long long)jiffies * (1000000000 / HZ);
 }
 
-static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t timer_interrupt(int irq, void *dev_id);
 static struct irqaction timer_irqaction = {
         .handler =      timer_interrupt,
         .flags =        IRQF_DISABLED,
@@ -150,7 +150,7 @@ EXPORT_SYMBOL(do_gettimeofday);
  * The timer interrupt is called HZ times per second.
  */
 
-irqreturn_t timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t timer_interrupt (int irq, void *dev_id)
 {
 
         unsigned long next;
@@ -160,9 +160,9 @@ irqreturn_t timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
 again:
         while ((signed long)(get_ccount() - next) > 0) {
 
-                profile_tick(CPU_PROFILING, regs);
+                profile_tick(CPU_PROFILING);
 #ifndef CONFIG_SMP
-                update_process_times(user_mode(regs));
+                update_process_times(user_mode(get_irq_regs()));
 #endif
 
                 write_seqlock(&xtime_lock);
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index ce077d6bf3a0..693ab268485e 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -75,7 +75,7 @@ extern void system_call (struct pt_regs*);
 #define USER            0x02
 
 #define COPROCESSOR(x)                                                  \
-{ XCHAL_EXCCAUSE_COPROCESSOR ## x ## _DISABLED, USER, fast_coprocessor }
+{ EXCCAUSE_COPROCESSOR ## x ## _DISABLED, USER, fast_coprocessor }
 
 typedef struct {
         int cause;
@@ -85,38 +85,38 @@ typedef struct {
 
 dispatch_init_table_t __init dispatch_init_table[] = {
 
-{ XCHAL_EXCCAUSE_ILLEGAL_INSTRUCTION,   0,         do_illegal_instruction},
-{ XCHAL_EXCCAUSE_SYSTEM_CALL,           KRNL,      fast_syscall_kernel },
-{ XCHAL_EXCCAUSE_SYSTEM_CALL,           USER,      fast_syscall_user },
-{ XCHAL_EXCCAUSE_SYSTEM_CALL,           0,         system_call },
-/* XCHAL_EXCCAUSE_INSTRUCTION_FETCH unhandled */
-/* XCHAL_EXCCAUSE_LOAD_STORE_ERROR unhandled*/
-{ XCHAL_EXCCAUSE_LEVEL1_INTERRUPT,      0,         do_interrupt },
-{ XCHAL_EXCCAUSE_ALLOCA,                USER|KRNL, fast_alloca },
-/* XCHAL_EXCCAUSE_INTEGER_DIVIDE_BY_ZERO unhandled */
-/* XCHAL_EXCCAUSE_PRIVILEGED unhandled */
+{ EXCCAUSE_ILLEGAL_INSTRUCTION, 0,         do_illegal_instruction},
+{ EXCCAUSE_SYSTEM_CALL,         KRNL,      fast_syscall_kernel },
+{ EXCCAUSE_SYSTEM_CALL,         USER,      fast_syscall_user },
+{ EXCCAUSE_SYSTEM_CALL,         0,         system_call },
+/* EXCCAUSE_INSTRUCTION_FETCH unhandled */
+/* EXCCAUSE_LOAD_STORE_ERROR unhandled*/
+{ EXCCAUSE_LEVEL1_INTERRUPT,    0,         do_interrupt },
+{ EXCCAUSE_ALLOCA,              USER|KRNL, fast_alloca },
+/* EXCCAUSE_INTEGER_DIVIDE_BY_ZERO unhandled */
+/* EXCCAUSE_PRIVILEGED unhandled */
 #if XCHAL_UNALIGNED_LOAD_EXCEPTION || XCHAL_UNALIGNED_STORE_EXCEPTION
 #ifdef CONFIG_UNALIGNED_USER
-{ XCHAL_EXCCAUSE_UNALIGNED,             USER,      fast_unaligned },
+{ EXCCAUSE_UNALIGNED,           USER,      fast_unaligned },
 #else
-{ XCHAL_EXCCAUSE_UNALIGNED,             0,         do_unaligned_user },
+{ EXCCAUSE_UNALIGNED,           0,         do_unaligned_user },
 #endif
-{ XCHAL_EXCCAUSE_UNALIGNED,             KRNL,      fast_unaligned },
+{ EXCCAUSE_UNALIGNED,           KRNL,      fast_unaligned },
 #endif
-{ XCHAL_EXCCAUSE_ITLB_MISS,             0,         do_page_fault },
-{ XCHAL_EXCCAUSE_ITLB_MISS,             USER|KRNL, fast_second_level_miss},
-{ XCHAL_EXCCAUSE_ITLB_MULTIHIT,         0,         do_multihit },
-{ XCHAL_EXCCAUSE_ITLB_PRIVILEGE,        0,         do_page_fault },
-/* XCHAL_EXCCAUSE_SIZE_RESTRICTION unhandled */
-{ XCHAL_EXCCAUSE_FETCH_CACHE_ATTRIBUTE, 0,         do_page_fault },
-{ XCHAL_EXCCAUSE_DTLB_MISS,             USER|KRNL, fast_second_level_miss},
-{ XCHAL_EXCCAUSE_DTLB_MISS,             0,         do_page_fault },
-{ XCHAL_EXCCAUSE_DTLB_MULTIHIT,         0,         do_multihit },
-{ XCHAL_EXCCAUSE_DTLB_PRIVILEGE,        0,         do_page_fault },
-/* XCHAL_EXCCAUSE_DTLB_SIZE_RESTRICTION unhandled */
-{ XCHAL_EXCCAUSE_STORE_CACHE_ATTRIBUTE, USER|KRNL, fast_store_prohibited },
-{ XCHAL_EXCCAUSE_STORE_CACHE_ATTRIBUTE, 0,         do_page_fault },
-{ XCHAL_EXCCAUSE_LOAD_CACHE_ATTRIBUTE,  0,         do_page_fault },
+{ EXCCAUSE_ITLB_MISS,           0,         do_page_fault },
+{ EXCCAUSE_ITLB_MISS,           USER|KRNL, fast_second_level_miss},
+{ EXCCAUSE_ITLB_MULTIHIT,               0,         do_multihit },
+{ EXCCAUSE_ITLB_PRIVILEGE,      0,         do_page_fault },
+/* EXCCAUSE_SIZE_RESTRICTION unhandled */
+{ EXCCAUSE_FETCH_CACHE_ATTRIBUTE,       0,         do_page_fault },
+{ EXCCAUSE_DTLB_MISS,           USER|KRNL, fast_second_level_miss},
+{ EXCCAUSE_DTLB_MISS,           0,         do_page_fault },
+{ EXCCAUSE_DTLB_MULTIHIT,               0,         do_multihit },
+{ EXCCAUSE_DTLB_PRIVILEGE,      0,         do_page_fault },
+/* EXCCAUSE_DTLB_SIZE_RESTRICTION unhandled */
+{ EXCCAUSE_STORE_CACHE_ATTRIBUTE,       USER|KRNL, fast_store_prohibited },
+{ EXCCAUSE_STORE_CACHE_ATTRIBUTE,       0,         do_page_fault },
+{ EXCCAUSE_LOAD_CACHE_ATTRIBUTE,        0,         do_page_fault },
 /* XCCHAL_EXCCAUSE_FLOATING_POINT unhandled */
 #if (XCHAL_CP_MASK & 1)
 COPROCESSOR(0),
diff --git a/arch/xtensa/kernel/vectors.S b/arch/xtensa/kernel/vectors.S
index 0e74397bfa2b..eb2d7bb69ee0 100644
--- a/arch/xtensa/kernel/vectors.S
+++ b/arch/xtensa/kernel/vectors.S
@@ -53,6 +53,8 @@
 #include <asm/thread_info.h>
 #include <asm/processor.h>
 
+#define WINDOW_VECTORS_SIZE   0x180
+
 
 /*
  * User exception vector. (Exceptions with PS.UM == 1, PS.EXCM == 0)
@@ -210,7 +212,7 @@ ENTRY(_DoubleExceptionVector)
         /* Check for kernel double exception (usually fatal). */
 
         rsr     a3, PS
-        _bbci.l a3, PS_UM_SHIFT, .Lksp
+        _bbci.l a3, PS_UM_BIT, .Lksp
 
         /* Check if we are currently handling a window exception. */
         /* Note: We don't need to indicate that we enter a critical section. */
@@ -219,7 +221,7 @@ ENTRY(_DoubleExceptionVector)
 
         movi    a3, XCHAL_WINDOW_VECTORS_VADDR
         _bltu   a0, a3, .Lfixup
-        addi    a3, a3, XSHAL_WINDOW_VECTORS_SIZE
+        addi    a3, a3, WINDOW_VECTORS_SIZE
         _bgeu   a0, a3, .Lfixup
 
         /* Window overflow/underflow exception. Get stack pointer. */
@@ -245,7 +247,7 @@ ENTRY(_DoubleExceptionVector)
 
         wsr     a2, DEPC                # save stack pointer temporarily
         rsr     a0, PS
-        extui   a0, a0, XCHAL_PS_OWB_SHIFT, XCHAL_PS_OWB_BITS
+        extui   a0, a0, PS_OWB_SHIFT, 4
         wsr     a0, WINDOWBASE
         rsync
 
@@ -312,8 +314,8 @@ ENTRY(_DoubleExceptionVector)
 .Lksp:  /* a0: a0, a1: a1, a2: a2, a3: trashed, depc: depc, excsave: a3 */
 
         rsr     a3, EXCCAUSE
-        beqi    a3, XCHAL_EXCCAUSE_ITLB_MISS, 1f
-        addi    a3, a3, -XCHAL_EXCCAUSE_DTLB_MISS
+        beqi    a3, EXCCAUSE_ITLB_MISS, 1f
+        addi    a3, a3, -EXCCAUSE_DTLB_MISS
         bnez    a3, .Lunrecoverable
 1:      movi    a3, fast_second_level_miss_double_kernel
         jx      a3
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S
index cfe75f528725..a36c104c3a52 100644
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@ -16,19 +16,17 @@
 
 #include <asm-generic/vmlinux.lds.h>
 
-#define _NOCLANGUAGE
-#include <xtensa/config/core.h>
-#include <xtensa/config/system.h>
+#include <asm/variant/core.h>
 OUTPUT_ARCH(xtensa)
 ENTRY(_start)
 
-#if XCHAL_MEMORY_ORDER == XTHAL_BIGENDIAN
+#ifdef __XTENSA_EB__
 jiffies = jiffies_64 + 4;
 #else
 jiffies = jiffies_64;
 #endif
 
-#define KERNELOFFSET 0x1000
+#define KERNELOFFSET 0xd0001000
 
 /* Note: In the following macros, it would be nice to specify only the
    vector name and section kind and construct "sym" and "section" using
@@ -75,7 +73,7 @@ jiffies = jiffies_64;
 
 SECTIONS
 {
-  . = XCHAL_KSEG_CACHED_VADDR + KERNELOFFSET;
+  . = KERNELOFFSET;
   /* .text section */
 
   _text = .;
@@ -159,7 +157,7 @@ SECTIONS
 
   /* Initialization code and data: */
 
-  . = ALIGN(1<<XCHAL_MMU_MIN_PTE_PAGE_SIZE);
+  . = ALIGN(1 << 12);
   __init_begin = .;
   .init.text : {
         _sinittext = .;
@@ -223,32 +221,32 @@ SECTIONS
                   .dummy)
   SECTION_VECTOR (_DebugInterruptVector_literal,
                   .DebugInterruptVector.literal,
-                  XCHAL_INTLEVEL_VECTOR_VADDR(XCHAL_DEBUGLEVEL) - 4,
+                  XCHAL_DEBUG_VECTOR_VADDR - 4,
                   SIZEOF(.WindowVectors.text),
                   .WindowVectors.text)
   SECTION_VECTOR (_DebugInterruptVector_text,
                   .DebugInterruptVector.text,
-                  XCHAL_INTLEVEL_VECTOR_VADDR(XCHAL_DEBUGLEVEL),
+                  XCHAL_DEBUG_VECTOR_VADDR,
                   4,
                   .DebugInterruptVector.literal)
   SECTION_VECTOR (_KernelExceptionVector_literal,
                   .KernelExceptionVector.literal,
-                  XCHAL_KERNELEXC_VECTOR_VADDR - 4,
+                  XCHAL_KERNEL_VECTOR_VADDR - 4,
                   SIZEOF(.DebugInterruptVector.text),
                   .DebugInterruptVector.text)
   SECTION_VECTOR (_KernelExceptionVector_text,
                   .KernelExceptionVector.text,
-                  XCHAL_KERNELEXC_VECTOR_VADDR,
+                  XCHAL_KERNEL_VECTOR_VADDR,
                   4,
                   .KernelExceptionVector.literal)
   SECTION_VECTOR (_UserExceptionVector_literal,
                   .UserExceptionVector.literal,
-                  XCHAL_USEREXC_VECTOR_VADDR - 4,
+                  XCHAL_USER_VECTOR_VADDR - 4,
                   SIZEOF(.KernelExceptionVector.text),
                   .KernelExceptionVector.text)
   SECTION_VECTOR (_UserExceptionVector_text,
                   .UserExceptionVector.text,
-                  XCHAL_USEREXC_VECTOR_VADDR,
+                  XCHAL_USER_VECTOR_VADDR,
                   4,
                   .UserExceptionVector.literal)
   SECTION_VECTOR (_DoubleExceptionVector_literal,
@@ -263,7 +261,7 @@ SECTIONS
                   .DoubleExceptionVector.literal)
 
   . = (LOADADDR( .DoubleExceptionVector.text ) + SIZEOF( .DoubleExceptionVector.text ) + 3) & ~ 3;
-  . = ALIGN(1<<XCHAL_MMU_MIN_PTE_PAGE_SIZE);
+  . = ALIGN(1 << 12);
 
   __init_end = .;
 
diff --git a/arch/xtensa/lib/checksum.S b/arch/xtensa/lib/checksum.S
index e2d64dfd530c..9d9cd990afa6 100644
--- a/arch/xtensa/lib/checksum.S
+++ b/arch/xtensa/lib/checksum.S
@@ -16,8 +16,7 @@
 
 #include <asm/errno.h>
 #include <linux/linkage.h>
-#define _ASMLANGUAGE
-#include <xtensa/config/core.h>
+#include <asm/variant/core.h>
 
 /*
  * computes a partial checksum, e.g. for TCP/UDP fragments
diff --git a/arch/xtensa/lib/memcopy.S b/arch/xtensa/lib/memcopy.S
index e8f6d7eb7222..ddda8f4bc862 100644
--- a/arch/xtensa/lib/memcopy.S
+++ b/arch/xtensa/lib/memcopy.S
@@ -9,7 +9,7 @@
  * Copyright (C) 2002 - 2005 Tensilica Inc.
  */
 
-#include <xtensa/coreasm.h>
+#include <asm/variant/core.h>
 
         .macro  src_b   r, w0, w1
 #ifdef __XTENSA_EB__
diff --git a/arch/xtensa/lib/memset.S b/arch/xtensa/lib/memset.S
index 4de25134bc62..56a17495b2db 100644
--- a/arch/xtensa/lib/memset.S
+++ b/arch/xtensa/lib/memset.S
@@ -11,7 +11,7 @@
  *  Copyright (C) 2002 Tensilica Inc.
  */
 
-#include <xtensa/coreasm.h>
+#include <asm/variant/core.h>
 
 /*
  * void *memset(void *dst, int c, size_t length)
diff --git a/arch/xtensa/lib/strncpy_user.S b/arch/xtensa/lib/strncpy_user.S
index 71d55df43893..a834057bda6b 100644
--- a/arch/xtensa/lib/strncpy_user.S
+++ b/arch/xtensa/lib/strncpy_user.S
@@ -11,7 +11,7 @@
  *  Copyright (C) 2002 Tensilica Inc.
  */
 
-#include <xtensa/coreasm.h>
+#include <asm/variant/core.h>
 #include <linux/errno.h>
 
 /* Load or store instructions that may cause exceptions use the EX macro. */
diff --git a/arch/xtensa/lib/strnlen_user.S b/arch/xtensa/lib/strnlen_user.S
index cdff4d670f3b..5e9c1e709b2e 100644
--- a/arch/xtensa/lib/strnlen_user.S
+++ b/arch/xtensa/lib/strnlen_user.S
@@ -11,7 +11,7 @@
  *  Copyright (C) 2002 Tensilica Inc.
  */
 
-#include <xtensa/coreasm.h>
+#include <asm/variant/core.h>
 
 /* Load or store instructions that may cause exceptions use the EX macro. */
 
diff --git a/arch/xtensa/lib/usercopy.S b/arch/xtensa/lib/usercopy.S
index 4641ef510f0e..a8ab1d4fe0ae 100644
--- a/arch/xtensa/lib/usercopy.S
+++ b/arch/xtensa/lib/usercopy.S
@@ -53,7 +53,7 @@
  *      a11/ original length
  */
 
-#include <xtensa/coreasm.h>
+#include <asm/variant/core.h>
 
 #ifdef __XTENSA_EB__
 #define ALIGN(R, W0, W1) src    R, W0, W1
diff --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c
index dd0dbec2e57e..3dc6f2f07bbe 100644
--- a/arch/xtensa/mm/fault.c
+++ b/arch/xtensa/mm/fault.c
@@ -21,7 +21,7 @@
 #include <asm/system.h>
 #include <asm/pgalloc.h>
 
-unsigned long asid_cache = ASID_FIRST_VERSION;
+unsigned long asid_cache = ASID_USER_FIRST;
 void bad_page_fault(struct pt_regs*, unsigned long, int);
 
 /*
@@ -58,10 +58,10 @@ void do_page_fault(struct pt_regs *regs)
                 return;
         }
 
-        is_write = (exccause == XCHAL_EXCCAUSE_STORE_CACHE_ATTRIBUTE) ? 1 : 0;
-        is_exec =  (exccause == XCHAL_EXCCAUSE_ITLB_PRIVILEGE ||
-                    exccause == XCHAL_EXCCAUSE_ITLB_MISS ||
-                    exccause == XCHAL_EXCCAUSE_FETCH_CACHE_ATTRIBUTE) ? 1 : 0;
+        is_write = (exccause == EXCCAUSE_STORE_CACHE_ATTRIBUTE) ? 1 : 0;
+        is_exec =  (exccause == EXCCAUSE_ITLB_PRIVILEGE ||
+                    exccause == EXCCAUSE_ITLB_MISS ||
+                    exccause == EXCCAUSE_FETCH_CACHE_ATTRIBUTE) ? 1 : 0;
 
 #if 0
         printk("[%s:%d:%08x:%d:%08x:%s%s]\n", current->comm, current->pid,
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index 660ef058c149..e1ec2d1e8189 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -141,8 +141,8 @@ void __init bootmem_init(void)
         if (min_low_pfn > max_pfn)
                 panic("No memory found!\n");
 
-        max_low_pfn = max_pfn < MAX_LOW_MEMORY >> PAGE_SHIFT ?
-                max_pfn : MAX_LOW_MEMORY >> PAGE_SHIFT;
+        max_low_pfn = max_pfn < MAX_MEM_PFN >> PAGE_SHIFT ?
+                max_pfn : MAX_MEM_PFN >> PAGE_SHIFT;
 
         /* Find an area to use for the bootmem bitmap. */
 
@@ -215,7 +215,7 @@ void __init init_mmu (void)
 
         /* Set rasid register to a known value. */
 
-        set_rasid_register (ASID_ALL_RESERVED);
+        set_rasid_register (ASID_USER_FIRST);
 
         /* Set PTEVADDR special register to the start of the page
          * table, which is in kernel mappable space (ie. not
diff --git a/arch/xtensa/mm/misc.S b/arch/xtensa/mm/misc.S
index 327c0f17187c..ae085332c607 100644
--- a/arch/xtensa/mm/misc.S
+++ b/arch/xtensa/mm/misc.S
@@ -19,9 +19,8 @@
 #include <linux/linkage.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-
-#include <xtensa/cacheasm.h>
-#include <xtensa/cacheattrasm.h>
+#include <asm/asmmacro.h>
+#include <asm/cacheasm.h>
 
 /* clear_page (page) */
 
@@ -74,104 +73,66 @@ ENTRY(copy_page)
 
         retw
 
-
 /*
- * void __flush_invalidate_cache_all(void)
+ * void __invalidate_icache_page(ulong start)
  */
 
-ENTRY(__flush_invalidate_cache_all)
+ENTRY(__invalidate_icache_page)
         entry   sp, 16
-        dcache_writeback_inv_all a2, a3
-        icache_invalidate_all a2, a3
-        retw
 
-/*
- * void __invalidate_icache_all(void)
- */
+        ___invalidate_icache_page a2 a3
+        isync
 
-ENTRY(__invalidate_icache_all)
-        entry   sp, 16
-        icache_invalidate_all a2, a3
         retw
 
 /*
- * void __flush_invalidate_dcache_all(void)
+ * void __invalidate_dcache_page(ulong start)
  */
 
-ENTRY(__flush_invalidate_dcache_all)
+ENTRY(__invalidate_dcache_page)
         entry   sp, 16
-        dcache_writeback_inv_all a2, a3
-        retw
-
 
-/*
- * void __flush_invalidate_cache_range(ulong start, ulong size)
- */
+        ___invalidate_dcache_page a2 a3
+        dsync
 
-ENTRY(__flush_invalidate_cache_range)
-        entry   sp, 16
-        mov     a4, a2
-        mov     a5, a3
-        dcache_writeback_inv_region a4, a5, a6
-        icache_invalidate_region a2, a3, a4
         retw
 
 /*
- * void __invalidate_icache_page(ulong start)
+ * void __flush_invalidate_dcache_page(ulong start)
  */
 
-ENTRY(__invalidate_icache_page)
+ENTRY(__flush_invalidate_dcache_page)
         entry   sp, 16
-        movi    a3, PAGE_SIZE
-        icache_invalidate_region a2, a3, a4
-        retw
 
-/*
- * void __invalidate_dcache_page(ulong start)
- */
+        ___flush_invalidate_dcache_page a2 a3
 
-ENTRY(__invalidate_dcache_page)
-        entry   sp, 16
-        movi    a3, PAGE_SIZE
-        dcache_invalidate_region a2, a3, a4
+        dsync
         retw
 
 /*
- * void __invalidate_icache_range(ulong start, ulong size)
+ * void __flush_dcache_page(ulong start)
  */
 
-ENTRY(__invalidate_icache_range)
+ENTRY(__flush_dcache_page)
         entry   sp, 16
-        icache_invalidate_region a2, a3, a4
-        retw
 
-/*
- * void __invalidate_dcache_range(ulong start, ulong size)
- */
+        ___flush_dcache_page a2 a3
 
-ENTRY(__invalidate_dcache_range)
-        entry   sp, 16
-        dcache_invalidate_region a2, a3, a4
+        dsync
         retw
 
-/*
- * void __flush_dcache_page(ulong start)
- */
 
-ENTRY(__flush_dcache_page)
-        entry   sp, 16
-        movi    a3, PAGE_SIZE
-        dcache_writeback_region a2, a3, a4
-        retw
 
 /*
- * void __flush_invalidate_dcache_page(ulong start)
+ * void __invalidate_icache_range(ulong start, ulong size)
  */
 
-ENTRY(__flush_invalidate_dcache_page)
+ENTRY(__invalidate_icache_range)
         entry   sp, 16
-        movi    a3, PAGE_SIZE
-        dcache_writeback_inv_region a2, a3, a4
+
+        ___invalidate_icache_range a2 a3 a4
+        isync
+
         retw
 
 /*
@@ -180,195 +141,69 @@ ENTRY(__flush_invalidate_dcache_page)
 
 ENTRY(__flush_invalidate_dcache_range)
         entry   sp, 16
-        dcache_writeback_inv_region a2, a3, a4
-        retw
 
-/*
- * void __invalidate_dcache_all(void)
- */
+        ___flush_invalidate_dcache_range a2 a3 a4
+        dsync
 
-ENTRY(__invalidate_dcache_all)
-        entry   sp, 16
-        dcache_invalidate_all a2, a3
         retw
 
 /*
- * void __flush_invalidate_dcache_page_phys(ulong start)
+ * void _flush_dcache_range(ulong start, ulong size)
  */
 
-ENTRY(__flush_invalidate_dcache_page_phys)
+ENTRY(__flush_dcache_range)
         entry   sp, 16
 
-        movi    a3, XCHAL_DCACHE_SIZE
-        movi    a4, PAGE_MASK | 1
-        addi    a2, a2, 1
-
-1:      addi    a3, a3, -XCHAL_DCACHE_LINESIZE
-
-        ldct    a6, a3
+        ___flush_dcache_range a2 a3 a4
         dsync
-        and     a6, a6, a4
-        beq     a6, a2, 2f
-        bgeui   a3, 2, 1b
-        retw
 
-2:      diwbi   a3, 0
-        bgeui   a3, 2, 1b
         retw
 
-ENTRY(check_dcache_low0)
-        entry   sp, 16
-
-        movi    a3, XCHAL_DCACHE_SIZE / 4
-        movi    a4, PAGE_MASK | 1
-        addi    a2, a2, 1
-
-1:      addi    a3, a3, -XCHAL_DCACHE_LINESIZE
-
-        ldct    a6, a3
-        dsync
-        and     a6, a6, a4
-        beq     a6, a2, 2f
-        bgeui   a3, 2, 1b
-        retw
-
-2:      j 2b
-
-ENTRY(check_dcache_high0)
-        entry   sp, 16
-
-        movi    a5, XCHAL_DCACHE_SIZE / 4
-        movi    a3, XCHAL_DCACHE_SIZE / 2
-        movi    a4, PAGE_MASK | 1
-        addi    a2, a2, 1
-
-1:      addi    a3, a3, -XCHAL_DCACHE_LINESIZE
-        addi    a5, a5, -XCHAL_DCACHE_LINESIZE
-
-        ldct    a6, a3
-        dsync
-        and     a6, a6, a4
-        beq     a6, a2, 2f
-        bgeui   a5, 2, 1b
-        retw
-
-2:      j 2b
+/*
+ * void _invalidate_dcache_range(ulong start, ulong size)
+ */
 
-ENTRY(check_dcache_low1)
+ENTRY(__invalidate_dcache_range)
         entry   sp, 16
 
-        movi    a5, XCHAL_DCACHE_SIZE / 4
-        movi    a3, XCHAL_DCACHE_SIZE * 3 / 4
-        movi    a4, PAGE_MASK | 1
-        addi    a2, a2, 1
+        ___invalidate_dcache_range a2 a3 a4
 
-1:      addi    a3, a3, -XCHAL_DCACHE_LINESIZE
-        addi    a5, a5, -XCHAL_DCACHE_LINESIZE
 
-        ldct    a6, a3
-        dsync
-        and     a6, a6, a4
-        beq     a6, a2, 2f
-        bgeui   a5, 2, 1b
         retw
 
-2:      j 2b
+/*
+ * void _invalidate_icache_all(void)
+ */
 
-ENTRY(check_dcache_high1)
+ENTRY(__invalidate_icache_all)
         entry   sp, 16
 
-        movi    a5, XCHAL_DCACHE_SIZE / 4
-        movi    a3, XCHAL_DCACHE_SIZE
-        movi    a4, PAGE_MASK | 1
-        addi    a2, a2, 1
-
-1:      addi    a3, a3, -XCHAL_DCACHE_LINESIZE
-        addi    a5, a5, -XCHAL_DCACHE_LINESIZE
+        ___invalidate_icache_all a2 a3
+        isync
 
-        ldct    a6, a3
-        dsync
-        and     a6, a6, a4
-        beq     a6, a2, 2f
-        bgeui   a5, 2, 1b
         retw
 
-2:      j 2b
-
-
 /*
- * void __invalidate_icache_page_phys(ulong start)
+ * void _flush_invalidate_dcache_all(void)
  */
 
-ENTRY(__invalidate_icache_page_phys)
+ENTRY(__flush_invalidate_dcache_all)
         entry   sp, 16
 
-        movi    a3, XCHAL_ICACHE_SIZE
-        movi    a4, PAGE_MASK | 1
-        addi    a2, a2, 1
-
-1:      addi    a3, a3, -XCHAL_ICACHE_LINESIZE
-
-        lict    a6, a3
-        isync
-        and     a6, a6, a4
-        beq     a6, a2, 2f
-        bgeui   a3, 2, 1b
-        retw
+        ___flush_invalidate_dcache_all a2 a3
+        dsync
 
-2:      iii     a3, 0
-        bgeui   a3, 2, 1b
         retw
 
+/*
+ * void _invalidate_dcache_all(void)
+ */
 
-#if 0
-
-        movi    a3, XCHAL_DCACHE_WAYS - 1
-        movi    a4, PAGE_SIZE
-
-1:      mov     a5, a2
-        add     a6, a2, a4
-
-2:      diwbi   a5, 0
-        diwbi   a5, XCHAL_DCACHE_LINESIZE
-        diwbi   a5, XCHAL_DCACHE_LINESIZE * 2
-        diwbi   a5, XCHAL_DCACHE_LINESIZE * 3
-
-        addi    a5, a5, XCHAL_DCACHE_LINESIZE * 4
-        blt     a5, a6, 2b
-
-        addi    a3, a3, -1
-        addi    a2, a2, XCHAL_DCACHE_SIZE / XCHAL_DCACHE_WAYS
-        bgez    a3, 1b
-
-        retw
-
-ENTRY(__invalidate_icache_page_index)
+ENTRY(__invalidate_dcache_all)
         entry   sp, 16
 
-        movi    a3, XCHAL_ICACHE_WAYS - 1
-        movi    a4, PAGE_SIZE
-
-1:      mov     a5, a2
-        add     a6, a2, a4
-
-2:      iii     a5, 0
-        iii     a5, XCHAL_ICACHE_LINESIZE
-        iii     a5, XCHAL_ICACHE_LINESIZE * 2
-        iii     a5, XCHAL_ICACHE_LINESIZE * 3
-
-        addi    a5, a5, XCHAL_ICACHE_LINESIZE * 4
-        blt     a5, a6, 2b
-
-        addi    a3, a3, -1
-        addi    a2, a2, XCHAL_ICACHE_SIZE / XCHAL_ICACHE_WAYS
-        bgez    a3, 2b
+        ___invalidate_dcache_all a2 a3
+        dsync
 
         retw
 
-#endif
-
-
-
-
-
-
diff --git a/arch/xtensa/mm/tlb.c b/arch/xtensa/mm/tlb.c
index 0fefb8666874..239461d8ea88 100644
--- a/arch/xtensa/mm/tlb.c
+++ b/arch/xtensa/mm/tlb.c
@@ -24,12 +24,12 @@
 
 static inline void __flush_itlb_all (void)
 {
-        int way, index;
+        int w, i;
 
-        for (way = 0; way < XCHAL_ITLB_ARF_WAYS; way++) {
-                for (index = 0; index < ITLB_ENTRIES_PER_ARF_WAY; index++) {
-                        int entry = way + (index << PAGE_SHIFT);
-                        invalidate_itlb_entry_no_isync (entry);
+        for (w = 0; w < ITLB_ARF_WAYS; w++) {
+                for (i = 0; i < (1 << XCHAL_ITLB_ARF_ENTRIES_LOG2); i++) {
+                        int e = w + (i << PAGE_SHIFT);
+                        invalidate_itlb_entry_no_isync(e);
                 }
         }
         asm volatile ("isync\n");
@@ -37,12 +37,12 @@ static inline void __flush_itlb_all (void)
 
 static inline void __flush_dtlb_all (void)
 {
-        int way, index;
+        int w, i;
 
-        for (way = 0; way < XCHAL_DTLB_ARF_WAYS; way++) {
-                for (index = 0; index < DTLB_ENTRIES_PER_ARF_WAY; index++) {
-                        int entry = way + (index << PAGE_SHIFT);
-                        invalidate_dtlb_entry_no_isync (entry);
+        for (w = 0; w < DTLB_ARF_WAYS; w++) {
+                for (i = 0; i < (1 << XCHAL_DTLB_ARF_ENTRIES_LOG2); i++) {
+                        int e = w + (i << PAGE_SHIFT);
+                        invalidate_dtlb_entry_no_isync(e);
                 }
         }
         asm volatile ("isync\n");
@@ -63,21 +63,25 @@ void flush_tlb_all (void)
 
 void flush_tlb_mm(struct mm_struct *mm)
 {
-#if 0
-        printk("[tlbmm<%lx>]\n", (unsigned long)mm->context);
-#endif
-
         if (mm == current->active_mm) {
                 int flags;
                 local_save_flags(flags);
-                get_new_mmu_context(mm, asid_cache);
-                set_rasid_register(ASID_INSERT(mm->context));
+                __get_new_mmu_context(mm);
+                __load_mmu_context(mm);
                 local_irq_restore(flags);
         }
         else
                 mm->context = 0;
 }
 
+#define _ITLB_ENTRIES (ITLB_ARF_WAYS << XCHAL_ITLB_ARF_ENTRIES_LOG2)
+#define _DTLB_ENTRIES (DTLB_ARF_WAYS << XCHAL_DTLB_ARF_ENTRIES_LOG2)
+#if _ITLB_ENTRIES > _DTLB_ENTRIES
+# define _TLB_ENTRIES _ITLB_ENTRIES
+#else
+# define _TLB_ENTRIES _DTLB_ENTRIES
+#endif
+
 void flush_tlb_range (struct vm_area_struct *vma,
                       unsigned long start, unsigned long end)
 {
@@ -93,7 +97,7 @@ void flush_tlb_range (struct vm_area_struct *vma,
 #endif
         local_save_flags(flags);
 
-        if (end-start + (PAGE_SIZE-1) <= SMALLEST_NTLB_ENTRIES << PAGE_SHIFT) {
+        if (end-start + (PAGE_SIZE-1) <= _TLB_ENTRIES << PAGE_SHIFT) {
                 int oldpid = get_rasid_register();
                 set_rasid_register (ASID_INSERT(mm->context));
                 start &= PAGE_MASK;
@@ -111,9 +115,7 @@ void flush_tlb_range (struct vm_area_struct *vma,
 
                 set_rasid_register(oldpid);
         } else {
-                get_new_mmu_context(mm, asid_cache);
-                if (mm == current->active_mm)
-                        set_rasid_register(ASID_INSERT(mm->context));
+                flush_tlb_mm(mm);
         }
         local_irq_restore(flags);
 }
@@ -123,10 +125,6 @@ void flush_tlb_page (struct vm_area_struct *vma, unsigned long page)
         struct mm_struct* mm = vma->vm_mm;
         unsigned long flags;
         int oldpid;
-#if 0
-        printk("[tlbpage<%02lx,%08lx>]\n",
-                        (unsigned long)mm->context, page);
-#endif
 
         if(mm->context == NO_CONTEXT)
                 return;
@@ -142,404 +140,5 @@ void flush_tlb_page (struct vm_area_struct *vma, unsigned long page)
         set_rasid_register(oldpid);
 
         local_irq_restore(flags);
-
-#if 0
-        flush_tlb_all();
-        return;
-#endif
-}
-
-
-#ifdef DEBUG_TLB
-
-#define USE_ITLB  0
-#define USE_DTLB  1
-
-struct way_config_t {
-        int indicies;
-        int indicies_log2;
-        int pgsz_log2;
-        int arf;
-};
-
-static struct way_config_t itlb[XCHAL_ITLB_WAYS] =
-{
-        { XCHAL_ITLB_SET(XCHAL_ITLB_WAY0_SET, ENTRIES),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY0_SET, ENTRIES_LOG2),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY0_SET, PAGESZ_LOG2_MIN),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY0_SET, ARF)
-        },
-        { XCHAL_ITLB_SET(XCHAL_ITLB_WAY1_SET, ENTRIES),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY1_SET, ENTRIES_LOG2),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY1_SET, PAGESZ_LOG2_MIN),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY1_SET, ARF)
-        },
-        { XCHAL_ITLB_SET(XCHAL_ITLB_WAY2_SET, ENTRIES),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY2_SET, ENTRIES_LOG2),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY2_SET, PAGESZ_LOG2_MIN),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY2_SET, ARF)
-        },
-        { XCHAL_ITLB_SET(XCHAL_ITLB_WAY3_SET, ENTRIES),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY3_SET, ENTRIES_LOG2),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY3_SET, PAGESZ_LOG2_MIN),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY3_SET, ARF)
-        },
-        { XCHAL_ITLB_SET(XCHAL_ITLB_WAY4_SET, ENTRIES),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY4_SET, ENTRIES_LOG2),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY4_SET, PAGESZ_LOG2_MIN),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY4_SET, ARF)
-        },
-        { XCHAL_ITLB_SET(XCHAL_ITLB_WAY5_SET, ENTRIES),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY5_SET, ENTRIES_LOG2),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY5_SET, PAGESZ_LOG2_MIN),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY5_SET, ARF)
-        },
-        { XCHAL_ITLB_SET(XCHAL_ITLB_WAY6_SET, ENTRIES),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY6_SET, ENTRIES_LOG2),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY6_SET, PAGESZ_LOG2_MIN),
-          XCHAL_ITLB_SET(XCHAL_ITLB_WAY6_SET, ARF)
-        }
-};
-
-static struct way_config_t dtlb[XCHAL_DTLB_WAYS] =
-{
-        { XCHAL_DTLB_SET(XCHAL_DTLB_WAY0_SET, ENTRIES),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY0_SET, ENTRIES_LOG2),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY0_SET, PAGESZ_LOG2_MIN),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY0_SET, ARF)
-        },
-        { XCHAL_DTLB_SET(XCHAL_DTLB_WAY1_SET, ENTRIES),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY1_SET, ENTRIES_LOG2),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY1_SET, PAGESZ_LOG2_MIN),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY1_SET, ARF)
-        },
-        { XCHAL_DTLB_SET(XCHAL_DTLB_WAY2_SET, ENTRIES),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY2_SET, ENTRIES_LOG2),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY2_SET, PAGESZ_LOG2_MIN),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY2_SET, ARF)
-        },
-        { XCHAL_DTLB_SET(XCHAL_DTLB_WAY3_SET, ENTRIES),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY3_SET, ENTRIES_LOG2),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY3_SET, PAGESZ_LOG2_MIN),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY3_SET, ARF)
-        },
-        { XCHAL_DTLB_SET(XCHAL_DTLB_WAY4_SET, ENTRIES),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY4_SET, ENTRIES_LOG2),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY4_SET, PAGESZ_LOG2_MIN),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY4_SET, ARF)
-        },
-        { XCHAL_DTLB_SET(XCHAL_DTLB_WAY5_SET, ENTRIES),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY5_SET, ENTRIES_LOG2),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY5_SET, PAGESZ_LOG2_MIN),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY5_SET, ARF)
-        },
-        { XCHAL_DTLB_SET(XCHAL_DTLB_WAY6_SET, ENTRIES),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY6_SET, ENTRIES_LOG2),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY6_SET, PAGESZ_LOG2_MIN),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY6_SET, ARF)
-        },
-        { XCHAL_DTLB_SET(XCHAL_DTLB_WAY7_SET, ENTRIES),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY7_SET, ENTRIES_LOG2),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY7_SET, PAGESZ_LOG2_MIN),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY7_SET, ARF)
-        },
-        { XCHAL_DTLB_SET(XCHAL_DTLB_WAY8_SET, ENTRIES),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY8_SET, ENTRIES_LOG2),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY8_SET, PAGESZ_LOG2_MIN),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY8_SET, ARF)
-        },
-        { XCHAL_DTLB_SET(XCHAL_DTLB_WAY9_SET, ENTRIES),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY9_SET, ENTRIES_LOG2),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY9_SET, PAGESZ_LOG2_MIN),
-          XCHAL_DTLB_SET(XCHAL_DTLB_WAY9_SET, ARF)
-        }
-};
-
-/*  Total number of entries:  */
-#define ITLB_TOTAL_ENTRIES      \
-                XCHAL_ITLB_SET(XCHAL_ITLB_WAY0_SET, ENTRIES) + \
-                XCHAL_ITLB_SET(XCHAL_ITLB_WAY1_SET, ENTRIES) + \
-                XCHAL_ITLB_SET(XCHAL_ITLB_WAY2_SET, ENTRIES) + \
-                XCHAL_ITLB_SET(XCHAL_ITLB_WAY3_SET, ENTRIES) + \
-                XCHAL_ITLB_SET(XCHAL_ITLB_WAY4_SET, ENTRIES) + \
-                XCHAL_ITLB_SET(XCHAL_ITLB_WAY5_SET, ENTRIES) + \
-                XCHAL_ITLB_SET(XCHAL_ITLB_WAY6_SET, ENTRIES)
-#define DTLB_TOTAL_ENTRIES      \
-                XCHAL_DTLB_SET(XCHAL_DTLB_WAY0_SET, ENTRIES) + \
-                XCHAL_DTLB_SET(XCHAL_DTLB_WAY1_SET, ENTRIES) + \
-                XCHAL_DTLB_SET(XCHAL_DTLB_WAY2_SET, ENTRIES) + \
-                XCHAL_DTLB_SET(XCHAL_DTLB_WAY3_SET, ENTRIES) + \
-                XCHAL_DTLB_SET(XCHAL_DTLB_WAY4_SET, ENTRIES) + \
-                XCHAL_DTLB_SET(XCHAL_DTLB_WAY5_SET, ENTRIES) + \
-                XCHAL_DTLB_SET(XCHAL_DTLB_WAY6_SET, ENTRIES) + \
-                XCHAL_DTLB_SET(XCHAL_DTLB_WAY7_SET, ENTRIES) + \
-                XCHAL_DTLB_SET(XCHAL_DTLB_WAY8_SET, ENTRIES) + \
-                XCHAL_DTLB_SET(XCHAL_DTLB_WAY9_SET, ENTRIES)
-
-
-typedef struct {
-    unsigned            va;
-    unsigned            pa;
-    unsigned char       asid;
-    unsigned char       ca;
-    unsigned char       way;
-    unsigned char       index;
-    unsigned char       pgsz_log2;      /* 0 .. 32 */
-    unsigned char       type;           /* 0=ITLB 1=DTLB */
-} tlb_dump_entry_t;
-
-/*  Return -1 if a precedes b, +1 if a follows b, 0 if same:  */
-int cmp_tlb_dump_info( tlb_dump_entry_t *a, tlb_dump_entry_t *b )
-{
-    if (a->asid < b->asid) return -1;
-    if (a->asid > b->asid) return  1;
-    if (a->va < b->va) return -1;
-    if (a->va > b->va) return  1;
-    if (a->pa < b->pa) return -1;
-    if (a->pa > b->pa) return  1;
-    if (a->ca < b->ca) return -1;
-    if (a->ca > b->ca) return  1;
-    if (a->way < b->way) return -1;
-    if (a->way > b->way) return  1;
-    if (a->index < b->index) return -1;
-    if (a->index > b->index) return  1;
-    return 0;
-}
-
-void sort_tlb_dump_info( tlb_dump_entry_t *t, int n )
-{
-    int i, j;
-    /*  Simple O(n*n) sort:  */
-    for (i = 0; i < n-1; i++)
-        for (j = i+1; j < n; j++)
-            if (cmp_tlb_dump_info(t+i, t+j) > 0) {
-                tlb_dump_entry_t tmp = t[i];
-                t[i] = t[j];
-                t[j] = tmp;
-            }
-}
-
-
-static tlb_dump_entry_t itlb_dump_info[ITLB_TOTAL_ENTRIES];
-static tlb_dump_entry_t dtlb_dump_info[DTLB_TOTAL_ENTRIES];
-
-
-static inline char *way_type (int type)
-{
-        return type ? "autorefill" : "non-autorefill";
-}
-
-void print_entry (struct way_config_t *way_info,
-                  unsigned int way,
-                  unsigned int index,
-                  unsigned int virtual,
-                  unsigned int translation)
-{
-        char valid_chr;
-        unsigned int va, pa, asid, ca;
-
-        va = virtual &
-                ~((1 << (way_info->pgsz_log2 + way_info->indicies_log2)) - 1);
-        asid = virtual & ((1 << XCHAL_MMU_ASID_BITS) - 1);
-        pa = translation & ~((1 << way_info->pgsz_log2) - 1);
-        ca = translation & ((1 << XCHAL_MMU_CA_BITS) - 1);
-        valid_chr = asid ? 'V' : 'I';
-
-        /* Compute and incorporate the effect of the index bits on the
-         * va.  It's more useful for kernel debugging, since we always
-         * want to know the effective va anyway. */
-
-        va += index << way_info->pgsz_log2;
-
-        printk ("\t[%d,%d] (%c) vpn 0x%.8x  ppn 0x%.8x  asid 0x%.2x  am 0x%x\n",
-                way, index, valid_chr, va, pa, asid, ca);
-}
-
-void print_itlb_entry (struct way_config_t *way_info, int way, int index)
-{
-        print_entry (way_info, way, index,
-                     read_itlb_virtual (way + (index << way_info->pgsz_log2)),
-                     read_itlb_translation (way + (index << way_info->pgsz_log2)));
-}
-
-void print_dtlb_entry (struct way_config_t *way_info, int way, int index)
-{
-        print_entry (way_info, way, index,
-                     read_dtlb_virtual (way + (index << way_info->pgsz_log2)),
-                     read_dtlb_translation (way + (index << way_info->pgsz_log2)));
-}
-
-void dump_itlb (void)
-{
-        int way, index;
-
-        printk ("\nITLB: ways = %d\n", XCHAL_ITLB_WAYS);
-
-        for (way = 0; way < XCHAL_ITLB_WAYS; way++) {
-                printk ("\nWay: %d, Entries: %d, MinPageSize: %d, Type: %s\n",
-                        way, itlb[way].indicies,
-                        itlb[way].pgsz_log2, way_type(itlb[way].arf));
-                for (index = 0; index < itlb[way].indicies; index++) {
-                        print_itlb_entry(&itlb[way], way, index);
-                }
-        }
-}
-
-void dump_dtlb (void)
-{
-        int way, index;
-
-        printk ("\nDTLB: ways = %d\n", XCHAL_DTLB_WAYS);
-
-        for (way = 0; way < XCHAL_DTLB_WAYS; way++) {
-                printk ("\nWay: %d, Entries: %d, MinPageSize: %d, Type: %s\n",
-                        way, dtlb[way].indicies,
-                        dtlb[way].pgsz_log2, way_type(dtlb[way].arf));
-                for (index = 0; index < dtlb[way].indicies; index++) {
-                        print_dtlb_entry(&dtlb[way], way, index);
-                }
-        }
-}
-
-void dump_tlb (tlb_dump_entry_t *tinfo, struct way_config_t *config,
-                int entries, int ways, int type, int show_invalid)
-{
-    tlb_dump_entry_t *e = tinfo;
-    int way, i;
-
-    /*  Gather all info:  */
-    for (way = 0; way < ways; way++) {
-        struct way_config_t *cfg = config + way;
-        for (i = 0; i < cfg->indicies; i++) {
-            unsigned wayindex = way + (i << cfg->pgsz_log2);
-            unsigned vv = (type ? read_dtlb_virtual (wayindex)
-                                : read_itlb_virtual (wayindex));
-            unsigned pp = (type ? read_dtlb_translation (wayindex)
-                                : read_itlb_translation (wayindex));
-
-            /* Compute and incorporate the effect of the index bits on the
-             * va.  It's more useful for kernel debugging, since we always
-             * want to know the effective va anyway. */
-
-            e->va = (vv & ~((1 << (cfg->pgsz_log2 + cfg->indicies_log2)) - 1));
-            e->va += (i << cfg->pgsz_log2);
-            e->pa = (pp & ~((1 << cfg->pgsz_log2) - 1));
-            e->asid = (vv & ((1 << XCHAL_MMU_ASID_BITS) - 1));
-            e->ca = (pp & ((1 << XCHAL_MMU_CA_BITS) - 1));
-            e->way = way;
-            e->index = i;
-            e->pgsz_log2 = cfg->pgsz_log2;
-            e->type = type;
-            e++;
-        }
-    }
-#if 1
-    /*  Sort by ASID and VADDR:  */
-    sort_tlb_dump_info (tinfo, entries);
-#endif
-
-    /*  Display all sorted info:  */
-    printk ("\n%cTLB dump:\n", (type ? 'D' : 'I'));
-    for (e = tinfo, i = 0; i < entries; i++, e++) {
-#if 0
-        if (e->asid == 0 && !show_invalid)
-            continue;
-#endif
-        printk ("%c way=%d i=%d  ASID=%02X V=%08X -> P=%08X CA=%X (%d %cB)\n",
-                (e->type ? 'D' : 'I'), e->way, e->index,
-                e->asid, e->va, e->pa, e->ca,
-                (1 << (e->pgsz_log2 % 10)),
-                " kMG"[e->pgsz_log2 / 10]
-                );
-    }
-}
-
-void dump_tlbs2 (int showinv)
-{
-    dump_tlb (itlb_dump_info, itlb, ITLB_TOTAL_ENTRIES, XCHAL_ITLB_WAYS, 0, showinv);
-    dump_tlb (dtlb_dump_info, dtlb, DTLB_TOTAL_ENTRIES, XCHAL_DTLB_WAYS, 1, showinv);
-}
-
-void dump_all_tlbs (void)
-{
-    dump_tlbs2 (1);
-}
-
-void dump_valid_tlbs (void)
-{
-    dump_tlbs2 (0);
 }
 
-
-void dump_tlbs (void)
-{
-        dump_itlb();
-        dump_dtlb();
-}
-
-void dump_cache_tag(int dcache, int idx)
-{
-        int w, i, s, e;
-        unsigned long tag, index;
-        unsigned long num_lines, num_ways, cache_size, line_size;
-
-        num_ways = dcache ? XCHAL_DCACHE_WAYS : XCHAL_ICACHE_WAYS;
-        cache_size = dcache ? XCHAL_DCACHE_SIZE : XCHAL_ICACHE_SIZE;
-        line_size = dcache ? XCHAL_DCACHE_LINESIZE : XCHAL_ICACHE_LINESIZE;
-
-        num_lines = cache_size / num_ways;
-
-        s = 0; e = num_lines;
-
-        if (idx >= 0)
-                e = (s = idx * line_size) + 1;
-
-        for (i = s; i < e; i+= line_size) {
-                printk("\nline %#08x:", i);
-                for (w = 0; w < num_ways; w++) {
-                        index = w * num_lines + i;
-                        if (dcache)
-                                __asm__ __volatile__("ldct %0, %1\n\t"
-                                                : "=a"(tag) : "a"(index));
-                        else
-                                __asm__ __volatile__("lict %0, %1\n\t"
-                                                : "=a"(tag) : "a"(index));
-
-                        printk(" %#010lx", tag);
-                }
-        }
-        printk ("\n");
-}
-
-void dump_icache(int index)
-{
-        unsigned long data, addr;
-        int w, i;
-
-        const unsigned long num_ways = XCHAL_ICACHE_WAYS;
-        const unsigned long cache_size = XCHAL_ICACHE_SIZE;
-        const unsigned long line_size = XCHAL_ICACHE_LINESIZE;
-        const unsigned long num_lines = cache_size / num_ways / line_size;
-
-        for (w = 0; w < num_ways; w++) {
-                printk ("\nWay %d", w);
-
-                for (i = 0; i < line_size; i+= 4) {
-                        addr = w * num_lines + index * line_size + i;
-                        __asm__ __volatile__("licw %0, %1\n\t"
-                                        : "=a"(data) : "a"(addr));
-                        printk(" %#010lx", data);
-                }
-        }
-        printk ("\n");
-}
-
-void dump_cache_tags(void)
-{
-        printk("Instruction cache\n");
-        dump_cache_tag(0, -1);
-        printk("Data cache\n");
-        dump_cache_tag(1, -1);
-}
-
-#endif
diff --git a/arch/xtensa/platform-iss/console.c b/arch/xtensa/platform-iss/console.c
index 5c947cae7520..2f4f20ffe666 100644
--- a/arch/xtensa/platform-iss/console.c
+++ b/arch/xtensa/platform-iss/console.c
@@ -25,11 +25,15 @@
 #include <asm/uaccess.h>
 #include <asm/irq.h>
 
-#include <xtensa/simcall.h>
+#include <asm/platform/simcall.h>
 
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 
+#ifdef SERIAL_INLINE
+#define _INLINE_ inline
+#endif
+
 #define SERIAL_MAX_NUM_LINES 1
 #define SERIAL_TIMER_VALUE (20 * HZ)
 
@@ -191,7 +195,7 @@ static int rs_read_proc(char *page, char **start, off_t off, int count,
 }
 
 
-static const struct tty_operations serial_ops = {
+static struct tty_operations serial_ops = {
         .open = rs_open,
         .close = rs_close,
         .write = rs_write,
diff --git a/arch/xtensa/platform-iss/network.c b/arch/xtensa/platform-iss/network.c
index 15d64414bd60..8ebfc8761229 100644
--- a/arch/xtensa/platform-iss/network.c
+++ b/arch/xtensa/platform-iss/network.c
@@ -34,7 +34,7 @@
 #include <linux/timer.h>
 #include <linux/platform_device.h>
 
-#include <xtensa/simcall.h>
+#include <asm/platform/simcall.h>
 
 #define DRIVER_NAME "iss-netdev"
 #define ETH_MAX_PACKET 1500