197 files changed, 2486 insertions, 1890 deletions
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index 728bb8f39441..0babb645b83c 100644
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -544,10 +544,10 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
                struct resource *fb_res = &lcdc_resources[2];
                size_t fb_len = fb_res->end - fb_res->start + 1;
-                fb = ioremap_writecombine(fb_res->start, fb_len);
+                fb = ioremap(fb_res->start, fb_len);
                if (fb) {
                        memset(fb, 0, fb_len);
-                        iounmap(fb, fb_len);
+                        iounmap(fb);
                }
        }
        lcdc_data = *data;
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index 054689804e77..450db304936f 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -332,13 +332,6 @@ static struct resource lcdc_resources[] = {
                .end    = AT91SAM9RL_ID_LCDC,
                .flags  = IORESOURCE_IRQ,
        },
-#if defined(CONFIG_FB_INTSRAM)
-        [2] = {
-                .start  = AT91SAM9RL_SRAM_BASE,
-                .end    = AT91SAM9RL_SRAM_BASE + AT91SAM9RL_SRAM_SIZE - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-#endif
 };
 static struct platform_device at91_lcdc_device = {
@@ -381,20 +374,6 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
        at91_set_B_periph(AT91_PIN_PC24, 0);    /* LCDD22 */
        at91_set_B_periph(AT91_PIN_PC25, 0);    /* LCDD23 */
-#ifdef CONFIG_FB_INTSRAM
-        {
-                void __iomem *fb;
-                struct resource *fb_res = &lcdc_resources[2];
-                size_t fb_len = fb_res->end - fb_res->start + 1;
-                fb = ioremap_writecombine(fb_res->start, fb_len);
-                if (fb) {
-                        memset(fb, 0, fb_len);
-                        iounmap(fb, fb_len);
-                }
-        }
-#endif
        lcdc_data = *data;
        platform_device_register(&at91_lcdc_device);
 }
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 0df5f6f75edf..16be41446b5b 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -135,6 +135,7 @@ config IA64_GENERIC
          HP-zx1/sx1000         For HP systems
          HP-zx1/sx1000+swiotlb For HP systems with (broken) DMA-constrained devices.
          SGI-SN2               For SGI Altix systems
+          SGI-UV                For SGI UV systems
          Ski-simulator         For the HP simulator <http://www.hpl.hp.com/research/linux/ski/>
          If you don't know what to do, choose "generic".
@@ -170,6 +171,18 @@ config IA64_SGI_SN2
          to select this option.  If in doubt, select ia64 generic support
          instead.
+config IA64_SGI_UV`
+        bool "SGI-UV`"
+        select NUMA
+        select ACPI_NUMA
+        select SWIOTLB
+        help
+          Selecting this option will optimize the kernel for use on UV based
+          systems, but the resulting kernel binary will not run on other
+          types of ia64 systems.  If you have an SGI UV system, it's safe
+          to select this option.  If in doubt, select ia64 generic support
+          instead.
 config IA64_HP_SIM
        bool "Ski-simulator"
        select SWIOTLB
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index ec4cca477f49..88f1a55c6c94 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -63,7 +63,7 @@ drivers-$(CONFIG_PCI)		+= arch/ia64/pci/
 drivers-$(CONFIG_IA64_HP_SIM)   += arch/ia64/hp/sim/
 drivers-$(CONFIG_IA64_HP_ZX1)   += arch/ia64/hp/common/ arch/ia64/hp/zx1/
 drivers-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/hp/common/ arch/ia64/hp/zx1/
-drivers-$(CONFIG_IA64_GENERIC)  += arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/hp/sim/ arch/ia64/sn/
+drivers-$(CONFIG_IA64_GENERIC)  += arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/hp/sim/ arch/ia64/sn/ arch/ia64/uv/
 drivers-$(CONFIG_OPROFILE)      += arch/ia64/oprofile/
 boot := arch/ia64/hp/sim/boot
diff --git a/arch/ia64/ia32/ia32_support.c b/arch/ia64/ia32/ia32_support.c
index 896b1ebbfb26..a6965ddafc46 100644
--- a/arch/ia64/ia32/ia32_support.c
+++ b/arch/ia64/ia32/ia32_support.c
@@ -15,7 +15,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/mm.h>
-#include <linux/personality.h>
 #include <linux/sched.h>
 #include <asm/intrinsics.h>
@@ -29,7 +28,6 @@
 extern int die_if_kernel (char *str, struct pt_regs *regs, long err);
-struct exec_domain ia32_exec_domain;
 struct page *ia32_shared_page[NR_CPUS];
 unsigned long *ia32_boot_gdt;
 unsigned long *cpu_gdt_table[NR_CPUS];
@@ -240,14 +238,6 @@ ia32_cpu_init (void)
 static int __init
 ia32_init (void)
 {
-        ia32_exec_domain.name = "Linux/x86";
-        ia32_exec_domain.handler = NULL;
-        ia32_exec_domain.pers_low = PER_LINUX32;
-        ia32_exec_domain.pers_high = PER_LINUX32;
-        ia32_exec_domain.signal_map = default_exec_domain.signal_map;
-        ia32_exec_domain.signal_invmap = default_exec_domain.signal_invmap;
-        register_exec_domain(&ia32_exec_domain);
 #if PAGE_SHIFT > IA32_PAGE_SHIFT
        {
                extern struct kmem_cache *ia64_partial_page_cachep;
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 19709a079635..853d1f11be00 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -117,7 +117,10 @@ acpi_get_sysname(void)
        if (!strcmp(hdr->oem_id, "HP")) {
                return "hpzx1";
        } else if (!strcmp(hdr->oem_id, "SGI")) {
-                return "sn2";
+                if (!strcmp(hdr->oem_table_id + 4, "UV"))
+                        return "uv";
+                else
+                        return "sn2";
        }
        return "dig";
@@ -130,6 +133,8 @@ acpi_get_sysname(void)
        return "hpzx1_swiotlb";
 # elif defined (CONFIG_IA64_SGI_SN2)
        return "sn2";
+# elif defined (CONFIG_IA64_SGI_UV)
+        return "uv";
 # elif defined (CONFIG_IA64_DIG)
        return "dig";
 # else
@@ -622,6 +627,9 @@ void acpi_unregister_gsi(u32 gsi)
        if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
                return;
+        if (has_8259 && gsi < 16)
+                return;
        iosapic_unregister_intr(gsi);
 }
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index e49ad8c5dc69..ca2bb95726de 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1156,6 +1156,9 @@ skip_rbs_switch:
         *      r31 = current->thread_info->flags
         * On exit:
         *      p6 = TRUE if work-pending-check needs to be redone
+         *
+         * Interrupts are disabled on entry, reenabled depend on work, and
+         * disabled on exit.
         */
 .work_pending_syscall:
        add r2=-8,r2
@@ -1164,16 +1167,16 @@ skip_rbs_switch:
        st8 [r2]=r8
        st8 [r3]=r10
 .work_pending:
-        tbit.z p6,p0=r31,TIF_NEED_RESCHED               // current_thread_info()->need_resched==0?
+        tbit.z p6,p0=r31,TIF_NEED_RESCHED       // is resched not needed?
 (p6)    br.cond.sptk.few .notify
 #ifdef CONFIG_PREEMPT
 (pKStk) dep r21=-1,r0,PREEMPT_ACTIVE_BIT,1
        ;;
 (pKStk) st4 [r20]=r21
-        ssm psr.i               // enable interrupts
 #endif
+        ssm psr.i               // enable interrupts
        br.call.spnt.many rp=schedule
-.ret9:  cmp.eq p6,p0=r0,r0                              // p6 <- 1
+.ret9:  cmp.eq p6,p0=r0,r0      // p6 <- 1 (re-check)
        rsm psr.i               // disable interrupts
        ;;
 #ifdef CONFIG_PREEMPT
@@ -1182,13 +1185,13 @@ skip_rbs_switch:
 (pKStk) st4 [r20]=r0            // preempt_count() <- 0
 #endif
 (pLvSys)br.cond.sptk.few  .work_pending_syscall_end
-        br.cond.sptk.many .work_processed_kernel        // re-check
+        br.cond.sptk.many .work_processed_kernel
 .notify:
 (pUStk) br.call.spnt.many rp=notify_resume_user
-.ret10: cmp.ne p6,p0=r0,r0                              // p6 <- 0
+.ret10: cmp.ne p6,p0=r0,r0      // p6 <- 0 (don't re-check)
 (pLvSys)br.cond.sptk.few  .work_pending_syscall_end
-        br.cond.sptk.many .work_processed_kernel        // don't re-check
+        br.cond.sptk.many .work_processed_kernel
 .work_pending_syscall_end:
        adds r2=PT(R8)+16,r12
@@ -1196,7 +1199,7 @@ skip_rbs_switch:
        ;;
        ld8 r8=[r2]
        ld8 r10=[r3]
-        br.cond.sptk.many .work_processed_syscall       // re-check
+        br.cond.sptk.many .work_processed_syscall
 END(ia64_leave_kernel)
@@ -1234,9 +1237,12 @@ GLOBAL_ENTRY(ia64_invoke_schedule_tail)
 END(ia64_invoke_schedule_tail)
        /*
-         * Setup stack and call do_notify_resume_user().  Note that pSys and pNonSys need to
+         * Setup stack and call do_notify_resume_user(), keeping interrupts
-         * be set up by the caller.  We declare 8 input registers so the system call
+         * disabled.
-         * args get preserved, in case we need to restart a system call.
+         *
+         * Note that pSys and pNonSys need to be set up by the caller.
+         * We declare 8 input registers so the system call args get preserved,
+         * in case we need to restart a system call.
         */
 ENTRY(notify_resume_user)
        .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(8)
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index 4547a2092af9..9dc00f7fe10e 100644
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -900,12 +900,6 @@ static void
 palinfo_smp_call(void *info)
 {
        palinfo_smp_data_t *data = (palinfo_smp_data_t *)info;
-        if (data == NULL) {
-                printk(KERN_ERR "palinfo: data pointer is NULL\n");
-                data->ret = 0; /* no output */
-                return;
-        }
-        /* does this actual call */
        data->ret = (*data->func)(data->page);
 }
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index c1ad27de2dd2..71d05133f556 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -5013,12 +5013,13 @@ pfm_context_force_terminate(pfm_context_t *ctx, struct pt_regs *regs)
 }
 static int pfm_ovfl_notify_user(pfm_context_t *ctx, unsigned long ovfl_pmds);
 /*
  * pfm_handle_work() can be called with interrupts enabled
  * (TIF_NEED_RESCHED) or disabled. The down_interruptible
  * call may sleep, therefore we must re-enable interrupts
  * to avoid deadlocks. It is safe to do so because this function
-  * is called ONLY when returning to user level (PUStk=1), in which case
+  * is called ONLY when returning to user level (pUStk=1), in which case
  * there is no risk of kernel stack overflow due to deep
  * interrupt nesting.
  */
@@ -5034,7 +5035,8 @@ pfm_handle_work(void)
        ctx = PFM_GET_CTX(current);
        if (ctx == NULL) {
-                printk(KERN_ERR "perfmon: [%d] has no PFM context\n", task_pid_nr(current));
+                printk(KERN_ERR "perfmon: [%d] has no PFM context\n",
+                        task_pid_nr(current));
                return;
        }
@@ -5058,11 +5060,12 @@ pfm_handle_work(void)
        /*
         * must be done before we check for simple-reset mode
         */
-        if (ctx->ctx_fl_going_zombie || ctx->ctx_state == PFM_CTX_ZOMBIE) goto do_zombie;
+        if (ctx->ctx_fl_going_zombie || ctx->ctx_state == PFM_CTX_ZOMBIE)
+                goto do_zombie;
        //if (CTX_OVFL_NOBLOCK(ctx)) goto skip_blocking;
-        if (reason == PFM_TRAP_REASON_RESET) goto skip_blocking;
+        if (reason == PFM_TRAP_REASON_RESET)
+                goto skip_blocking;
        /*
         * restore interrupt mask to what it was on entry.
@@ -5110,7 +5113,8 @@ do_zombie:
        /*
         * in case of interruption of down() we don't restart anything
         */
-        if (ret < 0) goto nothing_to_do;
+        if (ret < 0)
+                goto nothing_to_do;
 skip_blocking:
        pfm_resume_after_ovfl(ctx, ovfl_regs, regs);
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 58dcfac5ea88..a3a34b4eb038 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -167,11 +167,18 @@ void tsk_clear_notify_resume(struct task_struct *tsk)
        clear_ti_thread_flag(task_thread_info(tsk), TIF_NOTIFY_RESUME);
 }
+/*
+ * do_notify_resume_user():
+ *      Called from notify_resume_user at entry.S, with interrupts disabled.
+ */
 void
-do_notify_resume_user (sigset_t *unused, struct sigscratch *scr, long in_syscall)
+do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall)
 {
        if (fsys_mode(current, &scr->pt)) {
-                /* defer signal-handling etc. until we return to privilege-level 0.  */
+                /*
+                 * defer signal-handling etc. until we return to
+                 * privilege-level 0.
+                 */
                if (!ia64_psr(&scr->pt)->lp)
                        ia64_psr(&scr->pt)->lp = 1;
                return;
@@ -179,16 +186,26 @@ do_notify_resume_user (sigset_t *unused, struct sigscratch *scr, long in_syscall
 #ifdef CONFIG_PERFMON
        if (current->thread.pfm_needs_checking)
+                /*
+                 * Note: pfm_handle_work() allow us to call it with interrupts
+                 * disabled, and may enable interrupts within the function.
+                 */
                pfm_handle_work();
 #endif
        /* deal with pending signal delivery */
-        if (test_thread_flag(TIF_SIGPENDING))
+        if (test_thread_flag(TIF_SIGPENDING)) {
+                local_irq_enable();     /* force interrupt enable */
                ia64_do_signal(scr, in_syscall);
+        }
        /* copy user rbs to kernel rbs */
-        if (unlikely(test_thread_flag(TIF_RESTORE_RSE)))
+        if (unlikely(test_thread_flag(TIF_RESTORE_RSE))) {
+                local_irq_enable();     /* force interrupt enable */
                ia64_sync_krbs();
+        }
+        local_irq_disable();    /* force interrupt disable */
 }
 static int pal_halt        = 1;
diff --git a/arch/ia64/kernel/sal.c b/arch/ia64/kernel/sal.c
index a3022dc48ef8..7e0259709c04 100644
--- a/arch/ia64/kernel/sal.c
+++ b/arch/ia64/kernel/sal.c
@@ -229,6 +229,14 @@ static void __init sal_desc_ap_wakeup(void *p) { }
 */
 static int sal_cache_flush_drops_interrupts;
+static int __init
+force_pal_cache_flush(char *str)
+{
+        sal_cache_flush_drops_interrupts = 1;
+        return 0;
+}
+early_param("force_pal_cache_flush", force_pal_cache_flush);
 void __init
 check_sal_cache_flush (void)
 {
@@ -237,6 +245,9 @@ check_sal_cache_flush (void)
        u64 vector, cache_type = 3;
        struct ia64_sal_retval isrv;
+        if (sal_cache_flush_drops_interrupts)
+                return;
        cpu = get_cpu();
        local_irq_save(flags);
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 5015ca1275ca..e9596cd0cdab 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -239,6 +239,25 @@ __initcall(register_memory);
 #ifdef CONFIG_KEXEC
+/*
+ * This function checks if the reserved crashkernel is allowed on the specific
+ * IA64 machine flavour. Machines without an IO TLB use swiotlb and require
+ * some memory below 4 GB (i.e. in 32 bit area), see the implementation of
+ * lib/swiotlb.c. The hpzx1 architecture has an IO TLB but cannot use that
+ * in kdump case. See the comment in sba_init() in sba_iommu.c.
+ *
+ * So, the only machvec that really supports loading the kdump kernel
+ * over 4 GB is "sn2".
+ */
+static int __init check_crashkernel_memory(unsigned long pbase, size_t size)
+{
+        if (ia64_platform_is("sn2") || ia64_platform_is("uv"))
+                return 1;
+        else
+                return pbase < (1UL << 32);
+}
 static void __init setup_crashkernel(unsigned long total, int *n)
 {
        unsigned long long base = 0, size = 0;
@@ -252,6 +271,16 @@ static void __init setup_crashkernel(unsigned long total, int *n)
                        base = kdump_find_rsvd_region(size,
                                        rsvd_region, *n);
                }
+                if (!check_crashkernel_memory(base, size)) {
+                        pr_warning("crashkernel: There would be kdump memory "
+                                "at %ld GB but this is unusable because it "
+                                "must\nbe below 4 GB. Change the memory "
+                                "configuration of the machine.\n",
+                                (unsigned long)(base >> 30));
+                        return;
+                }
                if (base != ~0UL) {
                        printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
                                        "for crashkernel (System RAM: %ldMB)\n",
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index fc6c6636ffda..200100ea7610 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -719,3 +719,28 @@ out:
 EXPORT_SYMBOL_GPL(remove_memory);
 #endif /* CONFIG_MEMORY_HOTREMOVE */
 #endif
+/*
+ * Even when CONFIG_IA32_SUPPORT is not enabled it is
+ * useful to have the Linux/x86 domain registered to
+ * avoid an attempted module load when emulators call
+ * personality(PER_LINUX32). This saves several milliseconds
+ * on each such call.
+ */
+static struct exec_domain ia32_exec_domain;
+static int __init
+per_linux32_init(void)
+{
+        ia32_exec_domain.name = "Linux/x86";
+        ia32_exec_domain.handler = NULL;
+        ia32_exec_domain.pers_low = PER_LINUX32;
+        ia32_exec_domain.pers_high = PER_LINUX32;
+        ia32_exec_domain.signal_map = default_exec_domain.signal_map;
+        ia32_exec_domain.signal_invmap = default_exec_domain.signal_invmap;
+        register_exec_domain(&ia32_exec_domain);
+        return 0;
+}
+__initcall(per_linux32_init);
diff --git a/arch/ia64/uv/Makefile b/arch/ia64/uv/Makefile
new file mode 100644
index 000000000000..aa9f91947c49
--- /dev/null
+++ b/arch/ia64/uv/Makefile
@@ -0,0 +1,12 @@
+# arch/ia64/uv/Makefile
+#
+# This file is subject to the terms and conditions of the GNU General Public
+# License.  See the file "COPYING" in the main directory of this archive
+# for more details.
+#
+# Copyright (C) 2008 Silicon Graphics, Inc.  All Rights Reserved.
+#
+# Makefile for the sn uv subplatform
+#
+obj-y += kernel/
diff --git a/arch/ia64/uv/kernel/Makefile b/arch/ia64/uv/kernel/Makefile
new file mode 100644
index 000000000000..8d92b4684d8e
--- /dev/null
+++ b/arch/ia64/uv/kernel/Makefile
@@ -0,0 +1,13 @@
+# arch/ia64/uv/kernel/Makefile
+#
+# This file is subject to the terms and conditions of the GNU General Public
+# License.  See the file "COPYING" in the main directory of this archive
+# for more details.
+#
+# Copyright (C) 2008 Silicon Graphics, Inc.  All Rights Reserved.
+#
+EXTRA_CFLAGS += -Iarch/ia64/sn/include
+obj-y                           += setup.o
+obj-$(CONFIG_IA64_GENERIC)      += machvec.o
diff --git a/arch/ia64/uv/kernel/machvec.c b/arch/ia64/uv/kernel/machvec.c
new file mode 100644
index 000000000000..50737a9dca74
--- /dev/null
+++ b/arch/ia64/uv/kernel/machvec.c
@@ -0,0 +1,11 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.
+ */
+#define MACHVEC_PLATFORM_NAME   uv
+#define MACHVEC_PLATFORM_HEADER <asm/machvec_uv.h>
+#include <asm/machvec_init.h>
diff --git a/arch/ia64/uv/kernel/setup.c b/arch/ia64/uv/kernel/setup.c
new file mode 100644
index 000000000000..9aa743203c3c
--- /dev/null
+++ b/arch/ia64/uv/kernel/setup.c
@@ -0,0 +1,98 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * SGI UV Core Functions
+ *
+ * Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved.
+ */
+#include <linux/module.h>
+#include <linux/percpu.h>
+#include <asm/sn/simulator.h>
+#include <asm/uv/uv_mmrs.h>
+#include <asm/uv/uv_hub.h>
+DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);
+EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info);
+struct redir_addr {
+        unsigned long redirect;
+        unsigned long alias;
+};
+#define DEST_SHIFT UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR_DEST_BASE_SHFT
+static __initdata struct redir_addr redir_addrs[] = {
+        {UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR, UVH_SI_ALIAS0_OVERLAY_CONFIG},
+        {UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR, UVH_SI_ALIAS1_OVERLAY_CONFIG},
+        {UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR, UVH_SI_ALIAS2_OVERLAY_CONFIG},
+};
+static __init void get_lowmem_redirect(unsigned long *base, unsigned long *size)
+{
+        union uvh_si_alias0_overlay_config_u alias;
+        union uvh_rh_gam_alias210_redirect_config_2_mmr_u redirect;
+        int i;
+        for (i = 0; i < ARRAY_SIZE(redir_addrs); i++) {
+                alias.v = uv_read_local_mmr(redir_addrs[i].alias);
+                if (alias.s.base == 0) {
+                        *size = (1UL << alias.s.m_alias);
+                        redirect.v = uv_read_local_mmr(redir_addrs[i].redirect);
+                        *base = (unsigned long)redirect.s.dest_base << DEST_SHIFT;
+                        return;
+                }
+        }
+        BUG();
+}
+void __init uv_setup(char **cmdline_p)
+{
+        union uvh_si_addr_map_config_u m_n_config;
+        union uvh_node_id_u node_id;
+        unsigned long gnode_upper;
+        int nid, cpu, m_val, n_val;
+        unsigned long mmr_base, lowmem_redir_base, lowmem_redir_size;
+        if (IS_MEDUSA()) {
+                lowmem_redir_base = 0;
+                lowmem_redir_size = 0;
+                node_id.v = 0;
+                m_n_config.s.m_skt = 37;
+                m_n_config.s.n_skt = 0;
+                mmr_base = 0;
+        } else {
+                get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size);
+                node_id.v = uv_read_local_mmr(UVH_NODE_ID);
+                m_n_config.v = uv_read_local_mmr(UVH_SI_ADDR_MAP_CONFIG);
+                mmr_base =
+                        uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR) &
+                                ~UV_MMR_ENABLE;
+        }
+        m_val = m_n_config.s.m_skt;
+        n_val = m_n_config.s.n_skt;
+        printk(KERN_DEBUG "UV: global MMR base 0x%lx\n", mmr_base);
+        gnode_upper = (((unsigned long)node_id.s.node_id) &
+                       ~((1 << n_val) - 1)) << m_val;
+        for_each_present_cpu(cpu) {
+                nid = cpu_to_node(cpu);
+                uv_cpu_hub_info(cpu)->lowmem_remap_base = lowmem_redir_base;
+                uv_cpu_hub_info(cpu)->lowmem_remap_top =
+                        lowmem_redir_base + lowmem_redir_size;
+                uv_cpu_hub_info(cpu)->m_val = m_val;
+                uv_cpu_hub_info(cpu)->n_val = m_val;
+                uv_cpu_hub_info(cpu)->pnode_mask = (1 << n_val) -1;
+                uv_cpu_hub_info(cpu)->gpa_mask = (1 << (m_val + n_val)) - 1;
+                uv_cpu_hub_info(cpu)->gnode_upper = gnode_upper;
+                uv_cpu_hub_info(cpu)->global_mmr_base = mmr_base;
+                uv_cpu_hub_info(cpu)->coherency_domain_number = 0;/* ZZZ */
+                printk(KERN_DEBUG "UV cpu %d, nid %d\n", cpu, nid);
+        }
+}
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 07eb4c4bab82..8e8441587c22 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -671,6 +671,9 @@ config ROMKERNEL
 endchoice
+if COLDFIRE
+source "kernel/Kconfig.preempt"
+endif
 source "mm/Kconfig"
 endmenu
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index 5592e0bf951f..93e69236ed6f 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -114,6 +114,16 @@ SECTIONS {
                *(__kcrctab_gpl)
                __stop___kcrctab_gpl = .;
+                /* Kernel symbol table: Normal unused symbols */
+                __start___kcrctab_unused = .;
+                *(__kcrctab_unused)
+                __stop___kcrctab_unused = .;
+                /* Kernel symbol table: GPL-only unused symbols */
+                __start___kcrctab_unused_gpl = .;
+                *(__kcrctab_unused_gpl)
+                __stop___kcrctab_unused_gpl = .;
                /* Kernel symbol table: GPL-future symbols */
                __start___kcrctab_gpl_future = .;
                *(__kcrctab_gpl_future)
diff --git a/arch/mips/au1000/common/Makefile b/arch/mips/au1000/common/Makefile
index 90e2d7a46e8e..dd0e19dacfcf 100644
--- a/arch/mips/au1000/common/Makefile
+++ b/arch/mips/au1000/common/Makefile
@@ -1,9 +1,8 @@
 #
-#  Copyright 2000 MontaVista Software Inc.
+#  Copyright 2000, 2008 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
 #
-# Makefile for the Alchemy Au1000 CPU, generic files.
+# Makefile for the Alchemy Au1xx0 CPUs, generic files.
 #
 obj-y += prom.o irq.o puts.o time.o reset.o \
diff --git a/arch/mips/au1000/common/au1xxx_irqmap.c b/arch/mips/au1000/common/au1xxx_irqmap.c
index 37a10a01de9d..c7ca1596394c 100644
--- a/arch/mips/au1000/common/au1xxx_irqmap.c
+++ b/arch/mips/au1000/common/au1xxx_irqmap.c
@@ -40,20 +40,20 @@
 struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
 #if defined(CONFIG_SOC_AU1000)
-        { AU1000_UART0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_UART0_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_UART1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_UART1_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_UART2_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_UART2_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_UART3_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_UART3_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_SSI0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_SSI0_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_SSI1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_SSI1_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+1, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+1, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+2, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+2, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+3, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+3, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+4, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+4, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+5, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+5, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+6, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+6, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+7, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+7, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
@@ -62,32 +62,32 @@ struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
        { AU1000_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1000_IRDA_TX_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_IRDA_TX_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_IRDA_RX_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_IRDA_RX_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_USB_DEV_REQ_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_USB_HOST_INT, INTC_INT_LOW_LEVEL, 0 },
        { AU1000_ACSYNC_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1000_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_MAC1_DMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_MAC1_DMA_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_AC97C_INT, INTC_INT_RISE_EDGE, 0 },
 #elif defined(CONFIG_SOC_AU1500)
-        { AU1500_UART0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1500_UART0_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_PCI_INTA, INTC_INT_LOW_LEVEL, 0 },
        { AU1000_PCI_INTB, INTC_INT_LOW_LEVEL, 0 },
-        { AU1500_UART3_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1500_UART3_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_PCI_INTC, INTC_INT_LOW_LEVEL, 0 },
        { AU1000_PCI_INTD, INTC_INT_LOW_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+1, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+1, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+2, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+2, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+3, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+3, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+4, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+4, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+5, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+5, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+6, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+6, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+7, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+7, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
@@ -100,26 +100,26 @@ struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
        { AU1000_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_USB_HOST_INT, INTC_INT_LOW_LEVEL, 0 },
        { AU1000_ACSYNC_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1500_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1500_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1500_MAC1_DMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1500_MAC1_DMA_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_AC97C_INT, INTC_INT_RISE_EDGE, 0 },
 #elif defined(CONFIG_SOC_AU1100)
-        { AU1100_UART0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1100_UART0_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1100_UART1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1100_UART1_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1100_SD_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1100_SD_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1100_UART3_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1100_UART3_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_SSI0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_SSI0_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_SSI1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_SSI1_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+1, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+1, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+2, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+2, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+3, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+3, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+4, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+4, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+5, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+5, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+6, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+6, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+7, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+7, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
@@ -128,33 +128,33 @@ struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
        { AU1000_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1000_IRDA_TX_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_IRDA_TX_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_IRDA_RX_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_IRDA_RX_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_USB_DEV_REQ_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_USB_HOST_INT, INTC_INT_LOW_LEVEL, 0 },
        { AU1000_ACSYNC_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1100_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1100_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0 },
-        /*{ AU1000_GPIO215_208_INT, INTC_INT_HIGH_LEVEL, 0},*/
+        /* { AU1000_GPIO215_208_INT, INTC_INT_HIGH_LEVEL, 0 }, */
-        { AU1100_LCD_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1100_LCD_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_AC97C_INT, INTC_INT_RISE_EDGE, 0 },
 #elif defined(CONFIG_SOC_AU1550)
-        { AU1550_UART0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_UART0_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1550_PCI_INTA, INTC_INT_LOW_LEVEL, 0 },
        { AU1550_PCI_INTB, INTC_INT_LOW_LEVEL, 0 },
-        { AU1550_DDMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_DDMA_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1550_CRYPTO_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_CRYPTO_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1550_PCI_INTC, INTC_INT_LOW_LEVEL, 0 },
        { AU1550_PCI_INTD, INTC_INT_LOW_LEVEL, 0 },
        { AU1550_PCI_RST_INT, INTC_INT_LOW_LEVEL, 0 },
-        { AU1550_UART1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_UART1_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1550_UART3_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_UART3_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1550_PSC0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_PSC0_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1550_PSC1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_PSC1_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1550_PSC2_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_PSC2_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1550_PSC3_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_PSC3_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
@@ -163,26 +163,26 @@ struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
        { AU1000_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1550_NAND_INT, INTC_INT_RISE_EDGE, 0},
+        { AU1550_NAND_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1550_USB_DEV_REQ_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1550_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1550_USB_HOST_INT, INTC_INT_LOW_LEVEL, 0 },
-        { AU1550_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1550_MAC1_DMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_MAC1_DMA_INT, INTC_INT_HIGH_LEVEL, 0 },
 #elif defined(CONFIG_SOC_AU1200)
-        { AU1200_UART0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_UART0_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1200_SWT_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1200_SD_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_SD_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_DDMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_DDMA_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1200_MAE_BE_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_UART1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_UART1_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1200_MAE_FE_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_PSC0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_PSC0_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_PSC1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_PSC1_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_AES_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_AES_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_CAMERA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_CAMERA_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
@@ -191,10 +191,10 @@ struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
        { AU1000_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1200_NAND_INT, INTC_INT_RISE_EDGE, 0},
+        { AU1200_NAND_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1200_USB_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_LCD_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_LCD_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_MAE_BOTH_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_MAE_BOTH_INT, INTC_INT_HIGH_LEVEL, 0 },
 #else
 #error "Error: Unknown Alchemy SOC"
@@ -203,4 +203,3 @@ struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
 };
 int __initdata au1xxx_ic0_nr_irqs = ARRAY_SIZE(au1xxx_ic0_map);
diff --git a/arch/mips/au1000/common/clocks.c b/arch/mips/au1000/common/clocks.c
index 3ce6cace0eb0..46f8ee0e2657 100644
--- a/arch/mips/au1000/common/clocks.c
+++ b/arch/mips/au1000/common/clocks.c
@@ -1,10 +1,9 @@
 /*
 * BRIEF MODULE DESCRIPTION
- *      Simple Au1000 clocks routines.
+ *      Simple Au1xx0 clocks routines.
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -30,8 +29,8 @@
 #include <linux/module.h>
 #include <asm/mach-au1x00/au1000.h>
-static unsigned int au1x00_clock; // Hz
+static unsigned int au1x00_clock; /*  Hz */
-static unsigned int lcd_clock;    // KHz
+static unsigned int lcd_clock;    /* KHz */
 static unsigned long uart_baud_base;
 /*
@@ -47,8 +46,6 @@ unsigned int get_au1x00_speed(void)
        return au1x00_clock;
 }
 /*
 * The UART baud base is not known at compile time ... if
 * we want to be able to use the same code on different
@@ -73,24 +70,23 @@ void set_au1x00_uart_baud_base(unsigned long new_baud_base)
 void set_au1x00_lcd_clock(void)
 {
        unsigned int static_cfg0;
-        unsigned int sys_busclk =
+        unsigned int sys_busclk = (get_au1x00_speed() / 1000) /
-                (get_au1x00_speed()/1000) /
+                                  ((int)(au_readl(SYS_POWERCTRL) & 0x03) + 2);
-                ((int)(au_readl(SYS_POWERCTRL)&0x03) + 2);
        static_cfg0 = au_readl(MEM_STCFG0);
-        if (static_cfg0 & (1<<11))
+        if (static_cfg0 & (1 << 11))
                lcd_clock = sys_busclk / 5; /* note: BCLK switching fails with D5 */
        else
                lcd_clock = sys_busclk / 4;
        if (lcd_clock > 50000) /* Epson MAX */
-                printk("warning: LCD clock too high (%d KHz)\n", lcd_clock);
+                printk(KERN_WARNING "warning: LCD clock too high (%u KHz)\n",
+                                    lcd_clock);
 }
 unsigned int get_au1x00_lcd_clock(void)
 {
        return lcd_clock;
 }
 EXPORT_SYMBOL(get_au1x00_lcd_clock);
diff --git a/arch/mips/au1000/common/cputable.c b/arch/mips/au1000/common/cputable.c
index 8c93a05d7382..ba6430bc2d03 100644
--- a/arch/mips/au1000/common/cputable.c
+++ b/arch/mips/au1000/common/cputable.c
@@ -14,7 +14,7 @@
 #include <asm/mach-au1x00/au1000.h>
-struct cpu_spec* cur_cpu_spec[NR_CPUS];
+struct cpu_spec *cur_cpu_spec[NR_CPUS];
 /* With some thought, we can probably use the mask to reduce the
 * size of the table.
@@ -39,8 +39,7 @@ struct cpu_spec cpu_specs[] = {
        { 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0, 0 }
 };
-void
+void set_cpuspec(void)
-set_cpuspec(void)
 {
        struct  cpu_spec *sp;
        u32     prid;
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c
index 53377dfc0640..42d555236de1 100644
--- a/arch/mips/au1000/common/dbdma.c
+++ b/arch/mips/au1000/common/dbdma.c
@@ -53,12 +53,11 @@
 */
 static DEFINE_SPINLOCK(au1xxx_dbdma_spin_lock);
-/* I couldn't find a macro that did this......
+/* I couldn't find a macro that did this... */
-*/
 #define ALIGN_ADDR(x, a)        ((((u32)(x)) + (a-1)) & ~(a-1))
 static dbdma_global_t *dbdma_gptr = (dbdma_global_t *)DDMA_GLOBAL_BASE;
-static int dbdma_initialized=0;
+static int dbdma_initialized;
 static void au1xxx_dbdma_init(void);
 static dbdev_tab_t dbdev_tab[] = {
@@ -149,7 +148,7 @@ static dbdev_tab_t dbdev_tab[] = {
        { DSCR_CMD0_NAND_FLASH, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 },
-#endif // CONFIG_SOC_AU1200
+#endif /* CONFIG_SOC_AU1200 */
        { DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
        { DSCR_CMD0_ALWAYS, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
@@ -177,8 +176,7 @@ static dbdev_tab_t dbdev_tab[] = {
 static chan_tab_t *chan_tab_ptr[NUM_DBDMA_CHANS];
-static dbdev_tab_t *
+static dbdev_tab_t *find_dbdev_id(u32 id)
-find_dbdev_id(u32 id)
 {
        int i;
        dbdev_tab_t *p;
@@ -190,29 +188,27 @@ find_dbdev_id(u32 id)
        return NULL;
 }
-void * au1xxx_ddma_get_nextptr_virt(au1x_ddma_desc_t *dp)
+void *au1xxx_ddma_get_nextptr_virt(au1x_ddma_desc_t *dp)
 {
-        return phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
+        return phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
 }
 EXPORT_SYMBOL(au1xxx_ddma_get_nextptr_virt);
-u32
+u32 au1xxx_ddma_add_device(dbdev_tab_t *dev)
-au1xxx_ddma_add_device(dbdev_tab_t *dev)
 {
        u32 ret = 0;
-        dbdev_tab_t *p=NULL;
+        dbdev_tab_t *p;
-        static u16 new_id=0x1000;
+        static u16 new_id = 0x1000;
        p = find_dbdev_id(~0);
-        if ( NULL != p )
+        if (NULL != p) {
-        {
                memcpy(p, dev, sizeof(dbdev_tab_t));
                p->dev_id = DSCR_DEV2CUSTOM_ID(new_id, dev->dev_id);
                ret = p->dev_id;
                new_id++;
 #if 0
-                printk("add_device: id:%x flags:%x padd:%x\n",
+                printk(KERN_DEBUG "add_device: id:%x flags:%x padd:%x\n",
-                                p->dev_id, p->dev_flags, p->dev_physaddr );
+                                  p->dev_id, p->dev_flags, p->dev_physaddr);
 #endif
        }
@@ -220,10 +216,8 @@ au1xxx_ddma_add_device(dbdev_tab_t *dev)
 }
 EXPORT_SYMBOL(au1xxx_ddma_add_device);
-/* Allocate a channel and return a non-zero descriptor if successful.
+/* Allocate a channel and return a non-zero descriptor if successful. */
-*/
+u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
-u32
-au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
       void (*callback)(int, void *), void *callparam)
 {
        unsigned long   flags;
@@ -234,7 +228,8 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
        chan_tab_t      *ctp;
        au1x_dma_chan_t *cp;
-        /* We do the intialization on the first channel allocation.
+        /*
+         * We do the intialization on the first channel allocation.
         * We have to wait because of the interrupt handler initialization
         * which can't be done successfully during board set up.
         */
@@ -242,16 +237,17 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
                au1xxx_dbdma_init();
        dbdma_initialized = 1;
-        if ((stp = find_dbdev_id(srcid)) == NULL)
+        stp = find_dbdev_id(srcid);
+        if (stp == NULL)
                return 0;
-        if ((dtp = find_dbdev_id(destid)) == NULL)
+        dtp = find_dbdev_id(destid);
+        if (dtp == NULL)
                return 0;
        used = 0;
        rv = 0;
-        /* Check to see if we can get both channels.
+        /* Check to see if we can get both channels. */
-        */
        spin_lock_irqsave(&au1xxx_dbdma_spin_lock, flags);
        if (!(stp->dev_flags & DEV_FLAGS_INUSE) ||
             (stp->dev_flags & DEV_FLAGS_ANYUSE)) {
@@ -261,35 +257,30 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
                     (dtp->dev_flags & DEV_FLAGS_ANYUSE)) {
                        /* Got destination */
                        dtp->dev_flags |= DEV_FLAGS_INUSE;
-                }
+                } else {
-                else {
+                        /* Can't get dest.  Release src. */
-                        /* Can't get dest.  Release src.
-                        */
                        stp->dev_flags &= ~DEV_FLAGS_INUSE;
                        used++;
                }
-        }
+        } else
-        else {
                used++;
-        }
        spin_unlock_irqrestore(&au1xxx_dbdma_spin_lock, flags);
        if (!used) {
-                /* Let's see if we can allocate a channel for it.
+                /* Let's see if we can allocate a channel for it. */
-                */
                ctp = NULL;
                chan = 0;
                spin_lock_irqsave(&au1xxx_dbdma_spin_lock, flags);
-                for (i=0; i<NUM_DBDMA_CHANS; i++) {
+                for (i = 0; i < NUM_DBDMA_CHANS; i++)
                        if (chan_tab_ptr[i] == NULL) {
-                                /* If kmalloc fails, it is caught below same
+                                /*
+                                 * If kmalloc fails, it is caught below same
                                 * as a channel not available.
                                 */
                                ctp = kmalloc(sizeof(chan_tab_t), GFP_ATOMIC);
                                chan_tab_ptr[i] = ctp;
                                break;
                        }
-                }
                spin_unlock_irqrestore(&au1xxx_dbdma_spin_lock, flags);
                if (ctp != NULL) {
@@ -304,8 +295,7 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
                        ctp->chan_callback = callback;
                        ctp->chan_callparam = callparam;
-                        /* Initialize channel configuration.
+                        /* Initialize channel configuration. */
-                        */
                        i = 0;
                        if (stp->dev_intlevel)
                                i |= DDMA_CFG_SED;
@@ -326,8 +316,7 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
                         * operations.
                         */
                        rv = (u32)(&chan_tab_ptr[chan]);
-                }
+                } else {
-                else {
                        /* Release devices */
                        stp->dev_flags &= ~DEV_FLAGS_INUSE;
                        dtp->dev_flags &= ~DEV_FLAGS_INUSE;
@@ -337,11 +326,11 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
 }
 EXPORT_SYMBOL(au1xxx_dbdma_chan_alloc);
-/* Set the device width if source or destination is a FIFO.
+/*
+ * Set the device width if source or destination is a FIFO.
 * Should be 8, 16, or 32 bits.
 */
-u32
+u32 au1xxx_dbdma_set_devwidth(u32 chanid, int bits)
-au1xxx_dbdma_set_devwidth(u32 chanid, int bits)
 {
        u32             rv;
        chan_tab_t      *ctp;
@@ -365,10 +354,8 @@ au1xxx_dbdma_set_devwidth(u32 chanid, int bits)
 }
 EXPORT_SYMBOL(au1xxx_dbdma_set_devwidth);
-/* Allocate a descriptor ring, initializing as much as possible.
+/* Allocate a descriptor ring, initializing as much as possible. */
-*/
+u32 au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
-u32
-au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
 {
        int                     i;
        u32                     desc_base, srcid, destid;
@@ -378,43 +365,45 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
        dbdev_tab_t             *stp, *dtp;
        au1x_ddma_desc_t        *dp;
-        /* I guess we could check this to be within the
+        /*
+         * I guess we could check this to be within the
         * range of the table......
         */
        ctp = *((chan_tab_t **)chanid);
        stp = ctp->chan_src;
        dtp = ctp->chan_dest;
-        /* The descriptors must be 32-byte aligned.  There is a
+        /*
+         * The descriptors must be 32-byte aligned.  There is a
         * possibility the allocation will give us such an address,
         * and if we try that first we are likely to not waste larger
         * slabs of memory.
         */
        desc_base = (u32)kmalloc(entries * sizeof(au1x_ddma_desc_t),
-                        GFP_KERNEL|GFP_DMA);
+                                 GFP_KERNEL|GFP_DMA);
        if (desc_base == 0)
                return 0;
        if (desc_base & 0x1f) {
-                /* Lost....do it again, allocate extra, and round
+                /*
+                 * Lost....do it again, allocate extra, and round
                 * the address base.
                 */
                kfree((const void *)desc_base);
                i = entries * sizeof(au1x_ddma_desc_t);
                i += (sizeof(au1x_ddma_desc_t) - 1);
-                if ((desc_base = (u32)kmalloc(i, GFP_KERNEL|GFP_DMA)) == 0)
+                desc_base = (u32)kmalloc(i, GFP_KERNEL|GFP_DMA);
+                if (desc_base == 0)
                        return 0;
                desc_base = ALIGN_ADDR(desc_base, sizeof(au1x_ddma_desc_t));
        }
        dp = (au1x_ddma_desc_t *)desc_base;
-        /* Keep track of the base descriptor.
+        /* Keep track of the base descriptor. */
-        */
        ctp->chan_desc_base = dp;
-        /* Initialize the rings with as much information as we know.
+        /* Initialize the rings with as much information as we know. */
-         */
        srcid = stp->dev_id;
        destid = dtp->dev_id;
@@ -426,11 +415,12 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
        cmd0 |= DSCR_CMD0_IE | DSCR_CMD0_CV;
        cmd0 |= DSCR_CMD0_ST(DSCR_CMD0_ST_NOCHANGE);
-        /* is it mem to mem transfer? */
+        /* Is it mem to mem transfer? */
-        if(((DSCR_CUSTOM2DEV_ID(srcid) == DSCR_CMD0_THROTTLE) || (DSCR_CUSTOM2DEV_ID(srcid) == DSCR_CMD0_ALWAYS)) &&
+        if (((DSCR_CUSTOM2DEV_ID(srcid) == DSCR_CMD0_THROTTLE) ||
-           ((DSCR_CUSTOM2DEV_ID(destid) == DSCR_CMD0_THROTTLE) || (DSCR_CUSTOM2DEV_ID(destid) == DSCR_CMD0_ALWAYS))) {
+             (DSCR_CUSTOM2DEV_ID(srcid) == DSCR_CMD0_ALWAYS)) &&
-               cmd0 |= DSCR_CMD0_MEM;
+            ((DSCR_CUSTOM2DEV_ID(destid) == DSCR_CMD0_THROTTLE) ||
-        }
+             (DSCR_CUSTOM2DEV_ID(destid) == DSCR_CMD0_ALWAYS)))
+                cmd0 |= DSCR_CMD0_MEM;
        switch (stp->dev_devwidth) {
        case 8:
@@ -458,15 +448,17 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
                break;
        }
-        /* If the device is marked as an in/out FIFO, ensure it is
+        /*
+         * If the device is marked as an in/out FIFO, ensure it is
         * set non-coherent.
         */
        if (stp->dev_flags & DEV_FLAGS_IN)
-                cmd0 |= DSCR_CMD0_SN;           /* Source in fifo */
+                cmd0 |= DSCR_CMD0_SN;           /* Source in FIFO */
        if (dtp->dev_flags & DEV_FLAGS_OUT)
-                cmd0 |= DSCR_CMD0_DN;           /* Destination out fifo */
+                cmd0 |= DSCR_CMD0_DN;           /* Destination out FIFO */
-        /* Set up source1.  For now, assume no stride and increment.
+        /*
+         * Set up source1.  For now, assume no stride and increment.
         * A channel attribute update can change this later.
         */
        switch (stp->dev_tsize) {
@@ -485,19 +477,19 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
                break;
        }
-        /* If source input is fifo, set static address.
+        /* If source input is FIFO, set static address. */
-        */
        if (stp->dev_flags & DEV_FLAGS_IN) {
-                if ( stp->dev_flags & DEV_FLAGS_BURSTABLE )
+                if (stp->dev_flags & DEV_FLAGS_BURSTABLE)
                        src1 |= DSCR_SRC1_SAM(DSCR_xAM_BURST);
                else
-                src1 |= DSCR_SRC1_SAM(DSCR_xAM_STATIC);
+                        src1 |= DSCR_SRC1_SAM(DSCR_xAM_STATIC);
        }
        if (stp->dev_physaddr)
                src0 = stp->dev_physaddr;
-        /* Set up dest1.  For now, assume no stride and increment.
+        /*
+         * Set up dest1.  For now, assume no stride and increment.
         * A channel attribute update can change this later.
         */
        switch (dtp->dev_tsize) {
@@ -516,22 +508,24 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
                break;
        }
-        /* If destination output is fifo, set static address.
+        /* If destination output is FIFO, set static address. */
-        */
        if (dtp->dev_flags & DEV_FLAGS_OUT) {
-                if ( dtp->dev_flags & DEV_FLAGS_BURSTABLE )
+                if (dtp->dev_flags & DEV_FLAGS_BURSTABLE)
-                        dest1 |= DSCR_DEST1_DAM(DSCR_xAM_BURST);
+                        dest1 |= DSCR_DEST1_DAM(DSCR_xAM_BURST);
-                                else
+                else
-                dest1 |= DSCR_DEST1_DAM(DSCR_xAM_STATIC);
+                        dest1 |= DSCR_DEST1_DAM(DSCR_xAM_STATIC);
        }
        if (dtp->dev_physaddr)
                dest0 = dtp->dev_physaddr;
 #if 0
-                printk("did:%x sid:%x cmd0:%x cmd1:%x source0:%x source1:%x dest0:%x dest1:%x\n",
+                printk(KERN_DEBUG "did:%x sid:%x cmd0:%x cmd1:%x source0:%x "
-                        dtp->dev_id, stp->dev_id, cmd0, cmd1, src0, src1, dest0, dest1 );
+                                  "source1:%x dest0:%x dest1:%x\n",
+                                  dtp->dev_id, stp->dev_id, cmd0, cmd1, src0,
+                                  src1, dest0, dest1);
 #endif
-        for (i=0; i<entries; i++) {
+        for (i = 0; i < entries; i++) {
                dp->dscr_cmd0 = cmd0;
                dp->dscr_cmd1 = cmd1;
                dp->dscr_source0 = src0;
@@ -545,49 +539,49 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
                dp++;
        }
-        /* Make last descrptor point to the first.
+        /* Make last descrptor point to the first. */
-        */
        dp--;
        dp->dscr_nxtptr = DSCR_NXTPTR(virt_to_phys(ctp->chan_desc_base));
        ctp->get_ptr = ctp->put_ptr = ctp->cur_ptr = ctp->chan_desc_base;
-        return (u32)(ctp->chan_desc_base);
+        return (u32)ctp->chan_desc_base;
 }
 EXPORT_SYMBOL(au1xxx_dbdma_ring_alloc);
-/* Put a source buffer into the DMA ring.
+/*
+ * Put a source buffer into the DMA ring.
 * This updates the source pointer and byte count.  Normally used
 * for memory to fifo transfers.
 */
-u32
+u32 _au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes, u32 flags)
-_au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes, u32 flags)
 {
        chan_tab_t              *ctp;
        au1x_ddma_desc_t        *dp;
-        /* I guess we could check this to be within the
+        /*
+         * I guess we could check this to be within the
         * range of the table......
         */
-        ctp = *((chan_tab_t **)chanid);
+        ctp = *(chan_tab_t **)chanid;
-        /* We should have multiple callers for a particular channel,
+        /*
+         * We should have multiple callers for a particular channel,
         * an interrupt doesn't affect this pointer nor the descriptor,
         * so no locking should be needed.
         */
        dp = ctp->put_ptr;
-        /* If the descriptor is valid, we are way ahead of the DMA
+        /*
+         * If the descriptor is valid, we are way ahead of the DMA
         * engine, so just return an error condition.
         */
-        if (dp->dscr_cmd0 & DSCR_CMD0_V) {
+        if (dp->dscr_cmd0 & DSCR_CMD0_V)
                return 0;
-        }
-        /* Load up buffer address and byte count.
+        /* Load up buffer address and byte count. */
-        */
        dp->dscr_source0 = virt_to_phys(buf);
        dp->dscr_cmd1 = nbytes;
-        /* Check flags  */
+        /* Check flags */
        if (flags & DDMA_FLAGS_IE)
                dp->dscr_cmd0 |= DSCR_CMD0_IE;
        if (flags & DDMA_FLAGS_NOIE)
@@ -595,23 +589,21 @@ _au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes, u32 flags)
        /*
         * There is an errata on the Au1200/Au1550 parts that could result
-         * in "stale" data being DMA'd. It has to do with the snoop logic on
+         * in "stale" data being DMA'ed. It has to do with the snoop logic on
-         * the dache eviction buffer.  NONCOHERENT_IO is on by default for
+         * the cache eviction buffer.  DMA_NONCOHERENT is on by default for
-         * these parts. If it is fixedin the future, these dma_cache_inv will
+         * these parts. If it is fixed in the future, these dma_cache_inv will
         * just be nothing more than empty macros. See io.h.
-         * */
+         */
        dma_cache_wback_inv((unsigned long)buf, nbytes);
-        dp->dscr_cmd0 |= DSCR_CMD0_V;        /* Let it rip */
+        dp->dscr_cmd0 |= DSCR_CMD0_V;   /* Let it rip */
        au_sync();
        dma_cache_wback_inv((unsigned long)dp, sizeof(dp));
-        ctp->chan_ptr->ddma_dbell = 0;
+        ctp->chan_ptr->ddma_dbell = 0;
-        /* Get next descriptor pointer.
+        /* Get next descriptor pointer. */
-        */
        ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
-        /* return something not zero.
+        /* Return something non-zero. */
-        */
        return nbytes;
 }
 EXPORT_SYMBOL(_au1xxx_dbdma_put_source);
@@ -654,81 +646,77 @@ _au1xxx_dbdma_put_dest(u32 chanid, void *buf, int nbytes, u32 flags)
        dp->dscr_dest0 = virt_to_phys(buf);
        dp->dscr_cmd1 = nbytes;
 #if 0
-        printk("cmd0:%x cmd1:%x source0:%x source1:%x dest0:%x dest1:%x\n",
+        printk(KERN_DEBUG "cmd0:%x cmd1:%x source0:%x source1:%x dest0:%x dest1:%x\n",
-                        dp->dscr_cmd0, dp->dscr_cmd1, dp->dscr_source0,
+                          dp->dscr_cmd0, dp->dscr_cmd1, dp->dscr_source0,
-                        dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1 );
+                          dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1);
 #endif
        /*
         * There is an errata on the Au1200/Au1550 parts that could result in
-         * "stale" data being DMA'd. It has to do with the snoop logic on the
+         * "stale" data being DMA'ed. It has to do with the snoop logic on the
-         * dache eviction buffer. NONCOHERENT_IO is on by default for these
+         * cache eviction buffer.  DMA_NONCOHERENT is on by default for these
-         * parts. If it is fixedin the future, these dma_cache_inv will just
+         * parts. If it is fixed in the future, these dma_cache_inv will just
         * be nothing more than empty macros. See io.h.
-         * */
+         */
        dma_cache_inv((unsigned long)buf, nbytes);
        dp->dscr_cmd0 |= DSCR_CMD0_V;   /* Let it rip */
        au_sync();
        dma_cache_wback_inv((unsigned long)dp, sizeof(dp));
-        ctp->chan_ptr->ddma_dbell = 0;
+        ctp->chan_ptr->ddma_dbell = 0;
-        /* Get next descriptor pointer.
+        /* Get next descriptor pointer. */
-        */
        ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
-        /* return something not zero.
+        /* Return something non-zero. */
-        */
        return nbytes;
 }
 EXPORT_SYMBOL(_au1xxx_dbdma_put_dest);
-/* Get a destination buffer into the DMA ring.
+/*
+ * Get a destination buffer into the DMA ring.
 * Normally used to get a full buffer from the ring during fifo
 * to memory transfers.  This does not set the valid bit, you will
 * have to put another destination buffer to keep the DMA going.
 */
-u32
+u32 au1xxx_dbdma_get_dest(u32 chanid, void **buf, int *nbytes)
-au1xxx_dbdma_get_dest(u32 chanid, void **buf, int *nbytes)
 {
        chan_tab_t              *ctp;
        au1x_ddma_desc_t        *dp;
        u32                     rv;
-        /* I guess we could check this to be within the
+        /*
+         * I guess we could check this to be within the
         * range of the table......
         */
        ctp = *((chan_tab_t **)chanid);
-        /* We should have multiple callers for a particular channel,
+        /*
+         * We should have multiple callers for a particular channel,
         * an interrupt doesn't affect this pointer nor the descriptor,
         * so no locking should be needed.
         */
        dp = ctp->get_ptr;
-        /* If the descriptor is valid, we are way ahead of the DMA
+        /*
+         * If the descriptor is valid, we are way ahead of the DMA
         * engine, so just return an error condition.
         */
        if (dp->dscr_cmd0 & DSCR_CMD0_V)
                return 0;
-        /* Return buffer address and byte count.
+        /* Return buffer address and byte count. */
-        */
        *buf = (void *)(phys_to_virt(dp->dscr_dest0));
        *nbytes = dp->dscr_cmd1;
        rv = dp->dscr_stat;
-        /* Get next descriptor pointer.
+        /* Get next descriptor pointer. */
-        */
        ctp->get_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
-        /* return something not zero.
+        /* Return something non-zero. */
-        */
        return rv;
 }
 EXPORT_SYMBOL_GPL(au1xxx_dbdma_get_dest);
-void
+void au1xxx_dbdma_stop(u32 chanid)
-au1xxx_dbdma_stop(u32 chanid)
 {
        chan_tab_t      *ctp;
        au1x_dma_chan_t *cp;
@@ -743,7 +731,7 @@ au1xxx_dbdma_stop(u32 chanid)
                udelay(1);
                halt_timeout++;
                if (halt_timeout > 100) {
-                        printk("warning: DMA channel won't halt\n");
+                        printk(KERN_WARNING "warning: DMA channel won't halt\n");
                        break;
                }
        }
@@ -753,12 +741,12 @@ au1xxx_dbdma_stop(u32 chanid)
 }
 EXPORT_SYMBOL(au1xxx_dbdma_stop);
-/* Start using the current descriptor pointer.  If the dbdma encounters
+/*
- * a not valid descriptor, it will stop.  In this case, we can just
+ * Start using the current descriptor pointer.  If the DBDMA encounters
+ * a non-valid descriptor, it will stop.  In this case, we can just
 * continue by adding a buffer to the list and starting again.
 */
-void
+void au1xxx_dbdma_start(u32 chanid)
-au1xxx_dbdma_start(u32 chanid)
 {
        chan_tab_t      *ctp;
        au1x_dma_chan_t *cp;
@@ -773,8 +761,7 @@ au1xxx_dbdma_start(u32 chanid)
 }
 EXPORT_SYMBOL(au1xxx_dbdma_start);
-void
+void au1xxx_dbdma_reset(u32 chanid)
-au1xxx_dbdma_reset(u32 chanid)
 {
        chan_tab_t              *ctp;
        au1x_ddma_desc_t        *dp;
@@ -784,14 +771,14 @@ au1xxx_dbdma_reset(u32 chanid)
        ctp = *((chan_tab_t **)chanid);
        ctp->get_ptr = ctp->put_ptr = ctp->cur_ptr = ctp->chan_desc_base;
-        /* Run through the descriptors and reset the valid indicator.
+        /* Run through the descriptors and reset the valid indicator. */
-        */
        dp = ctp->chan_desc_base;
        do {
                dp->dscr_cmd0 &= ~DSCR_CMD0_V;
-                /* reset our SW status -- this is used to determine
+                /*
-                 * if a descriptor is in use by upper level SW. Since
+                 * Reset our software status -- this is used to determine
+                 * if a descriptor is in use by upper level software. Since
                 * posting can reset 'V' bit.
                 */
                dp->sw_status = 0;
@@ -800,8 +787,7 @@ au1xxx_dbdma_reset(u32 chanid)
 }
 EXPORT_SYMBOL(au1xxx_dbdma_reset);
-u32
+u32 au1xxx_get_dma_residue(u32 chanid)
-au1xxx_get_dma_residue(u32 chanid)
 {
        chan_tab_t      *ctp;
        au1x_dma_chan_t *cp;
@@ -810,18 +796,15 @@ au1xxx_get_dma_residue(u32 chanid)
        ctp = *((chan_tab_t **)chanid);
        cp = ctp->chan_ptr;
-        /* This is only valid if the channel is stopped.
+        /* This is only valid if the channel is stopped. */
-        */
        rv = cp->ddma_bytecnt;
        au_sync();
        return rv;
 }
 EXPORT_SYMBOL_GPL(au1xxx_get_dma_residue);
-void
+void au1xxx_dbdma_chan_free(u32 chanid)
-au1xxx_dbdma_chan_free(u32 chanid)
 {
        chan_tab_t      *ctp;
        dbdev_tab_t     *stp, *dtp;
@@ -842,8 +825,7 @@ au1xxx_dbdma_chan_free(u32 chanid)
 }
 EXPORT_SYMBOL(au1xxx_dbdma_chan_free);
-static irqreturn_t
+static irqreturn_t dbdma_interrupt(int irq, void *dev_id)
-dbdma_interrupt(int irq, void *dev_id)
 {
        u32 intstat;
        u32 chan_index;
@@ -859,13 +841,12 @@ dbdma_interrupt(int irq, void *dev_id)
        cp = ctp->chan_ptr;
        dp = ctp->cur_ptr;
-        /* Reset interrupt.
+        /* Reset interrupt. */
-        */
        cp->ddma_irq = 0;
        au_sync();
        if (ctp->chan_callback)
-                (ctp->chan_callback)(irq, ctp->chan_callparam);
+                ctp->chan_callback(irq, ctp->chan_callparam);
        ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
        return IRQ_RETVAL(1);
@@ -890,47 +871,47 @@ static void au1xxx_dbdma_init(void)
        if (request_irq(irq_nr, dbdma_interrupt, IRQF_DISABLED,
                        "Au1xxx dbdma", (void *)dbdma_gptr))
-                printk("Can't get 1550 dbdma irq");
+                printk(KERN_ERR "Can't get 1550 dbdma irq");
 }
-void
+void au1xxx_dbdma_dump(u32 chanid)
-au1xxx_dbdma_dump(u32 chanid)
 {
-        chan_tab_t              *ctp;
+        chan_tab_t       *ctp;
-        au1x_ddma_desc_t        *dp;
+        au1x_ddma_desc_t *dp;
-        dbdev_tab_t             *stp, *dtp;
+        dbdev_tab_t      *stp, *dtp;
-        au1x_dma_chan_t *cp;
+        au1x_dma_chan_t  *cp;
-                u32                     i = 0;
+        u32 i            = 0;
        ctp = *((chan_tab_t **)chanid);
        stp = ctp->chan_src;
        dtp = ctp->chan_dest;
        cp = ctp->chan_ptr;
-        printk("Chan %x, stp %x (dev %d)  dtp %x (dev %d) \n",
+        printk(KERN_DEBUG "Chan %x, stp %x (dev %d)  dtp %x (dev %d) \n",
-                (u32)ctp, (u32)stp, stp - dbdev_tab, (u32)dtp, dtp - dbdev_tab);
+                          (u32)ctp, (u32)stp, stp - dbdev_tab, (u32)dtp,
-        printk("desc base %x, get %x, put %x, cur %x\n",
+                          dtp - dbdev_tab);
-                (u32)(ctp->chan_desc_base), (u32)(ctp->get_ptr),
+        printk(KERN_DEBUG "desc base %x, get %x, put %x, cur %x\n",
-                (u32)(ctp->put_ptr), (u32)(ctp->cur_ptr));
+                          (u32)(ctp->chan_desc_base), (u32)(ctp->get_ptr),
+                          (u32)(ctp->put_ptr), (u32)(ctp->cur_ptr));
-        printk("dbdma chan %x\n", (u32)cp);
-        printk("cfg %08x, desptr %08x, statptr %08x\n",
+        printk(KERN_DEBUG "dbdma chan %x\n", (u32)cp);
-                cp->ddma_cfg, cp->ddma_desptr, cp->ddma_statptr);
+        printk(KERN_DEBUG "cfg %08x, desptr %08x, statptr %08x\n",
-        printk("dbell %08x, irq %08x, stat %08x, bytecnt %08x\n",
+                          cp->ddma_cfg, cp->ddma_desptr, cp->ddma_statptr);
-                cp->ddma_dbell, cp->ddma_irq, cp->ddma_stat, cp->ddma_bytecnt);
+        printk(KERN_DEBUG "dbell %08x, irq %08x, stat %08x, bytecnt %08x\n",
+                          cp->ddma_dbell, cp->ddma_irq, cp->ddma_stat,
+                          cp->ddma_bytecnt);
-        /* Run through the descriptors
-        */
+        /* Run through the descriptors */
        dp = ctp->chan_desc_base;
        do {
-                printk("Dp[%d]= %08x, cmd0 %08x, cmd1 %08x\n",
+                printk(KERN_DEBUG "Dp[%d]= %08x, cmd0 %08x, cmd1 %08x\n",
-                        i++, (u32)dp, dp->dscr_cmd0, dp->dscr_cmd1);
+                                  i++, (u32)dp, dp->dscr_cmd0, dp->dscr_cmd1);
-                printk("src0 %08x, src1 %08x, dest0 %08x, dest1 %08x\n",
+                printk(KERN_DEBUG "src0 %08x, src1 %08x, dest0 %08x, dest1 %08x\n",
-                        dp->dscr_source0, dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1);
+                                  dp->dscr_source0, dp->dscr_source1,
-                printk("stat %08x, nxtptr %08x\n",
+                                  dp->dscr_dest0, dp->dscr_dest1);
-                        dp->dscr_stat, dp->dscr_nxtptr);
+                printk(KERN_DEBUG "stat %08x, nxtptr %08x\n",
+                                  dp->dscr_stat, dp->dscr_nxtptr);
                dp = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
        } while (dp != ctp->chan_desc_base);
 }
@@ -938,32 +919,33 @@ au1xxx_dbdma_dump(u32 chanid)
 /* Put a descriptor into the DMA ring.
 * This updates the source/destination pointers and byte count.
 */
-u32
+u32 au1xxx_dbdma_put_dscr(u32 chanid, au1x_ddma_desc_t *dscr)
-au1xxx_dbdma_put_dscr(u32 chanid, au1x_ddma_desc_t *dscr )
 {
        chan_tab_t *ctp;
        au1x_ddma_desc_t *dp;
-        u32 nbytes=0;
+        u32 nbytes = 0;
-        /* I guess we could check this to be within the
+        /*
-        * range of the table......
+         * I guess we could check this to be within the
-        */
+         * range of the table......
+         */
        ctp = *((chan_tab_t **)chanid);
-        /* We should have multiple callers for a particular channel,
+        /*
-        * an interrupt doesn't affect this pointer nor the descriptor,
+         * We should have multiple callers for a particular channel,
-        * so no locking should be needed.
+         * an interrupt doesn't affect this pointer nor the descriptor,
-        */
+         * so no locking should be needed.
+         */
        dp = ctp->put_ptr;
-        /* If the descriptor is valid, we are way ahead of the DMA
+        /*
-        * engine, so just return an error condition.
+         * If the descriptor is valid, we are way ahead of the DMA
-        */
+         * engine, so just return an error condition.
+         */
        if (dp->dscr_cmd0 & DSCR_CMD0_V)
                return 0;
-        /* Load up buffer addresses and byte count.
+        /* Load up buffer addresses and byte count. */
-        */
        dp->dscr_dest0 = dscr->dscr_dest0;
        dp->dscr_source0 = dscr->dscr_source0;
        dp->dscr_dest1 = dscr->dscr_dest1;
@@ -975,14 +957,11 @@ au1xxx_dbdma_put_dscr(u32 chanid, au1x_ddma_desc_t *dscr )
        dp->dscr_cmd0 |= dscr->dscr_cmd0 | DSCR_CMD0_V;
        ctp->chan_ptr->ddma_dbell = 0;
-        /* Get next descriptor pointer.
+        /* Get next descriptor pointer. */
-        */
        ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
-        /* return something not zero.
+        /* Return something non-zero. */
-        */
        return nbytes;
 }
 #endif /* defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) */
diff --git a/arch/mips/au1000/common/dbg_io.c b/arch/mips/au1000/common/dbg_io.c
index eae1bb2ca26e..af5be7df2f2a 100644
--- a/arch/mips/au1000/common/dbg_io.c
+++ b/arch/mips/au1000/common/dbg_io.c
@@ -1,3 +1,4 @@
+#include <linux/types.h>
 #include <asm/mach-au1x00/au1000.h>
@@ -8,12 +9,6 @@
 * uart to be used for debugging.
 */
 #define DEBUG_BASE  UART_DEBUG_BASE
-/**/
-/* we need uint32 uint8 */
-/* #include "types.h" */
-typedef         unsigned char uint8;
-typedef         unsigned int  uint32;
 #define         UART16550_BAUD_2400             2400
 #define         UART16550_BAUD_4800             4800
@@ -51,17 +46,15 @@ typedef         unsigned int  uint32;
 #define UART_MOD_CNTRL  0x100   /* Module Control */
 /* memory-mapped read/write of the port */
-#define UART16550_READ(y)    (au_readl(DEBUG_BASE + y) & 0xff)
+#define UART16550_READ(y)     (au_readl(DEBUG_BASE + y) & 0xff)
-#define UART16550_WRITE(y, z) (au_writel(z&0xff, DEBUG_BASE + y))
+#define UART16550_WRITE(y, z) (au_writel(z & 0xff, DEBUG_BASE + y))
 extern unsigned long calc_clock(void);
-void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
+void debugInit(u32 baud, u8 data, u8 parity, u8 stop)
 {
+        if (UART16550_READ(UART_MOD_CNTRL) != 0x3)
-        if (UART16550_READ(UART_MOD_CNTRL) != 0x3) {
                UART16550_WRITE(UART_MOD_CNTRL, 3);
-        }
        calc_clock();
        /* disable interrupts */
@@ -69,7 +62,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
        /* set up baud rate */
        {
-                uint32 divisor;
+                u32 divisor;
                /* set divisor */
                divisor = get_au1x00_uart_baud_base() / baud;
@@ -80,9 +73,9 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
        UART16550_WRITE(UART_LCR, (data | parity | stop));
 }
-static int remoteDebugInitialized = 0;
+static int remoteDebugInitialized;
-uint8 getDebugChar(void)
+u8 getDebugChar(void)
 {
        if (!remoteDebugInitialized) {
                remoteDebugInitialized = 1;
@@ -92,15 +85,13 @@ uint8 getDebugChar(void)
                          UART16550_STOP_1BIT);
        }
-        while((UART16550_READ(UART_LSR) & 0x1) == 0);
+        while ((UART16550_READ(UART_LSR) & 0x1) == 0);
        return UART16550_READ(UART_RX);
 }
-int putDebugChar(uint8 byte)
+int putDebugChar(u8 byte)
 {
-//      int i;
        if (!remoteDebugInitialized) {
                remoteDebugInitialized = 1;
                debugInit(UART16550_BAUD_115200,
@@ -109,9 +100,8 @@ int putDebugChar(uint8 byte)
                          UART16550_STOP_1BIT);
        }
-        while ((UART16550_READ(UART_LSR)&0x40) == 0);
+        while ((UART16550_READ(UART_LSR) & 0x40) == 0);
        UART16550_WRITE(UART_TX, byte);
-        //for (i=0;i<0xfff;i++);
        return 1;
 }
diff --git a/arch/mips/au1000/common/dma.c b/arch/mips/au1000/common/dma.c
index 95f69ea146e9..d6fbda232e6a 100644
--- a/arch/mips/au1000/common/dma.c
+++ b/arch/mips/au1000/common/dma.c
@@ -1,12 +1,11 @@
 /*
 *
 * BRIEF MODULE DESCRIPTION
- *      A DMA channel allocator for Au1000. API is modeled loosely off of
+ *      A DMA channel allocator for Au1x00. API is modeled loosely off of
 *      linux/kernel/dma.c.
 *
- * Copyright 2000 MontaVista Software Inc.
+ * Copyright 2000, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              stevel@mvista.com or source@mvista.com
 * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
 *
 *  This program is free software; you can redistribute  it and/or modify it
@@ -39,7 +38,8 @@
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1000_dma.h>
-#if defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1100)
+#if defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1500) || \
+    defined(CONFIG_SOC_AU1100)
 /*
 * A note on resource allocation:
 *
@@ -56,7 +56,6 @@
 * returned from request_dma.
 */
 DEFINE_SPINLOCK(au1000_dma_spin_lock);
 struct dma_chan au1000_dma_table[NUM_AU1000_DMA_CHANNELS] = {
@@ -71,7 +70,7 @@ struct dma_chan au1000_dma_table[NUM_AU1000_DMA_CHANNELS] = {
 };
 EXPORT_SYMBOL(au1000_dma_table);
-// Device FIFO addresses and default DMA modes
+/* Device FIFO addresses and default DMA modes */
 static const struct dma_dev {
        unsigned int fifo_addr;
        unsigned int dma_mode;
@@ -80,8 +79,8 @@ static const struct dma_dev {
        {UART0_ADDR + UART_RX, 0},
        {0, 0},
        {0, 0},
-        {AC97C_DATA, DMA_DW16 },          // coherent
+        {AC97C_DATA, DMA_DW16 },          /* coherent */
-        {AC97C_DATA, DMA_DR | DMA_DW16 }, // coherent
+        {AC97C_DATA, DMA_DR | DMA_DW16 }, /* coherent */
        {UART3_ADDR + UART_TX, DMA_DW8 | DMA_NC},
        {UART3_ADDR + UART_RX, DMA_DR | DMA_DW8 | DMA_NC},
        {USBD_EP0RD, DMA_DR | DMA_DW8 | DMA_NC},
@@ -101,10 +100,10 @@ int au1000_dma_read_proc(char *buf, char **start, off_t fpos,
        struct dma_chan *chan;
        for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++) {
-                if ((chan = get_dma_chan(i)) != NULL) {
+                chan = get_dma_chan(i);
+                if (chan != NULL)
                        len += sprintf(buf + len, "%2d: %s\n",
                                       i, chan->dev_str);
-                }
        }
        if (fpos >= len) {
@@ -113,18 +112,19 @@ int au1000_dma_read_proc(char *buf, char **start, off_t fpos,
                return 0;
        }
        *start = buf + fpos;
-        if ((len -= fpos) > length)
+        len -= fpos;
+        if (len > length)
                return length;
        *eof = 1;
        return len;
 }
-// Device FIFO addresses and default DMA modes - 2nd bank
+/* Device FIFO addresses and default DMA modes - 2nd bank */
 static const struct dma_dev dma_dev_table_bank2[DMA_NUM_DEV_BANK2] = {
-        {SD0_XMIT_FIFO, DMA_DS | DMA_DW8},              // coherent
+        { SD0_XMIT_FIFO, DMA_DS | DMA_DW8 },            /* coherent */
-        {SD0_RECV_FIFO, DMA_DS | DMA_DR | DMA_DW8},     // coherent
+        { SD0_RECV_FIFO, DMA_DS | DMA_DR | DMA_DW8 },   /* coherent */
-        {SD1_XMIT_FIFO, DMA_DS | DMA_DW8},              // coherent
+        { SD1_XMIT_FIFO, DMA_DS | DMA_DW8 },            /* coherent */
-        {SD1_RECV_FIFO, DMA_DS | DMA_DR | DMA_DW8}      // coherent
+        { SD1_RECV_FIFO, DMA_DS | DMA_DR | DMA_DW8 }    /* coherent */
 };
 void dump_au1000_dma_channel(unsigned int dmanr)
@@ -150,7 +150,6 @@ void dump_au1000_dma_channel(unsigned int dmanr)
               au_readl(chan->io + DMA_BUFFER1_COUNT));
 }
 /*
 * Finds a free channel, and binds the requested device to it.
 * Returns the allocated channel number, or negative on error.
@@ -169,14 +168,14 @@ int request_au1000_dma(int dev_id, const char *dev_str,
        if (dev_id < 0 || dev_id >= (DMA_NUM_DEV + DMA_NUM_DEV_BANK2))
                return -EINVAL;
 #else
-        if (dev_id < 0 || dev_id >= DMA_NUM_DEV)
+        if (dev_id < 0 || dev_id >= DMA_NUM_DEV)
                return -EINVAL;
 #endif
-        for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++) {
+        for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++)
                if (au1000_dma_table[i].dev_id < 0)
                        break;
-        }
        if (i == NUM_AU1000_DMA_CHANNELS)
                return -ENODEV;
@@ -185,15 +184,15 @@ int request_au1000_dma(int dev_id, const char *dev_str,
        if (dev_id >= DMA_NUM_DEV) {
                dev_id -= DMA_NUM_DEV;
                dev = &dma_dev_table_bank2[dev_id];
-        } else {
+        } else
                dev = &dma_dev_table[dev_id];
-        }
        if (irqhandler) {
                chan->irq = AU1000_DMA_INT_BASE + i;
                chan->irq_dev = irq_dev_id;
-                if ((ret = request_irq(chan->irq, irqhandler, irqflags,
+                ret = request_irq(chan->irq, irqhandler, irqflags, dev_str,
-                                       dev_str, chan->irq_dev))) {
+                                  chan->irq_dev);
+                if (ret) {
                        chan->irq = 0;
                        chan->irq_dev = NULL;
                        return ret;
@@ -203,7 +202,7 @@ int request_au1000_dma(int dev_id, const char *dev_str,
                chan->irq_dev = NULL;
        }
-        // fill it in
+        /* fill it in */
        chan->io = DMA_CHANNEL_BASE + i * DMA_CHANNEL_LEN;
        chan->dev_id = dev_id;
        chan->dev_str = dev_str;
@@ -220,8 +219,9 @@ EXPORT_SYMBOL(request_au1000_dma);
 void free_au1000_dma(unsigned int dmanr)
 {
        struct dma_chan *chan = get_dma_chan(dmanr);
        if (!chan) {
-                printk("Trying to free DMA%d\n", dmanr);
+                printk(KERN_ERR "Error trying to free DMA%d\n", dmanr);
                return;
        }
@@ -235,4 +235,4 @@ void free_au1000_dma(unsigned int dmanr)
 }
 EXPORT_SYMBOL(free_au1000_dma);
-#endif // AU1000 AU1500 AU1100
+#endif /* AU1000 AU1500 AU1100 */
diff --git a/arch/mips/au1000/common/gpio.c b/arch/mips/au1000/common/gpio.c
index 525452589971..b485d94ce8a5 100644
--- a/arch/mips/au1000/common/gpio.c
+++ b/arch/mips/au1000/common/gpio.c
@@ -69,7 +69,7 @@ static int au1xxx_gpio2_direction_output(unsigned gpio, int value)
 static int au1xxx_gpio1_read(unsigned gpio)
 {
-        return ((gpio1->pinstaterd >> gpio) & 0x01);
+        return (gpio1->pinstaterd >> gpio) & 0x01;
 }
 static void au1xxx_gpio1_write(unsigned gpio, int value)
@@ -104,7 +104,6 @@ int au1xxx_gpio_get_value(unsigned gpio)
        else
                return au1xxx_gpio1_read(gpio);
 }
 EXPORT_SYMBOL(au1xxx_gpio_get_value);
 void au1xxx_gpio_set_value(unsigned gpio, int value)
@@ -118,7 +117,6 @@ void au1xxx_gpio_set_value(unsigned gpio, int value)
        else
                au1xxx_gpio1_write(gpio, value);
 }
 EXPORT_SYMBOL(au1xxx_gpio_set_value);
 int au1xxx_gpio_direction_input(unsigned gpio)
@@ -132,7 +130,6 @@ int au1xxx_gpio_direction_input(unsigned gpio)
        return au1xxx_gpio1_direction_input(gpio);
 }
 EXPORT_SYMBOL(au1xxx_gpio_direction_input);
 int au1xxx_gpio_direction_output(unsigned gpio, int value)
@@ -146,5 +143,4 @@ int au1xxx_gpio_direction_output(unsigned gpio, int value)
        return au1xxx_gpio1_direction_output(gpio, value);
 }
 EXPORT_SYMBOL(au1xxx_gpio_direction_output);
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c
index f0626992fd75..40c6ceceb5f9 100644
--- a/arch/mips/au1000/common/irq.c
+++ b/arch/mips/au1000/common/irq.c
@@ -210,10 +210,8 @@ static inline void mask_and_ack_either_edge_irq(unsigned int irq_nr)
        au_sync();
 }
 static inline void mask_and_ack_level_irq(unsigned int irq_nr)
 {
        local_disable_irq(irq_nr);
        au_sync();
 #if defined(CONFIG_MIPS_PB1000)
@@ -263,14 +261,14 @@ void restore_local_and_enable(int controller, unsigned long mask)
        unsigned long flags, new_mask;
        spin_lock_irqsave(&irq_lock, flags);
-        for (i = 0; i < 32; i++) {
+        for (i = 0; i < 32; i++)
                if (mask & (1 << i)) {
                        if (controller)
                                local_enable_irq(i + 32);
                        else
                                local_enable_irq(i);
                }
-        }
        if (controller)
                new_mask = au_readl(IC1_MASKSET);
        else
diff --git a/arch/mips/au1000/common/pci.c b/arch/mips/au1000/common/pci.c
index 7e966b31e3e1..7866cf50cf99 100644
--- a/arch/mips/au1000/common/pci.c
+++ b/arch/mips/au1000/common/pci.c
@@ -2,9 +2,8 @@
 * BRIEF MODULE DESCRIPTION
 *      Alchemy/AMD Au1x00 PCI support.
 *
- * Copyright 2001-2003, 2007 MontaVista Software Inc.
+ * Copyright 2001-2003, 2007-2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
 *
@@ -86,9 +85,9 @@ static int __init au1x_pci_setup(void)
                u32 prid = read_c0_prid();
                if ((prid & 0xFF000000) == 0x01000000 && prid < 0x01030202) {
-                       au_writel((1 << 16) | au_readl(Au1500_PCI_CFG),
+                        au_writel((1 << 16) | au_readl(Au1500_PCI_CFG),
-                                 Au1500_PCI_CFG);
+                                  Au1500_PCI_CFG);
-                       printk("Non-coherent PCI accesses enabled\n");
+                        printk(KERN_INFO "Non-coherent PCI accesses enabled\n");
                }
        }
 #endif
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c
index 31d2a2270878..8cae7753ef79 100644
--- a/arch/mips/au1000/common/platform.c
+++ b/arch/mips/au1000/common/platform.c
@@ -269,8 +269,8 @@ static struct platform_device au1x00_pcmcia_device = {
 #ifdef SMBUS_PSC_BASE
 static struct resource pbdb_smbus_resources[] = {
        {
-                .start  = SMBUS_PSC_BASE,
+                .start  = CPHYSADDR(SMBUS_PSC_BASE),
-                .end    = SMBUS_PSC_BASE + 0x24 - 1,
+                .end    = CPHYSADDR(SMBUS_PSC_BASE + 0xfffff),
                .flags  = IORESOURCE_MEM,
        },
 };
@@ -302,16 +302,17 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = {
 #endif
 };
-int __init au1xxx_platform_init(void)
+static int __init au1xxx_platform_init(void)
 {
        unsigned int uartclk = get_au1x00_uart_baud_base() * 16;
        int i;
        /* Fill up uartclk. */
-        for (i = 0; au1x00_uart_data[i].flags ; i++)
+        for (i = 0; au1x00_uart_data[i].flags; i++)
                au1x00_uart_data[i].uartclk = uartclk;
-        return platform_add_devices(au1xxx_platform_devices, ARRAY_SIZE(au1xxx_platform_devices));
+        return platform_add_devices(au1xxx_platform_devices,
+                                    ARRAY_SIZE(au1xxx_platform_devices));
 }
 arch_initcall(au1xxx_platform_init);
diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c
index a8cd2c1b9e1b..2166b9e1e80c 100644
--- a/arch/mips/au1000/common/power.c
+++ b/arch/mips/au1000/common/power.c
@@ -1,10 +1,9 @@
 /*
 * BRIEF MODULE DESCRIPTION
- *      Au1000 Power Management routines.
+ *      Au1xx0 Power Management routines.
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  Some of the routines are right out of init/main.c, whose
 *  copyrights apply here.
@@ -43,10 +42,10 @@
 #ifdef CONFIG_PM
 #define DEBUG 1
-#ifdef DEBUG
+#ifdef  DEBUG
-#  define DPRINTK(fmt, args...) printk("%s: " fmt, __func__, ## args)
+#define DPRINTK(fmt, args...)   printk(KERN_DEBUG "%s: " fmt, __func__, ## args)
 #else
-#  define DPRINTK(fmt, args...)
+#define DPRINTK(fmt, args...)
 #endif
 static void au1000_calibrate_delay(void);
@@ -57,7 +56,8 @@ extern void local_enable_irq(unsigned int irq_nr);
 static DEFINE_SPINLOCK(pm_lock);
-/* We need to save/restore a bunch of core registers that are
+/*
+ * We need to save/restore a bunch of core registers that are
 * either volatile or reset to some state across a processor sleep.
 * If reading a register doesn't provide a proper result for a
 * later restore, we have to provide a function for loading that
@@ -78,24 +78,25 @@ static unsigned int	sleep_usbhost_enable;
 static unsigned int     sleep_usbdev_enable;
 static unsigned int     sleep_static_memctlr[4][3];
-/* Define this to cause the value you write to /proc/sys/pm/sleep to
+/*
+ * Define this to cause the value you write to /proc/sys/pm/sleep to
 * set the TOY timer for the amount of time you want to sleep.
 * This is done mainly for testing, but may be useful in other cases.
 * The value is number of 32KHz ticks to sleep.
 */
 #define SLEEP_TEST_TIMEOUT 1
-#ifdef SLEEP_TEST_TIMEOUT
+#ifdef  SLEEP_TEST_TIMEOUT
-static  int     sleep_ticks;
+static int sleep_ticks;
 void wakeup_counter0_set(int ticks);
 #endif
-static void
+static void save_core_regs(void)
-save_core_regs(void)
 {
        extern void save_au1xxx_intctl(void);
        extern void pm_eth0_shutdown(void);
-        /* Do the serial ports.....these really should be a pm_*
+        /*
+         * Do the serial ports.....these really should be a pm_*
         * registered function by the driver......but of course the
         * standard serial driver doesn't understand our Au1xxx
         * unique registers.
@@ -106,27 +107,24 @@ save_core_regs(void)
        sleep_uart0_clkdiv = au_readl(UART0_ADDR + UART_CLK);
        sleep_uart0_enable = au_readl(UART0_ADDR + UART_MOD_CNTRL);
-        /* Shutdown USB host/device.
+        /* Shutdown USB host/device. */
-        */
        sleep_usbhost_enable = au_readl(USB_HOST_CONFIG);
-        /* There appears to be some undocumented reset register....
+        /* There appears to be some undocumented reset register.... */
-        */
        au_writel(0, 0xb0100004); au_sync();
        au_writel(0, USB_HOST_CONFIG); au_sync();
        sleep_usbdev_enable = au_readl(USBD_ENABLE);
        au_writel(0, USBD_ENABLE); au_sync();
-        /* Save interrupt controller state.
+        /* Save interrupt controller state. */
-        */
        save_au1xxx_intctl();
-        /* Clocks and PLLs.
+        /* Clocks and PLLs. */
-        */
        sleep_aux_pll_cntrl = au_readl(SYS_AUXPLL);
-        /* We don't really need to do this one, but unless we
+        /*
+         * We don't really need to do this one, but unless we
         * write it again it won't have a valid value if we
         * happen to read it.
         */
@@ -134,8 +132,7 @@ save_core_regs(void)
        sleep_pin_function = au_readl(SYS_PINFUNC);
-        /* Save the static memory controller configuration.
+        /* Save the static memory controller configuration. */
-        */
        sleep_static_memctlr[0][0] = au_readl(MEM_STCFG0);
        sleep_static_memctlr[0][1] = au_readl(MEM_STTIME0);
        sleep_static_memctlr[0][2] = au_readl(MEM_STADDR0);
@@ -150,8 +147,7 @@ save_core_regs(void)
        sleep_static_memctlr[3][2] = au_readl(MEM_STADDR3);
 }
-static void
+static void restore_core_regs(void)
-restore_core_regs(void)
 {
        extern void restore_au1xxx_intctl(void);
        extern void wakeup_counter0_adjust(void);
@@ -160,8 +156,7 @@ restore_core_regs(void)
        au_writel(sleep_cpu_pll_cntrl, SYS_CPUPLL); au_sync();
        au_writel(sleep_pin_function, SYS_PINFUNC); au_sync();
-        /* Restore the static memory controller configuration.
+        /* Restore the static memory controller configuration. */
-        */
        au_writel(sleep_static_memctlr[0][0], MEM_STCFG0);
        au_writel(sleep_static_memctlr[0][1], MEM_STTIME0);
        au_writel(sleep_static_memctlr[0][2], MEM_STADDR0);
@@ -175,7 +170,8 @@ restore_core_regs(void)
        au_writel(sleep_static_memctlr[3][1], MEM_STTIME3);
        au_writel(sleep_static_memctlr[3][2], MEM_STADDR3);
-        /* Enable the UART if it was enabled before sleep.
+        /*
+         * Enable the UART if it was enabled before sleep.
         * I guess I should define module control bits........
         */
        if (sleep_uart0_enable & 0x02) {
@@ -202,7 +198,7 @@ void wakeup_from_suspend(void)
 int au_sleep(void)
 {
        unsigned long wakeup, flags;
-        extern  void    save_and_sleep(void);
+        extern void save_and_sleep(void);
        spin_lock_irqsave(&pm_lock, flags);
@@ -210,23 +206,22 @@ int au_sleep(void)
        flush_cache_all();
-        /** The code below is all system dependent and we should probably
+        /**
+         ** The code below is all system dependent and we should probably
         ** have a function call out of here to set this up.  You need
         ** to configure the GPIO or timer interrupts that will bring
         ** you out of sleep.
         ** For testing, the TOY counter wakeup is useful.
         **/
 #if 0
        au_writel(au_readl(SYS_PINSTATERD) & ~(1 << 11), SYS_PINSTATERD);
-        /* gpio 6 can cause a wake up event */
+        /* GPIO 6 can cause a wake up event */
        wakeup = au_readl(SYS_WAKEMSK);
        wakeup &= ~(1 << 8);    /* turn off match20 wakeup */
-        wakeup |= 1 << 6;       /* turn on gpio 6 wakeup   */
+        wakeup |= 1 << 6;       /* turn on  GPIO  6 wakeup */
 #else
-        /* For testing, allow match20 to wake us up.
+        /* For testing, allow match20 to wake us up. */
-        */
 #ifdef SLEEP_TEST_TIMEOUT
        wakeup_counter0_set(sleep_ticks);
 #endif
@@ -240,7 +235,8 @@ int au_sleep(void)
        save_and_sleep();
-        /* after a wakeup, the cpu vectors back to 0x1fc00000 so
+        /*
+         * After a wakeup, the cpu vectors back to 0x1fc00000, so
         * it's up to the boot code to get us back here.
         */
        restore_core_regs();
@@ -248,24 +244,22 @@ int au_sleep(void)
        return 0;
 }
-static int pm_do_sleep(ctl_table * ctl, int write, struct file *file,
+static int pm_do_sleep(ctl_table *ctl, int write, struct file *file,
-                       void __user *buffer, size_t * len, loff_t *ppos)
+                       void __user *buffer, size_t *len, loff_t *ppos)
 {
 #ifdef SLEEP_TEST_TIMEOUT
 #define TMPBUFLEN2 16
        char buf[TMPBUFLEN2], *p;
 #endif
-        if (!write) {
+        if (!write)
                *len = 0;
-        } else {
+        else {
 #ifdef SLEEP_TEST_TIMEOUT
-                if (*len > TMPBUFLEN2 - 1) {
+                if (*len > TMPBUFLEN2 - 1)
                        return -EFAULT;
-                }
+                if (copy_from_user(buf, buffer, *len))
-                if (copy_from_user(buf, buffer, *len)) {
                        return -EFAULT;
-                }
                buf[*len] = 0;
                p = buf;
                sleep_ticks = simple_strtoul(p, &p, 0);
@@ -276,8 +270,8 @@ static int pm_do_sleep(ctl_table * ctl, int write, struct file *file,
        return 0;
 }
-static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
+static int pm_do_freq(ctl_table *ctl, int write, struct file *file,
-                      void __user *buffer, size_t * len, loff_t *ppos)
+                      void __user *buffer, size_t *len, loff_t *ppos)
 {
        int retval = 0, i;
        unsigned long val, pll;
@@ -285,14 +279,14 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
 #define MAX_CPU_FREQ 396
        char buf[TMPBUFLEN], *p;
        unsigned long flags, intc0_mask, intc1_mask;
-        unsigned long old_baud_base, old_cpu_freq, baud_rate, old_clk,
+        unsigned long old_baud_base, old_cpu_freq, old_clk, old_refresh;
-            old_refresh;
        unsigned long new_baud_base, new_cpu_freq, new_clk, new_refresh;
+        unsigned long baud_rate;
        spin_lock_irqsave(&pm_lock, flags);
-        if (!write) {
+        if (!write)
                *len = 0;
-        } else {
+        else {
                /* Parse the new frequency */
                if (*len > TMPBUFLEN - 1) {
                        spin_unlock_irqrestore(&pm_lock, flags);
@@ -312,7 +306,7 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
                pll = val / 12;
                if ((pll > 33) || (pll < 7)) {  /* 396 MHz max, 84 MHz min */
-                        /* revisit this for higher speed cpus */
+                        /* Revisit this for higher speed CPUs */
                        spin_unlock_irqrestore(&pm_lock, flags);
                        return -EFAULT;
                }
@@ -321,30 +315,28 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
                old_cpu_freq = get_au1x00_speed();
                new_cpu_freq = pll * 12 * 1000000;
-                new_baud_base =  (new_cpu_freq / (2 * ((int)(au_readl(SYS_POWERCTRL)&0x03) + 2) * 16));
+                new_baud_base = (new_cpu_freq / (2 * ((int)(au_readl(SYS_POWERCTRL)
+                                                            & 0x03) + 2) * 16));
                set_au1x00_speed(new_cpu_freq);
                set_au1x00_uart_baud_base(new_baud_base);
                old_refresh = au_readl(MEM_SDREFCFG) & 0x1ffffff;
-                new_refresh =
+                new_refresh = ((old_refresh * new_cpu_freq) / old_cpu_freq) |
-                    ((old_refresh * new_cpu_freq) /
+                              (au_readl(MEM_SDREFCFG) & ~0x1ffffff);
-                     old_cpu_freq) | (au_readl(MEM_SDREFCFG) & ~0x1ffffff);
                au_writel(pll, SYS_CPUPLL);
                au_sync_delay(1);
                au_writel(new_refresh, MEM_SDREFCFG);
                au_sync_delay(1);
-                for (i = 0; i < 4; i++) {
+                for (i = 0; i < 4; i++)
-                        if (au_readl
+                        if (au_readl(UART_BASE + UART_MOD_CNTRL +
-                            (UART_BASE + UART_MOD_CNTRL +
+                                     i * 0x00100000) == 3) {
-                             i * 0x00100000) == 3) {
+                                old_clk = au_readl(UART_BASE + UART_CLK +
-                                old_clk =
+                                                   i * 0x00100000);
-                                    au_readl(UART_BASE + UART_CLK +
-                                          i * 0x00100000);
-                                // baud_rate = baud_base/clk
                                baud_rate = old_baud_base / old_clk;
-                                /* we won't get an exact baud rate and the error
+                                /*
+                                 * We won't get an exact baud rate and the error
                                 * could be significant enough that our new
                                 * calculation will result in a clock that will
                                 * give us a baud rate that's too far off from
@@ -359,18 +351,14 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
                                else if (baud_rate > 17000)
                                        baud_rate = 19200;
                                else
-                                        (baud_rate = 9600);
+                                        baud_rate = 9600;
-                                // new_clk = new_baud_base/baud_rate
                                new_clk = new_baud_base / baud_rate;
-                                au_writel(new_clk,
+                                au_writel(new_clk, UART_BASE + UART_CLK +
-                                       UART_BASE + UART_CLK +
+                                          i * 0x00100000);
-                                       i * 0x00100000);
                                au_sync_delay(10);
                        }
-                }
        }
        /*
         * We don't want _any_ interrupts other than match20. Otherwise our
         * au1000_calibrate_delay() calculation will be off, potentially a lot.
@@ -428,14 +416,15 @@ static int __init pm_init(void)
 __initcall(pm_init);
 /*
 * This is right out of init/main.c
 */
-/* This is the number of bits of precision for the loops_per_jiffy.  Each
+/*
-   bit takes on average 1.5/HZ seconds.  This (like the original) is a little
+ * This is the number of bits of precision for the loops_per_jiffy.
-   better than 1% */
+ * Each bit takes on average 1.5/HZ seconds.  This (like the original)
+ * is a little better than 1%.
+ */
 #define LPS_PREC 8
 static void au1000_calibrate_delay(void)
@@ -443,14 +432,14 @@ static void au1000_calibrate_delay(void)
        unsigned long ticks, loopbit;
        int lps_precision = LPS_PREC;
-        loops_per_jiffy = (1 << 12);
+        loops_per_jiffy = 1 << 12;
        while (loops_per_jiffy <<= 1) {
-                /* wait for "start of" clock tick */
+                /* Wait for "start of" clock tick */
                ticks = jiffies;
                while (ticks == jiffies)
                        /* nothing */ ;
-                /* Go .. */
+                /* Go ... */
                ticks = jiffies;
                __delay(loops_per_jiffy);
                ticks = jiffies - ticks;
@@ -458,8 +447,10 @@ static void au1000_calibrate_delay(void)
                        break;
        }
-/* Do a binary approximation to get loops_per_jiffy set to equal one clock
+        /*
-   (up to lps_precision bits) */
+         * Do a binary approximation to get loops_per_jiffy set to be equal
+         * one clock (up to lps_precision bits)
+         */
        loops_per_jiffy >>= 1;
        loopbit = loops_per_jiffy;
        while (lps_precision-- && (loopbit >>= 1)) {
@@ -472,4 +463,4 @@ static void au1000_calibrate_delay(void)
                        loops_per_jiffy &= ~loopbit;
        }
 }
-#endif                          /* CONFIG_PM */
+#endif  /* CONFIG_PM */
diff --git a/arch/mips/au1000/common/prom.c b/arch/mips/au1000/common/prom.c
index f10af829e4ec..18b310b475ca 100644
--- a/arch/mips/au1000/common/prom.c
+++ b/arch/mips/au1000/common/prom.c
@@ -3,9 +3,8 @@
 * BRIEF MODULE DESCRIPTION
 *    PROM library initialisation code, supports YAMON and U-Boot.
 *
- * Copyright 2000, 2001, 2006 MontaVista Software Inc.
+ * Copyright 2000-2001, 2006, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 * This file was derived from Carsten Langgaard's
 * arch/mips/mips-boards/xx files.
@@ -57,7 +56,7 @@ void prom_init_cmdline(void)
        actr = 1; /* Always ignore argv[0] */
        cp = &(arcs_cmdline[0]);
-        while(actr < prom_argc) {
+        while (actr < prom_argc) {
                strcpy(cp, prom_argv[actr]);
                cp += strlen(prom_argv[actr]);
                *cp++ = ' ';
@@ -84,10 +83,8 @@ char *prom_getenv(char *envname)
                if (yamon) {
                        if (strcmp(envname, *env++) == 0)
                                return *env;
-                } else {
+                } else if (strncmp(envname, *env, i) == 0 && (*env)[i] == '=')
-                        if (strncmp(envname, *env, i) == 0 && (*env)[i] == '=')
+                        return *env + i + 1;
-                                return *env + i + 1;
-                }
                env++;
        }
@@ -110,13 +107,13 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
 {
        int i;
-        for(i = 0; i < 6; i++) {
+        for (i = 0; i < 6; i++) {
                unsigned char num;
-                if((*str == '.') || (*str == ':'))
+                if ((*str == '.') || (*str == ':'))
                        str++;
-                num = str2hexnum(*str++) << 4;
+                num  = str2hexnum(*str++) << 4;
-                num |= (str2hexnum(*str++));
+                num |= str2hexnum(*str++);
                ea[i] = num;
        }
 }
diff --git a/arch/mips/au1000/common/puts.c b/arch/mips/au1000/common/puts.c
index e34c67e89293..55bbe24d45b6 100644
--- a/arch/mips/au1000/common/puts.c
+++ b/arch/mips/au1000/common/puts.c
@@ -1,11 +1,10 @@
 /*
 *
 * BRIEF MODULE DESCRIPTION
- *      Low level uart routines to directly access a 16550 uart.
+ *      Low level UART routines to directly access Alchemy UART.
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -40,12 +39,12 @@
 static volatile unsigned long * const com1 = (unsigned long *)SERIAL_BASE;
 #ifdef SLOW_DOWN
 static inline void slow_down(void)
 {
-    int k;
+        int k;
-    for (k=0; k<10000; k++);
+        for (k = 0; k < 10000; k++);
 }
 #else
 #define slow_down()
@@ -54,16 +53,16 @@ static inline void slow_down(void)
 void
 prom_putchar(const unsigned char c)
 {
-    unsigned char ch;
+        unsigned char ch;
-    int i = 0;
+        int i = 0;
+        do {
+                ch = com1[SER_CMD];
+                slow_down();
+                i++;
+                if (i > TIMEOUT)
+                        break;
+        } while (0 == (ch & TX_BUSY));
-    do {
+        com1[SER_DATA] = c;
-        ch = com1[SER_CMD];
-        slow_down();
-        i++;
-        if (i>TIMEOUT) {
-            break;
-        }
-    } while (0 == (ch & TX_BUSY));
-    com1[SER_DATA] = c;
 }
diff --git a/arch/mips/au1000/common/reset.c b/arch/mips/au1000/common/reset.c
index 60cec537c745..d555429c8d6f 100644
--- a/arch/mips/au1000/common/reset.c
+++ b/arch/mips/au1000/common/reset.c
@@ -1,11 +1,10 @@
 /*
 *
 * BRIEF MODULE DESCRIPTION
- *      Au1000 reset routines.
+ *      Au1xx0 reset routines.
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2006, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -28,10 +27,11 @@
 *  675 Mass Ave, Cambridge, MA 02139, USA.
 */
+#include <asm/cacheflush.h>
 #include <asm/mach-au1x00/au1000.h>
 extern int au_sleep(void);
-extern void (*flush_cache_all)(void);
 void au1000_restart(char *command)
 {
@@ -40,8 +40,8 @@ void au1000_restart(char *command)
        u32 prid = read_c0_prid();
        printk(KERN_NOTICE "\n** Resetting Integrated Peripherals\n");
-        switch (prid & 0xFF000000)
-        {
+        switch (prid & 0xFF000000) {
        case 0x00000000: /* Au1000 */
                au_writel(0x02, 0xb0000010); /* ac97_enable */
                au_writel(0x08, 0xb017fffc); /* usbh_enable - early errata */
@@ -138,9 +138,6 @@ void au1000_restart(char *command)
                au_writel(0x00, 0xb1900064); /* sys_auxpll */
                au_writel(0x00, 0xb1900100); /* sys_pininputen */
                break;
-        default:
-                break;
        }
        set_c0_status(ST0_BEV | ST0_ERL);
@@ -158,25 +155,25 @@ void au1000_restart(char *command)
 void au1000_halt(void)
 {
 #if defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_DB1550)
-        /* power off system */
+        /* Power off system */
-        printk("\n** Powering off...\n");
+        printk(KERN_NOTICE "\n** Powering off...\n");
-        au_writew(au_readw(0xAF00001C) | (3<<14), 0xAF00001C);
+        au_writew(au_readw(0xAF00001C) | (3 << 14), 0xAF00001C);
        au_sync();
-        while(1); /* should not get here */
+        while (1); /* should not get here */
 #else
        printk(KERN_NOTICE "\n** You can safely turn off the power\n");
 #ifdef CONFIG_MIPS_MIRAGE
        au_writel((1 << 26) | (1 << 10), GPIO2_OUTPUT);
 #endif
 #ifdef CONFIG_MIPS_DB1200
-        au_writew(au_readw(0xB980001C) | (1<<14), 0xB980001C);
+        au_writew(au_readw(0xB980001C) | (1 << 14), 0xB980001C);
 #endif
 #ifdef CONFIG_PM
        au_sleep();
-        /* should not get here */
+        /* Should not get here */
-        printk(KERN_ERR "Unable to put cpu in sleep mode\n");
+        printk(KERN_ERR "Unable to put CPU in sleep mode\n");
-        while(1);
+        while (1);
 #else
        while (1)
                __asm__(".set\tmips3\n\t"
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c
index 0e86f7a6b4a7..1ac6b06f42a3 100644
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
@@ -1,7 +1,6 @@
 /*
- * Copyright 2000 MontaVista Software Inc.
+ * Copyright 2000, 2007-2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com
- *              ppopov@mvista.com or source@mvista.com
 *
 * Updates to 2.6, Pete Popov, Embedded Alley Solutions, Inc.
 *
@@ -48,7 +47,7 @@ void __init plat_mem_setup(void)
 {
        struct  cpu_spec *sp;
        char *argptr;
-        unsigned long prid, cpufreq, bclk = 1;
+        unsigned long prid, cpufreq, bclk;
        set_cpuspec();
        sp = cur_cpu_spec[0];
@@ -66,42 +65,39 @@ void __init plat_mem_setup(void)
                cpufreq = (au_readl(SYS_CPUPLL) & 0x3F) * 12;
        printk(KERN_INFO "(PRID %08lx) @ %ld MHz\n", prid, cpufreq);
-        bclk = sp->cpu_bclk;
+        if (sp->cpu_bclk) {
-        if (bclk)
-        {
                /* Enable BCLK switching */
-                bclk = au_readl(0xB190003C);
+                bclk = au_readl(SYS_POWERCTRL);
-                au_writel(bclk | 0x60, 0xB190003C);
+                au_writel(bclk | 0x60, SYS_POWERCTRL);
-                printk("BCLK switching enabled!\n");
+                printk(KERN_INFO "BCLK switching enabled!\n");
        }
-        if (sp->cpu_od) {
+        if (sp->cpu_od)
-                /* Various early Au1000 Errata corrected by this */
+                /* Various early Au1xx0 errata corrected by this */
-                set_c0_config(1<<19); /* Set Config[OD] */
+                set_c0_config(1 << 19); /* Set Config[OD] */
-        }
+        else
-        else {
                /* Clear to obtain best system bus performance */
-                clear_c0_config(1<<19); /* Clear Config[OD] */
+                clear_c0_config(1 << 19); /* Clear Config[OD] */
-        }
        argptr = prom_getcmdline();
 #ifdef CONFIG_SERIAL_8250_CONSOLE
-        if ((argptr = strstr(argptr, "console=")) == NULL) {
+        argptr = strstr(argptr, "console=");
+        if (argptr == NULL) {
                argptr = prom_getcmdline();
                strcat(argptr, " console=ttyS0,115200");
        }
 #endif
 #ifdef CONFIG_FB_AU1100
-    if ((argptr = strstr(argptr, "video=")) == NULL) {
+        argptr = strstr(argptr, "video=");
-        argptr = prom_getcmdline();
+        if (argptr == NULL) {
-        /* default panel */
+                argptr = prom_getcmdline();
-        /*strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");*/
+                /* default panel */
-    }
+                /*strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");*/
+        }
 #endif
 #if defined(CONFIG_SOUND_AU1X00) && !defined(CONFIG_SOC_AU1000)
        /* au1000 does not support vra, au1500 and au1100 do */
        strcat(argptr, " au1000_audio=vra");
@@ -129,7 +125,7 @@ void __init plat_mem_setup(void)
 /* This routine should be valid for all Au1x based boards */
 phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size)
 {
-        /* Don't fixup 36 bit addresses */
+        /* Don't fixup 36-bit addresses */
        if ((phys_addr >> 32) != 0)
                return phys_addr;
@@ -145,17 +141,17 @@ phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size)
        }
 #endif
-        /* All Au1x SOCs have a pcmcia controller */
+        /*
-        /* We setup our 32 bit pseudo addresses to be equal to the
+         * All Au1xx0 SOCs have a PCMCIA controller.
-         * 36 bit addr >> 4, to make it easier to check the address
+         * We setup our 32-bit pseudo addresses to be equal to the
+         * 36-bit addr >> 4, to make it easier to check the address
         * and fix it.
-         * The Au1x socket 0 phys attribute address is 0xF 4000 0000.
+         * The PCMCIA socket 0 physical attribute address is 0xF 4000 0000.
         * The pseudo address we use is 0xF400 0000. Any address over
-         * 0xF400 0000 is a pcmcia pseudo address.
+         * 0xF400 0000 is a PCMCIA pseudo address.
         */
-        if ((phys_addr >= 0xF4000000) && (phys_addr < 0xFFFFFFFF)) {
+        if ((phys_addr >= 0xF4000000) && (phys_addr < 0xFFFFFFFF))
                return (phys_t)(phys_addr << 4);
-        }
        /* default nop */
        return phys_addr;
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c
index bdb6d73b26fb..563d9390a872 100644
--- a/arch/mips/au1000/common/time.c
+++ b/arch/mips/au1000/common/time.c
@@ -25,11 +25,9 @@
 *
 * Setting up the clock on the MIPS boards.
 *
- * Update.  Always configure the kernel with CONFIG_NEW_TIME_C.  This
+ * We provide the clock interrupt processing and the timer offset compute
- * will use the user interface gettimeofday() functions from the
+ * functions.  If CONFIG_PM is selected, we also ensure the 32KHz timer is
- * arch/mips/kernel/time.c, and we provide the clock interrupt processing
+ * available.  -- Dan
- * and the timer offset compute functions.  If CONFIG_PM is selected,
- * we also ensure the 32KHz timer is available.   -- Dan
 */
 #include <linux/types.h>
@@ -47,8 +45,7 @@ extern int allow_au1k_wait; /* default off for CP0 Counter */
 #if HZ < 100 || HZ > 1000
 #error "unsupported HZ value! Must be in [100,1000]"
 #endif
-#define MATCH20_INC (328*100/HZ) /* magic number 328 is for HZ=100... */
+#define MATCH20_INC (328 * 100 / HZ) /* magic number 328 is for HZ=100... */
-extern void startup_match20_interrupt(irq_handler_t handler);
 static unsigned long last_pc0, last_match20;
 #endif
@@ -61,7 +58,7 @@ static irqreturn_t counter0_irq(int irq, void *dev_id)
 {
        unsigned long pc0;
        int time_elapsed;
-        static int jiffie_drift = 0;
+        static int jiffie_drift;
        if (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20) {
                /* should never happen! */
@@ -70,13 +67,11 @@ static irqreturn_t counter0_irq(int irq, void *dev_id)
        }
        pc0 = au_readl(SYS_TOYREAD);
-        if (pc0 < last_match20) {
+        if (pc0 < last_match20)
                /* counter overflowed */
                time_elapsed = (0xffffffff - last_match20) + pc0;
-        }
+        else
-        else {
                time_elapsed = pc0 - last_match20;
-        }
        while (time_elapsed > 0) {
                do_timer(1);
@@ -92,8 +87,9 @@ static irqreturn_t counter0_irq(int irq, void *dev_id)
        au_writel(last_match20 + MATCH20_INC, SYS_TOYMATCH2);
        au_sync();
-        /* our counter ticks at 10.009765625 ms/tick, we we're running
+        /*
-         * almost 10uS too slow per tick.
+         * Our counter ticks at 10.009765625 ms/tick, we we're running
+         * almost 10 uS too slow per tick.
         */
        if (jiffie_drift >= 999) {
@@ -117,20 +113,17 @@ struct irqaction counter0_action = {
 /* When we wakeup from sleep, we have to "catch up" on all of the
 * timer ticks we have missed.
 */
-void
+void wakeup_counter0_adjust(void)
-wakeup_counter0_adjust(void)
 {
        unsigned long pc0;
        int time_elapsed;
        pc0 = au_readl(SYS_TOYREAD);
-        if (pc0 < last_match20) {
+        if (pc0 < last_match20)
                /* counter overflowed */
                time_elapsed = (0xffffffff - last_match20) + pc0;
-        }
+        else
-        else {
                time_elapsed = pc0 - last_match20;
-        }
        while (time_elapsed > 0) {
                time_elapsed -= MATCH20_INC;
@@ -143,10 +136,8 @@ wakeup_counter0_adjust(void)
 }
-/* This is just for debugging to set the timer for a sleep delay.
+/* This is just for debugging to set the timer for a sleep delay. */
-*/
+void wakeup_counter0_set(int ticks)
-void
-wakeup_counter0_set(int ticks)
 {
        unsigned long pc0;
@@ -157,21 +148,22 @@ wakeup_counter0_set(int ticks)
 }
 #endif
-/* I haven't found anyone that doesn't use a 12 MHz source clock,
+/*
+ * I haven't found anyone that doesn't use a 12 MHz source clock,
 * but just in case.....
 */
 #define AU1000_SRC_CLK  12000000
 /*
 * We read the real processor speed from the PLL.  This is important
- * because it is more accurate than computing it from the 32KHz
+ * because it is more accurate than computing it from the 32 KHz
 * counter, if it exists.  If we don't have an accurate processor
 * speed, all of the peripherals that derive their clocks based on
 * this advertised speed will introduce error and sometimes not work
 * properly.  This function is futher convoluted to still allow configurations
 * to do that in case they have really, really old silicon with a
- * write-only PLL register, that we need the 32KHz when power management
+ * write-only PLL register, that we need the 32 KHz when power management
- * "wait" is enabled, and we need to detect if the 32KHz isn't present
+ * "wait" is enabled, and we need to detect if the 32 KHz isn't present
 * but requested......got it? :-)               -- Dan
 */
 unsigned long calc_clock(void)
@@ -182,8 +174,7 @@ unsigned long calc_clock(void)
        spin_lock_irqsave(&time_lock, flags);
-        /* Power management cares if we don't have a 32KHz counter.
+        /* Power management cares if we don't have a 32 KHz counter. */
-        */
        no_au1xxx_32khz = 0;
        counter = au_readl(SYS_COUNTER_CNTRL);
        if (counter & SYS_CNTRL_E0) {
@@ -193,7 +184,7 @@ unsigned long calc_clock(void)
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T1S);
                /* RTC now ticks at 32.768/16 kHz */
-                au_writel(trim_divide-1, SYS_RTCTRIM);
+                au_writel(trim_divide - 1, SYS_RTCTRIM);
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T1S);
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S);
@@ -215,9 +206,11 @@ unsigned long calc_clock(void)
 #endif
        else
                cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * AU1000_SRC_CLK;
+        /* On Alchemy CPU:counter ratio is 1:1 */
        mips_hpt_frequency = cpu_speed;
-        // Equation: Baudrate = CPU / (SD * 2 * CLKDIV * 16)
+        /* Equation: Baudrate = CPU / (SD * 2 * CLKDIV * 16) */
-        set_au1x00_uart_baud_base(cpu_speed / (2 * ((int)(au_readl(SYS_POWERCTRL)&0x03) + 2) * 16));
+        set_au1x00_uart_baud_base(cpu_speed / (2 * ((int)(au_readl(SYS_POWERCTRL)
+                                                          & 0x03) + 2) * 16));
        spin_unlock_irqrestore(&time_lock, flags);
        return cpu_speed;
 }
@@ -228,10 +221,10 @@ void __init plat_time_init(void)
        est_freq += 5000;    /* round */
        est_freq -= est_freq%10000;
-        printk("CPU frequency %d.%02d MHz\n", est_freq/1000000,
+        printk(KERN_INFO "CPU frequency %u.%02u MHz\n",
-               (est_freq%1000000)*100/1000000);
+               est_freq / 1000000, ((est_freq % 1000000) * 100) / 1000000);
-        set_au1x00_speed(est_freq);
+        set_au1x00_speed(est_freq);
-        set_au1x00_lcd_clock(); // program the LCD clock
+        set_au1x00_lcd_clock(); /* program the LCD clock */
 #ifdef CONFIG_PM
        /*
@@ -243,30 +236,29 @@ void __init plat_time_init(void)
         * counter 0 interrupt as a special irq and it doesn't show
         * up under /proc/interrupts.
         *
-         * Check to ensure we really have a 32KHz oscillator before
+         * Check to ensure we really have a 32 KHz oscillator before
         * we do this.
         */
        if (no_au1xxx_32khz)
-                printk("WARNING: no 32KHz clock found.\n");
+                printk(KERN_WARNING "WARNING: no 32KHz clock found.\n");
        else {
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S);
                au_writel(0, SYS_TOYWRITE);
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S);
-                au_writel(au_readl(SYS_WAKEMSK) | (1<<8), SYS_WAKEMSK);
+                au_writel(au_readl(SYS_WAKEMSK) | (1 << 8), SYS_WAKEMSK);
                au_writel(~0, SYS_WAKESRC);
                au_sync();
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20);
-                /* setup match20 to interrupt once every HZ */
+                /* Setup match20 to interrupt once every HZ */
                last_pc0 = last_match20 = au_readl(SYS_TOYREAD);
                au_writel(last_match20 + MATCH20_INC, SYS_TOYMATCH2);
                au_sync();
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20);
                setup_irq(AU1000_TOY_MATCH2_INT, &counter0_action);
-                /* We can use the real 'wait' instruction.
+                /* We can use the real 'wait' instruction. */
-                */
                allow_au1k_wait = 1;
        }
diff --git a/arch/mips/au1000/db1x00/Makefile b/arch/mips/au1000/db1x00/Makefile
index 51d62bd5d900..274db3b55d82 100644
--- a/arch/mips/au1000/db1x00/Makefile
+++ b/arch/mips/au1000/db1x00/Makefile
@@ -1,8 +1,8 @@
 #
-#  Copyright 2000 MontaVista Software Inc.
+#  Copyright 2000, 2008 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
+#
+# Makefile for the Alchemy Semiconductor DBAu1xx0 boards.
 #
-# Makefile for the Alchemy Semiconductor Db1x00 board.
 lib-y := init.o board_setup.o irqmap.o
diff --git a/arch/mips/au1000/db1x00/board_setup.c b/arch/mips/au1000/db1x00/board_setup.c
index b7dcbad5c586..9e5ccbbfcedd 100644
--- a/arch/mips/au1000/db1x00/board_setup.c
+++ b/arch/mips/au1000/db1x00/board_setup.c
@@ -3,9 +3,8 @@
 * BRIEF MODULE DESCRIPTION
 *      Alchemy Db1x00 board setup.
 *
- * Copyright 2000 MontaVista Software Inc.
+ * Copyright 2000, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -37,49 +36,49 @@ static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
 void board_reset(void)
 {
-        /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
+        /* Hit BCSR.SW_RESET[RESET] */
        bcsr->swreset = 0x0000;
 }
 void __init board_setup(void)
 {
-        u32 pin_func;
+        u32 pin_func = 0;
-        pin_func = 0;
+        /* Not valid for Au1550 */
-        /* not valid for 1550 */
+#if defined(CONFIG_IRDA) && \
+   (defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1100))
-#if defined(CONFIG_IRDA) && (defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1100))
+        /* Set IRFIRSEL instead of GPIO15 */
-        /* set IRFIRSEL instead of GPIO15 */
+        pin_func = au_readl(SYS_PINFUNC) | SYS_PF_IRF;
-        pin_func = au_readl(SYS_PINFUNC) | (u32)((1<<8));
        au_writel(pin_func, SYS_PINFUNC);
-        /* power off until the driver is in use */
+        /* Power off until the driver is in use */
        bcsr->resets &= ~BCSR_RESETS_IRDA_MODE_MASK;
-        bcsr->resets |= BCSR_RESETS_IRDA_MODE_OFF;
+        bcsr->resets |=  BCSR_RESETS_IRDA_MODE_OFF;
        au_sync();
 #endif
        bcsr->pcmcia = 0x0000; /* turn off PCMCIA power */
 #ifdef CONFIG_MIPS_MIRAGE
-        /* enable GPIO[31:0] inputs */
+        /* Enable GPIO[31:0] inputs */
        au_writel(0, SYS_PININPUTEN);
-        /* GPIO[20] is output, tristate the other input primary GPIO's */
+        /* GPIO[20] is output, tristate the other input primary GPIOs */
-        au_writel((u32)(~(1<<20)), SYS_TRIOUTCLR);
+        au_writel(~(1 << 20), SYS_TRIOUTCLR);
-        /* set GPIO[210:208] instead of SSI_0 */
+        /* Set GPIO[210:208] instead of SSI_0 */
-        pin_func = au_readl(SYS_PINFUNC) | (u32)(1);
+        pin_func = au_readl(SYS_PINFUNC) | SYS_PF_S0;
-        /* set GPIO[215:211] for LED's */
+        /* Set GPIO[215:211] for LEDs */
-        pin_func |= (u32)((5<<2));
+        pin_func |= 5 << 2;
-        /* set GPIO[214:213] for more LED's */
+        /* Set GPIO[214:213] for more LEDs */
-        pin_func |= (u32)((5<<12));
+        pin_func |= 5 << 12;
-        /* set GPIO[207:200] instead of PCMCIA/LCD */
+        /* Set GPIO[207:200] instead of PCMCIA/LCD */
-        pin_func |= (u32)((3<<17));
+        pin_func |= SYS_PF_LCD | SYS_PF_PC;
        au_writel(pin_func, SYS_PINFUNC);
-        /* Enable speaker amplifier.  This should
+        /*
+         * Enable speaker amplifier.  This should
         * be part of the audio driver.
         */
        au_writel(au_readl(GPIO2_DIR) | 0x200, GPIO2_DIR);
@@ -89,21 +88,21 @@ void __init board_setup(void)
        au_sync();
 #ifdef CONFIG_MIPS_DB1000
-    printk("AMD Alchemy Au1000/Db1000 Board\n");
+        printk(KERN_INFO "AMD Alchemy Au1000/Db1000 Board\n");
 #endif
 #ifdef CONFIG_MIPS_DB1500
-    printk("AMD Alchemy Au1500/Db1500 Board\n");
+        printk(KERN_INFO "AMD Alchemy Au1500/Db1500 Board\n");
 #endif
 #ifdef CONFIG_MIPS_DB1100
-    printk("AMD Alchemy Au1100/Db1100 Board\n");
+        printk(KERN_INFO "AMD Alchemy Au1100/Db1100 Board\n");
 #endif
 #ifdef CONFIG_MIPS_BOSPORUS
-    printk("AMD Alchemy Bosporus Board\n");
+        printk(KERN_INFO "AMD Alchemy Bosporus Board\n");
 #endif
 #ifdef CONFIG_MIPS_MIRAGE
-    printk("AMD Alchemy Mirage Board\n");
+        printk(KERN_INFO "AMD Alchemy Mirage Board\n");
 #endif
 #ifdef CONFIG_MIPS_DB1550
-    printk("AMD Alchemy Au1550/Db1550 Board\n");
+        printk(KERN_INFO "AMD Alchemy Au1550/Db1550 Board\n");
 #endif
 }
diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c
index d3b967caf70c..5ebe0de5e459 100644
--- a/arch/mips/au1000/db1x00/init.c
+++ b/arch/mips/au1000/db1x00/init.c
@@ -2,9 +2,8 @@
 * BRIEF MODULE DESCRIPTION
 *      PB1000 board setup
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -49,8 +48,8 @@ void __init prom_init(void)
        unsigned long memsize;
        prom_argc = fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg2;
+        prom_envp = (char **)fw_arg2;
        prom_init_cmdline();
@@ -58,6 +57,6 @@ void __init prom_init(void)
        if (!memsize_str)
                memsize = 0x04000000;
        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/db1x00/irqmap.c b/arch/mips/au1000/db1x00/irqmap.c
index eaa50c7b6341..94c090e8bf7a 100644
--- a/arch/mips/au1000/db1x00/irqmap.c
+++ b/arch/mips/au1000/db1x00/irqmap.c
@@ -32,32 +32,32 @@
 #ifdef CONFIG_MIPS_DB1500
 char irq_tab_alchemy[][5] __initdata = {
- [12] = { -1, INTA, INTX, INTX, INTX},   /* IDSEL 12 - HPT371   */
+        [12] = { -1, INTA, INTX, INTX, INTX }, /* IDSEL 12 - HPT371   */
- [13] = { -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot */
+        [13] = { -1, INTA, INTB, INTC, INTD }, /* IDSEL 13 - PCI slot */
 };
 #endif
 #ifdef CONFIG_MIPS_BOSPORUS
 char irq_tab_alchemy[][5] __initdata = {
- [11] = { -1, INTA, INTB, INTX, INTX},   /* IDSEL 11 - miniPCI  */
+        [11] = { -1, INTA, INTB, INTX, INTX }, /* IDSEL 11 - miniPCI  */
- [12] = { -1, INTA, INTX, INTX, INTX},   /* IDSEL 12 - SN1741   */
+        [12] = { -1, INTA, INTX, INTX, INTX }, /* IDSEL 12 - SN1741   */
- [13] = { -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot */
+        [13] = { -1, INTA, INTB, INTC, INTD }, /* IDSEL 13 - PCI slot */
 };
 #endif
 #ifdef CONFIG_MIPS_MIRAGE
 char irq_tab_alchemy[][5] __initdata = {
- [11] = { -1, INTD, INTX, INTX, INTX},   /* IDSEL 11 - SMI VGX */
+        [11] = { -1, INTD, INTX, INTX, INTX }, /* IDSEL 11 - SMI VGX */
- [12] = { -1, INTX, INTX, INTC, INTX},   /* IDSEL 12 - PNX1300 */
+        [12] = { -1, INTX, INTX, INTC, INTX }, /* IDSEL 12 - PNX1300 */
- [13] = { -1, INTA, INTB, INTX, INTX},   /* IDSEL 13 - miniPCI */
+        [13] = { -1, INTA, INTB, INTX, INTX }, /* IDSEL 13 - miniPCI */
 };
 #endif
 #ifdef CONFIG_MIPS_DB1550
 char irq_tab_alchemy[][5] __initdata = {
- [11] = { -1, INTC, INTX, INTX, INTX},   /* IDSEL 11 - on-board HPT371    */
+        [11] = { -1, INTC, INTX, INTX, INTX }, /* IDSEL 11 - on-board HPT371 */
- [12] = { -1, INTB, INTC, INTD, INTA},   /* IDSEL 12 - PCI slot 2 (left)  */
+        [12] = { -1, INTB, INTC, INTD, INTA }, /* IDSEL 12 - PCI slot 2 (left) */
- [13] = { -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot 1 (right) */
+        [13] = { -1, INTA, INTB, INTC, INTD }, /* IDSEL 13 - PCI slot 1 (right) */
 };
 #endif
diff --git a/arch/mips/au1000/mtx-1/Makefile b/arch/mips/au1000/mtx-1/Makefile
index 85a90941de4f..7c67b3d33bec 100644
--- a/arch/mips/au1000/mtx-1/Makefile
+++ b/arch/mips/au1000/mtx-1/Makefile
@@ -1,7 +1,6 @@
 #
 #  Copyright 2003 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
 #       Bruno Randolf <bruno.randolf@4g-systems.biz>
 #
 # Makefile for 4G Systems MTX-1 board.
diff --git a/arch/mips/au1000/mtx-1/board_setup.c b/arch/mips/au1000/mtx-1/board_setup.c
index 5736354829c6..3f8079186cf2 100644
--- a/arch/mips/au1000/mtx-1/board_setup.c
+++ b/arch/mips/au1000/mtx-1/board_setup.c
@@ -3,9 +3,8 @@
 * BRIEF MODULE DESCRIPTION
 *      4G Systems MTX-1 board setup.
 *
- * Copyright 2003 MontaVista Software Inc.
+ * Copyright 2003, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *         Bruno Randolf <bruno.randolf@4g-systems.biz>
 *
 *  This program is free software; you can redistribute  it and/or modify it
@@ -34,7 +33,7 @@
 #include <asm/mach-au1x00/au1000.h>
 extern int (*board_pci_idsel)(unsigned int devsel, int assert);
-int    mtx1_pci_idsel(unsigned int devsel, int assert);
+int mtx1_pci_idsel(unsigned int devsel, int assert);
 void board_reset(void)
 {
@@ -45,36 +44,36 @@ void board_reset(void)
 void __init board_setup(void)
 {
 #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
-        // enable USB power switch
+        /* Enable USB power switch */
-        au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR );
+        au_writel(au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR);
-        au_writel( 0x100000, GPIO2_OUTPUT );
+        au_writel(0x100000, GPIO2_OUTPUT);
 #endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
 #ifdef CONFIG_PCI
 #if defined(__MIPSEB__)
-        au_writel(0xf | (2<<6) | (1<<4), Au1500_PCI_CFG);
+        au_writel(0xf | (2 << 6) | (1 << 4), Au1500_PCI_CFG);
 #else
        au_writel(0xf, Au1500_PCI_CFG);
 #endif
 #endif
-        // initialize sys_pinfunc:
+        /* Initialize sys_pinfunc */
-        au_writel( SYS_PF_NI2, SYS_PINFUNC );
+        au_writel(SYS_PF_NI2, SYS_PINFUNC);
-        // initialize GPIO
+        /* Initialize GPIO */
-        au_writel( 0xFFFFFFFF, SYS_TRIOUTCLR );
+        au_writel(0xFFFFFFFF, SYS_TRIOUTCLR);
-        au_writel( 0x00000001, SYS_OUTPUTCLR ); // set M66EN (PCI 66MHz) to OFF
+        au_writel(0x00000001, SYS_OUTPUTCLR); /* set M66EN (PCI 66MHz) to OFF */
-        au_writel( 0x00000008, SYS_OUTPUTSET ); // set PCI CLKRUN# to OFF
+        au_writel(0x00000008, SYS_OUTPUTSET); /* set PCI CLKRUN# to OFF */
-        au_writel( 0x00000002, SYS_OUTPUTSET ); // set EXT_IO3 ON
+        au_writel(0x00000002, SYS_OUTPUTSET); /* set EXT_IO3 ON */
-        au_writel( 0x00000020, SYS_OUTPUTCLR ); // set eth PHY TX_ER to OFF
+        au_writel(0x00000020, SYS_OUTPUTCLR); /* set eth PHY TX_ER to OFF */
-        // enable LED and set it to green
+        /* Enable LED and set it to green */
-        au_writel( au_readl(GPIO2_DIR) | 0x1800, GPIO2_DIR );
+        au_writel(au_readl(GPIO2_DIR) | 0x1800, GPIO2_DIR);
-        au_writel( 0x18000800, GPIO2_OUTPUT );
+        au_writel(0x18000800, GPIO2_OUTPUT);
        board_pci_idsel = mtx1_pci_idsel;
-        printk("4G Systems MTX-1 Board\n");
+        printk(KERN_INFO "4G Systems MTX-1 Board\n");
 }
 int
@@ -82,20 +81,18 @@ mtx1_pci_idsel(unsigned int devsel, int assert)
 {
 #define MTX_IDSEL_ONLY_0_AND_3 0
 #if MTX_IDSEL_ONLY_0_AND_3
-       if (devsel != 0 && devsel != 3) {
+        if (devsel != 0 && devsel != 3) {
-               printk("*** not 0 or 3\n");
+                printk(KERN_ERR "*** not 0 or 3\n");
-               return 0;
+                return 0;
-       }
+        }
 #endif
-       if (assert && devsel != 0) {
+        if (assert && devsel != 0)
-               // suppress signal to cardbus
+                /* Suppress signal to Cardbus */
-               au_writel( 0x00000002, SYS_OUTPUTCLR ); // set EXT_IO3 OFF
+                au_writel(0x00000002, SYS_OUTPUTCLR); /* set EXT_IO3 OFF */
-       }
+        else
-       else {
+                au_writel(0x00000002, SYS_OUTPUTSET); /* set EXT_IO3 ON */
-               au_writel( 0x00000002, SYS_OUTPUTSET ); // set EXT_IO3 ON
+        au_sync_udelay(1);
-       }
+        return 1;
-       au_sync_udelay(1);
-       return 1;
 }
diff --git a/arch/mips/au1000/mtx-1/init.c b/arch/mips/au1000/mtx-1/init.c
index c015cbce1cca..33a4aebe0cba 100644
--- a/arch/mips/au1000/mtx-1/init.c
+++ b/arch/mips/au1000/mtx-1/init.c
@@ -3,9 +3,8 @@
 * BRIEF MODULE DESCRIPTION
 *      4G Systems MTX-1 board setup
 *
- * Copyright 2003 MontaVista Software Inc.
+ * Copyright 2003, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *         Bruno Randolf <bruno.randolf@4g-systems.biz>
 *
 *  This program is free software; you can redistribute  it and/or modify it
@@ -47,8 +46,8 @@ void __init prom_init(void)
        unsigned long memsize;
        prom_argc = fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg2;
+        prom_envp = (char **)fw_arg2;
        prom_init_cmdline();
@@ -56,6 +55,6 @@ void __init prom_init(void)
        if (!memsize_str)
                memsize = 0x04000000;
        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/mtx-1/irqmap.c b/arch/mips/au1000/mtx-1/irqmap.c
index 78d70c42c9db..f2bf02951e9c 100644
--- a/arch/mips/au1000/mtx-1/irqmap.c
+++ b/arch/mips/au1000/mtx-1/irqmap.c
@@ -31,18 +31,18 @@
 #include <asm/mach-au1x00/au1000.h>
 char irq_tab_alchemy[][5] __initdata = {
- [0] = { -1, INTA, INTA, INTX, INTX},   /* IDSEL 00 - AdapterA-Slot0 (top)    */
+        [0] = { -1, INTA, INTA, INTX, INTX }, /* IDSEL 00 - AdapterA-Slot0 (top) */
- [1] = { -1, INTB, INTA, INTX, INTX},   /* IDSEL 01 - AdapterA-Slot1 (bottom) */
+        [1] = { -1, INTB, INTA, INTX, INTX }, /* IDSEL 01 - AdapterA-Slot1 (bottom) */
- [2] = { -1, INTC, INTD, INTX, INTX},   /* IDSEL 02 - AdapterB-Slot0 (top)    */
+        [2] = { -1, INTC, INTD, INTX, INTX }, /* IDSEL 02 - AdapterB-Slot0 (top) */
- [3] = { -1, INTD, INTC, INTX, INTX},   /* IDSEL 03 - AdapterB-Slot1 (bottom) */
+        [3] = { -1, INTD, INTC, INTX, INTX }, /* IDSEL 03 - AdapterB-Slot1 (bottom) */
- [4] = { -1, INTA, INTB, INTX, INTX},   /* IDSEL 04 - AdapterC-Slot0 (top)    */
+        [4] = { -1, INTA, INTB, INTX, INTX }, /* IDSEL 04 - AdapterC-Slot0 (top) */
- [5] = { -1, INTB, INTA, INTX, INTX},   /* IDSEL 05 - AdapterC-Slot1 (bottom) */
+        [5] = { -1, INTB, INTA, INTX, INTX }, /* IDSEL 05 - AdapterC-Slot1 (bottom) */
- [6] = { -1, INTC, INTD, INTX, INTX},   /* IDSEL 06 - AdapterD-Slot0 (top)    */
+        [6] = { -1, INTC, INTD, INTX, INTX }, /* IDSEL 06 - AdapterD-Slot0 (top) */
- [7] = { -1, INTD, INTC, INTX, INTX},   /* IDSEL 07 - AdapterD-Slot1 (bottom) */
+        [7] = { -1, INTD, INTC, INTX, INTX }, /* IDSEL 07 - AdapterD-Slot1 (bottom) */
 };
 struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
-       { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},
+       { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0 },
       { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },
       { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },
       { AU1500_GPIO_203, INTC_INT_LOW_LEVEL, 0 },
diff --git a/arch/mips/au1000/mtx-1/platform.c b/arch/mips/au1000/mtx-1/platform.c
index a7edbf0829ac..9807be37c32f 100644
--- a/arch/mips/au1000/mtx-1/platform.c
+++ b/arch/mips/au1000/mtx-1/platform.c
@@ -21,11 +21,10 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
+#include <linux/gpio.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
-#include <asm/gpio.h>
 static struct gpio_keys_button mtx1_gpio_button[] = {
        {
                .gpio = 207,
diff --git a/arch/mips/au1000/pb1000/Makefile b/arch/mips/au1000/pb1000/Makefile
index daa1a507e72f..99bbec0ca41b 100644
--- a/arch/mips/au1000/pb1000/Makefile
+++ b/arch/mips/au1000/pb1000/Makefile
@@ -1,8 +1,8 @@
 #
-#  Copyright 2000 MontaVista Software Inc.
+#  Copyright 2000, 2008 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
+#
+# Makefile for the Alchemy Semiconductor Pb1000 board.
 #
-# Makefile for the Alchemy Semiconductor PB1000 board.
 lib-y := init.o board_setup.o irqmap.o
diff --git a/arch/mips/au1000/pb1000/board_setup.c b/arch/mips/au1000/pb1000/board_setup.c
index 33f15acc1b17..25df167a95b3 100644
--- a/arch/mips/au1000/pb1000/board_setup.c
+++ b/arch/mips/au1000/pb1000/board_setup.c
@@ -1,7 +1,6 @@
 /*
- * Copyright 2000 MontaVista Software Inc.
+ * Copyright 2000, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -40,128 +39,126 @@ void __init board_setup(void)
        u32 sys_freqctrl, sys_clksrc;
        u32 prid = read_c0_prid();
-        // set AUX clock to 12MHz * 8 = 96 MHz
+        /* Set AUX clock to 12 MHz * 8 = 96 MHz */
        au_writel(8, SYS_AUXPLL);
        au_writel(0, SYS_PINSTATERD);
        udelay(100);
 #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
-        /* zero and disable FREQ2 */
+        /* Zero and disable FREQ2 */
        sys_freqctrl = au_readl(SYS_FREQCTRL0);
        sys_freqctrl &= ~0xFFF00000;
        au_writel(sys_freqctrl, SYS_FREQCTRL0);
-        /* zero and disable USBH/USBD clocks */
+        /* Zero and disable USBH/USBD clocks */
        sys_clksrc = au_readl(SYS_CLKSRC);
-        sys_clksrc &= ~0x00007FE0;
+        sys_clksrc &= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |
+                        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);
        au_writel(sys_clksrc, SYS_CLKSRC);
        sys_freqctrl = au_readl(SYS_FREQCTRL0);
        sys_freqctrl &= ~0xFFF00000;
        sys_clksrc = au_readl(SYS_CLKSRC);
-        sys_clksrc &= ~0x00007FE0;
+        sys_clksrc &= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |
+                        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);
-        switch (prid & 0x000000FF)
+        switch (prid & 0x000000FF) {
-        {
        case 0x00: /* DA */
        case 0x01: /* HA */
        case 0x02: /* HB */
-        /* CPU core freq to 48MHz to slow it way down... */
+                /* CPU core freq to 48 MHz to slow it way down... */
-        au_writel(4, SYS_CPUPLL);
+                au_writel(4, SYS_CPUPLL);
-        /*
+                /*
-         * Setup 48MHz FREQ2 from CPUPLL for USB Host
+                 * Setup 48 MHz FREQ2 from CPUPLL for USB Host
-         */
+                 * FRDIV2 = 3 -> div by 8 of 384 MHz -> 48 MHz
-        /* FRDIV2=3 -> div by 8 of 384MHz -> 48MHz */
+                 */
-        sys_freqctrl |= ((3<<22) | (1<<21) | (0<<20));
+                sys_freqctrl |= (3 << SYS_FC_FRDIV2_BIT) | SYS_FC_FE2;
-        au_writel(sys_freqctrl, SYS_FREQCTRL0);
+                au_writel(sys_freqctrl, SYS_FREQCTRL0);
-        /* CPU core freq to 384MHz */
+                /* CPU core freq to 384 MHz */
-        au_writel(0x20, SYS_CPUPLL);
+                au_writel(0x20, SYS_CPUPLL);
-        printk("Au1000: 48MHz OHCI workaround enabled\n");
+                printk(KERN_INFO "Au1000: 48 MHz OHCI workaround enabled\n");
                break;
-        default:  /* HC and newer */
+        default: /* HC and newer */
-        // FREQ2 = aux/2 = 48 MHz
+                /* FREQ2 = aux / 2 = 48 MHz */
-        sys_freqctrl |= ((0<<22) | (1<<21) | (1<<20));
+                sys_freqctrl |= (0 << SYS_FC_FRDIV2_BIT) |
-        au_writel(sys_freqctrl, SYS_FREQCTRL0);
+                                 SYS_FC_FE2 | SYS_FC_FS2;
+                au_writel(sys_freqctrl, SYS_FREQCTRL0);
                break;
        }
        /*
-         * Route 48MHz FREQ2 into USB Host and/or Device
+         * Route 48 MHz FREQ2 into USB Host and/or Device
         */
-#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
+        sys_clksrc |= SYS_CS_MUX_FQ2 << SYS_CS_MUH_BIT;
-        sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
-#endif
        au_writel(sys_clksrc, SYS_CLKSRC);
-        // configure pins GPIO[14:9] as GPIO
+        /* Configure pins GPIO[14:9] as GPIO */
-        pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8080);
+        pin_func = au_readl(SYS_PINFUNC) & ~(SYS_PF_UR3 | SYS_PF_USB);
-        // 2nd USB port is USB host
+        /* 2nd USB port is USB host */
-        pin_func |= 0x8000;
+        pin_func |= SYS_PF_USB;
        au_writel(pin_func, SYS_PINFUNC);
        au_writel(0x2800, SYS_TRIOUTCLR);
        au_writel(0x0030, SYS_OUTPUTCLR);
 #endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
-        // make gpio 15 an input (for interrupt line)
+        /* Make GPIO 15 an input (for interrupt line) */
-        pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x100);
+        pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_IRF;
-        // we don't need I2S, so make it available for GPIO[31:29]
+        /* We don't need I2S, so make it available for GPIO[31:29] */
-        pin_func |= (1<<5);
+        pin_func |= SYS_PF_I2S;
        au_writel(pin_func, SYS_PINFUNC);
        au_writel(0x8000, SYS_TRIOUTCLR);
-        static_cfg0 = au_readl(MEM_STCFG0) & (u32)(~0xc00);
+        static_cfg0 = au_readl(MEM_STCFG0) & ~0xc00;
        au_writel(static_cfg0, MEM_STCFG0);
-        // configure RCE2* for LCD
+        /* configure RCE2* for LCD */
        au_writel(0x00000004, MEM_STCFG2);
-        // MEM_STTIME2
+        /* MEM_STTIME2 */
        au_writel(0x09000000, MEM_STTIME2);
-        // Set 32-bit base address decoding for RCE2*
+        /* Set 32-bit base address decoding for RCE2* */
        au_writel(0x10003ff0, MEM_STADDR2);
-        // PCI CPLD setup
+        /*
-        // expand CE0 to cover PCI
+         * PCI CPLD setup
+         * Expand CE0 to cover PCI
+         */
        au_writel(0x11803e40, MEM_STADDR1);
-        // burst visibility on
+        /* Burst visibility on */
        au_writel(au_readl(MEM_STCFG0) | 0x1000, MEM_STCFG0);
-        au_writel(0x83, MEM_STCFG1);         // ewait enabled, flash timing
+        au_writel(0x83, MEM_STCFG1);         /* ewait enabled, flash timing */
-        au_writel(0x33030a10, MEM_STTIME1);   // slower timing for FPGA
+        au_writel(0x33030a10, MEM_STTIME1);  /* slower timing for FPGA */
-        /* setup the static bus controller */
+        /* Setup the static bus controller */
        au_writel(0x00000002, MEM_STCFG3);  /* type = PCMCIA */
        au_writel(0x280E3D07, MEM_STTIME3); /* 250ns cycle time */
        au_writel(0x10000000, MEM_STADDR3); /* any PCMCIA select */
-#ifdef CONFIG_PCI
+        /*
-        au_writel(0, PCI_BRIDGE_CONFIG); // set extend byte to 0
+         * Enable Au1000 BCLK switching - note: sed1356 must not use
-        au_writel(0, SDRAM_MBAR);        // set mbar to 0
+         * its BCLK (Au1000 LCLK) for any timings
-        au_writel(0x2, SDRAM_CMD);       // enable memory accesses
+         */
-        au_sync_delay(1);
+        switch (prid & 0x000000FF) {
-#endif
-        /* Enable Au1000 BCLK switching - note: sed1356 must not use
-         * its BCLK (Au1000 LCLK) for any timings */
-        switch (prid & 0x000000FF)
-        {
        case 0x00: /* DA */
        case 0x01: /* HA */
        case 0x02: /* HB */
                break;
        default:  /* HC and newer */
-                /* Enable sys bus clock divider when IDLE state or no bus
+                /*
-                   activity. */
+                 * Enable sys bus clock divider when IDLE state or no bus
+                 * activity.
+                 */
                au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
                break;
        }
diff --git a/arch/mips/au1000/pb1000/init.c b/arch/mips/au1000/pb1000/init.c
index 549447df71d6..3837365d613d 100644
--- a/arch/mips/au1000/pb1000/init.c
+++ b/arch/mips/au1000/pb1000/init.c
@@ -1,10 +1,9 @@
 /*
 * BRIEF MODULE DESCRIPTION
- *      PB1000 board setup
+ *      Pb1000 board setup
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -44,16 +43,15 @@ void __init prom_init(void)
        unsigned char *memsize_str;
        unsigned long memsize;
-        prom_argc = (int) fw_arg0;
+        prom_argc = (int)fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg2;
+        prom_envp = (char **)fw_arg2;
        prom_init_cmdline();
        memsize_str = prom_getenv("memsize");
-        if (!memsize_str) {
+        if (!memsize_str)
                memsize = 0x04000000;
-        } else {
+        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
-        }
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/pb1100/Makefile b/arch/mips/au1000/pb1100/Makefile
index 996236df6375..793e97c49e46 100644
--- a/arch/mips/au1000/pb1100/Makefile
+++ b/arch/mips/au1000/pb1100/Makefile
@@ -1,8 +1,8 @@
 #
-#  Copyright 2000,2001 MontaVista Software Inc.
+#  Copyright 2000, 2001, 2008 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
 #
 # Makefile for the Alchemy Semiconductor Pb1100 board.
+#
 lib-y := init.o board_setup.o irqmap.o
diff --git a/arch/mips/au1000/pb1100/board_setup.c b/arch/mips/au1000/pb1100/board_setup.c
index 656164c8e9ca..c0bfd59a7a36 100644
--- a/arch/mips/au1000/pb1100/board_setup.c
+++ b/arch/mips/au1000/pb1100/board_setup.c
@@ -1,7 +1,6 @@
 /*
- * Copyright 2002 MontaVista Software Inc.
+ * Copyright 2002, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -32,15 +31,15 @@
 void board_reset(void)
 {
-    /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
+        /* Hit BCSR.RST_VDDI[SOFT_RESET] */
-    au_writel(0x00000000, 0xAE00001C);
+        au_writel(0x00000000, PB1100_RST_VDDI);
 }
 void __init board_setup(void)
 {
-        volatile void __iomem * base = (volatile void __iomem *) 0xac000000UL;
+        volatile void __iomem *base = (volatile void __iomem *)0xac000000UL;
-        // set AUX clock to 12MHz * 8 = 96 MHz
+        /* Set AUX clock to 12 MHz * 8 = 96 MHz */
        au_writel(8, SYS_AUXPLL);
        au_writel(0, SYS_PININPUTEN);
        udelay(100);
@@ -49,44 +48,47 @@ void __init board_setup(void)
        {
                u32 pin_func, sys_freqctrl, sys_clksrc;
-                // configure pins GPIO[14:9] as GPIO
+                /* Configure pins GPIO[14:9] as GPIO */
-                pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x80);
+                pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_UR3;
-                /* zero and disable FREQ2 */
+                /* Zero and disable FREQ2 */
                sys_freqctrl = au_readl(SYS_FREQCTRL0);
                sys_freqctrl &= ~0xFFF00000;
                au_writel(sys_freqctrl, SYS_FREQCTRL0);
-                /* zero and disable USBH/USBD/IrDA clock */
+                /* Zero and disable USBH/USBD/IrDA clock */
                sys_clksrc = au_readl(SYS_CLKSRC);
-                sys_clksrc &= ~0x0000001F;
+                sys_clksrc &= ~(SYS_CS_CIR | SYS_CS_DIR | SYS_CS_MIR_MASK);
                au_writel(sys_clksrc, SYS_CLKSRC);
                sys_freqctrl = au_readl(SYS_FREQCTRL0);
                sys_freqctrl &= ~0xFFF00000;
                sys_clksrc = au_readl(SYS_CLKSRC);
-                sys_clksrc &= ~0x0000001F;
+                sys_clksrc &= ~(SYS_CS_CIR | SYS_CS_DIR | SYS_CS_MIR_MASK);
-                // FREQ2 = aux/2 = 48 MHz
+                /* FREQ2 = aux / 2 = 48 MHz */
-                sys_freqctrl |= ((0<<22) | (1<<21) | (1<<20));
+                sys_freqctrl |= (0 << SYS_FC_FRDIV2_BIT) |
+                                SYS_FC_FE2 | SYS_FC_FS2;
                au_writel(sys_freqctrl, SYS_FREQCTRL0);
                /*
-                 * Route 48MHz FREQ2 into USBH/USBD/IrDA
+                 * Route 48 MHz FREQ2 into USBH/USBD/IrDA
                 */
-                sys_clksrc |= ((4<<2) | (0<<1) | 0 );
+                sys_clksrc |= SYS_CS_MUX_FQ2 << SYS_CS_MIR_BIT;
                au_writel(sys_clksrc, SYS_CLKSRC);
-                /* setup the static bus controller */
+                /* Setup the static bus controller */
                au_writel(0x00000002, MEM_STCFG3);  /* type = PCMCIA */
                au_writel(0x280E3D07, MEM_STTIME3); /* 250ns cycle time */
                au_writel(0x10000000, MEM_STADDR3); /* any PCMCIA select */
-                // get USB Functionality pin state (device vs host drive pins)
+                /*
-                pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
+                 * Get USB Functionality pin state (device vs host drive pins).
-                // 2nd USB port is USB host
+                 */
-                pin_func |= 0x8000;
+                pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_USB;
+                /* 2nd USB port is USB host. */
+                pin_func |= SYS_PF_USB;
                au_writel(pin_func, SYS_PINFUNC);
        }
 #endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
@@ -94,12 +96,12 @@ void __init board_setup(void)
        /* Enable sys bus clock divider when IDLE state or no bus activity. */
        au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
-        // Enable the RTC if not already enabled
+        /* Enable the RTC if not already enabled. */
        if (!(readb(base + 0x28) & 0x20)) {
                writeb(readb(base + 0x28) | 0x20, base + 0x28);
                au_sync();
        }
-        // Put the clock in BCD mode
+        /* Put the clock in BCD mode. */
        if (readb(base + 0x2C) & 0x4) { /* reg B */
                writeb(readb(base + 0x2c) & ~0x4, base + 0x2c);
                au_sync();
diff --git a/arch/mips/au1000/pb1100/init.c b/arch/mips/au1000/pb1100/init.c
index c91344648ed3..8355483f3de2 100644
--- a/arch/mips/au1000/pb1100/init.c
+++ b/arch/mips/au1000/pb1100/init.c
@@ -3,9 +3,8 @@
 * BRIEF MODULE DESCRIPTION
 *      Pb1100 board setup
 *
- * Copyright 2002 MontaVista Software Inc.
+ * Copyright 2002, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -46,8 +45,8 @@ void __init prom_init(void)
        unsigned long memsize;
        prom_argc = fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg3;
+        prom_envp = (char **)fw_arg3;
        prom_init_cmdline();
@@ -55,7 +54,7 @@ void __init prom_init(void)
        if (!memsize_str)
                memsize = 0x04000000;
        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/pb1100/irqmap.c b/arch/mips/au1000/pb1100/irqmap.c
index b5021e3d477f..9b7dd8b41283 100644
--- a/arch/mips/au1000/pb1100/irqmap.c
+++ b/arch/mips/au1000/pb1100/irqmap.c
@@ -1,6 +1,6 @@
 /*
 * BRIEF MODULE DESCRIPTION
- *      Au1xxx irq map table
+ *      Au1xx0 IRQ map table
 *
 * Copyright 2003 Embedded Edge, LLC
 *              dan@embeddededge.com
@@ -31,10 +31,10 @@
 #include <asm/mach-au1x00/au1000.h>
 struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
-        { AU1000_GPIO_9, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card Fully_Interted#
+        { AU1000_GPIO_9,  INTC_INT_LOW_LEVEL, 0 }, /* PCMCIA Card Fully_Inserted# */
-        { AU1000_GPIO_10, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card STSCHG#
+        { AU1000_GPIO_10, INTC_INT_LOW_LEVEL, 0 }, /* PCMCIA Card STSCHG# */
-        { AU1000_GPIO_11, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card IRQ#
+        { AU1000_GPIO_11, INTC_INT_LOW_LEVEL, 0 }, /* PCMCIA Card IRQ# */
-        { AU1000_GPIO_13, INTC_INT_LOW_LEVEL, 0 }, // DC_IRQ#
+        { AU1000_GPIO_13, INTC_INT_LOW_LEVEL, 0 }, /* DC_IRQ# */
 };
 int __initdata au1xxx_nr_irqs = ARRAY_SIZE(au1xxx_irq_map);
diff --git a/arch/mips/au1000/pb1200/Makefile b/arch/mips/au1000/pb1200/Makefile
index 4fe02ea65a60..d678adf7ce85 100644
--- a/arch/mips/au1000/pb1200/Makefile
+++ b/arch/mips/au1000/pb1200/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for the Alchemy Semiconductor PB1200 board.
+# Makefile for the Alchemy Semiconductor Pb1200/DBAu1200 boards.
 #
 lib-y := init.o board_setup.o irqmap.o
diff --git a/arch/mips/au1000/pb1200/board_setup.c b/arch/mips/au1000/pb1200/board_setup.c
index 4493a792cc4c..6cb2115059ad 100644
--- a/arch/mips/au1000/pb1200/board_setup.c
+++ b/arch/mips/au1000/pb1200/board_setup.c
@@ -27,16 +27,8 @@
 #include <linux/init.h>
 #include <linux/sched.h>
-#include <au1000.h>
 #include <prom.h>
+#include <au1xxx.h>
-#ifdef CONFIG_MIPS_PB1200
-#include <asm/mach-pb1x00/pb1200.h>
-#endif
-#ifdef CONFIG_MIPS_DB1200
-#include <asm/mach-db1x00/db1200.h>
-#endif
 extern void _board_init_irq(void);
 extern void (*board_init_irq)(void);
@@ -53,56 +45,57 @@ void __init board_setup(void)
 #if 0
        {
-        u32 pin_func;
+                u32 pin_func;
-        /* Enable PSC1 SYNC for AC97.  Normaly done in audio driver,
+                /*
-         * but it is board specific code, so put it here.
+                 * Enable PSC1 SYNC for AC97.  Normaly done in audio driver,
-         */
+                 * but it is board specific code, so put it here.
-        pin_func = au_readl(SYS_PINFUNC);
+                 */
-        au_sync();
+                pin_func = au_readl(SYS_PINFUNC);
-        pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1;
+                au_sync();
-        au_writel(pin_func, SYS_PINFUNC);
+                pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1;
+                au_writel(pin_func, SYS_PINFUNC);
-        au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */
-        au_sync();
+                au_writel(0, (u32)bcsr | 0x10); /* turn off PCMCIA power */
+                au_sync();
        }
 #endif
 #if defined(CONFIG_I2C_AU1550)
        {
-        u32 freq0, clksrc;
+                u32 freq0, clksrc;
-        u32 pin_func;
+                u32 pin_func;
-        /* Select SMBUS in CPLD */
+                /* Select SMBus in CPLD */
-        bcsr->resets &= ~(BCSR_RESETS_PCS0MUX);
+                bcsr->resets &= ~BCSR_RESETS_PCS0MUX;
-        pin_func = au_readl(SYS_PINFUNC);
+                pin_func = au_readl(SYS_PINFUNC);
-        au_sync();
+                au_sync();
-        pin_func &= ~(3<<17 | 1<<4);
+                pin_func &= ~(SYS_PINFUNC_P0A | SYS_PINFUNC_P0B);
-        /* Set GPIOs correctly */
+                /* Set GPIOs correctly */
-        pin_func |= 2<<17;
+                pin_func |= 2 << 17;
-        au_writel(pin_func, SYS_PINFUNC);
+                au_writel(pin_func, SYS_PINFUNC);
-        au_sync();
+                au_sync();
-        /* The i2c driver depends on 50Mhz clock */
+                /* The I2C driver depends on 50 MHz clock */
-        freq0 = au_readl(SYS_FREQCTRL0);
+                freq0 = au_readl(SYS_FREQCTRL0);
-        au_sync();
+                au_sync();
-        freq0 &= ~(SYS_FC_FRDIV1_MASK | SYS_FC_FS1 | SYS_FC_FE1);
+                freq0 &= ~(SYS_FC_FRDIV1_MASK | SYS_FC_FS1 | SYS_FC_FE1);
-        freq0 |= (3<<SYS_FC_FRDIV1_BIT);
+                freq0 |= 3 << SYS_FC_FRDIV1_BIT;
-        /* 396Mhz / (3+1)*2 == 49.5Mhz */
+                /* 396 MHz / (3 + 1) * 2 == 49.5 MHz */
-        au_writel(freq0, SYS_FREQCTRL0);
+                au_writel(freq0, SYS_FREQCTRL0);
-        au_sync();
+                au_sync();
-        freq0 |= SYS_FC_FE1;
+                freq0 |= SYS_FC_FE1;
-        au_writel(freq0, SYS_FREQCTRL0);
+                au_writel(freq0, SYS_FREQCTRL0);
-        au_sync();
+                au_sync();
-        clksrc = au_readl(SYS_CLKSRC);
+                clksrc = au_readl(SYS_CLKSRC);
-        au_sync();
+                au_sync();
-        clksrc &= ~0x01f00000;
+                clksrc &= ~(SYS_CS_CE0 | SYS_CS_DE0 | SYS_CS_ME0_MASK);
-        /* bit 22 is EXTCLK0 for PSC0 */
+                /* Bit 22 is EXTCLK0 for PSC0 */
-        clksrc |= (0x3 << 22);
+                clksrc |= SYS_CS_MUX_FQ1 << SYS_CS_ME0_BIT;
-        au_writel(clksrc, SYS_CLKSRC);
+                au_writel(clksrc, SYS_CLKSRC);
-        au_sync();
+                au_sync();
        }
 #endif
@@ -116,27 +109,27 @@ void __init board_setup(void)
 #endif
 #endif
-        /* The Pb1200 development board uses external MUX for PSC0 to
+        /*
-        support SMB/SPI. bcsr->resets bit 12: 0=SMB 1=SPI
+         * The Pb1200 development board uses external MUX for PSC0 to
-        */
+         * support SMB/SPI. bcsr->resets bit 12: 0=SMB 1=SPI
+         */
 #ifdef CONFIG_I2C_AU1550
-        bcsr->resets &= (~BCSR_RESETS_PCS0MUX);
+        bcsr->resets &= ~BCSR_RESETS_PCS0MUX;
 #endif
        au_sync();
 #ifdef CONFIG_MIPS_PB1200
-        printk("AMD Alchemy Pb1200 Board\n");
+        printk(KERN_INFO "AMD Alchemy Pb1200 Board\n");
 #endif
 #ifdef CONFIG_MIPS_DB1200
-        printk("AMD Alchemy Db1200 Board\n");
+        printk(KERN_INFO "AMD Alchemy Db1200 Board\n");
 #endif
        /* Setup Pb1200 External Interrupt Controller */
        board_init_irq = _board_init_irq;
 }
-int
+int board_au1200fb_panel(void)
-board_au1200fb_panel(void)
 {
        BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
        int p;
@@ -147,23 +140,23 @@ board_au1200fb_panel(void)
        return p;
 }
-int
+int board_au1200fb_panel_init(void)
-board_au1200fb_panel_init(void)
 {
        /* Apply power */
-    BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
+        BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
-        bcsr->board |= (BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD | BCSR_BOARD_LCDBL);
-        /*printk("board_au1200fb_panel_init()\n"); */
+        bcsr->board |= BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD | BCSR_BOARD_LCDBL;
+        /* printk(KERN_DEBUG "board_au1200fb_panel_init()\n"); */
        return 0;
 }
-int
+int board_au1200fb_panel_shutdown(void)
-board_au1200fb_panel_shutdown(void)
 {
        /* Remove power */
-    BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
+        BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
-        bcsr->board &= ~(BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD | BCSR_BOARD_LCDBL);
-        /*printk("board_au1200fb_panel_shutdown()\n"); */
+        bcsr->board &= ~(BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |
+                         BCSR_BOARD_LCDBL);
+        /* printk(KERN_DEBUG "board_au1200fb_panel_shutdown()\n"); */
        return 0;
 }
diff --git a/arch/mips/au1000/pb1200/init.c b/arch/mips/au1000/pb1200/init.c
index 72af5500660b..09fd63b86062 100644
--- a/arch/mips/au1000/pb1200/init.c
+++ b/arch/mips/au1000/pb1200/init.c
@@ -3,9 +3,8 @@
 * BRIEF MODULE DESCRIPTION
 *      PB1200 board setup
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -45,16 +44,15 @@ void __init prom_init(void)
        unsigned char *memsize_str;
        unsigned long memsize;
-        prom_argc = (int) fw_arg0;
+        prom_argc = (int)fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg2;
+        prom_envp = (char **)fw_arg2;
        prom_init_cmdline();
        memsize_str = prom_getenv("memsize");
-        if (!memsize_str) {
+        if (!memsize_str)
                memsize = 0x08000000;
-        } else {
+        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
-        }
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/pb1200/irqmap.c b/arch/mips/au1000/pb1200/irqmap.c
index e61eb8e0b76b..2a505ad8715b 100644
--- a/arch/mips/au1000/pb1200/irqmap.c
+++ b/arch/mips/au1000/pb1200/irqmap.c
@@ -39,25 +39,25 @@
 #endif
 struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
-        { AU1000_GPIO_7, INTC_INT_LOW_LEVEL, 0 }, // This is exteranl interrupt cascade
+        /* This is external interrupt cascade */
+        { AU1000_GPIO_7, INTC_INT_LOW_LEVEL, 0 },
 };
 int __initdata au1xxx_nr_irqs = ARRAY_SIZE(au1xxx_irq_map);
 /*
- *      Support for External interrupts on the PbAu1200 Development platform.
+ * Support for External interrupts on the Pb1200 Development platform.
 */
-static volatile int pb1200_cascade_en=0;
+static volatile int pb1200_cascade_en;
-irqreturn_t pb1200_cascade_handler( int irq, void *dev_id)
+irqreturn_t pb1200_cascade_handler(int irq, void *dev_id)
 {
        unsigned short bisr = bcsr->int_status;
        int extirq_nr = 0;
-        /* Clear all the edge interrupts. This has no effect on level */
+        /* Clear all the edge interrupts. This has no effect on level. */
        bcsr->int_status = bisr;
-        for( ; bisr; bisr &= (bisr-1) )
+        for ( ; bisr; bisr &= bisr - 1) {
-        {
                extirq_nr = PB1200_INT_BEGIN + __ffs(bisr);
                /* Ack and dispatch IRQ */
                do_IRQ(extirq_nr);
@@ -68,26 +68,20 @@ irqreturn_t pb1200_cascade_handler( int irq, void *dev_id)
 inline void pb1200_enable_irq(unsigned int irq_nr)
 {
-        bcsr->intset_mask = 1<<(irq_nr - PB1200_INT_BEGIN);
+        bcsr->intset_mask = 1 << (irq_nr - PB1200_INT_BEGIN);
-        bcsr->intset = 1<<(irq_nr - PB1200_INT_BEGIN);
+        bcsr->intset = 1 << (irq_nr - PB1200_INT_BEGIN);
 }
 inline void pb1200_disable_irq(unsigned int irq_nr)
 {
-        bcsr->intclr_mask = 1<<(irq_nr - PB1200_INT_BEGIN);
+        bcsr->intclr_mask = 1 << (irq_nr - PB1200_INT_BEGIN);
-        bcsr->intclr = 1<<(irq_nr - PB1200_INT_BEGIN);
+        bcsr->intclr = 1 << (irq_nr - PB1200_INT_BEGIN);
 }
 static unsigned int pb1200_setup_cascade(void)
 {
-        int err;
+        return request_irq(AU1000_GPIO_7, &pb1200_cascade_handler,
+                           0, "Pb1200 Cascade", &pb1200_cascade_handler);
-        err = request_irq(AU1000_GPIO_7, &pb1200_cascade_handler,
-                          0, "Pb1200 Cascade", &pb1200_cascade_handler);
-        if (err)
-                return err;
-        return 0;
 }
 static unsigned int pb1200_startup_irq(unsigned int irq)
@@ -132,23 +126,23 @@ void _board_init_irq(void)
        unsigned int irq;
 #ifdef CONFIG_MIPS_PB1200
-        /* We have a problem with CPLD rev3. Enable a workaround */
+        /* We have a problem with CPLD rev 3. */
        if (((bcsr->whoami & BCSR_WHOAMI_CPLD) >> 4) <= 3) {
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("Pb1200 must be at CPLD rev4. Please have Pb1200\n");
+                printk(KERN_ERR "Pb1200 must be at CPLD rev 4. Please have Pb1200\n");
-                printk("updated to latest revision. This software will not\n");
+                printk(KERN_ERR "updated to latest revision. This software will\n");
-                printk("work on anything less than CPLD rev4\n");
+                printk(KERN_ERR "not work on anything less than CPLD rev 4.\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
                panic("Game over.  Your score is 0.");
        }
 #endif
@@ -161,6 +155,6 @@ void _board_init_irq(void)
        /*
         * GPIO_7 can not be hooked here, so it is hooked upon first
-         * request of any source attached to the cascade
+         * request of any source attached to the cascade.
         */
 }
diff --git a/arch/mips/au1000/pb1500/Makefile b/arch/mips/au1000/pb1500/Makefile
index 97a730813cd3..602f38df20bb 100644
--- a/arch/mips/au1000/pb1500/Makefile
+++ b/arch/mips/au1000/pb1500/Makefile
@@ -1,8 +1,8 @@
 #
-#  Copyright 2000,2001 MontaVista Software Inc.
+#  Copyright 2000, 2001, 2008 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
 #
 # Makefile for the Alchemy Semiconductor Pb1500 board.
+#
 lib-y := init.o board_setup.o irqmap.o
diff --git a/arch/mips/au1000/pb1500/board_setup.c b/arch/mips/au1000/pb1500/board_setup.c
index 24c652e8ec4b..035771c6e5b8 100644
--- a/arch/mips/au1000/pb1500/board_setup.c
+++ b/arch/mips/au1000/pb1500/board_setup.c
@@ -1,7 +1,6 @@
 /*
- * Copyright 2000 MontaVista Software Inc.
+ * Copyright 2000, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -32,8 +31,8 @@
 void board_reset(void)
 {
-    /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
+        /* Hit BCSR.RST_VDDI[SOFT_RESET] */
-    au_writel(0x00000000, 0xAE00001C);
+        au_writel(0x00000000, PB1500_RST_VDDI);
 }
 void __init board_setup(void)
@@ -42,7 +41,7 @@ void __init board_setup(void)
        u32 sys_freqctrl, sys_clksrc;
        sys_clksrc = sys_freqctrl = pin_func = 0;
-        // set AUX clock to 12MHz * 8 = 96 MHz
+        /* Set AUX clock to 12 MHz * 8 = 96 MHz */
        au_writel(8, SYS_AUXPLL);
        au_writel(0, SYS_PINSTATERD);
        udelay(100);
@@ -51,51 +50,48 @@ void __init board_setup(void)
        /* GPIO201 is input for PCMCIA card detect */
        /* GPIO203 is input for PCMCIA interrupt request */
-        au_writel(au_readl(GPIO2_DIR) & (u32)(~((1<<1)|(1<<3))), GPIO2_DIR);
+        au_writel(au_readl(GPIO2_DIR) & ~((1 << 1) | (1 << 3)), GPIO2_DIR);
-        /* zero and disable FREQ2 */
+        /* Zero and disable FREQ2 */
        sys_freqctrl = au_readl(SYS_FREQCTRL0);
        sys_freqctrl &= ~0xFFF00000;
        au_writel(sys_freqctrl, SYS_FREQCTRL0);
        /* zero and disable USBH/USBD clocks */
        sys_clksrc = au_readl(SYS_CLKSRC);
-        sys_clksrc &= ~0x00007FE0;
+        sys_clksrc &= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |
+                        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);
        au_writel(sys_clksrc, SYS_CLKSRC);
        sys_freqctrl = au_readl(SYS_FREQCTRL0);
        sys_freqctrl &= ~0xFFF00000;
        sys_clksrc = au_readl(SYS_CLKSRC);
-        sys_clksrc &= ~0x00007FE0;
+        sys_clksrc &= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |
+                        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);
-        // FREQ2 = aux/2 = 48 MHz
+        /* FREQ2 = aux/2 = 48 MHz */
-        sys_freqctrl |= ((0<<22) | (1<<21) | (1<<20));
+        sys_freqctrl |= (0 << SYS_FC_FRDIV2_BIT) | SYS_FC_FE2 | SYS_FC_FS2;
        au_writel(sys_freqctrl, SYS_FREQCTRL0);
        /*
         * Route 48MHz FREQ2 into USB Host and/or Device
         */
-#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
+        sys_clksrc |= SYS_CS_MUX_FQ2 << SYS_CS_MUH_BIT;
-        sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
-#endif
        au_writel(sys_clksrc, SYS_CLKSRC);
+        pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_USB;
-        pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
+        /* 2nd USB port is USB host */
-        // 2nd USB port is USB host
+        pin_func |= SYS_PF_USB;
-        pin_func |= 0x8000;
        au_writel(pin_func, SYS_PINFUNC);
 #endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
 #ifdef CONFIG_PCI
-        // Setup PCI bus controller
+        /* Setup PCI bus controller */
        au_writel(0, Au1500_PCI_CMEM);
        au_writel(0x00003fff, Au1500_CFG_BASE);
 #if defined(__MIPSEB__)
-        au_writel(0xf | (2<<6) | (1<<4), Au1500_PCI_CFG);
+        au_writel(0xf | (2 << 6) | (1 << 4), Au1500_PCI_CFG);
 #else
        au_writel(0xf, Au1500_PCI_CFG);
 #endif
@@ -112,11 +108,11 @@ void __init board_setup(void)
        /* Enable the RTC if not already enabled */
        if (!(au_readl(0xac000028) & 0x20)) {
-                printk("enabling clock ...\n");
+                printk(KERN_INFO "enabling clock ...\n");
                au_writel((au_readl(0xac000028) | 0x20), 0xac000028);
        }
        /* Put the clock in BCD mode */
-        if (au_readl(0xac00002C) & 0x4) { /* reg B */
+        if (au_readl(0xac00002c) & 0x4) { /* reg B */
                au_writel(au_readl(0xac00002c) & ~0x4, 0xac00002c);
                au_sync();
        }
diff --git a/arch/mips/au1000/pb1500/init.c b/arch/mips/au1000/pb1500/init.c
index 488507c07db9..49f51e165863 100644
--- a/arch/mips/au1000/pb1500/init.c
+++ b/arch/mips/au1000/pb1500/init.c
@@ -1,11 +1,10 @@
 /*
 *
 * BRIEF MODULE DESCRIPTION
- *      PB1500 board setup
+ *      Pb1500 board setup
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -45,16 +44,15 @@ void __init prom_init(void)
        unsigned char *memsize_str;
        unsigned long memsize;
-        prom_argc = (int) fw_arg0;
+        prom_argc = (int)fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg2;
+        prom_envp = (char **)fw_arg2;
        prom_init_cmdline();
        memsize_str = prom_getenv("memsize");
-        if (!memsize_str) {
+        if (!memsize_str)
                memsize = 0x04000000;
-        } else {
+        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
-        }
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/pb1500/irqmap.c b/arch/mips/au1000/pb1500/irqmap.c
index 4817ab44d07f..39c4682766a8 100644
--- a/arch/mips/au1000/pb1500/irqmap.c
+++ b/arch/mips/au1000/pb1500/irqmap.c
@@ -31,12 +31,12 @@
 #include <asm/mach-au1x00/au1000.h>
 char irq_tab_alchemy[][5] __initdata = {
- [12] = { -1, INTA, INTX, INTX, INTX},   /* IDSEL 12 - HPT370   */
+        [12] = { -1, INTA, INTX, INTX, INTX },   /* IDSEL 12 - HPT370   */
- [13] = { -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot */
+        [13] = { -1, INTA, INTB, INTC, INTD },   /* IDSEL 13 - PCI slot */
 };
 struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
-        { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},
+        { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0 },
        { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },
        { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },
        { AU1500_GPIO_203, INTC_INT_LOW_LEVEL, 0 },
diff --git a/arch/mips/au1000/pb1550/Makefile b/arch/mips/au1000/pb1550/Makefile
index aa35bc6cb8cf..7d8beca87fa5 100644
--- a/arch/mips/au1000/pb1550/Makefile
+++ b/arch/mips/au1000/pb1550/Makefile
@@ -1,9 +1,8 @@
 #
-#  Copyright 2000 MontaVista Software Inc.
+#  Copyright 2000, 2008 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
 #
-# Makefile for the Alchemy Semiconductor PB1000 board.
+# Makefile for the Alchemy Semiconductor Pb1550 board.
 #
 lib-y := init.o board_setup.o irqmap.o
diff --git a/arch/mips/au1000/pb1550/board_setup.c b/arch/mips/au1000/pb1550/board_setup.c
index 45d60872b565..0ed76b64b6ab 100644
--- a/arch/mips/au1000/pb1550/board_setup.c
+++ b/arch/mips/au1000/pb1550/board_setup.c
@@ -3,9 +3,8 @@
 * BRIEF MODULE DESCRIPTION
 *      Alchemy Pb1550 board setup.
 *
- * Copyright 2000 MontaVista Software Inc.
+ * Copyright 2000, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -35,15 +34,16 @@
 void board_reset(void)
 {
-    /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
+        /* Hit BCSR.SYSTEM[RESET] */
-        au_writew(au_readw(0xAF00001C) & ~(1<<15), 0xAF00001C);
+        au_writew(au_readw(0xAF00001C) & ~BCSR_SYSTEM_RESET, 0xAF00001C);
 }
 void __init board_setup(void)
 {
        u32 pin_func;
-        /* Enable PSC1 SYNC for AC97.  Normaly done in audio driver,
+        /*
+         * Enable PSC1 SYNC for AC'97.  Normaly done in audio driver,
         * but it is board specific code, so put it here.
         */
        pin_func = au_readl(SYS_PINFUNC);
@@ -51,8 +51,8 @@ void __init board_setup(void)
        pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1;
        au_writel(pin_func, SYS_PINFUNC);
-        au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */
+        au_writel(0, (u32)bcsr | 0x10); /* turn off PCMCIA power */
        au_sync();
-        printk("AMD Alchemy Pb1550 Board\n");
+        printk(KERN_INFO "AMD Alchemy Pb1550 Board\n");
 }
diff --git a/arch/mips/au1000/pb1550/init.c b/arch/mips/au1000/pb1550/init.c
index f6b2fc587980..1b5f58434bb7 100644
--- a/arch/mips/au1000/pb1550/init.c
+++ b/arch/mips/au1000/pb1550/init.c
@@ -1,11 +1,10 @@
 /*
 *
 * BRIEF MODULE DESCRIPTION
- *      PB1550 board setup
+ *      Pb1550 board setup
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -45,16 +44,15 @@ void __init prom_init(void)
        unsigned char *memsize_str;
        unsigned long memsize;
-        prom_argc = (int) fw_arg0;
+        prom_argc = (int)fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg2;
+        prom_envp = (char **)fw_arg2;
        prom_init_cmdline();
        memsize_str = prom_getenv("memsize");
-        if (!memsize_str) {
+        if (!memsize_str)
                memsize = 0x08000000;
-        } else {
+        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
-        }
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/pb1550/irqmap.c b/arch/mips/au1000/pb1550/irqmap.c
index e1dac37af08a..a02a4d1fa899 100644
--- a/arch/mips/au1000/pb1550/irqmap.c
+++ b/arch/mips/au1000/pb1550/irqmap.c
@@ -1,6 +1,6 @@
 /*
 * BRIEF MODULE DESCRIPTION
- *      Au1xxx irq map table
+ *      Au1xx0 IRQ map table
 *
 * Copyright 2003 Embedded Edge, LLC
 *              dan@embeddededge.com
@@ -31,8 +31,8 @@
 #include <asm/mach-au1x00/au1000.h>
 char irq_tab_alchemy[][5] __initdata = {
- [12] = { -1, INTB, INTC, INTD, INTA},   /* IDSEL 12 - PCI slot 2 (left)  */
+        [12] = { -1, INTB, INTC, INTD, INTA }, /* IDSEL 12 - PCI slot 2 (left)  */
- [13] = { -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot 1 (right) */
+        [13] = { -1, INTA, INTB, INTC, INTD }, /* IDSEL 13 - PCI slot 1 (right) */
 };
 struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
diff --git a/arch/mips/au1000/xxs1500/Makefile b/arch/mips/au1000/xxs1500/Makefile
index 44d7f7056ae7..db3c526f64d8 100644
--- a/arch/mips/au1000/xxs1500/Makefile
+++ b/arch/mips/au1000/xxs1500/Makefile
@@ -1,7 +1,6 @@
 #
 #  Copyright 2003 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
 #
 # Makefile for MyCable XXS1500 board.
 #
diff --git a/arch/mips/au1000/xxs1500/board_setup.c b/arch/mips/au1000/xxs1500/board_setup.c
index 79d1798621bf..4c587acac5c3 100644
--- a/arch/mips/au1000/xxs1500/board_setup.c
+++ b/arch/mips/au1000/xxs1500/board_setup.c
@@ -1,7 +1,6 @@
 /*
- * Copyright 2000-2003 MontaVista Software Inc.
+ * Copyright 2000-2003, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -39,40 +38,40 @@ void __init board_setup(void)
 {
        u32 pin_func;
-        // set multiple use pins (UART3/GPIO) to UART (it's used as UART too)
+        /* Set multiple use pins (UART3/GPIO) to UART (it's used as UART too) */
-        pin_func = au_readl(SYS_PINFUNC) & (u32)(~SYS_PF_UR3);
+        pin_func  = au_readl(SYS_PINFUNC) & ~SYS_PF_UR3;
        pin_func |= SYS_PF_UR3;
        au_writel(pin_func, SYS_PINFUNC);
-        // enable UART
+        /* Enable UART */
-        au_writel(0x01, UART3_ADDR+UART_MOD_CNTRL); // clock enable (CE)
+        au_writel(0x01, UART3_ADDR + UART_MOD_CNTRL); /* clock enable (CE) */
        mdelay(10);
-        au_writel(0x03, UART3_ADDR+UART_MOD_CNTRL); // CE and "enable"
+        au_writel(0x03, UART3_ADDR + UART_MOD_CNTRL); /* CE and "enable" */
        mdelay(10);
-        // enable DTR = USB power up
+        /* Enable DTR = USB power up */
-        au_writel(0x01, UART3_ADDR+UART_MCR); //? UART_MCR_DTR is 0x01???
+        au_writel(0x01, UART3_ADDR + UART_MCR); /* UART_MCR_DTR is 0x01??? */
 #ifdef CONFIG_PCMCIA_XXS1500
-        /* setup pcmcia signals */
+        /* Setup PCMCIA signals */
        au_writel(0, SYS_PININPUTEN);
-        /* gpio 0, 1, and 4 are inputs */
+        /* GPIO 0, 1, and 4 are inputs */
-        au_writel(1 | (1<<1) | (1<<4), SYS_TRIOUTCLR);
+        au_writel(1 | (1 << 1) | (1 << 4), SYS_TRIOUTCLR);
-        /* enable GPIO2 if not already enabled */
+        /* Enable GPIO2 if not already enabled */
        au_writel(1, GPIO2_ENABLE);
-        /* gpio2 208/9/10/11 are inputs */
+        /* GPIO2 208/9/10/11 are inputs */
-        au_writel((1<<8) | (1<<9) | (1<<10) | (1<<11), GPIO2_DIR);
+        au_writel((1 << 8) | (1 << 9) | (1 << 10) | (1 << 11), GPIO2_DIR);
-        /* turn off power */
+        /* Turn off power */
-        au_writel((au_readl(GPIO2_PINSTATE) & ~(1<<14))|(1<<30), GPIO2_OUTPUT);
+        au_writel((au_readl(GPIO2_PINSTATE) & ~(1 << 14)) | (1 << 30),
+                  GPIO2_OUTPUT);
 #endif
 #ifdef CONFIG_PCI
 #if defined(__MIPSEB__)
-        au_writel(0xf | (2<<6) | (1<<4), Au1500_PCI_CFG);
+        au_writel(0xf | (2 << 6) | (1 << 4), Au1500_PCI_CFG);
 #else
        au_writel(0xf, Au1500_PCI_CFG);
 #endif
diff --git a/arch/mips/au1000/xxs1500/init.c b/arch/mips/au1000/xxs1500/init.c
index 24fc6e132dc0..b849bf501c04 100644
--- a/arch/mips/au1000/xxs1500/init.c
+++ b/arch/mips/au1000/xxs1500/init.c
@@ -2,9 +2,8 @@
 * BRIEF MODULE DESCRIPTION
 *      XXS1500 board setup
 *
- * Copyright 2003 MontaVista Software Inc.
+ * Copyright 2003, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -45,8 +44,8 @@ void __init prom_init(void)
        unsigned long memsize;
        prom_argc = fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg2;
+        prom_envp = (char **)fw_arg2;
        prom_init_cmdline();
@@ -54,6 +53,6 @@ void __init prom_init(void)
        if (!memsize_str)
                memsize = 0x04000000;
        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/xxs1500/irqmap.c b/arch/mips/au1000/xxs1500/irqmap.c
index dd6e3d1eb4d4..edf06ed11870 100644
--- a/arch/mips/au1000/xxs1500/irqmap.c
+++ b/arch/mips/au1000/xxs1500/irqmap.c
@@ -31,7 +31,7 @@
 #include <asm/mach-au1x00/au1000.h>
 struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
-        { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},
+        { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0 },
        { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },
        { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },
        { AU1500_GPIO_203, INTC_INT_LOW_LEVEL, 0 },
diff --git a/arch/mips/emma2rh/markeins/setup.c b/arch/mips/emma2rh/markeins/setup.c
index 82f9e9013e70..62bfb455d1b1 100644
--- a/arch/mips/emma2rh/markeins/setup.c
+++ b/arch/mips/emma2rh/markeins/setup.c
@@ -76,7 +76,9 @@ static void markeins_machine_power_off(void)
        while (1) ;
 }
-static unsigned long clock[4] = { 166500000, 187312500, 199800000, 210600000 };
+static unsigned long __initdata emma2rh_clock[4] = {
+        166500000, 187312500, 199800000, 210600000
+};
 static unsigned int __init detect_bus_frequency(unsigned long rtc_base)
 {
@@ -85,7 +87,8 @@ static unsigned int __init detect_bus_frequency(unsigned long rtc_base)
        /* detect from boot strap */
        reg = emma2rh_in32(EMMA2RH_BHIF_STRAP_0);
        reg = (reg >> 4) & 0x3;
-        return clock[reg];
+        return emma2rh_clock[reg];
 }
 void __init plat_time_init(void)
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 45545be3eb86..cc0244036aec 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -56,9 +56,9 @@ obj-$(CONFIG_MIPS_MT_SMP)	+= smp-mt.o
 obj-$(CONFIG_MIPS_CMP)          += smp-cmp.o
 obj-$(CONFIG_CPU_MIPSR2)        += spram.o
-obj-$(CONFIG_MIPS_APSP_KSPD)    += kspd.o
 obj-$(CONFIG_MIPS_VPE_LOADER)   += vpe.o
 obj-$(CONFIG_MIPS_VPE_APSP_API) += rtlx.o
+obj-$(CONFIG_MIPS_APSP_KSPD)    += kspd.o
 obj-$(CONFIG_I8259)             += i8259.o
 obj-$(CONFIG_IRQ_CPU)           += irq_cpu.o
diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c
index a1b48af0992f..02b7713cf71c 100644
--- a/arch/mips/kernel/cpu-bugs64.c
+++ b/arch/mips/kernel/cpu-bugs64.c
@@ -38,7 +38,7 @@ static inline void align_mod(const int align, const int mod)
                ".endr\n\t"
                ".set   pop"
                :
-                : GCC_IMM_ASM(align), GCC_IMM_ASM(mod));
+                : GCC_IMM_ASM() (align), GCC_IMM_ASM() (mod));
 }
 static inline void mult_sh_align_mod(long *v1, long *v2, long *w,
diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c
index 290d8e3a664d..469c7237e5ba 100644
--- a/arch/mips/kernel/irixelf.c
+++ b/arch/mips/kernel/irixelf.c
@@ -578,7 +578,7 @@ static inline int map_interpreter(struct elf_phdr *epp, struct elfhdr *ihp,
 * process and the system, here we map the page and fill the
 * structure
 */
-static void irix_map_prda_page(void)
+static int irix_map_prda_page(void)
 {
        unsigned long v;
        struct prda *pp;
@@ -587,8 +587,8 @@ static void irix_map_prda_page(void)
        v =  do_brk(PRDA_ADDRESS, PAGE_SIZE);
        up_write(&current->mm->mmap_sem);
-        if (v < 0)
+        if (v != PRDA_ADDRESS)
-                return;
+                return v;               /* v must be an error code */
        pp = (struct prda *) v;
        pp->prda_sys.t_pid  = task_pid_vnr(current);
@@ -596,6 +596,8 @@ static void irix_map_prda_page(void)
        pp->prda_sys.t_rpid = task_pid_vnr(current);
        /* We leave the rest set to zero */
+        return 0;
 }
@@ -781,7 +783,8 @@ static int load_irix_binary(struct linux_binprm * bprm, struct pt_regs * regs)
         * IRIX maps a page at 0x200000 which holds some system
         * information.  Programs depend on this.
         */
-        irix_map_prda_page();
+        if (irix_map_prda_page())
+                goto out_free_dentry;
        padzero(elf_bss);
diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c
index ceb62dce1c9c..b0591ae0ce56 100644
--- a/arch/mips/kernel/kspd.c
+++ b/arch/mips/kernel/kspd.c
@@ -257,7 +257,7 @@ void sp_work_handle_request(void)
                vcwd = vpe_getcwd(tclimit);
-                /* change to the cwd of the process that loaded the SP program */
+                /* change to cwd of the process that loaded the SP program */
                old_fs = get_fs();
                set_fs(KERNEL_DS);
                sys_chdir(vcwd);
@@ -323,6 +323,9 @@ static void sp_cleanup(void)
                        set >>= 1;
                }
        }
+        /* Put daemon cwd back to root to avoid umount problems */
+        sys_chdir("/");
 }
 static int channel_open = 0;
diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index 0233798f7155..b88f1c18ff4d 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -72,6 +72,15 @@ static void rtlx_dispatch(void)
 static irqreturn_t rtlx_interrupt(int irq, void *dev_id)
 {
        int i;
+        unsigned int flags, vpeflags;
+        /* Ought not to be strictly necessary for SMTC builds */
+        local_irq_save(flags);
+        vpeflags = dvpe();
+        set_c0_status(0x100 << MIPS_CPU_RTLX_IRQ);
+        irq_enable_hazard();
+        evpe(vpeflags);
+        local_irq_restore(flags);
        for (i = 0; i < RTLX_CHANNELS; i++) {
                        wake_up(&channel_wqs[i].lx_queue);
@@ -108,7 +117,8 @@ static void __used dump_rtlx(void)
 static int rtlx_init(struct rtlx_info *rtlxi)
 {
        if (rtlxi->id != RTLX_ID) {
-                printk(KERN_ERR "no valid RTLX id at 0x%p 0x%lx\n", rtlxi, rtlxi->id);
+                printk(KERN_ERR "no valid RTLX id at 0x%p 0x%lx\n",
+                        rtlxi, rtlxi->id);
                return -ENOEXEC;
        }
@@ -162,18 +172,17 @@ int rtlx_open(int index, int can_sleep)
        if (rtlx == NULL) {
                if( (p = vpe_get_shared(tclimit)) == NULL) {
-                        if (can_sleep) {
+                    if (can_sleep) {
-                                __wait_event_interruptible(channel_wqs[index].lx_queue,
+                        __wait_event_interruptible(channel_wqs[index].lx_queue,
-                                                           (p = vpe_get_shared(tclimit)),
+                                (p = vpe_get_shared(tclimit)), ret);
-                                                           ret);
+                        if (ret)
-                                if (ret)
-                                        goto out_fail;
-                        } else {
-                                printk(KERN_DEBUG "No SP program loaded, and device "
-                                        "opened with O_NONBLOCK\n");
-                                ret = -ENOSYS;
                                goto out_fail;
-                        }
+                    } else {
+                        printk(KERN_DEBUG "No SP program loaded, and device "
+                                        "opened with O_NONBLOCK\n");
+                        ret = -ENOSYS;
+                        goto out_fail;
+                    }
                }
                smp_rmb();
@@ -182,7 +191,9 @@ int rtlx_open(int index, int can_sleep)
                                DEFINE_WAIT(wait);
                                for (;;) {
-                                        prepare_to_wait(&channel_wqs[index].lx_queue, &wait, TASK_INTERRUPTIBLE);
+                                        prepare_to_wait(
+                                                &channel_wqs[index].lx_queue,
+                                                &wait, TASK_INTERRUPTIBLE);
                                        smp_rmb();
                                        if (*p != NULL)
                                                break;
@@ -195,7 +206,7 @@ int rtlx_open(int index, int can_sleep)
                                }
                                finish_wait(&channel_wqs[index].lx_queue, &wait);
                        } else {
-                                printk(" *vpe_get_shared is NULL. "
+                                pr_err(" *vpe_get_shared is NULL. "
                                       "Has an SP program been loaded?\n");
                                ret = -ENOSYS;
                                goto out_fail;
@@ -203,8 +214,9 @@ int rtlx_open(int index, int can_sleep)
                }
                if ((unsigned int)*p < KSEG0) {
-                        printk(KERN_WARNING "vpe_get_shared returned an invalid pointer "
+                        printk(KERN_WARNING "vpe_get_shared returned an "
-                               "maybe an error code %d\n", (int)*p);
+                               "invalid pointer maybe an error code %d\n",
+                               (int)*p);
                        ret = -ENOSYS;
                        goto out_fail;
                }
@@ -232,6 +244,10 @@ out_ret:
 int rtlx_release(int index)
 {
+        if (rtlx == NULL) {
+                pr_err("rtlx_release() with null rtlx\n");
+                return 0;
+        }
        rtlx->channel[index].lx_state = RTLX_STATE_UNUSED;
        return 0;
 }
@@ -251,8 +267,8 @@ unsigned int rtlx_read_poll(int index, int can_sleep)
                        int ret = 0;
                        __wait_event_interruptible(channel_wqs[index].lx_queue,
-                                                   chan->lx_read != chan->lx_write || sp_stopping,
+                                (chan->lx_read != chan->lx_write) ||
-                                                   ret);
+                                sp_stopping, ret);
                        if (ret)
                                return ret;
@@ -282,7 +298,9 @@ static inline int write_spacefree(int read, int write, int size)
 unsigned int rtlx_write_poll(int index)
 {
        struct rtlx_channel *chan = &rtlx->channel[index];
-        return write_spacefree(chan->rt_read, chan->rt_write, chan->buffer_size);
+        return write_spacefree(chan->rt_read, chan->rt_write,
+                                chan->buffer_size);
 }
 ssize_t rtlx_read(int index, void __user *buff, size_t count)
@@ -344,8 +362,8 @@ ssize_t rtlx_write(int index, const void __user *buffer, size_t count)
        rt_read = rt->rt_read;
        /* total number of bytes to copy */
-        count = min(count,
+        count = min(count, (size_t)write_spacefree(rt_read, rt->rt_write,
-                    (size_t)write_spacefree(rt_read, rt->rt_write, rt->buffer_size));
+                                                        rt->buffer_size));
        /* first bit from write pointer to the end of the buffer, or count */
        fl = min(count, (size_t) rt->buffer_size - rt->rt_write);
@@ -514,6 +532,11 @@ static int __init rtlx_module_init(void)
        if (cpu_has_vint)
                set_vi_handler(MIPS_CPU_RTLX_IRQ, rtlx_dispatch);
+        else {
+                pr_err("APRP RTLX init on non-vectored-interrupt processor\n");
+                err = -ENODEV;
+                goto out_chrdev;
+        }
        rtlx_irq.dev_id = rtlx;
        setup_irq(rtlx_irq_num, &rtlx_irq);
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 39f3dfe134fb..c6a063b2a0d9 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -331,6 +331,7 @@ static void __init bootmem_init(void)
        /*
         * Determine low and high memory ranges
         */
+        max_pfn = max_low_pfn;
        if (max_low_pfn > PFN_DOWN(HIGHMEM_START)) {
 #ifdef CONFIG_HIGHMEM
                highstart_pfn = PFN_DOWN(HIGHMEM_START);
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 33780cc61ce9..63370cdd3c90 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -87,8 +87,8 @@ struct plat_smp_ops *mp_ops;
 __cpuinit void register_smp_ops(struct plat_smp_ops *ops)
 {
-        if (ops)
+        if (mp_ops)
-                printk(KERN_WARNING "Overriding previous set SMP ops\n");
+                printk(KERN_WARNING "Overriding previously set SMP ops\n");
        mp_ops = ops;
 }
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 39804c584edd..2794501ff302 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -269,7 +269,7 @@ static void *alloc_progmem(unsigned long len)
         * This means you must tell Linux to use less memory than you
         * physically have, for example by passing a mem= boot argument.
         */
-        addr = pfn_to_kaddr(max_pfn);
+        addr = pfn_to_kaddr(max_low_pfn);
        memset(addr, 0, len);
 #else
        /* simple grab some mem for now */
@@ -781,10 +781,15 @@ static int vpe_run(struct vpe * v)
        /* take system out of configuration state */
        clear_c0_mvpcontrol(MVPCONTROL_VPC);
+        /*
+         * SMTC/SMVP kernels manage VPE enable independently,
+         * but uniprocessor kernels need to turn it on, even
+         * if that wasn't the pre-dvpe() state.
+         */
 #ifdef CONFIG_SMP
-        evpe(EVPE_ENABLE);
-#else
        evpe(vpeflags);
+#else
+        evpe(EVPE_ENABLE);
 #endif
        emt(dmt_flag);
        local_irq_restore(flags);
@@ -840,7 +845,7 @@ static int vpe_elfload(struct vpe * v)
        /* Sanity checks against insmoding binaries or wrong arch,
           weird elf version */
-        if (memcmp(hdr->e_ident, ELFMAG, 4) != 0
+        if (memcmp(hdr->e_ident, ELFMAG, SELFMAG) != 0
            || (hdr->e_type != ET_REL && hdr->e_type != ET_EXEC)
            || !elf_check_arch(hdr)
            || hdr->e_shentsize != sizeof(*sechdrs)) {
@@ -947,12 +952,14 @@ static int vpe_elfload(struct vpe * v)
                struct elf_phdr *phdr = (struct elf_phdr *) ((char *)hdr + hdr->e_phoff);
                for (i = 0; i < hdr->e_phnum; i++) {
-                        if (phdr->p_type != PT_LOAD)
+                        if (phdr->p_type == PT_LOAD) {
-                                continue;
+                                memcpy((void *)phdr->p_paddr,
+                                       (char *)hdr + phdr->p_offset,
-                        memcpy((void *)phdr->p_paddr, (char *)hdr + phdr->p_offset, phdr->p_filesz);
+                                       phdr->p_filesz);
-                        memset((void *)phdr->p_paddr + phdr->p_filesz, 0, phdr->p_memsz - phdr->p_filesz);
+                                memset((void *)phdr->p_paddr + phdr->p_filesz,
-                        phdr++;
+                                       0, phdr->p_memsz - phdr->p_filesz);
+                    }
+                    phdr++;
                }
                for (i = 0; i < hdr->e_shnum; i++) {
@@ -1107,7 +1114,7 @@ static int vpe_release(struct inode *inode, struct file *filp)
                return -ENODEV;
        hdr = (Elf_Ehdr *) v->pbuffer;
-        if (memcmp(hdr->e_ident, ELFMAG, 4) == 0) {
+        if (memcmp(hdr->e_ident, ELFMAG, SELFMAG) == 0) {
                if (vpe_elfload(v) >= 0) {
                        vpe_run(v);
                } else {
diff --git a/arch/mips/mm/highmem.c b/arch/mips/mm/highmem.c
index 10dd2af2343b..8f2cd8eda741 100644
--- a/arch/mips/mm/highmem.c
+++ b/arch/mips/mm/highmem.c
@@ -116,4 +116,3 @@ EXPORT_SYMBOL(__kmap);
 EXPORT_SYMBOL(__kunmap);
 EXPORT_SYMBOL(__kmap_atomic);
 EXPORT_SYMBOL(__kunmap_atomic);
-EXPORT_SYMBOL(__kmap_atomic_to_page);
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index da8cbb6899dc..b40df7d2cf44 100644
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -281,7 +281,7 @@ static inline int n_counters(void)
 static void reset_counters(void *arg)
 {
-        int counters = (int)arg;
+        int counters = (int)(long)arg;
        switch (counters) {
        case 4:
                w_c0_perfctrl3(0);
@@ -313,7 +313,7 @@ static int __init mipsxx_init(void)
        if (!cpu_has_mipsmt_pertccounters)
                counters = counters_total_to_per_cpu(counters);
 #endif
-        on_each_cpu(reset_counters, (void *)counters, 0, 1);
+        on_each_cpu(reset_counters, (void *)(long)counters, 0, 1);
        op_model_mipsxx_ops.num_counters = counters;
        switch (current_cpu_type()) {
@@ -382,7 +382,7 @@ static void mipsxx_exit(void)
        int counters = op_model_mipsxx_ops.num_counters;
        counters = counters_per_cpu_to_total(counters);
-        on_each_cpu(reset_counters, (void *)counters, 0, 1);
+        on_each_cpu(reset_counters, (void *)(long)counters, 0, 1);
        perf_irq = save_perf_irq;
 }
diff --git a/arch/mips/pci/fixup-au1000.c b/arch/mips/pci/fixup-au1000.c
index 00c36c9dbe0e..e2ddfc49237c 100644
--- a/arch/mips/pci/fixup-au1000.c
+++ b/arch/mips/pci/fixup-au1000.c
@@ -1,10 +1,9 @@
 /*
 * BRIEF MODULE DESCRIPTION
- *      Board specific pci fixups.
+ *      Board specific PCI fixups.
 *
- * Copyright 2001-2003 MontaVista Software Inc.
+ * Copyright 2001-2003, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
diff --git a/arch/mips/pci/ops-au1000.c b/arch/mips/pci/ops-au1000.c
index 1314bd58f036..9a57c5ab91dd 100644
--- a/arch/mips/pci/ops-au1000.c
+++ b/arch/mips/pci/ops-au1000.c
@@ -1,10 +1,9 @@
 /*
 * BRIEF MODULE DESCRIPTION
- *      Alchemy/AMD Au1x00 PCI support.
+ *      Alchemy/AMD Au1xx0 PCI support.
 *
- * Copyright 2001-2003, 2007 MontaVista Software Inc.
+ * Copyright 2001-2003, 2007-2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  Support for all devices (greater than 16) added by David Gathright.
 *
@@ -28,6 +27,7 @@
 *  with this program; if not, write  to the Free Software Foundation, Inc.,
 *  675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
@@ -36,9 +36,9 @@
 #include <asm/mach-au1x00/au1000.h>
-#undef DEBUG
+#undef  DEBUG
-#ifdef DEBUG
+#ifdef  DEBUG
-#define DBG(x...) printk(x)
+#define DBG(x...) printk(KERN_DEBUG x)
 #else
 #define DBG(x...)
 #endif
@@ -46,7 +46,6 @@
 #define PCI_ACCESS_READ  0
 #define PCI_ACCESS_WRITE 1
 int (*board_pci_idsel)(unsigned int devsel, int assert);
 void mod_wired_entry(int entry, unsigned long entrylo0,
@@ -92,10 +91,9 @@ void __init au1x_pci_cfg_init(void)
 }
 static int config_access(unsigned char access_type, struct pci_bus *bus,
-                         unsigned int dev_fn, unsigned char where,
+                         unsigned int dev_fn, unsigned char where, u32 *data)
-                         u32 * data)
 {
-#if defined( CONFIG_SOC_AU1500 ) || defined( CONFIG_SOC_AU1550 )
+#if defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550)
        unsigned int device = PCI_SLOT(dev_fn);
        unsigned int function = PCI_FUNC(dev_fn);
        unsigned long offset, status;
@@ -114,38 +112,36 @@ static int config_access(unsigned char access_type, struct pci_bus *bus,
                        Au1500_PCI_STATCMD);
        au_sync_udelay(1);
-        /* Allow board vendors to implement their own off-chip idsel.
+        /*
+         * Allow board vendors to implement their own off-chip IDSEL.
         * If it doesn't succeed, may as well bail out at this point.
         */
-        if (board_pci_idsel) {
+        if (board_pci_idsel && board_pci_idsel(device, 1) == 0) {
-                if (board_pci_idsel(device, 1) == 0) {
+                *data = 0xffffffff;
-                        *data = 0xffffffff;
+                local_irq_restore(flags);
-                        local_irq_restore(flags);
+                return -1;
-                        return -1;
-                }
        }
-        /* setup the config window */
+        /* Setup the config window */
-        if (bus->number == 0) {
+        if (bus->number == 0)
-                cfg_base = ((1<<device)<<11);
+                cfg_base = (1 << device) << 11;
-        } else {
+        else
-                cfg_base = 0x80000000 | (bus->number<<16) | (device<<11);
+                cfg_base = 0x80000000 | (bus->number << 16) | (device << 11);
-        }
-        /* setup the lower bits of the 36 bit address */
+        /* Setup the lower bits of the 36-bit address */
-        offset = (function << 8) | (where & ~0x3);
+        offset = (function << 8) | (where & ~0x3);
-        /* pick up any address that falls below the page mask */
+        /* Pick up any address that falls below the page mask */
        offset |= cfg_base & ~PAGE_MASK;
-        /* page boundary */
+        /* Page boundary */
        cfg_base = cfg_base & PAGE_MASK;
        /*
         * To improve performance, if the current device is the same as
         * the last device accessed, we don't touch the TLB.
         */
-        entryLo0 = (6 << 26)  | (cfg_base >> 6) | (2 << 3) | 7;
+        entryLo0 = (6 << 26) | (cfg_base >> 6) | (2 << 3) | 7;
-        entryLo1 = (6 << 26)  | (cfg_base >> 6) | (0x1000 >> 6) | (2 << 3) | 7;
+        entryLo1 = (6 << 26) | (cfg_base >> 6) | (0x1000 >> 6) | (2 << 3) | 7;
        if ((entryLo0 != last_entryLo0) || (entryLo1 != last_entryLo1)) {
                mod_wired_entry(pci_cfg_wired_entry, entryLo0, entryLo1,
                                (unsigned long)pci_cfg_vm->addr, PM_4K);
@@ -153,38 +149,37 @@ static int config_access(unsigned char access_type, struct pci_bus *bus,
                last_entryLo1 = entryLo1;
        }
-        if (access_type == PCI_ACCESS_WRITE) {
+        if (access_type == PCI_ACCESS_WRITE)
                au_writel(*data, (int)(pci_cfg_vm->addr + offset));
-        } else {
+        else
                *data = au_readl((int)(pci_cfg_vm->addr + offset));
-        }
        au_sync_udelay(2);
-        DBG("cfg_access %d bus->number %d dev %d at %x *data %x conf %x\n",
+        DBG("cfg_access %d bus->number %u dev %u at %x *data %x conf %lx\n",
-                        access_type, bus->number, device, where, *data, offset);
+            access_type, bus->number, device, where, *data, offset);
-        /* check master abort */
+        /* Check master abort */
        status = au_readl(Au1500_PCI_STATCMD);
-        if (status & (1<<29)) {
+        if (status & (1 << 29)) {
                *data = 0xffffffff;
                error = -1;
                DBG("Au1x Master Abort\n");
        } else if ((status >> 28) & 0xf) {
-                DBG("PCI ERR detected: device %d, status %x\n", device, ((status >> 28) & 0xf));
+                DBG("PCI ERR detected: device %u, status %lx\n",
+                    device, (status >> 28) & 0xf);
-                /* clear errors */
+                /* Clear errors */
                au_writel(status & 0xf000ffff, Au1500_PCI_STATCMD);
                *data = 0xffffffff;
                error = -1;
        }
-        /* Take away the idsel.
+        /* Take away the IDSEL. */
-        */
+        if (board_pci_idsel)
-        if (board_pci_idsel) {
                (void)board_pci_idsel(device, 0);
-        }
        local_irq_restore(flags);
        return error;
@@ -192,7 +187,7 @@ static int config_access(unsigned char access_type, struct pci_bus *bus,
 }
 static int read_config_byte(struct pci_bus *bus, unsigned int devfn,
-                            int where, u8 * val)
+                            int where,  u8 *val)
 {
        u32 data;
        int ret;
@@ -206,9 +201,8 @@ static int read_config_byte(struct pci_bus *bus, unsigned int devfn,
        return ret;
 }
 static int read_config_word(struct pci_bus *bus, unsigned int devfn,
-                            int where, u16 * val)
+                            int where, u16 *val)
 {
        u32 data;
        int ret;
@@ -221,7 +215,7 @@ static int read_config_word(struct pci_bus *bus, unsigned int devfn,
 }
 static int read_config_dword(struct pci_bus *bus, unsigned int devfn,
-                             int where, u32 * val)
+                             int where, u32 *val)
 {
        int ret;
@@ -229,9 +223,8 @@ static int read_config_dword(struct pci_bus *bus, unsigned int devfn,
        return ret;
 }
-static int
+static int write_config_byte(struct pci_bus *bus, unsigned int devfn,
-write_config_byte(struct pci_bus *bus, unsigned int devfn, int where,
+                             int where, u8 val)
-                  u8 val)
 {
        u32 data = 0;
@@ -239,7 +232,7 @@ write_config_byte(struct pci_bus *bus, unsigned int devfn, int where,
                return -1;
        data = (data & ~(0xff << ((where & 3) << 3))) |
-            (val << ((where & 3) << 3));
+               (val << ((where & 3) << 3));
        if (config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data))
                return -1;
@@ -247,9 +240,8 @@ write_config_byte(struct pci_bus *bus, unsigned int devfn, int where,
        return PCIBIOS_SUCCESSFUL;
 }
-static int
+static int write_config_word(struct pci_bus *bus, unsigned int devfn,
-write_config_word(struct pci_bus *bus, unsigned int devfn, int where,
+                             int where, u16 val)
-                  u16 val)
 {
        u32 data = 0;
@@ -257,18 +249,16 @@ write_config_word(struct pci_bus *bus, unsigned int devfn, int where,
                return -1;
        data = (data & ~(0xffff << ((where & 3) << 3))) |
-            (val << ((where & 3) << 3));
+               (val << ((where & 3) << 3));
        if (config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data))
                return -1;
        return PCIBIOS_SUCCESSFUL;
 }
-static int
+static int write_config_dword(struct pci_bus *bus, unsigned int devfn,
-write_config_dword(struct pci_bus *bus, unsigned int devfn, int where,
+                              int where, u32 val)
-                   u32 val)
 {
        if (config_access(PCI_ACCESS_WRITE, bus, devfn, where, &val))
                return -1;
@@ -277,18 +267,20 @@ write_config_dword(struct pci_bus *bus, unsigned int devfn, int where,
 }
 static int config_read(struct pci_bus *bus, unsigned int devfn,
-                       int where, int size, u32 * val)
+                       int where, int size, u32 *val)
 {
        switch (size) {
        case 1: {
                        u8 _val;
                        int rc = read_config_byte(bus, devfn, where, &_val);
                        *val = _val;
                        return rc;
                }
-       case 2: {
+        case 2: {
                        u16 _val;
                        int rc = read_config_word(bus, devfn, where, &_val);
                        *val = _val;
                        return rc;
                }
@@ -310,7 +302,6 @@ static int config_write(struct pci_bus *bus, unsigned int devfn,
        }
 }
 struct pci_ops au1x_pci_ops = {
        config_read,
        config_write
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
index ab96a2d7f4c4..11769b55438c 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
@@ -126,9 +126,6 @@ static irqreturn_t hwbutton_handler(int irq, void *data)
        struct hwbutton_interrupt *hirq = data;
        unsigned long cic_ext = *CIC_EXT_CFG_REG;
-        if (irq != hirq->irq)
-                return IRQ_NONE;
        if (CIC_EXT_IS_ACTIVE_HI(cic_ext, hirq->eirq)) {
                /* Interrupt: pin is now HI */
                CIC_EXT_SET_ACTIVE_LO(cic_ext, hirq->eirq);
@@ -164,7 +161,7 @@ static int msp_hwbutton_register(struct hwbutton_interrupt *hirq)
        *CIC_EXT_CFG_REG = cic_ext;
        return request_irq(hirq->irq, hwbutton_handler, IRQF_DISABLED,
-                                hirq->name, (void *)hirq);
+                           hirq->name, hirq);
 }
 static int __init msp_hwbutton_setup(void)
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c
index 25d3baf0ebc4..9cebc9e7da63 100644
--- a/arch/mips/sgi-ip27/ip27-timer.c
+++ b/arch/mips/sgi-ip27/ip27-timer.c
@@ -158,7 +158,7 @@ static void rt_set_mode(enum clock_event_mode mode,
        }
 }
-unsigned int rt_timer_irq;
+int rt_timer_irq;
 static irqreturn_t hub_rt_counter_handler(int irq, void *dev_id)
 {
@@ -219,7 +219,7 @@ static void __cpuinit hub_rt_clock_event_init(void)
 static void __init hub_rt_clock_event_global_init(void)
 {
-        unsigned int irq;
+        int irq;
        do {
                smp_wmb();
diff --git a/arch/mn10300/boot/install.sh b/arch/mn10300/boot/install.sh
index 072951c83976..abba30971191 100644
--- a/arch/mn10300/boot/install.sh
+++ b/arch/mn10300/boot/install.sh
@@ -26,42 +26,42 @@ rm -fr $4/../usr/include/linux $4/../usr/include/asm
 install -c -m 0755 $2 $4/vmlinuz
 install -c -m 0755 $5 $4/boot.rom
 install -c -m 0755 -d $4/../usr/include/linux
-cd $TOPDIR/include/linux
+cd ${srctree}/include/linux
 for i in `find . -maxdepth 1 -name '*.h' -print`; do
  install -c -m 0644 $i $4/../usr/include/linux
 done
 install -c -m 0755 -d $4/../usr/include/linux/byteorder
-cd $TOPDIR/include/linux/byteorder
+cd ${srctree}/include/linux/byteorder
 for i in `find . -name '*.h' -print`; do
  install -c -m 0644 $i $4/../usr/include/linux/byteorder
 done
 install -c -m 0755 -d $4/../usr/include/linux/lockd
-cd $TOPDIR/include/linux/lockd
+cd ${srctree}/include/linux/lockd
 for i in `find . -name '*.h' -print`; do
  install -c -m 0644 $i $4/../usr/include/linux/lockd
 done
 install -c -m 0755 -d $4/../usr/include/linux/netfilter_ipv4
-cd $TOPDIR/include/linux/netfilter_ipv4
+cd ${srctree}/include/linux/netfilter_ipv4
 for i in `find . -name '*.h' -print`; do
  install -c -m 0644 $i $4/../usr/include/linux/netfilter_ipv4
 done
 install -c -m 0755 -d $4/../usr/include/linux/nfsd
-cd $TOPDIR/include/linux/nfsd
+cd ${srctree}/include/linux/nfsd
 for i in `find . -name '*.h' -print`; do
  install -c -m 0644 $i $4/../usr/include/linux/nfsd/$i
 done
 install -c -m 0755 -d $4/../usr/include/linux/raid
-cd $TOPDIR/include/linux/raid
+cd ${srctree}/include/linux/raid
 for i in `find . -name '*.h' -print`; do
  install -c -m 0644 $i $4/../usr/include/linux/raid
 done
 install -c -m 0755 -d $4/../usr/include/linux/sunrpc
-cd $TOPDIR/include/linux/sunrpc
+cd ${srctree}/include/linux/sunrpc
 for i in `find . -name '*.h' -print`; do
  install -c -m 0644 $i $4/../usr/include/linux/sunrpc
 done
 install -c -m 0755 -d $4/../usr/include/asm
-cd $TOPDIR/include/asm
+cd ${srctree}/include/asm
 for i in `find . -name '*.h' -print`; do
  install -c -m 0644 $i $4/../usr/include/asm
 done
diff --git a/arch/parisc/hpux/gate.S b/arch/parisc/hpux/gate.S
index 38a1c1b8d4e8..f0b18ce89842 100644
--- a/arch/parisc/hpux/gate.S
+++ b/arch/parisc/hpux/gate.S
@@ -13,9 +13,10 @@
 #include <asm/unistd.h>
 #include <asm/errno.h>
 #include <linux/linkage.h>
+#include <linux/init.h>
        .level  LEVEL
-        .text
+        __HEAD
        .import hpux_call_table
        .import hpux_syscall_exit,code
diff --git a/arch/parisc/hpux/wrappers.S b/arch/parisc/hpux/wrappers.S
index 58c53c879c02..ccd3a50c0995 100644
--- a/arch/parisc/hpux/wrappers.S
+++ b/arch/parisc/hpux/wrappers.S
@@ -28,9 +28,10 @@
 #include <asm/assembly.h>
 #include <asm/signal.h>
 #include <linux/linkage.h>
+#include <linux/init.h>
        .level  LEVEL
-        .text
+        __HEAD
        /* These should probably go in a header file somewhere.
         * They are duplicated in kernel/wrappers.S
diff --git a/arch/parisc/kernel/Makefile b/arch/parisc/kernel/Makefile
index 1f6585a56f97..016d3fc4111c 100644
--- a/arch/parisc/kernel/Makefile
+++ b/arch/parisc/kernel/Makefile
@@ -4,9 +4,6 @@
 extra-y                 := init_task.o head.o vmlinux.lds
-AFLAGS_entry.o  := -traditional
-AFLAGS_pacache.o := -traditional
 obj-y           := cache.o pacache.o setup.o traps.o time.o irq.o \
                   pa7300lc.o syscall.o entry.o sys_parisc.o firmware.o \
                   ptrace.o hardware.o inventory.o drivers.o \
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index 111d47284eac..5d0837458c19 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -38,18 +38,11 @@
 #include <asm/thread_info.h>
 #include <linux/linkage.h>
+#include <linux/init.h>
 #ifdef CONFIG_64BIT
-#define CMPIB           cmpib,*
-#define CMPB            cmpb,*
-#define COND(x)         *x
        .level 2.0w
 #else
-#define CMPIB           cmpib,
-#define CMPB            cmpb,
-#define COND(x)         x
        .level 2.0
 #endif
@@ -629,7 +622,7 @@
         * the static part of the kernel address space.
         */
-        .text
+        __HEAD
        .align  PAGE_SIZE
@@ -957,9 +950,9 @@ intr_check_sig:
         * Only do signals if we are returning to user space
         */
        LDREG   PT_IASQ0(%r16), %r20
-        CMPIB=,n 0,%r20,intr_restore /* backward */
+        cmpib,COND(=),n 0,%r20,intr_restore /* backward */
        LDREG   PT_IASQ1(%r16), %r20
-        CMPIB=,n 0,%r20,intr_restore /* backward */
+        cmpib,COND(=),n 0,%r20,intr_restore /* backward */
        copy    %r0, %r25                       /* long in_syscall = 0 */
 #ifdef CONFIG_64BIT
@@ -1013,10 +1006,10 @@ intr_do_resched:
         * we jump back to intr_restore.
         */
        LDREG   PT_IASQ0(%r16), %r20
-        CMPIB=  0, %r20, intr_do_preempt
+        cmpib,COND(=)   0, %r20, intr_do_preempt
        nop
        LDREG   PT_IASQ1(%r16), %r20
-        CMPIB=  0, %r20, intr_do_preempt
+        cmpib,COND(=)   0, %r20, intr_do_preempt
        nop
 #ifdef CONFIG_64BIT
@@ -1045,7 +1038,7 @@ intr_do_preempt:
        /* current_thread_info()->preempt_count */
        mfctl   %cr30, %r1
        LDREG   TI_PRE_COUNT(%r1), %r19
-        CMPIB<> 0, %r19, intr_restore   /* if preempt_count > 0 */
+        cmpib,COND(<>)  0, %r19, intr_restore   /* if preempt_count > 0 */
        nop                             /* prev insn branched backwards */
        /* check if we interrupted a critical path */
@@ -1064,7 +1057,7 @@ intr_do_preempt:
         */
 intr_extint:
-        CMPIB=,n 0,%r16,1f
+        cmpib,COND(=),n 0,%r16,1f
        get_stack_use_cr30
        b,n 2f
@@ -1099,7 +1092,7 @@ ENDPROC(syscall_exit_rfi)
 ENTRY(intr_save)                /* for os_hpmc */
        mfsp    %sr7,%r16
-        CMPIB=,n 0,%r16,1f
+        cmpib,COND(=),n 0,%r16,1f
        get_stack_use_cr30
        b       2f
        copy    %r8,%r26
@@ -1121,7 +1114,7 @@ ENTRY(intr_save)		/* for os_hpmc */
         *           adjust isr/ior below.
         */
-        CMPIB=,n        6,%r26,skip_save_ior
+        cmpib,COND(=),n        6,%r26,skip_save_ior
        mfctl           %cr20, %r16 /* isr */
@@ -1450,11 +1443,11 @@ nadtlb_emulate:
        bb,>=,n         %r9,26,nadtlb_nullify  /* m bit not set, just nullify */
        BL              get_register,%r25
        extrw,u         %r9,15,5,%r8           /* Get index register # */
-        CMPIB=,n        -1,%r1,nadtlb_fault    /* have to use slow path */
+        cmpib,COND(=),n        -1,%r1,nadtlb_fault    /* have to use slow path */
        copy            %r1,%r24
        BL              get_register,%r25
        extrw,u         %r9,10,5,%r8           /* Get base register # */
-        CMPIB=,n        -1,%r1,nadtlb_fault    /* have to use slow path */
+        cmpib,COND(=),n        -1,%r1,nadtlb_fault    /* have to use slow path */
        BL              set_register,%r25
        add,l           %r1,%r24,%r1           /* doesn't affect c/b bits */
@@ -1486,7 +1479,7 @@ nadtlb_probe_check:
        cmpb,<>,n       %r16,%r17,nadtlb_fault /* Must be probe,[rw]*/
        BL              get_register,%r25      /* Find the target register */
        extrw,u         %r9,31,5,%r8           /* Get target register */
-        CMPIB=,n        -1,%r1,nadtlb_fault    /* have to use slow path */
+        cmpib,COND(=),n        -1,%r1,nadtlb_fault    /* have to use slow path */
        BL              set_register,%r25
        copy            %r0,%r1                /* Write zero to target register */
        b nadtlb_nullify                       /* Nullify return insn */
@@ -1570,12 +1563,12 @@ dbit_trap_20w:
        L3_ptep         ptp,pte,t0,va,dbit_fault
 #ifdef CONFIG_SMP
-        CMPIB=,n        0,spc,dbit_nolock_20w
+        cmpib,COND(=),n        0,spc,dbit_nolock_20w
        load32          PA(pa_dbit_lock),t0
 dbit_spin_20w:
        LDCW            0(t0),t1
-        cmpib,=         0,t1,dbit_spin_20w
+        cmpib,COND(=)         0,t1,dbit_spin_20w
        nop
 dbit_nolock_20w:
@@ -1586,7 +1579,7 @@ dbit_nolock_20w:
                
        idtlbt          pte,prot
 #ifdef CONFIG_SMP
-        CMPIB=,n        0,spc,dbit_nounlock_20w
+        cmpib,COND(=),n        0,spc,dbit_nounlock_20w
        ldi             1,t1
        stw             t1,0(t0)
@@ -1606,7 +1599,7 @@ dbit_trap_11:
        L2_ptep         ptp,pte,t0,va,dbit_fault
 #ifdef CONFIG_SMP
-        CMPIB=,n        0,spc,dbit_nolock_11
+        cmpib,COND(=),n        0,spc,dbit_nolock_11
        load32          PA(pa_dbit_lock),t0
 dbit_spin_11:
@@ -1628,7 +1621,7 @@ dbit_nolock_11:
        mtsp            t1, %sr1     /* Restore sr1 */
 #ifdef CONFIG_SMP
-        CMPIB=,n        0,spc,dbit_nounlock_11
+        cmpib,COND(=),n        0,spc,dbit_nounlock_11
        ldi             1,t1
        stw             t1,0(t0)
@@ -1646,7 +1639,7 @@ dbit_trap_20:
        L2_ptep         ptp,pte,t0,va,dbit_fault
 #ifdef CONFIG_SMP
-        CMPIB=,n        0,spc,dbit_nolock_20
+        cmpib,COND(=),n        0,spc,dbit_nolock_20
        load32          PA(pa_dbit_lock),t0
 dbit_spin_20:
@@ -1665,7 +1658,7 @@ dbit_nolock_20:
        idtlbt          pte,prot
 #ifdef CONFIG_SMP
-        CMPIB=,n        0,spc,dbit_nounlock_20
+        cmpib,COND(=),n        0,spc,dbit_nounlock_20
        ldi             1,t1
        stw             t1,0(t0)
@@ -1994,7 +1987,7 @@ ENTRY(syscall_exit)
        /* We can't use "CMPIB<> PER_HPUX" since "im5" field is sign extended */
        ldo       -PER_HPUX(%r19), %r19
-        CMPIB<>,n 0,%r19,1f
+        cmpib,COND(<>),n 0,%r19,1f
        /* Save other hpux returns if personality is PER_HPUX */
        STREG     %r22,TASK_PT_GR22(%r1)
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S
index ec2482dc1beb..5680a2c3b13d 100644
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
@@ -32,7 +32,7 @@ ENTRY(boot_args)
        .word 0 /* arg3 */
 END(boot_args)
-        .section .text.head
+        __HEAD
        .align  4
        .import init_thread_union,data
        .import fault_vector_20,code    /* IVA parisc 2.0 32 bit */
diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
index 2cbf13b3ef11..068322eb8c9b 100644
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
@@ -47,6 +47,7 @@
 #include <asm/pdc.h>
 #include <linux/linkage.h>
+#include <linux/init.h>
        /*
         * stack for os_hpmc, the HPMC handler.
@@ -76,7 +77,7 @@ ENTRY(hpmc_pim_data)
        .block HPMC_PIM_DATA_SIZE
 END(hpmc_pim_data)
-        .text
+        __HEAD
        .import intr_save, code
 ENTRY(os_hpmc)
diff --git a/arch/parisc/kernel/inventory.c b/arch/parisc/kernel/inventory.c
index 4845a6444633..bd1f7f1ff74e 100644
--- a/arch/parisc/kernel/inventory.c
+++ b/arch/parisc/kernel/inventory.c
@@ -499,7 +499,7 @@ add_system_map_addresses(struct parisc_device *dev, int num_addrs,
        dev->addr = kmalloc(num_addrs * sizeof(unsigned long), GFP_KERNEL);
        if(!dev->addr) {
                printk(KERN_ERR "%s %s(): memory allocation failure\n",
-                       __FILE__, __FUNCTION__);
+                       __FILE__, __func__);
                return;
        }
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S
index 5901092e0196..e3246a5ca74f 100644
--- a/arch/parisc/kernel/pacache.S
+++ b/arch/parisc/kernel/pacache.S
@@ -37,8 +37,9 @@
 #include <asm/pgtable.h>
 #include <asm/cache.h>
 #include <linux/linkage.h>
+#include <linux/init.h>
-        .text
+        __HEAD
        .align  128
 ENTRY(flush_tlb_all_local)
@@ -85,7 +86,7 @@ ENTRY(flush_tlb_all_local)
        LDREG           ITLB_OFF_COUNT(%r1), %arg2
        LDREG           ITLB_LOOP(%r1), %arg3
-        ADDIB=          -1, %arg3, fitoneloop   /* Preadjust and test */
+        addib,COND(=)           -1, %arg3, fitoneloop   /* Preadjust and test */
        movb,<,n        %arg3, %r31, fitdone    /* If loop < 0, skip */
        copy            %arg0, %r28             /* Init base addr */
@@ -95,14 +96,14 @@ fitmanyloop:					/* Loop if LOOP >= 2 */
        copy            %arg2, %r29             /* Init middle loop count */
 fitmanymiddle:                                  /* Loop if LOOP >= 2 */
-        ADDIB>          -1, %r31, fitmanymiddle /* Adjusted inner loop decr */
+        addib,COND(>)           -1, %r31, fitmanymiddle /* Adjusted inner loop decr */
        pitlbe          0(%sr1, %r28)
        pitlbe,m        %arg1(%sr1, %r28)       /* Last pitlbe and addr adjust */
-        ADDIB>          -1, %r29, fitmanymiddle /* Middle loop decr */
+        addib,COND(>)           -1, %r29, fitmanymiddle /* Middle loop decr */
        copy            %arg3, %r31             /* Re-init inner loop count */
        movb,tr         %arg0, %r28, fitmanyloop /* Re-init base addr */
-        ADDIB<=,n       -1, %r22, fitdone       /* Outer loop count decr */
+        addib,COND(<=),n        -1, %r22, fitdone       /* Outer loop count decr */
 fitoneloop:                                     /* Loop if LOOP = 1 */
        mtsp            %r20, %sr1
@@ -110,10 +111,10 @@ fitoneloop:					/* Loop if LOOP = 1 */
        copy            %arg2, %r29             /* init middle loop count */
 fitonemiddle:                                   /* Loop if LOOP = 1 */
-        ADDIB>          -1, %r29, fitonemiddle  /* Middle loop count decr */
+        addib,COND(>)           -1, %r29, fitonemiddle  /* Middle loop count decr */
        pitlbe,m        %arg1(%sr1, %r28)       /* pitlbe for one loop */
-        ADDIB>          -1, %r22, fitoneloop    /* Outer loop count decr */
+        addib,COND(>)           -1, %r22, fitoneloop    /* Outer loop count decr */
        add             %r21, %r20, %r20                /* increment space */
 fitdone:
@@ -128,7 +129,7 @@ fitdone:
        LDREG           DTLB_OFF_COUNT(%r1), %arg2
        LDREG           DTLB_LOOP(%r1), %arg3
-        ADDIB=          -1, %arg3, fdtoneloop   /* Preadjust and test */
+        addib,COND(=)           -1, %arg3, fdtoneloop   /* Preadjust and test */
        movb,<,n        %arg3, %r31, fdtdone    /* If loop < 0, skip */
        copy            %arg0, %r28             /* Init base addr */
@@ -138,14 +139,14 @@ fdtmanyloop:					/* Loop if LOOP >= 2 */
        copy            %arg2, %r29             /* Init middle loop count */
 fdtmanymiddle:                                  /* Loop if LOOP >= 2 */
-        ADDIB>          -1, %r31, fdtmanymiddle /* Adjusted inner loop decr */
+        addib,COND(>)           -1, %r31, fdtmanymiddle /* Adjusted inner loop decr */
        pdtlbe          0(%sr1, %r28)
        pdtlbe,m        %arg1(%sr1, %r28)       /* Last pdtlbe and addr adjust */
-        ADDIB>          -1, %r29, fdtmanymiddle /* Middle loop decr */
+        addib,COND(>)           -1, %r29, fdtmanymiddle /* Middle loop decr */
        copy            %arg3, %r31             /* Re-init inner loop count */
        movb,tr         %arg0, %r28, fdtmanyloop /* Re-init base addr */
-        ADDIB<=,n       -1, %r22,fdtdone        /* Outer loop count decr */
+        addib,COND(<=),n        -1, %r22,fdtdone        /* Outer loop count decr */
 fdtoneloop:                                     /* Loop if LOOP = 1 */
        mtsp            %r20, %sr1
@@ -153,10 +154,10 @@ fdtoneloop:					/* Loop if LOOP = 1 */
        copy            %arg2, %r29             /* init middle loop count */
 fdtonemiddle:                                   /* Loop if LOOP = 1 */
-        ADDIB>          -1, %r29, fdtonemiddle  /* Middle loop count decr */
+        addib,COND(>)           -1, %r29, fdtonemiddle  /* Middle loop count decr */
        pdtlbe,m        %arg1(%sr1, %r28)       /* pdtlbe for one loop */
-        ADDIB>          -1, %r22, fdtoneloop    /* Outer loop count decr */
+        addib,COND(>)           -1, %r22, fdtoneloop    /* Outer loop count decr */
        add             %r21, %r20, %r20        /* increment space */
@@ -209,18 +210,18 @@ ENTRY(flush_instruction_cache_local)
        LDREG           ICACHE_COUNT(%r1), %arg2
        LDREG           ICACHE_LOOP(%r1), %arg3
        rsm             PSW_SM_I, %r22          /* No mmgt ops during loop*/
-        ADDIB=          -1, %arg3, fioneloop    /* Preadjust and test */
+        addib,COND(=)           -1, %arg3, fioneloop    /* Preadjust and test */
        movb,<,n        %arg3, %r31, fisync     /* If loop < 0, do sync */
 fimanyloop:                                     /* Loop if LOOP >= 2 */
-        ADDIB>          -1, %r31, fimanyloop    /* Adjusted inner loop decr */
+        addib,COND(>)           -1, %r31, fimanyloop    /* Adjusted inner loop decr */
        fice            %r0(%sr1, %arg0)
        fice,m          %arg1(%sr1, %arg0)      /* Last fice and addr adjust */
        movb,tr         %arg3, %r31, fimanyloop /* Re-init inner loop count */
-        ADDIB<=,n       -1, %arg2, fisync       /* Outer loop decr */
+        addib,COND(<=),n        -1, %arg2, fisync       /* Outer loop decr */
 fioneloop:                                      /* Loop if LOOP = 1 */
-        ADDIB>          -1, %arg2, fioneloop    /* Outer loop count decr */
+        addib,COND(>)           -1, %arg2, fioneloop    /* Outer loop count decr */
        fice,m          %arg1(%sr1, %arg0)      /* Fice for one loop */
 fisync:
@@ -250,18 +251,18 @@ ENTRY(flush_data_cache_local)
        LDREG           DCACHE_COUNT(%r1), %arg2
        LDREG           DCACHE_LOOP(%r1), %arg3
        rsm             PSW_SM_I, %r22
-        ADDIB=          -1, %arg3, fdoneloop    /* Preadjust and test */
+        addib,COND(=)           -1, %arg3, fdoneloop    /* Preadjust and test */
        movb,<,n        %arg3, %r31, fdsync     /* If loop < 0, do sync */
 fdmanyloop:                                     /* Loop if LOOP >= 2 */
-        ADDIB>          -1, %r31, fdmanyloop    /* Adjusted inner loop decr */
+        addib,COND(>)           -1, %r31, fdmanyloop    /* Adjusted inner loop decr */
        fdce            %r0(%sr1, %arg0)
        fdce,m          %arg1(%sr1, %arg0)      /* Last fdce and addr adjust */
        movb,tr         %arg3, %r31, fdmanyloop /* Re-init inner loop count */
-        ADDIB<=,n       -1, %arg2, fdsync       /* Outer loop decr */
+        addib,COND(<=),n        -1, %arg2, fdsync       /* Outer loop decr */
 fdoneloop:                                      /* Loop if LOOP = 1 */
-        ADDIB>          -1, %arg2, fdoneloop    /* Outer loop count decr */
+        addib,COND(>)           -1, %arg2, fdoneloop    /* Outer loop count decr */
        fdce,m          %arg1(%sr1, %arg0)      /* Fdce for one loop */
 fdsync:
@@ -342,7 +343,7 @@ ENTRY(copy_user_page_asm)
         * non-taken backward branch. Note that .+4 is a backwards branch.
         * The ldd should only get executed if the branch is taken.
         */
-        ADDIB>,n        -1, %r1, 1b             /* bundle 10 */
+        addib,COND(>),n -1, %r1, 1b             /* bundle 10 */
        ldd             0(%r25), %r19           /* start next loads */
 #else
@@ -391,7 +392,7 @@ ENTRY(copy_user_page_asm)
        stw             %r21, 56(%r26)
        stw             %r22, 60(%r26)
        ldo             64(%r26), %r26
-        ADDIB>,n        -1, %r1, 1b
+        addib,COND(>),n -1, %r1, 1b
        ldw             0(%r25), %r19
 #endif
        bv              %r0(%r2)
@@ -515,7 +516,7 @@ ENTRY(copy_user_page_asm)
        stw             %r21, 56(%r28)
        stw             %r22, 60(%r28)
        ldo             64(%r28), %r28
-        ADDIB>          -1, %r1,1b
+        addib,COND(>)           -1, %r1,1b
        ldo             64(%r29), %r29
        bv              %r0(%r2)
@@ -574,7 +575,7 @@ ENTRY(__clear_user_page_asm)
        std             %r0, 104(%r28)
        std             %r0, 112(%r28)
        std             %r0, 120(%r28)
-        ADDIB>          -1, %r1, 1b
+        addib,COND(>)           -1, %r1, 1b
        ldo             128(%r28), %r28
 #else   /* ! CONFIG_64BIT */
@@ -597,7 +598,7 @@ ENTRY(__clear_user_page_asm)
        stw             %r0, 52(%r28)
        stw             %r0, 56(%r28)
        stw             %r0, 60(%r28)
-        ADDIB>          -1, %r1, 1b
+        addib,COND(>)           -1, %r1, 1b
        ldo             64(%r28), %r28
 #endif  /* CONFIG_64BIT */
@@ -640,7 +641,7 @@ ENTRY(flush_kernel_dcache_page_asm)
        fdc,m           %r23(%r26)
        fdc,m           %r23(%r26)
        fdc,m           %r23(%r26)
-        CMPB<<          %r26, %r25,1b
+        cmpb,COND(<<)           %r26, %r25,1b
        fdc,m           %r23(%r26)
        sync
@@ -683,7 +684,7 @@ ENTRY(flush_user_dcache_page)
        fdc,m           %r23(%sr3, %r26)
        fdc,m           %r23(%sr3, %r26)
        fdc,m           %r23(%sr3, %r26)
-        CMPB<<          %r26, %r25,1b
+        cmpb,COND(<<)           %r26, %r25,1b
        fdc,m           %r23(%sr3, %r26)
        sync
@@ -726,7 +727,7 @@ ENTRY(flush_user_icache_page)
        fic,m           %r23(%sr3, %r26)
        fic,m           %r23(%sr3, %r26)
        fic,m           %r23(%sr3, %r26)
-        CMPB<<          %r26, %r25,1b
+        cmpb,COND(<<)           %r26, %r25,1b
        fic,m           %r23(%sr3, %r26)
        sync
@@ -769,7 +770,7 @@ ENTRY(purge_kernel_dcache_page)
        pdc,m           %r23(%r26)
        pdc,m           %r23(%r26)
        pdc,m           %r23(%r26)
-        CMPB<<          %r26, %r25, 1b
+        cmpb,COND(<<)           %r26, %r25, 1b
        pdc,m           %r23(%r26)
        sync
@@ -833,7 +834,7 @@ ENTRY(flush_alias_page)
        fdc,m           %r23(%r28)
        fdc,m           %r23(%r28)
        fdc,m           %r23(%r28)
-        CMPB<<          %r28, %r29, 1b
+        cmpb,COND(<<)           %r28, %r29, 1b
        fdc,m           %r23(%r28)
        sync
@@ -856,7 +857,7 @@ flush_user_dcache_range_asm:
        ldo             -1(%r23), %r21
        ANDCM           %r26, %r21, %r26
-1:      CMPB<<,n        %r26, %r25, 1b
+1:      cmpb,COND(<<),n %r26, %r25, 1b
        fdc,m           %r23(%sr3, %r26)
        sync
@@ -877,7 +878,7 @@ ENTRY(flush_kernel_dcache_range_asm)
        ldo             -1(%r23), %r21
        ANDCM           %r26, %r21, %r26
-1:      CMPB<<,n        %r26, %r25,1b
+1:      cmpb,COND(<<),n %r26, %r25,1b
        fdc,m           %r23(%r26)
        sync
@@ -899,7 +900,7 @@ ENTRY(flush_user_icache_range_asm)
        ldo             -1(%r23), %r21
        ANDCM           %r26, %r21, %r26
-1:      CMPB<<,n        %r26, %r25,1b
+1:      cmpb,COND(<<),n %r26, %r25,1b
        fic,m           %r23(%sr3, %r26)
        sync
@@ -942,7 +943,7 @@ ENTRY(flush_kernel_icache_page)
        fic,m           %r23(%sr4, %r26)
        fic,m           %r23(%sr4, %r26)
        fic,m           %r23(%sr4, %r26)
-        CMPB<<          %r26, %r25, 1b
+        cmpb,COND(<<)           %r26, %r25, 1b
        fic,m           %r23(%sr4, %r26)
        sync
@@ -963,7 +964,7 @@ ENTRY(flush_kernel_icache_range_asm)
        ldo             -1(%r23), %r21
        ANDCM           %r26, %r21, %r26
-1:      CMPB<<,n        %r26, %r25, 1b
+1:      cmpb,COND(<<),n %r26, %r25, 1b
        fic,m           %r23(%sr4, %r26)
        sync
diff --git a/arch/parisc/kernel/perf_asm.S b/arch/parisc/kernel/perf_asm.S
index 43874ca3ed67..d411dfb5b6d1 100644
--- a/arch/parisc/kernel/perf_asm.S
+++ b/arch/parisc/kernel/perf_asm.S
@@ -20,6 +20,8 @@
 */
 #include <asm/assembly.h>
+#include <linux/init.h>
 #include <linux/linkage.h>
 #ifdef CONFIG_64BIT
@@ -41,7 +43,7 @@
 ; The coprocessor only needs to be enabled when
 ; starting/stopping the coprocessor with the pmenb/pmdis.
 ;
-        .text
+        __HEAD
 ENTRY(perf_intrigue_enable_perf_counters)
        .proc
diff --git a/arch/parisc/kernel/real2.S b/arch/parisc/kernel/real2.S
index 7a92695d95a6..47fbdae6efd5 100644
--- a/arch/parisc/kernel/real2.S
+++ b/arch/parisc/kernel/real2.S
@@ -12,6 +12,7 @@
 #include <asm/assembly.h>
 #include <linux/linkage.h>
+#include <linux/init.h>
        .section        .bss
        .export real_stack
@@ -39,7 +40,7 @@ save_cr_end:
 /************************ 32-bit real-mode calls ***********************/
 /* This can be called in both narrow and wide kernels */
-        .text
+        __HEAD
        /* unsigned long real32_call_asm(unsigned int *sp,
         *              unsigned int *arg0p,
@@ -113,7 +114,7 @@ ENDPROC(real32_call_asm)
 #  define PUSH_CR(r, where) mfctl r, %r1 ! STREG,ma %r1, REG_SZ(where)
 #  define POP_CR(r, where) LDREG,mb -REG_SZ(where), %r1 ! mtctl %r1, r
-        .text
+        __HEAD
 save_control_regs:
        load32  PA(save_cr_space), %r28
        PUSH_CR(%cr24, %r28)
@@ -145,7 +146,7 @@ restore_control_regs:
 /* rfi_virt2real() and rfi_real2virt() could perhaps be adapted for
 * more general-purpose use by the several places which need RFIs
 */
-        .text
+        __HEAD
        .align 128
 rfi_virt2real:
        /* switch to real mode... */
@@ -180,7 +181,7 @@ rfi_v2r_1:
        bv      0(%r2)
        nop
-        .text
+        __HEAD
        .align 128
 rfi_real2virt:
        rsm             PSW_SM_I,%r0
@@ -218,7 +219,7 @@ rfi_r2v_1:
 /************************ 64-bit real-mode calls ***********************/
 /* This is only usable in wide kernels right now and will probably stay so */
-        .text
+        __HEAD
        /* unsigned long real64_call_asm(unsigned long *sp,
         *              unsigned long *arg0p,
         *              unsigned long fn)
@@ -276,7 +277,7 @@ ENDPROC(real64_call_asm)
 #endif
-        .text
+        __HEAD
        /* http://lists.parisc-linux.org/hypermail/parisc-linux/10916.html
        **      GCC 3.3 and later has a new function in libgcc.a for
        **      comparing function pointers.
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index 69b6eebc466e..ae509d8cd03f 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -17,6 +17,7 @@
 #include <asm/processor.h>
 #include <linux/linkage.h>
+#include <linux/init.h>
        /* We fill the empty parts of the gateway page with
         * something that will kill the kernel or a
@@ -26,7 +27,7 @@
        .level          LEVEL
-        .text
+        __HEAD
        .import syscall_exit,code
        .import syscall_exit_rfi,code
@@ -636,7 +637,7 @@ END(sys_call_table64)
                All light-weight-syscall atomic operations 
                will use this set of locks 
        */
-        .section .data
+        .section .data, "aw"
        .align  PAGE_SIZE
 ENTRY(lws_lock_start)
        /* lws locks */
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 9dc6dc42f9cf..675f1d098f05 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -275,7 +275,7 @@ KERN_CRIT "                     ||     ||\n");
        /* Wot's wrong wif bein' racy? */
        if (current->thread.flags & PARISC_KERNEL_DEATH) {
-                printk(KERN_CRIT "%s() recursion detected.\n", __FUNCTION__);
+                printk(KERN_CRIT "%s() recursion detected.\n", __func__);
                local_irq_enable();
                while (1);
        }
diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c
index aebf3c168871..e6f4b7a4b7e3 100644
--- a/arch/parisc/kernel/unaligned.c
+++ b/arch/parisc/kernel/unaligned.c
@@ -30,7 +30,7 @@
 /* #define DEBUG_UNALIGNED 1 */
 #ifdef DEBUG_UNALIGNED
-#define DPRINTF(fmt, args...) do { printk(KERN_DEBUG "%s:%d:%s ", __FILE__, __LINE__, __FUNCTION__ ); printk(KERN_DEBUG fmt, ##args ); } while (0)
+#define DPRINTF(fmt, args...) do { printk(KERN_DEBUG "%s:%d:%s ", __FILE__, __LINE__, __func__ ); printk(KERN_DEBUG fmt, ##args ); } while (0)
 #else
 #define DPRINTF(fmt, args...)
 #endif
@@ -460,7 +460,8 @@ void handle_unaligned(struct pt_regs *regs)
                        goto force_sigbus;
                }
-                if (unaligned_count > 5 && jiffies - last_time > 5*HZ) {
+                if (unaligned_count > 5 &&
+                                time_after(jiffies, last_time + 5 * HZ)) {
                        unaligned_count = 0;
                        last_time = jiffies;
                }
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S
index d172d4245cdc..4821ad6d5269 100644
--- a/arch/parisc/lib/fixup.S
+++ b/arch/parisc/lib/fixup.S
@@ -23,6 +23,7 @@
 #include <asm/assembly.h>
 #include <asm/errno.h>
 #include <linux/linkage.h>
+#include <linux/init.h>
 #ifdef CONFIG_SMP
        .macro  get_fault_ip t1 t2
@@ -55,7 +56,7 @@
        .level LEVEL
-        .text
+        __HEAD
        .section .fixup, "ax"
        /* get_user() fixups, store -EFAULT in r8, and 0 in r9 */
diff --git a/arch/parisc/lib/lusercopy.S b/arch/parisc/lib/lusercopy.S
index 1bd23ccec17b..b0d885350846 100644
--- a/arch/parisc/lib/lusercopy.S
+++ b/arch/parisc/lib/lusercopy.S
@@ -33,11 +33,12 @@
 */
-        .text
-        
 #include <asm/assembly.h>
 #include <asm/errno.h>
 #include <linux/linkage.h>
+#include <linux/init.h>
+        __HEAD
        /*
         * get_sr gets the appropriate space value into
diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c
index d22042d33100..2d68431fc22e 100644
--- a/arch/parisc/lib/memcpy.c
+++ b/arch/parisc/lib/memcpy.c
@@ -91,7 +91,7 @@ DECLARE_PER_CPU(struct exception_data, exception_data);
 #define THRESHOLD       16
 #ifdef DEBUG_MEMCPY
-#define DPRINTF(fmt, args...) do { printk(KERN_DEBUG "%s:%d:%s ", __FILE__, __LINE__, __FUNCTION__ ); printk(KERN_DEBUG fmt, ##args ); } while (0)
+#define DPRINTF(fmt, args...) do { printk(KERN_DEBUG "%s:%d:%s ", __FILE__, __LINE__, __func__ ); printk(KERN_DEBUG fmt, ##args ); } while (0)
 #else
 #define DPRINTF(fmt, args...)
 #endif
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 1f012843150f..78fe252b92c3 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -555,8 +555,6 @@ void show_mem(void)
        printk(KERN_INFO "Mem-info:\n");
        show_free_areas();
-        printk(KERN_INFO "Free swap:     %6ldkB\n",
-                                nr_swap_pages<<(PAGE_SHIFT-10));
 #ifndef CONFIG_DISCONTIGMEM
        i = max_mapnr;
        while (i-- > 0) {
@@ -606,7 +604,7 @@ void show_mem(void)
                int i, j;
                for (i = 0; i < npmem_ranges; i++) {
-                        zl = node_zonelist(i);
+                        zl = node_zonelist(i, 0);
                        for (j = 0; j < MAX_NR_ZONES; j++) {
                                struct zoneref *z;
                                struct zone *zone;
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts
index eac8e1b59496..1e7802cc31ae 100644
--- a/arch/powerpc/boot/dts/mpc8377_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8377_mds.dts
@@ -268,6 +268,33 @@
                        interrupt-parent = <&ipic>;
                };
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8349-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <0x47 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8349-dma-channel";
+                                reg = <0 0x80>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8349-dma-channel";
+                                reg = <0x80 0x80>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8349-dma-channel";
+                                reg = <0x100 0x80>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8349-dma-channel";
+                                reg = <0x180 0x28>;
+                        };
+                };
                /* IPIC
                 * interrupts cell = <intr #, sense>
                 * sense values match linux IORESOURCE_IRQ_* defines:
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
index bba234eb14a9..08a780d89807 100644
--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@ -46,9 +46,63 @@
                reg = <0x00000000 0x20000000>;  // 512M at 0x0
        };
-        board-control@e8000000 {
+        localbus@e0005000 {
-                compatible = "fsl,fpga-pixis";
+                #address-cells = <2>;
-                reg = <0xe8000000 32>;          // pixis at 0xe8000000
+                #size-cells = <1>;
+                compatible = "fsl,mpc8610-elbc", "fsl,elbc", "simple-bus";
+                reg = <0xe0005000 0x1000>;
+                interrupts = <19 2>;
+                interrupt-parent = <&mpic>;
+                ranges = <0 0 0xf8000000 0x08000000
+                          1 0 0xf0000000 0x08000000
+                          2 0 0xe8400000 0x00008000
+                          4 0 0xe8440000 0x00008000
+                          5 0 0xe8480000 0x00008000
+                          6 0 0xe84c0000 0x00008000
+                          3 0 0xe8000000 0x00000020>;
+                flash@0,0 {
+                        compatible = "cfi-flash";
+                        reg = <0 0 0x8000000>;
+                        bank-width = <2>;
+                        device-width = <1>;
+                };
+                flash@1,0 {
+                        compatible = "cfi-flash";
+                        reg = <1 0 0x8000000>;
+                        bank-width = <2>;
+                        device-width = <1>;
+                };
+                flash@2,0 {
+                        compatible = "fsl,mpc8610-fcm-nand",
+                                     "fsl,elbc-fcm-nand";
+                        reg = <2 0 0x8000>;
+                };
+                flash@4,0 {
+                        compatible = "fsl,mpc8610-fcm-nand",
+                                     "fsl,elbc-fcm-nand";
+                        reg = <4 0 0x8000>;
+                };
+                flash@5,0 {
+                        compatible = "fsl,mpc8610-fcm-nand",
+                                     "fsl,elbc-fcm-nand";
+                        reg = <5 0 0x8000>;
+                };
+                flash@6,0 {
+                        compatible = "fsl,mpc8610-fcm-nand",
+                                     "fsl,elbc-fcm-nand";
+                        reg = <6 0 0x8000>;
+                };
+                board-control@3,0 {
+                        compatible = "fsl,fpga-pixis";
+                        reg = <3 0 0x20>;
+                };
        };
        soc@e0000000 {
diff --git a/arch/powerpc/boot/dts/sbc8548.dts b/arch/powerpc/boot/dts/sbc8548.dts
index b86e65d926c1..22d967178fe9 100644
--- a/arch/powerpc/boot/dts/sbc8548.dts
+++ b/arch/powerpc/boot/dts/sbc8548.dts
@@ -52,6 +52,99 @@
                reg = <0x00000000 0x10000000>;
        };
+        localbus@e0000000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "simple-bus";
+                reg = <0xe0000000 0x5000>;
+                interrupt-parent = <&mpic>;
+                ranges = <0x0 0x0 0xff800000 0x00800000         /*8MB Flash*/
+                          0x3 0x0 0xf0000000 0x04000000         /*64MB SDRAM*/
+                          0x4 0x0 0xf4000000 0x04000000         /*64MB SDRAM*/
+                          0x5 0x0 0xf8000000 0x00b10000         /* EPLD */
+                          0x6 0x0 0xfb800000 0x04000000>;       /*64MB Flash*/
+                flash@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <0x0 0x0 0x800000>;
+                        bank-width = <1>;
+                        device-width = <1>;
+                        partition@0x0 {
+                                label = "space";
+                                reg = <0x00000000 0x00100000>;
+                        };
+                        partition@0x100000 {
+                                label = "bootloader";
+                                reg = <0x00100000 0x00700000>;
+                                read-only;
+                        };
+                };
+                epld@5,0 {
+                        compatible = "wrs,epld-localbus";
+                        #address-cells = <2>;
+                        #size-cells = <1>;
+                        reg = <0x5 0x0 0x00b10000>;
+                        ranges = <
+                                0x0 0x0 0x5 0x000000 0x1fff     /* LED */
+                                0x1 0x0 0x5 0x100000 0x1fff     /* Switches */
+                                0x3 0x0 0x5 0x300000 0x1fff     /* HW Rev. */
+                                0xb 0x0 0x5 0xb00000 0x1fff     /* EEPROM */
+                        >;
+                        led@0,0 {
+                                compatible = "led";
+                                reg = <0x0 0x0 0x1fff>;
+                        };
+                        switches@1,0 {
+                                compatible = "switches";
+                                reg = <0x1 0x0 0x1fff>;
+                        };
+                        hw-rev@3,0 {
+                                compatible = "hw-rev";
+                                reg = <0x3 0x0 0x1fff>;
+                        };
+                        eeprom@b,0 {
+                                compatible = "eeprom";
+                                reg = <0xb 0 0x1fff>;
+                        };
+                };
+                alt-flash@6,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0x6 0x0 0x04000000>;
+                        compatible = "cfi-flash";
+                        bank-width = <4>;
+                        device-width = <1>;
+                        partition@0x0 {
+                                label = "bootloader";
+                                reg = <0x00000000 0x00100000>;
+                                read-only;
+                        };
+                        partition@0x00100000 {
+                                label = "file-system";
+                                reg = <0x00100000 0x01f00000>;
+                        };
+                        partition@0x02000000 {
+                                label = "boot-config";
+                                reg = <0x02000000 0x00100000>;
+                        };
+                        partition@0x02100000 {
+                                label = "space";
+                                reg = <0x02100000 0x01f00000>;
+                        };
+                };
+        };
        soc8548@e0000000 {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -59,6 +152,7 @@
                ranges = <0x00000000 0xe0000000 0x00100000>;
                reg = <0xe0000000 0x00001000>;  // CCSRBAR
                bus-frequency = <0>;
+                compatible = "simple-bus";
                memory-controller@2000 {
                        compatible = "fsl,8548-memory-controller";
diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/mpc8610_hpcd_defconfig
index 9270afe7594d..7e5b9ce58d89 100644
--- a/arch/powerpc/configs/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/mpc8610_hpcd_defconfig
@@ -358,7 +358,93 @@ CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_CONNECTOR is not set
-# CONFIG_MTD is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_OF_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+CONFIG_MTD_NAND_FSL_ELBC=y
+# CONFIG_MTD_ONENAND is not set
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
 CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
@@ -567,14 +653,11 @@ CONFIG_MII=y
 # CONFIG_NET_VENDOR_3COM is not set
 CONFIG_NET_TULIP=y
 # CONFIG_DE2104X is not set
-CONFIG_TULIP=y
+# CONFIG_TULIP is not set
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-# CONFIG_TULIP_NAPI is not set
 # CONFIG_DE4X5 is not set
 # CONFIG_WINBOND_840 is not set
 # CONFIG_DM9102 is not set
-# CONFIG_ULI526X is not set
+CONFIG_ULI526X=y
 # CONFIG_HP100 is not set
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index d14cebf62bb0..2346d271fbfd 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -105,6 +105,9 @@ PHONY += systbl_chk
 systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i
        $(call cmd,systbl_chk)
+ifeq ($(CONFIG_PPC_MERGE),y)
 $(obj)/built-in.o:              prom_init_check
 quiet_cmd_prom_init_check = CALL    $<
@@ -114,4 +117,7 @@ PHONY += prom_init_check
 prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o
        $(call cmd,prom_init_check)
+endif
 clean-files := vmlinux.lds
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 81738a4b3c3a..e44d5530f0a6 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -1484,6 +1484,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                .dcache_bsize           = 32,
                .machine_check          = machine_check_e200,
                .platform               = "ppc5554",
+        }
 #endif /* CONFIG_E200 */
 #ifdef CONFIG_E500
        {       /* e500 */
@@ -1533,6 +1534,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                .dcache_bsize           = 32,
                .machine_check          = machine_check_e500,
                .platform               = "powerpc",
+        }
 #endif /* CONFIG_E500 */
 #endif /* CONFIG_PPC32 */
 };
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index f1d2cdc5331b..c71d37dc6a88 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -10,6 +10,7 @@ ifeq ($(CONFIG_PPC_MERGE),y)
 obj-y                   := string.o alloc.o \
                           checksum_$(CONFIG_WORD_SIZE).o
 obj-$(CONFIG_PPC32)     += div64.o copy_32.o
+obj-$(CONFIG_HAS_IOMEM) += devres.o
 endif
 obj-$(CONFIG_PPC64)     += copypage_64.o copyuser_64.o \
@@ -23,4 +24,3 @@ obj-$(CONFIG_SMP)	+= locks.o
 endif
 obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
-obj-$(CONFIG_HAS_IOMEM) += devres.o
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 2b5a399f6fa6..0f2d239d94c4 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -94,6 +94,9 @@ unsigned long htab_hash_mask;
 int mmu_linear_psize = MMU_PAGE_4K;
 int mmu_virtual_psize = MMU_PAGE_4K;
 int mmu_vmalloc_psize = MMU_PAGE_4K;
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+int mmu_vmemmap_psize = MMU_PAGE_4K;
+#endif
 int mmu_io_psize = MMU_PAGE_4K;
 int mmu_kernel_ssize = MMU_SEGSIZE_256M;
 int mmu_highuser_ssize = MMU_SEGSIZE_256M;
@@ -387,11 +390,32 @@ static void __init htab_init_page_sizes(void)
        }
 #endif /* CONFIG_PPC_64K_PAGES */
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+        /* We try to use 16M pages for vmemmap if that is supported
+         * and we have at least 1G of RAM at boot
+         */
+        if (mmu_psize_defs[MMU_PAGE_16M].shift &&
+            lmb_phys_mem_size() >= 0x40000000)
+                mmu_vmemmap_psize = MMU_PAGE_16M;
+        else if (mmu_psize_defs[MMU_PAGE_64K].shift)
+                mmu_vmemmap_psize = MMU_PAGE_64K;
+        else
+                mmu_vmemmap_psize = MMU_PAGE_4K;
+#endif /* CONFIG_SPARSEMEM_VMEMMAP */
        printk(KERN_DEBUG "Page orders: linear mapping = %d, "
-               "virtual = %d, io = %d\n",
+               "virtual = %d, io = %d"
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+               ", vmemmap = %d"
+#endif
+               "\n",
               mmu_psize_defs[mmu_linear_psize].shift,
               mmu_psize_defs[mmu_virtual_psize].shift,
-               mmu_psize_defs[mmu_io_psize].shift);
+               mmu_psize_defs[mmu_io_psize].shift
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+               ,mmu_psize_defs[mmu_vmemmap_psize].shift
+#endif
+               );
 #ifdef CONFIG_HUGETLB_PAGE
        /* Init large page size. Currently, we pick 16M or 1M depending
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index c5ac532a0161..6aa65375abf5 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -19,6 +19,8 @@
 *
 */
+#undef DEBUG
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
@@ -208,12 +210,12 @@ int __meminit vmemmap_populated(unsigned long start, int page_size)
 }
 int __meminit vmemmap_populate(struct page *start_page,
-                                        unsigned long nr_pages, int node)
+                               unsigned long nr_pages, int node)
 {
        unsigned long mode_rw;
        unsigned long start = (unsigned long)start_page;
        unsigned long end = (unsigned long)(start_page + nr_pages);
-        unsigned long page_size = 1 << mmu_psize_defs[mmu_linear_psize].shift;
+        unsigned long page_size = 1 << mmu_psize_defs[mmu_vmemmap_psize].shift;
        mode_rw = _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_COHERENT | PP_RWXX;
@@ -235,11 +237,11 @@ int __meminit vmemmap_populate(struct page *start_page,
                        start, p, __pa(p));
                mapped = htab_bolt_mapping(start, start + page_size,
-                                        __pa(p), mode_rw, mmu_linear_psize,
+                                        __pa(p), mode_rw, mmu_vmemmap_psize,
                                        mmu_kernel_ssize);
                BUG_ON(mapped < 0);
        }
        return 0;
 }
-#endif
+#endif /* CONFIG_SPARSEMEM_VMEMMAP */
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index cf8705e32d60..89497fb04280 100644
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -28,7 +28,7 @@
 #include <asm/udbg.h>
 #ifdef DEBUG
-#define DBG(fmt...) udbg_printf(fmt)
+#define DBG(fmt...) printk(fmt)
 #else
 #define DBG pr_debug
 #endif
@@ -263,13 +263,19 @@ void slb_initialize(void)
        extern unsigned int *slb_miss_kernel_load_linear;
        extern unsigned int *slb_miss_kernel_load_io;
        extern unsigned int *slb_compare_rr_to_size;
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+        extern unsigned int *slb_miss_kernel_load_vmemmap;
+        unsigned long vmemmap_llp;
+#endif
        /* Prepare our SLB miss handler based on our page size */
        linear_llp = mmu_psize_defs[mmu_linear_psize].sllp;
        io_llp = mmu_psize_defs[mmu_io_psize].sllp;
        vmalloc_llp = mmu_psize_defs[mmu_vmalloc_psize].sllp;
        get_paca()->vmalloc_sllp = SLB_VSID_KERNEL | vmalloc_llp;
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+        vmemmap_llp = mmu_psize_defs[mmu_vmemmap_psize].sllp;
+#endif
        if (!slb_encoding_inited) {
                slb_encoding_inited = 1;
                patch_slb_encoding(slb_miss_kernel_load_linear,
@@ -281,6 +287,12 @@ void slb_initialize(void)
                DBG("SLB: linear  LLP = %04lx\n", linear_llp);
                DBG("SLB: io      LLP = %04lx\n", io_llp);
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+                patch_slb_encoding(slb_miss_kernel_load_vmemmap,
+                                   SLB_VSID_KERNEL | vmemmap_llp);
+                DBG("SLB: vmemmap LLP = %04lx\n", vmemmap_llp);
+#endif
        }
        get_paca()->stab_rr = SLB_NUM_BOLTED;
diff --git a/arch/powerpc/mm/slb_low.S b/arch/powerpc/mm/slb_low.S
index 657f6b37e9df..bc44dc4b5c67 100644
--- a/arch/powerpc/mm/slb_low.S
+++ b/arch/powerpc/mm/slb_low.S
@@ -47,8 +47,7 @@ _GLOBAL(slb_allocate_realmode)
         * it to VSID 0, which is reserved as a bad VSID - one which
         * will never have any pages in it.  */
-        /* Check if hitting the linear mapping of the vmalloc/ioremap
+        /* Check if hitting the linear mapping or some other kernel space
-         * kernel space
        */
        bne     cr7,1f
@@ -62,7 +61,18 @@ BEGIN_FTR_SECTION
 END_FTR_SECTION_IFCLR(CPU_FTR_1T_SEGMENT)
        b       slb_finish_load_1T
-1:      /* vmalloc/ioremap mapping encoding bits, the "li" instructions below
+1:
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+        /* Check virtual memmap region. To be patches at kernel boot */
+        cmpldi  cr0,r9,0xf
+        bne     1f
+_GLOBAL(slb_miss_kernel_load_vmemmap)
+        li      r11,0
+        b       6f
+1:
+#endif /* CONFIG_SPARSEMEM_VMEMMAP */
+        /* vmalloc/ioremap mapping encoding bits, the "li" instructions below
         * will be patched by the kernel at boot
         */
 BEGIN_FTR_SECTION
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 25f8bc75e838..43a459f63e31 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -32,6 +32,7 @@
 #include <linux/fsl_devices.h>
 #include <linux/of_platform.h>
 #include <linux/of_device.h>
+#include <linux/phy.h>
 #include <asm/system.h>
 #include <asm/atomic.h>
@@ -56,6 +57,95 @@
 #define DBG(fmt...)
 #endif
+#define MV88E1111_SCR   0x10
+#define MV88E1111_SCR_125CLK    0x0010
+static int mpc8568_fixup_125_clock(struct phy_device *phydev)
+{
+        int scr;
+        int err;
+        /* Workaround for the 125 CLK Toggle */
+        scr = phy_read(phydev, MV88E1111_SCR);
+        if (scr < 0)
+                return scr;
+        err = phy_write(phydev, MV88E1111_SCR, scr & ~(MV88E1111_SCR_125CLK));
+        if (err)
+                return err;
+        err = phy_write(phydev, MII_BMCR, BMCR_RESET);
+        if (err)
+                return err;
+        scr = phy_read(phydev, MV88E1111_SCR);
+        if (scr < 0)
+                return err;
+        err = phy_write(phydev, MV88E1111_SCR, scr | 0x0008);
+        return err;
+}
+static int mpc8568_mds_phy_fixups(struct phy_device *phydev)
+{
+        int temp;
+        int err;
+        /* Errata */
+        err = phy_write(phydev,29, 0x0006);
+        if (err)
+                return err;
+        temp = phy_read(phydev, 30);
+        if (temp < 0)
+                return temp;
+        temp = (temp & (~0x8000)) | 0x4000;
+        err = phy_write(phydev,30, temp);
+        if (err)
+                return err;
+        err = phy_write(phydev,29, 0x000a);
+        if (err)
+                return err;
+        temp = phy_read(phydev, 30);
+        if (temp < 0)
+                return temp;
+        temp = phy_read(phydev, 30);
+        if (temp < 0)
+                return temp;
+        temp &= ~0x0020;
+        err = phy_write(phydev,30,temp);
+        if (err)
+                return err;
+        /* Disable automatic MDI/MDIX selection */
+        temp = phy_read(phydev, 16);
+        if (temp < 0)
+                return temp;
+        temp &= ~0x0060;
+        err = phy_write(phydev,16,temp);
+        return err;
+}
 /* ************************************************************************
 *
 * Setup the architecture
@@ -64,7 +154,7 @@
 static void __init mpc85xx_mds_setup_arch(void)
 {
        struct device_node *np;
-        static u8 *bcsr_regs = NULL;
+        static u8 __iomem *bcsr_regs = NULL;
        if (ppc_md.progress)
                ppc_md.progress("mpc85xx_mds_setup_arch()", 0);
@@ -138,6 +228,35 @@ static void __init mpc85xx_mds_setup_arch(void)
 #endif  /* CONFIG_QUICC_ENGINE */
 }
+static int __init board_fixups(void)
+{
+        char phy_id[BUS_ID_SIZE];
+        char *compstrs[2] = {"fsl,gianfar-mdio", "fsl,ucc-mdio"};
+        struct device_node *mdio;
+        struct resource res;
+        int i;
+        for (i = 0; i < ARRAY_SIZE(compstrs); i++) {
+                mdio = of_find_compatible_node(NULL, NULL, compstrs[i]);
+                of_address_to_resource(mdio, 0, &res);
+                snprintf(phy_id, BUS_ID_SIZE, "%x:%02x", res.start, 1);
+                phy_register_fixup_for_id(phy_id, mpc8568_fixup_125_clock);
+                phy_register_fixup_for_id(phy_id, mpc8568_mds_phy_fixups);
+                /* Register a workaround for errata */
+                snprintf(phy_id, BUS_ID_SIZE, "%x:%02x", res.start, 7);
+                phy_register_fixup_for_id(phy_id, mpc8568_mds_phy_fixups);
+                of_node_put(mdio);
+        }
+        return 0;
+}
+machine_arch_initcall(mpc85xx_mds, board_fixups);
 static struct of_device_id mpc85xx_ids[] = {
        { .type = "soc", },
        { .compatible = "soc", },
diff --git a/arch/powerpc/platforms/85xx/sbc8548.c b/arch/powerpc/platforms/85xx/sbc8548.c
index 488facb99fe8..b9246ea0928a 100644
--- a/arch/powerpc/platforms/85xx/sbc8548.c
+++ b/arch/powerpc/platforms/85xx/sbc8548.c
@@ -49,6 +49,8 @@
 #include <sysdev/fsl_soc.h>
 #include <sysdev/fsl_pci.h>
+static int sbc_rev;
 static void __init sbc8548_pic_init(void)
 {
        struct mpic *mpic;
@@ -79,6 +81,30 @@ static void __init sbc8548_pic_init(void)
        mpic_init(mpic);
 }
+/* Extract the HW Rev from the EPLD on the board */
+static int __init sbc8548_hw_rev(void)
+{
+        struct device_node *np;
+        struct resource res;
+        unsigned int *rev;
+        int board_rev = 0;
+        np = of_find_compatible_node(NULL, NULL, "hw-rev");
+        if (np == NULL) {
+                printk("No HW-REV found in DTB.\n");
+                return -ENODEV;
+        }
+        of_address_to_resource(np, 0, &res);
+        of_node_put(np);
+        rev = ioremap(res.start,sizeof(unsigned int));
+        board_rev = (*rev) >> 28;
+        iounmap(rev);
+        return board_rev;
+}
 /*
 * Setup the architecture
 */
@@ -104,6 +130,7 @@ static void __init sbc8548_setup_arch(void)
                }
        }
 #endif
+        sbc_rev = sbc8548_hw_rev();
 }
 static void sbc8548_show_cpuinfo(struct seq_file *m)
@@ -115,7 +142,7 @@ static void sbc8548_show_cpuinfo(struct seq_file *m)
        svid = mfspr(SPRN_SVR);
        seq_printf(m, "Vendor\t\t: Wind River\n");
-        seq_printf(m, "Machine\t\t: SBC8548\n");
+        seq_printf(m, "Machine\t\t: SBC8548 v%d\n", sbc_rev);
        seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
        seq_printf(m, "SVR\t\t: 0x%x\n", svid);
@@ -130,6 +157,7 @@ static void sbc8548_show_cpuinfo(struct seq_file *m)
 static struct of_device_id __initdata of_bus_ids[] = {
        { .name = "soc", },
        { .type = "soc", },
+        { .compatible = "simple-bus", },
        {},
 };
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index 5e1e8cf14e75..dea13208bf64 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -43,6 +43,7 @@ static unsigned char *pixis_bdcfg0, *pixis_arch;
 static struct of_device_id __initdata mpc8610_ids[] = {
        { .compatible = "fsl,mpc8610-immr", },
+        { .compatible = "simple-bus", },
        {}
 };
@@ -216,11 +217,21 @@ void mpc8610hpcd_set_gamma_table(int monitor_port, char *gamma_table_base)
        }
 }
+#define PX_BRDCFG0_DVISEL       (1 << 3)
+#define PX_BRDCFG0_DLINK        (1 << 4)
+#define PX_BRDCFG0_DIU_MASK     (PX_BRDCFG0_DVISEL | PX_BRDCFG0_DLINK)
 void mpc8610hpcd_set_monitor_port(int monitor_port)
 {
-        static const u8 bdcfg[] = {0xBD, 0xB5, 0xA5};
+        static const u8 bdcfg[] = {
+                PX_BRDCFG0_DVISEL | PX_BRDCFG0_DLINK,
+                PX_BRDCFG0_DLINK,
+                0,
+        };
        if (monitor_port < 3)
-                *pixis_bdcfg0 = bdcfg[monitor_port];
+                clrsetbits_8(pixis_bdcfg0, PX_BRDCFG0_DIU_MASK,
+                             bdcfg[monitor_port]);
 }
 void mpc8610hpcd_set_pixel_clock(unsigned int pixclock)
diff --git a/arch/powerpc/platforms/cell/io-workarounds.c b/arch/powerpc/platforms/cell/io-workarounds.c
index 3b84e8be314c..b5f84e8f0899 100644
--- a/arch/powerpc/platforms/cell/io-workarounds.c
+++ b/arch/powerpc/platforms/cell/io-workarounds.c
@@ -118,7 +118,7 @@ static void iowa_##name at					\
 #undef DEF_PCI_AC_RET
 #undef DEF_PCI_AC_NORET
-static struct ppc_pci_io __initdata iowa_pci_io = {
+static const struct ppc_pci_io __devinitconst iowa_pci_io = {
 #define DEF_PCI_AC_RET(name, ret, at, al, space, aa)    .name = iowa_##name,
 #define DEF_PCI_AC_NORET(name, at, al, space, aa)       .name = iowa_##name,
@@ -146,7 +146,7 @@ static void __iomem *iowa_ioremap(unsigned long addr, unsigned long size,
 }
 /* Regist new bus to support workaround */
-void __init iowa_register_bus(struct pci_controller *phb,
+void __devinit iowa_register_bus(struct pci_controller *phb,
                        struct ppc_pci_io *ops,
                        int (*initfunc)(struct iowa_bus *, void *), void *data)
 {
@@ -173,7 +173,7 @@ void __init iowa_register_bus(struct pci_controller *phb,
 }
 /* enable IO workaround */
-void __init io_workaround_init(void)
+void __devinit io_workaround_init(void)
 {
        static int io_workaround_inited;
diff --git a/arch/powerpc/platforms/cell/io-workarounds.h b/arch/powerpc/platforms/cell/io-workarounds.h
index 79d8ed3d510f..6efc7782ebf2 100644
--- a/arch/powerpc/platforms/cell/io-workarounds.h
+++ b/arch/powerpc/platforms/cell/io-workarounds.h
@@ -31,9 +31,9 @@ struct iowa_bus {
        void   *private;
 };
-void __init io_workaround_init(void);
+void __devinit io_workaround_init(void);
-void __init iowa_register_bus(struct pci_controller *, struct ppc_pci_io *,
+void __devinit iowa_register_bus(struct pci_controller *, struct ppc_pci_io *,
-                              int (*)(struct iowa_bus *, void *), void *);
+                                 int (*)(struct iowa_bus *, void *), void *);
 struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR);
 struct iowa_bus *iowa_pio_find_bus(unsigned long);
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 80911a373400..c81341ff75b5 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -32,6 +32,7 @@
 #include <linux/marker.h>
 #include <asm/io.h>
+#include <asm/time.h>
 #include <asm/spu.h>
 #include <asm/spu_info.h>
 #include <asm/uaccess.h>
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 2e411f23462b..745dd51ec37f 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -659,7 +659,7 @@ static struct spu *find_victim(struct spu_context *ctx)
                        victim->stats.invol_ctx_switch++;
                        spu->stats.invol_ctx_switch++;
-                        if (test_bit(SPU_SCHED_SPU_RUN, &ctx->sched_flags))
+                        if (test_bit(SPU_SCHED_SPU_RUN, &victim->sched_flags))
                                spu_add_to_rq(victim);
                        mutex_unlock(&victim->state_mutex);
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 8df7f0e4c3a6..2352d139b262 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -43,7 +43,7 @@ KBUILD_AFLAGS += $(cpu-as-y)
 KBUILD_CFLAGS += $(cpu-as-y)
 # Default to the common case.
-KBUILD_DEFCONFIG := common_defconfig
+KBUILD_DEFCONFIG := ebony_defconfig
 head-y                          := arch/ppc/kernel/head.o
 head-$(CONFIG_8xx)              := arch/ppc/kernel/head_8xx.o
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index 16ac11ca7ba0..602c268fc8a2 100644
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -24,6 +24,7 @@
 #include <asm/checksum.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
+#include <asm/cacheflush.h>
 #include <linux/adb.h>
 #include <linux/cuda.h>
 #include <linux/pmu.h>
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index bfddfdee0b65..51e8094f52d6 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -36,6 +36,7 @@
 #include <asm/nvram.h>
 #include <asm/xmon.h>
 #include <asm/ocp.h>
+#include <asm/irq.h>
 #define USES_PPC_SYS (defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \
                      defined(CONFIG_PPC_MPC52xx))
diff --git a/arch/ppc/platforms/residual.c b/arch/ppc/platforms/residual.c
index 18495e754e30..d687b0f8763b 100644
--- a/arch/ppc/platforms/residual.c
+++ b/arch/ppc/platforms/residual.c
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
+#include <linux/proc_fs.h>
 #include <asm/sections.h>
 #include <asm/mmu.h>
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index dff0568e67ec..c93d1296cc0a 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -71,7 +71,7 @@ static ssize_t debug_input(struct file *file, const char __user *user_buf,
                        size_t user_len, loff_t * offset);
 static int debug_open(struct inode *inode, struct file *file);
 static int debug_close(struct inode *inode, struct file *file);
-static debug_info_t*  debug_info_create(char *name, int pages_per_area,
+static debug_info_t *debug_info_create(const char *name, int pages_per_area,
                        int nr_areas, int buf_size, mode_t mode);
 static void debug_info_get(debug_info_t *);
 static void debug_info_put(debug_info_t *);
@@ -234,8 +234,8 @@ fail_malloc_areas:
 */
 static debug_info_t*
-debug_info_alloc(char *name, int pages_per_area, int nr_areas, int buf_size,
+debug_info_alloc(const char *name, int pages_per_area, int nr_areas,
-                int level, int mode)
+                 int buf_size, int level, int mode)
 {
        debug_info_t* rc;
@@ -326,8 +326,8 @@ debug_info_free(debug_info_t* db_info){
 */
 static debug_info_t*
-debug_info_create(char *name, int pages_per_area, int nr_areas, int buf_size,
+debug_info_create(const char *name, int pages_per_area, int nr_areas,
-                  mode_t mode)
+                  int buf_size, mode_t mode)
 {
        debug_info_t* rc;
@@ -684,9 +684,9 @@ debug_close(struct inode *inode, struct file *file)
 * - Returns handle for debug area
 */
-debug_info_t *debug_register_mode(char *name, int pages_per_area, int nr_areas,
+debug_info_t *debug_register_mode(const char *name, int pages_per_area,
-                                  int buf_size, mode_t mode, uid_t uid,
+                                  int nr_areas, int buf_size, mode_t mode,
-                                  gid_t gid)
+                                  uid_t uid, gid_t gid)
 {
        debug_info_t *rc = NULL;
@@ -722,8 +722,8 @@ EXPORT_SYMBOL(debug_register_mode);
 * - returns handle for debug area
 */
-debug_info_t *debug_register(char *name, int pages_per_area, int nr_areas,
+debug_info_t *debug_register(const char *name, int pages_per_area,
-                             int buf_size)
+                             int nr_areas, int buf_size)
 {
        return debug_register_mode(name, pages_per_area, nr_areas, buf_size,
                                   S_IRUSR | S_IWUSR, 0, 0);
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index c59a86dca584..e7c5bfb7c755 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -25,6 +25,7 @@ int show_interrupts(struct seq_file *p, void *v)
        static const char *intrclass_names[] = { "EXT", "I/O", };
        int i = *(loff_t *) v, j;
+        get_online_cpus();
        if (i == 0) {
                seq_puts(p, "           ");
                for_each_online_cpu(j)
@@ -43,7 +44,7 @@ int show_interrupts(struct seq_file *p, void *v)
                seq_putc(p, '\n');
        }
+        put_online_cpus();
        return 0;
 }
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 0aeb290060d9..1f4228948dc4 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -139,7 +139,6 @@ static void __smp_call_function_map(void (*func) (void *info), void *info,
        if (wait)
                data.finished = CPU_MASK_NONE;
-        spin_lock(&call_lock);
        call_data = &data;
        for_each_cpu_mask(cpu, map)
@@ -151,7 +150,6 @@ static void __smp_call_function_map(void (*func) (void *info), void *info,
        if (wait)
                while (!cpus_equal(map, data.finished))
                        cpu_relax();
-        spin_unlock(&call_lock);
 out:
        if (local) {
                local_irq_disable();
@@ -177,11 +175,11 @@ int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
 {
        cpumask_t map;
-        preempt_disable();
+        spin_lock(&call_lock);
        map = cpu_online_map;
        cpu_clear(smp_processor_id(), map);
        __smp_call_function_map(func, info, nonatomic, wait, map);
-        preempt_enable();
+        spin_unlock(&call_lock);
        return 0;
 }
 EXPORT_SYMBOL(smp_call_function);
@@ -202,10 +200,10 @@ EXPORT_SYMBOL(smp_call_function);
 int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
                             int nonatomic, int wait)
 {
-        preempt_disable();
+        spin_lock(&call_lock);
        __smp_call_function_map(func, info, nonatomic, wait,
                                cpumask_of_cpu(cpu));
-        preempt_enable();
+        spin_unlock(&call_lock);
        return 0;
 }
 EXPORT_SYMBOL(smp_call_function_single);
@@ -228,10 +226,10 @@ EXPORT_SYMBOL(smp_call_function_single);
 int smp_call_function_mask(cpumask_t mask, void (*func)(void *), void *info,
                           int wait)
 {
-        preempt_disable();
+        spin_lock(&call_lock);
        cpu_clear(smp_processor_id(), mask);
        __smp_call_function_map(func, info, 0, wait, mask);
-        preempt_enable();
+        spin_unlock(&call_lock);
        return 0;
 }
 EXPORT_SYMBOL(smp_call_function_mask);
@@ -592,7 +590,9 @@ int __cpuinit start_secondary(void *cpuvoid)
        pfault_init();
        /* Mark this cpu as online */
+        spin_lock(&call_lock);
        cpu_set(smp_processor_id(), cpu_online_map);
+        spin_unlock(&call_lock);
        /* Switch on interrupts */
        local_irq_enable();
        /* Print info about this processor */
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index beccacf907f3..ea2804808f39 100644
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -27,19 +27,12 @@ struct memory_segment {
 static LIST_HEAD(mem_segs);
-static void __ref *vmem_alloc_pages(unsigned int order)
+static pud_t *vmem_pud_alloc(void)
-{
-        if (slab_is_available())
-                return (void *)__get_free_pages(GFP_KERNEL, order);
-        return alloc_bootmem_pages((1 << order) * PAGE_SIZE);
-}
-static inline pud_t *vmem_pud_alloc(void)
 {
        pud_t *pud = NULL;
 #ifdef CONFIG_64BIT
-        pud = vmem_alloc_pages(2);
+        pud = vmemmap_alloc_block(PAGE_SIZE * 4, 0);
        if (!pud)
                return NULL;
        clear_table((unsigned long *) pud, _REGION3_ENTRY_EMPTY, PAGE_SIZE * 4);
@@ -47,12 +40,12 @@ static inline pud_t *vmem_pud_alloc(void)
        return pud;
 }
-static inline pmd_t *vmem_pmd_alloc(void)
+static pmd_t *vmem_pmd_alloc(void)
 {
        pmd_t *pmd = NULL;
 #ifdef CONFIG_64BIT
-        pmd = vmem_alloc_pages(2);
+        pmd = vmemmap_alloc_block(PAGE_SIZE * 4, 0);
        if (!pmd)
                return NULL;
        clear_table((unsigned long *) pmd, _SEGMENT_ENTRY_EMPTY, PAGE_SIZE * 4);
@@ -60,7 +53,7 @@ static inline pmd_t *vmem_pmd_alloc(void)
        return pmd;
 }
-static pte_t __init_refok *vmem_pte_alloc(void)
+static pte_t __ref *vmem_pte_alloc(void)
 {
        pte_t *pte;
@@ -214,7 +207,7 @@ int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)
                if (pte_none(*pt_dir)) {
                        unsigned long new_page;
-                        new_page =__pa(vmem_alloc_pages(0));
+                        new_page =__pa(vmemmap_alloc_block(PAGE_SIZE, 0));
                        if (!new_page)
                                goto out;
                        pte = pfn_pte(new_page >> PAGE_SHIFT, PAGE_KERNEL);
diff --git a/arch/sh/kernel/kgdb_stub.c b/arch/sh/kernel/kgdb_stub.c
index d453c3a1c79f..832641bbd47d 100644
--- a/arch/sh/kernel/kgdb_stub.c
+++ b/arch/sh/kernel/kgdb_stub.c
@@ -330,14 +330,6 @@ static char *ebin_to_mem(const char *buf, char *mem, int count)
        return mem;
 }
-/* Pack a hex byte */
-static char *pack_hex_byte(char *pkt, int byte)
-{
-        *pkt++ = hexchars[(byte >> 4) & 0xf];
-        *pkt++ = hexchars[(byte & 0xf)];
-        return pkt;
-}
 /* Scan for the start char '$', read the packet and check the checksum */
 static void get_packet(char *buffer, int buflen)
 {
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 57d1bbdd0bd2..4bcfe54f878d 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -1306,6 +1306,8 @@ ret_from_fork:
        .align  4
        .globl  linux_sparc_syscall
 linux_sparc_syscall:
+        sethi   %hi(PSR_SYSCALL), %l4
+        or      %l0, %l4, %l0
        /* Direct access to user regs, must faster. */
        cmp     %g1, NR_SYSCALLS
        bgeu    linux_sparc_ni_syscall
diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c
index 36431f377dee..da48d248cc17 100644
--- a/arch/sparc/kernel/process.c
+++ b/arch/sparc/kernel/process.c
@@ -638,11 +638,6 @@ asmlinkage int sparc_execve(struct pt_regs *regs)
                          (char __user * __user *)regs->u_regs[base + UREG_I2],
                          regs);
        putname(filename);
-        if (error == 0) {
-                task_lock(current);
-                current->ptrace &= ~PT_DTRACE;
-                task_unlock(current);
-        }
 out:
        return error;
 }
diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c
index 7f44ae69b29e..81f3b929743f 100644
--- a/arch/sparc/kernel/ptrace.c
+++ b/arch/sparc/kernel/ptrace.c
@@ -170,8 +170,8 @@ static int genregs32_set(struct task_struct *target,
                switch (pos) {
                case 32: /* PSR */
                        psr = regs->psr;
-                        psr &= ~PSR_ICC;
+                        psr &= ~(PSR_ICC | PSR_SYSCALL);
-                        psr |= (reg & PSR_ICC);
+                        psr |= (reg & (PSR_ICC | PSR_SYSCALL));
                        regs->psr = psr;
                        break;
                case 33: /* PC */
@@ -441,6 +441,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                break;
        default:
+                if (request == PTRACE_SPARC_DETACH)
+                        request = PTRACE_DETACH;
                ret = ptrace_request(child, request, addr, data);
                break;
        }
diff --git a/arch/sparc/kernel/rtrap.S b/arch/sparc/kernel/rtrap.S
index 77ca6fd81253..ab818cdc4cc0 100644
--- a/arch/sparc/kernel/rtrap.S
+++ b/arch/sparc/kernel/rtrap.S
@@ -50,8 +50,9 @@ rtrap_7win_patch5:	and	%g1, 0x7f, %g1
 ret_trap_entry:
 ret_trap_lockless_ipi:
        andcc   %t_psr, PSR_PS, %g0
+        sethi   %hi(PSR_SYSCALL), %g1
        be      1f
-         nop
+         andn   %t_psr, %g1, %t_psr
        wr      %t_psr, 0x0, %psr
        b       ret_trap_kernel
@@ -73,7 +74,6 @@ signal_p:
         ld     [%sp + STACKFRAME_SZ + PT_PSR], %t_psr
        mov     %l5, %o1
-        mov     %l6, %o2
        call    do_signal
         add    %sp, STACKFRAME_SZ, %o0 ! pt_regs ptr
@@ -81,6 +81,8 @@ signal_p:
        ld      [%sp + STACKFRAME_SZ + PT_PSR], %t_psr
        clr     %l6
 ret_trap_continue:
+        sethi   %hi(PSR_SYSCALL), %g1
+        andn    %t_psr, %g1, %t_psr
        wr      %t_psr, 0x0, %psr
        WRITE_PAUSE
@@ -137,8 +139,9 @@ ret_trap_userwins_ok:
        LOAD_PT_PRIV(sp, t_psr, t_pc, t_npc)
        or      %t_pc, %t_npc, %g2
        andcc   %g2, 0x3, %g0
+        sethi   %hi(PSR_SYSCALL), %g2
        be      1f
-         nop
+         andn   %t_psr, %g2, %t_psr
        b       ret_trap_unaligned_pc
         add    %sp, STACKFRAME_SZ, %o0
@@ -201,6 +204,8 @@ rtrap_patch5:	and	%g1, 0xff, %g1
 1:
        LOAD_PT_ALL(sp, t_psr, t_pc, t_npc, g1)
 2:
+        sethi   %hi(PSR_SYSCALL), %twin_tmp1
+        andn    %t_psr, %twin_tmp1, %t_psr
        wr      %t_psr, 0x0, %psr
        WRITE_PAUSE
diff --git a/arch/sparc/kernel/signal.c b/arch/sparc/kernel/signal.c
index 368157926d24..3fd1df9f9ba7 100644
--- a/arch/sparc/kernel/signal.c
+++ b/arch/sparc/kernel/signal.c
@@ -145,6 +145,9 @@ asmlinkage void do_sigreturn(struct pt_regs *regs)
        regs->psr = (up_psr & ~(PSR_ICC | PSR_EF))
                  | (regs->psr & (PSR_ICC | PSR_EF));
+        /* Prevent syscall restart.  */
+        pt_regs_clear_syscall(regs);
        err |= __get_user(fpu_save, &sf->fpu_save);
        if (fpu_save)
@@ -199,6 +202,9 @@ asmlinkage void do_rt_sigreturn(struct pt_regs *regs)
        regs->psr = (regs->psr & ~PSR_ICC) | (psr & PSR_ICC);
+        /* Prevent syscall restart.  */
+        pt_regs_clear_syscall(regs);
        err |= __get_user(fpu_save, &sf->fpu_save);
        if (fpu_save)
@@ -507,26 +513,36 @@ static inline void syscall_restart(unsigned long orig_i0, struct pt_regs *regs,
 * want to handle. Thus you cannot kill init even with a SIGKILL even by
 * mistake.
 */
-asmlinkage void do_signal(struct pt_regs * regs, unsigned long orig_i0, int restart_syscall)
+asmlinkage void do_signal(struct pt_regs * regs, unsigned long orig_i0)
 {
-        siginfo_t info;
-        struct sparc_deliver_cookie cookie;
        struct k_sigaction ka;
-        int signr;
+        int restart_syscall;
        sigset_t *oldset;
+        siginfo_t info;
+        int signr;
-        cookie.restart_syscall = restart_syscall;
+        if (pt_regs_is_syscall(regs) && (regs->psr & PSR_C))
-        cookie.orig_i0 = orig_i0;
+                restart_syscall = 1;
+        else
+                restart_syscall = 0;
        if (test_thread_flag(TIF_RESTORE_SIGMASK))
                oldset = &current->saved_sigmask;
        else
                oldset = &current->blocked;
-        signr = get_signal_to_deliver(&info, &ka, regs, &cookie);
+        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
+        /* If the debugger messes with the program counter, it clears
+         * the software "in syscall" bit, directing us to not perform
+         * a syscall restart.
+         */
+        if (restart_syscall && !pt_regs_is_syscall(regs))
+                restart_syscall = 0;
        if (signr > 0) {
-                if (cookie.restart_syscall)
+                if (restart_syscall)
-                        syscall_restart(cookie.orig_i0, regs, &ka.sa);
+                        syscall_restart(orig_i0, regs, &ka.sa);
                handle_signal(signr, &ka, &info, oldset, regs);
                /* a signal was successfully delivered; the saved
@@ -538,16 +554,16 @@ asmlinkage void do_signal(struct pt_regs * regs, unsigned long orig_i0, int rest
                        clear_thread_flag(TIF_RESTORE_SIGMASK);
                return;
        }
-        if (cookie.restart_syscall &&
+        if (restart_syscall &&
            (regs->u_regs[UREG_I0] == ERESTARTNOHAND ||
             regs->u_regs[UREG_I0] == ERESTARTSYS ||
             regs->u_regs[UREG_I0] == ERESTARTNOINTR)) {
                /* replay the system call when we are done */
-                regs->u_regs[UREG_I0] = cookie.orig_i0;
+                regs->u_regs[UREG_I0] = orig_i0;
                regs->pc -= 4;
                regs->npc -= 4;
        }
-        if (cookie.restart_syscall &&
+        if (restart_syscall &&
            regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
                regs->u_regs[UREG_G1] = __NR_restart_syscall;
                regs->pc -= 4;
@@ -599,27 +615,3 @@ do_sys_sigstack(struct sigstack __user *ssptr, struct sigstack __user *ossptr,
 out:
        return ret;
 }
-void ptrace_signal_deliver(struct pt_regs *regs, void *cookie)
-{
-        struct sparc_deliver_cookie *cp = cookie;
-        if (cp->restart_syscall &&
-            (regs->u_regs[UREG_I0] == ERESTARTNOHAND ||
-             regs->u_regs[UREG_I0] == ERESTARTSYS ||
-             regs->u_regs[UREG_I0] == ERESTARTNOINTR)) {
-                /* replay the system call when we are done */
-                regs->u_regs[UREG_I0] = cp->orig_i0;
-                regs->pc -= 4;
-                regs->npc -= 4;
-                cp->restart_syscall = 0;
-        }
-        if (cp->restart_syscall &&
-            regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
-                regs->u_regs[UREG_G1] = __NR_restart_syscall;
-                regs->pc -= 4;
-                regs->npc -= 4;
-                cp->restart_syscall = 0;
-        }
-}
diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c
index e995491c4436..3c6b49a53ae8 100644
--- a/arch/sparc/kernel/sys_sparc.c
+++ b/arch/sparc/kernel/sys_sparc.c
@@ -219,7 +219,7 @@ out:
        return err;
 }
-int sparc_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
+int sparc_mmap_check(unsigned long addr, unsigned long len)
 {
        if (ARCH_SUN4C_SUN4 &&
            (len > 0x20000000 ||
@@ -295,52 +295,14 @@ asmlinkage unsigned long sparc_mremap(unsigned long addr,
        unsigned long old_len, unsigned long new_len,
        unsigned long flags, unsigned long new_addr)
 {
-        struct vm_area_struct *vma;
        unsigned long ret = -EINVAL;
-        if (ARCH_SUN4C_SUN4) {
-                if (old_len > 0x20000000 || new_len > 0x20000000)
+        if (unlikely(sparc_mmap_check(addr, old_len)))
-                        goto out;
+                goto out;
-                if (addr < 0xe0000000 && addr + old_len > 0x20000000)
+        if (unlikely(sparc_mmap_check(new_addr, new_len)))
-                        goto out;
-        }
-        if (old_len > TASK_SIZE - PAGE_SIZE ||
-            new_len > TASK_SIZE - PAGE_SIZE)
                goto out;
        down_write(&current->mm->mmap_sem);
-        if (flags & MREMAP_FIXED) {
-                if (ARCH_SUN4C_SUN4 &&
-                    new_addr < 0xe0000000 &&
-                    new_addr + new_len > 0x20000000)
-                        goto out_sem;
-                if (new_addr + new_len > TASK_SIZE - PAGE_SIZE)
-                        goto out_sem;
-        } else if ((ARCH_SUN4C_SUN4 && addr < 0xe0000000 &&
-                    addr + new_len > 0x20000000) ||
-                   addr + new_len > TASK_SIZE - PAGE_SIZE) {
-                unsigned long map_flags = 0;
-                struct file *file = NULL;
-                ret = -ENOMEM;
-                if (!(flags & MREMAP_MAYMOVE))
-                        goto out_sem;
-                vma = find_vma(current->mm, addr);
-                if (vma) {
-                        if (vma->vm_flags & VM_SHARED)
-                                map_flags |= MAP_SHARED;
-                        file = vma->vm_file;
-                }
-                new_addr = get_unmapped_area(file, addr, new_len,
-                                     vma ? vma->vm_pgoff : 0,
-                                     map_flags);
-                ret = new_addr;
-                if (new_addr & ~PAGE_MASK)
-                        goto out_sem;
-                flags |= MREMAP_FIXED;
-        }
        ret = do_mremap(addr, old_len, new_len, flags, new_addr);
-out_sem:
        up_write(&current->mm->mmap_sem);
 out:
        return ret;       
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index aff93c9d13f4..76eb832527f2 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.25
+# Linux kernel version: 2.6.26-rc2
-# Sat Apr 26 03:11:06 2008
+# Fri May 16 13:36:07 2008
 #
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
@@ -74,6 +74,7 @@ CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -103,12 +104,14 @@ CONFIG_KPROBES=y
 CONFIG_KRETPROBES=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
@@ -170,6 +173,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MIGRATION=y
 CONFIG_RESOURCES_64BIT=y
@@ -402,7 +406,6 @@ CONFIG_IDEPCI_PCIBUS_ORDER=y
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_AEC62XX is not set
 CONFIG_BLK_DEV_ALI15X3=y
-# CONFIG_WDC_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
 # CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_TRIFLEX is not set
@@ -609,6 +612,7 @@ CONFIG_NIU=m
 # CONFIG_MLX4_CORE is not set
 # CONFIG_TEHUTI is not set
 # CONFIG_BNX2X is not set
+# CONFIG_SFC is not set
 # CONFIG_TR is not set
 #
@@ -717,6 +721,7 @@ CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_DEVKMEM is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_NOZOMI is not set
@@ -793,12 +798,7 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
-#
-# SPI support
-#
 # CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
 # CONFIG_W1 is not set
 # CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
@@ -873,8 +873,17 @@ CONFIG_SSB_POSSIBLE=y
 #
 # Multimedia devices
 #
+#
+# Multimedia core support
+#
 # CONFIG_VIDEO_DEV is not set
 # CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+#
+# Multimedia drivers
+#
 # CONFIG_DAB is not set
 #
@@ -893,8 +902,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SYS_FILLRECT is not set
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -1100,6 +1109,10 @@ CONFIG_SND_SUN_CS4231=m
 #
 #
+# SoC Audio for the Texas Instruments OMAP
+#
+#
 # Open Sound System
 #
 # CONFIG_SOUND_PRIME is not set
@@ -1135,10 +1148,12 @@ CONFIG_USB_DEVICEFS=y
 #
 # USB Host Controller Drivers
 #
+# CONFIG_USB_C67X00_HCD is not set
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
 # CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -1173,6 +1188,7 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_ALAUDA is not set
 # CONFIG_USB_STORAGE_ONETOUCH is not set
 # CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
 # CONFIG_USB_LIBUSUAL is not set
 #
@@ -1214,6 +1230,7 @@ CONFIG_USB_STORAGE=m
 # CONFIG_MMC is not set
 # CONFIG_MEMSTICK is not set
 # CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 # CONFIG_RTC_CLASS is not set
 # CONFIG_UIO is not set
@@ -1367,6 +1384,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_PRINTK_TIME=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=2048
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
@@ -1377,6 +1395,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHED_DEBUG is not set
 CONFIG_SCHEDSTATS=y
 # CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
@@ -1402,6 +1421,8 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_LKDTM is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_DCFLUSH is not set
 # CONFIG_STACK_DEBUG is not set
@@ -1503,6 +1524,7 @@ CONFIG_CRYPTO_HW=y
 # Library routines
 #
 CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 # CONFIG_CRC_ITU_T is not set
diff --git a/arch/sparc64/kernel/etrap.S b/arch/sparc64/kernel/etrap.S
index b49d3b60bc0c..f25e1da3fd03 100644
--- a/arch/sparc64/kernel/etrap.S
+++ b/arch/sparc64/kernel/etrap.S
@@ -27,11 +27,12 @@
                .text           
                .align  64
-                .globl  etrap, etrap_irq, etraptl1
+                .globl  etrap_syscall, etrap, etrap_irq, etraptl1
 etrap:          rdpr    %pil, %g2
-etrap_irq:
+etrap_irq:      clr     %g3
-                TRAP_LOAD_THREAD_REG(%g6, %g1)
+etrap_syscall:  TRAP_LOAD_THREAD_REG(%g6, %g1)
                rdpr    %tstate, %g1
+                or      %g1, %g3, %g1
                sllx    %g2, 20, %g3
                andcc   %g1, TSTATE_PRIV, %g0
                or      %g1, %g3, %g1
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index e9fc0aa2da38..f6c9fc92921d 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -287,11 +287,11 @@ static int genregs64_set(struct task_struct *target,
                                         32 * sizeof(u64),
                                         33 * sizeof(u64));
                if (!ret) {
-                        /* Only the condition codes can be modified
+                        /* Only the condition codes and the "in syscall"
-                         * in the %tstate register.
+                         * state can be modified in the %tstate register.
                         */
-                        tstate &= (TSTATE_ICC | TSTATE_XCC);
+                        tstate &= (TSTATE_ICC | TSTATE_XCC | TSTATE_SYSCALL);
-                        regs->tstate &= ~(TSTATE_ICC | TSTATE_XCC);
+                        regs->tstate &= ~(TSTATE_ICC | TSTATE_XCC | TSTATE_SYSCALL);
                        regs->tstate |= tstate;
                }
        }
@@ -657,8 +657,10 @@ static int genregs32_set(struct task_struct *target,
                switch (pos) {
                case 32: /* PSR */
                        tstate = regs->tstate;
-                        tstate &= ~(TSTATE_ICC | TSTATE_XCC);
+                        tstate &= ~(TSTATE_ICC | TSTATE_XCC | TSTATE_SYSCALL);
                        tstate |= psr_to_tstate_icc(reg);
+                        if (reg & PSR_SYSCALL)
+                                tstate |= TSTATE_SYSCALL;
                        regs->tstate = tstate;
                        break;
                case 33: /* PC */
@@ -944,6 +946,8 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
                break;
        default:
+                if (request == PTRACE_SPARC_DETACH)
+                        request = PTRACE_DETACH;
                ret = compat_ptrace_request(child, request, addr, data);
                break;
        }
@@ -1036,6 +1040,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                break;
        default:
+                if (request == PTRACE_SPARC_DETACH)
+                        request = PTRACE_DETACH;
                ret = ptrace_request(child, request, addr, data);
                break;
        }
diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S
index ecf6753b204a..16689b2930db 100644
--- a/arch/sparc64/kernel/rtrap.S
+++ b/arch/sparc64/kernel/rtrap.S
@@ -46,7 +46,7 @@ __handle_user_windows:
                wrpr                    %g0, RTRAP_PSTATE_IRQOFF, %pstate
                ldx                     [%g6 + TI_FLAGS], %l0
-1:              andcc                   %l0, (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), %g0
+1:              andcc                   %l0, _TIF_SIGPENDING, %g0
                be,pt                   %xcc, __handle_user_windows_continue
                 nop
                mov                     %l5, %o1
@@ -86,7 +86,7 @@ __handle_perfctrs:
                 wrpr                   %g0, RTRAP_PSTATE, %pstate
                wrpr                    %g0, RTRAP_PSTATE_IRQOFF, %pstate
                ldx                     [%g6 + TI_FLAGS], %l0
-1:              andcc                   %l0, (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), %g0
+1:              andcc                   %l0, _TIF_SIGPENDING, %g0
                be,pt                   %xcc, __handle_perfctrs_continue
                 sethi                  %hi(TSTATE_PEF), %o0
@@ -195,7 +195,7 @@ __handle_preemption_continue:
                 andcc                  %l1, %o0, %g0
                andcc                   %l0, _TIF_NEED_RESCHED, %g0
                bne,pn                  %xcc, __handle_preemption
-                 andcc                  %l0, (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), %g0
+                 andcc                  %l0, _TIF_SIGPENDING, %g0
                bne,pn                  %xcc, __handle_signal
 __handle_signal_continue:
                 ldub                   [%g6 + TI_WSAVED], %o2
@@ -257,6 +257,7 @@ rt_continue:	ldx			[%sp + PTREGS_OFF + PT_V9_G1], %g1
                wr                      %o3, %g0, %y
                wrpr                    %l4, 0x0, %pil
                wrpr                    %g0, 0x1, %tl
+                andn                    %l1, TSTATE_SYSCALL, %l1
                wrpr                    %l1, %g0, %tstate
                wrpr                    %l2, %g0, %tpc
                wrpr                    %o2, %g0, %tnpc
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c
index 07c0443ea3f5..6e4dc67d16af 100644
--- a/arch/sparc64/kernel/signal.c
+++ b/arch/sparc64/kernel/signal.c
@@ -247,7 +247,9 @@ static long _sigpause_common(old_sigset_t set)
        current->state = TASK_INTERRUPTIBLE;
        schedule();
-        set_thread_flag(TIF_RESTORE_SIGMASK);
+        set_restore_sigmask();
        return -ERESTARTNOHAND;
 }
@@ -333,7 +335,7 @@ void do_rt_sigreturn(struct pt_regs *regs)
        regs->tnpc = tnpc;
        /* Prevent syscall restart.  */
-        pt_regs_clear_trap_type(regs);
+        pt_regs_clear_syscall(regs);
        sigdelsetmask(&set, ~_BLOCKABLE);
        spin_lock_irq(&current->sighand->siglock);
@@ -499,7 +501,7 @@ static inline void handle_signal(unsigned long signr, struct k_sigaction *ka,
 }
 static inline void syscall_restart(unsigned long orig_i0, struct pt_regs *regs,
-                                     struct sigaction *sa)
+                                   struct sigaction *sa)
 {
        switch (regs->u_regs[UREG_I0]) {
        case ERESTART_RESTARTBLOCK:
@@ -525,21 +527,19 @@ static inline void syscall_restart(unsigned long orig_i0, struct pt_regs *regs,
 */
 static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
 {
-        struct signal_deliver_cookie cookie;
        struct k_sigaction ka;
+        int restart_syscall;
        sigset_t *oldset;
        siginfo_t info;
        int signr;
        
        if (pt_regs_is_syscall(regs) &&
            (regs->tstate & (TSTATE_XCARRY | TSTATE_ICARRY))) {
-                pt_regs_clear_trap_type(regs);
+                restart_syscall = 1;
-                cookie.restart_syscall = 1;
        } else
-                cookie.restart_syscall = 0;
+                restart_syscall = 0;
-        cookie.orig_i0 = orig_i0;
-        if (test_thread_flag(TIF_RESTORE_SIGMASK))
+        if (current_thread_info()->status & TS_RESTORE_SIGMASK)
                oldset = &current->saved_sigmask;
        else
                oldset = &current->blocked;
@@ -547,77 +547,62 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
 #ifdef CONFIG_COMPAT
        if (test_thread_flag(TIF_32BIT)) {
                extern void do_signal32(sigset_t *, struct pt_regs *,
-                                        struct signal_deliver_cookie *);
+                                        int restart_syscall,
-                do_signal32(oldset, regs, &cookie);
+                                        unsigned long orig_i0);
+                do_signal32(oldset, regs, restart_syscall, orig_i0);
                return;
        }
 #endif  
-        signr = get_signal_to_deliver(&info, &ka, regs, &cookie);
+        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
+        /* If the debugger messes with the program counter, it clears
+         * the software "in syscall" bit, directing us to not perform
+         * a syscall restart.
+         */
+        if (restart_syscall && !pt_regs_is_syscall(regs))
+                restart_syscall = 0;
        if (signr > 0) {
-                if (cookie.restart_syscall)
+                if (restart_syscall)
-                        syscall_restart(cookie.orig_i0, regs, &ka.sa);
+                        syscall_restart(orig_i0, regs, &ka.sa);
                handle_signal(signr, &ka, &info, oldset, regs);
-                /* a signal was successfully delivered; the saved
+                /* A signal was successfully delivered; the saved
                 * sigmask will have been stored in the signal frame,
                 * and will be restored by sigreturn, so we can simply
-                 * clear the TIF_RESTORE_SIGMASK flag.
+                 * clear the TS_RESTORE_SIGMASK flag.
                 */
-                if (test_thread_flag(TIF_RESTORE_SIGMASK))
+                current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
-                        clear_thread_flag(TIF_RESTORE_SIGMASK);
                return;
        }
-        if (cookie.restart_syscall &&
+        if (restart_syscall &&
            (regs->u_regs[UREG_I0] == ERESTARTNOHAND ||
             regs->u_regs[UREG_I0] == ERESTARTSYS ||
             regs->u_regs[UREG_I0] == ERESTARTNOINTR)) {
                /* replay the system call when we are done */
-                regs->u_regs[UREG_I0] = cookie.orig_i0;
+                regs->u_regs[UREG_I0] = orig_i0;
                regs->tpc -= 4;
                regs->tnpc -= 4;
        }
-        if (cookie.restart_syscall &&
+        if (restart_syscall &&
            regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
                regs->u_regs[UREG_G1] = __NR_restart_syscall;
                regs->tpc -= 4;
                regs->tnpc -= 4;
        }
-        /* if there's no signal to deliver, we just put the saved sigmask
+        /* If there's no signal to deliver, we just put the saved sigmask
         * back
         */
-        if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
+        if (current_thread_info()->status & TS_RESTORE_SIGMASK) {
-                clear_thread_flag(TIF_RESTORE_SIGMASK);
+                current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
                sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
        }
 }
 void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0, unsigned long thread_info_flags)
 {
-        if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))
+        if (thread_info_flags & _TIF_SIGPENDING)
                do_signal(regs, orig_i0);
 }
-void ptrace_signal_deliver(struct pt_regs *regs, void *cookie)
-{
-        struct signal_deliver_cookie *cp = cookie;
-        if (cp->restart_syscall &&
-            (regs->u_regs[UREG_I0] == ERESTARTNOHAND ||
-             regs->u_regs[UREG_I0] == ERESTARTSYS ||
-             regs->u_regs[UREG_I0] == ERESTARTNOINTR)) {
-                /* replay the system call when we are done */
-                regs->u_regs[UREG_I0] = cp->orig_i0;
-                regs->tpc -= 4;
-                regs->tnpc -= 4;
-                cp->restart_syscall = 0;
-        }
-        if (cp->restart_syscall &&
-            regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
-                regs->u_regs[UREG_G1] = __NR_restart_syscall;
-                regs->tpc -= 4;
-                regs->tnpc -= 4;
-                cp->restart_syscall = 0;
-        }
-}
diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c
index 0f6b7b156efd..97cdd1bf4a10 100644
--- a/arch/sparc64/kernel/signal32.c
+++ b/arch/sparc64/kernel/signal32.c
@@ -269,7 +269,7 @@ void do_sigreturn32(struct pt_regs *regs)
        regs->tstate |= psr_to_tstate_icc(psr);
        /* Prevent syscall restart.  */
-        pt_regs_clear_trap_type(regs);
+        pt_regs_clear_syscall(regs);
        err |= __get_user(fpu_save, &sf->fpu_save);
        if (fpu_save)
@@ -355,7 +355,7 @@ asmlinkage void do_rt_sigreturn32(struct pt_regs *regs)
        regs->tstate |= psr_to_tstate_icc(psr);
        /* Prevent syscall restart.  */
-        pt_regs_clear_trap_type(regs);
+        pt_regs_clear_syscall(regs);
        err |= __get_user(fpu_save, &sf->fpu_save);
        if (fpu_save)
@@ -768,48 +768,55 @@ static inline void syscall_restart32(unsigned long orig_i0, struct pt_regs *regs
 * mistake.
 */
 void do_signal32(sigset_t *oldset, struct pt_regs * regs,
-                 struct signal_deliver_cookie *cookie)
+                 int restart_syscall, unsigned long orig_i0)
 {
        struct k_sigaction ka;
        siginfo_t info;
        int signr;
        
-        signr = get_signal_to_deliver(&info, &ka, regs, cookie);
+        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
+        /* If the debugger messes with the program counter, it clears
+         * the "in syscall" bit, directing us to not perform a syscall
+         * restart.
+         */
+        if (restart_syscall && !pt_regs_is_syscall(regs))
+                restart_syscall = 0;
        if (signr > 0) {
-                if (cookie->restart_syscall)
+                if (restart_syscall)
-                        syscall_restart32(cookie->orig_i0, regs, &ka.sa);
+                        syscall_restart32(orig_i0, regs, &ka.sa);
                handle_signal32(signr, &ka, &info, oldset, regs);
-                /* a signal was successfully delivered; the saved
+                /* A signal was successfully delivered; the saved
                 * sigmask will have been stored in the signal frame,
                 * and will be restored by sigreturn, so we can simply
-                 * clear the TIF_RESTORE_SIGMASK flag.
+                 * clear the TS_RESTORE_SIGMASK flag.
                 */
-                if (test_thread_flag(TIF_RESTORE_SIGMASK))
+                current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
-                        clear_thread_flag(TIF_RESTORE_SIGMASK);
                return;
        }
-        if (cookie->restart_syscall &&
+        if (restart_syscall &&
            (regs->u_regs[UREG_I0] == ERESTARTNOHAND ||
             regs->u_regs[UREG_I0] == ERESTARTSYS ||
             regs->u_regs[UREG_I0] == ERESTARTNOINTR)) {
                /* replay the system call when we are done */
-                regs->u_regs[UREG_I0] = cookie->orig_i0;
+                regs->u_regs[UREG_I0] = orig_i0;
                regs->tpc -= 4;
                regs->tnpc -= 4;
        }
-        if (cookie->restart_syscall &&
+        if (restart_syscall &&
            regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
                regs->u_regs[UREG_G1] = __NR_restart_syscall;
                regs->tpc -= 4;
                regs->tnpc -= 4;
        }
-        /* if there's no signal to deliver, we just put the saved sigmask
+        /* If there's no signal to deliver, we just put the saved sigmask
         * back
         */
-        if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
+        if (current_thread_info()->status & TS_RESTORE_SIGMASK) {
-                clear_thread_flag(TIF_RESTORE_SIGMASK);
+                current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
                sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
        }
 }
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
index 0dbc941f130e..ac1bff58c1ac 100644
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@@ -542,8 +542,7 @@ asmlinkage long sparc64_personality(unsigned long personality)
        return ret;
 }
-int sparc64_mmap_check(unsigned long addr, unsigned long len,
+int sparc64_mmap_check(unsigned long addr, unsigned long len)
-                unsigned long flags)
 {
        if (test_thread_flag(TIF_32BIT)) {
                if (len >= STACK_TOP32)
@@ -609,46 +608,19 @@ asmlinkage unsigned long sys64_mremap(unsigned long addr,
        unsigned long old_len, unsigned long new_len,
        unsigned long flags, unsigned long new_addr)
 {
-        struct vm_area_struct *vma;
        unsigned long ret = -EINVAL;
        if (test_thread_flag(TIF_32BIT))
                goto out;
        if (unlikely(new_len >= VA_EXCLUDE_START))
                goto out;
-        if (unlikely(invalid_64bit_range(addr, old_len)))
+        if (unlikely(sparc64_mmap_check(addr, old_len)))
+                goto out;
+        if (unlikely(sparc64_mmap_check(new_addr, new_len)))
                goto out;
        down_write(&current->mm->mmap_sem);
-        if (flags & MREMAP_FIXED) {
-                if (invalid_64bit_range(new_addr, new_len))
-                        goto out_sem;
-        } else if (invalid_64bit_range(addr, new_len)) {
-                unsigned long map_flags = 0;
-                struct file *file = NULL;
-                ret = -ENOMEM;
-                if (!(flags & MREMAP_MAYMOVE))
-                        goto out_sem;
-                vma = find_vma(current->mm, addr);
-                if (vma) {
-                        if (vma->vm_flags & VM_SHARED)
-                                map_flags |= MAP_SHARED;
-                        file = vma->vm_file;
-                }
-                /* MREMAP_FIXED checked above. */
-                new_addr = get_unmapped_area(file, addr, new_len,
-                                    vma ? vma->vm_pgoff : 0,
-                                    map_flags);
-                ret = new_addr;
-                if (new_addr & ~PAGE_MASK)
-                        goto out_sem;
-                flags |= MREMAP_FIXED;
-        }
        ret = do_mremap(addr, old_len, new_len, flags, new_addr);
-out_sem:
        up_write(&current->mm->mmap_sem);
 out:
        return ret;       
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index 1aa4288125f2..ba5bd626b39e 100644
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -867,44 +867,15 @@ asmlinkage unsigned long sys32_mremap(unsigned long addr,
        unsigned long old_len, unsigned long new_len,
        unsigned long flags, u32 __new_addr)
 {
-        struct vm_area_struct *vma;
        unsigned long ret = -EINVAL;
        unsigned long new_addr = __new_addr;
-        if (old_len > STACK_TOP32 || new_len > STACK_TOP32)
+        if (unlikely(sparc64_mmap_check(addr, old_len)))
                goto out;
-        if (addr > STACK_TOP32 - old_len)
+        if (unlikely(sparc64_mmap_check(new_addr, new_len)))
                goto out;
        down_write(&current->mm->mmap_sem);
-        if (flags & MREMAP_FIXED) {
-                if (new_addr > STACK_TOP32 - new_len)
-                        goto out_sem;
-        } else if (addr > STACK_TOP32 - new_len) {
-                unsigned long map_flags = 0;
-                struct file *file = NULL;
-                ret = -ENOMEM;
-                if (!(flags & MREMAP_MAYMOVE))
-                        goto out_sem;
-                vma = find_vma(current->mm, addr);
-                if (vma) {
-                        if (vma->vm_flags & VM_SHARED)
-                                map_flags |= MAP_SHARED;
-                        file = vma->vm_file;
-                }
-                /* MREMAP_FIXED checked above. */
-                new_addr = get_unmapped_area(file, addr, new_len,
-                                    vma ? vma->vm_pgoff : 0,
-                                    map_flags);
-                ret = new_addr;
-                if (new_addr & ~PAGE_MASK)
-                        goto out_sem;
-                flags |= MREMAP_FIXED;
-        }
        ret = do_mremap(addr, old_len, new_len, flags, new_addr);
-out_sem:
        up_write(&current->mm->mmap_sem);
 out:
        return ret;       
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index ec3e2c72302a..3c7b9471eafb 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -610,8 +610,6 @@ static void __init remap_kernel(void)
 static void __init inherit_prom_mappings(void)
 {
-        read_obp_translations();
        /* Now fixup OBP's idea about where we really are mapped. */
        printk("Remapping the kernel... ");
        remap_kernel();
@@ -770,7 +768,7 @@ static void __init find_ramdisk(unsigned long phys_base)
                initrd_start = ramdisk_image;
                initrd_end = ramdisk_image + sparc_ramdisk_size;
-                lmb_reserve(initrd_start, initrd_end);
+                lmb_reserve(initrd_start, sparc_ramdisk_size);
                initrd_start += PAGE_OFFSET;
                initrd_end += PAGE_OFFSET;
@@ -1747,7 +1745,17 @@ void __init paging_init(void)
        lmb_init();
-        /* Find available physical memory... */
+        /* Find available physical memory...
+         *
+         * Read it twice in order to work around a bug in openfirmware.
+         * The call to grab this table itself can cause openfirmware to
+         * allocate memory, which in turn can take away some space from
+         * the list of available memory.  Reading it twice makes sure
+         * we really do get the final value.
+         */
+        read_obp_translations();
+        read_obp_memory("reg", &pall[0], &pall_ents);
+        read_obp_memory("available", &pavail[0], &pavail_ents);
        read_obp_memory("available", &pavail[0], &pavail_ents);
        phys_base = 0xffffffffffffffffUL;
@@ -1788,8 +1796,6 @@ void __init paging_init(void)
        
        inherit_prom_mappings();
        
-        read_obp_memory("reg", &pall[0], &pall_ents);
        init_kpte_bitmap();
        /* Ok, we can use our TLB miss and window trap handlers safely.  */
diff --git a/arch/um/Kconfig.char b/arch/um/Kconfig.char
index 3a4b396d7979..1b238ebae6b3 100644
--- a/arch/um/Kconfig.char
+++ b/arch/um/Kconfig.char
@@ -145,14 +145,14 @@ config LEGACY_PTYS
          systems, it is safe to say N.
 config RAW_DRIVER
-        tristate "RAW driver (/dev/raw/rawN) (OBSOLETE)"
+        tristate "RAW driver (/dev/raw/rawN)"
+        depends on BLOCK
        help
          The raw driver permits block devices to be bound to /dev/raw/rawN.
          Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O.
          See the raw(8) manpage for more details.
-          The raw driver is deprecated and will be removed soon.
+          Applications should preferably open the device (eg /dev/hda1)
-          Applications should simply open the device (eg /dev/hda1)
          with the O_DIRECT flag.
 config MAX_RAW_DEVS
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
index 025764089ac8..cfeb3f4a44af 100644
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
@@ -11,6 +11,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 #include "chan_user.h"
+#include "kern_constants.h"
 #include "os.h"
 #include "um_malloc.h"
 #include "user.h"
diff --git a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h
index ca8c9e11a39b..f5701fd2ef90 100644
--- a/arch/um/drivers/cow_sys.h
+++ b/arch/um/drivers/cow_sys.h
@@ -8,7 +8,7 @@
 static inline void *cow_malloc(int size)
 {
-        return kmalloc(size, UM_GFP_KERNEL);
+        return uml_kmalloc(size, UM_GFP_KERNEL);
 }
 static inline void cow_free(void *ptr)
diff --git a/arch/um/drivers/daemon_user.c b/arch/um/drivers/daemon_user.c
index f23c109a055c..f8e85e0bdace 100644
--- a/arch/um/drivers/daemon_user.c
+++ b/arch/um/drivers/daemon_user.c
@@ -34,7 +34,7 @@ static struct sockaddr_un *new_addr(void *name, int len)
 {
        struct sockaddr_un *sun;
-        sun = kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL);
+        sun = uml_kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL);
        if (sun == NULL) {
                printk(UM_KERN_ERR "new_addr: allocation of sockaddr_un "
                       "failed\n");
@@ -83,7 +83,7 @@ static int connect_to_switch(struct daemon_data *pri)
                goto out_close;
        }
-        sun = kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL);
+        sun = uml_kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL);
        if (sun == NULL) {
                printk(UM_KERN_ERR "new_addr: allocation of sockaddr_un "
                       "failed\n");
diff --git a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c
index 0a2bb5b64b82..f5a981a16240 100644
--- a/arch/um/drivers/fd.c
+++ b/arch/um/drivers/fd.c
@@ -40,7 +40,7 @@ static void *fd_init(char *str, int device, const struct chan_opts *opts)
                return NULL;
        }
-        data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
+        data = uml_kmalloc(sizeof(*data), UM_GFP_KERNEL);
        if (data == NULL)
                return NULL;
diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
index ff1b22b69e9c..368219cc2366 100644
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
@@ -154,7 +154,7 @@ static int hostaudio_ioctl(struct inode *inode, struct file *file,
        case SNDCTL_DSP_SUBDIVIDE:
        case SNDCTL_DSP_SETFRAGMENT:
                if (get_user(data, (int __user *) arg))
-                        return EFAULT;
+                        return -EFAULT;
                break;
        default:
                break;
diff --git a/arch/um/drivers/mcast_user.c b/arch/um/drivers/mcast_user.c
index 5f647d7a7292..ee19e91568a2 100644
--- a/arch/um/drivers/mcast_user.c
+++ b/arch/um/drivers/mcast_user.c
@@ -15,6 +15,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <netinet/in.h>
+#include "kern_constants.h"
 #include "mcast.h"
 #include "net_user.h"
 #include "um_malloc.h"
@@ -24,7 +25,7 @@ static struct sockaddr_in *new_addr(char *addr, unsigned short port)
 {
        struct sockaddr_in *sin;
-        sin = kmalloc(sizeof(struct sockaddr_in), UM_GFP_KERNEL);
+        sin = uml_kmalloc(sizeof(struct sockaddr_in), UM_GFP_KERNEL);
        if (sin == NULL) {
                printk(UM_KERN_ERR "new_addr: allocation of sockaddr_in "
                       "failed\n");
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index abf2653f5517..9415dd9e63ef 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -222,7 +222,7 @@ static void change(char *dev, char *what, unsigned char *addr,
                netmask[2], netmask[3]);
        output_len = UM_KERN_PAGE_SIZE;
-        output = kmalloc(output_len, UM_GFP_KERNEL);
+        output = uml_kmalloc(output_len, UM_GFP_KERNEL);
        if (output == NULL)
                printk(UM_KERN_ERR "change : failed to allocate output "
                       "buffer\n");
diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
index d269ca387f10..b49bf56a56aa 100644
--- a/arch/um/drivers/port_user.c
+++ b/arch/um/drivers/port_user.c
@@ -47,7 +47,7 @@ static void *port_init(char *str, int device, const struct chan_opts *opts)
        if (kern_data == NULL)
                return NULL;
-        data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
+        data = uml_kmalloc(sizeof(*data), UM_GFP_KERNEL);
        if (data == NULL)
                goto err;
diff --git a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c
index 49c79dda6046..1113911dcb2b 100644
--- a/arch/um/drivers/pty.c
+++ b/arch/um/drivers/pty.c
@@ -29,7 +29,7 @@ static void *pty_chan_init(char *str, int device, const struct chan_opts *opts)
 {
        struct pty_chan *data;
-        data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
+        data = uml_kmalloc(sizeof(*data), UM_GFP_KERNEL);
        if (data == NULL)
                return NULL;
diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c
index 71f0959c1535..4949044773ba 100644
--- a/arch/um/drivers/random.c
+++ b/arch/um/drivers/random.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2005 Jeff Dike <jdike@addtoit.com> */
+/* Copyright (C) 2005 - 2008 Jeff Dike <jdike@{linux.intel,addtoit}.com> */
 /* Much of this ripped from drivers/char/hw_random.c, see there for other
 * copyright.
 *
@@ -8,16 +9,18 @@
 #include <linux/sched.h>
 #include <linux/module.h>
 #include <linux/fs.h>
+#include <linux/interrupt.h>
 #include <linux/miscdevice.h>
 #include <linux/delay.h>
 #include <asm/uaccess.h>
+#include "irq_kern.h"
 #include "os.h"
 /*
 * core module and version information
 */
 #define RNG_VERSION "1.0.0"
-#define RNG_MODULE_NAME "random"
+#define RNG_MODULE_NAME "hw_random"
 #define RNG_MISCDEV_MINOR               183 /* official */
@@ -26,47 +29,67 @@
 * protects against a module being loaded twice at the same time.
 */
 static int random_fd = -1;
+static DECLARE_WAIT_QUEUE_HEAD(host_read_wait);
 static int rng_dev_open (struct inode *inode, struct file *filp)
 {
        /* enforce read-only access to this chrdev */
        if ((filp->f_mode & FMODE_READ) == 0)
                return -EINVAL;
-        if (filp->f_mode & FMODE_WRITE)
+        if ((filp->f_mode & FMODE_WRITE) != 0)
                return -EINVAL;
        return 0;
 }
+static atomic_t host_sleep_count = ATOMIC_INIT(0);
 static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size,
-                             loff_t * offp)
+                             loff_t *offp)
 {
-        u32 data;
+        u32 data;
-        int n, ret = 0, have_data;
+        int n, ret = 0, have_data;
-        while(size){
+        while (size) {
-                n = os_read_file(random_fd, &data, sizeof(data));
+                n = os_read_file(random_fd, &data, sizeof(data));
-                if(n > 0){
+                if (n > 0) {
-                        have_data = n;
+                        have_data = n;
-                        while (have_data && size) {
+                        while (have_data && size) {
-                                if (put_user((u8)data, buf++)) {
+                                if (put_user((u8) data, buf++)) {
-                                        ret = ret ? : -EFAULT;
+                                        ret = ret ? : -EFAULT;
-                                        break;
+                                        break;
-                                }
+                                }
-                                size--;
+                                size--;
-                                ret++;
+                                ret++;
-                                have_data--;
+                                have_data--;
-                                data>>=8;
+                                data >>= 8;
-                        }
+                        }
-                }
+                }
-                else if(n == -EAGAIN){
+                else if (n == -EAGAIN) {
-                        if (filp->f_flags & O_NONBLOCK)
+                        DECLARE_WAITQUEUE(wait, current);
-                                return ret ? : -EAGAIN;
+                        if (filp->f_flags & O_NONBLOCK)
-                        if(need_resched())
+                                return ret ? : -EAGAIN;
-                                schedule_timeout_interruptible(1);
-                }
+                        atomic_inc(&host_sleep_count);
-                else return n;
+                        reactivate_fd(random_fd, RANDOM_IRQ);
+                        add_sigio_fd(random_fd);
+                        add_wait_queue(&host_read_wait, &wait);
+                        set_task_state(current, TASK_INTERRUPTIBLE);
+                        schedule();
+                        set_task_state(current, TASK_RUNNING);
+                        remove_wait_queue(&host_read_wait, &wait);
+                        if (atomic_dec_and_test(&host_sleep_count)) {
+                                ignore_sigio_fd(random_fd);
+                                deactivate_fd(random_fd, RANDOM_IRQ);
+                        }
+                }
+                else
+                        return n;
                if (signal_pending (current))
                        return ret ? : -ERESTARTSYS;
        }
@@ -86,6 +109,13 @@ static struct miscdevice rng_miscdev = {
        &rng_chrdev_ops,
 };
+static irqreturn_t random_interrupt(int irq, void *data)
+{
+        wake_up(&host_read_wait);
+        return IRQ_HANDLED;
+}
 /*
 * rng_init - initialize RNG module
 */
@@ -93,28 +123,33 @@ static int __init rng_init (void)
 {
        int err;
-        err = os_open_file("/dev/random", of_read(OPENFLAGS()), 0);
+        err = os_open_file("/dev/random", of_read(OPENFLAGS()), 0);
-        if(err < 0)
+        if (err < 0)
-                goto out;
+                goto out;
-        random_fd = err;
+        random_fd = err;
-        err = os_set_fd_block(random_fd, 0);
+        err = um_request_irq(RANDOM_IRQ, random_fd, IRQ_READ, random_interrupt,
-        if(err)
+                             IRQF_DISABLED | IRQF_SAMPLE_RANDOM, "random",
+                             NULL);
+        if (err)
                goto err_out_cleanup_hw;
+        sigio_broken(random_fd, 1);
        err = misc_register (&rng_miscdev);
        if (err) {
-                printk (KERN_ERR RNG_MODULE_NAME ": misc device register failed\n");
+                printk (KERN_ERR RNG_MODULE_NAME ": misc device register "
+                        "failed\n");
                goto err_out_cleanup_hw;
        }
+out:
+        return err;
- out:
+err_out_cleanup_hw:
-        return err;
+        os_close_file(random_fd);
+        random_fd = -1;
- err_out_cleanup_hw:
+        goto out;
-        random_fd = -1;
-        goto out;
 }
 /*
@@ -122,6 +157,7 @@ static int __init rng_init (void)
 */
 static void __exit rng_cleanup (void)
 {
+        os_close_file(random_fd);
        misc_deregister (&rng_miscdev);
 }
diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index 8b80505a3fb0..a1c2d2c98a94 100644
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -96,7 +96,7 @@ static int slip_tramp(char **argv, int fd)
        pid = err;
        output_len = UM_KERN_PAGE_SIZE;
-        output = kmalloc(output_len, UM_GFP_KERNEL);
+        output = uml_kmalloc(output_len, UM_GFP_KERNEL);
        if (output == NULL) {
                printk(UM_KERN_ERR "slip_tramp : failed to allocate output "
                       "buffer\n");
diff --git a/arch/um/drivers/tty.c b/arch/um/drivers/tty.c
index c930fedc5172..495858a090e4 100644
--- a/arch/um/drivers/tty.c
+++ b/arch/um/drivers/tty.c
@@ -29,7 +29,7 @@ static void *tty_chan_init(char *str, int device, const struct chan_opts *opts)
        }
        str++;
-        data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
+        data = uml_kmalloc(sizeof(*data), UM_GFP_KERNEL);
        if (data == NULL)
                return NULL;
        *data = ((struct tty_chan) { .dev       = str,
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 5e45e39a8a8d..44ad1607be2d 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -1178,8 +1178,8 @@ static void cowify_bitmap(__u64 io_offset, int length, unsigned long *cow_mask,
         * by one word.  Thanks to Lynn Kerby for the fix and James McMechan
         * for the original diagnosis.
         */
-        if(*cow_offset == ((bitmap_len + sizeof(unsigned long) - 1) /
+        if (*cow_offset == (DIV_ROUND_UP(bitmap_len,
-                           sizeof(unsigned long) - 1))
+                                         sizeof(unsigned long)) - 1))
                (*cow_offset)--;
        bitmap_words[0] = bitmap[*cow_offset];
diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index 8a1c18a9b240..da2caa5a21ef 100644
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
@@ -30,7 +30,7 @@ static void *xterm_init(char *str, int device, const struct chan_opts *opts)
 {
        struct xterm_chan *data;
-        data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
+        data = uml_kmalloc(sizeof(*data), UM_GFP_KERNEL);
        if (data == NULL)
                return NULL;
        *data = ((struct xterm_chan) { .pid             = -1,
diff --git a/arch/um/include/as-layout.h b/arch/um/include/as-layout.h
index cac542d8ff70..58e852dfb0ce 100644
--- a/arch/um/include/as-layout.h
+++ b/arch/um/include/as-layout.h
@@ -23,16 +23,16 @@
 */
 #ifdef __ASSEMBLY__
-#define _AC(X, Y)       (Y)
+#define _UML_AC(X, Y)   (Y)
 #else
-#define __AC(X, Y)      (X (Y))
+#define __UML_AC(X, Y)  (X(Y))
-#define _AC(X, Y)       __AC(X, Y)
+#define _UML_AC(X, Y)   __UML_AC(X, Y)
 #endif
-#define STUB_START _AC(, 0x100000)
+#define STUB_START _UML_AC(, 0x100000)
-#define STUB_CODE _AC((unsigned long), STUB_START)
+#define STUB_CODE _UML_AC((unsigned long), STUB_START)
-#define STUB_DATA _AC((unsigned long), STUB_CODE + UM_KERN_PAGE_SIZE)
+#define STUB_DATA _UML_AC((unsigned long), STUB_CODE + UM_KERN_PAGE_SIZE)
-#define STUB_END _AC((unsigned long), STUB_DATA + UM_KERN_PAGE_SIZE)
+#define STUB_END _UML_AC((unsigned long), STUB_DATA + UM_KERN_PAGE_SIZE)
 #ifndef __ASSEMBLY__
diff --git a/arch/um/include/line.h b/arch/um/include/line.h
index 979b73e6352d..311a0d3d93af 100644
--- a/arch/um/include/line.h
+++ b/arch/um/include/line.h
@@ -58,11 +58,11 @@ struct line {
 };
 #define LINE_INIT(str, d) \
-        { .count_lock = SPIN_LOCK_UNLOCKED, \
+        { .count_lock = __SPIN_LOCK_UNLOCKED((str).count_lock), \
          .init_str =   str,    \
          .init_pri =   INIT_STATIC, \
          .valid =      1, \
-          .lock =       SPIN_LOCK_UNLOCKED, \
+          .lock =       __SPIN_LOCK_UNLOCKED((str).lock), \
          .driver =     d }
 extern void line_close(struct tty_struct *tty, struct file * filp);
diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index 32c799e3a495..e2716ac8889a 100644
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -290,6 +290,7 @@ extern void os_set_ioignore(void);
 extern int add_sigio_fd(int fd);
 extern int ignore_sigio_fd(int fd);
 extern void maybe_sigio_broken(int fd, int read);
+extern void sigio_broken(int fd, int read);
 /* sys-x86_64/prctl.c */
 extern int os_arch_prctl(int pid, int code, unsigned long *addr);
diff --git a/arch/um/include/process.h b/arch/um/include/process.h
index 5af9157ff54f..bb873a51262e 100644
--- a/arch/um/include/process.h
+++ b/arch/um/include/process.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2000 - 2008 Jeff Dike (jdike@{addtoit,linux.intel}.com)
 * Licensed under the GPL
 */
@@ -8,18 +8,10 @@
 #include <signal.h>
-extern void sig_handler(int sig, struct sigcontext sc);
+/* Copied from linux/compiler-gcc.h since we can't include it directly */
-extern void alarm_handler(int sig, struct sigcontext sc);
+#define barrier() __asm__ __volatile__("": : :"memory")
-#endif
+extern void sig_handler(int sig, struct sigcontext *sc);
+extern void alarm_handler(int sig, struct sigcontext *sc);
-/*
+#endif
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/include/skas_ptrace.h b/arch/um/include/skas_ptrace.h
index cd2327d09c8d..3d31bbacd016 100644
--- a/arch/um/include/skas_ptrace.h
+++ b/arch/um/include/skas_ptrace.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
 * Licensed under the GPL
 */
@@ -12,14 +12,3 @@
 #include "sysdep/skas_ptrace.h"
 #endif
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/include/sysdep-i386/ptrace_user.h b/arch/um/include/sysdep-i386/ptrace_user.h
index 75650723c38f..ef56247e4143 100644
--- a/arch/um/include/sysdep-i386/ptrace_user.h
+++ b/arch/um/include/sysdep-i386/ptrace_user.h
@@ -41,38 +41,10 @@
 #define PT_SP_OFFSET PT_OFFSET(UESP)
 #define PT_SP(regs) ((regs)[UESP])
-#define FP_SIZE ((HOST_XFP_SIZE > HOST_FP_SIZE) ? HOST_XFP_SIZE : HOST_FP_SIZE)
+#define FP_SIZE ((HOST_FPX_SIZE > HOST_FP_SIZE) ? HOST_FPX_SIZE : HOST_FP_SIZE)
 #ifndef FRAME_SIZE
 #define FRAME_SIZE (17)
 #endif
-#define FRAME_SIZE_OFFSET (FRAME_SIZE * sizeof(unsigned long))
-#define FP_FRAME_SIZE (27)
-#define FPX_FRAME_SIZE (128)
-#ifdef PTRACE_GETREGS
-#define UM_HAVE_GETREGS
-#endif
-#ifdef PTRACE_SETREGS
-#define UM_HAVE_SETREGS
-#endif
-#ifdef PTRACE_GETFPREGS
-#define UM_HAVE_GETFPREGS
-#endif
-#ifdef PTRACE_SETFPREGS
-#define UM_HAVE_SETFPREGS
-#endif
-#ifdef PTRACE_GETFPXREGS
-#define UM_HAVE_GETFPXREGS
-#endif
-#ifdef PTRACE_SETFPXREGS
-#define UM_HAVE_SETFPXREGS
-#endif
 #endif
diff --git a/arch/um/include/sysdep-i386/sigcontext.h b/arch/um/include/sysdep-i386/sigcontext.h
index 67e77122aa45..f583c87111a0 100644
--- a/arch/um/include/sysdep-i386/sigcontext.h
+++ b/arch/um/include/sysdep-i386/sigcontext.h
@@ -10,7 +10,7 @@
 #define IP_RESTART_SYSCALL(ip) ((ip) -= 2)
-#define GET_FAULTINFO_FROM_SC(fi,sc) \
+#define GET_FAULTINFO_FROM_SC(fi, sc) \
        { \
                (fi).cr2 = SC_CR2(sc); \
                (fi).error_code = SC_ERR(sc); \
diff --git a/arch/um/include/sysdep-x86_64/ptrace_user.h b/arch/um/include/sysdep-x86_64/ptrace_user.h
index 45c0bd881cb3..4dbccdb58f48 100644
--- a/arch/um/include/sysdep-x86_64/ptrace_user.h
+++ b/arch/um/include/sysdep-x86_64/ptrace_user.h
@@ -48,7 +48,8 @@
 #define PT_ORIG_RAX_OFFSET (ORIG_RAX)
 #define PT_ORIG_RAX(regs) ((regs)[PT_INDEX(ORIG_RAX)])
-/* x86_64 FC3 doesn't define this in /usr/include/linux/ptrace.h even though
+/*
+ * x86_64 FC3 doesn't define this in /usr/include/linux/ptrace.h even though
 * it's defined in the kernel's include/linux/ptrace.h. Additionally, use the
 * 2.4 name and value for 2.4 host compatibility.
 */
@@ -56,7 +57,8 @@
 #define PTRACE_OLDSETOPTIONS 21
 #endif
-/* These are before the system call, so the system call number is RAX
+/*
+ * These are before the system call, so the system call number is RAX
 * rather than ORIG_RAX, and arg4 is R10 rather than RCX
 */
 #define REGS_SYSCALL_NR PT_INDEX(RAX)
@@ -73,14 +75,3 @@
 #define FP_SIZE (HOST_FP_SIZE)
 #endif
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/include/um_malloc.h b/arch/um/include/um_malloc.h
index 0ad17cb83d96..c554d706d106 100644
--- a/arch/um/include/um_malloc.h
+++ b/arch/um/include/um_malloc.h
@@ -8,15 +8,12 @@
 #include "kern_constants.h"
-extern void *__kmalloc(int size, int flags);
+extern void *uml_kmalloc(int size, int flags);
-static inline void *kmalloc(int size, int flags)
-{
-        return __kmalloc(size, flags);
-}
 extern void kfree(const void *ptr);
 extern void *vmalloc(unsigned long size);
 extern void vfree(void *ptr);
 #endif /* __UM_MALLOC_H__ */
diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S
index 26090b7f323e..9975e1ab44fb 100644
--- a/arch/um/kernel/dyn.lds.S
+++ b/arch/um/kernel/dyn.lds.S
@@ -1,4 +1,5 @@
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/page.h>
 OUTPUT_FORMAT(ELF_FORMAT)
 OUTPUT_ARCH(ELF_ARCH)
@@ -21,7 +22,7 @@ SECTIONS
        _einittext = .;
  }
-  . = ALIGN(4096);
+  . = ALIGN(PAGE_SIZE);
  /* Read-only sections, merged into text segment: */
  .hash           : { *(.hash) }
@@ -68,9 +69,9 @@ SECTIONS
    /* .gnu.warning sections are handled specially by elf32.em.  */
    *(.gnu.warning)
-    . = ALIGN(4096);
+    . = ALIGN(PAGE_SIZE);
  } =0x90909090
-  . = ALIGN(4096);
+  . = ALIGN(PAGE_SIZE);
  .syscall_stub : {
        __syscall_stub_start = .;
        *(.__syscall_stub*)
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 2eea1ff235e6..b0ee64622ff7 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -375,3 +375,8 @@ pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
        return pmd;
 }
 #endif
+void *uml_kmalloc(int size, int flags)
+{
+        return kmalloc(size, flags);
+}
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index 0d0cea2ac98d..c3e2f369c33c 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -75,7 +75,7 @@ static irqreturn_t um_timer(int irq, void *dev)
 static cycle_t itimer_read(void)
 {
-        return os_nsecs();
+        return os_nsecs() / 1000;
 }
 static struct clocksource itimer_clocksource = {
@@ -83,7 +83,7 @@ static struct clocksource itimer_clocksource = {
        .rating         = 300,
        .read           = itimer_read,
        .mask           = CLOCKSOURCE_MASK(64),
-        .mult           = 1,
+        .mult           = 1000,
        .shift          = 0,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 56deed623446..9db85b2ce698 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -150,7 +150,7 @@ __uml_setup("root=", uml_root_setup,
 static int __init no_skas_debug_setup(char *line, int *add)
 {
        printf("'debug' is not necessary to gdb UML in skas mode - run \n");
-        printf("'gdb linux'");
+        printf("'gdb linux'\n");
        return 0;
 }
@@ -258,6 +258,7 @@ int __init linux_main(int argc, char **argv)
 {
        unsigned long avail, diff;
        unsigned long virtmem_size, max_physmem;
+        unsigned long stack;
        unsigned int i;
        int add;
        char * mode;
@@ -348,7 +349,9 @@ int __init linux_main(int argc, char **argv)
        }
        virtmem_size = physmem_size;
-        avail = TASK_SIZE - start_vm;
+        stack = (unsigned long) argv;
+        stack &= ~(1024 * 1024 - 1);
+        avail = stack - start_vm;
        if (physmem_size > avail)
                virtmem_size = avail;
        end_vm = start_vm + virtmem_size;
diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S
index 5828c1d54505..11b835248b86 100644
--- a/arch/um/kernel/uml.lds.S
+++ b/arch/um/kernel/uml.lds.S
@@ -1,4 +1,5 @@
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/page.h>
 OUTPUT_FORMAT(ELF_FORMAT)
 OUTPUT_ARCH(ELF_ARCH)
@@ -26,7 +27,7 @@ SECTIONS
        INIT_TEXT
        _einittext = .;
  }
-  . = ALIGN(4096);
+  . = ALIGN(PAGE_SIZE);
  .text      :
  {
@@ -39,7 +40,7 @@ SECTIONS
    *(.gnu.linkonce.t*)
  }
-  . = ALIGN(4096);
+  . = ALIGN(PAGE_SIZE);
  .syscall_stub : {
        __syscall_stub_start = .;
        *(.__syscall_stub*)
@@ -79,7 +80,7 @@ SECTIONS
  .sdata     : { *(.sdata) }
  _edata  =  .;
  PROVIDE (edata = .);
-  . = ALIGN(0x1000);
+  . = ALIGN(PAGE_SIZE);
  .sbss      :
  {
   __bss_start = .;
diff --git a/arch/um/os-Linux/drivers/ethertap_user.c b/arch/um/os-Linux/drivers/ethertap_user.c
index 6fb0b174f538..cc72cb2c1af6 100644
--- a/arch/um/os-Linux/drivers/ethertap_user.c
+++ b/arch/um/os-Linux/drivers/ethertap_user.c
@@ -52,7 +52,7 @@ static void etap_change(int op, unsigned char *addr, unsigned char *netmask,
                return;
        }
-        output = kmalloc(UM_KERN_PAGE_SIZE, UM_GFP_KERNEL);
+        output = uml_kmalloc(UM_KERN_PAGE_SIZE, UM_GFP_KERNEL);
        if (output == NULL)
                printk(UM_KERN_ERR "etap_change : Failed to allocate output "
                       "buffer\n");
@@ -165,7 +165,7 @@ static int etap_open(void *data)
        err = etap_tramp(pri->dev_name, pri->gate_addr, control_fds[0],
                         control_fds[1], data_fds[0], data_fds[1]);
        output_len = UM_KERN_PAGE_SIZE;
-        output = kmalloc(output_len, UM_GFP_KERNEL);
+        output = uml_kmalloc(output_len, UM_GFP_KERNEL);
        read_output(control_fds[0], output, output_len);
        if (output == NULL)
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c
index f25c29a12d00..74ca7aabf4e1 100644
--- a/arch/um/os-Linux/helper.c
+++ b/arch/um/os-Linux/helper.c
@@ -71,8 +71,8 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv)
        data.pre_data = pre_data;
        data.argv = argv;
        data.fd = fds[1];
-        data.buf = __cant_sleep() ? kmalloc(PATH_MAX, UM_GFP_ATOMIC) :
+        data.buf = __cant_sleep() ? uml_kmalloc(PATH_MAX, UM_GFP_ATOMIC) :
-                                        kmalloc(PATH_MAX, UM_GFP_KERNEL);
+                                        uml_kmalloc(PATH_MAX, UM_GFP_KERNEL);
        pid = clone(helper_child, (void *) sp, CLONE_VM, &data);
        if (pid < 0) {
                ret = -errno;
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c
index abb9b0ffd960..eee69b9f52c9 100644
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
@@ -199,7 +199,7 @@ void *__wrap_malloc(int size)
                return __real_malloc(size);
        else if (size <= UM_KERN_PAGE_SIZE)
                /* finding contiguous pages can be hard*/
-                ret = kmalloc(size, UM_GFP_KERNEL);
+                ret = uml_kmalloc(size, UM_GFP_KERNEL);
        else ret = vmalloc(size);
        /*
diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c
index abf47a7c4abd..eb8f2e4be192 100644
--- a/arch/um/os-Linux/sigio.c
+++ b/arch/um/os-Linux/sigio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+ * Copyright (C) 2002 - 2008 Jeff Dike (jdike@{addtoit,linux.intel}.com)
 * Licensed under the GPL
 */
@@ -15,6 +15,7 @@
 #include "kern_util.h"
 #include "init.h"
 #include "os.h"
+#include "process.h"
 #include "sigio.h"
 #include "um_malloc.h"
 #include "user.h"
@@ -109,7 +110,7 @@ static int need_poll(struct pollfds *polls, int n)
        if (n <= polls->size)
                return 0;
-        new = kmalloc(n * sizeof(struct pollfd), UM_GFP_ATOMIC);
+        new = uml_kmalloc(n * sizeof(struct pollfd), UM_GFP_ATOMIC);
        if (new == NULL) {
                printk(UM_KERN_ERR "need_poll : failed to allocate new "
                       "pollfds\n");
@@ -243,7 +244,7 @@ static struct pollfd *setup_initial_poll(int fd)
 {
        struct pollfd *p;
-        p = kmalloc(sizeof(struct pollfd), UM_GFP_KERNEL);
+        p = uml_kmalloc(sizeof(struct pollfd), UM_GFP_KERNEL);
        if (p == NULL) {
                printk(UM_KERN_ERR "setup_initial_poll : failed to allocate "
                       "poll\n");
@@ -338,20 +339,10 @@ out_close1:
        close(l_write_sigio_fds[1]);
 }
-/* Changed during early boot */
+void sigio_broken(int fd, int read)
-static int pty_output_sigio = 0;
-static int pty_close_sigio = 0;
-void maybe_sigio_broken(int fd, int read)
 {
        int err;
-        if (!isatty(fd))
-                return;
-        if ((read || pty_output_sigio) && (!read || pty_close_sigio))
-                return;
        write_sigio_workaround();
        sigio_lock();
@@ -370,6 +361,21 @@ out:
        sigio_unlock();
 }
+/* Changed during early boot */
+static int pty_output_sigio;
+static int pty_close_sigio;
+void maybe_sigio_broken(int fd, int read)
+{
+        if (!isatty(fd))
+                return;
+        if ((read || pty_output_sigio) && (!read || pty_close_sigio))
+                return;
+        sigio_broken(fd, read);
+}
 static void sigio_cleanup(void)
 {
        if (write_sigio_pid == -1)
@@ -383,7 +389,7 @@ static void sigio_cleanup(void)
 __uml_exitcall(sigio_cleanup);
 /* Used as a flag during SIGIO testing early in boot */
-static volatile int got_sigio = 0;
+static int got_sigio;
 static void __init handler(int sig)
 {
@@ -498,7 +504,8 @@ static void tty_output(int master, int slave)
        if (errno != EAGAIN)
                printk(UM_KERN_ERR "tty_output : write failed, errno = %d\n",
                       errno);
-        while (((n = read(slave, buf, sizeof(buf))) > 0) && !got_sigio)
+        while (((n = read(slave, buf, sizeof(buf))) > 0) &&
+               !({ barrier(); got_sigio; }))
                ;
        if (got_sigio) {
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index 3f1694b134cb..5aade6027e40 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -12,6 +12,7 @@
 #include "as-layout.h"
 #include "kern_util.h"
 #include "os.h"
+#include "process.h"
 #include "sysdep/barrier.h"
 #include "sysdep/sigcontext.h"
 #include "user.h"
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index 1e8cba6550a9..6be028ca1817 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -442,7 +442,7 @@ void userspace(struct uml_pt_regs *regs)
                                unblock_signals();
                                break;
                        default:
-                                printk(UM_KERN_ERR "userspace - child stopped "
+                                printk(UM_KERN_ERR "userspace - child stopped "
                                       "with signal %d\n", sig);
                                fatal_sigsegv();
                        }
diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c
index 997d01944f91..b4b36e0f2e89 100644
--- a/arch/um/os-Linux/start_up.c
+++ b/arch/um/os-Linux/start_up.c
@@ -23,6 +23,7 @@
 #include "mem_user.h"
 #include "ptrace_user.h"
 #include "registers.h"
+#include "skas.h"
 #include "skas_ptrace.h"
 static void ptrace_child(void)
@@ -140,14 +141,27 @@ static int stop_ptraced_child(int pid, int exitcode, int mustexit)
 }
 /* Changed only during early boot */
-int ptrace_faultinfo = 1;
+int ptrace_faultinfo;
-int ptrace_ldt = 1;
+static int disable_ptrace_faultinfo;
-int proc_mm = 1;
-int skas_needs_stub = 0;
+int ptrace_ldt;
+static int disable_ptrace_ldt;
+int proc_mm;
+static int disable_proc_mm;
+int have_switch_mm;
+static int disable_switch_mm;
+int skas_needs_stub;
 static int __init skas0_cmd_param(char *str, int* add)
 {
-        ptrace_faultinfo = proc_mm = 0;
+        disable_ptrace_faultinfo = 1;
+        disable_ptrace_ldt = 1;
+        disable_proc_mm = 1;
+        disable_switch_mm = 1;
        return 0;
 }
@@ -157,15 +171,12 @@ static int __init mode_skas0_cmd_param(char *str, int* add)
        __attribute__((alias("skas0_cmd_param")));
 __uml_setup("skas0", skas0_cmd_param,
-                "skas0\n"
+"skas0\n"
-                "    Disables SKAS3 usage, so that SKAS0 is used, unless \n"
+"    Disables SKAS3 and SKAS4 usage, so that SKAS0 is used\n\n");
-                "    you specify mode=tt.\n\n");
 __uml_setup("mode=skas0", mode_skas0_cmd_param,
-                "mode=skas0\n"
+"mode=skas0\n"
-                "    Disables SKAS3 usage, so that SKAS0 is used, unless you \n"
+"    Disables SKAS3 and SKAS4 usage, so that SKAS0 is used.\n\n");
-                "    specify mode=tt. Note that this was recently added - on \n"
-                "    older kernels you must use simply \"skas0\".\n\n");
 /* Changed only during early boot */
 static int force_sysemu_disabled = 0;
@@ -360,7 +371,7 @@ void __init os_early_checks(void)
 static int __init noprocmm_cmd_param(char *str, int* add)
 {
-        proc_mm = 0;
+        disable_proc_mm = 1;
        return 0;
 }
@@ -372,7 +383,7 @@ __uml_setup("noprocmm", noprocmm_cmd_param,
 static int __init noptracefaultinfo_cmd_param(char *str, int* add)
 {
-        ptrace_faultinfo = 0;
+        disable_ptrace_faultinfo = 1;
        return 0;
 }
@@ -384,7 +395,7 @@ __uml_setup("noptracefaultinfo", noptracefaultinfo_cmd_param,
 static int __init noptraceldt_cmd_param(char *str, int* add)
 {
-        ptrace_ldt = 0;
+        disable_ptrace_ldt = 1;
        return 0;
 }
@@ -404,17 +415,15 @@ static inline void check_skas3_ptrace_faultinfo(void)
        n = ptrace(PTRACE_FAULTINFO, pid, 0, &fi);
        if (n < 0) {
-                ptrace_faultinfo = 0;
                if (errno == EIO)
                        non_fatal("not found\n");
                else
                        perror("not found");
-        }
+        } else if (disable_ptrace_faultinfo)
+                non_fatal("found but disabled on command line\n");
        else {
-                if (!ptrace_faultinfo)
+                ptrace_faultinfo = 1;
-                        non_fatal("found but disabled on command line\n");
+                non_fatal("found\n");
-                else
-                        non_fatal("found\n");
        }
        stop_ptraced_child(pid, 1, 1);
@@ -437,38 +446,30 @@ static inline void check_skas3_ptrace_ldt(void)
        if (n < 0) {
                if (errno == EIO)
                        non_fatal("not found\n");
-                else {
+                else
                        perror("not found");
-                }
+        } else if (disable_ptrace_ldt)
-                ptrace_ldt = 0;
+                non_fatal("found, but use is disabled\n");
-        }
        else {
-                if (ptrace_ldt)
+                ptrace_ldt = 1;
-                        non_fatal("found\n");
+                non_fatal("found\n");
-                else
-                        non_fatal("found, but use is disabled\n");
        }
        stop_ptraced_child(pid, 1, 1);
-#else
-        /* PTRACE_LDT might be disabled via cmdline option.
-         * We want to override this, else we might use the stub
-         * without real need
-         */
-        ptrace_ldt = 1;
 #endif
 }
 static inline void check_skas3_proc_mm(void)
 {
        non_fatal("  - /proc/mm...");
-        if (access("/proc/mm", W_OK) < 0) {
+        if (access("/proc/mm", W_OK) < 0)
-                proc_mm = 0;
                perror("not found");
-        }
+        else if (disable_proc_mm)
-        else if (!proc_mm)
                non_fatal("found but disabled on command line\n");
-        else non_fatal("found\n");
+        else {
+                proc_mm = 1;
+                non_fatal("found\n");
+        }
 }
 void can_do_skas(void)
diff --git a/arch/um/os-Linux/sys-i386/registers.c b/arch/um/os-Linux/sys-i386/registers.c
index b613473b3ec1..c6183e7aec3d 100644
--- a/arch/um/os-Linux/sys-i386/registers.c
+++ b/arch/um/os-Linux/sys-i386/registers.c
@@ -5,6 +5,7 @@
 */
 #include <errno.h>
+#include <asm/user.h>
 #include "kern_constants.h"
 #include "longjmp.h"
 #include "user.h"
@@ -74,10 +75,10 @@ int put_fp_registers(int pid, unsigned long *regs)
 void arch_init_registers(int pid)
 {
-        unsigned long fpx_regs[HOST_XFP_SIZE];
+        struct user_fxsr_struct fpx_regs;
        int err;
-        err = ptrace(PTRACE_GETFPXREGS, pid, 0, fpx_regs);
+        err = ptrace(PTRACE_GETFPXREGS, pid, 0, &fpx_regs);
        if (!err)
                return;
diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c
index e49280599465..bee98f466d66 100644
--- a/arch/um/os-Linux/time.c
+++ b/arch/um/os-Linux/time.c
@@ -9,7 +9,9 @@
 #include <time.h>
 #include <sys/time.h>
 #include "kern_constants.h"
+#include "kern_util.h"
 #include "os.h"
+#include "process.h"
 #include "user.h"
 int set_interval(void)
@@ -58,12 +60,17 @@ static inline long long timeval_to_ns(const struct timeval *tv)
 long long disable_timer(void)
 {
        struct itimerval time = ((struct itimerval) { { 0, 0 }, { 0, 0 } });
+        int remain, max = UM_NSEC_PER_SEC / UM_HZ;
        if (setitimer(ITIMER_VIRTUAL, &time, &time) < 0)
                printk(UM_KERN_ERR "disable_timer - setitimer failed, "
                       "errno = %d\n", errno);
-        return timeval_to_ns(&time.it_value);
+        remain = timeval_to_ns(&time.it_value);
+        if (remain > max)
+                remain = max;
+        return remain;
 }
 long long os_nsecs(void)
@@ -79,7 +86,44 @@ static int after_sleep_interval(struct timespec *ts)
 {
        return 0;
 }
+static void deliver_alarm(void)
+{
+        alarm_handler(SIGVTALRM, NULL);
+}
+static unsigned long long sleep_time(unsigned long long nsecs)
+{
+        return nsecs;
+}
 #else
+unsigned long long last_tick;
+unsigned long long skew;
+static void deliver_alarm(void)
+{
+        unsigned long long this_tick = os_nsecs();
+        int one_tick = UM_NSEC_PER_SEC / UM_HZ;
+        if (last_tick == 0)
+                last_tick = this_tick - one_tick;
+        skew += this_tick - last_tick;
+        while (skew >= one_tick) {
+                alarm_handler(SIGVTALRM, NULL);
+                skew -= one_tick;
+        }
+        last_tick = this_tick;
+}
+static unsigned long long sleep_time(unsigned long long nsecs)
+{
+        return nsecs > skew ? nsecs - skew : 0;
+}
 static inline long long timespec_to_us(const struct timespec *ts)
 {
        return ((long long) ts->tv_sec * UM_USEC_PER_SEC) +
@@ -102,6 +146,8 @@ static int after_sleep_interval(struct timespec *ts)
         */
        if (start_usecs > usec)
                start_usecs = usec;
+        start_usecs -= skew / UM_NSEC_PER_USEC;
        tv = ((struct timeval) { .tv_sec  = start_usecs / UM_USEC_PER_SEC,
                                 .tv_usec = start_usecs % UM_USEC_PER_SEC });
        interval = ((struct itimerval) { { 0, usec }, tv });
@@ -113,8 +159,6 @@ static int after_sleep_interval(struct timespec *ts)
 }
 #endif
-extern void alarm_handler(int sig, struct sigcontext *sc);
 void idle_sleep(unsigned long long nsecs)
 {
        struct timespec ts;
@@ -126,10 +170,12 @@ void idle_sleep(unsigned long long nsecs)
         */
        if (nsecs == 0)
                nsecs = UM_NSEC_PER_SEC / UM_HZ;
+        nsecs = sleep_time(nsecs);
        ts = ((struct timespec) { .tv_sec       = nsecs / UM_NSEC_PER_SEC,
                                  .tv_nsec      = nsecs % UM_NSEC_PER_SEC });
        if (nanosleep(&ts, &ts) == 0)
-                alarm_handler(SIGVTALRM, NULL);
+                deliver_alarm();
        after_sleep_interval(&ts);
 }
diff --git a/arch/um/sys-i386/ptrace.c b/arch/um/sys-i386/ptrace.c
index 6b4499906a6c..c9b176534d65 100644
--- a/arch/um/sys-i386/ptrace.c
+++ b/arch/um/sys-i386/ptrace.c
@@ -148,14 +148,13 @@ int peek_user(struct task_struct *child, long addr, long data)
 int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
 {
        int err, n, cpu = ((struct thread_info *) child->stack)->cpu;
-        long fpregs[HOST_FP_SIZE];
+        struct user_i387_struct fpregs;
-        BUG_ON(sizeof(*buf) != sizeof(fpregs));
+        err = save_fp_registers(userspace_pid[cpu], (unsigned long *) &fpregs);
-        err = save_fp_registers(userspace_pid[cpu], fpregs);
        if (err)
                return err;
-        n = copy_to_user(buf, fpregs, sizeof(fpregs));
+        n = copy_to_user(buf, &fpregs, sizeof(fpregs));
        if(n > 0)
                return -EFAULT;
@@ -165,27 +164,26 @@ int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
 int set_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
 {
        int n, cpu = ((struct thread_info *) child->stack)->cpu;
-        long fpregs[HOST_FP_SIZE];
+        struct user_i387_struct fpregs;
-        BUG_ON(sizeof(*buf) != sizeof(fpregs));
+        n = copy_from_user(&fpregs, buf, sizeof(fpregs));
-        n = copy_from_user(fpregs, buf, sizeof(fpregs));
        if (n > 0)
                return -EFAULT;
-        return restore_fp_registers(userspace_pid[cpu], fpregs);
+        return restore_fp_registers(userspace_pid[cpu],
+                                    (unsigned long *) &fpregs);
 }
 int get_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child)
 {
        int err, n, cpu = ((struct thread_info *) child->stack)->cpu;
-        long fpregs[HOST_XFP_SIZE];
+        struct user_fxsr_struct fpregs;
-        BUG_ON(sizeof(*buf) != sizeof(fpregs));
+        err = save_fpx_registers(userspace_pid[cpu], (unsigned long *) &fpregs);
-        err = save_fpx_registers(userspace_pid[cpu], fpregs);
        if (err)
                return err;
-        n = copy_to_user(buf, fpregs, sizeof(fpregs));
+        n = copy_to_user(buf, &fpregs, sizeof(fpregs));
        if(n > 0)
                return -EFAULT;
@@ -195,14 +193,14 @@ int get_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child)
 int set_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child)
 {
        int n, cpu = ((struct thread_info *) child->stack)->cpu;
-        long fpregs[HOST_XFP_SIZE];
+        struct user_fxsr_struct fpregs;
-        BUG_ON(sizeof(*buf) != sizeof(fpregs));
+        n = copy_from_user(&fpregs, buf, sizeof(fpregs));
-        n = copy_from_user(fpregs, buf, sizeof(fpregs));
        if (n > 0)
                return -EFAULT;
-        return restore_fpx_registers(userspace_pid[cpu], fpregs);
+        return restore_fpx_registers(userspace_pid[cpu],
+                                     (unsigned long *) &fpregs);
 }
 long subarch_ptrace(struct task_struct *child, long request, long addr,
diff --git a/arch/um/sys-i386/user-offsets.c b/arch/um/sys-i386/user-offsets.c
index 39bd32bf84f0..5f883bfe773f 100644
--- a/arch/um/sys-i386/user-offsets.c
+++ b/arch/um/sys-i386/user-offsets.c
@@ -22,7 +22,7 @@ void foo(void)
        OFFSET(HOST_SC_CR2, sigcontext, cr2);
        DEFINE_LONGS(HOST_FP_SIZE, sizeof(struct user_fpregs_struct));
-        DEFINE_LONGS(HOST_XFP_SIZE, sizeof(struct user_fpxregs_struct));
+        DEFINE_LONGS(HOST_FPX_SIZE, sizeof(struct user_fpxregs_struct));
        DEFINE(HOST_IP, EIP);
        DEFINE(HOST_SP, UESP);
diff --git a/arch/um/sys-x86_64/user-offsets.c b/arch/um/sys-x86_64/user-offsets.c
index 2f3443c6e859..973585414a66 100644
--- a/arch/um/sys-x86_64/user-offsets.c
+++ b/arch/um/sys-x86_64/user-offsets.c
@@ -24,7 +24,6 @@ void foo(void)
        OFFSET(HOST_SC_TRAPNO, sigcontext, trapno);
        DEFINE(HOST_FP_SIZE, sizeof(struct _fpstate) / sizeof(unsigned long));
-        DEFINE(HOST_XFP_SIZE, 0);
        DEFINE_LONGS(HOST_RBX, RBX);
        DEFINE_LONGS(HOST_RCX, RCX);
        DEFINE_LONGS(HOST_RDI, RDI);
diff --git a/arch/x86/kernel/acpi/realmode/wakeup.lds.S b/arch/x86/kernel/acpi/realmode/wakeup.lds.S
index 22fab6c4be15..7da00b799cda 100644
--- a/arch/x86/kernel/acpi/realmode/wakeup.lds.S
+++ b/arch/x86/kernel/acpi/realmode/wakeup.lds.S
@@ -12,11 +12,6 @@ ENTRY(_start)
 SECTIONS
 {
-        . = HEADER_OFFSET;
-        .header : {
-                 *(.header)
-        }
        . = 0;
        .text : {
                 *(.text*)
@@ -50,6 +45,11 @@ SECTIONS
                __bss_end = .;
        }
+        . = HEADER_OFFSET;
+        .header : {
+                *(.header)
+        }
        . = ALIGN(16);
        _end = .;
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 0c37f16b6950..c5ef1af8e79d 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -385,11 +385,13 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
        if (dma_alloc_from_coherent_mem(dev, size, dma_handle, &memory))
                return memory;
-        if (!dev)
+        if (!dev) {
                dev = &fallback_dev;
+                gfp |= GFP_DMA;
+        }
        dma_mask = dev->coherent_dma_mask;
        if (dma_mask == 0)
-                dma_mask = DMA_32BIT_MASK;
+                dma_mask = (gfp & GFP_DMA) ? DMA_24BIT_MASK : DMA_32BIT_MASK;
        /* Device not DMA able */
        if (dev->dma_mask == NULL)
@@ -403,7 +405,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
           larger than 16MB and in this case we have a chance of
           finding fitting memory in the next higher zone first. If
           not retry with true GFP_DMA. -AK */
-        if (dma_mask <= DMA_32BIT_MASK)
+        if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA))
                gfp |= GFP_DMA32;
 #endif
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 67e9b4a1e89d..ba370dc8685b 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -99,15 +99,6 @@ static void mwait_idle(void)
                local_irq_enable();
 }
-static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c)
-{
-        if (force_mwait)
-                return 1;
-        /* Any C1 states supported? */
-        return c->cpuid_level >= 5 && ((cpuid_edx(5) >> 4) & 0xf) > 0;
-}
 /*
 * On SMP it's slightly faster (but much more power-consuming!)
 * to poll the ->work.need_resched flag instead of waiting for the
@@ -119,6 +110,33 @@ static void poll_idle(void)
        cpu_relax();
 }
+/*
+ * mwait selection logic:
+ *
+ * It depends on the CPU. For AMD CPUs that support MWAIT this is
+ * wrong. Family 0x10 and 0x11 CPUs will enter C1 on HLT. Powersavings
+ * then depend on a clock divisor and current Pstate of the core. If
+ * all cores of a processor are in halt state (C1) the processor can
+ * enter the C1E (C1 enhanced) state. If mwait is used this will never
+ * happen.
+ *
+ * idle=mwait overrides this decision and forces the usage of mwait.
+ */
+static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c)
+{
+        if (force_mwait)
+                return 1;
+        if (c->x86_vendor == X86_VENDOR_AMD) {
+                switch(c->x86) {
+                case 0x10:
+                case 0x11:
+                        return 0;
+                }
+        }
+        return 1;
+}
 void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c)
 {
        static int selected;
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index fb03ef380f0e..a7835f282936 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -1303,6 +1303,9 @@ static const struct user_regset_view user_x86_64_view = {
 #define genregs32_get           genregs_get
 #define genregs32_set           genregs_set
+#define user_i387_ia32_struct   user_i387_struct
+#define user32_fxsr_struct      user_fxsr_struct
 #endif  /* CONFIG_X86_64 */
 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
@@ -1315,13 +1318,13 @@ static const struct user_regset x86_32_regsets[] = {
        },
        [REGSET_FP] = {
                .core_note_type = NT_PRFPREG,
-                .n = sizeof(struct user_i387_struct) / sizeof(u32),
+                .n = sizeof(struct user_i387_ia32_struct) / sizeof(u32),
                .size = sizeof(u32), .align = sizeof(u32),
                .active = fpregs_active, .get = fpregs_get, .set = fpregs_set
        },
        [REGSET_XFP] = {
                .core_note_type = NT_PRXFPREG,
-                .n = sizeof(struct user_i387_struct) / sizeof(u32),
+                .n = sizeof(struct user32_fxsr_struct) / sizeof(u32),
                .size = sizeof(u32), .align = sizeof(u32),
                .active = xfpregs_active, .get = xfpregs_get, .set = xfpregs_set
        },
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index c0c68c18a788..6f80b852a196 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -12,6 +12,7 @@
 #include <asm/mpspec.h>
 #include <asm/apicdef.h>
+#ifdef CONFIG_X86_LOCAL_APIC
 unsigned int num_processors;
 unsigned disabled_cpus __cpuinitdata;
 /* Processor that is doing the boot up */
@@ -23,8 +24,9 @@ EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid);
 /* Bitmask of physically existing CPUs */
 physid_mask_t phys_cpu_present_map;
+#endif
-#if defined(CONFIG_HAVE_SETUP_PER_CPU_AREA) && defined(CONFIG_SMP)
+#if defined(CONFIG_HAVE_SETUP_PER_CPU_AREA) && defined(CONFIG_X86_SMP)
 /*
 * Copy data used in early init routines from the initial arrays to the
 * per cpu data areas.  These arrays then become expendable and the
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index f2fc8feb727d..6dff1286ad8a 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -951,7 +951,7 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
 static void __cpuinit early_init_centaur(struct cpuinfo_x86 *c)
 {
        if (c->x86 == 0x6 && c->x86_model >= 0xf)
-                set_bit(X86_FEATURE_CONSTANT_TSC, &c->x86_capability);
+                set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
 }
 static void __cpuinit init_centaur(struct cpuinfo_x86 *c)
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
index 8f75893a6467..0cb7aadc87cd 100644
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
@@ -231,7 +231,8 @@ native_smp_call_function_mask(cpumask_t mask,
        wmb();
        /* Send a message to other CPUs */
-        if (cpus_equal(mask, allbutself))
+        if (cpus_equal(mask, allbutself) &&
+            cpus_equal(cpu_online_map, cpu_callout_map))
                send_IPI_allbutself(CALL_FUNCTION_VECTOR);
        else
                send_IPI_mask(mask, CALL_FUNCTION_VECTOR);
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 6b087ab6cd8f..38988491c622 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -86,6 +86,7 @@ void *x86_bios_cpu_apicid_early_ptr;
 #ifdef CONFIG_X86_32
 u8 apicid_2_node[MAX_APICID];
+static int low_mappings;
 #endif
 /* State of each CPU */
@@ -326,6 +327,12 @@ static void __cpuinit start_secondary(void *unused)
                enable_8259A_irq(0);
        }
+#ifdef CONFIG_X86_32
+        while (low_mappings)
+                cpu_relax();
+        __flush_tlb_all();
+#endif
        /* This must be done before setting cpu_online_map */
        set_cpu_sibling_map(raw_smp_processor_id());
        wmb();
@@ -1040,14 +1047,20 @@ int __cpuinit native_cpu_up(unsigned int cpu)
 #ifdef CONFIG_X86_32
        /* init low mem mapping */
        clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
-                        min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));
+                min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));
        flush_tlb_all();
-#endif
+        low_mappings = 1;
        err = do_boot_cpu(apicid, cpu);
-        if (err < 0) {
+        zap_low_mappings();
+        low_mappings = 0;
+#else
+        err = do_boot_cpu(apicid, cpu);
+#endif
+        if (err) {
                Dprintk("do_boot_cpu failed %d\n", err);
-                return err;
+                return -EIO;
        }
        /*
@@ -1259,9 +1272,6 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
        setup_ioapic_dest();
 #endif
        check_nmi_watchdog();
-#ifdef CONFIG_X86_32
-        zap_low_mappings();
-#endif
 }
 #ifdef CONFIG_HOTPLUG_CPU
diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
index 58882f9f2637..f6c05d0410fb 100644
--- a/arch/x86/kernel/x8664_ksyms_64.c
+++ b/arch/x86/kernel/x8664_ksyms_64.c
@@ -2,6 +2,7 @@
   All C exports should go in the respective C files. */
 #include <linux/module.h>
+#include <net/checksum.h>
 #include <linux/smp.h>
 #include <asm/processor.h>
@@ -29,6 +30,8 @@ EXPORT_SYMBOL(__copy_from_user_inatomic);
 EXPORT_SYMBOL(copy_page);
 EXPORT_SYMBOL(clear_page);
+EXPORT_SYMBOL(csum_partial);
 /*
 * Export string functions. We normally rely on gcc builtin for most of these,
 * but gcc sometimes decides not to inline them.
diff --git a/arch/x86/lib/csum-partial_64.c b/arch/x86/lib/csum-partial_64.c
index bc503f506903..bf51144d97e1 100644
--- a/arch/x86/lib/csum-partial_64.c
+++ b/arch/x86/lib/csum-partial_64.c
@@ -136,8 +136,6 @@ __wsum csum_partial(const void *buff, int len, __wsum sum)
                                                (__force u32)sum);
 }
-EXPORT_SYMBOL(csum_partial);
 /*
 * this routine is used for miscellaneous IP-like checksums, mainly
 * in icmp.c
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index de236e419cb5..ec30d10154b6 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -438,8 +438,6 @@ void zap_low_mappings(void)
 {
        int i;
-        save_pg_dir();
        /*
         * Zap initial low-memory mappings.
         *
@@ -663,16 +661,8 @@ void __init mem_init(void)
                test_wp_bit();
        cpa_init();
+        save_pg_dir();
-        /*
-         * Subtle. SMP is doing it's boot stuff late (because it has to
-         * fork idle threads) - but it also needs low mappings for the
-         * protected-mode entry to work. We zap these entries only after
-         * the WP-bit has been tested.
-         */
-#ifndef CONFIG_SMP
        zap_low_mappings();
-#endif
 }
 #ifdef CONFIG_MEMORY_HOTPLUG
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index 60adbe22efa0..de3a99812450 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -28,7 +28,7 @@
 #ifdef CONFIG_X86_PAT
 int __read_mostly pat_wc_enabled = 1;
-void __init pat_disable(char *reason)
+void __cpuinit pat_disable(char *reason)
 {
        pat_wc_enabled = 0;
        printk(KERN_INFO "%s\n", reason);
@@ -555,7 +555,7 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,
                "%s:%d /dev/mem ioremap_change_attr failed %s for %Lx-%Lx\n",
                        current->comm, current->pid,
                        cattr_name(flags),
-                        offset, offset + size);
+                        offset, (unsigned long long)(offset + size));
                return 0;
        }
@@ -576,7 +576,7 @@ void map_devmem(unsigned long pfn, unsigned long size, pgprot_t vma_prot)
                "%s:%d /dev/mem expected mapping type %s for %Lx-%Lx, got %s\n",
                        current->comm, current->pid,
                        cattr_name(want_flags),
-                        addr, addr + size,
+                        addr, (unsigned long long)(addr + size),
                        cattr_name(flags));
        }
 }
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 8af0f0bae2af..10fb308fded8 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -301,15 +301,13 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
        prot = pgprot_val(vma->vm_page_prot);
        if (pat_wc_enabled && write_combine)
                prot |= _PAGE_CACHE_WC;
-        else if (pat_wc_enabled)
+        else if (pat_wc_enabled || boot_cpu_data.x86 > 3)
                /*
                 * ioremap() and ioremap_nocache() defaults to UC MINUS for now.
                 * To avoid attribute conflicts, request UC MINUS here
                 * aswell.
                 */
                prot |= _PAGE_CACHE_UC_MINUS;
-        else if (boot_cpu_data.x86 > 3)
-                prot |= _PAGE_CACHE_UC;
        vma->vm_page_prot = __pgprot(prot);