82 files changed, 3815 insertions, 2306 deletions
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index a346e1833bf2..626cdc83668b 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -108,7 +108,6 @@ static struct async_struct *IRQ_ports[NR_IRQS];
 static struct console *console;
 static unsigned char *tmp_buf;
-static DECLARE_MUTEX(tmp_buf_sem);
 extern struct console *console_drivers; /* from kernel/printk.c */
@@ -167,15 +166,9 @@ static  void receive_chars(struct tty_struct *tty, struct pt_regs *regs)
                        }
                }
                seen_esc = 0;
-                if (tty->flip.count >= TTY_FLIPBUF_SIZE) break;
-                *tty->flip.char_buf_ptr = ch;
+                if (tty_insert_flip_char(tty, ch, TTY_NORMAL) == 0)
+                        break;
-                *tty->flip.flag_buf_ptr = 0;
-                tty->flip.flag_buf_ptr++;
-                tty->flip.char_buf_ptr++;
-                tty->flip.count++;
        }
        tty_flip_buffer_push(tty);
 }
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S
index 2ddbac6f4999..ce423910ca97 100644
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
@@ -903,5 +903,6 @@ fsyscall_table:
        data8 0
        data8 0
        data8 0
+        data8 0                                                 // 1280
        .org fsyscall_table + 8*NR_syscalls     // guard against failures to increase NR_syscalls
diff --git a/arch/ia64/kernel/jprobes.S b/arch/ia64/kernel/jprobes.S
index 2323377e3695..5cd6226f44f2 100644
--- a/arch/ia64/kernel/jprobes.S
+++ b/arch/ia64/kernel/jprobes.S
@@ -60,3 +60,30 @@ END(jprobe_break)
 GLOBAL_ENTRY(jprobe_inst_return)
        br.call.sptk.many b0=jprobe_break
 END(jprobe_inst_return)
+GLOBAL_ENTRY(invalidate_stacked_regs)
+        movl r16=invalidate_restore_cfm
+        ;;
+        mov b6=r16
+        ;;
+        br.ret.sptk.many b6
+        ;;
+invalidate_restore_cfm:
+        mov r16=ar.rsc
+        ;;
+        mov ar.rsc=r0
+        ;;
+        loadrs
+        ;;
+        mov ar.rsc=r16
+        ;;
+        br.cond.sptk.many rp
+END(invalidate_stacked_regs)
+GLOBAL_ENTRY(flush_register_stack)
+        // flush dirty regs to backing store (must be first in insn group)
+        flushrs
+        ;;
+        br.ret.sptk.many rp
+END(flush_register_stack)
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 346fedf9ea47..50ae8c7d453d 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -766,11 +766,56 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
        return ret;
 }
