Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	net/sunrpc/auth_gss/gss_krb5_crypto.c
	net/sunrpc/auth_gss/gss_spkm3_token.c
	net/sunrpc/clnt.c

Merge with mainline and fix conflicts.

32 files changed, 451 insertions, 357 deletions

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index d2ded19e4064..8120d428ebfd 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -17,6 +17,7 @@ obj-y				+= vdso32/
 obj-$(CONFIG_PPC64)             += setup_64.o binfmt_elf32.o sys_ppc32.o \
                                    signal_64.o ptrace32.o \
                                    paca.o cpu_setup_ppc970.o \
+                                   cpu_setup_pa6t.o \
                                    firmware.o sysfs.o nvram_64.o
 obj-$(CONFIG_PPC64)             += vdso64/
 obj-$(CONFIG_ALTIVEC)           += vecemu.o vector.o
diff --git a/arch/powerpc/kernel/cpu_setup_pa6t.S b/arch/powerpc/kernel/cpu_setup_pa6t.S
new file mode 100644
index 000000000000..4047be25c4d2
--- /dev/null
+++ b/arch/powerpc/kernel/cpu_setup_pa6t.S
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2006-2007 PA Semi, Inc
+ *
+ * Maintained by: Olof Johansson <olof@lixom.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#include <asm/processor.h>
+#include <asm/page.h>
+#include <asm/cputable.h>
+#include <asm/ppc_asm.h>
+#include <asm/asm-offsets.h>
+#include <asm/cache.h>
+
+/* Right now, restore and setup are the same thing */
+_GLOBAL(__restore_cpu_pa6t)
+_GLOBAL(__setup_cpu_pa6t)
+        /* Do nothing if not running in HV mode */
+        mfmsr   r0
+        rldicl. r0,r0,4,63
+        beqlr
+
+        mfspr   r0,SPRN_HID5
+        ori     r0,r0,0x30
+        mtspr   SPRN_HID5,r0
+
+        mfspr   r0,SPRN_LPCR
+        ori     r0,r0,0x7000
+        mtspr   SPRN_LPCR,r0
+
+        blr
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index b742013bb9da..dd17dffbf058 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -43,6 +43,8 @@ extern void __setup_cpu_745x(unsigned long offset, struct cpu_spec* spec);
 #ifdef CONFIG_PPC64
 extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_ppc970MP(unsigned long offset, struct cpu_spec* spec);
+extern void __setup_cpu_pa6t(unsigned long offset, struct cpu_spec* spec);
+extern void __restore_cpu_pa6t(unsigned long offset, struct cpu_spec* spec);
 extern void __restore_cpu_ppc970(void);
 #endif /* CONFIG_PPC64 */
 
@@ -86,6 +88,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
+                .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/power3",
                 .oprofile_type          = PPC_OPROFILE_RS64,
                 .platform               = "power3",
@@ -99,6 +102,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
+                .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/power3",
                 .oprofile_type          = PPC_OPROFILE_RS64,
                 .platform               = "power3",
@@ -112,6 +116,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
+                .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/rs64",
                 .oprofile_type          = PPC_OPROFILE_RS64,
                 .platform               = "rs64",
@@ -125,6 +130,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
+                .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/rs64",
                 .oprofile_type          = PPC_OPROFILE_RS64,
                 .platform               = "rs64",
@@ -138,6 +144,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
+                .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/rs64",
                 .oprofile_type          = PPC_OPROFILE_RS64,
                 .platform               = "rs64",
@@ -151,6 +158,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
+                .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/rs64",
                 .oprofile_type          = PPC_OPROFILE_RS64,
                 .platform               = "rs64",
@@ -164,6 +172,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
+                .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/power4",
                 .oprofile_type          = PPC_OPROFILE_POWER4,
                 .platform               = "power4",
@@ -177,6 +186,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
+                .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/power4",
                 .oprofile_type          = PPC_OPROFILE_POWER4,
                 .platform               = "power4",
@@ -191,6 +201,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
+                .pmc_type               = PPC_PMC_IBM,
                 .cpu_setup              = __setup_cpu_ppc970,
                 .cpu_restore            = __restore_cpu_ppc970,
                 .oprofile_cpu_type      = "ppc64/970",
@@ -207,6 +218,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
+                .pmc_type               = PPC_PMC_IBM,
                 .cpu_setup              = __setup_cpu_ppc970,
                 .cpu_restore            = __restore_cpu_ppc970,
                 .oprofile_cpu_type      = "ppc64/970",
@@ -239,6 +251,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
+                .pmc_type               = PPC_PMC_IBM,
                 .cpu_setup              = __setup_cpu_ppc970,
                 .oprofile_cpu_type      = "ppc64/970",
                 .oprofile_type          = PPC_OPROFILE_POWER4,
@@ -253,6 +266,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/power5",
                 .oprofile_type          = PPC_OPROFILE_POWER4,
                 /* SIHV / SIPR bits are implemented on POWER4+ (GQ)
@@ -271,6 +285,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/power5+",
                 .oprofile_type          = PPC_OPROFILE_POWER4,
                 .oprofile_mmcra_sihv    = MMCRA_SIHV,
@@ -321,6 +336,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/power6",
                 .oprofile_type          = PPC_OPROFILE_POWER4,
                 .oprofile_mmcra_sihv    = POWER6_MMCRA_SIHV,
@@ -340,6 +356,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 4,
+                .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/cell-be",
                 .oprofile_type          = PPC_OPROFILE_CELL,
                 .platform               = "ppc-cell-be",
@@ -353,6 +370,9 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 64,
                 .dcache_bsize           = 64,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_PA6T,
+                .cpu_setup              = __setup_cpu_pa6t,
+                .cpu_restore            = __restore_cpu_pa6t,
                 .platform               = "pa6t",
         },
         {       /* default match */
@@ -364,6 +384,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_IBM,
                 .platform               = "power4",
         }
 #endif  /* CONFIG_PPC64 */
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 2551c0884afc..2b66d53dcc55 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -172,13 +172,18 @@ syscall_error_cont:
         stdcx.  r0,0,r1                 /* to clear the reservation */
         andi.   r6,r8,MSR_PR
         ld      r4,_LINK(r1)
+        /*
+         * Clear RI before restoring r13.  If we are returning to
+         * userspace and we take an exception after restoring r13,
+         * we end up corrupting the userspace r13 value.
+         */
+        li      r12,MSR_RI
+        andc    r11,r10,r12
+        mtmsrd  r11,1                   /* clear MSR.RI */
         beq-    1f
         ACCOUNT_CPU_USER_EXIT(r11, r12)
         ld      r13,GPR13(r1)   /* only restore r13 if returning to usermode */
 1:      ld      r2,GPR2(r1)
-        li      r12,MSR_RI
-        andc    r11,r10,r12
-        mtmsrd  r11,1                   /* clear MSR.RI */
         ld      r1,GPR1(r1)
         mtlr    r4
         mtcr    r5
@@ -488,42 +493,44 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
 #endif
         stb     r5,PACASOFTIRQEN(r13)
 
+        /* extract EE bit and use it to restore paca->hard_enabled */
         ld      r3,_MSR(r1)
+        rldicl  r4,r3,49,63             /* r0 = (r3 >> 15) & 1 */
+        stb     r4,PACAHARDIRQEN(r13)
+
+        ld      r4,_CTR(r1)
+        ld      r0,_LINK(r1)
+        mtctr   r4
+        mtlr    r0
+        ld      r4,_XER(r1)
+        mtspr   SPRN_XER,r4
+
+        REST_8GPRS(5, r1)
+
         andi.   r0,r3,MSR_RI
         beq-    unrecov_restore
 
