102 files changed, 1096 insertions, 570 deletions

diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c
index b5d387ef37e1..bff7ddd06a52 100644
--- a/arch/arm/mach-s3c2440/mach-anubis.c
+++ b/arch/arm/mach-s3c2440/mach-anubis.c
@@ -76,8 +76,8 @@ static struct map_desc anubis_iodesc[] __initdata = {
         .length         = SZ_4K,
         .type           = MT_DEVICE,
   }, {
-        .virtual        = (u32)ANUBIS_VA_CTRL2,
-        .pfn            = __phys_to_pfn(ANUBIS_PA_CTRL2),
+        .virtual        = (u32)ANUBIS_VA_IDREG,
+        .pfn            = __phys_to_pfn(ANUBIS_PA_IDREG),
         .length         = SZ_4K,
         .type           = MT_DEVICE,
   },
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c
index 4d6c7a574c1a..15811601f03d 100644
--- a/arch/arm/mach-s3c2440/mach-osiris.c
+++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -16,6 +16,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/sysdev.h>
 #include <linux/serial_core.h>
 
 #include <asm/mach/arch.h>
@@ -65,6 +66,11 @@ static struct map_desc osiris_iodesc[] __initdata = {
   /* CPLD control registers */
 
   {
+          .virtual      = (u32)OSIRIS_VA_CTRL0,
+          .pfn          = __phys_to_pfn(OSIRIS_PA_CTRL0),
+          .length       = SZ_16K,
+          .type         = MT_DEVICE,
+  }, {
           .virtual      = (u32)OSIRIS_VA_CTRL1,
           .pfn          = __phys_to_pfn(OSIRIS_PA_CTRL1),
           .length       = SZ_16K,
@@ -74,6 +80,11 @@ static struct map_desc osiris_iodesc[] __initdata = {
           .pfn          = __phys_to_pfn(OSIRIS_PA_CTRL2),
           .length       = SZ_16K,
           .type         = MT_DEVICE,
+  }, {
+          .virtual      = (u32)OSIRIS_VA_IDREG,
+          .pfn          = __phys_to_pfn(OSIRIS_PA_IDREG),
+          .length       = SZ_16K,
+          .type         = MT_DEVICE,
   },
 };
 
@@ -195,13 +206,13 @@ static void osiris_nand_select(struct s3c2410_nand_set *set, int slot)
         pr_debug("osiris_nand: selecting slot %d (set %p,%p)\n",
                  slot, set, set->nr_map);
 
-        tmp = __raw_readb(OSIRIS_VA_CTRL1);
-        tmp &= ~OSIRIS_CTRL1_NANDSEL;
+        tmp = __raw_readb(OSIRIS_VA_CTRL0);
+        tmp &= ~OSIRIS_CTRL0_NANDSEL;
         tmp |= slot;
 
-        pr_debug("osiris_nand: ctrl1 now %02x\n", tmp);
+        pr_debug("osiris_nand: ctrl0 now %02x\n", tmp);
 
-        __raw_writeb(tmp, OSIRIS_VA_CTRL1);
+        __raw_writeb(tmp, OSIRIS_VA_CTRL0);
 }
 
 static struct s3c2410_platform_nand osiris_nand_info = {
@@ -235,10 +246,45 @@ static struct platform_device osiris_pcmcia = {
         .resource       = osiris_pcmcia_resource,
 };
 
+/* Osiris power management device */
+
+#ifdef CONFIG_PM
+static unsigned char pm_osiris_ctrl0;
+
+static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state)
+{
+        pm_osiris_ctrl0 = __raw_readb(OSIRIS_VA_CTRL0);
+        return 0;
+}
+
+static int osiris_pm_resume(struct sys_device *sd)
+{
+        if (pm_osiris_ctrl0 & OSIRIS_CTRL0_FIX8)
+                __raw_writeb(OSIRIS_CTRL1_FIX8, OSIRIS_VA_CTRL1);
+
+        return 0;
+}
+
+#else
+#define osiris_pm_suspend NULL
+#define osiris_pm_resume NULL
+#endif
+
+static struct sysdev_class osiris_pm_sysclass = {
+        set_kset_name("mach-osiris"),
+        .suspend        = osiris_pm_suspend,
+        .resume         = osiris_pm_resume,
+};
+
+static struct sys_device osiris_pm_sysdev = {
+        .cls            = &osiris_pm_sysclass,
+};
+
 /* Standard Osiris devices */
 
 static struct platform_device *osiris_devices[] __initdata = {
         &s3c_device_i2c,
+        &s3c_device_wdt,
         &s3c_device_nand,
         &osiris_pcmcia,
 };
@@ -288,6 +334,9 @@ static void __init osiris_map_io(void)
 
 static void __init osiris_init(void)
 {
+        sysdev_class_register(&osiris_pm_sysclass);
+        sysdev_register(&osiris_pm_sysdev);
+
         platform_add_devices(osiris_devices, ARRAY_SIZE(osiris_devices));
 };
 
@@ -299,5 +348,6 @@ MACHINE_START(OSIRIS, "Simtec-OSIRIS")
         .map_io         = osiris_map_io,
         .init_machine   = osiris_init,
         .init_irq       = s3c24xx_init_irq,
+        .init_machine   = osiris_init,
         .timer          = &s3c24xx_timer,
 MACHINE_END
diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S
index ca2a5ad19ea6..806ce26d5243 100644
--- a/arch/arm/vfp/entry.S
+++ b/arch/arm/vfp/entry.S
@@ -29,6 +29,10 @@ do_vfp:
         add     r10, r10, #TI_VFPSTATE  @ r10 = workspace
         ldr     pc, [r4]                @ call VFP entry point
 
+ENTRY(vfp_null_entry)
+        mov     pc, lr
+ENDPROC(vfp_null_entry)
+
 .LCvfp:
         .word   vfp_vector
 
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index f1e5951dc721..1106b5f9cf19 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -26,8 +26,9 @@
  */
 void vfp_testing_entry(void);
 void vfp_support_entry(void);
+void vfp_null_entry(void);
 
-void (*vfp_vector)(void) = vfp_testing_entry;
+void (*vfp_vector)(void) = vfp_null_entry;
 union vfp_state *last_VFP_context[NR_CPUS];
 
 /*
@@ -321,8 +322,10 @@ static int __init vfp_init(void)
          * The handler is already setup to just log calls, so
          * we just need to read the VFPSID register.
          */
+        vfp_vector = vfp_testing_entry;
         vfpsid = fmrx(FPSID);
         barrier();
+        vfp_vector = vfp_null_entry;
 
         printk(KERN_INFO "VFP support v0.3: ");
         if (VFP_arch) {
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index fe1dbe2e28f4..e253e86a1a39 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -42,6 +42,7 @@ static struct spi_board_info spi0_board_info[] __initdata = {
                 .modalias       = "ltv350qv",
                 .max_speed_hz   = 16000000,
                 .chip_select    = 1,
+                .mode           = SPI_MODE_3,
         },
 };
 
diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
index e011f1ce1875..4b2495285d94 100644
--- a/arch/avr32/mm/fault.c
+++ b/arch/avr32/mm/fault.c
@@ -158,7 +158,7 @@ bad_area:
         up_read(&mm->mmap_sem);
 
         if (user_mode(regs)) {
-                if (exception_trace)
+                if (exception_trace && printk_ratelimit())
                         printk("%s%s[%d]: segfault at %08lx pc %08lx "
                                "sp %08lx ecr %lu\n",
                                is_init(tsk) ? KERN_EMERG : KERN_INFO,
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index 64b62bdfb4f6..b8fa7ddd78f6 100644
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -129,13 +129,13 @@ static irqreturn_t ipi_call_interrupt(int irq, void *dev_id)
 
 static struct irqaction irq_resched = {
         .handler        = ipi_resched_interrupt,
-        .flags          = IRQF_DISABLED,
+        .flags          = IRQF_DISABLED|IRQF_PERCPU,
         .name           = "IPI_resched"
 };
 
 static struct irqaction irq_call = {
         .handler        = ipi_call_interrupt,
-        .flags          = IRQF_DISABLED,
+        .flags          = IRQF_DISABLED|IRQF_PERCPU,
         .name           = "IPI_call"
 };
 
@@ -275,10 +275,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
         setup_irq(cpu_ipi_resched_irq, &irq_resched);
         setup_irq(cpu_ipi_call_irq, &irq_call);
 
-        /* need to mark IPI's as IRQ_PER_CPU */
-        irq_desc[cpu_ipi_resched_irq].status |= IRQ_PER_CPU;
         set_irq_handler(cpu_ipi_resched_irq, handle_percpu_irq);
-        irq_desc[cpu_ipi_call_irq].status |= IRQ_PER_CPU;
         set_irq_handler(cpu_ipi_call_irq, handle_percpu_irq);
 }
 
@@ -326,8 +323,11 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
 
 void prom_init_secondary(void)
 {
+        /* Enable per-cpu interrupts */
+
+        /* This is Malta specific: IPI,performance and timer inetrrupts */
         write_c0_status((read_c0_status() & ~ST0_IM ) |
-                        (STATUSF_IP0 | STATUSF_IP1 | STATUSF_IP7));
+                        (STATUSF_IP0 | STATUSF_IP1 | STATUSF_IP6 | STATUSF_IP7));
 }
 
 void prom_smp_finish(void)
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index 751b4a18b133..7def1ff3da94 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -199,6 +199,30 @@ int (*perf_irq)(void) = null_perf_irq;
 EXPORT_SYMBOL(null_perf_irq);
 EXPORT_SYMBOL(perf_irq);
 
+/*
+ * Performance counter IRQ or -1 if shared with timer
+ */
+int mipsxx_perfcount_irq;
+EXPORT_SYMBOL(mipsxx_perfcount_irq);
+
+/*
+ * Possibly handle a performance counter interrupt.
+ * Return true if the timer interrupt should not be checked
+ */
+static inline int handle_perf_irq (int r2)
+{
+        /*
+         * The performance counter overflow interrupt may be shared with the
+         * timer interrupt (mipsxx_perfcount_irq < 0). If it is and a
+         * performance counter has overflowed (perf_irq() == IRQ_HANDLED)
+         * and we can't reliably determine if a counter interrupt has also
+         * happened (!r2) then don't check for a timer interrupt.
+         */
+        return (mipsxx_perfcount_irq < 0) &&
+                perf_irq() == IRQ_HANDLED &&
+                !r2;
+}
+
 asmlinkage void ll_timer_interrupt(int irq)
 {
         int r2 = cpu_has_mips_r2;
@@ -206,19 +230,13 @@ asmlinkage void ll_timer_interrupt(int irq)
         irq_enter();
         kstat_this_cpu.irqs[irq]++;
 
-        /*
-         * Suckage alert:
-         * Before R2 of the architecture there was no way to see if a
-         * performance counter interrupt was pending, so we have to run the
-         * performance counter interrupt handler anyway.
-         */
-        if (!r2 || (read_c0_cause() & (1 << 26)))
-                if (perf_irq())
-                        goto out;
+        if (handle_perf_irq(r2))
+                goto out;
 
-        /* we keep interrupt disabled all the time */
-        if (!r2 || (read_c0_cause() & (1 << 30)))
-                timer_interrupt(irq, NULL);
+        if (r2 && ((read_c0_cause() & (1 << 30)) == 0))
+                goto out;
+
+        timer_interrupt(irq, NULL);
 
 out:
         irq_exit();
@@ -258,7 +276,7 @@ unsigned int mips_hpt_frequency;
 
 static struct irqaction timer_irqaction = {
         .handler = timer_interrupt,
-        .flags = IRQF_DISABLED,
+        .flags = IRQF_DISABLED | IRQF_PERCPU,
         .name = "timer",
 };
 
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c
index 88e9c2a7a2f9..4eabc1eadd23 100644
--- a/arch/mips/mips-boards/generic/init.c
+++ b/arch/mips/mips-boards/generic/init.c
@@ -57,7 +57,8 @@ int *_prom_argv, *_prom_envp;
 
 int init_debug = 0;
 
-unsigned int mips_revision_corid;
+int mips_revision_corid;
+int mips_revision_sconid;
 
 /* Bonito64 system controller register base. */
 unsigned long _pcictrl_bonito;
@@ -275,13 +276,38 @@ void __init prom_init(void)
                 else
                         mips_revision_corid = MIPS_REVISION_CORID_CORE_EMUL_MSC;
         }