+struct param_bsp_cfm {
+        unsigned long ip;
+        unsigned long *bsp;
+        unsigned long cfm;
+};
+static void ia64_get_bsp_cfm(struct unw_frame_info *info, void *arg)
+{
+        unsigned long ip;
+        struct param_bsp_cfm *lp = arg;
+        do {
+                unw_get_ip(info, &ip);
+                if (ip == 0)
+                        break;
+                if (ip == lp->ip) {
+                        unw_get_bsp(info, (unsigned long*)&lp->bsp);
+                        unw_get_cfm(info, (unsigned long*)&lp->cfm);
+                        return;
+                }
+        } while (unw_unwind(info) >= 0);
+        lp->bsp = 0;
+        lp->cfm = 0;
+        return;
+}
 int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
 {
        struct jprobe *jp = container_of(p, struct jprobe, kp);
        unsigned long addr = ((struct fnptr *)(jp->entry))->ip;
        struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
+        struct param_bsp_cfm pa;
+        int bytes;
+        /*
+         * Callee owns the argument space and could overwrite it, eg
+         * tail call optimization. So to be absolutely safe
+         * we save the argument space before transfering the control
+         * to instrumented jprobe function which runs in
+         * the process context
+         */
+        pa.ip = regs->cr_iip;
+        unw_init_running(ia64_get_bsp_cfm, &pa);
+        bytes = (char *)ia64_rse_skip_regs(pa.bsp, pa.cfm & 0x3f)
+                                - (char *)pa.bsp;
+        memcpy( kcb->jprobes_saved_stacked_regs,
+                pa.bsp,
+                bytes );
+        kcb->bsp = pa.bsp;
+        kcb->cfm = pa.cfm;
        /* save architectural state */
        kcb->jprobe_saved_regs = *regs;
@@ -792,8 +837,20 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
 int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
 {
        struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
+        int bytes;
+        /* restoring architectural state */
        *regs = kcb->jprobe_saved_regs;
+        /* restoring the original argument space */
+        flush_register_stack();
+        bytes = (char *)ia64_rse_skip_regs(kcb->bsp, kcb->cfm & 0x3f)
+                                - (char *)kcb->bsp;
+        memcpy( kcb->bsp,
+                kcb->jprobes_saved_stacked_regs,
+                bytes );
+        invalidate_stacked_regs();
        preempt_enable_no_resched();
        return 1;
 }
diff --git a/arch/ia64/kernel/mca_asm.S b/arch/ia64/kernel/mca_asm.S
index db32fc1d3935..403a80a58c13 100644
--- a/arch/ia64/kernel/mca_asm.S
+++ b/arch/ia64/kernel/mca_asm.S
@@ -847,7 +847,7 @@ ia64_state_restore:
        ;;
        mov cr.iim=temp3
        mov cr.iha=temp4
-        dep r22=0,r22,62,2      // pal_min_state, physical, uncached
+        dep r22=0,r22,62,1      // pal_min_state, physical, uncached
        mov IA64_KR(CURRENT)=r21
        ld8 r8=[temp1]          // os_status
        ld8 r10=[temp2]         // context
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index a87a162a3086..9d5a823479a3 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -3,7 +3,7 @@
 *
 * Creates entries in /proc/sal for various system features.
 *
- * Copyright (c) 2003 Silicon Graphics, Inc.  All rights reserved.
+ * Copyright (c) 2003, 2006 Silicon Graphics, Inc.  All rights reserved.
 * Copyright (c) 2003 Hewlett-Packard Co
 *      Bjorn Helgaas <bjorn.helgaas@hp.com>
 *
@@ -27,9 +27,17 @@
 *   mca.c may not pass a buffer, a NULL buffer just indicates that a new
 *   record is available in SAL.
 *   Replace some NR_CPUS by cpus_online, for hotplug cpu.
+ *
+ * Jan  5 2006        kaos@sgi.com
+ *   Handle hotplug cpus coming online.
+ *   Handle hotplug cpus going offline while they still have outstanding records.
+ *   Use the cpu_* macros consistently.
+ *   Replace the counting semaphore with a mutex and a test if the cpumask is non-empty.
+ *   Modify the locking to make the test for "work to do" an atomic operation.
 */
 #include <linux/capability.h>
+#include <linux/cpu.h>
 #include <linux/types.h>
 #include <linux/proc_fs.h>
 #include <linux/module.h>
@@ -132,8 +140,8 @@ enum salinfo_state {
 };
 struct salinfo_data {
-        volatile cpumask_t      cpu_event;      /* which cpus have outstanding events */
+        cpumask_t               cpu_event;      /* which cpus have outstanding events */
-        struct semaphore        sem;            /* count of cpus with outstanding events (bits set in cpu_event) */
+        struct semaphore        mutex;
        u8                      *log_buffer;
        u64                     log_size;
        u8                      *oemdata;       /* decoded oem data */
@@ -174,6 +182,21 @@ struct salinfo_platform_oemdata_parms {
        int ret;
 };
+/* Kick the mutex that tells user space that there is work to do.  Instead of
+ * trying to track the state of the mutex across multiple cpus, in user
+ * context, interrupt context, non-maskable interrupt context and hotplug cpu,
+ * it is far easier just to grab the mutex if it is free then release it.
+ *
+ * This routine must be called with data_saved_lock held, to make the down/up
+ * operation atomic.
+ */
+static void
+salinfo_work_to_do(struct salinfo_data *data)
+{
+        down_trylock(&data->mutex);
+        up(&data->mutex);
+}
 static void
 salinfo_platform_oemdata_cpu(void *context)
 {
@@ -212,9 +235,9 @@ salinfo_log_wakeup(int type, u8 *buffer, u64 size, int irqsafe)
        BUG_ON(type >= ARRAY_SIZE(salinfo_log_name));
+        if (irqsafe)
+                spin_lock_irqsave(&data_saved_lock, flags);
        if (buffer) {
-                if (irqsafe)
-                        spin_lock_irqsave(&data_saved_lock, flags);
                for (i = 0, data_saved = data->data_saved; i < saved_size; ++i, ++data_saved) {
                        if (!data_saved->buffer)
                                break;
@@ -232,13 +255,11 @@ salinfo_log_wakeup(int type, u8 *buffer, u64 size, int irqsafe)
                        data_saved->size = size;
                        data_saved->buffer = buffer;
                }
-                if (irqsafe)
-                        spin_unlock_irqrestore(&data_saved_lock, flags);
        }
+        cpu_set(smp_processor_id(), data->cpu_event);
-        if (!test_and_set_bit(smp_processor_id(), &data->cpu_event)) {
+        if (irqsafe) {
-                if (irqsafe)
+                salinfo_work_to_do(data);
-                        up(&data->sem);
+                spin_unlock_irqrestore(&data_saved_lock, flags);
        }
 }
@@ -249,20 +270,17 @@ static struct timer_list salinfo_timer;
 static void
 salinfo_timeout_check(struct salinfo_data *data)
 {
-        int i;
+        unsigned long flags;
        if (!data->open)
                return;
-        for_each_online_cpu(i) {
+        if (!cpus_empty(data->cpu_event)) {
-                if (test_bit(i, &data->cpu_event)) {
+                spin_lock_irqsave(&data_saved_lock, flags);
-                        /* double up() is not a problem, user space will see no
+                salinfo_work_to_do(data);
-                         * records for the additional "events".
+                spin_unlock_irqrestore(&data_saved_lock, flags);
-                         */
-                        up(&data->sem);
-                }
        }
 }
-static void 
+static void
 salinfo_timeout (unsigned long arg)
 {
        salinfo_timeout_check(salinfo_data + SAL_INFO_TYPE_MCA);
@@ -290,16 +308,20 @@ salinfo_event_read(struct file *file, char __user *buffer, size_t count, loff_t
        int i, n, cpu = -1;
 retry:
-        if (down_trylock(&data->sem)) {
+        if (cpus_empty(data->cpu_event) && down_trylock(&data->mutex)) {
                if (file->f_flags & O_NONBLOCK)
                        return -EAGAIN;
-                if (down_interruptible(&data->sem))
+                if (down_interruptible(&data->mutex))
                        return -EINTR;
        }
        n = data->cpu_check;
        for (i = 0; i < NR_CPUS; i++) {
-                if (test_bit(n, &data->cpu_event) && cpu_online(n)) {
+                if (cpu_isset(n, data->cpu_event)) {
+                        if (!cpu_online(n)) {
+                                cpu_clear(n, data->cpu_event);
+                                continue;
+                        }
                        cpu = n;
                        break;
                }
@@ -310,9 +332,6 @@ retry:
        if (cpu == -1)
                goto retry;
-        /* events are sticky until the user says "clear" */
-        up(&data->sem);
        /* for next read, start checking at next CPU */
        data->cpu_check = cpu;
        if (++data->cpu_check == NR_CPUS)
@@ -381,10 +400,8 @@ salinfo_log_release(struct inode *inode, struct file *file)
 static void
 call_on_cpu(int cpu, void (*fn)(void *), void *arg)
 {
-        cpumask_t save_cpus_allowed, new_cpus_allowed;
+        cpumask_t save_cpus_allowed = current->cpus_allowed;
-        memcpy(&save_cpus_allowed, &current->cpus_allowed, sizeof(save_cpus_allowed));
+        cpumask_t new_cpus_allowed = cpumask_of_cpu(cpu);
-        memset(&new_cpus_allowed, 0, sizeof(new_cpus_allowed));
-        set_bit(cpu, &new_cpus_allowed);
        set_cpus_allowed(current, new_cpus_allowed);
        (*fn)(arg);
        set_cpus_allowed(current, save_cpus_allowed);
@@ -433,10 +450,10 @@ retry:
        if (!data->saved_num)
                call_on_cpu(cpu, salinfo_log_read_cpu, data);
        if (!data->log_size) {
-                data->state = STATE_NO_DATA;
+                data->state = STATE_NO_DATA;
-                clear_bit(cpu, &data->cpu_event);
+                cpu_clear(cpu, data->cpu_event);
        } else {
-                data->state = STATE_LOG_RECORD;
+                data->state = STATE_LOG_RECORD;
        }
 }
@@ -473,27 +490,31 @@ static int
 salinfo_log_clear(struct salinfo_data *data, int cpu)
 {
        sal_log_record_header_t *rh;
+        unsigned long flags;
+        spin_lock_irqsave(&data_saved_lock, flags);
        data->state = STATE_NO_DATA;
-        if (!test_bit(cpu, &data->cpu_event))
+        if (!cpu_isset(cpu, data->cpu_event)) {
+                spin_unlock_irqrestore(&data_saved_lock, flags);
                return 0;
-        down(&data->sem);
+        }
-        clear_bit(cpu, &data->cpu_event);
+        cpu_clear(cpu, data->cpu_event);
        if (data->saved_num) {
-                unsigned long flags;
+                shift1_data_saved(data, data->saved_num - 1);
-                spin_lock_irqsave(&data_saved_lock, flags);
-                shift1_data_saved(data, data->saved_num - 1 );
                data->saved_num = 0;
-                spin_unlock_irqrestore(&data_saved_lock, flags);
        }
+        spin_unlock_irqrestore(&data_saved_lock, flags);
        rh = (sal_log_record_header_t *)(data->log_buffer);
        /* Corrected errors have already been cleared from SAL */
        if (rh->severity != sal_log_severity_corrected)
                call_on_cpu(cpu, salinfo_log_clear_cpu, data);
        /* clearing a record may make a new record visible */
        salinfo_log_new_read(cpu, data);
-        if (data->state == STATE_LOG_RECORD &&
+        if (data->state == STATE_LOG_RECORD) {
-            !test_and_set_bit(cpu,  &data->cpu_event))
+                spin_lock_irqsave(&data_saved_lock, flags);
-                up(&data->sem);
+                cpu_set(cpu, data->cpu_event);
+                salinfo_work_to_do(data);
+                spin_unlock_irqrestore(&data_saved_lock, flags);
+        }
        return 0;
 }
@@ -550,6 +571,53 @@ static struct file_operations salinfo_data_fops = {
        .write   = salinfo_log_write,
 };
+#ifdef  CONFIG_HOTPLUG_CPU
+static int __devinit
+salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
+{
+        unsigned int i, cpu = (unsigned long)hcpu;
+        unsigned long flags;
+        struct salinfo_data *data;
+        switch (action) {
+        case CPU_ONLINE:
+                spin_lock_irqsave(&data_saved_lock, flags);
+                for (i = 0, data = salinfo_data;
+                     i < ARRAY_SIZE(salinfo_data);
+                     ++i, ++data) {
+                        cpu_set(cpu, data->cpu_event);
+                        salinfo_work_to_do(data);
+                }
+                spin_unlock_irqrestore(&data_saved_lock, flags);
+                break;
+        case CPU_DEAD:
+                spin_lock_irqsave(&data_saved_lock, flags);
+                for (i = 0, data = salinfo_data;
+                     i < ARRAY_SIZE(salinfo_data);
+                     ++i, ++data) {
+                        struct salinfo_data_saved *data_saved;
+                        int j;
+                        for (j = ARRAY_SIZE(data->data_saved) - 1, data_saved = data->data_saved + j;
+                             j >= 0;
+                             --j, --data_saved) {
+                                if (data_saved->buffer && data_saved->cpu == cpu) {
+                                        shift1_data_saved(data, j);
+                                }
+                        }
+                        cpu_clear(cpu, data->cpu_event);
+                }
+                spin_unlock_irqrestore(&data_saved_lock, flags);
+                break;
+        }
+        return NOTIFY_OK;
+}
+static struct notifier_block salinfo_cpu_notifier =
+{
+        .notifier_call = salinfo_cpu_callback,
+        .priority = 0,
+};
+#endif  /* CONFIG_HOTPLUG_CPU */
 static int __init
 salinfo_init(void)
 {
@@ -557,7 +625,7 @@ salinfo_init(void)
        struct proc_dir_entry **sdir = salinfo_proc_entries; /* keeps track of every entry */
        struct proc_dir_entry *dir, *entry;
        struct salinfo_data *data;
-        int i, j, online;
+        int i, j;
        salinfo_dir = proc_mkdir("sal", NULL);
        if (!salinfo_dir)
@@ -572,7 +640,7 @@ salinfo_init(void)
        for (i = 0; i < ARRAY_SIZE(salinfo_log_name); i++) {
                data = salinfo_data + i;
                data->type = i;
-                sema_init(&data->sem, 0);
+                init_MUTEX(&data->mutex);
                dir = proc_mkdir(salinfo_log_name[i], salinfo_dir);
                if (!dir)
                        continue;
@@ -592,12 +660,8 @@ salinfo_init(void)
                *sdir++ = entry;
                /* we missed any events before now */
-                online = 0;
+                for_each_online_cpu(j)
-                for_each_online_cpu(j) {
+                        cpu_set(j, data->cpu_event);
-                        set_bit(j, &data->cpu_event);
-                        ++online;
-                }
-                sema_init(&data->sem, online);
                *sdir++ = dir;
        }
@@ -609,6 +673,10 @@ salinfo_init(void)
        salinfo_timer.function = &salinfo_timeout;
        add_timer(&salinfo_timer);
+#ifdef  CONFIG_HOTPLUG_CPU
+        register_cpu_notifier(&salinfo_cpu_notifier);
+#endif
        return 0;
 }
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index d3e0ecb56d62..55391901b013 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -530,12 +530,15 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
                if (fsys_mode(current, &regs)) {
                        extern char __kernel_syscall_via_break[];
                        /*
-                         * Got a trap in fsys-mode: Taken Branch Trap and Single Step trap
+                         * Got a trap in fsys-mode: Taken Branch Trap
-                         * need special handling; Debug trap is not supposed to happen.
+                         * and Single Step trap need special handling;
+                         * Debug trap is ignored (we disable it here
+                         * and re-enable it in the lower-privilege trap).
                         */
                        if (unlikely(vector == 29)) {
-                                die("Got debug trap in fsys-mode---not supposed to happen!",
+                                set_thread_flag(TIF_DB_DISABLED);
-                                    &regs, 0);
+                                ia64_psr(&regs)->db = 0;
+                                ia64_psr(&regs)->lp = 1;
                                return;
                        }
                        /* re-do the system call via break 0x100000: */
@@ -589,10 +592,19 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
              case 34:
                if (isr & 0x2) {
                        /* Lower-Privilege Transfer Trap */
+                        /* If we disabled debug traps during an fsyscall,
+                         * re-enable them here.
+                         */
+                        if (test_thread_flag(TIF_DB_DISABLED)) {
+                                clear_thread_flag(TIF_DB_DISABLED);
+                                ia64_psr(&regs)->db = 1;
+                        }
                        /*
-                         * Just clear PSR.lp and then return immediately: all the
+                         * Just clear PSR.lp and then return immediately:
-                         * interesting work (e.g., signal delivery is done in the kernel
+                         * all the interesting work (e.g., signal delivery)
-                         * exit path).
+                         * is done in the kernel exit path.
                         */
                        ia64_psr(&regs)->lp = 0;
                        return;
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c
index 41105d454423..6a4eec9113e8 100644
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -90,7 +90,7 @@ ia64_global_tlb_purge (struct mm_struct *mm, unsigned long start,
 {
        static DEFINE_SPINLOCK(ptcg_lock);
-        if (mm != current->active_mm) {
+        if (mm != current->active_mm || !current->mm) {
                flush_tlb_all();
                return;
        }
diff --git a/arch/ia64/sn/include/xtalk/hubdev.h b/arch/ia64/sn/include/xtalk/hubdev.h
index 71c2b271b4c6..4d417c301201 100644
--- a/arch/ia64/sn/include/xtalk/hubdev.h
+++ b/arch/ia64/sn/include/xtalk/hubdev.h
@@ -26,11 +26,14 @@
 #define IIO_NUM_ITTES   7
 #define HUB_NUM_BIG_WINDOW      (IIO_NUM_ITTES - 1)
-struct sn_flush_device_list {
+/* This struct is shared between the PROM and the kernel.
+ * Changes to this struct will require corresponding changes to the kernel.
+ */
+struct sn_flush_device_common {
        int sfdl_bus;
        int sfdl_slot;
        int sfdl_pin;
-        struct bar_list {
+        struct common_bar_list {
                unsigned long start;
                unsigned long end;
        } sfdl_bar_list[6];
@@ -40,14 +43,19 @@ struct sn_flush_device_list {
        uint32_t sfdl_persistent_busnum;
        uint32_t sfdl_persistent_segment;
        struct pcibus_info *sfdl_pcibus_info;
+};
+/* This struct is kernel only and is not used by the PROM */
+struct sn_flush_device_kernel {
        spinlock_t sfdl_flush_lock;
+        struct sn_flush_device_common *common;
 };
 /*
- * **widget_p - Used as an array[wid_num][device] of sn_flush_device_list.
+ * **widget_p - Used as an array[wid_num][device] of sn_flush_device_kernel.
 */
 struct sn_flush_nasid_entry  {
-        struct sn_flush_device_list **widget_p; /* Used as a array of wid_num */
+        struct sn_flush_device_kernel **widget_p; // Used as an array of wid_num
        uint64_t iio_itte[8];
 };
diff --git a/arch/ia64/sn/kernel/bte_error.c b/arch/ia64/sn/kernel/bte_error.c
index fcbc748ae433..f1ec1370b3e3 100644
--- a/arch/ia64/sn/kernel/bte_error.c
+++ b/arch/ia64/sn/kernel/bte_error.c
@@ -33,7 +33,7 @@ void bte_error_handler(unsigned long);
 * Wait until all BTE related CRBs are completed
 * and then reset the interfaces.
 */
-void shub1_bte_error_handler(unsigned long _nodepda)
+int shub1_bte_error_handler(unsigned long _nodepda)
 {
        struct nodepda_s *err_nodepda = (struct nodepda_s *)_nodepda;
        struct timer_list *recovery_timer = &err_nodepda->bte_recovery_timer;
@@ -53,7 +53,7 @@ void shub1_bte_error_handler(unsigned long _nodepda)
            (err_nodepda->bte_if[1].bh_error == BTE_SUCCESS)) {
                BTE_PRINTK(("eh:%p:%d Nothing to do.\n", err_nodepda,
                            smp_processor_id()));
-                return;
+                return 1;
        }
        /* Determine information about our hub */
@@ -81,7 +81,7 @@ void shub1_bte_error_handler(unsigned long _nodepda)
                mod_timer(recovery_timer, HZ * 5);
                BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda,
                            smp_processor_id()));
-                return;
+                return 1;
        }
        if (icmr.ii_icmr_fld_s.i_crb_vld != 0) {
@@ -99,7 +99,7 @@ void shub1_bte_error_handler(unsigned long _nodepda)
                                BTE_PRINTK(("eh:%p:%d Valid %d, Giving up\n",
                                            err_nodepda, smp_processor_id(),
                                            i));
-                                return;
+                                return 1;
                        }
                }
        }
@@ -124,6 +124,42 @@ void shub1_bte_error_handler(unsigned long _nodepda)
        REMOTE_HUB_S(nasid, IIO_IBCR, ibcr.ii_ibcr_regval);
        del_timer(recovery_timer);
+        return 0;
+}
+/*
+ * Wait until all BTE related CRBs are completed
+ * and then reset the interfaces.
+ */
+int shub2_bte_error_handler(unsigned long _nodepda)
+{
+        struct nodepda_s *err_nodepda = (struct nodepda_s *)_nodepda;
+        struct timer_list *recovery_timer = &err_nodepda->bte_recovery_timer;
+        struct bteinfo_s *bte;
+        nasid_t nasid;
+        u64 status;
+        int i;
+        nasid = cnodeid_to_nasid(err_nodepda->bte_if[0].bte_cnode);
+        /*
+         * Verify that all the BTEs are complete
+         */
+        for (i = 0; i < BTES_PER_NODE; i++) {
+                bte = &err_nodepda->bte_if[i];
+                status = BTE_LNSTAT_LOAD(bte);
+                if ((status & IBLS_ERROR) || !(status & IBLS_BUSY))
+                        continue;
+                mod_timer(recovery_timer, HZ * 5);
+                BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda,
+                            smp_processor_id()));
+                return 1;
+        }
+        if (ia64_sn_bte_recovery(nasid))
+                panic("bte_error_handler(): Fatal BTE Error");
+        del_timer(recovery_timer);
+        return 0;
 }
 /*
@@ -135,7 +171,6 @@ void bte_error_handler(unsigned long _nodepda)
        struct nodepda_s *err_nodepda = (struct nodepda_s *)_nodepda;
        spinlock_t *recovery_lock = &err_nodepda->bte_recovery_lock;
        int i;
-        nasid_t nasid;
        unsigned long irq_flags;
        volatile u64 *notify;
        bte_result_t bh_error;
@@ -160,12 +195,15 @@ void bte_error_handler(unsigned long _nodepda)
        }
        if (is_shub1()) {
-                shub1_bte_error_handler(_nodepda);
+                if (shub1_bte_error_handler(_nodepda)) {
+                        spin_unlock_irqrestore(recovery_lock, irq_flags);
+                        return;
+                }
        } else {
-                nasid = cnodeid_to_nasid(err_nodepda->bte_if[0].bte_cnode);
+                if (shub2_bte_error_handler(_nodepda)) {
+                        spin_unlock_irqrestore(recovery_lock, irq_flags);
-                if (ia64_sn_bte_recovery(nasid))
+                        return;
-                        panic("bte_error_handler(): Fatal BTE Error");
+                }
        }
        for (i = 0; i < BTES_PER_NODE; i++) {
diff --git a/arch/ia64/sn/kernel/huberror.c b/arch/ia64/sn/kernel/huberror.c
index 5c5eb01c50f0..56ab6bae00ee 100644
--- a/arch/ia64/sn/kernel/huberror.c
+++ b/arch/ia64/sn/kernel/huberror.c
@@ -32,13 +32,14 @@ static irqreturn_t hub_eint_handler(int irq, void *arg, struct pt_regs *ep)
        ret_stuff.v0 = 0;
        hubdev_info = (struct hubdev_info *)arg;
        nasid = hubdev_info->hdi_nasid;
-        SAL_CALL_NOLOCK(ret_stuff, SN_SAL_HUB_ERROR_INTERRUPT,
+        if (is_shub1()) {
+                SAL_CALL_NOLOCK(ret_stuff, SN_SAL_HUB_ERROR_INTERRUPT,
                        (u64) nasid, 0, 0, 0, 0, 0, 0);
-        if ((int)ret_stuff.v0)
+                if ((int)ret_stuff.v0)
-                panic("hubii_eint_handler(): Fatal TIO Error");
+                        panic("hubii_eint_handler(): Fatal TIO Error");
-        if (is_shub1()) {
                if (!(nasid & 1)) /* Not a TIO, handle CRB errors */
                        (void)hubiio_crb_error_handler(hubdev_info);
        } else 
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 318087e35b66..258d9d7aff98 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -76,11 +76,12 @@ static struct sn_pcibus_provider sn_pci_default_provider = {
 };
 /*
- * Retrieve the DMA Flush List given nasid.  This list is needed 
+ * Retrieve the DMA Flush List given nasid, widget, and device.
- * to implement the WAR - Flush DMA data on PIO Reads.
+ * This list is needed to implement the WAR - Flush DMA data on PIO Reads.
 */
-static inline uint64_t
+static inline u64
-sal_get_widget_dmaflush_list(u64 nasid, u64 widget_num, u64 address)
+sal_get_device_dmaflush_list(u64 nasid, u64 widget_num, u64 device_num,
+                             u64 address)
 {
        struct ia64_sal_retval ret_stuff;
@@ -88,17 +89,17 @@ sal_get_widget_dmaflush_list(u64 nasid, u64 widget_num, u64 address)
        ret_stuff.v0 = 0;
        SAL_CALL_NOLOCK(ret_stuff,
-                        (u64) SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST,
+                        (u64) SN_SAL_IOIF_GET_DEVICE_DMAFLUSH_LIST,
-                        (u64) nasid, (u64) widget_num, (u64) address, 0, 0, 0,
+                        (u64) nasid, (u64) widget_num,
-                        0);
+                        (u64) device_num, (u64) address, 0, 0, 0);
-        return ret_stuff.v0;
+        return ret_stuff.status;
 }
 /*
 * Retrieve the hub device info structure for the given nasid.
 */
-static inline uint64_t sal_get_hubdev_info(u64 handle, u64 address)
+static inline u64 sal_get_hubdev_info(u64 handle, u64 address)
 {
        struct ia64_sal_retval ret_stuff;
@@ -114,7 +115,7 @@ static inline uint64_t sal_get_hubdev_info(u64 handle, u64 address)
 /*
 * Retrieve the pci bus information given the bus number.
 */
-static inline uint64_t sal_get_pcibus_info(u64 segment, u64 busnum, u64 address)
+static inline u64 sal_get_pcibus_info(u64 segment, u64 busnum, u64 address)
 {
        struct ia64_sal_retval ret_stuff;
@@ -130,7 +131,7 @@ static inline uint64_t sal_get_pcibus_info(u64 segment, u64 busnum, u64 address)
 /*
 * Retrieve the pci device information given the bus and device|function number.
 */
-static inline uint64_t
+static inline u64
 sal_get_pcidev_info(u64 segment, u64 bus_number, u64 devfn, u64 pci_dev, 
                        u64 sn_irq_info)
 {
@@ -170,12 +171,12 @@ sn_pcidev_info_get(struct pci_dev *dev)
 */
 static void sn_fixup_ionodes(void)
 {
+        struct sn_flush_device_kernel *sn_flush_device_kernel;
-        struct sn_flush_device_list *sn_flush_device_list;
+        struct sn_flush_device_kernel *dev_entry;
        struct hubdev_info *hubdev;
-        uint64_t status;
+        u64 status;
-        uint64_t nasid;
+        u64 nasid;
-        int i, widget;
+        int i, widget, device;
        /*
         * Get SGI Specific HUB chipset information.
@@ -186,7 +187,7 @@ static void sn_fixup_ionodes(void)
                nasid = cnodeid_to_nasid(i);
                hubdev->max_segment_number = 0xffffffff;
                hubdev->max_pcibus_number = 0xff;
-                status = sal_get_hubdev_info(nasid, (uint64_t) __pa(hubdev));
+                status = sal_get_hubdev_info(nasid, (u64) __pa(hubdev));
                if (status)
                        continue;
@@ -213,38 +214,49 @@ static void sn_fixup_ionodes(void)
                hubdev->hdi_flush_nasid_list.widget_p =
                    kmalloc((HUB_WIDGET_ID_MAX + 1) *
-                            sizeof(struct sn_flush_device_list *), GFP_KERNEL);
+                            sizeof(struct sn_flush_device_kernel *),
+                            GFP_KERNEL);
                memset(hubdev->hdi_flush_nasid_list.widget_p, 0x0,
                       (HUB_WIDGET_ID_MAX + 1) *
-                       sizeof(struct sn_flush_device_list *));
+                       sizeof(struct sn_flush_device_kernel *));
                for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) {
-                        sn_flush_device_list = kmalloc(DEV_PER_WIDGET *
+                        sn_flush_device_kernel = kmalloc(DEV_PER_WIDGET *
-                                                       sizeof(struct
+                                                         sizeof(struct
-                                                              sn_flush_device_list),
+                                                        sn_flush_device_kernel),
-                                                       GFP_KERNEL);
+                                                        GFP_KERNEL);
-                        memset(sn_flush_device_list, 0x0,
+                        if (!sn_flush_device_kernel)
+                                BUG();
+                        memset(sn_flush_device_kernel, 0x0,
                               DEV_PER_WIDGET *
-                               sizeof(struct sn_flush_device_list));
+                               sizeof(struct sn_flush_device_kernel));
-                        status =
+                        dev_entry = sn_flush_device_kernel;
-                            sal_get_widget_dmaflush_list(nasid, widget,
+                        for (device = 0; device < DEV_PER_WIDGET;
-                                                         (uint64_t)
+                             device++,dev_entry++) {
-                                                         __pa
+                                dev_entry->common = kmalloc(sizeof(struct
-                                                         (sn_flush_device_list));
+                                                        sn_flush_device_common),
-                        if (status) {
+                                                            GFP_KERNEL);
-                                kfree(sn_flush_device_list);
+                                if (!dev_entry->common)
-                                continue;
+                                        BUG();
+                                memset(dev_entry->common, 0x0, sizeof(struct
+                                                       sn_flush_device_common));
+                                status = sal_get_device_dmaflush_list(nasid,
+                                                                        widget,
+                                                                        device,
+                                                      (u64)(dev_entry->common));
+                                if (status)
+                                        BUG();
+                                spin_lock_init(&dev_entry->sfdl_flush_lock);
                        }
-                        spin_lock_init(&sn_flush_device_list->sfdl_flush_lock);
+                        if (sn_flush_device_kernel)
-                        hubdev->hdi_flush_nasid_list.widget_p[widget] =
+                                hubdev->hdi_flush_nasid_list.widget_p[widget] =
-                            sn_flush_device_list;
+                                                       sn_flush_device_kernel;
-                }
+                }
        }
 }
 /*
diff --git a/arch/ia64/sn/kernel/xpc.h b/arch/ia64/sn/kernel/xpc.h
deleted file mode 100644
index 5483a9f227d4..000000000000
--- a/arch/ia64/sn/kernel/xpc.h
+++ /dev/null
@@ -1,1273 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (c) 2004-2005 Silicon Graphics, Inc.  All Rights Reserved.
- */
-/*
- * Cross Partition Communication (XPC) structures and macros.
- */
-#ifndef _IA64_SN_KERNEL_XPC_H
-#define _IA64_SN_KERNEL_XPC_H
-#include <linux/config.h>
-#include <linux/interrupt.h>
-#include <linux/sysctl.h>
-#include <linux/device.h>
-#include <asm/pgtable.h>
-#include <asm/processor.h>
-#include <asm/sn/bte.h>
-#include <asm/sn/clksupport.h>
-#include <asm/sn/addrs.h>
-#include <asm/sn/mspec.h>
-#include <asm/sn/shub_mmr.h>
-#include <asm/sn/xp.h>
-/*
- * XPC Version numbers consist of a major and minor number. XPC can always
- * talk to versions with same major #, and never talk to versions with a
- * different major #.
- */
-#define _XPC_VERSION(_maj, _min)        (((_maj) << 4) | ((_min) & 0xf))
-#define XPC_VERSION_MAJOR(_v)           ((_v) >> 4)
-#define XPC_VERSION_MINOR(_v)           ((_v) & 0xf)
-/*
- * The next macros define word or bit representations for given
- * C-brick nasid in either the SAL provided bit array representing
- * nasids in the partition/machine or the AMO_t array used for
- * inter-partition initiation communications.
- *
- * For SN2 machines, C-Bricks are alway even numbered NASIDs.  As
- * such, some space will be saved by insisting that nasid information
- * passed from SAL always be packed for C-Bricks and the
- * cross-partition interrupts use the same packing scheme.
- */
-#define XPC_NASID_W_INDEX(_n)   (((_n) / 64) / 2)
-#define XPC_NASID_B_INDEX(_n)   (((_n) / 2) & (64 - 1))
-#define XPC_NASID_IN_ARRAY(_n, _p) ((_p)[XPC_NASID_W_INDEX(_n)] & \
-                                    (1UL << XPC_NASID_B_INDEX(_n)))
-#define XPC_NASID_FROM_W_B(_w, _b) (((_w) * 64 + (_b)) * 2)
-#define XPC_HB_DEFAULT_INTERVAL         5       /* incr HB every x secs */
-#define XPC_HB_CHECK_DEFAULT_INTERVAL   20      /* check HB every x secs */
-/* define the process name of HB checker and the CPU it is pinned to */
-#define XPC_HB_CHECK_THREAD_NAME        "xpc_hb"
-#define XPC_HB_CHECK_CPU                0
-/* define the process name of the discovery thread */
-#define XPC_DISCOVERY_THREAD_NAME       "xpc_discovery"
-/*
- * the reserved page
- *
- *   SAL reserves one page of memory per partition for XPC. Though a full page
- *   in length (16384 bytes), its starting address is not page aligned, but it
- *   is cacheline aligned. The reserved page consists of the following:
- *
- *   reserved page header
- *
- *     The first cacheline of the reserved page contains the header
- *     (struct xpc_rsvd_page). Before SAL initialization has completed,
- *     SAL has set up the following fields of the reserved page header:
- *     SAL_signature, SAL_version, partid, and nasids_size. The other
- *     fields are set up by XPC. (xpc_rsvd_page points to the local
- *     partition's reserved page.)
- *
- *   part_nasids mask
- *   mach_nasids mask
- *
- *     SAL also sets up two bitmaps (or masks), one that reflects the actual
- *     nasids in this partition (part_nasids), and the other that reflects
- *     the actual nasids in the entire machine (mach_nasids). We're only
- *     interested in the even numbered nasids (which contain the processors
- *     and/or memory), so we only need half as many bits to represent the
- *     nasids. The part_nasids mask is located starting at the first cacheline
- *     following the reserved page header. The mach_nasids mask follows right
- *     after the part_nasids mask. The size in bytes of each mask is reflected
- *     by the reserved page header field 'nasids_size'. (Local partition's
- *     mask pointers are xpc_part_nasids and xpc_mach_nasids.)
- *
- *   vars
- *   vars part
- *
- *     Immediately following the mach_nasids mask are the XPC variables
- *     required by other partitions. First are those that are generic to all
- *     partitions (vars), followed on the next available cacheline by those
- *     which are partition specific (vars part). These are setup by XPC.
- *     (Local partition's vars pointers are xpc_vars and xpc_vars_part.)
- *
- * Note: Until vars_pa is set, the partition XPC code has not been initialized.
- */
-struct xpc_rsvd_page {
-        u64 SAL_signature;      /* SAL: unique signature */
-        u64 SAL_version;        /* SAL: version */
-        u8 partid;              /* SAL: partition ID */
-        u8 version;
-        u8 pad1[6];             /* align to next u64 in cacheline */
-        volatile u64 vars_pa;
-        struct timespec stamp;  /* time when reserved page was setup by XPC */
-        u64 pad2[9];            /* align to last u64 in cacheline */
-        u64 nasids_size;        /* SAL: size of each nasid mask in bytes */
-};
-#define XPC_RP_VERSION _XPC_VERSION(1,1) /* version 1.1 of the reserved page */
-#define XPC_SUPPORTS_RP_STAMP(_version) \
-                        (_version >= _XPC_VERSION(1,1))
-/*
- * compare stamps - the return value is:
- *
- *      < 0,    if stamp1 < stamp2
- *      = 0,    if stamp1 == stamp2
- *      > 0,    if stamp1 > stamp2
- */
-static inline int
-xpc_compare_stamps(struct timespec *stamp1, struct timespec *stamp2)
-{
-        int ret;
-        if ((ret = stamp1->tv_sec - stamp2->tv_sec) == 0) {
-                ret = stamp1->tv_nsec - stamp2->tv_nsec;
-        }
-        return ret;
-}
-/*
- * Define the structures by which XPC variables can be exported to other
- * partitions. (There are two: struct xpc_vars and struct xpc_vars_part)
- */
-/*
- * The following structure describes the partition generic variables
- * needed by other partitions in order to properly initialize.
- *
- * struct xpc_vars version number also applies to struct xpc_vars_part.
- * Changes to either structure and/or related functionality should be
- * reflected by incrementing either the major or minor version numbers
- * of struct xpc_vars.
- */
-struct xpc_vars {
-        u8 version;
-        u64 heartbeat;
-        u64 heartbeating_to_mask;
-        u64 heartbeat_offline;  /* if 0, heartbeat should be changing */
-        int act_nasid;
-        int act_phys_cpuid;
-        u64 vars_part_pa;
-        u64 amos_page_pa;       /* paddr of page of AMOs from MSPEC driver */
-        AMO_t *amos_page;       /* vaddr of page of AMOs from MSPEC driver */
-};
-#define XPC_V_VERSION _XPC_VERSION(3,1) /* version 3.1 of the cross vars */
-#define XPC_SUPPORTS_DISENGAGE_REQUEST(_version) \
-                        (_version >= _XPC_VERSION(3,1))
-static inline int
-xpc_hb_allowed(partid_t partid, struct xpc_vars *vars)
-{
-        return ((vars->heartbeating_to_mask & (1UL << partid)) != 0);
-}
-static inline void
-xpc_allow_hb(partid_t partid, struct xpc_vars *vars)
-{
-        u64 old_mask, new_mask;
-        do {
-                old_mask = vars->heartbeating_to_mask;
-                new_mask = (old_mask | (1UL << partid));
-        } while (cmpxchg(&vars->heartbeating_to_mask, old_mask, new_mask) !=
-                                                        old_mask);
-}
-static inline void
-xpc_disallow_hb(partid_t partid, struct xpc_vars *vars)
-{
-        u64 old_mask, new_mask;
-        do {
-                old_mask = vars->heartbeating_to_mask;
-                new_mask = (old_mask & ~(1UL << partid));
-        } while (cmpxchg(&vars->heartbeating_to_mask, old_mask, new_mask) !=
-                                                        old_mask);
-}
-/*
- * The AMOs page consists of a number of AMO variables which are divided into
- * four groups, The first two groups are used to identify an IRQ's sender.
- * These two groups consist of 64 and 128 AMO variables respectively. The last
- * two groups, consisting of just one AMO variable each, are used to identify
- * the remote partitions that are currently engaged (from the viewpoint of
- * the XPC running on the remote partition).
- */
-#define XPC_NOTIFY_IRQ_AMOS        0
-#define XPC_ACTIVATE_IRQ_AMOS      (XPC_NOTIFY_IRQ_AMOS + XP_MAX_PARTITIONS)
-#define XPC_ENGAGED_PARTITIONS_AMO (XPC_ACTIVATE_IRQ_AMOS + XP_NASID_MASK_WORDS)
-#define XPC_DISENGAGE_REQUEST_AMO  (XPC_ENGAGED_PARTITIONS_AMO + 1)
-/*
- * The following structure describes the per partition specific variables.
- *
- * An array of these structures, one per partition, will be defined. As a
- * partition becomes active XPC will copy the array entry corresponding to
- * itself from that partition. It is desirable that the size of this
- * structure evenly divide into a cacheline, such that none of the entries
- * in this array crosses a cacheline boundary. As it is now, each entry
- * occupies half a cacheline.
- */
-struct xpc_vars_part {
-        volatile u64 magic;
-        u64 openclose_args_pa;  /* physical address of open and close args */
-        u64 GPs_pa;             /* physical address of Get/Put values */
-        u64 IPI_amo_pa;         /* physical address of IPI AMO_t structure */
-        int IPI_nasid;          /* nasid of where to send IPIs */
-        int IPI_phys_cpuid;     /* physical CPU ID of where to send IPIs */
-        u8 nchannels;           /* #of defined channels supported */
-        u8 reserved[23];        /* pad to a full 64 bytes */
-};
-/*
- * The vars_part MAGIC numbers play a part in the first contact protocol.
- *
- * MAGIC1 indicates that the per partition specific variables for a remote
- * partition have been initialized by this partition.
- *
- * MAGIC2 indicates that this partition has pulled the remote partititions
- * per partition variables that pertain to this partition.
- */
-#define XPC_VP_MAGIC1   0x0053524156435058L  /* 'XPCVARS\0'L (little endian) */
-#define XPC_VP_MAGIC2   0x0073726176435058L  /* 'XPCvars\0'L (little endian) */
-/* the reserved page sizes and offsets */
-#define XPC_RP_HEADER_SIZE      L1_CACHE_ALIGN(sizeof(struct xpc_rsvd_page))
-#define XPC_RP_VARS_SIZE        L1_CACHE_ALIGN(sizeof(struct xpc_vars))
-#define XPC_RP_PART_NASIDS(_rp) (u64 *) ((u8 *) _rp + XPC_RP_HEADER_SIZE)
-#define XPC_RP_MACH_NASIDS(_rp) (XPC_RP_PART_NASIDS(_rp) + xp_nasid_mask_words)
-#define XPC_RP_VARS(_rp)        ((struct xpc_vars *) XPC_RP_MACH_NASIDS(_rp) + xp_nasid_mask_words)
-#define XPC_RP_VARS_PART(_rp)   (struct xpc_vars_part *) ((u8 *) XPC_RP_VARS(rp) + XPC_RP_VARS_SIZE)
-/*
- * Functions registered by add_timer() or called by kernel_thread() only
- * allow for a single 64-bit argument. The following macros can be used to
- * pack and unpack two (32-bit, 16-bit or 8-bit) arguments into or out from
- * the passed argument.
- */
-#define XPC_PACK_ARGS(_arg1, _arg2) \
-                        ((((u64) _arg1) & 0xffffffff) | \
-                        ((((u64) _arg2) & 0xffffffff) << 32))
-#define XPC_UNPACK_ARG1(_args)  (((u64) _args) & 0xffffffff)
-#define XPC_UNPACK_ARG2(_args)  ((((u64) _args) >> 32) & 0xffffffff)
-/*
- * Define a Get/Put value pair (pointers) used with a message queue.
- */
-struct xpc_gp {
-        volatile s64 get;       /* Get value */
-        volatile s64 put;       /* Put value */
-};
-#define XPC_GP_SIZE \
-                L1_CACHE_ALIGN(sizeof(struct xpc_gp) * XPC_NCHANNELS)
-/*
- * Define a structure that contains arguments associated with opening and
- * closing a channel.
- */
-struct xpc_openclose_args {
-        u16 reason;             /* reason why channel is closing */
-        u16 msg_size;           /* sizeof each message entry */
-        u16 remote_nentries;    /* #of message entries in remote msg queue */
-        u16 local_nentries;     /* #of message entries in local msg queue */
-        u64 local_msgqueue_pa;  /* physical address of local message queue */
-};
-#define XPC_OPENCLOSE_ARGS_SIZE \
-              L1_CACHE_ALIGN(sizeof(struct xpc_openclose_args) * XPC_NCHANNELS)
-/* struct xpc_msg flags */
-#define XPC_M_DONE              0x01    /* msg has been received/consumed */
-#define XPC_M_READY             0x02    /* msg is ready to be sent */
-#define XPC_M_INTERRUPT         0x04    /* send interrupt when msg consumed */
-#define XPC_MSG_ADDRESS(_payload) \
-                ((struct xpc_msg *)((u8 *)(_payload) - XPC_MSG_PAYLOAD_OFFSET))
-/*
- * Defines notify entry.
- *
- * This is used to notify a message's sender that their message was received
- * and consumed by the intended recipient.
- */
-struct xpc_notify {
-        struct semaphore sema;          /* notify semaphore */
-        volatile u8 type;                       /* type of notification */
-        /* the following two fields are only used if type == XPC_N_CALL */
-        xpc_notify_func func;           /* user's notify function */
-        void *key;                      /* pointer to user's key */
-};
-/* struct xpc_notify type of notification */
-#define XPC_N_CALL              0x01    /* notify function provided by user */
-/*
- * Define the structure that manages all the stuff required by a channel. In
- * particular, they are used to manage the messages sent across the channel.
- *
- * This structure is private to a partition, and is NOT shared across the
- * partition boundary.
- *
- * There is an array of these structures for each remote partition. It is
- * allocated at the time a partition becomes active. The array contains one
- * of these structures for each potential channel connection to that partition.
- *
- * Each of these structures manages two message queues (circular buffers).
- * They are allocated at the time a channel connection is made. One of
- * these message queues (local_msgqueue) holds the locally created messages
- * that are destined for the remote partition. The other of these message
- * queues (remote_msgqueue) is a locally cached copy of the remote partition's
- * own local_msgqueue.
- *
- * The following is a description of the Get/Put pointers used to manage these
- * two message queues. Consider the local_msgqueue to be on one partition
- * and the remote_msgqueue to be its cached copy on another partition. A
- * description of what each of the lettered areas contains is included.
- *
- *
- *                     local_msgqueue      remote_msgqueue
- *
- *                        |/////////|      |/////////|
- *    w_remote_GP.get --> +---------+      |/////////|
- *                        |    F    |      |/////////|
- *     remote_GP.get  --> +---------+      +---------+ <-- local_GP->get
- *                        |         |      |         |
- *                        |         |      |    E    |
- *                        |         |      |         |
- *                        |         |      +---------+ <-- w_local_GP.get
- *                        |    B    |      |/////////|
- *                        |         |      |////D////|
- *                        |         |      |/////////|
- *                        |         |      +---------+ <-- w_remote_GP.put
- *                        |         |      |////C////|
- *      local_GP->put --> +---------+      +---------+ <-- remote_GP.put
- *                        |         |      |/////////|
- *                        |    A    |      |/////////|
- *                        |         |      |/////////|
- *     w_local_GP.put --> +---------+      |/////////|
- *                        |/////////|      |/////////|
- *
- *
- *          ( remote_GP.[get|put] are cached copies of the remote
- *            partition's local_GP->[get|put], and thus their values can
- *            lag behind their counterparts on the remote partition. )
- *
- *
- *  A - Messages that have been allocated, but have not yet been sent to the
- *      remote partition.
- *
- *  B - Messages that have been sent, but have not yet been acknowledged by the
- *      remote partition as having been received.
- *
- *  C - Area that needs to be prepared for the copying of sent messages, by
- *      the clearing of the message flags of any previously received messages.
- *
- *  D - Area into which sent messages are to be copied from the remote
- *      partition's local_msgqueue and then delivered to their intended
- *      recipients. [ To allow for a multi-message copy, another pointer
- *      (next_msg_to_pull) has been added to keep track of the next message
- *      number needing to be copied (pulled). It chases after w_remote_GP.put.
- *      Any messages lying between w_local_GP.get and next_msg_to_pull have
- *      been copied and are ready to be delivered. ]
- *
- *  E - Messages that have been copied and delivered, but have not yet been
- *      acknowledged by the recipient as having been received.
- *
- *  F - Messages that have been acknowledged, but XPC has not yet notified the
- *      sender that the message was received by its intended recipient.
- *      This is also an area that needs to be prepared for the allocating of
- *      new messages, by the clearing of the message flags of the acknowledged
- *      messages.
- */
-struct xpc_channel {
-        partid_t partid;                /* ID of remote partition connected */
-        spinlock_t lock;                /* lock for updating this structure */
-        u32 flags;                      /* general flags */
-        enum xpc_retval reason;         /* reason why channel is disconnect'g */
-        int reason_line;                /* line# disconnect initiated from */
-        u16 number;                     /* channel # */
-        u16 msg_size;                   /* sizeof each msg entry */
-        u16 local_nentries;             /* #of msg entries in local msg queue */
-        u16 remote_nentries;            /* #of msg entries in remote msg queue*/
-        void *local_msgqueue_base;      /* base address of kmalloc'd space */
-        struct xpc_msg *local_msgqueue; /* local message queue */
-        void *remote_msgqueue_base;     /* base address of kmalloc'd space */
-        struct xpc_msg *remote_msgqueue;/* cached copy of remote partition's */
-                                        /* local message queue */
-        u64 remote_msgqueue_pa;         /* phys addr of remote partition's */
-                                        /* local message queue */
-        atomic_t references;            /* #of external references to queues */
-        atomic_t n_on_msg_allocate_wq;   /* #on msg allocation wait queue */
-        wait_queue_head_t msg_allocate_wq; /* msg allocation wait queue */
-        u8 delayed_IPI_flags;           /* IPI flags received, but delayed */
-                                        /* action until channel disconnected */
-        /* queue of msg senders who want to be notified when msg received */
-        atomic_t n_to_notify;           /* #of msg senders to notify */
-        struct xpc_notify *notify_queue;/* notify queue for messages sent */
-        xpc_channel_func func;          /* user's channel function */
-        void *key;                      /* pointer to user's key */
-        struct semaphore msg_to_pull_sema; /* next msg to pull serialization */
-        struct semaphore wdisconnect_sema; /* wait for channel disconnect */
-        struct xpc_openclose_args *local_openclose_args; /* args passed on */
-                                        /* opening or closing of channel */
-        /* various flavors of local and remote Get/Put values */
-        struct xpc_gp *local_GP;        /* local Get/Put values */
-        struct xpc_gp remote_GP;        /* remote Get/Put values */
-        struct xpc_gp w_local_GP;       /* working local Get/Put values */
-        struct xpc_gp w_remote_GP;      /* working remote Get/Put values */
-        s64 next_msg_to_pull;           /* Put value of next msg to pull */
-        /* kthread management related fields */
-// >>> rethink having kthreads_assigned_limit and kthreads_idle_limit; perhaps
-// >>> allow the assigned limit be unbounded and let the idle limit be dynamic
-// >>> dependent on activity over the last interval of time
-        atomic_t kthreads_assigned;     /* #of kthreads assigned to channel */
-        u32 kthreads_assigned_limit;    /* limit on #of kthreads assigned */
-        atomic_t kthreads_idle;         /* #of kthreads idle waiting for work */
-        u32 kthreads_idle_limit;        /* limit on #of kthreads idle */
-        atomic_t kthreads_active;       /* #of kthreads actively working */
-        // >>> following field is temporary
-        u32 kthreads_created;           /* total #of kthreads created */
-        wait_queue_head_t idle_wq;      /* idle kthread wait queue */
-} ____cacheline_aligned;
-/* struct xpc_channel flags */
-#define XPC_C_WASCONNECTED      0x00000001 /* channel was connected */
-#define XPC_C_ROPENREPLY        0x00000002 /* remote open channel reply */
-#define XPC_C_OPENREPLY         0x00000004 /* local open channel reply */
-#define XPC_C_ROPENREQUEST      0x00000008 /* remote open channel request */
-#define XPC_C_OPENREQUEST       0x00000010 /* local open channel request */
-#define XPC_C_SETUP             0x00000020 /* channel's msgqueues are alloc'd */
-#define XPC_C_CONNECTCALLOUT    0x00000040 /* channel connected callout made */
-#define XPC_C_CONNECTED         0x00000080 /* local channel is connected */
-#define XPC_C_CONNECTING        0x00000100 /* channel is being connected */
-#define XPC_C_RCLOSEREPLY       0x00000200 /* remote close channel reply */
-#define XPC_C_CLOSEREPLY        0x00000400 /* local close channel reply */
-#define XPC_C_RCLOSEREQUEST     0x00000800 /* remote close channel request */
-#define XPC_C_CLOSEREQUEST      0x00001000 /* local close channel request */
-#define XPC_C_DISCONNECTED      0x00002000 /* channel is disconnected */
-#define XPC_C_DISCONNECTING     0x00004000 /* channel is being disconnected */
-#define XPC_C_DISCONNECTCALLOUT 0x00008000 /* chan disconnected callout made */
-#define XPC_C_WDISCONNECT       0x00010000 /* waiting for channel disconnect */
-/*
- * Manages channels on a partition basis. There is one of these structures
- * for each partition (a partition will never utilize the structure that
- * represents itself).
- */
-struct xpc_partition {
-        /* XPC HB infrastructure */
-        u8 remote_rp_version;           /* version# of partition's rsvd pg */
-        struct timespec remote_rp_stamp;/* time when rsvd pg was initialized */
-        u64 remote_rp_pa;               /* phys addr of partition's rsvd pg */
-        u64 remote_vars_pa;             /* phys addr of partition's vars */
-        u64 remote_vars_part_pa;        /* phys addr of partition's vars part */
-        u64 last_heartbeat;             /* HB at last read */
-        u64 remote_amos_page_pa;        /* phys addr of partition's amos page */
-        int remote_act_nasid;           /* active part's act/deact nasid */
-        int remote_act_phys_cpuid;      /* active part's act/deact phys cpuid */
-        u32 act_IRQ_rcvd;               /* IRQs since activation */
-        spinlock_t act_lock;            /* protect updating of act_state */
-        u8 act_state;                   /* from XPC HB viewpoint */
-        u8 remote_vars_version;         /* version# of partition's vars */
-        enum xpc_retval reason;         /* reason partition is deactivating */
-        int reason_line;                /* line# deactivation initiated from */
-        int reactivate_nasid;           /* nasid in partition to reactivate */
-        unsigned long disengage_request_timeout; /* timeout in jiffies */
-        struct timer_list disengage_request_timer;
-        /* XPC infrastructure referencing and teardown control */
-        volatile u8 setup_state;        /* infrastructure setup state */
-        wait_queue_head_t teardown_wq;  /* kthread waiting to teardown infra */
-        atomic_t references;            /* #of references to infrastructure */
-        /*
-         * NONE OF THE PRECEDING FIELDS OF THIS STRUCTURE WILL BE CLEARED WHEN
-         * XPC SETS UP THE NECESSARY INFRASTRUCTURE TO SUPPORT CROSS PARTITION
-         * COMMUNICATION. ALL OF THE FOLLOWING FIELDS WILL BE CLEARED. (THE
-         * 'nchannels' FIELD MUST BE THE FIRST OF THE FIELDS TO BE CLEARED.)
-         */
-        u8 nchannels;              /* #of defined channels supported */
-        atomic_t nchannels_active; /* #of channels that are not DISCONNECTED */
-        atomic_t nchannels_engaged;/* #of channels engaged with remote part */
-        struct xpc_channel *channels;/* array of channel structures */
-        void *local_GPs_base;     /* base address of kmalloc'd space */
-        struct xpc_gp *local_GPs; /* local Get/Put values */
-        void *remote_GPs_base;    /* base address of kmalloc'd space */
-        struct xpc_gp *remote_GPs;/* copy of remote partition's local Get/Put */
-                                  /* values */
-        u64 remote_GPs_pa;        /* phys address of remote partition's local */
-                                  /* Get/Put values */
-        /* fields used to pass args when opening or closing a channel */
-        void *local_openclose_args_base;  /* base address of kmalloc'd space */
-        struct xpc_openclose_args *local_openclose_args;  /* local's args */
-        void *remote_openclose_args_base; /* base address of kmalloc'd space */
-        struct xpc_openclose_args *remote_openclose_args; /* copy of remote's */
-                                          /* args */
-        u64 remote_openclose_args_pa;     /* phys addr of remote's args */
-        /* IPI sending, receiving and handling related fields */
-        int remote_IPI_nasid;       /* nasid of where to send IPIs */
-        int remote_IPI_phys_cpuid;  /* phys CPU ID of where to send IPIs */
-        AMO_t *remote_IPI_amo_va;   /* address of remote IPI AMO_t structure */
-        AMO_t *local_IPI_amo_va;    /* address of IPI AMO_t structure */
-        u64 local_IPI_amo;          /* IPI amo flags yet to be handled */
-        char IPI_owner[8];          /* IPI owner's name */
-        struct timer_list dropped_IPI_timer; /* dropped IPI timer */
-        spinlock_t IPI_lock;        /* IPI handler lock */
-        /* channel manager related fields */
-        atomic_t channel_mgr_requests;  /* #of requests to activate chan mgr */
-        wait_queue_head_t channel_mgr_wq; /* channel mgr's wait queue */
-} ____cacheline_aligned;
-/* struct xpc_partition act_state values (for XPC HB) */
-#define XPC_P_INACTIVE          0x00    /* partition is not active */
-#define XPC_P_ACTIVATION_REQ    0x01    /* created thread to activate */
-#define XPC_P_ACTIVATING        0x02    /* activation thread started */
-#define XPC_P_ACTIVE            0x03    /* xpc_partition_up() was called */
-#define XPC_P_DEACTIVATING      0x04    /* partition deactivation initiated */
-#define XPC_DEACTIVATE_PARTITION(_p, _reason) \
-                        xpc_deactivate_partition(__LINE__, (_p), (_reason))
-/* struct xpc_partition setup_state values */
-#define XPC_P_UNSET             0x00    /* infrastructure was never setup */
-#define XPC_P_SETUP             0x01    /* infrastructure is setup */
-#define XPC_P_WTEARDOWN         0x02    /* waiting to teardown infrastructure */
-#define XPC_P_TORNDOWN          0x03    /* infrastructure is torndown */
-/*
- * struct xpc_partition IPI_timer #of seconds to wait before checking for
- * dropped IPIs. These occur whenever an IPI amo write doesn't complete until
- * after the IPI was received.
- */
-#define XPC_P_DROPPED_IPI_WAIT  (0.25 * HZ)
-/* number of seconds to wait for other partitions to disengage */
-#define XPC_DISENGAGE_REQUEST_DEFAULT_TIMELIMIT 90
-/* interval in seconds to print 'waiting disengagement' messages */
-#define XPC_DISENGAGE_PRINTMSG_INTERVAL         10
-#define XPC_PARTID(_p)  ((partid_t) ((_p) - &xpc_partitions[0]))
-/* found in xp_main.c */
-extern struct xpc_registration xpc_registrations[];
-/* found in xpc_main.c */
-extern struct device *xpc_part;
-extern struct device *xpc_chan;
-extern int xpc_disengage_request_timelimit;
-extern irqreturn_t xpc_notify_IRQ_handler(int, void *, struct pt_regs *);
-extern void xpc_dropped_IPI_check(struct xpc_partition *);
-extern void xpc_activate_partition(struct xpc_partition *);
-extern void xpc_activate_kthreads(struct xpc_channel *, int);
-extern void xpc_create_kthreads(struct xpc_channel *, int);
-extern void xpc_disconnect_wait(int);
-/* found in xpc_partition.c */
-extern int xpc_exiting;
-extern struct xpc_vars *xpc_vars;
-extern struct xpc_rsvd_page *xpc_rsvd_page;
-extern struct xpc_vars_part *xpc_vars_part;
-extern struct xpc_partition xpc_partitions[XP_MAX_PARTITIONS + 1];
-extern char xpc_remote_copy_buffer[];
-extern struct xpc_rsvd_page *xpc_rsvd_page_init(void);
-extern void xpc_allow_IPI_ops(void);
-extern void xpc_restrict_IPI_ops(void);
-extern int xpc_identify_act_IRQ_sender(void);
-extern int xpc_partition_disengaged(struct xpc_partition *);
-extern enum xpc_retval xpc_mark_partition_active(struct xpc_partition *);
-extern void xpc_mark_partition_inactive(struct xpc_partition *);
-extern void xpc_discovery(void);
-extern void xpc_check_remote_hb(void);
-extern void xpc_deactivate_partition(const int, struct xpc_partition *,
-                                                enum xpc_retval);
-extern enum xpc_retval xpc_initiate_partid_to_nasids(partid_t, void *);
-/* found in xpc_channel.c */
-extern void xpc_initiate_connect(int);
-extern void xpc_initiate_disconnect(int);
-extern enum xpc_retval xpc_initiate_allocate(partid_t, int, u32, void **);
-extern enum xpc_retval xpc_initiate_send(partid_t, int, void *);
-extern enum xpc_retval xpc_initiate_send_notify(partid_t, int, void *,
-                                                xpc_notify_func, void *);
-extern void xpc_initiate_received(partid_t, int, void *);
-extern enum xpc_retval xpc_setup_infrastructure(struct xpc_partition *);
-extern enum xpc_retval xpc_pull_remote_vars_part(struct xpc_partition *);
-extern void xpc_process_channel_activity(struct xpc_partition *);
-extern void xpc_connected_callout(struct xpc_channel *);
-extern void xpc_deliver_msg(struct xpc_channel *);
-extern void xpc_disconnect_channel(const int, struct xpc_channel *,
-                                        enum xpc_retval, unsigned long *);
-extern void xpc_disconnecting_callout(struct xpc_channel *);
-extern void xpc_partition_going_down(struct xpc_partition *, enum xpc_retval);
-extern void xpc_teardown_infrastructure(struct xpc_partition *);
-static inline void
-xpc_wakeup_channel_mgr(struct xpc_partition *part)
-{
-        if (atomic_inc_return(&part->channel_mgr_requests) == 1) {
-                wake_up(&part->channel_mgr_wq);
-        }
-}
-/*
- * These next two inlines are used to keep us from tearing down a channel's
- * msg queues while a thread may be referencing them.
- */
-static inline void
-xpc_msgqueue_ref(struct xpc_channel *ch)
-{
-        atomic_inc(&ch->references);
-}
-static inline void
-xpc_msgqueue_deref(struct xpc_channel *ch)
-{
-        s32 refs = atomic_dec_return(&ch->references);
-        DBUG_ON(refs < 0);
-        if (refs == 0) {
-                xpc_wakeup_channel_mgr(&xpc_partitions[ch->partid]);
-        }
-}
-#define XPC_DISCONNECT_CHANNEL(_ch, _reason, _irqflgs) \
-                xpc_disconnect_channel(__LINE__, _ch, _reason, _irqflgs)
-/*
- * These two inlines are used to keep us from tearing down a partition's
- * setup infrastructure while a thread may be referencing it.
- */
-static inline void
-xpc_part_deref(struct xpc_partition *part)
-{
-        s32 refs = atomic_dec_return(&part->references);
-        DBUG_ON(refs < 0);
-        if (refs == 0 && part->setup_state == XPC_P_WTEARDOWN) {
-                wake_up(&part->teardown_wq);
-        }
-}
-static inline int
-xpc_part_ref(struct xpc_partition *part)
-{
-        int setup;
-        atomic_inc(&part->references);
-        setup = (part->setup_state == XPC_P_SETUP);
-        if (!setup) {
-                xpc_part_deref(part);
-        }
-        return setup;
-}
-/*
- * The following macro is to be used for the setting of the reason and
- * reason_line fields in both the struct xpc_channel and struct xpc_partition
- * structures.
- */
-#define XPC_SET_REASON(_p, _reason, _line) \
-        { \
-                (_p)->reason = _reason; \
-                (_p)->reason_line = _line; \
-        }
-/*
- * This next set of inlines are used to keep track of when a partition is
- * potentially engaged in accessing memory belonging to another partition.
- */
-static inline void
-xpc_mark_partition_engaged(struct xpc_partition *part)
-{
-        unsigned long irq_flags;
-        AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa +
-                                (XPC_ENGAGED_PARTITIONS_AMO * sizeof(AMO_t)));
-        local_irq_save(irq_flags);
-        /* set bit corresponding to our partid in remote partition's AMO */
-        FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_OR,
-                                                (1UL << sn_partition_id));
-        /*
-         * We must always use the nofault function regardless of whether we
-         * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we
-         * didn't, we'd never know that the other partition is down and would
-         * keep sending IPIs and AMOs to it until the heartbeat times out.
-         */
-        (void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo->
-                                variable), xp_nofault_PIOR_target));
-        local_irq_restore(irq_flags);
-}
-static inline void
-xpc_mark_partition_disengaged(struct xpc_partition *part)
-{
-        unsigned long irq_flags;
-        AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa +
-                                (XPC_ENGAGED_PARTITIONS_AMO * sizeof(AMO_t)));
-        local_irq_save(irq_flags);
-        /* clear bit corresponding to our partid in remote partition's AMO */
-        FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND,
-                                                ~(1UL << sn_partition_id));
-        /*
-         * We must always use the nofault function regardless of whether we
-         * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we
-         * didn't, we'd never know that the other partition is down and would
-         * keep sending IPIs and AMOs to it until the heartbeat times out.
-         */
-        (void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo->
-                                variable), xp_nofault_PIOR_target));
-        local_irq_restore(irq_flags);
-}
-static inline void
-xpc_request_partition_disengage(struct xpc_partition *part)
-{
-        unsigned long irq_flags;
-        AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa +
-                                (XPC_DISENGAGE_REQUEST_AMO * sizeof(AMO_t)));
-        local_irq_save(irq_flags);
-        /* set bit corresponding to our partid in remote partition's AMO */
-        FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_OR,
-                                                (1UL << sn_partition_id));
-        /*
-         * We must always use the nofault function regardless of whether we
-         * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we
-         * didn't, we'd never know that the other partition is down and would
-         * keep sending IPIs and AMOs to it until the heartbeat times out.
-         */
-        (void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo->
-                                variable), xp_nofault_PIOR_target));
-        local_irq_restore(irq_flags);
-}
-static inline void
-xpc_cancel_partition_disengage_request(struct xpc_partition *part)
-{
-        unsigned long irq_flags;
-        AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa +
-                                (XPC_DISENGAGE_REQUEST_AMO * sizeof(AMO_t)));
-        local_irq_save(irq_flags);
-        /* clear bit corresponding to our partid in remote partition's AMO */
-        FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND,
-                                                ~(1UL << sn_partition_id));
-        /*
-         * We must always use the nofault function regardless of whether we
-         * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we
-         * didn't, we'd never know that the other partition is down and would
-         * keep sending IPIs and AMOs to it until the heartbeat times out.
-         */
-        (void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo->
-                                variable), xp_nofault_PIOR_target));
-        local_irq_restore(irq_flags);
-}
-static inline u64
-xpc_partition_engaged(u64 partid_mask)
-{
-        AMO_t *amo = xpc_vars->amos_page + XPC_ENGAGED_PARTITIONS_AMO;
-        /* return our partition's AMO variable ANDed with partid_mask */
-        return (FETCHOP_LOAD_OP(TO_AMO((u64) &amo->variable), FETCHOP_LOAD) &
-                                                                partid_mask);
-}
-static inline u64
-xpc_partition_disengage_requested(u64 partid_mask)
-{
-        AMO_t *amo = xpc_vars->amos_page + XPC_DISENGAGE_REQUEST_AMO;
-        /* return our partition's AMO variable ANDed with partid_mask */
-        return (FETCHOP_LOAD_OP(TO_AMO((u64) &amo->variable), FETCHOP_LOAD) &
-                                                                partid_mask);
-}
-static inline void
-xpc_clear_partition_engaged(u64 partid_mask)
-{
-        AMO_t *amo = xpc_vars->amos_page + XPC_ENGAGED_PARTITIONS_AMO;
-        /* clear bit(s) based on partid_mask in our partition's AMO */
-        FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND,
-                                                                ~partid_mask);
-}
-static inline void
-xpc_clear_partition_disengage_request(u64 partid_mask)
-{
-        AMO_t *amo = xpc_vars->amos_page + XPC_DISENGAGE_REQUEST_AMO;
-        /* clear bit(s) based on partid_mask in our partition's AMO */
-        FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND,
-                                                                ~partid_mask);
-}
-/*
- * The following set of macros and inlines are used for the sending and
- * receiving of IPIs (also known as IRQs). There are two flavors of IPIs,
- * one that is associated with partition activity (SGI_XPC_ACTIVATE) and
- * the other that is associated with channel activity (SGI_XPC_NOTIFY).
- */
-static inline u64
-xpc_IPI_receive(AMO_t *amo)
-{
-        return FETCHOP_LOAD_OP(TO_AMO((u64) &amo->variable), FETCHOP_CLEAR);
-}
-static inline enum xpc_retval
-xpc_IPI_send(AMO_t *amo, u64 flag, int nasid, int phys_cpuid, int vector)
-{
-        int ret = 0;
-        unsigned long irq_flags;
-        local_irq_save(irq_flags);
-        FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_OR, flag);
-        sn_send_IPI_phys(nasid, phys_cpuid, vector, 0);
-        /*
-         * We must always use the nofault function regardless of whether we
-         * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we
-         * didn't, we'd never know that the other partition is down and would
-         * keep sending IPIs and AMOs to it until the heartbeat times out.
-         */
-        ret = xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo->variable),
-                                xp_nofault_PIOR_target));
-        local_irq_restore(irq_flags);
-        return ((ret == 0) ? xpcSuccess : xpcPioReadError);
-}
-/*
- * IPIs associated with SGI_XPC_ACTIVATE IRQ.
- */
-/*
- * Flag the appropriate AMO variable and send an IPI to the specified node.
- */
-static inline void
-xpc_activate_IRQ_send(u64 amos_page_pa, int from_nasid, int to_nasid,
-                        int to_phys_cpuid)
-{
-        int w_index = XPC_NASID_W_INDEX(from_nasid);
-        int b_index = XPC_NASID_B_INDEX(from_nasid);
-        AMO_t *amos = (AMO_t *) __va(amos_page_pa +
-                                (XPC_ACTIVATE_IRQ_AMOS * sizeof(AMO_t)));
-        (void) xpc_IPI_send(&amos[w_index], (1UL << b_index), to_nasid,
-                                to_phys_cpuid, SGI_XPC_ACTIVATE);
-}
-static inline void
-xpc_IPI_send_activate(struct xpc_vars *vars)
-{
-        xpc_activate_IRQ_send(vars->amos_page_pa, cnodeid_to_nasid(0),
-                                vars->act_nasid, vars->act_phys_cpuid);
-}
-static inline void
-xpc_IPI_send_activated(struct xpc_partition *part)
-{
-        xpc_activate_IRQ_send(part->remote_amos_page_pa, cnodeid_to_nasid(0),
-                        part->remote_act_nasid, part->remote_act_phys_cpuid);
-}
-static inline void
-xpc_IPI_send_reactivate(struct xpc_partition *part)
-{
-        xpc_activate_IRQ_send(xpc_vars->amos_page_pa, part->reactivate_nasid,
-                                xpc_vars->act_nasid, xpc_vars->act_phys_cpuid);
-}
-static inline void
-xpc_IPI_send_disengage(struct xpc_partition *part)
-{
-        xpc_activate_IRQ_send(part->remote_amos_page_pa, cnodeid_to_nasid(0),
-                        part->remote_act_nasid, part->remote_act_phys_cpuid);
-}
-/*
- * IPIs associated with SGI_XPC_NOTIFY IRQ.
- */
-/*
- * Send an IPI to the remote partition that is associated with the
- * specified channel.
- */
-#define XPC_NOTIFY_IRQ_SEND(_ch, _ipi_f, _irq_f) \
-                xpc_notify_IRQ_send(_ch, _ipi_f, #_ipi_f, _irq_f)
-static inline void
-xpc_notify_IRQ_send(struct xpc_channel *ch, u8 ipi_flag, char *ipi_flag_string,
-                        unsigned long *irq_flags)
-{
-        struct xpc_partition *part = &xpc_partitions[ch->partid];
-        enum xpc_retval ret;
-        if (likely(part->act_state != XPC_P_DEACTIVATING)) {
-                ret = xpc_IPI_send(part->remote_IPI_amo_va,
-                                        (u64) ipi_flag << (ch->number * 8),
-                                        part->remote_IPI_nasid,
-                                        part->remote_IPI_phys_cpuid,
-                                        SGI_XPC_NOTIFY);
-                dev_dbg(xpc_chan, "%s sent to partid=%d, channel=%d, ret=%d\n",
-                        ipi_flag_string, ch->partid, ch->number, ret);
-                if (unlikely(ret != xpcSuccess)) {
-                        if (irq_flags != NULL) {
-                                spin_unlock_irqrestore(&ch->lock, *irq_flags);
-                        }
-                        XPC_DEACTIVATE_PARTITION(part, ret);
-                        if (irq_flags != NULL) {
-                                spin_lock_irqsave(&ch->lock, *irq_flags);
-                        }
-                }
-        }
-}
-/*
- * Make it look like the remote partition, which is associated with the
- * specified channel, sent us an IPI. This faked IPI will be handled
- * by xpc_dropped_IPI_check().
- */
-#define XPC_NOTIFY_IRQ_SEND_LOCAL(_ch, _ipi_f) \
-                xpc_notify_IRQ_send_local(_ch, _ipi_f, #_ipi_f)
-static inline void
-xpc_notify_IRQ_send_local(struct xpc_channel *ch, u8 ipi_flag,
-                                char *ipi_flag_string)
-{
-        struct xpc_partition *part = &xpc_partitions[ch->partid];
-        FETCHOP_STORE_OP(TO_AMO((u64) &part->local_IPI_amo_va->variable),
-                        FETCHOP_OR, ((u64) ipi_flag << (ch->number * 8)));
-        dev_dbg(xpc_chan, "%s sent local from partid=%d, channel=%d\n",
-                ipi_flag_string, ch->partid, ch->number);
-}
-/*
- * The sending and receiving of IPIs includes the setting of an AMO variable
- * to indicate the reason the IPI was sent. The 64-bit variable is divided
- * up into eight bytes, ordered from right to left. Byte zero pertains to
- * channel 0, byte one to channel 1, and so on. Each byte is described by
- * the following IPI flags.
- */
-#define XPC_IPI_CLOSEREQUEST    0x01
-#define XPC_IPI_CLOSEREPLY      0x02
-#define XPC_IPI_OPENREQUEST     0x04
-#define XPC_IPI_OPENREPLY       0x08
-#define XPC_IPI_MSGREQUEST      0x10
-/* given an AMO variable and a channel#, get its associated IPI flags */
-#define XPC_GET_IPI_FLAGS(_amo, _c)     ((u8) (((_amo) >> ((_c) * 8)) & 0xff))
-#define XPC_SET_IPI_FLAGS(_amo, _c, _f) (_amo) |= ((u64) (_f) << ((_c) * 8))
-#define XPC_ANY_OPENCLOSE_IPI_FLAGS_SET(_amo) ((_amo) & 0x0f0f0f0f0f0f0f0f)
-#define XPC_ANY_MSG_IPI_FLAGS_SET(_amo)       ((_amo) & 0x1010101010101010)
-static inline void
-xpc_IPI_send_closerequest(struct xpc_channel *ch, unsigned long *irq_flags)
-{
-        struct xpc_openclose_args *args = ch->local_openclose_args;
-        args->reason = ch->reason;
-        XPC_NOTIFY_IRQ_SEND(ch, XPC_IPI_CLOSEREQUEST, irq_flags);
-}
-static inline void
-xpc_IPI_send_closereply(struct xpc_channel *ch, unsigned long *irq_flags)
-{
-        XPC_NOTIFY_IRQ_SEND(ch, XPC_IPI_CLOSEREPLY, irq_flags);
-}
-static inline void
-xpc_IPI_send_openrequest(struct xpc_channel *ch, unsigned long *irq_flags)
-{
-        struct xpc_openclose_args *args = ch->local_openclose_args;
-        args->msg_size = ch->msg_size;
-        args->local_nentries = ch->local_nentries;
-        XPC_NOTIFY_IRQ_SEND(ch, XPC_IPI_OPENREQUEST, irq_flags);
-}
-static inline void
-xpc_IPI_send_openreply(struct xpc_channel *ch, unsigned long *irq_flags)
-{
-        struct xpc_openclose_args *args = ch->local_openclose_args;
-        args->remote_nentries = ch->remote_nentries;
-        args->local_nentries = ch->local_nentries;
-        args->local_msgqueue_pa = __pa(ch->local_msgqueue);
-        XPC_NOTIFY_IRQ_SEND(ch, XPC_IPI_OPENREPLY, irq_flags);
-}
-static inline void
-xpc_IPI_send_msgrequest(struct xpc_channel *ch)
-{
-        XPC_NOTIFY_IRQ_SEND(ch, XPC_IPI_MSGREQUEST, NULL);
-}
-static inline void
-xpc_IPI_send_local_msgrequest(struct xpc_channel *ch)
-{
-        XPC_NOTIFY_IRQ_SEND_LOCAL(ch, XPC_IPI_MSGREQUEST);
-}
-/*
- * Memory for XPC's AMO variables is allocated by the MSPEC driver. These
- * pages are located in the lowest granule. The lowest granule uses 4k pages
- * for cached references and an alternate TLB handler to never provide a
- * cacheable mapping for the entire region. This will prevent speculative
- * reading of cached copies of our lines from being issued which will cause
- * a PI FSB Protocol error to be generated by the SHUB. For XPC, we need 64
- * AMO variables (based on XP_MAX_PARTITIONS) for message notification and an
- * additional 128 AMO variables (based on XP_NASID_MASK_WORDS) for partition
- * activation and 2 AMO variables for partition deactivation.
- */
-static inline AMO_t *
-xpc_IPI_init(int index)
-{
-        AMO_t *amo = xpc_vars->amos_page + index;
-        (void) xpc_IPI_receive(amo);    /* clear AMO variable */
-        return amo;
-}
-static inline enum xpc_retval
-xpc_map_bte_errors(bte_result_t error)
-{
-        switch (error) {
-        case BTE_SUCCESS:       return xpcSuccess;
-        case BTEFAIL_DIR:       return xpcBteDirectoryError;
-        case BTEFAIL_POISON:    return xpcBtePoisonError;
-        case BTEFAIL_WERR:      return xpcBteWriteError;
-        case BTEFAIL_ACCESS:    return xpcBteAccessError;
-        case BTEFAIL_PWERR:     return xpcBtePWriteError;
-        case BTEFAIL_PRERR:     return xpcBtePReadError;
-        case BTEFAIL_TOUT:      return xpcBteTimeOutError;
-        case BTEFAIL_XTERR:     return xpcBteXtalkError;
-        case BTEFAIL_NOTAVAIL:  return xpcBteNotAvailable;
-        default:                return xpcBteUnmappedError;
-        }
-}
-static inline void *
-xpc_kmalloc_cacheline_aligned(size_t size, gfp_t flags, void **base)
-{
-        /* see if kmalloc will give us cachline aligned memory by default */
-        *base = kmalloc(size, flags);
-        if (*base == NULL) {
-                return NULL;
-        }
-        if ((u64) *base == L1_CACHE_ALIGN((u64) *base)) {
-                return *base;
-        }
-        kfree(*base);
-        /* nope, we'll have to do it ourselves */
-        *base = kmalloc(size + L1_CACHE_BYTES, flags);
-        if (*base == NULL) {
-                return NULL;
-        }
-        return (void *) L1_CACHE_ALIGN((u64) *base);
-}
-/*
- * Check to see if there is any channel activity to/from the specified
- * partition.
- */
-static inline void
-xpc_check_for_channel_activity(struct xpc_partition *part)
-{
-        u64 IPI_amo;
-        unsigned long irq_flags;
-        IPI_amo = xpc_IPI_receive(part->local_IPI_amo_va);
-        if (IPI_amo == 0) {
-                return;
-        }
-        spin_lock_irqsave(&part->IPI_lock, irq_flags);
-        part->local_IPI_amo |= IPI_amo;
-        spin_unlock_irqrestore(&part->IPI_lock, irq_flags);
-        dev_dbg(xpc_chan, "received IPI from partid=%d, IPI_amo=0x%lx\n",
-                XPC_PARTID(part), IPI_amo);
-        xpc_wakeup_channel_mgr(part);
-}
-#endif /* _IA64_SN_KERNEL_XPC_H */
diff --git a/arch/ia64/sn/kernel/xpc_channel.c b/arch/ia64/sn/kernel/xpc_channel.c
index abf4fc2a87bb..0c0a68902409 100644
--- a/arch/ia64/sn/kernel/xpc_channel.c
+++ b/arch/ia64/sn/kernel/xpc_channel.c
@@ -3,7 +3,7 @@
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 *
- * Copyright (c) 2004-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2004-2006 Silicon Graphics, Inc.  All Rights Reserved.
 */
@@ -24,7 +24,7 @@
 #include <linux/slab.h>
 #include <asm/sn/bte.h>
 #include <asm/sn/sn_sal.h>
-#include "xpc.h"
+#include <asm/sn/xpc.h>
 /*
@@ -779,6 +779,12 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
        /* both sides are disconnected now */
+        if (ch->flags & XPC_C_CONNECTCALLOUT) {
+                spin_unlock_irqrestore(&ch->lock, *irq_flags);
+                xpc_disconnect_callout(ch, xpcDisconnected);
+                spin_lock_irqsave(&ch->lock, *irq_flags);
+        }
        /* it's now safe to free the channel's message queues */
        xpc_free_msgqueues(ch);
@@ -1645,7 +1651,7 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch,
 void
-xpc_disconnecting_callout(struct xpc_channel *ch)
+xpc_disconnect_callout(struct xpc_channel *ch, enum xpc_retval reason)
 {
        /*
         * Let the channel's registerer know that the channel is being
@@ -1654,15 +1660,13 @@ xpc_disconnecting_callout(struct xpc_channel *ch)
         */
        if (ch->func != NULL) {
-                dev_dbg(xpc_chan, "ch->func() called, reason=xpcDisconnecting,"
+                dev_dbg(xpc_chan, "ch->func() called, reason=%d, partid=%d, "
-                        " partid=%d, channel=%d\n", ch->partid, ch->number);
+                        "channel=%d\n", reason, ch->partid, ch->number);
-                ch->func(xpcDisconnecting, ch->partid, ch->number, NULL,
+                ch->func(reason, ch->partid, ch->number, NULL, ch->key);
-                                                                ch->key);
-                dev_dbg(xpc_chan, "ch->func() returned, reason="
+                dev_dbg(xpc_chan, "ch->func() returned, reason=%d, partid=%d, "
-                        "xpcDisconnecting, partid=%d, channel=%d\n",
+                        "channel=%d\n", reason, ch->partid, ch->number);
-                        ch->partid, ch->number);
        }
 }
diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c
index b617236524c6..8930586e0eb4 100644
--- a/arch/ia64/sn/kernel/xpc_main.c
+++ b/arch/ia64/sn/kernel/xpc_main.c
@@ -3,7 +3,7 @@
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 *
- * Copyright (c) 2004-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2004-2006 Silicon Graphics, Inc.  All Rights Reserved.
 */
@@ -59,7 +59,7 @@
 #include <asm/sn/sn_sal.h>
 #include <asm/kdebug.h>
 #include <asm/uaccess.h>
-#include "xpc.h"
+#include <asm/sn/xpc.h>
 /* define two XPC debug device structures to be used with dev_dbg() et al */
@@ -82,6 +82,9 @@ struct device *xpc_part = &xpc_part_dbg_subname;
 struct device *xpc_chan = &xpc_chan_dbg_subname;
+static int xpc_kdebug_ignore;
 /* systune related variables for /proc/sys directories */
 static int xpc_hb_interval = XPC_HB_DEFAULT_INTERVAL;
@@ -162,6 +165,8 @@ static ctl_table xpc_sys_dir[] = {
 };
 static struct ctl_table_header *xpc_sysctl;
+/* non-zero if any remote partition disengage request was timed out */
+int xpc_disengage_request_timedout;
 /* #of IRQs received */
 static atomic_t xpc_act_IRQ_rcvd;
@@ -773,7 +778,7 @@ xpc_daemonize_kthread(void *args)
                        ch->flags |= XPC_C_DISCONNECTCALLOUT;
                        spin_unlock_irqrestore(&ch->lock, irq_flags);
-                        xpc_disconnecting_callout(ch);
+                        xpc_disconnect_callout(ch, xpcDisconnecting);
                } else {
                        spin_unlock_irqrestore(&ch->lock, irq_flags);
                }
@@ -921,9 +926,9 @@ static void
 xpc_do_exit(enum xpc_retval reason)
 {
        partid_t partid;
-        int active_part_count;
+        int active_part_count, printed_waiting_msg = 0;
        struct xpc_partition *part;
-        unsigned long printmsg_time;
+        unsigned long printmsg_time, disengage_request_timeout = 0;
        /* a 'rmmod XPC' and a 'reboot' cannot both end up here together */
@@ -953,7 +958,8 @@ xpc_do_exit(enum xpc_retval reason)
        /* wait for all partitions to become inactive */
-        printmsg_time = jiffies;
+        printmsg_time = jiffies + (XPC_DISENGAGE_PRINTMSG_INTERVAL * HZ);
+        xpc_disengage_request_timedout = 0;
        do {
                active_part_count = 0;
@@ -969,20 +975,39 @@ xpc_do_exit(enum xpc_retval reason)
                        active_part_count++;
                        XPC_DEACTIVATE_PARTITION(part, reason);
-                }
-                if (active_part_count == 0) {
+                        if (part->disengage_request_timeout >
-                        break;
+                                                disengage_request_timeout) {
+                                disengage_request_timeout =
+                                                part->disengage_request_timeout;
+                        }
                }
-                if (jiffies >= printmsg_time) {
+                if (xpc_partition_engaged(-1UL)) {
-                        dev_info(xpc_part, "waiting for partitions to "
+                        if (time_after(jiffies, printmsg_time)) {
-                                "deactivate/disengage, active count=%d, remote "
+                                dev_info(xpc_part, "waiting for remote "
-                                "engaged=0x%lx\n", active_part_count,
+                                        "partitions to disengage, timeout in "
-                                xpc_partition_engaged(1UL << partid));
+                                        "%ld seconds\n",
+                                        (disengage_request_timeout - jiffies)
-                        printmsg_time = jiffies +
+                                                                        / HZ);
+                                printmsg_time = jiffies +
                                        (XPC_DISENGAGE_PRINTMSG_INTERVAL * HZ);
+                                printed_waiting_msg = 1;
+                        }
+                } else if (active_part_count > 0) {
+                        if (printed_waiting_msg) {
+                                dev_info(xpc_part, "waiting for local partition"
+                                        " to disengage\n");
+                                printed_waiting_msg = 0;
+                        }
+                } else {
+                        if (!xpc_disengage_request_timedout) {
+                                dev_info(xpc_part, "all partitions have "
+                                        "disengaged\n");
+                        }
+                        break;
                }
                /* sleep for a 1/3 of a second or so */
@@ -1000,11 +1025,13 @@ xpc_do_exit(enum xpc_retval reason)
        del_timer_sync(&xpc_hb_timer);
        DBUG_ON(xpc_vars->heartbeating_to_mask != 0);
-        /* take ourselves off of the reboot_notifier_list */
+        if (reason == xpcUnloading) {
-        (void) unregister_reboot_notifier(&xpc_reboot_notifier);
+                /* take ourselves off of the reboot_notifier_list */
+                (void) unregister_reboot_notifier(&xpc_reboot_notifier);
-        /* take ourselves off of the die_notifier list */
+                /* take ourselves off of the die_notifier list */
-        (void) unregister_die_notifier(&xpc_die_notifier);
+                (void) unregister_die_notifier(&xpc_die_notifier);
+        }
        /* close down protections for IPI operations */
        xpc_restrict_IPI_ops();
@@ -1020,7 +1047,35 @@ xpc_do_exit(enum xpc_retval reason)
 /*
- * Called when the system is about to be either restarted or halted.
+ * This function is called when the system is being rebooted.
+ */
+static int
+xpc_system_reboot(struct notifier_block *nb, unsigned long event, void *unused)
+{
+        enum xpc_retval reason;
+        switch (event) {
+        case SYS_RESTART:
+                reason = xpcSystemReboot;
+                break;
+        case SYS_HALT:
+                reason = xpcSystemHalt;
+                break;
+        case SYS_POWER_OFF:
+                reason = xpcSystemPoweroff;
+                break;
+        default:
+                reason = xpcSystemGoingDown;
+        }
+        xpc_do_exit(reason);
+        return NOTIFY_DONE;
+}
+/*
+ * Notify other partitions to disengage from all references to our memory.
 */
 static void
 xpc_die_disengage(void)
@@ -1028,7 +1083,7 @@ xpc_die_disengage(void)
        struct xpc_partition *part;
        partid_t partid;
        unsigned long engaged;
-        long time, print_time, disengage_request_timeout;
+        long time, printmsg_time, disengage_request_timeout;
        /* keep xpc_hb_checker thread from doing anything (just in case) */
@@ -1055,57 +1110,53 @@ xpc_die_disengage(void)
                }
        }
-        print_time = rtc_time();
+        time = rtc_time();
-        disengage_request_timeout = print_time +
+        printmsg_time = time +
+                (XPC_DISENGAGE_PRINTMSG_INTERVAL * sn_rtc_cycles_per_second);
+        disengage_request_timeout = time +
                (xpc_disengage_request_timelimit * sn_rtc_cycles_per_second);
        /* wait for all other partitions to disengage from us */
-        while ((engaged = xpc_partition_engaged(-1UL)) &&
+        while (1) {
-                        (time = rtc_time()) < disengage_request_timeout) {
+                engaged = xpc_partition_engaged(-1UL);
+                if (!engaged) {
+                        dev_info(xpc_part, "all partitions have disengaged\n");
+                        break;
+                }
-                if (time >= print_time) {
+                time = rtc_time();
+                if (time >= disengage_request_timeout) {
+                        for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) {
+                                if (engaged & (1UL << partid)) {
+                                        dev_info(xpc_part, "disengage from "
+                                                "remote partition %d timed "
+                                                "out\n", partid);
+                                }
+                        }
+                        break;
+                }
+                if (time >= printmsg_time) {
                        dev_info(xpc_part, "waiting for remote partitions to "
-                                "disengage, engaged=0x%lx\n", engaged);
+                                "disengage, timeout in %ld seconds\n",
-                        print_time = time + (XPC_DISENGAGE_PRINTMSG_INTERVAL *
+                                (disengage_request_timeout - time) /
+                                                sn_rtc_cycles_per_second);
+                        printmsg_time = time +
+                                        (XPC_DISENGAGE_PRINTMSG_INTERVAL *
                                                sn_rtc_cycles_per_second);
                }
        }
-        dev_info(xpc_part, "finished waiting for remote partitions to "
-                                "disengage, engaged=0x%lx\n", engaged);
-}
-/*
- * This function is called when the system is being rebooted.
- */
-static int
-xpc_system_reboot(struct notifier_block *nb, unsigned long event, void *unused)
-{
-        enum xpc_retval reason;
-        switch (event) {
-        case SYS_RESTART:
-                reason = xpcSystemReboot;
-                break;
-        case SYS_HALT:
-                reason = xpcSystemHalt;
-                break;
-        case SYS_POWER_OFF:
-                reason = xpcSystemPoweroff;
-                break;
-        default:
-                reason = xpcSystemGoingDown;
-        }
-        xpc_do_exit(reason);
-        return NOTIFY_DONE;
 }
 /*
- * This function is called when the system is being rebooted.
+ * This function is called when the system is being restarted or halted due
+ * to some sort of system failure. If this is the case we need to notify the
+ * other partitions to disengage from all references to our memory.
+ * This function can also be called when our heartbeater could be offlined
+ * for a time. In this case we need to notify other partitions to not worry
+ * about the lack of a heartbeat.
 */
 static int
 xpc_system_die(struct notifier_block *nb, unsigned long event, void *unused)
@@ -1115,11 +1166,25 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *unused)
        case DIE_MACHINE_HALT:
                xpc_die_disengage();
                break;