-        /* extract EE bit and use it to restore paca->hard_enabled */
-        rldicl  r4,r3,49,63             /* r0 = (r3 >> 15) & 1 */
-        stb     r4,PACAHARDIRQEN(r13)
+        stdcx.  r0,0,r1         /* to clear the reservation */
 
-        andi.   r0,r3,MSR_PR
+        /*
+         * Clear RI before restoring r13.  If we are returning to
+         * userspace and we take an exception after restoring r13,
+         * we end up corrupting the userspace r13 value.
+         */
+        mfmsr   r4
+        andc    r4,r4,r0        /* r0 contains MSR_RI here */
+        mtmsrd  r4,1
 
         /*
          * r13 is our per cpu area, only restore it if we are returning to
          * userspace
          */
+        andi.   r0,r3,MSR_PR
         beq     1f
-        ACCOUNT_CPU_USER_EXIT(r3, r4)
+        ACCOUNT_CPU_USER_EXIT(r2, r4)
         REST_GPR(13, r1)
 1:
-        ld      r3,_CTR(r1)
-        ld      r0,_LINK(r1)
-        mtctr   r3
-        mtlr    r0
-        ld      r3,_XER(r1)
-        mtspr   SPRN_XER,r3
-
-        REST_8GPRS(5, r1)
-
-        stdcx.  r0,0,r1         /* to clear the reservation */
-
-        mfmsr   r0
-        li      r2, MSR_RI
-        andc    r0,r0,r2
-        mtmsrd  r0,1
-
-        ld      r0,_MSR(r1)
-        mtspr   SPRN_SRR1,r0
+        mtspr   SPRN_SRR1,r3
 
         ld      r2,_CCR(r1)
         mtcrf   0xFF,r2
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 9417cf5b4b7e..c897203198b1 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -344,12 +344,7 @@ i##n:								\
 /* System reset */
 /* core99 pmac starts the seconary here by changing the vector, and
    putting it back to what it was (unknown_exception) when done.  */
-#if defined(CONFIG_GEMINI) && defined(CONFIG_SMP)
-        . = 0x100
-        b       __secondary_start_gemini
-#else
         EXCEPTION(0x100, Reset, unknown_exception, EXC_XFER_STD)
-#endif
 
 /* Machine check */
 /*
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 71b1fe58e9e4..97cedcd6c9b4 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -613,7 +613,7 @@ system_call_pSeries:
 /*** pSeries interrupt support ***/
 
         /* moved from 0xf00 */
-        MASKABLE_EXCEPTION_PSERIES(., performance_monitor)
+        STD_EXCEPTION_PSERIES(., performance_monitor)
 
 /*
  * An interrupt came in while soft-disabled; clear EE in SRR1,
diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c
index c68113371050..601ef79a5916 100644
--- a/arch/powerpc/kernel/iomap.c
+++ b/arch/powerpc/kernel/iomap.c
@@ -12,23 +12,23 @@
  * Here comes the ppc64 implementation of the IOMAP 
  * interfaces.
  */
-unsigned int fastcall ioread8(void __iomem *addr)
+unsigned int ioread8(void __iomem *addr)
 {
         return readb(addr);
 }
-unsigned int fastcall ioread16(void __iomem *addr)
+unsigned int ioread16(void __iomem *addr)
 {
         return readw(addr);
 }
-unsigned int fastcall ioread16be(void __iomem *addr)
+unsigned int ioread16be(void __iomem *addr)
 {
         return in_be16(addr);
 }
-unsigned int fastcall ioread32(void __iomem *addr)
+unsigned int ioread32(void __iomem *addr)
 {
         return readl(addr);
 }
-unsigned int fastcall ioread32be(void __iomem *addr)
+unsigned int ioread32be(void __iomem *addr)
 {
         return in_be32(addr);
 }
@@ -38,23 +38,23 @@ EXPORT_SYMBOL(ioread16be);
 EXPORT_SYMBOL(ioread32);
 EXPORT_SYMBOL(ioread32be);
 
-void fastcall iowrite8(u8 val, void __iomem *addr)
+void iowrite8(u8 val, void __iomem *addr)
 {
         writeb(val, addr);
 }
-void fastcall iowrite16(u16 val, void __iomem *addr)
+void iowrite16(u16 val, void __iomem *addr)
 {
         writew(val, addr);
 }
-void fastcall iowrite16be(u16 val, void __iomem *addr)
+void iowrite16be(u16 val, void __iomem *addr)
 {
         out_be16(addr, val);
 }
-void fastcall iowrite32(u32 val, void __iomem *addr)
+void iowrite32(u32 val, void __iomem *addr)
 {
         writel(val, addr);
 }
-void fastcall iowrite32be(u32 val, void __iomem *addr)
+void iowrite32be(u32 val, void __iomem *addr)
 {
         out_be32(addr, val);
 }
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 0bd8c7665834..919fbf568495 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -281,10 +281,10 @@ void do_IRQ(struct pt_regs *regs)
 
         /*
          * Every platform is required to implement ppc_md.get_irq.
-         * This function will either return an irq number or -1 to
+         * This function will either return an irq number or NO_IRQ to
          * indicate there are no more pending.
-         * The value -2 is for buggy hardware and means that this IRQ
-         * has already been handled. -- Tom
+         * The value NO_IRQ_IGNORE is for buggy hardware and means that this
+         * IRQ has already been handled. -- Tom
          */
         irq = ppc_md.get_irq();
 
@@ -604,6 +604,8 @@ unsigned int irq_create_mapping(struct irq_host *host,
          */
         virq = irq_find_mapping(host, hwirq);
         if (virq != IRQ_NONE) {
+                if (host->ops->remap)
+                        host->ops->remap(host, virq, hwirq);
                 pr_debug("irq: -> existing mapping on virq %d\n", virq);
                 return virq;
         }
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 4657563f8813..dd2886f97e98 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -46,8 +46,8 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
         if ((unsigned long)p->addr & 0x03) {
                 printk("Attempt to register kprobe at an unaligned address\n");
                 ret = -EINVAL;
-        } else if (IS_MTMSRD(insn) || IS_RFID(insn)) {
-                printk("Cannot register a kprobe on rfid or mtmsrd\n");
+        } else if (IS_MTMSRD(insn) || IS_RFID(insn) || IS_RFI(insn)) {
+                printk("Cannot register a kprobe on rfi/rfid or mtmsr[d]\n");
                 ret = -EINVAL;
         }
 
@@ -483,8 +483,12 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
         memcpy(&kcb->jprobe_saved_regs, regs, sizeof(struct pt_regs));
 
         /* setup return addr to the jprobe handler routine */
+#ifdef CONFIG_PPC64
         regs->nip = (unsigned long)(((func_descr_t *)jp->entry)->entry);
         regs->gpr[2] = (unsigned long)(((func_descr_t *)jp->entry)->toc);
+#else
+        regs->nip = (unsigned long)jp->entry;
+#endif
 
         return 1;
 }
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 5e6ddfa474c0..89f46f377922 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -498,7 +498,7 @@ static int __init check_legacy_serial_console(void)
         DBG(" -> check_legacy_serial_console()\n");
 
         /* The user has requested a console so this is already set up. */
