321 files changed, 2832 insertions, 1467 deletions

diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index da677f829f76..63af36cf7f6e 100644
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
@@ -49,15 +49,15 @@ select_smp_affinity(unsigned int irq)
         static int last_cpu;
         int cpu = last_cpu + 1;
 
-        if (!irq_desc[irq].handler->set_affinity || irq_user_affinity[irq])
+        if (!irq_desc[irq].chip->set_affinity || irq_user_affinity[irq])
                 return 1;
 
         while (!cpu_possible(cpu))
                 cpu = (cpu < (NR_CPUS-1) ? cpu + 1 : 0);
         last_cpu = cpu;
 
-        irq_affinity[irq] = cpumask_of_cpu(cpu);
-        irq_desc[irq].handler->set_affinity(irq, cpumask_of_cpu(cpu));
+        irq_desc[irq].affinity = cpumask_of_cpu(cpu);
+        irq_desc[irq].chip->set_affinity(irq, cpumask_of_cpu(cpu));
         return 0;
 }
 #endif /* CONFIG_SMP */
@@ -93,7 +93,7 @@ show_interrupts(struct seq_file *p, void *v)
                 for_each_online_cpu(j)
                         seq_printf(p, "%10u ", kstat_cpu(j).irqs[irq]);
 #endif
-                seq_printf(p, " %14s", irq_desc[irq].handler->typename);
+                seq_printf(p, " %14s", irq_desc[irq].chip->typename);
                 seq_printf(p, "  %c%s",
                         (action->flags & SA_INTERRUPT)?'+':' ',
                         action->name);
diff --git a/arch/alpha/kernel/irq_alpha.c b/arch/alpha/kernel/irq_alpha.c
index 9d34ce26e5ef..f20f2dff9c43 100644
--- a/arch/alpha/kernel/irq_alpha.c
+++ b/arch/alpha/kernel/irq_alpha.c
@@ -233,7 +233,7 @@ void __init
 init_rtc_irq(void)
 {
         irq_desc[RTC_IRQ].status = IRQ_DISABLED;
-        irq_desc[RTC_IRQ].handler = &rtc_irq_type;
+        irq_desc[RTC_IRQ].chip = &rtc_irq_type;
         setup_irq(RTC_IRQ, &timer_irqaction);
 }
 
diff --git a/arch/alpha/kernel/irq_i8259.c b/arch/alpha/kernel/irq_i8259.c
index b188683b83fd..ac893bd48036 100644
--- a/arch/alpha/kernel/irq_i8259.c
+++ b/arch/alpha/kernel/irq_i8259.c
@@ -109,7 +109,7 @@ init_i8259a_irqs(void)
 
         for (i = 0; i < 16; i++) {
                 irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].handler = &i8259a_irq_type;
+                irq_desc[i].chip = &i8259a_irq_type;
         }
 
         setup_irq(2, &cascade);
diff --git a/arch/alpha/kernel/irq_pyxis.c b/arch/alpha/kernel/irq_pyxis.c
index 146a20b9e3d5..3b581415bab0 100644
--- a/arch/alpha/kernel/irq_pyxis.c
+++ b/arch/alpha/kernel/irq_pyxis.c
@@ -120,7 +120,7 @@ init_pyxis_irqs(unsigned long ignore_mask)
                 if ((ignore_mask >> i) & 1)
                         continue;
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &pyxis_irq_type;
+                irq_desc[i].chip = &pyxis_irq_type;
         }
 
         setup_irq(16+7, &isa_cascade_irqaction);
diff --git a/arch/alpha/kernel/irq_srm.c b/arch/alpha/kernel/irq_srm.c
index 0a87e466918c..8e4d121f84cc 100644
--- a/arch/alpha/kernel/irq_srm.c
+++ b/arch/alpha/kernel/irq_srm.c
@@ -67,7 +67,7 @@ init_srm_irqs(long max, unsigned long ignore_mask)
                 if (i < 64 && ((ignore_mask >> i) & 1))
                         continue;
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &srm_irq_type;
+                irq_desc[i].chip = &srm_irq_type;
         }
 }
 
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 2a8b364c822e..4ea6711e55aa 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -124,12 +124,12 @@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_final);
 
 void
 pcibios_align_resource(void *data, struct resource *res,
-                       unsigned long size, unsigned long align)
+                       resource_size_t size, resource_size_t align)
 {
         struct pci_dev *dev = data;
         struct pci_controller *hose = dev->sysdata;
         unsigned long alignto;
-        unsigned long start = res->start;
+        resource_size_t start = res->start;
 
         if (res->flags & IORESOURCE_IO) {
                 /* Make sure we start at our min on all hoses */
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index 558b83368559..254c507a608c 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -481,7 +481,7 @@ register_cpus(void)
                 struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);
                 if (!p)
                         return -ENOMEM;
-                register_cpu(p, i, NULL);
+                register_cpu(p, i);
         }
         return 0;
 }
diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index d7f0e97fe56f..1a1a2c7a3d94 100644
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -144,7 +144,7 @@ alcor_init_irq(void)
                 if (i >= 16+20 && i <= 16+30)
                         continue;
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &alcor_irq_type;
+                irq_desc[i].chip = &alcor_irq_type;
         }
         i8259a_irq_type.ack = alcor_isa_mask_and_ack_irq;
 
diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c
index 8e3374d34c95..8c9e443d93ad 100644
--- a/arch/alpha/kernel/sys_cabriolet.c
+++ b/arch/alpha/kernel/sys_cabriolet.c
@@ -124,7 +124,7 @@ common_init_irq(void (*srm_dev_int)(unsigned long v, struct pt_regs *r))
 
                 for (i = 16; i < 35; ++i) {
                         irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                        irq_desc[i].handler = &cabriolet_irq_type;
+                        irq_desc[i].chip = &cabriolet_irq_type;
                 }
         }
 
diff --git a/arch/alpha/kernel/sys_dp264.c b/arch/alpha/kernel/sys_dp264.c
index d5da6b1b28ee..b28c8f1c6e10 100644
--- a/arch/alpha/kernel/sys_dp264.c
+++ b/arch/alpha/kernel/sys_dp264.c
@@ -300,7 +300,7 @@ init_tsunami_irqs(struct hw_interrupt_type * ops, int imin, int imax)
         long i;
         for (i = imin; i <= imax; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = ops;
+                irq_desc[i].chip = ops;
         }
 }
 
diff --git a/arch/alpha/kernel/sys_eb64p.c b/arch/alpha/kernel/sys_eb64p.c
index 61a79c354f0b..aeb8e0277905 100644
--- a/arch/alpha/kernel/sys_eb64p.c
+++ b/arch/alpha/kernel/sys_eb64p.c
@@ -137,7 +137,7 @@ eb64p_init_irq(void)
 
         for (i = 16; i < 32; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &eb64p_irq_type;
+                irq_desc[i].chip = &eb64p_irq_type;
         }               
 
         common_init_isa_dma();
diff --git a/arch/alpha/kernel/sys_eiger.c b/arch/alpha/kernel/sys_eiger.c
index bd6e5f0e43c7..64a785baf53a 100644
--- a/arch/alpha/kernel/sys_eiger.c
+++ b/arch/alpha/kernel/sys_eiger.c
@@ -154,7 +154,7 @@ eiger_init_irq(void)
 
         for (i = 16; i < 128; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &eiger_irq_type;
+                irq_desc[i].chip = &eiger_irq_type;
         }
 }
 
diff --git a/arch/alpha/kernel/sys_jensen.c b/arch/alpha/kernel/sys_jensen.c
index fcabb7c96a16..0148e095638f 100644
--- a/arch/alpha/kernel/sys_jensen.c
+++ b/arch/alpha/kernel/sys_jensen.c
@@ -206,11 +206,11 @@ jensen_init_irq(void)
 {
         init_i8259a_irqs();
 
-        irq_desc[1].handler = &jensen_local_irq_type;
-        irq_desc[4].handler = &jensen_local_irq_type;
-        irq_desc[3].handler = &jensen_local_irq_type;
-        irq_desc[7].handler = &jensen_local_irq_type;
-        irq_desc[9].handler = &jensen_local_irq_type;
+        irq_desc[1].chip = &jensen_local_irq_type;
+        irq_desc[4].chip = &jensen_local_irq_type;
+        irq_desc[3].chip = &jensen_local_irq_type;
+        irq_desc[7].chip = &jensen_local_irq_type;
+        irq_desc[9].chip = &jensen_local_irq_type;
 
         common_init_isa_dma();
 }
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c
index e32fee505220..36d215954376 100644
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
@@ -303,7 +303,7 @@ init_io7_irqs(struct io7 *io7,
         /* Set up the lsi irqs.  */
         for (i = 0; i < 128; ++i) {
                 irq_desc[base + i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[base + i].handler = lsi_ops;
+                irq_desc[base + i].chip = lsi_ops;
         }
 
         /* Disable the implemented irqs in hardware.  */
@@ -317,7 +317,7 @@ init_io7_irqs(struct io7 *io7,
         /* Set up the msi irqs.  */
         for (i = 128; i < (128 + 512); ++i) {
                 irq_desc[base + i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[base + i].handler = msi_ops;
+                irq_desc[base + i].chip = msi_ops;
         }
 
         for (i = 0; i < 16; ++i)
@@ -335,7 +335,7 @@ marvel_init_irq(void)
         /* Reserve the legacy irqs.  */
         for (i = 0; i < 16; ++i) {
                 irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].handler = &marvel_legacy_irq_type;
+                irq_desc[i].chip = &marvel_legacy_irq_type;
         }
 
         /* Init the io7 irqs.  */
diff --git a/arch/alpha/kernel/sys_mikasa.c b/arch/alpha/kernel/sys_mikasa.c
index d78a0daa6168..b741600e3761 100644
--- a/arch/alpha/kernel/sys_mikasa.c
+++ b/arch/alpha/kernel/sys_mikasa.c
@@ -117,7 +117,7 @@ mikasa_init_irq(void)
 
         for (i = 16; i < 32; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &mikasa_irq_type;
+                irq_desc[i].chip = &mikasa_irq_type;
         }
 
         init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_noritake.c b/arch/alpha/kernel/sys_noritake.c
index 65061f5d7410..55db02d318d7 100644
--- a/arch/alpha/kernel/sys_noritake.c
+++ b/arch/alpha/kernel/sys_noritake.c
@@ -139,7 +139,7 @@ noritake_init_irq(void)
 
         for (i = 16; i < 48; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &noritake_irq_type;
+                irq_desc[i].chip = &noritake_irq_type;
         }
 
         init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_rawhide.c b/arch/alpha/kernel/sys_rawhide.c
index 05888a02a604..949607e3d6fb 100644
--- a/arch/alpha/kernel/sys_rawhide.c
+++ b/arch/alpha/kernel/sys_rawhide.c
@@ -180,7 +180,7 @@ rawhide_init_irq(void)
 
         for (i = 16; i < 128; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &rawhide_irq_type;
+                irq_desc[i].chip = &rawhide_irq_type;
         }
 
         init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_rx164.c b/arch/alpha/kernel/sys_rx164.c
index 58404243057b..6ae506052635 100644
--- a/arch/alpha/kernel/sys_rx164.c
+++ b/arch/alpha/kernel/sys_rx164.c
@@ -117,7 +117,7 @@ rx164_init_irq(void)
         rx164_update_irq_hw(0);
         for (i = 16; i < 40; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &rx164_irq_type;
+                irq_desc[i].chip = &rx164_irq_type;
         }
 
         init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_sable.c b/arch/alpha/kernel/sys_sable.c
index a7ff84474ace..24dea40c9bfe 100644
--- a/arch/alpha/kernel/sys_sable.c
+++ b/arch/alpha/kernel/sys_sable.c
@@ -537,7 +537,7 @@ sable_lynx_init_irq(int nr_irqs)
 
         for (i = 0; i < nr_irqs; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &sable_lynx_irq_type;
+                irq_desc[i].chip = &sable_lynx_irq_type;
         }
 
         common_init_isa_dma();
diff --git a/arch/alpha/kernel/sys_takara.c b/arch/alpha/kernel/sys_takara.c
index 7955bdfc2db0..2c75cd1fd81a 100644
--- a/arch/alpha/kernel/sys_takara.c
+++ b/arch/alpha/kernel/sys_takara.c
@@ -154,7 +154,7 @@ takara_init_irq(void)
 
         for (i = 16; i < 128; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &takara_irq_type;
+                irq_desc[i].chip = &takara_irq_type;
         }
 
         common_init_isa_dma();
diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c
index 2551fb49ae09..13f3ed8ed7ac 100644
--- a/arch/alpha/kernel/sys_titan.c
+++ b/arch/alpha/kernel/sys_titan.c
@@ -189,7 +189,7 @@ init_titan_irqs(struct hw_interrupt_type * ops, int imin, int imax)
         long i;
         for (i = imin; i <= imax; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = ops;
+                irq_desc[i].chip = ops;
         }
 }
 
diff --git a/arch/alpha/kernel/sys_wildfire.c b/arch/alpha/kernel/sys_wildfire.c
index 1553f470246e..22c5798fe083 100644
--- a/arch/alpha/kernel/sys_wildfire.c
+++ b/arch/alpha/kernel/sys_wildfire.c
@@ -199,14 +199,14 @@ wildfire_init_irq_per_pca(int qbbno, int pcano)
                 if (i == 2)
                         continue;
                 irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i+irq_bias].handler = &wildfire_irq_type;
+                irq_desc[i+irq_bias].chip = &wildfire_irq_type;
         }
 
         irq_desc[36+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;
-        irq_desc[36+irq_bias].handler = &wildfire_irq_type;
+        irq_desc[36+irq_bias].chip = &wildfire_irq_type;
         for (i = 40; i < 64; ++i) {
                 irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i+irq_bias].handler = &wildfire_irq_type;
+                irq_desc[i+irq_bias].chip = &wildfire_irq_type;
         }
 
         setup_irq(32+irq_bias, &isa_enable);    
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3d1a3fb7d5fc..f123c7c9fc98 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -188,23 +188,27 @@ config ARCH_IMX
 
 config ARCH_IOP3XX
         bool "IOP3xx-based"
+        depends on MMU
         select PCI
         help
           Support for Intel's IOP3XX (XScale) family of processors.
 
 config ARCH_IXP4XX
         bool "IXP4xx-based"
+        depends on MMU
         help
           Support for Intel's IXP4XX (XScale) family of processors.
 
 config ARCH_IXP2000
         bool "IXP2400/2800-based"
+        depends on MMU
         select PCI
         help
           Support for Intel's IXP2400/2800 (XScale) family of processors.
 
 config ARCH_IXP23XX
         bool "IXP23XX-based"
+        depends on MMU
         select PCI
         help
           Support for Intel's IXP23xx (XScale) family of processors.
@@ -229,6 +233,7 @@ config ARCH_PNX4008
 
 config ARCH_PXA
         bool "PXA2xx-based"
+        depends on MMU
         select ARCH_MTD_XIP
         help
           Support for Intel's PXA2XX processor line.
@@ -339,6 +344,10 @@ config XSCALE_PMU
         depends on CPU_XSCALE && !XSCALE_PMU_TIMER
         default y
 
+if !MMU
+source "arch/arm/Kconfig-nommu"
+endif
+
 endmenu
 
 source "arch/arm/common/Kconfig"
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index a601b8b55f35..7cffbaef064b 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -22,6 +22,9 @@ obj-$(CONFIG_PCI)		+= bios32.o
 obj-$(CONFIG_SMP)               += smp.o
 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
 AFLAGS_iwmmxt.o                 := -Wa,-mcpu=iwmmxt
 
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index c49b5d4d7fca..da69e660574b 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -109,11 +109,13 @@ EXPORT_SYMBOL(memchr);
 EXPORT_SYMBOL(__memzero);
 
         /* user mem (segment) */
-EXPORT_SYMBOL(__arch_copy_from_user);
-EXPORT_SYMBOL(__arch_copy_to_user);
-EXPORT_SYMBOL(__arch_clear_user);
-EXPORT_SYMBOL(__arch_strnlen_user);
-EXPORT_SYMBOL(__arch_strncpy_from_user);
+EXPORT_SYMBOL(__strnlen_user);
+EXPORT_SYMBOL(__strncpy_from_user);
+
+#ifdef CONFIG_MMU
+EXPORT_SYMBOL(__copy_from_user);
+EXPORT_SYMBOL(__copy_to_user);
+EXPORT_SYMBOL(__clear_user);
 
 EXPORT_SYMBOL(__get_user_1);
 EXPORT_SYMBOL(__get_user_2);
@@ -123,6 +125,7 @@ EXPORT_SYMBOL(__put_user_1);
 EXPORT_SYMBOL(__put_user_2);
 EXPORT_SYMBOL(__put_user_4);
 EXPORT_SYMBOL(__put_user_8);
+#endif
 
         /* crypto hash */
 EXPORT_SYMBOL(sha_transform);
diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
index 396efba9bacd..447ede5143a8 100644
--- a/arch/arm/kernel/asm-offsets.c
+++ b/arch/arm/kernel/asm-offsets.c
@@ -60,6 +60,9 @@ int main(void)
 #ifdef CONFIG_IWMMXT
   DEFINE(TI_IWMMXT_STATE,       offsetof(struct thread_info, fpstate.iwmmxt));
 #endif
+#ifdef CONFIG_CRUNCH
+  DEFINE(TI_CRUNCH_STATE,       offsetof(struct thread_info, crunchstate));
+#endif
   BLANK();
   DEFINE(S_R0,                  offsetof(struct pt_regs, ARM_r0));
   DEFINE(S_R1,                  offsetof(struct pt_regs, ARM_r1));
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index 302fc1401547..45da06fc1ba1 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -304,7 +304,7 @@ static inline int pdev_bad_for_parity(struct pci_dev *dev)
 static void __devinit
 pdev_fixup_device_resources(struct pci_sys_data *root, struct pci_dev *dev)
 {
-        unsigned long offset;
+        resource_size_t offset;
         int i;
 
         for (i = 0; i < PCI_NUM_RESOURCES; i++) {
@@ -634,9 +634,9 @@ char * __init pcibios_setup(char *str)
  * which might be mirrored at 0x0100-0x03ff..
  */
 void pcibios_align_resource(void *data, struct resource *res,
-                            unsigned long size, unsigned long align)
+                            resource_size_t size, resource_size_t align)
 {
-        unsigned long start = res->start;
+        resource_size_t start = res->start;
 
         if (res->flags & IORESOURCE_IO && start & 0x300)
                 start = (start + 0x3ff) & ~0x3ff;
diff --git a/arch/arm/kernel/crunch-bits.S b/arch/arm/kernel/crunch-bits.S
new file mode 100644
index 000000000000..a26886758c67
--- /dev/null
+++ b/arch/arm/kernel/crunch-bits.S
@@ -0,0 +1,305 @@
+/*
+ * arch/arm/kernel/crunch-bits.S
+ * Cirrus MaverickCrunch context switching and handling
+ *
+ * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>
+ *
+ * Shamelessly stolen from the iWMMXt code by Nicolas Pitre, which is
+ * 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/linkage.h>
+#include <asm/ptrace.h>
+#include <asm/thread_info.h>
+#include <asm/asm-offsets.h>
+#include <asm/arch/ep93xx-regs.h>
+
+/*
+ * We can't use hex constants here due to a bug in gas.
+ */
+#define CRUNCH_MVDX0            0
+#define CRUNCH_MVDX1            8
+#define CRUNCH_MVDX2            16
+#define CRUNCH_MVDX3            24
+#define CRUNCH_MVDX4            32
+#define CRUNCH_MVDX5            40
+#define CRUNCH_MVDX6            48
+#define CRUNCH_MVDX7            56
+#define CRUNCH_MVDX8            64
+#define CRUNCH_MVDX9            72
+#define CRUNCH_MVDX10           80
+#define CRUNCH_MVDX11           88
+#define CRUNCH_MVDX12           96
+#define CRUNCH_MVDX13           104
+#define CRUNCH_MVDX14           112
+#define CRUNCH_MVDX15           120
+#define CRUNCH_MVAX0L           128
+#define CRUNCH_MVAX0M           132
+#define CRUNCH_MVAX0H           136
+#define CRUNCH_MVAX1L           140
+#define CRUNCH_MVAX1M           144
+#define CRUNCH_MVAX1H           148
+#define CRUNCH_MVAX2L           152
+#define CRUNCH_MVAX2M           156
+#define CRUNCH_MVAX2H           160
+#define CRUNCH_MVAX3L           164
+#define CRUNCH_MVAX3M           168
+#define CRUNCH_MVAX3H           172
+#define CRUNCH_DSPSC            176
+
+#define CRUNCH_SIZE             184
+
+        .text
+
+/*
+ * Lazy switching of crunch coprocessor context
+ *
+ * r10 = struct thread_info pointer
+ * r9  = ret_from_exception
+ * lr  = undefined instr exit
+ *
+ * called from prefetch exception handler with interrupts disabled
+ */
+ENTRY(crunch_task_enable)
+        ldr     r8, =(EP93XX_APB_VIRT_BASE + 0x00130000)        @ syscon addr
+
+        ldr     r1, [r8, #0x80]
+        tst     r1, #0x00800000                 @ access to crunch enabled?
+        movne   pc, lr                          @ if so no business here
+        mov     r3, #0xaa                       @ unlock syscon swlock
+        str     r3, [r8, #0xc0]
+        orr     r1, r1, #0x00800000             @ enable access to crunch
+        str     r1, [r8, #0x80]
+
+        ldr     r3, =crunch_owner
+        add     r0, r10, #TI_CRUNCH_STATE       @ get task crunch save area
+        ldr     r2, [sp, #60]                   @ current task pc value
+        ldr     r1, [r3]                        @ get current crunch owner
+        str     r0, [r3]                        @ this task now owns crunch
+        sub     r2, r2, #4                      @ adjust pc back
+        str     r2, [sp, #60]
+
+        ldr     r2, [r8, #0x80]
+        mov     r2, r2                          @ flush out enable (@@@)
+
+        teq     r1, #0                          @ test for last ownership
+        mov     lr, r9                          @ normal exit from exception
+        beq     crunch_load                     @ no owner, skip save
+
+crunch_save:
+        cfstr64         mvdx0, [r1, #CRUNCH_MVDX0]      @ save 64b registers
+        cfstr64         mvdx1, [r1, #CRUNCH_MVDX1]
+        cfstr64         mvdx2, [r1, #CRUNCH_MVDX2]
+        cfstr64         mvdx3, [r1, #CRUNCH_MVDX3]
+        cfstr64         mvdx4, [r1, #CRUNCH_MVDX4]
+        cfstr64         mvdx5, [r1, #CRUNCH_MVDX5]
+        cfstr64         mvdx6, [r1, #CRUNCH_MVDX6]
+        cfstr64         mvdx7, [r1, #CRUNCH_MVDX7]
+        cfstr64         mvdx8, [r1, #CRUNCH_MVDX8]
+        cfstr64         mvdx9, [r1, #CRUNCH_MVDX9]
+        cfstr64         mvdx10, [r1, #CRUNCH_MVDX10]
+        cfstr64         mvdx11, [r1, #CRUNCH_MVDX11]
+        cfstr64         mvdx12, [r1, #CRUNCH_MVDX12]
+        cfstr64         mvdx13, [r1, #CRUNCH_MVDX13]
+        cfstr64         mvdx14, [r1, #CRUNCH_MVDX14]
+        cfstr64         mvdx15, [r1, #CRUNCH_MVDX15]
+
+#ifdef __ARMEB__
+#error fix me for ARMEB
+#endif
+
+        cfmv32al        mvfx0, mvax0                    @ save 72b accumulators
+        cfstr32         mvfx0, [r1, #CRUNCH_MVAX0L]
+        cfmv32am        mvfx0, mvax0
+        cfstr32         mvfx0, [r1, #CRUNCH_MVAX0M]
+        cfmv32ah        mvfx0, mvax0
+        cfstr32         mvfx0, [r1, #CRUNCH_MVAX0H]
+        cfmv32al        mvfx0, mvax1
+        cfstr32         mvfx0, [r1, #CRUNCH_MVAX1L]
+        cfmv32am        mvfx0, mvax1
+        cfstr32         mvfx0, [r1, #CRUNCH_MVAX1M]
+        cfmv32ah        mvfx0, mvax1
+        cfstr32         mvfx0, [r1, #CRUNCH_MVAX1H]
+        cfmv32al        mvfx0, mvax2
+        cfstr32         mvfx0, [r1, #CRUNCH_MVAX2L]
+        cfmv32am        mvfx0, mvax2
+        cfstr32         mvfx0, [r1, #CRUNCH_MVAX2M]
+        cfmv32ah        mvfx0, mvax2
+        cfstr32         mvfx0, [r1, #CRUNCH_MVAX2H]
+        cfmv32al        mvfx0, mvax3
+        cfstr32         mvfx0, [r1, #CRUNCH_MVAX3L]
+        cfmv32am        mvfx0, mvax3
+        cfstr32         mvfx0, [r1, #CRUNCH_MVAX3M]
+        cfmv32ah        mvfx0, mvax3
+        cfstr32         mvfx0, [r1, #CRUNCH_MVAX3H]
+
+        cfmv32sc        mvdx0, dspsc                    @ save status word
+        cfstr64         mvdx0, [r1, #CRUNCH_DSPSC]
+
+        teq             r0, #0                          @ anything to load?
+        cfldr64eq       mvdx0, [r1, #CRUNCH_MVDX0]      @ mvdx0 was clobbered
+        moveq           pc, lr
+
+crunch_load:
+        cfldr64         mvdx0, [r0, #CRUNCH_DSPSC]      @ load status word
+        cfmvsc32        dspsc, mvdx0
+
+        cfldr32         mvfx0, [r0, #CRUNCH_MVAX0L]     @ load 72b accumulators
+        cfmval32        mvax0, mvfx0
+        cfldr32         mvfx0, [r0, #CRUNCH_MVAX0M]
+        cfmvam32        mvax0, mvfx0
+        cfldr32         mvfx0, [r0, #CRUNCH_MVAX0H]
+        cfmvah32        mvax0, mvfx0
+        cfldr32         mvfx0, [r0, #CRUNCH_MVAX1L]
+        cfmval32        mvax1, mvfx0
+        cfldr32         mvfx0, [r0, #CRUNCH_MVAX1M]
+        cfmvam32        mvax1, mvfx0
+        cfldr32         mvfx0, [r0, #CRUNCH_MVAX1H]
+        cfmvah32        mvax1, mvfx0
+        cfldr32         mvfx0, [r0, #CRUNCH_MVAX2L]
+        cfmval32        mvax2, mvfx0
+        cfldr32         mvfx0, [r0, #CRUNCH_MVAX2M]
+        cfmvam32        mvax2, mvfx0
+        cfldr32         mvfx0, [r0, #CRUNCH_MVAX2H]
+        cfmvah32        mvax2, mvfx0
+        cfldr32         mvfx0, [r0, #CRUNCH_MVAX3L]
+        cfmval32        mvax3, mvfx0
+        cfldr32         mvfx0, [r0, #CRUNCH_MVAX3M]
+        cfmvam32        mvax3, mvfx0
+        cfldr32         mvfx0, [r0, #CRUNCH_MVAX3H]
+        cfmvah32        mvax3, mvfx0
+
+        cfldr64         mvdx0, [r0, #CRUNCH_MVDX0]      @ load 64b registers
+        cfldr64         mvdx1, [r0, #CRUNCH_MVDX1]
+        cfldr64         mvdx2, [r0, #CRUNCH_MVDX2]
+        cfldr64         mvdx3, [r0, #CRUNCH_MVDX3]
+        cfldr64         mvdx4, [r0, #CRUNCH_MVDX4]
+        cfldr64         mvdx5, [r0, #CRUNCH_MVDX5]
+        cfldr64         mvdx6, [r0, #CRUNCH_MVDX6]
+        cfldr64         mvdx7, [r0, #CRUNCH_MVDX7]
+        cfldr64         mvdx8, [r0, #CRUNCH_MVDX8]
+        cfldr64         mvdx9, [r0, #CRUNCH_MVDX9]
+        cfldr64         mvdx10, [r0, #CRUNCH_MVDX10]
+        cfldr64         mvdx11, [r0, #CRUNCH_MVDX11]
+        cfldr64         mvdx12, [r0, #CRUNCH_MVDX12]
+        cfldr64         mvdx13, [r0, #CRUNCH_MVDX13]
+        cfldr64         mvdx14, [r0, #CRUNCH_MVDX14]
+        cfldr64         mvdx15, [r0, #CRUNCH_MVDX15]
+
+        mov     pc, lr
+
+/*
+ * Back up crunch regs to save area and disable access to them
+ * (mainly for gdb or sleep mode usage)
+ *
+ * r0 = struct thread_info pointer of target task or NULL for any
+ */
+ENTRY(crunch_task_disable)
+        stmfd   sp!, {r4, r5, lr}
+
+        mrs     ip, cpsr
+        orr     r2, ip, #PSR_I_BIT              @ disable interrupts
+        msr     cpsr_c, r2
+
+        ldr     r4, =(EP93XX_APB_VIRT_BASE + 0x00130000)        @ syscon addr
+
+        ldr     r3, =crunch_owner
+        add     r2, r0, #TI_CRUNCH_STATE        @ get task crunch save area
+        ldr     r1, [r3]                        @ get current crunch owner
+        teq     r1, #0                          @ any current owner?
+        beq     1f                              @ no: quit
+        teq     r0, #0                          @ any owner?
+        teqne   r1, r2                          @ or specified one?
+        bne     1f                              @ no: quit
+
+        ldr     r5, [r4, #0x80]                 @ enable access to crunch
+        mov     r2, #0xaa
+        str     r2, [r4, #0xc0]
+        orr     r5, r5, #0x00800000
+        str     r5, [r4, #0x80]
+
+        mov     r0, #0                          @ nothing to load
+        str     r0, [r3]                        @ no more current owner
+        ldr     r2, [r4, #0x80]                 @ flush out enable (@@@)
+        mov     r2, r2
+        bl      crunch_save
+
+        mov     r2, #0xaa                       @ disable access to crunch
+        str     r2, [r4, #0xc0]
+        bic     r5, r5, #0x00800000
+        str     r5, [r4, #0x80]
+        ldr     r5, [r4, #0x80]                 @ flush out enable (@@@)
+        mov     r5, r5
+
+1:      msr     cpsr_c, ip                      @ restore interrupt mode
+        ldmfd   sp!, {r4, r5, pc}
+
+/*
+ * Copy crunch state to given memory address
+ *
+ * r0 = struct thread_info pointer of target task
+ * r1 = memory address where to store crunch state
+ *
+ * this is called mainly in the creation of signal stack frames
+ */
+ENTRY(crunch_task_copy)
+        mrs     ip, cpsr
+        orr     r2, ip, #PSR_I_BIT              @ disable interrupts
+        msr     cpsr_c, r2
+
+        ldr     r3, =crunch_owner
+        add     r2, r0, #TI_CRUNCH_STATE        @ get task crunch save area
+        ldr     r3, [r3]                        @ get current crunch owner
+        teq     r2, r3                          @ does this task own it...
+        beq     1f
+
+        @ current crunch values are in the task save area
+        msr     cpsr_c, ip                      @ restore interrupt mode
+        mov     r0, r1
+        mov     r1, r2
+        mov     r2, #CRUNCH_SIZE
+        b       memcpy
+
+1:      @ this task owns crunch regs -- grab a copy from there
+        mov     r0, #0                          @ nothing to load
+        mov     r3, lr                          @ preserve return address
+        bl      crunch_save
+        msr     cpsr_c, ip                      @ restore interrupt mode
+        mov     pc, r3
+
+/*
+ * Restore crunch state from given memory address
+ *
+ * r0 = struct thread_info pointer of target task
+ * r1 = memory address where to get crunch state from
+ *
+ * this is used to restore crunch state when unwinding a signal stack frame
+ */
+ENTRY(crunch_task_restore)
+        mrs     ip, cpsr
+        orr     r2, ip, #PSR_I_BIT              @ disable interrupts
+        msr     cpsr_c, r2
+
+        ldr     r3, =crunch_owner
+        add     r2, r0, #TI_CRUNCH_STATE        @ get task crunch save area
+        ldr     r3, [r3]                        @ get current crunch owner
+        teq     r2, r3                          @ does this task own it...
+        beq     1f
+
+        @ this task doesn't own crunch regs -- use its save area
+        msr     cpsr_c, ip                      @ restore interrupt mode
+        mov     r0, r2
+        mov     r2, #CRUNCH_SIZE
+        b       memcpy
+
+1:      @ this task owns crunch regs -- load them directly
+        mov     r0, r1
+        mov     r1, #0                          @ nothing to save
+        mov     r3, lr                          @ preserve return address
+        bl      crunch_load
+        msr     cpsr_c, ip                      @ restore interrupt mode
+        mov     pc, r3
diff --git a/arch/arm/kernel/crunch.c b/arch/arm/kernel/crunch.c
new file mode 100644
index 000000000000..748175921f9b
--- /dev/null
+++ b/arch/arm/kernel/crunch.c
@@ -0,0 +1,83 @@
+/*
+ * arch/arm/kernel/crunch.c
+ * Cirrus MaverickCrunch context switching and handling
+ *
+ * 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 version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/config.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/init.h>
+#include <asm/arch/ep93xx-regs.h>
+#include <asm/thread_notify.h>
+#include <asm/io.h>
+
+struct crunch_state *crunch_owner;
+
+void crunch_task_release(struct thread_info *thread)
+{
+        local_irq_disable();
+        if (crunch_owner == &thread->crunchstate)
+                crunch_owner = NULL;
+        local_irq_enable();
+}
+
+static int crunch_enabled(u32 devcfg)
+{
+        return !!(devcfg & EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE);
+}
+
+static int crunch_do(struct notifier_block *self, unsigned long cmd, void *t)
+{
+        struct thread_info *thread = (struct thread_info *)t;
+        struct crunch_state *crunch_state;
+        u32 devcfg;
+
+        crunch_state = &thread->crunchstate;
+
+        switch (cmd) {
+        case THREAD_NOTIFY_FLUSH:
+                memset(crunch_state, 0, sizeof(*crunch_state));
+
+                /*
+                 * FALLTHROUGH: Ensure we don't try to overwrite our newly
+                 * initialised state information on the first fault.
+                 */
+
+        case THREAD_NOTIFY_RELEASE:
+                crunch_task_release(thread);
+                break;
+
+        case THREAD_NOTIFY_SWITCH:
+                devcfg = __raw_readl(EP93XX_SYSCON_DEVICE_CONFIG);
+                if (crunch_enabled(devcfg) || crunch_owner == crunch_state) {
+                        devcfg ^= EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE;
+                        __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK);
+                        __raw_writel(devcfg, EP93XX_SYSCON_DEVICE_CONFIG);
+                }
+                break;
+        }
+
+        return NOTIFY_DONE;
+}
+
+static struct notifier_block crunch_notifier_block = {
+        .notifier_call  = crunch_do,
+};
+
+static int __init crunch_init(void)
+{
+        thread_register_notifier(&crunch_notifier_block);
+
+        return 0;
+}
+
+late_initcall(crunch_init);
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 86c92523a346..6423a38839b8 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -492,9 +492,15 @@ call_fpe:
         b       do_fpe                          @ CP#1 (FPE)
         b       do_fpe                          @ CP#2 (FPE)
         mov     pc, lr                          @ CP#3
+#ifdef CONFIG_CRUNCH
+        b       crunch_task_enable              @ CP#4 (MaverickCrunch)
+        b       crunch_task_enable              @ CP#5 (MaverickCrunch)
+        b       crunch_task_enable              @ CP#6 (MaverickCrunch)
+#else
         mov     pc, lr                          @ CP#4
         mov     pc, lr                          @ CP#5
         mov     pc, lr                          @ CP#6
+#endif
         mov     pc, lr                          @ CP#7
         mov     pc, lr                          @ CP#8
         mov     pc, lr                          @ CP#9
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index a1d1b2906e8d..c40bdc770054 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -634,6 +634,32 @@ static int ptrace_setwmmxregs(struct task_struct *tsk, void __user *ufp)
 
 #endif
 
+#ifdef CONFIG_CRUNCH
+/*
+ * Get the child Crunch state.
+ */
+static int ptrace_getcrunchregs(struct task_struct *tsk, void __user *ufp)
+{
+        struct thread_info *thread = task_thread_info(tsk);
+
+        crunch_task_disable(thread);  /* force it to ram */
+        return copy_to_user(ufp, &thread->crunchstate, CRUNCH_SIZE)
+                ? -EFAULT : 0;
+}
+
+/*
+ * Set the child Crunch state.
+ */
+static int ptrace_setcrunchregs(struct task_struct *tsk, void __user *ufp)
+{
+        struct thread_info *thread = task_thread_info(tsk);
+
+        crunch_task_release(thread);  /* force a reload */
+        return copy_from_user(&thread->crunchstate, ufp, CRUNCH_SIZE)
+                ? -EFAULT : 0;
+}
+#endif
+
 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 {
         unsigned long tmp;
@@ -765,6 +791,16 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                         child->ptrace_message = data;
                         break;
 
+#ifdef CONFIG_CRUNCH
+                case PTRACE_GETCRUNCHREGS:
+                        ret = ptrace_getcrunchregs(child, (void __user *)data);
+                        break;
+
+                case PTRACE_SETCRUNCHREGS:
+                        ret = ptrace_setcrunchregs(child, (void __user *)data);
+                        break;
+#endif
+
                 default:
                         ret = ptrace_request(child, request, addr, data);
                         break;
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 9fc9af88c60c..6bdf70def01f 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -119,9 +119,24 @@ DEFINE_PER_CPU(struct cpuinfo_arm, cpu_data);
  * Standard memory resources
  */
 static struct resource mem_res[] = {
-        { "Video RAM",   0,     0,     IORESOURCE_MEM                   },
-        { "Kernel text", 0,     0,     IORESOURCE_MEM                   },
-        { "Kernel data", 0,     0,     IORESOURCE_MEM                   }
+        {
+                .name = "Video RAM",
+                .start = 0,
+                .end = 0,
+                .flags = IORESOURCE_MEM
+        },
+        {
+                .name = "Kernel text",
+                .start = 0,
+                .end = 0,
+                .flags = IORESOURCE_MEM
+        },
+        {
+                .name = "Kernel data",
+                .start = 0,
+                .end = 0,
+                .flags = IORESOURCE_MEM
+        }
 };
 
 #define video_ram   mem_res[0]
@@ -129,9 +144,24 @@ static struct resource mem_res[] = {
 #define kernel_data mem_res[2]
 
 static struct resource io_res[] = {
-        { "reserved",    0x3bc, 0x3be, IORESOURCE_IO | IORESOURCE_BUSY },
-        { "reserved",    0x378, 0x37f, IORESOURCE_IO | IORESOURCE_BUSY },
-        { "reserved",    0x278, 0x27f, IORESOURCE_IO | IORESOURCE_BUSY }
+        {
+                .name = "reserved",
+                .start = 0x3bc,
+                .end = 0x3be,
+                .flags = IORESOURCE_IO | IORESOURCE_BUSY
+        },
+        {
+                .name = "reserved",
+                .start = 0x378,
+                .end = 0x37f,
+                .flags = IORESOURCE_IO | IORESOURCE_BUSY
+        },
+        {
+                .name = "reserved",
+                .start = 0x278,
+                .end = 0x27f,
+                .flags = IORESOURCE_IO | IORESOURCE_BUSY
+        }
 };
 
 #define lp0 io_res[0]
@@ -808,7 +838,7 @@ static int __init topology_init(void)
         int cpu;
 
         for_each_possible_cpu(cpu)
-                register_cpu(&per_cpu(cpu_data, cpu).cpu, cpu, NULL);
+                register_cpu(&per_cpu(cpu_data, cpu).cpu, cpu);
 
         return 0;
 }
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 1ce05ec086c6..83a8d3c95eb3 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -132,6 +132,37 @@ sys_sigaction(int sig, const struct old_sigaction __user *act,
         return ret;
 }
 
+#ifdef CONFIG_CRUNCH
+static int preserve_crunch_context(struct crunch_sigframe *frame)
+{
+        char kbuf[sizeof(*frame) + 8];
+        struct crunch_sigframe *kframe;
+
+        /* the crunch context must be 64 bit aligned */
+        kframe = (struct crunch_sigframe *)((unsigned long)(kbuf + 8) & ~7);
+        kframe->magic = CRUNCH_MAGIC;
+        kframe->size = CRUNCH_STORAGE_SIZE;
+        crunch_task_copy(current_thread_info(), &kframe->storage);
+        return __copy_to_user(frame, kframe, sizeof(*frame));
+}
+
+static int restore_crunch_context(struct crunch_sigframe *frame)
+{
+        char kbuf[sizeof(*frame) + 8];
+        struct crunch_sigframe *kframe;
+
+        /* the crunch context must be 64 bit aligned */
+        kframe = (struct crunch_sigframe *)((unsigned long)(kbuf + 8) & ~7);
+        if (__copy_from_user(kframe, frame, sizeof(*frame)))
+                return -1;
+        if (kframe->magic != CRUNCH_MAGIC ||
+            kframe->size != CRUNCH_STORAGE_SIZE)
+                return -1;
+        crunch_task_restore(current_thread_info(), &kframe->storage);
+        return 0;
+}
+#endif
+
 #ifdef CONFIG_IWMMXT
 
 static int preserve_iwmmxt_context(struct iwmmxt_sigframe *frame)
@@ -214,6 +245,10 @@ static int restore_sigframe(struct pt_regs *regs, struct sigframe __user *sf)
         err |= !valid_user_regs(regs);
 
         aux = (struct aux_sigframe __user *) sf->uc.uc_regspace;
+#ifdef CONFIG_CRUNCH
+        if (err == 0)
+                err |= restore_crunch_context(&aux->crunch);
+#endif
 #ifdef CONFIG_IWMMXT
         if (err == 0 && test_thread_flag(TIF_USING_IWMMXT))
                 err |= restore_iwmmxt_context(&aux->iwmmxt);
@@ -333,6 +368,10 @@ setup_sigframe(struct sigframe __user *sf, struct pt_regs *regs, sigset_t *set)
         err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(*set));
 
         aux = (struct aux_sigframe __user *) sf->uc.uc_regspace;
+#ifdef CONFIG_CRUNCH
+        if (err == 0)
+                err |= preserve_crunch_context(&aux->crunch);
+#endif
 #ifdef CONFIG_IWMMXT
         if (err == 0 && test_thread_flag(TIF_USING_IWMMXT))
                 err |= preserve_iwmmxt_context(&aux->iwmmxt);
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index 2b254e88595c..2df9688a7028 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -80,6 +80,10 @@ SECTIONS
                 *(.exit.text)
                 *(.exit.data)
                 *(.exitcall.exit)
+#ifndef CONFIG_MMU
+                *(.fixup)
+                *(__ex_table)
+#endif
         }
 
         .text : {                       /* Real text segment            */
@@ -87,7 +91,9 @@ SECTIONS
                         *(.text)
                         SCHED_TEXT
                         LOCK_TEXT
+#ifdef CONFIG_MMU
                         *(.fixup)
+#endif
                         *(.gnu.warning)
                         *(.rodata)
                         *(.rodata.*)
@@ -142,7 +148,9 @@ SECTIONS
                  */
                 . = ALIGN(32);
                 __start___ex_table = .;
+#ifdef CONFIG_MMU
                 *(__ex_table)
+#endif
                 __stop___ex_table = .;
 
                 /*
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 7b726b627ea5..30351cd4560d 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -6,28 +6,31 @@
 
 lib-y           := backtrace.o changebit.o csumipv6.o csumpartial.o   \
                    csumpartialcopy.o csumpartialcopyuser.o clearbit.o \
-                   copy_page.o delay.o findbit.o memchr.o memcpy.o    \
+                   delay.o findbit.o memchr.o memcpy.o                \
                    memmove.o memset.o memzero.o setbit.o              \
                    strncpy_from_user.o strnlen_user.o                 \
                    strchr.o strrchr.o                                 \
                    testchangebit.o testclearbit.o testsetbit.o        \
-                   getuser.o putuser.o clear_user.o                   \
                    ashldi3.o ashrdi3.o lshrdi3.o muldi3.o             \
                    ucmpdi2.o lib1funcs.o div64.o sha1.o               \
                    io-readsb.o io-writesb.o io-readsl.o io-writesl.o
 
+mmu-y   := clear_user.o copy_page.o getuser.o putuser.o
+
 # the code in uaccess.S is not preemption safe and
 # probably faster on ARMv3 only
 ifeq ($(CONFIG_PREEMPT),y)
-  lib-y += copy_from_user.o copy_to_user.o
+  mmu-y += copy_from_user.o copy_to_user.o
 else
 ifneq ($(CONFIG_CPU_32v3),y)
-  lib-y += copy_from_user.o copy_to_user.o
+  mmu-y += copy_from_user.o copy_to_user.o
 else
-  lib-y += uaccess.o
+  mmu-y += uaccess.o
 endif
 endif
 
+lib-$(CONFIG_MMU) += $(mmu-y)
+
 ifeq ($(CONFIG_CPU_32v3),y)
   lib-y += io-readsw-armv3.o io-writesw-armv3.o
 else
diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S
index 058b80d72aa1..91f993f2e9db 100644
--- a/arch/arm/lib/backtrace.S
+++ b/arch/arm/lib/backtrace.S
@@ -97,16 +97,13 @@ ENTRY(c_backtrace)
                 b       1007f
 
 /*
- * Fixup for LDMDB
+ * Fixup for LDMDB.  Note that this must not be in the fixup section.
  */
-                .section .fixup,"ax"
-                .align  0
 1007:           ldr     r0, =.Lbad
                 mov     r1, frame
                 bl      printk
                 ldmfd   sp!, {r4 - r8, pc}
                 .ltorg
-                .previous
                 
                 .section __ex_table,"a"
                 .align  3
diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
index ea435ae2e4a5..ecb28dcdaf7b 100644
--- a/arch/arm/lib/clear_user.S
+++ b/arch/arm/lib/clear_user.S
@@ -12,13 +12,13 @@
 
                 .text
 
-/* Prototype: int __arch_clear_user(void *addr, size_t sz)
+/* Prototype: int __clear_user(void *addr, size_t sz)
  * Purpose  : clear some user memory
  * Params   : addr - user memory address to clear
  *          : sz   - number of bytes to clear
  * Returns  : number of bytes NOT cleared
  */
-ENTRY(__arch_clear_user)
+ENTRY(__clear_user)
                 stmfd   sp!, {r1, lr}
                 mov     r2, #0
                 cmp     r1, #4
diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
index 7497393a0e81..6b7363ce749c 100644
--- a/arch/arm/lib/copy_from_user.S
+++ b/arch/arm/lib/copy_from_user.S
@@ -16,7 +16,7 @@
 /*
  * Prototype:
  *
- *      size_t __arch_copy_from_user(void *to, const void *from, size_t n)
+ *      size_t __copy_from_user(void *to, const void *from, size_t n)
  *
  * Purpose:
  *
@@ -83,7 +83,7 @@
 
         .text
 
-ENTRY(__arch_copy_from_user)
+ENTRY(__copy_from_user)
 
 #include "copy_template.S"
 
diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
index 4a6d8ea14022..5224d94688d9 100644
--- a/arch/arm/lib/copy_to_user.S
+++ b/arch/arm/lib/copy_to_user.S
@@ -16,7 +16,7 @@
 /*
  * Prototype:
  *
- *      size_t __arch_copy_to_user(void *to, const void *from, size_t n)
+ *      size_t __copy_to_user(void *to, const void *from, size_t n)
  *
  * Purpose:
  *
@@ -86,7 +86,7 @@
 
         .text
 
-ENTRY(__arch_copy_to_user)
+ENTRY(__copy_to_user)
 
 #include "copy_template.S"
 
diff --git a/arch/arm/lib/strncpy_from_user.S b/arch/arm/lib/strncpy_from_user.S
index 35649f04fcac..36e3741a3772 100644
--- a/arch/arm/lib/strncpy_from_user.S
+++ b/arch/arm/lib/strncpy_from_user.S
@@ -20,7 +20,7 @@
  * returns the number of characters copied (strlen of copied string),
  *  -EFAULT on exception, or "len" if we fill the whole buffer
  */
-ENTRY(__arch_strncpy_from_user)
+ENTRY(__strncpy_from_user)
         mov     ip, r1
 1:      subs    r2, r2, #1
 USER(   ldrplbt r3, [r1], #1)
diff --git a/arch/arm/lib/strnlen_user.S b/arch/arm/lib/strnlen_user.S
index 3668a15991ef..18d8fa4f925a 100644
--- a/arch/arm/lib/strnlen_user.S
+++ b/arch/arm/lib/strnlen_user.S
@@ -14,13 +14,13 @@
         .text
         .align  5
 
-/* Prototype: unsigned long __arch_strnlen_user(const char *str, long n)
+/* Prototype: unsigned long __strnlen_user(const char *str, long n)
  * Purpose  : get length of a string in user memory
  * Params   : str - address of string in user memory
  * Returns  : length of string *including terminator*
  *            or zero on exception, or n + 1 if too long
  */
-ENTRY(__arch_strnlen_user)
+ENTRY(__strnlen_user)
         mov     r2, r0
 1:
 USER(   ldrbt   r3, [r0], #1)
diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S
index 1f1545d737be..b48bd6d5fd83 100644
--- a/arch/arm/lib/uaccess.S
+++ b/arch/arm/lib/uaccess.S
@@ -19,7 +19,7 @@
 
 #define PAGE_SHIFT 12
 
-/* Prototype: int __arch_copy_to_user(void *to, const char *from, size_t n)
+/* Prototype: int __copy_to_user(void *to, const char *from, size_t n)
  * Purpose  : copy a block to user memory from kernel memory
  * Params   : to   - user memory
  *          : from - kernel memory
@@ -39,7 +39,7 @@ USER(		strgtbt	r3, [r0], #1)			@ May fault
                 sub     r2, r2, ip
                 b       .Lc2u_dest_aligned
 
-ENTRY(__arch_copy_to_user)
+ENTRY(__copy_to_user)
                 stmfd   sp!, {r2, r4 - r7, lr}
                 cmp     r2, #4
                 blt     .Lc2u_not_enough
@@ -283,7 +283,7 @@ USER(		strgtbt	r3, [r0], #1)			@ May fault
 9001:           ldmfd   sp!, {r0, r4 - r7, pc}
                 .previous
 
-/* Prototype: unsigned long __arch_copy_from_user(void *to,const void *from,unsigned long n);
+/* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n);
  * Purpose  : copy a block from user memory to kernel memory
  * Params   : to   - kernel memory
  *          : from - user memory
@@ -302,7 +302,7 @@ USER(		ldrgtbt	r3, [r1], #1)			@ May fault
                 sub     r2, r2, ip
                 b       .Lcfu_dest_aligned
 
-ENTRY(__arch_copy_from_user)
+ENTRY(__copy_from_user)
                 stmfd   sp!, {r0, r2, r4 - r7, lr}
                 cmp     r2, #4
                 blt     .Lcfu_not_enough
diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig
index cec5a21ca4e3..e15e4c54a253 100644
--- a/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
@@ -2,8 +2,19 @@ if ARCH_EP93XX
 
 menu "Cirrus EP93xx Implementation Options"
 
+config CRUNCH
+        bool "Support for MaverickCrunch"
+        help
+          Enable kernel support for MaverickCrunch.
+
 comment "EP93xx Platforms"
 
+config MACH_EDB9315
+        bool "Support Cirrus Logic EDB9315"
+        help
+          Say 'Y' here if you want your kernel to support the Cirrus
+          Logic EDB9315 Evaluation Board.
+
 config MACH_GESBC9312
         bool "Support Glomation GESBC-9312-sx"
         help
diff --git a/arch/arm/mach-ep93xx/Makefile b/arch/arm/mach-ep93xx/Makefile
index 05a48a21038e..dfa7e2e8a18b 100644
--- a/arch/arm/mach-ep93xx/Makefile
+++ b/arch/arm/mach-ep93xx/Makefile
@@ -6,5 +6,6 @@ obj-m			:=
 obj-n                   :=
 obj-                    :=
 
+obj-$(CONFIG_MACH_EDB9315)      += edb9315.o
 obj-$(CONFIG_MACH_GESBC9312)    += gesbc9312.o
 obj-$(CONFIG_MACH_TS72XX)       += ts72xx.o
diff --git a/arch/arm/mach-ep93xx/edb9315.c b/arch/arm/mach-ep93xx/edb9315.c
new file mode 100644
index 000000000000..ef7482faad81
--- /dev/null
+++ b/arch/arm/mach-ep93xx/edb9315.c
@@ -0,0 +1,62 @@
+/*
+ * arch/arm/mach-ep93xx/edb9315.c
+ * Cirrus Logic EDB9315 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/config.h>
+#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 edb9315_flash_data = {
+        .width          = 4,
+};
+
+static struct resource edb9315_flash_resource = {
+        .start          = 0x60000000,
+        .end            = 0x61ffffff,
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device edb9315_flash = {
+        .name           = "physmap-flash",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &edb9315_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &edb9315_flash_resource,
+};
+
+static void __init edb9315_init_machine(void)
+{
+        ep93xx_init_devices();
+        platform_device_register(&edb9315_flash);
+}
+
+MACHINE_START(EDB9315, "Cirrus Logic EDB9315 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    = 0x00000100,
+        .map_io         = ep93xx_map_io,
+        .init_irq       = ep93xx_init_irq,
+        .timer          = &ep93xx_timer,
+        .init_machine   = edb9315_init_machine,
+MACHINE_END
diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c
index 47cc6c8b7c79..2c28d66d260e 100644
--- a/arch/arm/mach-ep93xx/gesbc9312.c
+++ b/arch/arm/mach-ep93xx/gesbc9312.c
@@ -30,7 +30,7 @@ static struct physmap_flash_data gesbc9312_flash_data = {
 
 static struct resource gesbc9312_flash_resource = {
         .start          = 0x60000000,
-        .end            = 0x60800000,
+        .end            = 0x607fffff,
         .flags          = IORESOURCE_MEM,
 };
 
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
index 6e5a56cd5ae8..0b3b875b1875 100644
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -118,7 +118,7 @@ static struct physmap_flash_data ts72xx_flash_data = {
 
 static struct resource ts72xx_flash_resource = {
         .start          = TS72XX_NOR_PHYS_BASE,
-        .end            = TS72XX_NOR_PHYS_BASE + 0x01000000,
+        .end            = TS72XX_NOR_PHYS_BASE + 0x00ffffff,
         .flags          = IORESOURCE_MEM,
 };
 
diff --git a/arch/arm/mach-ixp23xx/espresso.c b/arch/arm/mach-ixp23xx/espresso.c
index dc5e489c70bc..357351fbb1e2 100644
--- a/arch/arm/mach-ixp23xx/espresso.c
+++ b/arch/arm/mach-ixp23xx/espresso.c
@@ -59,7 +59,7 @@ static struct physmap_flash_data espresso_flash_data = {
 
 static struct resource espresso_flash_resource = {
         .start          = 0x90000000,
-        .end            = 0x92000000,
+        .end            = 0x91ffffff,
         .flags          = IORESOURCE_MEM,
 };
 
diff --git a/arch/arm/mach-ixp23xx/ixdp2351.c b/arch/arm/mach-ixp23xx/ixdp2351.c
index 535b334ee045..e0886871cc77 100644
--- a/arch/arm/mach-ixp23xx/ixdp2351.c
+++ b/arch/arm/mach-ixp23xx/ixdp2351.c
@@ -304,7 +304,7 @@ static struct physmap_flash_data ixdp2351_flash_data = {
 
 static struct resource ixdp2351_flash_resource = {
         .start          = 0x90000000,
-        .end            = 0x94000000,
+        .end            = 0x93ffffff,
         .flags          = IORESOURCE_MEM,
 };
 
diff --git a/arch/arm/mach-ixp23xx/roadrunner.c b/arch/arm/mach-ixp23xx/roadrunner.c
index b9f5d13fcfe1..92ad18f41251 100644
--- a/arch/arm/mach-ixp23xx/roadrunner.c
+++ b/arch/arm/mach-ixp23xx/roadrunner.c
@@ -143,7 +143,7 @@ static struct physmap_flash_data roadrunner_flash_data = {
 
 static struct resource roadrunner_flash_resource = {
         .start          = 0x90000000,
-        .end            = 0x94000000,
+        .end            = 0x93ffffff,
         .flags          = IORESOURCE_MEM,
 };
 
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index 539b596005fc..d9635ff4b10c 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -88,8 +88,8 @@ static int pxa_gpio_irq_type(unsigned int irq, unsigned int type)
 
         if (type == IRQT_PROBE) {
             /* Don't mess with enabled GPIOs using preconfigured edges or
-               GPIOs set to alternate function during probe */
-                if ((GPIO_IRQ_rising_edge[idx] | GPIO_IRQ_falling_edge[idx]) &
+               GPIOs set to alternate function or to output during probe */
+                if ((GPIO_IRQ_rising_edge[idx] | GPIO_IRQ_falling_edge[idx] | GPDR(gpio)) &
                     GPIO_bit(gpio))
                         return 0;
                 if (GAFR(gpio) & (0x3 << (((gpio) & 0xf)*2)))
diff --git a/arch/arm/mach-s3c2410/s3c244x.c b/arch/arm/mach-s3c2410/s3c244x.c
index 838bc525e836..9a2258270de9 100644
--- a/arch/arm/mach-s3c2410/s3c244x.c
+++ b/arch/arm/mach-s3c2410/s3c244x.c
@@ -69,6 +69,7 @@ void __init s3c244x_map_io(struct map_desc *mach_desc, int size)
 
         s3c_device_i2c.name  = "s3c2440-i2c";
         s3c_device_nand.name = "s3c2440-nand";
+        s3c_device_usbgadget.name = "s3c2440-usbgadget";
 }
 
 void __init s3c244x_init_clocks(int xtal)
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index ecf5e232a6fc..c4bca753165b 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -15,8 +15,8 @@ config CPU_ARM610
         select CPU_32v3
         select CPU_CACHE_V3
         select CPU_CACHE_VIVT
-        select CPU_COPY_V3
-        select CPU_TLB_V3
+        select CPU_COPY_V3 if MMU
+        select CPU_TLB_V3 if MMU
         help
           The ARM610 is the successor to the ARM3 processor
           and was produced by VLSI Technology Inc.
@@ -31,8 +31,8 @@ config CPU_ARM710
         select CPU_32v3
         select CPU_CACHE_V3
         select CPU_CACHE_VIVT
-        select CPU_COPY_V3
-        select CPU_TLB_V3
+        select CPU_COPY_V3 if MMU
+        select CPU_TLB_V3 if MMU
         help
           A 32-bit RISC microprocessor based on the ARM7 processor core
           designed by Advanced RISC Machines Ltd. The ARM710 is the
@@ -50,8 +50,8 @@ config CPU_ARM720T
         select CPU_ABRT_LV4T
         select CPU_CACHE_V4
         select CPU_CACHE_VIVT
-        select CPU_COPY_V4WT
-        select CPU_TLB_V4WT
+        select CPU_COPY_V4WT if MMU
+        select CPU_TLB_V4WT if MMU
         help
           A 32-bit RISC processor with 8kByte Cache, Write Buffer and
           MMU built around an ARM7TDMI core.
@@ -68,8 +68,8 @@ config CPU_ARM920T
         select CPU_ABRT_EV4T
         select CPU_CACHE_V4WT
         select CPU_CACHE_VIVT
-        select CPU_COPY_V4WB
-        select CPU_TLB_V4WBI
+        select CPU_COPY_V4WB if MMU
+        select CPU_TLB_V4WBI if MMU
         help
           The ARM920T is licensed to be produced by numerous vendors,
           and is used in the Maverick EP9312 and the Samsung S3C2410.
@@ -89,8 +89,8 @@ config CPU_ARM922T
         select CPU_ABRT_EV4T
         select CPU_CACHE_V4WT
         select CPU_CACHE_VIVT
-        select CPU_COPY_V4WB
-        select CPU_TLB_V4WBI
+        select CPU_COPY_V4WB if MMU
+        select CPU_TLB_V4WBI if MMU
         help
           The ARM922T is a version of the ARM920T, but with smaller
           instruction and data caches. It is used in Altera's
@@ -108,8 +108,8 @@ config CPU_ARM925T
         select CPU_ABRT_EV4T
         select CPU_CACHE_V4WT
         select CPU_CACHE_VIVT
-        select CPU_COPY_V4WB
-        select CPU_TLB_V4WBI
+        select CPU_COPY_V4WB if MMU
+        select CPU_TLB_V4WBI if MMU
         help
           The ARM925T is a mix between the ARM920T and ARM926T, but with
           different instruction and data caches. It is used in TI's OMAP
@@ -126,8 +126,8 @@ config CPU_ARM926T
         select CPU_32v5
         select CPU_ABRT_EV5TJ
         select CPU_CACHE_VIVT
-        select CPU_COPY_V4WB
-        select CPU_TLB_V4WBI
+        select CPU_COPY_V4WB if MMU
+        select CPU_TLB_V4WBI if MMU
         help
           This is a variant of the ARM920.  It has slightly different
           instruction sequences for cache and TLB operations.  Curiously,
@@ -144,8 +144,8 @@ config CPU_ARM1020
         select CPU_ABRT_EV4T
         select CPU_CACHE_V4WT
         select CPU_CACHE_VIVT
-        select CPU_COPY_V4WB
-        select CPU_TLB_V4WBI
+        select CPU_COPY_V4WB if MMU
+        select CPU_TLB_V4WBI if MMU
         help
           The ARM1020 is the 32K cached version of the ARM10 processor,
           with an addition of a floating-point unit.
@@ -161,8 +161,8 @@ config CPU_ARM1020E
         select CPU_ABRT_EV4T
         select CPU_CACHE_V4WT
         select CPU_CACHE_VIVT
-        select CPU_COPY_V4WB
-        select CPU_TLB_V4WBI
+        select CPU_COPY_V4WB if MMU
+        select CPU_TLB_V4WBI if MMU
         depends on n
 
 # ARM1022E
@@ -172,8 +172,8 @@ config CPU_ARM1022
         select CPU_32v5
         select CPU_ABRT_EV4T
         select CPU_CACHE_VIVT
-        select CPU_COPY_V4WB # can probably do better
-        select CPU_TLB_V4WBI
+        select CPU_COPY_V4WB if MMU # can probably do better
+        select CPU_TLB_V4WBI if MMU
         help
           The ARM1022E is an implementation of the ARMv5TE architecture
           based upon the ARM10 integer core with a 16KiB L1 Harvard cache,
@@ -189,8 +189,8 @@ config CPU_ARM1026
         select CPU_32v5
         select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10
         select CPU_CACHE_VIVT
-        select CPU_COPY_V4WB # can probably do better
-        select CPU_TLB_V4WBI
+        select CPU_COPY_V4WB if MMU # can probably do better
+        select CPU_TLB_V4WBI if MMU
         help
           The ARM1026EJ-S is an implementation of the ARMv5TEJ architecture
           based upon the ARM10 integer core.
@@ -207,8 +207,8 @@ config CPU_SA110
         select CPU_ABRT_EV4
         select CPU_CACHE_V4WB
         select CPU_CACHE_VIVT
-        select CPU_COPY_V4WB
-        select CPU_TLB_V4WB
+        select CPU_COPY_V4WB if MMU
+        select CPU_TLB_V4WB if MMU
         help
           The Intel StrongARM(R) SA-110 is a 32-bit microprocessor and
           is available at five speeds ranging from 100 MHz to 233 MHz.
@@ -227,7 +227,7 @@ config CPU_SA1100
         select CPU_ABRT_EV4
         select CPU_CACHE_V4WB
         select CPU_CACHE_VIVT
-        select CPU_TLB_V4WB
+        select CPU_TLB_V4WB if MMU
 
 # XScale
 config CPU_XSCALE
@@ -237,7 +237,7 @@ config CPU_XSCALE
         select CPU_32v5
         select CPU_ABRT_EV5T
         select CPU_CACHE_VIVT
-        select CPU_TLB_V4WBI
+        select CPU_TLB_V4WBI if MMU
 
 # XScale Core Version 3
 config CPU_XSC3
@@ -247,7 +247,7 @@ config CPU_XSC3
         select CPU_32v5
         select CPU_ABRT_EV5T
         select CPU_CACHE_VIVT
-        select CPU_TLB_V4WBI
+        select CPU_TLB_V4WBI if MMU
         select IO_36
 
 # ARMv6
@@ -258,8 +258,8 @@ config CPU_V6
         select CPU_ABRT_EV6
         select CPU_CACHE_V6
         select CPU_CACHE_VIPT
-        select CPU_COPY_V6
-        select CPU_TLB_V6
+        select CPU_COPY_V6 if MMU
+        select CPU_TLB_V6 if MMU
 
 # ARMv6k
 config CPU_32v6K
@@ -277,17 +277,17 @@ config CPU_32v6K
 # This defines the compiler instruction set which depends on the machine type.
 config CPU_32v3
         bool
-        select TLS_REG_EMUL if SMP
+        select TLS_REG_EMUL if SMP || !MMU
         select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
 
 config CPU_32v4
         bool
-        select TLS_REG_EMUL if SMP
+        select TLS_REG_EMUL if SMP || !MMU
         select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
 
 config CPU_32v5
         bool
-        select TLS_REG_EMUL if SMP
+        select TLS_REG_EMUL if SMP || !MMU
         select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
 
 config CPU_32v6
@@ -334,6 +334,7 @@ config CPU_CACHE_VIVT
 config CPU_CACHE_VIPT
         bool
 
+if MMU
 # The copy-page model
 config CPU_COPY_V3
         bool
@@ -372,6 +373,8 @@ config CPU_TLB_V4WBI
 config CPU_TLB_V6
         bool
 
+endif
+
 #
 # CPU supports 36-bit I/O
 #
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile
index 07a538505784..21a2770226ee 100644
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
@@ -2,10 +2,16 @@
 # Makefile for the linux arm-specific parts of the memory manager.
 #
 
-obj-y                           := consistent.o extable.o fault-armv.o \
-                                   fault.o flush.o init.o ioremap.o mmap.o \
+obj-y                           := consistent.o extable.o fault.o init.o \
+                                   iomap.o
+
+obj-$(CONFIG_MMU)               += fault-armv.o flush.o ioremap.o mmap.o \
                                    mm-armv.o
 
+ifneq ($(CONFIG_MMU),y)
+obj-y                           += nommu.o
+endif
+
 obj-$(CONFIG_MODULES)           += proc-syms.o
 
 obj-$(CONFIG_ALIGNMENT_TRAP)    += alignment.o
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 9ea1f87a7079..989fd681c822 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -26,8 +26,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#define TABLE_SIZE      (2 * PTRS_PER_PTE * sizeof(pte_t))
-
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 
 extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
diff --git a/arch/arm/mm/iomap.c b/arch/arm/mm/iomap.c
new file mode 100644
index 000000000000..62066f3020c8
--- /dev/null
+++ b/arch/arm/mm/iomap.c
@@ -0,0 +1,55 @@
+/*
+ *  linux/arch/arm/mm/iomap.c
+ *
+ * Map IO port and PCI memory spaces so that {read,write}[bwl] can
+ * be used to access this memory.
+ */
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/ioport.h>
+
+#include <asm/io.h>
+
+#ifdef __io
+void __iomem *ioport_map(unsigned long port, unsigned int nr)
+{
+        return __io(port);
+}
+EXPORT_SYMBOL(ioport_map);
+
+void ioport_unmap(void __iomem *addr)
+{
+}
+EXPORT_SYMBOL(ioport_unmap);
+#endif
+
+#ifdef CONFIG_PCI
+void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
+{
+        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 || !start)
+                return NULL;
+        if (maxlen && len > maxlen)
+                len = maxlen;
+        if (flags & IORESOURCE_IO)
+                return ioport_map(start, len);
+        if (flags & IORESOURCE_MEM) {
+                if (flags & IORESOURCE_CACHEABLE)
+                        return ioremap(start, len);
+                return ioremap_nocache(start, len);
+        }
+        return NULL;
+}
+EXPORT_SYMBOL(pci_iomap);
+
+void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
+{
+        if ((unsigned long)addr >= VMALLOC_START &&
+            (unsigned long)addr < VMALLOC_END)
+                iounmap(addr);
+}
+EXPORT_SYMBOL(pci_iounmap);
+#endif
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index c1f7180c7bed..7691cfdba567 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -176,50 +176,3 @@ void __iounmap(void __iomem *addr)
         vunmap((void *)(PAGE_MASK & (unsigned long)addr));
 }
 EXPORT_SYMBOL(__iounmap);
-
-#ifdef __io
-void __iomem *ioport_map(unsigned long port, unsigned int nr)
-{
-        return __io(port);
-}
-EXPORT_SYMBOL(ioport_map);
-
-void ioport_unmap(void __iomem *addr)
-{
-}
-EXPORT_SYMBOL(ioport_unmap);
-#endif
-
-#ifdef CONFIG_PCI
-#include <linux/pci.h>
-#include <linux/ioport.h>
-
-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
-{
-        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 || !start)
-                return NULL;
-        if (maxlen && len > maxlen)
-                len = maxlen;
-        if (flags & IORESOURCE_IO)
-                return ioport_map(start, len);
-        if (flags & IORESOURCE_MEM) {
-                if (flags & IORESOURCE_CACHEABLE)
-                        return ioremap(start, len);
-                return ioremap_nocache(start, len);
-        }
-        return NULL;
-}
-EXPORT_SYMBOL(pci_iomap);
-
-void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
-{
-        if ((unsigned long)addr >= VMALLOC_START &&
-            (unsigned long)addr < VMALLOC_END)
-                iounmap(addr);
-}
-EXPORT_SYMBOL(pci_iounmap);
-#endif
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c
new file mode 100644
index 000000000000..1464ed817b5d
--- /dev/null
+++ b/arch/arm/mm/nommu.c
@@ -0,0 +1,39 @@
+/*
+ *  linux/arch/arm/mm/nommu.c
+ *
+ * ARM uCLinux supporting functions.
+ */
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/pagemap.h>
+
+#include <asm/cacheflush.h>
+#include <asm/io.h>
+#include <asm/page.h>
+
+void flush_dcache_page(struct page *page)
+{
+        __cpuc_flush_dcache_page(page_address(page));
+}
+EXPORT_SYMBOL(flush_dcache_page);
+
+void __iomem *__ioremap_pfn(unsigned long pfn, unsigned long offset,
+                            size_t size, unsigned long flags)
+{
+        if (pfn >= (0x100000000ULL >> PAGE_SHIFT))
+                return NULL;
+        return (void __iomem *) (offset + (pfn << PAGE_SHIFT));
+}
+EXPORT_SYMBOL(__ioremap_pfn);
+
+void __iomem *__ioremap(unsigned long phys_addr, size_t size,
+                        unsigned long flags)
+{
+        return (void __iomem *)phys_addr;
+}
+EXPORT_SYMBOL(__ioremap);
+
+void __iounmap(void __iomem *addr)
+{
+}
+EXPORT_SYMBOL(__iounmap);
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
index 959588884fa5..b9abbafca812 100644
--- a/arch/arm/mm/proc-arm1020.S
+++ b/arch/arm/mm/proc-arm1020.S
@@ -3,6 +3,7 @@
  *
  *  Copyright (C) 2000 ARM Limited
  *  Copyright (C) 2000 Deep Blue Solutions Ltd.
+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.
  *
  * 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
@@ -101,7 +102,9 @@ ENTRY(cpu_arm1020_reset)
         mov     ip, #0
         mcr     p15, 0, ip, c7, c7, 0           @ invalidate I,D caches
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
+#ifdef CONFIG_MMU
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mrc     p15, 0, ip, c1, c0, 0           @ ctrl register
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
@@ -359,6 +362,7 @@ ENTRY(cpu_arm1020_dcache_clean_area)
  */
         .align  5
 ENTRY(cpu_arm1020_switch_mm)
+#ifdef CONFIG_MMU
 #ifndef CONFIG_CPU_DCACHE_DISABLE
         mcr     p15, 0, r3, c7, c10, 4
         mov     r1, #0xF                        @ 16 segments
@@ -383,6 +387,7 @@ ENTRY(cpu_arm1020_switch_mm)
         mcr     p15, 0, r1, c7, c10, 4          @ drain WB
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, r1, c8, c7, 0           @ invalidate I & D TLBs
+#endif /* CONFIG_MMU */
         mov     pc, lr
         
 /*
@@ -392,6 +397,7 @@ ENTRY(cpu_arm1020_switch_mm)
  */
         .align  5
 ENTRY(cpu_arm1020_set_pte)
+#ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
         eor     r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
@@ -421,6 +427,7 @@ ENTRY(cpu_arm1020_set_pte)
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
 #endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
+#endif /* CONFIG_MMU */
         mov     pc, lr
 
         __INIT
@@ -430,7 +437,9 @@ __arm1020_setup:
         mov     r0, #0
         mcr     p15, 0, r0, c7, c7              @ invalidate I,D caches on v4
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer on v4
+#ifdef CONFIG_MMU
         mcr     p15, 0, r0, c8, c7              @ invalidate I,D TLBs on v4
+#endif
         mrc     p15, 0, r0, c1, c0              @ get control register v4
         ldr     r5, arm1020_cr1_clear
         bic     r0, r0, r5
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
index be6d081ff2b7..bcd5ee022e00 100644
--- a/arch/arm/mm/proc-arm1020e.S
+++ b/arch/arm/mm/proc-arm1020e.S
@@ -3,6 +3,7 @@
  *
  *  Copyright (C) 2000 ARM Limited
  *  Copyright (C) 2000 Deep Blue Solutions Ltd.
+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.
  *
  * 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
@@ -101,7 +102,9 @@ ENTRY(cpu_arm1020e_reset)
         mov     ip, #0
         mcr     p15, 0, ip, c7, c7, 0           @ invalidate I,D caches
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
+#ifdef CONFIG_MMU
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mrc     p15, 0, ip, c1, c0, 0           @ ctrl register
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
@@ -344,6 +347,7 @@ ENTRY(cpu_arm1020e_dcache_clean_area)
  */
         .align  5
 ENTRY(cpu_arm1020e_switch_mm)
+#ifdef CONFIG_MMU
 #ifndef CONFIG_CPU_DCACHE_DISABLE
         mcr     p15, 0, r3, c7, c10, 4
         mov     r1, #0xF                        @ 16 segments
@@ -367,6 +371,7 @@ ENTRY(cpu_arm1020e_switch_mm)
         mcr     p15, 0, r1, c7, c10, 4          @ drain WB
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, r1, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mov     pc, lr
         
 /*
@@ -376,6 +381,7 @@ ENTRY(cpu_arm1020e_switch_mm)
  */
         .align  5
 ENTRY(cpu_arm1020e_set_pte)
+#ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
         eor     r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
@@ -403,6 +409,7 @@ ENTRY(cpu_arm1020e_set_pte)
 #ifndef CONFIG_CPU_DCACHE_DISABLE
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
 #endif
+#endif /* CONFIG_MMU */
         mov     pc, lr
 
         __INIT
@@ -412,7 +419,9 @@ __arm1020e_setup:
         mov     r0, #0
         mcr     p15, 0, r0, c7, c7              @ invalidate I,D caches on v4
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer on v4
+#ifdef CONFIG_MMU
         mcr     p15, 0, r0, c8, c7              @ invalidate I,D TLBs on v4
+#endif
         mrc     p15, 0, r0, c1, c0              @ get control register v4
         ldr     r5, arm1020e_cr1_clear
         bic     r0, r0, r5
diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
index f778545d57a2..b0ccff4fadd2 100644
--- a/arch/arm/mm/proc-arm1022.S
+++ b/arch/arm/mm/proc-arm1022.S
@@ -3,6 +3,7 @@
  *
  *  Copyright (C) 2000 ARM Limited
  *  Copyright (C) 2000 Deep Blue Solutions Ltd.
+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.
  *
  * 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
@@ -90,7 +91,9 @@ ENTRY(cpu_arm1022_reset)
         mov     ip, #0
         mcr     p15, 0, ip, c7, c7, 0           @ invalidate I,D caches
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
+#ifdef CONFIG_MMU
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mrc     p15, 0, ip, c1, c0, 0           @ ctrl register
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
@@ -333,6 +336,7 @@ ENTRY(cpu_arm1022_dcache_clean_area)
  */
         .align  5
 ENTRY(cpu_arm1022_switch_mm)
+#ifdef CONFIG_MMU
 #ifndef CONFIG_CPU_DCACHE_DISABLE
         mov     r1, #(CACHE_DSEGMENTS - 1) << 5 @ 16 segments
 1:      orr     r3, r1, #(CACHE_DENTRIES - 1) << 26 @ 64 entries
@@ -349,6 +353,7 @@ ENTRY(cpu_arm1022_switch_mm)
         mcr     p15, 0, r1, c7, c10, 4          @ drain WB
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, r1, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mov     pc, lr
         
 /*
@@ -358,6 +363,7 @@ ENTRY(cpu_arm1022_switch_mm)
  */
         .align  5
 ENTRY(cpu_arm1022_set_pte)
+#ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
         eor     r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
@@ -385,6 +391,7 @@ ENTRY(cpu_arm1022_set_pte)
 #ifndef CONFIG_CPU_DCACHE_DISABLE
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
 #endif
+#endif /* CONFIG_MMU */
         mov     pc, lr
 
         __INIT
@@ -394,7 +401,9 @@ __arm1022_setup:
         mov     r0, #0
         mcr     p15, 0, r0, c7, c7              @ invalidate I,D caches on v4
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer on v4
+#ifdef CONFIG_MMU
         mcr     p15, 0, r0, c8, c7              @ invalidate I,D TLBs on v4
+#endif
         mrc     p15, 0, r0, c1, c0              @ get control register v4
         ldr     r5, arm1022_cr1_clear
         bic     r0, r0, r5
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S
index 148c111fde73..abe850c9a641 100644
--- a/arch/arm/mm/proc-arm1026.S
+++ b/arch/arm/mm/proc-arm1026.S
@@ -3,6 +3,7 @@
  *
  *  Copyright (C) 2000 ARM Limited
  *  Copyright (C) 2000 Deep Blue Solutions Ltd.
+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.
  *
  * 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
@@ -90,7 +91,9 @@ ENTRY(cpu_arm1026_reset)
         mov     ip, #0
         mcr     p15, 0, ip, c7, c7, 0           @ invalidate I,D caches
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
+#ifdef CONFIG_MMU
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mrc     p15, 0, ip, c1, c0, 0           @ ctrl register
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
@@ -327,6 +330,7 @@ ENTRY(cpu_arm1026_dcache_clean_area)
  */
         .align  5
 ENTRY(cpu_arm1026_switch_mm)
+#ifdef CONFIG_MMU
         mov     r1, #0
 #ifndef CONFIG_CPU_DCACHE_DISABLE
 1:      mrc     p15, 0, r15, c7, c14, 3         @ test, clean, invalidate
@@ -338,6 +342,7 @@ ENTRY(cpu_arm1026_switch_mm)
         mcr     p15, 0, r1, c7, c10, 4          @ drain WB
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, r1, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mov     pc, lr
         
 /*
@@ -347,6 +352,7 @@ ENTRY(cpu_arm1026_switch_mm)
  */
         .align  5
 ENTRY(cpu_arm1026_set_pte)
+#ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
         eor     r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
@@ -374,6 +380,7 @@ ENTRY(cpu_arm1026_set_pte)
 #ifndef CONFIG_CPU_DCACHE_DISABLE
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
 #endif
+#endif /* CONFIG_MMU */
         mov     pc, lr
 
 
@@ -384,8 +391,10 @@ __arm1026_setup:
         mov     r0, #0
         mcr     p15, 0, r0, c7, c7              @ invalidate I,D caches on v4
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer on v4
+#ifdef CONFIG_MMU
         mcr     p15, 0, r0, c8, c7              @ invalidate I,D TLBs on v4
         mcr     p15, 0, r4, c2, c0              @ load page table pointer
+#endif
 #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
         mov     r0, #4                          @ explicitly disable writeback
         mcr     p15, 7, r0, c15, c0, 0
diff --git a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S
index 540359b475d0..7a705edfa4b2 100644
--- a/arch/arm/mm/proc-arm6_7.S
+++ b/arch/arm/mm/proc-arm6_7.S
@@ -2,6 +2,7 @@
  *  linux/arch/arm/mm/proc-arm6,7.S
  *
  *  Copyright (C) 1997-2000 Russell King
+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -199,10 +200,12 @@ ENTRY(cpu_arm7_do_idle)
  */
 ENTRY(cpu_arm6_switch_mm)
 ENTRY(cpu_arm7_switch_mm)
+#ifdef CONFIG_MMU
                 mov     r1, #0
                 mcr     p15, 0, r1, c7, c0, 0           @ flush cache
                 mcr     p15, 0, r0, c2, c0, 0           @ update page table ptr
                 mcr     p15, 0, r1, c5, c0, 0           @ flush TLBs
+#endif
                 mov     pc, lr
 
 /*
@@ -214,6 +217,7 @@ ENTRY(cpu_arm7_switch_mm)
                 .align  5
 ENTRY(cpu_arm6_set_pte)
 ENTRY(cpu_arm7_set_pte)
+#ifdef CONFIG_MMU
                 str     r1, [r0], #-2048                @ linux version
 
                 eor     r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
@@ -232,6 +236,7 @@ ENTRY(cpu_arm7_set_pte)
                 movne   r2, #0
 
                 str     r2, [r0]                        @ hardware version
+#endif /* CONFIG_MMU */
                 mov     pc, lr
 
 /*
@@ -243,7 +248,9 @@ ENTRY(cpu_arm6_reset)
 ENTRY(cpu_arm7_reset)
                 mov     r1, #0
                 mcr     p15, 0, r1, c7, c0, 0           @ flush cache
+#ifdef CONFIG_MMU
                 mcr     p15, 0, r1, c5, c0, 0           @ flush TLB
+#endif
                 mov     r1, #0x30
                 mcr     p15, 0, r1, c1, c0, 0           @ turn off MMU etc
                 mov     pc, r0
@@ -253,19 +260,27 @@ ENTRY(cpu_arm7_reset)
                 .type   __arm6_setup, #function
 __arm6_setup:   mov     r0, #0
                 mcr     p15, 0, r0, c7, c0              @ flush caches on v3
+#ifdef CONFIG_MMU
                 mcr     p15, 0, r0, c5, c0              @ flush TLBs on v3
                 mov     r0, #0x3d                       @ . ..RS BLDP WCAM
                 orr     r0, r0, #0x100                  @ . ..01 0011 1101
+#else
+                mov     r0, #0x3c                       @ . ..RS BLDP WCA.
+#endif
                 mov     pc, lr
                 .size   __arm6_setup, . - __arm6_setup
 
                 .type   __arm7_setup, #function
 __arm7_setup:   mov     r0, #0
                 mcr     p15, 0, r0, c7, c0              @ flush caches on v3
+#ifdef CONFIG_MMU
                 mcr     p15, 0, r0, c5, c0              @ flush TLBs on v3
                 mcr     p15, 0, r0, c3, c0              @ load domain access register
                 mov     r0, #0x7d                       @ . ..RS BLDP WCAM
                 orr     r0, r0, #0x100                  @ . ..01 0111 1101
+#else
+                mov     r0, #0x7c                       @ . ..RS BLDP WCA.
+#endif
                 mov     pc, lr
                 .size   __arm7_setup, . - __arm7_setup
 
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
index 26f00ee2ad9a..86102467d37f 100644
--- a/arch/arm/mm/proc-arm720.S
+++ b/arch/arm/mm/proc-arm720.S
@@ -4,6 +4,7 @@
  *  Copyright (C) 2000 Steve Hill (sjhill@cotw.com)
  *                     Rob Scott (rscott@mtrob.fdns.net)
  *  Copyright (C) 2000 ARM Limited, Deep Blue Solutions Ltd.
+ *  hacked for non-paged-MM by Hyok S. Choi, 2004.
  *
  * 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
@@ -29,6 +30,7 @@
  *                      out of 'proc-arm6,7.S' per RMK discussion
  *   07-25-2000 SJH     Added idle function.
  *   08-25-2000 DBS     Updated for integration of ARM Ltd version.
+ *   04-20-2004 HSC     modified for non-paged memory management mode.
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
@@ -75,10 +77,12 @@ ENTRY(cpu_arm720_do_idle)
  *           the new.
  */
 ENTRY(cpu_arm720_switch_mm)
+#ifdef CONFIG_MMU
                 mov     r1, #0
                 mcr     p15, 0, r1, c7, c7, 0           @ invalidate cache
                 mcr     p15, 0, r0, c2, c0, 0           @ update page table ptr
                 mcr     p15, 0, r1, c8, c7, 0           @ flush TLB (v4)
+#endif
                 mov     pc, lr
 
 /*
@@ -89,6 +93,7 @@ ENTRY(cpu_arm720_switch_mm)
  */
                 .align  5
 ENTRY(cpu_arm720_set_pte)
+#ifdef CONFIG_MMU
                 str     r1, [r0], #-2048                @ linux version
 
                 eor     r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
@@ -107,6 +112,7 @@ ENTRY(cpu_arm720_set_pte)
                 movne   r2, #0
 
                 str     r2, [r0]                        @ hardware version
+#endif
                 mov     pc, lr
 
 /*
@@ -117,7 +123,9 @@ ENTRY(cpu_arm720_set_pte)
 ENTRY(cpu_arm720_reset)
                 mov     ip, #0
                 mcr     p15, 0, ip, c7, c7, 0           @ invalidate cache
+#ifdef CONFIG_MMU
                 mcr     p15, 0, ip, c8, c7, 0           @ flush TLB (v4)
+#endif
                 mrc     p15, 0, ip, c1, c0, 0           @ get ctrl register
                 bic     ip, ip, #0x000f                 @ ............wcam
                 bic     ip, ip, #0x2100                 @ ..v....s........
@@ -130,7 +138,9 @@ ENTRY(cpu_arm720_reset)
 __arm710_setup:
         mov     r0, #0
         mcr     p15, 0, r0, c7, c7, 0           @ invalidate caches
+#ifdef CONFIG_MMU
         mcr     p15, 0, r0, c8, c7, 0           @ flush TLB (v4)
+#endif
         mrc     p15, 0, r0, c1, c0              @ get control register
         ldr     r5, arm710_cr1_clear
         bic     r0, r0, r5
@@ -156,7 +166,9 @@ arm710_cr1_set:
 __arm720_setup:
         mov     r0, #0
         mcr     p15, 0, r0, c7, c7, 0           @ invalidate caches
+#ifdef CONFIG_MMU
         mcr     p15, 0, r0, c8, c7, 0           @ flush TLB (v4)
+#endif
         mrc     p15, 0, r0, c1, c0              @ get control register
         ldr     r5, arm720_cr1_clear
         bic     r0, r0, r5
diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
index a17f79e0199c..31dc839ba07c 100644
--- a/arch/arm/mm/proc-arm920.S
+++ b/arch/arm/mm/proc-arm920.S
@@ -3,6 +3,7 @@
  *
  *  Copyright (C) 1999,2000 ARM Limited
  *  Copyright (C) 2000 Deep Blue Solutions Ltd.
+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.
  *
  * 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
@@ -97,7 +98,9 @@ ENTRY(cpu_arm920_reset)
         mov     ip, #0
         mcr     p15, 0, ip, c7, c7, 0           @ invalidate I,D caches
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
+#ifdef CONFIG_MMU
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mrc     p15, 0, ip, c1, c0, 0           @ ctrl register
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
@@ -317,6 +320,7 @@ ENTRY(cpu_arm920_dcache_clean_area)
  */
         .align  5
 ENTRY(cpu_arm920_switch_mm)
+#ifdef CONFIG_MMU
         mov     ip, #0
 #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
         mcr     p15, 0, ip, c7, c6, 0           @ invalidate D cache
@@ -337,6 +341,7 @@ ENTRY(cpu_arm920_switch_mm)
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mov     pc, lr
 
 /*
@@ -346,6 +351,7 @@ ENTRY(cpu_arm920_switch_mm)
  */
         .align  5
 ENTRY(cpu_arm920_set_pte)
+#ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
         eor     r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
@@ -372,6 +378,7 @@ ENTRY(cpu_arm920_set_pte)
         mov     r0, r0
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
+#endif /* CONFIG_MMU */
         mov     pc, lr
 
         __INIT
@@ -381,7 +388,9 @@ __arm920_setup:
         mov     r0, #0
         mcr     p15, 0, r0, c7, c7              @ invalidate I,D caches on v4
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer on v4
+#ifdef CONFIG_MMU
         mcr     p15, 0, r0, c8, c7              @ invalidate I,D TLBs on v4
+#endif
         mrc     p15, 0, r0, c1, c0              @ get control register v4
         ldr     r5, arm920_cr1_clear
         bic     r0, r0, r5
diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S
index bbde4a024a48..9e57c34f5c09 100644
--- a/arch/arm/mm/proc-arm922.S
+++ b/arch/arm/mm/proc-arm922.S
@@ -4,6 +4,7 @@
  *  Copyright (C) 1999,2000 ARM Limited
  *  Copyright (C) 2000 Deep Blue Solutions Ltd.
  *  Copyright (C) 2001 Altera Corporation
+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.
  *
  * 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
@@ -99,7 +100,9 @@ ENTRY(cpu_arm922_reset)
         mov     ip, #0
         mcr     p15, 0, ip, c7, c7, 0           @ invalidate I,D caches
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
+#ifdef CONFIG_MMU
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mrc     p15, 0, ip, c1, c0, 0           @ ctrl register
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
@@ -321,6 +324,7 @@ ENTRY(cpu_arm922_dcache_clean_area)
  */
         .align  5
 ENTRY(cpu_arm922_switch_mm)
+#ifdef CONFIG_MMU
         mov     ip, #0
 #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
         mcr     p15, 0, ip, c7, c6, 0           @ invalidate D cache
@@ -341,6 +345,7 @@ ENTRY(cpu_arm922_switch_mm)
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mov     pc, lr
 
 /*
@@ -350,6 +355,7 @@ ENTRY(cpu_arm922_switch_mm)
  */
         .align  5
 ENTRY(cpu_arm922_set_pte)
+#ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
         eor     r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
@@ -376,6 +382,7 @@ ENTRY(cpu_arm922_set_pte)
         mov     r0, r0
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
+#endif /* CONFIG_MMU */
         mov     pc, lr
 
         __INIT
@@ -385,7 +392,9 @@ __arm922_setup:
         mov     r0, #0
         mcr     p15, 0, r0, c7, c7              @ invalidate I,D caches on v4
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer on v4
+#ifdef CONFIG_MMU
         mcr     p15, 0, r0, c8, c7              @ invalidate I,D TLBs on v4
+#endif
         mrc     p15, 0, r0, c1, c0              @ get control register v4
         ldr     r5, arm922_cr1_clear
         bic     r0, r0, r5
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index 224ce226a01b..8d47c9f3f931 100644
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@ -9,6 +9,8 @@
  *  Update for Linux-2.6 and cache flush improvements
  *  Copyright (C) 2004 Nokia Corporation by Tony Lindgren <tony@atomide.com>
  *
+ *  hacked for non-paged-MM by Hyok S. Choi, 2004.
+ *
  * 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
@@ -122,7 +124,9 @@ ENTRY(cpu_arm925_reset)
         mov     ip, #0
         mcr     p15, 0, ip, c7, c7, 0           @ invalidate I,D caches
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
+#ifdef CONFIG_MMU
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mrc     p15, 0, ip, c1, c0, 0           @ ctrl register
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
@@ -369,6 +373,7 @@ ENTRY(cpu_arm925_dcache_clean_area)
  */
         .align  5
 ENTRY(cpu_arm925_switch_mm)
+#ifdef CONFIG_MMU
         mov     ip, #0
 #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
         mcr     p15, 0, ip, c7, c6, 0           @ invalidate D cache
@@ -383,6 +388,7 @@ ENTRY(cpu_arm925_switch_mm)
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mov     pc, lr
 
 /*
@@ -392,6 +398,7 @@ ENTRY(cpu_arm925_switch_mm)
  */
         .align  5
 ENTRY(cpu_arm925_set_pte)
+#ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
         eor     r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
@@ -420,6 +427,7 @@ ENTRY(cpu_arm925_set_pte)
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
 #endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
+#endif /* CONFIG_MMU */
         mov     pc, lr
 
         __INIT
@@ -438,7 +446,9 @@ __arm925_setup:
         mov     r0, #0
         mcr     p15, 0, r0, c7, c7              @ invalidate I,D caches on v4
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer on v4
+#ifdef CONFIG_MMU
         mcr     p15, 0, r0, c8, c7              @ invalidate I,D TLBs on v4
+#endif
 
 #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
         mov     r0, #4                          @ disable write-back on caches explicitly
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
index 4e2a087cf388..cb4d8f33d2a3 100644
--- a/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
@@ -3,6 +3,7 @@
  *
  *  Copyright (C) 1999-2001 ARM Limited
  *  Copyright (C) 2000 Deep Blue Solutions Ltd.
+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.
  *
  * 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
@@ -85,7 +86,9 @@ ENTRY(cpu_arm926_reset)
         mov     ip, #0
         mcr     p15, 0, ip, c7, c7, 0           @ invalidate I,D caches
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
+#ifdef CONFIG_MMU
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mrc     p15, 0, ip, c1, c0, 0           @ ctrl register
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
@@ -329,6 +332,7 @@ ENTRY(cpu_arm926_dcache_clean_area)
  */
         .align  5
 ENTRY(cpu_arm926_switch_mm)
+#ifdef CONFIG_MMU
         mov     ip, #0
 #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
         mcr     p15, 0, ip, c7, c6, 0           @ invalidate D cache
@@ -341,6 +345,7 @@ ENTRY(cpu_arm926_switch_mm)
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mov     pc, lr
 
 /*
@@ -350,6 +355,7 @@ ENTRY(cpu_arm926_switch_mm)
  */
         .align  5
 ENTRY(cpu_arm926_set_pte)
+#ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
         eor     r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
@@ -378,6 +384,7 @@ ENTRY(cpu_arm926_set_pte)
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
 #endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
+#endif
         mov     pc, lr
 
         __INIT
@@ -387,7 +394,9 @@ __arm926_setup:
         mov     r0, #0
         mcr     p15, 0, r0, c7, c7              @ invalidate I,D caches on v4
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer on v4
+#ifdef CONFIG_MMU
         mcr     p15, 0, r0, c8, c7              @ invalidate I,D TLBs on v4
+#endif
 
 
 #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
index a2dd5ae1077d..5a760a2c629c 100644
--- a/arch/arm/mm/proc-sa110.S
+++ b/arch/arm/mm/proc-sa110.S
@@ -2,6 +2,7 @@
  *  linux/arch/arm/mm/proc-sa110.S
  *
  *  Copyright (C) 1997-2002 Russell King
+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -67,7 +68,9 @@ ENTRY(cpu_sa110_reset)
         mov     ip, #0
         mcr     p15, 0, ip, c7, c7, 0           @ invalidate I,D caches
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
+#ifdef CONFIG_MMU
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mrc     p15, 0, ip, c1, c0, 0           @ ctrl register
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
@@ -130,11 +133,15 @@ ENTRY(cpu_sa110_dcache_clean_area)
  */
         .align  5
 ENTRY(cpu_sa110_switch_mm)
+#ifdef CONFIG_MMU
         str     lr, [sp, #-4]!
         bl      v4wb_flush_kern_cache_all       @ clears IP
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
         ldr     pc, [sp], #4
+#else
+        mov     pc, lr
+#endif
 
 /*
  * cpu_sa110_set_pte(ptep, pte)
@@ -143,6 +150,7 @@ ENTRY(cpu_sa110_switch_mm)
  */
         .align  5
 ENTRY(cpu_sa110_set_pte)
+#ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
         eor     r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
@@ -164,6 +172,7 @@ ENTRY(cpu_sa110_set_pte)
         mov     r0, r0
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
+#endif
         mov     pc, lr
 
         __INIT
@@ -173,7 +182,9 @@ __sa110_setup:
         mov     r10, #0
         mcr     p15, 0, r10, c7, c7             @ invalidate I,D caches on v4
         mcr     p15, 0, r10, c7, c10, 4         @ drain write buffer on v4
+#ifdef CONFIG_MMU
         mcr     p15, 0, r10, c8, c7             @ invalidate I,D TLBs on v4
+#endif
         mrc     p15, 0, r0, c1, c0              @ get control register v4
         ldr     r5, sa110_cr1_clear
         bic     r0, r0, r5
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
index 777ad99c1439..0a2107ad4c32 100644
--- a/arch/arm/mm/proc-sa1100.S
+++ b/arch/arm/mm/proc-sa1100.S
@@ -2,6 +2,7 @@
  *  linux/arch/arm/mm/proc-sa1100.S
  *
  *  Copyright (C) 1997-2002 Russell King
+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -77,7 +78,9 @@ ENTRY(cpu_sa1100_reset)
         mov     ip, #0
         mcr     p15, 0, ip, c7, c7, 0           @ invalidate I,D caches
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
+#ifdef CONFIG_MMU
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+#endif
         mrc     p15, 0, ip, c1, c0, 0           @ ctrl register
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
@@ -142,12 +145,16 @@ ENTRY(cpu_sa1100_dcache_clean_area)
  */
         .align  5
 ENTRY(cpu_sa1100_switch_mm)
+#ifdef CONFIG_MMU
         str     lr, [sp, #-4]!
         bl      v4wb_flush_kern_cache_all       @ clears IP
         mcr     p15, 0, ip, c9, c0, 0           @ invalidate RB
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
         ldr     pc, [sp], #4
+#else
+        mov     pc, lr
+#endif
 
 /*
  * cpu_sa1100_set_pte(ptep, pte)
@@ -156,6 +163,7 @@ ENTRY(cpu_sa1100_switch_mm)
  */
         .align  5
 ENTRY(cpu_sa1100_set_pte)
+#ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
         eor     r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
@@ -177,6 +185,7 @@ ENTRY(cpu_sa1100_set_pte)
         mov     r0, r0
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
+#endif
         mov     pc, lr
 
         __INIT
@@ -186,7 +195,9 @@ __sa1100_setup:
         mov     r0, #0
         mcr     p15, 0, r0, c7, c7              @ invalidate I,D caches on v4
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer on v4
+#ifdef CONFIG_MMU
         mcr     p15, 0, r0, c8, c7              @ invalidate I,D TLBs on v4
+#endif
         mrc     p15, 0, r0, c1, c0              @ get control register v4
         ldr     r5, sa1100_cr1_clear
         bic     r0, r0, r5
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 09b1a41a6de8..ca13d4d05f65 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -2,6 +2,7 @@
  *  linux/arch/arm/mm/proc-v6.S
  *
  *  Copyright (C) 2001 Deep Blue Solutions Ltd.
+ *  Modified by Catalin Marinas for noMMU support
  *
  * 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
@@ -88,6 +89,7 @@ ENTRY(cpu_v6_dcache_clean_area)
  *      - we are not using split page tables
  */
 ENTRY(cpu_v6_switch_mm)
+#ifdef CONFIG_MMU
         mov     r2, #0
         ldr     r1, [r1, #MM_CONTEXT_ID]        @ get mm->context.id
 #ifdef CONFIG_SMP
@@ -97,6 +99,7 @@ ENTRY(cpu_v6_switch_mm)
         mcr     p15, 0, r2, c7, c10, 4          @ drain write buffer
         mcr     p15, 0, r0, c2, c0, 0           @ set TTB 0
         mcr     p15, 0, r1, c13, c0, 1          @ set context ID
+#endif
         mov     pc, lr
 
 /*
@@ -119,6 +122,7 @@ ENTRY(cpu_v6_switch_mm)
  *        1111   0   1   1      r/w     r/w
  */
 ENTRY(cpu_v6_set_pte)
+#ifdef CONFIG_MMU
         str     r1, [r0], #-2048                @ linux version
 
         bic     r2, r1, #0x000003f0
@@ -145,6 +149,7 @@ ENTRY(cpu_v6_set_pte)
 
         str     r2, [r0]
         mcr     p15, 0, r0, c7, c10, 1 @ flush_pte
+#endif
         mov     pc, lr
 
 
@@ -194,12 +199,14 @@ __v6_setup:
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
         mcr     p15, 0, r0, c7, c15, 0          @ clean+invalidate cache
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer
+#ifdef CONFIG_MMU
         mcr     p15, 0, r0, c8, c7, 0           @ invalidate I + D TLBs
         mcr     p15, 0, r0, c2, c0, 2           @ TTB control register
 #ifdef CONFIG_SMP
         orr     r4, r4, #TTB_RGN_WBWA|TTB_S     @ mark PTWs shared, outer cacheable
 #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)
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 856b665020e7..6a1238a29d6c 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -28,6 +28,10 @@ config GENERIC_CALIBRATE_DELAY
         bool
         default y
 
+config IRQ_PER_CPU
+        bool
+        default y
+
 config CRIS
         bool
         default y
diff --git a/arch/cris/arch-v10/kernel/irq.c b/arch/cris/arch-v10/kernel/irq.c
index 4b368a122015..2d5be93b5197 100644
--- a/arch/cris/arch-v10/kernel/irq.c
+++ b/arch/cris/arch-v10/kernel/irq.c
@@ -172,7 +172,7 @@ init_IRQ(void)
 
         /* Initialize IRQ handler descriptiors. */
         for(i = 2; i < NR_IRQS; i++) {
-                irq_desc[i].handler = &crisv10_irq_type;
+                irq_desc[i].chip = &crisv10_irq_type;
                 set_int_vector(i, interrupt[i]);
         }
 
diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c
index 1e9d062103ae..a2b9c60c2777 100644
--- a/arch/cris/arch-v32/drivers/pci/bios.c
+++ b/arch/cris/arch-v32/drivers/pci/bios.c
@@ -43,10 +43,10 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 
 void
 pcibios_align_resource(void *data, struct resource *res,
-                       unsigned long size, unsigned long align)
+                       resource_size_t size, resource_size_t align)
 {
         if (res->flags & IORESOURCE_IO) {
-                unsigned long start = res->start;
+                resource_size_t start = res->start;
 
                 if (start & 0x300) {
                         start = (start + 0x3ff) & ~0x3ff;
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c
index c78cc2685133..06260874f018 100644
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@ -369,7 +369,7 @@ init_IRQ(void)
 
         /* Point all IRQ's to bad handlers. */
         for (i = FIRST_IRQ, j = 0; j < NR_IRQS; i++, j++) {
-                irq_desc[j].handler = &crisv32_irq_type;
+                irq_desc[j].chip = &crisv32_irq_type;
                 set_exception_vector(i, interrupt[j]);
         }
 
diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c
index b504def3e346..6547bb646364 100644
--- a/arch/cris/kernel/irq.c
+++ b/arch/cris/kernel/irq.c
@@ -69,7 +69,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].handler->typename);
+                seq_printf(p, " %14s", irq_desc[i].chip->typename);
                 seq_printf(p, "  %s", action->name);
 
                 for (action=action->next; action; action = action->next)
diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c
index 0a26bf6f1cd4..4f165c93be42 100644
--- a/arch/frv/mb93090-mb00/pci-frv.c
+++ b/arch/frv/mb93090-mb00/pci-frv.c
@@ -64,10 +64,10 @@ pcibios_update_resource(struct pci_dev *dev, struct resource *root,
  */
 void
 pcibios_align_resource(void *data, struct resource *res,
-                       unsigned long size, unsigned long align)
+                       resource_size_t size, resource_size_t align)
 {
         if (res->flags & IORESOURCE_IO) {
-                unsigned long start = res->start;
+                resource_size_t start = res->start;
 
                 if (start & 0x300) {
                         start = (start + 0x3ff) & ~0x3ff;
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 47c08bcd9b24..0463f6335905 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -233,7 +233,7 @@ config NR_CPUS
 
 config SCHED_SMT
         bool "SMT (Hyperthreading) scheduler support"
-        depends on SMP
+        depends on X86_HT
         help
           SMT scheduler support improves the CPU scheduler's decision making
           when dealing with Intel Pentium 4 chips with HyperThreading at a
@@ -242,7 +242,7 @@ config SCHED_SMT
 
 config SCHED_MC
         bool "Multi-core scheduler support"
-        depends on SMP
+        depends on X86_HT
         default y
         help
           Multi-core scheduler support improves the CPU scheduler's decision
@@ -529,6 +529,7 @@ config X86_PAE
         bool
         depends on HIGHMEM64G
         default y
+        select RESOURCES_64BIT
 
 # Common NUMA Features
 config NUMA
@@ -780,9 +781,23 @@ config HOTPLUG_CPU
           enable suspend on SMP systems. CPUs can be controlled through
           /sys/devices/system/cpu.
 
+config COMPAT_VDSO
+        bool "Compat VDSO support"
+        default y
+        help
+          Map the VDSO to the predictable old-style address too.
+        ---help---
+          Say N here if you are running a sufficiently recent glibc
+          version (2.3.3 or later), to remove the high-mapped
+          VDSO mapping and to exclusively use the randomized VDSO.
+
+          If unsure, say Y.
 
 endmenu
 
+config ARCH_ENABLE_MEMORY_HOTPLUG
+        def_bool y
+        depends on HIGHMEM
 
 menu "Power management options (ACPI, APM)"
         depends on !X86_VOYAGER
diff --git a/arch/i386/kernel/asm-offsets.c b/arch/i386/kernel/asm-offsets.c
index 1c3a809e6421..c80271f8f084 100644
--- a/arch/i386/kernel/asm-offsets.c
+++ b/arch/i386/kernel/asm-offsets.c
@@ -14,6 +14,7 @@
 #include <asm/fixmap.h>
 #include <asm/processor.h>
 #include <asm/thread_info.h>
+#include <asm/elf.h>
 
 #define DEFINE(sym, val) \
         asm volatile("\n->" #sym " %0 " #val : : "i" (val))
@@ -54,6 +55,7 @@ void foo(void)
         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(EXEC_DOMAIN_handler, exec_domain, handler);
@@ -69,7 +71,7 @@ void foo(void)
                  sizeof(struct tss_struct));
 
         DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
-        DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
+        DEFINE(VDSO_PRELINK, VDSO_PRELINK);
 
         OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
 }
diff --git a/arch/i386/kernel/cpu/amd.c b/arch/i386/kernel/cpu/amd.c
index fd0457c9c827..e6a2d6b80cda 100644
--- a/arch/i386/kernel/cpu/amd.c
+++ b/arch/i386/kernel/cpu/amd.c
@@ -235,10 +235,10 @@ static void __init init_amd(struct cpuinfo_x86 *c)
                         while ((1 << bits) < c->x86_max_cores)
                                 bits++;
                 }
-                cpu_core_id[cpu] = phys_proc_id[cpu] & ((1<<bits)-1);
-                phys_proc_id[cpu] >>= bits;
+                c->cpu_core_id = c->phys_proc_id & ((1<<bits)-1);
+                c->phys_proc_id >>= bits;
                 printk(KERN_INFO "CPU %d(%d) -> Core %d\n",
-                       cpu, c->x86_max_cores, cpu_core_id[cpu]);
+                       cpu, c->x86_max_cores, c->cpu_core_id);
         }
 #endif
 
diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
index 44f2c5f2dda1..70c87de582c7 100644
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
@@ -294,7 +294,7 @@ void __cpuinit generic_identify(struct cpuinfo_x86 * c)
                         if (c->x86 >= 0x6)
                                 c->x86_model += ((tfms >> 16) & 0xF) << 4;
                         c->x86_mask = tfms & 15;
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_HT
                         c->apicid = phys_pkg_id((ebx >> 24) & 0xFF, 0);
 #else
                         c->apicid = (ebx >> 24) & 0xFF;
@@ -319,7 +319,7 @@ void __cpuinit generic_identify(struct cpuinfo_x86 * c)
         early_intel_workaround(c);
 
 #ifdef CONFIG_X86_HT
-        phys_proc_id[smp_processor_id()] = (cpuid_ebx(1) >> 24) & 0xff;
+        c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff;
 #endif
 }
 
@@ -477,11 +477,9 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)
 {
         u32     eax, ebx, ecx, edx;
         int     index_msb, core_bits;
-        int     cpu = smp_processor_id();
 
         cpuid(1, &eax, &ebx, &ecx, &edx);
 
-
         if (!cpu_has(c, X86_FEATURE_HT) || cpu_has(c, X86_FEATURE_CMP_LEGACY))
                 return;
 
@@ -492,16 +490,17 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)
         } else if (smp_num_siblings > 1 ) {
 
                 if (smp_num_siblings > NR_CPUS) {
-                        printk(KERN_WARNING "CPU: Unsupported number of the siblings %d", smp_num_siblings);
+                        printk(KERN_WARNING "CPU: Unsupported number of the "
+                                        "siblings %d", smp_num_siblings);
                         smp_num_siblings = 1;
                         return;
                 }
 
                 index_msb = get_count_order(smp_num_siblings);
-                phys_proc_id[cpu] = phys_pkg_id((ebx >> 24) & 0xFF, index_msb);
+                c->phys_proc_id = phys_pkg_id((ebx >> 24) & 0xFF, index_msb);
 
                 printk(KERN_INFO  "CPU: Physical Processor ID: %d\n",
-                       phys_proc_id[cpu]);
+                       c->phys_proc_id);
 
                 smp_num_siblings = smp_num_siblings / c->x86_max_cores;
 
@@ -509,12 +508,12 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)
 
                 core_bits = get_count_order(c->x86_max_cores);
 
-                cpu_core_id[cpu] = phys_pkg_id((ebx >> 24) & 0xFF, index_msb) &
+                c->cpu_core_id = phys_pkg_id((ebx >> 24) & 0xFF, index_msb) &
                                                ((1 << core_bits) - 1);
 
                 if (c->x86_max_cores > 1)
                         printk(KERN_INFO  "CPU: Processor Core ID: %d\n",
-                               cpu_core_id[cpu]);
+                               c->cpu_core_id);
         }
 }
 #endif
@@ -613,6 +612,12 @@ void __cpuinit cpu_init(void)
                 set_in_cr4(X86_CR4_TSD);
         }
 
+        /* 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
@@ -631,7 +636,7 @@ void __cpuinit cpu_init(void)
                                 local_irq_enable();
                 }
         }
-
+old_gdt:
         /*
          * Initialize the per-CPU GDT with the boot GDT,
          * and set up the GDT descriptor:
diff --git a/arch/i386/kernel/cpu/intel_cacheinfo.c b/arch/i386/kernel/cpu/intel_cacheinfo.c
index 6c37b4fd8ce2..e9f0b928b0a9 100644
--- a/arch/i386/kernel/cpu/intel_cacheinfo.c
+++ b/arch/i386/kernel/cpu/intel_cacheinfo.c
@@ -159,13 +159,13 @@ union l2_cache {
         unsigned val;
 };
 
-static unsigned short assocs[] = {
+static const unsigned short assocs[] = {
         [1] = 1, [2] = 2, [4] = 4, [6] = 8,
         [8] = 16,
         [0xf] = 0xffff // ??
         };
-static unsigned char levels[] = { 1, 1, 2 };
-static unsigned char types[] = { 1, 2, 3 };
+static const unsigned char levels[] = { 1, 1, 2 };
+static const unsigned char types[] = { 1, 2, 3 };
 
 static void __cpuinit amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax,
                        union _cpuid4_leaf_ebx *ebx,
@@ -261,7 +261,7 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)
         unsigned int new_l1d = 0, new_l1i = 0; /* Cache sizes from cpuid(4) */
         unsigned int new_l2 = 0, new_l3 = 0, i; /* Cache sizes from cpuid(4) */
         unsigned int l2_id = 0, l3_id = 0, num_threads_sharing, index_msb;
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_HT
         unsigned int cpu = (c == &boot_cpu_data) ? 0 : (c - cpu_data);
 #endif
 
@@ -383,14 +383,14 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)
 
         if (new_l2) {
                 l2 = new_l2;
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_HT
                 cpu_llc_id[cpu] = l2_id;
 #endif
         }
 
         if (new_l3) {
                 l3 = new_l3;
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_HT
                 cpu_llc_id[cpu] = l3_id;
 #endif
         }
@@ -729,7 +729,7 @@ static void __cpuexit cache_remove_dev(struct sys_device * sys_dev)
         return;
 }
 
-static int cacheinfo_cpu_callback(struct notifier_block *nfb,
+static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb,
                                         unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
@@ -747,7 +747,7 @@ static int cacheinfo_cpu_callback(struct notifier_block *nfb,
         return NOTIFY_OK;
 }
 
-static struct notifier_block cacheinfo_cpu_notifier =
+static struct notifier_block __cpuinitdata cacheinfo_cpu_notifier =
 {
     .notifier_call = cacheinfo_cpu_callback,
 };
diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c
index a19fcb262dbb..f54a15268ed7 100644
--- a/arch/i386/kernel/cpu/proc.c
+++ b/arch/i386/kernel/cpu/proc.c
@@ -18,7 +18,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
          * applications want to get the raw CPUID data, they should access
          * /dev/cpu/<cpu_nr>/cpuid instead.
          */
-        static char *x86_cap_flags[] = {
+        static const char * const x86_cap_flags[] = {
                 /* Intel-defined */
                 "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
                 "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",
@@ -62,7 +62,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
         };
-        static char *x86_power_flags[] = {
+        static const char * const x86_power_flags[] = {
                 "ts",   /* temperature sensor */
                 "fid",  /* frequency id control */
                 "vid",  /* voltage id control */
@@ -109,9 +109,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                 seq_printf(m, "cache size\t: %d KB\n", c->x86_cache_size);
 #ifdef CONFIG_X86_HT
         if (c->x86_max_cores * smp_num_siblings > 1) {
-                seq_printf(m, "physical id\t: %d\n", phys_proc_id[n]);
+                seq_printf(m, "physical id\t: %d\n", c->phys_proc_id);
                 seq_printf(m, "siblings\t: %d\n", cpus_weight(cpu_core_map[n]));
-                seq_printf(m, "core id\t\t: %d\n", cpu_core_id[n]);
+                seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id);
                 seq_printf(m, "cpu cores\t: %d\n", c->booted_cores);
         }
 #endif
diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c
index 1d9a4abcdfc7..f6dfa9fb675c 100644
--- a/arch/i386/kernel/cpuid.c
+++ b/arch/i386/kernel/cpuid.c
@@ -183,7 +183,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long ac
         return NOTIFY_OK;
 }
 
-static struct notifier_block cpuid_class_cpu_notifier =
+static struct notifier_block __cpuinitdata cpuid_class_cpu_notifier =
 {
         .notifier_call = cpuid_class_cpu_callback,
 };
diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c
index 9202b67c4b2e..8beb0f07d999 100644
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
@@ -601,8 +601,10 @@ efi_initialize_iomem_resources(struct resource *code_resource,
                 res->end = res->start + ((md->num_pages << EFI_PAGE_SHIFT) - 1);
                 res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
                 if (request_resource(&iomem_resource, res) < 0)
-                        printk(KERN_ERR PFX "Failed to allocate res %s : 0x%lx-0x%lx\n",
-                                res->name, res->start, res->end);
+                        printk(KERN_ERR PFX "Failed to allocate res %s : "
+                                "0x%llx-0x%llx\n", res->name,
+                                (unsigned long long)res->start,
+                                (unsigned long long)res->end);
                 /*
                  * We don't know which region contains kernel data so we try
                  * it repeatedly and let the resource manager test it.
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
index e6e4506e749a..fbdb933251b6 100644
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
@@ -83,6 +83,12 @@ VM_MASK		= 0x00020000
 #define resume_kernel           restore_nocheck
 #endif
 
+#ifdef CONFIG_VM86
+#define resume_userspace_sig    check_userspace
+#else
+#define resume_userspace_sig    resume_userspace
+#endif
+
 #define SAVE_ALL \
         cld; \
         pushl %es; \
@@ -211,6 +217,7 @@ ret_from_exception:
         preempt_stop
 ret_from_intr:
         GET_THREAD_INFO(%ebp)
+check_userspace:
         movl EFLAGS(%esp), %eax         # mix EFLAGS and CS
         movb CS(%esp), %al
         testl $(VM_MASK | 3), %eax
@@ -263,7 +270,12 @@ sysenter_past_esp:
         pushl $(__USER_CS)
         CFI_ADJUST_CFA_OFFSET 4
         /*CFI_REL_OFFSET cs, 0*/
-        pushl $SYSENTER_RETURN
+        /*
+         * Push current_thread_info()->sysenter_return to the stack.
+         * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
+         * pushed above; +8 corresponds to copy_thread's esp0 setting.
+         */
+        pushl (TI_sysenter_return-THREAD_SIZE+8+4*4)(%esp)
         CFI_ADJUST_CFA_OFFSET 4
         CFI_REL_OFFSET eip, 0
 
@@ -415,7 +427,7 @@ work_notifysig:				# deal with pending signals and
                                         # vm86-space
         xorl %edx, %edx
         call do_notify_resume
-        jmp resume_userspace
+        jmp resume_userspace_sig
 
         ALIGN
 work_notifysig_v86:
@@ -428,7 +440,7 @@ work_notifysig_v86:
         movl %eax, %esp
         xorl %edx, %edx
         call do_notify_resume
-        jmp resume_userspace
+        jmp resume_userspace_sig
 #endif
 
         # perform syscall exit tracing
@@ -515,7 +527,7 @@ ENTRY(irq_entries_start)
  .if vector
         CFI_ADJUST_CFA_OFFSET -4
  .endif
-1:      pushl $vector-256
+1:      pushl $~(vector)
         CFI_ADJUST_CFA_OFFSET 4
         jmp common_interrupt
 .data
@@ -535,7 +547,7 @@ common_interrupt:
 #define BUILD_INTERRUPT(name, nr)       \
 ENTRY(name)                             \
         RING0_INT_FRAME;                \
-        pushl $nr-256;                  \
+        pushl $~(nr);                   \
         CFI_ADJUST_CFA_OFFSET 4;        \
         SAVE_ALL;                       \
         movl %esp,%eax;                 \
diff --git a/arch/i386/kernel/i8259.c b/arch/i386/kernel/i8259.c
index c1a42feba286..3c6063671a9f 100644
--- a/arch/i386/kernel/i8259.c
+++ b/arch/i386/kernel/i8259.c
@@ -132,7 +132,7 @@ void make_8259A_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
         io_apic_irqs &= ~(1<<irq);
-        irq_desc[irq].handler = &i8259A_irq_type;
+        irq_desc[irq].chip = &i8259A_irq_type;
         enable_irq(irq);
 }
 
@@ -386,12 +386,12 @@ void __init init_ISA_irqs (void)
                         /*
                          * 16 old-style INTA-cycle interrupts:
                          */
-                        irq_desc[i].handler = &i8259A_irq_type;
+                        irq_desc[i].chip = &i8259A_irq_type;
                 } else {
                         /*
                          * 'high' PCI IRQs filled in on demand
                          */
-                        irq_desc[i].handler = &no_irq_type;
+                        irq_desc[i].chip = &no_irq_type;
                 }
         }
 }
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 72ae414e4d49..ec9ea0269d36 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -581,7 +581,7 @@ static int balanced_irq(void *unused)
         
         /* push everything to CPU 0 to give us a starting point.  */
         for (i = 0 ; i < NR_IRQS ; i++) {
-                pending_irq_cpumask[i] = cpumask_of_cpu(0);
+                irq_desc[i].pending_mask = cpumask_of_cpu(0);
                 set_pending_irq(i, cpumask_of_cpu(0));
         }
 
@@ -1205,15 +1205,17 @@ static struct hw_interrupt_type ioapic_edge_type;
 #define IOAPIC_EDGE     0
 #define IOAPIC_LEVEL    1
 
-static inline void ioapic_register_intr(int irq, int vector, unsigned long trigger)
+static void ioapic_register_intr(int irq, int vector, unsigned long trigger)
 {
-        unsigned idx = use_pci_vector() && !platform_legacy_irq(irq) ? vector : irq;
+        unsigned idx;
+
+        idx = use_pci_vector() && !platform_legacy_irq(irq) ? vector : irq;
 
         if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||
                         trigger == IOAPIC_LEVEL)
-                irq_desc[idx].handler = &ioapic_level_type;
+                irq_desc[idx].chip = &ioapic_level_type;
         else
-                irq_desc[idx].handler = &ioapic_edge_type;
+                irq_desc[idx].chip = &ioapic_edge_type;
         set_intr_gate(vector, interrupt[idx]);
 }
 
@@ -1325,7 +1327,7 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in
          * The timer IRQ doesn't have to know that behind the
          * scene we have a 8259A-master in AEOI mode ...
          */
-        irq_desc[0].handler = &ioapic_edge_type;
+        irq_desc[0].chip = &ioapic_edge_type;
 
         /*
          * Add it to the IO-APIC irq-routing table:
@@ -2069,6 +2071,13 @@ static void set_ioapic_affinity_vector (unsigned int vector,
 #endif
 #endif
 
+static int ioapic_retrigger(unsigned int irq)
+{
+        send_IPI_self(IO_APIC_VECTOR(irq));
+
+        return 1;
+}
+
 /*
  * Level and edge triggered IO-APIC interrupts need different handling,
  * so we use two separate IRQ descriptors. Edge triggered IRQs can be
@@ -2088,6 +2097,7 @@ static struct hw_interrupt_type ioapic_edge_type __read_mostly = {
 #ifdef CONFIG_SMP
         .set_affinity   = set_ioapic_affinity,
 #endif
+        .retrigger      = ioapic_retrigger,
 };
 
 static struct hw_interrupt_type ioapic_level_type __read_mostly = {
@@ -2101,6 +2111,7 @@ static struct hw_interrupt_type ioapic_level_type __read_mostly = {
 #ifdef CONFIG_SMP
         .set_affinity   = set_ioapic_affinity,
 #endif
+        .retrigger      = ioapic_retrigger,
 };
 
 static inline void init_IO_APIC_traps(void)
@@ -2135,7 +2146,7 @@ static inline void init_IO_APIC_traps(void)
                                 make_8259A_irq(irq);
                         else
                                 /* Strange. Oh, well.. */
-                                irq_desc[irq].handler = &no_irq_type;
+                                irq_desc[irq].chip = &no_irq_type;
                 }
         }
 }
@@ -2351,7 +2362,7 @@ static inline void check_timer(void)
         printk(KERN_INFO "...trying to set up timer as Virtual Wire IRQ...");
 
         disable_8259A_irq(0);
-        irq_desc[0].handler = &lapic_irq_type;
+        irq_desc[0].chip = &lapic_irq_type;
         apic_write_around(APIC_LVT0, APIC_DM_FIXED | vector);   /* Fixed mode */
         enable_8259A_irq(0);
 
diff --git a/arch/i386/kernel/irq.c b/arch/i386/kernel/irq.c
index 061533e0cb5e..16b491703967 100644
--- a/arch/i386/kernel/irq.c
+++ b/arch/i386/kernel/irq.c
@@ -53,13 +53,19 @@ static union irq_ctx *softirq_ctx[NR_CPUS] __read_mostly;
  */
 fastcall unsigned int do_IRQ(struct pt_regs *regs)
 {       
-        /* high bits used in ret_from_ code */
-        int irq = regs->orig_eax & 0xff;
+        /* high bit used in ret_from_ code */
+        int irq = ~regs->orig_eax;
 #ifdef CONFIG_4KSTACKS
         union irq_ctx *curctx, *irqctx;
         u32 *isp;
 #endif
 
+        if (unlikely((unsigned)irq >= NR_IRQS)) {
+                printk(KERN_EMERG "%s: cannot handle IRQ %d\n",
+                                        __FUNCTION__, irq);
+                BUG();
+        }
+
         irq_enter();
 #ifdef CONFIG_DEBUG_STACKOVERFLOW
         /* Debugging check for stack overflow: is there less than 1KB free? */
@@ -76,6 +82,10 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs)
         }
 #endif
 
+        if (!irq_desc[irq].handle_irq) {
+                __do_IRQ(irq, regs);
+                goto out_exit;
+        }
 #ifdef CONFIG_4KSTACKS
 
         curctx = (union irq_ctx *) current_thread_info();
@@ -100,8 +110,8 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs)
                  * softirq checks work in the hardirq context.
                  */
                 irqctx->tinfo.preempt_count =
-                        irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK |
-                        curctx->tinfo.preempt_count & SOFTIRQ_MASK;
+                        (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
+                        (curctx->tinfo.preempt_count & SOFTIRQ_MASK);
 
                 asm volatile(
                         "       xchgl   %%ebx,%%esp      \n"
@@ -115,6 +125,7 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs)
 #endif
                 __do_IRQ(irq, regs);
 
+out_exit:
         irq_exit();
 
         return 1;
@@ -243,7 +254,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].handler->typename);
+                seq_printf(p, " %14s", irq_desc[i].chip->typename);
                 seq_printf(p, "  %s", action->name);
 
                 for (action=action->next; action; action = action->next)
@@ -285,13 +296,13 @@ void fixup_irqs(cpumask_t map)
                 if (irq == 2)
                         continue;
 
-                cpus_and(mask, irq_affinity[irq], map);
+                cpus_and(mask, irq_desc[irq].affinity, map);
                 if (any_online_cpu(mask) == NR_CPUS) {
                         printk("Breaking affinity for irq %i\n", irq);
                         mask = map;
                 }
-                if (irq_desc[irq].handler->set_affinity)
-                        irq_desc[irq].handler->set_affinity(irq, mask);
+                if (irq_desc[irq].chip->set_affinity)
+                        irq_desc[irq].chip->set_affinity(irq, mask);
                 else if (irq_desc[irq].action && !(warned++))
                         printk("Cannot set affinity for irq %i\n", irq);
         }
diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c
index 7a328230e540..d022cb8fd725 100644
--- a/arch/i386/kernel/msr.c
+++ b/arch/i386/kernel/msr.c
@@ -266,7 +266,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb, unsigned long acti
         return NOTIFY_OK;
 }
 
-static struct notifier_block msr_class_cpu_notifier =
+static struct notifier_block __cpuinitdata msr_class_cpu_notifier =
 {
         .notifier_call = msr_class_cpu_callback,
 };
diff --git a/arch/i386/kernel/scx200.c b/arch/i386/kernel/scx200.c
index 321f5fd26e75..9bf590cefc7d 100644
--- a/arch/i386/kernel/scx200.c
+++ b/arch/i386/kernel/scx200.c
@@ -9,6 +9,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/mutex.h>
 #include <linux/pci.h>
 
 #include <linux/scx200.h>
@@ -45,11 +46,19 @@ static struct pci_driver scx200_pci_driver = {
         .probe = scx200_probe,
 };
 
-static DEFINE_SPINLOCK(scx200_gpio_config_lock);
+static DEFINE_MUTEX(scx200_gpio_config_lock);
 
-static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+static void __devinit scx200_init_shadow(void)
 {
         int bank;
+
+        /* read the current values driven on the GPIO signals */
+        for (bank = 0; bank < 2; ++bank)
+                scx200_gpio_shadow[bank] = inl(scx200_gpio_base + 0x10 * bank);
+}
+
+static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
         unsigned base;
 
         if (pdev->device == PCI_DEVICE_ID_NS_SCx200_BRIDGE ||
@@ -63,10 +72,7 @@ static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_
                 }
 
                 scx200_gpio_base = base;
-
-                /* read the current values driven on the GPIO signals */
-                for (bank = 0; bank < 2; ++bank)
-                        scx200_gpio_shadow[bank] = inl(scx200_gpio_base + 0x10 * bank);
+                scx200_init_shadow();
 
         } else {
                 /* find the base of the Configuration Block */
@@ -87,12 +93,11 @@ static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_
         return 0;
 }
 
-u32 scx200_gpio_configure(int index, u32 mask, u32 bits)
+u32 scx200_gpio_configure(unsigned index, u32 mask, u32 bits)
 {
         u32 config, new_config;
-        unsigned long flags;
 
-        spin_lock_irqsave(&scx200_gpio_config_lock, flags);
+        mutex_lock(&scx200_gpio_config_lock);
 
         outl(index, scx200_gpio_base + 0x20);
         config = inl(scx200_gpio_base + 0x24);
@@ -100,45 +105,11 @@ u32 scx200_gpio_configure(int index, u32 mask, u32 bits)
         new_config = (config & mask) | bits;
         outl(new_config, scx200_gpio_base + 0x24);
 
-        spin_unlock_irqrestore(&scx200_gpio_config_lock, flags);
+        mutex_unlock(&scx200_gpio_config_lock);
 
         return config;
 }
 
-#if 0
-void scx200_gpio_dump(unsigned index)
-{
-        u32 config = scx200_gpio_configure(index, ~0, 0);
-        printk(KERN_DEBUG "GPIO%02u: 0x%08lx", index, (unsigned long)config);
-        
-        if (config & 1) 
-                printk(" OE"); /* output enabled */
-        else
-                printk(" TS"); /* tristate */
-        if (config & 2) 
-                printk(" PP"); /* push pull */
-        else
-                printk(" OD"); /* open drain */
-        if (config & 4) 
-                printk(" PUE"); /* pull up enabled */
-        else
-                printk(" PUD"); /* pull up disabled */
-        if (config & 8) 
-                printk(" LOCKED"); /* locked */
-        if (config & 16) 
-                printk(" LEVEL"); /* level input */
-        else
-                printk(" EDGE"); /* edge input */
-        if (config & 32) 
-                printk(" HI"); /* trigger on rising edge */
-        else
-                printk(" LO"); /* trigger on falling edge */
-        if (config & 64) 
-                printk(" DEBOUNCE"); /* debounce */
-        printk("\n");
-}
-#endif  /*  0  */
-
 static int __init scx200_init(void)
 {
         printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n");
@@ -159,10 +130,3 @@ EXPORT_SYMBOL(scx200_gpio_base);
 EXPORT_SYMBOL(scx200_gpio_shadow);
 EXPORT_SYMBOL(scx200_gpio_configure);
 EXPORT_SYMBOL(scx200_cb_base);
-
-/*
-    Local variables:
-        compile-command: "make -k -C ../../.. SUBDIRS=arch/i386/kernel modules"
-        c-basic-offset: 8
-    End:
-*/
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 4a65040cc624..6712f0d2eb37 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -1314,8 +1314,10 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat
         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;
diff --git a/arch/i386/kernel/signal.c b/arch/i386/kernel/signal.c
index 5c352c3a9e7f..43002cfb40c4 100644
--- a/arch/i386/kernel/signal.c
+++ b/arch/i386/kernel/signal.c
@@ -351,7 +351,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,
                         goto give_sigsegv;
         }
 
-        restorer = &__kernel_sigreturn;
+        restorer = (void *)VDSO_SYM(&__kernel_sigreturn);
         if (ka->sa.sa_flags & SA_RESTORER)
                 restorer = ka->sa.sa_restorer;
 
@@ -447,7 +447,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 goto give_sigsegv;
 
         /* Set up to return from userspace.  */
-        restorer = &__kernel_rt_sigreturn;
+        restorer = (void *)VDSO_SYM(&__kernel_rt_sigreturn);
         if (ka->sa.sa_flags & SA_RESTORER)
                 restorer = ka->sa.sa_restorer;
         err |= __put_user(restorer, &frame->pretcode);
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index bce5470ecb42..89e7315e539c 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -67,12 +67,6 @@ int smp_num_siblings = 1;
 EXPORT_SYMBOL(smp_num_siblings);
 #endif
 
-/* Package ID of each logical CPU */
-int phys_proc_id[NR_CPUS] __read_mostly = {[0 ... NR_CPUS-1] = BAD_APICID};
-
-/* Core ID of each logical CPU */
-int cpu_core_id[NR_CPUS] __read_mostly = {[0 ... NR_CPUS-1] = BAD_APICID};
-
 /* Last level cache ID of each logical CPU */
 int cpu_llc_id[NR_CPUS] __cpuinitdata = {[0 ... NR_CPUS-1] = BAD_APICID};
 
@@ -454,10 +448,12 @@ cpumask_t cpu_coregroup_map(int cpu)
         struct cpuinfo_x86 *c = cpu_data + cpu;
         /*
          * For perf, we return last level cache shared map.
-         * TBD: when power saving sched policy is added, we will return
-         *      cpu_core_map when power saving policy is enabled
+         * And for power savings, we return cpu_core_map
          */
-        return c->llc_shared_map;
+        if (sched_mc_power_savings || sched_smt_power_savings)
+                return cpu_core_map[cpu];
+        else
+                return c->llc_shared_map;
 }
 
 /* representing cpus for which sibling maps can be computed */
@@ -473,8 +469,8 @@ set_cpu_sibling_map(int cpu)
 
         if (smp_num_siblings > 1) {
                 for_each_cpu_mask(i, cpu_sibling_setup_map) {
-                        if (phys_proc_id[cpu] == phys_proc_id[i] &&
-                            cpu_core_id[cpu] == cpu_core_id[i]) {
+                        if (c[cpu].phys_proc_id == c[i].phys_proc_id &&
+                            c[cpu].cpu_core_id == c[i].cpu_core_id) {
                                 cpu_set(i, cpu_sibling_map[cpu]);
                                 cpu_set(cpu, cpu_sibling_map[i]);
                                 cpu_set(i, cpu_core_map[cpu]);
@@ -501,7 +497,7 @@ set_cpu_sibling_map(int cpu)
                         cpu_set(i, c[cpu].llc_shared_map);
                         cpu_set(cpu, c[i].llc_shared_map);
                 }
-                if (phys_proc_id[cpu] == phys_proc_id[i]) {
+                if (c[cpu].phys_proc_id == c[i].phys_proc_id) {
                         cpu_set(i, cpu_core_map[cpu]);
                         cpu_set(cpu, cpu_core_map[i]);
                         /*
@@ -1056,6 +1052,7 @@ static int __cpuinit __smp_prepare_cpu(int cpu)
         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);
 
         apicid = x86_cpu_to_apicid[cpu];
         if (apicid == BAD_APICID) {
@@ -1063,6 +1060,18 @@ static int __cpuinit __smp_prepare_cpu(int cpu)
                 goto exit;
         }
 
+        /*
+         * the CPU isn't initialized at boot time, allocate gdt table here.
+         * cpu_init will initialize it
+         */
+        if (!cpu_gdt_descr->address) {
+                cpu_gdt_descr->address = get_zeroed_page(GFP_KERNEL);
+                if (!cpu_gdt_descr->address)
+                        printk(KERN_CRIT "CPU%d failed to allocate GDT\n", cpu);
+                        ret = -ENOMEM;
+                        goto exit;
+        }
+
         info.complete = &done;
         info.apicid = apicid;
         info.cpu = cpu;
@@ -1340,8 +1349,8 @@ remove_siblinginfo(int cpu)
                 cpu_clear(cpu, cpu_sibling_map[sibling]);
         cpus_clear(cpu_sibling_map[cpu]);
         cpus_clear(cpu_core_map[cpu]);
-        phys_proc_id[cpu] = BAD_APICID;
-        cpu_core_id[cpu] = BAD_APICID;
+        c[cpu].phys_proc_id = 0;
+        c[cpu].cpu_core_id = 0;
         cpu_clear(cpu, cpu_sibling_setup_map);
 }
 
diff --git a/arch/i386/kernel/sysenter.c b/arch/i386/kernel/sysenter.c
index 0bada1870bdf..713ba39d32c6 100644
--- a/arch/i386/kernel/sysenter.c
+++ b/arch/i386/kernel/sysenter.c
@@ -2,6 +2,8 @@
  * linux/arch/i386/kernel/sysenter.c
  *
  * (C) Copyright 2002 Linus Torvalds
+ * Portions based on the vdso-randomization code from exec-shield:
+ * Copyright(C) 2005-2006, Red Hat, Inc., Ingo Molnar
  *
  * This file contains the needed initializations to support sysenter.
  */
@@ -13,12 +15,31 @@
 #include <linux/gfp.h>
 #include <linux/string.h>
 #include <linux/elf.h>
+#include <linux/mm.h>
+#include <linux/module.h>
 
 #include <asm/cpufeature.h>
 #include <asm/msr.h>
 #include <asm/pgtable.h>
 #include <asm/unistd.h>
 
+/*
+ * Should the kernel map a VDSO page into processes and pass its
+ * address down to glibc upon exec()?
+ */
+unsigned int __read_mostly vdso_enabled = 1;
+
+EXPORT_SYMBOL_GPL(vdso_enabled);
+
+static int __init vdso_setup(char *s)
+{
+        vdso_enabled = simple_strtoul(s, NULL, 0);
+
+        return 1;
+}
+
+__setup("vdso=", vdso_setup);
+
 extern asmlinkage void sysenter_entry(void);
 
 void enable_sep_cpu(void)
@@ -45,23 +66,120 @@ void enable_sep_cpu(void)
  */
 extern const char vsyscall_int80_start, vsyscall_int80_end;
 extern const char vsyscall_sysenter_start, vsyscall_sysenter_end;
+static void *syscall_page;
 
 int __init sysenter_setup(void)
 {
-        void *page = (void *)get_zeroed_page(GFP_ATOMIC);
+        syscall_page = (void *)get_zeroed_page(GFP_ATOMIC);
 
-        __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC);
+#ifdef CONFIG_COMPAT_VDSO
+        __set_fixmap(FIX_VDSO, __pa(syscall_page), PAGE_READONLY);
+        printk("Compat vDSO mapped to %08lx.\n", __fix_to_virt(FIX_VDSO));
+#else
+        /*
+         * In the non-compat case the ELF coredumping code needs the fixmap:
+         */
+        __set_fixmap(FIX_VDSO, __pa(syscall_page), PAGE_KERNEL_RO);
+#endif
 
         if (!boot_cpu_has(X86_FEATURE_SEP)) {
-                memcpy(page,
+                memcpy(syscall_page,
                        &vsyscall_int80_start,
                        &vsyscall_int80_end - &vsyscall_int80_start);
                 return 0;
         }
 
-        memcpy(page,
+        memcpy(syscall_page,
                &vsyscall_sysenter_start,
                &vsyscall_sysenter_end - &vsyscall_sysenter_start);
 
         return 0;
 }
+
+static struct page *syscall_nopage(struct vm_area_struct *vma,
+                                unsigned long adr, int *type)
+{
+        struct page *p = virt_to_page(adr - vma->vm_start + syscall_page);
+        get_page(p);
+        return p;
+}
+
+/* Prevent VMA merging */
+static void syscall_vma_close(struct vm_area_struct *vma)
+{
+}
+
+static struct vm_operations_struct syscall_vm_ops = {
+        .close = syscall_vma_close,
+        .nopage = syscall_nopage,
+};
+
+/* Defined in vsyscall-sysenter.S */
+extern void SYSENTER_RETURN;
+
+/* Setup a VMA at program startup for the vsyscall page */
+int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
+{
+        struct vm_area_struct *vma;
+        struct mm_struct *mm = current->mm;
+        unsigned long addr;
+        int ret;
+
+        down_write(&mm->mmap_sem);
+        addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
+        if (IS_ERR_VALUE(addr)) {
+                ret = addr;
+                goto up_fail;
+        }
+
+        vma = kmem_cache_zalloc(vm_area_cachep, SLAB_KERNEL);
+        if (!vma) {
+                ret = -ENOMEM;
+                goto up_fail;
+        }
+
+        vma->vm_start = addr;
+        vma->vm_end = addr + PAGE_SIZE;
+        /* MAYWRITE to allow gdb to COW and set breakpoints */
+        vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE;
+        vma->vm_flags |= mm->def_flags;
+        vma->vm_page_prot = protection_map[vma->vm_flags & 7];
+        vma->vm_ops = &syscall_vm_ops;
+        vma->vm_mm = mm;
+
+        ret = insert_vm_struct(mm, vma);
+        if (unlikely(ret)) {
+                kmem_cache_free(vm_area_cachep, vma);
+                goto up_fail;
+        }
+
+        current->mm->context.vdso = (void *)addr;
+        current_thread_info()->sysenter_return =
+                                    (void *)VDSO_SYM(&SYSENTER_RETURN);
+        mm->total_vm++;
+up_fail:
+        up_write(&mm->mmap_sem);
+        return ret;
+}
+
+const char *arch_vma_name(struct vm_area_struct *vma)
+{
+        if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
+                return "[vdso]";
+        return NULL;
+}
+
+struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
+{
+        return NULL;
+}
+
+int in_gate_area(struct task_struct *task, unsigned long addr)
+{
+        return 0;
+}
+
+int in_gate_area_no_task(unsigned long addr)
+{
+        return 0;
+}
diff --git a/arch/i386/kernel/topology.c b/arch/i386/kernel/topology.c
index 296355292c7c..e2e281d4bcc8 100644
--- a/arch/i386/kernel/topology.c
+++ b/arch/i386/kernel/topology.c
@@ -32,15 +32,8 @@
 
 static struct i386_cpu cpu_devices[NR_CPUS];
 
-int arch_register_cpu(int num){
-        struct node *parent = NULL;
-
-#ifdef CONFIG_NUMA
-        int node = cpu_to_node(num);
-        if (node_online(node))
-                parent = &node_devices[node].node;
-#endif /* CONFIG_NUMA */
-
+int arch_register_cpu(int num)
+{
         /*
          * CPU0 cannot be offlined due to several
          * restrictions and assumptions in kernel. This basically
@@ -50,21 +43,13 @@ int arch_register_cpu(int num){
         if (!num)
                 cpu_devices[num].cpu.no_control = 1;
 
-        return register_cpu(&cpu_devices[num].cpu, num, parent);
+        return register_cpu(&cpu_devices[num].cpu, num);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
 
 void arch_unregister_cpu(int num) {
-        struct node *parent = NULL;
-
-#ifdef CONFIG_NUMA
-        int node = cpu_to_node(num);
-        if (node_online(node))
-                parent = &node_devices[node].node;
-#endif /* CONFIG_NUMA */
-
-        return unregister_cpu(&cpu_devices[num].cpu, parent);
+        return unregister_cpu(&cpu_devices[num].cpu);
 }
 EXPORT_SYMBOL(arch_register_cpu);
 EXPORT_SYMBOL(arch_unregister_cpu);
@@ -74,16 +59,13 @@ EXPORT_SYMBOL(arch_unregister_cpu);
 
 #ifdef CONFIG_NUMA
 #include <linux/mmzone.h>
-#include <asm/node.h>
-
-struct i386_node node_devices[MAX_NUMNODES];
 
 static int __init topology_init(void)
 {
         int i;
 
         for_each_online_node(i)
-                arch_register_node(i);
+                register_one_node(i);
 
         for_each_present_cpu(i)
                 arch_register_cpu(i);
diff --git a/arch/i386/kernel/vsyscall-sysenter.S b/arch/i386/kernel/vsyscall-sysenter.S
index 3b62baa6a371..1a36d26e15eb 100644
--- a/arch/i386/kernel/vsyscall-sysenter.S
+++ b/arch/i386/kernel/vsyscall-sysenter.S
@@ -42,10 +42,10 @@ __kernel_vsyscall:
         /* 7: align return point with nop's to make disassembly easier */
         .space 7,0x90
 
-        /* 14: System call restart point is here! (SYSENTER_RETURN - 2) */
+        /* 14: System call restart point is here! (SYSENTER_RETURN-2) */
         jmp .Lenter_kernel
         /* 16: System call normal return point is here! */
-        .globl SYSENTER_RETURN  /* Symbol used by entry.S.  */
+        .globl SYSENTER_RETURN  /* Symbol used by sysenter.c  */
 SYSENTER_RETURN:
         pop %ebp
 .Lpop_ebp:
diff --git a/arch/i386/kernel/vsyscall.lds.S b/arch/i386/kernel/vsyscall.lds.S
index 98699ca6e52d..e26975fc68b6 100644
--- a/arch/i386/kernel/vsyscall.lds.S
+++ b/arch/i386/kernel/vsyscall.lds.S
@@ -7,7 +7,7 @@
 
 SECTIONS
 {
-  . = VSYSCALL_BASE + SIZEOF_HEADERS;
+  . = VDSO_PRELINK + SIZEOF_HEADERS;
 
   .hash           : { *(.hash) }                :text
   .dynsym         : { *(.dynsym) }
@@ -20,7 +20,7 @@ SECTIONS
      For the layouts to match, we need to skip more than enough
      space for the dynamic symbol table et al.  If this amount
      is insufficient, ld -shared will barf.  Just increase it here.  */
-  . = VSYSCALL_BASE + 0x400;
+  . = VDSO_PRELINK + 0x400;
 
   .text           : { *(.text) }                :text =0x90909090
   .note           : { *(.note.*) }              :text :note
diff --git a/arch/i386/mach-visws/setup.c b/arch/i386/mach-visws/setup.c
index 8a9e1a6f745d..1f84cdb24779 100644
--- a/arch/i386/mach-visws/setup.c
+++ b/arch/i386/mach-visws/setup.c
@@ -140,8 +140,8 @@ void __init time_init_hook(void)
 
 #define MB (1024 * 1024)
 
-static unsigned long sgivwfb_mem_phys;
-static unsigned long sgivwfb_mem_size;
+unsigned long sgivwfb_mem_phys;
+unsigned long sgivwfb_mem_size;
 
 long long mem_size __initdata = 0;
 
@@ -177,8 +177,4 @@ char * __init machine_specific_memory_setup(void)
         add_memory_region(sgivwfb_mem_phys, sgivwfb_mem_size, E820_RESERVED);
 
         return "PROM";
-
-        /* Remove gcc warnings */
-        (void) sanitize_e820_map(NULL, NULL);
-        (void) copy_e820_map(NULL, 0);
 }
diff --git a/arch/i386/mach-visws/visws_apic.c b/arch/i386/mach-visws/visws_apic.c
index 3e64fb721291..c418521dd554 100644
--- a/arch/i386/mach-visws/visws_apic.c
+++ b/arch/i386/mach-visws/visws_apic.c
@@ -278,22 +278,22 @@ void init_VISWS_APIC_irqs(void)
                 irq_desc[i].depth = 1;
 
                 if (i == 0) {
-                        irq_desc[i].handler = &cobalt_irq_type;
+                        irq_desc[i].chip = &cobalt_irq_type;
                 }
                 else if (i == CO_IRQ_IDE0) {
-                        irq_desc[i].handler = &cobalt_irq_type;
+                        irq_desc[i].chip = &cobalt_irq_type;
                 }
                 else if (i == CO_IRQ_IDE1) {
-                        irq_desc[i].handler = &cobalt_irq_type;
+                        irq_desc[i].chip = &cobalt_irq_type;
                 }
                 else if (i == CO_IRQ_8259) {
-                        irq_desc[i].handler = &piix4_master_irq_type;
+                        irq_desc[i].chip = &piix4_master_irq_type;
                 }
                 else if (i < CO_IRQ_APIC0) {
-                        irq_desc[i].handler = &piix4_virtual_irq_type;
+                        irq_desc[i].chip = &piix4_virtual_irq_type;
                 }
                 else if (IS_CO_APIC(i)) {
-                        irq_desc[i].handler = &cobalt_irq_type;
+                        irq_desc[i].chip = &cobalt_irq_type;
                 }
         }
 
diff --git a/arch/i386/mach-voyager/setup.c b/arch/i386/mach-voyager/setup.c
index 0e225054e222..defc6ebbd565 100644
--- a/arch/i386/mach-voyager/setup.c
+++ b/arch/i386/mach-voyager/setup.c
@@ -5,10 +5,10 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <asm/acpi.h>
 #include <asm/arch_hooks.h>
 #include <asm/voyager.h>
 #include <asm/e820.h>
+#include <asm/io.h>
 #include <asm/setup.h>
 
 void __init pre_intr_init_hook(void)
@@ -27,8 +27,7 @@ void __init intr_init_hook(void)
         smp_intr_init();
 #endif
 
-        if (!acpi_ioapic)
-                setup_irq(2, &irq2);
+        setup_irq(2, &irq2);
 }
 
 void __init pre_setup_arch_hook(void)
diff --git a/arch/i386/mach-voyager/voyager_smp.c b/arch/i386/mach-voyager/voyager_smp.c
index 70e560a1b79a..5b8b579a079f 100644
--- a/arch/i386/mach-voyager/voyager_smp.c
+++ b/arch/i386/mach-voyager/voyager_smp.c
@@ -661,6 +661,7 @@ do_boot_cpu(__u8 cpu)
                 print_cpu_info(&cpu_data[cpu]);
                 wmb();
                 cpu_set(cpu, cpu_callout_map);
+                cpu_set(cpu, cpu_present_map);
         }
         else {
                 printk("CPU%d FAILED TO BOOT: ", cpu);
@@ -1418,7 +1419,7 @@ smp_intr_init(void)
          * This is for later: first 16 correspond to PC IRQs; next 16
          * are Primary MC IRQs and final 16 are Secondary MC IRQs */
         for(i = 0; i < 48; i++)
-                irq_desc[i].handler = &vic_irq_type;
+                irq_desc[i].chip = &vic_irq_type;
 }
 
 /* send a CPI at level cpi to a set of cpus in cpuset (set 1 bit per
@@ -1912,6 +1913,7 @@ void __devinit smp_prepare_boot_cpu(void)
         cpu_set(smp_processor_id(), cpu_online_map);
         cpu_set(smp_processor_id(), cpu_callout_map);
         cpu_set(smp_processor_id(), cpu_possible_map);
+        cpu_set(smp_processor_id(), cpu_present_map);
 }
 
 int __devinit
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index bf19513f0cea..f84b16e007ff 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -23,6 +23,7 @@
 #include <linux/init.h>
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
+#include <linux/poison.h>
 #include <linux/bootmem.h>
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
@@ -654,7 +655,7 @@ void __init mem_init(void)
  */
 #ifdef CONFIG_MEMORY_HOTPLUG
 #ifndef CONFIG_NEED_MULTIPLE_NODES
-int add_memory(u64 start, u64 size)
+int arch_add_memory(int nid, u64 start, u64 size)
 {
         struct pglist_data *pgdata = &contig_page_data;
         struct zone *zone = pgdata->node_zones + MAX_NR_ZONES-1;
@@ -753,7 +754,7 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
         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);
+                memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
                 free_page(addr);
                 totalram_pages++;
         }
diff --git a/arch/i386/mm/pageattr.c b/arch/i386/mm/pageattr.c
index 0887b34bc59b..353a836ed63c 100644
--- a/arch/i386/mm/pageattr.c
+++ b/arch/i386/mm/pageattr.c
@@ -229,8 +229,8 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
         if (PageHighMem(page))
                 return;
         if (!enable)
-                mutex_debug_check_no_locks_freed(page_address(page),
-                                                 numpages * PAGE_SIZE);
+                debug_check_no_locks_freed(page_address(page),
+                                           numpages * PAGE_SIZE);
 
         /* the return value is ignored - the calls cannot fail,
          * large pages are disabled at boot time.
diff --git a/arch/i386/pci/i386.c b/arch/i386/pci/i386.c
index a151f7a99f5e..10154a2cac68 100644
--- a/arch/i386/pci/i386.c
+++ b/arch/i386/pci/i386.c
@@ -48,10 +48,10 @@
  */
 void
 pcibios_align_resource(void *data, struct resource *res,
-                       unsigned long size, unsigned long align)
+                        resource_size_t size, resource_size_t align)
 {
         if (res->flags & IORESOURCE_IO) {
-                unsigned long start = res->start;
+                resource_size_t start = res->start;
 
                 if (start & 0x300) {
                         start = (start + 0x3ff) & ~0x3ff;
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 18318749884b..b487e227a1f7 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -271,6 +271,9 @@ config HOTPLUG_CPU
           can be controlled through /sys/devices/system/cpu/cpu#.
           Say N if you want to disable CPU hotplug.
 
+config ARCH_ENABLE_MEMORY_HOTPLUG
+        def_bool y
+
 config SCHED_SMT
         bool "SMT scheduler support"
         depends on SMP
@@ -374,6 +377,10 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
         def_bool y
         depends on NEED_MULTIPLE_NODES
 
+config HAVE_ARCH_NODEDATA_EXTENSION
+        def_bool y
+        depends on NUMA
+
 config IA32_SUPPORT
         bool "Support for Linux/x86 binaries"
         help
@@ -485,6 +492,10 @@ config GENERIC_PENDING_IRQ
         depends on GENERIC_HARDIRQS && SMP
         default y
 
+config IRQ_PER_CPU
+        bool
+        default y
+
 source "arch/ia64/hp/sim/Kconfig"
 
 menu "Instrumentation Support"
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig
index 766bf4955432..9d1cffb57cde 100644
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
@@ -114,7 +114,7 @@ CONFIG_IA64_CYCLONE=y
 CONFIG_IOSAPIC=y
 CONFIG_FORCE_MAX_ZONEORDER=17
 CONFIG_SMP=y
-CONFIG_NR_CPUS=4
+CONFIG_NR_CPUS=16
 CONFIG_HOTPLUG_CPU=y
 CONFIG_PERMIT_BSP_REMOVE=y
 CONFIG_FORCE_CPEI_RETARGET=y
diff --git a/arch/ia64/hp/sim/hpsim_irq.c b/arch/ia64/hp/sim/hpsim_irq.c
index c0d25a2a3e9c..8145547bb52d 100644
--- a/arch/ia64/hp/sim/hpsim_irq.c
+++ b/arch/ia64/hp/sim/hpsim_irq.c
@@ -44,8 +44,8 @@ hpsim_irq_init (void)
         int i;
 
         for (i = 0; i < NR_IRQS; ++i) {
-                idesc = irq_descp(i);
-                if (idesc->handler == &no_irq_type)
-                        idesc->handler = &irq_type_hp_sim;
+                idesc = irq_desc + i;
+                if (idesc->chip == &no_irq_type)
+                        idesc->chip = &irq_type_hp_sim;
         }
 }
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index d58c1c5c903a..efc7df4b0fd2 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -456,7 +456,7 @@ iosapic_startup_edge_irq (unsigned int irq)
 static void
 iosapic_ack_edge_irq (unsigned int irq)
 {
-        irq_desc_t *idesc = irq_descp(irq);
+        irq_desc_t *idesc = irq_desc + irq;
 
         move_native_irq(irq);
         /*
@@ -659,14 +659,14 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery,
         else
                 irq_type = &irq_type_iosapic_level;
 
-        idesc = irq_descp(vector);
-        if (idesc->handler != irq_type) {
-                if (idesc->handler != &no_irq_type)
+        idesc = irq_desc + vector;
+        if (idesc->chip != irq_type) {
+                if (idesc->chip != &no_irq_type)
                         printk(KERN_WARNING
                                "%s: changing vector %d from %s to %s\n",
                                __FUNCTION__, vector,
-                               idesc->handler->typename, irq_type->typename);
-                idesc->handler = irq_type;
+                               idesc->chip->typename, irq_type->typename);
+                idesc->chip = irq_type;
         }
         return 0;
 }
@@ -793,14 +793,14 @@ again:
                         return -ENOSPC;
         }
 
-        spin_lock_irqsave(&irq_descp(vector)->lock, flags);
+        spin_lock_irqsave(&irq_desc[vector].lock, flags);
         spin_lock(&iosapic_lock);
         {
                 if (gsi_to_vector(gsi) > 0) {
                         if (list_empty(&iosapic_intr_info[vector].rtes))
                                 free_irq_vector(vector);
                         spin_unlock(&iosapic_lock);
-                        spin_unlock_irqrestore(&irq_descp(vector)->lock,
+                        spin_unlock_irqrestore(&irq_desc[vector].lock,
                                                flags);
                         goto again;
                 }
@@ -810,7 +810,7 @@ again:
                               polarity, trigger);
                 if (err < 0) {
                         spin_unlock(&iosapic_lock);
-                        spin_unlock_irqrestore(&irq_descp(vector)->lock,
+                        spin_unlock_irqrestore(&irq_desc[vector].lock,
                                                flags);
                         return err;
                 }
@@ -825,7 +825,7 @@ again:
                 set_rte(gsi, vector, dest, mask);
         }
         spin_unlock(&iosapic_lock);
-        spin_unlock_irqrestore(&irq_descp(vector)->lock, flags);
+        spin_unlock_irqrestore(&irq_desc[vector].lock, flags);
 
         printk(KERN_INFO "GSI %u (%s, %s) -> CPU %d (0x%04x) vector %d\n",
                gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"),
@@ -860,7 +860,7 @@ iosapic_unregister_intr (unsigned int gsi)
         }
         vector = irq_to_vector(irq);
 
-        idesc = irq_descp(irq);
+        idesc = irq_desc + irq;
         spin_lock_irqsave(&idesc->lock, flags);
         spin_lock(&iosapic_lock);
         {
@@ -903,7 +903,7 @@ iosapic_unregister_intr (unsigned int gsi)
                         BUG_ON(iosapic_intr_info[vector].count);
 
                         /* Clear the interrupt controller descriptor */
-                        idesc->handler = &no_irq_type;
+                        idesc->chip = &no_irq_type;
 
                         /* Clear the interrupt information */
                         memset(&iosapic_intr_info[vector], 0,
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
index 9c72ea3f6432..7852382de2fa 100644
--- a/arch/ia64/kernel/irq.c
+++ b/arch/ia64/kernel/irq.c
@@ -76,7 +76,7 @@ int show_interrupts(struct seq_file *p, void *v)
                         seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
                 }
 #endif
-                seq_printf(p, " %14s", irq_desc[i].handler->typename);
+                seq_printf(p, " %14s", irq_desc[i].chip->typename);
                 seq_printf(p, "  %s", action->name);
 
                 for (action=action->next; action; action = action->next)
@@ -100,7 +100,7 @@ void set_irq_affinity_info (unsigned int irq, int hwid, int redir)
         cpu_set(cpu_logical_id(hwid), mask);
 
         if (irq < NR_IRQS) {
-                irq_affinity[irq] = mask;
+                irq_desc[irq].affinity = mask;
                 irq_redir[irq] = (char) (redir & 0xff);
         }
 }
@@ -120,7 +120,7 @@ static void migrate_irqs(void)
         int             irq, new_cpu;
 
         for (irq=0; irq < NR_IRQS; irq++) {
-                desc = irq_descp(irq);
+                desc = irq_desc + irq;
 
                 /*
                  * No handling for now.
@@ -131,7 +131,7 @@ static void migrate_irqs(void)
                 if (desc->status == IRQ_PER_CPU)
                         continue;
 
-                cpus_and(mask, irq_affinity[irq], cpu_online_map);
+                cpus_and(mask, irq_desc[irq].affinity, cpu_online_map);
                 if (any_online_cpu(mask) == NR_CPUS) {
                         /*
                          * Save it for phase 2 processing
@@ -144,15 +144,15 @@ static void migrate_irqs(void)
                         /*
                          * Al three are essential, currently WARN_ON.. maybe panic?
                          */
-                        if (desc->handler && desc->handler->disable &&
-                                desc->handler->enable && desc->handler->set_affinity) {
-                                desc->handler->disable(irq);
-                                desc->handler->set_affinity(irq, mask);
-                                desc->handler->enable(irq);
+                        if (desc->chip && desc->chip->disable &&
+                                desc->chip->enable && desc->chip->set_affinity) {
+                                desc->chip->disable(irq);
+                                desc->chip->set_affinity(irq, mask);
+                                desc->chip->enable(irq);
                         } else {
-                                WARN_ON((!(desc->handler) || !(desc->handler->disable) ||
-                                                !(desc->handler->enable) ||
-                                                !(desc->handler->set_affinity)));
+                                WARN_ON((!(desc->chip) || !(desc->chip->disable) ||
+                                                !(desc->chip->enable) ||
+                                                !(desc->chip->set_affinity)));
                         }
                 }
         }
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index ef9a2b49307a..f5035304594e 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -249,9 +249,9 @@ register_percpu_irq (ia64_vector vec, struct irqaction *action)
 
         for (irq = 0; irq < NR_IRQS; ++irq)
                 if (irq_to_vector(irq) == vec) {
-                        desc = irq_descp(irq);
+                        desc = irq_desc + irq;
                         desc->status |= IRQ_PER_CPU;
-                        desc->handler = &irq_type_ia64_lsapic;
+                        desc->chip = &irq_type_ia64_lsapic;
                         if (action)
                                 setup_irq(irq, action);
                 }
diff --git a/arch/ia64/kernel/irq_lsapic.c b/arch/ia64/kernel/irq_lsapic.c
index ea14e6a04409..1ab58b09f3d7 100644
--- a/arch/ia64/kernel/irq_lsapic.c
+++ b/arch/ia64/kernel/irq_lsapic.c
@@ -26,6 +26,13 @@ lsapic_noop (unsigned int irq)
         /* nuthing to do... */
 }
 
+static int lsapic_retrigger(unsigned int irq)
+{
+        ia64_resend_irq(irq);
+
+        return 1;
+}
+
 struct hw_interrupt_type irq_type_ia64_lsapic = {
         .typename =     "LSAPIC",
         .startup =      lsapic_noop_startup,
@@ -33,5 +40,6 @@ struct hw_interrupt_type irq_type_ia64_lsapic = {
         .enable =       lsapic_noop,
         .disable =      lsapic_noop,
         .ack =          lsapic_noop,
-        .end =          lsapic_noop
+        .end =          lsapic_noop,
+        .retrigger =    lsapic_retrigger,
 };
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 6a0880639bc9..d7dc5e63de63 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1788,7 +1788,7 @@ ia64_mca_late_init(void)
                         cpe_poll_enabled = 0;
                         for (irq = 0; irq < NR_IRQS; ++irq)
                                 if (irq_to_vector(irq) == cpe_vector) {
-                                        desc = irq_descp(irq);
+                                        desc = irq_desc + irq;
                                         desc->status |= IRQ_PER_CPU;
                                         setup_irq(irq, &mca_cpe_irqaction);
                                         ia64_cpe_irq = irq;
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index 859fb37ff49b..8a1208419138 100644
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -959,7 +959,7 @@ remove_palinfo_proc_entries(unsigned int hcpu)
         }
 }
 
-static int palinfo_cpu_callback(struct notifier_block *nfb,
+static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,
                                                                 unsigned long action,
                                                                 void *hcpu)
 {
@@ -978,7 +978,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
         return NOTIFY_OK;
 }
 
-static struct notifier_block palinfo_cpu_notifier =
+static struct notifier_block __cpuinitdata palinfo_cpu_notifier =
 {
         .notifier_call = palinfo_cpu_callback,
         .priority = 0,
@@ -998,7 +998,7 @@ palinfo_init(void)
         }
 
         /* Register for future delivery via notify registration */
-        register_cpu_notifier(&palinfo_cpu_notifier);
+        register_hotcpu_notifier(&palinfo_cpu_notifier);
 
         return 0;
 }
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 6d7bc8ff7b3a..a0055d3d695c 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -6165,7 +6165,7 @@ pfm_load_regs (struct task_struct *task)
                 /*
                  * will replay the PMU interrupt
                  */
-                if (need_irq_resend) hw_resend_irq(NULL, IA64_PERFMON_VECTOR);
+                if (need_irq_resend) ia64_resend_irq(IA64_PERFMON_VECTOR);
 
                 pfm_stats[smp_processor_id()].pfm_replay_ovfl_intr_count++;
         }
@@ -6305,7 +6305,7 @@ pfm_load_regs (struct task_struct *task)
                 /*
                  * will replay the PMU interrupt
                  */
-                if (need_irq_resend) hw_resend_irq(NULL, IA64_PERFMON_VECTOR);
+                if (need_irq_resend) ia64_resend_irq(IA64_PERFMON_VECTOR);
 
                 pfm_stats[smp_processor_id()].pfm_replay_ovfl_intr_count++;
         }
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index 663a186ad194..9065f0f01ba3 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -572,7 +572,7 @@ static struct file_operations salinfo_data_fops = {
 };
 
 #ifdef  CONFIG_HOTPLUG_CPU
-static int
+static int __devinit
 salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
 {
         unsigned int i, cpu = (unsigned long)hcpu;
@@ -673,9 +673,7 @@ salinfo_init(void)
         salinfo_timer.function = &salinfo_timeout;
         add_timer(&salinfo_timer);
 
-#ifdef  CONFIG_HOTPLUG_CPU
-        register_cpu_notifier(&salinfo_cpu_notifier);
-#endif
+        register_hotcpu_notifier(&salinfo_cpu_notifier);
 
         return 0;
 }
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 44e9547878ac..5203df78f150 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -677,16 +677,16 @@ int migrate_platform_irqs(unsigned int cpu)
                         new_cpei_cpu = any_online_cpu(cpu_online_map);
                         mask = cpumask_of_cpu(new_cpei_cpu);
                         set_cpei_target_cpu(new_cpei_cpu);
-                        desc = irq_descp(ia64_cpe_irq);
+                        desc = irq_desc + ia64_cpe_irq;
                         /*
                          * Switch for now, immediatly, we need to do fake intr
                          * as other interrupts, but need to study CPEI behaviour with
                          * polling before making changes.
                          */
                         if (desc) {
-                                desc->handler->disable(ia64_cpe_irq);
-                                desc->handler->set_affinity(ia64_cpe_irq, mask);
-                                desc->handler->enable(ia64_cpe_irq);
+                                desc->chip->disable(ia64_cpe_irq);
+                                desc->chip->set_affinity(ia64_cpe_irq, mask);
+                                desc->chip->enable(ia64_cpe_irq);
                                 printk ("Re-targetting CPEI to cpu %d\n", new_cpei_cpu);
                         }
                 }
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 879edb51d1e0..5511d9c6c701 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -26,19 +26,10 @@
 #include <asm/numa.h>
 #include <asm/cpu.h>
 
-#ifdef CONFIG_NUMA
-static struct node *sysfs_nodes;
-#endif
 static struct ia64_cpu *sysfs_cpus;
 
 int arch_register_cpu(int num)
 {
-        struct node *parent = NULL;
-        
-#ifdef CONFIG_NUMA
-        parent = &sysfs_nodes[cpu_to_node(num)];
-#endif /* CONFIG_NUMA */
-
 #if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU)
         /*
          * If CPEI cannot be re-targetted, and this is
@@ -48,21 +39,14 @@ int arch_register_cpu(int num)
                 sysfs_cpus[num].cpu.no_control = 1;
 #endif
 
-        return register_cpu(&sysfs_cpus[num].cpu, num, parent);
+        return register_cpu(&sysfs_cpus[num].cpu, num);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
 
 void arch_unregister_cpu(int num)
 {
-        struct node *parent = NULL;
-
-#ifdef CONFIG_NUMA
-        int node = cpu_to_node(num);
-        parent = &sysfs_nodes[node];
-#endif /* CONFIG_NUMA */
-
-        return unregister_cpu(&sysfs_cpus[num].cpu, parent);
+        return unregister_cpu(&sysfs_cpus[num].cpu);
 }
 EXPORT_SYMBOL(arch_register_cpu);
 EXPORT_SYMBOL(arch_unregister_cpu);
@@ -74,17 +58,11 @@ static int __init topology_init(void)
         int i, err = 0;
 
 #ifdef CONFIG_NUMA
-        sysfs_nodes = kzalloc(sizeof(struct node) * MAX_NUMNODES, GFP_KERNEL);
-        if (!sysfs_nodes) {
-                err = -ENOMEM;
-                goto out;
-        }
-
         /*
          * MCD - Do we want to register all ONLINE nodes, or all POSSIBLE nodes?
          */
         for_each_online_node(i) {
-                if ((err = register_node(&sysfs_nodes[i], i, 0)))
+                if ((err = register_one_node(i)))
                         goto out;
         }
 #endif
@@ -426,7 +404,7 @@ static int __cpuinit cache_remove_dev(struct sys_device * sys_dev)
  * When a cpu is hot-plugged, do a check and initiate
  * cache kobject if necessary
  */
-static int cache_cpu_callback(struct notifier_block *nfb,
+static int __cpuinit cache_cpu_callback(struct notifier_block *nfb,
                 unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
@@ -444,7 +422,7 @@ static int cache_cpu_callback(struct notifier_block *nfb,
         return NOTIFY_OK;
 }
 
-static struct notifier_block cache_cpu_notifier =
+static struct notifier_block __cpuinitdata cache_cpu_notifier =
 {
         .notifier_call = cache_cpu_callback
 };
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index b6bcc9fa3603..525b082eb661 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -33,7 +33,6 @@
  */
 struct early_node_data {
         struct ia64_node_data *node_data;
-        pg_data_t *pgdat;
         unsigned long pernode_addr;
         unsigned long pernode_size;
         struct bootmem_data bootmem_data;
@@ -46,6 +45,8 @@ struct early_node_data {
 static struct early_node_data mem_data[MAX_NUMNODES] __initdata;
 static nodemask_t memory_less_mask __initdata;
 
+static pg_data_t *pgdat_list[MAX_NUMNODES];
+
 /*
  * To prevent cache aliasing effects, align per-node structures so that they
  * start at addresses that are strided by node number.
@@ -99,7 +100,7 @@ static int __init build_node_maps(unsigned long start, unsigned long len,
  * acpi_boot_init() (which builds the node_to_cpu_mask array) hasn't been
  * called yet.  Note that node 0 will also count all non-existent cpus.
  */
-static int __init early_nr_cpus_node(int node)
+static int __meminit early_nr_cpus_node(int node)
 {
         int cpu, n = 0;
 
@@ -114,7 +115,7 @@ static int __init early_nr_cpus_node(int node)
  * compute_pernodesize - compute size of pernode data
  * @node: the node id.
  */
-static unsigned long __init compute_pernodesize(int node)
+static unsigned long __meminit compute_pernodesize(int node)
 {
         unsigned long pernodesize = 0, cpus;
 
@@ -175,13 +176,13 @@ static void __init fill_pernode(int node, unsigned long pernode,
         pernode += PERCPU_PAGE_SIZE * cpus;
         pernode += node * L1_CACHE_BYTES;
 
-        mem_data[node].pgdat = __va(pernode);
+        pgdat_list[node] = __va(pernode);
         pernode += L1_CACHE_ALIGN(sizeof(pg_data_t));
 
         mem_data[node].node_data = __va(pernode);
         pernode += L1_CACHE_ALIGN(sizeof(struct ia64_node_data));
 
-        mem_data[node].pgdat->bdata = bdp;
+        pgdat_list[node]->bdata = bdp;
         pernode += L1_CACHE_ALIGN(sizeof(pg_data_t));
 
         cpu_data = per_cpu_node_setup(cpu_data, node);
@@ -268,7 +269,7 @@ static int __init find_pernode_space(unsigned long start, unsigned long len,
 static int __init free_node_bootmem(unsigned long start, unsigned long len,
                                     int node)
 {
-        free_bootmem_node(mem_data[node].pgdat, start, len);
+        free_bootmem_node(pgdat_list[node], start, len);
 
         return 0;
 }
@@ -287,7 +288,7 @@ static void __init reserve_pernode_space(void)
         int node;
 
         for_each_online_node(node) {
-                pg_data_t *pdp = mem_data[node].pgdat;
+                pg_data_t *pdp = pgdat_list[node];
 
                 if (node_isset(node, memory_less_mask))
                         continue;
@@ -307,6 +308,17 @@ static void __init reserve_pernode_space(void)
         }
 }
 
+static void __meminit scatter_node_data(void)
+{
+        pg_data_t **dst;
+        int node;
+
+        for_each_online_node(node) {
+                dst = LOCAL_DATA_ADDR(pgdat_list[node])->pg_data_ptrs;
+                memcpy(dst, pgdat_list, sizeof(pgdat_list));
+        }
+}
+
 /**
  * initialize_pernode_data - fixup per-cpu & per-node pointers
  *
@@ -317,17 +329,10 @@ static void __init reserve_pernode_space(void)
  */
 static void __init initialize_pernode_data(void)
 {
-        pg_data_t *pgdat_list[MAX_NUMNODES];
         int cpu, node;
 
-        for_each_online_node(node)
-                pgdat_list[node] = mem_data[node].pgdat;
+        scatter_node_data();
 
-        /* Copy the pg_data_t list to each node and init the node field */
-        for_each_online_node(node) {
-                memcpy(mem_data[node].node_data->pg_data_ptrs, pgdat_list,
-                       sizeof(pgdat_list));
-        }
 #ifdef CONFIG_SMP
         /* Set the node_data pointer for each per-cpu struct */
         for (cpu = 0; cpu < NR_CPUS; cpu++) {
@@ -372,7 +377,7 @@ static void __init *memory_less_node_alloc(int nid, unsigned long pernodesize)
         if (bestnode == -1)
                 bestnode = anynode;
 
-        ptr = __alloc_bootmem_node(mem_data[bestnode].pgdat, pernodesize,
+        ptr = __alloc_bootmem_node(pgdat_list[bestnode], pernodesize,
                 PERCPU_PAGE_SIZE, __pa(MAX_DMA_ADDRESS));
 
         return ptr;
@@ -476,7 +481,7 @@ void __init find_memory(void)
                 pernodesize = mem_data[node].pernode_size;
                 map = pernode + pernodesize;
 
-                init_bootmem_node(mem_data[node].pgdat,
+                init_bootmem_node(pgdat_list[node],
                                   map>>PAGE_SHIFT,
                                   bdp->node_boot_start>>PAGE_SHIFT,
                                   bdp->node_low_pfn);
@@ -786,3 +791,21 @@ void __init paging_init(void)
 
         zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));
 }
+
+pg_data_t *arch_alloc_nodedata(int nid)
+{
+        unsigned long size = compute_pernodesize(nid);
+
+        return kzalloc(size, GFP_KERNEL);
+}
+
+void arch_free_nodedata(pg_data_t *pgdat)
+{
+        kfree(pgdat);
+}
+
+void arch_refresh_nodedata(int update_node, pg_data_t *update_pgdat)
+{
+        pgdat_list[update_node] = update_pgdat;
+        scatter_node_data();
+}
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 11f08001f8c2..38306e98f04b 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -652,7 +652,7 @@ void online_page(struct page *page)
         num_physpages++;
 }
 
-int add_memory(u64 start, u64 size)
+int arch_add_memory(int nid, u64 start, u64 size)
 {
         pg_data_t *pgdat;
         struct zone *zone;
@@ -660,7 +660,7 @@ int add_memory(u64 start, u64 size)
         unsigned long nr_pages = size >> PAGE_SHIFT;
         int ret;
 
-        pgdat = NODE_DATA(0);
+        pgdat = NODE_DATA(nid);
 
         zone = pgdat->node_zones + ZONE_NORMAL;
         ret = __add_pages(zone, start_pfn, nr_pages);
@@ -671,7 +671,6 @@ int add_memory(u64 start, u64 size)
 
         return ret;
 }
-EXPORT_SYMBOL_GPL(add_memory);
 
 int remove_memory(u64 start, u64 size)
 {
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 77375a55da31..5bef0e3603f2 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -568,7 +568,7 @@ pcibios_disable_device (struct pci_dev *dev)
 
 void
 pcibios_align_resource (void *data, struct resource *res,
-                        unsigned long size, unsigned long align)
+                        resource_size_t size, resource_size_t align)
 {
 }
 
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index dc8e2b696713..7bb6ad188ba3 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -27,7 +27,7 @@ static void unregister_intr_pda(struct sn_irq_info *sn_irq_info);
 int sn_force_interrupt_flag = 1;
 extern int sn_ioif_inited;
 struct list_head **sn_irq_lh;
-static spinlock_t sn_irq_info_lock = SPIN_LOCK_UNLOCKED; /* non-IRQ lock */
+static DEFINE_SPINLOCK(sn_irq_info_lock); /* non-IRQ lock */
 
 u64 sn_intr_alloc(nasid_t local_nasid, int local_widget,
                                      struct sn_irq_info *sn_irq_info,
@@ -225,8 +225,8 @@ void sn_irq_init(void)
         ia64_last_device_vector = IA64_SN2_LAST_DEVICE_VECTOR;
 
         for (i = 0; i < NR_IRQS; i++) {
-                if (base_desc[i].handler == &no_irq_type) {
-                        base_desc[i].handler = &irq_type_sn;
+                if (base_desc[i].chip == &no_irq_type) {
+                        base_desc[i].chip = &irq_type_sn;
                 }
         }
 }
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 93577abae36d..3bfccf354343 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -458,7 +458,7 @@ void __init sn_setup(char **cmdline_p)
          * support here so we don't have to listen to failed keyboard probe
          * messages.
          */
-        if (version <= 0x0209 && acpi_kbd_controller_present) {
+        if (is_shub1() && version <= 0x0209 && acpi_kbd_controller_present) {
                 printk(KERN_INFO "Disabling legacy keyboard support as prom "
                        "is too old and doesn't provide FADT\n");
                 acpi_kbd_controller_present = 0;
@@ -577,7 +577,8 @@ void __init sn_cpu_init(void)
         int i;
         static int wars_have_been_checked;
 
-        if (smp_processor_id() == 0 && IS_MEDUSA()) {
+        cpuid = smp_processor_id();
+        if (cpuid == 0 && IS_MEDUSA()) {
                 if (ia64_sn_is_fake_prom())
                         sn_prom_type = 2;
                 else
@@ -597,6 +598,12 @@ void __init sn_cpu_init(void)
         sn_hub_info->as_shift = sn_hub_info->nasid_shift - 2;
 
         /*
+         * Don't check status. The SAL call is not supported on all PROMs
+         * but a failure is harmless.
+         */
+        (void) ia64_sn_set_cpu_number(cpuid);
+
+        /*
          * The boot cpu makes this call again after platform initialization is
          * complete.
          */
@@ -607,7 +614,6 @@ void __init sn_cpu_init(void)
                 if (ia64_sn_get_prom_feature_set(i, &sn_prom_features[i]) != 0)
                         break;
 
-        cpuid = smp_processor_id();
         cpuphyid = get_sapicid();
 
         if (ia64_sn_get_sapic_info(cpuphyid, &nasid, &subnode, &slice))
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index 20de72791b97..e4aa839d0189 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -595,7 +595,7 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
 
         /* sanity check prom rev */
 
-        if (sn_sal_rev() < 0x0406) {
+        if (is_shub1() && sn_sal_rev() < 0x0406) {
                 printk
                     (KERN_ERR "%s:  SGI prom rev 4.06 or greater required "
                      "for tioca support\n", __FUNCTION__);
diff --git a/arch/m32r/kernel/irq.c b/arch/m32r/kernel/irq.c
index a4634b06f675..3841861df6a2 100644
--- a/arch/m32r/kernel/irq.c
+++ b/arch/m32r/kernel/irq.c
@@ -54,7 +54,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].handler->typename);
+                seq_printf(p, " %14s", irq_desc[i].chip->typename);
                 seq_printf(p, "  %s", action->name);
 
                 for (action=action->next; action; action = action->next)
diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c
index 3cd3c2988a48..1ff483c8a4c9 100644
--- a/arch/m32r/kernel/setup.c
+++ b/arch/m32r/kernel/setup.c
@@ -275,7 +275,7 @@ static int __init topology_init(void)
         int i;
 
         for_each_present_cpu(i)
-                register_cpu(&cpu_devices[i], i, NULL);
+                register_cpu(&cpu_devices[i], i);
 
         return 0;
 }
diff --git a/arch/m32r/kernel/setup_m32104ut.c b/arch/m32r/kernel/setup_m32104ut.c
index 6328e1357a80..f9f56c270195 100644
--- a/arch/m32r/kernel/setup_m32104ut.c
+++ b/arch/m32r/kernel/setup_m32104ut.c
@@ -87,7 +87,7 @@ void __init init_IRQ(void)
 #if defined(CONFIG_SMC91X)
         /* INT#0: LAN controller on M32104UT-LAN (SMC91C111)*/
         irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_INT0].handler = &m32104ut_irq_type;
+        irq_desc[M32R_IRQ_INT0].chip = &m32104ut_irq_type;
         irq_desc[M32R_IRQ_INT0].action = 0;
         irq_desc[M32R_IRQ_INT0].depth = 1;
         icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN | M32R_ICUCR_ISMOD11; /* "H" level sense */
@@ -96,7 +96,7 @@ void __init init_IRQ(void)
 
         /* MFT2 : system timer */
         irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_MFT2].handler = &m32104ut_irq_type;
+        irq_desc[M32R_IRQ_MFT2].chip = &m32104ut_irq_type;
         irq_desc[M32R_IRQ_MFT2].action = 0;
         irq_desc[M32R_IRQ_MFT2].depth = 1;
         icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;
@@ -105,7 +105,7 @@ void __init init_IRQ(void)
 #ifdef CONFIG_SERIAL_M32R_SIO
         /* SIO0_R : uart receive data */
         irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_R].handler = &m32104ut_irq_type;
+        irq_desc[M32R_IRQ_SIO0_R].chip = &m32104ut_irq_type;
         irq_desc[M32R_IRQ_SIO0_R].action = 0;
         irq_desc[M32R_IRQ_SIO0_R].depth = 1;
         icu_data[M32R_IRQ_SIO0_R].icucr = M32R_ICUCR_IEN;
@@ -113,7 +113,7 @@ void __init init_IRQ(void)
 
         /* SIO0_S : uart send data */
         irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_S].handler = &m32104ut_irq_type;
+        irq_desc[M32R_IRQ_SIO0_S].chip = &m32104ut_irq_type;
         irq_desc[M32R_IRQ_SIO0_S].action = 0;
         irq_desc[M32R_IRQ_SIO0_S].depth = 1;
         icu_data[M32R_IRQ_SIO0_S].icucr = M32R_ICUCR_IEN;
diff --git a/arch/m32r/kernel/setup_m32700ut.c b/arch/m32r/kernel/setup_m32700ut.c
index fad1fc99bb27..b6ab00eff580 100644
--- a/arch/m32r/kernel/setup_m32700ut.c
+++ b/arch/m32r/kernel/setup_m32700ut.c
@@ -301,7 +301,7 @@ void __init init_IRQ(void)
 #if defined(CONFIG_SMC91X)
         /* INT#0: LAN controller on M32700UT-LAN (SMC91C111)*/
         irq_desc[M32700UT_LAN_IRQ_LAN].status = IRQ_DISABLED;
-        irq_desc[M32700UT_LAN_IRQ_LAN].handler = &m32700ut_lanpld_irq_type;
+        irq_desc[M32700UT_LAN_IRQ_LAN].chip = &m32700ut_lanpld_irq_type;
         irq_desc[M32700UT_LAN_IRQ_LAN].action = 0;
         irq_desc[M32700UT_LAN_IRQ_LAN].depth = 1;       /* disable nested irq */
         lanpld_icu_data[irq2lanpldirq(M32700UT_LAN_IRQ_LAN)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD02;   /* "H" edge sense */
@@ -310,7 +310,7 @@ void __init init_IRQ(void)
 
         /* MFT2 : system timer */
         irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_MFT2].handler = &m32700ut_irq_type;
+        irq_desc[M32R_IRQ_MFT2].chip = &m32700ut_irq_type;
         irq_desc[M32R_IRQ_MFT2].action = 0;
         irq_desc[M32R_IRQ_MFT2].depth = 1;
         icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;
@@ -318,7 +318,7 @@ void __init init_IRQ(void)
 
         /* SIO0 : receive */
         irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_R].handler = &m32700ut_irq_type;
+        irq_desc[M32R_IRQ_SIO0_R].chip = &m32700ut_irq_type;
         irq_desc[M32R_IRQ_SIO0_R].action = 0;
         irq_desc[M32R_IRQ_SIO0_R].depth = 1;
         icu_data[M32R_IRQ_SIO0_R].icucr = 0;
@@ -326,7 +326,7 @@ void __init init_IRQ(void)
 
         /* SIO0 : send */
         irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_S].handler = &m32700ut_irq_type;
+        irq_desc[M32R_IRQ_SIO0_S].chip = &m32700ut_irq_type;
         irq_desc[M32R_IRQ_SIO0_S].action = 0;
         irq_desc[M32R_IRQ_SIO0_S].depth = 1;
         icu_data[M32R_IRQ_SIO0_S].icucr = 0;
@@ -334,7 +334,7 @@ void __init init_IRQ(void)
 
         /* SIO1 : receive */
         irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO1_R].handler = &m32700ut_irq_type;
+        irq_desc[M32R_IRQ_SIO1_R].chip = &m32700ut_irq_type;
         irq_desc[M32R_IRQ_SIO1_R].action = 0;
         irq_desc[M32R_IRQ_SIO1_R].depth = 1;
         icu_data[M32R_IRQ_SIO1_R].icucr = 0;
@@ -342,7 +342,7 @@ void __init init_IRQ(void)
 
         /* SIO1 : send */
         irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO1_S].handler = &m32700ut_irq_type;
+        irq_desc[M32R_IRQ_SIO1_S].chip = &m32700ut_irq_type;
         irq_desc[M32R_IRQ_SIO1_S].action = 0;
         irq_desc[M32R_IRQ_SIO1_S].depth = 1;
         icu_data[M32R_IRQ_SIO1_S].icucr = 0;
@@ -350,7 +350,7 @@ void __init init_IRQ(void)
 
         /* DMA1 : */
         irq_desc[M32R_IRQ_DMA1].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_DMA1].handler = &m32700ut_irq_type;
+        irq_desc[M32R_IRQ_DMA1].chip = &m32700ut_irq_type;
         irq_desc[M32R_IRQ_DMA1].action = 0;
         irq_desc[M32R_IRQ_DMA1].depth = 1;
         icu_data[M32R_IRQ_DMA1].icucr = 0;
@@ -359,7 +359,7 @@ void __init init_IRQ(void)
 #ifdef CONFIG_SERIAL_M32R_PLDSIO
         /* INT#1: SIO0 Receive on PLD */
         irq_desc[PLD_IRQ_SIO0_RCV].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_SIO0_RCV].handler = &m32700ut_pld_irq_type;
+        irq_desc[PLD_IRQ_SIO0_RCV].chip = &m32700ut_pld_irq_type;
         irq_desc[PLD_IRQ_SIO0_RCV].action = 0;
         irq_desc[PLD_IRQ_SIO0_RCV].depth = 1;   /* disable nested irq */
         pld_icu_data[irq2pldirq(PLD_IRQ_SIO0_RCV)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD03;
@@ -367,7 +367,7 @@ void __init init_IRQ(void)
 
         /* INT#1: SIO0 Send on PLD */
         irq_desc[PLD_IRQ_SIO0_SND].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_SIO0_SND].handler = &m32700ut_pld_irq_type;
+        irq_desc[PLD_IRQ_SIO0_SND].chip = &m32700ut_pld_irq_type;
         irq_desc[PLD_IRQ_SIO0_SND].action = 0;
         irq_desc[PLD_IRQ_SIO0_SND].depth = 1;   /* disable nested irq */
         pld_icu_data[irq2pldirq(PLD_IRQ_SIO0_SND)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD03;
@@ -376,7 +376,7 @@ void __init init_IRQ(void)
 
         /* INT#1: CFC IREQ on PLD */
         irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_CFIREQ].handler = &m32700ut_pld_irq_type;
+        irq_desc[PLD_IRQ_CFIREQ].chip = &m32700ut_pld_irq_type;
         irq_desc[PLD_IRQ_CFIREQ].action = 0;
         irq_desc[PLD_IRQ_CFIREQ].depth = 1;     /* disable nested irq */
         pld_icu_data[irq2pldirq(PLD_IRQ_CFIREQ)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD01;       /* 'L' level sense */
@@ -384,7 +384,7 @@ void __init init_IRQ(void)
 
         /* INT#1: CFC Insert on PLD */
         irq_desc[PLD_IRQ_CFC_INSERT].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_CFC_INSERT].handler = &m32700ut_pld_irq_type;
+        irq_desc[PLD_IRQ_CFC_INSERT].chip = &m32700ut_pld_irq_type;
         irq_desc[PLD_IRQ_CFC_INSERT].action = 0;
         irq_desc[PLD_IRQ_CFC_INSERT].depth = 1; /* disable nested irq */
         pld_icu_data[irq2pldirq(PLD_IRQ_CFC_INSERT)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD00;   /* 'L' edge sense */
@@ -392,7 +392,7 @@ void __init init_IRQ(void)
 
         /* INT#1: CFC Eject on PLD */
         irq_desc[PLD_IRQ_CFC_EJECT].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_CFC_EJECT].handler = &m32700ut_pld_irq_type;
+        irq_desc[PLD_IRQ_CFC_EJECT].chip = &m32700ut_pld_irq_type;
         irq_desc[PLD_IRQ_CFC_EJECT].action = 0;
         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 */
@@ -416,7 +416,7 @@ void __init init_IRQ(void)
         outw(USBCR_OTGS, USBCR);        /* USBCR: non-OTG */
 
     irq_desc[M32700UT_LCD_IRQ_USB_INT1].status = IRQ_DISABLED;
-    irq_desc[M32700UT_LCD_IRQ_USB_INT1].handler = &m32700ut_lcdpld_irq_type;
+    irq_desc[M32700UT_LCD_IRQ_USB_INT1].chip = &m32700ut_lcdpld_irq_type;
     irq_desc[M32700UT_LCD_IRQ_USB_INT1].action = 0;
     irq_desc[M32700UT_LCD_IRQ_USB_INT1].depth = 1;
     lcdpld_icu_data[irq2lcdpldirq(M32700UT_LCD_IRQ_USB_INT1)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD01;  /* "L" level sense */
@@ -434,7 +434,7 @@ void __init init_IRQ(void)
          * INT3# is used for AR
          */
         irq_desc[M32R_IRQ_INT3].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_INT3].handler = &m32700ut_irq_type;
+        irq_desc[M32R_IRQ_INT3].chip = &m32700ut_irq_type;
         irq_desc[M32R_IRQ_INT3].action = 0;
         irq_desc[M32R_IRQ_INT3].depth = 1;
         icu_data[M32R_IRQ_INT3].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;
diff --git a/arch/m32r/kernel/setup_mappi.c b/arch/m32r/kernel/setup_mappi.c
index 00f253209cb3..c268044185f5 100644
--- a/arch/m32r/kernel/setup_mappi.c
+++ b/arch/m32r/kernel/setup_mappi.c
@@ -86,7 +86,7 @@ void __init init_IRQ(void)
 #ifdef CONFIG_NE2000
         /* INT0 : LAN controller (RTL8019AS) */
         irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_INT0].handler = &mappi_irq_type;
+        irq_desc[M32R_IRQ_INT0].chip = &mappi_irq_type;
         irq_desc[M32R_IRQ_INT0].action = 0;
         irq_desc[M32R_IRQ_INT0].depth = 1;
         icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;
@@ -95,7 +95,7 @@ void __init init_IRQ(void)
 
         /* MFT2 : system timer */
         irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_MFT2].handler = &mappi_irq_type;
+        irq_desc[M32R_IRQ_MFT2].chip = &mappi_irq_type;
         irq_desc[M32R_IRQ_MFT2].action = 0;
         irq_desc[M32R_IRQ_MFT2].depth = 1;
         icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;
@@ -104,7 +104,7 @@ void __init init_IRQ(void)
 #ifdef CONFIG_SERIAL_M32R_SIO
         /* SIO0_R : uart receive data */
         irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_R].handler = &mappi_irq_type;
+        irq_desc[M32R_IRQ_SIO0_R].chip = &mappi_irq_type;
         irq_desc[M32R_IRQ_SIO0_R].action = 0;
         irq_desc[M32R_IRQ_SIO0_R].depth = 1;
         icu_data[M32R_IRQ_SIO0_R].icucr = 0;
@@ -112,7 +112,7 @@ void __init init_IRQ(void)
 
         /* SIO0_S : uart send data */
         irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_S].handler = &mappi_irq_type;
+        irq_desc[M32R_IRQ_SIO0_S].chip = &mappi_irq_type;
         irq_desc[M32R_IRQ_SIO0_S].action = 0;
         irq_desc[M32R_IRQ_SIO0_S].depth = 1;
         icu_data[M32R_IRQ_SIO0_S].icucr = 0;
@@ -120,7 +120,7 @@ void __init init_IRQ(void)
 
         /* SIO1_R : uart receive data */
         irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO1_R].handler = &mappi_irq_type;
+        irq_desc[M32R_IRQ_SIO1_R].chip = &mappi_irq_type;
         irq_desc[M32R_IRQ_SIO1_R].action = 0;
         irq_desc[M32R_IRQ_SIO1_R].depth = 1;
         icu_data[M32R_IRQ_SIO1_R].icucr = 0;
@@ -128,7 +128,7 @@ void __init init_IRQ(void)
 
         /* SIO1_S : uart send data */
         irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO1_S].handler = &mappi_irq_type;
+        irq_desc[M32R_IRQ_SIO1_S].chip = &mappi_irq_type;
         irq_desc[M32R_IRQ_SIO1_S].action = 0;
         irq_desc[M32R_IRQ_SIO1_S].depth = 1;
         icu_data[M32R_IRQ_SIO1_S].icucr = 0;
@@ -138,7 +138,7 @@ void __init init_IRQ(void)
 #if defined(CONFIG_M32R_PCC)
         /* INT1 : pccard0 interrupt */
         irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_INT1].handler = &mappi_irq_type;
+        irq_desc[M32R_IRQ_INT1].chip = &mappi_irq_type;
         irq_desc[M32R_IRQ_INT1].action = 0;
         irq_desc[M32R_IRQ_INT1].depth = 1;
         icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_IEN | M32R_ICUCR_ISMOD00;
@@ -146,7 +146,7 @@ void __init init_IRQ(void)
 
         /* INT2 : pccard1 interrupt */
         irq_desc[M32R_IRQ_INT2].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_INT2].handler = &mappi_irq_type;
+        irq_desc[M32R_IRQ_INT2].chip = &mappi_irq_type;
         irq_desc[M32R_IRQ_INT2].action = 0;
         irq_desc[M32R_IRQ_INT2].depth = 1;
         icu_data[M32R_IRQ_INT2].icucr = M32R_ICUCR_IEN | M32R_ICUCR_ISMOD00;
diff --git a/arch/m32r/kernel/setup_mappi2.c b/arch/m32r/kernel/setup_mappi2.c
index eebc9d8b4e72..bd2327d5cca2 100644
--- a/arch/m32r/kernel/setup_mappi2.c
+++ b/arch/m32r/kernel/setup_mappi2.c
@@ -87,7 +87,7 @@ void __init init_IRQ(void)
 #if defined(CONFIG_SMC91X)
         /* INT0 : LAN controller (SMC91111) */
         irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_INT0].handler = &mappi2_irq_type;
+        irq_desc[M32R_IRQ_INT0].chip = &mappi2_irq_type;
         irq_desc[M32R_IRQ_INT0].action = 0;
         irq_desc[M32R_IRQ_INT0].depth = 1;
         icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;
@@ -96,7 +96,7 @@ void __init init_IRQ(void)
 
         /* MFT2 : system timer */
         irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_MFT2].handler = &mappi2_irq_type;
+        irq_desc[M32R_IRQ_MFT2].chip = &mappi2_irq_type;
         irq_desc[M32R_IRQ_MFT2].action = 0;
         irq_desc[M32R_IRQ_MFT2].depth = 1;
         icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;
@@ -105,7 +105,7 @@ void __init init_IRQ(void)
 #ifdef CONFIG_SERIAL_M32R_SIO
         /* SIO0_R : uart receive data */
         irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_R].handler = &mappi2_irq_type;
+        irq_desc[M32R_IRQ_SIO0_R].chip = &mappi2_irq_type;
         irq_desc[M32R_IRQ_SIO0_R].action = 0;
         irq_desc[M32R_IRQ_SIO0_R].depth = 1;
         icu_data[M32R_IRQ_SIO0_R].icucr = 0;
@@ -113,14 +113,14 @@ void __init init_IRQ(void)
 
         /* SIO0_S : uart send data */
         irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_S].handler = &mappi2_irq_type;
+        irq_desc[M32R_IRQ_SIO0_S].chip = &mappi2_irq_type;
         irq_desc[M32R_IRQ_SIO0_S].action = 0;
         irq_desc[M32R_IRQ_SIO0_S].depth = 1;
         icu_data[M32R_IRQ_SIO0_S].icucr = 0;
         disable_mappi2_irq(M32R_IRQ_SIO0_S);
         /* SIO1_R : uart receive data */
         irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO1_R].handler = &mappi2_irq_type;
+        irq_desc[M32R_IRQ_SIO1_R].chip = &mappi2_irq_type;
         irq_desc[M32R_IRQ_SIO1_R].action = 0;
         irq_desc[M32R_IRQ_SIO1_R].depth = 1;
         icu_data[M32R_IRQ_SIO1_R].icucr = 0;
@@ -128,7 +128,7 @@ void __init init_IRQ(void)
 
         /* SIO1_S : uart send data */
         irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO1_S].handler = &mappi2_irq_type;
+        irq_desc[M32R_IRQ_SIO1_S].chip = &mappi2_irq_type;
         irq_desc[M32R_IRQ_SIO1_S].action = 0;
         irq_desc[M32R_IRQ_SIO1_S].depth = 1;
         icu_data[M32R_IRQ_SIO1_S].icucr = 0;
@@ -138,7 +138,7 @@ void __init init_IRQ(void)
 #if defined(CONFIG_USB)
         /* INT1 : USB Host controller interrupt */
         irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_INT1].handler = &mappi2_irq_type;
+        irq_desc[M32R_IRQ_INT1].chip = &mappi2_irq_type;
         irq_desc[M32R_IRQ_INT1].action = 0;
         irq_desc[M32R_IRQ_INT1].depth = 1;
         icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_ISMOD01;
@@ -147,7 +147,7 @@ void __init init_IRQ(void)
 
         /* ICUCR40: CFC IREQ */
         irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_CFIREQ].handler = &mappi2_irq_type;
+        irq_desc[PLD_IRQ_CFIREQ].chip = &mappi2_irq_type;
         irq_desc[PLD_IRQ_CFIREQ].action = 0;
         irq_desc[PLD_IRQ_CFIREQ].depth = 1;     /* disable nested irq */
         icu_data[PLD_IRQ_CFIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01;
@@ -156,7 +156,7 @@ void __init init_IRQ(void)
 #if defined(CONFIG_M32R_CFC)
         /* ICUCR41: CFC Insert */
         irq_desc[PLD_IRQ_CFC_INSERT].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_CFC_INSERT].handler = &mappi2_irq_type;
+        irq_desc[PLD_IRQ_CFC_INSERT].chip = &mappi2_irq_type;
         irq_desc[PLD_IRQ_CFC_INSERT].action = 0;
         irq_desc[PLD_IRQ_CFC_INSERT].depth = 1; /* disable nested irq */
         icu_data[PLD_IRQ_CFC_INSERT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD00;
@@ -164,7 +164,7 @@ void __init init_IRQ(void)
 
         /* ICUCR42: CFC Eject */
         irq_desc[PLD_IRQ_CFC_EJECT].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_CFC_EJECT].handler = &mappi2_irq_type;
+        irq_desc[PLD_IRQ_CFC_EJECT].chip = &mappi2_irq_type;
         irq_desc[PLD_IRQ_CFC_EJECT].action = 0;
         irq_desc[PLD_IRQ_CFC_EJECT].depth = 1;  /* disable nested irq */
         icu_data[PLD_IRQ_CFC_EJECT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;
diff --git a/arch/m32r/kernel/setup_mappi3.c b/arch/m32r/kernel/setup_mappi3.c
index d2ff021e2d3d..014b51d17505 100644
--- a/arch/m32r/kernel/setup_mappi3.c
+++ b/arch/m32r/kernel/setup_mappi3.c
@@ -87,7 +87,7 @@ void __init init_IRQ(void)
 #if defined(CONFIG_SMC91X)
         /* INT0 : LAN controller (SMC91111) */
         irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_INT0].handler = &mappi3_irq_type;
+        irq_desc[M32R_IRQ_INT0].chip = &mappi3_irq_type;
         irq_desc[M32R_IRQ_INT0].action = 0;
         irq_desc[M32R_IRQ_INT0].depth = 1;
         icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;
@@ -96,7 +96,7 @@ void __init init_IRQ(void)
 
         /* MFT2 : system timer */
         irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_MFT2].handler = &mappi3_irq_type;
+        irq_desc[M32R_IRQ_MFT2].chip = &mappi3_irq_type;
         irq_desc[M32R_IRQ_MFT2].action = 0;
         irq_desc[M32R_IRQ_MFT2].depth = 1;
         icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;
@@ -105,7 +105,7 @@ void __init init_IRQ(void)
 #ifdef CONFIG_SERIAL_M32R_SIO
         /* SIO0_R : uart receive data */
         irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_R].handler = &mappi3_irq_type;
+        irq_desc[M32R_IRQ_SIO0_R].chip = &mappi3_irq_type;
         irq_desc[M32R_IRQ_SIO0_R].action = 0;
         irq_desc[M32R_IRQ_SIO0_R].depth = 1;
         icu_data[M32R_IRQ_SIO0_R].icucr = 0;
@@ -113,14 +113,14 @@ void __init init_IRQ(void)
 
         /* SIO0_S : uart send data */
         irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_S].handler = &mappi3_irq_type;
+        irq_desc[M32R_IRQ_SIO0_S].chip = &mappi3_irq_type;
         irq_desc[M32R_IRQ_SIO0_S].action = 0;
         irq_desc[M32R_IRQ_SIO0_S].depth = 1;
         icu_data[M32R_IRQ_SIO0_S].icucr = 0;
         disable_mappi3_irq(M32R_IRQ_SIO0_S);
         /* SIO1_R : uart receive data */
         irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO1_R].handler = &mappi3_irq_type;
+        irq_desc[M32R_IRQ_SIO1_R].chip = &mappi3_irq_type;
         irq_desc[M32R_IRQ_SIO1_R].action = 0;
         irq_desc[M32R_IRQ_SIO1_R].depth = 1;
         icu_data[M32R_IRQ_SIO1_R].icucr = 0;
@@ -128,7 +128,7 @@ void __init init_IRQ(void)
 
         /* SIO1_S : uart send data */
         irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO1_S].handler = &mappi3_irq_type;
+        irq_desc[M32R_IRQ_SIO1_S].chip = &mappi3_irq_type;
         irq_desc[M32R_IRQ_SIO1_S].action = 0;
         irq_desc[M32R_IRQ_SIO1_S].depth = 1;
         icu_data[M32R_IRQ_SIO1_S].icucr = 0;
@@ -138,7 +138,7 @@ void __init init_IRQ(void)
 #if defined(CONFIG_USB)
         /* INT1 : USB Host controller interrupt */
         irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_INT1].handler = &mappi3_irq_type;
+        irq_desc[M32R_IRQ_INT1].chip = &mappi3_irq_type;
         irq_desc[M32R_IRQ_INT1].action = 0;
         irq_desc[M32R_IRQ_INT1].depth = 1;
         icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_ISMOD01;
@@ -147,7 +147,7 @@ void __init init_IRQ(void)
 
         /* CFC IREQ */
         irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_CFIREQ].handler = &mappi3_irq_type;
+        irq_desc[PLD_IRQ_CFIREQ].chip = &mappi3_irq_type;
         irq_desc[PLD_IRQ_CFIREQ].action = 0;
         irq_desc[PLD_IRQ_CFIREQ].depth = 1;     /* disable nested irq */
         icu_data[PLD_IRQ_CFIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01;
@@ -156,7 +156,7 @@ void __init init_IRQ(void)
 #if defined(CONFIG_M32R_CFC)
         /* ICUCR41: CFC Insert & eject */
         irq_desc[PLD_IRQ_CFC_INSERT].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_CFC_INSERT].handler = &mappi3_irq_type;
+        irq_desc[PLD_IRQ_CFC_INSERT].chip = &mappi3_irq_type;
         irq_desc[PLD_IRQ_CFC_INSERT].action = 0;
         irq_desc[PLD_IRQ_CFC_INSERT].depth = 1; /* disable nested irq */
         icu_data[PLD_IRQ_CFC_INSERT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD00;
@@ -166,7 +166,7 @@ void __init init_IRQ(void)
 
         /* IDE IREQ */
         irq_desc[PLD_IRQ_IDEIREQ].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_IDEIREQ].handler = &mappi3_irq_type;
+        irq_desc[PLD_IRQ_IDEIREQ].chip = &mappi3_irq_type;
         irq_desc[PLD_IRQ_IDEIREQ].action = 0;
         irq_desc[PLD_IRQ_IDEIREQ].depth = 1;    /* disable nested irq */
         icu_data[PLD_IRQ_IDEIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;
diff --git a/arch/m32r/kernel/setup_oaks32r.c b/arch/m32r/kernel/setup_oaks32r.c
index 0e9e63538c0f..ea64831aef7a 100644
--- a/arch/m32r/kernel/setup_oaks32r.c
+++ b/arch/m32r/kernel/setup_oaks32r.c
@@ -85,7 +85,7 @@ void __init init_IRQ(void)
 #ifdef CONFIG_NE2000
         /* INT3 : LAN controller (RTL8019AS) */
         irq_desc[M32R_IRQ_INT3].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_INT3].handler = &oaks32r_irq_type;
+        irq_desc[M32R_IRQ_INT3].chip = &oaks32r_irq_type;
         irq_desc[M32R_IRQ_INT3].action = 0;
         irq_desc[M32R_IRQ_INT3].depth = 1;
         icu_data[M32R_IRQ_INT3].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;
@@ -94,7 +94,7 @@ void __init init_IRQ(void)
 
         /* MFT2 : system timer */
         irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_MFT2].handler = &oaks32r_irq_type;
+        irq_desc[M32R_IRQ_MFT2].chip = &oaks32r_irq_type;
         irq_desc[M32R_IRQ_MFT2].action = 0;
         irq_desc[M32R_IRQ_MFT2].depth = 1;
         icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;
@@ -103,7 +103,7 @@ void __init init_IRQ(void)
 #ifdef CONFIG_SERIAL_M32R_SIO
         /* SIO0_R : uart receive data */
         irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_R].handler = &oaks32r_irq_type;
+        irq_desc[M32R_IRQ_SIO0_R].chip = &oaks32r_irq_type;
         irq_desc[M32R_IRQ_SIO0_R].action = 0;
         irq_desc[M32R_IRQ_SIO0_R].depth = 1;
         icu_data[M32R_IRQ_SIO0_R].icucr = 0;
@@ -111,7 +111,7 @@ void __init init_IRQ(void)
 
         /* SIO0_S : uart send data */
         irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_S].handler = &oaks32r_irq_type;
+        irq_desc[M32R_IRQ_SIO0_S].chip = &oaks32r_irq_type;
         irq_desc[M32R_IRQ_SIO0_S].action = 0;
         irq_desc[M32R_IRQ_SIO0_S].depth = 1;
         icu_data[M32R_IRQ_SIO0_S].icucr = 0;
@@ -119,7 +119,7 @@ void __init init_IRQ(void)
 
         /* SIO1_R : uart receive data */
         irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO1_R].handler = &oaks32r_irq_type;
+        irq_desc[M32R_IRQ_SIO1_R].chip = &oaks32r_irq_type;
         irq_desc[M32R_IRQ_SIO1_R].action = 0;
         irq_desc[M32R_IRQ_SIO1_R].depth = 1;
         icu_data[M32R_IRQ_SIO1_R].icucr = 0;
@@ -127,7 +127,7 @@ void __init init_IRQ(void)
 
         /* SIO1_S : uart send data */
         irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO1_S].handler = &oaks32r_irq_type;
+        irq_desc[M32R_IRQ_SIO1_S].chip = &oaks32r_irq_type;
         irq_desc[M32R_IRQ_SIO1_S].action = 0;
         irq_desc[M32R_IRQ_SIO1_S].depth = 1;
         icu_data[M32R_IRQ_SIO1_S].icucr = 0;
diff --git a/arch/m32r/kernel/setup_opsput.c b/arch/m32r/kernel/setup_opsput.c
index 548e8fc7949b..55e8972d455a 100644
--- a/arch/m32r/kernel/setup_opsput.c
+++ b/arch/m32r/kernel/setup_opsput.c
@@ -302,7 +302,7 @@ void __init init_IRQ(void)
 #if defined(CONFIG_SMC91X)
         /* INT#0: LAN controller on OPSPUT-LAN (SMC91C111)*/
         irq_desc[OPSPUT_LAN_IRQ_LAN].status = IRQ_DISABLED;
-        irq_desc[OPSPUT_LAN_IRQ_LAN].handler = &opsput_lanpld_irq_type;
+        irq_desc[OPSPUT_LAN_IRQ_LAN].chip = &opsput_lanpld_irq_type;
         irq_desc[OPSPUT_LAN_IRQ_LAN].action = 0;
         irq_desc[OPSPUT_LAN_IRQ_LAN].depth = 1; /* disable nested irq */
         lanpld_icu_data[irq2lanpldirq(OPSPUT_LAN_IRQ_LAN)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD02;     /* "H" edge sense */
@@ -311,7 +311,7 @@ void __init init_IRQ(void)
 
         /* MFT2 : system timer */
         irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_MFT2].handler = &opsput_irq_type;
+        irq_desc[M32R_IRQ_MFT2].chip = &opsput_irq_type;
         irq_desc[M32R_IRQ_MFT2].action = 0;
         irq_desc[M32R_IRQ_MFT2].depth = 1;
         icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;
@@ -319,7 +319,7 @@ void __init init_IRQ(void)
 
         /* SIO0 : receive */
         irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_R].handler = &opsput_irq_type;
+        irq_desc[M32R_IRQ_SIO0_R].chip = &opsput_irq_type;
         irq_desc[M32R_IRQ_SIO0_R].action = 0;
         irq_desc[M32R_IRQ_SIO0_R].depth = 1;
         icu_data[M32R_IRQ_SIO0_R].icucr = 0;
@@ -327,7 +327,7 @@ void __init init_IRQ(void)
 
         /* SIO0 : send */
         irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_S].handler = &opsput_irq_type;
+        irq_desc[M32R_IRQ_SIO0_S].chip = &opsput_irq_type;
         irq_desc[M32R_IRQ_SIO0_S].action = 0;
         irq_desc[M32R_IRQ_SIO0_S].depth = 1;
         icu_data[M32R_IRQ_SIO0_S].icucr = 0;
@@ -335,7 +335,7 @@ void __init init_IRQ(void)
 
         /* SIO1 : receive */
         irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO1_R].handler = &opsput_irq_type;
+        irq_desc[M32R_IRQ_SIO1_R].chip = &opsput_irq_type;
         irq_desc[M32R_IRQ_SIO1_R].action = 0;
         irq_desc[M32R_IRQ_SIO1_R].depth = 1;
         icu_data[M32R_IRQ_SIO1_R].icucr = 0;
@@ -343,7 +343,7 @@ void __init init_IRQ(void)
 
         /* SIO1 : send */
         irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO1_S].handler = &opsput_irq_type;
+        irq_desc[M32R_IRQ_SIO1_S].chip = &opsput_irq_type;
         irq_desc[M32R_IRQ_SIO1_S].action = 0;
         irq_desc[M32R_IRQ_SIO1_S].depth = 1;
         icu_data[M32R_IRQ_SIO1_S].icucr = 0;
@@ -351,7 +351,7 @@ void __init init_IRQ(void)
 
         /* DMA1 : */
         irq_desc[M32R_IRQ_DMA1].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_DMA1].handler = &opsput_irq_type;
+        irq_desc[M32R_IRQ_DMA1].chip = &opsput_irq_type;
         irq_desc[M32R_IRQ_DMA1].action = 0;
         irq_desc[M32R_IRQ_DMA1].depth = 1;
         icu_data[M32R_IRQ_DMA1].icucr = 0;
@@ -360,7 +360,7 @@ void __init init_IRQ(void)
 #ifdef CONFIG_SERIAL_M32R_PLDSIO
         /* INT#1: SIO0 Receive on PLD */
         irq_desc[PLD_IRQ_SIO0_RCV].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_SIO0_RCV].handler = &opsput_pld_irq_type;
+        irq_desc[PLD_IRQ_SIO0_RCV].chip = &opsput_pld_irq_type;
         irq_desc[PLD_IRQ_SIO0_RCV].action = 0;
         irq_desc[PLD_IRQ_SIO0_RCV].depth = 1;   /* disable nested irq */
         pld_icu_data[irq2pldirq(PLD_IRQ_SIO0_RCV)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD03;
@@ -368,7 +368,7 @@ void __init init_IRQ(void)
 
         /* INT#1: SIO0 Send on PLD */
         irq_desc[PLD_IRQ_SIO0_SND].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_SIO0_SND].handler = &opsput_pld_irq_type;
+        irq_desc[PLD_IRQ_SIO0_SND].chip = &opsput_pld_irq_type;
         irq_desc[PLD_IRQ_SIO0_SND].action = 0;
         irq_desc[PLD_IRQ_SIO0_SND].depth = 1;   /* disable nested irq */
         pld_icu_data[irq2pldirq(PLD_IRQ_SIO0_SND)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD03;
@@ -378,7 +378,7 @@ void __init init_IRQ(void)
 #if defined(CONFIG_M32R_CFC)
         /* INT#1: CFC IREQ on PLD */
         irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_CFIREQ].handler = &opsput_pld_irq_type;
+        irq_desc[PLD_IRQ_CFIREQ].chip = &opsput_pld_irq_type;
         irq_desc[PLD_IRQ_CFIREQ].action = 0;
         irq_desc[PLD_IRQ_CFIREQ].depth = 1;     /* disable nested irq */
         pld_icu_data[irq2pldirq(PLD_IRQ_CFIREQ)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD01;       /* 'L' level sense */
@@ -386,7 +386,7 @@ void __init init_IRQ(void)
 
         /* INT#1: CFC Insert on PLD */
         irq_desc[PLD_IRQ_CFC_INSERT].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_CFC_INSERT].handler = &opsput_pld_irq_type;
+        irq_desc[PLD_IRQ_CFC_INSERT].chip = &opsput_pld_irq_type;
         irq_desc[PLD_IRQ_CFC_INSERT].action = 0;
         irq_desc[PLD_IRQ_CFC_INSERT].depth = 1; /* disable nested irq */
         pld_icu_data[irq2pldirq(PLD_IRQ_CFC_INSERT)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD00;   /* 'L' edge sense */
@@ -394,7 +394,7 @@ void __init init_IRQ(void)
 
         /* INT#1: CFC Eject on PLD */
         irq_desc[PLD_IRQ_CFC_EJECT].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_CFC_EJECT].handler = &opsput_pld_irq_type;
+        irq_desc[PLD_IRQ_CFC_EJECT].chip = &opsput_pld_irq_type;
         irq_desc[PLD_IRQ_CFC_EJECT].action = 0;
         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 */
@@ -420,7 +420,7 @@ void __init init_IRQ(void)
         outw(USBCR_OTGS, USBCR);        /* USBCR: non-OTG */
 
     irq_desc[OPSPUT_LCD_IRQ_USB_INT1].status = IRQ_DISABLED;
-    irq_desc[OPSPUT_LCD_IRQ_USB_INT1].handler = &opsput_lcdpld_irq_type;
+    irq_desc[OPSPUT_LCD_IRQ_USB_INT1].chip = &opsput_lcdpld_irq_type;
     irq_desc[OPSPUT_LCD_IRQ_USB_INT1].action = 0;
     irq_desc[OPSPUT_LCD_IRQ_USB_INT1].depth = 1;
     lcdpld_icu_data[irq2lcdpldirq(OPSPUT_LCD_IRQ_USB_INT1)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD01;    /* "L" level sense */
@@ -438,7 +438,7 @@ void __init init_IRQ(void)
          * INT3# is used for AR
          */
         irq_desc[M32R_IRQ_INT3].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_INT3].handler = &opsput_irq_type;
+        irq_desc[M32R_IRQ_INT3].chip = &opsput_irq_type;
         irq_desc[M32R_IRQ_INT3].action = 0;
         irq_desc[M32R_IRQ_INT3].depth = 1;
         icu_data[M32R_IRQ_INT3].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;
diff --git a/arch/m32r/kernel/setup_usrv.c b/arch/m32r/kernel/setup_usrv.c
index 64be659a23e7..7fa12d8f66b4 100644
--- a/arch/m32r/kernel/setup_usrv.c
+++ b/arch/m32r/kernel/setup_usrv.c
@@ -158,7 +158,7 @@ void __init init_IRQ(void)
 
         /* MFT2 : system timer */
         irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_MFT2].handler = &mappi_irq_type;
+        irq_desc[M32R_IRQ_MFT2].chip = &mappi_irq_type;
         irq_desc[M32R_IRQ_MFT2].action = 0;
         irq_desc[M32R_IRQ_MFT2].depth = 1;
         icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;
@@ -167,7 +167,7 @@ void __init init_IRQ(void)
 #if defined(CONFIG_SERIAL_M32R_SIO)
         /* SIO0_R : uart receive data */
         irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_R].handler = &mappi_irq_type;
+        irq_desc[M32R_IRQ_SIO0_R].chip = &mappi_irq_type;
         irq_desc[M32R_IRQ_SIO0_R].action = 0;
         irq_desc[M32R_IRQ_SIO0_R].depth = 1;
         icu_data[M32R_IRQ_SIO0_R].icucr = 0;
@@ -175,7 +175,7 @@ void __init init_IRQ(void)
 
         /* SIO0_S : uart send data */
         irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO0_S].handler = &mappi_irq_type;
+        irq_desc[M32R_IRQ_SIO0_S].chip = &mappi_irq_type;
         irq_desc[M32R_IRQ_SIO0_S].action = 0;
         irq_desc[M32R_IRQ_SIO0_S].depth = 1;
         icu_data[M32R_IRQ_SIO0_S].icucr = 0;
@@ -183,7 +183,7 @@ void __init init_IRQ(void)
 
         /* SIO1_R : uart receive data */
         irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO1_R].handler = &mappi_irq_type;
+        irq_desc[M32R_IRQ_SIO1_R].chip = &mappi_irq_type;
         irq_desc[M32R_IRQ_SIO1_R].action = 0;
         irq_desc[M32R_IRQ_SIO1_R].depth = 1;
         icu_data[M32R_IRQ_SIO1_R].icucr = 0;
@@ -191,7 +191,7 @@ void __init init_IRQ(void)
 
         /* SIO1_S : uart send data */
         irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;
-        irq_desc[M32R_IRQ_SIO1_S].handler = &mappi_irq_type;
+        irq_desc[M32R_IRQ_SIO1_S].chip = &mappi_irq_type;
         irq_desc[M32R_IRQ_SIO1_S].action = 0;
         irq_desc[M32R_IRQ_SIO1_S].depth = 1;
         icu_data[M32R_IRQ_SIO1_S].icucr = 0;
@@ -201,7 +201,7 @@ void __init init_IRQ(void)
         /* INT#67-#71: CFC#0 IREQ on PLD */
         for (i = 0 ; i < CONFIG_CFC_NUM ; i++ ) {
                 irq_desc[PLD_IRQ_CF0 + i].status = IRQ_DISABLED;
-                irq_desc[PLD_IRQ_CF0 + i].handler = &m32700ut_pld_irq_type;
+                irq_desc[PLD_IRQ_CF0 + i].chip = &m32700ut_pld_irq_type;
                 irq_desc[PLD_IRQ_CF0 + i].action = 0;
                 irq_desc[PLD_IRQ_CF0 + i].depth = 1;    /* disable nested irq */
                 pld_icu_data[irq2pldirq(PLD_IRQ_CF0 + i)].icucr
@@ -212,7 +212,7 @@ void __init init_IRQ(void)
 #if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)
         /* INT#76: 16552D#0 IREQ on PLD */
         irq_desc[PLD_IRQ_UART0].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_UART0].handler = &m32700ut_pld_irq_type;
+        irq_desc[PLD_IRQ_UART0].chip = &m32700ut_pld_irq_type;
         irq_desc[PLD_IRQ_UART0].action = 0;
         irq_desc[PLD_IRQ_UART0].depth = 1;      /* disable nested irq */
         pld_icu_data[irq2pldirq(PLD_IRQ_UART0)].icucr
@@ -221,7 +221,7 @@ void __init init_IRQ(void)
 
         /* INT#77: 16552D#1 IREQ on PLD */
         irq_desc[PLD_IRQ_UART1].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_UART1].handler = &m32700ut_pld_irq_type;
+        irq_desc[PLD_IRQ_UART1].chip = &m32700ut_pld_irq_type;
         irq_desc[PLD_IRQ_UART1].action = 0;
         irq_desc[PLD_IRQ_UART1].depth = 1;      /* disable nested irq */
         pld_icu_data[irq2pldirq(PLD_IRQ_UART1)].icucr
@@ -232,7 +232,7 @@ void __init init_IRQ(void)
 #if defined(CONFIG_IDC_AK4524) || defined(CONFIG_IDC_AK4524_MODULE)
         /* INT#80: AK4524 IREQ on PLD */
         irq_desc[PLD_IRQ_SNDINT].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_SNDINT].handler = &m32700ut_pld_irq_type;
+        irq_desc[PLD_IRQ_SNDINT].chip = &m32700ut_pld_irq_type;
         irq_desc[PLD_IRQ_SNDINT].action = 0;
         irq_desc[PLD_IRQ_SNDINT].depth = 1;     /* disable nested irq */
         pld_icu_data[irq2pldirq(PLD_IRQ_SNDINT)].icucr
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 8b6e723eb82b..e767f2ddae72 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -540,6 +540,59 @@ config RAM32BIT
 
 endchoice
 
+comment "ROM configuration"
+
+config ROM
+        bool "Specify ROM linker regions"
+        default n
+        help
+          Define a ROM region for the linker script. This creates a kernel
+          that can be stored in flash, with possibly the text, and data
+          regions being copied out to RAM at startup.
+
+config ROMBASE
+        hex "Address of the base of ROM device"
+        default "0"
+        depends on ROM
+        help
+          Define the address that the ROM region starts at. Some platforms
+          use this to set their chip select region accordingly for the boot
+          device.
+
+config ROMVEC
+        hex "Address of the base of the ROM vectors"
+        default "0"
+        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
+          on system startup.
+
+config ROMVECSIZE
+        hex "Size of ROM vector region (in bytes)"
+        default "0x400"
+        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
+          not want a vector region at the start of the ROM.
+
+config ROMSTART
+        hex "Address of the base of system image in ROM"
+        default "0x400"
+        depends on ROM
+        help
+          Define the start address of the system image in ROM. Commonly this
+          is strait after the ROM vectors.
+
+config ROMSIZE
+        hex "Size of the ROM device"
+        default "0x100000"
+        depends on ROM
+        help
+          Size of the ROM device. On some platforms this is used to setup
+          the chip select that controls the boot ROM device.
+
 choice
         prompt "Kernel executes from"
         ---help---
diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile
index 6f880cbff1c8..8951793fd8d4 100644
--- a/arch/m68knommu/Makefile
+++ b/arch/m68knommu/Makefile
@@ -21,6 +21,7 @@ platform-$(CONFIG_M527x)	:= 527x
 platform-$(CONFIG_M5272)        := 5272
 platform-$(CONFIG_M528x)        := 528x
 platform-$(CONFIG_M5307)        := 5307
+platform-$(CONFIG_M532x)        := 532x
 platform-$(CONFIG_M5407)        := 5407
 PLATFORM := $(platform-y)
 
@@ -44,6 +45,7 @@ board-$(CONFIG_senTec)		:= senTec
 board-$(CONFIG_SNEHA)           := SNEHA
 board-$(CONFIG_M5208EVB)        := M5208EVB
 board-$(CONFIG_MOD5272)         := MOD5272
+board-$(CONFIG_AVNET)           := AVNET
 BOARD := $(board-y)
 
 model-$(CONFIG_RAMKERNEL)       := ram
@@ -65,6 +67,7 @@ cpuclass-$(CONFIG_M527x)	:= 5307
 cpuclass-$(CONFIG_M5272)        := 5307
 cpuclass-$(CONFIG_M528x)        := 5307
 cpuclass-$(CONFIG_M5307)        := 5307
+cpuclass-$(CONFIG_M532x)        := 5307
 cpuclass-$(CONFIG_M5407)        := 5307
 cpuclass-$(CONFIG_M68328)       := 68328
 cpuclass-$(CONFIG_M68EZ328)     := 68328
@@ -81,16 +84,17 @@ export PLATFORM BOARD MODEL CPUCLASS
 #
 # Some CFLAG additions based on specific CPU type.
 #
-cflags-$(CONFIG_M5206)          := -m5200 -Wa,-S -Wa,-m5200
-cflags-$(CONFIG_M5206e)         := -m5200 -Wa,-S -Wa,-m5200
-cflags-$(CONFIG_M520x)          := -m5307 -Wa,-S -Wa,-m5307
-cflags-$(CONFIG_M523x)          := -m5307 -Wa,-S -Wa,-m5307
-cflags-$(CONFIG_M5249)          := -m5200 -Wa,-S -Wa,-m5200
-cflags-$(CONFIG_M527x)          := -m5307 -Wa,-S -Wa,-m5307
-cflags-$(CONFIG_M5272)          := -m5307 -Wa,-S -Wa,-m5307
-cflags-$(CONFIG_M528x)          := -m5307 -Wa,-S -Wa,-m5307
-cflags-$(CONFIG_M5307)          := -m5307 -Wa,-S -Wa,-m5307
-cflags-$(CONFIG_M5407)          := -m5200 -Wa,-S -Wa,-m5200
+cflags-$(CONFIG_M5206)          := -m5200
+cflags-$(CONFIG_M5206e)         := -m5200
+cflags-$(CONFIG_M520x)          := -m5307
+cflags-$(CONFIG_M523x)          := -m5307
+cflags-$(CONFIG_M5249)          := -m5200
+cflags-$(CONFIG_M527x)          := -m5307
+cflags-$(CONFIG_M5272)          := -m5307
+cflags-$(CONFIG_M528x)          := -m5307
+cflags-$(CONFIG_M5307)          := -m5307
+cflags-$(CONFIG_M532x)          := -m5307
+cflags-$(CONFIG_M5407)          := -m5200
 cflags-$(CONFIG_M68328)         := -m68000
 cflags-$(CONFIG_M68EZ328)       := -m68000
 cflags-$(CONFIG_M68VZ328)       := -m68000
diff --git a/arch/m68knommu/defconfig b/arch/m68knommu/defconfig
index 2d59ba1a79ba..3891de09ac23 100644
--- a/arch/m68knommu/defconfig
+++ b/arch/m68knommu/defconfig
@@ -1,21 +1,22 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.13-uc0
-# Wed Aug 31 15:03:26 2005
+# Linux kernel version: 2.6.17
+# Tue Jun 27 12:57:06 2006
 #
-CONFIG_M68KNOMMU=y
+CONFIG_M68K=y
 # CONFIG_MMU is not set
 # CONFIG_FPU is not set
-CONFIG_UID16=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_TIME_LOW_RES=y
 
 #
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 
@@ -23,26 +24,30 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # General setup
 #
 CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_SYSVIPC is not set
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_SYSCTL is not set
 # CONFIG_AUDIT is not set
-# CONFIG_HOTPLUG is not set
-# CONFIG_KOBJECT_UEVENT is not set
 # CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_UID16=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EMBEDDED=y
 # CONFIG_KALLSYMS is not set
+# CONFIG_HOTPLUG is not set
 CONFIG_PRINTK=y
 CONFIG_BUG=y
+CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
 # CONFIG_EPOLL is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
+CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
 
 #
 # Loadable module support
@@ -50,6 +55,24 @@ CONFIG_BASE_SMALL=0
 # CONFIG_MODULES is not set
 
 #
+# Block layer
+#
+# CONFIG_BLK_DEV_IO_TRACE 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"
+
+#
 # Processor type and features
 #
 # CONFIG_M68328 is not set
@@ -58,6 +81,7 @@ CONFIG_BASE_SMALL=0
 # CONFIG_M68360 is not set
 # CONFIG_M5206 is not set
 # CONFIG_M5206e is not set
+# CONFIG_M520x is not set
 # CONFIG_M523x is not set
 # CONFIG_M5249 is not set
 # CONFIG_M5271 is not set
@@ -65,29 +89,12 @@ CONFIG_M5272=y
 # CONFIG_M5275 is not set
 # CONFIG_M528x is not set
 # CONFIG_M5307 is not set
+# CONFIG_M532x is not set
 # CONFIG_M5407 is not set
 CONFIG_COLDFIRE=y
-# CONFIG_CLOCK_AUTO is not set
-# CONFIG_CLOCK_11MHz is not set
-# CONFIG_CLOCK_16MHz is not set
-# CONFIG_CLOCK_20MHz is not set
-# CONFIG_CLOCK_24MHz is not set
-# CONFIG_CLOCK_25MHz is not set
-# CONFIG_CLOCK_33MHz is not set
-# CONFIG_CLOCK_40MHz is not set
-# CONFIG_CLOCK_45MHz is not set
-# CONFIG_CLOCK_48MHz is not set
-# CONFIG_CLOCK_50MHz is not set
-# CONFIG_CLOCK_54MHz is not set
-# CONFIG_CLOCK_60MHz is not set
-# CONFIG_CLOCK_62_5MHz is not set
-# CONFIG_CLOCK_64MHz is not set
-CONFIG_CLOCK_66MHz=y
-# CONFIG_CLOCK_70MHz is not set
-# CONFIG_CLOCK_100MHz is not set
-# CONFIG_CLOCK_140MHz is not set
-# CONFIG_CLOCK_150MHz is not set
-# CONFIG_CLOCK_166MHz is not set
+CONFIG_CLOCK_SET=y
+CONFIG_CLOCK_FREQ=66666666
+CONFIG_CLOCK_DIV=1
 
 #
 # Platform
@@ -102,11 +109,14 @@ CONFIG_M5272C3=y
 CONFIG_FREESCALE=y
 # CONFIG_LARGE_ALLOCS is not set
 CONFIG_4KSTACKS=y
-CONFIG_RAMAUTO=y
-# CONFIG_RAM4MB is not set
-# CONFIG_RAM8MB is not set
-# CONFIG_RAM16MB is not set
-# CONFIG_RAM32MB is not set
+
+#
+# RAM configuration
+#
+CONFIG_RAMBASE=0x0
+CONFIG_RAMSIZE=0x800000
+CONFIG_VECTORBASE=0x0
+CONFIG_KERNELBASE=0x20000
 CONFIG_RAMAUTOBIT=y
 # CONFIG_RAM8BIT is not set
 # CONFIG_RAM16BIT is not set
@@ -119,6 +129,8 @@ CONFIG_FLATMEM_MANUAL=y
 # 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
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -140,6 +152,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_BINFMT_FLAT=y
 # CONFIG_BINFMT_ZFLAT is not set
 # CONFIG_BINFMT_SHARED_FLAT is not set
+# CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
 
 #
@@ -155,6 +168,7 @@ CONFIG_NET=y
 #
 # Networking options
 #
+# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -171,18 +185,30 @@ CONFIG_IP_FIB_HASH=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_IP_TCPDIAG is not set
-# CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_BIC=y
 # CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL 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
@@ -195,8 +221,11 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_NET_DIVERT 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
-# CONFIG_NET_CLS_ROUTE is not set
 
 #
 # Network testing
@@ -205,6 +234,7 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
 
 #
 # Device Drivers
@@ -218,6 +248,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 
 #
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
 # Memory Technology Devices (MTD)
 #
 CONFIG_MTD=y
@@ -235,6 +270,7 @@ 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
 
 #
 # RAM/ROM/Flash chip drivers
@@ -254,13 +290,13 @@ CONFIG_MTD_CFI_I2=y
 CONFIG_MTD_RAM=y
 # 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_UCLINUX=y
-# CONFIG_MTD_SNAPGEARuC is not set
 # CONFIG_MTD_PLATRAM is not set
 
 #
@@ -269,7 +305,6 @@ CONFIG_MTD_UCLINUX=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLKMTD is not set
 # CONFIG_MTD_BLOCK2MTD is not set
 
 #
@@ -285,6 +320,11 @@ CONFIG_MTD_UCLINUX=y
 # CONFIG_MTD_NAND is not set
 
 #
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
 # Parallel port support
 #
 # CONFIG_PARPORT is not set
@@ -296,7 +336,6 @@ CONFIG_MTD_UCLINUX=y
 #
 # 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
@@ -304,16 +343,7 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_BLK_DEV_INITRD is not set
-CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CDROM_PKTCDVD 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_ATA_OVER_ETH is not set
 
 #
@@ -324,6 +354,7 @@ CONFIG_IOSCHED_NOOP=y
 #
 # SCSI device support
 #
+# CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 
 #
@@ -354,13 +385,15 @@ CONFIG_NETDEVICES=y
 # CONFIG_TUN is not set
 
 #
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
 # CONFIG_MII is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_NE2000 is not set
-# CONFIG_NET_PCI is not set
 CONFIG_FEC=y
 # CONFIG_FEC2 is not set
 
@@ -392,6 +425,7 @@ CONFIG_PPP=y
 # CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_PPP_DEFLATE is not set
 # CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_MPPE is not set
 # CONFIG_PPPOE is not set
 # CONFIG_SLIP is not set
 # CONFIG_SHAPER is not set
@@ -425,8 +459,6 @@ CONFIG_PPP=y
 #
 # CONFIG_VT is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_LEDMAN is not set
-# CONFIG_RESETSWITCH is not set
 
 #
 # Serial drivers
@@ -450,8 +482,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # Watchdog Cards
 #
 # CONFIG_WATCHDOG is not set
-# CONFIG_MCFWATCHDOG is not set
-# CONFIG_RTC is not set
 # CONFIG_GEN_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
@@ -464,14 +494,19 @@ CONFIG_LEGACY_PTY_COUNT=256
 #
 # TPM devices
 #
-# CONFIG_MCF_QSPI is not set
-# CONFIG_M41T11M6 is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
 
 #
 # I2C support
 #
 # CONFIG_I2C is not set
-# CONFIG_I2C_SENSOR is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
 
 #
 # Dallas's 1-wire bus
@@ -482,6 +517,7 @@ CONFIG_LEGACY_PTY_COUNT=256
 # Hardware Monitoring support
 #
 # CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
 
 #
 # Misc devices
@@ -491,6 +527,7 @@ CONFIG_LEGACY_PTY_COUNT=256
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
@@ -503,11 +540,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_FB is not set
 
 #
-# SPI support
-#
-# CONFIG_SPI is not set
-
-#
 # Sound
 #
 # CONFIG_SOUND is not set
@@ -517,6 +549,11 @@ CONFIG_LEGACY_PTY_COUNT=256
 #
 # 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
@@ -529,29 +566,43 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MMC is not set
 
 #
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
 # InfiniBand support
 #
 
 #
-# SN Devices
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
 #
 
 #
+# Real Time Clock
+#
+# 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_JBD is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
-
-#
-# XFS support
-#
 # CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 CONFIG_ROMFS_FS=y
 # CONFIG_INOTIFY is not set
@@ -559,6 +610,7 @@ CONFIG_ROMFS_FS=y
 # 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
@@ -581,6 +633,7 @@ CONFIG_SYSFS=y
 # CONFIG_TMPFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -611,6 +664,7 @@ CONFIG_RAMFS=y
 # 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
@@ -627,8 +681,12 @@ CONFIG_MSDOS_PARTITION=y
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+# CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_UNWIND_INFO is not set
 # CONFIG_FULLDEBUG is not set
 # CONFIG_HIGHPROFILE is not set
 # CONFIG_BOOTPARAM is not set
@@ -655,5 +713,6 @@ CONFIG_LOG_BUF_SHIFT=14
 # Library routines
 #
 # CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
 # CONFIG_CRC32 is not set
 # CONFIG_LIBCRC32C is not set
diff --git a/arch/m68knommu/kernel/comempci.c b/arch/m68knommu/kernel/comempci.c
index 8670938f1107..db7a0c1cebae 100644
--- a/arch/m68knommu/kernel/comempci.c
+++ b/arch/m68knommu/kernel/comempci.c
@@ -357,7 +357,8 @@ void pcibios_fixup_bus(struct pci_bus *b)
 
 /*****************************************************************************/
 
-void pcibios_align_resource(void *data, struct resource *res, unsigned long size, unsigned long align)
+void pcibios_align_resource(void *data, struct resource *res,
+                                resource_size_t size, resource_size_t align)
 {
 }
 
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index 6a2f0c693254..59ced831b792 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -3,63 +3,13 @@
  *
  *      (C) Copyright 2002-2006, Greg Ungerer <gerg@snapgear.com>
  *
- *      This ends up looking compilcated, because of the number of
- *      address variations for ram and rom/flash layouts. The real
- *      work of the linker script is all at the end, and reasonably
- *      strait forward.
+ *      This linker script is equiped to build either ROM loaded or RAM
+ *      run kernels.
  */
 
 #include <linux/config.h>
 #include <asm-generic/vmlinux.lds.h>
 
-/*
- *      Original Palm pilot (same for Xcopilot).
- *      There is really only a rom target for this.
- */
-#ifdef CONFIG_PILOT3
-#define ROMVEC_START    0x10c00000
-#define ROMVEC_LENGTH   0x10400
-#define ROM_START       0x10c10400
-#define ROM_LENGTH      0xfec00
-#define ROM_END         0x10d00000
-#define DATA_ADDR       CONFIG_KERNELBASE
-#endif
-
-/*
- *      Same setup on both the uCsimm and uCdimm.
- */
-#if defined(CONFIG_UCSIMM) || defined(CONFIG_UCDIMM)
-#ifdef CONFIG_RAMKERNEL
-#define ROMVEC_START    0x10c10000
-#define ROMVEC_LENGTH   0x400
-#define ROM_START       0x10c10400
-#define ROM_LENGTH      0x1efc00
-#define ROM_END         0x10e00000
-#endif
-#ifdef CONFIG_ROMKERNEL
-#define ROMVEC_START    0x10c10000
-#define ROMVEC_LENGTH   0x400
-#define ROM_START       0x10c10400
-#define ROM_LENGTH      0x1efc00
-#define ROM_END         0x10e00000
-#endif
-#ifdef CONFIG_HIMEMKERNEL
-#define ROMVEC_START    0x00600000
-#define ROMVEC_LENGTH   0x400
-#define ROM_START       0x00600400
-#define ROM_LENGTH      0x1efc00
-#define ROM_END         0x007f0000
-#endif
-#endif
-
-#ifdef CONFIG_UCQUICC
-#define ROMVEC_START    0x00000000
-#define ROMVEC_LENGTH   0x404
-#define ROM_START       0x00000404
-#define ROM_LENGTH      0x1ff6fc
-#define ROM_END         0x00200000
-#endif
-
 #if defined(CONFIG_RAMKERNEL)
 #define RAM_START       CONFIG_KERNELBASE
 #define RAM_LENGTH      (CONFIG_RAMBASE + CONFIG_RAMSIZE - CONFIG_KERNELBASE)
@@ -71,6 +21,10 @@
 #if defined(CONFIG_ROMKERNEL) || defined(CONFIG_HIMEMKERNEL)
 #define RAM_START       CONFIG_RAMBASE
 #define RAM_LENGTH      CONFIG_RAMSIZE
+#define ROMVEC_START    CONFIG_ROMVEC
+#define ROMVEC_LENGTH   CONFIG_ROMVECSIZE
+#define ROM_START       CONFIG_ROMSTART
+#define ROM_LENGTH      CONFIG_ROMSIZE
 #define TEXT            rom
 #define DATA            ram
 #define INIT            ram
@@ -90,7 +44,6 @@ MEMORY {
 #ifdef ROM_START
         romvec  : ORIGIN = ROMVEC_START, LENGTH = ROMVEC_LENGTH
         rom     : ORIGIN = ROM_START, LENGTH = ROM_LENGTH
-        erom    : ORIGIN = ROM_END, LENGTH = 0
 #endif
 }
 
@@ -167,13 +120,6 @@ SECTIONS {
                 _etext = . ;
         } > TEXT
 
-#ifdef ROM_END
-        . = ROM_END ;
-        .erom : {
-                __rom_end = . ;
-        } > erom
-#endif
-
         .data DATA_ADDR : {
                 . = ALIGN(4);
                 _sdata = . ;
diff --git a/arch/m68knommu/platform/68328/Makefile b/arch/m68knommu/platform/68328/Makefile
index 1b3b719e4479..5e5435552d56 100644
--- a/arch/m68knommu/platform/68328/Makefile
+++ b/arch/m68knommu/platform/68328/Makefile
@@ -8,6 +8,7 @@ head-$(CONFIG_DRAGEN2)	= head-de2.o
 
 obj-y                   += entry.o ints.o timers.o
 obj-$(CONFIG_M68328)    += config.o
+obj-$(CONFIG_ROM)       += romvec.o
 
 extra-y                 := head.o
 extra-$(CONFIG_M68328)  += bootlogo.rh head.o
diff --git a/arch/m68knommu/platform/68328/head-rom.S b/arch/m68knommu/platform/68328/head-rom.S
index 2b448a297011..234430b9551c 100644
--- a/arch/m68knommu/platform/68328/head-rom.S
+++ b/arch/m68knommu/platform/68328/head-rom.S
@@ -28,6 +28,8 @@ _ramstart:
 _ramend:
 .long   0
 
+#define RAMEND  (CONFIG_RAMBASE + CONFIG_RAMSIZE)
+
 #ifdef CONFIG_INIT_LCD
 splash_bits:
 #include "bootlogo.rh"
@@ -48,7 +50,7 @@ _stext:	movew	#0x2700,%sr
         moveb   #0x81,   0xfffffA27     /* LCKCON */
         movew   #0xff00, 0xfffff412     /* LCD pins */
 #endif
-        moveal  #__ramend-CONFIG_MEMORY_RESERVE*0x100000 - 0x10, %sp
+        moveal  #RAMEND-CONFIG_MEMORY_RESERVE*0x100000 - 0x10, %sp
         movew   #32767, %d0  /* PLL settle wait loop */
 1:      subq    #1, %d0
         bne     1b
@@ -73,13 +75,13 @@ _stext:	movew	#0x2700,%sr
         bhi     1b
 
         movel   #_sdata, %d0    
-        movel   %d0,    _rambase        
-        movel   #_ebss,  %d0
-        movel   %d0,    _ramstart
-        movel   #__ramend-CONFIG_MEMORY_RESERVE*0x100000, %d0
-        movel   %d0,    _ramend
-        movel   #__ramvec,      %d0
-        movel   %d0,    _ramvec
+        movel   %d0, _rambase        
+        movel   #_ebss, %d0
+        movel   %d0, _ramstart
+        movel   #RAMEND-CONFIG_MEMORY_RESERVE*0x100000, %d0
+        movel   %d0, _ramend
+        movel   #CONFIG_VECTORBASE,     %d0
+        movel   %d0, _ramvec
         
 /*
  * load the current task pointer and stack
diff --git a/arch/m68knommu/platform/68328/ints.c b/arch/m68knommu/platform/68328/ints.c
index 7437217813d2..2dda7339aae5 100644
--- a/arch/m68knommu/platform/68328/ints.c
+++ b/arch/m68knommu/platform/68328/ints.c
@@ -18,6 +18,7 @@
 
 #include <asm/system.h>
 #include <asm/irq.h>
+#include <asm/irqnode.h>
 #include <asm/traps.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
@@ -82,25 +83,6 @@ unsigned int local_irq_count[NR_CPUS];
 /* irq node variables for the 32 (potential) on chip sources */
 static irq_node_t int_irq_list[NR_IRQS];
 
-#if !defined(CONFIG_DRAGEN2)
-asm (".global _start, __ramend/n/t"
-     ".section .romvec/n"
-     "e_vectors:\n\t"
-     ".long __ramend-4, _start, buserr, trap, trap, trap, trap, trap\n\t"
-     ".long trap, trap, trap, trap, trap, trap, trap, trap\n\t"
-     ".long trap, trap, trap, trap, trap, trap, trap, trap\n\t"
-     ".long trap, trap, trap, trap\n\t"
-     ".long trap, trap, trap, trap\n\t"
-        /*.long inthandler, inthandler, inthandler, inthandler
-        .long inthandler4, inthandler, inthandler, inthandler   */
-        /* TRAP #0-15 */
-     ".long system_call, trap, trap, trap, trap, trap, trap, trap\n\t"
-     ".long trap, trap, trap, trap, trap, trap, trap, trap\n\t"
-     ".long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\n\t"
-     ".text\n"
-     "ignore: rte");
-#endif
-
 /*
  * This function should be called during kernel startup to initialize
  * the IRQ handling routines.
diff --git a/arch/m68knommu/platform/68328/romvec.S b/arch/m68knommu/platform/68328/romvec.S
new file mode 100644
index 000000000000..3e7fe1e14913
--- /dev/null
+++ b/arch/m68knommu/platform/68328/romvec.S
@@ -0,0 +1,37 @@
+/*
+ * linux/arch/m68knommu/platform/68328/romvec.S
+ *
+ * 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 1996 Roman Zippel
+ * Copyright 1999 D. Jeff Dionne <jeff@rt-control.com>
+ * Copyright 2006 Greg Ungerer <gerg@snapgear.com>
+ */
+
+#include <linux/config.h>
+
+.global _start
+.global _buserr
+.global trap
+.global system_call
+
+.section .romvec
+
+e_vectors:
+.long CONFIG_RAMBASE+CONFIG_RAMSIZE-4, _start, buserr, trap
+.long trap, trap, trap, trap
+.long trap, trap, trap, trap
+.long trap, trap, trap, trap
+.long trap, trap, trap, trap
+.long trap, trap, trap, trap
+.long trap, trap, trap, trap
+.long trap, trap, trap, trap
+/* TRAP #0-15 */
+.long system_call, trap, trap, trap
+.long trap, trap, trap, trap
+.long trap, trap, trap, trap
+.long trap, trap, trap, trap
+.long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+
diff --git a/arch/m68knommu/platform/68360/config.c b/arch/m68knommu/platform/68360/config.c
index 3db244625f0f..69c670dfd62b 100644
--- a/arch/m68knommu/platform/68360/config.c
+++ b/arch/m68knommu/platform/68360/config.c
@@ -141,13 +141,13 @@ int BSP_set_clock_mmss (unsigned long nowtime)
 void BSP_reset (void)
 {
   local_irq_disable();
-  asm volatile ("
-    moveal #_start, %a0;
-    moveb #0, 0xFFFFF300;
-    moveal 0(%a0), %sp;
-    moveal 4(%a0), %a0;
-    jmp (%a0);
-    ");
+  asm volatile (
+    "moveal #_start, %a0;\n"
+    "moveb #0, 0xFFFFF300;\n"
+    "moveal 0(%a0), %sp;\n"
+    "moveal 4(%a0), %a0;\n"
+    "jmp (%a0);\n"
+    );
 }
 
 unsigned char *scc1_hwaddr;
diff --git a/arch/m68knommu/platform/68360/head-ram.S b/arch/m68knommu/platform/68360/head-ram.S
index a5c639a51eef..f497713a4ec7 100644
--- a/arch/m68knommu/platform/68360/head-ram.S
+++ b/arch/m68knommu/platform/68360/head-ram.S
@@ -18,7 +18,6 @@
 .global _start
 
 .global _rambase
-.global __ramvec
 .global _ramvec
 .global _ramstart
 .global _ramend
@@ -26,6 +25,8 @@
 .global _quicc_base
 .global _periph_base
 
+#define RAMEND                      (CONFIG_RAMBASE + CONFIG_RAMSIZE)
+
 #define REGB                        0x1000
 #define PEPAR                       (_dprbase + REGB + 0x0016)
 #define GMR                         (_dprbase + REGB + 0x0040)
@@ -103,7 +104,7 @@ _stext:
         nop
         ori.w   #MCU_DISABLE_INTRPTS, %sr       /* disable interrupts: */
         /* We should not need to setup the boot stack the reset should do it. */
-        movea.l #__ramend, %sp                  /*set up stack at the end of DRAM:*/
+        movea.l #RAMEND, %sp                    /*set up stack at the end of DRAM:*/
 
 set_mbar_register:
         moveq.l #0x07, %d1                      /* Setup MBAR */
@@ -163,7 +164,7 @@ configure_memory_controller:
         move.l  %d0, GMR
 
 configure_chip_select_0:
-        move.l  #__ramend, %d0
+        move.l  #RAMEND, %d0
         subi.l  #__ramstart, %d0
         subq.l  #0x01, %d0
         eori.l  #SIM_OR_MASK, %d0
@@ -234,16 +235,10 @@ store_ram_size:
         /* Set ram size information */
         move.l  #_sdata, _rambase
         move.l  #_ebss, _ramstart
-        move.l  #__ramend, %d0
+        move.l  #RAMEND, %d0
         sub.l   #0x1000, %d0                    /* Reserve 4K for stack space.*/
-        move.l  %d0, _ramend                    /* Different from __ramend.*/
+        move.l  %d0, _ramend                    /* Different from RAMEND.*/
 
-store_flash_size:
-        /* Set rom size information */
-        move.l  #__rom_end, %d0
-        sub.l   #__rom_start, %d0
-        move.l  %d0, rom_length
-    
         pea     0
         pea     env
         pea     %sp@(4)
@@ -286,7 +281,7 @@ _dprbase:
      */
  
 .section ".data.initvect","awx"
-    .long   __ramend    /* Reset: Initial Stack Pointer                 - 0.  */
+    .long   RAMEND      /* Reset: Initial Stack Pointer                 - 0.  */
     .long   _start      /* Reset: Initial Program Counter               - 1.  */
     .long   buserr      /* Bus Error                                    - 2.  */
     .long   trap        /* Address Error                                - 3.  */
diff --git a/arch/m68knommu/platform/68360/head-rom.S b/arch/m68knommu/platform/68360/head-rom.S
index 0da357a4cfee..2d28c3e19a88 100644
--- a/arch/m68knommu/platform/68360/head-rom.S
+++ b/arch/m68knommu/platform/68360/head-rom.S
@@ -18,7 +18,6 @@
 .global _start
 
 .global _rambase
-.global __ramvec
 .global _ramvec
 .global _ramstart
 .global _ramend
@@ -26,6 +25,8 @@
 .global _quicc_base
 .global _periph_base
 
+#define RAMEND                      (CONFIG_RAMBASE + CONFIG_RAMSIZE)
+
 #define REGB                        0x1000
 #define PEPAR                       (_dprbase + REGB + 0x0016)
 #define GMR                         (_dprbase + REGB + 0x0040)
@@ -115,7 +116,7 @@ _stext:
         nop
         ori.w   #MCU_DISABLE_INTRPTS, %sr       /* disable interrupts: */
         /* We should not need to setup the boot stack the reset should do it. */
-        movea.l #__ramend, %sp          /* set up stack at the end of DRAM:*/
+        movea.l #RAMEND, %sp            /* set up stack at the end of DRAM:*/
 
 
 set_mbar_register:
@@ -245,16 +246,10 @@ store_ram_size:
         /* Set ram size information */
         move.l  #_sdata, _rambase
         move.l  #_ebss, _ramstart
-        move.l  #__ramend, %d0
+        move.l  #RAMEND, %d0
         sub.l   #0x1000, %d0                    /* Reserve 4K for stack space.*/
-        move.l  %d0, _ramend                    /* Different from __ramend.*/
+        move.l  %d0, _ramend                    /* Different from RAMEND.*/
 
-store_flash_size:
-        /* Set rom size information */
-        move.l  #__rom_end, %d0
-        sub.l   #__rom_start, %d0
-        move.l  %d0, rom_length
-    
         pea     0
         pea     env
         pea     %sp@(4)
@@ -298,7 +293,7 @@ _dprbase:
      */
  
 .section ".data.initvect","awx"
-    .long   __ramend    /* Reset: Initial Stack Pointer                 - 0.  */
+    .long   RAMEND      /* Reset: Initial Stack Pointer                 - 0.  */
     .long   _start      /* Reset: Initial Program Counter               - 1.  */
     .long   buserr      /* Bus Error                                    - 2.  */
     .long   trap        /* Address Error                                - 3.  */
diff --git a/arch/m68knommu/platform/68360/ints.c b/arch/m68knommu/platform/68360/ints.c
index ba184db1651b..0245fc4a4781 100644
--- a/arch/m68knommu/platform/68360/ints.c
+++ b/arch/m68knommu/platform/68360/ints.c
@@ -20,6 +20,7 @@
 
 #include <asm/system.h>
 #include <asm/irq.h>
+#include <asm/irqnode.h>
 #include <asm/traps.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
diff --git a/arch/m68knommu/platform/68EZ328/config.c b/arch/m68knommu/platform/68EZ328/config.c
index d8d56e5de310..15a14a67c2bf 100644
--- a/arch/m68knommu/platform/68EZ328/config.c
+++ b/arch/m68knommu/platform/68EZ328/config.c
@@ -42,13 +42,13 @@ void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int
 void m68ez328_reset(void)
 {
   local_irq_disable();
-  asm volatile ("
-    moveal #0x10c00000, %a0;
-    moveb #0, 0xFFFFF300;
-    moveal 0(%a0), %sp;
-    moveal 4(%a0), %a0;
-    jmp (%a0);
-    ");
+  asm volatile (
+    "moveal #0x10c00000, %a0;\n"
+    "moveb #0, 0xFFFFF300;\n"
+    "moveal 0(%a0), %sp;\n"
+    "moveal 4(%a0), %a0;\n"
+    "jmp (%a0);\n"
+    );
 }
 
 /***************************************************************************/
diff --git a/arch/m68knommu/platform/68VZ328/config.c b/arch/m68knommu/platform/68VZ328/config.c
index d926524cdf82..4058de5c8fa2 100644
--- a/arch/m68knommu/platform/68VZ328/config.c
+++ b/arch/m68knommu/platform/68VZ328/config.c
@@ -141,13 +141,13 @@ static void init_hardware(char *command, int size)
 static void m68vz328_reset(void)
 {
         local_irq_disable();
-        asm volatile ("
-                moveal #0x10c00000, %a0;
-                moveb #0, 0xFFFFF300;
-                moveal 0(%a0), %sp;
-                moveal 4(%a0), %a0;
-                jmp (%a0);
-        ");
+        asm volatile (
+                "moveal #0x10c00000, %a0;\n\t"
+                "moveb #0, 0xFFFFF300;\n\t"
+                "moveal 0(%a0), %sp;\n\t"
+                "moveal 4(%a0), %a0;\n\t"
+                "jmp (%a0);\n"
+        );
 }
 
 unsigned char *cs8900a_hwaddr;
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 35e038a974c6..08c2ece4ae40 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1618,6 +1618,11 @@ config GENERIC_IRQ_PROBE
         bool
         default y
 
+config IRQ_PER_CPU
+        depends on SMP
+        bool
+        default y
+
 #
 # - Highmem only makes sense for the 32-bit kernel.
 # - The current highmem code will only work properly on physically indexed
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c
index afe05ec12c27..da74ac21954b 100644
--- a/arch/mips/au1000/common/irq.c
+++ b/arch/mips/au1000/common/irq.c
@@ -333,31 +333,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].handler = &rise_edge_irq_type;
+                                irq_desc[irq_nr].chip = &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].handler = &fall_edge_irq_type;
+                                irq_desc[irq_nr].chip = &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].handler = &either_edge_irq_type;
+                                irq_desc[irq_nr].chip = &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].handler = &level_irq_type;
+                                irq_desc[irq_nr].chip = &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].handler = &level_irq_type;
+                                irq_desc[irq_nr].chip = &level_irq_type;
                                 break;
                         case INTC_INT_DISABLED: /* 0:0:0 */
                                 au_writel(1<<(irq_nr-32), IC1_CFG0CLR);
@@ -385,31 +385,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].handler = &rise_edge_irq_type;
+                                irq_desc[irq_nr].chip = &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].handler = &fall_edge_irq_type;
+                                irq_desc[irq_nr].chip = &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].handler = &either_edge_irq_type;
+                                irq_desc[irq_nr].chip = &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].handler = &level_irq_type;
+                                irq_desc[irq_nr].chip = &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].handler = &level_irq_type;
+                                irq_desc[irq_nr].chip = &level_irq_type;
                                 break;
                         case INTC_INT_DISABLED: /* 0:0:0 */
                                 au_writel(1<<irq_nr, IC0_CFG0CLR);
diff --git a/arch/mips/au1000/pb1200/irqmap.c b/arch/mips/au1000/pb1200/irqmap.c
index bacc0c6bfe67..5dd164fc1889 100644
--- a/arch/mips/au1000/pb1200/irqmap.c
+++ b/arch/mips/au1000/pb1200/irqmap.c
@@ -172,7 +172,7 @@ void _board_init_irq(void)
 
         for (irq_nr = PB1200_INT_BEGIN; irq_nr <= PB1200_INT_END; irq_nr++)
         {
-                irq_desc[irq_nr].handler = &external_irq_type;
+                irq_desc[irq_nr].chip = &external_irq_type;
                 pb1200_disable_irq(irq_nr);
         }
 
diff --git a/arch/mips/ddb5xxx/ddb5477/irq_5477.c b/arch/mips/ddb5xxx/ddb5477/irq_5477.c
index 5fcd5f070cdc..63c3d6534b3a 100644
--- a/arch/mips/ddb5xxx/ddb5477/irq_5477.c
+++ b/arch/mips/ddb5xxx/ddb5477/irq_5477.c
@@ -107,7 +107,7 @@ void __init vrc5477_irq_init(u32 irq_base)
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = NULL;
                 irq_desc[i].depth = 1;
-                irq_desc[i].handler = &vrc5477_irq_controller;
+                irq_desc[i].chip = &vrc5477_irq_controller;
         }
 
         vrc5477_irq_base = irq_base;
diff --git a/arch/mips/dec/ioasic-irq.c b/arch/mips/dec/ioasic-irq.c
index d5bca5d233b6..da2dbb42f913 100644
--- a/arch/mips/dec/ioasic-irq.c
+++ b/arch/mips/dec/ioasic-irq.c
@@ -144,13 +144,13 @@ void __init init_ioasic_irqs(int base)
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = 0;
                 irq_desc[i].depth = 1;
-                irq_desc[i].handler = &ioasic_irq_type;
+                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].handler = &ioasic_dma_irq_type;
+                irq_desc[i].chip = &ioasic_dma_irq_type;
         }
 
         ioasic_irq_base = base;
diff --git a/arch/mips/dec/kn02-irq.c b/arch/mips/dec/kn02-irq.c
index 898bed502a34..d44c00d9e80f 100644
--- a/arch/mips/dec/kn02-irq.c
+++ b/arch/mips/dec/kn02-irq.c
@@ -123,7 +123,7 @@ void __init init_kn02_irqs(int base)
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = 0;
                 irq_desc[i].depth = 1;
-                irq_desc[i].handler = &kn02_irq_type;
+                irq_desc[i].chip = &kn02_irq_type;
         }
 
         kn02_irq_base = base;
diff --git a/arch/mips/gt64120/ev64120/irq.c b/arch/mips/gt64120/ev64120/irq.c
index 46c468b26b30..f489a8067a93 100644
--- a/arch/mips/gt64120/ev64120/irq.c
+++ b/arch/mips/gt64120/ev64120/irq.c
@@ -138,7 +138,7 @@ void __init arch_init_irq(void)
         /*  Let's initialize our IRQ descriptors  */
         for (i = 0; i < NR_IRQS; i++) {
                 irq_desc[i].status = 0;
-                irq_desc[i].handler = &no_irq_type;
+                irq_desc[i].chip = &no_irq_type;
                 irq_desc[i].action = NULL;
                 irq_desc[i].depth = 0;
                 spin_lock_init(&irq_desc[i].lock);
diff --git a/arch/mips/ite-boards/generic/irq.c b/arch/mips/ite-boards/generic/irq.c
index 77be7216bdd0..a6749c56fe38 100644
--- a/arch/mips/ite-boards/generic/irq.c
+++ b/arch/mips/ite-boards/generic/irq.c
@@ -208,10 +208,10 @@ void __init arch_init_irq(void)
 #endif
 
         for (i = 0; i <= IT8172_LAST_IRQ; i++) {
-                irq_desc[i].handler = &it8172_irq_type;
+                irq_desc[i].chip = &it8172_irq_type;
                 spin_lock_init(&irq_desc[i].lock);
         }
-        irq_desc[MIPS_CPU_TIMER_IRQ].handler = &cp0_irq_type;
+        irq_desc[MIPS_CPU_TIMER_IRQ].chip = &cp0_irq_type;
         set_c0_status(ALLINTS_NOTIMER);
 }
 
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c
index becc9accd495..478be9858a1e 100644
--- a/arch/mips/jazz/irq.c
+++ b/arch/mips/jazz/irq.c
@@ -73,7 +73,7 @@ void __init init_r4030_ints(void)
                 irq_desc[i].status     = IRQ_DISABLED;
                 irq_desc[i].action     = 0;
                 irq_desc[i].depth      = 1;
-                irq_desc[i].handler    = &r4030_irq_type;
+                irq_desc[i].chip    = &r4030_irq_type;
         }
 
         r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, 0);
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c
index 11304d1354f4..380046ea1db5 100644
--- a/arch/mips/jmr3927/rbhma3100/irq.c
+++ b/arch/mips/jmr3927/rbhma3100/irq.c
@@ -435,7 +435,7 @@ void jmr3927_irq_init(u32 irq_base)
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = NULL;
                 irq_desc[i].depth = 1;
-                irq_desc[i].handler = &jmr3927_irq_controller;
+                irq_desc[i].chip = &jmr3927_irq_controller;
         }
 
         jmr3927_irq_base = irq_base;
diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
index 0cb8ed5662f3..91ffb1233cad 100644
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
@@ -120,7 +120,7 @@ int i8259A_irq_pending(unsigned int irq)
 void make_8259A_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
-        irq_desc[irq].handler = &i8259A_irq_type;
+        irq_desc[irq].chip = &i8259A_irq_type;
         enable_irq(irq);
 }
 
@@ -327,7 +327,7 @@ void __init init_i8259_irqs (void)
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = NULL;
                 irq_desc[i].depth = 1;
-                irq_desc[i].handler = &i8259A_irq_type;
+                irq_desc[i].chip = &i8259A_irq_type;
         }
 
         setup_irq(2, &irq2);
diff --git a/arch/mips/kernel/irq-msc01.c b/arch/mips/kernel/irq-msc01.c
index 97ebdc754b9e..f8cd1ac64d88 100644
--- a/arch/mips/kernel/irq-msc01.c
+++ b/arch/mips/kernel/irq-msc01.c
@@ -174,14 +174,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].handler = &msc_edgeirq_type;
+                        irq_desc[base+n].chip = &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].handler = &msc_levelirq_type;
+                        irq_desc[base+n].chip = &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 0613f1f36b1b..f9c763a65547 100644
--- a/arch/mips/kernel/irq-mv6434x.c
+++ b/arch/mips/kernel/irq-mv6434x.c
@@ -155,7 +155,7 @@ void __init mv64340_irq_init(unsigned int base)
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = 0;
                 irq_desc[i].depth = 2;
-                irq_desc[i].handler = &mv64340_irq_type;
+                irq_desc[i].chip = &mv64340_irq_type;
         }
 
         irq_base = base;
diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c
index 0b130c5ac5d9..121da385a94d 100644
--- a/arch/mips/kernel/irq-rm7000.c
+++ b/arch/mips/kernel/irq-rm7000.c
@@ -91,7 +91,7 @@ void __init rm7k_cpu_irq_init(int base)
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = NULL;
                 irq_desc[i].depth = 1;
-                irq_desc[i].handler = &rm7k_irq_controller;
+                irq_desc[i].chip = &rm7k_irq_controller;
         }
 
         irq_base = base;
diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c
index 9b5f20c32acb..25109c103e44 100644
--- a/arch/mips/kernel/irq-rm9000.c
+++ b/arch/mips/kernel/irq-rm9000.c
@@ -139,11 +139,11 @@ void __init rm9k_cpu_irq_init(int base)
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = NULL;
                 irq_desc[i].depth = 1;
-                irq_desc[i].handler = &rm9k_irq_controller;
+                irq_desc[i].chip = &rm9k_irq_controller;
         }
 
         rm9000_perfcount_irq = base + 1;
-        irq_desc[rm9000_perfcount_irq].handler = &rm9k_perfcounter_irq;
+        irq_desc[rm9000_perfcount_irq].chip = &rm9k_perfcounter_irq;
 
         irq_base = base;
 }
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index 3dce742e716f..5c9dcd5eed59 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -95,7 +95,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].handler->typename);
+                seq_printf(p, " %14s", irq_desc[i].chip->typename);
                 seq_printf(p, "  %s", action->name);
 
                 for (action=action->next; action; action = action->next)
@@ -137,7 +137,7 @@ void __init init_IRQ(void)
                 irq_desc[i].status  = IRQ_DISABLED;
                 irq_desc[i].action  = NULL;
                 irq_desc[i].depth   = 1;
-                irq_desc[i].handler = &no_irq_type;
+                irq_desc[i].chip = &no_irq_type;
                 spin_lock_init(&irq_desc[i].lock);
 #ifdef CONFIG_MIPS_MT_SMTC
                 irq_hwmask[i] = 0;
diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c
index 5db67e31ec1a..0e455a8ad860 100644
--- a/arch/mips/kernel/irq_cpu.c
+++ b/arch/mips/kernel/irq_cpu.c
@@ -167,14 +167,14 @@ void __init mips_cpu_irq_init(int irq_base)
                         irq_desc[i].status = IRQ_DISABLED;
                         irq_desc[i].action = NULL;
                         irq_desc[i].depth = 1;
-                        irq_desc[i].handler = &mips_mt_cpu_irq_controller;
+                        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].handler = &mips_cpu_irq_controller;
+                irq_desc[i].chip = &mips_cpu_irq_controller;
         }
 
         mips_cpu_irq_base = irq_base;
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 298f82fe8440..9096a5ea4229 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -446,7 +446,7 @@ static int __init topology_init(void)
         int ret;
 
         for_each_present_cpu(cpu) {
-                ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu, NULL);
+                ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu);
                 if (ret)
                         printk(KERN_WARNING "topology_init: register_cpu %d "
                                "failed (%d)\n", cpu, ret);
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 2e8e52c135e6..70cf09afdf56 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -367,7 +367,7 @@ void mipsmt_prepare_cpus(void)
         dvpe();
         dmt();
 
-        freeIPIq.lock = SPIN_LOCK_UNLOCKED;
+        spin_lock_init(&freeIPIq.lock);
 
         /*
          * We probably don't have as many VPEs as we do SMP "CPUs",
@@ -375,7 +375,7 @@ void mipsmt_prepare_cpus(void)
          */
         for (i=0; i<NR_CPUS; i++) {
                 IPIQ[i].head = IPIQ[i].tail = NULL;
-                IPIQ[i].lock = SPIN_LOCK_UNLOCKED;
+                spin_lock_init(&IPIQ[i].lock);
                 IPIQ[i].depth = 0;
                 ipi_timer_latch[i] = 0;
         }
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c
index 2d3472b21ebb..9316a024a818 100644
--- a/arch/mips/lasat/interrupt.c
+++ b/arch/mips/lasat/interrupt.c
@@ -156,6 +156,6 @@ void __init arch_init_irq(void)
                 irq_desc[i].status      = IRQ_DISABLED;
                 irq_desc[i].action      = 0;
                 irq_desc[i].depth       = 1;
-                irq_desc[i].handler     = &lasat_irq_type;
+                irq_desc[i].chip        = &lasat_irq_type;
         }
 }
diff --git a/arch/mips/mips-boards/atlas/atlas_int.c b/arch/mips/mips-boards/atlas/atlas_int.c
index db53950b7cfb..9dd6b8925581 100644
--- a/arch/mips/mips-boards/atlas/atlas_int.c
+++ b/arch/mips/mips-boards/atlas/atlas_int.c
@@ -215,7 +215,7 @@ void __init arch_init_irq(void)
                 irq_desc[i].status      = IRQ_DISABLED;
                 irq_desc[i].action      = 0;
                 irq_desc[i].depth       = 1;
-                irq_desc[i].handler     = &atlas_irq_type;
+                irq_desc[i].chip        = &atlas_irq_type;
                 spin_lock_init(&irq_desc[i].lock);
         }
 }
diff --git a/arch/mips/momentum/ocelot_c/cpci-irq.c b/arch/mips/momentum/ocelot_c/cpci-irq.c
index bd885785e2f9..31d179c4673f 100644
--- a/arch/mips/momentum/ocelot_c/cpci-irq.c
+++ b/arch/mips/momentum/ocelot_c/cpci-irq.c
@@ -147,6 +147,6 @@ void cpci_irq_init(void)
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = 0;
                 irq_desc[i].depth = 2;
-                irq_desc[i].handler = &cpci_irq_type;
+                irq_desc[i].chip = &cpci_irq_type;
         }
 }
diff --git a/arch/mips/momentum/ocelot_c/uart-irq.c b/arch/mips/momentum/ocelot_c/uart-irq.c
index 755bde5146be..852265026fd1 100644
--- a/arch/mips/momentum/ocelot_c/uart-irq.c
+++ b/arch/mips/momentum/ocelot_c/uart-irq.c
@@ -137,10 +137,10 @@ void uart_irq_init(void)
         irq_desc[80].status = IRQ_DISABLED;
         irq_desc[80].action = 0;
         irq_desc[80].depth = 2;
-        irq_desc[80].handler = &uart_irq_type;
+        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].handler = &uart_irq_type;
+        irq_desc[81].chip = &uart_irq_type;
 }
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 4dfce154d4af..ba66f8c9bd4e 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -51,11 +51,11 @@ unsigned long PCIBIOS_MIN_MEM	= 0;
  */
 void
 pcibios_align_resource(void *data, struct resource *res,
-                       unsigned long size, unsigned long align)
+                       resource_size_t size, resource_size_t align)
 {
         struct pci_dev *dev = data;
         struct pci_controller *hose = dev->sysdata;
-        unsigned long start = res->start;
+        resource_size_t start = res->start;
 
         if (res->flags & IORESOURCE_IO) {
                 /* Make sure we start at our min on all hoses */
diff --git a/arch/mips/philips/pnx8550/common/int.c b/arch/mips/philips/pnx8550/common/int.c
index 39ee6314f627..8f18764a2359 100644
--- a/arch/mips/philips/pnx8550/common/int.c
+++ b/arch/mips/philips/pnx8550/common/int.c
@@ -236,7 +236,7 @@ void __init arch_init_irq(void)
         int configPR;
 
         for (i = 0; i < PNX8550_INT_CP0_TOTINT; i++) {
-                irq_desc[i].handler = &level_irq_type;
+                irq_desc[i].chip = &level_irq_type;
                 pnx8550_ack(i); /* mask the irq just in case  */
         }
 
@@ -273,7 +273,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].handler = &level_irq_type;
+                irq_desc[i].chip = &level_irq_type;
         }
 
         /* Priority level 0 */
@@ -282,12 +282,12 @@ 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].handler = &level_irq_type;
+        irq_desc[MIPS_CPU_GIC_IRQ].chip = &level_irq_type;
         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].handler = &level_irq_type;
+                irq_desc[i].chip = &level_irq_type;
         }
 
         /* Stop Timer 1-3 */
@@ -295,7 +295,7 @@ void __init arch_init_irq(void)
         configPR |= 0x00000038;
         write_c0_config7(configPR);
 
-        irq_desc[MIPS_CPU_TIMER_IRQ].handler = &level_irq_type;
+        irq_desc[MIPS_CPU_TIMER_IRQ].chip = &level_irq_type;
         setup_irq(MIPS_CPU_TIMER_IRQ, &timer_action);
 }
 
diff --git a/arch/mips/pmc-sierra/yosemite/ht.c b/arch/mips/pmc-sierra/yosemite/ht.c
index 54b65a80abf5..fb523ebcafa8 100644
--- a/arch/mips/pmc-sierra/yosemite/ht.c
+++ b/arch/mips/pmc-sierra/yosemite/ht.c
@@ -383,12 +383,12 @@ void pcibios_update_resource(struct pci_dev *dev, struct resource *root,
 
 
 void pcibios_align_resource(void *data, struct resource *res,
-                            unsigned long size, unsigned long align)
+                            resource_size_t size, resource_size_t align)
 {
         struct pci_dev *dev = data;
 
         if (res->flags & IORESOURCE_IO) {
-                unsigned long start = res->start;
+                resource_size_t start = res->start;
 
                 /* We need to avoid collisions with `mirrored' VGA ports
                    and other strange ISA hardware, so we always want the
diff --git a/arch/mips/sgi-ip22/ip22-eisa.c b/arch/mips/sgi-ip22/ip22-eisa.c
index b19820110aa3..989167b49ce9 100644
--- a/arch/mips/sgi-ip22/ip22-eisa.c
+++ b/arch/mips/sgi-ip22/ip22-eisa.c
@@ -279,9 +279,9 @@ int __init ip22_eisa_init(void)
                 irq_desc[i].action = 0;
                 irq_desc[i].depth = 1;
                 if (i < (SGINT_EISA + 8))
-                        irq_desc[i].handler = &ip22_eisa1_irq_type;
+                        irq_desc[i].chip = &ip22_eisa1_irq_type;
                 else
-                        irq_desc[i].handler = &ip22_eisa2_irq_type;
+                        irq_desc[i].chip = &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 fc6a7e2b189c..18906af69691 100644
--- a/arch/mips/sgi-ip22/ip22-int.c
+++ b/arch/mips/sgi-ip22/ip22-int.c
@@ -436,7 +436,7 @@ void __init arch_init_irq(void)
                 irq_desc[i].status      = IRQ_DISABLED;
                 irq_desc[i].action      = 0;
                 irq_desc[i].depth       = 1;
-                irq_desc[i].handler     = handler;
+                irq_desc[i].chip        = handler;
         }
 
         /* 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 0b61a39ce2bb..869566c360ae 100644
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
@@ -386,7 +386,7 @@ 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].handler   = &bridge_irq_type;
+        irq_desc[irq].chip      = &bridge_irq_type;
 }
 
 int __devinit request_bridge_irq(struct bridge_controller *bc)
diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c
index 8ba08047d164..00b94aaf6371 100644
--- a/arch/mips/sgi-ip32/ip32-irq.c
+++ b/arch/mips/sgi-ip32/ip32-irq.c
@@ -591,7 +591,7 @@ void __init arch_init_irq(void)
                 irq_desc[irq].status = IRQ_DISABLED;
                 irq_desc[irq].action = 0;
                 irq_desc[irq].depth = 0;
-                irq_desc[irq].handler = controller;
+                irq_desc[irq].chip = 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 e61760b14d99..610df40cb820 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -276,10 +276,10 @@ void __init init_bcm1480_irqs(void)
                 irq_desc[i].action = 0;
                 irq_desc[i].depth = 1;
                 if (i < BCM1480_NR_IRQS) {
-                        irq_desc[i].handler = &bcm1480_irq_type;
+                        irq_desc[i].chip = &bcm1480_irq_type;
                         bcm1480_irq_owner[i] = 0;
                 } else {
-                        irq_desc[i].handler = &no_irq_type;
+                        irq_desc[i].chip = &no_irq_type;
                 }
         }
 }
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index f853c32f60a0..fcc61940f1ff 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -246,10 +246,10 @@ void __init init_sb1250_irqs(void)
                 irq_desc[i].action = 0;
                 irq_desc[i].depth = 1;
                 if (i < SB1250_NR_IRQS) {
-                        irq_desc[i].handler = &sb1250_irq_type;
+                        irq_desc[i].chip = &sb1250_irq_type;
                         sb1250_irq_owner[i] = 0;
                 } else {
-                        irq_desc[i].handler = &no_irq_type;
+                        irq_desc[i].chip = &no_irq_type;
                 }
         }
 }
diff --git a/arch/mips/sni/irq.c b/arch/mips/sni/irq.c
index 7365b4853ddb..c19e158ec402 100644
--- a/arch/mips/sni/irq.c
+++ b/arch/mips/sni/irq.c
@@ -203,7 +203,7 @@ void __init arch_init_irq(void)
                 irq_desc[i].status     = IRQ_DISABLED;
                 irq_desc[i].action     = 0;
                 irq_desc[i].depth      = 1;
-                irq_desc[i].handler    = &pciasic_irq_type;
+                irq_desc[i].chip    = &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 8ca68015cf40..a42be00483e6 100644
--- a/arch/mips/tx4927/common/tx4927_irq.c
+++ b/arch/mips/tx4927/common/tx4927_irq.c
@@ -227,7 +227,7 @@ static void __init tx4927_irq_cp0_init(void)
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = 0;
                 irq_desc[i].depth = 1;
-                irq_desc[i].handler = &tx4927_irq_cp0_type;
+                irq_desc[i].chip = &tx4927_irq_cp0_type;
         }
 
         return;
@@ -435,7 +435,7 @@ static void __init tx4927_irq_pic_init(void)
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = 0;
                 irq_desc[i].depth = 2;
-                irq_desc[i].handler = &tx4927_irq_pic_type;
+                irq_desc[i].chip = &tx4927_irq_pic_type;
         }
 
         setup_irq(TX4927_IRQ_NEST_PIC_ON_CP0, &tx4927_irq_pic_action);
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
index aee07ff2212a..c67978b6dae4 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
@@ -368,7 +368,7 @@ static void __init toshiba_rbtx4927_irq_ioc_init(void)
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = 0;
                 irq_desc[i].depth = 3;
-                irq_desc[i].handler = &toshiba_rbtx4927_irq_ioc_type;
+                irq_desc[i].chip = &toshiba_rbtx4927_irq_ioc_type;
         }
 
         setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_IOC_ON_PIC,
@@ -526,7 +526,7 @@ static void __init toshiba_rbtx4927_irq_isa_init(void)
                 irq_desc[i].action = 0;
                 irq_desc[i].depth =
                     ((i < TOSHIBA_RBTX4927_IRQ_ISA_MID) ? (4) : (5));
-                irq_desc[i].handler = &toshiba_rbtx4927_irq_isa_type;
+                irq_desc[i].chip = &toshiba_rbtx4927_irq_isa_type;
         }
 
         setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC,
@@ -692,13 +692,13 @@ void toshiba_rbtx4927_irq_dump(char *key)
         {
                 u32 i, j = 0;
                 for (i = 0; i < NR_IRQS; i++) {
-                        if (strcmp(irq_desc[i].handler->typename, "none")
+                        if (strcmp(irq_desc[i].chip->typename, "none")
                             == 0)
                                 continue;
 
                         if ((i >= 1)
-                            && (irq_desc[i - 1].handler->typename ==
-                                irq_desc[i].handler->typename)) {
+                            && (irq_desc[i - 1].chip->typename ==
+                                irq_desc[i].chip->typename)) {
                                 j++;
                         } else {
                                 j = 0;
@@ -707,12 +707,12 @@ void toshiba_rbtx4927_irq_dump(char *key)
                             (TOSHIBA_RBTX4927_IRQ_INFO,
                              "%s irq=0x%02x/%3d s=0x%08x h=0x%08x a=0x%08x ah=0x%08x d=%1d n=%s/%02d\n",
                              key, i, i, irq_desc[i].status,
-                             (u32) irq_desc[i].handler,
+                             (u32) irq_desc[i].chip,
                              (u32) irq_desc[i].action,
                              (u32) (irq_desc[i].action ? irq_desc[i].
                                     action->handler : 0),
                              irq_desc[i].depth,
-                             irq_desc[i].handler->typename, j);
+                             irq_desc[i].chip->typename, j);
                 }
         }
 #endif
diff --git a/arch/mips/tx4938/common/irq.c b/arch/mips/tx4938/common/irq.c
index 873805178d8e..0b2f8c849218 100644
--- a/arch/mips/tx4938/common/irq.c
+++ b/arch/mips/tx4938/common/irq.c
@@ -102,7 +102,7 @@ tx4938_irq_cp0_init(void)
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = 0;
                 irq_desc[i].depth = 1;
-                irq_desc[i].handler = &tx4938_irq_cp0_type;
+                irq_desc[i].chip = &tx4938_irq_cp0_type;
         }
 
         return;
@@ -306,7 +306,7 @@ tx4938_irq_pic_init(void)
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = 0;
                 irq_desc[i].depth = 2;
-                irq_desc[i].handler = &tx4938_irq_pic_type;
+                irq_desc[i].chip = &tx4938_irq_pic_type;
         }
 
         setup_irq(TX4938_IRQ_NEST_PIC_ON_CP0, &tx4938_irq_pic_action);
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/irq.c b/arch/mips/tx4938/toshiba_rbtx4938/irq.c
index 9cd9c0fe2265..3b8245dc5bd3 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/irq.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/irq.c
@@ -146,7 +146,7 @@ toshiba_rbtx4938_irq_ioc_init(void)
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = 0;
                 irq_desc[i].depth = 3;
-                irq_desc[i].handler = &toshiba_rbtx4938_irq_ioc_type;
+                irq_desc[i].chip = &toshiba_rbtx4938_irq_ioc_type;
         }
 
         setup_irq(RBTX4938_IRQ_IOCINT,
diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
index 07ae19cf0c29..b9323302cc4e 100644
--- a/arch/mips/vr41xx/common/icu.c
+++ b/arch/mips/vr41xx/common/icu.c
@@ -722,10 +722,10 @@ static int __init vr41xx_icu_init(void)
         icu2_write(MGIUINTHREG, 0xffff);
 
         for (i = SYSINT1_IRQ_BASE; i <= SYSINT1_IRQ_LAST; i++)
-                irq_desc[i].handler = &sysint1_irq_type;
+                irq_desc[i].chip = &sysint1_irq_type;
 
         for (i = SYSINT2_IRQ_BASE; i <= SYSINT2_IRQ_LAST; i++)
-                irq_desc[i].handler = &sysint2_irq_type;
+                irq_desc[i].chip = &sysint2_irq_type;
 
         cascade_irq(INT0_IRQ, icu_get_irq);
         cascade_irq(INT1_IRQ, icu_get_irq);
diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
index 86796bb63c3c..66aa50802deb 100644
--- a/arch/mips/vr41xx/common/irq.c
+++ b/arch/mips/vr41xx/common/irq.c
@@ -73,13 +73,13 @@ static void irq_dispatch(unsigned int irq, struct pt_regs *regs)
         if (cascade->get_irq != NULL) {
                 unsigned int source_irq = irq;
                 desc = irq_desc + source_irq;
-                desc->handler->ack(source_irq);
+                desc->chip->ack(source_irq);
                 irq = cascade->get_irq(irq, regs);
                 if (irq < 0)
                         atomic_inc(&irq_err_count);
                 else
                         irq_dispatch(irq, regs);
-                desc->handler->end(source_irq);
+                desc->chip->end(source_irq);
         } else
                 do_IRQ(irq, regs);
 }
diff --git a/arch/mips/vr41xx/common/vrc4173.c b/arch/mips/vr41xx/common/vrc4173.c
index 3e31f8193d21..2d287b8893d9 100644
--- a/arch/mips/vr41xx/common/vrc4173.c
+++ b/arch/mips/vr41xx/common/vrc4173.c
@@ -483,7 +483,7 @@ static inline int vrc4173_icu_init(int cascade_irq)
         vr41xx_set_irq_level(GIU_IRQ_TO_PIN(cascade_irq), LEVEL_LOW);
 
         for (i = VRC4173_IRQ_BASE; i <= VRC4173_IRQ_LAST; i++)
-                irq_desc[i].handler = &vrc4173_irq_type;
+                irq_desc[i].chip = &vrc4173_irq_type;
 
         return 0;
 }
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/irq.c b/arch/mips/vr41xx/nec-cmbvr4133/irq.c
index 31db6b61a39e..7b2511ca0a61 100644
--- a/arch/mips/vr41xx/nec-cmbvr4133/irq.c
+++ b/arch/mips/vr41xx/nec-cmbvr4133/irq.c
@@ -104,7 +104,7 @@ void __init rockhopper_init_irq(void)
         }
 
         for (i = I8259_IRQ_BASE; i <= I8259_IRQ_LAST; i++)
-                irq_desc[i].handler = &i8259_irq_type;
+                irq_desc[i].chip = &i8259_irq_type;
 
         setup_irq(I8259_SLAVE_IRQ, &i8259_slave_cascade);
 
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 910fb3afc0b5..6dd0ea8f88e0 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -51,6 +51,10 @@ config GENERIC_HARDIRQS
 config GENERIC_IRQ_PROBE
         def_bool y
 
+config IRQ_PER_CPU
+        bool
+        default y
+
 # unless you want to implement ACPI on PA-RISC ... ;-)
 config PM
         bool
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index c057ad7605ba..bc7c4a4e26a1 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -97,15 +97,17 @@ update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t pte)
 void
 show_cache_info(struct seq_file *m)
 {
+        char buf[32];
+
         seq_printf(m, "I-cache\t\t: %ld KB\n", 
                 cache_info.ic_size/1024 );
-        seq_printf(m, "D-cache\t\t: %ld KB (%s%s, %d-way associative)\n", 
+        if (cache_info.dc_loop == 1)
+                snprintf(buf, 32, "%lu-way associative", cache_info.dc_loop);
+        seq_printf(m, "D-cache\t\t: %ld KB (%s%s, %s)\n",
                 cache_info.dc_size/1024,
                 (cache_info.dc_conf.cc_wt ? "WT":"WB"),
                 (cache_info.dc_conf.cc_sh ? ", shared I/D":""),
-                (cache_info.dc_conf.cc_assoc)
-        );
-
+                ((cache_info.dc_loop == 1) ? "direct mapped" : buf));
         seq_printf(m, "ITLB entries\t: %ld\n" "DTLB entries\t: %ld%s\n",
                 cache_info.it_size,
                 cache_info.dt_size,
@@ -158,11 +160,11 @@ parisc_cache_init(void)
                 cache_info.dc_conf.cc_block,
                 cache_info.dc_conf.cc_line,
                 cache_info.dc_conf.cc_shift);
-        printk("        wt %d sh %d cst %d assoc %d\n",
+        printk("        wt %d sh %d cst %d hv %d\n",
                 cache_info.dc_conf.cc_wt,
                 cache_info.dc_conf.cc_sh,
                 cache_info.dc_conf.cc_cst,
-                cache_info.dc_conf.cc_assoc);
+                cache_info.dc_conf.cc_hv);
 
         printk("IC  base 0x%lx stride 0x%lx count 0x%lx loop 0x%lx\n",
                 cache_info.ic_base,
@@ -176,11 +178,11 @@ parisc_cache_init(void)
                 cache_info.ic_conf.cc_block,
                 cache_info.ic_conf.cc_line,
                 cache_info.ic_conf.cc_shift);
-        printk("        wt %d sh %d cst %d assoc %d\n",
+        printk("        wt %d sh %d cst %d hv %d\n",
                 cache_info.ic_conf.cc_wt,
                 cache_info.ic_conf.cc_sh,
                 cache_info.ic_conf.cc_cst,
-                cache_info.ic_conf.cc_assoc);
+                cache_info.ic_conf.cc_hv);
 
         printk("D-TLB conf: sh %d page %d cst %d aid %d pad1 %d \n",
                 cache_info.dt_conf.tc_sh,
@@ -234,7 +236,8 @@ parisc_cache_init(void)
 
 void disable_sr_hashing(void)
 {
-        int srhash_type;
+        int srhash_type, retval;
+        unsigned long space_bits;
 
         switch (boot_cpu_data.cpu_type) {
         case pcx: /* We shouldn't get this far.  setup.c should prevent it. */
@@ -260,6 +263,13 @@ void disable_sr_hashing(void)
         }
 
         disable_sr_hashing_asm(srhash_type);
+
+        retval = pdc_spaceid_bits(&space_bits);
+        /* If this procedure isn't implemented, don't panic. */
+        if (retval < 0 && retval != PDC_BAD_OPTION)
+                panic("pdc_spaceid_bits call failed.\n");
+        if (space_bits != 0)
+                panic("SpaceID hashing is still on!\n");
 }
 
 void flush_dcache_page(struct page *page)
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index d9e53cf0372b..630730c32a5a 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -1638,7 +1638,7 @@ dbit_trap_20w:
         load32          PA(pa_dbit_lock),t0
 
 dbit_spin_20w:
-        ldcw            0(t0),t1
+        LDCW            0(t0),t1
         cmpib,=         0,t1,dbit_spin_20w
         nop
 
@@ -1674,7 +1674,7 @@ dbit_trap_11:
         load32          PA(pa_dbit_lock),t0
 
 dbit_spin_11:
-        ldcw            0(t0),t1
+        LDCW            0(t0),t1
         cmpib,=         0,t1,dbit_spin_11
         nop
 
@@ -1714,7 +1714,7 @@ dbit_trap_20:
         load32          PA(pa_dbit_lock),t0
 
 dbit_spin_20:
-        ldcw            0(t0),t1
+        LDCW            0(t0),t1
         cmpib,=         0,t1,dbit_spin_20
         nop
 
diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c
index 2dc06b8e1817..4398d2a95789 100644
--- a/arch/parisc/kernel/firmware.c
+++ b/arch/parisc/kernel/firmware.c
@@ -11,7 +11,7 @@
  * Copyright 1999 The Puffin Group, (Alex deVries, David Kennedy)
  * Copyright 2003 Grant Grundler <grundler parisc-linux org>
  * Copyright 2003,2004 Ryan Bradetich <rbrad@parisc-linux.org>
- * Copyright 2004 Thibaut VARENE <varenet@parisc-linux.org>
+ * Copyright 2004,2006 Thibaut VARENE <varenet@parisc-linux.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
@@ -252,10 +252,8 @@ int pdc_pat_chassis_send_log(unsigned long state, unsigned long data)
 #endif
 
 /**
- * pdc_chassis_disp - Updates display
+ * pdc_chassis_disp - Updates chassis code
  * @retval: -1 on error, 0 on success
- *
- * Works on old PDC only (E class, others?)
  */
 int pdc_chassis_disp(unsigned long disp)
 {
@@ -269,6 +267,22 @@ int pdc_chassis_disp(unsigned long disp)
 }
 
 /**
+ * pdc_chassis_warn - Fetches chassis warnings
+ * @retval: -1 on error, 0 on success
+ */
+int pdc_chassis_warn(unsigned long *warn)
+{
+        int retval = 0;
+
+        spin_lock_irq(&pdc_lock);
+        retval = mem_pdc_call(PDC_CHASSIS, PDC_CHASSIS_WARN, __pa(pdc_result));
+        *warn = pdc_result[0];
+        spin_unlock_irq(&pdc_lock);
+
+        return retval;
+}
+
+/**
  * pdc_coproc_cfg - To identify coprocessors attached to the processor.
  * @pdc_coproc_info: Return buffer address.
  *
@@ -393,7 +407,9 @@ int pdc_model_info(struct pdc_model *model)
  * pdc_model_sysmodel - Get the system model name.
  * @name: A char array of at least 81 characters.
  *
- * Get system model name from PDC ROM (e.g. 9000/715 or 9000/778/B160L)
+ * Get system model name from PDC ROM (e.g. 9000/715 or 9000/778/B160L).
+ * Using OS_ID_HPUX will return the equivalent of the 'modelname' command
+ * on HP/UX.
  */
 int pdc_model_sysmodel(char *name)
 {
@@ -498,6 +514,26 @@ int pdc_cache_info(struct pdc_cache_info *cache_info)
         return retval;
 }
 
+/**
+ * pdc_spaceid_bits - Return whether Space ID hashing is turned on.
+ * @space_bits: Should be 0, if not, bad mojo!
+ *
+ * Returns information about Space ID hashing.
+ */
+int pdc_spaceid_bits(unsigned long *space_bits)
+{
+        int retval;
+
+        spin_lock_irq(&pdc_lock);
+        pdc_result[0] = 0;
+        retval = mem_pdc_call(PDC_CACHE, PDC_CACHE_RET_SPID, __pa(pdc_result), 0);
+        convert_to_wide(pdc_result);
+        *space_bits = pdc_result[0];
+        spin_unlock_irq(&pdc_lock);
+
+        return retval;
+}
+
 #ifndef CONFIG_PA20
 /**
  * pdc_btlb_info - Return block TLB information.
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index 197936d9359a..82fe6ba29727 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -94,7 +94,7 @@ int cpu_check_affinity(unsigned int irq, cpumask_t *dest)
         if (irq == TIMER_IRQ || irq == IPI_IRQ) {
                 /* Bad linux design decision.  The mask has already
                  * been set; we must reset it */
-                irq_affinity[irq] = CPU_MASK_ALL;
+                irq_desc[irq].affinity = CPU_MASK_ALL;
                 return -EINVAL;
         }
 
@@ -110,7 +110,7 @@ static void cpu_set_affinity_irq(unsigned int irq, cpumask_t dest)
         if (cpu_check_affinity(irq, &dest))
                 return;
 
-        irq_affinity[irq] = dest;
+        irq_desc[irq].affinity = dest;
 }
 #endif
 
@@ -125,6 +125,10 @@ static struct hw_interrupt_type cpu_interrupt_type = {
 #ifdef CONFIG_SMP
         .set_affinity   = cpu_set_affinity_irq,
 #endif
+        /* XXX: Needs to be written.  We managed without it so far, but
+         * we really ought to write it.
+         */
+        .retrigger      = NULL,
 };
 
 int show_interrupts(struct seq_file *p, void *v)
@@ -158,7 +162,7 @@ int show_interrupts(struct seq_file *p, void *v)
                 seq_printf(p, "%10u ", kstat_irqs(i));
 #endif
 
-                seq_printf(p, " %14s", irq_desc[i].handler->typename);
+                seq_printf(p, " %14s", irq_desc[i].chip->typename);
 #ifndef PARISC_IRQ_CR16_COUNTS
                 seq_printf(p, "  %s", action->name);
 
@@ -210,12 +214,12 @@ int cpu_claim_irq(unsigned int irq, struct hw_interrupt_type *type, void *data)
 {
         if (irq_desc[irq].action)
                 return -EBUSY;
-        if (irq_desc[irq].handler != &cpu_interrupt_type)
+        if (irq_desc[irq].chip != &cpu_interrupt_type)
                 return -EBUSY;
 
         if (type) {
-                irq_desc[irq].handler = type;
-                irq_desc[irq].handler_data = data;
+                irq_desc[irq].chip = type;
+                irq_desc[irq].chip_data = data;
                 cpu_interrupt_type.enable(irq);
         }
         return 0;
@@ -265,7 +269,7 @@ int txn_alloc_irq(unsigned int bits_wide)
 unsigned long txn_affinity_addr(unsigned int irq, int cpu)
 {
 #ifdef CONFIG_SMP
-        irq_affinity[irq] = cpumask_of_cpu(cpu);
+        irq_desc[irq].affinity = cpumask_of_cpu(cpu);
 #endif
 
         return cpu_data[cpu].txn_addr;
@@ -326,7 +330,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)
                 /* Work our way from MSb to LSb...same order we alloc EIRs */
                 for (irq = TIMER_IRQ; eirr_val && bit; bit>>=1, irq++) {
 #ifdef CONFIG_SMP
-                        cpumask_t dest = irq_affinity[irq];
+                        cpumask_t dest = irq_desc[irq].affinity;
 #endif
                         if (!(bit & eirr_val))
                                 continue;
@@ -378,7 +382,7 @@ static void claim_cpu_irqs(void)
 {
         int i;
         for (i = CPU_IRQ_BASE; i <= CPU_IRQ_MAX; i++) {
-                irq_desc[i].handler = &cpu_interrupt_type;
+                irq_desc[i].chip = &cpu_interrupt_type;
         }
 
         irq_desc[TIMER_IRQ].action = &timer_action;
@@ -404,13 +408,6 @@ void __init init_IRQ(void)
 
 }
 
-void hw_resend_irq(struct hw_interrupt_type *type, unsigned int irq)
-{
-        /* XXX: Needs to be written.  We managed without it so far, but
-         * we really ought to write it.
-         */
-}
-
 void ack_bad_irq(unsigned int irq)
 {
         printk("unexpected IRQ %d\n", irq);
diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
index f27cfe4771b8..aee311884f3f 100644
--- a/arch/parisc/kernel/module.c
+++ b/arch/parisc/kernel/module.c
@@ -89,6 +89,12 @@ static inline int is_local(struct module *me, void *loc)
         return is_init(me, loc) || is_core(me, loc);
 }
 
+static inline int is_local_section(struct module *me, void *loc, void *dot)
+{
+        return (is_init(me, loc) && is_init(me, dot)) ||
+                (is_core(me, loc) && is_core(me, dot));
+}
+
 
 #ifndef __LP64__
 struct got_entry {
@@ -364,8 +370,14 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
 }
 #endif /* __LP64__ */
 
+enum elf_stub_type {
+        ELF_STUB_GOT,
+        ELF_STUB_MILLI,
+        ELF_STUB_DIRECT,
+};
+
 static Elf_Addr get_stub(struct module *me, unsigned long value, long addend,
-        int millicode, int init_section)
+        enum elf_stub_type stub_type, int init_section)
 {
         unsigned long i;
         struct stub_entry *stub;
@@ -396,7 +408,7 @@ static Elf_Addr get_stub(struct module *me, unsigned long value, long addend,
         stub->insns[1] |= reassemble_17(rrsel(value, addend) / 4);
 
 #else
-/* for 64-bit we have two kinds of stubs:
+/* for 64-bit we have three kinds of stubs:
  * for normal function calls:
  *      ldd 0(%dp),%dp
  *      ldd 10(%dp), %r1
@@ -408,18 +420,23 @@ static Elf_Addr get_stub(struct module *me, unsigned long value, long addend,
  *      ldo 0(%r1), %r1
  *      ldd 10(%r1), %r1
  *      bve,n (%r1)
+ *
+ * for direct branches (jumps between different section of the
+ * same module):
+ *      ldil 0, %r1
+ *      ldo 0(%r1), %r1
+ *      bve,n (%r1)
  */
-        if (!millicode)
-        {
+        switch (stub_type) {
+        case ELF_STUB_GOT:
                 stub->insns[0] = 0x537b0000;    /* ldd 0(%dp),%dp       */
                 stub->insns[1] = 0x53610020;    /* ldd 10(%dp),%r1      */
                 stub->insns[2] = 0xe820d000;    /* bve (%r1)            */
                 stub->insns[3] = 0x537b0030;    /* ldd 18(%dp),%dp      */
 
                 stub->insns[0] |= reassemble_14(get_got(me, value, addend) & 0x3fff);
-        }
-        else
-        {
+                break;
+        case ELF_STUB_MILLI:
                 stub->insns[0] = 0x20200000;    /* ldil 0,%r1           */
                 stub->insns[1] = 0x34210000;    /* ldo 0(%r1), %r1      */
                 stub->insns[2] = 0x50210020;    /* ldd 10(%r1),%r1      */
@@ -427,7 +444,17 @@ static Elf_Addr get_stub(struct module *me, unsigned long value, long addend,
 
                 stub->insns[0] |= reassemble_21(lrsel(value, addend));
                 stub->insns[1] |= reassemble_14(rrsel(value, addend));
+                break;
+        case ELF_STUB_DIRECT:
+                stub->insns[0] = 0x20200000;    /* ldil 0,%r1           */
+                stub->insns[1] = 0x34210000;    /* ldo 0(%r1), %r1      */
+                stub->insns[2] = 0xe820d002;    /* bve,n (%r1)          */
+
+                stub->insns[0] |= reassemble_21(lrsel(value, addend));
+                stub->insns[1] |= reassemble_14(rrsel(value, addend));
+                break;
         }
+
 #endif
 
         return (Elf_Addr)stub;
@@ -539,14 +566,14 @@ int apply_relocate_add(Elf_Shdr *sechdrs,
                         break;
                 case R_PARISC_PCREL17F:
                         /* 17-bit PC relative address */
-                        val = get_stub(me, val, addend, 0, is_init(me, loc));
+                        val = get_stub(me, val, addend, ELF_STUB_GOT, is_init(me, loc));
                         val = (val - dot - 8)/4;
                         CHECK_RELOC(val, 17)
                         *loc = (*loc & ~0x1f1ffd) | reassemble_17(val);
                         break;
                 case R_PARISC_PCREL22F:
                         /* 22-bit PC relative address; only defined for pa20 */
-                        val = get_stub(me, val, addend, 0, is_init(me, loc));
+                        val = get_stub(me, val, addend, ELF_STUB_GOT, is_init(me, loc));
                         DEBUGP("STUB FOR %s loc %lx+%lx at %lx\n", 
                                strtab + sym->st_name, (unsigned long)loc, addend, 
                                val)
@@ -643,13 +670,23 @@ int apply_relocate_add(Elf_Shdr *sechdrs,
                                strtab + sym->st_name,
                                loc, val);
                         /* can we reach it locally? */
-                        if(!is_local(me, (void *)val)) {
-                                if (strncmp(strtab + sym->st_name, "$$", 2)
+                        if(!is_local_section(me, (void *)val, (void *)dot)) {
+
+                                if (is_local(me, (void *)val))
+                                        /* this is the case where the
+                                         * symbol is local to the
+                                         * module, but in a different
+                                         * section, so stub the jump
+                                         * in case it's more than 22
+                                         * bits away */
+                                        val = get_stub(me, val, addend, ELF_STUB_DIRECT,
+                                                       is_init(me, loc));
+                                else if (strncmp(strtab + sym->st_name, "$$", 2)
                                     == 0)
-                                        val = get_stub(me, val, addend, 1,
+                                        val = get_stub(me, val, addend, ELF_STUB_MILLI,
                                                        is_init(me, loc));
                                 else
-                                        val = get_stub(me, val, addend, 0,
+                                        val = get_stub(me, val, addend, ELF_STUB_GOT,
                                                        is_init(me, loc));
                         }
                         DEBUGP("STUB FOR %s loc %lx, val %lx+%lx at %lx\n", 
diff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c
index 79c7db2705fd..7d6967ee367c 100644
--- a/arch/parisc/kernel/pci.c
+++ b/arch/parisc/kernel/pci.c
@@ -289,7 +289,7 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);
  * than res->start.
  */
 void pcibios_align_resource(void *data, struct resource *res,
-                                unsigned long size, unsigned long alignment)
+                                resource_size_t size, resource_size_t alignment)
 {
         unsigned long mask, align;
 
diff --git a/arch/parisc/kernel/pdc_chassis.c b/arch/parisc/kernel/pdc_chassis.c
index a45e2e2ffd9f..d47ba1aa8253 100644
--- a/arch/parisc/kernel/pdc_chassis.c
+++ b/arch/parisc/kernel/pdc_chassis.c
@@ -1,8 +1,8 @@
 /* 
- *    interfaces to log Chassis Codes via PDC (firmware)
+ *    interfaces to Chassis Codes via PDC (firmware)
  *
  *    Copyright (C) 2002 Laurent Canet <canetl@esiee.fr>
- *    Copyright (C) 2002-2004 Thibaut VARENE <varenet@parisc-linux.org>
+ *    Copyright (C) 2002-2006 Thibaut VARENE <varenet@parisc-linux.org>
  *
  *    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
@@ -16,6 +16,10 @@
  *    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
+ *
+ *    TODO: poll chassis warns, trigger (configurable) machine shutdown when
+ *              needed.
+ *          Find out how to get Chassis warnings out of PAT boxes?
  */
 
 #undef PDC_CHASSIS_DEBUG
@@ -30,15 +34,16 @@
 #include <linux/reboot.h>
 #include <linux/notifier.h>
 #include <linux/cache.h>
+#include <linux/proc_fs.h>
 
 #include <asm/pdc_chassis.h>
 #include <asm/processor.h>
 #include <asm/pdc.h>
 #include <asm/pdcpat.h>
 
+#define PDC_CHASSIS_VER "0.05"
 
 #ifdef CONFIG_PDC_CHASSIS
-static int pdc_chassis_old __read_mostly = 0;   
 static unsigned int pdc_chassis_enabled __read_mostly = 1;
 
 
@@ -64,7 +69,7 @@ __setup("pdcchassis=", pdc_chassis_setup);
  * Currently, only E class and A180 are known to work with this.
  * Inspired by Christoph Plattner
  */
-
+#if 0
 static void __init pdc_chassis_checkold(void)
 {
         switch(CPU_HVERSION) {
@@ -73,7 +78,6 @@ static void __init pdc_chassis_checkold(void)
                 case 0x482:             /* E45 */
                 case 0x483:             /* E55 */
                 case 0x516:             /* A180 */
-                        pdc_chassis_old = 1;
                         break;
 
                 default:
@@ -81,7 +85,7 @@ static void __init pdc_chassis_checkold(void)
         }
         DPRINTK(KERN_DEBUG "%s: pdc_chassis_checkold(); pdc_chassis_old = %d\n", __FILE__, pdc_chassis_old);
 }
-
+#endif
 
 /**
  * pdc_chassis_panic_event() - Called by the panic handler.
@@ -131,30 +135,20 @@ static struct notifier_block pdc_chassis_reboot_block = {
 void __init parisc_pdc_chassis_init(void)
 {
 #ifdef CONFIG_PDC_CHASSIS
-        int handle = 0;
         if (likely(pdc_chassis_enabled)) {
                 DPRINTK(KERN_DEBUG "%s: parisc_pdc_chassis_init()\n", __FILE__);
 
                 /* Let see if we have something to handle... */
-                /* Check for PDC_PAT or old LED Panel */
-                pdc_chassis_checkold();
-                if (is_pdc_pat()) {
-                        printk(KERN_INFO "Enabling PDC_PAT chassis codes support.\n");
-                        handle = 1;
-                }
-                else if (unlikely(pdc_chassis_old)) {
-                        printk(KERN_INFO "Enabling old style chassis LED panel support.\n");
-                        handle = 1;
-                }
-
-                if (handle) {
-                        /* initialize panic notifier chain */
-                        atomic_notifier_chain_register(&panic_notifier_list,
-                                        &pdc_chassis_panic_block);
-
-                        /* initialize reboot notifier chain */
-                        register_reboot_notifier(&pdc_chassis_reboot_block);
-                }
+                printk(KERN_INFO "Enabling %s chassis codes support v%s\n",
+                                is_pdc_pat() ? "PDC_PAT" : "regular",
+                                PDC_CHASSIS_VER);
+
+                /* initialize panic notifier chain */
+                atomic_notifier_chain_register(&panic_notifier_list,
+                                &pdc_chassis_panic_block);
+
+                /* initialize reboot notifier chain */
+                register_reboot_notifier(&pdc_chassis_reboot_block);
         }
 #endif /* CONFIG_PDC_CHASSIS */
 }
@@ -215,9 +209,12 @@ int pdc_chassis_send_status(int message)
                         }
                 } else retval = -1;
 #else
-                if (unlikely(pdc_chassis_old)) {
+                if (1) {
                         switch (message) {
                                 case PDC_CHASSIS_DIRECT_BSTART:
+                                        retval = pdc_chassis_disp(PDC_CHASSIS_DISP_DATA(OSTAT_INIT));
+                                        break;
+
                                 case PDC_CHASSIS_DIRECT_BCOMPLETE:
                                         retval = pdc_chassis_disp(PDC_CHASSIS_DISP_DATA(OSTAT_RUN));
                                         break;
@@ -244,3 +241,61 @@ int pdc_chassis_send_status(int message)
 #endif /* CONFIG_PDC_CHASSIS */
         return retval;
 }
+
+#ifdef CONFIG_PDC_CHASSIS_WARN
+#ifdef CONFIG_PROC_FS
+static int pdc_chassis_warn_pread(char *page, char **start, off_t off,
+                int count, int *eof, void *data)
+{
+        char *out = page;
+        int len, ret;
+        unsigned long warn;
+        u32 warnreg;
+
+        ret = pdc_chassis_warn(&warn);
+        if (ret != PDC_OK)
+                return -EIO;
+
+        warnreg = (warn & 0xFFFFFFFF);
+
+        if ((warnreg >> 24) & 0xFF)
+                out += sprintf(out, "Chassis component failure! (eg fan or PSU): 0x%.2x\n", ((warnreg >> 24) & 0xFF));
+
+        out += sprintf(out, "Battery: %s\n", (warnreg & 0x04) ? "Low!" : "OK");
+        out += sprintf(out, "Temp low: %s\n", (warnreg & 0x02) ? "Exceeded!" : "OK");
+        out += sprintf(out, "Temp mid: %s\n", (warnreg & 0x01) ? "Exceeded!" : "OK");
+
+        len = out - page - off;
+        if (len < count) {
+                *eof = 1;
+                if (len <= 0) return 0;
+        } else {
+                len = count;
+        }
+        *start = page + off;
+        return len;
+}
+
+static int __init pdc_chassis_create_procfs(void)
+{
+        unsigned long test;
+        int ret;
+
+        ret = pdc_chassis_warn(&test);
+        if ((ret == PDC_BAD_PROC) || (ret == PDC_BAD_OPTION)) {
+                /* seems that some boxes (eg L1000) do not implement this */
+                printk(KERN_INFO "Chassis warnings not supported.\n");
+                return 0;
+        }
+
+        printk(KERN_INFO "Enabling PDC chassis warnings support v%s\n",
+                        PDC_CHASSIS_VER);
+        create_proc_read_entry("chassis", 0400, NULL, pdc_chassis_warn_pread,
+                                NULL);
+        return 0;
+}
+
+__initcall(pdc_chassis_create_procfs);
+
+#endif /* CONFIG_PROC_FS */
+#endif /* CONFIG_PDC_CHASSIS_WARN */
diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c
index 413292f1a4a3..3f28de974556 100644
--- a/arch/parisc/kernel/ptrace.c
+++ b/arch/parisc/kernel/ptrace.c
@@ -91,7 +91,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 int copied;
 
 #ifdef __LP64__
-                if (personality(child->personality) == PER_LINUX32) {
+                if (__is_compat_task(child)) {
                         unsigned int tmp;
 
                         addr &= 0xffffffffL;
@@ -123,7 +123,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
         case PTRACE_POKEDATA:
                 ret = 0;
 #ifdef __LP64__
-                if (personality(child->personality) == PER_LINUX32) {
+                if (__is_compat_task(child)) {
                         unsigned int tmp = (unsigned int)data;
                         DBG("sys_ptrace(POKE%s, %d, %lx, %lx)\n",
                                 request == PTRACE_POKETEXT ? "TEXT" : "DATA",
@@ -146,7 +146,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
         case PTRACE_PEEKUSR: {
                 ret = -EIO;
 #ifdef __LP64__
-                if (personality(child->personality) == PER_LINUX32) {
+                if (__is_compat_task(child)) {
                         unsigned int tmp;
 
                         if (addr & (sizeof(int)-1))
@@ -205,7 +205,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                         goto out_tsk;
                 }
 #ifdef __LP64__
-                if (personality(child->personality) == PER_LINUX32) {
+                if (__is_compat_task(child)) {
                         if (addr & (sizeof(int)-1))
                                 goto out_tsk;
                         if ((addr = translate_usr_offset(addr)) < 0)
diff --git a/arch/parisc/kernel/real2.S b/arch/parisc/kernel/real2.S
index 8c2859cca77e..453d01a9f971 100644
--- a/arch/parisc/kernel/real2.S
+++ b/arch/parisc/kernel/real2.S
@@ -276,15 +276,6 @@ r64_ret:
 
 #endif
 
-        .export pc_in_user_space
-        .text
-        /* Doesn't belong here but I couldn't find a nicer spot. */
-        /* Should never get called, only used by profile stuff in time.c */
-pc_in_user_space:
-        bv,n    0(%rp)
-        nop
-
-
         .export __canonicalize_funcptr_for_compare
         .text
         /* http://lists.parisc-linux.org/hypermail/parisc-linux/10916.html
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 4a36ec3f6ac1..278f4b9f6a38 100644
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -303,6 +303,8 @@ extern void eisa_init(void);
 
 static int __init parisc_init(void)
 {
+        u32 osid = (OS_ID_LINUX << 16);
+
         parisc_proc_mkdir();
         parisc_init_resources();
         do_device_inventory();                  /* probe for hardware */
@@ -311,6 +313,9 @@ static int __init parisc_init(void)
         
         /* set up a new led state on systems shipped LED State panel */
         pdc_chassis_send_status(PDC_CHASSIS_DIRECT_BSTART);
+
+        /* tell PDC we're Linux. Nevermind failure. */
+        pdc_stable_write(0x40, &osid, sizeof(osid));
         
         processor_init();
         printk(KERN_INFO "CPU(s): %d x %s at %d.%06d MHz\n",
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index cc38edfd90c5..bb83880c5ee3 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -76,7 +76,7 @@ sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize, struct pt_regs *r
 #ifdef __LP64__
         compat_sigset_t newset32;
 
-        if(personality(current->personality) == PER_LINUX32){
+        if (is_compat_task()) {
                 /* XXX: Don't preclude handling different sized sigset_t's.  */
                 if (sigsetsize != sizeof(compat_sigset_t))
                         return -EINVAL;
@@ -153,7 +153,7 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall)
         compat_sigset_t compat_set;
         struct compat_rt_sigframe __user * compat_frame;
         
-        if(personality(current->personality) == PER_LINUX32)
+        if (is_compat_task())
                 sigframe_size = PARISC_RT_SIGFRAME_SIZE32;
 #endif
 
@@ -166,7 +166,7 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall)
 #ifdef __LP64__
         compat_frame = (struct compat_rt_sigframe __user *)frame;
         
-        if(personality(current->personality) == PER_LINUX32){
+        if (is_compat_task()) {
                 DBG(2,"sys_rt_sigreturn: ELF32 process.\n");
                 if (__copy_from_user(&compat_set, &compat_frame->uc.uc_sigmask, sizeof(compat_set)))
                         goto give_sigsegv;
@@ -186,7 +186,7 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall)
 
         /* Good thing we saved the old gr[30], eh? */
 #ifdef __LP64__
-        if(personality(current->personality) == PER_LINUX32){
+        if (is_compat_task()) {
                 DBG(1,"sys_rt_sigreturn: compat_frame->uc.uc_mcontext 0x%p\n",
                                 &compat_frame->uc.uc_mcontext);
 // FIXME: Load upper half from register file
@@ -315,7 +315,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 
         compat_frame = (struct compat_rt_sigframe __user *)frame;
         
-        if(personality(current->personality) == PER_LINUX32) {
+        if (is_compat_task()) {
                 DBG(1,"setup_rt_frame: frame->info = 0x%p\n", &compat_frame->info);
                 err |= copy_siginfo_to_user32(&compat_frame->info, info);
                 DBG(1,"SETUP_RT_FRAME: 1\n");
@@ -392,7 +392,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         haddr = A(ka->sa.sa_handler);
         /* The sa_handler may be a pointer to a function descriptor */
 #ifdef __LP64__
-        if(personality(current->personality) == PER_LINUX32) {
+        if (is_compat_task()) {
 #endif
                 if (haddr & PA_PLABEL_FDESC) {
                         Elf32_Fdesc fdesc;
@@ -427,19 +427,19 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
          */
         sigframe_size = PARISC_RT_SIGFRAME_SIZE;
 #ifdef __LP64__
-        if(personality(current->personality) == PER_LINUX32)
+        if (is_compat_task())
                 sigframe_size = PARISC_RT_SIGFRAME_SIZE32;
 #endif
         if (in_syscall) {
                 regs->gr[31] = haddr;
 #ifdef __LP64__
-                if(personality(current->personality) == PER_LINUX)
+                if (personality(current->personality) == PER_LINUX)
                         sigframe_size |= 1;
 #endif
         } else {
                 unsigned long psw = USER_PSW;
 #ifdef __LP64__
-                if(personality(current->personality) == PER_LINUX)
+                if (personality(current->personality) == PER_LINUX)
                         psw |= PSW_W;
 #endif
 
@@ -464,7 +464,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         regs->gr[26] = sig;               /* signal number */
         
 #ifdef __LP64__
-        if(personality(current->personality) == PER_LINUX32){
+        if (is_compat_task()) {
                 regs->gr[25] = A(&compat_frame->info); /* siginfo pointer */
                 regs->gr[24] = A(&compat_frame->uc);   /* ucontext pointer */
         } else
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index 479d9a017cd1..9670a89c77fe 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -29,18 +29,6 @@
         .level          1.1
 #endif
 
-#ifndef CONFIG_64BIT
-        .macro fixup_branch,lbl
-        b           \lbl
-        .endm
-#else
-        .macro fixup_branch,lbl
-        ldil        L%\lbl, %r1
-        ldo         R%\lbl(%r1), %r1
-        bv,n        %r0(%r1)
-        .endm
-#endif
-
         .text
 
         .import syscall_exit,code
@@ -541,7 +529,7 @@ cas_nocontend:
 # endif
 /* ENABLE_LWS_DEBUG */
 
-        ldcw    0(%sr2,%r20), %r28                      /* Try to acquire the lock */
+        LDCW    0(%sr2,%r20), %r28                      /* Try to acquire the lock */
         cmpb,<>,n       %r0, %r28, cas_action           /* Did we get it? */
 cas_wouldblock:
         ldo     2(%r0), %r28                            /* 2nd case */
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 594930bc4bcf..eb35e1c0bb53 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -157,8 +157,22 @@ do_gettimeofday (struct timeval *tv)
                 usec += (xtime.tv_nsec / 1000);
         } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
 
-        while (usec >= 1000000) {
-                usec -= 1000000;
+        if (unlikely(usec > LONG_MAX)) {
+                /* This can happen if the gettimeoffset adjustment is
+                 * negative and xtime.tv_nsec is smaller than the
+                 * adjustment */
+                printk(KERN_ERR "do_gettimeofday() spurious xtime.tv_nsec of %ld\n", usec);
+                usec += USEC_PER_SEC;
+                --sec;
+                /* This should never happen, it means the negative
+                 * time adjustment was more than a second, so there's
+                 * something seriously wrong */
+                BUG_ON(usec > LONG_MAX);
+        }
+
+
+        while (usec >= USEC_PER_SEC) {
+                usec -= USEC_PER_SEC;
                 ++sec;
         }
 
diff --git a/arch/parisc/kernel/topology.c b/arch/parisc/kernel/topology.c
index 3ba040050e4c..068b20d822e7 100644
--- a/arch/parisc/kernel/topology.c
+++ b/arch/parisc/kernel/topology.c
@@ -26,11 +26,10 @@ static struct cpu cpu_devices[NR_CPUS] __read_mostly;
 
 static int __init topology_init(void)
 {
-        struct node *parent = NULL;
         int num;
 
         for_each_present_cpu(num) {
-                register_cpu(&cpu_devices[num], num, parent);
+                register_cpu(&cpu_devices[num], num);
         }
         return 0;
 }
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index ff200608c851..348344a84bf7 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -66,57 +66,42 @@ int printbinary(char *buf, unsigned long x, int nbits)
 #else
 #define RFMT "%08lx"
 #endif
+#define FFMT "%016llx"  /* fpregs are 64-bit always */
 
-void show_regs(struct pt_regs *regs)
+#define PRINTREGS(lvl,r,f,fmt,x)        \
+        printk("%s%s%02d-%02d  " fmt " " fmt " " fmt " " fmt "\n",      \
+                lvl, f, (x), (x+3), (r)[(x)+0], (r)[(x)+1],             \
+                (r)[(x)+2], (r)[(x)+3])
+
+static void print_gr(char *level, struct pt_regs *regs)
 {
         int i;
-        char buf[128], *p;
-        char *level;
-        unsigned long cr30;
-        unsigned long cr31;
-        /* carlos says that gcc understands better memory in a struct,
-         * and it makes our life easier with fpregs -- T-Bone */
-        struct { u32 sw[2]; } s;
-        
-        level = user_mode(regs) ? KERN_DEBUG : KERN_CRIT;
-
-        printk("%s\n", level); /* don't want to have that pretty register dump messed up */
+        char buf[64];
 
+        printk("%s\n", level);
         printk("%s     YZrvWESTHLNXBCVMcbcbcbcbOGFRQPDI\n", level);
         printbinary(buf, regs->gr[0], 32);
         printk("%sPSW: %s %s\n", level, buf, print_tainted());
 
-        for (i = 0; i < 32; i += 4) {
-                int j;
-                p = buf;
-                p += sprintf(p, "%sr%02d-%02d ", level, i, i + 3);
-                for (j = 0; j < 4; j++) {
-                        p += sprintf(p, " " RFMT, (i+j) == 0 ? 0 : regs->gr[i + j]);
-                }
-                printk("%s\n", buf);
-        }
+        for (i = 0; i < 32; i += 4)
+                PRINTREGS(level, regs->gr, "r", RFMT, i);
+}
 
-        for (i = 0; i < 8; i += 4) {
-                int j;
-                p = buf;
-                p += sprintf(p, "%ssr%d-%d  ", level, i, i + 3);
-                for (j = 0; j < 4; j++) {
-                        p += sprintf(p, " " RFMT, regs->sr[i + j]);
-                }
-                printk("%s\n", buf);
-        }
+static void print_fr(char *level, struct pt_regs *regs)
+{
+        int i;
+        char buf[64];
+        struct { u32 sw[2]; } s;
 
         /* FR are 64bit everywhere. Need to use asm to get the content
          * of fpsr/fper1, and we assume that we won't have a FP Identify
          * in our way, otherwise we're screwed.
          * The fldd is used to restore the T-bit if there was one, as the
          * store clears it anyway.
-         * BTW, PA2.0 book says "thou shall not use fstw on FPSR/FPERs". */ 
-        __asm__ (
-                "fstd %%fr0,0(%1)       \n\t"
-                "fldd 0(%1),%%fr0       \n\t"
-                : "=m" (s) : "r" (&s) : "%r0"
-                );
+         * PA2.0 book says "thou shall not use fstw on FPSR/FPERs" - T-Bone */
+        asm volatile ("fstd %%fr0,0(%1) \n\t"
+                      "fldd 0(%1),%%fr0 \n\t"
+                      : "=m" (s) : "r" (&s) : "r0");
 
         printk("%s\n", level);
         printk("%s      VZOUICununcqcqcqcqcqcrmunTDVZOUI\n", level);
@@ -125,14 +110,25 @@ void show_regs(struct pt_regs *regs)
         printk("%sFPER1: %08x\n", level, s.sw[1]);
 
         /* here we'll print fr0 again, tho it'll be meaningless */
-        for (i = 0; i < 32; i += 4) {
-                int j;
-                p = buf;
-                p += sprintf(p, "%sfr%02d-%02d ", level, i, i + 3);
-                for (j = 0; j < 4; j++)
-                        p += sprintf(p, " %016llx", (i+j) == 0 ? 0 : regs->fr[i+j]);
-                printk("%s\n", buf);
-        }
+        for (i = 0; i < 32; i += 4)
+                PRINTREGS(level, regs->fr, "fr", FFMT, i);
+}
+
+void show_regs(struct pt_regs *regs)
+{
+        int i;
+        char *level;
+        unsigned long cr30, cr31;
+
+        level = user_mode(regs) ? KERN_DEBUG : KERN_CRIT;
+
+        print_gr(level, regs);
+
+        for (i = 0; i < 8; i += 4)
+                PRINTREGS(level, regs->sr, "sr", RFMT, i);
+
+        if (user_mode(regs))
+                print_fr(level, regs);
 
         cr30 = mfctl(30);
         cr31 = mfctl(31);
diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c
index de0a1b21cb40..92328fbddb3e 100644
--- a/arch/parisc/kernel/unaligned.c
+++ b/arch/parisc/kernel/unaligned.c
@@ -43,6 +43,8 @@
         "\tldil L%%" #lbl ", %%r1\n"                    \
         "\tldo R%%" #lbl "(%%r1), %%r1\n"               \
         "\tbv,n %%r0(%%r1)\n"
+/* If you use FIXUP_BRANCH, then you must list this clobber */
+#define FIXUP_BRANCH_CLOBBER "r1"
 
 /* 1111 1100 0000 0000 0001 0011 1100 0000 */
 #define OPCODE1(a,b,c)  ((a)<<26|(b)<<12|(c)<<6) 
@@ -157,7 +159,7 @@ static int emulate_ldh(struct pt_regs *regs, int toreg)
 "       .previous\n"
         : "=r" (val), "=r" (ret)
         : "0" (val), "r" (saddr), "r" (regs->isr)
-        : "r20" );
+        : "r20", FIXUP_BRANCH_CLOBBER );
 
         DPRINTF("val = 0x" RFMT "\n", val);
 
@@ -202,7 +204,7 @@ static int emulate_ldw(struct pt_regs *regs, int toreg, int flop)
 "       .previous\n"
         : "=r" (val), "=r" (ret)
         : "0" (val), "r" (saddr), "r" (regs->isr)
-        : "r19", "r20" );
+        : "r19", "r20", FIXUP_BRANCH_CLOBBER );
 
         DPRINTF("val = 0x" RFMT "\n", val);
 
@@ -253,7 +255,7 @@ static int emulate_ldd(struct pt_regs *regs, int toreg, int flop)
 "       .previous\n"
         : "=r" (val), "=r" (ret)
         : "0" (val), "r" (saddr), "r" (regs->isr)
-        : "r19", "r20" );
+        : "r19", "r20", FIXUP_BRANCH_CLOBBER );
 #else
     {
         unsigned long valh=0,vall=0;
@@ -287,7 +289,7 @@ static int emulate_ldd(struct pt_regs *regs, int toreg, int flop)
 "       .previous\n"
         : "=r" (valh), "=r" (vall), "=r" (ret)
         : "0" (valh), "1" (vall), "r" (saddr), "r" (regs->isr)
-        : "r19", "r20" );
+        : "r19", "r20", FIXUP_BRANCH_CLOBBER );
         val=((__u64)valh<<32)|(__u64)vall;
     }
 #endif
@@ -335,7 +337,7 @@ static int emulate_sth(struct pt_regs *regs, int frreg)
 "       .previous\n"
         : "=r" (ret)
         : "r" (val), "r" (regs->ior), "r" (regs->isr)
-        : "r19" );
+        : "r19", FIXUP_BRANCH_CLOBBER );
 
         return ret;
 }
@@ -389,7 +391,7 @@ static int emulate_stw(struct pt_regs *regs, int frreg, int flop)
 "       .previous\n"
         : "=r" (ret)
         : "r" (val), "r" (regs->ior), "r" (regs->isr)
-        : "r19", "r20", "r21", "r22", "r1" );
+        : "r19", "r20", "r21", "r22", "r1", FIXUP_BRANCH_CLOBBER );
 
         return 0;
 }
@@ -450,7 +452,7 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop)
 "       .previous\n"
         : "=r" (ret)
         : "r" (val), "r" (regs->ior), "r" (regs->isr)
-        : "r19", "r20", "r21", "r22", "r1" );
+        : "r19", "r20", "r21", "r22", "r1", FIXUP_BRANCH_CLOBBER );
 #else
     {
         unsigned long valh=(val>>32),vall=(val&0xffffffffl);
@@ -495,7 +497,7 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop)
 "       .previous\n"
         : "=r" (ret)
         : "r" (valh), "r" (vall), "r" (regs->ior), "r" (regs->isr)
-        : "r19", "r20", "r21", "r1" );
+        : "r19", "r20", "r21", "r1", FIXUP_BRANCH_CLOBBER );
     }
 #endif
 
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index e898da2381aa..b9a40a35a9ed 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -30,6 +30,10 @@ config GENERIC_HARDIRQS
         bool
         default y
 
+config IRQ_PER_CPU
+        bool
+        default y
+
 config RWSEM_GENERIC_SPINLOCK
         bool
 
@@ -631,6 +635,9 @@ config HOTPLUG_CPU
 
           Say N if you are unsure.
 
+config ARCH_ENABLE_MEMORY_HOTPLUG
+        def_bool y
+
 config KEXEC
         bool "kexec system call (EXPERIMENTAL)"
         depends on PPC_MULTIPLATFORM && EXPERIMENTAL
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index b537cfa4e09b..358cecdc6aef 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -281,13 +281,13 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
         local_irq_disable();
 
         for_each_irq(irq) {
-                struct irq_desc *desc = irq_descp(irq);
+                struct irq_desc *desc = irq_desc + irq;
 
                 if (desc->status & IRQ_INPROGRESS)
-                        desc->handler->end(irq);
+                        desc->chip->end(irq);
 
                 if (!(desc->status & IRQ_DISABLED))
-                        desc->handler->disable(irq);
+                        desc->chip->disable(irq);
         }
 
         /*
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 40d4c14fde8f..24f6050aa4ab 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -120,8 +120,8 @@ int show_interrupts(struct seq_file *p, void *v)
 #else
                 seq_printf(p, "%10u ", kstat_irqs(i));
 #endif /* CONFIG_SMP */
-                if (desc->handler)
-                        seq_printf(p, " %s ", desc->handler->typename);
+                if (desc->chip)
+                        seq_printf(p, " %s ", desc->chip->typename);
                 else
                         seq_puts(p, "  None      ");
                 seq_printf(p, "%s", (desc->status & IRQ_LEVEL) ? "Level " : "Edge  ");
@@ -164,13 +164,13 @@ void fixup_irqs(cpumask_t map)
                 if (irq_desc[irq].status & IRQ_PER_CPU)
                         continue;
 
-                cpus_and(mask, irq_affinity[irq], map);
+                cpus_and(mask, irq_desc[irq].affinity, map);
                 if (any_online_cpu(mask) == NR_CPUS) {
                         printk("Breaking affinity for irq %i\n", irq);
                         mask = map;
                 }
-                if (irq_desc[irq].handler->set_affinity)
-                        irq_desc[irq].handler->set_affinity(irq, mask);
+                if (irq_desc[irq].chip->set_affinity)
+                        irq_desc[irq].chip->set_affinity(irq, mask);
                 else if (irq_desc[irq].action && !(warned++))
                         printk("Cannot set affinity for irq %i\n", irq);
         }
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index b5431ccf1147..8474355a1a4f 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -99,7 +99,7 @@ pcibios_fixup_resources(struct pci_dev *dev)
                 if (!res->flags)
                         continue;
                 if (res->end == 0xffffffff) {
-                        DBG("PCI:%s Resource %d [%08lx-%08lx] is unassigned\n",
+                        DBG("PCI:%s Resource %d [%016llx-%016llx] is unassigned\n",
                             pci_name(dev), i, res->start, res->end);
                         res->end -= res->start;
                         res->start = 0;
@@ -117,7 +117,7 @@ pcibios_fixup_resources(struct pci_dev *dev)
                         res->start += offset;
                         res->end += offset;
 #ifdef DEBUG
-                        printk("Fixup res %d (%lx) of dev %s: %lx -> %lx\n",
+                        printk("Fixup res %d (%lx) of dev %s: %llx -> %llx\n",
                                i, res->flags, pci_name(dev),
                                res->start - offset, res->start);
 #endif
@@ -173,18 +173,18 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);
  * but we want to try to avoid allocating at 0x2900-0x2bff
  * which might have be mirrored at 0x0100-0x03ff..
  */
-void pcibios_align_resource(void *data, struct resource *res, unsigned long size,
-                       unsigned long align)
+void pcibios_align_resource(void *data, struct resource *res,
+                                resource_size_t size, resource_size_t align)
 {
         struct pci_dev *dev = data;
 
         if (res->flags & IORESOURCE_IO) {
-                unsigned long start = res->start;
+                resource_size_t start = res->start;
 
                 if (size > 0x100) {
                         printk(KERN_ERR "PCI: I/O Region %s/%d too large"
-                               " (%ld bytes)\n", pci_name(dev),
-                               dev->resource - res, size);
+                               " (%lld bytes)\n", pci_name(dev),
+                               dev->resource - res, (unsigned long long)size);
                 }
 
                 if (start & 0x300) {
@@ -255,8 +255,8 @@ pcibios_allocate_bus_resources(struct list_head *bus_list)
                                 }
                         }
 
-                        DBG("PCI: bridge rsrc %lx..%lx (%lx), parent %p\n",
-                            res->start, res->end, res->flags, pr);
+                        DBG("PCI: bridge rsrc %llx..%llx (%lx), parent %p\n",
+                                res->start, res->end, res->flags, pr);
                         if (pr) {
                                 if (request_resource(pr, res) == 0)
                                         continue;
@@ -306,7 +306,7 @@ reparent_resources(struct resource *parent, struct resource *res)
         *pp = NULL;
         for (p = res->child; p != NULL; p = p->sibling) {
                 p->parent = res;
-                DBG(KERN_INFO "PCI: reparented %s [%lx..%lx] under %s\n",
+                DBG(KERN_INFO "PCI: reparented %s [%llx..%llx] under %s\n",
                     p->name, p->start, p->end, res->name);
         }
         return 0;
@@ -362,13 +362,14 @@ pci_relocate_bridge_resource(struct pci_bus *bus, int i)
                 try = conflict->start - 1;
         }
         if (request_resource(pr, res)) {
-                DBG(KERN_ERR "PCI: huh? couldn't move to %lx..%lx\n",
+                DBG(KERN_ERR "PCI: huh? couldn't move to %llx..%llx\n",
                     res->start, res->end);
                 return -1;              /* "can't happen" */
         }
         update_bridge_base(bus, i);
-        printk(KERN_INFO "PCI: bridge %d resource %d moved to %lx..%lx\n",
-               bus->number, i, res->start, res->end);
+        printk(KERN_INFO "PCI: bridge %d resource %d moved to %llx..%llx\n",
+               bus->number, i, (unsigned long long)res->start,
+               (unsigned long long)res->end);
         return 0;
 }
 
@@ -479,14 +480,14 @@ static inline void alloc_resource(struct pci_dev *dev, int idx)
 {
         struct resource *pr, *r = &dev->resource[idx];
 
-        DBG("PCI:%s: Resource %d: %08lx-%08lx (f=%lx)\n",
+        DBG("PCI:%s: Resource %d: %016llx-%016llx (f=%lx)\n",
             pci_name(dev), idx, r->start, 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: %08lx-%08lx (f=%lx)\n",
+                        DBG("PCI:  parent is %p: %016llx-%016llx (f=%lx)\n",
                             pr, pr->start, pr->end, pr->flags);
                 /* We'll assign a new address later */
                 r->flags |= IORESOURCE_UNSET;
@@ -956,7 +957,7 @@ pci_process_bridge_OF_ranges(struct pci_controller *hose,
                         res = &hose->io_resource;
                         res->flags = IORESOURCE_IO;
                         res->start = ranges[2];
-                        DBG("PCI: IO 0x%lx -> 0x%lx\n",
+                        DBG("PCI: IO 0x%llx -> 0x%llx\n",
                                     res->start, res->start + size - 1);
                         break;
                 case 2:         /* memory space */
@@ -978,7 +979,7 @@ pci_process_bridge_OF_ranges(struct pci_controller *hose,
                                 if(ranges[0] & 0x40000000)
                                         res->flags |= IORESOURCE_PREFETCH;
                                 res->start = ranges[na+2];
-                                DBG("PCI: MEM[%d] 0x%lx -> 0x%lx\n", memno,
+                                DBG("PCI: MEM[%d] 0x%llx -> 0x%llx\n", memno,
                                             res->start, res->start + size - 1);
                         }
                         break;
@@ -1074,7 +1075,7 @@ do_update_p2p_io_resource(struct pci_bus *bus, int enable_vga)
         DBG("Remapping Bus %d, bridge: %s\n", bus->number, pci_name(bridge));
         res.start -= ((unsigned long) hose->io_base_virt - isa_io_base);
         res.end -= ((unsigned long) hose->io_base_virt - isa_io_base);
-        DBG("  IO window: %08lx-%08lx\n", res.start, res.end);
+        DBG("  IO window: %016llx-%016llx\n", res.start, res.end);
 
         /* Set up the top and bottom of the PCI I/O segment for this bus. */
         pci_read_config_dword(bridge, PCI_IO_BASE, &l);
@@ -1223,8 +1224,8 @@ do_fixup_p2p_level(struct pci_bus *bus)
                                         continue;
                                 if ((r->flags & IORESOURCE_IO) == 0)
                                         continue;
-                                DBG("Trying to allocate from %08lx, size %08lx from parent"
-                                    " res %d: %08lx -> %08lx\n",
+                                DBG("Trying to allocate from %016llx, size %016llx from parent"
+                                    " res %d: %016llx -> %016llx\n",
                                         res->start, res->end, i, r->start, r->end);
                         
                                 if (allocate_resource(r, res, res->end + 1, res->start, max,
@@ -1574,8 +1575,8 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
         else
                 prot |= _PAGE_GUARDED;
 
-        printk("PCI map for %s:%lx, prot: %lx\n", pci_name(dev), rp->start,
-               prot);
+        printk("PCI map for %s:%llx, prot: %lx\n", pci_name(dev),
+                (unsigned long long)rp->start, prot);
 
         return __pgprot(prot);
 }
@@ -1755,7 +1756,7 @@ long sys_pciconfig_iobase(long which, unsigned long bus, unsigned long devfn)
 
 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_hose(dev->bus->number);
         unsigned long offset = 0;
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 247937dd8b73..286aa52aae33 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -138,11 +138,11 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);
  * which might have be mirrored at 0x0100-0x03ff..
  */
 void pcibios_align_resource(void *data, struct resource *res,
-                            unsigned long size, unsigned long align)
+                            resource_size_t size, resource_size_t align)
 {
         struct pci_dev *dev = data;
         struct pci_controller *hose = pci_bus_to_host(dev->bus);
-        unsigned long start = res->start;
+        resource_size_t start = res->start;
         unsigned long alignto;
 
         if (res->flags & IORESOURCE_IO) {
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index e5a44812441a..0932a62a1c96 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -215,7 +215,7 @@ int __init ppc_init(void)
 
         /* register CPU devices */
         for_each_possible_cpu(i)
-                register_cpu(&cpu_devices[i], i, NULL);
+                register_cpu(&cpu_devices[i], i);
 
         /* call platform init */
         if (ppc_md.init != NULL) {
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 5bc2585c8036..4662b580efa1 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -279,7 +279,7 @@ static void unregister_cpu_online(unsigned int cpu)
 }
 #endif /* CONFIG_HOTPLUG_CPU */
 
-static int sysfs_cpu_notify(struct notifier_block *self,
+static int __devinit sysfs_cpu_notify(struct notifier_block *self,
                                       unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned int)(long)hcpu;
@@ -297,30 +297,19 @@ static int sysfs_cpu_notify(struct notifier_block *self,
         return NOTIFY_OK;
 }
 
-static struct notifier_block sysfs_cpu_nb = {
+static struct notifier_block __devinitdata sysfs_cpu_nb = {
         .notifier_call  = sysfs_cpu_notify,
 };
 
 /* NUMA stuff */
 
 #ifdef CONFIG_NUMA
-static struct node node_devices[MAX_NUMNODES];
-
 static void register_nodes(void)
 {
         int i;
 
-        for (i = 0; i < MAX_NUMNODES; i++) {
-                if (node_online(i)) {
-                        int p_node = parent_node(i);
-                        struct node *parent = NULL;
-
-                        if (p_node != i)
-                                parent = &node_devices[p_node];
-
-                        register_node(&node_devices[i], i, parent);
-                }
-        }
+        for (i = 0; i < MAX_NUMNODES; i++)
+                register_one_node(i);
 }
 
 int sysfs_add_device_to_node(struct sys_device *dev, int nid)
@@ -359,23 +348,13 @@ static SYSDEV_ATTR(physical_id, 0444, show_physical_id, NULL);
 static int __init topology_init(void)
 {
         int cpu;
-        struct node *parent = NULL;
 
         register_nodes();
-
         register_cpu_notifier(&sysfs_cpu_nb);
 
         for_each_possible_cpu(cpu) {
                 struct cpu *c = &per_cpu(cpu_devices, cpu);
 
-#ifdef CONFIG_NUMA
-                /* The node to which a cpu belongs can't be known
-                 * until the cpu is made present.
-                 */
-                parent = NULL;
-                if (cpu_present(cpu))
-                        parent = &node_devices[cpu_to_node(cpu)];
-#endif
                 /*
                  * For now, we just see if the system supports making
                  * the RTAS calls for CPU hotplug.  But, there may be a
@@ -387,7 +366,7 @@ static int __init topology_init(void)
                         c->no_control = 1;
 
                 if (cpu_online(cpu) || (c->no_control == 0)) {
-                        register_cpu(c, cpu, parent);
+                        register_cpu(c, cpu);
 
                         sysdev_create_file(&c->sysdev, &attr_physical_id);
                 }
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 9e30f968c184..d454caada265 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -41,6 +41,7 @@
 #include <linux/idr.h>
 #include <linux/nodemask.h>
 #include <linux/module.h>
+#include <linux/poison.h>
 
 #include <asm/pgalloc.h>
 #include <asm/page.h>
@@ -90,7 +91,7 @@ void free_initmem(void)
 
         addr = (unsigned long)__init_begin;
         for (; addr < (unsigned long)__init_end; addr += PAGE_SIZE) {
-                memset((void *)addr, 0xcc, PAGE_SIZE);
+                memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
                 ClearPageReserved(virt_to_page(addr));
                 init_page_count(virt_to_page(addr));
                 free_page(addr);
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 69f3b9a20beb..089d939a0b3e 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -114,15 +114,20 @@ void online_page(struct page *page)
         num_physpages++;
 }
 
-int __devinit add_memory(u64 start, u64 size)
+#ifdef CONFIG_NUMA
+int memory_add_physaddr_to_nid(u64 start)
+{
+        return hot_add_scn_to_nid(start);
+}
+#endif
+
+int __devinit arch_add_memory(int nid, u64 start, u64 size)
 {
         struct pglist_data *pgdata;
         struct zone *zone;
-        int nid;
         unsigned long start_pfn = start >> PAGE_SHIFT;
         unsigned long nr_pages = size >> PAGE_SHIFT;
 
-        nid = hot_add_scn_to_nid(start);
         pgdata = NODE_DATA(nid);
 
         start = (unsigned long)__va(start);
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index aa98cb3b59d8..fbe23933f731 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -334,7 +334,7 @@ out:
         return nid;
 }
 
-static int cpu_numa_callback(struct notifier_block *nfb,
+static int __cpuinit cpu_numa_callback(struct notifier_block *nfb,
                              unsigned long action,
                              void *hcpu)
 {
@@ -609,14 +609,15 @@ static void __init *careful_allocation(int nid, unsigned long size,
         return (void *)ret;
 }
 
+static struct notifier_block __cpuinitdata ppc64_numa_nb = {
+        .notifier_call = cpu_numa_callback,
+        .priority = 1 /* Must run before sched domains notifier. */
+};
+
 void __init do_init_bootmem(void)
 {
         int nid;
         unsigned int i;
-        static struct notifier_block ppc64_numa_nb = {
-                .notifier_call = cpu_numa_callback,
-                .priority = 1 /* Must run before sched domains notifier. */
-        };
 
         min_low_pfn = 0;
         max_low_pfn = lmb_end_of_DRAM() >> PAGE_SHIFT;
diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c
index 16f7d3b30e1d..3baceb00fefa 100644
--- a/arch/powerpc/platforms/83xx/pci.c
+++ b/arch/powerpc/platforms/83xx/pci.c
@@ -91,9 +91,10 @@ int __init add_bridge(struct device_node *dev)
                 mpc83xx_pci2_busno = hose->first_busno;
         }
 
-        printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%08lx. "
+        printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%016llx. "
                "Firmware bus number: %d->%d\n",
-               rsrc.start, hose->first_busno, hose->last_busno);
+               (unsigned long long)rsrc.start, hose->first_busno,
+               hose->last_busno);
 
         DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",
             hose, hose->cfg_addr, hose->cfg_data);
diff --git a/arch/powerpc/platforms/85xx/pci.c b/arch/powerpc/platforms/85xx/pci.c
index bad290110ed1..48c8849c07ca 100644
--- a/arch/powerpc/platforms/85xx/pci.c
+++ b/arch/powerpc/platforms/85xx/pci.c
@@ -79,9 +79,10 @@ int __init add_bridge(struct device_node *dev)
                 mpc85xx_pci2_busno = hose->first_busno;
         }
 
-        printk(KERN_INFO "Found MPC85xx PCI host bridge at 0x%08lx. "
+        printk(KERN_INFO "Found MPC85xx PCI host bridge at 0x%016llx. "
                "Firmware bus number: %d->%d\n",
-                rsrc.start, hose->first_busno, hose->last_busno);
+                (unsigned long long)rsrc.start, hose->first_busno,
+                hose->last_busno);
 
         DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",
                 hose, hose->cfg_addr, hose->cfg_data);
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 1bbf822b4efc..7bff3cbc5723 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -307,7 +307,7 @@ static void iic_request_ipi(int ipi, const char *name)
         irq = iic_ipi_to_irq(ipi);
         /* IPIs are marked SA_INTERRUPT as they must run with irqs
          * disabled */
-        get_irq_desc(irq)->handler = &iic_pic;
+        get_irq_desc(irq)->chip = &iic_pic;
         get_irq_desc(irq)->status |= IRQ_PER_CPU;
         request_irq(irq, iic_ipi_action, SA_INTERRUPT, name, NULL);
 }
@@ -330,7 +330,7 @@ static void iic_setup_spe_handlers(void)
         for (be=0; be < num_present_cpus() / 2; be++) {
                 for (isrc = 0; isrc < IIC_CLASS_STRIDE * 3; isrc++) {
                         int irq = IIC_NODE_STRIDE * be + IIC_SPE_OFFSET + isrc;
-                        get_irq_desc(irq)->handler = &iic_pic;
+                        get_irq_desc(irq)->chip = &iic_pic;
                 }
         }
 }
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index 55cbdd77a62d..7c3a0b6d34fd 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -162,7 +162,7 @@ void spider_init_IRQ_hardcoded(void)
                 spider_pics[node] = ioremap(spiderpic, 0x800);
                 for (n = 0; n < IIC_NUM_EXT; n++) {
                         int irq = n + IIC_EXT_OFFSET + node * IIC_NODE_STRIDE;
-                        get_irq_desc(irq)->handler = &spider_pic;
+                        get_irq_desc(irq)->chip = &spider_pic;
                 }
 
                 /* do not mask any interrupts because of level */
@@ -217,7 +217,7 @@ void spider_init_IRQ(void)
 
                 for (n = 0; n < IIC_NUM_EXT; n++) {
                         int irq = n + IIC_EXT_OFFSET + node * IIC_NODE_STRIDE;
-                        get_irq_desc(irq)->handler = &spider_pic;
+                        get_irq_desc(irq)->chip = &spider_pic;
                 }
 
                 /* do not mask any interrupts because of level */
diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c
index 015a51787009..c7fea2cca534 100644
--- a/arch/powerpc/platforms/cell/spufs/switch.c
+++ b/arch/powerpc/platforms/cell/spufs/switch.c
@@ -2205,7 +2205,7 @@ void spu_init_csa(struct spu_state *csa)
 
         memset(lscsa, 0, sizeof(struct spu_lscsa));
         csa->lscsa = lscsa;
-        csa->register_lock = SPIN_LOCK_UNLOCKED;
+        spin_lock_init(&csa->register_lock);
 
         /* Set LS pages reserved to allow for user-space mapping. */
         for (p = lscsa->ls; p < lscsa->ls + LS_SIZE; p += PAGE_SIZE)
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index ac224876ce59..53515daf01b1 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -143,7 +143,7 @@ hydra_init(void)
         if (np == NULL || of_address_to_resource(np, 0, &r))
                 return 0;
         Hydra = ioremap(r.start, r.end-r.start);
-        printk("Hydra Mac I/O at %lx\n", r.start);
+        printk("Hydra Mac I/O at %llx\n", (unsigned long long)r.start);
         printk("Hydra Feature_Control was %x",
                in_le32(&Hydra->Feature_Control));
         out_le32(&Hydra->Feature_Control, (HYDRA_FC_SCC_CELL_EN |
@@ -267,7 +267,7 @@ chrp_find_bridges(void)
                                bus_range[0], bus_range[1]);
                 printk(" controlled by %s", dev->type);
                 if (!is_longtrail)
-                        printk(" at %lx", r.start);
+                        printk(" at %llx", (unsigned long long)r.start);
                 printk("\n");
 
                 hose = pcibios_alloc_controller();
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index 62bbbcf5ded3..33bb4aa0e1e8 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -242,9 +242,9 @@ void __init iSeries_activate_IRQs()
         for_each_irq (irq) {
                 irq_desc_t *desc = get_irq_desc(irq);
 
-                if (desc && desc->handler && desc->handler->startup) {
+                if (desc && desc->chip && desc->chip->startup) {
                         spin_lock_irqsave(&desc->lock, flags);
-                        desc->handler->startup(irq);
+                        desc->chip->startup(irq);
                         spin_unlock_irqrestore(&desc->lock, flags);
                 }
         }
@@ -324,7 +324,7 @@ int __init iSeries_allocate_IRQ(HvBusNumber bus,
                 + function;
         virtirq = virt_irq_create_mapping(realirq);
 
-        irq_desc[virtirq].handler = &iSeries_IRQ_handler;
+        irq_desc[virtirq].chip = &iSeries_IRQ_handler;
         return virtirq;
 }
 
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 9a4efc0c3b29..f7170ff86dab 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -376,9 +376,10 @@ static void __init maple_fixup_phb_resources(void)
                 unsigned long offset = (unsigned long)hose->io_base_virt - pci_io_base;
                 hose->io_resource.start += offset;
                 hose->io_resource.end += offset;
-                printk(KERN_INFO "PCI Host %d, io start: %lx; io end: %lx\n",
+                printk(KERN_INFO "PCI Host %d, io start: %llx; io end: %llx\n",
                        hose->global_number,
-                       hose->io_resource.start, hose->io_resource.end);
+                       (unsigned long long)hose->io_resource.start,
+                       (unsigned long long)hose->io_resource.end);
         }
 }
 
diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
index 498b042e1837..c7a27eddca6d 100644
--- a/arch/powerpc/platforms/powermac/backlight.c
+++ b/arch/powerpc/platforms/powermac/backlight.c
@@ -119,7 +119,14 @@ int pmac_backlight_set_legacy_brightness(int brightness)
                 down(&pmac_backlight->sem);
                 props = pmac_backlight->props;
                 props->brightness = brightness *
-                        props->max_brightness / OLD_BACKLIGHT_MAX;
+                        (props->max_brightness + 1) /
+                        (OLD_BACKLIGHT_MAX + 1);
+
+                if (props->brightness > props->max_brightness)
+                        props->brightness = props->max_brightness;
+                else if (props->brightness < 0)
+                        props->brightness = 0;
+
                 props->update_status(pmac_backlight);
                 up(&pmac_backlight->sem);
 
@@ -140,8 +147,11 @@ int pmac_backlight_get_legacy_brightness()
 
                 down(&pmac_backlight->sem);
                 props = pmac_backlight->props;
+
                 result = props->brightness *
-                        OLD_BACKLIGHT_MAX / props->max_brightness;
+                        (OLD_BACKLIGHT_MAX + 1) /
+                        (props->max_brightness + 1);
+
                 up(&pmac_backlight->sem);
         }
         mutex_unlock(&pmac_backlight_mutex);
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 80035853467b..d524a915aa86 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -939,9 +939,10 @@ static int __init add_bridge(struct device_node *dev)
                 disp_name = "Chaos";
                 primary = 0;
         }
-        printk(KERN_INFO "Found %s PCI host bridge at 0x%08lx. "
+        printk(KERN_INFO "Found %s PCI host bridge at 0x%016llx. "
                "Firmware bus number: %d->%d\n",
-                disp_name, rsrc.start, hose->first_busno, hose->last_busno);
+                disp_name, (unsigned long long)rsrc.start, hose->first_busno,
+                hose->last_busno);
 #endif /* CONFIG_PPC32 */
 
         DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",
diff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c
index 047f954a89eb..93e7505debc5 100644
--- a/arch/powerpc/platforms/powermac/pfunc_core.c
+++ b/arch/powerpc/platforms/powermac/pfunc_core.c
@@ -546,7 +546,7 @@ struct pmf_device {
 };
 
 static LIST_HEAD(pmf_devices);
-static spinlock_t pmf_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(pmf_lock);
 static DEFINE_MUTEX(pmf_irq_mutex);
 
 static void pmf_release_device(struct kref *kref)
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 18bf3011d1e3..9f6189af6dd6 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -446,7 +446,7 @@ static void __init pmac_pic_probe_oldstyle(void)
 
         /* Set the handler for the main PIC */
         for ( i = 0; i < max_real_irqs ; i++ )
-                irq_desc[i].handler = &pmac_pic;
+                irq_desc[i].chip = &pmac_pic;
 
         /* Get addresses of first controller if we have a node for it */
         BUG_ON(of_address_to_resource(master, 0, &r));
@@ -493,7 +493,7 @@ static void __init pmac_pic_probe_oldstyle(void)
         /* Setup handlers for secondary controller and hook cascade irq*/
         if (slave) {
                 for ( i = max_real_irqs ; i < max_irqs ; i++ )
-                        irq_desc[i].handler = &gatwick_pic;
+                        irq_desc[i].chip = &gatwick_pic;
                 setup_irq(irq_cascade, &gatwick_cascade_action);
         }
         printk(KERN_INFO "irq: System has %d possible interrupts\n", max_irqs);
diff --git a/arch/powerpc/platforms/pseries/eeh_event.c b/arch/powerpc/platforms/pseries/eeh_event.c
index 8f2d12935b99..45ccc687e57c 100644
--- a/arch/powerpc/platforms/pseries/eeh_event.c
+++ b/arch/powerpc/platforms/pseries/eeh_event.c
@@ -35,7 +35,7 @@
  */
 
 /* EEH event workqueue setup. */
-static spinlock_t eeh_eventlist_lock = SPIN_LOCK_UNLOCKED;
+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);
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index b14f9b5c114e..19c03dd43000 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -238,7 +238,7 @@ static int get_irq_server(unsigned int irq)
 {
         unsigned int server;
         /* For the moment only implement delivery to all cpus or one cpu */
-        cpumask_t cpumask = irq_affinity[irq];
+        cpumask_t cpumask = irq_desc[irq].affinity;
         cpumask_t tmp = CPU_MASK_NONE;
 
         if (!distribute_irqs)
@@ -558,7 +558,7 @@ nextnode:
         }
 
         for (i = irq_offset_value(); i < NR_IRQS; ++i)
-                get_irq_desc(i)->handler = &xics_pic;
+                get_irq_desc(i)->chip = &xics_pic;
 
         xics_setup_cpu();
 
@@ -701,9 +701,9 @@ void xics_migrate_irqs_away(void)
                         continue;
 
                 /* We only need to migrate enabled IRQS */
-                if (desc == NULL || desc->handler == NULL
+                if (desc == NULL || desc->chip == NULL
                     || desc->action == NULL
-                    || desc->handler->set_affinity == NULL)
+                    || desc->chip->set_affinity == NULL)
                         continue;
 
                 spin_lock_irqsave(&desc->lock, flags);
@@ -728,8 +728,8 @@ void xics_migrate_irqs_away(void)
                        virq, cpu);
 
                 /* Reset affinity to all cpus */
-                desc->handler->set_affinity(virq, CPU_MASK_ALL);
-                irq_affinity[virq] = CPU_MASK_ALL;
+                desc->chip->set_affinity(virq, CPU_MASK_ALL);
+                irq_desc[irq].affinity = CPU_MASK_ALL;
 unlock:
                 spin_unlock_irqrestore(&desc->lock, flags);
         }
diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c
index b7ac32fdd776..2bff30f6d635 100644
--- a/arch/powerpc/sysdev/i8259.c
+++ b/arch/powerpc/sysdev/i8259.c
@@ -208,7 +208,7 @@ void __init i8259_init(unsigned long intack_addr, int offset)
         spin_unlock_irqrestore(&i8259_lock, flags);
 
         for (i = 0; i < NUM_ISA_INTERRUPTS; ++i)
-                irq_desc[offset + i].handler = &i8259_pic;
+                irq_desc[offset + i].chip = &i8259_pic;
 
         /* reserve our resources */
         setup_irq(offset + 2, &i8259_irqaction);
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index 8f01e0f1d847..46801f5ec03f 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -472,7 +472,7 @@ void __init ipic_init(phys_addr_t phys_addr,
         ipic_write(primary_ipic->regs, IPIC_SEMSR, temp);
 
         for (i = 0 ; i < NR_IPIC_INTS ; i++) {
-                irq_desc[i+irq_offset].handler = &ipic;
+                irq_desc[i+irq_offset].chip = &ipic;
                 irq_desc[i+irq_offset].status = IRQ_LEVEL;
         }
 
diff --git a/arch/powerpc/sysdev/mmio_nvram.c b/arch/powerpc/sysdev/mmio_nvram.c
index 74e0d31a3559..615350d46b52 100644
--- a/arch/powerpc/sysdev/mmio_nvram.c
+++ b/arch/powerpc/sysdev/mmio_nvram.c
@@ -32,7 +32,7 @@
 
 static void __iomem *mmio_nvram_start;
 static long mmio_nvram_len;
-static spinlock_t mmio_nvram_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(mmio_nvram_lock);
 
 static ssize_t mmio_nvram_read(char *buf, size_t count, loff_t *index)
 {
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index bffe50d02c99..28df9c827ca6 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -379,14 +379,14 @@ static inline u32 mpic_physmask(u32 cpumask)
 /* Get the mpic structure from the IPI number */
 static inline struct mpic * mpic_from_ipi(unsigned int ipi)
 {
-        return container_of(irq_desc[ipi].handler, struct mpic, hc_ipi);
+        return container_of(irq_desc[ipi].chip, struct mpic, hc_ipi);
 }
 #endif
 
 /* Get the mpic structure from the irq number */
 static inline struct mpic * mpic_from_irq(unsigned int irq)
 {
-        return container_of(irq_desc[irq].handler, struct mpic, hc_irq);
+        return container_of(irq_desc[irq].chip, struct mpic, hc_irq);
 }
 
 /* Send an EOI */
@@ -752,7 +752,7 @@ void __init mpic_init(struct mpic *mpic)
                 if (!(mpic->flags & MPIC_PRIMARY))
                         continue;
                 irq_desc[mpic->ipi_offset+i].status |= IRQ_PER_CPU;
-                irq_desc[mpic->ipi_offset+i].handler = &mpic->hc_ipi;
+                irq_desc[mpic->ipi_offset+i].chip = &mpic->hc_ipi;
 #endif /* CONFIG_SMP */
         }
 
@@ -813,7 +813,7 @@ void __init mpic_init(struct mpic *mpic)
                 /* init linux descriptors */
                 if (i < mpic->irq_count) {
                         irq_desc[mpic->irq_offset+i].status = level ? IRQ_LEVEL : 0;
-                        irq_desc[mpic->irq_offset+i].handler = &mpic->hc_irq;
+                        irq_desc[mpic->irq_offset+i].chip = &mpic->hc_irq;
                 }
         }
         
@@ -906,7 +906,7 @@ void mpic_setup_this_cpu(void)
         /* let the mpic know we want intrs. default affinity is 0xffffffff
          * until changed via /proc. That's how it's done on x86. If we want
          * it differently, then we should make sure we also change the default
-         * values of irq_affinity in irq.c.
+         * values of irq_desc[].affinity in irq.c.
          */
         if (distribute_irqs) {
                 for (i = 0; i < mpic->num_sources ; i++)
diff --git a/arch/ppc/8xx_io/commproc.c b/arch/ppc/8xx_io/commproc.c
index 12b84ca51327..9b3ace26280c 100644
--- a/arch/ppc/8xx_io/commproc.c
+++ b/arch/ppc/8xx_io/commproc.c
@@ -187,7 +187,7 @@ cpm_interrupt_init(void)
          * interrupt vectors
          */
         for ( i = CPM_IRQ_OFFSET ; i < CPM_IRQ_OFFSET + NR_CPM_INTS ; i++ )
-                irq_desc[i].handler = &cpm_pic;
+                irq_desc[i].chip = &cpm_pic;
 
         /* Set our interrupt handler with the core CPU. */
         if (setup_irq(CPM_INTERRUPT, &cpm_interrupt_irqaction))
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index d20accf9650d..242bb052be67 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -95,8 +95,10 @@ pcibios_fixup_resources(struct pci_dev *dev)
                 if (!res->flags)
                         continue;
                 if (res->end == 0xffffffff) {
-                        DBG("PCI:%s Resource %d [%08lx-%08lx] is unassigned\n",
-                            pci_name(dev), i, res->start, res->end);
+                        DBG("PCI:%s Resource %d [%016llx-%016llx] is unassigned\n",
+                                pci_name(dev), i,
+                                (unsigned long long)res->start,
+                                (unsigned long long)res->end);
                         res->end -= res->start;
                         res->start = 0;
                         res->flags |= IORESOURCE_UNSET;
@@ -169,18 +171,18 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);
  * but we want to try to avoid allocating at 0x2900-0x2bff
  * which might have be mirrored at 0x0100-0x03ff..
  */
-void pcibios_align_resource(void *data, struct resource *res, unsigned long size,
-                       unsigned long align)
+void pcibios_align_resource(void *data, struct resource *res,
+                                resource_size_t size, resource_size_t align)
 {
         struct pci_dev *dev = data;
 
         if (res->flags & IORESOURCE_IO) {
-                unsigned long start = res->start;
+                resource_size_t start = res->start;
 
                 if (size > 0x100) {
                         printk(KERN_ERR "PCI: I/O Region %s/%d too large"
-                               " (%ld bytes)\n", pci_name(dev),
-                               dev->resource - res, size);
+                               " (%lld bytes)\n", pci_name(dev),
+                               dev->resource - res, (unsigned long long)size);
                 }
 
                 if (start & 0x300) {
@@ -251,8 +253,9 @@ pcibios_allocate_bus_resources(struct list_head *bus_list)
                                 }
                         }
 
-                        DBG("PCI: bridge rsrc %lx..%lx (%lx), parent %p\n",
-                            res->start, res->end, res->flags, pr);
+                        DBG("PCI: bridge rsrc %llx..%llx (%lx), parent %p\n",
+                                (unsigned long long)res->start,
+                                (unsigned long long)res->end, res->flags, pr);
                         if (pr) {
                                 if (request_resource(pr, res) == 0)
                                         continue;
@@ -302,8 +305,9 @@ reparent_resources(struct resource *parent, struct resource *res)
         *pp = NULL;
         for (p = res->child; p != NULL; p = p->sibling) {
                 p->parent = res;
-                DBG(KERN_INFO "PCI: reparented %s [%lx..%lx] under %s\n",
-                    p->name, p->start, p->end, res->name);
+                DBG(KERN_INFO "PCI: reparented %s [%llx..%llx] under %s\n",
+                        p->name, (unsigned long long)p->start,
+                        (unsigned long long)p->end, res->name);
         }
         return 0;
 }
@@ -358,13 +362,15 @@ pci_relocate_bridge_resource(struct pci_bus *bus, int i)
                 try = conflict->start - 1;
         }
         if (request_resource(pr, res)) {
-                DBG(KERN_ERR "PCI: huh? couldn't move to %lx..%lx\n",
-                    res->start, res->end);
+                DBG(KERN_ERR "PCI: huh? couldn't move to %llx..%llx\n",
+                        (unsigned long long)res->start,
+                        (unsigned long long)res->end);
                 return -1;              /* "can't happen" */
         }
         update_bridge_base(bus, i);
-        printk(KERN_INFO "PCI: bridge %d resource %d moved to %lx..%lx\n",
-               bus->number, i, res->start, res->end);
+        printk(KERN_INFO "PCI: bridge %d resource %d moved to %llx..%llx\n",
+                bus->number, i, (unsigned long long)res->start,
+                (unsigned long long)res->end);
         return 0;
 }
 
@@ -475,15 +481,17 @@ static inline void alloc_resource(struct pci_dev *dev, int idx)
 {
         struct resource *pr, *r = &dev->resource[idx];
 
-        DBG("PCI:%s: Resource %d: %08lx-%08lx (f=%lx)\n",
-            pci_name(dev), idx, r->start, r->end, r->flags);
+        DBG("PCI:%s: Resource %d: %016llx-%016llx (f=%lx)\n",
+            pci_name(dev), idx, (unsigned long long)r->start,
+            (unsigned long long)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: %08lx-%08lx (f=%lx)\n",
-                            pr, pr->start, pr->end, pr->flags);
+                        DBG("PCI:  parent is %p: %016llx-%016llx (f=%lx)\n",
+                                pr, (unsigned long long)pr->start,
+                                (unsigned long long)pr->end, pr->flags);
                 /* We'll assign a new address later */
                 r->flags |= IORESOURCE_UNSET;
                 r->end -= r->start;
@@ -952,8 +960,8 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
         else
                 prot |= _PAGE_GUARDED;
 
-        printk("PCI map for %s:%lx, prot: %lx\n", pci_name(dev), rp->start,
-               prot);
+        printk("PCI map for %s:%llx, prot: %lx\n", pci_name(dev),
+                (unsigned long long)rp->start, prot);
 
         return __pgprot(prot);
 }
@@ -1122,7 +1130,7 @@ long sys_pciconfig_iobase(long which, unsigned long bus, unsigned long devfn)
 
 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_hose(dev->bus->number);
         unsigned long offset = 0;
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index 1f79e84ab464..4b4607d89bfa 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -475,7 +475,7 @@ int __init ppc_init(void)
 
         /* register CPU devices */
         for_each_possible_cpu(i)
-                register_cpu(&cpu_devices[i], i, NULL);
+                register_cpu(&cpu_devices[i], i);
 
         /* call platform init */
         if (ppc_md.init != NULL) {
diff --git a/arch/ppc/platforms/apus_setup.c b/arch/ppc/platforms/apus_setup.c
index fe0cdc04d436..5c4118a459f3 100644
--- a/arch/ppc/platforms/apus_setup.c
+++ b/arch/ppc/platforms/apus_setup.c
@@ -734,9 +734,9 @@ void apus_init_IRQ(void)
         for ( i = 0 ; i < AMI_IRQS; i++ ) {
                 irq_desc[i].status = IRQ_LEVEL;
                 if (i < IRQ_AMIGA_AUTO) {
-                        irq_desc[i].handler = &amiga_irqctrl;
+                        irq_desc[i].chip = &amiga_irqctrl;
                 } else {
-                        irq_desc[i].handler = &amiga_sys_irqctrl;
+                        irq_desc[i].chip = &amiga_sys_irqctrl;
                         action = &amiga_sys_irqaction[i-IRQ_AMIGA_AUTO];
                         if (action->name)
                                 setup_irq(i, action);
diff --git a/arch/ppc/platforms/sbc82xx.c b/arch/ppc/platforms/sbc82xx.c
index 866807b4ad0b..41006d2b4b38 100644
--- a/arch/ppc/platforms/sbc82xx.c
+++ b/arch/ppc/platforms/sbc82xx.c
@@ -172,7 +172,7 @@ void __init sbc82xx_init_IRQ(void)
         
         /* Set up the interrupt handlers for the i8259 IRQs */
         for (i = NR_SIU_INTS; i < NR_SIU_INTS + 8; i++) {
-                irq_desc[i].handler = &sbc82xx_i8259_ic;
+                irq_desc[i].chip = &sbc82xx_i8259_ic;
                 irq_desc[i].status |= IRQ_LEVEL;
         }
 
diff --git a/arch/ppc/syslib/cpc700_pic.c b/arch/ppc/syslib/cpc700_pic.c
index 5add0a919ef6..172aa215fdb0 100644
--- a/arch/ppc/syslib/cpc700_pic.c
+++ b/arch/ppc/syslib/cpc700_pic.c
@@ -140,12 +140,12 @@ cpc700_init_IRQ(void)
                                                         /* IRQ 0 is highest */
 
         for (i = 0; i < 17; i++) {
-                irq_desc[i].handler = &cpc700_pic;
+                irq_desc[i].chip = &cpc700_pic;
                 cpc700_pic_init_irq(i);
         }
 
         for (i = 20; i < 32; i++) {
-                irq_desc[i].handler = &cpc700_pic;
+                irq_desc[i].chip = &cpc700_pic;
                 cpc700_pic_init_irq(i);
         }
 
diff --git a/arch/ppc/syslib/cpm2_pic.c b/arch/ppc/syslib/cpm2_pic.c
index 29d95d415ceb..c0fee0beb815 100644
--- a/arch/ppc/syslib/cpm2_pic.c
+++ b/arch/ppc/syslib/cpm2_pic.c
@@ -171,7 +171,7 @@ void cpm2_init_IRQ(void)
         /* Enable chaining to OpenPIC, and make everything level
          */
         for (i = 0; i < NR_CPM_INTS; i++) {
-                irq_desc[i+CPM_IRQ_OFFSET].handler = &cpm2_pic;
+                irq_desc[i+CPM_IRQ_OFFSET].chip = &cpm2_pic;
                 irq_desc[i+CPM_IRQ_OFFSET].status |= IRQ_LEVEL;
         }
 }
diff --git a/arch/ppc/syslib/gt64260_pic.c b/arch/ppc/syslib/gt64260_pic.c
index dc3bd9ecbbf6..91096b38ae70 100644
--- a/arch/ppc/syslib/gt64260_pic.c
+++ b/arch/ppc/syslib/gt64260_pic.c
@@ -98,7 +98,7 @@ gt64260_init_irq(void)
 
         /* use the gt64260 for all (possible) interrupt sources */
         for (i = gt64260_irq_base; i < (gt64260_irq_base + 96); i++)
-                irq_desc[i].handler = &gt64260_pic;
+                irq_desc[i].chip = &gt64260_pic;
 
         if (ppc_md.progress)
                 ppc_md.progress("gt64260_init_irq: exit", 0x0);
diff --git a/arch/ppc/syslib/m82xx_pci.c b/arch/ppc/syslib/m82xx_pci.c
index 1941a8c7ca9a..63fa5b313396 100644
--- a/arch/ppc/syslib/m82xx_pci.c
+++ b/arch/ppc/syslib/m82xx_pci.c
@@ -159,7 +159,7 @@ pq2pci_init_irq(void)
         immap->im_memctl.memc_or8 = 0xffff8010;
 #endif
         for (irq = NR_CPM_INTS; irq < NR_CPM_INTS + 4; irq++)
-                irq_desc[irq].handler = &pq2pci_ic;
+                irq_desc[irq].chip = &pq2pci_ic;
 
         /* make PCI IRQ level sensitive */
         immap->im_intctl.ic_siexr &=
diff --git a/arch/ppc/syslib/m8xx_setup.c b/arch/ppc/syslib/m8xx_setup.c
index dae9af78bde1..0c4c0de7c59f 100644
--- a/arch/ppc/syslib/m8xx_setup.c
+++ b/arch/ppc/syslib/m8xx_setup.c
@@ -347,13 +347,13 @@ m8xx_init_IRQ(void)
         int i;
 
         for (i = SIU_IRQ_OFFSET ; i < SIU_IRQ_OFFSET + NR_SIU_INTS ; i++)
-                irq_desc[i].handler = &ppc8xx_pic;
+                irq_desc[i].chip = &ppc8xx_pic;
 
         cpm_interrupt_init();
 
 #if defined(CONFIG_PCI)
         for (i = I8259_IRQ_OFFSET ; i < I8259_IRQ_OFFSET + NR_8259_INTS ; i++)
-                irq_desc[i].handler = &i8259_pic;
+                irq_desc[i].chip = &i8259_pic;
 
         i8259_pic_irq_offset = I8259_IRQ_OFFSET;
         i8259_init(0);
diff --git a/arch/ppc/syslib/mpc52xx_pic.c b/arch/ppc/syslib/mpc52xx_pic.c
index c4406f9dc6a3..6425b5cee7db 100644
--- a/arch/ppc/syslib/mpc52xx_pic.c
+++ b/arch/ppc/syslib/mpc52xx_pic.c
@@ -204,9 +204,9 @@ mpc52xx_init_irq(void)
         out_be32(&intr->main_pri1, 0);
         out_be32(&intr->main_pri2, 0);
 
-        /* Initialize irq_desc[i].handler's with mpc52xx_ic. */
+        /* Initialize irq_desc[i].chip's with mpc52xx_ic. */
         for (i = 0; i < NR_IRQS; i++) {
-                irq_desc[i].handler = &mpc52xx_ic;
+                irq_desc[i].chip = &mpc52xx_ic;
                 irq_desc[i].status = IRQ_LEVEL;
         }
 
diff --git a/arch/ppc/syslib/mv64360_pic.c b/arch/ppc/syslib/mv64360_pic.c
index 5a19697060f0..a4244d468381 100644
--- a/arch/ppc/syslib/mv64360_pic.c
+++ b/arch/ppc/syslib/mv64360_pic.c
@@ -119,7 +119,7 @@ mv64360_init_irq(void)
         /* All interrupts are level interrupts */
         for (i = mv64360_irq_base; i < (mv64360_irq_base + 96); i++) {
                 irq_desc[i].status |= IRQ_LEVEL;
-                irq_desc[i].handler = &mv64360_pic;
+                irq_desc[i].chip = &mv64360_pic;
         }
 
         if (ppc_md.progress)
diff --git a/arch/ppc/syslib/open_pic.c b/arch/ppc/syslib/open_pic.c
index 70456c8f998c..767a0bc95817 100644
--- a/arch/ppc/syslib/open_pic.c
+++ b/arch/ppc/syslib/open_pic.c
@@ -373,7 +373,7 @@ void __init openpic_init(int offset)
                                 OPENPIC_VEC_IPI+i+offset);
                 /* IPIs are per-CPU */
                 irq_desc[OPENPIC_VEC_IPI+i+offset].status |= IRQ_PER_CPU;
-                irq_desc[OPENPIC_VEC_IPI+i+offset].handler = &open_pic_ipi;
+                irq_desc[OPENPIC_VEC_IPI+i+offset].chip = &open_pic_ipi;
         }
 #endif
 
@@ -408,7 +408,7 @@ void __init openpic_init(int offset)
 
         /* Init descriptors */
         for (i = offset; i < NumSources + offset; i++)
-                irq_desc[i].handler = &open_pic;
+                irq_desc[i].chip = &open_pic;
 
         /* Initialize the spurious interrupt */
         if (ppc_md.progress) ppc_md.progress("openpic: spurious",0x3bd);
@@ -615,8 +615,8 @@ void __devinit do_openpic_setup_cpu(void)
         /* let the openpic know we want intrs. default affinity
          * is 0xffffffff until changed via /proc
          * That's how it's done on x86. If we want it differently, then
-         * we should make sure we also change the default values of irq_affinity
-         * in irq.c.
+         * we should make sure we also change the default values of
+         * irq_desc[].affinity in irq.c.
          */
         for (i = 0; i < NumSources; i++)
                 openpic_mapirq(i, msk, CPU_MASK_ALL);
diff --git a/arch/ppc/syslib/open_pic2.c b/arch/ppc/syslib/open_pic2.c
index bcbe40de26fe..b8154efff6ed 100644
--- a/arch/ppc/syslib/open_pic2.c
+++ b/arch/ppc/syslib/open_pic2.c
@@ -290,7 +290,7 @@ void __init openpic2_init(int offset)
 
         /* Init descriptors */
         for (i = offset; i < NumSources + offset; i++)
-                irq_desc[i].handler = &open_pic2;
+                irq_desc[i].chip = &open_pic2;
 
         /* Initialize the spurious interrupt */
         if (ppc_md.progress) ppc_md.progress("openpic2: spurious",0x3bd);
diff --git a/arch/ppc/syslib/ppc403_pic.c b/arch/ppc/syslib/ppc403_pic.c
index c46043c47225..1584c8b1229f 100644
--- a/arch/ppc/syslib/ppc403_pic.c
+++ b/arch/ppc/syslib/ppc403_pic.c
@@ -121,5 +121,5 @@ ppc4xx_pic_init(void)
         ppc_md.get_irq = ppc403_pic_get_irq;
 
         for (i = 0; i < NR_IRQS; i++)
-                irq_desc[i].handler = &ppc403_aic;
+                irq_desc[i].chip = &ppc403_aic;
 }
diff --git a/arch/ppc/syslib/ppc4xx_pic.c b/arch/ppc/syslib/ppc4xx_pic.c
index fd9af0fc0e9f..e669c1335d47 100644
--- a/arch/ppc/syslib/ppc4xx_pic.c
+++ b/arch/ppc/syslib/ppc4xx_pic.c
@@ -276,7 +276,7 @@ void __init ppc4xx_pic_init(void)
 
         /* Attach low-level handlers */
         for (i = 0; i < (NR_UICS << 5); ++i) {
-                irq_desc[i].handler = &__uic[i >> 5].decl;
+                irq_desc[i].chip = &__uic[i >> 5].decl;
                 if (is_level_sensitive(i))
                         irq_desc[i].status |= IRQ_LEVEL;
         }
diff --git a/arch/ppc/syslib/xilinx_pic.c b/arch/ppc/syslib/xilinx_pic.c
index e672b600f315..39a93dc6375b 100644
--- a/arch/ppc/syslib/xilinx_pic.c
+++ b/arch/ppc/syslib/xilinx_pic.c
@@ -143,7 +143,7 @@ ppc4xx_pic_init(void)
         ppc_md.get_irq = xilinx_pic_get_irq;
 
         for (i = 0; i < NR_IRQS; ++i) {
-                irq_desc[i].handler = &xilinx_intc;
+                irq_desc[i].chip = &xilinx_intc;
 
                 if (XPAR_INTC_0_KIND_OF_INTR & (0x00000001 << i))
                         irq_desc[i].status &= ~IRQ_LEVEL;
diff --git a/arch/s390/appldata/appldata.h b/arch/s390/appldata/appldata.h
index e806a8922bbb..71d65eb30650 100644
--- a/arch/s390/appldata/appldata.h
+++ b/arch/s390/appldata/appldata.h
@@ -3,9 +3,9 @@
  *
  * Definitions and interface for Linux - z/VM Monitor Stream.
  *
- * Copyright (C) 2003 IBM Corporation, IBM Deutschland Entwicklung GmbH.
+ * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.
  *
- * Author: Gerald Schaefer <geraldsc@de.ibm.com>
+ * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
  */
 
 //#define APPLDATA_DEBUG                        /* Debug messages on/off */
@@ -29,6 +29,22 @@
 #define CTL_APPLDATA_NET_SUM    2125
 #define CTL_APPLDATA_PROC       2126
 
+#ifndef CONFIG_64BIT
+
+#define APPLDATA_START_INTERVAL_REC 0x00        /* Function codes for */
+#define APPLDATA_STOP_REC           0x01        /* DIAG 0xDC      */
+#define APPLDATA_GEN_EVENT_RECORD   0x02
+#define APPLDATA_START_CONFIG_REC   0x03
+
+#else
+
+#define APPLDATA_START_INTERVAL_REC 0x80
+#define APPLDATA_STOP_REC           0x81
+#define APPLDATA_GEN_EVENT_RECORD   0x82
+#define APPLDATA_START_CONFIG_REC   0x83
+
+#endif /* CONFIG_64BIT */
+
 #define P_INFO(x...)    printk(KERN_INFO MY_PRINT_NAME " info: " x)
 #define P_ERROR(x...)   printk(KERN_ERR MY_PRINT_NAME " error: " x)
 #define P_WARNING(x...) printk(KERN_WARNING MY_PRINT_NAME " status: " x)
@@ -53,7 +69,11 @@ struct appldata_ops {
         void *data;                             /* record data */
         unsigned int size;                      /* size of record */
         struct module *owner;                   /* THIS_MODULE */
+        char mod_lvl[2];                        /* modification level, EBCDIC */
 };
 
 extern int appldata_register_ops(struct appldata_ops *ops);
 extern void appldata_unregister_ops(struct appldata_ops *ops);
+extern int appldata_diag(char record_nr, u16 function, unsigned long buffer,
+                         u16 length, char *mod_lvl);
+
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 9a22434a580c..61bc44626c04 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -5,9 +5,9 @@
  * Exports appldata_register_ops() and appldata_unregister_ops() for the
  * data gathering modules.
  *
- * Copyright (C) 2003 IBM Corporation, IBM Deutschland Entwicklung GmbH.
+ * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.
  *
- * Author: Gerald Schaefer <geraldsc@de.ibm.com>
+ * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
  */
 
 #include <linux/config.h>
@@ -40,22 +40,6 @@
 
 #define TOD_MICRO       0x01000                 /* nr. of TOD clock units
                                                    for 1 microsecond */
-#ifndef CONFIG_64BIT
-
-#define APPLDATA_START_INTERVAL_REC 0x00        /* Function codes for */
-#define APPLDATA_STOP_REC           0x01        /* DIAG 0xDC      */
-#define APPLDATA_GEN_EVENT_RECORD   0x02
-#define APPLDATA_START_CONFIG_REC   0x03
-
-#else
-
-#define APPLDATA_START_INTERVAL_REC 0x80
-#define APPLDATA_STOP_REC           0x81
-#define APPLDATA_GEN_EVENT_RECORD   0x82
-#define APPLDATA_START_CONFIG_REC   0x83
-
-#endif /* CONFIG_64BIT */
-
 
 /*
  * Parameter list for DIAGNOSE X'DC'
@@ -195,8 +179,8 @@ static void appldata_work_fn(void *data)
  *
  * prepare parameter list, issue DIAG 0xDC
  */
-static int appldata_diag(char record_nr, u16 function, unsigned long buffer,
-                        u16 length)
+int appldata_diag(char record_nr, u16 function, unsigned long buffer,
+                        u16 length, char *mod_lvl)
 {
         unsigned long ry;
         struct appldata_product_id {
@@ -214,7 +198,7 @@ static int appldata_diag(char record_nr, u16 function, unsigned long buffer,
                 .record_nr  = record_nr,
                 .version_nr = {0xF2, 0xF6},             /* "26" */
                 .release_nr = {0xF0, 0xF1},             /* "01" */
-                .mod_lvl    = {0xF0, 0xF0},             /* "00" */
+                .mod_lvl    = {mod_lvl[0], mod_lvl[1]},
         };
         struct appldata_parameter_list appldata_parameter_list = {
                                 .diag = 0xDC,
@@ -467,24 +451,25 @@ appldata_generic_handler(ctl_table *ctl, int write, struct file *filp,
                         module_put(ops->owner);
                         return -ENODEV;
                 }
-                ops->active = 1;
                 ops->callback(ops->data);       // init record
                 rc = appldata_diag(ops->record_nr,
                                         APPLDATA_START_INTERVAL_REC,
-                                        (unsigned long) ops->data, ops->size);
+                                        (unsigned long) ops->data, ops->size,
+                                        ops->mod_lvl);
                 if (rc != 0) {
                         P_ERROR("START DIAG 0xDC for %s failed, "
                                 "return code: %d\n", ops->name, rc);
                         module_put(ops->owner);
-                        ops->active = 0;
                 } else {
                         P_INFO("Monitoring %s data enabled, "
                                 "DIAG 0xDC started.\n", ops->name);
+                        ops->active = 1;
                 }
         } else if ((buf[0] == '0') && (ops->active == 1)) {
                 ops->active = 0;
                 rc = appldata_diag(ops->record_nr, APPLDATA_STOP_REC,
-                                (unsigned long) ops->data, ops->size);
+                                (unsigned long) ops->data, ops->size,
+                                ops->mod_lvl);
                 if (rc != 0) {
                         P_ERROR("STOP DIAG 0xDC for %s failed, "
                                 "return code: %d\n", ops->name, rc);
@@ -633,7 +618,7 @@ appldata_offline_cpu(int cpu)
         spin_unlock(&appldata_timer_lock);
 }
 
-static int
+static int __cpuinit
 appldata_cpu_notify(struct notifier_block *self,
                     unsigned long action, void *hcpu)
 {
@@ -652,7 +637,7 @@ appldata_cpu_notify(struct notifier_block *self,
         return NOTIFY_OK;
 }
 
-static struct notifier_block appldata_nb = {
+static struct notifier_block __devinitdata appldata_nb = {
         .notifier_call = appldata_cpu_notify,
 };
 
@@ -710,7 +695,8 @@ static void __exit appldata_exit(void)
         list_for_each(lh, &appldata_ops_list) {
                 ops = list_entry(lh, struct appldata_ops, list);
                 rc = appldata_diag(ops->record_nr, APPLDATA_STOP_REC,
-                                (unsigned long) ops->data, ops->size);
+                                (unsigned long) ops->data, ops->size,
+                                ops->mod_lvl);
                 if (rc != 0) {
                         P_ERROR("STOP DIAG 0xDC for %s failed, "
                                 "return code: %d\n", ops->name, rc);
@@ -739,6 +725,7 @@ MODULE_DESCRIPTION("Linux-VM Monitor Stream, base infrastructure");
 
 EXPORT_SYMBOL_GPL(appldata_register_ops);
 EXPORT_SYMBOL_GPL(appldata_unregister_ops);
+EXPORT_SYMBOL_GPL(appldata_diag);
 
 #ifdef MODULE
 /*
@@ -779,7 +766,6 @@ unsigned long nr_iowait(void)
 #endif /* MODULE */
 EXPORT_SYMBOL_GPL(si_swapinfo);
 EXPORT_SYMBOL_GPL(nr_threads);
-EXPORT_SYMBOL_GPL(avenrun);
 EXPORT_SYMBOL_GPL(get_full_page_state);
 EXPORT_SYMBOL_GPL(nr_running);
 EXPORT_SYMBOL_GPL(nr_iowait);
diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c
index f0e2fbed3d4c..7915a197d96d 100644
--- a/arch/s390/appldata/appldata_mem.c
+++ b/arch/s390/appldata/appldata_mem.c
@@ -4,9 +4,9 @@
  * Data gathering module for Linux-VM Monitor Stream, Stage 1.
  * Collects data related to memory management.
  *
- * Copyright (C) 2003 IBM Corporation, IBM Deutschland Entwicklung GmbH.
+ * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.
  *
- * Author: Gerald Schaefer <geraldsc@de.ibm.com>
+ * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
  */
 
 #include <linux/config.h>
@@ -152,6 +152,7 @@ static struct appldata_ops ops = {
         .callback  = &appldata_get_mem_data,
         .data      = &appldata_mem_data,
         .owner     = THIS_MODULE,
+        .mod_lvl   = {0xF0, 0xF0},              /* EBCDIC "00" */
 };
 
 
diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c
index 2a4c7432db4a..39b7bdecbf05 100644
--- a/arch/s390/appldata/appldata_net_sum.c
+++ b/arch/s390/appldata/appldata_net_sum.c
@@ -5,9 +5,9 @@
  * Collects accumulated network statistics (Packets received/transmitted,
  * dropped, errors, ...).
  *
- * Copyright (C) 2003 IBM Corporation, IBM Deutschland Entwicklung GmbH.
+ * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.
  *
- * Author: Gerald Schaefer <geraldsc@de.ibm.com>
+ * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
  */
 
 #include <linux/config.h>
@@ -152,6 +152,7 @@ static struct appldata_ops ops = {
         .callback  = &appldata_get_net_sum_data,
         .data      = &appldata_net_sum_data,
         .owner     = THIS_MODULE,
+        .mod_lvl   = {0xF0, 0xF0},              /* EBCDIC "00" */
 };
 
 
diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata_os.c
index 99ddd3bf2fba..f2b44a2f1dec 100644
--- a/arch/s390/appldata/appldata_os.c
+++ b/arch/s390/appldata/appldata_os.c
@@ -4,9 +4,9 @@
  * Data gathering module for Linux-VM Monitor Stream, Stage 1.
  * Collects misc. OS related data (CPU utilization, running processes).
  *
- * Copyright (C) 2003 IBM Corporation, IBM Deutschland Entwicklung GmbH.
+ * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.
  *
- * Author: Gerald Schaefer <geraldsc@de.ibm.com>
+ * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
  */
 
 #include <linux/config.h>
@@ -44,11 +44,14 @@ struct appldata_os_per_cpu {
         u32 per_cpu_system;     /* ... spent in kernel mode         */
         u32 per_cpu_idle;       /* ... spent in idle mode           */
 
-// New in 2.6 -->
+        /* New in 2.6 */
         u32 per_cpu_irq;        /* ... spent in interrupts          */
         u32 per_cpu_softirq;    /* ... spent in softirqs            */
         u32 per_cpu_iowait;     /* ... spent while waiting for I/O  */
-// <-- New in 2.6
+
+        /* New in modification level 01 */
+        u32 per_cpu_steal;      /* ... stolen by hypervisor         */
+        u32 cpu_id;             /* number of this CPU               */
 } __attribute__((packed));
 
 struct appldata_os_data {
@@ -68,10 +71,9 @@ struct appldata_os_data {
         u32 avenrun[3];         /* average nr. of running processes during */
                                 /* the last 1, 5 and 15 minutes */
 
-// New in 2.6 -->
+        /* New in 2.6 */
         u32 nr_iowait;          /* number of blocked threads
                                    (waiting for I/O)               */
-// <-- New in 2.6
 
         /* per cpu data */
         struct appldata_os_per_cpu os_cpu[0];
@@ -79,6 +81,14 @@ struct appldata_os_data {
 
 static struct appldata_os_data *appldata_os_data;
 
+static struct appldata_ops ops = {
+        .ctl_nr    = CTL_APPLDATA_OS,
+        .name      = "os",
+        .record_nr = APPLDATA_RECORD_OS_ID,
+        .owner     = THIS_MODULE,
+        .mod_lvl   = {0xF0, 0xF1},              /* EBCDIC "01" */
+};
+
 
 static inline void appldata_print_debug(struct appldata_os_data *os_data)
 {
@@ -100,15 +110,17 @@ static inline void appldata_print_debug(struct appldata_os_data *os_data)
         P_DEBUG("nr_cpus = %u\n", os_data->nr_cpus);
         for (i = 0; i < os_data->nr_cpus; i++) {
                 P_DEBUG("cpu%u : user = %u, nice = %u, system = %u, "
-                        "idle = %u, irq = %u, softirq = %u, iowait = %u\n",
-                                i,
+                        "idle = %u, irq = %u, softirq = %u, iowait = %u, "
+                        "steal = %u\n",
+                                os_data->os_cpu[i].cpu_id,
                                 os_data->os_cpu[i].per_cpu_user,
                                 os_data->os_cpu[i].per_cpu_nice,
                                 os_data->os_cpu[i].per_cpu_system,
                                 os_data->os_cpu[i].per_cpu_idle,
                                 os_data->os_cpu[i].per_cpu_irq,
                                 os_data->os_cpu[i].per_cpu_softirq,
-                                os_data->os_cpu[i].per_cpu_iowait);
+                                os_data->os_cpu[i].per_cpu_iowait,
+                                os_data->os_cpu[i].per_cpu_steal);
         }
 
         P_DEBUG("sync_count_1 = %u\n", os_data->sync_count_1);
@@ -123,14 +135,13 @@ static inline void appldata_print_debug(struct appldata_os_data *os_data)
  */
 static void appldata_get_os_data(void *data)
 {
-        int i, j;
+        int i, j, rc;
         struct appldata_os_data *os_data;
+        unsigned int new_size;
 
         os_data = data;
         os_data->sync_count_1++;
 
-        os_data->nr_cpus = num_online_cpus();
-
         os_data->nr_threads = nr_threads;
         os_data->nr_running = nr_running();
         os_data->nr_iowait  = nr_iowait();
@@ -154,9 +165,44 @@ static void appldata_get_os_data(void *data)
                         cputime_to_jiffies(kstat_cpu(i).cpustat.softirq);
                 os_data->os_cpu[j].per_cpu_iowait =
                         cputime_to_jiffies(kstat_cpu(i).cpustat.iowait);
+                os_data->os_cpu[j].per_cpu_steal =
+                        cputime_to_jiffies(kstat_cpu(i).cpustat.steal);
+                os_data->os_cpu[j].cpu_id = i;
                 j++;
         }
 
+        os_data->nr_cpus = j;
+
+        new_size = sizeof(struct appldata_os_data) +
+                   (os_data->nr_cpus * sizeof(struct appldata_os_per_cpu));
+        if (ops.size != new_size) {
+                if (ops.active) {
+                        rc = appldata_diag(APPLDATA_RECORD_OS_ID,
+                                           APPLDATA_START_INTERVAL_REC,
+                                           (unsigned long) ops.data, new_size,
+                                           ops.mod_lvl);
+                        if (rc != 0) {
+                                P_ERROR("os: START NEW DIAG 0xDC failed, "
+                                        "return code: %d, new size = %i\n", rc,
+                                        new_size);
+                                P_INFO("os: stopping old record now\n");
+                        } else
+                                P_INFO("os: new record size = %i\n", new_size);
+
+                        rc = appldata_diag(APPLDATA_RECORD_OS_ID,
+                                           APPLDATA_STOP_REC,
+                                           (unsigned long) ops.data, ops.size,
+                                           ops.mod_lvl);
+                        if (rc != 0)
+                                P_ERROR("os: STOP OLD DIAG 0xDC failed, "
+                                        "return code: %d, old size = %i\n", rc,
+                                        ops.size);
+                        else
+                                P_INFO("os: old record size = %i stopped\n",
+                                        ops.size);
+                }
+                ops.size = new_size;
+        }
         os_data->timestamp = get_clock();
         os_data->sync_count_2++;
 #ifdef APPLDATA_DEBUG
@@ -165,15 +211,6 @@ static void appldata_get_os_data(void *data)
 }
 
 
-static struct appldata_ops ops = {
-        .ctl_nr    = CTL_APPLDATA_OS,
-        .name      = "os",
-        .record_nr = APPLDATA_RECORD_OS_ID,
-        .callback  = &appldata_get_os_data,
-        .owner     = THIS_MODULE,
-};
-
-
 /*
  * appldata_os_init()
  *
@@ -181,26 +218,25 @@ static struct appldata_ops ops = {
  */
 static int __init appldata_os_init(void)
 {
-        int rc, size;
+        int rc, max_size;
 
-        size = sizeof(struct appldata_os_data) +
-                (NR_CPUS * sizeof(struct appldata_os_per_cpu));
-        if (size > APPLDATA_MAX_REC_SIZE) {
-                P_ERROR("Size of record = %i, bigger than maximum (%i)!\n",
-                        size, APPLDATA_MAX_REC_SIZE);
+        max_size = sizeof(struct appldata_os_data) +
+                   (NR_CPUS * sizeof(struct appldata_os_per_cpu));
+        if (max_size > APPLDATA_MAX_REC_SIZE) {
+                P_ERROR("Max. size of OS record = %i, bigger than maximum "
+                        "record size (%i)\n", max_size, APPLDATA_MAX_REC_SIZE);
                 rc = -ENOMEM;
                 goto out;
         }
-        P_DEBUG("sizeof(os) = %i, sizeof(os_cpu) = %lu\n", size,
+        P_DEBUG("max. sizeof(os) = %i, sizeof(os_cpu) = %lu\n", max_size,
                 sizeof(struct appldata_os_per_cpu));
 
-        appldata_os_data = kmalloc(size, GFP_DMA);
+        appldata_os_data = kzalloc(max_size, GFP_DMA);
         if (appldata_os_data == NULL) {
                 P_ERROR("No memory for %s!\n", ops.name);
                 rc = -ENOMEM;
                 goto out;
         }
-        memset(appldata_os_data, 0, size);
 
         appldata_os_data->per_cpu_size = sizeof(struct appldata_os_per_cpu);
         appldata_os_data->cpu_offset   = offsetof(struct appldata_os_data,
@@ -208,7 +244,7 @@ static int __init appldata_os_init(void)
         P_DEBUG("cpu offset = %u\n", appldata_os_data->cpu_offset);
 
         ops.data = appldata_os_data;
-        ops.size = size;
+        ops.callback  = &appldata_get_os_data;
         rc = appldata_register_ops(&ops);
         if (rc != 0) {
                 P_ERROR("Error registering ops, rc = %i\n", rc);
diff --git a/arch/s390/kernel/binfmt_elf32.c b/arch/s390/kernel/binfmt_elf32.c
index 1f451c2cb071..12a6311e9838 100644
--- a/arch/s390/kernel/binfmt_elf32.c
+++ b/arch/s390/kernel/binfmt_elf32.c
@@ -177,11 +177,6 @@ struct elf_prpsinfo32
 
 #include <linux/highuid.h>
 
-#undef NEW_TO_OLD_UID
-#undef NEW_TO_OLD_GID
-#define NEW_TO_OLD_UID(uid) ((uid) > 65535) ? (u16)overflowuid : (u16)(uid)
-#define NEW_TO_OLD_GID(gid) ((gid) > 65535) ? (u16)overflowgid : (u16)(gid) 
-
 #define elf_addr_t      u32
 /*
 #define init_elf_binfmt init_elf32_binfmt
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index b2448487854c..aa8b52c2140f 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -93,13 +93,22 @@ STACK_SIZE  = 1 << STACK_SHIFT
         l       %r13,__LC_SVC_NEW_PSW+4 # load &system_call to %r13
         .endm
 
-        .macro  SAVE_ALL psworg,savearea,sync
+        .macro  SAVE_ALL_SYNC psworg,savearea
         la      %r12,\psworg
-        .if     \sync
         tm      \psworg+1,0x01          # test problem state bit
         bz      BASED(2f)               # skip stack setup save
         l       %r15,__LC_KERNEL_STACK  # problem state -> load ksp
-        .else
+#ifdef CONFIG_CHECK_STACK
+        b       BASED(3f)
+2:      tml     %r15,STACK_SIZE - CONFIG_STACK_GUARD
+        bz      BASED(stack_overflow)
+3:
+#endif
+2:
+        .endm
+
+        .macro  SAVE_ALL_ASYNC psworg,savearea
+        la      %r12,\psworg
         tm      \psworg+1,0x01          # test problem state bit
         bnz     BASED(1f)               # from user -> load async stack
         clc     \psworg+4(4),BASED(.Lcritical_end)
@@ -115,7 +124,6 @@ STACK_SIZE  = 1 << STACK_SHIFT
         sra     %r14,STACK_SHIFT
         be      BASED(2f)
 1:      l       %r15,__LC_ASYNC_STACK
-        .endif
 #ifdef CONFIG_CHECK_STACK
         b       BASED(3f)
 2:      tml     %r15,STACK_SIZE - CONFIG_STACK_GUARD
@@ -196,7 +204,7 @@ system_call:
         STORE_TIMER __LC_SYNC_ENTER_TIMER
 sysc_saveall:
         SAVE_ALL_BASE __LC_SAVE_AREA
-        SAVE_ALL __LC_SVC_OLD_PSW,__LC_SAVE_AREA,1
+        SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA
         CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA
         lh      %r7,0x8a          # get svc number from lowcore
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
@@ -425,7 +433,7 @@ pgm_check_handler:
         SAVE_ALL_BASE __LC_SAVE_AREA
         tm      __LC_PGM_INT_CODE+1,0x80 # check whether we got a per exception
         bnz     BASED(pgm_per)           # got per exception -> special case
-        SAVE_ALL __LC_PGM_OLD_PSW,__LC_SAVE_AREA,1
+        SAVE_ALL_SYNC __LC_PGM_OLD_PSW,__LC_SAVE_AREA
         CREATE_STACK_FRAME __LC_PGM_OLD_PSW,__LC_SAVE_AREA
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
         tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
@@ -464,7 +472,7 @@ pgm_per:
 # Normal per exception
 #
 pgm_per_std:
-        SAVE_ALL __LC_PGM_OLD_PSW,__LC_SAVE_AREA,1
+        SAVE_ALL_SYNC __LC_PGM_OLD_PSW,__LC_SAVE_AREA
         CREATE_STACK_FRAME __LC_PGM_OLD_PSW,__LC_SAVE_AREA
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
         tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
@@ -490,7 +498,7 @@ pgm_no_vtime2:
 # it was a single stepped SVC that is causing all the trouble
 #
 pgm_svcper:
-        SAVE_ALL __LC_SVC_OLD_PSW,__LC_SAVE_AREA,1
+        SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA
         CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
         tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
@@ -519,7 +527,7 @@ io_int_handler:
         STORE_TIMER __LC_ASYNC_ENTER_TIMER
         stck    __LC_INT_CLOCK
         SAVE_ALL_BASE __LC_SAVE_AREA+16
-        SAVE_ALL __LC_IO_OLD_PSW,__LC_SAVE_AREA+16,0
+        SAVE_ALL_ASYNC __LC_IO_OLD_PSW,__LC_SAVE_AREA+16
         CREATE_STACK_FRAME __LC_IO_OLD_PSW,__LC_SAVE_AREA+16
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
         tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
@@ -631,7 +639,7 @@ ext_int_handler:
         STORE_TIMER __LC_ASYNC_ENTER_TIMER
         stck    __LC_INT_CLOCK
         SAVE_ALL_BASE __LC_SAVE_AREA+16
-        SAVE_ALL __LC_EXT_OLD_PSW,__LC_SAVE_AREA+16,0
+        SAVE_ALL_ASYNC __LC_EXT_OLD_PSW,__LC_SAVE_AREA+16
         CREATE_STACK_FRAME __LC_EXT_OLD_PSW,__LC_SAVE_AREA+16
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
         tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
@@ -657,21 +665,31 @@ __critical_end:
         .globl mcck_int_handler
 mcck_int_handler:
         spt     __LC_CPU_TIMER_SAVE_AREA        # revalidate cpu timer
-        mvc     __LC_ASYNC_ENTER_TIMER(8),__LC_CPU_TIMER_SAVE_AREA
         lm      %r0,%r15,__LC_GPREGS_SAVE_AREA  # revalidate gprs
         SAVE_ALL_BASE __LC_SAVE_AREA+32
         la      %r12,__LC_MCK_OLD_PSW
         tm      __LC_MCCK_CODE,0x80     # system damage?
         bo      BASED(mcck_int_main)    # yes -> rest of mcck code invalid
-        tm      __LC_MCCK_CODE+5,0x02   # stored cpu timer value valid?
-        bo      BASED(0f)
-        spt     __LC_LAST_UPDATE_TIMER  # revalidate cpu timer
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
-        mvc     __LC_ASYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER
-        mvc     __LC_SYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER
-        mvc     __LC_EXIT_TIMER(8),__LC_LAST_UPDATE_TIMER
+        mvc     __LC_SAVE_AREA+52(8),__LC_ASYNC_ENTER_TIMER
+        mvc     __LC_ASYNC_ENTER_TIMER(8),__LC_CPU_TIMER_SAVE_AREA
+        tm      __LC_MCCK_CODE+5,0x02   # stored cpu timer value valid?
+        bo      BASED(1f)
+        la      %r14,__LC_SYNC_ENTER_TIMER
+        clc     0(8,%r14),__LC_ASYNC_ENTER_TIMER
+        bl      BASED(0f)
+        la      %r14,__LC_ASYNC_ENTER_TIMER
+0:      clc     0(8,%r14),__LC_EXIT_TIMER
+        bl      BASED(0f)
+        la      %r14,__LC_EXIT_TIMER
+0:      clc     0(8,%r14),__LC_LAST_UPDATE_TIMER
+        bl      BASED(0f)
+        la      %r14,__LC_LAST_UPDATE_TIMER
+0:      spt     0(%r14)
+        mvc     __LC_ASYNC_ENTER_TIMER(8),0(%r14)
+1:
 #endif
-0:      tm      __LC_MCCK_CODE+2,0x09   # mwp + ia of old psw valid?
+        tm      __LC_MCCK_CODE+2,0x09   # mwp + ia of old psw valid?
         bno     BASED(mcck_int_main)    # no -> skip cleanup critical
         tm      __LC_MCK_OLD_PSW+1,0x01 # test problem state bit
         bnz     BASED(mcck_int_main)    # from user -> load async stack
@@ -691,7 +709,7 @@ mcck_int_main:
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
         tm      __LC_MCCK_CODE+2,0x08   # mwp of old psw valid?
         bno     BASED(mcck_no_vtime)    # no -> skip cleanup critical
-        tm      __LC_MCK_OLD_PSW+1,0x01 # interrupting from user ?
+        tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
         bz      BASED(mcck_no_vtime)
         UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER
         UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
@@ -715,6 +733,20 @@ mcck_no_vtime:
         l       %r1,BASED(.Ls390_handle_mcck)
         basr    %r14,%r1                # call machine check handler
 mcck_return:
+        mvc     __LC_RETURN_MCCK_PSW(8),SP_PSW(%r15) # move return PSW
+        ni      __LC_RETURN_MCCK_PSW+1,0xfd # clear wait state bit
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+        mvc     __LC_ASYNC_ENTER_TIMER(8),__LC_SAVE_AREA+52
+        tm      __LC_RETURN_MCCK_PSW+1,0x01 # returning to user ?
+        bno     BASED(0f)
+        lm      %r0,%r15,SP_R0(%r15)    # load gprs 0-15
+        stpt    __LC_EXIT_TIMER
+        lpsw    __LC_RETURN_MCCK_PSW    # back to caller
+0:
+#endif
+        lm      %r0,%r15,SP_R0(%r15)    # load gprs 0-15
+        lpsw    __LC_RETURN_MCCK_PSW    # back to caller
+
         RESTORE_ALL __LC_RETURN_MCCK_PSW,0
 
 #ifdef CONFIG_SMP
@@ -781,6 +813,8 @@ cleanup_table_sysc_leave:
         .long   sysc_leave + 0x80000000, sysc_work_loop + 0x80000000
 cleanup_table_sysc_work_loop:
         .long   sysc_work_loop + 0x80000000, sysc_reschedule + 0x80000000
+cleanup_table_io_return:
+        .long   io_return + 0x80000000, io_leave + 0x80000000
 cleanup_table_io_leave:
         .long   io_leave + 0x80000000, io_done + 0x80000000
 cleanup_table_io_work_loop:
@@ -807,6 +841,11 @@ cleanup_critical:
         clc     4(4,%r12),BASED(cleanup_table_sysc_work_loop+4)
         bl      BASED(cleanup_sysc_return)
 0:
+        clc     4(4,%r12),BASED(cleanup_table_io_return)
+        bl      BASED(0f)
+        clc     4(4,%r12),BASED(cleanup_table_io_return+4)
+        bl      BASED(cleanup_io_return)
+0:
         clc     4(4,%r12),BASED(cleanup_table_io_leave)
         bl      BASED(0f)
         clc     4(4,%r12),BASED(cleanup_table_io_leave+4)
@@ -839,7 +878,7 @@ cleanup_system_call:
         mvc     __LC_SAVE_AREA(16),0(%r12)
 0:      st      %r13,4(%r12)
         st      %r12,__LC_SAVE_AREA+48  # argh
-        SAVE_ALL __LC_SVC_OLD_PSW,__LC_SAVE_AREA,1
+        SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA
         CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA
         l       %r12,__LC_SAVE_AREA+48  # argh
         st      %r15,12(%r12)
@@ -980,7 +1019,6 @@ cleanup_io_leave_insn:
                .long  cleanup_critical
 
 #define SYSCALL(esa,esame,emu)  .long esa
-        .globl  sys_call_table
 sys_call_table:
 #include "syscalls.S"
 #undef SYSCALL
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 2ac095bc0e25..f3222a1b2861 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -87,13 +87,22 @@ _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \
         larl    %r13,system_call
         .endm
 
-        .macro  SAVE_ALL psworg,savearea,sync
+        .macro  SAVE_ALL_SYNC psworg,savearea
         la      %r12,\psworg
-        .if     \sync
         tm      \psworg+1,0x01          # test problem state bit
         jz      2f                      # skip stack setup save
         lg      %r15,__LC_KERNEL_STACK  # problem state -> load ksp
-        .else
+#ifdef CONFIG_CHECK_STACK
+        j       3f
+2:      tml     %r15,STACK_SIZE - CONFIG_STACK_GUARD
+        jz      stack_overflow
+3:
+#endif
+2:
+        .endm
+
+        .macro  SAVE_ALL_ASYNC psworg,savearea
+        la      %r12,\psworg
         tm      \psworg+1,0x01          # test problem state bit
         jnz     1f                      # from user -> load kernel stack
         clc     \psworg+8(8),BASED(.Lcritical_end)
@@ -108,7 +117,6 @@ _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \
         srag    %r14,%r14,STACK_SHIFT
         jz      2f
 1:      lg      %r15,__LC_ASYNC_STACK   # load async stack
-        .endif
 #ifdef CONFIG_CHECK_STACK
         j       3f
 2:      tml     %r15,STACK_SIZE - CONFIG_STACK_GUARD
@@ -187,7 +195,7 @@ system_call:
         STORE_TIMER __LC_SYNC_ENTER_TIMER
 sysc_saveall:
         SAVE_ALL_BASE __LC_SAVE_AREA
-        SAVE_ALL __LC_SVC_OLD_PSW,__LC_SAVE_AREA,1
+        SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA
         CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA
         llgh    %r7,__LC_SVC_INT_CODE # get svc number from lowcore
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
@@ -446,7 +454,7 @@ pgm_check_handler:
         SAVE_ALL_BASE __LC_SAVE_AREA
         tm      __LC_PGM_INT_CODE+1,0x80 # check whether we got a per exception
         jnz     pgm_per                  # got per exception -> special case
-        SAVE_ALL __LC_PGM_OLD_PSW,__LC_SAVE_AREA,1
+        SAVE_ALL_SYNC __LC_PGM_OLD_PSW,__LC_SAVE_AREA
         CREATE_STACK_FRAME __LC_PGM_OLD_PSW,__LC_SAVE_AREA
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
         tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
@@ -485,7 +493,7 @@ pgm_per:
 # Normal per exception
 #
 pgm_per_std:
-        SAVE_ALL __LC_PGM_OLD_PSW,__LC_SAVE_AREA,1
+        SAVE_ALL_SYNC __LC_PGM_OLD_PSW,__LC_SAVE_AREA
         CREATE_STACK_FRAME __LC_PGM_OLD_PSW,__LC_SAVE_AREA
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
         tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
@@ -511,7 +519,7 @@ pgm_no_vtime2:
 # it was a single stepped SVC that is causing all the trouble
 #
 pgm_svcper:
-        SAVE_ALL __LC_SVC_OLD_PSW,__LC_SAVE_AREA,1
+        SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA
         CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
         tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
@@ -539,7 +547,7 @@ io_int_handler:
         STORE_TIMER __LC_ASYNC_ENTER_TIMER
         stck    __LC_INT_CLOCK
         SAVE_ALL_BASE __LC_SAVE_AREA+32
-        SAVE_ALL __LC_IO_OLD_PSW,__LC_SAVE_AREA+32,0
+        SAVE_ALL_ASYNC __LC_IO_OLD_PSW,__LC_SAVE_AREA+32
         CREATE_STACK_FRAME __LC_IO_OLD_PSW,__LC_SAVE_AREA+32
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
         tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
@@ -647,7 +655,7 @@ ext_int_handler:
         STORE_TIMER __LC_ASYNC_ENTER_TIMER
         stck    __LC_INT_CLOCK
         SAVE_ALL_BASE __LC_SAVE_AREA+32
-        SAVE_ALL __LC_EXT_OLD_PSW,__LC_SAVE_AREA+32,0
+        SAVE_ALL_ASYNC __LC_EXT_OLD_PSW,__LC_SAVE_AREA+32
         CREATE_STACK_FRAME __LC_EXT_OLD_PSW,__LC_SAVE_AREA+32
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
         tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
@@ -672,21 +680,32 @@ __critical_end:
 mcck_int_handler:
         la      %r1,4095                # revalidate r1
         spt     __LC_CPU_TIMER_SAVE_AREA-4095(%r1)      # revalidate cpu timer
-        mvc     __LC_ASYNC_ENTER_TIMER(8),__LC_CPU_TIMER_SAVE_AREA-4095(%r1)
         lmg     %r0,%r15,__LC_GPREGS_SAVE_AREA-4095(%r1)# revalidate gprs
         SAVE_ALL_BASE __LC_SAVE_AREA+64
         la      %r12,__LC_MCK_OLD_PSW
         tm      __LC_MCCK_CODE,0x80     # system damage?
         jo      mcck_int_main           # yes -> rest of mcck code invalid
-        tm      __LC_MCCK_CODE+5,0x02   # stored cpu timer value valid?
-        jo      0f
-        spt     __LC_LAST_UPDATE_TIMER
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
-        mvc     __LC_ASYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER
-        mvc     __LC_SYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER
-        mvc     __LC_EXIT_TIMER(8),__LC_LAST_UPDATE_TIMER
+        la      %r14,4095
+        mvc     __LC_SAVE_AREA+104(8),__LC_ASYNC_ENTER_TIMER
+        mvc     __LC_ASYNC_ENTER_TIMER(8),__LC_CPU_TIMER_SAVE_AREA-4095(%r14)
+        tm      __LC_MCCK_CODE+5,0x02   # stored cpu timer value valid?
+        jo      1f
+        la      %r14,__LC_SYNC_ENTER_TIMER
+        clc     0(8,%r14),__LC_ASYNC_ENTER_TIMER
+        jl      0f
+        la      %r14,__LC_ASYNC_ENTER_TIMER
+0:      clc     0(8,%r14),__LC_EXIT_TIMER
+        jl      0f
+        la      %r14,__LC_EXIT_TIMER
+0:      clc     0(8,%r14),__LC_LAST_UPDATE_TIMER
+        jl      0f
+        la      %r14,__LC_LAST_UPDATE_TIMER
+0:      spt     0(%r14)
+        mvc     __LC_ASYNC_ENTER_TIMER(8),0(%r14)
+1:
 #endif
-0:      tm      __LC_MCCK_CODE+2,0x09   # mwp + ia of old psw valid?
+        tm      __LC_MCCK_CODE+2,0x09   # mwp + ia of old psw valid?
         jno     mcck_int_main           # no -> skip cleanup critical
         tm      __LC_MCK_OLD_PSW+1,0x01 # test problem state bit
         jnz     mcck_int_main           # from user -> load kernel stack
@@ -705,7 +724,7 @@ mcck_int_main:
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
         tm      __LC_MCCK_CODE+2,0x08   # mwp of old psw valid?
         jno     mcck_no_vtime           # no -> no timer update
-        tm      __LC_MCK_OLD_PSW+1,0x01 # interrupting from user ?
+        tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
         jz      mcck_no_vtime
         UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER
         UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
@@ -727,7 +746,17 @@ mcck_no_vtime:
         jno     mcck_return
         brasl   %r14,s390_handle_mcck
 mcck_return:
-        RESTORE_ALL __LC_RETURN_MCCK_PSW,0
+        mvc     __LC_RETURN_MCCK_PSW(16),SP_PSW(%r15) # move return PSW
+        ni      __LC_RETURN_MCCK_PSW+1,0xfd # clear wait state bit
+        lmg     %r0,%r15,SP_R0(%r15)    # load gprs 0-15
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+        mvc     __LC_ASYNC_ENTER_TIMER(8),__LC_SAVE_AREA+104
+        tm      __LC_RETURN_MCCK_PSW+1,0x01 # returning to user ?
+        jno     0f
+        stpt    __LC_EXIT_TIMER
+0:
+#endif
+        lpswe   __LC_RETURN_MCCK_PSW    # back to caller
 
 #ifdef CONFIG_SMP
 /*
@@ -789,6 +818,8 @@ cleanup_table_sysc_leave:
         .quad   sysc_leave, sysc_work_loop
 cleanup_table_sysc_work_loop:
         .quad   sysc_work_loop, sysc_reschedule
+cleanup_table_io_return:
+        .quad   io_return, io_leave
 cleanup_table_io_leave:
         .quad   io_leave, io_done
 cleanup_table_io_work_loop:
@@ -815,6 +846,11 @@ cleanup_critical:
         clc     8(8,%r12),BASED(cleanup_table_sysc_work_loop+8)
         jl      cleanup_sysc_return
 0:
+        clc     8(8,%r12),BASED(cleanup_table_io_return)
+        jl      0f
+        clc     8(8,%r12),BASED(cleanup_table_io_return+8)
+        jl      cleanup_io_return
+0:
         clc     8(8,%r12),BASED(cleanup_table_io_leave)
         jl      0f
         clc     8(8,%r12),BASED(cleanup_table_io_leave+8)
@@ -847,7 +883,7 @@ cleanup_system_call:
         mvc     __LC_SAVE_AREA(32),0(%r12)
 0:      stg     %r13,8(%r12)
         stg     %r12,__LC_SAVE_AREA+96  # argh
-        SAVE_ALL __LC_SVC_OLD_PSW,__LC_SAVE_AREA,1
+        SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA
         CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA
         lg      %r12,__LC_SAVE_AREA+96  # argh
         stg     %r15,24(%r12)
@@ -957,7 +993,6 @@ cleanup_io_leave_insn:
                .quad  __critical_end
 
 #define SYSCALL(esa,esame,emu)  .long esame
-        .globl  sys_call_table
 sys_call_table:
 #include "syscalls.S"
 #undef SYSCALL
@@ -965,7 +1000,6 @@ sys_call_table:
 #ifdef CONFIG_COMPAT
 
 #define SYSCALL(esa,esame,emu)  .long emu
-        .globl  sys_call_table_emu
 sys_call_table_emu:
 #include "syscalls.S"
 #undef SYSCALL
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index ea88d066bf04..538c82da49b1 100644
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -1,7 +1,7 @@
 /*
  *  arch/s390/kernel/head.S
  *
- * (C) Copyright IBM Corp. 1999, 2005
+ * Copyright (C) IBM Corp. 1999,2006
  *
  *    Author(s): Hartmut Penner <hp@de.ibm.com>
  *               Martin Schwidefsky <schwidefsky@de.ibm.com>
@@ -482,24 +482,23 @@ start:
 
 .macro GET_IPL_DEVICE
 .Lget_ipl_device:
-        basr  %r12,0
-.LGID:  l     %r1,0xb8                  # get sid
+        l     %r1,0xb8                  # get sid
         sll   %r1,15                    # test if subchannel is enabled
         srl   %r1,31
         ltr   %r1,%r1
-        bz    0(%r14)                   # subchannel disabled
+        bz    2f-.LPG1(%r13)            # subchannel disabled
         l     %r1,0xb8
-        la    %r5,.Lipl_schib-.LGID(%r12)
+        la    %r5,.Lipl_schib-.LPG1(%r13)
         stsch 0(%r5)                    # get schib of subchannel
-        bnz   0(%r14)                   # schib not available
+        bnz   2f-.LPG1(%r13)            # schib not available
         tm    5(%r5),0x01               # devno valid?
-        bno   0(%r14)
-        la    %r6,ipl_parameter_flags-.LGID(%r12)
+        bno   2f-.LPG1(%r13)
+        la    %r6,ipl_parameter_flags-.LPG1(%r13)
         oi    3(%r6),0x01               # set flag
-        la    %r2,ipl_devno-.LGID(%r12)
+        la    %r2,ipl_devno-.LPG1(%r13)
         mvc   0(2,%r2),6(%r5)           # store devno
         tm    4(%r5),0x80               # qdio capable device?
-        bno   0(%r14)
+        bno   2f-.LPG1(%r13)
         oi    3(%r6),0x02               # set flag
 
         # copy ipl parameters
@@ -523,7 +522,7 @@ start:
         ar    %r2,%r1
         sr    %r0,%r4
         jne   1b
-        b     0(%r14)
+        b     2f-.LPG1(%r13)
 
         .align 4
 .Lipl_schib:
@@ -537,6 +536,7 @@ ipl_parameter_flags:
         .globl ipl_devno
 ipl_devno:
         .word 0
+2:
 .endm
 
 #ifdef CONFIG_64BIT
diff --git a/arch/s390/kernel/head31.S b/arch/s390/kernel/head31.S
index 2d3b089bfb83..d00de17b3778 100644
--- a/arch/s390/kernel/head31.S
+++ b/arch/s390/kernel/head31.S
@@ -1,7 +1,7 @@
 /*
  * arch/s390/kernel/head31.S
  *
- * (C) Copyright IBM Corp. 2005
+ * Copyright (C) IBM Corp. 2005,2006
  *
  *   Author(s): Hartmut Penner <hp@de.ibm.com>
  *              Martin Schwidefsky <schwidefsky@de.ibm.com>
@@ -16,12 +16,31 @@
 # or linload or SALIPL
 #
         .org    0x10000
-startup:basr    %r13,0                   # get base
-.LPG1:  l       %r1, .Lget_ipl_device_addr-.LPG1(%r13)
-        basr    %r14, %r1
+startup:basr    %r13,0                  # get base
+.LPG0:  l       %r13,0f-.LPG0(%r13)
+        b       0(%r13)
+0:      .long   startup_continue
+
+#
+# params at 10400 (setup.h)
+#
+        .org    PARMAREA
+        .long   0,0                     # IPL_DEVICE
+        .long   0,RAMDISK_ORIGIN        # INITRD_START
+        .long   0,RAMDISK_SIZE          # INITRD_SIZE
+
+        .org    COMMAND_LINE
+        .byte   "root=/dev/ram0 ro"
+        .byte   0
+
+        .org    0x11000
+
+startup_continue:
+        basr    %r13,0                  # get base
+.LPG1:  GET_IPL_DEVICE
         lctl    %c0,%c15,.Lctl-.LPG1(%r13) # load control registers
-        la      %r12,_pstart-.LPG1(%r13) # pointer to parameter area
-                                         # move IPL device to lowcore
+        l       %r12,.Lparmaddr-.LPG1(%r13) # pointer to parameter area
+                                        # move IPL device to lowcore
         mvc     __LC_IPLDEV(4),IPL_DEVICE-PARMAREA(%r12)
 
 #
@@ -51,8 +70,8 @@ startup:basr	%r13,0			 # get base
         a       %r1,__LC_EXT_NEW_PSW+4  # set handler
         st      %r1,__LC_EXT_NEW_PSW+4
 
-        la      %r4,_pstart-.LPG1(%r13) # %r4 is our index for sccb stuff
-        la      %r1, .Lsccb-PARMAREA(%r4)       # our sccb
+        l       %r4,.Lsccbaddr-.LPG1(%r13) # %r4 is our index for sccb stuff
+        lr      %r1,%r4                 # our sccb
         .insn   rre,0xb2200000,%r2,%r1  # service call
         ipm     %r1
         srl     %r1,28                  # get cc code
@@ -63,7 +82,7 @@ startup:basr	%r13,0			 # get base
         be      .Lservicecall-.LPG1(%r13)
         lpsw    .Lwaitsclp-.LPG1(%r13)
 .Lsclph:
-        lh      %r1,.Lsccbr-PARMAREA(%r4)
+        lh      %r1,.Lsccbr-.Lsccb(%r4)
         chi     %r1,0x10                # 0x0010 is the sucess code
         je      .Lprocsccb              # let's process the sccb
         chi     %r1,0x1f0
@@ -74,7 +93,7 @@ startup:basr	%r13,0			 # get base
         b       .Lservicecall-.LPG1(%r13)
 .Lprocsccb:
         lhi     %r1,0
-        icm     %r1,3,.Lscpincr1-PARMAREA(%r4) # use this one if != 0
+        icm     %r1,3,.Lscpincr1-.Lsccb(%r4) # use this one if != 0
         jnz     .Lscnd
         lhi     %r1,0x800               # otherwise report 2GB
 .Lscnd:
@@ -84,10 +103,10 @@ startup:basr	%r13,0			 # get base
         lr      %r1,%r3
 .Lno2gb:
         xr      %r3,%r3                 # same logic
-        ic      %r3,.Lscpa1-PARMAREA(%r4)
+        ic      %r3,.Lscpa1-.Lsccb(%r4)
         chi     %r3,0x00
         jne     .Lcompmem
-        l       %r3,.Lscpa2-PARMAREA(%r13)
+        l       %r3,.Lscpa2-.Lsccb(%r4)
 .Lcompmem:
         mr      %r2,%r1                 # mem in MB on 128-bit
         l       %r1,.Lonemb-.LPG1(%r13)
@@ -95,8 +114,6 @@ startup:basr	%r13,0			 # get base
         b       .Lfchunk-.LPG1(%r13)
 
         .align 4
-.Lget_ipl_device_addr:
-        .long   .Lget_ipl_device
 .Lpmask:
         .byte   0
 .align 8
@@ -242,6 +259,8 @@ startup:basr	%r13,0			 # get base
         .long   0                       # cr13: home space segment table
         .long   0xc0000000              # cr14: machine check handling off
         .long   0                       # cr15: linkage stack operations
+.Lduct: .long   0,0,0,0,0,0,0,0
+        .long   0,0,0,0,0,0,0,0
 .Lpcmem:.long   0x00080000,0x80000000 + .Lchkmem
 .Lpcfpu:.long   0x00080000,0x80000000 + .Lchkfpu
 .Lpccsp:.long   0x00080000,0x80000000 + .Lchkcsp
@@ -252,25 +271,9 @@ startup:basr	%r13,0			 # get base
 .Lmflags:.long  machine_flags
 .Lbss_bgn:  .long __bss_start
 .Lbss_end:  .long _end
-
-        .org    PARMAREA-64
-.Lduct: .long   0,0,0,0,0,0,0,0
-        .long   0,0,0,0,0,0,0,0
-
-#
-# params at 10400 (setup.h)
-#
-        .org    PARMAREA
-        .global _pstart
-_pstart:
-        .long   0,0                     # IPL_DEVICE
-        .long   0,RAMDISK_ORIGIN        # INITRD_START
-        .long   0,RAMDISK_SIZE          # INITRD_SIZE
-
-        .org    COMMAND_LINE
-        .byte   "root=/dev/ram0 ro"
-        .byte   0
-        .org    0x11000
+.Lparmaddr: .long PARMAREA
+.Lsccbaddr: .long .Lsccb
+        .align  4096
 .Lsccb:
         .hword  0x1000                  # length, one page
         .byte   0x00,0x00,0x00
@@ -287,18 +290,14 @@ _pstart:
 .Lscpincr2:
         .quad   0x00
         .fill   3984,1,0
-        .org    0x12000
-        .global _pend
-_pend:
-
-        GET_IPL_DEVICE
+        .align  4096
 
 #ifdef CONFIG_SHARED_KERNEL
         .org    0x100000
 #endif
 
 #
-# startup-code, running in virtual mode
+# startup-code, running in absolute addressing mode
 #
         .globl  _stext
 _stext: basr    %r13,0                  # get base
diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index f08c06f45d5c..47744fcca930 100644
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -1,7 +1,7 @@
 /*
  * arch/s390/kernel/head64.S
  *
- * (C) Copyright IBM Corp. 1999,2005
+ * Copyright (C) IBM Corp. 1999,2006
  *
  *   Author(s): Hartmut Penner <hp@de.ibm.com>
  *              Martin Schwidefsky <schwidefsky@de.ibm.com>
@@ -15,18 +15,37 @@
 # this is called either by the ipl loader or directly by PSW restart
 # or linload or SALIPL
 #
-        .org  0x10000
-startup:basr  %r13,0                     # get base
+        .org  0x10000
+startup:basr  %r13,0                     # get base
+.LPG0:  l     %r13,0f-.LPG0(%r13)
+        b     0(%r13)
+0:      .long startup_continue
+
+#
+# params at 10400 (setup.h)
+#
+        .org   PARMAREA
+        .quad  0                        # IPL_DEVICE
+        .quad  RAMDISK_ORIGIN           # INITRD_START
+        .quad  RAMDISK_SIZE             # INITRD_SIZE
+
+        .org   COMMAND_LINE
+        .byte  "root=/dev/ram0 ro"
+        .byte  0
+
+        .org   0x11000
+
+startup_continue:
+        basr  %r13,0                     # get base
 .LPG1:  sll   %r13,1                     # remove high order bit
         srl   %r13,1
-        l     %r1,.Lget_ipl_device_addr-.LPG1(%r13)
-        basr  %r14,%r1
+        GET_IPL_DEVICE
         lhi   %r1,1                      # mode 1 = esame
         slr   %r0,%r0                    # set cpuid to zero
         sigp  %r1,%r0,0x12               # switch to esame mode
         sam64                            # switch to 64 bit mode
         lctlg %c0,%c15,.Lctl-.LPG1(%r13) # load control registers
-        larl  %r12,_pstart               # pointer to parameter area
+        lg    %r12,.Lparmaddr-.LPG1(%r13)# pointer to parameter area
                                          # move IPL device to lowcore
         mvc   __LC_IPLDEV(4),IPL_DEVICE+4-PARMAREA(%r12)
 
@@ -55,8 +74,8 @@ startup:basr  %r13,0                     # get base
         larl  %r1,.Lsclph
         stg   %r1,__LC_EXT_NEW_PSW+8    # set handler
 
-        larl  %r4,_pstart               # %r4 is our index for sccb stuff
-        la    %r1,.Lsccb-PARMAREA(%r4)  # our sccb
+        larl  %r4,.Lsccb                # %r4 is our index for sccb stuff
+        lgr   %r1,%r4                   # our sccb
         .insn rre,0xb2200000,%r2,%r1    # service call
         ipm   %r1
         srl   %r1,28                    # get cc code
@@ -67,7 +86,7 @@ startup:basr  %r13,0                     # get base
         be    .Lservicecall-.LPG1(%r13)
         lpswe .Lwaitsclp-.LPG1(%r13)
 .Lsclph:
-        lh    %r1,.Lsccbr-PARMAREA(%r4)
+        lh    %r1,.Lsccbr-.Lsccb(%r4)
         chi   %r1,0x10                  # 0x0010 is the sucess code
         je    .Lprocsccb                # let's process the sccb
         chi   %r1,0x1f0
@@ -78,15 +97,15 @@ startup:basr  %r13,0                     # get base
         b     .Lservicecall-.LPG1(%r13)
 .Lprocsccb:
         lghi  %r1,0
-        icm   %r1,3,.Lscpincr1-PARMAREA(%r4) # use this one if != 0
+        icm   %r1,3,.Lscpincr1-.Lsccb(%r4) # use this one if != 0
         jnz   .Lscnd
-        lg    %r1,.Lscpincr2-PARMAREA(%r4) # otherwise use this one
+        lg    %r1,.Lscpincr2-.Lsccb(%r4) # otherwise use this one
 .Lscnd:
         xr    %r3,%r3                   # same logic
-        ic    %r3,.Lscpa1-PARMAREA(%r4)
+        ic    %r3,.Lscpa1-.Lsccb(%r4)
         chi   %r3,0x00
         jne   .Lcompmem
-        l     %r3,.Lscpa2-PARMAREA(%r13)
+        l     %r3,.Lscpa2-.Lsccb(%r4)
 .Lcompmem:
         mlgr  %r2,%r1                   # mem in MB on 128-bit
         l     %r1,.Lonemb-.LPG1(%r13)
@@ -94,8 +113,6 @@ startup:basr  %r13,0                     # get base
         b     .Lfchunk-.LPG1(%r13)
 
         .align 4
-.Lget_ipl_device_addr:
-        .long .Lget_ipl_device
 .Lpmask:
         .byte 0
         .align 8
@@ -242,29 +259,16 @@ startup:basr  %r13,0                     # get base
         .quad  0                        # cr13: home space segment table
         .quad  0xc0000000               # cr14: machine check handling off
         .quad  0                        # cr15: linkage stack operations
+.Lduct: .long 0,0,0,0,0,0,0,0
+        .long 0,0,0,0,0,0,0,0
 .Lpcmsk:.quad  0x0000000180000000
 .L4malign:.quad 0xffffffffffc00000
 .Lscan2g:.quad 0x80000000 + 0x20000 - 8 # 2GB + 128K - 8
 .Lnop:  .long  0x07000700
+.Lparmaddr:
+        .quad   PARMAREA
 
-        .org PARMAREA-64
-.Lduct: .long 0,0,0,0,0,0,0,0
-        .long 0,0,0,0,0,0,0,0
-
-#
-# params at 10400 (setup.h)
-#
-        .org   PARMAREA
-        .global _pstart
-_pstart:
-        .quad  0                        # IPL_DEVICE
-        .quad  RAMDISK_ORIGIN           # INITRD_START
-        .quad  RAMDISK_SIZE             # INITRD_SIZE
-
-        .org   COMMAND_LINE
-        .byte  "root=/dev/ram0 ro"
-        .byte  0
-        .org   0x11000
+        .align 4096
 .Lsccb:
         .hword 0x1000                   # length, one page
         .byte 0x00,0x00,0x00
@@ -281,18 +285,14 @@ _pstart:
 .Lscpincr2:
         .quad 0x00
         .fill 3984,1,0
-        .org 0x12000
-        .global _pend
-_pend:  
-
-        GET_IPL_DEVICE
+        .align 4096
 
 #ifdef CONFIG_SHARED_KERNEL
         .org   0x100000
 #endif
         
 #
-# startup-code, running in virtual mode
+# startup-code, running in absolute addressing mode
 #
         .globl _stext
 _stext: basr  %r13,0                    # get base
@@ -326,4 +326,3 @@ _stext:	basr  %r13,0                    # get base
             .align 8
 .Ldw:       .quad  0x0002000180000000,0x0000000000000000
 .Laregs:    .long  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-
diff --git a/arch/s390/kernel/s390_ksyms.c b/arch/s390/kernel/s390_ksyms.c
index 4176c77670c4..0886e739d122 100644
--- a/arch/s390/kernel/s390_ksyms.c
+++ b/arch/s390/kernel/s390_ksyms.c
@@ -46,8 +46,6 @@ EXPORT_SYMBOL(__down_interruptible);
  */
 extern int dump_fpu (struct pt_regs * regs, s390_fp_regs *fpregs);
 EXPORT_SYMBOL(dump_fpu);
-EXPORT_SYMBOL(overflowuid);
-EXPORT_SYMBOL(overflowgid);
 EXPORT_SYMBOL(empty_zero_page);
 
 /*
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index b282034452a4..2b2551e3510b 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -37,6 +37,7 @@
 #include <linux/seq_file.h>
 #include <linux/kernel_stat.h>
 #include <linux/device.h>
+#include <linux/notifier.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -115,6 +116,7 @@ void __devinit cpu_init (void)
  */
 char vmhalt_cmd[128] = "";
 char vmpoff_cmd[128] = "";
+char vmpanic_cmd[128] = "";
 
 static inline void strncpy_skip_quote(char *dst, char *src, int n)
 {
@@ -146,6 +148,38 @@ static int __init vmpoff_setup(char *str)
 
 __setup("vmpoff=", vmpoff_setup);
 
+static int vmpanic_notify(struct notifier_block *self, unsigned long event,
+                          void *data)
+{
+        if (MACHINE_IS_VM && strlen(vmpanic_cmd) > 0)
+                cpcmd(vmpanic_cmd, NULL, 0, NULL);
+
+        return NOTIFY_OK;
+}
+
+#define PANIC_PRI_VMPANIC       0
+
+static struct notifier_block vmpanic_nb = {
+        .notifier_call = vmpanic_notify,
+        .priority = PANIC_PRI_VMPANIC
+};
+
+static int __init vmpanic_setup(char *str)
+{
+        static int register_done __initdata = 0;
+
+        strncpy_skip_quote(vmpanic_cmd, str, 127);
+        vmpanic_cmd[127] = 0;
+        if (!register_done) {
+                register_done = 1;
+                atomic_notifier_chain_register(&panic_notifier_list,
+                                               &vmpanic_nb);
+        }
+        return 1;
+}
+
+__setup("vmpanic=", vmpanic_setup);
+
 /*
  * condev= and conmode= setup parameter.
  */
@@ -289,19 +323,34 @@ void (*_machine_power_off)(void) = do_machine_power_off_nonsmp;
 
 void machine_restart(char *command)
 {
-        console_unblank();
+        if (!in_interrupt() || oops_in_progress)
+                /*
+                 * Only unblank the console if we are called in enabled
+                 * context or a bust_spinlocks cleared the way for us.
+                 */
+                console_unblank();
         _machine_restart(command);
 }
 
 void machine_halt(void)
 {
-        console_unblank();
+        if (!in_interrupt() || oops_in_progress)
+                /*
+                 * Only unblank the console if we are called in enabled
+                 * context or a bust_spinlocks cleared the way for us.
+                 */
+                console_unblank();
         _machine_halt();
 }
 
 void machine_power_off(void)
 {
-        console_unblank();
+        if (!in_interrupt() || oops_in_progress)
+                /*
+                 * Only unblank the console if we are called in enabled
+                 * context or a bust_spinlocks cleared the way for us.
+                 */
+                console_unblank();
         _machine_power_off();
 }
 
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 343120c9223d..8e03219eea76 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -869,7 +869,7 @@ static int __init topology_init(void)
         int ret;
 
         for_each_possible_cpu(cpu) {
-                ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu, NULL);
+                ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu);
                 if (ret)
                         printk(KERN_WARNING "topology_init: register_cpu %d "
                                "failed (%d)\n", cpu, ret);
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index a46793beeddd..b7630436f693 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -150,13 +150,11 @@ void show_stack(struct task_struct *task, unsigned long *sp)
         unsigned long *stack;
         int i;
 
-        // debugging aid: "show_stack(NULL);" prints the
-        // back trace for this cpu.
-
         if (!sp)
-                sp = task ? (unsigned long *) task->thread.ksp : __r15;
+                stack = task ? (unsigned long *) task->thread.ksp : __r15;
+        else
+                stack = sp;
 
-        stack = sp;
         for (i = 0; i < kstack_depth_to_print; i++) {
                 if (((addr_t) stack & (THREAD_SIZE-1)) == 0)
                         break;
diff --git a/arch/sh/boards/adx/irq_maskreg.c b/arch/sh/boards/adx/irq_maskreg.c
index c0973f8d57ba..357fab1bac2b 100644
--- a/arch/sh/boards/adx/irq_maskreg.c
+++ b/arch/sh/boards/adx/irq_maskreg.c
@@ -102,6 +102,6 @@ static void end_maskreg_irq(unsigned int irq)
 void make_maskreg_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
-        irq_desc[irq].handler = &maskreg_irq_type;
+        irq_desc[irq].chip = &maskreg_irq_type;
         disable_maskreg_irq(irq);
 }
diff --git a/arch/sh/boards/bigsur/irq.c b/arch/sh/boards/bigsur/irq.c
index 6ddbcc77244d..1d32425782c0 100644
--- a/arch/sh/boards/bigsur/irq.c
+++ b/arch/sh/boards/bigsur/irq.c
@@ -253,7 +253,7 @@ static void make_bigsur_l1isr(unsigned int irq) {
         /* sanity check first */
         if(irq >= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH) {
                 /* save the handler in the main description table */
-                irq_desc[irq].handler = &bigsur_l1irq_type;
+                irq_desc[irq].chip = &bigsur_l1irq_type;
                 irq_desc[irq].status = IRQ_DISABLED;
                 irq_desc[irq].action = 0;
                 irq_desc[irq].depth = 1;
@@ -270,7 +270,7 @@ static void make_bigsur_l2isr(unsigned int irq) {
         /* sanity check first */
         if(irq >= BIGSUR_2NDLVL_IRQ_LOW && irq < BIGSUR_2NDLVL_IRQ_HIGH) {
                 /* save the handler in the main description table */
-                irq_desc[irq].handler = &bigsur_l2irq_type;
+                irq_desc[irq].chip = &bigsur_l2irq_type;
                 irq_desc[irq].status = IRQ_DISABLED;
                 irq_desc[irq].action = 0;
                 irq_desc[irq].depth = 1;
diff --git a/arch/sh/boards/cqreek/irq.c b/arch/sh/boards/cqreek/irq.c
index d1da0d844567..2955adc52310 100644
--- a/arch/sh/boards/cqreek/irq.c
+++ b/arch/sh/boards/cqreek/irq.c
@@ -103,7 +103,7 @@ void __init init_cqreek_IRQ(void)
                 cqreek_irq_data[14].stat_port = BRIDGE_IDE_INTR_STAT;
                 cqreek_irq_data[14].bit = 1;
 
-                irq_desc[14].handler = &cqreek_irq_type;
+                irq_desc[14].chip = &cqreek_irq_type;
                 irq_desc[14].status = IRQ_DISABLED;
                 irq_desc[14].action = 0;
                 irq_desc[14].depth = 1;
@@ -117,7 +117,7 @@ void __init init_cqreek_IRQ(void)
                 cqreek_irq_data[10].bit = (1 << 10);
 
                 /* XXX: Err... we may need demultiplexer for ISA irq... */
-                irq_desc[10].handler = &cqreek_irq_type;
+                irq_desc[10].chip = &cqreek_irq_type;
                 irq_desc[10].status = IRQ_DISABLED;
                 irq_desc[10].action = 0;
                 irq_desc[10].depth = 1;
diff --git a/arch/sh/boards/dreamcast/setup.c b/arch/sh/boards/dreamcast/setup.c
index 55dece35cde5..0027b80a2343 100644
--- a/arch/sh/boards/dreamcast/setup.c
+++ b/arch/sh/boards/dreamcast/setup.c
@@ -70,7 +70,7 @@ int __init platform_setup(void)
 
         /* Assign all virtual IRQs to the System ASIC int. handler */
         for (i = HW_EVENT_IRQ_BASE; i < HW_EVENT_IRQ_MAX; i++)
-                irq_desc[i].handler = &systemasic_int;
+                irq_desc[i].chip = &systemasic_int;
 
         board_time_init = aica_time_init;
 
diff --git a/arch/sh/boards/ec3104/setup.c b/arch/sh/boards/ec3104/setup.c
index 5130ba2b6ff1..4b3ef16a0e96 100644
--- a/arch/sh/boards/ec3104/setup.c
+++ b/arch/sh/boards/ec3104/setup.c
@@ -63,7 +63,7 @@ int __init platform_setup(void)
                 str[i] = ctrl_readb(EC3104_BASE + i);
 
         for (i = EC3104_IRQBASE; i < EC3104_IRQBASE + 32; i++)
-                irq_desc[i].handler = &ec3104_int;
+                irq_desc[i].chip = &ec3104_int;
 
         printk("initializing EC3104 \"%.8s\" at %08x, IRQ %d, IRQ base %d\n",
                str, EC3104_BASE, EC3104_IRQ, EC3104_IRQBASE);
diff --git a/arch/sh/boards/harp/irq.c b/arch/sh/boards/harp/irq.c
index 52d0ba39031b..701fa55d5297 100644
--- a/arch/sh/boards/harp/irq.c
+++ b/arch/sh/boards/harp/irq.c
@@ -114,7 +114,7 @@ static void enable_harp_irq(unsigned int irq)
 static void __init make_harp_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
-        irq_desc[irq].handler = &harp_irq_type;
+        irq_desc[irq].chip = &harp_irq_type;
         disable_harp_irq(irq);
 }
 
diff --git a/arch/sh/boards/mpc1211/pci.c b/arch/sh/boards/mpc1211/pci.c
index ba3a65439752..9f7ccd33ffb6 100644
--- a/arch/sh/boards/mpc1211/pci.c
+++ b/arch/sh/boards/mpc1211/pci.c
@@ -273,9 +273,9 @@ void __init pcibios_fixup_irqs(void)
 }
 
 void pcibios_align_resource(void *data, struct resource *res,
-                            unsigned long size, unsigned long align)
+                            resource_size_t size, resource_size_t align)
 {
-        unsigned long start = res->start;
+        resource_size_t start = res->start;
 
         if (res->flags & IORESOURCE_IO) {
                 if (start >= 0x10000UL) {
diff --git a/arch/sh/boards/mpc1211/setup.c b/arch/sh/boards/mpc1211/setup.c
index 2bb581b91683..b72f009c52c2 100644
--- a/arch/sh/boards/mpc1211/setup.c
+++ b/arch/sh/boards/mpc1211/setup.c
@@ -194,7 +194,7 @@ static struct hw_interrupt_type mpc1211_irq_type = {
 
 static void make_mpc1211_irq(unsigned int irq)
 {
-        irq_desc[irq].handler = &mpc1211_irq_type;
+        irq_desc[irq].chip = &mpc1211_irq_type;
         irq_desc[irq].status  = IRQ_DISABLED;
         irq_desc[irq].action  = 0;
         irq_desc[irq].depth   = 1;
diff --git a/arch/sh/boards/overdrive/galileo.c b/arch/sh/boards/overdrive/galileo.c
index 276fa11ee4ce..b055809d2ac1 100644
--- a/arch/sh/boards/overdrive/galileo.c
+++ b/arch/sh/boards/overdrive/galileo.c
@@ -536,7 +536,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
 }
 
 void pcibios_align_resource(void *data, struct resource *res,
-                            unsigned long size)
+                            resource_size_t size)
 {
 }
 
diff --git a/arch/sh/boards/overdrive/irq.c b/arch/sh/boards/overdrive/irq.c
index 715e8feb3a68..2c13a7de6b22 100644
--- a/arch/sh/boards/overdrive/irq.c
+++ b/arch/sh/boards/overdrive/irq.c
@@ -150,7 +150,7 @@ static void enable_od_irq(unsigned int irq)
 static void __init make_od_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
-        irq_desc[irq].handler = &od_irq_type;
+        irq_desc[irq].chip = &od_irq_type;
         disable_od_irq(irq);
 }
 
diff --git a/arch/sh/boards/renesas/hs7751rvoip/irq.c b/arch/sh/boards/renesas/hs7751rvoip/irq.c
index ed4c5b50ea45..52a98b524e1f 100644
--- a/arch/sh/boards/renesas/hs7751rvoip/irq.c
+++ b/arch/sh/boards/renesas/hs7751rvoip/irq.c
@@ -86,7 +86,7 @@ static struct hw_interrupt_type hs7751rvoip_irq_type = {
 static void make_hs7751rvoip_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
-        irq_desc[irq].handler = &hs7751rvoip_irq_type;
+        irq_desc[irq].chip = &hs7751rvoip_irq_type;
         disable_hs7751rvoip_irq(irq);
 }
 
diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/renesas/rts7751r2d/irq.c
index d36c9374aed1..e16915d9cda4 100644
--- a/arch/sh/boards/renesas/rts7751r2d/irq.c
+++ b/arch/sh/boards/renesas/rts7751r2d/irq.c
@@ -100,7 +100,7 @@ static struct hw_interrupt_type rts7751r2d_irq_type = {
 static void make_rts7751r2d_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
-        irq_desc[irq].handler = &rts7751r2d_irq_type;
+        irq_desc[irq].chip = &rts7751r2d_irq_type;
         disable_rts7751r2d_irq(irq);
 }
 
diff --git a/arch/sh/boards/renesas/systemh/irq.c b/arch/sh/boards/renesas/systemh/irq.c
index 7a2eb10edb56..845979181059 100644
--- a/arch/sh/boards/renesas/systemh/irq.c
+++ b/arch/sh/boards/renesas/systemh/irq.c
@@ -105,7 +105,7 @@ static void end_systemh_irq(unsigned int irq)
 void make_systemh_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
-        irq_desc[irq].handler = &systemh_irq_type;
+        irq_desc[irq].chip = &systemh_irq_type;
         disable_systemh_irq(irq);
 }
 
diff --git a/arch/sh/boards/se/73180/irq.c b/arch/sh/boards/se/73180/irq.c
index 70f04caad9a4..402735c7c898 100644
--- a/arch/sh/boards/se/73180/irq.c
+++ b/arch/sh/boards/se/73180/irq.c
@@ -85,7 +85,7 @@ void
 make_intreq_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
-        irq_desc[irq].handler = &intreq_irq_type;
+        irq_desc[irq].chip = &intreq_irq_type;
         disable_intreq_irq(irq);
 }
 
diff --git a/arch/sh/boards/superh/microdev/irq.c b/arch/sh/boards/superh/microdev/irq.c
index efcbd86b7cd2..cb5999425d16 100644
--- a/arch/sh/boards/superh/microdev/irq.c
+++ b/arch/sh/boards/superh/microdev/irq.c
@@ -147,7 +147,7 @@ static void enable_microdev_irq(unsigned int irq)
 static void __init make_microdev_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
-        irq_desc[irq].handler = &microdev_irq_type;
+        irq_desc[irq].chip = &microdev_irq_type;
         disable_microdev_irq(irq);
 }
 
diff --git a/arch/sh/cchips/hd6446x/hd64461/setup.c b/arch/sh/cchips/hd6446x/hd64461/setup.c
index f014b9bf6922..724db04cb392 100644
--- a/arch/sh/cchips/hd6446x/hd64461/setup.c
+++ b/arch/sh/cchips/hd6446x/hd64461/setup.c
@@ -154,7 +154,7 @@ int __init setup_hd64461(void)
         outw(0xffff, HD64461_NIMR);
 
         for (i = HD64461_IRQBASE; i < HD64461_IRQBASE + 16; i++) {
-                irq_desc[i].handler = &hd64461_irq_type;
+                irq_desc[i].chip = &hd64461_irq_type;
         }
 
         setup_irq(CONFIG_HD64461_IRQ, &irq0);
diff --git a/arch/sh/cchips/hd6446x/hd64465/setup.c b/arch/sh/cchips/hd6446x/hd64465/setup.c
index 68e4c4e4283d..cf9142c620b7 100644
--- a/arch/sh/cchips/hd6446x/hd64465/setup.c
+++ b/arch/sh/cchips/hd6446x/hd64465/setup.c
@@ -182,7 +182,7 @@ static int __init setup_hd64465(void)
         outw(0xffff, HD64465_REG_NIMR);         /* mask all interrupts */
 
         for (i = 0; i < HD64465_IRQ_NUM ; i++) {
-                irq_desc[HD64465_IRQ_BASE + i].handler = &hd64465_irq_type;
+                irq_desc[HD64465_IRQ_BASE + i].chip = &hd64465_irq_type;
         }
 
         setup_irq(CONFIG_HD64465_IRQ, &irq0);
diff --git a/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c
index 2ee330b3c38f..892214bade19 100644
--- a/arch/sh/cchips/voyagergx/irq.c
+++ b/arch/sh/cchips/voyagergx/irq.c
@@ -191,7 +191,7 @@ void __init setup_voyagergx_irq(void)
                         flag = 1;
                 }
                 if (flag == 1)
-                        irq_desc[VOYAGER_IRQ_BASE + i].handler = &voyagergx_irq_type;
+                        irq_desc[VOYAGER_IRQ_BASE + i].chip = &voyagergx_irq_type;
         }
 
         setup_irq(IRQ_VOYAGER, &irq0);
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index c1669905abe4..3d546ba329cf 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -75,7 +75,7 @@ pcibios_update_resource(struct pci_dev *dev, struct resource *root,
 }
 
 void pcibios_align_resource(void *data, struct resource *res,
-                            unsigned long size, unsigned long align)
+                            resource_size_t size, resource_size_t align)
                             __attribute__ ((weak));
 
 /*
@@ -85,10 +85,10 @@ void pcibios_align_resource(void *data, struct resource *res,
  * modulo 0x400.
  */
 void pcibios_align_resource(void *data, struct resource *res,
-                            unsigned long size, unsigned long align)
+                            resource_size_t size, resource_size_t align)
 {
         if (res->flags & IORESOURCE_IO) {
-                unsigned long start = res->start;
+                resource_size_t start = res->start;
 
                 if (start & 0x300) {
                         start = (start + 0x3ff) & ~0x3ff;
diff --git a/arch/sh/kernel/cpu/irq/imask.c b/arch/sh/kernel/cpu/irq/imask.c
index baed9a550d39..a33ae3e0a5a5 100644
--- a/arch/sh/kernel/cpu/irq/imask.c
+++ b/arch/sh/kernel/cpu/irq/imask.c
@@ -105,6 +105,6 @@ static void shutdown_imask_irq(unsigned int irq)
 void make_imask_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
-        irq_desc[irq].handler = &imask_irq_type;
+        irq_desc[irq].chip = &imask_irq_type;
         enable_irq(irq);
 }
diff --git a/arch/sh/kernel/cpu/irq/intc2.c b/arch/sh/kernel/cpu/irq/intc2.c
index 06e8afab32e4..30064bf6e154 100644
--- a/arch/sh/kernel/cpu/irq/intc2.c
+++ b/arch/sh/kernel/cpu/irq/intc2.c
@@ -137,7 +137,7 @@ void make_intc2_irq(unsigned int irq,
 
         local_irq_restore(flags);
 
-        irq_desc[irq].handler = &intc2_irq_type;
+        irq_desc[irq].chip = &intc2_irq_type;
 
         disable_intc2_irq(irq);
 }
diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c
index e55150ed0856..0373b65c77f9 100644
--- a/arch/sh/kernel/cpu/irq/ipr.c
+++ b/arch/sh/kernel/cpu/irq/ipr.c
@@ -115,7 +115,7 @@ void make_ipr_irq(unsigned int irq, unsigned int addr, int pos, int priority)
         ipr_data[irq].shift = pos*4; /* POSition (0-3) x 4 means shift */
         ipr_data[irq].priority = priority;
 
-        irq_desc[irq].handler = &ipr_irq_type;
+        irq_desc[irq].chip = &ipr_irq_type;
         disable_ipr_irq(irq);
 }
 
diff --git a/arch/sh/kernel/cpu/irq/pint.c b/arch/sh/kernel/cpu/irq/pint.c
index 95d6024fe1ae..714963a25bba 100644
--- a/arch/sh/kernel/cpu/irq/pint.c
+++ b/arch/sh/kernel/cpu/irq/pint.c
@@ -85,7 +85,7 @@ static void end_pint_irq(unsigned int irq)
 void make_pint_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
-        irq_desc[irq].handler = &pint_irq_type;
+        irq_desc[irq].chip = &pint_irq_type;
         disable_pint_irq(irq);
 }
 
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index b56e79632f24..c2e07f7f3496 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -47,7 +47,7 @@ int show_interrupts(struct seq_file *p, void *v)
                         goto unlock;
                 seq_printf(p, "%3d: ",i);
                 seq_printf(p, "%10u ", kstat_irqs(i));
-                seq_printf(p, " %14s", irq_desc[i].handler->typename);
+                seq_printf(p, " %14s", irq_desc[i].chip->typename);
                 seq_printf(p, "  %s", action->name);
 
                 for (action=action->next; action; action = action->next)
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index bb229ef030f3..9af22116c9a2 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -402,7 +402,7 @@ static int __init topology_init(void)
         int cpu_id;
 
         for_each_possible_cpu(cpu_id)
-                register_cpu(&cpu[cpu_id], cpu_id, NULL);
+                register_cpu(&cpu[cpu_id], cpu_id);
 
         return 0;
 }
diff --git a/arch/sh64/kernel/irq.c b/arch/sh64/kernel/irq.c
index d69879c0e063..675776a5477e 100644
--- a/arch/sh64/kernel/irq.c
+++ b/arch/sh64/kernel/irq.c
@@ -65,7 +65,7 @@ int show_interrupts(struct seq_file *p, void *v)
                         goto unlock;
                 seq_printf(p, "%3d: ",i);
                 seq_printf(p, "%10u ", kstat_irqs(i));
-                seq_printf(p, " %14s", irq_desc[i].handler->typename);
+                seq_printf(p, " %14s", irq_desc[i].chip->typename);
                 seq_printf(p, "  %s", action->name);
 
                 for (action=action->next; action; action = action->next)
diff --git a/arch/sh64/kernel/irq_intc.c b/arch/sh64/kernel/irq_intc.c
index fc99bf4e362c..fa730f5fe2e6 100644
--- a/arch/sh64/kernel/irq_intc.c
+++ b/arch/sh64/kernel/irq_intc.c
@@ -178,7 +178,7 @@ static void end_intc_irq(unsigned int irq)
 void make_intc_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
-        irq_desc[irq].handler = &intc_irq_type;
+        irq_desc[irq].chip = &intc_irq_type;
         disable_intc_irq(irq);
 }
 
@@ -208,7 +208,7 @@ void __init init_IRQ(void)
         /* Set default: per-line enable/disable, priority driven ack/eoi */
         for (i = 0; i < NR_INTC_IRQS; i++) {
                 if (platform_int_priority[i] != NO_PRIORITY) {
-                        irq_desc[i].handler = &intc_irq_type;
+                        irq_desc[i].chip = &intc_irq_type;
                 }
         }
 
diff --git a/arch/sh64/kernel/pcibios.c b/arch/sh64/kernel/pcibios.c
index 50c61dcb9fae..945920bc24db 100644
--- a/arch/sh64/kernel/pcibios.c
+++ b/arch/sh64/kernel/pcibios.c
@@ -69,10 +69,10 @@ pcibios_update_resource(struct pci_dev *dev, struct resource *root,
  * modulo 0x400.
  */
 void pcibios_align_resource(void *data, struct resource *res,
-                            unsigned long size, unsigned long align)
+                            resource_size_t size, resource_size_t align)
 {
         if (res->flags & IORESOURCE_IO) {
-                unsigned long start = res->start;
+                resource_size_t start = res->start;
 
                 if (start & 0x300) {
                         start = (start + 0x3ff) & ~0x3ff;
diff --git a/arch/sh64/kernel/setup.c b/arch/sh64/kernel/setup.c
index d2711c9c9d13..da98d8dbcf95 100644
--- a/arch/sh64/kernel/setup.c
+++ b/arch/sh64/kernel/setup.c
@@ -309,7 +309,7 @@ static struct cpu cpu[1];
 
 static int __init topology_init(void)
 {
-        return register_cpu(cpu, 0, NULL);
+        return register_cpu(cpu, 0);
 }
 
 subsys_initcall(topology_init);
diff --git a/arch/sh64/mach-cayman/irq.c b/arch/sh64/mach-cayman/irq.c
index f797c84bfdd1..05eb7cdc26f0 100644
--- a/arch/sh64/mach-cayman/irq.c
+++ b/arch/sh64/mach-cayman/irq.c
@@ -187,7 +187,7 @@ void init_cayman_irq(void)
         }
 
         for (i=0; i<NR_EXT_IRQS; i++) {
-                irq_desc[START_EXT_IRQS + i].handler = &cayman_irq_type;
+                irq_desc[START_EXT_IRQS + i].chip = &cayman_irq_type;
         }
 
         /* Setup the SMSC interrupt */
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index ae4c667c906f..79d177149fdb 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -208,7 +208,7 @@ _sparc_ioremap(struct resource *res, u32 bus, u32 pa, int sz)
         pa &= PAGE_MASK;
         sparc_mapiorange(bus, pa, res->start, res->end - res->start + 1);
 
-        return (void __iomem *) (res->start + offset);
+        return (void __iomem *)(unsigned long)(res->start + offset);
 }
 
 /*
@@ -325,7 +325,7 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp)
                 res->name = sdev->prom_name;
         }
 
-        return (void *)res->start;
+        return (void *)(unsigned long)res->start;
 
 err_noiommu:
         release_resource(res);
@@ -819,7 +819,9 @@ _sparc_io_get_info(char *buf, char **start, off_t fpos, int length, int *eof,
                 if (p + 32 >= e)        /* Better than nothing */
                         break;
                 if ((nm = r->name) == 0) nm = "???";
-                p += sprintf(p, "%08lx-%08lx: %s\n", r->start, r->end, nm);
+                p += sprintf(p, "%016llx-%016llx: %s\n",
+                                (unsigned long long)r->start,
+                                (unsigned long long)r->end, nm);
         }
 
         return p-buf;
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index bcfdddd0418a..5df3ebdc0ab1 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -860,7 +860,7 @@ char * __init pcibios_setup(char *str)
 }
 
 void pcibios_align_resource(void *data, struct resource *res,
-                            unsigned long size, unsigned long align)
+                            resource_size_t size, resource_size_t align)
 {
 }
 
diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c
index a893a9cc9534..2e5d08ce217b 100644
--- a/arch/sparc/kernel/setup.c
+++ b/arch/sparc/kernel/setup.c
@@ -496,7 +496,7 @@ static int __init topology_init(void)
                 if (!p)
                         err = -ENOMEM;
                 else
-                        register_cpu(p, i, NULL);
+                        register_cpu(p, i);
         }
 
         return err;
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index cc89b06d0178..ab9e640df228 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -151,7 +151,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, " %9s", irq_desc[i].handler->typename);
+                seq_printf(p, " %9s", irq_desc[i].chip->typename);
                 seq_printf(p, "  %s", action->name);
 
                 for (action=action->next; action; action = action->next)
@@ -224,7 +224,7 @@ static inline struct ino_bucket *virt_irq_to_bucket(unsigned int virt_irq)
 #ifdef CONFIG_SMP
 static int irq_choose_cpu(unsigned int virt_irq)
 {
-        cpumask_t mask = irq_affinity[virt_irq];
+        cpumask_t mask = irq_desc[virt_irq].affinity;
         int cpuid;
 
         if (cpus_equal(mask, CPU_MASK_ALL)) {
@@ -414,8 +414,8 @@ void irq_install_pre_handler(int virt_irq,
         data->pre_handler_arg1 = arg1;
         data->pre_handler_arg2 = arg2;
 
-        desc->handler = (desc->handler == &sun4u_irq ?
-                         &sun4u_irq_ack : &sun4v_irq_ack);
+        desc->chip = (desc->chip == &sun4u_irq ?
+                      &sun4u_irq_ack : &sun4v_irq_ack);
 }
 
 unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap)
@@ -431,7 +431,7 @@ unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap)
         bucket = &ivector_table[ino];
         if (!bucket->virt_irq) {
                 bucket->virt_irq = virt_irq_alloc(__irq(bucket));
-                irq_desc[bucket->virt_irq].handler = &sun4u_irq;
+                irq_desc[bucket->virt_irq].chip = &sun4u_irq;
         }
 
         desc = irq_desc + bucket->virt_irq;
@@ -465,7 +465,7 @@ unsigned int sun4v_build_irq(u32 devhandle, unsigned int devino)
         bucket = &ivector_table[sysino];
         if (!bucket->virt_irq) {
                 bucket->virt_irq = virt_irq_alloc(__irq(bucket));
-                irq_desc[bucket->virt_irq].handler = &sun4v_irq;
+                irq_desc[bucket->virt_irq].chip = &sun4v_irq;
         }
 
         desc = irq_desc + bucket->virt_irq;
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 6c9e3e94abaa..20ca9ec8fd3b 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -357,7 +357,7 @@ void pcibios_update_irq(struct pci_dev *pdev, int irq)
 }
 
 void pcibios_align_resource(void *data, struct resource *res,
-                            unsigned long size, unsigned long align)
+                            resource_size_t size, resource_size_t align)
 {
 }
 
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index a6a7d8168346..116d9632002d 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -537,7 +537,7 @@ static int __init topology_init(void)
         for_each_possible_cpu(i) {
                 struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);
                 if (p) {
-                        register_cpu(p, i, NULL);
+                        register_cpu(p, i);
                         err = 0;
                 }
         }
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 5c2bcf354ce6..cb75a27adb51 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -18,6 +18,7 @@
 #include <linux/initrd.h>
 #include <linux/swap.h>
 #include <linux/pagemap.h>
+#include <linux/poison.h>
 #include <linux/fs.h>
 #include <linux/seq_file.h>
 #include <linux/kprobes.h>
@@ -1520,7 +1521,7 @@ void free_initmem(void)
                 page = (addr +
                         ((unsigned long) __va(kern_base)) -
                         ((unsigned long) KERNBASE));
-                memset((void *)addr, 0xcc, PAGE_SIZE);
+                memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
                 p = virt_to_page(page);
 
                 ClearPageReserved(p);
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 2ffda012385e..fae43a3054a0 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -63,7 +63,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].handler->typename);
+                seq_printf(p, " %14s", irq_desc[i].chip->typename);
                 seq_printf(p, "  %s", action->name);
 
                 for (action=action->next; action; action = action->next)
@@ -451,13 +451,13 @@ void __init init_IRQ(void)
         irq_desc[TIMER_IRQ].status = IRQ_DISABLED;
         irq_desc[TIMER_IRQ].action = NULL;
         irq_desc[TIMER_IRQ].depth = 1;
-        irq_desc[TIMER_IRQ].handler = &SIGVTALRM_irq_type;
+        irq_desc[TIMER_IRQ].chip = &SIGVTALRM_irq_type;
         enable_irq(TIMER_IRQ);
         for (i = 1; i < NR_IRQS; i++) {
                 irq_desc[i].status = IRQ_DISABLED;
                 irq_desc[i].action = NULL;
                 irq_desc[i].depth = 1;
-                irq_desc[i].handler = &normal_irq_type;
+                irq_desc[i].chip = &normal_irq_type;
                 enable_irq(i);
         }
 }
diff --git a/arch/v850/kernel/irq.c b/arch/v850/kernel/irq.c
index 7a151c26f82e..858c45819aab 100644
--- a/arch/v850/kernel/irq.c
+++ b/arch/v850/kernel/irq.c
@@ -65,10 +65,10 @@ int show_interrupts(struct seq_file *p, void *v)
                         int j;
                         int count = 0;
                         int num = -1;
-                        const char *type_name = irq_desc[irq].handler->typename;
+                        const char *type_name = irq_desc[irq].chip->typename;
 
                         for (j = 0; j < NR_IRQS; j++)
-                                if (irq_desc[j].handler->typename == type_name){
+                                if (irq_desc[j].chip->typename == type_name){
                                         if (irq == j)
                                                 num = count;
                                         count++;
@@ -117,7 +117,7 @@ init_irq_handlers (int base_irq, int num, int interval,
                 irq_desc[base_irq].status  = IRQ_DISABLED;
                 irq_desc[base_irq].action  = NULL;
                 irq_desc[base_irq].depth   = 1;
-                irq_desc[base_irq].handler = irq_type;
+                irq_desc[base_irq].chip = irq_type;
                 base_irq += interval;
         }
 }
diff --git a/arch/v850/kernel/rte_mb_a_pci.c b/arch/v850/kernel/rte_mb_a_pci.c
index ffbb6d073bf2..3a7c5c9c3ac6 100644
--- a/arch/v850/kernel/rte_mb_a_pci.c
+++ b/arch/v850/kernel/rte_mb_a_pci.c
@@ -329,7 +329,7 @@ void pcibios_fixup_bus(struct pci_bus *b)
 
 void
 pcibios_align_resource (void *data, struct resource *res,
-                        unsigned long size, unsigned long align)
+                        resource_size_t size, resource_size_t align)
 {
 }
 
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index ccc4a7fb97a3..91039844820c 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -370,6 +370,8 @@ config HOTPLUG_CPU
                 can be controlled through /sys/devices/system/cpu/cpu#.
                 Say N if you want to disable CPU hotplug.
 
+config ARCH_ENABLE_MEMORY_HOTPLUG
+        def_bool y
 
 config HPET_TIMER
         bool
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index 7290e72b9a34..22cac4487b57 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -588,7 +588,7 @@ END(common_interrupt)
  */             
         .macro apicinterrupt num,func
         INTR_FRAME
-        pushq $\num-256
+        pushq $~(\num)
         CFI_ADJUST_CFA_OFFSET 8
         interrupt \func
         jmp ret_from_intr
diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c
index 86b2c1e197aa..3dd1659427dc 100644
--- a/arch/x86_64/kernel/i8259.c
+++ b/arch/x86_64/kernel/i8259.c
@@ -235,7 +235,7 @@ void make_8259A_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
         io_apic_irqs &= ~(1<<irq);
-        irq_desc[irq].handler = &i8259A_irq_type;
+        irq_desc[irq].chip = &i8259A_irq_type;
         enable_irq(irq);
 }
 
@@ -468,12 +468,12 @@ void __init init_ISA_irqs (void)
                         /*
                          * 16 old-style INTA-cycle interrupts:
                          */
-                        irq_desc[i].handler = &i8259A_irq_type;
+                        irq_desc[i].chip = &i8259A_irq_type;
                 } else {
                         /*
                          * 'high' PCI IRQs filled in on demand
                          */
-                        irq_desc[i].handler = &no_irq_type;
+                        irq_desc[i].chip = &no_irq_type;
                 }
         }
 }
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index c768d8a036d0..401b687fef21 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -876,15 +876,17 @@ static struct hw_interrupt_type ioapic_edge_type;
 #define IOAPIC_EDGE     0
 #define IOAPIC_LEVEL    1
 
-static inline void ioapic_register_intr(int irq, int vector, unsigned long trigger)
+static void ioapic_register_intr(int irq, int vector, unsigned long trigger)
 {
-        unsigned idx = use_pci_vector() && !platform_legacy_irq(irq) ? vector : irq;
+        unsigned idx;
+
+        idx = use_pci_vector() && !platform_legacy_irq(irq) ? vector : irq;
 
         if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||
                         trigger == IOAPIC_LEVEL)
-                irq_desc[idx].handler = &ioapic_level_type;
+                irq_desc[idx].chip = &ioapic_level_type;
         else
-                irq_desc[idx].handler = &ioapic_edge_type;
+                irq_desc[idx].chip = &ioapic_edge_type;
         set_intr_gate(vector, interrupt[idx]);
 }
 
@@ -986,7 +988,7 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in
          * The timer IRQ doesn't have to know that behind the
          * scene we have a 8259A-master in AEOI mode ...
          */
-        irq_desc[0].handler = &ioapic_edge_type;
+        irq_desc[0].chip = &ioapic_edge_type;
 
         /*
          * Add it to the IO-APIC irq-routing table:
@@ -1616,6 +1618,13 @@ static void set_ioapic_affinity_vector (unsigned int vector,
 #endif // CONFIG_SMP
 #endif // CONFIG_PCI_MSI
 
+static int ioapic_retrigger(unsigned int irq)
+{
+        send_IPI_self(IO_APIC_VECTOR(irq));
+
+        return 1;
+}
+
 /*
  * Level and edge triggered IO-APIC interrupts need different handling,
  * so we use two separate IRQ descriptors. Edge triggered IRQs can be
@@ -1636,6 +1645,7 @@ static struct hw_interrupt_type ioapic_edge_type __read_mostly = {
 #ifdef CONFIG_SMP
         .set_affinity = set_ioapic_affinity,
 #endif
+        .retrigger      = ioapic_retrigger,
 };
 
 static struct hw_interrupt_type ioapic_level_type __read_mostly = {
@@ -1649,6 +1659,7 @@ static struct hw_interrupt_type ioapic_level_type __read_mostly = {
 #ifdef CONFIG_SMP
         .set_affinity = set_ioapic_affinity,
 #endif
+        .retrigger      = ioapic_retrigger,
 };
 
 static inline void init_IO_APIC_traps(void)
@@ -1683,7 +1694,7 @@ static inline void init_IO_APIC_traps(void)
                                 make_8259A_irq(irq);
                         else
                                 /* Strange. Oh, well.. */
-                                irq_desc[irq].handler = &no_irq_type;
+                                irq_desc[irq].chip = &no_irq_type;
                 }
         }
 }
@@ -1900,7 +1911,7 @@ static inline void check_timer(void)
         apic_printk(APIC_VERBOSE, KERN_INFO "...trying to set up timer as Virtual Wire IRQ...");
 
         disable_8259A_irq(0);
-        irq_desc[0].handler = &lapic_irq_type;
+        irq_desc[0].chip = &lapic_irq_type;
         apic_write(APIC_LVT0, APIC_DM_FIXED | vector);  /* Fixed mode */
         enable_8259A_irq(0);
 
diff --git a/arch/x86_64/kernel/irq.c b/arch/x86_64/kernel/irq.c
index 59518d4d4358..a1f1df5f7bfc 100644
--- a/arch/x86_64/kernel/irq.c
+++ b/arch/x86_64/kernel/irq.c
@@ -79,7 +79,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].handler->typename);
+                seq_printf(p, " %14s", irq_desc[i].chip->typename);
 
                 seq_printf(p, "  %s", action->name);
                 for (action=action->next; action; action = action->next)
@@ -115,8 +115,14 @@ skip:
  */
 asmlinkage unsigned int do_IRQ(struct pt_regs *regs)
 {       
-        /* high bits used in ret_from_ code  */
-        unsigned irq = regs->orig_rax & 0xff;
+        /* high bit used in ret_from_ code  */
+        unsigned irq = ~regs->orig_rax;
+
+        if (unlikely(irq >= NR_IRQS)) {
+                printk(KERN_EMERG "%s: cannot handle IRQ %d\n",
+                                        __FUNCTION__, irq);
+                BUG();
+        }
 
         exit_idle();
         irq_enter();
@@ -140,13 +146,13 @@ void fixup_irqs(cpumask_t map)
                 if (irq == 2)
                         continue;
 
-                cpus_and(mask, irq_affinity[irq], map);
+                cpus_and(mask, irq_desc[irq].affinity, map);
                 if (any_online_cpu(mask) == NR_CPUS) {
                         printk("Breaking affinity for irq %i\n", irq);
                         mask = map;
                 }
-                if (irq_desc[irq].handler->set_affinity)
-                        irq_desc[irq].handler->set_affinity(irq, mask);
+                if (irq_desc[irq].chip->set_affinity)
+                        irq_desc[irq].chip->set_affinity(irq, mask);
                 else if (irq_desc[irq].action && !(warned++))
                         printk("Cannot set affinity for irq %i\n", irq);
         }
diff --git a/arch/x86_64/kernel/mce.c b/arch/x86_64/kernel/mce.c
index acd5816b1a6f..88845674c661 100644
--- a/arch/x86_64/kernel/mce.c
+++ b/arch/x86_64/kernel/mce.c
@@ -629,7 +629,7 @@ static __cpuinit void mce_remove_device(unsigned int cpu)
 #endif
 
 /* Get notified when a cpu comes on/off. Be hotplug friendly. */
-static int
+static __cpuinit int
 mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
@@ -647,7 +647,7 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
         return NOTIFY_OK;
 }
 
-static struct notifier_block mce_cpu_notifier = {
+static struct notifier_block __cpuinitdata mce_cpu_notifier = {
         .notifier_call = mce_cpu_callback,
 };
 
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index 399489c93132..0ef9cf2bc45e 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -607,11 +607,13 @@ void set_nmi_callback(nmi_callback_t callback)
         vmalloc_sync_all();
         rcu_assign_pointer(nmi_callback, callback);
 }
+EXPORT_SYMBOL_GPL(set_nmi_callback);
 
 void unset_nmi_callback(void)
 {
         nmi_callback = dummy_nmi_callback;
 }
+EXPORT_SYMBOL_GPL(unset_nmi_callback);
 
 #ifdef CONFIG_SYSCTL
 
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c
index acee4bc3f6fa..5a1c0a3bf872 100644
--- a/arch/x86_64/kernel/smp.c
+++ b/arch/x86_64/kernel/smp.c
@@ -135,10 +135,10 @@ asmlinkage void smp_invalidate_interrupt(struct pt_regs *regs)
 
         cpu = smp_processor_id();
         /*
-         * orig_rax contains the interrupt vector - 256.
+         * orig_rax contains the negated interrupt vector.
          * Use that to determine where the sender put the data.
          */
-        sender = regs->orig_rax + 256 - INVALIDATE_TLB_VECTOR_START;
+        sender = ~regs->orig_rax - INVALIDATE_TLB_VECTOR_START;
         f = &per_cpu(flush_state, sender);
 
         if (!cpu_isset(cpu, f->flush_cpumask))
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
index 4e9755179ecf..540c0ccbcccc 100644
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
@@ -455,10 +455,12 @@ cpumask_t cpu_coregroup_map(int cpu)
         struct cpuinfo_x86 *c = cpu_data + cpu;
         /*
          * For perf, we return last level cache shared map.
-         * TBD: when power saving sched policy is added, we will return
-         *      cpu_core_map when power saving policy is enabled
+         * And for power savings, we return cpu_core_map
          */
-        return c->llc_shared_map;
+        if (sched_mc_power_savings || sched_smt_power_savings)
+                return cpu_core_map[cpu];
+        else
+                return c->llc_shared_map;
 }
 
 /* representing cpus for which sibling maps can be computed */
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index 02add1d1dfa8..95bd232ff0cf 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -23,6 +23,7 @@
 #include <linux/bootmem.h>
 #include <linux/proc_fs.h>
 #include <linux/pci.h>
+#include <linux/poison.h>
 #include <linux/dma-mapping.h>
 #include <linux/module.h>
 #include <linux/memory_hotplug.h>
@@ -506,8 +507,6 @@ void __init clear_kernel_mapping(unsigned long address, unsigned long size)
 /*
  * Memory hotplug specific functions
  */
-#if defined(CONFIG_ACPI_HOTPLUG_MEMORY) || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
-
 void online_page(struct page *page)
 {
         ClearPageReserved(page);
@@ -517,31 +516,17 @@ void online_page(struct page *page)
         num_physpages++;
 }
 
-#ifndef CONFIG_MEMORY_HOTPLUG
+#ifdef CONFIG_MEMORY_HOTPLUG
 /*
- * Memory Hotadd without sparsemem. The mem_maps have been allocated in advance,
- * just online the pages.
+ * XXX: memory_add_physaddr_to_nid() is to find node id from physical address
+ *      via probe interface of sysfs. If acpi notifies hot-add event, then it
+ *      can tell node id by searching dsdt. But, probe interface doesn't have
+ *      node id. So, return 0 as node id at this time.
  */
-int __add_pages(struct zone *z, unsigned long start_pfn, unsigned long nr_pages)
+#ifdef CONFIG_NUMA
+int memory_add_physaddr_to_nid(u64 start)
 {
-        int err = -EIO;
-        unsigned long pfn;
-        unsigned long total = 0, mem = 0;
-        for (pfn = start_pfn; pfn < start_pfn + nr_pages; pfn++) {
-                if (pfn_valid(pfn)) {
-                        online_page(pfn_to_page(pfn));
-                        err = 0;
-                        mem++;
-                }
-                total++;
-        }
-        if (!err) {
-                z->spanned_pages += total;
-                z->present_pages += mem;
-                z->zone_pgdat->node_spanned_pages += total;
-                z->zone_pgdat->node_present_pages += mem;
-        }
-        return err;
+        return 0;
 }
 #endif
 
@@ -549,9 +534,9 @@ int __add_pages(struct zone *z, unsigned long start_pfn, unsigned long nr_pages)
  * Memory is added always to NORMAL zone. This means you will never get
  * additional DMA/DMA32 memory.
  */
-int add_memory(u64 start, u64 size)
+int arch_add_memory(int nid, u64 start, u64 size)
 {
-        struct pglist_data *pgdat = NODE_DATA(0);
+        struct pglist_data *pgdat = NODE_DATA(nid);
         struct zone *zone = pgdat->node_zones + MAX_NR_ZONES-2;
         unsigned long start_pfn = start >> PAGE_SHIFT;
         unsigned long nr_pages = size >> PAGE_SHIFT;
@@ -568,7 +553,7 @@ error:
         printk("%s: Problem encountered in __add_pages!\n", __func__);
         return ret;
 }
-EXPORT_SYMBOL_GPL(add_memory);
+EXPORT_SYMBOL_GPL(arch_add_memory);
 
 int remove_memory(u64 start, u64 size)
 {
@@ -576,7 +561,33 @@ int remove_memory(u64 start, u64 size)
 }
 EXPORT_SYMBOL_GPL(remove_memory);
 
-#endif
+#else /* CONFIG_MEMORY_HOTPLUG */
+/*
+ * Memory Hotadd without sparsemem. The mem_maps have been allocated in advance,
+ * just online the pages.
+ */
+int __add_pages(struct zone *z, unsigned long start_pfn, unsigned long nr_pages)
+{
+        int err = -EIO;
+        unsigned long pfn;
+        unsigned long total = 0, mem = 0;
+        for (pfn = start_pfn; pfn < start_pfn + nr_pages; pfn++) {
+                if (pfn_valid(pfn)) {
+                        online_page(pfn_to_page(pfn));
+                        err = 0;
+                        mem++;
+                }
+                total++;
+        }
+        if (!err) {
+                z->spanned_pages += total;
+                z->present_pages += mem;
+                z->zone_pgdat->node_spanned_pages += total;
+                z->zone_pgdat->node_present_pages += mem;
+        }
+        return err;
+}
+#endif /* CONFIG_MEMORY_HOTPLUG */
 
 static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,
                          kcore_vsyscall;
@@ -650,7 +661,8 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
         for (addr = begin; addr < end; addr += PAGE_SIZE) {
                 ClearPageReserved(virt_to_page(addr));
                 init_page_count(virt_to_page(addr));
-                memset((void *)(addr & ~(PAGE_SIZE-1)), 0xcc, PAGE_SIZE); 
+                memset((void *)(addr & ~(PAGE_SIZE-1)),
+                        POISON_FREE_INITMEM, PAGE_SIZE);
                 free_page(addr);
                 totalram_pages++;
         }
@@ -658,7 +670,8 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
 
 void free_initmem(void)
 {
-        memset(__initdata_begin, 0xba, __initdata_end - __initdata_begin);
+        memset(__initdata_begin, POISON_FREE_INITDATA,
+                __initdata_end - __initdata_begin);
         free_init_pages("unused kernel memory",
                         (unsigned long)(&__init_begin),
                         (unsigned long)(&__init_end));
diff --git a/arch/xtensa/kernel/irq.c b/arch/xtensa/kernel/irq.c
index 51f9bed455fa..1cf744ee0959 100644
--- a/arch/xtensa/kernel/irq.c
+++ b/arch/xtensa/kernel/irq.c
@@ -100,7 +100,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].handler->typename);
+                seq_printf(p, " %14s", irq_desc[i].chip->typename);
                 seq_printf(p, "  %s", action->name);
 
                 for (action=action->next; action; action = action->next)
@@ -181,7 +181,7 @@ void __init init_IRQ(void)
         int i;
 
         for (i=0; i < XTENSA_NR_IRQS; i++)
-                irq_desc[i].handler = &xtensa_irq_type;
+                irq_desc[i].chip = &xtensa_irq_type;
 
         cached_irq_mask = 0;
 
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index c6f471b9eaa0..eda029fc8972 100644
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -71,13 +71,13 @@ static int pci_bus_count;
  * which might have be mirrored at 0x0100-0x03ff..
  */
 void
-pcibios_align_resource(void *data, struct resource *res, unsigned long size,
-                       unsigned long align)
+pcibios_align_resource(void *data, struct resource *res, resource_size_t size,
+                       resource_size_t align)
 {
         struct pci_dev *dev = data;
 
         if (res->flags & IORESOURCE_IO) {
-                unsigned long start = res->start;
+                resource_size_t start = res->start;
 
                 if (size > 0x100) {
                         printk(KERN_ERR "PCI: I/O Region %s/%d too large"
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 937d81f62f43..fe14909f45e0 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -29,7 +29,7 @@
 
 extern volatile unsigned long wall_jiffies;
 
-spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(rtc_lock);
 EXPORT_SYMBOL(rtc_lock);
 
 
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index 225d64d73f04..27e409089a7b 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -461,7 +461,7 @@ void show_code(unsigned int *pc)
         }
 }
 
-spinlock_t die_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(die_lock);
 
 void die(const char * str, struct pt_regs * regs, long err)
 {