+        case DIE_KDEBUG_ENTER:
+                /* Should lack of heartbeat be ignored by other partitions? */
+                if (!xpc_kdebug_ignore) {
+                        break;
+                }
+                /* fall through */
        case DIE_MCA_MONARCH_ENTER:
        case DIE_INIT_MONARCH_ENTER:
                xpc_vars->heartbeat++;
                xpc_vars->heartbeat_offline = 1;
                break;
+        case DIE_KDEBUG_LEAVE:
+                /* Is lack of heartbeat being ignored by other partitions? */
+                if (!xpc_kdebug_ignore) {
+                        break;
+                }
+                /* fall through */
        case DIE_MCA_MONARCH_LEAVE:
        case DIE_INIT_MONARCH_LEAVE:
                xpc_vars->heartbeat++;
@@ -1344,3 +1409,7 @@ module_param(xpc_disengage_request_timelimit, int, 0);
 MODULE_PARM_DESC(xpc_disengage_request_timelimit, "Number of seconds to wait "
                "for disengage request to complete.");
+module_param(xpc_kdebug_ignore, int, 0);
+MODULE_PARM_DESC(xpc_kdebug_ignore, "Should lack of heartbeat be ignored by "
+                "other partitions when dropping into kdebug.");
diff --git a/arch/ia64/sn/kernel/xpc_partition.c b/arch/ia64/sn/kernel/xpc_partition.c
index cdd6431853a1..88a730e6cfdb 100644
--- a/arch/ia64/sn/kernel/xpc_partition.c
+++ b/arch/ia64/sn/kernel/xpc_partition.c
@@ -3,7 +3,7 @@
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 *
- * Copyright (c) 2004-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2004-2006 Silicon Graphics, Inc.  All Rights Reserved.
 */
@@ -28,7 +28,7 @@
 #include <asm/sn/sn_sal.h>
 #include <asm/sn/nodepda.h>
 #include <asm/sn/addrs.h>
-#include "xpc.h"
+#include <asm/sn/xpc.h>
 /* XPC is exiting flag */
@@ -771,7 +771,8 @@ xpc_identify_act_IRQ_req(int nasid)
                }
        }
-        if (!xpc_partition_disengaged(part)) {
+        if (part->disengage_request_timeout > 0 &&
+                                        !xpc_partition_disengaged(part)) {
                /* still waiting on other side to disengage from us */
                return;
        }
@@ -873,6 +874,9 @@ xpc_partition_disengaged(struct xpc_partition *part)
                         * request in a timely fashion, so assume it's dead.
                         */
+                        dev_info(xpc_part, "disengage from remote partition %d "
+                                "timed out\n", partid);
+                        xpc_disengage_request_timedout = 1;
                        xpc_clear_partition_engaged(1UL << partid);
                        disengaged = 1;
                }
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_dma.c b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
index 34093476e965..e68332d93171 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
@@ -218,7 +218,9 @@ void sn_dma_flush(uint64_t addr)
        uint64_t flags;
        uint64_t itte;
        struct hubdev_info *hubinfo;
-        volatile struct sn_flush_device_list *p;
+        volatile struct sn_flush_device_kernel *p;
+        volatile struct sn_flush_device_common *common;
        struct sn_flush_nasid_entry *flush_nasid_list;
        if (!sn_ioif_inited)
@@ -268,17 +270,17 @@ void sn_dma_flush(uint64_t addr)
        p = &flush_nasid_list->widget_p[wid_num][0];
        /* find a matching BAR */
-        for (i = 0; i < DEV_PER_WIDGET; i++) {
+        for (i = 0; i < DEV_PER_WIDGET; i++,p++) {
+                common = p->common;
                for (j = 0; j < PCI_ROM_RESOURCE; j++) {
-                        if (p->sfdl_bar_list[j].start == 0)
+                        if (common->sfdl_bar_list[j].start == 0)
                                break;
-                        if (addr >= p->sfdl_bar_list[j].start
+                        if (addr >= common->sfdl_bar_list[j].start
-                            && addr <= p->sfdl_bar_list[j].end)
+                            && addr <= common->sfdl_bar_list[j].end)
                                break;
                }
-                if (j < PCI_ROM_RESOURCE && p->sfdl_bar_list[j].start != 0)
+                if (j < PCI_ROM_RESOURCE && common->sfdl_bar_list[j].start != 0)
                        break;
-                p++;
        }
        /* if no matching BAR, return without doing anything. */
@@ -304,24 +306,24 @@ void sn_dma_flush(uint64_t addr)
                if ((1 << XWIDGET_PART_REV_NUM_REV(revnum)) & PV907516) {
                        return;
                } else {
-                        pcireg_wrb_flush_get(p->sfdl_pcibus_info,
+                        pcireg_wrb_flush_get(common->sfdl_pcibus_info,
-                                             (p->sfdl_slot - 1));
+                                             (common->sfdl_slot - 1));
                }
        } else {
-                spin_lock_irqsave(&((struct sn_flush_device_list *)p)->
+                spin_lock_irqsave((spinlock_t *)&p->sfdl_flush_lock,
-                                  sfdl_flush_lock, flags);
+                                  flags);
+                *common->sfdl_flush_addr = 0;
-                *p->sfdl_flush_addr = 0;
                /* force an interrupt. */
-                *(volatile uint32_t *)(p->sfdl_force_int_addr) = 1;
+                *(volatile uint32_t *)(common->sfdl_force_int_addr) = 1;
                /* wait for the interrupt to come back. */
-                while (*(p->sfdl_flush_addr) != 0x10f)
+                while (*(common->sfdl_flush_addr) != 0x10f)
                        cpu_relax();
                /* okay, everything is synched up. */
-                spin_unlock_irqrestore((spinlock_t *)&p->sfdl_flush_lock, flags);
+                spin_unlock_irqrestore((spinlock_t *)&p->sfdl_flush_lock,
+                                       flags);
        }
        return;
 }
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
index 1f500c81002c..e328e948175d 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
@@ -92,7 +92,8 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
        cnodeid_t near_cnode;
        struct hubdev_info *hubdev_info;
        struct pcibus_info *soft;