-        if (strstr(saved_command_line, "console=")) {
+        if (strstr(boot_command_line, "console=")) {
                 DBG(" console was specified !\n");
                 return -EBUSY;
         }
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 41c05dcd68f4..89486b631284 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -439,6 +439,10 @@ static ssize_t lparcfg_write(struct file *file, const char __user * buf,
 
         ssize_t retval = -ENOMEM;
 
+        if (!firmware_has_feature(FW_FEATURE_SPLPAR) ||
+                        firmware_has_feature(FW_FEATURE_ISERIES))
+                return -EINVAL;
+
         kbuf = kmalloc(count, GFP_KERNEL);
         if (!kbuf)
                 goto out;
@@ -517,7 +521,7 @@ static int pseries_lparcfg_data(struct seq_file *m, void *v)
 static ssize_t lparcfg_write(struct file *file, const char __user * buf,
                              size_t count, loff_t * off)
 {
-        return count;
+        return -EINVAL;
 }
 
 #endif                          /* CONFIG_PPC_PSERIES */
@@ -567,9 +571,10 @@ static int lparcfg_open(struct inode *inode, struct file *file)
         return single_open(file, lparcfg_data, NULL);
 }
 
-struct file_operations lparcfg_fops = {
+const struct file_operations lparcfg_fops = {
         .owner          = THIS_MODULE,
         .read           = seq_read,
+        .write          = lparcfg_write,
         .open           = lparcfg_open,
         .release        = single_release,
 };
@@ -581,10 +586,8 @@ int __init lparcfg_init(void)
 
         /* Allow writing if we have FW_FEATURE_SPLPAR */
         if (firmware_has_feature(FW_FEATURE_SPLPAR) &&
-                        !firmware_has_feature(FW_FEATURE_ISERIES)) {
-                lparcfg_fops.write = lparcfg_write;
+                        !firmware_has_feature(FW_FEATURE_ISERIES))
                 mode |= S_IWUSR;
-        }
 
         ent = create_proc_entry("ppc64/lparcfg", mode, NULL);
         if (ent) {
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index 21fd2c662a99..519861da0423 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -311,6 +311,46 @@ _GLOBAL(real_writeb)
         blr
 #endif /* defined(CONFIG_PPC_PMAC) || defined(CONFIG_PPC_MAPLE) */
 
+#ifdef CONFIG_PPC_PASEMI
+
+/* No support in all binutils for these yet, so use defines */
+#define LBZCIX(RT,RA,RB)  .long (0x7c0006aa|(RT<<21)|(RA<<16)|(RB << 11))
+#define STBCIX(RS,RA,RB)  .long (0x7c0007aa|(RS<<21)|(RA<<16)|(RB << 11))
+
+
+_GLOBAL(real_205_readb)
+        mfmsr   r7
+        ori     r0,r7,MSR_DR
+        xori    r0,r0,MSR_DR
+        sync
+        mtmsrd  r0
+        sync
+        isync
+        LBZCIX(r3,0,r3)
+        isync
+        mtmsrd  r7
+        sync
+        isync
+        blr
+
+_GLOBAL(real_205_writeb)
+        mfmsr   r7
+        ori     r0,r7,MSR_DR
+        xori    r0,r0,MSR_DR
+        sync
+        mtmsrd  r0
+        sync
+        isync
+        STBCIX(r3,0,r4)
+        isync
+        mtmsrd  r7
+        sync
+        isync
+        blr
+
+#endif /* CONFIG_PPC_PASEMI */
+
+
 #ifdef CONFIG_CPU_FREQ_PMAC64
 /*
  * SCOM access functions for 970 (FX only for now)
diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
index 8339fd609de0..07a89a398639 100644
--- a/arch/powerpc/kernel/module_32.c
+++ b/arch/powerpc/kernel/module_32.c
@@ -224,7 +224,12 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
                         /* Low half of the symbol */
                         *(uint16_t *)location = value;
                         break;
-                
+
+                case R_PPC_ADDR16_HI:
+                        /* Higher half of the symbol */
+                        *(uint16_t *)location = (value >> 16);
+                        break;
+
                 case R_PPC_ADDR16_HA:
                         /* Sign-adjusted lower 16 bits: PPC ELF ABI says:
                            (((x >> 16) + ((x & 0x8000) ? 1 : 0))) & 0xFFFF.
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index 869cebbba967..f9676f52c6d8 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -179,7 +179,7 @@ static int dev_nvram_ioctl(struct inode *inode, struct file *file,
         }
 }
 
-struct file_operations nvram_fops = {
+const struct file_operations nvram_fops = {
         .owner =        THIS_MODULE,
         .llseek =       dev_nvram_llseek,
         .read =         dev_nvram_read,
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index c54f3639c5ad..d8ef2e100505 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -1450,7 +1450,6 @@ int pci_read_irq_line(struct pci_dev *pci_dev)
                 return -1;
         }
         pci_dev->irq = virq;
-        pci_write_config_byte(pci_dev, PCI_INTERRUPT_LINE, virq);
 
         return 0;
 }
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 01f18c683407..7e97d71a5f8f 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -381,8 +381,6 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
 
         pci_device_add(dev, bus);
 
-        /* XXX pci_scan_msi_device(dev); */
-
         return dev;
 }
 EXPORT_SYMBOL(of_create_pci_dev);
@@ -1325,7 +1323,6 @@ int pci_read_irq_line(struct pci_dev *pci_dev)
         DBG(" -> mapped to linux irq %d\n", virq);
 
         pci_dev->irq = virq;
-        pci_write_config_byte(pci_dev, PCI_INTERRUPT_LINE, virq);
 
         return 0;
 }
diff --git a/arch/powerpc/kernel/pmc.c b/arch/powerpc/kernel/pmc.c
index 3d8f6f44641e..24d7b7c99bb9 100644
--- a/arch/powerpc/kernel/pmc.c
+++ b/arch/powerpc/kernel/pmc.c
@@ -17,40 +17,25 @@
 #include <linux/module.h>
 
 #include <asm/processor.h>
+#include <asm/cputable.h>
 #include <asm/pmc.h>
 
-#if defined(CONFIG_FSL_BOOKE) && !defined(CONFIG_E200)
-static void dummy_perf(struct pt_regs *regs)
-{
-        unsigned int pmgc0 = mfpmr(PMRN_PMGC0);
-
-        pmgc0 &= ~PMGC0_PMIE;
-        mtpmr(PMRN_PMGC0, pmgc0);
-}
-#elif defined(CONFIG_PPC64) || defined(CONFIG_6xx)
-
-#ifndef MMCR0_PMAO
-#define MMCR0_PMAO      0
+#ifndef MMCR0_PMA0
+#define MMCR0_PMA0      0
 #endif
 
-/* Ensure exceptions are disabled */
 static void dummy_perf(struct pt_regs *regs)
 {
-        unsigned int mmcr0 = mfspr(SPRN_MMCR0);
-
-        mmcr0 &= ~(MMCR0_PMXE|MMCR0_PMAO);
-        mtspr(SPRN_MMCR0, mmcr0);
-}
+#if defined(CONFIG_FSL_BOOKE) && !defined(CONFIG_E200)
+        mtpmr(PMRN_PMGC0, mfpmr(PMRN_PMGC0) & ~PMGC0_PMIE);
+#elif defined(CONFIG_PPC64) || defined(CONFIG_6xx)
+        if (cur_cpu_spec->pmc_type == PPC_PMC_IBM)
+                mtspr(SPRN_MMCR0, mfspr(SPRN_MMCR0) & ~(MMCR0_PMXE|MMCR0_PMA0));
 #else
-/* Ensure exceptions are disabled */
-static void dummy_perf(struct pt_regs *regs)
-{
-        unsigned int mmcr0 = mfspr(SPRN_MMCR0);
-
-        mmcr0 &= ~(MMCR0_PMXE);
-        mtspr(SPRN_MMCR0, mmcr0);
-}
+        mtspr(SPRN_MMCR0, mfspr(SPRN_MMCR0) & ~MMCR0_PMXE);
 #endif
+}
+
 
 static DEFINE_SPINLOCK(pmc_owner_lock);
 static void *pmc_owner_caller; /* mostly for debugging */
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index 95776b6af4e2..ecee596d28f6 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -44,6 +44,7 @@
 #include <asm/btext.h>
 #include <asm/div64.h>
 #include <asm/signal.h>
+#include <asm/dcr.h>
 
 #ifdef  CONFIG_8xx
 #include <asm/commproc.h>