-        switch(mips_revision_corid) {
+
+        mips_revision_sconid = MIPS_REVISION_SCONID;
+        if (mips_revision_sconid == MIPS_REVISION_SCON_OTHER) {
+                switch (mips_revision_corid) {
+                case MIPS_REVISION_CORID_QED_RM5261:
+                case MIPS_REVISION_CORID_CORE_LV:
+                case MIPS_REVISION_CORID_CORE_FPGA:
+                case MIPS_REVISION_CORID_CORE_FPGAR2:
+                        mips_revision_sconid = MIPS_REVISION_SCON_GT64120;
+                        break;
+                case MIPS_REVISION_CORID_CORE_EMUL_BON:
+                case MIPS_REVISION_CORID_BONITO64:
+                case MIPS_REVISION_CORID_CORE_20K:
+                        mips_revision_sconid = MIPS_REVISION_SCON_BONITO;
+                        break;
+                case MIPS_REVISION_CORID_CORE_MSC:
+                case MIPS_REVISION_CORID_CORE_FPGA2:
+                case MIPS_REVISION_CORID_CORE_FPGA3:
+                case MIPS_REVISION_CORID_CORE_24K:
+                case MIPS_REVISION_CORID_CORE_EMUL_MSC:
+                        mips_revision_sconid = MIPS_REVISION_SCON_SOCIT;
+                        break;
+                default:
+                        mips_display_message("CC Error");
+                        while (1);   /* We die here... */
+                }
+        }
+
+        switch (mips_revision_sconid) {
                 u32 start, map, mask, data;
 
-        case MIPS_REVISION_CORID_QED_RM5261:
-        case MIPS_REVISION_CORID_CORE_LV:
-        case MIPS_REVISION_CORID_CORE_FPGA:
-        case MIPS_REVISION_CORID_CORE_FPGAR2:
+        case MIPS_REVISION_SCON_GT64120:
                 /*
                  * Setup the North bridge to do Master byte-lane swapping
                  * when running in bigendian.
@@ -305,9 +331,7 @@ void __init prom_init(void)
                 set_io_port_base(MALTA_GT_PORT_BASE);
                 break;
 
-        case MIPS_REVISION_CORID_CORE_EMUL_BON:
-        case MIPS_REVISION_CORID_BONITO64:
-        case MIPS_REVISION_CORID_CORE_20K:
+        case MIPS_REVISION_SCON_BONITO:
                 _pcictrl_bonito_pcicfg = (unsigned long)ioremap(BONITO_PCICFG_BASE, BONITO_PCICFG_SIZE);
 
                 /*
@@ -334,13 +358,10 @@ void __init prom_init(void)
                 set_io_port_base(MALTA_BONITO_PORT_BASE);
                 break;
 
-        case MIPS_REVISION_CORID_CORE_MSC:
-        case MIPS_REVISION_CORID_CORE_FPGA2:
-        case MIPS_REVISION_CORID_CORE_FPGA3:
-        case MIPS_REVISION_CORID_CORE_24K:
-        case MIPS_REVISION_CORID_CORE_EMUL_MSC:
+        case MIPS_REVISION_SCON_SOCIT:
+        case MIPS_REVISION_SCON_ROCIT:
                 _pcictrl_msc = (unsigned long)ioremap(MIPS_MSC01_PCI_REG_BASE, 0x2000);
-
+        mips_pci_controller:
                 mb();
                 MSC_READ(MSC01_PCI_CFG, data);
                 MSC_WRITE(MSC01_PCI_CFG, data & ~MSC01_PCI_CFG_EN_BIT);
@@ -374,10 +395,15 @@ void __init prom_init(void)
                 set_io_port_base(MALTA_MSC_PORT_BASE);
                 break;
 
+        case MIPS_REVISION_SCON_SOCITSC:
+        case MIPS_REVISION_SCON_SOCITSCP:
+                _pcictrl_msc = (unsigned long)ioremap(MIPS_SOCITSC_PCI_REG_BASE, 0x2000);
+                goto mips_pci_controller;
+
         default:
-                /* Unknown Core card */
-                mips_display_message("CC Error");
-                while(1);   /* We die here... */
+                /* Unknown system controller */
+                mips_display_message("SC Error");
+                while (1);   /* We die here... */
         }
 #endif
         board_nmi_handler_setup = mips_nmi_setup;
diff --git a/arch/mips/mips-boards/generic/pci.c b/arch/mips/mips-boards/generic/pci.c
index f98d60f78658..c9852206890a 100644
--- a/arch/mips/mips-boards/generic/pci.c
+++ b/arch/mips/mips-boards/generic/pci.c
@@ -92,11 +92,8 @@ void __init mips_pcibios_init(void)
         struct pci_controller *controller;
         resource_size_t start, end, map, start1, end1, map1, map2, map3, mask;
 
-        switch (mips_revision_corid) {
-        case MIPS_REVISION_CORID_QED_RM5261:
-        case MIPS_REVISION_CORID_CORE_LV:
-        case MIPS_REVISION_CORID_CORE_FPGA:
-        case MIPS_REVISION_CORID_CORE_FPGAR2:
+        switch (mips_revision_sconid) {
+        case MIPS_REVISION_SCON_GT64120:
                 /*
                  * Due to a bug in the Galileo system controller, we need
                  * to setup the PCI BAR for the Galileo internal registers.
@@ -161,9 +158,7 @@ void __init mips_pcibios_init(void)
                 controller = &gt64120_controller;
                 break;
 
-        case MIPS_REVISION_CORID_BONITO64:
-        case MIPS_REVISION_CORID_CORE_20K:
-        case MIPS_REVISION_CORID_CORE_EMUL_BON:
+        case MIPS_REVISION_SCON_BONITO:
                 /* Set up resource ranges from the controller's registers.  */
                 map = BONITO_PCIMAP;
                 map1 = (BONITO_PCIMAP & BONITO_PCIMAP_PCIMAP_LO0) >>
@@ -195,11 +190,10 @@ void __init mips_pcibios_init(void)
                 controller = &bonito64_controller;
                 break;
 
-        case MIPS_REVISION_CORID_CORE_MSC:
-        case MIPS_REVISION_CORID_CORE_FPGA2:
-        case MIPS_REVISION_CORID_CORE_FPGA3:
-        case MIPS_REVISION_CORID_CORE_24K:
-        case MIPS_REVISION_CORID_CORE_EMUL_MSC:
+        case MIPS_REVISION_SCON_SOCIT:
+        case MIPS_REVISION_SCON_ROCIT:
+        case MIPS_REVISION_SCON_SOCITSC:
+        case MIPS_REVISION_SCON_SOCITSCP:
                 /* Set up resource ranges from the controller's registers.  */
                 MSC_READ(MSC01_PCI_SC2PMBASL, start);
                 MSC_READ(MSC01_PCI_SC2PMMSKL, mask);
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c
index b41db9e7ab1f..8f1000f51b3d 100644
--- a/arch/mips/mips-boards/generic/time.c
+++ b/arch/mips/mips-boards/generic/time.c
@@ -53,9 +53,8 @@
 
 unsigned long cpu_khz;
 
-#define CPUCTR_IMASKBIT (0x100 << MIPSCPU_INT_CPUCTR)
-
 static int mips_cpu_timer_irq;
+extern int mipsxx_perfcount_irq;
 extern void smtc_timer_broadcast(int);
 
 static void mips_timer_dispatch(void)
@@ -63,6 +62,11 @@ static void mips_timer_dispatch(void)
         do_IRQ(mips_cpu_timer_irq);
 }
 
+static void mips_perf_dispatch(void)
+{
+        do_IRQ(mipsxx_perfcount_irq);
+}
+
 /*
  * Redeclare until I get around mopping the timer code insanity on MIPS.
  */
@@ -70,6 +74,24 @@ extern int null_perf_irq(void);
 
 extern int (*perf_irq)(void);
 
+/*
+ * Possibly handle a performance counter interrupt.
+ * Return true if the timer interrupt should not be checked
+ */
+static inline int handle_perf_irq (int r2)
+{
+        /*
+         * The performance counter overflow interrupt may be shared with the
+         * timer interrupt (mipsxx_perfcount_irq < 0). If it is and a
+         * performance counter has overflowed (perf_irq() == IRQ_HANDLED)
+         * and we can't reliably determine if a counter interrupt has also
+         * happened (!r2) then don't check for a timer interrupt.
+         */
+        return (mipsxx_perfcount_irq < 0) &&
+                perf_irq() == IRQ_HANDLED &&
+                !r2;
+}
+
 irqreturn_t mips_timer_interrupt(int irq, void *dev_id)
 {
         int cpu = smp_processor_id();
@@ -92,8 +114,7 @@ irqreturn_t mips_timer_interrupt(int irq, void *dev_id)
          * We could be here due to timer interrupt,
          * perf counter overflow, or both.
          */
-        if (read_c0_cause() & (1 << 26))
-                perf_irq();
+        (void) handle_perf_irq(1);
 
         if (read_c0_cause() & (1 << 30)) {
                 /*
@@ -115,19 +136,19 @@ irqreturn_t mips_timer_interrupt(int irq, void *dev_id)
 #else /* CONFIG_MIPS_MT_SMTC */
         int r2 = cpu_has_mips_r2;
 
+        if (handle_perf_irq(r2))
+                goto out;
+
+        if (r2 && ((read_c0_cause() & (1 << 30)) == 0))
+                goto out;
+
         if (cpu == 0) {
                 /*
                  * CPU 0 handles the global timer interrupt job and process
                  * accounting resets count/compare registers to trigger next
                  * timer int.
                  */
-                if (!r2 || (read_c0_cause() & (1 << 26)))
-                        if (perf_irq())
-                                goto out;
-
-                /* we keep interrupt disabled all the time */
-                if (!r2 || (read_c0_cause() & (1 << 30)))
-                        timer_interrupt(irq, NULL);
+                timer_interrupt(irq, NULL);
         } else {
                 /* Everyone else needs to reset the timer int here as
                    ll_local_timer_interrupt doesn't */
@@ -225,35 +246,85 @@ void __init mips_time_init(void)
         mips_scroll_message();
 }
 
+irqreturn_t mips_perf_interrupt(int irq, void *dev_id)
+{
+        return perf_irq();
+}
+
+static struct irqaction perf_irqaction = {
+        .handler = mips_perf_interrupt,
+        .flags = IRQF_DISABLED | IRQF_PERCPU,
+        .name = "performance",
+};
+
+void __init plat_perf_setup(struct irqaction *irq)
+{
+        int hwint = 0;
+        mipsxx_perfcount_irq = -1;
+
+#ifdef MSC01E_INT_BASE
+        if (cpu_has_veic) {
+                set_vi_handler (MSC01E_INT_PERFCTR, mips_perf_dispatch);
+                mipsxx_perfcount_irq = MSC01E_INT_BASE + MSC01E_INT_PERFCTR;
+        } else
+#endif
+        if (cpu_has_mips_r2) {
+                /*
+                 * Read IntCtl.IPPCI to determine the performance
+                 * counter interrupt
+                 */
+                hwint = (read_c0_intctl () >> 26) & 7;
+                if (hwint != MIPSCPU_INT_CPUCTR) {
+                        if (cpu_has_vint)
+                                set_vi_handler (hwint, mips_perf_dispatch);
+                        mipsxx_perfcount_irq = MIPSCPU_INT_BASE + hwint;
+                }
+        }
+        if (mipsxx_perfcount_irq >= 0) {
+#ifdef CONFIG_MIPS_MT_SMTC
+                setup_irq_smtc(mipsxx_perfcount_irq, irq, 0x100 << hwint);
+#else
+                setup_irq(mipsxx_perfcount_irq, irq);
+#endif /* CONFIG_MIPS_MT_SMTC */
+#ifdef CONFIG_SMP
+                set_irq_handler(mipsxx_perfcount_irq, handle_percpu_irq);
+#endif
+        }
+}
+
 void __init plat_timer_setup(struct irqaction *irq)
 {
+        int hwint = 0;
 #ifdef MSC01E_INT_BASE
         if (cpu_has_veic) {
                 set_vi_handler (MSC01E_INT_CPUCTR, mips_timer_dispatch);
                 mips_cpu_timer_irq = MSC01E_INT_BASE + MSC01E_INT_CPUCTR;
-        } else
+        }
+        else
 #endif
         {
+                if (cpu_has_mips_r2)
+                        /*
+                         * Read IntCtl.IPTI to determine the timer interrupt
+                         */
+                        hwint = (read_c0_intctl () >> 29) & 7;
+                else
+                        hwint = MIPSCPU_INT_CPUCTR;
                 if (cpu_has_vint)
-                        set_vi_handler (MIPSCPU_INT_CPUCTR, mips_timer_dispatch);
-                mips_cpu_timer_irq = MIPSCPU_INT_BASE + MIPSCPU_INT_CPUCTR;
+                        set_vi_handler (hwint, mips_timer_dispatch);
+                mips_cpu_timer_irq = MIPSCPU_INT_BASE + hwint;
         }
 
-
         /* we are using the cpu counter for timer interrupts */
         irq->handler = mips_timer_interrupt;    /* we use our own handler */
 #ifdef CONFIG_MIPS_MT_SMTC
-        setup_irq_smtc(mips_cpu_timer_irq, irq, CPUCTR_IMASKBIT);
+        setup_irq_smtc(mips_cpu_timer_irq, irq, 0x100 << hwint);
 #else
         setup_irq(mips_cpu_timer_irq, irq);
 #endif /* CONFIG_MIPS_MT_SMTC */
-
 #ifdef CONFIG_SMP
-        /* irq_desc(riptor) is a global resource, when the interrupt overlaps
-           on seperate cpu's the first one tries to handle the second interrupt.
-           The effect is that the int remains disabled on the second cpu.
-           Mark the interrupt with IRQ_PER_CPU to avoid any confusion */
-        irq_desc[mips_cpu_timer_irq].status |= IRQ_PER_CPU;
         set_irq_handler(mips_cpu_timer_irq, handle_percpu_irq);
 #endif
+
+        plat_perf_setup(&perf_irqaction);
 }
diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mips-boards/malta/malta_int.c
index 1cd830e3d933..1668cc21d5b5 100644
--- a/arch/mips/mips-boards/malta/malta_int.c
+++ b/arch/mips/mips-boards/malta/malta_int.c
@@ -53,25 +53,19 @@ static inline int mips_pcibios_iack(void)
          * Determine highest priority pending interrupt by performing
          * a PCI Interrupt Acknowledge cycle.
          */
-        switch(mips_revision_corid) {
-        case MIPS_REVISION_CORID_CORE_MSC:
-        case MIPS_REVISION_CORID_CORE_FPGA2:
-        case MIPS_REVISION_CORID_CORE_FPGA3:
-        case MIPS_REVISION_CORID_CORE_24K:
-        case MIPS_REVISION_CORID_CORE_EMUL_MSC:
+        switch (mips_revision_sconid) {
+        case MIPS_REVISION_SCON_SOCIT:
+        case MIPS_REVISION_SCON_ROCIT:
+        case MIPS_REVISION_SCON_SOCITSC:
+        case MIPS_REVISION_SCON_SOCITSCP:
                 MSC_READ(MSC01_PCI_IACK, irq);
                 irq &= 0xff;
                 break;
-        case MIPS_REVISION_CORID_QED_RM5261:
-        case MIPS_REVISION_CORID_CORE_LV:
-        case MIPS_REVISION_CORID_CORE_FPGA:
-        case MIPS_REVISION_CORID_CORE_FPGAR2:
+        case MIPS_REVISION_SCON_GT64120:
                 irq = GT_READ(GT_PCI0_IACK_OFS);
                 irq &= 0xff;
                 break;
-        case MIPS_REVISION_CORID_BONITO64:
-        case MIPS_REVISION_CORID_CORE_20K:
-        case MIPS_REVISION_CORID_CORE_EMUL_BON:
+        case MIPS_REVISION_SCON_BONITO:
                 /* The following will generate a PCI IACK cycle on the
                  * Bonito controller. It's a little bit kludgy, but it
                  * was the easiest way to implement it in hardware at
@@ -89,7 +83,7 @@ static inline int mips_pcibios_iack(void)
                 BONITO_PCIMAP_CFG = 0;
                 break;
         default:
-                printk("Unknown Core card, don't know the system controller.\n");
+                printk("Unknown system controller.\n");
                 return -1;
         }
         return irq;
@@ -144,27 +138,21 @@ static void corehi_irqdispatch(void)
            Do it for the others too.
         */
 
-        switch(mips_revision_corid) {
-        case MIPS_REVISION_CORID_CORE_MSC:
-        case MIPS_REVISION_CORID_CORE_FPGA2:
-        case MIPS_REVISION_CORID_CORE_FPGA3:
-        case MIPS_REVISION_CORID_CORE_24K:
-        case MIPS_REVISION_CORID_CORE_EMUL_MSC:
+        switch (mips_revision_sconid) {
+        case MIPS_REVISION_SCON_SOCIT:
+        case MIPS_REVISION_SCON_ROCIT:
+        case MIPS_REVISION_SCON_SOCITSC:
+        case MIPS_REVISION_SCON_SOCITSCP:
                 ll_msc_irq();
                 break;
-        case MIPS_REVISION_CORID_QED_RM5261:
-        case MIPS_REVISION_CORID_CORE_LV:
-        case MIPS_REVISION_CORID_CORE_FPGA:
-        case MIPS_REVISION_CORID_CORE_FPGAR2:
+        case MIPS_REVISION_SCON_GT64120:
                 intrcause = GT_READ(GT_INTRCAUSE_OFS);
                 datalo = GT_READ(GT_CPUERR_ADDRLO_OFS);
                 datahi = GT_READ(GT_CPUERR_ADDRHI_OFS);
                 printk("GT_INTRCAUSE = %08x\n", intrcause);
                 printk("GT_CPUERR_ADDR = %02x%08x\n", datahi, datalo);
                 break;
-        case MIPS_REVISION_CORID_BONITO64:
-        case MIPS_REVISION_CORID_CORE_20K:
-        case MIPS_REVISION_CORID_CORE_EMUL_BON:
+        case MIPS_REVISION_SCON_BONITO:
                 pcibadaddr = BONITO_PCIBADADDR;
                 pcimstat = BONITO_PCIMSTAT;
                 intisr = BONITO_INTISR;
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c
index c14b7bf89950..8f1b78dfd89f 100644
--- a/arch/mips/mips-boards/malta/malta_setup.c
+++ b/arch/mips/mips-boards/malta/malta_setup.c
@@ -103,9 +103,7 @@ void __init plat_mem_setup(void)
         kgdb_config ();
 #endif
 
-        if ((mips_revision_corid == MIPS_REVISION_CORID_BONITO64) ||
-            (mips_revision_corid == MIPS_REVISION_CORID_CORE_20K) ||
-            (mips_revision_corid == MIPS_REVISION_CORID_CORE_EMUL_BON)) {
+        if (mips_revision_sconid == MIPS_REVISION_SCON_BONITO) {
                 char *argptr;
 
                 argptr = prom_getcmdline();
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index 4f94fa261aae..1ea5c9c1010b 100644
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -177,7 +177,10 @@ static int mipsxx_perfcount_handler(void)
         unsigned int counters = op_model_mipsxx_ops.num_counters;
         unsigned int control;
         unsigned int counter;
-        int handled = 0;
+        int handled = IRQ_NONE;
+
+        if (cpu_has_mips_r2 && !(read_c0_cause() & (1 << 26)))
+                return handled;
 
         switch (counters) {
 #define HANDLE_COUNTER(n)                                               \
@@ -188,7 +191,7 @@ static int mipsxx_perfcount_handler(void)
                     (counter & M_COUNTER_OVERFLOW)) {                   \
                         oprofile_add_sample(get_irq_regs(), n);         \
                         w_c0_perfcntr ## n(reg.counter[n]);             \
-                        handled = 1;                                    \
+                        handled = IRQ_HANDLED;                          \
                 }
         HANDLE_COUNTER(3)
         HANDLE_COUNTER(2)
diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c
index d86e15776779..f2042e6466a4 100644
--- a/arch/parisc/hpux/fs.c
+++ b/arch/parisc/hpux/fs.c
@@ -21,6 +21,7 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/file.h>
@@ -69,7 +70,6 @@ struct getdents_callback {
 };
 
 #define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de)))
-#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
 
 static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
                 u64 ino, unsigned d_type)
@@ -77,7 +77,7 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
         struct hpux_dirent __user * dirent;
         struct getdents_callback * buf = (struct getdents_callback *) __buf;
         ino_t d_ino;
-        int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
+        int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 1, sizeof(long));
 
         buf->error = -EINVAL;   /* only used if we fail.. */
         if (reclen > buf->count)
@@ -102,7 +102,6 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
 }
 
 #undef NAME_OFFSET
-#undef ROUND_UP
 
 int hpux_getdents(unsigned int fd, struct hpux_dirent __user *dirent, unsigned int count)
 {
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index 8474f9e5ca10..42598abf4576 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -954,21 +954,6 @@ intr_return:
         /* NOTE: Need to enable interrupts incase we schedule. */
         ssm     PSW_SM_I, %r0
 
-        /* Check for software interrupts */
-
-        .import irq_stat,data
-
-        load32  irq_stat,%r19
-#ifdef CONFIG_SMP
-        mfctl   %cr30,%r1
-        ldw     TI_CPU(%r1),%r1 /* get cpu # - int */
-        /* shift left ____cacheline_aligned (aka L1_CACHE_BYTES) amount
-        ** irq_stat[] is defined using ____cacheline_aligned.
-        */
-        SHLREG  %r1,L1_CACHE_SHIFT,%r20
-        add     %r19,%r20,%r19  /* now have &irq_stat[smp_processor_id()] */
-#endif /* CONFIG_SMP */
-
 intr_check_resched:
 
         /* check for reschedule */
@@ -2034,10 +2019,9 @@ ENTRY(syscall_exit)
         STREG     %r28,TASK_PT_GR28(%r1)
 
 #ifdef CONFIG_HPUX
-
 /* <linux/personality.h> cannot be easily included */
 #define PER_HPUX 0x10
-        LDREG     TASK_PERSONALITY(%r1),%r19
+        ldw     TASK_PERSONALITY(%r1),%r19
 
         /* We can't use "CMPIB<> PER_HPUX" since "im5" field is sign extended */
         ldo       -PER_HPUX(%r19), %r19
@@ -2055,24 +2039,6 @@ ENTRY(syscall_exit)
          */
         loadgp
 
-syscall_check_bh:
-
-        /* Check for software interrupts */
-
-        .import irq_stat,data
-
-        load32  irq_stat,%r19
-
-#ifdef CONFIG_SMP
-        /* sched.h: int processor */
-        /* %r26 is used as scratch register to index into irq_stat[] */
-        ldw     TI_CPU-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r26 /* cpu # */
-
-        /* shift left ____cacheline_aligned (aka L1_CACHE_BYTES) bits */
-        SHLREG  %r26,L1_CACHE_SHIFT,%r20
-        add     %r19,%r20,%r19  /* now have &irq_stat[smp_processor_id()] */
-#endif /* CONFIG_SMP */
-
 syscall_check_resched:
 
         /* check for reschedule */
@@ -2114,7 +2080,7 @@ syscall_restore:
         /* Are we being ptraced? */
         LDREG   TI_TASK-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r1
 
-        LDREG   TASK_PTRACE(%r1), %r19
+        ldw     TASK_PTRACE(%r1), %r19
         bb,<    %r19,31,syscall_restore_rfi
         nop
 
@@ -2244,7 +2210,7 @@ syscall_do_resched:
 #else
         nop
 #endif
-        b       syscall_check_bh  /* if resched, we start over again */
+        b       syscall_check_resched   /* if resched, we start over again */
         nop
 ENDPROC(syscall_exit)
 
diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c
index 39dc835bf89e..fd6552c4c08c 100644
--- a/arch/parisc/kernel/firmware.c
+++ b/arch/parisc/kernel/firmware.c
@@ -634,7 +634,7 @@ EXPORT_SYMBOL(pdc_lan_station_id);
  * pdc_stable_read - Read data from Stable Storage.
  * @staddr: Stable Storage address to access.
  * @memaddr: The memory address where Stable Storage data shall be copied.
- * @count: number of bytes to transfert. count is multiple of 4.
+ * @count: number of bytes to transfer. count is multiple of 4.
  *
  * This PDC call reads from the Stable Storage address supplied in staddr
  * and copies count bytes to the memory address memaddr.
@@ -660,7 +660,7 @@ EXPORT_SYMBOL(pdc_stable_read);
  * pdc_stable_write - Write data to Stable Storage.
  * @staddr: Stable Storage address to access.
  * @memaddr: The memory address where Stable Storage data shall be read from.
- * @count: number of bytes to transfert. count is multiple of 4.
+ * @count: number of bytes to transfer. count is multiple of 4.
  *
  * This PDC call reads count bytes from the supplied memaddr address,
  * and copies count bytes to the Stable Storage address staddr.
diff --git a/arch/parisc/kernel/hardware.c b/arch/parisc/kernel/hardware.c
index 18ba4cb9159b..04848b2b381c 100644
--- a/arch/parisc/kernel/hardware.c
+++ b/arch/parisc/kernel/hardware.c
@@ -38,7 +38,7 @@
  *      so don't reference this table after starting the init process
  */
  
-static struct hp_hardware hp_hardware_list[] __initdata = {
+static struct hp_hardware hp_hardware_list[] __devinitdata = {
         {HPHW_NPROC,0x01,0x4,0x0,"Indigo (840, 930)"},
         {HPHW_NPROC,0x8,0x4,0x01,"Firefox(825,925)"},
         {HPHW_NPROC,0xA,0x4,0x01,"Top Gun (835,834,935,635)"},
@@ -1219,7 +1219,7 @@ static struct hp_cpu_type_mask {
         unsigned short model;
         unsigned short mask;
         enum cpu_type cpu;
-} hp_cpu_type_mask_list[] __initdata = {
+} hp_cpu_type_mask_list[] __devinitdata = {
 
         { 0x0000, 0x0ff0, pcx    },  /* 0x0000 - 0x000f */
         { 0x0048, 0x0ff0, pcxl   },  /* 0x0040 - 0x004f */
@@ -1296,10 +1296,11 @@ static struct hp_cpu_type_mask {
         { 0x05f0, 0x0ff0, pcxw2  },  /* 0x05f0 - 0x05ff */
         { 0x0600, 0x0fe0, pcxl   },  /* 0x0600 - 0x061f */
         { 0x0880, 0x0ff0, mako   },  /* 0x0880 - 0x088f */
+        { 0x0890, 0x0ff0, mako2  },  /* 0x0890 - 0x089f */
         { 0x0000, 0x0000, pcx    }      /* terminate table */
 };
 
-char *cpu_name_version[][2] = {
+const char * const cpu_name_version[][2] = {
         [pcx]   = { "PA7000 (PCX)",     "1.0" },
         [pcxs]  = { "PA7000 (PCX-S)",   "1.1a" },
         [pcxt]  = { "PA7100 (PCX-T)",   "1.1b" },
@@ -1311,10 +1312,11 @@ char *cpu_name_version[][2] = {
         [pcxw]  = { "PA8500 (PCX-W)",   "2.0" },
         [pcxw_] = { "PA8600 (PCX-W+)",  "2.0" },
         [pcxw2] = { "PA8700 (PCX-W2)",  "2.0" },
-        [mako]  = { "PA8800 (Mako)",    "2.0" }
+        [mako]  = { "PA8800 (Mako)",    "2.0" },
+        [mako2] = { "PA8900 (Shortfin)",        "2.0" }
 };
 
-const char * __init
+const char * __devinit
 parisc_hardware_description(struct parisc_device_id *id)
 {
         struct hp_hardware *listptr;
@@ -1353,7 +1355,7 @@ parisc_hardware_description(struct parisc_device_id *id)
 
 
 /* Interpret hversion (ret[0]) from PDC_MODEL(4)/PDC_MODEL_INFO(0) */
-enum cpu_type __init
+enum cpu_type __cpuinit
 parisc_get_cpu_type(unsigned long hversion)
 {
         struct hp_cpu_type_mask *ptr;
diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
index d8baa158d8a0..43b41df0b541 100644
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
@@ -295,8 +295,5 @@ os_hpmc_6:
         b .
         nop
 ENDPROC(os_hpmc)
-
-        /* this label used to compute os_hpmc checksum */
-ENTRY(os_hpmc_end)
-
+ENTRY(os_hpmc_end)      /* this label used to compute os_hpmc checksum */
         nop
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index c5c9125dacec..76ce5e3b0050 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -46,14 +46,10 @@ extern irqreturn_t ipi_interrupt(int, void *);
 static volatile unsigned long cpu_eiem = 0;
 
 /*
-** ack bitmap ... habitually set to 1, but reset to zero
+** local ACK bitmap ... habitually set to 1, but reset to zero
 ** between ->ack() and ->end() of the interrupt to prevent
 ** re-interruption of a processing interrupt.
 */
-static volatile unsigned long global_ack_eiem = ~0UL;
-/*
-** Local bitmap, same as above but for per-cpu interrupts
-*/
 static DEFINE_PER_CPU(unsigned long, local_ack_eiem) = ~0UL;
 
 static void cpu_disable_irq(unsigned int irq)
@@ -94,13 +90,11 @@ void cpu_ack_irq(unsigned int irq)
         int cpu = smp_processor_id();
 
         /* Clear in EIEM so we can no longer process */
-        if (CHECK_IRQ_PER_CPU(irq_desc[irq].status))
-                per_cpu(local_ack_eiem, cpu) &= ~mask;
-        else
-                global_ack_eiem &= ~mask;
+        per_cpu(local_ack_eiem, cpu) &= ~mask;
 
         /* disable the interrupt */
-        set_eiem(cpu_eiem & global_ack_eiem & per_cpu(local_ack_eiem, cpu));
+        set_eiem(cpu_eiem & per_cpu(local_ack_eiem, cpu));
+
         /* and now ack it */
         mtctl(mask, 23);
 }
@@ -111,13 +105,10 @@ void cpu_end_irq(unsigned int irq)
         int cpu = smp_processor_id();
 
         /* set it in the eiems---it's no longer in process */
-        if (CHECK_IRQ_PER_CPU(irq_desc[irq].status))
-                per_cpu(local_ack_eiem, cpu) |= mask;
-        else
-                global_ack_eiem |= mask;
+        per_cpu(local_ack_eiem, cpu) |= mask;
 
         /* enable the interrupt */
-        set_eiem(cpu_eiem & global_ack_eiem & per_cpu(local_ack_eiem, cpu));
+        set_eiem(cpu_eiem & per_cpu(local_ack_eiem, cpu));
 }
 
 #ifdef CONFIG_SMP
@@ -354,8 +345,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)
         local_irq_disable();
         irq_enter();
 
-        eirr_val = mfctl(23) & cpu_eiem & global_ack_eiem &
-                per_cpu(local_ack_eiem, cpu);
+        eirr_val = mfctl(23) & cpu_eiem & per_cpu(local_ack_eiem, cpu);
         if (!eirr_val)
                 goto set_out;
         irq = eirr_to_irq(eirr_val);
@@ -381,7 +371,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)
         return;
 
  set_out:
-        set_eiem(cpu_eiem & global_ack_eiem & per_cpu(local_ack_eiem, cpu));
+        set_eiem(cpu_eiem & per_cpu(local_ack_eiem, cpu));
         goto out;
 }
 
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c
index 0c3aecb85a5c..23c1388df1f5 100644
--- a/arch/parisc/kernel/pci-dma.c
+++ b/arch/parisc/kernel/pci-dma.c
@@ -21,6 +21,7 @@
 #include <linux/mm.h>
 #include <linux/pci.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/types.h>
@@ -34,7 +35,6 @@
 #include <asm/tlbflush.h>       /* for purge_tlb_*() macros */
 
 static struct proc_dir_entry * proc_gsc_root __read_mostly = NULL;
-static int pcxl_proc_info(char *buffer, char **start, off_t offset, int length);
 static unsigned long pcxl_used_bytes __read_mostly = 0;
 static unsigned long pcxl_used_pages __read_mostly = 0;
 
@@ -330,6 +330,54 @@ pcxl_free_range(unsigned long vaddr, size_t size)
         dump_resmap();
 }
 
+static int proc_pcxl_dma_show(struct seq_file *m, void *v)
+{
+#if 0
+        u_long i = 0;
+        unsigned long *res_ptr = (u_long *)pcxl_res_map;
+#endif
+        unsigned long total_pages = pcxl_res_size << 3;   /* 8 bits per byte */
+
+        seq_printf(m, "\nDMA Mapping Area size    : %d bytes (%ld pages)\n",
+                PCXL_DMA_MAP_SIZE, total_pages);
+
+        seq_printf(m, "Resource bitmap : %d bytes\n", pcxl_res_size);
+
+        seq_puts(m,  "            total:    free:    used:   % used:\n");
+        seq_printf(m, "blocks  %8d %8ld %8ld %8ld%%\n", pcxl_res_size,
+                pcxl_res_size - pcxl_used_bytes, pcxl_used_bytes,
+                (pcxl_used_bytes * 100) / pcxl_res_size);
+
+        seq_printf(m, "pages   %8ld %8ld %8ld %8ld%%\n", total_pages,
+                total_pages - pcxl_used_pages, pcxl_used_pages,
+                (pcxl_used_pages * 100 / total_pages));
+
+#if 0
+        seq_puts(m, "\nResource bitmap:");
+
+        for(; i < (pcxl_res_size / sizeof(u_long)); ++i, ++res_ptr) {
+                if ((i & 7) == 0)
+                    seq_puts(m,"\n   ");
+                seq_printf(m, "%s %08lx", buf, *res_ptr);
+        }
+#endif
+        seq_putc(m, '\n');
+        return 0;
+}
+
+static int proc_pcxl_dma_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, proc_pcxl_dma_show, NULL);
+}
+
+static const struct file_operations proc_pcxl_dma_ops = {
+        .owner          = THIS_MODULE,
+        .open           = proc_pcxl_dma_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 static int __init
 pcxl_dma_init(void)
 {
@@ -348,9 +396,10 @@ pcxl_dma_init(void)
                         "pcxl_dma_init: Unable to create gsc /proc dir entry\n");
         else {
                 struct proc_dir_entry* ent;
-                ent = create_proc_info_entry("pcxl_dma", 0,
-                                proc_gsc_root, pcxl_proc_info);
-                if (!ent)
+                ent = create_proc_entry("pcxl_dma", 0, proc_gsc_root);
+                if (ent)
+                        ent->proc_fops = &proc_pcxl_dma_ops;
+                else
                         printk(KERN_WARNING
                                 "pci-dma.c: Unable to create pcxl_dma /proc entry.\n");
         }
@@ -551,40 +600,3 @@ struct hppa_dma_ops pcx_dma_ops = {
         .dma_sync_sg_for_cpu =          pa11_dma_sync_sg_for_cpu,
         .dma_sync_sg_for_device =       pa11_dma_sync_sg_for_device,
 };
-
-
-static int pcxl_proc_info(char *buf, char **start, off_t offset, int len)
-{
-#if 0
-        u_long i = 0;
-        unsigned long *res_ptr = (u_long *)pcxl_res_map;
-#endif
-        unsigned long total_pages = pcxl_res_size << 3;   /* 8 bits per byte */
-
-        sprintf(buf, "\nDMA Mapping Area size    : %d bytes (%ld pages)\n",
-                PCXL_DMA_MAP_SIZE, total_pages);
-        
-        sprintf(buf, "%sResource bitmap : %d bytes\n", buf, pcxl_res_size);
-
-        strcat(buf,  "            total:    free:    used:   % used:\n");
-        sprintf(buf, "%sblocks  %8d %8ld %8ld %8ld%%\n", buf, pcxl_res_size,
-                pcxl_res_size - pcxl_used_bytes, pcxl_used_bytes,
-                (pcxl_used_bytes * 100) / pcxl_res_size);
-
-        sprintf(buf, "%spages   %8ld %8ld %8ld %8ld%%\n", buf, total_pages,
-                total_pages - pcxl_used_pages, pcxl_used_pages,
-                (pcxl_used_pages * 100 / total_pages));
-
-#if 0
-        strcat(buf, "\nResource bitmap:");
-
-        for(; i < (pcxl_res_size / sizeof(u_long)); ++i, ++res_ptr) {
-                if ((i & 7) == 0)
-                    strcat(buf,"\n   ");
-                sprintf(buf, "%s %08lx", buf, *res_ptr);
-        }
-#endif
-        strcat(buf, "\n");
-        return strlen(buf);
-}
-
diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c
index a46bc62b643e..89d6d5ad44b5 100644
--- a/arch/parisc/kernel/perf.c
+++ b/arch/parisc/kernel/perf.c
@@ -171,7 +171,7 @@ static const uint64_t perf_bitmasks[] = {
 
 /*
  * Write control bitmasks for Pa-8700 processor given
- * somethings have changed slightly.
+ * some things have changed slightly.
  */
 static const uint64_t perf_bitmasks_piranha[] = {
         0x0000000000000000ul,     /* first dbl word must be zero */
@@ -511,10 +511,12 @@ static int __init perf_init(void)
         } else if (boot_cpu_data.cpu_type == pcxw ||
                  boot_cpu_data.cpu_type == pcxw_ ||
                  boot_cpu_data.cpu_type == pcxw2 ||
-                 boot_cpu_data.cpu_type == mako) {
+                 boot_cpu_data.cpu_type == mako ||
+                 boot_cpu_data.cpu_type == mako2) {
                 perf_processor_interface = CUDA_INTF;
                 if (boot_cpu_data.cpu_type == pcxw2 ||
-                    boot_cpu_data.cpu_type == mako) 
+                    boot_cpu_data.cpu_type == mako ||
+                    boot_cpu_data.cpu_type == mako2)
                         bitmask_array = perf_bitmasks_piranha;
         } else {
                 perf_processor_interface = UNKNOWN_INTF;
@@ -574,27 +576,27 @@ static int perf_stop_counters(uint32_t *raddr)
                 if (!perf_rdr_read_ubuf(16, userbuf))
                         return -13;
 
-                /* Counter0 is bits 1398 thru 1429 */
+                /* Counter0 is bits 1398 to 1429 */
                 tmp64 =  (userbuf[21] << 22) & 0x00000000ffc00000;
                 tmp64 |= (userbuf[22] >> 42) & 0x00000000003fffff;
                 /* OR sticky0 (bit 1430) to counter0 bit 32 */
                 tmp64 |= (userbuf[22] >> 10) & 0x0000000080000000;
                 raddr[0] = (uint32_t)tmp64;
 
-                /* Counter1 is bits 1431 thru 1462 */
+                /* Counter1 is bits 1431 to 1462 */
                 tmp64 =  (userbuf[22] >> 9) & 0x00000000ffffffff;
                 /* OR sticky1 (bit 1463) to counter1 bit 32 */
                 tmp64 |= (userbuf[22] << 23) & 0x0000000080000000;
                 raddr[1] = (uint32_t)tmp64;
 
-                /* Counter2 is bits 1464 thru 1495 */
+                /* Counter2 is bits 1464 to 1495 */
                 tmp64 =  (userbuf[22] << 24) & 0x00000000ff000000;
                 tmp64 |= (userbuf[23] >> 40) & 0x0000000000ffffff;
                 /* OR sticky2 (bit 1496) to counter2 bit 32 */
                 tmp64 |= (userbuf[23] >> 8) & 0x0000000080000000;
                 raddr[2] = (uint32_t)tmp64;
                 
-                /* Counter3 is bits 1497 thru 1528 */
+                /* Counter3 is bits 1497 to 1528 */
                 tmp64 =  (userbuf[23] >> 7) & 0x00000000ffffffff;
                 /* OR sticky3 (bit 1529) to counter3 bit 32 */
                 tmp64 |= (userbuf[23] << 25) & 0x0000000080000000;
@@ -616,7 +618,7 @@ static int perf_stop_counters(uint32_t *raddr)
                 userbuf[23] = 0;
 
                 /* 
-                 * Write back the zero'ed bytes + the image given
+                 * Write back the zeroed bytes + the image given
                  * the read was destructive.
                  */
                 perf_rdr_write(16, userbuf);
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index 0dd3847f494c..355664812b83 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -381,6 +381,10 @@ get_wchan(struct task_struct *p)
         struct unwind_frame_info info;
         unsigned long ip;
         int count = 0;
+
+        if (!p || p == current || p->state == TASK_RUNNING)
+                return 0;
+
         /*
          * These bracket the sleeping functions..
          */
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c
index 566226d78bc9..549f5484342c 100644
--- a/arch/parisc/kernel/processor.c
+++ b/arch/parisc/kernel/processor.c
@@ -63,7 +63,7 @@ extern int update_cr16_clocksource(void);	/* from time.c */
 ** will call register_parisc_driver(&cpu_driver) before calling do_inventory().
 **
 ** The goal of consolidating CPU initialization into one place is
-** to make sure all CPU's get initialized the same way.
+** to make sure all CPUs get initialized the same way.
 ** The code path not shared is how PDC hands control of the CPU to the OS.
 ** The initialization of OS data structures is the same (done below).
 */
@@ -76,7 +76,7 @@ extern int update_cr16_clocksource(void);	/* from time.c */
  * (return 1).  If so, initialize the chip and tell other partners in crime 
  * they have work to do.
  */
-static int __init processor_probe(struct parisc_device *dev)
+static int __cpuinit processor_probe(struct parisc_device *dev)
 {
         unsigned long txn_addr;
         unsigned long cpuid;
@@ -166,7 +166,7 @@ static int __init processor_probe(struct parisc_device *dev)
 #endif
 
         /*
-        ** CONFIG_SMP: init_smp_config() will attempt to get CPU's into
+        ** CONFIG_SMP: init_smp_config() will attempt to get CPUs into
         ** OS control. RENDEZVOUS is the default state - see mem_set above.
         **      p->state = STATE_RENDEZVOUS;
         */
@@ -334,7 +334,7 @@ int __init init_per_cpu(int cpunum)
 }
 
 /*
- * Display cpu info for all cpu's.
+ * Display CPU info for all CPUs.
  */
 int
 show_cpuinfo (struct seq_file *m, void *v)
@@ -381,19 +381,19 @@ show_cpuinfo (struct seq_file *m, void *v)
         return 0;
 }
 
-static struct parisc_device_id processor_tbl[] __read_mostly = {
+static const struct parisc_device_id processor_tbl[] = {
         { HPHW_NPROC, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, SVERSION_ANY_ID },
         { 0, }
 };
 
-static struct parisc_driver cpu_driver __read_mostly = {
+static struct parisc_driver cpu_driver = {
         .name           = "CPU",
         .id_table       = processor_tbl,
         .probe          = processor_probe
 };
 
 /**
- * processor_init - Processor initalization procedure.
+ * processor_init - Processor initialization procedure.
  *
  * Register this driver.
  */
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 9818919571fd..c44b8c51f5d1 100644
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -45,7 +45,7 @@
 #include <asm/io.h>
 #include <asm/setup.h>
 
-char    __initdata command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];
 
 /* Intended for ccio/sba/cpu statistics under /proc/bus/{runway|gsc} */
 struct proc_dir_entry * proc_runway_root __read_mostly = NULL;
@@ -162,7 +162,7 @@ void __init setup_arch(char **cmdline_p)
 }
 
 /*
- * Display cpu info for all cpu's.
+ * Display CPU info for all CPUs.
  * for parisc this is in processor.c
  */
 extern int show_cpuinfo (struct seq_file *m, void *v);
@@ -225,6 +225,7 @@ static void __init parisc_proc_mkdir(void)
                 }
                 break;
         case mako:
+        case mako2:
                 if (NULL == proc_mckinley_root)
                 {
                         proc_mckinley_root = proc_mkdir("bus/mckinley", NULL);
diff --git a/arch/parisc/kernel/signal32.h b/arch/parisc/kernel/signal32.h
index e39b38a67a87..c7800846422c 100644
--- a/arch/parisc/kernel/signal32.h
+++ b/arch/parisc/kernel/signal32.h
@@ -113,7 +113,7 @@ int copy_siginfo_from_user32 (siginfo_t *to, compat_siginfo_t __user *from);
 /* In a deft move of uber-hackery, we decide to carry the top half of all
  * 64-bit registers in a non-portable, non-ABI, hidden structure.
  * Userspace can read the hidden structure if it *wants* but is never
- * guaranteed to be in the same place. Infact the uc_sigmask from the
+ * guaranteed to be in the same place. In fact the uc_sigmask from the
  * ucontext_t structure may push the hidden register file downards
  */
 struct compat_regfile {
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index 6ba9257fdb7f..04c7e1d36cea 100644
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -8,7 +8,7 @@
 ** Lots of stuff stolen from arch/alpha/kernel/smp.c
 ** ...and then parisc stole from arch/ia64/kernel/smp.c. Thanks David! :^)
 **
-** Thanks to John Curry and Ullas Ponnadi. I learned alot from their work.
+** Thanks to John Curry and Ullas Ponnadi. I learned a lot from their work.
 ** -grant (1/12/2001)
 **
 **      This program is free software; you can redistribute it and/or modify
@@ -419,7 +419,7 @@ smp_cpu_init(int cpunum)
                 BUG();
         enter_lazy_tlb(&init_mm, current);
 
-        init_IRQ();   /* make sure no IRQ's are enabled or pending */
+        init_IRQ();   /* make sure no IRQs are enabled or pending */
         start_cpu_itimer();
 }
 
@@ -461,7 +461,7 @@ void __init smp_callin(void)
 /*
  * Bring one cpu online.
  */
-int __init smp_boot_one_cpu(int cpuid)
+int __cpuinit smp_boot_one_cpu(int cpuid)
 {
         struct task_struct *idle;
         long timeout;
@@ -552,7 +552,7 @@ void __devinit smp_prepare_boot_cpu(void)
 
 /*
 ** inventory.c:do_inventory() hasn't yet been run and thus we
-** don't 'discover' the additional CPU's until later.
+** don't 'discover' the additional CPUs until later.
 */
 void __init smp_prepare_cpus(unsigned int max_cpus)
 {
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index ce3245f87fdd..bb23ff71c28e 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -311,14 +311,13 @@ struct readdir32_callback {
         int count;
 };
 
-#define ROUND_UP(x,a)   ((__typeof__(x))(((unsigned long)(x) + ((a) - 1)) & ~((a) - 1)))
 #define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de)))
 static int filldir32 (void *__buf, const char *name, int namlen,
                         loff_t offset, u64 ino, unsigned int d_type)
 {
         struct linux32_dirent __user * dirent;
         struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
-        int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1, 4);
+        int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 1, 4);
         u32 d_ino;
 
         buf->error = -EINVAL;   /* only used if we fail.. */
@@ -350,6 +349,10 @@ sys32_getdents (unsigned int fd, void __user * dirent, unsigned int count)
         struct getdents32_callback buf;
         int error;
 
+        error = -EFAULT;
+        if (!access_ok(VERIFY_WRITE, dirent, count))
+                goto out;
+
         error = -EBADF;
         file = fget(fd);
         if (!file)
@@ -366,8 +369,10 @@ sys32_getdents (unsigned int fd, void __user * dirent, unsigned int count)
         error = buf.error;
         lastdirent = buf.previous;
         if (lastdirent) {
-                put_user(file->f_pos, &lastdirent->d_off);
-                error = count - buf.count;
+                if (put_user(file->f_pos, &lastdirent->d_off))
+                        error = -EFAULT;
+                else
+                        error = count - buf.count;
         }
 
 out_putf:
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index 10859f53e94f..56f6231cb863 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -181,7 +181,7 @@ linux_gateway_entry:
         /* Are we being ptraced? */
         mfctl   %cr30, %r1
         LDREG   TI_TASK(%r1),%r1
-        LDREG   TASK_PTRACE(%r1), %r1
+        ldw     TASK_PTRACE(%r1), %r1
         bb,<,n  %r1,31,.Ltracesys
         
         /* Note!  We cannot use the syscall table that is mapped
@@ -198,7 +198,7 @@ linux_gateway_entry:
         ldil    L%sys_call_table, %r1
         ldo     R%sys_call_table(%r1), %r19
 #endif  
-        comiclr,>>=     __NR_Linux_syscalls, %r20, %r0
+        comiclr,>>      __NR_Linux_syscalls, %r20, %r0
         b,n     .Lsyscall_nosys
         
         LDREGX  %r20(%r19), %r19
@@ -501,7 +501,7 @@ lws_compare_and_swap:
         shlw    %r20, 4, %r20
         add     %r20, %r28, %r20
 
-# ifdef ENABLE_LWS_DEBUG
+# if ENABLE_LWS_DEBUG
         /*      
                 DEBUG, check for deadlock! 
                 If the thread register values are the same
@@ -550,7 +550,7 @@ cas_wouldblock:
                 perspective
         */
 cas_action:
-#if defined CONFIG_SMP && defined ENABLE_LWS_DEBUG
+#if defined CONFIG_SMP && ENABLE_LWS_DEBUG
         /* DEBUG */
         mfctl   %cr27, %r1
         stw     %r1, 4(%sr2,%r20)
@@ -562,7 +562,7 @@ cas_action:
 #ifdef CONFIG_SMP
         /* Free lock */
         stw     %r20, 0(%sr2,%r20)
-# ifdef ENABLE_LWS_DEBUG
+# if ENABLE_LWS_DEBUG
         /* Clear thread register indicator */
         stw     %r0, 4(%sr2,%r20)
 # endif
@@ -576,7 +576,7 @@ cas_action:
 #ifdef CONFIG_SMP
         /* Free lock */
         stw     %r20, 0(%sr2,%r20)
-# ifdef ENABLE_LWS_DEBUG
+# if ENABLE_LWS_DEBUG
         stw     %r0, 4(%sr2,%r20)
 # endif
 #endif
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 8bf87e5d9c37..627f3c28ad8c 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -30,11 +30,6 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#undef ENTRY_SAME
-#undef ENTRY_DIFF
-#undef ENTRY_UHOH
-#undef ENTRY_COMP
-#undef ENTRY_OURS
 #if defined(CONFIG_64BIT) && !defined(SYSCALL_TABLE_64BIT)
 /* Use ENTRY_SAME for 32-bit syscalls which are the same on wide and
  * narrow palinux.  Use ENTRY_DIFF for those where a 32-bit specific
@@ -405,5 +400,16 @@
         ENTRY_SAME(epoll_pwait)
         ENTRY_COMP(statfs64)
         ENTRY_COMP(fstatfs64)
+        ENTRY_COMP(kexec_load)          /* 300 */
+        ENTRY_COMP(utimensat)
+        ENTRY_COMP(signalfd)
+        ENTRY_COMP(timerfd)
+        ENTRY_SAME(eventfd)
+
         /* Nothing yet */
 
+#undef ENTRY_SAME
+#undef ENTRY_DIFF
+#undef ENTRY_UHOH
+#undef ENTRY_COMP
+#undef ENTRY_OURS
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 07a991aa9b0c..8b3062a5c812 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -191,7 +191,7 @@ int update_cr16_clocksource(void)
 {
         int change = 0;
 
-        /* since the cr16 cycle counters are not syncronized across CPUs,
+        /* since the cr16 cycle counters are not synchronized across CPUs,
            we'll check if we should switch to a safe clocksource: */
         if (clocksource_cr16.rating != 0 && num_online_cpus() > 1) {
                 clocksource_change_rating(&clocksource_cr16, 0);
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 745ff741490a..c3ec9f1ec0f3 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -615,7 +615,7 @@ void handle_interruption(int code, struct pt_regs *regs)
                 
         case 13:
                 /* Conditional Trap
-                   The condition succees in an instruction which traps 
+                   The condition succeeds in an instruction which traps
                    on condition  */
                 if(user_mode(regs)){
                         si.si_signo = SIGFPE;
@@ -802,13 +802,14 @@ void handle_interruption(int code, struct pt_regs *regs)
 
 int __init check_ivt(void *iva)
 {
+        extern const u32 os_hpmc[];
+        extern const u32 os_hpmc_end[];
+
         int i;
         u32 check = 0;
         u32 *ivap;
         u32 *hpmcp;
         u32 length;
-        extern void os_hpmc(void);
-        extern void os_hpmc_end(void);
 
         if (strcmp((char *)iva, "cows can fly"))
                 return -1;
@@ -820,7 +821,7 @@ int __init check_ivt(void *iva)
 
         /* Compute Checksum for HPMC handler */
 
-        length = (u32)((unsigned long)os_hpmc_end - (unsigned long)os_hpmc);
+        length = os_hpmc_end - os_hpmc;
         ivap[7] = length;
 
         hpmcp = (u32 *)os_hpmc;
diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c
index 89c03707eccc..e70f57e27643 100644
--- a/arch/parisc/kernel/unwind.c
+++ b/arch/parisc/kernel/unwind.c
@@ -216,8 +216,10 @@ static void unwind_frame_regs(struct unwind_frame_info *info)
                 /* Handle some frequent special cases.... */
                 {
                         char symname[KSYM_NAME_LEN+1];
+                        char *modname;
 
-                        kallsyms_lookup(info->ip, NULL, NULL, NULL, symname);
+                        kallsyms_lookup(info->ip, NULL, NULL, &modname,
+                                symname);
 
                         dbg("info->ip = 0x%lx, name = %s\n", info->ip, symname);
 
diff --git a/arch/parisc/math-emu/dbl_float.h b/arch/parisc/math-emu/dbl_float.h
index 1570e2e0a327..0c2fa9a951b3 100644
--- a/arch/parisc/math-emu/dbl_float.h
+++ b/arch/parisc/math-emu/dbl_float.h
@@ -22,7 +22,7 @@
     PA header file -- do not include this header file for non-PA builds.
 #endif
 
-/* 32-bit word grabing functions */
+/* 32-bit word grabbing functions */
 #define Dbl_firstword(value) Dallp1(value)
 #define Dbl_secondword(value) Dallp2(value)
 #define Dbl_thirdword(value) dummy_location
@@ -37,7 +37,7 @@
 #define Dbl_allp1(object) Dallp1(object)
 #define Dbl_allp2(object) Dallp2(object)
 
-/* dbl_and_signs ands the sign bits of each argument and puts the result
+/* dbl_and_signs ANDs the sign bits of each argument and puts the result
  * into the first argument. dbl_or_signs ors those same sign bits */
 #define Dbl_and_signs( src1dst, src2)           \
     Dallp1(src1dst) = (Dallp1(src2)|~((unsigned int)1<<31)) & Dallp1(src1dst)
diff --git a/arch/parisc/math-emu/dfsqrt.c b/arch/parisc/math-emu/dfsqrt.c
index b6ed1066f1e4..9542c6d281a5 100644
--- a/arch/parisc/math-emu/dfsqrt.c
+++ b/arch/parisc/math-emu/dfsqrt.c
@@ -76,7 +76,7 @@ dbl_fsqrt(
                 }
                 /*
                  * Return quiet NaN or positive infinity.
-                 *  Fall thru to negative test if negative infinity.
+                 *  Fall through to negative test if negative infinity.
                  */
                 if (Dbl_iszero_sign(srcp1) || 
                     Dbl_isnotzero_mantissa(srcp1,srcp2)) {
diff --git a/arch/parisc/math-emu/sfsqrt.c b/arch/parisc/math-emu/sfsqrt.c
index cd3f6db1f6fb..4657a12c9107 100644
--- a/arch/parisc/math-emu/sfsqrt.c
+++ b/arch/parisc/math-emu/sfsqrt.c
@@ -76,7 +76,7 @@ sgl_fsqrt(
                 }
                 /*
                  * Return quiet NaN or positive infinity.
-                 *  Fall thru to negative test if negative infinity.
+                 *  Fall through to negative test if negative infinity.
                  */
                 if (Sgl_iszero_sign(src) || Sgl_isnotzero_mantissa(src)) {
                         *dstptr = src;
diff --git a/arch/parisc/math-emu/sgl_float.h b/arch/parisc/math-emu/sgl_float.h
index 82519a5c2ba5..4ee4cc95e4bf 100644
--- a/arch/parisc/math-emu/sgl_float.h
+++ b/arch/parisc/math-emu/sgl_float.h
@@ -23,7 +23,7 @@
     PA header file -- do not include this header file for non-PA builds.
 #endif
 
-/* 32-bit word grabing functions */
+/* 32-bit word grabbing functions */
 #define Sgl_firstword(value) Sall(value)
 #define Sgl_secondword(value) dummy_location
 #define Sgl_thirdword(value) dummy_location
@@ -36,7 +36,7 @@
 #define Sgl_exponentmantissa(object) Sexponentmantissa(object)
 #define Sgl_all(object) Sall(object)
 
-/* sgl_and_signs ands the sign bits of each argument and puts the result
+/* sgl_and_signs ANDs the sign bits of each argument and puts the result
  * into the first argument. sgl_or_signs ors those same sign bits */
 #define Sgl_and_signs( src1dst, src2)           \
     Sall(src1dst) = (Sall(src2)|~((unsigned int)1<<31)) & Sall(src1dst)
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 75ea9f2a8a41..e724b362c49a 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -890,7 +890,7 @@ void __init paging_init(void)
 #ifdef CONFIG_PA20
 
 /*
- * Currently, all PA20 chips have 18 bit protection id's, which is the
+ * Currently, all PA20 chips have 18 bit protection IDs, which is the
  * limiting factor (space ids are 32 bits).
  */
 
@@ -899,10 +899,10 @@ void __init paging_init(void)
 #else
 
 /*
- * Currently we have a one-to-one relationship between space id's and
- * protection id's. Older parisc chips (PCXS, PCXT, PCXL, PCXL2) only
- * support 15 bit protection id's, so that is the limiting factor.
- * PCXT' has 18 bit protection id's, but only 16 bit spaceids, so it's
+ * Currently we have a one-to-one relationship between space IDs and
+ * protection IDs. Older parisc chips (PCXS, PCXT, PCXL, PCXL2) only
+ * support 15 bit protection IDs, so that is the limiting factor.
+ * PCXT' has 18 bit protection IDs, but only 16 bit spaceids, so it's
  * probably not worth the effort for a special case here.
  */
 
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c
index 87703df87509..cbca1df8bc60 100644
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@ -151,12 +151,18 @@ static struct console udbg_console = {
 
 static int early_console_initialized;
 
-/* called by setup_system */
+/*
+ * Called by setup_system after ppc_md->probe and ppc_md->early_init.
+ * Call it again after setting udbg_putc in ppc_md->setup_arch.
+ */
 void register_early_udbg_console(void)
 {
         if (early_console_initialized)
                 return;
 
+        if (!udbg_putc)
+                return;
+
         if (strstr(boot_command_line, "udbg-immortal")) {
                 printk(KERN_INFO "early console immortal !\n");
                 udbg_console.flags &= ~CON_BOOT;
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 07b1c4ec428d..956571526a57 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -363,8 +363,19 @@ static void __init pmac_setup_arch(void)
                 smp_ops = &core99_smp_ops;
         }
 #ifdef CONFIG_PPC32
-        else
+        else {
+                /*
+                 * We have to set bits in cpu_possible_map here since the
+                 * secondary CPU(s) aren't in the device tree, and
+                 * setup_per_cpu_areas only allocates per-cpu data for
+                 * CPUs in the cpu_possible_map.
+                 */
+                int cpu;
+
+                for (cpu = 1; cpu < 4 && cpu < NR_CPUS; ++cpu)
+                        cpu_set(cpu, cpu_possible_map);
                 smp_ops = &psurge_smp_ops;
+        }
 #endif
 #endif /* CONFIG_SMP */
 
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 686ed82bde79..cb2d894541c6 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -317,7 +317,6 @@ static int __init smp_psurge_probe(void)
                 ncpus = NR_CPUS;
         for (i = 1; i < ncpus ; ++i) {
                 cpu_set(i, cpu_present_map);
-                cpu_set(i, cpu_possible_map);
                 set_hard_smp_processor_id(i, i);
         }
 
diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index 7d1a11822a1e..8059531bf0ac 100644
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
@@ -2357,8 +2357,9 @@ sun4v_ldc_unmap:
          nop
         .size   sun4v_ldc_unmap, .-sun4v_ldc_unmap
 
-        /* %o0: cookie
-         * %o1: mte_cookie
+        /* %o0: channel
+         * %o1: cookie
+         * %o2: mte_cookie
          *
          * returns %o0: status
          */
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index a36f8dd0c021..e60d283f60bc 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -1,7 +1,6 @@
-/* $Id: irq.c,v 1.114 2002/01/11 08:45:38 davem Exp $
- * irq.c: UltraSparc IRQ handling/init/registry.
+/* irq.c: UltraSparc IRQ handling/init/registry.
  *
- * Copyright (C) 1997  David S. Miller  (davem@caip.rutgers.edu)
+ * Copyright (C) 1997, 2007  David S. Miller  (davem@davemloft.net)
  * Copyright (C) 1998  Eddie C. Dost    (ecd@skynet.be)
  * Copyright (C) 1998  Jakub Jelinek    (jj@ultra.linux.cz)
  */
@@ -43,6 +42,7 @@
 #include <asm/cpudata.h>
 #include <asm/auxio.h>
 #include <asm/head.h>
+#include <asm/hypervisor.h>
 
 /* UPA nodes send interrupt packet to UltraSparc with first data reg
  * value low 5 (7 on Starfire) bits holding the IRQ identifier being
@@ -380,6 +380,76 @@ static void sun4v_irq_end(unsigned int virt_irq)
         }
 }
 
+static void sun4v_virq_enable(unsigned int virt_irq)
+{
+        struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);
+        unsigned int ino = bucket - &ivector_table[0];
+
+        if (likely(bucket)) {
+                unsigned long cpuid, dev_handle, dev_ino;
+                int err;
+
+                cpuid = irq_choose_cpu(virt_irq);
+
+                dev_handle = ino & IMAP_IGN;
+                dev_ino = ino & IMAP_INO;
+
+                err = sun4v_vintr_set_target(dev_handle, dev_ino, cpuid);
+                if (err != HV_EOK)
+                        printk("sun4v_vintr_set_target(%lx,%lx,%lu): "
+                               "err(%d)\n",
+                               dev_handle, dev_ino, cpuid, err);
+                err = sun4v_vintr_set_state(dev_handle, dev_ino,
+                                            HV_INTR_ENABLED);
+                if (err != HV_EOK)
+                        printk("sun4v_vintr_set_state(%lx,%lx,"
+                               "HV_INTR_ENABLED): err(%d)\n",
+                               dev_handle, dev_ino, err);
+        }
+}
+
+static void sun4v_virq_disable(unsigned int virt_irq)
+{
+        struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);
+        unsigned int ino = bucket - &ivector_table[0];
+
+        if (likely(bucket)) {
+                unsigned long dev_handle, dev_ino;
+                int err;
+
+                dev_handle = ino & IMAP_IGN;
+                dev_ino = ino & IMAP_INO;
+
+                err = sun4v_vintr_set_state(dev_handle, dev_ino,
+                                            HV_INTR_DISABLED);
+                if (err != HV_EOK)
+                        printk("sun4v_vintr_set_state(%lx,%lx,"
+                               "HV_INTR_DISABLED): err(%d)\n",
+                               dev_handle, dev_ino, err);
+        }
+}
+
+static void sun4v_virq_end(unsigned int virt_irq)
+{
+        struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);
+        unsigned int ino = bucket - &ivector_table[0];
+
+        if (likely(bucket)) {
+                unsigned long dev_handle, dev_ino;
+                int err;
+
+                dev_handle = ino & IMAP_IGN;
+                dev_ino = ino & IMAP_INO;
+
+                err = sun4v_vintr_set_state(dev_handle, dev_ino,
+                                            HV_INTR_STATE_IDLE);
+                if (err != HV_EOK)
+                        printk("sun4v_vintr_set_state(%lx,%lx,"
+                                "HV_INTR_STATE_IDLE): err(%d)\n",
+                               dev_handle, dev_ino, err);
+        }
+}
+
 static void run_pre_handler(unsigned int virt_irq)
 {
         struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);
@@ -434,6 +504,21 @@ static struct irq_chip sun4v_msi = {
 };
 #endif
 
+static struct irq_chip sun4v_virq = {
+        .typename       = "vsun4v",
+        .enable         = sun4v_virq_enable,
+        .disable        = sun4v_virq_disable,
+        .end            = sun4v_virq_end,
+};
+
+static struct irq_chip sun4v_virq_ack = {
+        .typename       = "vsun4v+ack",
+        .enable         = sun4v_virq_enable,
+        .disable        = sun4v_virq_disable,
+        .ack            = run_pre_handler,
+        .end            = sun4v_virq_end,
+};
+
 void irq_install_pre_handler(int virt_irq,
                              void (*func)(unsigned int, void *, void *),
                              void *arg1, void *arg2)
@@ -447,7 +532,8 @@ void irq_install_pre_handler(int virt_irq,
 
         chip = get_irq_chip(virt_irq);
         if (chip == &sun4u_irq_ack ||
-            chip == &sun4v_irq_ack
+            chip == &sun4v_irq_ack ||
+            chip == &sun4v_virq_ack
 #ifdef CONFIG_PCI_MSI
             || chip == &sun4v_msi
 #endif
@@ -455,7 +541,9 @@ void irq_install_pre_handler(int virt_irq,
                 return;
 
         chip = (chip == &sun4u_irq ?
-                &sun4u_irq_ack : &sun4v_irq_ack);
+                &sun4u_irq_ack :
+                (chip == &sun4v_irq ?
+                 &sun4v_irq_ack : &sun4v_virq_ack));
         set_irq_chip(virt_irq, chip);
 }
 
@@ -492,19 +580,18 @@ out:
         return bucket->virt_irq;
 }
 
-unsigned int sun4v_build_irq(u32 devhandle, unsigned int devino)
+static unsigned int sun4v_build_common(unsigned long sysino,
+                                       struct irq_chip *chip)
 {
         struct ino_bucket *bucket;
         struct irq_handler_data *data;
-        unsigned long sysino;
 
         BUG_ON(tlb_type != hypervisor);
 
-        sysino = sun4v_devino_to_sysino(devhandle, devino);
         bucket = &ivector_table[sysino];
         if (!bucket->virt_irq) {
                 bucket->virt_irq = virt_irq_alloc(__irq(bucket));
-                set_irq_chip(bucket->virt_irq, &sun4v_irq);
+                set_irq_chip(bucket->virt_irq, chip);
         }
 
         data = get_irq_chip_data(bucket->virt_irq);
@@ -529,6 +616,32 @@ out:
         return bucket->virt_irq;
 }
 
+unsigned int sun4v_build_irq(u32 devhandle, unsigned int devino)
+{
+        unsigned long sysino = sun4v_devino_to_sysino(devhandle, devino);
+
+        return sun4v_build_common(sysino, &sun4v_irq);
+}
+
+unsigned int sun4v_build_virq(u32 devhandle, unsigned int devino)
+{
+        unsigned long sysino, hv_err;
+
+        BUG_ON(devhandle & ~IMAP_IGN);
+        BUG_ON(devino & ~IMAP_INO);
+
+        sysino = devhandle | devino;
+
+        hv_err = sun4v_vintr_set_cookie(devhandle, devino, sysino);
+        if (hv_err) {
+                prom_printf("IRQ: Fatal, cannot set cookie for [%x:%x] "
+                            "err=%lu\n", devhandle, devino, hv_err);
+                prom_halt();
+        }
+
+        return sun4v_build_common(sysino, &sun4v_virq);
+}
+
 #ifdef CONFIG_PCI_MSI
 unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p,
                              unsigned int msi_start, unsigned int msi_end)
diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c
index f974fefc3ebc..4249214608af 100644
--- a/arch/sparc64/kernel/pci_common.c
+++ b/arch/sparc64/kernel/pci_common.c
@@ -291,8 +291,9 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
 
         for (i = 0; i < num_pbm_ranges; i++) {
                 const struct linux_prom_pci_ranges *pr = &pbm_ranges[i];
-                unsigned long a;
+                unsigned long a, size;
                 u32 parent_phys_hi, parent_phys_lo;
+                u32 size_hi, size_lo;
                 int type;
 
                 parent_phys_hi = pr->parent_phys_hi;
@@ -300,9 +301,14 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
                 if (tlb_type == hypervisor)
                         parent_phys_hi &= 0x0fffffff;
 
+                size_hi = pr->size_hi;
+                size_lo = pr->size_lo;
+
                 type = (pr->child_phys_hi >> 24) & 0x3;
                 a = (((unsigned long)parent_phys_hi << 32UL) |
                      ((unsigned long)parent_phys_lo  <<  0UL));
+                size = (((unsigned long)size_hi << 32UL) |
+                        ((unsigned long)size_lo  <<  0UL));
 
                 switch (type) {
                 case 0:
@@ -313,7 +319,7 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
                 case 1:
                         /* 16-bit IO space, 16MB */
                         pbm->io_space.start = a;
-                        pbm->io_space.end = a + ((16UL*1024UL*1024UL) - 1UL);
+                        pbm->io_space.end = a + size - 1UL;
                         pbm->io_space.flags = IORESOURCE_IO;
                         saw_io = 1;
                         break;
@@ -321,7 +327,7 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
                 case 2:
                         /* 32-bit MEM space, 2GB */
                         pbm->mem_space.start = a;
-                        pbm->mem_space.end = a + (0x80000000UL - 1UL);
+                        pbm->mem_space.end = a + size - 1UL;
                         pbm->mem_space.flags = IORESOURCE_MEM;
                         saw_mem = 1;
                         break;
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 6b5173ac8131..c99b46354859 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -340,6 +340,15 @@ unsigned blk_ordered_req_seq(struct request *rq)
         if (rq == &q->post_flush_rq)
                 return QUEUE_ORDSEQ_POSTFLUSH;
 
+        /*
+         * !fs requests don't need to follow barrier ordering.  Always
+         * put them at the front.  This fixes the following deadlock.
+         *
+         * http://thread.gmane.org/gmane.linux.kernel/537473
+         */
+        if (!blk_fs_request(rq))
+                return QUEUE_ORDSEQ_DRAIN;
+
         if ((rq->cmd_flags & REQ_ORDERED_COLOR) ==
             (q->orig_bar_rq->cmd_flags & REQ_ORDERED_COLOR))
                 return QUEUE_ORDSEQ_DRAIN;
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index d383168b75fa..0439ee951a11 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -1810,68 +1810,69 @@ static int find_gmch(u16 device)
 static const struct intel_driver_description {
         unsigned int chip_id;
         unsigned int gmch_chip_id;
+        unsigned int multi_gmch_chip; /* if we have more gfx chip type on this HB. */
         char *name;
         const struct agp_bridge_driver *driver;
         const struct agp_bridge_driver *gmch_driver;
 } intel_agp_chipsets[] = {
-        { PCI_DEVICE_ID_INTEL_82443LX_0, 0, "440LX", &intel_generic_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82443BX_0, 0, "440BX", &intel_generic_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82443GX_0, 0, "440GX", &intel_generic_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82810_MC1, PCI_DEVICE_ID_INTEL_82810_IG1, "i810",
+        { PCI_DEVICE_ID_INTEL_82443LX_0, 0, 0, "440LX", &intel_generic_driver, NULL },
+        { PCI_DEVICE_ID_INTEL_82443BX_0, 0, 0, "440BX", &intel_generic_driver, NULL },
+        { PCI_DEVICE_ID_INTEL_82443GX_0, 0, 0, "440GX", &intel_generic_driver, NULL },
+        { PCI_DEVICE_ID_INTEL_82810_MC1, PCI_DEVICE_ID_INTEL_82810_IG1, 0, "i810",
                 NULL, &intel_810_driver },
-        { PCI_DEVICE_ID_INTEL_82810_MC3, PCI_DEVICE_ID_INTEL_82810_IG3, "i810",
+        { PCI_DEVICE_ID_INTEL_82810_MC3, PCI_DEVICE_ID_INTEL_82810_IG3, 0, "i810",
                 NULL, &intel_810_driver },
-        { PCI_DEVICE_ID_INTEL_82810E_MC, PCI_DEVICE_ID_INTEL_82810E_IG, "i810",
+        { PCI_DEVICE_ID_INTEL_82810E_MC, PCI_DEVICE_ID_INTEL_82810E_IG, 0, "i810",
                 NULL, &intel_810_driver },
-        { PCI_DEVICE_ID_INTEL_82815_MC, PCI_DEVICE_ID_INTEL_82815_CGC, "i815",
-                &intel_810_driver, &intel_815_driver },
-        { PCI_DEVICE_ID_INTEL_82820_HB, 0, "i820", &intel_820_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82820_UP_HB, 0, "i820", &intel_820_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82830_HB, PCI_DEVICE_ID_INTEL_82830_CGC, "830M",
+        { PCI_DEVICE_ID_INTEL_82815_MC, PCI_DEVICE_ID_INTEL_82815_CGC, 0, "i815",
+                &intel_815_driver, &intel_810_driver },
+        { PCI_DEVICE_ID_INTEL_82820_HB, 0, 0, "i820", &intel_820_driver, NULL },
+        { PCI_DEVICE_ID_INTEL_82820_UP_HB, 0, 0, "i820", &intel_820_driver, NULL },
+        { PCI_DEVICE_ID_INTEL_82830_HB, PCI_DEVICE_ID_INTEL_82830_CGC, 0, "830M",
                 &intel_830mp_driver, &intel_830_driver },
-        { PCI_DEVICE_ID_INTEL_82840_HB, 0, "i840", &intel_840_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82845_HB, 0, "845G", &intel_845_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82845G_HB, PCI_DEVICE_ID_INTEL_82845G_IG, "830M",
+        { PCI_DEVICE_ID_INTEL_82840_HB, 0, 0, "i840", &intel_840_driver, NULL },
+        { PCI_DEVICE_ID_INTEL_82845_HB, 0, 0, "845G", &intel_845_driver, NULL },
+        { PCI_DEVICE_ID_INTEL_82845G_HB, PCI_DEVICE_ID_INTEL_82845G_IG, 0, "830M",
                 &intel_845_driver, &intel_830_driver },
-        { PCI_DEVICE_ID_INTEL_82850_HB, 0, "i850", &intel_850_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82855PM_HB, 0, "855PM", &intel_845_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82855GM_HB, PCI_DEVICE_ID_INTEL_82855GM_IG, "855GM",
+        { PCI_DEVICE_ID_INTEL_82850_HB, 0, 0, "i850", &intel_850_driver, NULL },
+        { PCI_DEVICE_ID_INTEL_82855PM_HB, 0, 0, "855PM", &intel_845_driver, NULL },
+        { PCI_DEVICE_ID_INTEL_82855GM_HB, PCI_DEVICE_ID_INTEL_82855GM_IG, 0, "855GM",
                 &intel_845_driver, &intel_830_driver },
-        { PCI_DEVICE_ID_INTEL_82860_HB, 0, "i860", &intel_860_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82865_HB, PCI_DEVICE_ID_INTEL_82865_IG, "865",
+        { PCI_DEVICE_ID_INTEL_82860_HB, 0, 0, "i860", &intel_860_driver, NULL },
+        { PCI_DEVICE_ID_INTEL_82865_HB, PCI_DEVICE_ID_INTEL_82865_IG, 0, "865",
                 &intel_845_driver, &intel_830_driver },
-        { PCI_DEVICE_ID_INTEL_82875_HB, 0, "i875", &intel_845_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82915G_HB, PCI_DEVICE_ID_INTEL_82915G_IG, "915G",
+        { PCI_DEVICE_ID_INTEL_82875_HB, 0, 0, "i875", &intel_845_driver, NULL },
+        { PCI_DEVICE_ID_INTEL_82915G_HB, PCI_DEVICE_ID_INTEL_82915G_IG, 0, "915G",
                 &intel_845_driver, &intel_915_driver },
-        { PCI_DEVICE_ID_INTEL_82915GM_HB, PCI_DEVICE_ID_INTEL_82915GM_IG, "915GM",
+        { PCI_DEVICE_ID_INTEL_82915GM_HB, PCI_DEVICE_ID_INTEL_82915GM_IG, 0, "915GM",
                 &intel_845_driver, &intel_915_driver },
-        { PCI_DEVICE_ID_INTEL_82945G_HB, PCI_DEVICE_ID_INTEL_82945G_IG, "945G",
+        { PCI_DEVICE_ID_INTEL_82945G_HB, PCI_DEVICE_ID_INTEL_82945G_IG, 0, "945G",
                 &intel_845_driver, &intel_915_driver },
-        { PCI_DEVICE_ID_INTEL_82945GM_HB, PCI_DEVICE_ID_INTEL_82945GM_IG, "945GM",
+        { PCI_DEVICE_ID_INTEL_82945GM_HB, PCI_DEVICE_ID_INTEL_82945GM_IG, 1, "945GM",
                 &intel_845_driver, &intel_915_driver },
-        { PCI_DEVICE_ID_INTEL_82945GM_HB, PCI_DEVICE_ID_INTEL_82945GME_IG, "945GME",
+        { PCI_DEVICE_ID_INTEL_82945GM_HB, PCI_DEVICE_ID_INTEL_82945GME_IG, 0, "945GME",
                 &intel_845_driver, &intel_915_driver },
-        { PCI_DEVICE_ID_INTEL_82946GZ_HB, PCI_DEVICE_ID_INTEL_82946GZ_IG, "946GZ",
+        { PCI_DEVICE_ID_INTEL_82946GZ_HB, PCI_DEVICE_ID_INTEL_82946GZ_IG, 0, "946GZ",
                 &intel_845_driver, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_82965G_1_HB, PCI_DEVICE_ID_INTEL_82965G_1_IG, "965G",
+        { PCI_DEVICE_ID_INTEL_82965G_1_HB, PCI_DEVICE_ID_INTEL_82965G_1_IG, 0, "965G",
                 &intel_845_driver, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_82965Q_HB, PCI_DEVICE_ID_INTEL_82965Q_IG, "965Q",
+        { PCI_DEVICE_ID_INTEL_82965Q_HB, PCI_DEVICE_ID_INTEL_82965Q_IG, 0, "965Q",
                 &intel_845_driver, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_82965G_HB, PCI_DEVICE_ID_INTEL_82965G_IG, "965G",
+        { PCI_DEVICE_ID_INTEL_82965G_HB, PCI_DEVICE_ID_INTEL_82965G_IG, 0, "965G",
                 &intel_845_driver, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_82965GM_HB, PCI_DEVICE_ID_INTEL_82965GM_IG, "965GM",
+        { PCI_DEVICE_ID_INTEL_82965GM_HB, PCI_DEVICE_ID_INTEL_82965GM_IG, 1, "965GM",
                 &intel_845_driver, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_82965GM_HB, PCI_DEVICE_ID_INTEL_82965GME_IG, "965GME/GLE",
+        { PCI_DEVICE_ID_INTEL_82965GM_HB, PCI_DEVICE_ID_INTEL_82965GME_IG, 0, "965GME/GLE",
                 &intel_845_driver, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_7505_0, 0, "E7505", &intel_7505_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_7205_0, 0, "E7205", &intel_7505_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_G33_HB, PCI_DEVICE_ID_INTEL_G33_IG, "G33",
+        { PCI_DEVICE_ID_INTEL_7505_0, 0, 0, "E7505", &intel_7505_driver, NULL },
+        { PCI_DEVICE_ID_INTEL_7205_0, 0, 0, "E7205", &intel_7505_driver, NULL },
+        { PCI_DEVICE_ID_INTEL_G33_HB, PCI_DEVICE_ID_INTEL_G33_IG, 0, "G33",
                 &intel_845_driver, &intel_g33_driver },
-        { PCI_DEVICE_ID_INTEL_Q35_HB, PCI_DEVICE_ID_INTEL_Q35_IG, "Q35",
+        { PCI_DEVICE_ID_INTEL_Q35_HB, PCI_DEVICE_ID_INTEL_Q35_IG, 0, "Q35",
                 &intel_845_driver, &intel_g33_driver },
-        { PCI_DEVICE_ID_INTEL_Q33_HB, PCI_DEVICE_ID_INTEL_Q33_IG, "Q33",
+        { PCI_DEVICE_ID_INTEL_Q33_HB, PCI_DEVICE_ID_INTEL_Q33_IG, 0, "Q33",
                 &intel_845_driver, &intel_g33_driver },
-        { 0, 0, NULL, NULL, NULL }
+        { 0, 0, 0, NULL, NULL, NULL }
 };
 
 static int __devinit agp_intel_probe(struct pci_dev *pdev,
@@ -1892,10 +1893,19 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
                 /* In case that multiple models of gfx chip may
                    stand on same host bridge type, this can be
                    sure we detect the right IGD. */
-                if ((pdev->device == intel_agp_chipsets[i].chip_id) &&
-                        ((intel_agp_chipsets[i].gmch_chip_id == 0) ||
-                                find_gmch(intel_agp_chipsets[i].gmch_chip_id)))
-                        break;
+                if (pdev->device == intel_agp_chipsets[i].chip_id) {
+                        if ((intel_agp_chipsets[i].gmch_chip_id != 0) &&
+                                find_gmch(intel_agp_chipsets[i].gmch_chip_id)) {
+                                bridge->driver =
+                                        intel_agp_chipsets[i].gmch_driver;
+                                break;
+                        } else if (intel_agp_chipsets[i].multi_gmch_chip) {
+                                continue;
+                        } else {
+                                bridge->driver = intel_agp_chipsets[i].driver;
+                                break;
+                        }
+                }
         }
 
         if (intel_agp_chipsets[i].name == NULL) {
@@ -1906,11 +1916,6 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
                 return -ENODEV;
         }
 
-        if (intel_agp_chipsets[i].gmch_chip_id != 0)
-            bridge->driver = intel_agp_chipsets[i].gmch_driver;
-        else
-            bridge->driver = intel_agp_chipsets[i].driver;
-
         if (bridge->driver == NULL) {
                 printk(KERN_WARNING PFX "Failed to find bridge device "
                         "(chip_id: %04x)\n", intel_agp_chipsets[i].gmch_chip_id);
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
index 177ccc07f968..aa6335032d1e 100644
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
@@ -300,10 +300,15 @@
         {0x8086, 0x2592, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x2772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x27a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+        {0x8086, 0x27ae, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x2972, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x2982, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x2992, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x29a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+        {0x8086, 0x29b2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+        {0x8086, 0x29c2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+        {0x8086, 0x29d2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x2a02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+        {0x8086, 0x2a12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0, 0, 0}
 
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 1ba15d9a171a..ea52740af4f6 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -35,7 +35,12 @@
                        dev->pci_device == 0x2982 || \
                        dev->pci_device == 0x2992 || \
                        dev->pci_device == 0x29A2 || \
-                       dev->pci_device == 0x2A02)
+                       dev->pci_device == 0x2A02 || \
+                       dev->pci_device == 0x2A12)
+
+#define IS_G33(dev) (dev->pci_device == 0x29b2 || \
+                     dev->pci_device == 0x29c2 || \
+                     dev->pci_device == 0x29d2)
 
 /* Really want an OS-independent resettable timer.  Would like to have
  * this loop run for (eg) 3 sec, but have the timer reset every time
@@ -106,6 +111,12 @@ static int i915_dma_cleanup(drm_device_t * dev)
                         I915_WRITE(0x02080, 0x1ffff000);
                 }
 
+                if (dev_priv->status_gfx_addr) {
+                        dev_priv->status_gfx_addr = 0;
+                        drm_core_ioremapfree(&dev_priv->hws_map, dev);
+                        I915_WRITE(0x2080, 0x1ffff000);
+                }
+
                 drm_free(dev->dev_private, sizeof(drm_i915_private_t),
                          DRM_MEM_DRIVER);
 
@@ -179,26 +190,24 @@ static int i915_initialize(drm_device_t * dev,
         dev_priv->allow_batchbuffer = 1;
 
         /* Program Hardware Status Page */
-        dev_priv->status_page_dmah = drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE,
-                                                   0xffffffff);
+        if (!IS_G33(dev)) {
+                dev_priv->status_page_dmah =
+                        drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff);
+
+                if (!dev_priv->status_page_dmah) {
+                        dev->dev_private = (void *)dev_priv;
+                        i915_dma_cleanup(dev);
+                        DRM_ERROR("Can not allocate hardware status page\n");
+                        return DRM_ERR(ENOMEM);
+                }
+                dev_priv->hw_status_page = dev_priv->status_page_dmah->vaddr;
+                dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr;
 
-        if (!dev_priv->status_page_dmah) {
-                dev->dev_private = (void *)dev_priv;
-                i915_dma_cleanup(dev);
-                DRM_ERROR("Can not allocate hardware status page\n");
-                return DRM_ERR(ENOMEM);
+                memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
+                I915_WRITE(0x02080, dev_priv->dma_status_page);
         }
-        dev_priv->hw_status_page = dev_priv->status_page_dmah->vaddr;
-        dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr;
-
-        memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
-        DRM_DEBUG("hw status page @ %p\n", dev_priv->hw_status_page);
-
-        I915_WRITE(0x02080, dev_priv->dma_status_page);
         DRM_DEBUG("Enabled hardware status page\n");
-
         dev->dev_private = (void *)dev_priv;
-
         return 0;
 }
 
@@ -231,7 +240,10 @@ static int i915_dma_resume(drm_device_t * dev)
         }
         DRM_DEBUG("hw status page @ %p\n", dev_priv->hw_status_page);
 
-        I915_WRITE(0x02080, dev_priv->dma_status_page);
+        if (dev_priv->status_gfx_addr != 0)
+                I915_WRITE(0x02080, dev_priv->status_gfx_addr);
+        else
+                I915_WRITE(0x02080, dev_priv->dma_status_page);
         DRM_DEBUG("Enabled hardware status page\n");
 
         return 0;
@@ -739,6 +751,47 @@ static int i915_setparam(DRM_IOCTL_ARGS)
         return 0;
 }
 
+static int i915_set_status_page(DRM_IOCTL_ARGS)
+{
+        DRM_DEVICE;
+        drm_i915_private_t *dev_priv = dev->dev_private;
+        drm_i915_hws_addr_t hws;
+
+        if (!dev_priv) {
+                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
+                return DRM_ERR(EINVAL);
+        }
+        DRM_COPY_FROM_USER_IOCTL(hws, (drm_i915_hws_addr_t __user *) data,
+                        sizeof(hws));
+        printk(KERN_DEBUG "set status page addr 0x%08x\n", (u32)hws.addr);
+
+        dev_priv->status_gfx_addr = hws.addr & (0x1ffff<<12);
+
+        dev_priv->hws_map.offset = dev->agp->agp_info.aper_base + hws.addr;
+        dev_priv->hws_map.size = 4*1024;
+        dev_priv->hws_map.type = 0;
+        dev_priv->hws_map.flags = 0;
+        dev_priv->hws_map.mtrr = 0;
+
+        drm_core_ioremap(&dev_priv->hws_map, dev);
+        if (dev_priv->hws_map.handle == NULL) {
+                dev->dev_private = (void *)dev_priv;
+                i915_dma_cleanup(dev);
+                dev_priv->status_gfx_addr = 0;
+                DRM_ERROR("can not ioremap virtual address for"
+                                " G33 hw status page\n");
+                return DRM_ERR(ENOMEM);
+        }
+        dev_priv->hw_status_page = dev_priv->hws_map.handle;
+
+        memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
+        I915_WRITE(0x02080, dev_priv->status_gfx_addr);
+        DRM_DEBUG("load hws 0x2080 with gfx mem 0x%x\n",
+                        dev_priv->status_gfx_addr);
+        DRM_DEBUG("load hws at %p\n", dev_priv->hw_status_page);
+        return 0;
+}
+
 int i915_driver_load(drm_device_t *dev, unsigned long flags)
 {
         /* i915 has 4 more counters */
@@ -785,6 +838,7 @@ drm_ioctl_desc_t i915_ioctls[] = {
         [DRM_IOCTL_NR(DRM_I915_SET_VBLANK_PIPE)] = { i915_vblank_pipe_set, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY },
         [DRM_IOCTL_NR(DRM_I915_GET_VBLANK_PIPE)] = { i915_vblank_pipe_get, DRM_AUTH },
         [DRM_IOCTL_NR(DRM_I915_VBLANK_SWAP)] = {i915_vblank_swap, DRM_AUTH},
+        [DRM_IOCTL_NR(DRM_I915_HWS_ADDR)] = {i915_set_status_page, DRM_AUTH},
 };
 
 int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);
diff --git a/drivers/char/drm/i915_drm.h b/drivers/char/drm/i915_drm.h
index 96a468886a7a..7b7b68b96f31 100644
--- a/drivers/char/drm/i915_drm.h
+++ b/drivers/char/drm/i915_drm.h
@@ -142,6 +142,7 @@ typedef struct _drm_i915_sarea {
 #define DRM_I915_SET_VBLANK_PIPE        0x0d
 #define DRM_I915_GET_VBLANK_PIPE        0x0e
 #define DRM_I915_VBLANK_SWAP    0x0f
+#define DRM_I915_HWS_ADDR       0x11
 
 #define DRM_IOCTL_I915_INIT             DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
 #define DRM_IOCTL_I915_FLUSH            DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
@@ -262,4 +263,8 @@ typedef struct drm_i915_vblank_swap {
         unsigned int sequence;
 } drm_i915_vblank_swap_t;
 
+typedef struct drm_i915_hws_addr {
+        uint64_t addr;
+} drm_i915_hws_addr_t;
+
 #endif                          /* _I915_DRM_H_ */
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index 93cdcfe6aa84..85e323acb95d 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -91,6 +91,8 @@ typedef struct drm_i915_private {
         void *hw_status_page;
         dma_addr_t dma_status_page;
         unsigned long counter;
+        unsigned int status_gfx_addr;
+        drm_local_map_t hws_map;
 
         unsigned int cpp;
         int back_offset;
diff --git a/drivers/char/drm/radeon_ioc32.c b/drivers/char/drm/radeon_ioc32.c
index 1f1f9cc055a4..04126c2e79ab 100644
--- a/drivers/char/drm/radeon_ioc32.c
+++ b/drivers/char/drm/radeon_ioc32.c
@@ -349,6 +349,31 @@ static int compat_radeon_irq_emit(struct file *file, unsigned int cmd,
                          DRM_IOCTL_RADEON_IRQ_EMIT, (unsigned long)request);
 }
 
+typedef struct drm_radeon_setparam32 {
+        int param;
+        u64 value;
+} __attribute__((packed)) drm_radeon_setparam32_t;
+
+static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
+                                     unsigned long arg)
+{
+        drm_radeon_setparam32_t req32;
+        drm_radeon_setparam_t __user *request;
+
+        if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
+                return -EFAULT;
+
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
+            || __put_user(req32.param, &request->param)
+            || __put_user((void __user *)(unsigned long)req32.value,
+                          &request->value))
+                return -EFAULT;
+
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_RADEON_SETPARAM, (unsigned long) request);
+}
+
 drm_ioctl_compat_t *radeon_compat_ioctls[] = {
         [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
         [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
@@ -357,6 +382,7 @@ drm_ioctl_compat_t *radeon_compat_ioctls[] = {
         [DRM_RADEON_VERTEX2] = compat_radeon_cp_vertex2,
         [DRM_RADEON_CMDBUF] = compat_radeon_cp_cmdbuf,
         [DRM_RADEON_GETPARAM] = compat_radeon_cp_getparam,
+        [DRM_RADEON_SETPARAM] = compat_radeon_cp_setparam,
         [DRM_RADEON_ALLOC] = compat_radeon_mem_alloc,
         [DRM_RADEON_IRQ_EMIT] = compat_radeon_irq_emit,
 };
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
index 1c040d80c641..152312c1fafa 100644
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -304,6 +304,7 @@ struct kvm_vcpu {
         char *host_fx_image;
         char *guest_fx_image;
         int fpu_active;
+        int guest_fpu_loaded;
 
         int mmio_needed;
         int mmio_read_completed;
@@ -508,6 +509,8 @@ void fx_init(struct kvm_vcpu *vcpu);
 void load_msrs(struct vmx_msr_entry *e, int n);
 void save_msrs(struct vmx_msr_entry *e, int n);
 void kvm_resched(struct kvm_vcpu *vcpu);
+void kvm_load_guest_fpu(struct kvm_vcpu *vcpu);
+void kvm_put_guest_fpu(struct kvm_vcpu *vcpu);
 
 int kvm_read_guest(struct kvm_vcpu *vcpu,
                gva_t addr,
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index da985b31b17e..8f1f07adb04e 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -253,6 +253,28 @@ int kvm_write_guest(struct kvm_vcpu *vcpu, gva_t addr, unsigned long size,
 }
 EXPORT_SYMBOL_GPL(kvm_write_guest);
 
+void kvm_load_guest_fpu(struct kvm_vcpu *vcpu)
+{
+        if (!vcpu->fpu_active || vcpu->guest_fpu_loaded)
+                return;
+
+        vcpu->guest_fpu_loaded = 1;
+        fx_save(vcpu->host_fx_image);
+        fx_restore(vcpu->guest_fx_image);
+}
+EXPORT_SYMBOL_GPL(kvm_load_guest_fpu);
+
+void kvm_put_guest_fpu(struct kvm_vcpu *vcpu)
+{
+        if (!vcpu->guest_fpu_loaded)
+                return;
+
+        vcpu->guest_fpu_loaded = 0;
+        fx_save(vcpu->guest_fx_image);
+        fx_restore(vcpu->host_fx_image);
+}
+EXPORT_SYMBOL_GPL(kvm_put_guest_fpu);
+
 /*
  * Switches to specified vcpu, until a matching vcpu_put()
  */
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index 184238e2ece4..c1ac106ace8c 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -280,6 +280,7 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu)
 
 static void vmx_vcpu_put(struct kvm_vcpu *vcpu)
 {
+        kvm_put_guest_fpu(vcpu);
         put_cpu();
 }
 
@@ -1847,10 +1848,8 @@ again:
         if (vcpu->guest_debug.enabled)
                 kvm_guest_debug_pre(vcpu);
 
-        if (vcpu->fpu_active) {
-                fx_save(vcpu->host_fx_image);
-                fx_restore(vcpu->guest_fx_image);
-        }
+        kvm_load_guest_fpu(vcpu);
+
         /*
          * Loading guest fpu may have cleared host cr0.ts
          */
@@ -2012,11 +2011,6 @@ again:
         }
 #endif
 
-        if (vcpu->fpu_active) {
-                fx_save(vcpu->guest_fx_image);
-                fx_restore(vcpu->host_fx_image);
-        }
-
         vcpu->interrupt_window_open = (vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & 3) == 0;
 
         asm ("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c
index 6b49fc4bd1a1..741780e14b2c 100644
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -83,6 +83,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/bitops.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c
index d5bdd2574659..5ae80bbe2edc 100644
--- a/drivers/net/ppp_mppe.c
+++ b/drivers/net/ppp_mppe.c
@@ -493,14 +493,14 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf,
 
         /*
          * Make sure we have enough room to decrypt the packet.
-         * Note that for our test we only subtract 1 byte whereas in
-         * mppe_compress() we added 2 bytes (+MPPE_OVHD);
-         * this is to account for possible PFC.
+         * To account for possible PFC we should only subtract 1
+         * byte whereas in mppe_compress() we added 2 bytes (+MPPE_OVHD);
+         * However, we assume no PFC, thus subtracting 2 bytes.
          */
-        if (osize < isize - MPPE_OVHD - 1) {
+        if (osize < isize - MPPE_OVHD - 2) {
                 printk(KERN_DEBUG "mppe_decompress[%d]: osize too small! "
                        "(have: %d need: %d)\n", state->unit,
-                       osize, isize - MPPE_OVHD - 1);
+                       osize, isize - MPPE_OVHD - 2);
                 return DECOMP_ERROR;
         }
         osize = isize - MPPE_OVHD - 2;  /* assume no PFC */
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 894fdb9d44c0..b3c4dbff26b8 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -32,6 +32,7 @@
 */
 
 #include <linux/types.h>
+#include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/spinlock.h>
@@ -292,7 +293,6 @@ static int ioc_count;
 #define PDIR_INDEX(iovp)    ((iovp)>>IOVP_SHIFT)
 #define MKIOVP(pdir_idx)    ((long)(pdir_idx) << IOVP_SHIFT)
 #define MKIOVA(iovp,offset) (dma_addr_t)((long)iovp | (long)offset)
-#define ROUNDUP(x,y) ((x + ((y)-1)) & ~((y)-1))
 
 /*
 ** Don't worry about the 150% average search length on a miss.
@@ -668,7 +668,7 @@ ccio_mark_invalid(struct ioc *ioc, dma_addr_t iova, size_t byte_cnt)
         size_t saved_byte_cnt;
 
         /* round up to nearest page size */
-        saved_byte_cnt = byte_cnt = ROUNDUP(byte_cnt, IOVP_SIZE);
+        saved_byte_cnt = byte_cnt = ALIGN(byte_cnt, IOVP_SIZE);
 
         while(byte_cnt > 0) {
                 /* invalidate one page at a time */
@@ -751,7 +751,7 @@ ccio_map_single(struct device *dev, void *addr, size_t size,
         offset = ((unsigned long) addr) & ~IOVP_MASK;
 
         /* round up to nearest IOVP_SIZE */
-        size = ROUNDUP(size + offset, IOVP_SIZE);
+        size = ALIGN(size + offset, IOVP_SIZE);
         spin_lock_irqsave(&ioc->res_lock, flags);
 
 #ifdef CCIO_MAP_STATS
@@ -814,7 +814,7 @@ ccio_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
 
         iova ^= offset;        /* clear offset bits */
         size += offset;
-        size = ROUNDUP(size, IOVP_SIZE);
+        size = ALIGN(size, IOVP_SIZE);
 
         spin_lock_irqsave(&ioc->res_lock, flags);
 
@@ -1227,7 +1227,7 @@ ccio_get_iotlb_size(struct parisc_device *dev)
 #endif /* 0 */
 
 /* We *can't* support JAVA (T600). Venture there at your own risk. */
-static struct parisc_device_id ccio_tbl[] = {
+static const struct parisc_device_id ccio_tbl[] = {
         { HPHW_IOA, HVERSION_REV_ANY_ID, U2_IOA_RUNWAY, 0xb }, /* U2 */
         { HPHW_IOA, HVERSION_REV_ANY_ID, UTURN_IOA_RUNWAY, 0xb }, /* UTurn */
         { 0, }
@@ -1370,7 +1370,7 @@ ccio_ioc_init(struct ioc *ioc)
         }
 }
 
-static void
+static void __init
 ccio_init_resource(struct resource *res, char *name, void __iomem *ioaddr)
 {
         int result;
@@ -1537,7 +1537,7 @@ int ccio_request_resource(const struct parisc_device *dev,
  * If so, initialize the chip and tell other partners in crime they
  * have work to do.
  */
-static int ccio_probe(struct parisc_device *dev)
+static int __init ccio_probe(struct parisc_device *dev)
 {
         int i;
         struct ioc *ioc, **ioc_p = &ioc_list;
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c
index 309076b39853..771cef592542 100644
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
@@ -307,7 +307,7 @@ static void init_eisa_pic(void)
 
 #define is_mongoose(dev) (dev->id.sversion == 0x00076)
 
-static int __devinit eisa_probe(struct parisc_device *dev)
+static int __init eisa_probe(struct parisc_device *dev)
 {
         int i, result;
 
@@ -387,7 +387,7 @@ static int __devinit eisa_probe(struct parisc_device *dev)
         return 0;
 }
 
-static struct parisc_device_id eisa_tbl[] = {
+static const struct parisc_device_id eisa_tbl[] = {
         { HPHW_BA, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00076 }, /* Mongoose */
         { HPHW_BA, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00090 }, /* Wax EISA */
         { 0, }
diff --git a/drivers/parisc/iommu-helpers.h b/drivers/parisc/iommu-helpers.h
index 38d9e1aba1d0..0a1f99a2e93e 100644
--- a/drivers/parisc/iommu-helpers.h
+++ b/drivers/parisc/iommu-helpers.h
@@ -138,7 +138,7 @@ iommu_coalesce_chunks(struct ioc *ioc, struct scatterlist *startsg, int nents,
                         ** exceed DMA_CHUNK_SIZE if we coalesce the
                         ** next entry.
                         */   
-                        if(unlikely(ROUNDUP(dma_len + dma_offset + startsg->length,
+                        if(unlikely(ALIGN(dma_len + dma_offset + startsg->length,
                                             IOVP_SIZE) > DMA_CHUNK_SIZE))
                                 break;
 
@@ -158,7 +158,7 @@ iommu_coalesce_chunks(struct ioc *ioc, struct scatterlist *startsg, int nents,
                 ** Allocate space for DMA stream.
                 */
                 sg_dma_len(contig_sg) = dma_len;
-                dma_len = ROUNDUP(dma_len + dma_offset, IOVP_SIZE);
+                dma_len = ALIGN(dma_len + dma_offset, IOVP_SIZE);
                 sg_dma_address(contig_sg) =
                         PIDE_FLAG 
                         | (iommu_alloc_range(ioc, dma_len) << IOVP_SHIFT)
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 815e445c3125..924ef0609460 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -1067,7 +1067,7 @@ pdc_stable_init(void)
                         error = subsys_create_file(&stable_subsys, attr);
         
         /* register the paths subsys as a subsystem of stable subsys */
-        kset_set_kset_s(&paths_subsys, stable_subsys);
+        kobj_set_kset_s(&paths_subsys, stable_subsys);
         if ((rc = subsystem_register(&paths_subsys)))
                 goto fail_subsysreg;
 
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c
index 6dedbdef7106..90cca5e3805f 100644
--- a/drivers/parisc/power.c
+++ b/drivers/parisc/power.c
@@ -41,6 +41,7 @@
 #include <linux/reboot.h>
 #include <linux/sched.h>
 #include <linux/kthread.h>
+#include <linux/pm.h>
 
 #include <asm/pdc.h>
 #include <asm/io.h>
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 322957ac2ad1..d044c48323e6 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -113,8 +113,6 @@ module_param(sba_reserve_agpgart, int, 0444);
 MODULE_PARM_DESC(sba_reserve_agpgart, "Reserve half of IO pdir as AGPGART");
 #endif
 
-#define ROUNDUP(x,y) ((x + ((y)-1)) & ~((y)-1))
-
 
 /************************************
 ** SBA register read and write support
@@ -352,7 +350,7 @@ sba_search_bitmap(struct ioc *ioc, unsigned long bits_wanted)
                 ** SBA HW features in the unmap path.
                 */
                 unsigned long o = 1 << get_order(bits_wanted << PAGE_SHIFT);
-                uint bitshiftcnt = ROUNDUP(ioc->res_bitshift, o);
+                uint bitshiftcnt = ALIGN(ioc->res_bitshift, o);
                 unsigned long mask;
 
                 if (bitshiftcnt >= BITS_PER_LONG) {
@@ -779,7 +777,7 @@ sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
         offset = iova & ~IOVP_MASK;
         iova ^= offset;        /* clear offset bits */
         size += offset;
-        size = ROUNDUP(size, IOVP_SIZE);
+        size = ALIGN(size, IOVP_SIZE);
 
         spin_lock_irqsave(&ioc->res_lock, flags);
 
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index 1fd97f7c8b98..a708c329675e 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -389,7 +389,7 @@ int superio_fixup_irq(struct pci_dev *pcidev)
         return local_irq;
 }
 
-static void __devinit superio_serial_init(void)
+static void __init superio_serial_init(void)
 {
 #ifdef CONFIG_SERIAL_8250
         int retval;
@@ -423,7 +423,7 @@ static void __devinit superio_serial_init(void)
 }
 
 
-static void __devinit superio_parport_init(void)
+static void __init superio_parport_init(void)
 {
 #ifdef CONFIG_PARPORT_PC
         if (!parport_pc_probe_port(sio_dev.pp_base,
@@ -450,7 +450,7 @@ static void superio_fixup_pci(struct pci_dev *pdev)
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415, superio_fixup_pci);
 
 
-static int __devinit
+static int __init
 superio_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
         struct superio_device *sio = &sio_dev;
@@ -485,7 +485,7 @@ superio_probe(struct pci_dev *dev, const struct pci_device_id *id)
         return -ENODEV;
 }
 
-static struct pci_device_id superio_tbl[] = {
+static const struct pci_device_id superio_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87560_LIO) },
         { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87560_USB) },
         { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415) },
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index 17bf9937d276..43652ba523eb 100644
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -350,7 +350,7 @@ struct parport *__devinit parport_gsc_probe_port (unsigned long base,
 
 #define PARPORT_GSC_OFFSET 0x800
 
-static int __initdata parport_count;
+static int __devinitdata parport_count;
 
 static int __devinit parport_init_chip(struct parisc_device *dev)
 {
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 717b360d0415..870017d44970 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -240,7 +240,7 @@ static void sti_flush(unsigned long from, unsigned long len)
         flush_icache_range(from, from+len);
 }
 
-void __init
+void __devinit
 sti_rom_copy(unsigned long base, unsigned long count, void *dest)
 {
         unsigned long dest_len = count;
@@ -269,7 +269,7 @@ sti_rom_copy(unsigned long base, unsigned long count, void *dest)
 static char default_sti_path[21] __read_mostly;
 
 #ifndef MODULE
-static int __init sti_setup(char *str)
+static int __devinit sti_setup(char *str)
 {
         if (str)
                 strlcpy (default_sti_path, str, sizeof (default_sti_path));
@@ -288,12 +288,12 @@ __setup("sti=", sti_setup);
 
 
 
-static char __initdata  *font_name[MAX_STI_ROMS] = { "VGA8x16", };
-static int __initdata   font_index[MAX_STI_ROMS], 
-                        font_height[MAX_STI_ROMS],
-                        font_width[MAX_STI_ROMS];
+static char __devinitdata       *font_name[MAX_STI_ROMS] = { "VGA8x16", };
+static int __devinitdata        font_index[MAX_STI_ROMS],
+                                font_height[MAX_STI_ROMS],
+                                font_width[MAX_STI_ROMS];
 #ifndef MODULE
-static int __init sti_font_setup(char *str)
+static int __devinit sti_font_setup(char *str)
 {
         char *x;
         int i = 0;
@@ -346,7 +346,7 @@ __setup("sti_font=", sti_font_setup);
 
 
         
-static void __init
+static void __devinit
 sti_dump_globcfg(struct sti_glob_cfg *glob_cfg, unsigned int sti_mem_request)
 {
         struct sti_glob_cfg_ext *cfg;
@@ -386,7 +386,7 @@ sti_dump_globcfg(struct sti_glob_cfg *glob_cfg, unsigned int sti_mem_request)
                 cfg->sti_mem_addr, sti_mem_request));
 }
 
-static void __init
+static void __devinit
 sti_dump_outptr(struct sti_struct *sti)
 {
         DPRINTK((KERN_INFO
@@ -400,7 +400,7 @@ sti_dump_outptr(struct sti_struct *sti)
                  sti->outptr.attributes));
 }
 
-static int __init
+static int __devinit
 sti_init_glob_cfg(struct sti_struct *sti,
             unsigned long rom_address, unsigned long hpa)
 {
@@ -482,7 +482,7 @@ sti_init_glob_cfg(struct sti_struct *sti,
 }
 
 #ifdef CONFIG_FB
-struct sti_cooked_font * __init
+struct sti_cooked_font * __devinit
 sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
 {
         const struct font_desc *fbfont;
@@ -538,14 +538,14 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
         return cooked_font;
 }
 #else
-struct sti_cooked_font * __init
+struct sti_cooked_font * __devinit
 sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
 {
         return NULL;
 }
 #endif
 
-struct sti_cooked_font * __init
+struct sti_cooked_font * __devinit
 sti_select_font(struct sti_cooked_rom *rom,
             int (*search_font_fnc) (struct sti_cooked_rom *,int,int) )
 {
@@ -572,7 +572,7 @@ sti_select_font(struct sti_cooked_rom *rom,
 }
 
 
-static void __init 
+static void __devinit
 sti_dump_rom(struct sti_rom *rom)
 {
         printk(KERN_INFO "    id %04x-%04x, conforms to spec rev. %d.%02x\n",
@@ -590,7 +590,7 @@ sti_dump_rom(struct sti_rom *rom)
 }
 
 
-static int __init 
+static int __devinit
 sti_cook_fonts(struct sti_cooked_rom *cooked_rom,
                         struct sti_rom *raw_rom)
 {
@@ -625,7 +625,7 @@ sti_cook_fonts(struct sti_cooked_rom *cooked_rom,
 }
 
 
-static int __init 
+static int __devinit
 sti_search_font(struct sti_cooked_rom *rom, int height, int width)
 {
         struct sti_cooked_font *font;
@@ -642,7 +642,7 @@ sti_search_font(struct sti_cooked_rom *rom, int height, int width)
 #define BMODE_RELOCATE(offset)          offset = (offset) / 4;
 #define BMODE_LAST_ADDR_OFFS            0x50
 
-static void * __init
+static void * __devinit
 sti_bmode_font_raw(struct sti_cooked_font *f)
 {
         unsigned char *n, *p, *q;
@@ -660,7 +660,7 @@ sti_bmode_font_raw(struct sti_cooked_font *f)
         return n + 3;
 }
 
-static void __init
+static void __devinit
 sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
 {
         unsigned long dest_len = count;
@@ -675,7 +675,7 @@ sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
         sti_flush(dest_start, dest_len);
 }
 
-static struct sti_rom * __init
+static struct sti_rom * __devinit
 sti_get_bmode_rom (unsigned long address)
 {
         struct sti_rom *raw;
@@ -711,7 +711,7 @@ sti_get_bmode_rom (unsigned long address)
         return raw;
 }
 
-struct sti_rom * __init
+struct sti_rom * __devinit
 sti_get_wmode_rom (unsigned long address)
 {
         struct sti_rom *raw;
@@ -727,7 +727,7 @@ sti_get_wmode_rom (unsigned long address)
         return raw;
 }
 
-int __init
+int __devinit
 sti_read_rom(int wordmode, struct sti_struct *sti, unsigned long address)
 {
         struct sti_cooked_rom *cooked;
@@ -783,7 +783,7 @@ out_err:
         return 0;
 }
 
-static struct sti_struct * __init
+static struct sti_struct * __devinit
 sti_try_rom_generic(unsigned long address, unsigned long hpa, struct pci_dev *pd)
 {
         struct sti_struct *sti;
@@ -898,7 +898,7 @@ out_err:
         return NULL;
 }
 
-static void __init sticore_check_for_default_sti(struct sti_struct *sti, char *path)
+static void __devinit sticore_check_for_default_sti(struct sti_struct *sti, char *path)
 {
         if (strcmp (path, default_sti_path) == 0)
                 default_sti = sti;
@@ -909,7 +909,7 @@ static void __init sticore_check_for_default_sti(struct sti_struct *sti, char *p
  * in the additional address field addr[1] while on
  * older Systems the PDC stores it in page0->proc_sti 
  */
-static int __init sticore_pa_init(struct parisc_device *dev)
+static int __devinit sticore_pa_init(struct parisc_device *dev)
 {
         char pa_path[21];
         struct sti_struct *sti = NULL;
@@ -1015,7 +1015,7 @@ static struct parisc_driver pa_sti_driver = {
 
 static int sticore_initialized __read_mostly;
 
-static void __init sti_init_roms(void)
+static void __devinit sti_init_roms(void)
 {
         if (sticore_initialized)
                 return;
diff --git a/fs/splice.c b/fs/splice.c
index cb211360273a..e7d7080de2f9 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -176,6 +176,7 @@ static const struct pipe_buf_operations user_page_pipe_buf_ops = {
 static ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
                               struct splice_pipe_desc *spd)
 {
+        unsigned int spd_pages = spd->nr_pages;
         int ret, do_wakeup, page_nr;
 
         ret = 0;
@@ -244,17 +245,18 @@ static ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
                 pipe->waiting_writers--;
         }
 
-        if (pipe->inode)
+        if (pipe->inode) {
                 mutex_unlock(&pipe->inode->i_mutex);
 
-        if (do_wakeup) {
-                smp_mb();
-                if (waitqueue_active(&pipe->wait))
-                        wake_up_interruptible(&pipe->wait);
-                kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
+                if (do_wakeup) {
+                        smp_mb();
+                        if (waitqueue_active(&pipe->wait))
+                                wake_up_interruptible(&pipe->wait);
+                        kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
+                }
         }
 
-        while (page_nr < spd->nr_pages)
+        while (page_nr < spd_pages)
                 page_cache_release(spd->pages[page_nr++]);
 
         return ret;
@@ -811,7 +813,10 @@ generic_file_splice_write_nolock(struct pipe_inode_info *pipe, struct file *out,
 
         ret = __splice_from_pipe(pipe, out, ppos, len, flags, pipe_to_file);
         if (ret > 0) {
+                unsigned long nr_pages;
+
                 *ppos += ret;
+                nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
 
                 /*
                  * If file or inode is SYNC and we actually wrote some data,
@@ -824,7 +829,7 @@ generic_file_splice_write_nolock(struct pipe_inode_info *pipe, struct file *out,
                         if (err)
                                 ret = err;
                 }
-                balance_dirty_pages_ratelimited(mapping);
+                balance_dirty_pages_ratelimited_nr(mapping, nr_pages);
         }
 
         return ret;
@@ -863,7 +868,10 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
 
         ret = splice_from_pipe(pipe, out, ppos, len, flags, pipe_to_file);
         if (ret > 0) {
+                unsigned long nr_pages;
+
                 *ppos += ret;
+                nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
 
                 /*
                  * If file or inode is SYNC and we actually wrote some data,
@@ -878,7 +886,7 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
                         if (err)
                                 ret = err;
                 }
-                balance_dirty_pages_ratelimited(mapping);
+                balance_dirty_pages_ratelimited_nr(mapping, nr_pages);
         }
 
         return ret;
diff --git a/include/asm-arm/arch-s3c2410/anubis-cpld.h b/include/asm-arm/arch-s3c2410/anubis-cpld.h
index dcebf6d61903..168b93fee529 100644
--- a/include/asm-arm/arch-s3c2410/anubis-cpld.h
+++ b/include/asm-arm/arch-s3c2410/anubis-cpld.h
@@ -18,4 +18,8 @@
 
 #define ANUBIS_CTRL1_NANDSEL            (0x3)
 
+/* IDREG - revision */
+
+#define ANUBIS_IDREG_REVMASK            (0x7)
+
 #endif /* __ASM_ARCH_ANUBISCPLD_H */
diff --git a/include/asm-arm/arch-s3c2410/anubis-map.h b/include/asm-arm/arch-s3c2410/anubis-map.h
index ab076de4a0d0..830d114261da 100644
--- a/include/asm-arm/arch-s3c2410/anubis-map.h
+++ b/include/asm-arm/arch-s3c2410/anubis-map.h
@@ -27,14 +27,8 @@
 #define ANUBIS_VA_CTRL1     ANUBIS_IOADDR(0x00000000)    /* 0x01800000 */
 #define ANUBIS_PA_CTRL1     (ANUBIS_PA_CPLD)
 
-#define ANUBIS_VA_CTRL2     ANUBIS_IOADDR(0x00100000)    /* 0x01900000 */
-#define ANUBIS_PA_CTRL2     (ANUBIS_PA_CPLD)
-
-#define ANUBIS_VA_CTRL3     ANUBIS_IOADDR(0x00200000)    /* 0x01A00000 */
-#define ANUBIS_PA_CTRL3     (ANUBIS_PA_CPLD)
-
-#define ANUBIS_VA_CTRL4     ANUBIS_IOADDR(0x00300000)    /* 0x01B00000 */
-#define ANUBIS_PA_CTRL4     (ANUBIS_PA_CPLD)
+#define ANUBIS_VA_IDREG     ANUBIS_IOADDR(0x00300000)    /* 0x01B00000 */
+#define ANUBIS_PA_IDREG     (ANUBIS_PA_CPLD + (3<<23))
 
 #define ANUBIS_IDEPRI       ANUBIS_IOADDR(0x01000000)
 #define ANUBIS_IDEPRIAUX    ANUBIS_IOADDR(0x01100000)
diff --git a/include/asm-arm/arch-s3c2410/osiris-cpld.h b/include/asm-arm/arch-s3c2410/osiris-cpld.h
index 3b6498468d62..229ab2351db6 100644
--- a/include/asm-arm/arch-s3c2410/osiris-cpld.h
+++ b/include/asm-arm/arch-s3c2410/osiris-cpld.h
@@ -1,6 +1,6 @@
 /* linux/include/asm-arm/arch-s3c2410/osiris-cpld.h
  *
- * Copyright (c) 2005 Simtec Electronics
+ * Copyright 2005 Simtec Electronics
  *      http://www.simtec.co.uk/products/
  *      Ben Dooks <ben@simtec.co.uk>
  *
@@ -14,12 +14,17 @@
 #ifndef __ASM_ARCH_OSIRISCPLD_H
 #define __ASM_ARCH_OSIRISCPLD_H
 
-/* CTRL1 - NAND WP control */
+/* CTRL0 - NAND WP control */
 
-#define OSIRIS_CTRL1_NANDSEL            (0x3)
-#define OSIRIS_CTRL1_BOOT_INT           (1<<3)
-#define OSIRIS_CTRL1_PCMCIA             (1<<4)
-#define OSIRIS_CTRL1_PCMCIA_nWAIT       (1<<6)
-#define OSIRIS_CTRL1_PCMCIA_nIOIS16     (1<<7)
+#define OSIRIS_CTRL0_NANDSEL            (0x3)
+#define OSIRIS_CTRL0_BOOT_INT           (1<<3)
+#define OSIRIS_CTRL0_PCMCIA             (1<<4)
+#define OSIRIS_CTRL0_FIX8               (1<<5)
+#define OSIRIS_CTRL0_PCMCIA_nWAIT       (1<<6)
+#define OSIRIS_CTRL0_PCMCIA_nIOIS16     (1<<7)
+
+#define OSIRIS_CTRL1_FIX8               (1<<0)
+
+#define OSIRIS_ID_REVMASK               (0x7)
 
 #endif /* __ASM_ARCH_OSIRISCPLD_H */
diff --git a/include/asm-arm/arch-s3c2410/osiris-map.h b/include/asm-arm/arch-s3c2410/osiris-map.h
index a14164dfa525..b5c74d2b9aaa 100644
--- a/include/asm-arm/arch-s3c2410/osiris-map.h
+++ b/include/asm-arm/arch-s3c2410/osiris-map.h
@@ -24,16 +24,19 @@
 
 /* we put the CPLD registers next, to get them out of the way */
 
-#define OSIRIS_VA_CTRL1     OSIRIS_IOADDR(0x00000000)
-#define OSIRIS_PA_CTRL1     (OSIRIS_PA_CPLD)
+#define OSIRIS_VA_CTRL0         OSIRIS_IOADDR(0x00000000)
+#define OSIRIS_PA_CTRL0         (OSIRIS_PA_CPLD)
 
-#define OSIRIS_VA_CTRL2     OSIRIS_IOADDR(0x00100000)
-#define OSIRIS_PA_CTRL2     (OSIRIS_PA_CPLD + (1<<23))
+#define OSIRIS_VA_CTRL1         OSIRIS_IOADDR(0x00100000)
+#define OSIRIS_PA_CTRL1         (OSIRIS_PA_CPLD + (1<<23))
 
-#define OSIRIS_VA_CTRL3     OSIRIS_IOADDR(0x00200000)
-#define OSIRIS_PA_CTRL3     (OSIRIS_PA_CPLD + (2<<23))
+#define OSIRIS_VA_CTRL2         OSIRIS_IOADDR(0x00200000)
+#define OSIRIS_PA_CTRL2         (OSIRIS_PA_CPLD + (2<<23))
 
-#define OSIRIS_VA_CTRL4     OSIRIS_IOADDR(0x00300000)
-#define OSIRIS_PA_CTRL4     (OSIRIS_PA_CPLD + (3<<23))
+#define OSIRIS_VA_CTRL3         OSIRIS_IOADDR(0x00300000)
+#define OSIRIS_PA_CTRL3         (OSIRIS_PA_CPLD + (2<<23))
+
+#define OSIRIS_VA_IDREG         OSIRIS_IOADDR(0x00700000)
+#define OSIRIS_PA_IDREG         (OSIRIS_PA_CPLD + (7<<23))
 
 #endif /* __ASM_ARCH_OSIRISMAP_H */
diff --git a/include/asm-arm/linkage.h b/include/asm-arm/linkage.h
index dbe4b4e31a5b..5a25632b1bc0 100644
--- a/include/asm-arm/linkage.h
+++ b/include/asm-arm/linkage.h
@@ -4,4 +4,8 @@
 #define __ALIGN .align 0
 #define __ALIGN_STR ".align 0"
 
+#define ENDPROC(name) \
+  .type name, %function; \
+  END(name)
+
 #endif
diff --git a/include/asm-avr32/arch-at32ap/gpio.h b/include/asm-avr32/arch-at32ap/gpio.h
index 80a21aa9ae77..af7f9535bab3 100644
--- a/include/asm-avr32/arch-at32ap/gpio.h
+++ b/include/asm-avr32/arch-at32ap/gpio.h
@@ -14,6 +14,8 @@ int gpio_direction_output(unsigned int gpio, int value);
 int gpio_get_value(unsigned int gpio);
 void gpio_set_value(unsigned int gpio, int value);
 
+#include <asm-generic/gpio.h>           /* cansleep wrappers */
+
 static inline int gpio_to_irq(unsigned int gpio)
 {
         return gpio + GPIO_IRQ_BASE;
diff --git a/include/asm-avr32/cache.h b/include/asm-avr32/cache.h
index dabb955f3c00..d3cf35ab11ab 100644
--- a/include/asm-avr32/cache.h
+++ b/include/asm-avr32/cache.h
@@ -4,6 +4,15 @@
 #define L1_CACHE_SHIFT 5
 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
 
+/*
+ * Memory returned by kmalloc() may be used for DMA, so we must make
+ * sure that all such allocations are cache aligned. Otherwise,
+ * unrelated code may cause parts of the buffer to be read into the
+ * cache before the transfer is done, causing old data to be seen by
+ * the CPU.
+ */
+#define ARCH_KMALLOC_MINALIGN   L1_CACHE_BYTES
+
 #ifndef __ASSEMBLER__
 struct cache_info {
         unsigned int ways;
diff --git a/include/asm-mips/mips-boards/generic.h b/include/asm-mips/mips-boards/generic.h
index b98f1658cfd0..c8ebcc3e1267 100644
--- a/include/asm-mips/mips-boards/generic.h
+++ b/include/asm-mips/mips-boards/generic.h
@@ -73,12 +73,28 @@
  *  CoreEMUL with   Bonito   System Controller is treated like a Core20K
  *  CoreEMUL with SOC-it 101 System Controller is treated like a CoreMSC
  */
-#define MIPS_REVISION_CORID_CORE_EMUL_BON  0x63
-#define MIPS_REVISION_CORID_CORE_EMUL_MSC  0x65
+#define MIPS_REVISION_CORID_CORE_EMUL_BON  -1
+#define MIPS_REVISION_CORID_CORE_EMUL_MSC  -2
 
 #define MIPS_REVISION_CORID (((*(volatile u32 *)ioremap(MIPS_REVISION_REG, 4)) >> 10) & 0x3f)
 
-extern unsigned int mips_revision_corid;
+extern int mips_revision_corid;
+
+#define MIPS_REVISION_SCON_OTHER           0
+#define MIPS_REVISION_SCON_SOCITSC         1
+#define MIPS_REVISION_SCON_SOCITSCP        2
+
+/* Artificial SCON defines for MIPS_REVISION_SCON_OTHER */
+#define MIPS_REVISION_SCON_UNKNOWN         -1
+#define MIPS_REVISION_SCON_GT64120         -2
+#define MIPS_REVISION_SCON_BONITO          -3
+#define MIPS_REVISION_SCON_BRTL            -4
+#define MIPS_REVISION_SCON_SOCIT           -5
+#define MIPS_REVISION_SCON_ROCIT           -6
+
+#define MIPS_REVISION_SCONID (((*(volatile u32 *)ioremap(MIPS_REVISION_REG, 4)) >> 24) & 0xff)
+
+extern int mips_revision_sconid;
 
 #ifdef CONFIG_PCI
 extern void mips_pcibios_init(void);
diff --git a/include/asm-mips/mips-boards/msc01_pci.h b/include/asm-mips/mips-boards/msc01_pci.h
index 8eaefb837b9d..e036b7dd6deb 100644
--- a/include/asm-mips/mips-boards/msc01_pci.h
+++ b/include/asm-mips/mips-boards/msc01_pci.h
@@ -208,6 +208,7 @@
  * latter, they should be moved elsewhere.
  */
 #define MIPS_MSC01_PCI_REG_BASE         0x1bd00000
+#define MIPS_SOCITSC_PCI_REG_BASE       0x1ff10000
 
 extern unsigned long _pcictrl_msc;
 
diff --git a/include/asm-parisc/hardware.h b/include/asm-parisc/hardware.h
index 76d880dc4bae..4e9626836bab 100644
--- a/include/asm-parisc/hardware.h
+++ b/include/asm-parisc/hardware.h
@@ -31,10 +31,11 @@ enum cpu_type {
         pcxw    = 8, /* pa8500          pa 2.0  */
         pcxw_   = 9, /* pa8600  (w+)    pa 2.0  */
         pcxw2   = 10, /* pa8700         pa 2.0  */
-        mako    = 11  /* pa8800         pa 2.0  */
+        mako    = 11, /* pa8800         pa 2.0  */
+        mako2   = 12  /* pa8900         pa 2.0  */
 };
 
-extern char *cpu_name_version[][2]; /* mapping from enum cpu_type to strings */
+extern const char * const cpu_name_version[][2]; /* mapping from enum cpu_type to strings */
 
 struct parisc_driver;
 
diff --git a/include/asm-parisc/linkage.h b/include/asm-parisc/linkage.h
index 7a09d911b538..ad8cd0d069ea 100644
--- a/include/asm-parisc/linkage.h
+++ b/include/asm-parisc/linkage.h
@@ -8,8 +8,10 @@
 
 /*
  * In parisc assembly a semicolon marks a comment while a
- * exclamation mark is used to seperate independend lines.
+ * exclamation mark is used to seperate independent lines.
  */
+#ifdef __ASSEMBLY__
+
 #define ENTRY(name) \
         .export name !\
         ALIGN !\
@@ -24,5 +26,6 @@ name:
         END(name)
 #endif
 
+#endif /* __ASSEMBLY__ */
 
 #endif  /* __ASM_PARISC_LINKAGE_H */
diff --git a/include/asm-parisc/processor.h b/include/asm-parisc/processor.h
index d2f396721d3e..6b294fb07a23 100644
--- a/include/asm-parisc/processor.h
+++ b/include/asm-parisc/processor.h
@@ -69,8 +69,8 @@ struct system_cpuinfo_parisc {
                 char   sys_model_name[81]; /* PDC-ROM returnes this model name */
         } pdc;
 
-        char            *cpu_name;      /* e.g. "PA7300LC (PCX-L2)" */
-        char            *family_name;   /* e.g. "1.1e" */
+        const char      *cpu_name;      /* e.g. "PA7300LC (PCX-L2)" */
+        const char      *family_name;   /* e.g. "1.1e" */
 };
 
 
@@ -334,8 +334,8 @@ extern unsigned long get_wchan(struct task_struct *p);
 static inline int parisc_requires_coherency(void)
 {
 #ifdef CONFIG_PA8X00
-        /* FIXME: also pa8900 - when we see one */
-        return boot_cpu_data.cpu_type == mako;
+        return (boot_cpu_data.cpu_type == mako) ||
+                (boot_cpu_data.cpu_type == mako2);
 #else
         return 0;
 #endif
diff --git a/include/asm-parisc/unistd.h b/include/asm-parisc/unistd.h
index 2f7c40861c91..f74099bdca3c 100644
--- a/include/asm-parisc/unistd.h
+++ b/include/asm-parisc/unistd.h
@@ -792,8 +792,19 @@
 #define __NR_epoll_pwait        (__NR_Linux + 297)
 #define __NR_statfs64           (__NR_Linux + 298)
 #define __NR_fstatfs64          (__NR_Linux + 299)
+#define __NR_kexec_load         (__NR_Linux + 300)
+#define __NR_utimensat          (__NR_Linux + 301)
+#define __NR_signalfd           (__NR_Linux + 302)
+#define __NR_timerfd            (__NR_Linux + 303)
+#define __NR_eventfd            (__NR_Linux + 304)
+
+#define __NR_Linux_syscalls     (__NR_eventfd + 1)
+
+
+#define __IGNORE_select         /* newselect */
+#define __IGNORE_fadvise64      /* fadvise64_64 */
+#define __IGNORE_utimes         /* utime */
 
-#define __NR_Linux_syscalls     (__NR_fstatfs64 + 1)
 
 #define HPUX_GATEWAY_ADDR       0xC0000004
 #define LINUX_GATEWAY_ADDR      0x100
diff --git a/include/asm-sparc64/dma-mapping.h b/include/asm-sparc64/dma-mapping.h
index 4e21c2f3065c..c58ec1661df8 100644
--- a/include/asm-sparc64/dma-mapping.h
+++ b/include/asm-sparc64/dma-mapping.h
@@ -15,8 +15,7 @@
 static inline int
 dma_supported(struct device *dev, u64 mask)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         return pci_dma_supported(to_pci_dev(dev), mask);
 }
@@ -24,8 +23,7 @@ dma_supported(struct device *dev, u64 mask)
 static inline int
 dma_set_mask(struct device *dev, u64 dma_mask)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         return pci_set_dma_mask(to_pci_dev(dev), dma_mask);
 }
@@ -34,8 +32,7 @@ static inline void *
 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
                    gfp_t flag)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         return pci_iommu_ops->alloc_consistent(to_pci_dev(dev), size, dma_handle, flag);
 }
@@ -44,8 +41,7 @@ static inline void
 dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
                     dma_addr_t dma_handle)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_free_consistent(to_pci_dev(dev), size, cpu_addr, dma_handle);
 }
@@ -54,8 +50,7 @@ static inline dma_addr_t
 dma_map_single(struct device *dev, void *cpu_addr, size_t size,
                enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         return pci_map_single(to_pci_dev(dev), cpu_addr, size, (int)direction);
 }
@@ -64,8 +59,7 @@ static inline void
 dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
                  enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_unmap_single(to_pci_dev(dev), dma_addr, size, (int)direction);
 }
@@ -75,8 +69,7 @@ dma_map_page(struct device *dev, struct page *page,
              unsigned long offset, size_t size,
              enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         return pci_map_page(to_pci_dev(dev), page, offset, size, (int)direction);
 }
@@ -85,8 +78,7 @@ static inline void
 dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
                enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_unmap_page(to_pci_dev(dev), dma_address, size, (int)direction);
 }
@@ -95,8 +87,7 @@ static inline int
 dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
            enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         return pci_map_sg(to_pci_dev(dev), sg, nents, (int)direction);
 }
@@ -105,8 +96,7 @@ static inline void
 dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
              enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_unmap_sg(to_pci_dev(dev), sg, nhwentries, (int)direction);
 }
@@ -115,8 +105,7 @@ static inline void
 dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
                         enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_dma_sync_single_for_cpu(to_pci_dev(dev), dma_handle,
                                     size, (int)direction);
@@ -126,8 +115,7 @@ static inline void
 dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
                            enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_dma_sync_single_for_device(to_pci_dev(dev), dma_handle,
                                        size, (int)direction);
@@ -137,8 +125,7 @@ static inline void
 dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
                     enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_dma_sync_sg_for_cpu(to_pci_dev(dev), sg, nelems, (int)direction);
 }
@@ -147,8 +134,7 @@ static inline void
 dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
                        enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_dma_sync_sg_for_device(to_pci_dev(dev), sg, nelems, (int)direction);
 }
diff --git a/include/asm-sparc64/hypervisor.h b/include/asm-sparc64/hypervisor.h
index 5c2f9d4b9f06..db2130a95d68 100644
--- a/include/asm-sparc64/hypervisor.h
+++ b/include/asm-sparc64/hypervisor.h
@@ -2615,8 +2615,9 @@ struct ldc_mtable_entry {
 /* ldc_revoke()
  * TRAP:        HV_FAST_TRAP
  * FUNCTION:    HV_FAST_LDC_REVOKE
- * ARG0:        cookie
- * ARG1:        ldc_mtable_entry cookie
+ * ARG0:        channel ID
+ * ARG1:        cookie
+ * ARG2:        ldc_mtable_entry cookie
  * RET0:        status
  */
 #define HV_FAST_LDC_REVOKE              0xef
@@ -2663,7 +2664,8 @@ extern unsigned long sun4v_ldc_mapin(unsigned long channel,
                                      unsigned long *ra,
                                      unsigned long *perm);
 extern unsigned long sun4v_ldc_unmap(unsigned long ra);
-extern unsigned long sun4v_ldc_revoke(unsigned long cookie,
+extern unsigned long sun4v_ldc_revoke(unsigned long channel,
+                                      unsigned long cookie,
                                       unsigned long mte_cookie);
 #endif
 
diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h
index 5d233b42fe13..90781e34a95c 100644
--- a/include/asm-sparc64/irq.h
+++ b/include/asm-sparc64/irq.h
@@ -46,6 +46,7 @@ extern void irq_install_pre_handler(int virt_irq,
 #define irq_canonicalize(irq)   (irq)
 extern unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap);
 extern unsigned int sun4v_build_irq(u32 devhandle, unsigned int devino);
+extern unsigned int sun4v_build_virq(u32 devhandle, unsigned int devino);
 extern unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p,
                                     unsigned int msi_devino_start,
                                     unsigned int msi_devino_end);
diff --git a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h
index 6340a5253a34..23cc63f049a8 100644
--- a/include/asm-sparc64/parport.h
+++ b/include/asm-sparc64/parport.h
@@ -145,7 +145,7 @@ static int parport_isa_probe(int count)
                          */
                         if (parport_pc_probe_port(base, base + 0x400,
                                                   child->irq, PARPORT_DMA_NOFIFO,
-                                                  child->bus->self))
+                                                  &child->bus->self->dev))
                                 count++;
                 }
         }
@@ -199,7 +199,8 @@ static int parport_pc_find_nonpci_ports (int autoirq, int autodma)
 
                                 if (parport_pc_probe_port(base, base + 0x400,
                                                           edev->irqs[0],
-                                                          count, ebus->self))
+                                                          count,
+                                                          &ebus->self->dev))
                                         count++;
                         }
                 }
diff --git a/include/net/irda/irlap.h b/include/net/irda/irlap.h
index f0248fb8e196..a3d370efb903 100644
--- a/include/net/irda/irlap.h
+++ b/include/net/irda/irlap.h
@@ -289,4 +289,21 @@ static inline void irlap_clear_disconnect(struct irlap_cb *self)
         self->disconnect_pending = FALSE;
 }
 
+/*
+ * Function irlap_next_state (self, state)
+ *
+ *    Switches state and provides debug information
+ *
+ */
+static inline void irlap_next_state(struct irlap_cb *self, IRLAP_STATE state)
+{
+        /*
+        if (!self || self->magic != LAP_MAGIC)
+                return;
+
+        IRDA_DEBUG(4, "next LAP state = %s\n", irlap_state[state]);
+        */
+        self->state = state;
+}
+
 #endif
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index dda72bf5b9b4..16baef4dab7e 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -503,6 +503,13 @@ static inline int sctp_frag_point(const struct sctp_sock *sp, int pmtu)
         return frag;
 }
 
+static inline void sctp_assoc_pending_pmtu(struct sctp_association *asoc)
+{
+
+        sctp_assoc_sync_pmtu(asoc);
+        asoc->pmtu_pending = 0;
+}
+
 /* Walk through a list of TLV parameters.  Don't trust the
  * individual parameter lengths and instead depend on
  * the chunk length to indicate when to stop.  Make sure
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 5e81984b8478..ee4559b11302 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -912,6 +912,9 @@ struct sctp_transport {
          */
         __u16 pathmaxrxt;
 
+        /* is the Path MTU update pending on this tranport */
+        __u8 pmtu_pending;
+
         /* PMTU       : The current known path MTU.  */
         __u32 pathmtu;
 
@@ -1006,6 +1009,7 @@ void sctp_transport_raise_cwnd(struct sctp_transport *, __u32, __u32);
 void sctp_transport_lower_cwnd(struct sctp_transport *, sctp_lower_cwnd_t);
 unsigned long sctp_transport_timeout(struct sctp_transport *);
 void sctp_transport_reset(struct sctp_transport *);
+void sctp_transport_update_pmtu(struct sctp_transport *, u32);
 
 
 /* This is the structure we use to queue packets as they come into
@@ -1565,6 +1569,9 @@ struct sctp_association {
          */
         __u16 pathmaxrxt;
 
+        /* Flag that path mtu update is pending */
+        __u8   pmtu_pending;
+
         /* Association : The smallest PMTU discovered for all of the
          * PMTU        : peer's transport addresses.
          */
diff --git a/net/ipv4/tcp_bic.c b/net/ipv4/tcp_bic.c
index 281c9f913257..dd9ef65ad3ff 100644
--- a/net/ipv4/tcp_bic.c
+++ b/net/ipv4/tcp_bic.c
@@ -29,7 +29,7 @@ static int fast_convergence = 1;
 static int max_increment = 16;
 static int low_window = 14;
 static int beta = 819;          /* = 819/1024 (BICTCP_BETA_SCALE) */
-static int initial_ssthresh = 100;
+static int initial_ssthresh;
 static int smooth_part = 20;
 
 module_param(fast_convergence, int, 0644);
diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c
index 14224487b16b..ebfaac2f9f46 100644
--- a/net/ipv4/tcp_cubic.c
+++ b/net/ipv4/tcp_cubic.c
@@ -29,7 +29,7 @@
 static int fast_convergence __read_mostly = 1;
 static int max_increment __read_mostly = 16;
 static int beta __read_mostly = 819;    /* = 819/1024 (BICTCP_BETA_SCALE) */
-static int initial_ssthresh __read_mostly = 100;
+static int initial_ssthresh __read_mostly;
 static int bic_scale __read_mostly = 41;
 static int tcp_friendliness __read_mostly = 1;
 
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 74683d81c3f1..d6d0f9b6cdc6 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2037,7 +2037,7 @@ static void tcp_try_to_open(struct sock *sk, int flag)
 {
         struct tcp_sock *tp = tcp_sk(sk);
 
-        tp->left_out = tp->sacked_out;
+        tcp_sync_left_out(tp);
 
         if (tp->retrans_out == 0)
                 tp->retrans_stamp = 0;
@@ -2932,6 +2932,7 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
                                            opt_rx->sack_ok) {
                                                 TCP_SKB_CB(skb)->sacked = (ptr - 2) - (unsigned char *)th;
                                         }
+                                        break;
 #ifdef CONFIG_TCP_MD5SIG
                                 case TCPOPT_MD5SIG:
                                         /*
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 97e294e82679..354721d67f69 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -878,6 +878,7 @@ int tcp_v4_md5_do_add(struct sock *sk, __be32 addr,
                                 kfree(newkey);
                                 return -ENOMEM;
                         }
+                        sk->sk_route_caps &= ~NETIF_F_GSO_MASK;
                 }
                 if (tcp_alloc_md5sig_pool() == NULL) {
                         kfree(newkey);
@@ -1007,7 +1008,7 @@ static int tcp_v4_parse_md5_keys(struct sock *sk, char __user *optval,
                         return -EINVAL;
 
                 tp->md5sig_info = p;
-
+                sk->sk_route_caps &= ~NETIF_F_GSO_MASK;
         }
 
         newkey = kmemdup(cmd.tcpm_key, cmd.tcpm_keylen, GFP_KERNEL);
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 5a5f8bd4597a..f96ed76d8fa4 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2154,6 +2154,15 @@ static void addrconf_dev_config(struct net_device *dev)
 
         ASSERT_RTNL();
 
+        if ((dev->type != ARPHRD_ETHER) &&
+            (dev->type != ARPHRD_FDDI) &&
+            (dev->type != ARPHRD_IEEE802_TR) &&
+            (dev->type != ARPHRD_ARCNET) &&
+            (dev->type != ARPHRD_INFINIBAND)) {
+                /* Alas, we support only Ethernet autoconfiguration. */
+                return;
+        }
+
         idev = addrconf_add_dev(dev);
         if (idev == NULL)
                 return;
@@ -2241,36 +2250,16 @@ static void addrconf_ip6_tnl_config(struct net_device *dev)
         ip6_tnl_add_linklocal(idev);
 }
 
-static int ipv6_hwtype(struct net_device *dev)
-{
-        if ((dev->type == ARPHRD_ETHER) ||
-            (dev->type == ARPHRD_LOOPBACK) ||
-            (dev->type == ARPHRD_SIT) ||
-            (dev->type == ARPHRD_TUNNEL6) ||
-            (dev->type == ARPHRD_FDDI) ||
-            (dev->type == ARPHRD_IEEE802_TR) ||
-            (dev->type == ARPHRD_ARCNET) ||
-            (dev->type == ARPHRD_INFINIBAND))
-                return 1;
-
-        return 0;
-}
-
 static int addrconf_notify(struct notifier_block *this, unsigned long event,
                            void * data)
 {
         struct net_device *dev = (struct net_device *) data;
-        struct inet6_dev *idev;
+        struct inet6_dev *idev = __in6_dev_get(dev);
         int run_pending = 0;
 
-        if (!ipv6_hwtype(dev))
-                return NOTIFY_OK;
-
-        idev = __in6_dev_get(dev);
-
         switch(event) {
         case NETDEV_REGISTER:
-                if (!idev) {
+                if (!idev && dev->mtu >= IPV6_MIN_MTU) {
                         idev = ipv6_add_dev(dev);
                         if (!idev)
                                 printk(KERN_WARNING "IPv6: add_dev failed for %s\n",
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 4f06a51ad4fd..193d9d60bb7a 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -590,6 +590,7 @@ static int tcp_v6_md5_do_add(struct sock *sk, struct in6_addr *peer,
                                 kfree(newkey);
                                 return -ENOMEM;
                         }
+                        sk->sk_route_caps &= ~NETIF_F_GSO_MASK;
                 }
                 tcp_alloc_md5sig_pool();
                 if (tp->md5sig_info->alloced6 == tp->md5sig_info->entries6) {
@@ -724,6 +725,7 @@ static int tcp_v6_parse_md5_keys (struct sock *sk, char __user *optval,
                         return -ENOMEM;
 
                 tp->md5sig_info = p;
+                sk->sk_route_caps &= ~NETIF_F_GSO_MASK;
         }
 
         newkey = kmemdup(cmd.tcpm_key, cmd.tcpm_keylen, GFP_KERNEL);
diff --git a/net/irda/irlap_event.c b/net/irda/irlap_event.c
index 0b02073ffdf3..a8b8873aa263 100644
--- a/net/irda/irlap_event.c
+++ b/net/irda/irlap_event.c
@@ -317,23 +317,6 @@ void irlap_do_event(struct irlap_cb *self, IRLAP_EVENT event,
 }
 
 /*
- * Function irlap_next_state (self, state)
- *
- *    Switches state and provides debug information
- *
- */
-static inline void irlap_next_state(struct irlap_cb *self, IRLAP_STATE state)
-{
-        /*
-        if (!self || self->magic != LAP_MAGIC)
-                return;
-
-        IRDA_DEBUG(4, "next LAP state = %s\n", irlap_state[state]);
-        */
-        self->state = state;
-}
-
-/*
  * Function irlap_state_ndm (event, skb, frame)
  *
  *    NDM (Normal Disconnected Mode) state
@@ -1086,7 +1069,6 @@ static int irlap_state_xmit_p(struct irlap_cb *self, IRLAP_EVENT event,
                         } else {
                                 /* Final packet of window */
                                 irlap_send_data_primary_poll(self, skb);
-                                irlap_next_state(self, LAP_NRM_P);
 
                                 /*
                                  * Make sure state machine does not try to send
@@ -1436,14 +1418,14 @@ static int irlap_state_nrm_p(struct irlap_cb *self, IRLAP_EVENT event,
                  */
                 self->remote_busy = FALSE;
 
+                /* Stop final timer */
+                del_timer(&self->final_timer);
+
                 /*
                  *  Nr as expected?
                  */
                 ret = irlap_validate_nr_received(self, info->nr);
                 if (ret == NR_EXPECTED) {
-                        /* Stop final timer */
-                        del_timer(&self->final_timer);
-
                         /* Update Nr received */
                         irlap_update_nr_received(self, info->nr);
 
@@ -1475,14 +1457,12 @@ static int irlap_state_nrm_p(struct irlap_cb *self, IRLAP_EVENT event,
 
                         /* Resend rejected frames */
                         irlap_resend_rejected_frames(self, CMD_FRAME);
-
-                        /* Final timer ??? Jean II */
+                        irlap_start_final_timer(self, self->final_timeout * 2);
 
                         irlap_next_state(self, LAP_NRM_P);
                 } else if (ret == NR_INVALID) {
                         IRDA_DEBUG(1, "%s(), Received RR with "
                                    "invalid nr !\n", __FUNCTION__);
-                        del_timer(&self->final_timer);
 
                         irlap_next_state(self, LAP_RESET_WAIT);
 
diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c
index 3c5a68e36414..3013c49ab975 100644
--- a/net/irda/irlap_frame.c
+++ b/net/irda/irlap_frame.c
@@ -798,16 +798,19 @@ void irlap_send_data_primary_poll(struct irlap_cb *self, struct sk_buff *skb)
                 self->vs = (self->vs + 1) % 8;
                 self->ack_required = FALSE;
 
+                irlap_next_state(self, LAP_NRM_P);
                 irlap_send_i_frame(self, tx_skb, CMD_FRAME);
         } else {
                 IRDA_DEBUG(4, "%s(), sending unreliable frame\n", __FUNCTION__);
 
                 if (self->ack_required) {
                         irlap_send_ui_frame(self, skb_get(skb), self->caddr, CMD_FRAME);
+                        irlap_next_state(self, LAP_NRM_P);
                         irlap_send_rr_frame(self, CMD_FRAME);
                         self->ack_required = FALSE;
                 } else {
                         skb->data[1] |= PF_BIT;
+                        irlap_next_state(self, LAP_NRM_P);
                         irlap_send_ui_frame(self, skb_get(skb), self->caddr, CMD_FRAME);
                 }
         }
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index bb6c0feb2d48..476c8486f789 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -112,7 +112,7 @@ DEBUGFS_READONLY_FILE(wep_iv, 20, "%#06x",
                       local->wep_iv & 0xffffff);
 DEBUGFS_READONLY_FILE(tx_power_reduction, 20, "%d.%d dBm",
                       local->hw.conf.tx_power_reduction / 10,
-                      local->hw.conf.tx_power_reduction & 10);
+                      local->hw.conf.tx_power_reduction % 10);
 DEBUGFS_READONLY_FILE(rate_ctrl_alg, 100, "%s",
                       local->rate_ctrl ? local->rate_ctrl->ops->name : "<unset>");
 
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 9f30ae4c2ab3..91b545c144c1 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -2592,11 +2592,17 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw)
 
         read_lock(&local->sub_if_lock);
         list_for_each_entry(sdata, &local->sub_if_list, list) {
+
+                /* No need to wake the master device. */
+                if (sdata->dev == local->mdev)
+                        continue;
+
                 if (sdata->type == IEEE80211_IF_TYPE_STA) {
                         if (sdata->u.sta.associated)
                                 ieee80211_send_nullfunc(local, sdata, 0);
                         ieee80211_sta_timer((unsigned long)sdata);
                 }
+
                 netif_wake_queue(sdata->dev);
         }
         read_unlock(&local->sub_if_lock);
@@ -2738,6 +2744,12 @@ static int ieee80211_sta_start_scan(struct net_device *dev,
 
         read_lock(&local->sub_if_lock);
         list_for_each_entry(sdata, &local->sub_if_list, list) {
+
+                /* Don't stop the master interface, otherwise we can't transmit
+                 * probes! */
+                if (sdata->dev == local->mdev)
+                        continue;
+
                 netif_stop_queue(sdata->dev);
                 if (sdata->type == IEEE80211_IF_TYPE_STA &&
                     sdata->u.sta.associated)
diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index df94e3cdfba3..498edb0cd4e5 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -1231,6 +1231,10 @@ void sctp_assoc_sync_pmtu(struct sctp_association *asoc)
         /* Get the lowest pmtu of all the transports. */
         list_for_each(pos, &asoc->peer.transport_addr_list) {
                 t = list_entry(pos, struct sctp_transport, transports);
+                if (t->pmtu_pending && t->dst) {
+                        sctp_transport_update_pmtu(t, dst_mtu(t->dst));
+                        t->pmtu_pending = 0;
+                }
                 if (!pmtu || (t->pathmtu < pmtu))
                         pmtu = t->pathmtu;
         }
diff --git a/net/sctp/input.c b/net/sctp/input.c
index 885109fb3dda..d57ff7f3c576 100644
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -367,24 +367,18 @@ static void sctp_add_backlog(struct sock *sk, struct sk_buff *skb)
 void sctp_icmp_frag_needed(struct sock *sk, struct sctp_association *asoc,
                            struct sctp_transport *t, __u32 pmtu)
 {
-        if (sock_owned_by_user(sk) || !t || (t->pathmtu == pmtu))
+        if (!t || (t->pathmtu == pmtu))
                 return;
 
+        if (sock_owned_by_user(sk)) {
+                asoc->pmtu_pending = 1;
+                t->pmtu_pending = 1;
+                return;
+        }
+
         if (t->param_flags & SPP_PMTUD_ENABLE) {
-                if (unlikely(pmtu < SCTP_DEFAULT_MINSEGMENT)) {
-                        printk(KERN_WARNING "%s: Reported pmtu %d too low, "
-                               "using default minimum of %d\n",
-                               __FUNCTION__, pmtu,
-                               SCTP_DEFAULT_MINSEGMENT);
-                        /* Use default minimum segment size and disable
-                         * pmtu discovery on this transport.
-                         */
-                        t->pathmtu = SCTP_DEFAULT_MINSEGMENT;
-                        t->param_flags = (t->param_flags & ~SPP_PMTUD) |
-                                SPP_PMTUD_DISABLE;
-                } else {
-                        t->pathmtu = pmtu;
-                }
+                /* Update transports view of the MTU */
+                sctp_transport_update_pmtu(t, pmtu);
 
                 /* Update association pmtu. */
                 sctp_assoc_sync_pmtu(asoc);
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 4dcdabf56473..6edaaa009d62 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -333,12 +333,19 @@ SCTP_STATIC int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
         if (!sp->pf->bind_verify(sp, addr))
                 return -EADDRNOTAVAIL;
 
-        /* We must either be unbound, or bind to the same port.  */
-        if (bp->port && (snum != bp->port)) {
-                SCTP_DEBUG_PRINTK("sctp_do_bind:"
+        /* We must either be unbound, or bind to the same port.
+         * It's OK to allow 0 ports if we are already bound.
+         * We'll just inhert an already bound port in this case
+         */
+        if (bp->port) {
+                if (!snum)
+                        snum = bp->port;
+                else if (snum != bp->port) {
+                        SCTP_DEBUG_PRINTK("sctp_do_bind:"
                                   " New port %d does not match existing port "
                                   "%d.\n", snum, bp->port);
-                return -EINVAL;
+                        return -EINVAL;
+                }
         }
 
         if (snum && snum < PROT_SOCK && !capable(CAP_NET_BIND_SERVICE))
@@ -1655,6 +1662,9 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
                 goto out_free;
         }
 
+        if (asoc->pmtu_pending)
+                sctp_assoc_pending_pmtu(asoc);
+
         /* If fragmentation is disabled and the message length exceeds the
          * association fragmentation point, return EMSGSIZE.  The I-D
          * does not specify what this error is, but this looks like
@@ -3550,6 +3560,7 @@ SCTP_STATIC int sctp_do_peeloff(struct sctp_association *asoc,
         struct sock *sk = asoc->base.sk;
         struct socket *sock;
         struct inet_sock *inetsk;
+        struct sctp_af *af;
         int err = 0;
 
         /* An association cannot be branched off from an already peeled-off
@@ -3571,8 +3582,9 @@ SCTP_STATIC int sctp_do_peeloff(struct sctp_association *asoc,
         /* Make peeled-off sockets more like 1-1 accepted sockets.
          * Set the daddr and initialize id to something more random
          */
+        af = sctp_get_af_specific(asoc->peer.primary_addr.sa.sa_family);
+        af->to_sk_daddr(&asoc->peer.primary_addr, sk);
         inetsk = inet_sk(sock->sk);
-        inetsk->daddr = asoc->peer.primary_addr.v4.sin_addr.s_addr;
         inetsk->id = asoc->next_tsn ^ jiffies;
 
         *sockp = sock;
@@ -4343,11 +4355,12 @@ copy_getaddrs:
                 err = -EFAULT;
                 goto error;
         }
-        if (put_user(cnt, &((struct sctp_getaddrs __user *)optval)->addr_num))
-                return -EFAULT;
+        if (put_user(cnt, &((struct sctp_getaddrs __user *)optval)->addr_num)) {
+                err = -EFAULT;
+                goto error;
+        }
         if (put_user(bytes_copied, optlen))
-                return -EFAULT;
-
+                err = -EFAULT;
 error:
         kfree(addrs);
         return err;
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 961df275d5b9..5f467c914f80 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -241,6 +241,45 @@ void sctp_transport_pmtu(struct sctp_transport *transport)
                 transport->pathmtu = SCTP_DEFAULT_MAXSEGMENT;
 }
 
+/* this is a complete rip-off from __sk_dst_check
+ * the cookie is always 0 since this is how it's used in the
+ * pmtu code
+ */
+static struct dst_entry *sctp_transport_dst_check(struct sctp_transport *t)
+{
+        struct dst_entry *dst = t->dst;
+
+        if (dst && dst->obsolete && dst->ops->check(dst, 0) == NULL) {
+                dst_release(t->dst);
+                t->dst = NULL;
+                return NULL;
+        }
+
+        return dst;
+}
+
+void sctp_transport_update_pmtu(struct sctp_transport *t, u32 pmtu)
+{
+        struct dst_entry *dst;
+
+        if (unlikely(pmtu < SCTP_DEFAULT_MINSEGMENT)) {
+                printk(KERN_WARNING "%s: Reported pmtu %d too low, "
+                       "using default minimum of %d\n",
+                       __FUNCTION__, pmtu,
+                       SCTP_DEFAULT_MINSEGMENT);
+                /* Use default minimum segment size and disable
+                 * pmtu discovery on this transport.
+                 */
+                t->pathmtu = SCTP_DEFAULT_MINSEGMENT;
+        } else {
+                t->pathmtu = pmtu;
+        }
+
+        dst = sctp_transport_dst_check(t);
+        if (dst)
+                dst->ops->update_pmtu(dst, pmtu);
+}
+
 /* Caches the dst entry and source address for a transport's destination
  * address.
  */
diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c
index 3ebae1442963..88aaacd9f822 100644
--- a/net/wireless/sysfs.c
+++ b/net/wireless/sysfs.c
@@ -33,7 +33,7 @@ static ssize_t _show_permaddr(struct device *dev,
                               struct device_attribute *attr,
                               char *buf)
 {
-        char *addr = dev_to_rdev(dev)->wiphy.perm_addr;
+        unsigned char *addr = dev_to_rdev(dev)->wiphy.perm_addr;
 
         return sprintf(buf, "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
                        addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 8e5610d428c5..3645e980da71 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1052,6 +1052,7 @@ static int init_section_ref_ok(const char *name)
                 ".plt",  /* seen on ARCH=um build on x86_64. Harmless */
                 "__ftr_fixup",          /* powerpc cpu feature fixup */
                 "__fw_ftr_fixup",       /* powerpc firmware feature fixup */
+                ".cranges",     /* used by sh64 */
                 NULL
         };
         /* Start of section names */
@@ -1132,6 +1133,7 @@ static int exit_section_ref_ok(const char *name)
                 ".fixup",
                 ".smp_locks",
                 ".plt",  /* seen on ARCH=um build on x86_64. Harmless */
+                ".cranges",     /* used by sh64 */
                 NULL
         };
         /* Start of section names */