-        struct sn_flush_device_list *sn_flush_device_list;
+        struct sn_flush_device_kernel *sn_flush_device_kernel;
+        struct sn_flush_device_common *common;
        if (! IS_PCI_BRIDGE_ASIC(prom_bussoft->bs_asic_type)) {
                return NULL;
@@ -137,20 +138,19 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
        hubdev_info = (struct hubdev_info *)(NODEPDA(cnode)->pdinfo);
        if (hubdev_info->hdi_flush_nasid_list.widget_p) {
-                sn_flush_device_list = hubdev_info->hdi_flush_nasid_list.
+                sn_flush_device_kernel = hubdev_info->hdi_flush_nasid_list.
                    widget_p[(int)soft->pbi_buscommon.bs_xid];
-                if (sn_flush_device_list) {
+                if (sn_flush_device_kernel) {
                        for (j = 0; j < DEV_PER_WIDGET;
-                             j++, sn_flush_device_list++) {
+                             j++, sn_flush_device_kernel++) {
-                                if (sn_flush_device_list->sfdl_slot == -1)
+                                common = sn_flush_device_kernel->common;
+                                if (common->sfdl_slot == -1)
                                        continue;
-                                if ((sn_flush_device_list->
+                                if ((common->sfdl_persistent_segment ==
-                                     sfdl_persistent_segment ==
                                     soft->pbi_buscommon.bs_persist_segment) &&
-                                     (sn_flush_device_list->
+                                     (common->sfdl_persistent_busnum ==
-                                     sfdl_persistent_busnum ==
                                     soft->pbi_buscommon.bs_persist_busnum))
-                                        sn_flush_device_list->sfdl_pcibus_info =
+                                        common->sfdl_pcibus_info =
                                            soft;
                        }
                }
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index d3654a264ef7..44dd82b791d1 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -139,17 +139,14 @@ drivers-$(CONFIG_CPM2)		+= arch/ppc/8260_io/
 drivers-$(CONFIG_OPROFILE)      += arch/powerpc/oprofile/
-defaultimage-$(CONFIG_PPC32)    := zImage
+# Default to zImage, override when needed
+defaultimage-y                  := zImage
 defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux
-defaultimage-$(CONFIG_PPC_PSERIES) := zImage
 KBUILD_IMAGE := $(defaultimage-y)
 all: $(KBUILD_IMAGE)
 CPPFLAGS_vmlinux.lds    := -Upowerpc
-# All the instructions talk about "make bzImage".
-bzImage: zImage
 BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage
 .PHONY: $(BOOT_TARGETS)
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index b53d677f6742..788dec4c7ef3 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -25,8 +25,8 @@ HOSTCC		:= gcc
 BOOTCFLAGS      := $(HOSTCFLAGS) -fno-builtin -nostdinc -isystem \
                   $(shell $(CROSS32CC) -print-file-name=include) -fPIC
 BOOTAFLAGS      := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc
-BOOTLFLAGS      := -T $(srctree)/$(src)/zImage.lds
 OBJCOPYFLAGS    := contents,alloc,load,readonly,data
+OBJCOPY_COFF_ARGS := -O aixcoff-rs6000 --set-start 0x500000
 zlib       := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c
 zlibheader := infblock.h infcodes.h inffast.h inftrees.h infutil.h
@@ -35,7 +35,7 @@ zliblinuxheader := zlib.h zconf.h zutil.h
 $(addprefix $(obj)/,$(zlib) main.o): $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
 #$(addprefix $(obj)/,main.o): $(addprefix $(obj)/,zlib.h)
-src-boot := string.S prom.c main.c div64.S crt0.S
+src-boot := crt0.S string.S prom.c stdio.c main.c div64.S
 src-boot += $(zlib)
 src-boot := $(addprefix $(obj)/, $(src-boot))
 obj-boot := $(addsuffix .o, $(basename $(src-boot)))
@@ -70,7 +70,7 @@ quiet_cmd_bootas = BOOTAS  $@
      cmd_bootas = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $<
 quiet_cmd_bootld = BOOTLD  $@
-      cmd_bootld = $(CROSS32LD) $(BOOTLFLAGS) -o $@ $(2)
+      cmd_bootld = $(CROSS32LD) -T $(srctree)/$(src)/$(3) -o $@ $(2)
 $(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c
        $(call if_changed_dep,bootcc)
@@ -87,12 +87,14 @@ obj-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.o, $(section)))
 src-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.c, $(section)))
 gz-sec  = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.gz, $(section)))
-hostprogs-y             := addnote addRamDisk
+hostprogs-y             := addnote addRamDisk hack-coff
-targets                 += zImage.vmode zImage.initrd.vmode zImage zImage.initrd \
-                           $(patsubst $(obj)/%,%, $(call obj-sec, $(required) $(initrd))) \
+targets += zImage.vmode zImage.initrd.vmode zImage zImage.initrd \
-                           $(patsubst $(obj)/%,%, $(call src-sec, $(required) $(initrd))) \
+           zImage.coff zImage.initrd.coff \
-                           $(patsubst $(obj)/%,%, $(call gz-sec, $(required) $(initrd))) \
+           $(patsubst $(obj)/%,%, $(call obj-sec, $(required) $(initrd))) \
-                           vmlinux.initrd
+           $(patsubst $(obj)/%,%, $(call src-sec, $(required) $(initrd))) \
+           $(patsubst $(obj)/%,%, $(call gz-sec, $(required) $(initrd))) \
+           vmlinux.initrd
 extra-y                 := initrd.o
 quiet_cmd_ramdisk = RAMDISK $@
@@ -114,6 +116,10 @@ quiet_cmd_addsection = ADDSEC  $@
 quiet_cmd_addnote = ADDNOTE $@
      cmd_addnote = $(obj)/addnote $@
+quiet_cmd_gencoff = COFF    $@
+      cmd_gencoff = $(OBJCOPY) $(OBJCOPY_COFF_ARGS) $@ && \
+                    $(obj)/hack-coff $@
 $(call gz-sec, $(required)): $(obj)/kernel-%.gz: %
        $(call if_changed,gzip)
@@ -127,22 +133,35 @@ $(call obj-sec, $(required) $(initrd)): $(obj)/kernel-%.o: $(obj)/kernel-%.c
        $(call if_changed_dep,bootcc)
        $(call cmd,addsection)
-$(obj)/zImage.vmode: obj-boot += $(call obj-sec, $(required))
+$(obj)/zImage.vmode $(obj)/zImage.coff: obj-boot += $(call obj-sec, $(required))
 $(obj)/zImage.vmode: $(call obj-sec, $(required)) $(obj-boot) $(srctree)/$(src)/zImage.lds
-        $(call cmd,bootld,$(obj-boot))
+        $(call cmd,bootld,$(obj-boot),zImage.lds)
-$(obj)/zImage.initrd.vmode: obj-boot += $(call obj-sec, $(required) $(initrd))
+$(obj)/zImage.initrd.vmode $(obj)/zImage.initrd.coff: obj-boot += $(call obj-sec, $(required) $(initrd))
 $(obj)/zImage.initrd.vmode: $(call obj-sec, $(required) $(initrd)) $(obj-boot) $(srctree)/$(src)/zImage.lds
-        $(call cmd,bootld,$(obj-boot))
+        $(call cmd,bootld,$(obj-boot),zImage.lds)
+# For 32-bit powermacs, build the COFF images as well as the ELF images.
+coffimage-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/zImage.coff
+coffrdimg-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/zImage.initrd.coff
-$(obj)/zImage: $(obj)/zImage.vmode $(obj)/addnote
+$(obj)/zImage: $(obj)/zImage.vmode $(obj)/addnote $(coffimage-y-y)
        @cp -f $< $@
        $(call if_changed,addnote)
-$(obj)/zImage.initrd: $(obj)/zImage.initrd.vmode $(obj)/addnote
+$(obj)/zImage.initrd: $(obj)/zImage.initrd.vmode $(obj)/addnote $(coffrdimg-y-y)
        @cp -f $< $@
        $(call if_changed,addnote)
+$(obj)/zImage.coff: $(call obj-sec, $(required)) $(obj-boot) $(srctree)/$(src)/zImage.coff.lds $(obj)/hack-coff
+        $(call cmd,bootld,$(obj-boot),zImage.coff.lds)
+        $(call cmd,gencoff)
+$(obj)/zImage.initrd.coff: $(call obj-sec, $(required) $(initrd)) $(obj-boot) \
+                           $(srctree)/$(src)/zImage.coff.lds $(obj)/hack-coff
+        $(call cmd,bootld,$(obj-boot),zImage.coff.lds)
+        $(call cmd,gencoff)
 #-----------------------------------------------------------
 # build u-boot images
 #-----------------------------------------------------------
diff --git a/arch/powerpc/boot/crt0.S b/arch/powerpc/boot/crt0.S
index d2f2ace56cd3..e0192c26037b 100644
--- a/arch/powerpc/boot/crt0.S
+++ b/arch/powerpc/boot/crt0.S
@@ -12,17 +12,23 @@
 #include "ppc_asm.h"
        .text
+        /* a procedure descriptor used when booting this as a COFF file */
+_zimage_start_opd:
+        .long   _zimage_start, 0, 0, 0
        .globl  _zimage_start
 _zimage_start:
+        /* Work out the offset between the address we were linked at
+           and the address where we're running. */
        bl      1f
+1:      mflr    r0
-1:
-        mflr    r0
        lis     r9,1b@ha
        addi    r9,r9,1b@l
        subf.   r0,r9,r0
-        beq     3f
+        beq     3f              /* if running at same address as linked */
+        /* The .got2 section contains a list of addresses, so add
+           the address offset onto each entry. */
        lis     r9,__got2_start@ha
        addi    r9,r9,__got2_start@l
        lis     r8,__got2_end@ha
@@ -32,15 +38,14 @@ _zimage_start:
        srwi.   r8,r8,2
        mtctr   r8
        add     r9,r0,r9
-2:
+2:      lwz     r8,0(r9)
-        lwz     r8,0(r9)
        add     r8,r8,r0
        stw     r8,0(r9)
        addi    r9,r9,4
        bdnz    2b
-3:
+        /* Do a cache flush for our text, in case OF didn't */
-        lis     r9,_start@h
+3:      lis     r9,_start@h
        add     r9,r0,r9
        lis     r8,_etext@ha
        addi    r8,r8,_etext@l
diff --git a/arch/powerpc/boot/hack-coff.c b/arch/powerpc/boot/hack-coff.c
new file mode 100644
index 000000000000..5e5a6573a1ef
--- /dev/null
+++ b/arch/powerpc/boot/hack-coff.c
@@ -0,0 +1,84 @@
+/*
+ * hack-coff.c - hack the header of an xcoff file to fill in
+ * a few fields needed by the Open Firmware xcoff loader on
+ * Power Macs but not initialized by objcopy.
+ *
+ * Copyright (C) Paul Mackerras 1997.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include "rs6000.h"
+#define AOUT_MAGIC      0x010b
+#define get_16be(x)     ((((unsigned char *)(x))[0] << 8) \
+                         + ((unsigned char *)(x))[1])
+#define put_16be(x, v)  (((unsigned char *)(x))[0] = (v) >> 8, \
+                         ((unsigned char *)(x))[1] = (v) & 0xff)
+#define get_32be(x)     ((((unsigned char *)(x))[0] << 24) \
+                         + (((unsigned char *)(x))[1] << 16) \
+                         + (((unsigned char *)(x))[2] << 8) \
+                         + ((unsigned char *)(x))[3])
+int
+main(int ac, char **av)
+{
+    int fd;
+    int i, nsect;
+    int aoutsz;
+    struct external_filehdr fhdr;
+    AOUTHDR aout;
+    struct external_scnhdr shdr;
+    if (ac != 2) {
+        fprintf(stderr, "Usage: hack-coff coff-file\n");
+        exit(1);
+    }
+    if ((fd = open(av[1], 2)) == -1) {
+        perror(av[2]);
+        exit(1);
+    }
+    if (read(fd, &fhdr, sizeof(fhdr)) != sizeof(fhdr))
+        goto readerr;
+    i = get_16be(fhdr.f_magic);
+    if (i != U802TOCMAGIC && i != U802WRMAGIC && i != U802ROMAGIC) {
+        fprintf(stderr, "%s: not an xcoff file\n", av[1]);
+        exit(1);
+    }
+    aoutsz = get_16be(fhdr.f_opthdr);
+    if (read(fd, &aout, aoutsz) != aoutsz)
+        goto readerr;
+    nsect = get_16be(fhdr.f_nscns);
+    for (i = 0; i < nsect; ++i) {
+        if (read(fd, &shdr, sizeof(shdr)) != sizeof(shdr))
+            goto readerr;
+        if (strcmp(shdr.s_name, ".text") == 0) {
+            put_16be(aout.o_snentry, i+1);
+            put_16be(aout.o_sntext, i+1);
+        } else if (strcmp(shdr.s_name, ".data") == 0) {
+            put_16be(aout.o_sndata, i+1);
+        } else if (strcmp(shdr.s_name, ".bss") == 0) {
+            put_16be(aout.o_snbss, i+1);
+        }
+    }
+    put_16be(aout.magic, AOUT_MAGIC);
+    if (lseek(fd, (long) sizeof(struct external_filehdr), 0) == -1
+        || write(fd, &aout, aoutsz) != aoutsz) {
+        fprintf(stderr, "%s: write error\n", av[1]);
+        exit(1);
+    }
+    close(fd);
+    exit(0);
+readerr:
+    fprintf(stderr, "%s: read error or file too short\n", av[1]);
+    exit(1);
+}
diff --git a/arch/powerpc/boot/main.c b/arch/powerpc/boot/main.c
index 64ec93116fa6..55ec59867250 100644
--- a/arch/powerpc/boot/main.c
+++ b/arch/powerpc/boot/main.c
@@ -21,8 +21,8 @@ extern void flush_cache(void *, unsigned long);
 /* Value picked to match that used by yaboot */
-#define PROG_START      0x01400000
+#define PROG_START      0x01400000      /* only used on 64-bit systems */
-#define RAM_END         (512<<20) // Fixme: use OF */
+#define RAM_END         (512<<20)       /* Fixme: use OF */
 #define ONE_MB          0x100000
 extern char _start[];
@@ -160,6 +160,17 @@ static int is_elf64(void *hdr)
        elfoffset = (unsigned long)elf64ph->p_offset;
        vmlinux.size = (unsigned long)elf64ph->p_filesz + elfoffset;
        vmlinux.memsize = (unsigned long)elf64ph->p_memsz + elfoffset;
+#if defined(PROG_START)
+        /*
+         * Maintain a "magic" minimum address. This keeps some older
+         * firmware platforms running.
+         */
+        if (claim_base < PROG_START)
+                claim_base = PROG_START;
+#endif
        return 1;
 }
@@ -206,12 +217,18 @@ void start(unsigned long a1, unsigned long a2, void *promptr, void *sp)
                exit();
        if (getprop(chosen_handle, "stdout", &stdout, sizeof(stdout)) != 4)
                exit();
-        stderr = stdout;
-        if (getprop(chosen_handle, "stdin", &stdin, sizeof(stdin)) != 4)
-                exit();
        printf("\n\rzImage starting: loaded at 0x%p (sp: 0x%p)\n\r", _start, sp);
+        /*
+         * The first available claim_base must be above the end of the
+         * the loaded kernel wrapper file (_start to _end includes the
+         * initrd image if it is present) and rounded up to a nice
+         * 1 MB boundary for good measure.
+         */
+        claim_base = _ALIGN_UP((unsigned long)_end, ONE_MB);
        vmlinuz.addr = (unsigned long)_vmlinux_start;
        vmlinuz.size = (unsigned long)(_vmlinux_end - _vmlinux_start);
@@ -228,25 +245,6 @@ void start(unsigned long a1, unsigned long a2, void *promptr, void *sp)
                exit();
        }
-        /*
-         * The first available claim_base must be above the end of the
-         * the loaded kernel wrapper file (_start to _end includes the
-         * initrd image if it is present) and rounded up to a nice
-         * 1 MB boundary for good measure.
-         */
-        claim_base = _ALIGN_UP((unsigned long)_end, ONE_MB);
-#if defined(PROG_START)
-        /*
-         * Maintain a "magic" minimum address. This keeps some older
-         * firmware platforms running.
-         */
-        if (claim_base < PROG_START)
-                claim_base = PROG_START;
-#endif
        /* We need to claim the memsize plus the file offset since gzip
         * will expand the header (file offset), then the kernel, then
         * possible rubbish we don't care about. But the kernel bss must
diff --git a/arch/powerpc/boot/prom.c b/arch/powerpc/boot/prom.c
index 4bea2f4dcb06..fa0057736f6b 100644
--- a/arch/powerpc/boot/prom.c
+++ b/arch/powerpc/boot/prom.c
@@ -13,487 +13,153 @@
 #include "prom.h"
 int (*prom)(void *);
+phandle chosen_handle;
+ihandle stdout;
-void *chosen_handle;
+int call_prom(const char *service, int nargs, int nret, ...)
-void *stdin;
-void *stdout;
-void *stderr;
-int
-write(void *handle, void *ptr, int nb)
-{
-        struct prom_args {
-                char *service;
-                int nargs;
-                int nret;
-                void *ihandle;
-                void *addr;
-                int len;
-                int actual;
-        } args;
-        args.service = "write";
-        args.nargs = 3;
-        args.nret = 1;
-        args.ihandle = handle;
-        args.addr = ptr;
-        args.len = nb;
-        args.actual = -1;
-        (*prom)(&args);
-        return args.actual;
-}
-int
-read(void *handle, void *ptr, int nb)
 {
+        int i;
        struct prom_args {
-                char *service;
+                const char *service;
                int nargs;
                int nret;
-                void *ihandle;
+                unsigned int args[12];
-                void *addr;
-                int len;
-                int actual;
-        } args;
-        args.service = "read";
-        args.nargs = 3;
-        args.nret = 1;
-        args.ihandle = handle;
-        args.addr = ptr;
-        args.len = nb;
-        args.actual = -1;
-        (*prom)(&args);
-        return args.actual;
-}
-void
-exit()
-{
-        struct prom_args {
-                char *service;
-        } args;
-        for (;;) {
-                args.service = "exit";
-                (*prom)(&args);
-        }
-}
-void
-pause(void)
-{
-        struct prom_args {
-                char *service;
        } args;
+        va_list list;
-        args.service = "enter";
+        args.service = service;
-        (*prom)(&args);
+        args.nargs = nargs;
-}
+        args.nret = nret;
-void *
+        va_start(list, nret);
-finddevice(const char *name)
+        for (i = 0; i < nargs; i++)
-{
+                args.args[i] = va_arg(list, unsigned int);
-        struct prom_args {
+        va_end(list);
-                char *service;
-                int nargs;
-                int nret;
-                const char *devspec;
-                void *phandle;
-        } args;
-        args.service = "finddevice";
+        for (i = 0; i < nret; i++)
-        args.nargs = 1;
+                args.args[nargs+i] = 0;
-        args.nret = 1;
-        args.devspec = name;
-        args.phandle = (void *) -1;
-        (*prom)(&args);
-        return args.phandle;
-}
-void *
+        if (prom(&args) < 0)
-claim(unsigned long virt, unsigned long size, unsigned long align)
+                return -1;
-{
-        struct prom_args {
-                char *service;
-                int nargs;
-                int nret;
-                unsigned int virt;
-                unsigned int size;
-                unsigned int align;
-                void *ret;
-        } args;
-        args.service = "claim";
+        return (nret > 0)? args.args[nargs]: 0;
-        args.nargs = 3;
-        args.nret = 1;
-        args.virt = virt;
-        args.size = size;
-        args.align = align;
-        (*prom)(&args);
-        return args.ret;
 }
-int
+int call_prom_ret(const char *service, int nargs, int nret,
-getprop(void *phandle, const char *name, void *buf, int buflen)
+                  unsigned int *rets, ...)
 {
+        int i;
        struct prom_args {
-                char *service;
+                const char *service;
                int nargs;
                int nret;
-                void *phandle;
+                unsigned int args[12];
-                const char *name;
-                void *buf;
-                int buflen;
-                int size;
        } args;
+        va_list list;
-        args.service = "getprop";
+        args.service = service;
-        args.nargs = 4;
+        args.nargs = nargs;
-        args.nret = 1;
+        args.nret = nret;
-        args.phandle = phandle;
-        args.name = name;
-        args.buf = buf;
-        args.buflen = buflen;
-        args.size = -1;
-        (*prom)(&args);
-        return args.size;
-}
-int
+        va_start(list, rets);
-putc(int c, void *f)
+        for (i = 0; i < nargs; i++)
-{
+                args.args[i] = va_arg(list, unsigned int);
-        char ch = c;
+        va_end(list);
-        if (c == '\n')
+        for (i = 0; i < nret; i++)
-                putc('\r', f);
+                args.args[nargs+i] = 0;
-        return write(f, &ch, 1) == 1? c: -1;
-}
-int
+        if (prom(&args) < 0)
-putchar(int c)
+                return -1;
-{
-        return putc(c, stdout);
-}
-int
+        if (rets != (void *) 0)
-fputs(char *str, void *f)
+                for (i = 1; i < nret; ++i)
-{
+                        rets[i-1] = args.args[nargs+i];
-        int n = strlen(str);
-        return write(f, str, n) == n? 0: -1;
+        return (nret > 0)? args.args[nargs]: 0;
 }
-size_t strnlen(const char * s, size_t count)
+int write(void *handle, void *ptr, int nb)
 {
-        const char *sc;
+        return call_prom("write", 3, 1, handle, ptr, nb);
-        for (sc = s; count-- && *sc != '\0'; ++sc)
-                /* nothing */;
-        return sc - s;
 }
-extern unsigned int __div64_32(unsigned long long *dividend,
+/*
-                               unsigned int divisor);
+ * Older OF's require that when claiming a specific range of addresses,
+ * we claim the physical space in the /memory node and the virtual
-/* The unnecessary pointer compare is there
+ * space in the chosen mmu node, and then do a map operation to
- * to check for type safety (n must be 64bit)
+ * map virtual to physical.
 */
-# define do_div(n,base) ({                                              \
+static int need_map = -1;
-        unsigned int __base = (base);                                   \
+static ihandle chosen_mmu;
-        unsigned int __rem;                                             \
+static phandle memory;
-        (void)(((typeof((n)) *)0) == ((unsigned long long *)0));        \
-        if (((n) >> 32) == 0) {                                         \
-                __rem = (unsigned int)(n) % __base;                     \
-                (n) = (unsigned int)(n) / __base;                       \
-        } else                                                          \
-                __rem = __div64_32(&(n), __base);                       \
-        __rem;                                                          \
- })
-static int skip_atoi(const char **s)
+/* returns true if s2 is a prefix of s1 */
+static int string_match(const char *s1, const char *s2)
 {
-        int i, c;
+        for (; *s2; ++s2)
+                if (*s1++ != *s2)
-        for (i = 0; '0' <= (c = **s) && c <= '9'; ++*s)
+                        return 0;
-                i = i*10 + c - '0';
+        return 1;
-        return i;
 }
-#define ZEROPAD 1               /* pad with zero */
+static int check_of_version(void)
-#define SIGN    2               /* unsigned/signed long */
-#define PLUS    4               /* show plus */
-#define SPACE   8               /* space if plus */
-#define LEFT    16              /* left justified */
-#define SPECIAL 32              /* 0x */
-#define LARGE   64              /* use 'ABCDEF' instead of 'abcdef' */
-static char * number(char * str, unsigned long long num, int base, int size, int precision, int type)
 {
-        char c,sign,tmp[66];
+        phandle oprom, chosen;
-        const char *digits="0123456789abcdefghijklmnopqrstuvwxyz";
+        char version[64];
-        int i;
-        if (type & LARGE)
+        oprom = finddevice("/openprom");
-                digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        if (oprom == (phandle) -1)
-        if (type & LEFT)
-                type &= ~ZEROPAD;
-        if (base < 2 || base > 36)
                return 0;
-        c = (type & ZEROPAD) ? '0' : ' ';
+        if (getprop(oprom, "model", version, sizeof(version)) <= 0)
-        sign = 0;
+                return 0;
-        if (type & SIGN) {
+        version[sizeof(version)-1] = 0;
-                if ((signed long long)num < 0) {
+        printf("OF version = '%s'\r\n", version);
-                        sign = '-';
+        if (!string_match(version, "Open Firmware, 1.")
-                        num = - (signed long long)num;
+            && !string_match(version, "FirmWorks,3."))
-                        size--;
+                return 0;
-                } else if (type & PLUS) {
+        chosen = finddevice("/chosen");
-                        sign = '+';
+        if (chosen == (phandle) -1) {
-                        size--;
+                chosen = finddevice("/chosen@0");
-                } else if (type & SPACE) {
+                if (chosen == (phandle) -1) {
-                        sign = ' ';
+                        printf("no chosen\n");
-                        size--;
+                        return 0;
                }
        }
-        if (type & SPECIAL) {
+        if (getprop(chosen, "mmu", &chosen_mmu, sizeof(chosen_mmu)) <= 0) {
-                if (base == 16)
+                printf("no mmu\n");
-                        size -= 2;
+                return 0;
-                else if (base == 8)
-                        size--;
-        }
-        i = 0;
-        if (num == 0)
-                tmp[i++]='0';
-        else while (num != 0) {
-                tmp[i++] = digits[do_div(num, base)];
        }
-        if (i > precision)
+        memory = (ihandle) call_prom("open", 1, 1, "/memory");
-                precision = i;
+        if (memory == (ihandle) -1) {
-        size -= precision;
+                memory = (ihandle) call_prom("open", 1, 1, "/memory@0");
-        if (!(type&(ZEROPAD+LEFT)))
+                if (memory == (ihandle) -1) {
-                while(size-->0)
+                        printf("no memory node\n");
-                        *str++ = ' ';
+                        return 0;
-        if (sign)
-                *str++ = sign;
-        if (type & SPECIAL) {
-                if (base==8)
-                        *str++ = '0';
-                else if (base==16) {
-                        *str++ = '0';
-                        *str++ = digits[33];
                }
        }
-        if (!(type & LEFT))
+        printf("old OF detected\r\n");
-                while (size-- > 0)
+        return 1;
-                        *str++ = c;
-        while (i < precision--)
-                *str++ = '0';
-        while (i-- > 0)
-                *str++ = tmp[i];
-        while (size-- > 0)
-                *str++ = ' ';
-        return str;
 }
-int vsprintf(char *buf, const char *fmt, va_list args)
+void *claim(unsigned long virt, unsigned long size, unsigned long align)
 {
-        int len;
+        int ret;
-        unsigned long long num;
+        unsigned int result;
-        int i, base;
-        char * str;
-        const char *s;
-        int flags;              /* flags to number() */
-        int field_width;        /* width of output field */
-        int precision;          /* min. # of digits for integers; max
-                                   number of chars for from string */
-        int qualifier;          /* 'h', 'l', or 'L' for integer fields */
-                                /* 'z' support added 23/7/1999 S.H.    */
-                                /* 'z' changed to 'Z' --davidm 1/25/99 */
+        if (need_map < 0)
+                need_map = check_of_version();
+        if (align || !need_map)
+                return (void *) call_prom("claim", 3, 1, virt, size, align);
        
-        for (str=buf ; *fmt ; ++fmt) {
+        ret = call_prom_ret("call-method", 5, 2, &result, "claim", memory,
-                if (*fmt != '%') {
+                            align, size, virt);
-                        *str++ = *fmt;
+        if (ret != 0 || result == -1)
-                        continue;
+                return (void *) -1;
-                }
+        ret = call_prom_ret("call-method", 5, 2, &result, "claim", chosen_mmu,
-                        
+                            align, size, virt);
-                /* process flags */
+        /* 0x12 == coherent + read/write */
-                flags = 0;
+        ret = call_prom("call-method", 6, 1, "map", chosen_mmu,
-                repeat:
+                        0x12, size, virt, virt);
-                        ++fmt;          /* this also skips first '%' */
+        return (void *) virt;
-                        switch (*fmt) {
-                                case '-': flags |= LEFT; goto repeat;
-                                case '+': flags |= PLUS; goto repeat;
-                                case ' ': flags |= SPACE; goto repeat;
-                                case '#': flags |= SPECIAL; goto repeat;
-                                case '0': flags |= ZEROPAD; goto repeat;
-                                }
-                
-                /* get field width */
-                field_width = -1;
-                if ('0' <= *fmt && *fmt <= '9')
-                        field_width = skip_atoi(&fmt);
-                else if (*fmt == '*') {
-                        ++fmt;
-                        /* it's the next argument */
-                        field_width = va_arg(args, int);
-                        if (field_width < 0) {
-                                field_width = -field_width;
-                                flags |= LEFT;
-                        }
-                }
-                /* get the precision */
-                precision = -1;
-                if (*fmt == '.') {
-                        ++fmt;  
-                        if ('0' <= *fmt && *fmt <= '9')
-                                precision = skip_atoi(&fmt);
-                        else if (*fmt == '*') {
-                                ++fmt;
-                                /* it's the next argument */
-                                precision = va_arg(args, int);
-                        }
-                        if (precision < 0)
-                                precision = 0;
-                }
-                /* get the conversion qualifier */
-                qualifier = -1;
-                if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt =='Z') {
-                        qualifier = *fmt;
-                        ++fmt;
-                }
-                /* default base */
-                base = 10;
-                switch (*fmt) {
-                case 'c':
-                        if (!(flags & LEFT))
-                                while (--field_width > 0)
-                                        *str++ = ' ';
-                        *str++ = (unsigned char) va_arg(args, int);
-                        while (--field_width > 0)
-                                *str++ = ' ';
-                        continue;
-                case 's':
-                        s = va_arg(args, char *);
-                        if (!s)
-                                s = "<NULL>";
-                        len = strnlen(s, precision);
-                        if (!(flags & LEFT))
-                                while (len < field_width--)
-                                        *str++ = ' ';
-                        for (i = 0; i < len; ++i)
-                                *str++ = *s++;
-                        while (len < field_width--)
-                                *str++ = ' ';
-                        continue;
-                case 'p':
-                        if (field_width == -1) {
-                                field_width = 2*sizeof(void *);
-                                flags |= ZEROPAD;
-                        }
-                        str = number(str,
-                                (unsigned long) va_arg(args, void *), 16,
-                                field_width, precision, flags);
-                        continue;
-                case 'n':
-                        if (qualifier == 'l') {
-                                long * ip = va_arg(args, long *);
-                                *ip = (str - buf);
-                        } else if (qualifier == 'Z') {
-                                size_t * ip = va_arg(args, size_t *);
-                                *ip = (str - buf);
-                        } else {
-                                int * ip = va_arg(args, int *);
-                                *ip = (str - buf);
-                        }
-                        continue;
-                case '%':
-                        *str++ = '%';
-                        continue;
-                /* integer number formats - set up the flags and "break" */
-                case 'o':
-                        base = 8;
-                        break;
-                case 'X':
-                        flags |= LARGE;
-                case 'x':
-                        base = 16;
-                        break;
-                case 'd':
-                case 'i':
-                        flags |= SIGN;
-                case 'u':
-                        break;
-                default:
-                        *str++ = '%';
-                        if (*fmt)
-                                *str++ = *fmt;
-                        else
-                                --fmt;
-                        continue;
-                }
-                if (qualifier == 'l') {
-                        num = va_arg(args, unsigned long);
-                        if (flags & SIGN)
-                                num = (signed long) num;
-                } else if (qualifier == 'Z') {
-                        num = va_arg(args, size_t);
-                } else if (qualifier == 'h') {
-                        num = (unsigned short) va_arg(args, int);
-                        if (flags & SIGN)
-                                num = (signed short) num;
-                } else {
-                        num = va_arg(args, unsigned int);
-                        if (flags & SIGN)
-                                num = (signed int) num;
-                }
-                str = number(str, num, base, field_width, precision, flags);
-        }
-        *str = '\0';
-        return str-buf;
-}
-int sprintf(char * buf, const char *fmt, ...)
-{
-        va_list args;
-        int i;
-        va_start(args, fmt);
-        i=vsprintf(buf,fmt,args);
-        va_end(args);
-        return i;
-}
-static char sprint_buf[1024];
-int
-printf(const char *fmt, ...)
-{
-        va_list args;
-        int n;
-        va_start(args, fmt);
-        n = vsprintf(sprint_buf, fmt, args);
-        va_end(args);
-        write(stdout, sprint_buf, n);
-        return n;
 }
diff --git a/arch/powerpc/boot/prom.h b/arch/powerpc/boot/prom.h
index 96ab5aec740c..3e2ddd4a5a81 100644
--- a/arch/powerpc/boot/prom.h
+++ b/arch/powerpc/boot/prom.h
@@ -1,18 +1,34 @@
 #ifndef _PPC_BOOT_PROM_H_
 #define _PPC_BOOT_PROM_H_
+typedef void *phandle;
+typedef void *ihandle;
 extern int (*prom) (void *);
-extern void *chosen_handle;
+extern phandle chosen_handle;
+extern ihandle stdout;
-extern void *stdin;
+int     call_prom(const char *service, int nargs, int nret, ...);
-extern void *stdout;
+int     call_prom_ret(const char *service, int nargs, int nret,
-extern void *stderr;
+                      unsigned int *rets, ...);
 extern int write(void *handle, void *ptr, int nb);
-extern int read(void *handle, void *ptr, int nb);
+extern void *claim(unsigned long virt, unsigned long size, unsigned long aln);
-extern void exit(void);
-extern void pause(void);
+static inline void exit(void)
-extern void *finddevice(const char *);
+{
-extern void *claim(unsigned long virt, unsigned long size, unsigned long align);
+        call_prom("exit", 0, 0);
-extern int getprop(void *phandle, const char *name, void *buf, int buflen);
+}
+static inline phandle finddevice(const char *name)
+{
+        return (phandle) call_prom("finddevice", 1, 1, name);
+}
+static inline int getprop(void *phandle, const char *name,
+                          void *buf, int buflen)
+{
+        return call_prom("getprop", 4, 1, phandle, name, buf, buflen);
+}
 #endif                          /* _PPC_BOOT_PROM_H_ */
diff --git a/arch/powerpc/boot/rs6000.h b/arch/powerpc/boot/rs6000.h
new file mode 100644
index 000000000000..433f45084e41
--- /dev/null
+++ b/arch/powerpc/boot/rs6000.h
@@ -0,0 +1,243 @@
+/* IBM RS/6000 "XCOFF" file definitions for BFD.
+   Copyright (C) 1990, 1991 Free Software Foundation, Inc.
+   FIXME: Can someone provide a transliteration of this name into ASCII?
+   Using the following chars caused a compiler warning on HIUX (so I replaced
+   them with octal escapes), and isn't useful without an understanding of what
+   character set it is.
+   Written by Mimi Ph\373\364ng-Th\345o V\365 of IBM
+   and John Gilmore of Cygnus Support.  */
+/********************** FILE HEADER **********************/
+struct external_filehdr {
+        char f_magic[2];        /* magic number                 */
+        char f_nscns[2];        /* number of sections           */
+        char f_timdat[4];       /* time & date stamp            */
+        char f_symptr[4];       /* file pointer to symtab       */
+        char f_nsyms[4];        /* number of symtab entries     */
+        char f_opthdr[2];       /* sizeof(optional hdr)         */
+        char f_flags[2];        /* flags                        */
+};
+        /* IBM RS/6000 */
+#define U802WRMAGIC     0730    /* writeable text segments **chh**      */
+#define U802ROMAGIC     0735    /* readonly sharable text segments      */
+#define U802TOCMAGIC    0737    /* readonly text segments and TOC       */
+#define BADMAG(x)       \
+        ((x).f_magic != U802ROMAGIC && (x).f_magic != U802WRMAGIC && \
+         (x).f_magic != U802TOCMAGIC)
+#define FILHDR  struct external_filehdr
+#define FILHSZ  20
+/********************** AOUT "OPTIONAL HEADER" **********************/
+typedef struct
+{
+  unsigned char magic[2];       /* type of file                 */
+  unsigned char vstamp[2];      /* version stamp                */
+  unsigned char tsize[4];       /* text size in bytes, padded to FW bdry */
+  unsigned char dsize[4];       /* initialized data "  "        */
+  unsigned char bsize[4];       /* uninitialized data "   "     */
+  unsigned char entry[4];       /* entry pt.                    */
+  unsigned char text_start[4];  /* base of text used for this file */
+  unsigned char data_start[4];  /* base of data used for this file */
+  unsigned char o_toc[4];       /* address of TOC */
+  unsigned char o_snentry[2];   /* section number of entry point */
+  unsigned char o_sntext[2];    /* section number of .text section */
+  unsigned char o_sndata[2];    /* section number of .data section */
+  unsigned char o_sntoc[2];     /* section number of TOC */
+  unsigned char o_snloader[2];  /* section number of .loader section */
+  unsigned char o_snbss[2];     /* section number of .bss section */
+  unsigned char o_algntext[2];  /* .text alignment */
+  unsigned char o_algndata[2];  /* .data alignment */
+  unsigned char o_modtype[2];   /* module type (??) */
+  unsigned char o_cputype[2];   /* cpu type */
+  unsigned char o_maxstack[4];  /* max stack size (??) */
+  unsigned char o_maxdata[4];   /* max data size (??) */
+  unsigned char o_resv2[12];    /* reserved */
+}
+AOUTHDR;
+#define AOUTSZ 72
+#define SMALL_AOUTSZ (28)
+#define AOUTHDRSZ 72
+#define RS6K_AOUTHDR_OMAGIC     0x0107  /* old: text & data writeable */
+#define RS6K_AOUTHDR_NMAGIC     0x0108  /* new: text r/o, data r/w */
+#define RS6K_AOUTHDR_ZMAGIC     0x010B  /* paged: text r/o, both page-aligned */
+/********************** SECTION HEADER **********************/
+struct external_scnhdr {
+        char            s_name[8];      /* section name                 */
+        char            s_paddr[4];     /* physical address, aliased s_nlib */
+        char            s_vaddr[4];     /* virtual address              */
+        char            s_size[4];      /* section size                 */
+        char            s_scnptr[4];    /* file ptr to raw data for section */
+        char            s_relptr[4];    /* file ptr to relocation       */
+        char            s_lnnoptr[4];   /* file ptr to line numbers     */
+        char            s_nreloc[2];    /* number of relocation entries */
+        char            s_nlnno[2];     /* number of line number entries*/
+        char            s_flags[4];     /* flags                        */
+};
+/*
+ * names of "special" sections
+ */
+#define _TEXT   ".text"
+#define _DATA   ".data"
+#define _BSS    ".bss"
+#define _PAD    ".pad"
+#define _LOADER ".loader"
+#define SCNHDR  struct external_scnhdr
+#define SCNHSZ  40
+/* XCOFF uses a special .loader section with type STYP_LOADER.  */
+#define STYP_LOADER 0x1000
+/* XCOFF uses a special .debug section with type STYP_DEBUG.  */
+#define STYP_DEBUG 0x2000
+/* XCOFF handles line number or relocation overflow by creating
+   another section header with STYP_OVRFLO set.  */
+#define STYP_OVRFLO 0x8000
+/********************** LINE NUMBERS **********************/
+/* 1 line number entry for every "breakpointable" source line in a section.
+ * Line numbers are grouped on a per function basis; first entry in a function
+ * grouping will have l_lnno = 0 and in place of physical address will be the
+ * symbol table index of the function name.
+ */
+struct external_lineno {
+        union {
+                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
+                char l_paddr[4];        /* (physical) address of line number    */
+        } l_addr;
+        char l_lnno[2]; /* line number          */
+};
+#define LINENO  struct external_lineno
+#define LINESZ  6
+/********************** SYMBOLS **********************/
+#define E_SYMNMLEN      8       /* # characters in a symbol name        */
+#define E_FILNMLEN      14      /* # characters in a file name          */
+#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
+struct external_syment
+{
+  union {
+    char e_name[E_SYMNMLEN];
+    struct {
+      char e_zeroes[4];
+      char e_offset[4];
+    } e;
+  } e;
+  char e_value[4];
+  char e_scnum[2];
+  char e_type[2];
+  char e_sclass[1];
+  char e_numaux[1];
+};
+#define N_BTMASK        (017)
+#define N_TMASK         (060)
+#define N_BTSHFT        (4)
+#define N_TSHIFT        (2)
+union external_auxent {
+        struct {
+                char x_tagndx[4];       /* str, un, or enum tag indx */
+                union {
+                        struct {
+                            char  x_lnno[2]; /* declaration line number */
+                            char  x_size[2]; /* str/union/array size */
+                        } x_lnsz;
+                        char x_fsize[4];        /* size of function */
+                } x_misc;
+                union {
+                        struct {                /* if ISFCN, tag, or .bb */
+                            char x_lnnoptr[4];  /* ptr to fcn line # */
+                            char x_endndx[4];   /* entry ndx past block end */
+                        } x_fcn;
+                        struct {                /* if ISARY, up to 4 dimen. */
+                            char x_dimen[E_DIMNUM][2];
+                        } x_ary;
+                } x_fcnary;
+                char x_tvndx[2];                /* tv index */
+        } x_sym;
+        union {
+                char x_fname[E_FILNMLEN];
+                struct {
+                        char x_zeroes[4];
+                        char x_offset[4];
+                } x_n;
+        } x_file;
+        struct {
+                char x_scnlen[4];                       /* section length */
+                char x_nreloc[2];       /* # relocation entries */
+                char x_nlinno[2];       /* # line numbers */
+        } x_scn;
+        struct {
+                char x_tvfill[4];       /* tv fill value */
+                char x_tvlen[2];        /* length of .tv */
+                char x_tvran[2][2];     /* tv range */
+        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
+        struct {
+                unsigned char x_scnlen[4];
+                unsigned char x_parmhash[4];
+                unsigned char x_snhash[2];
+                unsigned char x_smtyp[1];
+                unsigned char x_smclas[1];
+                unsigned char x_stab[4];
+                unsigned char x_snstab[2];
+        } x_csect;
+};
+#define SYMENT  struct external_syment
+#define SYMESZ  18
+#define AUXENT  union external_auxent
+#define AUXESZ  18
+#define DBXMASK 0x80            /* for dbx storage mask */
+#define SYMNAME_IN_DEBUG(symptr) ((symptr)->n_sclass & DBXMASK)
+/********************** RELOCATION DIRECTIVES **********************/
+struct external_reloc {
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_size[1];
+  char r_type[1];
+};
+#define RELOC struct external_reloc
+#define RELSZ 10
+#define DEFAULT_DATA_SECTION_ALIGNMENT 4
+#define DEFAULT_BSS_SECTION_ALIGNMENT 4
+#define DEFAULT_TEXT_SECTION_ALIGNMENT 4
+/* For new sections we havn't heard of before */
+#define DEFAULT_SECTION_ALIGNMENT 4
diff --git a/arch/powerpc/boot/stdio.c b/arch/powerpc/boot/stdio.c
new file mode 100644
index 000000000000..b5aa522f8b77
--- /dev/null
+++ b/arch/powerpc/boot/stdio.c
@@ -0,0 +1,325 @@
+/*
+ * Copyright (C) Paul Mackerras 1997.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#include <stdarg.h>
+#include <stddef.h>
+#include "string.h"
+#include "stdio.h"
+#include "prom.h"
+size_t strnlen(const char * s, size_t count)
+{
+        const char *sc;
+        for (sc = s; count-- && *sc != '\0'; ++sc)
+                /* nothing */;
+        return sc - s;
+}
+extern unsigned int __div64_32(unsigned long long *dividend,
+                               unsigned int divisor);
+/* The unnecessary pointer compare is there
+ * to check for type safety (n must be 64bit)
+ */
+# define do_div(n,base) ({                                              \
+        unsigned int __base = (base);                                   \
+        unsigned int __rem;                                             \
+        (void)(((typeof((n)) *)0) == ((unsigned long long *)0));        \
+        if (((n) >> 32) == 0) {                                         \
+                __rem = (unsigned int)(n) % __base;                     \
+                (n) = (unsigned int)(n) / __base;                       \
+        } else                                                          \
+                __rem = __div64_32(&(n), __base);                       \
+        __rem;                                                          \
+ })
+static int skip_atoi(const char **s)
+{
+        int i, c;
+        for (i = 0; '0' <= (c = **s) && c <= '9'; ++*s)
+                i = i*10 + c - '0';
+        return i;
+}
+#define ZEROPAD 1               /* pad with zero */
+#define SIGN    2               /* unsigned/signed long */
+#define PLUS    4               /* show plus */
+#define SPACE   8               /* space if plus */
+#define LEFT    16              /* left justified */
+#define SPECIAL 32              /* 0x */
+#define LARGE   64              /* use 'ABCDEF' instead of 'abcdef' */
+static char * number(char * str, unsigned long long num, int base, int size, int precision, int type)
+{
+        char c,sign,tmp[66];
+        const char *digits="0123456789abcdefghijklmnopqrstuvwxyz";
+        int i;
+        if (type & LARGE)
+                digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        if (type & LEFT)
+                type &= ~ZEROPAD;
+        if (base < 2 || base > 36)
+                return 0;
+        c = (type & ZEROPAD) ? '0' : ' ';
+        sign = 0;
+        if (type & SIGN) {
+                if ((signed long long)num < 0) {
+                        sign = '-';
+                        num = - (signed long long)num;
+                        size--;
+                } else if (type & PLUS) {
+                        sign = '+';
+                        size--;
+                } else if (type & SPACE) {
+                        sign = ' ';
+                        size--;
+                }
+        }
+        if (type & SPECIAL) {
+                if (base == 16)
+                        size -= 2;
+                else if (base == 8)
+                        size--;
+        }
+        i = 0;
+        if (num == 0)
+                tmp[i++]='0';
+        else while (num != 0) {
+                tmp[i++] = digits[do_div(num, base)];
+        }
+        if (i > precision)
+                precision = i;
+        size -= precision;
+        if (!(type&(ZEROPAD+LEFT)))
+                while(size-->0)
+                        *str++ = ' ';
+        if (sign)
+                *str++ = sign;
+        if (type & SPECIAL) {
+                if (base==8)
+                        *str++ = '0';
+                else if (base==16) {
+                        *str++ = '0';
+                        *str++ = digits[33];
+                }
+        }
+        if (!(type & LEFT))
+                while (size-- > 0)
+                        *str++ = c;
+        while (i < precision--)
+                *str++ = '0';
+        while (i-- > 0)
+                *str++ = tmp[i];
+        while (size-- > 0)
+                *str++ = ' ';
+        return str;
+}
+int vsprintf(char *buf, const char *fmt, va_list args)
+{
+        int len;
+        unsigned long long num;
+        int i, base;
+        char * str;
+        const char *s;
+        int flags;              /* flags to number() */
+        int field_width;        /* width of output field */
+        int precision;          /* min. # of digits for integers; max
+                                   number of chars for from string */
+        int qualifier;          /* 'h', 'l', or 'L' for integer fields */
+                                /* 'z' support added 23/7/1999 S.H.    */
+                                /* 'z' changed to 'Z' --davidm 1/25/99 */
+        
+        for (str=buf ; *fmt ; ++fmt) {
+                if (*fmt != '%') {
+                        *str++ = *fmt;
+                        continue;
+                }
+                        
+                /* process flags */
+                flags = 0;
+                repeat:
+                        ++fmt;          /* this also skips first '%' */
+                        switch (*fmt) {
+                                case '-': flags |= LEFT; goto repeat;
+                                case '+': flags |= PLUS; goto repeat;
+                                case ' ': flags |= SPACE; goto repeat;
+                                case '#': flags |= SPECIAL; goto repeat;
+                                case '0': flags |= ZEROPAD; goto repeat;
+                                }
+                
+                /* get field width */
+                field_width = -1;
+                if ('0' <= *fmt && *fmt <= '9')
+                        field_width = skip_atoi(&fmt);
+                else if (*fmt == '*') {
+                        ++fmt;
+                        /* it's the next argument */
+                        field_width = va_arg(args, int);
+                        if (field_width < 0) {
+                                field_width = -field_width;
+                                flags |= LEFT;
+                        }
+                }
+                /* get the precision */
+                precision = -1;
+                if (*fmt == '.') {
+                        ++fmt;  
+                        if ('0' <= *fmt && *fmt <= '9')
+                                precision = skip_atoi(&fmt);
+                        else if (*fmt == '*') {
+                                ++fmt;
+                                /* it's the next argument */
+                                precision = va_arg(args, int);
+                        }
+                        if (precision < 0)
+                                precision = 0;
+                }
+                /* get the conversion qualifier */
+                qualifier = -1;
+                if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt =='Z') {
+                        qualifier = *fmt;
+                        ++fmt;
+                }
+                /* default base */
+                base = 10;
+                switch (*fmt) {
+                case 'c':
+                        if (!(flags & LEFT))
+                                while (--field_width > 0)
+                                        *str++ = ' ';
+                        *str++ = (unsigned char) va_arg(args, int);
+                        while (--field_width > 0)
+                                *str++ = ' ';
+                        continue;
+                case 's':
+                        s = va_arg(args, char *);
+                        if (!s)
+                                s = "<NULL>";
+                        len = strnlen(s, precision);
+                        if (!(flags & LEFT))
+                                while (len < field_width--)
+                                        *str++ = ' ';
+                        for (i = 0; i < len; ++i)
+                                *str++ = *s++;
+                        while (len < field_width--)
+                                *str++ = ' ';
+                        continue;
+                case 'p':
+                        if (field_width == -1) {
+                                field_width = 2*sizeof(void *);
+                                flags |= ZEROPAD;
+                        }
+                        str = number(str,
+                                (unsigned long) va_arg(args, void *), 16,
+                                field_width, precision, flags);
+                        continue;
+                case 'n':
+                        if (qualifier == 'l') {
+                                long * ip = va_arg(args, long *);
+                                *ip = (str - buf);
+                        } else if (qualifier == 'Z') {
+                                size_t * ip = va_arg(args, size_t *);
+                                *ip = (str - buf);
+                        } else {
+                                int * ip = va_arg(args, int *);
+                                *ip = (str - buf);
+                        }
+                        continue;
+                case '%':
+                        *str++ = '%';
+                        continue;
+                /* integer number formats - set up the flags and "break" */
+                case 'o':
+                        base = 8;
+                        break;
+                case 'X':
+                        flags |= LARGE;
+                case 'x':
+                        base = 16;
+                        break;
+                case 'd':
+                case 'i':
+                        flags |= SIGN;
+                case 'u':
+                        break;
+                default:
+                        *str++ = '%';
+                        if (*fmt)
+                                *str++ = *fmt;
+                        else
+                                --fmt;
+                        continue;
+                }
+                if (qualifier == 'l') {
+                        num = va_arg(args, unsigned long);
+                        if (flags & SIGN)
+                                num = (signed long) num;
+                } else if (qualifier == 'Z') {
+                        num = va_arg(args, size_t);
+                } else if (qualifier == 'h') {
+                        num = (unsigned short) va_arg(args, int);
+                        if (flags & SIGN)
+                                num = (signed short) num;
+                } else {
+                        num = va_arg(args, unsigned int);
+                        if (flags & SIGN)
+                                num = (signed int) num;
+                }
+                str = number(str, num, base, field_width, precision, flags);
+        }
+        *str = '\0';
+        return str-buf;
+}
+int sprintf(char * buf, const char *fmt, ...)
+{
+        va_list args;
+        int i;
+        va_start(args, fmt);
+        i=vsprintf(buf,fmt,args);
+        va_end(args);
+        return i;
+}
+static char sprint_buf[1024];
+int
+printf(const char *fmt, ...)
+{
+        va_list args;
+        int n;
+        va_start(args, fmt);
+        n = vsprintf(sprint_buf, fmt, args);
+        va_end(args);
+        write(stdout, sprint_buf, n);
+        return n;
+}
diff --git a/arch/powerpc/boot/stdio.h b/arch/powerpc/boot/stdio.h
index 24bd3a8dee94..eb9e16c87aef 100644
--- a/arch/powerpc/boot/stdio.h
+++ b/arch/powerpc/boot/stdio.h
@@ -7,10 +7,4 @@ extern int sprintf(char *buf, const char *fmt, ...);
 extern int vsprintf(char *buf, const char *fmt, va_list args);
-extern int putc(int c, void *f);
-extern int putchar(int c);
-extern int getchar(void);
-extern int fputs(char *str, void *f);
 #endif                          /* _PPC_BOOT_STDIO_H_ */
diff --git a/arch/powerpc/boot/string.S b/arch/powerpc/boot/string.S
index b1eeaed7db17..ac3d43b6a324 100644
--- a/arch/powerpc/boot/string.S
+++ b/arch/powerpc/boot/string.S
@@ -107,10 +107,12 @@ memcpy:
        rlwinm. r7,r5,32-3,3,31         /* r7 = r5 >> 3 */
        addi    r6,r3,-4
        addi    r4,r4,-4
-        beq     2f                      /* if less than 8 bytes to do */
+        beq     3f                      /* if less than 8 bytes to do */
        andi.   r0,r6,3                 /* get dest word aligned */
        mtctr   r7
        bne     5f
+        andi.   r0,r4,3                 /* check src word aligned too */
+        bne     3f
 1:      lwz     r7,4(r4)
        lwzu    r8,8(r4)
        stw     r7,4(r6)
@@ -132,6 +134,11 @@ memcpy:
        bdnz    4b
        blr
 5:      subfic  r0,r0,4
+        cmpw    cr1,r0,r5
+        add     r7,r0,r4
+        andi.   r7,r7,3                 /* will source be word-aligned too? */
+        ble     cr1,3b
+        bne     3b                      /* do byte-by-byte if not */
        mtctr   r0
 6:      lbz     r7,4(r4)
        addi    r4,r4,1
@@ -149,10 +156,12 @@ backwards_memcpy:
        rlwinm. r7,r5,32-3,3,31         /* r7 = r5 >> 3 */
        add     r6,r3,r5
        add     r4,r4,r5
-        beq     2f
+        beq     3f
        andi.   r0,r6,3
        mtctr   r7
        bne     5f
+        andi.   r0,r4,3
+        bne     3f
 1:      lwz     r7,-4(r4)
        lwzu    r8,-8(r4)
        stw     r7,-4(r6)
@@ -171,7 +180,12 @@ backwards_memcpy:
        stbu    r0,-1(r6)
        bdnz    4b
        blr
-5:      mtctr   r0
+5:      cmpw    cr1,r0,r5
+        subf    r7,r0,r4
+        andi.   r7,r7,3
+        ble     cr1,3b
+        bne     3b
+        mtctr   r0
 6:      lbzu    r7,-1(r4)
        stbu    r7,-1(r6)
        bdnz    6b
diff --git a/arch/powerpc/boot/zImage.coff.lds b/arch/powerpc/boot/zImage.coff.lds
new file mode 100644
index 000000000000..6016251a1a2c
--- /dev/null
+++ b/arch/powerpc/boot/zImage.coff.lds
@@ -0,0 +1,46 @@
+OUTPUT_ARCH(powerpc:common)
+ENTRY(_start)
+SECTIONS
+{
+  . = (5*1024*1024);
+  _start = .;
+  .text      :
+  {
+    *(.text)
+    *(.fixup)
+  }
+  _etext = .;
+  . = ALIGN(4096);
+  .data    :
+  {
+    *(.rodata*)
+    *(.data*)
+    *(.sdata*)
+    __got2_start = .;
+    *(.got2)
+    __got2_end = .;
+    _vmlinux_start =  .;
+    *(.kernel:vmlinux.strip)
+    _vmlinux_end =  .;
+    _initrd_start =  .;
+    *(.kernel:initrd)
+    _initrd_end =  .;
+  }
+  . = ALIGN(4096);
+  _edata  =  .;
+  __bss_start = .;
+  .bss       :
+  {
+   *(.sbss)
+   *(.bss)
+  }
+  _end = . ;
+  /DISCARD/ :
+  {
+    *(.comment)
+  }
+}
diff --git a/arch/powerpc/configs/mpc834x_sys_defconfig b/arch/powerpc/configs/mpc834x_sys_defconfig
new file mode 100644
index 000000000000..3bff761965c2
--- /dev/null
+++ b/arch/powerpc/configs/mpc834x_sys_defconfig
@@ -0,0 +1,911 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.15-g461d4edf-dirty
+# Fri Jan 13 11:01:47 2006
+#
+# CONFIG_PPC64 is not set
+CONFIG_PPC32=y
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_PPC_UDBG_16550=y
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_DEFAULT_UIMAGE=y
+#
+# Processor support
+#
+# CONFIG_CLASSIC32 is not set
+# CONFIG_PPC_52xx is not set
+# CONFIG_PPC_82xx is not set
+CONFIG_PPC_83xx=y
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_8xx is not set
+# CONFIG_E200 is not set
+# CONFIG_E500 is not set
+CONFIG_6xx=y
+CONFIG_83xx=y
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_SMP is not set
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_EMBEDDED=y
+# CONFIG_KALLSYMS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+# CONFIG_EPOLL is not set
+CONFIG_SHMEM=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_KMOD is not set
+#
+# Block layer
+#
+# CONFIG_LBD is not set
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_PPC_GEN550=y
+# CONFIG_WANT_EARLY_SERIAL is not set
+#
+# Platform support
+#
+CONFIG_MPC834x_SYS=y
+CONFIG_MPC834x=y
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+# CONFIG_SOFTWARE_SUSPEND is not set
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+#
+# Bus options
+#
+CONFIG_GENERIC_ISA_DMA=y
+# CONFIG_PPC_I8259 is not set
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_FSL_SOC=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_LEGACY_PROC is not set
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_HIGHMEM_START=0xfe000000
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_TASK_SIZE=0x80000000
+CONFIG_BOOT_LOAD=0x00800000
+#
+# Networking
+#
+CONFIG_NET=y
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+# CONFIG_IPV6 is not set
+# CONFIG_NETFILTER is not set
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+#
+# Device Drivers
+#
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+#
+# Plug and Play support
+#
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=32768
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+#
+# Macintosh device drivers
+#
+# CONFIG_WINDFARM is not set
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+#
+# PHY device support
+#
+CONFIG_PHYLIB=y
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=y
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+CONFIG_E100=y
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_VIA_RHINE is not set
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+CONFIG_GIANFAR=y
+# CONFIG_GFAR_NAPI is not set
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+#
+# Input device support
+#
+CONFIG_INPUT=y
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+#
+# Watchdog Cards
+#
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_83xx_WDT=y
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+# CONFIG_NVRAM is not set
+CONFIG_GEN_RTC=y
+# CONFIG_GEN_RTC_X is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+CONFIG_I2C_MPC=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_SCx200_ACB is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_ISA is not set
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_M41T00 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_RTC_X1205_I2C is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+#
+# Misc devices
+#
+#
+# Multimedia Capabilities Port drivers
+#
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB is not set
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+#
+# SN Devices
+#
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_RELAYFS_FS is not set
+# CONFIG_CONFIGFS_FS is not set
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+# CONFIG_MSDOS_PARTITION is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+#
+# Instrumentation Support
+#
+# CONFIG_PROFILING is not set
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_BOOTX_TEXT is not set
+# CONFIG_SERIAL_TEXT_DEBUG is not set
+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
+# CONFIG_PPC_EARLY_DEBUG_G5 is not set
+# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_TEST is not set
+#
+# Hardware crypto devices
+#
+#
+# SEC2.x Options
+#
+CONFIG_MPC8349E_SEC2x=y
+#
+# SEC2.x Test Options
+#
+CONFIG_MPC8349E_SEC2xTEST=y
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 56399c5c931a..840aad43a98b 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -135,7 +135,7 @@ int main(void)
        DEFINE(PACA_EXMC, offsetof(struct paca_struct, exmc));
        DEFINE(PACA_EXSLB, offsetof(struct paca_struct, exslb));
        DEFINE(PACAEMERGSP, offsetof(struct paca_struct, emergency_sp));
-        DEFINE(PACALPPACA, offsetof(struct paca_struct, lppaca));
+        DEFINE(PACALPPACAPTR, offsetof(struct paca_struct, lppaca_ptr));
        DEFINE(PACAHWCPUID, offsetof(struct paca_struct, hw_cpu_id));
        DEFINE(LPPACASRR0, offsetof(struct lppaca, saved_srr0));
diff --git a/arch/powerpc/kernel/cpu_setup_power4.S b/arch/powerpc/kernel/cpu_setup_power4.S
index cca942fe6115..b61d86e7ceb6 100644
--- a/arch/powerpc/kernel/cpu_setup_power4.S
+++ b/arch/powerpc/kernel/cpu_setup_power4.S
@@ -130,7 +130,7 @@ _GLOBAL(__save_cpu_setup)
        mfcr    r7
        /* Get storage ptr */
-        LOADADDR(r5,cpu_state_storage)
+        LOAD_REG_IMMEDIATE(r5,cpu_state_storage)
        /* We only deal with 970 for now */
        mfspr   r0,SPRN_PVR
@@ -164,7 +164,7 @@ _GLOBAL(__restore_cpu_setup)
        /* Get storage ptr (FIXME when using anton reloc as we
         * are running with translation disabled here
         */
-        LOADADDR(r5,cpu_state_storage)
+        LOAD_REG_IMMEDIATE(r5,cpu_state_storage)
        /* We only deal with 970 for now */
        mfspr   r0,SPRN_PVR
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 43c74a6b07b1..10696456a4c6 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -55,7 +55,8 @@ extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec);
 #define COMMON_USER_POWER4      (COMMON_USER_PPC64 | PPC_FEATURE_POWER4)
 #define COMMON_USER_POWER5      (COMMON_USER_PPC64 | PPC_FEATURE_POWER5)
 #define COMMON_USER_POWER5_PLUS (COMMON_USER_PPC64 | PPC_FEATURE_POWER5_PLUS)