diff --git a/arch/powerpc/kernel/proc_ppc64.c b/arch/powerpc/kernel/proc_ppc64.c
index dd7001cacf75..f78dfce1b771 100644
--- a/arch/powerpc/kernel/proc_ppc64.c
+++ b/arch/powerpc/kernel/proc_ppc64.c
@@ -33,7 +33,7 @@ static ssize_t page_map_read( struct file *file, char __user *buf, size_t nbytes
                               loff_t *ppos);
 static int     page_map_mmap( struct file *file, struct vm_area_struct *vma );
 
-static struct file_operations page_map_fops = {
+static const struct file_operations page_map_fops = {
         .llseek = page_map_seek,
         .read   = page_map_read,
         .mmap   = page_map_mmap
@@ -71,7 +71,6 @@ static int __init proc_ppc64_init(void)
         pde = create_proc_entry("ppc64/systemcfg", S_IFREG|S_IRUGO, NULL);
         if (!pde)
                 return 1;
-        pde->nlink = 1;
         pde->data = vdso_data;
         pde->size = PAGE_SIZE;
         pde->proc_fops = &page_map_fops;
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 1fc732a552db..3e86e6e0f778 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -991,7 +991,7 @@ void __init early_init_devtree(void *params)
         of_scan_flat_dt(early_init_dt_scan_memory, NULL);
 
         /* Save command line for /proc/cmdline and then parse parameters */
-        strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
+        strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
         parse_early_param();
 
         /* Reserve LMB regions used by kernel, initrd, dt, etc... */
@@ -1221,8 +1221,7 @@ struct device_node *of_find_node_by_name(struct device_node *from,
                 if (np->name != NULL && strcasecmp(np->name, name) == 0
                     && of_node_get(np))
                         break;
-        if (from)
-                of_node_put(from);
+        of_node_put(from);
         read_unlock(&devtree_lock);
         return np;
 }
@@ -1250,8 +1249,7 @@ struct device_node *of_find_node_by_type(struct device_node *from,
                 if (np->type != 0 && strcasecmp(np->type, type) == 0
                     && of_node_get(np))
                         break;
-        if (from)
-                of_node_put(from);
+        of_node_put(from);
         read_unlock(&devtree_lock);
         return np;
 }
@@ -1285,8 +1283,7 @@ struct device_node *of_find_compatible_node(struct device_node *from,
                 if (device_is_compatible(np, compatible) && of_node_get(np))
                         break;
         }
-        if (from)
-                of_node_put(from);
+        of_node_put(from);
         read_unlock(&devtree_lock);
         return np;
 }
@@ -1329,8 +1326,7 @@ struct device_node *of_find_node_by_phandle(phandle handle)
         for (np = allnodes; np != 0; np = np->allnext)
                 if (np->linux_phandle == handle)
                         break;
-        if (np)
-                of_node_get(np);
+        of_node_get(np);
         read_unlock(&devtree_lock);
         return np;
 }
@@ -1353,8 +1349,7 @@ struct device_node *of_find_all_nodes(struct device_node *prev)
         for (; np != 0; np = np->allnext)
                 if (of_node_get(np))
                         break;
-        if (prev)
-                of_node_put(prev);
+        of_node_put(prev);
         read_unlock(&devtree_lock);
         return np;
 }
@@ -1399,8 +1394,7 @@ struct device_node *of_get_next_child(const struct device_node *node,
         for (; next != 0; next = next->sibling)
                 if (of_node_get(next))
                         break;
-        if (prev)
-                of_node_put(prev);
+        of_node_put(prev);
         read_unlock(&devtree_lock);
         return next;
 }
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 975102a020d9..cc44c7b975aa 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -532,16 +532,22 @@ void do_syscall_trace_enter(struct pt_regs *regs)
             && (current->ptrace & PT_PTRACED))
                 do_syscall_trace();
 
-        if (unlikely(current->audit_context))
-                audit_syscall_entry(
-#ifdef CONFIG_PPC32
-                                    AUDIT_ARCH_PPC,
-#else
-                                    test_thread_flag(TIF_32BIT)?AUDIT_ARCH_PPC:AUDIT_ARCH_PPC64,
+        if (unlikely(current->audit_context)) {
+#ifdef CONFIG_PPC64
+                if (!test_thread_flag(TIF_32BIT))
+                        audit_syscall_entry(AUDIT_ARCH_PPC64,
+                                            regs->gpr[0],
+                                            regs->gpr[3], regs->gpr[4],
+                                            regs->gpr[5], regs->gpr[6]);
+                else
 #endif
-                                    regs->gpr[0],
-                                    regs->gpr[3], regs->gpr[4],
-                                    regs->gpr[5], regs->gpr[6]);
+                        audit_syscall_entry(AUDIT_ARCH_PPC,
+                                            regs->gpr[0],
+                                            regs->gpr[3] & 0xffffffff,
+                                            regs->gpr[4] & 0xffffffff,
+                                            regs->gpr[5] & 0xffffffff,
+                                            regs->gpr[6] & 0xffffffff);
+        }
 }
 
 void do_syscall_trace_leave(struct pt_regs *regs)
diff --git a/arch/powerpc/kernel/rtas-proc.c b/arch/powerpc/kernel/rtas-proc.c
index 2fe82abf1c52..6cbf2ae5d7aa 100644
--- a/arch/powerpc/kernel/rtas-proc.c
+++ b/arch/powerpc/kernel/rtas-proc.c
@@ -160,7 +160,7 @@ static int sensors_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_rtas_sensors_show, NULL);
 }
 
-struct file_operations ppc_rtas_sensors_operations = {
+const struct file_operations ppc_rtas_sensors_operations = {
         .open           = sensors_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -172,7 +172,7 @@ static int poweron_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_rtas_poweron_show, NULL);
 }
 
-struct file_operations ppc_rtas_poweron_operations = {
+const struct file_operations ppc_rtas_poweron_operations = {
         .open           = poweron_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -185,7 +185,7 @@ static int progress_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_rtas_progress_show, NULL);
 }
 
-struct file_operations ppc_rtas_progress_operations = {
+const struct file_operations ppc_rtas_progress_operations = {
         .open           = progress_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -198,7 +198,7 @@ static int clock_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_rtas_clock_show, NULL);
 }
 
-struct file_operations ppc_rtas_clock_operations = {
+const struct file_operations ppc_rtas_clock_operations = {
         .open           = clock_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -211,7 +211,7 @@ static int tone_freq_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_rtas_tone_freq_show, NULL);
 }
 
-struct file_operations ppc_rtas_tone_freq_operations = {
+const struct file_operations ppc_rtas_tone_freq_operations = {
         .open           = tone_freq_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -224,7 +224,7 @@ static int tone_volume_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_rtas_tone_volume_show, NULL);
 }
 
-struct file_operations ppc_rtas_tone_volume_operations = {
+const struct file_operations ppc_rtas_tone_volume_operations = {
         .open           = tone_volume_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -237,7 +237,7 @@ static int rmo_buf_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_rtas_rmo_buf_show, NULL);
 }
 