+#define COMMON_USER_BOOKE       (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \
+                                 PPC_FEATURE_BOOKE)
 /* We only set the spe features if the kernel was compiled with
 * spe support
@@ -79,7 +80,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power3,
                .oprofile_cpu_type      = "ppc64/power3",
-                .oprofile_type          = RS64,
+                .oprofile_type          = PPC_OPROFILE_RS64,
+                .platform               = "power3",
        },
        {       /* Power3+ */
                .pvr_mask               = 0xffff0000,
@@ -92,7 +94,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power3,
                .oprofile_cpu_type      = "ppc64/power3",
-                .oprofile_type          = RS64,
+                .oprofile_type          = PPC_OPROFILE_RS64,
+                .platform               = "power3",
        },
        {       /* Northstar */
                .pvr_mask               = 0xffff0000,
@@ -105,7 +108,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power3,
                .oprofile_cpu_type      = "ppc64/rs64",
-                .oprofile_type          = RS64,
+                .oprofile_type          = PPC_OPROFILE_RS64,
+                .platform               = "rs64",
        },
        {       /* Pulsar */
                .pvr_mask               = 0xffff0000,
@@ -118,7 +122,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power3,
                .oprofile_cpu_type      = "ppc64/rs64",
-                .oprofile_type          = RS64,
+                .oprofile_type          = PPC_OPROFILE_RS64,
+                .platform               = "rs64",
        },
        {       /* I-star */
                .pvr_mask               = 0xffff0000,
@@ -131,7 +136,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power3,
                .oprofile_cpu_type      = "ppc64/rs64",
-                .oprofile_type          = RS64,
+                .oprofile_type          = PPC_OPROFILE_RS64,
+                .platform               = "rs64",
        },
        {       /* S-star */
                .pvr_mask               = 0xffff0000,
@@ -144,7 +150,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power3,
                .oprofile_cpu_type      = "ppc64/rs64",
-                .oprofile_type          = RS64,
+                .oprofile_type          = PPC_OPROFILE_RS64,
+                .platform               = "rs64",
        },
        {       /* Power4 */
                .pvr_mask               = 0xffff0000,
@@ -157,7 +164,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power4,
                .oprofile_cpu_type      = "ppc64/power4",
-                .oprofile_type          = POWER4,
+                .oprofile_type          = PPC_OPROFILE_POWER4,
+                .platform               = "power4",
        },
        {       /* Power4+ */
                .pvr_mask               = 0xffff0000,
@@ -170,7 +178,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power4,
                .oprofile_cpu_type      = "ppc64/power4",
-                .oprofile_type          = POWER4,
+                .oprofile_type          = PPC_OPROFILE_POWER4,
+                .platform               = "power4",
        },
        {       /* PPC970 */
                .pvr_mask               = 0xffff0000,
@@ -184,7 +193,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970",
-                .oprofile_type          = POWER4,
+                .oprofile_type          = PPC_OPROFILE_POWER4,
+                .platform               = "ppc970",
        },
 #endif /* CONFIG_PPC64 */
 #if defined(CONFIG_PPC64) || defined(CONFIG_POWER4)
@@ -204,7 +214,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970",
-                .oprofile_type          = POWER4,
+                .oprofile_type          = PPC_OPROFILE_POWER4,
+                .platform               = "ppc970",
        },
 #endif /* defined(CONFIG_PPC64) || defined(CONFIG_POWER4) */
 #ifdef CONFIG_PPC64