-struct file_operations ppc_rtas_rmo_buf_ops = {
+const struct file_operations ppc_rtas_rmo_buf_ops = {
         .open           = rmo_buf_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c
index 0c4fcd34bfe5..f72118c0844f 100644
--- a/arch/powerpc/kernel/rtas_flash.c
+++ b/arch/powerpc/kernel/rtas_flash.c
@@ -702,13 +702,12 @@ static int initialize_flash_pde_data(const char *rtas_call_name,
 }
 
 static struct proc_dir_entry *create_flash_pde(const char *filename,
-                                               struct file_operations *fops)
+                                               const struct file_operations *fops)
 {
         struct proc_dir_entry *ent = NULL;
 
         ent = create_proc_entry(filename, S_IRUSR | S_IWUSR, NULL);
         if (ent != NULL) {
-                ent->nlink = 1;
                 ent->proc_fops = fops;
                 ent->owner = THIS_MODULE;
         }
@@ -716,21 +715,21 @@ static struct proc_dir_entry *create_flash_pde(const char *filename,
         return ent;
 }
 
-static struct file_operations rtas_flash_operations = {
+static const struct file_operations rtas_flash_operations = {
         .read           = rtas_flash_read,
         .write          = rtas_flash_write,
         .open           = rtas_excl_open,
         .release        = rtas_flash_release,
 };
 
-static struct file_operations manage_flash_operations = {
+static const struct file_operations manage_flash_operations = {
         .read           = manage_flash_read,
         .write          = manage_flash_write,
         .open           = rtas_excl_open,
         .release        = rtas_excl_release,
 };
 
-static struct file_operations validate_flash_operations = {
+static const struct file_operations validate_flash_operations = {
         .read           = validate_flash_read,
         .write          = validate_flash_write,
         .open           = rtas_excl_open,
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 61c65d19ef06..6a19fa40dcee 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -65,6 +65,7 @@ int have_of = 1;
 
 #ifdef CONFIG_VGA_CONSOLE
 unsigned long vgacon_remap_base;
+EXPORT_SYMBOL(vgacon_remap_base);
 #endif
 
 /*
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index 03a2a2f30d66..673e8d9df7f5 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -198,73 +198,6 @@ static inline long put_tv32(struct compat_timeval __user *o, struct timeval *i)
                  __put_user(i->tv_usec, &o->tv_usec)));
 }
 
-struct sysinfo32 {
-        s32 uptime;
-        u32 loads[3];
-        u32 totalram;
-        u32 freeram;
-        u32 sharedram;
-        u32 bufferram;
-        u32 totalswap;
-        u32 freeswap;
-        unsigned short procs;
-        unsigned short pad;
-        u32 totalhigh;
-        u32 freehigh;
-        u32 mem_unit;
-        char _f[20-2*sizeof(int)-sizeof(int)];
-};
-
-asmlinkage long compat_sys_sysinfo(struct sysinfo32 __user *info)
-{
-        struct sysinfo s;
-        int ret, err;
-        int bitcount=0;
-        mm_segment_t old_fs = get_fs ();
-        
-        /* The __user cast is valid due to set_fs() */
-        set_fs (KERNEL_DS);
-        ret = sys_sysinfo((struct sysinfo __user *)&s);
-        set_fs (old_fs);
-
-        /* Check to see if any memory value is too large for 32-bit and
-         * scale down if needed.
-         */
-        if ((s.totalram >> 32) || (s.totalswap >> 32)) {
-            while (s.mem_unit < PAGE_SIZE) {
-                s.mem_unit <<= 1;
-                bitcount++;
-            }
-            s.totalram >>=bitcount;
-            s.freeram >>= bitcount;
-            s.sharedram >>= bitcount;
-            s.bufferram >>= bitcount;
-            s.totalswap >>= bitcount;
-            s.freeswap >>= bitcount;
-            s.totalhigh >>= bitcount;
-            s.freehigh >>= bitcount;
-        }
-
-        err = put_user (s.uptime, &info->uptime);
-        err |= __put_user (s.loads[0], &info->loads[0]);
-        err |= __put_user (s.loads[1], &info->loads[1]);
-        err |= __put_user (s.loads[2], &info->loads[2]);
-        err |= __put_user (s.totalram, &info->totalram);
-        err |= __put_user (s.freeram, &info->freeram);
-        err |= __put_user (s.sharedram, &info->sharedram);
-        err |= __put_user (s.bufferram, &info->bufferram);
-        err |= __put_user (s.totalswap, &info->totalswap);
-        err |= __put_user (s.freeswap, &info->freeswap);
-        err |= __put_user (s.procs, &info->procs);
-        err |= __put_user (s.totalhigh, &info->totalhigh);
-        err |= __put_user (s.freehigh, &info->freehigh);
-        err |= __put_user (s.mem_unit, &info->mem_unit);
-        if (err)
-                return -EFAULT;
-        
-        return ret;
-}
-
 
 
 
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 400ab2b946e7..d57818aea081 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -169,6 +169,11 @@ static ssize_t __attribute_used__ \
         return count; \
 }
 
+
+/* Let's define all possible registers, we'll only hook up the ones
+ * that are implemented on the current processor
+ */
+
 SYSFS_PMCSETUP(mmcr0, SPRN_MMCR0);
 SYSFS_PMCSETUP(mmcr1, SPRN_MMCR1);
 SYSFS_PMCSETUP(mmcra, SPRN_MMCRA);
@@ -184,55 +189,87 @@ SYSFS_PMCSETUP(purr, SPRN_PURR);
 SYSFS_PMCSETUP(spurr, SPRN_SPURR);
 SYSFS_PMCSETUP(dscr, SPRN_DSCR);
 
-static SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0);
-static SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1);
+SYSFS_PMCSETUP(pa6t_pmc0, PA6T_SPRN_PMC0);
+SYSFS_PMCSETUP(pa6t_pmc1, PA6T_SPRN_PMC1);
+SYSFS_PMCSETUP(pa6t_pmc2, PA6T_SPRN_PMC2);
+SYSFS_PMCSETUP(pa6t_pmc3, PA6T_SPRN_PMC3);
+SYSFS_PMCSETUP(pa6t_pmc4, PA6T_SPRN_PMC4);
+SYSFS_PMCSETUP(pa6t_pmc5, PA6T_SPRN_PMC5);
+
+
 static SYSDEV_ATTR(mmcra, 0600, show_mmcra, store_mmcra);
-static SYSDEV_ATTR(pmc1, 0600, show_pmc1, store_pmc1);
-static SYSDEV_ATTR(pmc2, 0600, show_pmc2, store_pmc2);
-static SYSDEV_ATTR(pmc3, 0600, show_pmc3, store_pmc3);
-static SYSDEV_ATTR(pmc4, 0600, show_pmc4, store_pmc4);
-static SYSDEV_ATTR(pmc5, 0600, show_pmc5, store_pmc5);
-static SYSDEV_ATTR(pmc6, 0600, show_pmc6, store_pmc6);
-static SYSDEV_ATTR(pmc7, 0600, show_pmc7, store_pmc7);
-static SYSDEV_ATTR(pmc8, 0600, show_pmc8, store_pmc8);
-static SYSDEV_ATTR(purr, 0600, show_purr, NULL);
 static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL);
 static SYSDEV_ATTR(dscr, 0600, show_dscr, store_dscr);
+static SYSDEV_ATTR(purr, 0600, show_purr, store_purr);
+
+static struct sysdev_attribute ibm_common_attrs[] = {
+        _SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
+        _SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
+};
+
+static struct sysdev_attribute ibm_pmc_attrs[] = {
+        _SYSDEV_ATTR(pmc1, 0600, show_pmc1, store_pmc1),
+        _SYSDEV_ATTR(pmc2, 0600, show_pmc2, store_pmc2),
+        _SYSDEV_ATTR(pmc3, 0600, show_pmc3, store_pmc3),
+        _SYSDEV_ATTR(pmc4, 0600, show_pmc4, store_pmc4),
+        _SYSDEV_ATTR(pmc5, 0600, show_pmc5, store_pmc5),
+        _SYSDEV_ATTR(pmc6, 0600, show_pmc6, store_pmc6),
+        _SYSDEV_ATTR(pmc7, 0600, show_pmc7, store_pmc7),
+        _SYSDEV_ATTR(pmc8, 0600, show_pmc8, store_pmc8),
+};
+
+static struct sysdev_attribute pa6t_attrs[] = {
+        _SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
+        _SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
+        _SYSDEV_ATTR(pmc0, 0600, show_pa6t_pmc0, store_pa6t_pmc0),
+        _SYSDEV_ATTR(pmc1, 0600, show_pa6t_pmc1, store_pa6t_pmc1),
+        _SYSDEV_ATTR(pmc2, 0600, show_pa6t_pmc2, store_pa6t_pmc2),
+        _SYSDEV_ATTR(pmc3, 0600, show_pa6t_pmc3, store_pa6t_pmc3),
+        _SYSDEV_ATTR(pmc4, 0600, show_pa6t_pmc4, store_pa6t_pmc4),
+        _SYSDEV_ATTR(pmc5, 0600, show_pa6t_pmc5, store_pa6t_pmc5),
+};
+
 
 static void register_cpu_online(unsigned int cpu)
 {
         struct cpu *c = &per_cpu(cpu_devices, cpu);
         struct sys_device *s = &c->sysdev;
+        struct sysdev_attribute *attrs, *pmc_attrs;
+        int i, nattrs;
 
         if (!firmware_has_feature(FW_FEATURE_ISERIES) &&
                         cpu_has_feature(CPU_FTR_SMT))
                 sysdev_create_file(s, &attr_smt_snooze_delay);
 
         /* PMC stuff */
+        switch (cur_cpu_spec->pmc_type) {
+        case PPC_PMC_IBM:
+                attrs = ibm_common_attrs;
+                nattrs = sizeof(ibm_common_attrs) / sizeof(struct sysdev_attribute);
+                pmc_attrs = ibm_pmc_attrs;
+                break;
+        case PPC_PMC_PA6T:
+                /* PA Semi starts counting at PMC0 */
+                attrs = pa6t_attrs;
+                nattrs = sizeof(pa6t_attrs) / sizeof(struct sysdev_attribute);
+                pmc_attrs = NULL;
+                break;
+        default:
+                attrs = NULL;
+                nattrs = 0;
+                pmc_attrs = NULL;
+        }
+
+        for (i = 0; i < nattrs; i++)
+                sysdev_create_file(s, &attrs[i]);
 
-        sysdev_create_file(s, &attr_mmcr0);
-        sysdev_create_file(s, &attr_mmcr1);
+        if (pmc_attrs)
+                for (i = 0; i < cur_cpu_spec->num_pmcs; i++)
+                        sysdev_create_file(s, &pmc_attrs[i]);
 
         if (cpu_has_feature(CPU_FTR_MMCRA))
                 sysdev_create_file(s, &attr_mmcra);
 
-        if (cur_cpu_spec->num_pmcs >= 1)
-                sysdev_create_file(s, &attr_pmc1);
-        if (cur_cpu_spec->num_pmcs >= 2)
-                sysdev_create_file(s, &attr_pmc2);
-        if (cur_cpu_spec->num_pmcs >= 3)
-                sysdev_create_file(s, &attr_pmc3);
-        if (cur_cpu_spec->num_pmcs >= 4)
-                sysdev_create_file(s, &attr_pmc4);
-        if (cur_cpu_spec->num_pmcs >= 5)
-                sysdev_create_file(s, &attr_pmc5);
-        if (cur_cpu_spec->num_pmcs >= 6)
-                sysdev_create_file(s, &attr_pmc6);
-        if (cur_cpu_spec->num_pmcs >= 7)
-                sysdev_create_file(s, &attr_pmc7);
-        if (cur_cpu_spec->num_pmcs >= 8)
-                sysdev_create_file(s, &attr_pmc8);
-
         if (cpu_has_feature(CPU_FTR_PURR))
                 sysdev_create_file(s, &attr_purr);
 
@@ -248,6 +285,8 @@ static void unregister_cpu_online(unsigned int cpu)
 {
         struct cpu *c = &per_cpu(cpu_devices, cpu);
         struct sys_device *s = &c->sysdev;
+        struct sysdev_attribute *attrs, *pmc_attrs;
+        int i, nattrs;
 
         BUG_ON(!c->hotpluggable);
 
@@ -256,30 +295,34 @@ static void unregister_cpu_online(unsigned int cpu)
                 sysdev_remove_file(s, &attr_smt_snooze_delay);
 
         /* PMC stuff */
+        switch (cur_cpu_spec->pmc_type) {
+        case PPC_PMC_IBM:
+                attrs = ibm_common_attrs;
+                nattrs = sizeof(ibm_common_attrs) / sizeof(struct sysdev_attribute);
+                pmc_attrs = ibm_pmc_attrs;
+                break;
+        case PPC_PMC_PA6T:
+                /* PA Semi starts counting at PMC0 */
+                attrs = pa6t_attrs;
+                nattrs = sizeof(pa6t_attrs) / sizeof(struct sysdev_attribute);
+                pmc_attrs = NULL;
+                break;
+        default:
+                attrs = NULL;
+                nattrs = 0;
+                pmc_attrs = NULL;
+        }
 
-        sysdev_remove_file(s, &attr_mmcr0);
-        sysdev_remove_file(s, &attr_mmcr1);
+        for (i = 0; i < nattrs; i++)
+                sysdev_remove_file(s, &attrs[i]);
+
+        if (pmc_attrs)
+                for (i = 0; i < cur_cpu_spec->num_pmcs; i++)
+                        sysdev_remove_file(s, &pmc_attrs[i]);
 
         if (cpu_has_feature(CPU_FTR_MMCRA))
                 sysdev_remove_file(s, &attr_mmcra);
 
-        if (cur_cpu_spec->num_pmcs >= 1)
-                sysdev_remove_file(s, &attr_pmc1);
-        if (cur_cpu_spec->num_pmcs >= 2)
-                sysdev_remove_file(s, &attr_pmc2);
-        if (cur_cpu_spec->num_pmcs >= 3)
-                sysdev_remove_file(s, &attr_pmc3);
-        if (cur_cpu_spec->num_pmcs >= 4)
-                sysdev_remove_file(s, &attr_pmc4);
-        if (cur_cpu_spec->num_pmcs >= 5)
-                sysdev_remove_file(s, &attr_pmc5);
-        if (cur_cpu_spec->num_pmcs >= 6)
-                sysdev_remove_file(s, &attr_pmc6);
-        if (cur_cpu_spec->num_pmcs >= 7)
-                sysdev_remove_file(s, &attr_pmc7);
-        if (cur_cpu_spec->num_pmcs >= 8)
-                sysdev_remove_file(s, &attr_pmc8);
-
         if (cpu_has_feature(CPU_FTR_PURR))
                 sysdev_remove_file(s, &attr_purr);
 
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 535f50665647..dcc6f159fd94 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -174,7 +174,7 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
          * generate the same exception over and over again and we get
          * nowhere.  Better to kill it and let the kernel panic.
          */
-        if (current->pid == 1) {
+        if (is_init(current)) {
                 __sighandler_t handler;
 
                 spin_lock_irq(&current->sighand->siglock);
@@ -535,34 +535,40 @@ static void emulate_single_step(struct pt_regs *regs)
         }
 }
 
-static void parse_fpe(struct pt_regs *regs)
+static inline int __parse_fpscr(unsigned long fpscr)
 {
-        int code = 0;
-        unsigned long fpscr;
-
-        flush_fp_to_thread(current);
-
-        fpscr = current->thread.fpscr.val;
+        int ret = 0;
 
         /* Invalid operation */
         if ((fpscr & FPSCR_VE) && (fpscr & FPSCR_VX))
-                code = FPE_FLTINV;
+                ret = FPE_FLTINV;
 
         /* Overflow */
         else if ((fpscr & FPSCR_OE) && (fpscr & FPSCR_OX))
-                code = FPE_FLTOVF;
+                ret = FPE_FLTOVF;
 
         /* Underflow */
         else if ((fpscr & FPSCR_UE) && (fpscr & FPSCR_UX))
-                code = FPE_FLTUND;
+                ret = FPE_FLTUND;
 
         /* Divide by zero */
         else if ((fpscr & FPSCR_ZE) && (fpscr & FPSCR_ZX))
-                code = FPE_FLTDIV;
+                ret = FPE_FLTDIV;
 
         /* Inexact result */
         else if ((fpscr & FPSCR_XE) && (fpscr & FPSCR_XX))
-                code = FPE_FLTRES;
+                ret = FPE_FLTRES;
+
+        return ret;
+}
+
+static void parse_fpe(struct pt_regs *regs)
+{
+        int code = 0;
+
+        flush_fp_to_thread(current);
+
+        code = __parse_fpscr(current->thread.fpscr.val);
 
         _exception(SIGFPE, regs, code, regs->nip);
 }
@@ -739,20 +745,7 @@ void __kprobes program_check_exception(struct pt_regs *regs)
         extern int do_mathemu(struct pt_regs *regs);
 
         /* We can now get here via a FP Unavailable exception if the core
-         * has no FPU, in that case no reason flags will be set */
-#ifdef CONFIG_MATH_EMULATION
-        /* (reason & REASON_ILLEGAL) would be the obvious thing here,
-         * but there seems to be a hardware bug on the 405GP (RevD)
-         * that means ESR is sometimes set incorrectly - either to
-         * ESR_DST (!?) or 0.  In the process of chasing this with the
-         * hardware people - not sure if it can happen on any illegal
-         * instruction or only on FP instructions, whether there is a
-         * pattern to occurences etc. -dgibson 31/Mar/2003 */
-        if (!(reason & REASON_TRAP) && do_mathemu(regs) == 0) {
-                emulate_single_step(regs);
-                return;
-        }
-#endif /* CONFIG_MATH_EMULATION */
+         * has no FPU, in that case the reason flags will be 0 */
 
         if (reason & REASON_FP) {
                 /* IEEE FP exception */
@@ -778,6 +771,31 @@ void __kprobes program_check_exception(struct pt_regs *regs)
 
         local_irq_enable();
 
+#ifdef CONFIG_MATH_EMULATION
+        /* (reason & REASON_ILLEGAL) would be the obvious thing here,
+         * but there seems to be a hardware bug on the 405GP (RevD)
+         * that means ESR is sometimes set incorrectly - either to
+         * ESR_DST (!?) or 0.  In the process of chasing this with the
+         * hardware people - not sure if it can happen on any illegal
+         * instruction or only on FP instructions, whether there is a
+         * pattern to occurences etc. -dgibson 31/Mar/2003 */
+        switch (do_mathemu(regs)) {
+        case 0:
+                emulate_single_step(regs);
+                return;
+        case 1: {
+                        int code = 0;
+                        code = __parse_fpscr(current->thread.fpscr.val);
+                        _exception(SIGFPE, regs, code, regs->nip);
+                        return;
+                }
+        case -EFAULT:
+                _exception(SIGSEGV, regs, SEGV_MAPERR, regs->nip);
+                return;
+        }
+        /* fall through on any other errors */
+#endif /* CONFIG_MATH_EMULATION */
+
         /* Try to emulate it if we should. */
         if (reason & (REASON_ILLEGAL | REASON_PRIVILEGED)) {
                 switch (emulate_instruction(regs)) {
@@ -891,18 +909,39 @@ void SoftwareEmulation(struct pt_regs *regs)
 
 #ifdef CONFIG_MATH_EMULATION
         errcode = do_mathemu(regs);
+
+        switch (errcode) {
+        case 0:
+                emulate_single_step(regs);
+                return;
+        case 1: {
+                        int code = 0;
+                        code = __parse_fpscr(current->thread.fpscr.val);
+                        _exception(SIGFPE, regs, code, regs->nip);
+                        return;
+                }
+        case -EFAULT:
+                _exception(SIGSEGV, regs, SEGV_MAPERR, regs->nip);
+                return;
+        default:
+                _exception(SIGILL, regs, ILL_ILLOPC, regs->nip);
+                return;
+        }
+
 #else
         errcode = Soft_emulate_8xx(regs);
-#endif
-        if (errcode) {
-                if (errcode > 0)
-                        _exception(SIGFPE, regs, 0, 0);
-                else if (errcode == -EFAULT)
-                        _exception(SIGSEGV, regs, 0, 0);
-                else
-                        _exception(SIGILL, regs, ILL_ILLOPC, regs->nip);
-        } else
+        switch (errcode) {
+        case 0:
                 emulate_single_step(regs);
+                return;
+        case 1:
+                _exception(SIGILL, regs, ILL_ILLOPC, regs->nip);
+                return;
+        case -EFAULT:
+                _exception(SIGSEGV, regs, SEGV_MAPERR, regs->nip);
+                return;
+        }
+#endif
 }
 #endif /* CONFIG_8xx */
 
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c
index 5730906b23d5..194a93eeb3e7 100644
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@ -45,6 +45,10 @@ void __init udbg_early_init(void)
 #elif defined(CONFIG_PPC_EARLY_DEBUG_ISERIES)
         /* For iSeries - hit Ctrl-x Ctrl-x to see the output */
         udbg_init_iseries();
+#elif defined(CONFIG_PPC_EARLY_DEBUG_BEAT)
+        udbg_init_debug_beat();
+#elif defined(CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE)
+        udbg_init_pas_realmode();
 #endif
 }
 
@@ -146,7 +150,7 @@ void __init disable_early_printk(void)
 {
         if (!early_console_initialized)
                 return;
-        if (strstr(saved_command_line, "udbg-immortal")) {
+        if (strstr(boot_command_line, "udbg-immortal")) {
                 printk(KERN_INFO "early console immortal !\n");
                 return;
         }
diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c
index 2d17f2b8eda7..e738f93b42fe 100644
--- a/arch/powerpc/kernel/udbg_16550.c
+++ b/arch/powerpc/kernel/udbg_16550.c
@@ -14,6 +14,8 @@
 
 extern u8 real_readb(volatile u8 __iomem  *addr);
 extern void real_writeb(u8 data, volatile u8 __iomem *addr);
+extern u8 real_205_readb(volatile u8 __iomem  *addr);
+extern void real_205_writeb(u8 data, volatile u8 __iomem *addr);
 
 struct NS16550 {
         /* this struct must be packed */
@@ -167,3 +169,25 @@ void __init udbg_init_maple_realmode(void)
         udbg_getc_poll = NULL;
 }
 #endif /* CONFIG_PPC_MAPLE */
+
+#ifdef CONFIG_PPC_PASEMI
+void udbg_pas_real_putc(char c)
+{
+        if (udbg_comport) {
+                while ((real_205_readb(&udbg_comport->lsr) & LSR_THRE) == 0)
+                        /* wait for idle */;
+                real_205_writeb(c, &udbg_comport->thr); eieio();
+                if (c == '\n')
+                        udbg_pas_real_putc('\r');
+        }
+}
+
+void udbg_init_pas_realmode(void)
+{
+        udbg_comport = (volatile struct NS16550 __iomem *)0xfcff03f8;
+
+        udbg_putc = udbg_pas_real_putc;
+        udbg_getc = NULL;
+        udbg_getc_poll = NULL;
+}
+#endif /* CONFIG_PPC_MAPLE */
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index ae0ede19879d..50149ec6efa4 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -49,9 +49,13 @@
 /* Max supported size for symbol names */
 #define MAX_SYMNAME     64
 
+#define VDSO32_MAXPAGES (((0x3000 + PAGE_MASK) >> PAGE_SHIFT) + 2)
+#define VDSO64_MAXPAGES (((0x3000 + PAGE_MASK) >> PAGE_SHIFT) + 2)
+
 extern char vdso32_start, vdso32_end;
 static void *vdso32_kbase = &vdso32_start;
 unsigned int vdso32_pages;
+static struct page *vdso32_pagelist[VDSO32_MAXPAGES];
 unsigned long vdso32_sigtramp;
 unsigned long vdso32_rt_sigtramp;
 
@@ -59,6 +63,7 @@ unsigned long vdso32_rt_sigtramp;
 extern char vdso64_start, vdso64_end;
 static void *vdso64_kbase = &vdso64_start;
 unsigned int vdso64_pages;
+static struct page *vdso64_pagelist[VDSO64_MAXPAGES];
 unsigned long vdso64_rt_sigtramp;
 #endif /* CONFIG_PPC64 */
 
@@ -165,55 +170,6 @@ static void dump_vdso_pages(struct vm_area_struct * vma)
 #endif /* DEBUG */
 
 /*
- * Keep a dummy vma_close for now, it will prevent VMA merging.
- */
-static void vdso_vma_close(struct vm_area_struct * vma)
-{
-}
-
-/*
- * Our nopage() function, maps in the actual vDSO kernel pages, they will
- * be mapped read-only by do_no_page(), and eventually COW'ed, either
- * right away for an initial write access, or by do_wp_page().
- */
-static struct page * vdso_vma_nopage(struct vm_area_struct * vma,
-                                     unsigned long address, int *type)
-{
-        unsigned long offset = address - vma->vm_start;
-        struct page *pg;
-#ifdef CONFIG_PPC64
-        void *vbase = (vma->vm_mm->task_size > TASK_SIZE_USER32) ?
-                vdso64_kbase : vdso32_kbase;
-#else
-        void *vbase = vdso32_kbase;
-#endif
-
-        DBG("vdso_vma_nopage(current: %s, address: %016lx, off: %lx)\n",
-            current->comm, address, offset);
-
-        if (address < vma->vm_start || address > vma->vm_end)
-                return NOPAGE_SIGBUS;
-
-        /*
-         * Last page is systemcfg.
-         */
-        if ((vma->vm_end - address) <= PAGE_SIZE)
-                pg = virt_to_page(vdso_data);
-        else
-                pg = virt_to_page(vbase + offset);
-
-        get_page(pg);
-        DBG(" ->page count: %d\n", page_count(pg));
-
-        return pg;
-}
-
-static struct vm_operations_struct vdso_vmops = {
-        .close  = vdso_vma_close,
-        .nopage = vdso_vma_nopage,
-};
-
-/*
  * This is called from binfmt_elf, we create the special vma for the
  * vDSO and insert it into the mm struct tree
  */
@@ -221,20 +177,23 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
                                 int executable_stack)
 {
         struct mm_struct *mm = current->mm;
-        struct vm_area_struct *vma;
+        struct page **vdso_pagelist;
         unsigned long vdso_pages;
         unsigned long vdso_base;
         int rc;
 
 #ifdef CONFIG_PPC64
         if (test_thread_flag(TIF_32BIT)) {
+                vdso_pagelist = vdso32_pagelist;
                 vdso_pages = vdso32_pages;
                 vdso_base = VDSO32_MBASE;
         } else {
+                vdso_pagelist = vdso64_pagelist;
                 vdso_pages = vdso64_pages;
                 vdso_base = VDSO64_MBASE;
         }
 #else
+        vdso_pagelist = vdso32_pagelist;
         vdso_pages = vdso32_pages;
         vdso_base = VDSO32_MBASE;
 #endif
@@ -262,17 +221,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
                 goto fail_mmapsem;
         }
 
-
-        /* Allocate a VMA structure and fill it up */
-        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
-        if (vma == NULL) {
-                rc = -ENOMEM;
-                goto fail_mmapsem;
-        }
-        vma->vm_mm = mm;
-        vma->vm_start = vdso_base;
-        vma->vm_end = vma->vm_start + (vdso_pages << PAGE_SHIFT);
-
         /*
          * our vma flags don't have VM_WRITE so by default, the process isn't
          * allowed to write those pages.
@@ -282,32 +230,26 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
          * and your nice userland gettimeofday will be totally dead.
          * It's fine to use that for setting breakpoints in the vDSO code
          * pages though
-         */
-        vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC;
-        /*
+         *
          * Make sure the vDSO gets into every core dump.
          * Dumping its contents makes post-mortem fully interpretable later
          * without matching up the same kernel and hardware config to see
          * what PC values meant.
          */
-        vma->vm_flags |= VM_ALWAYSDUMP;
-        vma->vm_flags |= mm->def_flags;
-        vma->vm_page_prot = protection_map[vma->vm_flags & 0x7];
-        vma->vm_ops = &vdso_vmops;
-
-        /* Insert new VMA */
-        rc = insert_vm_struct(mm, vma);
+        rc = install_special_mapping(mm, vdso_base, vdso_pages << PAGE_SHIFT,
+                                     VM_READ|VM_EXEC|
+                                     VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
+                                     VM_ALWAYSDUMP,
+                                     vdso_pagelist);
         if (rc)
-                goto fail_vma;
+                goto fail_mmapsem;
 
-        /* Put vDSO base into mm struct and account for memory usage */
+        /* Put vDSO base into mm struct */
         current->mm->context.vdso_base = vdso_base;
-        mm->total_vm += (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+
         up_write(&mm->mmap_sem);
         return 0;
 
- fail_vma:
-        kmem_cache_free(vm_area_cachep, vma);
  fail_mmapsem:
         up_write(&mm->mmap_sem);
         return rc;
@@ -778,18 +720,26 @@ void __init vdso_init(void)
         }
 
         /* Make sure pages are in the correct state */
+        BUG_ON(vdso32_pages + 2 > VDSO32_MAXPAGES);
         for (i = 0; i < vdso32_pages; i++) {
                 struct page *pg = virt_to_page(vdso32_kbase + i*PAGE_SIZE);
                 ClearPageReserved(pg);
                 get_page(pg);
-
+                vdso32_pagelist[i] = pg;
         }
+        vdso32_pagelist[i++] = virt_to_page(vdso_data);
+        vdso32_pagelist[i] = NULL;
+
 #ifdef CONFIG_PPC64
+        BUG_ON(vdso64_pages + 2 > VDSO64_MAXPAGES);
         for (i = 0; i < vdso64_pages; i++) {
                 struct page *pg = virt_to_page(vdso64_kbase + i*PAGE_SIZE);
                 ClearPageReserved(pg);
                 get_page(pg);
+                vdso64_pagelist[i] = pg;
         }
+        vdso64_pagelist[i++] = virt_to_page(vdso_data);
+        vdso64_pagelist[i] = NULL;
 #endif /* CONFIG_PPC64 */
 
         get_page(virt_to_page(vdso_data));
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index a80f8f1d2e5d..2968ffeafdb6 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -199,10 +199,8 @@ EXPORT_SYMBOL(vio_unregister_driver);
 /* vio_dev refcount hit 0 */
 static void __devinit vio_dev_release(struct device *dev)
 {
-        if (dev->archdata.of_node) {
-                /* XXX should free TCE table */
-                of_node_put(dev->archdata.of_node);
-        }
+        /* XXX should free TCE table */
+        of_node_put(dev->archdata.of_node);
         kfree(to_vio_dev(dev));
 }
 
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 04b8e71bf5b0..7eefeb4a30e7 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -131,14 +131,14 @@ SECTIONS
                 __stop___fw_ftr_fixup = .;
         }
 #endif
-
+#ifdef CONFIG_BLK_DEV_INITRD
         . = ALIGN(PAGE_SIZE);
         .init.ramfs : {
                 __initramfs_start = .;
                 *(.init.ramfs)
                 __initramfs_end = .;
         }
-
+#endif
 #ifdef CONFIG_PPC32
         . = ALIGN(32);
 #else