@@ -219,7 +230,8 @@ struct cpu_spec	cpu_specs[] = {
                .dcache_bsize           = 128,
                .cpu_setup              = __setup_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970",
-                .oprofile_type          = POWER4,
+                .oprofile_type          = PPC_OPROFILE_POWER4,
+                .platform               = "ppc970",
        },
        {       /* Power5 GR */
                .pvr_mask               = 0xffff0000,
@@ -232,7 +244,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_power4,
                .oprofile_cpu_type      = "ppc64/power5",
-                .oprofile_type          = POWER4,
+                .oprofile_type          = PPC_OPROFILE_POWER4,
+                .platform               = "power5",
        },
        {       /* Power5 GS */
                .pvr_mask               = 0xffff0000,
@@ -245,7 +258,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_power4,
                .oprofile_cpu_type      = "ppc64/power5+",
-                .oprofile_type          = POWER4,
+                .oprofile_type          = PPC_OPROFILE_POWER4,
+                .platform               = "power5+",
        },
        {       /* Cell Broadband Engine */
                .pvr_mask               = 0xffff0000,
@@ -257,6 +271,7 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 128,
                .dcache_bsize           = 128,
                .cpu_setup              = __setup_cpu_be,
+                .platform               = "ppc-cell-be",
        },
        {       /* default match */
                .pvr_mask               = 0x00000000,
@@ -268,6 +283,7 @@ struct cpu_spec	cpu_specs[] = {
                .dcache_bsize           = 128,
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_power4,
+                .platform               = "power4",
        }
 #endif  /* CONFIG_PPC64 */
 #ifdef CONFIG_PPC32
@@ -281,6 +297,7 @@ struct cpu_spec	cpu_specs[] = {
                        PPC_FEATURE_UNIFIED_CACHE | PPC_FEATURE_NO_TB,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc601",
        },
        {       /* 603 */
                .pvr_mask               = 0xffff0000,
@@ -290,7 +307,8 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_user_features      = COMMON_USER,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
-                .cpu_setup              = __setup_cpu_603
+                .cpu_setup              = __setup_cpu_603,
+                .platform               = "ppc603",
        },
        {       /* 603e */
                .pvr_mask               = 0xffff0000,
@@ -300,7 +318,8 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_user_features      = COMMON_USER,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
-                .cpu_setup              = __setup_cpu_603
+                .cpu_setup              = __setup_cpu_603,
+                .platform               = "ppc603",
        },
        {       /* 603ev */
                .pvr_mask               = 0xffff0000,
@@ -310,7 +329,8 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_user_features      = COMMON_USER,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
-                .cpu_setup              = __setup_cpu_603
+                .cpu_setup              = __setup_cpu_603,
+                .platform               = "ppc603",
        },
        {       /* 604 */
                .pvr_mask               = 0xffff0000,
@@ -321,7 +341,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 2,
-                .cpu_setup              = __setup_cpu_604
+                .cpu_setup              = __setup_cpu_604,
+                .platform               = "ppc604",
        },
        {       /* 604e */
                .pvr_mask               = 0xfffff000,
@@ -332,7 +353,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_604
+                .cpu_setup              = __setup_cpu_604,
+                .platform               = "ppc604",
        },
        {       /* 604r */
                .pvr_mask               = 0xffff0000,
@@ -343,7 +365,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_604
+                .cpu_setup              = __setup_cpu_604,
+                .platform               = "ppc604",
        },
        {       /* 604ev */
                .pvr_mask               = 0xffff0000,
@@ -354,7 +377,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_604
+                .cpu_setup              = __setup_cpu_604,
+                .platform               = "ppc604",
        },
        {       /* 740/750 (0x4202, don't support TAU ?) */
                .pvr_mask               = 0xffffffff,
@@ -365,7 +389,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_750
+                .cpu_setup              = __setup_cpu_750,
+                .platform               = "ppc750",
        },
        {       /* 750CX (80100 and 8010x?) */
                .pvr_mask               = 0xfffffff0,
@@ -376,7 +401,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_750cx
+                .cpu_setup              = __setup_cpu_750cx,
+                .platform               = "ppc750",
        },
        {       /* 750CX (82201 and 82202) */
                .pvr_mask               = 0xfffffff0,
@@ -387,7 +413,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_750cx
+                .cpu_setup              = __setup_cpu_750cx,
+                .platform               = "ppc750",
        },
        {       /* 750CXe (82214) */
                .pvr_mask               = 0xfffffff0,
@@ -398,7 +425,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_750cx
+                .cpu_setup              = __setup_cpu_750cx,
+                .platform               = "ppc750",
        },
        {       /* 750CXe "Gekko" (83214) */
                .pvr_mask               = 0xffffffff,
@@ -409,7 +437,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_750cx
+                .cpu_setup              = __setup_cpu_750cx,
+                .platform               = "ppc750",
        },
        {       /* 745/755 */
                .pvr_mask               = 0xfffff000,
@@ -420,7 +449,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_750
+                .cpu_setup              = __setup_cpu_750,
+                .platform               = "ppc750",
        },
        {       /* 750FX rev 1.x */
                .pvr_mask               = 0xffffff00,
@@ -431,7 +461,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_750
+                .cpu_setup              = __setup_cpu_750,
+                .platform               = "ppc750",
        },
        {       /* 750FX rev 2.0 must disable HID0[DPM] */
                .pvr_mask               = 0xffffffff,
@@ -442,7 +473,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_750
+                .cpu_setup              = __setup_cpu_750,
+                .platform               = "ppc750",
        },
        {       /* 750FX (All revs except 2.0) */
                .pvr_mask               = 0xffff0000,
@@ -453,7 +485,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_750fx
+                .cpu_setup              = __setup_cpu_750fx,
+                .platform               = "ppc750",
        },
        {       /* 750GX */
                .pvr_mask               = 0xffff0000,
@@ -464,7 +497,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_750fx
+                .cpu_setup              = __setup_cpu_750fx,
+                .platform               = "ppc750",
        },
        {       /* 740/750 (L2CR bit need fixup for 740) */
                .pvr_mask               = 0xffff0000,
@@ -475,7 +509,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_750
+                .cpu_setup              = __setup_cpu_750,
+                .platform               = "ppc750",
        },
        {       /* 7400 rev 1.1 ? (no TAU) */
                .pvr_mask               = 0xffffffff,
@@ -486,7 +521,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_7400
+                .cpu_setup              = __setup_cpu_7400,
+                .platform               = "ppc7400",
        },
        {       /* 7400 */
                .pvr_mask               = 0xffff0000,
@@ -497,7 +533,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_7400
+                .cpu_setup              = __setup_cpu_7400,
+                .platform               = "ppc7400",
        },
        {       /* 7410 */
                .pvr_mask               = 0xffff0000,
@@ -508,7 +545,8 @@ struct cpu_spec	cpu_specs[] = {
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
-                .cpu_setup              = __setup_cpu_7410
+                .cpu_setup              = __setup_cpu_7410,
+                .platform               = "ppc7400",
        },
        {       /* 7450 2.0 - no doze/nap */
                .pvr_mask               = 0xffffffff,
@@ -521,7 +559,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-                .oprofile_type          = G4,
+                .oprofile_type          = PPC_OPROFILE_G4,
+                .platform               = "ppc7450",
        },
        {       /* 7450 2.1 */
                .pvr_mask               = 0xffffffff,
@@ -534,7 +573,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-                .oprofile_type          = G4,
+                .oprofile_type          = PPC_OPROFILE_G4,
+                .platform               = "ppc7450",
        },
        {       /* 7450 2.3 and newer */
                .pvr_mask               = 0xffff0000,
@@ -547,7 +587,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-                .oprofile_type          = G4,
+                .oprofile_type          = PPC_OPROFILE_G4,
+                .platform               = "ppc7450",
        },
        {       /* 7455 rev 1.x */
                .pvr_mask               = 0xffffff00,
@@ -560,7 +601,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-                .oprofile_type          = G4,
+                .oprofile_type          = PPC_OPROFILE_G4,
+                .platform               = "ppc7450",
        },
        {       /* 7455 rev 2.0 */
                .pvr_mask               = 0xffffffff,
@@ -573,7 +615,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-                .oprofile_type          = G4,
+                .oprofile_type          = PPC_OPROFILE_G4,
+                .platform               = "ppc7450",
        },
        {       /* 7455 others */
                .pvr_mask               = 0xffff0000,
@@ -586,7 +629,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-                .oprofile_type          = G4,
+                .oprofile_type          = PPC_OPROFILE_G4,
+                .platform               = "ppc7450",
        },
        {       /* 7447/7457 Rev 1.0 */
                .pvr_mask               = 0xffffffff,
@@ -599,7 +643,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-                .oprofile_type          = G4,
+                .oprofile_type          = PPC_OPROFILE_G4,
+                .platform               = "ppc7450",
        },
        {       /* 7447/7457 Rev 1.1 */
                .pvr_mask               = 0xffffffff,
@@ -612,7 +657,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-                .oprofile_type          = G4,
+                .oprofile_type          = PPC_OPROFILE_G4,
+                .platform               = "ppc7450",
        },
        {       /* 7447/7457 Rev 1.2 and later */
                .pvr_mask               = 0xffff0000,
@@ -625,7 +671,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-                .oprofile_type          = G4,
+                .oprofile_type          = PPC_OPROFILE_G4,
+                .platform               = "ppc7450",
        },
        {       /* 7447A */
                .pvr_mask               = 0xffff0000,
@@ -638,7 +685,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-                .oprofile_type          = G4,
+                .oprofile_type          = PPC_OPROFILE_G4,
+                .platform               = "ppc7450",
        },
        {       /* 7448 */
                .pvr_mask               = 0xffff0000,
@@ -651,7 +699,8 @@ struct cpu_spec	cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-                .oprofile_type          = G4,
+                .oprofile_type          = PPC_OPROFILE_G4,
+                .platform               = "ppc7450",
        },
        {       /* 82xx (8240, 8245, 8260 are all 603e cores) */
                .pvr_mask               = 0x7fff0000,
@@ -661,7 +710,8 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_user_features      = COMMON_USER,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
-                .cpu_setup              = __setup_cpu_603
+                .cpu_setup              = __setup_cpu_603,
+                .platform               = "ppc603",
        },
        {       /* All G2_LE (603e core, plus some) have the same pvr */
                .pvr_mask               = 0x7fff0000,
@@ -671,7 +721,8 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_user_features      = COMMON_USER,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
-                .cpu_setup              = __setup_cpu_603
+                .cpu_setup              = __setup_cpu_603,
+                .platform               = "ppc603",
        },
        {       /* e300 (a 603e core, plus some) on 83xx */
                .pvr_mask               = 0x7fff0000,
@@ -681,7 +732,8 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_user_features      = COMMON_USER,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
-                .cpu_setup              = __setup_cpu_603
+                .cpu_setup              = __setup_cpu_603,
+                .platform               = "ppc603",
        },
        {       /* default match, we assume split I/D cache & TB (non-601)... */
                .pvr_mask               = 0x00000000,
@@ -691,6 +743,7 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_user_features      = COMMON_USER,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc603",
        },
 #endif /* CLASSIC_PPC */
 #ifdef CONFIG_8xx
@@ -704,6 +757,7 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
                .icache_bsize           = 16,
                .dcache_bsize           = 16,
+                .platform               = "ppc823",
        },
 #endif /* CONFIG_8xx */
 #ifdef CONFIG_40x
@@ -715,6 +769,7 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
                .icache_bsize           = 16,
                .dcache_bsize           = 16,
+                .platform               = "ppc403",
        },
        {       /* 403GCX */
                .pvr_mask               = 0xffffff00,
@@ -725,6 +780,7 @@ struct cpu_spec	cpu_specs[] = {
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_NO_TB,
                .icache_bsize           = 16,
                .dcache_bsize           = 16,
+                .platform               = "ppc403",
        },
        {       /* 403G ?? */
                .pvr_mask               = 0xffff0000,
@@ -734,6 +790,7 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
                .icache_bsize           = 16,
                .dcache_bsize           = 16,
+                .platform               = "ppc403",
        },
        {       /* 405GP */
                .pvr_mask               = 0xffff0000,
@@ -744,6 +801,7 @@ struct cpu_spec	cpu_specs[] = {
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc405",
        },
        {       /* STB 03xxx */
                .pvr_mask               = 0xffff0000,
@@ -754,6 +812,7 @@ struct cpu_spec	cpu_specs[] = {
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc405",
        },
        {       /* STB 04xxx */
                .pvr_mask               = 0xffff0000,
@@ -764,6 +823,7 @@ struct cpu_spec	cpu_specs[] = {
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc405",
        },
        {       /* NP405L */
                .pvr_mask               = 0xffff0000,
@@ -774,6 +834,7 @@ struct cpu_spec	cpu_specs[] = {
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc405",
        },
        {       /* NP4GS3 */
                .pvr_mask               = 0xffff0000,
@@ -784,6 +845,7 @@ struct cpu_spec	cpu_specs[] = {
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc405",
        },
        {   /* NP405H */
                .pvr_mask               = 0xffff0000,
@@ -794,6 +856,7 @@ struct cpu_spec	cpu_specs[] = {
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc405",
        },
        {       /* 405GPr */
                .pvr_mask               = 0xffff0000,
@@ -804,6 +867,7 @@ struct cpu_spec	cpu_specs[] = {
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc405",
        },
        {   /* STBx25xx */
                .pvr_mask               = 0xffff0000,
@@ -814,6 +878,7 @@ struct cpu_spec	cpu_specs[] = {
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc405",
        },
        {       /* 405LP */
                .pvr_mask               = 0xffff0000,
@@ -823,6 +888,7 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc405",
        },
        {       /* Xilinx Virtex-II Pro  */
                .pvr_mask               = 0xffff0000,
@@ -833,6 +899,7 @@ struct cpu_spec	cpu_specs[] = {
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc405",
        },
        {       /* 405EP */
                .pvr_mask               = 0xffff0000,
@@ -843,6 +910,7 @@ struct cpu_spec	cpu_specs[] = {
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc405",
        },
 #endif /* CONFIG_40x */
@@ -852,81 +920,90 @@ struct cpu_spec	cpu_specs[] = {
                .pvr_value              = 0x40000850,
                .cpu_name               = "440EP Rev. A",
                .cpu_features           = CPU_FTRS_44X,
-                .cpu_user_features      = COMMON_USER, /* 440EP has an FPU */
+                .cpu_user_features      = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc440",
        },
        {
                .pvr_mask               = 0xf0000fff,
                .pvr_value              = 0x400008d3,
                .cpu_name               = "440EP Rev. B",
                .cpu_features           = CPU_FTRS_44X,
-                .cpu_user_features      = COMMON_USER, /* 440EP has an FPU */
+                .cpu_user_features      = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc440",
        },
        {       /* 440GP Rev. B */
                .pvr_mask               = 0xf0000fff,
                .pvr_value              = 0x40000440,
                .cpu_name               = "440GP Rev. B",
                .cpu_features           = CPU_FTRS_44X,
-                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
+                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc440gp",
        },
        {       /* 440GP Rev. C */
                .pvr_mask               = 0xf0000fff,
                .pvr_value              = 0x40000481,
                .cpu_name               = "440GP Rev. C",
                .cpu_features           = CPU_FTRS_44X,
-                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
+                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc440gp",
        },
        { /* 440GX Rev. A */
                .pvr_mask               = 0xf0000fff,
                .pvr_value              = 0x50000850,
                .cpu_name               = "440GX Rev. A",
                .cpu_features           = CPU_FTRS_44X,
-                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
+                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc440",
        },
        { /* 440GX Rev. B */
                .pvr_mask               = 0xf0000fff,
                .pvr_value              = 0x50000851,
                .cpu_name               = "440GX Rev. B",
                .cpu_features           = CPU_FTRS_44X,
-                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
+                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc440",
        },
        { /* 440GX Rev. C */
                .pvr_mask               = 0xf0000fff,
                .pvr_value              = 0x50000892,
                .cpu_name               = "440GX Rev. C",
                .cpu_features           = CPU_FTRS_44X,
-                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
+                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc440",
        },
        { /* 440GX Rev. F */
                .pvr_mask               = 0xf0000fff,
                .pvr_value              = 0x50000894,
                .cpu_name               = "440GX Rev. F",
                .cpu_features           = CPU_FTRS_44X,
-                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
+                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc440",
        },
        { /* 440SP Rev. A */
                .pvr_mask               = 0xff000fff,
                .pvr_value              = 0x53000891,
                .cpu_name               = "440SP Rev. A",
                .cpu_features           = CPU_FTRS_44X,
-                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
+                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc440",
        },
        { /* 440SPe Rev. A */
                .pvr_mask               = 0xff000fff,
@@ -934,9 +1011,10 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_name               = "440SPe Rev. A",
                .cpu_features           = CPU_FTR_SPLIT_ID_CACHE |
                        CPU_FTR_USE_TB,
-                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
+                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "ppc440",
        },
 #endif /* CONFIG_44x */
 #ifdef CONFIG_FSL_BOOKE
@@ -946,10 +1024,11 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_name               = "e200z5",
                /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
                .cpu_features           = CPU_FTRS_E200,
-                .cpu_user_features      = PPC_FEATURE_32 |
+                .cpu_user_features      = COMMON_USER_BOOKE |
-                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_EFP_SINGLE |
+                        PPC_FEATURE_HAS_EFP_SINGLE |
                        PPC_FEATURE_UNIFIED_CACHE,
                .dcache_bsize           = 32,
+                .platform               = "ppc5554",
        },
        {       /* e200z6 */
                .pvr_mask               = 0xfff00000,
@@ -957,11 +1036,12 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_name               = "e200z6",
                /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
                .cpu_features           = CPU_FTRS_E200,
-                .cpu_user_features      = PPC_FEATURE_32 |
+                .cpu_user_features      = COMMON_USER_BOOKE |
-                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_SPE_COMP |
+                        PPC_FEATURE_SPE_COMP |
                        PPC_FEATURE_HAS_EFP_SINGLE |
                        PPC_FEATURE_UNIFIED_CACHE,
                .dcache_bsize           = 32,
+                .platform               = "ppc5554",
        },
        {       /* e500 */
                .pvr_mask               = 0xffff0000,
@@ -969,14 +1049,15 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_name               = "e500",
                /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
                .cpu_features           = CPU_FTRS_E500,
-                .cpu_user_features      = PPC_FEATURE_32 |
+                .cpu_user_features      = COMMON_USER_BOOKE |
-                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_SPE_COMP |
+                        PPC_FEATURE_SPE_COMP |
                        PPC_FEATURE_HAS_EFP_SINGLE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .oprofile_cpu_type      = "ppc/e500",
-                .oprofile_type          = BOOKE,
+                .oprofile_type          = PPC_OPROFILE_BOOKE,
+                .platform               = "ppc8540",
        },
        {       /* e500v2 */
                .pvr_mask               = 0xffff0000,
@@ -984,14 +1065,16 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_name               = "e500v2",
                /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
                .cpu_features           = CPU_FTRS_E500_2,
-                .cpu_user_features      = PPC_FEATURE_32 |
+                .cpu_user_features      = COMMON_USER_BOOKE |
-                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_SPE_COMP |
+                        PPC_FEATURE_SPE_COMP |
-                        PPC_FEATURE_HAS_EFP_SINGLE | PPC_FEATURE_HAS_EFP_DOUBLE,
+                        PPC_FEATURE_HAS_EFP_SINGLE |
+                        PPC_FEATURE_HAS_EFP_DOUBLE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .oprofile_cpu_type      = "ppc/e500",
-                .oprofile_type          = BOOKE,
+                .oprofile_type          = PPC_OPROFILE_BOOKE,
+                .platform               = "ppc8548",
        },
 #endif
 #if !CLASSIC_PPC
@@ -1003,6 +1086,7 @@ struct cpu_spec	cpu_specs[] = {
                .cpu_user_features      = PPC_FEATURE_32,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+                .platform               = "powerpc",
        }
 #endif /* !CLASSIC_PPC */
 #endif /* CONFIG_PPC32 */
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 036b71d2adfc..d8da2a35c0a4 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -988,7 +988,7 @@ _GLOBAL(enter_rtas)
        stwu    r1,-INT_FRAME_SIZE(r1)
        mflr    r0
        stw     r0,INT_FRAME_SIZE+4(r1)
-        LOADADDR(r4, rtas)
+        LOAD_REG_ADDR(r4, rtas)
        lis     r6,1f@ha        /* physical return address for rtas */
        addi    r6,r6,1f@l
        tophys(r6,r6)
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index aacebb33e98a..542036318866 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -511,7 +511,8 @@ restore:
        cmpdi   0,r5,0
        beq     4f
        /* Check for pending interrupts (iSeries) */
-        ld      r3,PACALPPACA+LPPACAANYINT(r13)
+        ld      r3,PACALPPACAPTR(r13)
+        ld      r3,LPPACAANYINT(r3)
        cmpdi   r3,0
        beq+    4f                      /* skip do_IRQ if no interrupts */
@@ -689,9 +690,8 @@ _GLOBAL(enter_rtas)
        std     r6,PACASAVEDMSR(r13)
        /* Setup our real return addr */        
-        SET_REG_TO_LABEL(r4,.rtas_return_loc)
+        LOAD_REG_ADDR(r4,.rtas_return_loc)
-        SET_REG_TO_CONST(r9,PAGE_OFFSET)
+        clrldi  r4,r4,2                 /* convert to realmode address */
-        sub     r4,r4,r9
        mtlr    r4
        li      r0,0
@@ -706,7 +706,7 @@ _GLOBAL(enter_rtas)
        sync                            /* disable interrupts so SRR0/1 */
        mtmsrd  r0                      /* don't get trashed */
-        SET_REG_TO_LABEL(r4,rtas)
+        LOAD_REG_ADDR(r4, rtas)
        ld      r5,RTASENTRY(r4)        /* get the rtas->entry value */
        ld      r4,RTASBASE(r4)         /* get the rtas->base value */
        
@@ -718,8 +718,7 @@ _GLOBAL(enter_rtas)
 _STATIC(rtas_return_loc)
        /* relocation is off at this point */
        mfspr   r4,SPRN_SPRG3           /* Get PACA */
-        SET_REG_TO_CONST(r5, PAGE_OFFSET)
+        clrldi  r4,r4,2                 /* convert to realmode address */
-        sub     r4,r4,r5                /* RELOC the PACA base pointer */
        mfmsr   r6
        li      r0,MSR_RI
@@ -728,7 +727,7 @@ _STATIC(rtas_return_loc)
        mtmsrd  r6
        
        ld      r1,PACAR1(r4)           /* Restore our SP */
-        LOADADDR(r3,.rtas_restore_regs)
+        LOAD_REG_IMMEDIATE(r3,.rtas_restore_regs)
        ld      r4,PACASAVEDMSR(r4)     /* Restore our MSR */
        mtspr   SPRN_SRR0,r3
diff --git a/arch/powerpc/kernel/fpu.S b/arch/powerpc/kernel/fpu.S
index b780b42c95fc..e4362dfa37fb 100644
--- a/arch/powerpc/kernel/fpu.S
+++ b/arch/powerpc/kernel/fpu.S
@@ -39,9 +39,9 @@ _GLOBAL(load_up_fpu)
 * to another.  Instead we call giveup_fpu in switch_to.
 */
 #ifndef CONFIG_SMP
-        LOADBASE(r3, last_task_used_math)
+        LOAD_REG_ADDRBASE(r3, last_task_used_math)
        toreal(r3)
-        PPC_LL  r4,OFF(last_task_used_math)(r3)
+        PPC_LL  r4,ADDROFF(last_task_used_math)(r3)
        PPC_LCMPI       0,r4,0
        beq     1f
        toreal(r4)
@@ -77,7 +77,7 @@ _GLOBAL(load_up_fpu)
 #ifndef CONFIG_SMP
        subi    r4,r5,THREAD
        fromreal(r4)
-        PPC_STL r4,OFF(last_task_used_math)(r3)
+        PPC_STL r4,ADDROFF(last_task_used_math)(r3)
 #endif /* CONFIG_SMP */
        /* restore registers and return */
        /* we haven't used ctr or xer or lr */
@@ -113,8 +113,8 @@ _GLOBAL(giveup_fpu)
 1:
 #ifndef CONFIG_SMP
        li      r5,0
-        LOADBASE(r4,last_task_used_math)
+        LOAD_REG_ADDRBASE(r4,last_task_used_math)
-        PPC_STL r5,OFF(last_task_used_math)(r4)
+        PPC_STL r5,ADDROFF(last_task_used_math)(r4)
 #endif /* CONFIG_SMP */
        blr
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 1c066d125375..308268466342 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -154,12 +154,12 @@ _GLOBAL(__secondary_hold)
        bne     100b
 #ifdef CONFIG_HMT
-        LOADADDR(r4, .hmt_init)
+        SET_REG_IMMEDIATE(r4, .hmt_init)
        mtctr   r4
        bctr
 #else
 #ifdef CONFIG_SMP
-        LOADADDR(r4, .pSeries_secondary_smp_init)
+        LOAD_REG_IMMEDIATE(r4, .pSeries_secondary_smp_init)
        mtctr   r4
        mr      r3,r24
        bctr
@@ -205,9 +205,10 @@ exception_marker:
 #define EX_LR           72
 /*
- * We're short on space and time in the exception prolog, so we can't use
+ * We're short on space and time in the exception prolog, so we can't
- * the normal LOADADDR macro. Normally we just need the low halfword of the
+ * use the normal SET_REG_IMMEDIATE macro. Normally we just need the
- * address, but for Kdump we need the whole low word.
+ * low halfword of the address, but for Kdump we need the whole low
+ * word.
 */
 #ifdef CONFIG_CRASH_DUMP
 #define LOAD_HANDLER(reg, label)                                        \
@@ -254,8 +255,9 @@ exception_marker:
 #define EXCEPTION_PROLOG_ISERIES_2                                      \
        mfmsr   r10;                                                    \
-        ld      r11,PACALPPACA+LPPACASRR0(r13);                         \
+        ld      r12,PACALPPACAPTR(r13);                                 \
-        ld      r12,PACALPPACA+LPPACASRR1(r13);                         \
+        ld      r11,LPPACASRR0(r12);                                    \
+        ld      r12,LPPACASRR1(r12);                                    \
        ori     r10,r10,MSR_RI;                                         \
        mtmsrd  r10,1
@@ -634,7 +636,8 @@ data_access_slb_iSeries:
        std     r12,PACA_EXSLB+EX_R12(r13)
        mfspr   r10,SPRN_SPRG1
        std     r10,PACA_EXSLB+EX_R13(r13)
-        ld      r12,PACALPPACA+LPPACASRR1(r13);
+        ld      r12,PACALPPACAPTR(r13)
+        ld      r12,LPPACASRR1(r12)
        b       .slb_miss_realmode
        STD_EXCEPTION_ISERIES(0x400, instruction_access, PACA_EXGEN)
@@ -644,7 +647,8 @@ instruction_access_slb_iSeries:
        mtspr   SPRN_SPRG1,r13          /* save r13 */
        mfspr   r13,SPRN_SPRG3          /* get paca address into r13 */
        std     r3,PACA_EXSLB+EX_R3(r13)
-        ld      r3,PACALPPACA+LPPACASRR0(r13)   /* get SRR0 value */
+        ld      r3,PACALPPACAPTR(r13)
+        ld      r3,LPPACASRR0(r3)       /* get SRR0 value */
        std     r9,PACA_EXSLB+EX_R9(r13)
        mfcr    r9
 #ifdef __DISABLED__
@@ -656,7 +660,8 @@ instruction_access_slb_iSeries:
        std     r12,PACA_EXSLB+EX_R12(r13)
        mfspr   r10,SPRN_SPRG1
        std     r10,PACA_EXSLB+EX_R13(r13)
-        ld      r12,PACALPPACA+LPPACASRR1(r13);
+        ld      r12,PACALPPACAPTR(r13)
+        ld      r12,LPPACASRR1(r12)
        b       .slb_miss_realmode
 #ifdef __DISABLED__
@@ -713,7 +718,7 @@ system_reset_iSeries:
        lbz     r23,PACAPROCSTART(r13)  /* Test if this processor
                                         * should start */
        sync
-        LOADADDR(r3,current_set)
+        LOAD_REG_IMMEDIATE(r3,current_set)
        sldi    r28,r24,3               /* get current_set[cpu#] */
        ldx     r3,r3,r28
        addi    r1,r3,THREAD_SIZE
@@ -745,17 +750,19 @@ iSeries_secondary_smp_loop:
        .globl decrementer_iSeries_masked
 decrementer_iSeries_masked:
        li      r11,1
-        stb     r11,PACALPPACA+LPPACADECRINT(r13)
+        ld      r12,PACALPPACAPTR(r13)
-        LOADBASE(r12,tb_ticks_per_jiffy)
+        stb     r11,LPPACADECRINT(r12)
-        lwz     r12,OFF(tb_ticks_per_jiffy)(r12)
+        LOAD_REG_ADDRBASE(r12,tb_ticks_per_jiffy)
+        lwz     r12,ADDROFF(tb_ticks_per_jiffy)(r12)
        mtspr   SPRN_DEC,r12
        /* fall through */
        .globl hardware_interrupt_iSeries_masked
 hardware_interrupt_iSeries_masked:
        mtcrf   0x80,r9         /* Restore regs */
-        ld      r11,PACALPPACA+LPPACASRR0(r13)
+        ld      r12,PACALPPACAPTR(r13)
-        ld      r12,PACALPPACA+LPPACASRR1(r13)
+        ld      r11,LPPACASRR0(r12)
+        ld      r12,LPPACASRR1(r12)
        mtspr   SPRN_SRR0,r11
        mtspr   SPRN_SRR1,r12
        ld      r9,PACA_EXGEN+EX_R9(r13)
@@ -994,7 +1001,8 @@ _GLOBAL(slb_miss_realmode)
        ld      r3,PACA_EXSLB+EX_R3(r13)
        lwz     r9,PACA_EXSLB+EX_CCR(r13)       /* get saved CR */
 #ifdef CONFIG_PPC_ISERIES
-        ld      r11,PACALPPACA+LPPACASRR0(r13)  /* get SRR0 value */
+        ld      r11,PACALPPACAPTR(r13)
+        ld      r11,LPPACASRR0(r11)             /* get SRR0 value */
 #endif /* CONFIG_PPC_ISERIES */
        mtlr    r10
@@ -1412,7 +1420,7 @@ _GLOBAL(pSeries_secondary_smp_init)
         * physical cpu id in r24, we need to search the pacas to find
         * which logical id maps to our physical one.
         */
-        LOADADDR(r13, paca)             /* Get base vaddr of paca array  */
+        LOAD_REG_IMMEDIATE(r13, paca)   /* Get base vaddr of paca array  */
        li      r5,0                    /* logical cpu id                */
 1:      lhz     r6,PACAHWCPUID(r13)     /* Load HW procid from paca      */
        cmpw    r6,r24                  /* Compare to our id             */
@@ -1446,8 +1454,8 @@ _GLOBAL(pSeries_secondary_smp_init)
 #ifdef CONFIG_PPC_ISERIES
 _STATIC(__start_initialization_iSeries)
        /* Clear out the BSS */
-        LOADADDR(r11,__bss_stop)
+        LOAD_REG_IMMEDIATE(r11,__bss_stop)
-        LOADADDR(r8,__bss_start)
+        LOAD_REG_IMMEDIATE(r8,__bss_start)
        sub     r11,r11,r8              /* bss size                     */
        addi    r11,r11,7               /* round up to an even double word */
        rldicl. r11,r11,61,3            /* shift right by 3             */
@@ -1458,17 +1466,17 @@ _STATIC(__start_initialization_iSeries)
 3:      stdu    r0,8(r8)
        bdnz    3b
 4:
-        LOADADDR(r1,init_thread_union)
+        LOAD_REG_IMMEDIATE(r1,init_thread_union)
        addi    r1,r1,THREAD_SIZE
        li      r0,0
        stdu    r0,-STACK_FRAME_OVERHEAD(r1)
-        LOADADDR(r3,cpu_specs)
+        LOAD_REG_IMMEDIATE(r3,cpu_specs)
-        LOADADDR(r4,cur_cpu_spec)
+        LOAD_REG_IMMEDIATE(r4,cur_cpu_spec)
        li      r5,0
        bl      .identify_cpu
-        LOADADDR(r2,__toc_start)
+        LOAD_REG_IMMEDIATE(r2,__toc_start)
        addi    r2,r2,0x4000
        addi    r2,r2,0x4000
@@ -1528,7 +1536,7 @@ _GLOBAL(__start_initialization_multiplatform)
        li      r24,0
        /* Switch off MMU if not already */
-        LOADADDR(r4, .__after_prom_start - KERNELBASE)
+        LOAD_REG_IMMEDIATE(r4, .__after_prom_start - KERNELBASE)
        add     r4,r4,r30
        bl      .__mmu_off
        b       .__after_prom_start
@@ -1548,7 +1556,7 @@ _STATIC(__boot_from_prom)
        /* put a relocation offset into r3 */
        bl      .reloc_offset
-        LOADADDR(r2,__toc_start)
+        LOAD_REG_IMMEDIATE(r2,__toc_start)
        addi    r2,r2,0x4000
        addi    r2,r2,0x4000
@@ -1588,9 +1596,9 @@ _STATIC(__after_prom_start)
 */
        bl      .reloc_offset
        mr      r26,r3
-        SET_REG_TO_CONST(r27,KERNELBASE)
+        LOAD_REG_IMMEDIATE(r27, KERNELBASE)
-        LOADADDR(r3, PHYSICAL_START)    /* target addr */
+        LOAD_REG_IMMEDIATE(r3, PHYSICAL_START)  /* target addr */
        // XXX FIXME: Use phys returned by OF (r30)
        add     r4,r27,r26              /* source addr                   */
@@ -1598,7 +1606,7 @@ _STATIC(__after_prom_start)
                                        /*   i.e. where we are running   */
                                        /*      the source addr          */
-        LOADADDR(r5,copy_to_here)       /* # bytes of memory to copy     */
+        LOAD_REG_IMMEDIATE(r5,copy_to_here) /* # bytes of memory to copy */
        sub     r5,r5,r27
        li      r6,0x100                /* Start offset, the first 0x100 */
@@ -1608,11 +1616,11 @@ _STATIC(__after_prom_start)
                                        /* this includes the code being  */
                                        /* executed here.                */
-        LOADADDR(r0, 4f)                /* Jump to the copy of this code */
+        LOAD_REG_IMMEDIATE(r0, 4f)      /* Jump to the copy of this code */
        mtctr   r0                      /* that we just made/relocated   */
        bctr
-4:      LOADADDR(r5,klimit)
+4:      LOAD_REG_IMMEDIATE(r5,klimit)
        add     r5,r5,r26
        ld      r5,0(r5)                /* get the value of klimit */
        sub     r5,r5,r27
@@ -1694,7 +1702,7 @@ _GLOBAL(pmac_secondary_start)
        mtmsrd  r3                      /* RI on */
        /* Set up a paca value for this processor. */
-        LOADADDR(r4, paca)               /* Get base vaddr of paca array        */
+        LOAD_REG_IMMEDIATE(r4, paca)    /* Get base vaddr of paca array */
        mulli   r13,r24,PACA_SIZE        /* Calculate vaddr of right paca */
        add     r13,r13,r4              /* for this processor.          */
        mtspr   SPRN_SPRG3,r13           /* Save vaddr of paca in SPRG3 */
@@ -1731,7 +1739,7 @@ _GLOBAL(__secondary_start)
        bl      .early_setup_secondary
        /* Initialize the kernel stack.  Just a repeat for iSeries.      */
-        LOADADDR(r3,current_set)
+        LOAD_REG_ADDR(r3, current_set)
        sldi    r28,r24,3               /* get current_set[cpu#]         */
        ldx     r1,r3,r28
        addi    r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
@@ -1742,8 +1750,8 @@ _GLOBAL(__secondary_start)
        mtlr    r7
        /* enable MMU and jump to start_secondary */
-        LOADADDR(r3,.start_secondary_prolog)
+        LOAD_REG_ADDR(r3, .start_secondary_prolog)
-        SET_REG_TO_CONST(r4, MSR_KERNEL)
+        LOAD_REG_IMMEDIATE(r4, MSR_KERNEL)
 #ifdef DO_SOFT_DISABLE
        ori     r4,r4,MSR_EE
 #endif
@@ -1792,8 +1800,8 @@ _STATIC(start_here_multiplatform)
         * be detached from the kernel completely. Besides, we need
         * to clear it now for kexec-style entry.
         */
-        LOADADDR(r11,__bss_stop)
+        LOAD_REG_IMMEDIATE(r11,__bss_stop)
-        LOADADDR(r8,__bss_start)
+        LOAD_REG_IMMEDIATE(r8,__bss_start)
        sub     r11,r11,r8              /* bss size                     */
        addi    r11,r11,7               /* round up to an even double word */
        rldicl. r11,r11,61,3            /* shift right by 3             */
@@ -1831,7 +1839,7 @@ _STATIC(start_here_multiplatform)
        /* up the htab.  This is done because we have relocated the  */
        /* kernel but are still running in real mode. */
-        LOADADDR(r3,init_thread_union)
+        LOAD_REG_IMMEDIATE(r3,init_thread_union)
        add     r3,r3,r26
        /* set up a stack pointer (physical address) */
@@ -1840,14 +1848,14 @@ _STATIC(start_here_multiplatform)
        stdu    r0,-STACK_FRAME_OVERHEAD(r1)
        /* set up the TOC (physical address) */
-        LOADADDR(r2,__toc_start)
+        LOAD_REG_IMMEDIATE(r2,__toc_start)
        addi    r2,r2,0x4000
        addi    r2,r2,0x4000
        add     r2,r2,r26
-        LOADADDR(r3,cpu_specs)
+        LOAD_REG_IMMEDIATE(r3, cpu_specs)
        add     r3,r3,r26
-        LOADADDR(r4,cur_cpu_spec)
+        LOAD_REG_IMMEDIATE(r4,cur_cpu_spec)
        add     r4,r4,r26
        mr      r5,r26
        bl      .identify_cpu
@@ -1863,11 +1871,11 @@ _STATIC(start_here_multiplatform)
         * nowhere it can be initialized differently before we reach this
         * code
         */
-        LOADADDR(r27, boot_cpuid)
+        LOAD_REG_IMMEDIATE(r27, boot_cpuid)
        add     r27,r27,r26
        lwz     r27,0(r27)
-        LOADADDR(r24, paca)             /* Get base vaddr of paca array  */
+        LOAD_REG_IMMEDIATE(r24, paca)   /* Get base vaddr of paca array  */
        mulli   r13,r27,PACA_SIZE       /* Calculate vaddr of right paca */
        add     r13,r13,r24             /* for this processor.           */
        add     r13,r13,r26             /* convert to physical addr      */
@@ -1880,8 +1888,8 @@ _STATIC(start_here_multiplatform)
        mr      r3,r31
        bl      .early_setup
-        LOADADDR(r3,.start_here_common)
+        LOAD_REG_IMMEDIATE(r3, .start_here_common)
-        SET_REG_TO_CONST(r4, MSR_KERNEL)
+        LOAD_REG_IMMEDIATE(r4, MSR_KERNEL)
        mtspr   SPRN_SRR0,r3
        mtspr   SPRN_SRR1,r4
        rfid
@@ -1895,7 +1903,7 @@ _STATIC(start_here_common)
        /* The following code sets up the SP and TOC now that we are */
        /* running with translation enabled. */
-        LOADADDR(r3,init_thread_union)
+        LOAD_REG_IMMEDIATE(r3,init_thread_union)
        /* set up the stack */
        addi    r1,r3,THREAD_SIZE
@@ -1908,16 +1916,16 @@ _STATIC(start_here_common)
        li      r3,0
        bl      .do_cpu_ftr_fixups
-        LOADADDR(r26, boot_cpuid)
+        LOAD_REG_IMMEDIATE(r26, boot_cpuid)
        lwz     r26,0(r26)
-        LOADADDR(r24, paca)             /* Get base vaddr of paca array  */
+        LOAD_REG_IMMEDIATE(r24, paca)   /* Get base vaddr of paca array  */
        mulli   r13,r26,PACA_SIZE       /* Calculate vaddr of right paca */
        add     r13,r13,r24             /* for this processor.           */
        mtspr   SPRN_SPRG3,r13
        /* ptr to current */
-        LOADADDR(r4,init_task)
+        LOAD_REG_IMMEDIATE(r4, init_task)
        std     r4,PACACURRENT(r13)
        /* Load the TOC */
@@ -1940,7 +1948,7 @@ _STATIC(start_here_common)
 _GLOBAL(hmt_init)
 #ifdef CONFIG_HMT
-        LOADADDR(r5, hmt_thread_data)
+        LOAD_REG_IMMEDIATE(r5, hmt_thread_data)
        mfspr   r7,SPRN_PVR
        srwi    r7,r7,16
        cmpwi   r7,0x34                 /* Pulsar  */
@@ -1961,7 +1969,7 @@ _GLOBAL(hmt_init)
        b       101f
 __hmt_secondary_hold:
-        LOADADDR(r5, hmt_thread_data)
+        LOAD_REG_IMMEDIATE(r5, hmt_thread_data)
        clrldi  r5,r5,4
        li      r7,0
        mfspr   r6,SPRN_PIR
@@ -1989,7 +1997,7 @@ __hmt_secondary_hold:
 #ifdef CONFIG_HMT
 _GLOBAL(hmt_start_secondary)
-        LOADADDR(r4,__hmt_secondary_hold)
+        LOAD_REG_IMMEDIATE(r4,__hmt_secondary_hold)
        clrldi  r4,r4,4
        mtspr   SPRN_NIADORM, r4
        mfspr   r4, SPRN_MSRDORM
diff --git a/arch/powerpc/kernel/idle_power4.S b/arch/powerpc/kernel/idle_power4.S
index 1494e2f177f7..c16b4afab582 100644
--- a/arch/powerpc/kernel/idle_power4.S
+++ b/arch/powerpc/kernel/idle_power4.S
@@ -38,14 +38,14 @@ END_FTR_SECTION_IFCLR(CPU_FTR_CAN_NAP)
        /* We must dynamically check for the NAP feature as it
         * can be cleared by CPU init after the fixups are done
         */
-        LOADBASE(r3,cur_cpu_spec)
+        LOAD_REG_ADDRBASE(r3,cur_cpu_spec)
-        ld      r4,OFF(cur_cpu_spec)(r3)
+        ld      r4,ADDROFF(cur_cpu_spec)(r3)
        ld      r4,CPU_SPEC_FEATURES(r4)
        andi.   r0,r4,CPU_FTR_CAN_NAP
        beqlr
        /* Now check if user or arch enabled NAP mode */
-        LOADBASE(r3,powersave_nap)
+        LOAD_REG_ADDRBASE(r3,powersave_nap)
-        lwz     r4,OFF(powersave_nap)(r3)
+        lwz     r4,ADDROFF(powersave_nap)(r3)
        cmpwi   0,r4,0
        beqlr
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 5651032d8706..d1fffce86df9 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -238,14 +238,10 @@ void do_IRQ(struct pt_regs *regs)
        irq_exit();
 #ifdef CONFIG_PPC_ISERIES
-        {
+        if (get_lppaca()->int_dword.fields.decr_int) {
-                struct paca_struct *lpaca = get_paca();
+                get_lppaca()->int_dword.fields.decr_int = 0;
+                /* Signal a fake decrementer interrupt */
-                if (lpaca->lppaca.int_dword.fields.decr_int) {
+                timer_interrupt(regs);
-                        lpaca->lppaca.int_dword.fields.decr_int = 0;
-                        /* Signal a fake decrementer interrupt */
-                        timer_interrupt(regs);
-                }
        }
 #endif
 }
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 9dda16ccde78..1ae96a8ed7e2 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -55,15 +55,13 @@ static unsigned long get_purr(void)
 {
        unsigned long sum_purr = 0;
        int cpu;
-        struct paca_struct *lpaca;
        for_each_cpu(cpu) {
-                lpaca = paca + cpu;
+                sum_purr += lppaca[cpu].emulated_time_base;
-                sum_purr += lpaca->lppaca.emulated_time_base;
 #ifdef PURR_DEBUG
                printk(KERN_INFO "get_purr for cpu (%d) has value (%ld) \n",
-                        cpu, lpaca->lppaca.emulated_time_base);
+                        cpu, lppaca[cpu].emulated_time_base);
 #endif
        }
        return sum_purr;
@@ -79,12 +77,11 @@ static int lparcfg_data(struct seq_file *m, void *v)
        unsigned long pool_id, lp_index;
        int shared, entitled_capacity, max_entitled_capacity;
        int processors, max_processors;
-        struct paca_struct *lpaca = get_paca();
        unsigned long purr = get_purr();
        seq_printf(m, "%s %s \n", MODULE_NAME, MODULE_VERS);
-        shared = (int)(lpaca->lppaca_ptr->shared_proc);
+        shared = (int)(get_lppaca()->shared_proc);
        seq_printf(m, "serial_number=%c%c%c%c%c%c%c\n",
                   e2a(xItExtVpdPanel.mfgID[2]),
                   e2a(xItExtVpdPanel.mfgID[3]),
@@ -402,7 +399,7 @@ static int lparcfg_data(struct seq_file *m, void *v)
                           (h_resource >> 0 * 8) & 0xffff);
                /* pool related entries are apropriate for shared configs */
-                if (paca[0].lppaca.shared_proc) {
+                if (lppaca[0].shared_proc) {
                        h_pic(&pool_idle_time, &pool_procs);
@@ -451,7 +448,7 @@ static int lparcfg_data(struct seq_file *m, void *v)
        seq_printf(m, "partition_potential_processors=%d\n",
                   partition_potential_processors);
-        seq_printf(m, "shared_processor_mode=%d\n", paca[0].lppaca.shared_proc);
+        seq_printf(m, "shared_processor_mode=%d\n", lppaca[0].shared_proc);
        return 0;
 }
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index 01d0d97a16e1..be982023409e 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -68,7 +68,7 @@ _GLOBAL(reloc_offset)
        mflr    r0
        bl      1f
 1:      mflr    r3
-        LOADADDR(r4,1b)
+        LOAD_REG_IMMEDIATE(r4,1b)
        subf    r3,r4,r3
        mtlr    r0
        blr
@@ -80,7 +80,7 @@ _GLOBAL(add_reloc_offset)
        mflr    r0
        bl      1f
 1:      mflr    r5
-        LOADADDR(r4,1b)
+        LOAD_REG_IMMEDIATE(r4,1b)
        subf    r5,r4,r5
        add     r3,r3,r5
        mtlr    r0
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index ae48a002f81a..2778cce058e2 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -39,7 +39,7 @@ _GLOBAL(reloc_offset)
        mflr    r0
        bl      1f
 1:      mflr    r3
-        LOADADDR(r4,1b)
+        LOAD_REG_IMMEDIATE(r4,1b)
        subf    r3,r4,r3
        mtlr    r0
        blr
@@ -51,7 +51,7 @@ _GLOBAL(add_reloc_offset)
        mflr    r0
        bl      1f
 1:      mflr    r5
-        LOADADDR(r4,1b)
+        LOAD_REG_IMMEDIATE(r4,1b)
        subf    r5,r4,r5
        add     r3,r3,r5
        mtlr    r0
@@ -498,15 +498,15 @@ _GLOBAL(identify_cpu)
 */
 _GLOBAL(do_cpu_ftr_fixups)
        /* Get CPU 0 features */
-        LOADADDR(r6,cur_cpu_spec)
+        LOAD_REG_IMMEDIATE(r6,cur_cpu_spec)
        sub     r6,r6,r3
        ld      r4,0(r6)
        sub     r4,r4,r3
        ld      r4,CPU_SPEC_FEATURES(r4)
        /* Get the fixup table */
-        LOADADDR(r6,__start___ftr_fixup)
+        LOAD_REG_IMMEDIATE(r6,__start___ftr_fixup)
        sub     r6,r6,r3
-        LOADADDR(r7,__stop___ftr_fixup)
+        LOAD_REG_IMMEDIATE(r7,__stop___ftr_fixup)
        sub     r7,r7,r3
        /* Do the fixup */
 1:      cmpld   r6,r7
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c
index 999bdd816769..5d1b708086bd 100644
--- a/arch/powerpc/kernel/paca.c
+++ b/arch/powerpc/kernel/paca.c
@@ -25,6 +25,28 @@
 * field correctly */
 extern unsigned long __toc_start;
+/*
+ * iSeries structure which the hypervisor knows about - this structure
+ * should not cross a page boundary.  The vpa_init/register_vpa call
+ * is now known to fail if the lppaca structure crosses a page
+ * boundary.  The lppaca is also used on POWER5 pSeries boxes.  The
+ * lppaca is 640 bytes long, and cannot readily change since the
+ * hypervisor knows its layout, so a 1kB alignment will suffice to
+ * ensure that it doesn't cross a page boundary.
+ */
+struct lppaca lppaca[] = {
+        [0 ... (NR_CPUS-1)] = {
+                .desc = 0xd397d781,     /* "LpPa" */
+                .size = sizeof(struct lppaca),
+                .dyn_proc_status = 2,
+                .decr_val = 0x00ff0000,
+                .fpregs_in_use = 1,
+                .end_of_quantum = 0xfffffffffffffffful,
+                .slb_count = 64,
+                .vmxregs_in_use = 0,
+        },
+};
 /* The Paca is an array with one entry per processor.  Each contains an
 * lppaca, which contains the information shared between the
 * hypervisor and Linux.
@@ -35,27 +57,17 @@ extern unsigned long __toc_start;
 * processor (not thread).
 */
 #define PACA_INIT_COMMON(number, start, asrr, asrv)                         \
+        .lppaca_ptr = &lppaca[number],                                      \
        .lock_token = 0x8000,                                               \
        .paca_index = (number),         /* Paca Index */                    \
        .kernel_toc = (unsigned long)(&__toc_start) + 0x8000UL,             \
        .stab_real = (asrr),            /* Real pointer to segment table */ \
        .stab_addr = (asrv),            /* Virt pointer to segment table */ \
        .cpu_start = (start),           /* Processor start */               \
-        .hw_cpu_id = 0xffff,                                                \
+        .hw_cpu_id = 0xffff,
-        .lppaca = {                                                         \
-                .desc = 0xd397d781,     /* "LpPa" */                        \
-                .size = sizeof(struct lppaca),                              \
-                .dyn_proc_status = 2,                                       \
-                .decr_val = 0x00ff0000,                                     \
-                .fpregs_in_use = 1,                                         \
-                .end_of_quantum = 0xfffffffffffffffful,                     \
-                .slb_count = 64,                                            \
-                .vmxregs_in_use = 0,                                        \
-        },                                                                  \
 #ifdef CONFIG_PPC_ISERIES
 #define PACA_INIT_ISERIES(number)                                           \
-        .lppaca_ptr = &paca[number].lppaca,                                 \
        .reg_save_ptr = &iseries_reg_save[number],
 #define PACA_INIT(number)                                                   \
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index 16d9a904f3cb..d9a459c144d8 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -230,8 +230,7 @@ EXPORT_SYMBOL(__down_interruptible);
 EXPORT_SYMBOL(cpm_install_handler);
 EXPORT_SYMBOL(cpm_free_handler);
 #endif /* CONFIG_8xx */
-#if defined(CONFIG_8xx) || defined(CONFIG_40x) || defined(CONFIG_85xx) ||\
+#if defined(CONFIG_8xx) || defined(CONFIG_40x)
-        defined(CONFIG_83xx)
 EXPORT_SYMBOL(__res);
 #endif
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 02e2115323e4..d50c8df0183e 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -1627,6 +1627,11 @@ static void of_node_release(struct kref *kref)
                kfree(prop->value);
                kfree(prop);
                prop = next;
+                if (!prop) {
+                        prop = node->deadprops;
+                        node->deadprops = NULL;
+                }
        }
        kfree(node->intrs);
        kfree(node->full_name);
@@ -1774,22 +1779,32 @@ static int __init prom_reconfig_setup(void)
 __initcall(prom_reconfig_setup);
 #endif
-/*
+struct property *of_find_property(struct device_node *np, const char *name,
- * Find a property with a given name for a given node
+                                  int *lenp)
- * and return the value.
- */
-unsigned char *get_property(struct device_node *np, const char *name,
-                            int *lenp)
 {
        struct property *pp;
+        read_lock(&devtree_lock);
        for (pp = np->properties; pp != 0; pp = pp->next)
                if (strcmp(pp->name, name) == 0) {
                        if (lenp != 0)
                                *lenp = pp->length;
-                        return pp->value;
+                        break;
                }
-        return NULL;
+        read_unlock(&devtree_lock);
+        return pp;
+}
+/*
+ * Find a property with a given name for a given node
+ * and return the value.
+ */
+unsigned char *get_property(struct device_node *np, const char *name,
+                            int *lenp)
+{
+        struct property *pp = of_find_property(np,name,lenp);
+        return pp ? pp->value : NULL;
 }
 EXPORT_SYMBOL(get_property);
@@ -1823,4 +1838,82 @@ int prom_add_property(struct device_node* np, struct property* prop)
        return 0;
 }
+/*
+ * Remove a property from a node.  Note that we don't actually
+ * remove it, since we have given out who-knows-how-many pointers
+ * to the data using get-property.  Instead we just move the property
+ * to the "dead properties" list, so it won't be found any more.
+ */
+int prom_remove_property(struct device_node *np, struct property *prop)
+{
+        struct property **next;
+        int found = 0;
+        write_lock(&devtree_lock);
+        next = &np->properties;
+        while (*next) {
+                if (*next == prop) {
+                        /* found the node */
+                        *next = prop->next;
+                        prop->next = np->deadprops;
+                        np->deadprops = prop;
+                        found = 1;
+                        break;
+                }
+                next = &(*next)->next;
+        }
+        write_unlock(&devtree_lock);
+        if (!found)
+                return -ENODEV;
+#ifdef CONFIG_PROC_DEVICETREE
+        /* try to remove the proc node as well */
+        if (np->pde)
+                proc_device_tree_remove_prop(np->pde, prop);
+#endif /* CONFIG_PROC_DEVICETREE */
+        return 0;
+}
+/*
+ * Update a property in a node.  Note that we don't actually
+ * remove it, since we have given out who-knows-how-many pointers
+ * to the data using get-property.  Instead we just move the property
+ * to the "dead properties" list, and add the new property to the
+ * property list
+ */
+int prom_update_property(struct device_node *np,
+                         struct property *newprop,
+                         struct property *oldprop)
+{
+        struct property **next;
+        int found = 0;
+        write_lock(&devtree_lock);
+        next = &np->properties;
+        while (*next) {
+                if (*next == oldprop) {
+                        /* found the node */
+                        newprop->next = oldprop->next;
+                        *next = newprop;
+                        oldprop->next = np->deadprops;
+                        np->deadprops = oldprop;
+                        found = 1;
+                        break;
+                }
+                next = &(*next)->next;
+        }
+        write_unlock(&devtree_lock);
+        if (!found)
+                return -ENODEV;
+#ifdef CONFIG_PROC_DEVICETREE
+        /* try to add to proc as well if it was initialized */
+        if (np->pde)
+                proc_device_tree_update_prop(np->pde, newprop, oldprop);
+#endif /* CONFIG_PROC_DEVICETREE */
+        return 0;
+}
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index 309ae1d5fa77..a8099c806150 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -113,7 +113,8 @@ static unsigned int of_bus_default_get_flags(u32 *addr)
 static int of_bus_pci_match(struct device_node *np)
 {
-        return !strcmp(np->type, "pci");
+        /* "vci" is for the /chaos bridge on 1st-gen PCI powermacs */
+        return !strcmp(np->type, "pci") || !strcmp(np->type, "vci");
 }
 static void of_bus_pci_count_cells(struct device_node *np,
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 4b9cfe4637b1..7fe4a5c944c9 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -36,6 +36,11 @@ struct rtas_t rtas = {
        .lock = SPIN_LOCK_UNLOCKED
 };
+struct rtas_suspend_me_data {
+        long waiting;
+        struct rtas_args *args;
+};
 EXPORT_SYMBOL(rtas);
 DEFINE_SPINLOCK(rtas_data_buf_lock);
@@ -556,6 +561,80 @@ void rtas_os_term(char *str)
        } while (status == RTAS_BUSY);
 }
+static int ibm_suspend_me_token = RTAS_UNKNOWN_SERVICE;
+#ifdef CONFIG_PPC_PSERIES
+static void rtas_percpu_suspend_me(void *info)
+{
+        long rc;
+        long flags;
+        struct rtas_suspend_me_data *data =
+                (struct rtas_suspend_me_data *)info;
+        /*
+         * We use "waiting" to indicate our state.  As long
+         * as it is >0, we are still trying to all join up.
+         * If it goes to 0, we have successfully joined up and
+         * one thread got H_Continue.  If any error happens,
+         * we set it to <0.
+         */
+        local_irq_save(flags);
+        do {
+                rc = plpar_hcall_norets(H_JOIN);
+                smp_rmb();
+        } while (rc == H_Success && data->waiting > 0);
+        if (rc == H_Success)
+                goto out;
+        if (rc == H_Continue) {
+                data->waiting = 0;
+                rtas_call(ibm_suspend_me_token, 0, 1,
+                          data->args->args);
+        } else {
+                data->waiting = -EBUSY;
+                printk(KERN_ERR "Error on H_Join hypervisor call\n");
+        }
+out:
+        /* before we restore interrupts, make sure we don't
+         * generate a spurious soft lockup errors
+         */
+        touch_softlockup_watchdog();
+        local_irq_restore(flags);
+        return;
+}
+static int rtas_ibm_suspend_me(struct rtas_args *args)
+{
+        int i;
+        struct rtas_suspend_me_data data;
+        data.waiting = 1;
+        data.args = args;
+        /* Call function on all CPUs.  One of us will make the
+         * rtas call
+         */
+        if (on_each_cpu(rtas_percpu_suspend_me, &data, 1, 0))
+                data.waiting = -EINVAL;
+        if (data.waiting != 0)
+                printk(KERN_ERR "Error doing global join\n");
+        /* Prod each CPU.  This won't hurt, and will wake
+         * anyone we successfully put to sleep with H_Join
+         */
+        for_each_cpu(i)
+                plpar_hcall_norets(H_PROD, i);
+        return data.waiting;
+}
+#else /* CONFIG_PPC_PSERIES */
+static int rtas_ibm_suspend_me(struct rtas_args *args)
+{
+        return -ENOSYS;
+}
+#endif
 asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
 {
@@ -563,6 +642,7 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
        unsigned long flags;
        char *buff_copy, *errbuf = NULL;
        int nargs;
+        int rc;
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
@@ -581,6 +661,17 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
                           nargs * sizeof(rtas_arg_t)) != 0)
                return -EFAULT;
+        if (args.token == RTAS_UNKNOWN_SERVICE)
+                return -EINVAL;
+        /* Need to handle ibm,suspend_me call specially */
+        if (args.token == ibm_suspend_me_token) {
+                rc = rtas_ibm_suspend_me(&args);
+                if (rc)
+                        return rc;
+                goto copy_return;
+        }
        buff_copy = get_errorlog_buffer();
        spin_lock_irqsave(&rtas.lock, flags);
@@ -604,6 +695,7 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
                kfree(buff_copy);
        }
+ copy_return:
        /* Copy out args. */
        if (copy_to_user(uargs->args + nargs,
                         args.args + nargs,
@@ -675,8 +767,10 @@ void __init rtas_initialize(void)
         * the stop-self token if any
         */
 #ifdef CONFIG_PPC64
-        if (_machine == PLATFORM_PSERIES_LPAR)
+        if (_machine == PLATFORM_PSERIES_LPAR) {
                rtas_region = min(lmb.rmo_size, RTAS_INSTANTIATE_MAX);
+                ibm_suspend_me_token = rtas_token("ibm,suspend-me");
+        }
 #endif
        rtas_rmo_buf = lmb_alloc_base(RTAS_RMOBUF_MAX, PAGE_SIZE, rtas_region);
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index d5c52fae023a..be12041c0fc5 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -100,7 +100,8 @@ void machine_shutdown(void)
 void machine_restart(char *cmd)
 {
        machine_shutdown();
-        ppc_md.restart(cmd);
+        if (ppc_md.restart)
+                ppc_md.restart(cmd);
 #ifdef CONFIG_SMP
        smp_send_stop();
 #endif
@@ -112,7 +113,8 @@ void machine_restart(char *cmd)
 void machine_power_off(void)
 {
        machine_shutdown();
-        ppc_md.power_off();
+        if (ppc_md.power_off)
+                ppc_md.power_off();
 #ifdef CONFIG_SMP
        smp_send_stop();
 #endif
@@ -129,7 +131,8 @@ EXPORT_SYMBOL_GPL(pm_power_off);
 void machine_halt(void)
 {
        machine_shutdown();
-        ppc_md.halt();
+        if (ppc_md.halt)
+                ppc_md.halt();
 #ifdef CONFIG_SMP
        smp_send_stop();
 #endif
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 56f50e91bddb..c4a294d657b9 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -431,7 +431,7 @@ void timer_interrupt(struct pt_regs * regs)
        profile_tick(CPU_PROFILING, regs);
 #ifdef CONFIG_PPC_ISERIES
-        get_paca()->lppaca.int_dword.fields.decr_int = 0;
+        get_lppaca()->int_dword.fields.decr_int = 0;
 #endif
        while ((ticks = tb_ticks_since(per_cpu(last_jiffy, cpu)))
diff --git a/arch/powerpc/lib/locks.c b/arch/powerpc/lib/locks.c
index 35bd03c41dd1..8362fa272ca5 100644
--- a/arch/powerpc/lib/locks.c
+++ b/arch/powerpc/lib/locks.c
@@ -28,15 +28,13 @@
 void __spin_yield(raw_spinlock_t *lock)
 {
        unsigned int lock_value, holder_cpu, yield_count;
-        struct paca_struct *holder_paca;
        lock_value = lock->slock;
        if (lock_value == 0)
                return;
        holder_cpu = lock_value & 0xffff;
        BUG_ON(holder_cpu >= NR_CPUS);
-        holder_paca = &paca[holder_cpu];
+        yield_count = lppaca[holder_cpu].yield_count;
-        yield_count = holder_paca->lppaca.yield_count;
        if ((yield_count & 1) == 0)
                return;         /* virtual cpu is currently running */
        rmb();
@@ -60,15 +58,13 @@ void __rw_yield(raw_rwlock_t *rw)
 {
        int lock_value;
        unsigned int holder_cpu, yield_count;
-        struct paca_struct *holder_paca;
        lock_value = rw->lock;
        if (lock_value >= 0)
                return;         /* no write lock at present */
        holder_cpu = lock_value & 0xffff;
        BUG_ON(holder_cpu >= NR_CPUS);
-        holder_paca = &paca[holder_cpu];
+        yield_count = lppaca[holder_cpu].yield_count;
-        yield_count = holder_paca->lppaca.yield_count;
        if ((yield_count & 1) == 0)
                return;         /* virtual cpu is currently running */
        rmb();
diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index 71615eb70b2b..cc2535be3a73 100644
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -140,19 +140,19 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
        switch (cur_cpu_spec->oprofile_type) {
 #ifdef CONFIG_PPC64
-                case RS64:
+                case PPC_OPROFILE_RS64:
                        model = &op_model_rs64;
                        break;
-                case POWER4:
+                case PPC_OPROFILE_POWER4:
                        model = &op_model_power4;
                        break;
 #else
-                case G4:
+                case PPC_OPROFILE_G4:
                        model = &op_model_7450;
                        break;
 #endif
 #ifdef CONFIG_FSL_BOOKE
-                case BOOKE:
+                case PPC_OPROFILE_BOOKE:
                        model = &op_model_fsl_booke;
                        break;
 #endif
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index b20812d460e6..7675e675dce1 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -7,6 +7,7 @@ choice
 config MPC834x_SYS
        bool "Freescale MPC834x SYS"
+        select DEFAULT_UIMAGE
        help
          This option enables support for the MPC 834x SYS evaluation board.
diff --git a/arch/powerpc/platforms/83xx/mpc834x_sys.c b/arch/powerpc/platforms/83xx/mpc834x_sys.c
new file mode 100644
index 000000000000..2098dd05a773
--- /dev/null
+++ b/arch/powerpc/platforms/83xx/mpc834x_sys.c
@@ -0,0 +1,243 @@
+/*
+ * arch/powerpc/platforms/83xx/mpc834x_sys.c
+ *
+ * MPC834x SYS board specific routines
+ *
+ * Maintainer: Kumar Gala <galak@kernel.crashing.org>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#include <linux/config.h>
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/reboot.h>
+#include <linux/pci.h>
+#include <linux/kdev_t.h>
+#include <linux/major.h>
+#include <linux/console.h>
+#include <linux/delay.h>
+#include <linux/seq_file.h>
+#include <linux/root_dev.h>
+#include <linux/module.h>
+#include <linux/fsl_devices.h>
+#include <asm/system.h>
+#include <asm/pgtable.h>
+#include <asm/page.h>
+#include <asm/atomic.h>
+#include <asm/time.h>
+#include <asm/io.h>
+#include <asm/machdep.h>
+#include <asm/ipic.h>
+#include <asm/bootinfo.h>
+#include <asm/pci-bridge.h>
+#include <asm/mpc83xx.h>
+#include <asm/irq.h>
+#include <mm/mmu_decl.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <sysdev/fsl_soc.h>
+#include "mpc83xx.h"
+#ifndef CONFIG_PCI
+unsigned long isa_io_base = 0;
+unsigned long isa_mem_base = 0;
+#endif
+#ifdef CONFIG_PCI
+extern int mpc83xx_pci2_busno;
+static int
+mpc83xx_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
+{
+        static char pci_irq_table[][4] =
+            /*
+             *      PCI IDSEL/INTPIN->INTLINE
+             *       A      B      C      D
+             */
+        {
+                {PIRQA, PIRQB, PIRQC, PIRQD},   /* idsel 0x11 */
+                {PIRQC, PIRQD, PIRQA, PIRQB},   /* idsel 0x12 */
+                {PIRQD, PIRQA, PIRQB, PIRQC},   /* idsel 0x13 */
+                {0, 0, 0, 0},
+                {PIRQA, PIRQB, PIRQC, PIRQD},   /* idsel 0x15 */
+                {PIRQD, PIRQA, PIRQB, PIRQC},   /* idsel 0x16 */
+                {PIRQC, PIRQD, PIRQA, PIRQB},   /* idsel 0x17 */
+                {PIRQB, PIRQC, PIRQD, PIRQA},   /* idsel 0x18 */
+                {0, 0, 0, 0},                   /* idsel 0x19 */
+                {0, 0, 0, 0},                   /* idsel 0x20 */
+        };
+        const long min_idsel = 0x11, max_idsel = 0x20, irqs_per_slot = 4;
+        return PCI_IRQ_TABLE_LOOKUP;
+}
+static int
+mpc83xx_exclude_device(u_char bus, u_char devfn)
+{
+        if (bus == 0 && PCI_SLOT(devfn) == 0)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+        if (mpc83xx_pci2_busno)
+                if (bus == (mpc83xx_pci2_busno) && PCI_SLOT(devfn) == 0)
+                        return PCIBIOS_DEVICE_NOT_FOUND;
+        return PCIBIOS_SUCCESSFUL;
+}
+#endif /* CONFIG_PCI */
+/* ************************************************************************
+ *
+ * Setup the architecture
+ *
+ */
+static void __init
+mpc834x_sys_setup_arch(void)
+{
+        struct device_node *np;
+        if (ppc_md.progress)
+                ppc_md.progress("mpc834x_sys_setup_arch()", 0);
+        np = of_find_node_by_type(NULL, "cpu");
+        if (np != 0) {
+                unsigned int *fp = (int *) get_property(np, "clock-frequency", NULL);
+                if (fp != 0)
+                        loops_per_jiffy = *fp / HZ;
+                else
+                        loops_per_jiffy = 50000000 / HZ;
+                of_node_put(np);
+        }
+#ifdef CONFIG_PCI
+        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
+                add_bridge(np);
+        ppc_md.pci_swizzle = common_swizzle;
+        ppc_md.pci_map_irq = mpc83xx_map_irq;
+        ppc_md.pci_exclude_device = mpc83xx_exclude_device;
+#endif
+#ifdef  CONFIG_ROOT_NFS
+                ROOT_DEV = Root_NFS;
+#else
+                ROOT_DEV = Root_HDA1;
+#endif
+}
+void __init
+mpc834x_sys_init_IRQ(void)
+{
+        u8 senses[8] = {
+                0,                      /* EXT 0 */
+                IRQ_SENSE_LEVEL,        /* EXT 1 */
+                IRQ_SENSE_LEVEL,        /* EXT 2 */
+                0,                      /* EXT 3 */
+#ifdef CONFIG_PCI
+                IRQ_SENSE_LEVEL,        /* EXT 4 */
+                IRQ_SENSE_LEVEL,        /* EXT 5 */
+                IRQ_SENSE_LEVEL,        /* EXT 6 */
+                IRQ_SENSE_LEVEL,        /* EXT 7 */
+#else
+                0,                      /* EXT 4 */
+                0,                      /* EXT 5 */
+                0,                      /* EXT 6 */
+                0,                      /* EXT 7 */
+#endif
+        };
+        ipic_init(get_immrbase() + 0x00700, 0, 0, senses, 8);
+        /* Initialize the default interrupt mapping priorities,
+         * in case the boot rom changed something on us.
+         */
+        ipic_set_default_priority();
+}
+#if defined(CONFIG_I2C_MPC) && defined(CONFIG_SENSORS_DS1374)
+extern ulong    ds1374_get_rtc_time(void);
+extern int      ds1374_set_rtc_time(ulong);
+static int __init
+mpc834x_rtc_hookup(void)
+{
+        struct timespec tv;
+        ppc_md.get_rtc_time = ds1374_get_rtc_time;
+        ppc_md.set_rtc_time = ds1374_set_rtc_time;
+        tv.tv_nsec = 0;
+        tv.tv_sec = (ppc_md.get_rtc_time)();
+        do_settimeofday(&tv);
+        return 0;
+}
+late_initcall(mpc834x_rtc_hookup);
+#endif
+static void
+mpc83xx_restart(char *cmd)
+{
+#define RST_OFFSET      0x00000900
+#define RST_PROT_REG    0x00000018
+#define RST_CTRL_REG    0x0000001c
+        __be32 __iomem *reg;
+        // map reset register space
+        reg = ioremap(get_immrbase() + 0x900, 0xff);
+        local_irq_disable();
+        /* enable software reset "RSTE" */
+        out_be32(reg + (RST_PROT_REG >> 2), 0x52535445);
+        /* set software hard reset */
+        out_be32(reg + (RST_CTRL_REG >> 2), 0x52535445);
+        for(;;);
+}
+static long __init
+mpc83xx_time_init(void)
+{
+#define SPCR_OFFSET     0x00000110
+#define SPCR_TBEN       0x00400000
+        __be32 __iomem *spcr = ioremap(get_immrbase() + SPCR_OFFSET, 4);
+        __be32 tmp;
+        tmp = in_be32(spcr);
+        out_be32(spcr, tmp|SPCR_TBEN);
+        iounmap(spcr);
+        return 0;
+}
+void __init
+platform_init(void)
+{
+        /* setup the PowerPC module struct */
+        ppc_md.setup_arch = mpc834x_sys_setup_arch;
+        ppc_md.init_IRQ = mpc834x_sys_init_IRQ;
+        ppc_md.get_irq = ipic_get_irq;
+        ppc_md.restart = mpc83xx_restart;
+        ppc_md.time_init = mpc83xx_time_init;
+        ppc_md.set_rtc_time = NULL;
+        ppc_md.get_rtc_time = NULL;
+        ppc_md.calibrate_decr = generic_calibrate_decr;
+        ppc_md.progress = udbg_progress;
+        if (ppc_md.progress)
+                ppc_md.progress("mpc834x_sys_init(): exit", 0);
+        return;
+}
diff --git a/arch/powerpc/platforms/83xx/mpc834x_sys.h b/arch/powerpc/platforms/83xx/mpc834x_sys.h
new file mode 100644
index 000000000000..e4ca39f6a862
--- /dev/null
+++ b/arch/powerpc/platforms/83xx/mpc834x_sys.h
@@ -0,0 +1,23 @@
+/*
+ * arch/powerppc/platforms/83xx/mpc834x_sys.h
+ *
+ * MPC834X SYS common board definitions
+ *
+ * Maintainer: Kumar Gala <galak@kernel.crashing.org>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+#ifndef __MACH_MPC83XX_SYS_H__
+#define __MACH_MPC83XX_SYS_H__
+#define PIRQA   MPC83xx_IRQ_EXT4
+#define PIRQB   MPC83xx_IRQ_EXT5
+#define PIRQC   MPC83xx_IRQ_EXT6
+#define PIRQD   MPC83xx_IRQ_EXT7
+#endif                /* __MACH_MPC83XX_SYS_H__ */
diff --git a/arch/powerpc/platforms/83xx/mpc83xx.h b/arch/powerpc/platforms/83xx/mpc83xx.h
new file mode 100644
index 000000000000..ce9e66abef24
--- /dev/null
+++ b/arch/powerpc/platforms/83xx/mpc83xx.h
@@ -0,0 +1,14 @@
+#ifndef __MPC83XX_H__
+#define __MPC83XX_H__
+#include <linux/init.h>
+#include <linux/device.h>
+/*
+ * Declaration for the various functions exported by the
+ * mpc83xx_* files. Mostly for use by mpc83xx_setup
+ */
+extern int add_bridge(struct device_node *dev);
+#endif /* __MPC83XX_H__ */
diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c
new file mode 100644
index 000000000000..469cdacc5bd4
--- /dev/null
+++ b/arch/powerpc/platforms/83xx/pci.c
@@ -0,0 +1,99 @@
+/*
+ * FSL SoC setup code
+ *
+ * Maintained by Kumar Gala (see MAINTAINERS for contact information)
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#include <linux/config.h>
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/module.h>
+#include <asm/system.h>
+#include <asm/atomic.h>
+#include <asm/io.h>
+#include <asm/pci-bridge.h>
+#include <asm/prom.h>
+#include <sysdev/fsl_soc.h>
+#undef DEBUG
+#ifdef DEBUG
+#define DBG(x...) printk(x)
+#else
+#define DBG(x...)
+#endif
+int mpc83xx_pci2_busno;
+#ifdef CONFIG_PCI
+int __init add_bridge(struct device_node *dev)
+{
+        int len;
+        struct pci_controller *hose;
+        struct resource rsrc;
+        int *bus_range;
+        int primary = 1, has_address = 0;
+        phys_addr_t immr = get_immrbase();
+        DBG("Adding PCI host bridge %s\n", dev->full_name);
+        /* Fetch host bridge registers address */
+        has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
+        /* Get bus range if any */
+        bus_range = (int *) get_property(dev, "bus-range", &len);
+        if (bus_range == NULL || len < 2 * sizeof(int)) {
+                printk(KERN_WARNING "Can't get bus-range for %s, assume"
+                       " bus 0\n", dev->full_name);
+        }
+        hose = pcibios_alloc_controller();
+        if (!hose)
+                return -ENOMEM;
+        hose->arch_data = dev;
+        hose->set_cfg_type = 1;
+        hose->first_busno = bus_range ? bus_range[0] : 0;
+        hose->last_busno = bus_range ? bus_range[1] : 0xff;
+        /* MPC83xx supports up to two host controllers one at 0x8500 from immrbar
+         * the other at 0x8600, we consider the 0x8500 the primary controller
+         */
+        /* PCI 1 */
+        if ((rsrc.start & 0xfffff) == 0x8500) {
+                setup_indirect_pci(hose, immr + 0x8300, immr + 0x8304);
+        }
+        /* PCI 2*/
+        if ((rsrc.start & 0xfffff) == 0x8600) {
+                setup_indirect_pci(hose, immr + 0x8380, immr + 0x8384);
+                primary = 0;
+                hose->bus_offset = hose->first_busno;
+                mpc83xx_pci2_busno = hose->first_busno;
+        }
+        printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%08lx. "
+               "Firmware bus number: %d->%d\n",
+                rsrc.start, hose->first_busno, hose->last_busno);
+        DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",
+                hose, hose->cfg_addr, hose->cfg_data);
+        /* Interpret the "ranges" property */
+        /* This also maps the I/O region and sets isa_io/mem_base */
+        pci_process_bridge_OF_ranges(hose, dev, primary);
+        return 0;
+}
+#endif
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index 82c429d487f3..00c52f27ef4f 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -135,12 +135,13 @@ int __init
 hydra_init(void)
 {
        struct device_node *np;
+        struct resource r;
        np = find_devices("mac-io");
-        if (np == NULL || np->n_addrs == 0)
+        if (np == NULL || of_address_to_resource(np, 0, &r))
                return 0;
-        Hydra = ioremap(np->addrs[0].address, np->addrs[0].size);
+        Hydra = ioremap(r.start, r.end-r.start);
-        printk("Hydra Mac I/O at %lx\n", np->addrs[0].address);
+        printk("Hydra Mac I/O at %lx\n", r.start);
        printk("Hydra Feature_Control was %x",
               in_le32(&Hydra->Feature_Control));
        out_le32(&Hydra->Feature_Control, (HYDRA_FC_SCC_CELL_EN |
@@ -177,18 +178,24 @@ setup_python(struct pci_controller *hose, struct device_node *dev)
 {
        u32 __iomem *reg;
        u32 val;
-        unsigned long addr = dev->addrs[0].address;
+        struct resource r;
-        setup_indirect_pci(hose, addr + 0xf8000, addr + 0xf8010);
+        if (of_address_to_resource(dev, 0, &r)) {
+                printk(KERN_ERR "No address for Python PCI controller\n");
+                return;
+        }
        /* Clear the magic go-slow bit */
-        reg = ioremap(dev->addrs[0].address + 0xf6000, 0x40);
+        reg = ioremap(r.start + 0xf6000, 0x40);
+        BUG_ON(!reg); 
        val = in_be32(&reg[12]);
        if (val & PRG_CL_RESET_VALID) {
                out_be32(&reg[12], val & ~PRG_CL_RESET_VALID);
                in_be32(&reg[12]);
        }
        iounmap(reg);
+        setup_indirect_pci(hose, r.start + 0xf8000, r.start + 0xf8010);
 }
 /* Marvell Discovery II based Pegasos 2 */
@@ -218,7 +225,7 @@ chrp_find_bridges(void)
        char *model, *machine;
        int is_longtrail = 0, is_mot = 0, is_pegasos = 0;
        struct device_node *root = find_path_device("/");
+        struct resource r;
        /*
         * The PCI host bridge nodes on some machines don't have
         * properties to adequately identify them, so we have to
@@ -238,7 +245,7 @@ chrp_find_bridges(void)
                        continue;
                ++index;
                /* The GG2 bridge on the LongTrail doesn't have an address */
-                if (dev->n_addrs < 1 && !is_longtrail) {
+                if (of_address_to_resource(dev, 0, &r) && !is_longtrail) {
                        printk(KERN_WARNING "Can't use %s: no address\n",
                               dev->full_name);
                        continue;
@@ -255,8 +262,8 @@ chrp_find_bridges(void)
                        printk(KERN_INFO "PCI buses %d..%d",
                               bus_range[0], bus_range[1]);
                printk(" controlled by %s", dev->type);
-                if (dev->n_addrs > 0)
+                if (!is_longtrail)
-                        printk(" at %lx", dev->addrs[0].address);
+                        printk(" at %lx", r.start);
                printk("\n");
                hose = pcibios_alloc_controller();
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 4ec8ba737e7d..2dc87aa5962f 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -352,9 +352,10 @@ static void __init chrp_find_openpic(void)
                opaddr = opprop[na-1];  /* assume 32-bit */
                oplen /= na * sizeof(unsigned int);
        } else {
-                if (np->n_addrs == 0)
+                struct resource r;
+                if (of_address_to_resource(np, 0, &r))
                        return;
-                opaddr = np->addrs[0].address;
+                opaddr = r.start;
                oplen = 0;
        }
@@ -377,7 +378,7 @@ static void __init chrp_find_openpic(void)
         */
        if (oplen < len) {
                printk(KERN_ERR "Insufficient addresses for distributed"
-                       " OpenPIC (%d < %d)\n", np->n_addrs, len);
+                       " OpenPIC (%d < %d)\n", oplen, len);
                len = oplen;
        }
diff --git a/arch/powerpc/platforms/chrp/time.c b/arch/powerpc/platforms/chrp/time.c
index 737ee5d9f0aa..36a0f97bb7b1 100644
--- a/arch/powerpc/platforms/chrp/time.c
+++ b/arch/powerpc/platforms/chrp/time.c
@@ -21,6 +21,7 @@
 #include <linux/mc146818rtc.h>
 #include <linux/init.h>
 #include <linux/bcd.h>
+#include <linux/ioport.h>
 #include <asm/io.h>
 #include <asm/nvram.h>
@@ -37,14 +38,16 @@ static int nvram_data = NVRAM_DATA;
 long __init chrp_time_init(void)
 {
        struct device_node *rtcs;
+        struct resource r;
        int base;
        rtcs = find_compatible_devices("rtc", "pnpPNP,b00");
        if (rtcs == NULL)
                rtcs = find_compatible_devices("rtc", "ds1385-rtc");
-        if (rtcs == NULL || rtcs->addrs == NULL)
+        if (rtcs == NULL || of_address_to_resource(rtcs, 0, &r))
                return 0;
-        base = rtcs->addrs[0].address;
+        
+        base = r.start;
        nvram_as1 = 0;
        nvram_as0 = base;
        nvram_data = base + 1;
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index 83442ea77476..be3fbfc24e6c 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -334,14 +334,12 @@ int __init iSeries_allocate_IRQ(HvBusNumber bus,
 */
 int iSeries_get_irq(struct pt_regs *regs)
 {
-        struct paca_struct *lpaca;
        /* -2 means ignore this interrupt */
        int irq = -2;
-        lpaca = get_paca();
 #ifdef CONFIG_SMP
-        if (lpaca->lppaca.int_dword.fields.ipi_cnt) {
+        if (get_lppaca()->int_dword.fields.ipi_cnt) {
-                lpaca->lppaca.int_dword.fields.ipi_cnt = 0;
+                get_lppaca()->int_dword.fields.ipi_cnt = 0;
                iSeries_smp_message_recv(regs);
        }
 #endif /* CONFIG_SMP */
diff --git a/arch/powerpc/platforms/iseries/misc.S b/arch/powerpc/platforms/iseries/misc.S
index dfe7aa1ba098..7641fc7e550a 100644
--- a/arch/powerpc/platforms/iseries/misc.S
+++ b/arch/powerpc/platforms/iseries/misc.S
@@ -44,7 +44,8 @@ _GLOBAL(local_irq_restore)
        /* Check pending interrupts */
        /*   A decrementer, IPI or PMC interrupt may have occurred
         *   while we were in the hypervisor (which enables) */
-        ld      r4,PACALPPACA+LPPACAANYINT(r13)
+        ld      r4,PACALPPACAPTR(r13)
+        ld      r4,LPPACAANYINT(r4)
        cmpdi   r4,0
        beqlr
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index c6bbe5c25107..3f8790146b00 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -538,7 +538,7 @@ static unsigned long __init build_iSeries_Memory_Map(void)
 */
 static void __init iSeries_setup_arch(void)
 {
-        if (get_paca()->lppaca.shared_proc) {
+        if (get_lppaca()->shared_proc) {
                ppc_md.idle_loop = iseries_shared_idle;
                printk(KERN_INFO "Using shared processor idle loop\n");
        } else {
@@ -647,7 +647,7 @@ static void yield_shared_processor(void)
         * The decrementer stops during the yield.  Force a fake decrementer
         * here and let the timer_interrupt code sort out the actual time.
         */
-        get_paca()->lppaca.int_dword.fields.decr_int = 1;
+        get_lppaca()->int_dword.fields.decr_int = 1;
        process_iSeries_events();
 }
@@ -883,7 +883,7 @@ void dt_cpus(struct iseries_flat_dt *dt)
        pft_size[1] = __ilog2(HvCallHpt_getHptPages() * HW_PAGE_SIZE);
        for (i = 0; i < NR_CPUS; i++) {
-                if (paca[i].lppaca.dyn_proc_status >= 2)
+                if (lppaca[i].dyn_proc_status >= 2)
                        continue;
                snprintf(p, 32 - (p - buf), "@%d", i);
@@ -891,7 +891,7 @@ void dt_cpus(struct iseries_flat_dt *dt)
                dt_prop_str(dt, "device_type", "cpu");
-                index = paca[i].lppaca.dyn_hv_phys_proc_index;
+                index = lppaca[i].dyn_hv_phys_proc_index;
                d = &xIoHriProcessorVpd[index];
                dt_prop_u32(dt, "i-cache-size", d->xInstCacheSize * 1024);
diff --git a/arch/powerpc/platforms/iseries/smp.c b/arch/powerpc/platforms/iseries/smp.c
index fcb094ec6aec..6f9d407a709f 100644
--- a/arch/powerpc/platforms/iseries/smp.c
+++ b/arch/powerpc/platforms/iseries/smp.c
@@ -91,7 +91,7 @@ static void smp_iSeries_kick_cpu(int nr)
        BUG_ON((nr < 0) || (nr >= NR_CPUS));
        /* Verify that our partition has a processor nr */
-        if (paca[nr].lppaca.dyn_proc_status >= 2)
+        if (lppaca[nr].dyn_proc_status >= 2)
                return;
        /* The processor is currently spinning, waiting
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 1fe445ab78a6..8952528d31ac 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -254,11 +254,11 @@ out:
 void vpa_init(int cpu)
 {
        int hwcpu = get_hard_smp_processor_id(cpu);
-        unsigned long vpa = __pa(&paca[cpu].lppaca);
+        unsigned long vpa = __pa(&lppaca[cpu]);
        long ret;
        if (cpu_has_feature(CPU_FTR_ALTIVEC))
-                paca[cpu].lppaca.vmxregs_in_use = 1;
+                lppaca[cpu].vmxregs_in_use = 1;
        ret = register_vpa(hwcpu, vpa);
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index d8864164dbe8..86cfa6ecdcf3 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -350,6 +350,100 @@ static int do_remove_node(char *buf)
        return rv;
 }
+static char *parse_node(char *buf, size_t bufsize, struct device_node **npp)
+{
+        char *handle_str;
+        phandle handle;
+        *npp = NULL;
+        handle_str = buf;
+        buf = strchr(buf, ' ');
+        if (!buf)
+                return NULL;
+        *buf = '\0';
+        buf++;
+        handle = simple_strtoul(handle_str, NULL, 10);
+        *npp = of_find_node_by_phandle(handle);
+        return buf;
+}
+static int do_add_property(char *buf, size_t bufsize)
+{
+        struct property *prop = NULL;
+        struct device_node *np;
+        unsigned char *value;
+        char *name, *end;
+        int length;
+        end = buf + bufsize;
+        buf = parse_node(buf, bufsize, &np);
+        if (!np)
+                return -ENODEV;
+        if (parse_next_property(buf, end, &name, &length, &value) == NULL)
+                return -EINVAL;
+        prop = new_property(name, length, value, NULL);
+        if (!prop)
+                return -ENOMEM;
+        prom_add_property(np, prop);
+        return 0;
+}
+static int do_remove_property(char *buf, size_t bufsize)
+{
+        struct device_node *np;
+        char *tmp;
+        struct property *prop;
+        buf = parse_node(buf, bufsize, &np);
+        if (!np)
+                return -ENODEV;
+        tmp = strchr(buf,' ');
+        if (tmp)
+                *tmp = '\0';
+        if (strlen(buf) == 0)
+                return -EINVAL;
+        prop = of_find_property(np, buf, NULL);
+        return prom_remove_property(np, prop);
+}
+static int do_update_property(char *buf, size_t bufsize)
+{
+        struct device_node *np;
+        unsigned char *value;
+        char *name, *end;
+        int length;
+        struct property *newprop, *oldprop;
+        buf = parse_node(buf, bufsize, &np);
+        end = buf + bufsize;
+        if (!np)
+                return -ENODEV;
+        if (parse_next_property(buf, end, &name, &length, &value) == NULL)
+                return -EINVAL;
+        newprop = new_property(name, length, value, NULL);
+        if (!newprop)
+                return -ENOMEM;
+        oldprop = of_find_property(np, name,NULL);
+        if (!oldprop)
+                return -ENODEV;
+        return prom_update_property(np, newprop, oldprop);
+}
 /**
 * ofdt_write - perform operations on the Open Firmware device tree
 *
@@ -392,6 +486,12 @@ static ssize_t ofdt_write(struct file *file, const char __user *buf, size_t coun
                rv = do_add_node(tmp, count - (tmp - kbuf));
        else if (!strcmp(kbuf, "remove_node"))
                rv = do_remove_node(tmp);
+        else if (!strcmp(kbuf, "add_property"))
+                rv = do_add_property(tmp, count - (tmp - kbuf));
+        else if (!strcmp(kbuf, "remove_property"))
+                rv = do_remove_property(tmp, count - (tmp - kbuf));
+        else if (!strcmp(kbuf, "update_property"))
+                rv = do_update_property(tmp, count - (tmp - kbuf));
        else
                rv = -EINVAL;
 out:
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 68b7f086d63d..da6cebaf72cd 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -190,7 +190,7 @@ static void pseries_lpar_enable_pmcs(void)
        /* instruct hypervisor to maintain PMCs */
        if (firmware_has_feature(FW_FEATURE_SPLPAR))
-                get_paca()->lppaca.pmcregs_in_use = 1;
+                get_lppaca()->pmcregs_in_use = 1;
 }
 static void __init pSeries_setup_arch(void)
@@ -234,7 +234,7 @@ static void __init pSeries_setup_arch(void)
        /* Choose an idle loop */
        if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
                vpa_init(boot_cpuid);
-                if (get_paca()->lppaca.shared_proc) {
+                if (get_lppaca()->shared_proc) {
                        printk(KERN_INFO "Using shared processor idle loop\n");
                        ppc_md.idle_loop = pseries_shared_idle;
                } else {
@@ -444,10 +444,10 @@ DECLARE_PER_CPU(unsigned long, smt_snooze_delay);
 static inline void dedicated_idle_sleep(unsigned int cpu)
 {
-        struct paca_struct *ppaca = &paca[cpu ^ 1];
+        struct lppaca *plppaca = &lppaca[cpu ^ 1];
        /* Only sleep if the other thread is not idle */
-        if (!(ppaca->lppaca.idle)) {
+        if (!(plppaca->idle)) {
                local_irq_disable();
                /*
@@ -480,7 +480,6 @@ static inline void dedicated_idle_sleep(unsigned int cpu)
 static void pseries_dedicated_idle(void)
 { 
-        struct paca_struct *lpaca = get_paca();
        unsigned int cpu = smp_processor_id();
        unsigned long start_snooze;
        unsigned long *smt_snooze_delay = &__get_cpu_var(smt_snooze_delay);
@@ -491,7 +490,7 @@ static void pseries_dedicated_idle(void)
                 * Indicate to the HV that we are idle. Now would be
                 * a good time to find other work to dispatch.
                 */
-                lpaca->lppaca.idle = 1;
+                get_lppaca()->idle = 1;
                if (!need_resched()) {
                        start_snooze = get_tb() +
@@ -518,7 +517,7 @@ static void pseries_dedicated_idle(void)
                        HMT_medium();
                }
-                lpaca->lppaca.idle = 0;
+                get_lppaca()->idle = 0;
                ppc64_runlatch_on();
                preempt_enable_no_resched();
@@ -532,7 +531,6 @@ static void pseries_dedicated_idle(void)
 static void pseries_shared_idle(void)
 {
-        struct paca_struct *lpaca = get_paca();
        unsigned int cpu = smp_processor_id();
        while (1) {
@@ -540,7 +538,7 @@ static void pseries_shared_idle(void)
                 * Indicate to the HV that we are idle. Now would be
                 * a good time to find other work to dispatch.
                 */
-                lpaca->lppaca.idle = 1;
+                get_lppaca()->idle = 1;
                while (!need_resched() && !cpu_is_offline(cpu)) {
                        local_irq_disable();
@@ -564,7 +562,7 @@ static void pseries_shared_idle(void)
                        HMT_medium();
                }
-                lpaca->lppaca.idle = 0;
+                get_lppaca()->idle = 0;
                ppc64_runlatch_on();
                preempt_enable_no_resched();
@@ -588,7 +586,7 @@ static void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
 {
        /* Don't risk a hypervisor call if we're crashing */
        if (!crash_shutdown) {
-                unsigned long vpa = __pa(&get_paca()->lppaca);
+                unsigned long vpa = __pa(get_lppaca());
                if (unregister_vpa(hard_smp_processor_id(), vpa)) {
                        printk("VPA deregistration of cpu %u (hw_cpu_id %d) "
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 0ae841347a09..4c2b356774ea 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_40x)		+= dcr.o
 obj-$(CONFIG_U3_DART)           += dart_iommu.o
 obj-$(CONFIG_MMIO_NVRAM)        += mmio_nvram.o
 obj-$(CONFIG_PPC_83xx)          += ipic.o
+obj-$(CONFIG_FSL_SOC)           += fsl_soc.o
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
new file mode 100644
index 000000000000..064c9de47732
--- /dev/null
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -0,0 +1,317 @@
+/*
+ * FSL SoC setup code
+ *
+ * Maintained by Kumar Gala (see MAINTAINERS for contact information)
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#include <linux/config.h>
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/major.h>
+#include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/fsl_devices.h>
+#include <asm/system.h>
+#include <asm/atomic.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/prom.h>
+#include <sysdev/fsl_soc.h>
+#include <mm/mmu_decl.h>
+static phys_addr_t immrbase = -1;
+phys_addr_t get_immrbase(void)
+{
+        struct device_node *soc;
+        if (immrbase != -1)
+                return immrbase;
+        soc = of_find_node_by_type(NULL, "soc");
+        if (soc != 0) {
+                unsigned int size;
+                void *prop = get_property(soc, "reg", &size);
+                immrbase = of_translate_address(soc, prop);
+                of_node_put(soc);
+        };
+        return immrbase;
+}
+EXPORT_SYMBOL(get_immrbase);
+static const char * gfar_tx_intr = "tx";
+static const char * gfar_rx_intr = "rx";
+static const char * gfar_err_intr = "error";
+static int __init gfar_of_init(void)
+{
+        struct device_node *np;
+        unsigned int i;
+        struct platform_device *mdio_dev, *gfar_dev;
+        struct resource res;
+        int ret;
+        for (np = NULL, i = 0; (np = of_find_compatible_node(np, "mdio", "gianfar")) != NULL; i++) {
+                int k;
+                struct device_node *child = NULL;
+                struct gianfar_mdio_data mdio_data;
+                memset(&res, 0, sizeof(res));
+                memset(&mdio_data, 0, sizeof(mdio_data));
+                ret = of_address_to_resource(np, 0, &res);
+                if (ret)
+                        goto mdio_err;
+                mdio_dev = platform_device_register_simple("fsl-gianfar_mdio", res.start, &res, 1);
+                if (IS_ERR(mdio_dev)) {
+                        ret = PTR_ERR(mdio_dev);
+                        goto mdio_err;
+                }
+                for (k = 0; k < 32; k++)
+                        mdio_data.irq[k] = -1;
+                while ((child = of_get_next_child(np, child)) != NULL) {
+                        if (child->n_intrs) {
+                                u32 *id = (u32 *) get_property(child, "reg", NULL);
+                                mdio_data.irq[*id] = child->intrs[0].line;
+                        }
+                }
+                ret = platform_device_add_data(mdio_dev, &mdio_data, sizeof(struct gianfar_mdio_data));
+                if (ret)
+                        goto mdio_unreg;
+        }
+        for (np = NULL, i = 0; (np = of_find_compatible_node(np, "network", "gianfar")) != NULL; i++) {
+                struct resource r[4];
+                struct device_node *phy, *mdio;
+                struct gianfar_platform_data gfar_data;
+                unsigned int *id;
+                char *model;
+                void *mac_addr;
+                phandle *ph;
+                memset(r, 0, sizeof(r));
+                memset(&gfar_data, 0, sizeof(gfar_data));
+                ret = of_address_to_resource(np, 0, &r[0]);
+                if (ret)
+                        goto gfar_err;
+                r[1].start = np->intrs[0].line;
+                r[1].end = np->intrs[0].line;
+                r[1].flags = IORESOURCE_IRQ;
+                model = get_property(np, "model", NULL);
+                /* If we aren't the FEC we have multiple interrupts */
+                if (model && strcasecmp(model, "FEC")) {
+                        r[1].name = gfar_tx_intr;
+                        r[2].name = gfar_rx_intr;
+                        r[2].start = np->intrs[1].line;
+                        r[2].end = np->intrs[1].line;
+                        r[2].flags = IORESOURCE_IRQ;
+                        r[3].name = gfar_err_intr;
+                        r[3].start = np->intrs[2].line;
+                        r[3].end = np->intrs[2].line;
+                        r[3].flags = IORESOURCE_IRQ;
+                }
+                gfar_dev = platform_device_register_simple("fsl-gianfar", i, &r[0], np->n_intrs + 1);
+                if (IS_ERR(gfar_dev)) {
+                        ret = PTR_ERR(gfar_dev);
+                        goto gfar_err;
+                }
+                mac_addr = get_property(np, "address", NULL);
+                memcpy(gfar_data.mac_addr, mac_addr, 6);
+                if (model && !strcasecmp(model, "TSEC"))
+                        gfar_data.device_flags =
+                                FSL_GIANFAR_DEV_HAS_GIGABIT |
+                                FSL_GIANFAR_DEV_HAS_COALESCE |
+                                FSL_GIANFAR_DEV_HAS_RMON |
+                                FSL_GIANFAR_DEV_HAS_MULTI_INTR;
+                if (model && !strcasecmp(model, "eTSEC"))
+                        gfar_data.device_flags =
+                                FSL_GIANFAR_DEV_HAS_GIGABIT |
+                                FSL_GIANFAR_DEV_HAS_COALESCE |
+                                FSL_GIANFAR_DEV_HAS_RMON |
+                                FSL_GIANFAR_DEV_HAS_MULTI_INTR |
+                                FSL_GIANFAR_DEV_HAS_CSUM |
+                                FSL_GIANFAR_DEV_HAS_VLAN |
+                                FSL_GIANFAR_DEV_HAS_EXTENDED_HASH;
+                ph = (phandle *) get_property(np, "phy-handle", NULL);
+                phy = of_find_node_by_phandle(*ph);
+                if (phy == NULL) {
+                        ret = -ENODEV;
+                        goto gfar_unreg;
+                }
+                mdio = of_get_parent(phy);
+                id = (u32 *) get_property(phy, "reg", NULL);
+                ret = of_address_to_resource(mdio, 0, &res);
+                if (ret) {
+                        of_node_put(phy);
+                        of_node_put(mdio);
+                        goto gfar_unreg;
+                }
+                gfar_data.phy_id = *id;
+                gfar_data.bus_id = res.start;
+                of_node_put(phy);
+                of_node_put(mdio);
+                ret = platform_device_add_data(gfar_dev, &gfar_data, sizeof(struct gianfar_platform_data));
+                if (ret)
+                        goto gfar_unreg;
+        }
+        return 0;
+mdio_unreg:
+        platform_device_unregister(mdio_dev);
+mdio_err:
+        return ret;
+gfar_unreg:
+        platform_device_unregister(gfar_dev);
+gfar_err:
+        return ret;
+}
+arch_initcall(gfar_of_init);
+static int __init fsl_i2c_of_init(void)
+{
+        struct device_node *np;
+        unsigned int i;
+        struct platform_device *i2c_dev;
+        int ret;
+        for (np = NULL, i = 0; (np = of_find_compatible_node(np, "i2c", "fsl-i2c")) != NULL; i++) {
+                struct resource r[2];
+                struct fsl_i2c_platform_data i2c_data;
+                unsigned char * flags = NULL;
+                memset(&r, 0, sizeof(r));
+                memset(&i2c_data, 0, sizeof(i2c_data));
+                ret = of_address_to_resource(np, 0, &r[0]);
+                if (ret)
+                        goto i2c_err;
+                r[1].start = np->intrs[0].line;
+                r[1].end = np->intrs[0].line;
+                r[1].flags = IORESOURCE_IRQ;
+                i2c_dev = platform_device_register_simple("fsl-i2c", i, r, 2);
+                if (IS_ERR(i2c_dev)) {
+                        ret = PTR_ERR(i2c_dev);
+                        goto i2c_err;
+                }
+                i2c_data.device_flags = 0;
+                flags = get_property(np, "dfsrr", NULL);
+                if (flags)
+                        i2c_data.device_flags |= FSL_I2C_DEV_SEPARATE_DFSRR;
+                flags = get_property(np, "fsl5200-clocking", NULL);
+                if (flags)
+                        i2c_data.device_flags |= FSL_I2C_DEV_CLOCK_5200;
+                ret = platform_device_add_data(i2c_dev, &i2c_data, sizeof(struct fsl_i2c_platform_data));
+                if (ret)
+                        goto i2c_unreg;
+        }
+        return 0;
+i2c_unreg:
+        platform_device_unregister(i2c_dev);
+i2c_err:
+        return ret;
+}
+arch_initcall(fsl_i2c_of_init);
+#ifdef CONFIG_PPC_83xx
+static int __init mpc83xx_wdt_init(void)
+{
+        struct resource r;
+        struct device_node *soc, *np;
+        struct platform_device *dev;
+        unsigned int *freq;
+        int ret;
+        np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt");
+        if (!np) {
+                ret = -ENODEV;
+                goto mpc83xx_wdt_nodev;
+        }
+        soc = of_find_node_by_type(NULL, "soc");
+        if (!soc) {
+                ret = -ENODEV;
+                goto mpc83xx_wdt_nosoc;
+        }
+        freq = (unsigned int *)get_property(soc, "bus-frequency", NULL);
+        if (!freq) {
+                ret = -ENODEV;
+                goto mpc83xx_wdt_err;
+        }
+        memset(&r, 0, sizeof(r));
+        ret = of_address_to_resource(np, 0, &r);
+        if (ret)
+                goto mpc83xx_wdt_err;
+        dev = platform_device_register_simple("mpc83xx_wdt", 0, &r, 1);
+        if (IS_ERR(dev)) {
+                ret = PTR_ERR(dev);
+                goto mpc83xx_wdt_err;
+        }
+        ret = platform_device_add_data(dev, freq, sizeof(int));
+        if (ret)
+                goto mpc83xx_wdt_unreg;
+        of_node_put(soc);
+        of_node_put(np);
+        return 0;
+mpc83xx_wdt_unreg:
+        platform_device_unregister(dev);
+mpc83xx_wdt_err:
+        of_node_put(soc);
+mpc83xx_wdt_nosoc:
+        of_node_put(np);
+mpc83xx_wdt_nodev:
+        return ret;
+}
+arch_initcall(mpc83xx_wdt_init);
+#endif
diff --git a/arch/powerpc/sysdev/fsl_soc.h b/arch/powerpc/sysdev/fsl_soc.h
new file mode 100644
index 000000000000..c433d3f39edd
--- /dev/null
+++ b/arch/powerpc/sysdev/fsl_soc.h
@@ -0,0 +1,8 @@
+#ifndef __PPC_FSL_SOC_H
+#define __PPC_FSL_SOC_H
+#ifdef __KERNEL__
+extern phys_addr_t get_immrbase(void);
+#endif
+#endif
diff --git a/arch/ppc/4xx_io/serial_sicc.c b/arch/ppc/4xx_io/serial_sicc.c
index ebc4db8fcc63..8ace2a1f3b48 100644
--- a/arch/ppc/4xx_io/serial_sicc.c
+++ b/arch/ppc/4xx_io/serial_sicc.c
@@ -215,7 +215,6 @@ static struct tty_driver *siccnormal_driver;
 * memory if large numbers of serial ports are open.
 */
 static u_char *tmp_buf;
-static DECLARE_MUTEX(tmp_buf_sem);
 #define HIGH_BITS_OFFSET    ((sizeof(long)-sizeof(int))*8)
diff --git a/arch/ppc/kernel/head_8xx.S b/arch/ppc/kernel/head_8xx.S
index de0978742221..3e6ca7f5843f 100644
--- a/arch/ppc/kernel/head_8xx.S
+++ b/arch/ppc/kernel/head_8xx.S
@@ -375,6 +375,8 @@ DataStoreTLBMiss:
        lis     r11, swapper_pg_dir@h
        ori     r11, r11, swapper_pg_dir@l
        rlwimi  r10, r11, 0, 2, 19
+        stw     r12, 16(r0)
+        b LoadLargeDTLB
 3:
        lwz     r11, 0(r10)     /* Get the level 1 entry */
        rlwinm. r10, r11,0,0,19 /* Extract page descriptor page address */
@@ -430,6 +432,81 @@ DataStoreTLBMiss:
 InstructionTLBError:
        b       InstructionAccess
+LoadLargeDTLB:
+        li      r12, 0
+        lwz     r11, 0(r10)     /* Get the level 1 entry */
+        rlwinm. r10, r11,0,0,19 /* Extract page descriptor page address */
+        beq     3f              /* If zero, don't try to find a pte */
+        /* We have a pte table, so load fetch the pte from the table.
+         */
+        ori     r11, r11, 1     /* Set valid bit in physical L2 page */
+        DO_8xx_CPU6(0x3b80, r3)
+        mtspr   SPRN_MD_TWC, r11        /* Load pte table base address */
+        mfspr   r10, SPRN_MD_TWC        /* ....and get the pte address */
+        lwz     r10, 0(r10)     /* Get the pte */
+        /* Insert the Guarded flag into the TWC from the Linux PTE.
+         * It is bit 27 of both the Linux PTE and the TWC (at least
+         * I got that right :-).  It will be better when we can put
+         * this into the Linux pgd/pmd and load it in the operation
+         * above.
+         */
+        rlwimi  r11, r10, 0, 27, 27
+        rlwimi  r12, r10, 0, 0, 9       /* extract phys. addr */
+        mfspr   r3, SPRN_MD_EPN
+        rlwinm  r3, r3, 0, 0, 9         /* extract virtual address */
+        tophys(r3, r3)
+        cmpw    r3, r12                 /* only use 8M page if it is a direct 
+                                           kernel mapping */
+        bne     1f
+        ori     r11, r11, MD_PS8MEG
+        li      r12, 1
+        b       2f
+1:
+        li      r12, 0          /* can't use 8MB TLB, so zero r12. */
+2:
+        DO_8xx_CPU6(0x3b80, r3)
+        mtspr   SPRN_MD_TWC, r11
+        /* The Linux PTE won't go exactly into the MMU TLB.
+         * Software indicator bits 21, 22 and 28 must be clear.
+         * Software indicator bits 24, 25, 26, and 27 must be
+         * set.  All other Linux PTE bits control the behavior
+         * of the MMU.
+         */
+3:      li      r11, 0x00f0
+        rlwimi  r10, r11, 0, 24, 28     /* Set 24-27, clear 28 */
+        cmpwi   r12, 1
+        bne 4f
+        ori     r10, r10, 0x8
+        mfspr   r12, SPRN_MD_EPN
+        lis     r3, 0xff80              /* 10-19 must be clear for 8MB TLB */
+        ori     r3, r3, 0x0fff
+        and     r12, r3, r12
+        DO_8xx_CPU6(0x3780, r3)
+        mtspr   SPRN_MD_EPN, r12
+        lis     r3, 0xff80              /* 10-19 must be clear for 8MB TLB */
+        ori     r3, r3, 0x0fff
+        and     r10, r3, r10
+4:
+        DO_8xx_CPU6(0x3d80, r3)
+        mtspr   SPRN_MD_RPN, r10        /* Update TLB entry */
+        mfspr   r10, SPRN_M_TW  /* Restore registers */
+        lwz     r11, 0(r0)
+        mtcr    r11
+        lwz     r11, 4(r0)
+        lwz     r12, 16(r0)
+#ifdef CONFIG_8xx_CPU6
+        lwz     r3, 8(r0)
+#endif
+        rfi
 /* This is the data TLB error on the MPC8xx.  This could be due to
 * many reasons, including a dirty update to a pte.  We can catch that
 * one here, but anything else is an error.  First, we track down the
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index 95075f99a6d4..fb0da7c209db 100644
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -270,7 +270,6 @@ EXPORT_SYMBOL(__delay);
 EXPORT_SYMBOL(timer_interrupt);
 EXPORT_SYMBOL(irq_desc);
 EXPORT_SYMBOL(tb_ticks_per_jiffy);
-EXPORT_SYMBOL(get_wchan);
 EXPORT_SYMBOL(console_drivers);
 #ifdef CONFIG_XMON
 EXPORT_SYMBOL(xmon);
diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.c b/arch/ppc/platforms/83xx/mpc834x_sys.c
index 04bdc39bf47b..012e1e652c03 100644
--- a/arch/ppc/platforms/83xx/mpc834x_sys.c
+++ b/arch/ppc/platforms/83xx/mpc834x_sys.c
@@ -51,9 +51,6 @@
 #include <syslib/ppc83xx_setup.h>
-static const char *GFAR_PHY_0 = "phy0:0";
-static const char *GFAR_PHY_1 = "phy0:1";
 #ifndef CONFIG_PCI
 unsigned long isa_io_base = 0;
 unsigned long isa_mem_base = 0;
@@ -129,20 +126,21 @@ mpc834x_sys_setup_arch(void)
        mdata->irq[1] = MPC83xx_IRQ_EXT2;
        mdata->irq[2] = -1;
        mdata->irq[31] = -1;
-        mdata->paddr += binfo->bi_immr_base;
        /* setup the board related information for the enet controllers */
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC83xx_TSEC1);
        if (pdata) {
                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-                pdata->bus_id = GFAR_PHY_0;
+                pdata->bus_id = 0;
+                pdata->phy_id = 0;
                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
        }
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC83xx_TSEC2);
        if (pdata) {
                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-                pdata->bus_id = GFAR_PHY_1;
+                pdata->bus_id = 0;
+                pdata->phy_id = 1;
                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
        }
diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.c b/arch/ppc/platforms/85xx/mpc8540_ads.c
index c5cde97c6ef0..2eceb1e6f4eb 100644
--- a/arch/ppc/platforms/85xx/mpc8540_ads.c
+++ b/arch/ppc/platforms/85xx/mpc8540_ads.c
@@ -52,10 +52,6 @@
 #include <syslib/ppc85xx_setup.h>
-static const char *GFAR_PHY_0 = "phy0:0";
-static const char *GFAR_PHY_1 = "phy0:1";
-static const char *GFAR_PHY_3 = "phy0:3";
 /* ************************************************************************
 *
 * Setup the architecture
@@ -102,27 +98,29 @@ mpc8540ads_setup_arch(void)
        mdata->irq[2] = -1;
        mdata->irq[3] = MPC85xx_IRQ_EXT5;
        mdata->irq[31] = -1;
-        mdata->paddr += binfo->bi_immr_base;
        /* setup the board related information for the enet controllers */
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
        if (pdata) {
                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-                pdata->bus_id = GFAR_PHY_0;
+                pdata->bus_id = 0;
+                pdata->phy_id = 0;
                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
        }
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
        if (pdata) {
                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-                pdata->bus_id = GFAR_PHY_1;
+                pdata->bus_id = 0;
+                pdata->phy_id = 1;
                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
        }
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_FEC);
        if (pdata) {
                pdata->board_flags = 0;
-                pdata->bus_id = GFAR_PHY_3;
+                pdata->bus_id = 0;
+                pdata->phy_id = 3;
                memcpy(pdata->mac_addr, binfo->bi_enet2addr, 6);
        }
diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.c b/arch/ppc/platforms/85xx/mpc8560_ads.c
index 8e39a5517092..442c7ff195d3 100644
--- a/arch/ppc/platforms/85xx/mpc8560_ads.c
+++ b/arch/ppc/platforms/85xx/mpc8560_ads.c
@@ -56,10 +56,6 @@
 #include <syslib/ppc85xx_setup.h>
-static const char *GFAR_PHY_0 = "phy0:0";
-static const char *GFAR_PHY_1 = "phy0:1";
-static const char *GFAR_PHY_3 = "phy0:3";
 /* ************************************************************************
 *
 * Setup the architecture
@@ -99,20 +95,21 @@ mpc8560ads_setup_arch(void)
        mdata->irq[2] = -1;
        mdata->irq[3] = MPC85xx_IRQ_EXT5;
        mdata->irq[31] = -1;
-        mdata->paddr += binfo->bi_immr_base;
        /* setup the board related information for the enet controllers */
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
        if (pdata) {
                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-                pdata->bus_id = GFAR_PHY_0;
+                pdata->bus_id = 0;
+                pdata->phy_id = 0;
                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
        }
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
        if (pdata) {
                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-                pdata->bus_id = GFAR_PHY_1;
+                pdata->bus_id = 0;
+                pdata->phy_id = 1;
                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
        }
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index 2959e3c4083d..b332ebae6bd3 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -395,9 +395,6 @@ mpc85xx_cds_pcibios_fixup(void)
 TODC_ALLOC();
-static const char *GFAR_PHY_0 = "phy0:0";
-static const char *GFAR_PHY_1 = "phy0:1";
 /* ************************************************************************
 *
 * Setup the architecture
@@ -461,34 +458,37 @@ mpc85xx_cds_setup_arch(void)
        mdata->irq[2] = -1;
        mdata->irq[3] = -1;
        mdata->irq[31] = -1;
-        mdata->paddr += binfo->bi_immr_base;
        /* setup the board related information for the enet controllers */
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
        if (pdata) {
                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-                pdata->bus_id = GFAR_PHY_0;
+                pdata->bus_id = 0;
+                pdata->phy_id = 0;
                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
        }
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
        if (pdata) {
                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-                pdata->bus_id = GFAR_PHY_1;
+                pdata->bus_id = 0;
+                pdata->phy_id = 1;
                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
        }
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_eTSEC1);
        if (pdata) {
                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-                pdata->bus_id = GFAR_PHY_0;
+                pdata->bus_id = 0;
+                pdata->phy_id = 0;
                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
        }
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_eTSEC2);
        if (pdata) {
                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-                pdata->bus_id = GFAR_PHY_1;
+                pdata->bus_id = 0;
+                pdata->phy_id = 1;
                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
        }
diff --git a/arch/ppc/platforms/85xx/sbc8560.c b/arch/ppc/platforms/85xx/sbc8560.c
index 45a5b81b4ed1..e777ba824aa9 100644
--- a/arch/ppc/platforms/85xx/sbc8560.c
+++ b/arch/ppc/platforms/85xx/sbc8560.c
@@ -91,9 +91,6 @@ sbc8560_early_serial_map(void)
 }
 #endif
-static const char *GFAR_PHY_25 = "phy0:25";
-static const char *GFAR_PHY_26 = "phy0:26";
 /* ************************************************************************
 *
 * Setup the architecture
@@ -136,20 +133,21 @@ sbc8560_setup_arch(void)
        mdata->irq[25] = MPC85xx_IRQ_EXT6;
        mdata->irq[26] = MPC85xx_IRQ_EXT7;
        mdata->irq[31] = -1;
-        mdata->paddr += binfo->bi_immr_base;
        /* setup the board related information for the enet controllers */
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
        if (pdata) {
                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-                pdata->bus_id = GFAR_PHY_25;
+                pdata->bus_id = 0;
+                pdata->phy_id = 25;
                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
        }
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
        if (pdata) {
                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-                pdata->bus_id = GFAR_PHY_26;
+                pdata->bus_id = 0;
+                pdata->phy_id = 26;
                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
        }
diff --git a/arch/ppc/platforms/85xx/stx_gp3.c b/arch/ppc/platforms/85xx/stx_gp3.c
index 15ce9d070634..061bb7cf2d9a 100644
--- a/arch/ppc/platforms/85xx/stx_gp3.c
+++ b/arch/ppc/platforms/85xx/stx_gp3.c
@@ -93,9 +93,6 @@ static u8 gp3_openpic_initsenses[] __initdata = {
        0x0,                            /* External 11: */
 };
-static const char *GFAR_PHY_2 = "phy0:2";
-static const char *GFAR_PHY_4 = "phy0:4";
 /*
 * Setup the architecture
 */
@@ -130,20 +127,21 @@ gp3_setup_arch(void)
        mdata->irq[2] = MPC85xx_IRQ_EXT5;
        mdata->irq[4] = MPC85xx_IRQ_EXT5;
        mdata->irq[31] = -1;
-        mdata->paddr += binfo->bi_immr_base;
        /* setup the board related information for the enet controllers */
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
        if (pdata) {
        /*      pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR; */
-                pdata->bus_id = GFAR_PHY_2;
+                pdata->bus_id = 0;
+                pdata->phy_id = 2;
                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
        }
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
        if (pdata) {
        /*      pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR; */
-                pdata->bus_id = GFAR_PHY_4;
+                pdata->bus_id = 0;
+                pdata->phy_id = 4;
                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
        }
diff --git a/arch/ppc/platforms/85xx/tqm85xx.c b/arch/ppc/platforms/85xx/tqm85xx.c
index c6dfd8f0f9df..b436f4d0a3fa 100644
--- a/arch/ppc/platforms/85xx/tqm85xx.c
+++ b/arch/ppc/platforms/85xx/tqm85xx.c
@@ -91,12 +91,6 @@ static u_char tqm85xx_openpic_initsenses[] __initdata = {
        0x0,                            /* External 11: */
 };
-static const char *GFAR_PHY_0 = "phy0:2";
-static const char *GFAR_PHY_1 = "phy0:1";
-#ifdef CONFIG_MPC8540
-static const char *GFAR_PHY_3 = "phy0:3";
-#endif
 /* ************************************************************************
 *
 * Setup the architecture
@@ -149,20 +143,21 @@ tqm85xx_setup_arch(void)
        mdata->irq[2] = -1;
        mdata->irq[3] = MPC85xx_IRQ_EXT8;
        mdata->irq[31] = -1;
-        mdata->paddr += binfo->bi_immr_base;
        /* setup the board related information for the enet controllers */
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
        if (pdata) {
                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-                pdata->bus_id = GFAR_PHY_0;
+                pdata->bus_id = 0;
+                pdata->phy_id = 2;
                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
        }
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
        if (pdata) {
                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-                pdata->bus_id = GFAR_PHY_1;
+                pdata->bus_id = 0;
+                pdata->phy_id = 1;
                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
        }
@@ -170,7 +165,8 @@ tqm85xx_setup_arch(void)
        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_FEC);
        if (pdata) {
                pdata->board_flags = 0;
-                pdata->bus_id = GFAR_PHY_3;
+                pdata->bus_id = 0;
+                pdata->phy_id = 3;
                memcpy(pdata->mac_addr, binfo->bi_enet2addr, 6);
        }
 #endif
diff --git a/arch/ppc/syslib/mpc83xx_devices.c b/arch/ppc/syslib/mpc83xx_devices.c
index 847df4409982..f9b95de70e23 100644
--- a/arch/ppc/syslib/mpc83xx_devices.c
+++ b/arch/ppc/syslib/mpc83xx_devices.c
@@ -28,7 +28,6 @@
 */
 struct gianfar_mdio_data mpc83xx_mdio_pdata = {
-        .paddr = 0x24520,
 };
 static struct gianfar_platform_data mpc83xx_tsec1_pdata = {
@@ -226,7 +225,14 @@ struct platform_device ppc_sys_platform_devices[] = {
                .name = "fsl-gianfar_mdio",
                .id = 0,
                .dev.platform_data = &mpc83xx_mdio_pdata,
-                .num_resources = 0,
+                .num_resources = 1,
+                .resource = (struct resource[]) {
+                        {
+                                .start  = 0x24520,
+                                .end    = 0x2453f,
+                                .flags  = IORESOURCE_MEM,
+                        },
+                },
        },
 };
diff --git a/arch/ppc/syslib/mpc85xx_devices.c b/arch/ppc/syslib/mpc85xx_devices.c
index 69949d255658..00e9b6ff2f6e 100644
--- a/arch/ppc/syslib/mpc85xx_devices.c
+++ b/arch/ppc/syslib/mpc85xx_devices.c
@@ -26,7 +26,6 @@
 * what CCSRBAR is, will get fixed up by mach_mpc85xx_fixup
 */
 struct gianfar_mdio_data mpc85xx_mdio_pdata = {
-        .paddr = MPC85xx_MIIM_OFFSET,
 };
 static struct gianfar_platform_data mpc85xx_tsec1_pdata = {
@@ -720,7 +719,14 @@ struct platform_device ppc_sys_platform_devices[] = {
                .name = "fsl-gianfar_mdio",
                .id = 0,
                .dev.platform_data = &mpc85xx_mdio_pdata,
-                .num_resources = 0,
+                .num_resources = 1,
+                .resource = (struct resource[]) {
+                        {
+                                .start  = 0x24520,
+                                .end    = 0x2453f,
+                                .flags  = IORESOURCE_MEM,
+                        },
+                },
        },
 };