Merge linux-2.6 with linux-acpi-2.6

28 files changed, 505 insertions, 448 deletions

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index f4b3bfcc109d..ae60eb1193c6 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -31,7 +31,7 @@ obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o prom.o
 
 obj-$(CONFIG_PPC_PSERIES) += pSeries_pci.o pSeries_lpar.o pSeries_hvCall.o \
                              pSeries_nvram.o rtasd.o ras.o pSeries_reconfig.o \
-                             pSeries_setup.o pSeries_iommu.o
+                             pSeries_setup.o pSeries_iommu.o udbg_16550.o
 
 obj-$(CONFIG_PPC_BPA) += bpa_setup.o bpa_iommu.o bpa_nvram.o \
                          bpa_iic.o spider-pic.o
@@ -58,9 +58,11 @@ obj-$(CONFIG_XICS)		+= xics.o
 obj-$(CONFIG_MPIC)              += mpic.o
 
 obj-$(CONFIG_PPC_PMAC)          += pmac_setup.o pmac_feature.o pmac_pci.o \
-                                   pmac_time.o pmac_nvram.o pmac_low_i2c.o
+                                   pmac_time.o pmac_nvram.o pmac_low_i2c.o \
+                                   udbg_scc.o
 
-obj-$(CONFIG_PPC_MAPLE)         += maple_setup.o maple_pci.o maple_time.o
+obj-$(CONFIG_PPC_MAPLE)         += maple_setup.o maple_pci.o maple_time.o \
+                                   udbg_16550.o
 
 obj-$(CONFIG_U3_DART)           += u3_iommu.o
 
diff --git a/arch/ppc64/kernel/btext.c b/arch/ppc64/kernel/btext.c
index c53f079e9b77..b6fbfbe9032d 100644
--- a/arch/ppc64/kernel/btext.c
+++ b/arch/ppc64/kernel/btext.c
@@ -7,7 +7,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/version.h>
 
 #include <asm/sections.h>
 #include <asm/prom.h>
diff --git a/arch/ppc64/kernel/cputable.c b/arch/ppc64/kernel/cputable.c
index 4847f2ac8c9f..8831a28c3c4e 100644
--- a/arch/ppc64/kernel/cputable.c
+++ b/arch/ppc64/kernel/cputable.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 
+#include <asm/oprofile_impl.h>
 #include <asm/cputable.h>
 
 struct cpu_spec* cur_cpu_spec = NULL;
@@ -54,24 +55,32 @@ struct cpu_spec	cpu_specs[] = {
                 .pvr_value              = 0x00400000,
                 .cpu_name               = "POWER3 (630)",
                 .cpu_features           = CPU_FTR_SPLIT_ID_CACHE |
-                        CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE | CPU_FTR_IABR |
-                        CPU_FTR_PMC8,
+                        CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE | CPU_FTR_IABR,
                 .cpu_user_features = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power3,
+#ifdef CONFIG_OPROFILE
+                .oprofile_cpu_type      = "ppc64/power3",
+                .oprofile_model         = &op_model_rs64,
+#endif
         },
         {       /* Power3+ */
                 .pvr_mask               = 0xffff0000,
                 .pvr_value              = 0x00410000,
                 .cpu_name               = "POWER3 (630+)",
                 .cpu_features           = CPU_FTR_SPLIT_ID_CACHE |
-                        CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE | CPU_FTR_IABR |
-                        CPU_FTR_PMC8,
+                        CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE | CPU_FTR_IABR,
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power3,
+#ifdef CONFIG_OPROFILE
+                .oprofile_cpu_type      = "ppc64/power3",
+                .oprofile_model         = &op_model_rs64,
+#endif
         },
         {       /* Northstar */
                 .pvr_mask               = 0xffff0000,
@@ -79,11 +88,16 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_name               = "RS64-II (northstar)",
                 .cpu_features           = CPU_FTR_SPLIT_ID_CACHE |
                         CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE | CPU_FTR_IABR |
-                        CPU_FTR_PMC8 | CPU_FTR_MMCRA | CPU_FTR_CTRL,
+                        CPU_FTR_MMCRA | CPU_FTR_CTRL,
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power3,
+#ifdef CONFIG_OPROFILE
+                .oprofile_cpu_type      = "ppc64/rs64",
+                .oprofile_model         = &op_model_rs64,
+#endif
         },
         {       /* Pulsar */
                 .pvr_mask               = 0xffff0000,
@@ -91,11 +105,16 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_name               = "RS64-III (pulsar)",
                 .cpu_features           = CPU_FTR_SPLIT_ID_CACHE |
                         CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE | CPU_FTR_IABR |
-                        CPU_FTR_PMC8 | CPU_FTR_MMCRA | CPU_FTR_CTRL,
+                        CPU_FTR_MMCRA | CPU_FTR_CTRL,
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power3,
+#ifdef CONFIG_OPROFILE
+                .oprofile_cpu_type      = "ppc64/rs64",
+                .oprofile_model         = &op_model_rs64,
+#endif
         },
         {       /* I-star */
                 .pvr_mask               = 0xffff0000,
@@ -103,11 +122,16 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_name               = "RS64-III (icestar)",
                 .cpu_features           = CPU_FTR_SPLIT_ID_CACHE |
                         CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE | CPU_FTR_IABR |
-                        CPU_FTR_PMC8 | CPU_FTR_MMCRA | CPU_FTR_CTRL,
+                        CPU_FTR_MMCRA | CPU_FTR_CTRL,
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power3,
+#ifdef CONFIG_OPROFILE
+                .oprofile_cpu_type      = "ppc64/rs64",
+                .oprofile_model         = &op_model_rs64,
+#endif
         },
         {       /* S-star */
                 .pvr_mask               = 0xffff0000,
@@ -115,11 +139,16 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_name               = "RS64-IV (sstar)",
                 .cpu_features           = CPU_FTR_SPLIT_ID_CACHE |
                         CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE | CPU_FTR_IABR |
-                        CPU_FTR_PMC8 | CPU_FTR_MMCRA | CPU_FTR_CTRL,
+                        CPU_FTR_MMCRA | CPU_FTR_CTRL,
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power3,
+#ifdef CONFIG_OPROFILE
+                .oprofile_cpu_type      = "ppc64/rs64",
+                .oprofile_model         = &op_model_rs64,
+#endif
         },
         {       /* Power4 */
                 .pvr_mask               = 0xffff0000,
@@ -127,11 +156,16 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_name               = "POWER4 (gp)",
                 .cpu_features           = CPU_FTR_SPLIT_ID_CACHE |
                         CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE |
-                        CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_PMC8 | CPU_FTR_MMCRA,
+                        CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_MMCRA,
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power4,
+#ifdef CONFIG_OPROFILE
+                .oprofile_cpu_type      = "ppc64/power4",
+                .oprofile_model         = &op_model_rs64,
+#endif
         },
         {       /* Power4+ */
                 .pvr_mask               = 0xffff0000,
@@ -139,11 +173,16 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_name               = "POWER4+ (gq)",
                 .cpu_features           = CPU_FTR_SPLIT_ID_CACHE |
                         CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE |
-                        CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_PMC8 | CPU_FTR_MMCRA,
+                        CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_MMCRA,
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power4,
+#ifdef CONFIG_OPROFILE
+                .oprofile_cpu_type      = "ppc64/power4",
+                .oprofile_model         = &op_model_power4,
+#endif
         },
         {       /* PPC970 */
                 .pvr_mask               = 0xffff0000,
@@ -152,12 +191,17 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_features           = CPU_FTR_SPLIT_ID_CACHE |
                         CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE |
                         CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_ALTIVEC_COMP |
-                        CPU_FTR_CAN_NAP | CPU_FTR_PMC8 | CPU_FTR_MMCRA,
+                        CPU_FTR_CAN_NAP | CPU_FTR_MMCRA,
                 .cpu_user_features      = COMMON_USER_PPC64 |
                         PPC_FEATURE_HAS_ALTIVEC_COMP,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_ppc970,
+#ifdef CONFIG_OPROFILE
+                .oprofile_cpu_type      = "ppc64/970",
+                .oprofile_model         = &op_model_power4,
+#endif
         },
         {       /* PPC970FX */
                 .pvr_mask               = 0xffff0000,
@@ -166,12 +210,17 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_features           = CPU_FTR_SPLIT_ID_CACHE |
                         CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE |
                         CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_ALTIVEC_COMP |
-                        CPU_FTR_CAN_NAP | CPU_FTR_PMC8 | CPU_FTR_MMCRA,
+                        CPU_FTR_CAN_NAP | CPU_FTR_MMCRA,
                 .cpu_user_features      = COMMON_USER_PPC64 |
                         PPC_FEATURE_HAS_ALTIVEC_COMP,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_ppc970,
+#ifdef CONFIG_OPROFILE
+                .oprofile_cpu_type      = "ppc64/970",
+                .oprofile_model         = &op_model_power4,
+#endif
         },
         {       /* PPC970MP */
                 .pvr_mask               = 0xffff0000,
@@ -180,12 +229,16 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_features           = CPU_FTR_SPLIT_ID_CACHE |
                         CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE |
                         CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_ALTIVEC_COMP |
-                        CPU_FTR_CAN_NAP | CPU_FTR_PMC8 | CPU_FTR_MMCRA,
+                        CPU_FTR_CAN_NAP | CPU_FTR_MMCRA,
                 .cpu_user_features      = COMMON_USER_PPC64 |
                         PPC_FEATURE_HAS_ALTIVEC_COMP,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .cpu_setup              = __setup_cpu_ppc970,
+#ifdef CONFIG_OPROFILE
+                .oprofile_cpu_type      = "ppc64/970",
+                .oprofile_model         = &op_model_power4,
+#endif
         },
         {       /* Power5 */
                 .pvr_mask               = 0xffff0000,
@@ -199,7 +252,12 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 6,
                 .cpu_setup              = __setup_cpu_power4,
+#ifdef CONFIG_OPROFILE
+                .oprofile_cpu_type      = "ppc64/power5",
+                .oprofile_model         = &op_model_power4,
+#endif
         },
         {       /* Power5 */
                 .pvr_mask               = 0xffff0000,
@@ -213,7 +271,12 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 6,
                 .cpu_setup              = __setup_cpu_power4,
+#ifdef CONFIG_OPROFILE
+                .oprofile_cpu_type      = "ppc64/power5",
+                .oprofile_model         = &op_model_power4,
+#endif
         },
         {       /* BE DD1.x */
                 .pvr_mask               = 0xffff0000,
@@ -239,6 +302,7 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 6,
                 .cpu_setup              = __setup_cpu_power4,
         }
 };
diff --git a/arch/ppc64/kernel/entry.S b/arch/ppc64/kernel/entry.S
index b61572eb2a71..bf99b4a92f20 100644
--- a/arch/ppc64/kernel/entry.S
+++ b/arch/ppc64/kernel/entry.S
@@ -400,15 +400,14 @@ BEGIN_FTR_SECTION
         cmpd    cr1,r6,r9       /* or is new ESID the same as current ESID? */
         cror    eq,4*cr1+eq,eq
         beq     2f              /* if yes, don't slbie it */
-        oris    r0,r6,0x0800    /* set C (class) bit */
 
         /* Bolt in the new stack SLB entry */
         ld      r7,KSP_VSID(r4) /* Get new stack's VSID */
-        oris    r6,r6,(SLB_ESID_V)@h
-        ori     r6,r6,(SLB_NUM_BOLTED-1)@l
-        slbie   r0
-        slbie   r0              /* Workaround POWER5 < DD2.1 issue */
-        slbmte  r7,r6
+        oris    r0,r6,(SLB_ESID_V)@h
+        ori     r0,r0,(SLB_NUM_BOLTED-1)@l
+        slbie   r6
+        slbie   r6              /* Workaround POWER5 < DD2.1 issue */
+        slbmte  r7,r0
         isync
 
 2:
diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S
index 036959775623..b436206e317d 100644
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
@@ -1646,8 +1646,9 @@ _GLOBAL(__secondary_start)
 #else
         /* set the ASR */
         ld      r3,systemcfg@got(r2)    /* r3 = ptr to systemcfg         */
+        ld      r3,0(r3)
         lwz     r3,PLATFORM(r3)         /* r3 = platform flags           */
-        cmpldi  r3,PLATFORM_PSERIES_LPAR
+        andi.   r3,r3,PLATFORM_LPAR     /* Test if bit 0 is set (LPAR bit) */
         bne     98f
         mfspr   r3,PVR
         srwi    r3,r3,16
@@ -1809,8 +1810,9 @@ _STATIC(start_here_multiplatform)
         ld      r3,PACASTABREAL(r13)
         ori     r4,r3,1                 /* turn on valid bit             */
         ld      r3,systemcfg@got(r2)    /* r3 = ptr to systemcfg */
+        ld      r3,0(r3)
         lwz     r3,PLATFORM(r3)         /* r3 = platform flags */
-        cmpldi  r3,PLATFORM_PSERIES_LPAR
+        andi.   r3,r3,PLATFORM_LPAR     /* Test if bit 0 is set (LPAR bit) */
         bne     98f
         mfspr   r3,PVR
         srwi    r3,r3,16
@@ -1828,9 +1830,10 @@ _STATIC(start_here_multiplatform)
 99:
         /* Set SDR1 (hash table pointer) */
         ld      r3,systemcfg@got(r2)    /* r3 = ptr to systemcfg */
+        ld      r3,0(r3)
         lwz     r3,PLATFORM(r3)         /* r3 = platform flags */
         /* Test if bit 0 is set (LPAR bit) */
-        andi.   r3,r3,0x1
+        andi.   r3,r3,PLATFORM_LPAR
         bne     98f
         LOADADDR(r6,_SDR1)              /* Only if NOT LPAR */
         sub     r6,r6,r26
diff --git a/arch/ppc64/kernel/kprobes.c b/arch/ppc64/kernel/kprobes.c
index a3d519518fb8..7e80d49c589a 100644
--- a/arch/ppc64/kernel/kprobes.c
+++ b/arch/ppc64/kernel/kprobes.c
@@ -44,7 +44,7 @@ static struct kprobe *kprobe_prev;
 static unsigned long kprobe_status_prev, kprobe_saved_msr_prev;
 static struct pt_regs jprobe_saved_regs;
 
-int arch_prepare_kprobe(struct kprobe *p)
+int __kprobes arch_prepare_kprobe(struct kprobe *p)
 {
         int ret = 0;
         kprobe_opcode_t insn = *p->addr;
@@ -68,27 +68,27 @@ int arch_prepare_kprobe(struct kprobe *p)
         return ret;
 }
 
-void arch_copy_kprobe(struct kprobe *p)
+void __kprobes arch_copy_kprobe(struct kprobe *p)
 {
         memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
         p->opcode = *p->addr;
 }
 
-void arch_arm_kprobe(struct kprobe *p)
+void __kprobes arch_arm_kprobe(struct kprobe *p)
 {
         *p->addr = BREAKPOINT_INSTRUCTION;
         flush_icache_range((unsigned long) p->addr,
                            (unsigned long) p->addr + sizeof(kprobe_opcode_t));
 }
 
-void arch_disarm_kprobe(struct kprobe *p)
+void __kprobes arch_disarm_kprobe(struct kprobe *p)
 {
         *p->addr = p->opcode;
         flush_icache_range((unsigned long) p->addr,
                            (unsigned long) p->addr + sizeof(kprobe_opcode_t));
 }
 
-void arch_remove_kprobe(struct kprobe *p)
+void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
         up(&kprobe_mutex);
         free_insn_slot(p->ainsn.insn);
@@ -102,7 +102,7 @@ static inline void prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
         regs->msr |= MSR_SE;
 
         /* single step inline if it is a trap variant */
-        if (IS_TW(insn) || IS_TD(insn) || IS_TWI(insn) || IS_TDI(insn))
+        if (is_trap(insn))
                 regs->nip = (unsigned long)p->addr;
         else
                 regs->nip = (unsigned long)p->ainsn.insn;
@@ -122,7 +122,8 @@ static inline void restore_previous_kprobe(void)
         kprobe_saved_msr = kprobe_saved_msr_prev;
 }
 
-void arch_prepare_kretprobe(struct kretprobe *rp, struct pt_regs *regs)
+void __kprobes arch_prepare_kretprobe(struct kretprobe *rp,
+                                      struct pt_regs *regs)
 {
         struct kretprobe_instance *ri;
 
@@ -151,7 +152,9 @@ static inline int kprobe_handler(struct pt_regs *regs)
                    Disarm the probe we just hit, and ignore it. */
                 p = get_kprobe(addr);
                 if (p) {
-                        if (kprobe_status == KPROBE_HIT_SS) {
+                        kprobe_opcode_t insn = *p->ainsn.insn;
+                        if (kprobe_status == KPROBE_HIT_SS &&
+                                        is_trap(insn)) {
                                 regs->msr &= ~MSR_SE;
                                 regs->msr |= kprobe_saved_msr;
                                 unlock_kprobes();
@@ -191,8 +194,7 @@ static inline int kprobe_handler(struct pt_regs *regs)
                          * trap variant, it could belong to someone else
                          */
                         kprobe_opcode_t cur_insn = *addr;
-                        if (IS_TW(cur_insn) || IS_TD(cur_insn) ||
-                                        IS_TWI(cur_insn) || IS_TDI(cur_insn))
+                        if (is_trap(cur_insn))
                                 goto no_kprobe;
                         /*
                          * The breakpoint instruction was removed right
@@ -244,7 +246,7 @@ void kretprobe_trampoline_holder(void)
 /*
  * Called when the probe at kretprobe trampoline is hit
  */
-int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
 {
         struct kretprobe_instance *ri = NULL;
         struct hlist_head *head;
@@ -308,7 +310,7 @@ int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
  * single-stepped a copy of the instruction.  The address of this
  * copy is p->ainsn.insn.
  */
-static void resume_execution(struct kprobe *p, struct pt_regs *regs)
+static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs)
 {
         int ret;
         unsigned int insn = *p->ainsn.insn;
@@ -373,8 +375,8 @@ static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr)
 /*
  * Wrapper routine to for handling exceptions.
  */
-int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
-                             void *data)
+int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
+                                       unsigned long val, void *data)
 {
         struct die_args *args = (struct die_args *)data;
         int ret = NOTIFY_DONE;
@@ -402,11 +404,11 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
         default:
                 break;
         }
-        preempt_enable();
+        preempt_enable_no_resched();
         return ret;
 }
 
-int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
 {
         struct jprobe *jp = container_of(p, struct jprobe, kp);
 
@@ -419,16 +421,16 @@ int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
         return 1;
 }
 
-void jprobe_return(void)
+void __kprobes jprobe_return(void)
 {
         asm volatile("trap" ::: "memory");
 }
 
-void jprobe_return_end(void)
+void __kprobes jprobe_return_end(void)
 {
 };
 
-int longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
 {
         /*
          * FIXME - we should ideally be validating that we got here 'cos
diff --git a/arch/ppc64/kernel/lparcfg.c b/arch/ppc64/kernel/lparcfg.c
index edad361a8db0..cae19bbd5acd 100644
--- a/arch/ppc64/kernel/lparcfg.c
+++ b/arch/ppc64/kernel/lparcfg.c
@@ -569,7 +569,7 @@ struct file_operations lparcfg_fops = {
 int __init lparcfg_init(void)
 {
         struct proc_dir_entry *ent;
-        mode_t mode = S_IRUSR;
+        mode_t mode = S_IRUSR | S_IRGRP | S_IROTH;
 
         /* Allow writing if we have FW_FEATURE_SPLPAR */
         if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
diff --git a/arch/ppc64/kernel/maple_setup.c b/arch/ppc64/kernel/maple_setup.c
index bb55b5a56910..fc0567498a3a 100644
--- a/arch/ppc64/kernel/maple_setup.c
+++ b/arch/ppc64/kernel/maple_setup.c
@@ -207,9 +207,6 @@ static void __init maple_init_early(void)
                 comport = (void *)ioremap(physport, 16);
                 udbg_init_uart(comport, default_speed);
 
-                ppc_md.udbg_putc = udbg_putc;
-                ppc_md.udbg_getc = udbg_getc;
-                ppc_md.udbg_getc_poll = udbg_getc_poll;
                 DBG("Hello World !\n");
         }
 
diff --git a/arch/ppc64/kernel/misc.S b/arch/ppc64/kernel/misc.S
index 474df0a862bf..6d860c1d9fa0 100644
--- a/arch/ppc64/kernel/misc.S
+++ b/arch/ppc64/kernel/misc.S
@@ -183,7 +183,7 @@ PPC64_CACHES:
  *   flush all bytes from start through stop-1 inclusive
  */
 
-_GLOBAL(__flush_icache_range)
+_KPROBE(__flush_icache_range)
 
 /*
  * Flush the data cache to memory 
@@ -223,7 +223,7 @@ _GLOBAL(__flush_icache_range)
         bdnz    2b
         isync
         blr
-        
+        .previous .text
 /*
  * Like above, but only do the D-cache.
  *
@@ -957,7 +957,7 @@ _GLOBAL(sys_call_table32)
         .llong .ppc_fork
         .llong .sys_read
         .llong .sys_write
-        .llong .sys32_open              /* 5 */
+        .llong .compat_sys_open         /* 5 */
         .llong .sys_close
         .llong .sys32_waitpid
         .llong .sys32_creat
diff --git a/arch/ppc64/kernel/pSeries_lpar.c b/arch/ppc64/kernel/pSeries_lpar.c
index 0a3ddc9227c5..a6de83f2078f 100644
--- a/arch/ppc64/kernel/pSeries_lpar.c
+++ b/arch/ppc64/kernel/pSeries_lpar.c
@@ -192,9 +192,9 @@ static unsigned char udbg_getcLP(void)
 void udbg_init_debug_lpar(void)
 {
         vtermno = 0;
-        ppc_md.udbg_putc = udbg_putcLP;
-        ppc_md.udbg_getc = udbg_getcLP;
-        ppc_md.udbg_getc_poll = udbg_getc_pollLP;
+        udbg_putc = udbg_putcLP;
+        udbg_getc = udbg_getcLP;
+        udbg_getc_poll = udbg_getc_pollLP;
 }
 
 /* returns 0 if couldn't find or use /chosen/stdout as console */
@@ -227,18 +227,18 @@ int find_udbg_vterm(void)
                         termno = (u32 *)get_property(stdout_node, "reg", NULL);
                         if (termno) {
                                 vtermno = termno[0];
-                                ppc_md.udbg_putc = udbg_putcLP;
-                                ppc_md.udbg_getc = udbg_getcLP;
-                                ppc_md.udbg_getc_poll = udbg_getc_pollLP;
+                                udbg_putc = udbg_putcLP;
+                                udbg_getc = udbg_getcLP;
+                                udbg_getc_poll = udbg_getc_pollLP;
                                 found = 1;
                         }
                 } else if (device_is_compatible(stdout_node, "hvterm-protocol")) {
                         termno = (u32 *)get_property(stdout_node, "reg", NULL);
                         if (termno) {
                                 vtermno = termno[0];
-                                ppc_md.udbg_putc = udbg_hvsi_putc;
-                                ppc_md.udbg_getc = udbg_hvsi_getc;
-                                ppc_md.udbg_getc_poll = udbg_hvsi_getc_poll;
+                                udbg_putc = udbg_hvsi_putc;
+                                udbg_getc = udbg_hvsi_getc;
+                                udbg_getc_poll = udbg_hvsi_getc_poll;
                                 found = 1;
                         }
                 }
@@ -266,6 +266,10 @@ void vpa_init(int cpu)
 
         /* Register the Virtual Processor Area (VPA) */
         flags = 1UL << (63 - 18);
+
+        if (cpu_has_feature(CPU_FTR_ALTIVEC))
+                paca[cpu].lppaca.vmxregs_in_use = 1;
+
         ret = register_vpa(flags, hwcpu, __pa(vpa));
 
         if (ret)
diff --git a/arch/ppc64/kernel/pSeries_reconfig.c b/arch/ppc64/kernel/pSeries_reconfig.c
index dc2a69d412a2..58c61219d08e 100644
--- a/arch/ppc64/kernel/pSeries_reconfig.c
+++ b/arch/ppc64/kernel/pSeries_reconfig.c
@@ -111,7 +111,7 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist
         struct device_node *np;
         int err = -ENOMEM;
 
-        np = kcalloc(1, sizeof(*np), GFP_KERNEL);
+        np = kzalloc(sizeof(*np), GFP_KERNEL);
         if (!np)
                 goto out_err;
 
diff --git a/arch/ppc64/kernel/pSeries_setup.c b/arch/ppc64/kernel/pSeries_setup.c
index f0f0630cf07c..9490b6c5b173 100644
--- a/arch/ppc64/kernel/pSeries_setup.c
+++ b/arch/ppc64/kernel/pSeries_setup.c
@@ -37,7 +37,7 @@
 #include <linux/ioport.h>
 #include <linux/console.h>
 #include <linux/pci.h>
-#include <linux/version.h>
+#include <linux/utsname.h>
 #include <linux/adb.h>
 #include <linux/module.h>
 #include <linux/delay.h>
@@ -272,7 +272,7 @@ static int __init pSeries_init_panel(void)
 {
         /* Manually leave the kernel version on the panel. */
         ppc_md.progress("Linux ppc64\n", 0);
-        ppc_md.progress(UTS_RELEASE, 0);
+        ppc_md.progress(system_utsname.version, 0);
 
         return 0;
 }
@@ -397,9 +397,6 @@ static void __init pSeries_init_early(void)
                 comport = (void *)ioremap(physport, 16);
                 udbg_init_uart(comport, default_speed);
 
-                ppc_md.udbg_putc = udbg_putc;
-                ppc_md.udbg_getc = udbg_getc;
-                ppc_md.udbg_getc_poll = udbg_getc_poll;
                 DBG("Hello World !\n");
         }
 
diff --git a/arch/ppc64/kernel/pacaData.c b/arch/ppc64/kernel/pacaData.c
index 6182a2cd90a5..33a2d8db3f21 100644
--- a/arch/ppc64/kernel/pacaData.c
+++ b/arch/ppc64/kernel/pacaData.c
@@ -59,6 +59,7 @@ extern unsigned long __toc_start;
                 .fpregs_in_use = 1,                                         \
                 .end_of_quantum = 0xfffffffffffffffful,                     \
                 .slb_count = 64,                                            \
+                .vmxregs_in_use = 0,                                        \
         },                                                                  \
 
 #ifdef CONFIG_PPC_ISERIES
diff --git a/arch/ppc64/kernel/pmac_setup.c b/arch/ppc64/kernel/pmac_setup.c
index 8ff86a766cdf..e7f695dcd8c8 100644
--- a/arch/ppc64/kernel/pmac_setup.c
+++ b/arch/ppc64/kernel/pmac_setup.c
@@ -274,16 +274,6 @@ static void __pmac pmac_halt(void)
 }
 
 #ifdef CONFIG_BOOTX_TEXT
-static int dummy_getc_poll(void)
-{
-        return -1;
-}
-
-static unsigned char dummy_getc(void)
-{
-        return 0;
-}
-
 static void btext_putc(unsigned char c)
 {
         btext_drawchar(c);
@@ -342,16 +332,13 @@ static void __init pmac_init_early(void)
                 sccdbg = 1;
                 udbg_init_scc(NULL);
         }
-
-        else {
 #ifdef CONFIG_BOOTX_TEXT
+        else {
                 init_boot_display();
 
-                ppc_md.udbg_putc = btext_putc;
-                ppc_md.udbg_getc = dummy_getc;
-                ppc_md.udbg_getc_poll = dummy_getc_poll;
-#endif /* CONFIG_BOOTX_TEXT */
+                udbg_putc = btext_putc;
         }
+#endif /* CONFIG_BOOTX_TEXT */
 
         /* Setup interrupt mapping options */
         ppc64_interrupt_controller = IC_OPEN_PIC;
diff --git a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c
index b21848826791..6ad5a8467f87 100644
--- a/arch/ppc64/kernel/prom.c
+++ b/arch/ppc64/kernel/prom.c
@@ -22,7 +22,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/version.h>
 #include <linux/threads.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
diff --git a/arch/ppc64/kernel/prom_init.c b/arch/ppc64/kernel/prom_init.c
index 122283a1d39a..9979919cdf92 100644
--- a/arch/ppc64/kernel/prom_init.c
+++ b/arch/ppc64/kernel/prom_init.c
@@ -22,7 +22,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/version.h>
 #include <linux/threads.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
diff --git a/arch/ppc64/kernel/rtasd.c b/arch/ppc64/kernel/rtasd.c
index b0c3b829fe47..e26b0420b6dd 100644
--- a/arch/ppc64/kernel/rtasd.c
+++ b/arch/ppc64/kernel/rtasd.c
@@ -19,6 +19,7 @@
 #include <linux/vmalloc.h>
 #include <linux/spinlock.h>
 #include <linux/cpu.h>
+#include <linux/delay.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -412,8 +413,7 @@ static void do_event_scan_all_cpus(long delay)
 
                 /* Drop hotplug lock, and sleep for the specified delay */
                 unlock_cpu_hotplug();
-                set_current_state(TASK_INTERRUPTIBLE);
-                schedule_timeout(delay);
+                msleep_interruptible(delay);
                 lock_cpu_hotplug();
 
                 cpu = next_cpu(cpu, cpu_online_map);
@@ -442,7 +442,7 @@ static int rtasd(void *unused)
 
         printk(KERN_INFO "RTAS daemon started\n");
 
-        DEBUG("will sleep for %d jiffies\n", (HZ*60/rtas_event_scan_rate) / 2);
+        DEBUG("will sleep for %d milliseconds\n", (30000/rtas_event_scan_rate));
 
         /* See if we have any error stored in NVRAM */
         memset(logdata, 0, rtas_error_log_max);
@@ -459,7 +459,7 @@ static int rtasd(void *unused)
         }
 
         /* First pass. */
-        do_event_scan_all_cpus(HZ);
+        do_event_scan_all_cpus(1000);
 
         if (surveillance_timeout != -1) {
                 DEBUG("enabling surveillance\n");
@@ -471,7 +471,7 @@ static int rtasd(void *unused)
          * machines have problems if we call event-scan too
          * quickly. */
         for (;;)
-                do_event_scan_all_cpus((HZ*60/rtas_event_scan_rate) / 2);
+                do_event_scan_all_cpus(30000/rtas_event_scan_rate);
 
 error:
         /* Should delete proc entries */
diff --git a/arch/ppc64/kernel/rtc.c b/arch/ppc64/kernel/rtc.c
index d729fefa0df5..6ff52bc61325 100644
--- a/arch/ppc64/kernel/rtc.c
+++ b/arch/ppc64/kernel/rtc.c
@@ -35,6 +35,7 @@
 #include <linux/spinlock.h>
 #include <linux/bcd.h>
 #include <linux/interrupt.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -351,8 +352,7 @@ void rtas_get_rtc_time(struct rtc_time *rtc_tm)
                                 return; /* delay not allowed */
                         }
                         wait_time = rtas_extended_busy_delay_time(error);
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        schedule_timeout(wait_time);
+                        msleep_interruptible(wait_time);
                         error = RTAS_CLOCK_BUSY;
                 }
         } while (error == RTAS_CLOCK_BUSY && (__get_tb() < max_wait_tb));
@@ -386,8 +386,7 @@ int rtas_set_rtc_time(struct rtc_time *tm)
                         if (in_interrupt())
                                 return 1;       /* probably decrementer */
                         wait_time = rtas_extended_busy_delay_time(error);
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        schedule_timeout(wait_time);
+                        msleep_interruptible(wait_time);
                         error = RTAS_CLOCK_BUSY;
                 }
         } while (error == RTAS_CLOCK_BUSY && (__get_tb() < max_wait_tb));
diff --git a/arch/ppc64/kernel/scanlog.c b/arch/ppc64/kernel/scanlog.c
index 4d70736619c7..215bf8900304 100644
--- a/arch/ppc64/kernel/scanlog.c
+++ b/arch/ppc64/kernel/scanlog.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/proc_fs.h>
 #include <linux/init.h>
+#include <linux/delay.h>
 #include <asm/uaccess.h>
 #include <asm/rtas.h>
 #include <asm/prom.h>
@@ -77,7 +78,7 @@ static ssize_t scanlog_read(struct file *file, char __user *buf,
                 return -EFAULT;
 
         for (;;) {
-                wait_time = HZ/2;       /* default wait if no data */
+                wait_time = 500;        /* default wait if no data */
                 spin_lock(&rtas_data_buf_lock);
                 memcpy(rtas_data_buf, data, RTAS_DATA_BUF_SIZE);
                 status = rtas_call(ibm_scan_log_dump, 2, 1, NULL,
@@ -107,24 +108,14 @@ static ssize_t scanlog_read(struct file *file, char __user *buf,
                         break;
                     default:
                         if (status > 9900 && status <= 9905) {
-                                /* No data.  RTAS is hinting at a delay required
-                                 * between 1-100000 milliseconds
-                                 */
-                                int ms = 1;
-                                for (; status > 9900; status--)
-                                        ms = ms * 10;
-                                /* Use microseconds for reasonable accuracy */
-                                ms *= 1000;
-                                wait_time = ms / (1000000/HZ); /* round down is fine */
-                                /* Fall through to sleep */
+                                wait_time = rtas_extended_busy_delay_time(status);
                         } else {
                                 printk(KERN_ERR "scanlog: unknown error from rtas: %d\n", status);
                                 return -EIO;
                         }
                 }
                 /* Apparently no data yet.  Wait and try again. */
-                set_current_state(TASK_INTERRUPTIBLE);
-                schedule_timeout(wait_time);
+                msleep_interruptible(wait_time);
         }
         /*NOTREACHED*/
 }
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c
index ee3b20de2e7a..d0bb68af0ea4 100644
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
@@ -25,7 +25,7 @@
 #include <linux/seq_file.h>
 #include <linux/ioport.h>
 #include <linux/console.h>
-#include <linux/version.h>
+#include <linux/utsname.h>
 #include <linux/tty.h>
 #include <linux/root_dev.h>
 #include <linux/notifier.h>
@@ -89,7 +89,7 @@ extern void udbg_init_maple_realmode(void);
 #define EARLY_DEBUG_INIT() udbg_init_maple_realmode()
 #define EARLY_DEBUG_INIT() udbg_init_pmac_realmode()
 #define EARLY_DEBUG_INIT()                                              \
-        do { ppc_md.udbg_putc = call_rtas_display_status_delay; } while(0)
+        do { udbg_putc = call_rtas_display_status_delay; } while(0)
 #endif
 
 /* extern void *stab; */
@@ -108,7 +108,6 @@ int boot_cpuid = 0;
 int boot_cpuid_phys = 0;
 dev_t boot_dev;
 u64 ppc64_pft_size;
-u64 ppc64_debug_switch;
 
 struct ppc64_caches ppc64_caches;
 EXPORT_SYMBOL_GPL(ppc64_caches);
@@ -154,34 +153,6 @@ struct screen_info screen_info = {
         .orig_video_points = 16
 };
 
-/*
- * Initialize the PPCDBG state.  Called before relocation has been enabled.
- */
-void __init ppcdbg_initialize(void)
-{
-        ppc64_debug_switch = PPC_DEBUG_DEFAULT; /* | PPCDBG_BUSWALK | */
-        /* PPCDBG_PHBINIT | PPCDBG_MM | PPCDBG_MMINIT | PPCDBG_TCEINIT | PPCDBG_TCE */;
-}
-
-/*
- * Early boot console based on udbg
- */
-static struct console udbg_console = {
-        .name   = "udbg",
-        .write  = udbg_console_write,
-        .flags  = CON_PRINTBUFFER,
-        .index  = -1,
-};
-static int early_console_initialized;
-
-void __init disable_early_printk(void)
-{
-        if (!early_console_initialized)
-                return;
-        unregister_console(&udbg_console);
-        early_console_initialized = 0;
-}
-
 #if defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_SMP)
 
 static int smt_enabled_cmdline;
@@ -425,12 +396,6 @@ void __init early_setup(unsigned long dt_ptr)
         }
         ppc_md = **mach;
 
-        /* our udbg callbacks got overriden by the above, let's put them
-         * back in. Ultimately, I want those things to be split from the
-         * main ppc_md
-         */
-        EARLY_DEBUG_INIT();
-
         DBG("Found, Initializing memory management...\n");
 
         /*
@@ -636,8 +601,7 @@ void __init setup_system(void)
         /*
          * Register early console
          */
-        early_console_initialized = 1;
-        register_console(&udbg_console);
+        register_early_udbg_console();
 
         /* Save unparsed command line copy for /proc/cmdline */
         strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
@@ -657,7 +621,7 @@ void __init setup_system(void)
         smp_release_cpus();
 #endif /* defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES) */
 
-        printk("Starting Linux PPC64 %s\n", UTS_RELEASE);
+        printk("Starting Linux PPC64 %s\n", system_utsname.version);
 
         printk("-----------------------------------------------------\n");
         printk("ppc64_pft_size                = 0x%lx\n", ppc64_pft_size);
diff --git a/arch/ppc64/kernel/sys_ppc32.c b/arch/ppc64/kernel/sys_ppc32.c
index 206619080e66..214914a95a50 100644
--- a/arch/ppc64/kernel/sys_ppc32.c
+++ b/arch/ppc64/kernel/sys_ppc32.c
@@ -867,37 +867,6 @@ off_t ppc32_lseek(unsigned int fd, u32 offset, unsigned int origin)
         return sys_lseek(fd, (int)offset, origin);
 }
 
-/*
- * This is just a version for 32-bit applications which does
- * not force O_LARGEFILE on.
- */
-asmlinkage long sys32_open(const char __user * filename, int flags, int mode)
-{
-        char * tmp;
-        int fd, error;
-
-        tmp = getname(filename);
-        fd = PTR_ERR(tmp);
-        if (!IS_ERR(tmp)) {
-                fd = get_unused_fd();
-                if (fd >= 0) {
-                        struct file * f = filp_open(tmp, flags, mode);
-                        error = PTR_ERR(f);
-                        if (IS_ERR(f))
-                                goto out_error;
-                        fd_install(fd, f);
-                }
-out:
-                putname(tmp);
-        }
-        return fd;
-
-out_error:
-        put_unused_fd(fd);
-        fd = error;
-        goto out;
-}
-
 /* Note: it is necessary to treat bufsiz as an unsigned int,
  * with the corresponding cast to a signed int to insure that the 
  * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
diff --git a/arch/ppc64/kernel/sysfs.c b/arch/ppc64/kernel/sysfs.c
index f311ee7c0070..6654b350979c 100644
--- a/arch/ppc64/kernel/sysfs.c
+++ b/arch/ppc64/kernel/sysfs.c
@@ -215,18 +215,23 @@ static void register_cpu_online(unsigned int cpu)
         if (cpu_has_feature(CPU_FTR_MMCRA))
                 sysdev_create_file(s, &attr_mmcra);
 
-        sysdev_create_file(s, &attr_pmc1);
-        sysdev_create_file(s, &attr_pmc2);
-        sysdev_create_file(s, &attr_pmc3);
-        sysdev_create_file(s, &attr_pmc4);
-        sysdev_create_file(s, &attr_pmc5);
-        sysdev_create_file(s, &attr_pmc6);
-
-        if (cpu_has_feature(CPU_FTR_PMC8)) {
+        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_SMT))
                 sysdev_create_file(s, &attr_purr);
 }
@@ -252,17 +257,22 @@ static void unregister_cpu_online(unsigned int cpu)
         if (cpu_has_feature(CPU_FTR_MMCRA))
                 sysdev_remove_file(s, &attr_mmcra);
 
-        sysdev_remove_file(s, &attr_pmc1);
-        sysdev_remove_file(s, &attr_pmc2);
-        sysdev_remove_file(s, &attr_pmc3);
-        sysdev_remove_file(s, &attr_pmc4);
-        sysdev_remove_file(s, &attr_pmc5);
-        sysdev_remove_file(s, &attr_pmc6);
-
-        if (cpu_has_feature(CPU_FTR_PMC8)) {
+        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_SMT))
                 sysdev_remove_file(s, &attr_purr);
diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c
index 1696e1b05bb9..9939c206afa4 100644
--- a/arch/ppc64/kernel/time.c
+++ b/arch/ppc64/kernel/time.c
@@ -51,7 +51,6 @@
 #include <linux/cpu.h>
 #include <linux/security.h>
 
-#include <asm/segment.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/nvram.h>
@@ -129,7 +128,7 @@ static __inline__ void timer_check_rtc(void)
          * We should have an rtc call that only sets the minutes and
          * seconds like on Intel to avoid problems with non UTC clocks.
          */
-        if ( (time_status & STA_UNSYNC) == 0 &&
+        if (ntp_synced() &&
              xtime.tv_sec - last_rtc_update >= 659 &&
              abs((xtime.tv_nsec/1000) - (1000000-1000000/HZ)) < 500000/HZ &&
              jiffies - wall_jiffies == 1) {
@@ -436,10 +435,7 @@ int do_settimeofday(struct timespec *tv)
          */
         last_rtc_update = new_sec - 658;
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
 
         delta_xsec = mulhdu( (tb_last_stamp-do_gtod.varp->tb_orig_stamp),
                              do_gtod.varp->tb_to_xs );
diff --git a/arch/ppc64/kernel/traps.c b/arch/ppc64/kernel/traps.c
index a8d5e83ee89f..7467ae508e6e 100644
--- a/arch/ppc64/kernel/traps.c
+++ b/arch/ppc64/kernel/traps.c
@@ -30,6 +30,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/delay.h>
+#include <linux/kprobes.h>
 #include <asm/kdebug.h>
 
 #include <asm/pgtable.h>
@@ -220,7 +221,7 @@ void instruction_breakpoint_exception(struct pt_regs *regs)
         _exception(SIGTRAP, regs, TRAP_BRKPT, regs->nip);
 }
 
-void single_step_exception(struct pt_regs *regs)
+void __kprobes single_step_exception(struct pt_regs *regs)
 {
         regs->msr &= ~MSR_SE;  /* Turn off 'trace' bit */
 
@@ -398,7 +399,7 @@ check_bug_trap(struct pt_regs *regs)
         return 0;
 }
 
-void program_check_exception(struct pt_regs *regs)
+void __kprobes program_check_exception(struct pt_regs *regs)
 {
         if (debugger_fault_handler(regs))
                 return;
diff --git a/arch/ppc64/kernel/udbg.c b/arch/ppc64/kernel/udbg.c
index c0da45540f0f..ed6766e21f5a 100644
--- a/arch/ppc64/kernel/udbg.c
+++ b/arch/ppc64/kernel/udbg.c
@@ -1,5 +1,5 @@
 /*
- * NS16550 Serial Port (uart) debugging stuff.
+ * polling mode stateless debugging stuff, originally for NS16550 Serial Ports
  *
  * c 2001 PPC 64 Team, IBM Corp
  *
@@ -13,249 +13,24 @@
 #define WANT_PPCDBG_TAB /* Only defined here */
 #include <linux/config.h>
 #include <linux/types.h>
+#include <linux/sched.h>
+#include <linux/console.h>
 #include <asm/ppcdebug.h>
 #include <asm/processor.h>
-#include <asm/uaccess.h>
-#include <asm/machdep.h>
-#include <asm/io.h>
-#include <asm/prom.h>
-#include <asm/pmac_feature.h>
 
-extern u8 real_readb(volatile u8 __iomem  *addr);
-extern void real_writeb(u8 data, volatile u8 __iomem *addr);
-
-struct NS16550 {
-        /* this struct must be packed */
-        unsigned char rbr;  /* 0 */
-        unsigned char ier;  /* 1 */
-        unsigned char fcr;  /* 2 */
-        unsigned char lcr;  /* 3 */
-        unsigned char mcr;  /* 4 */
-        unsigned char lsr;  /* 5 */
-        unsigned char msr;  /* 6 */
-        unsigned char scr;  /* 7 */
-};
-
-#define thr rbr
-#define iir fcr
-#define dll rbr
-#define dlm ier
-#define dlab lcr
-
-#define LSR_DR   0x01  /* Data ready */
-#define LSR_OE   0x02  /* Overrun */
-#define LSR_PE   0x04  /* Parity error */
-#define LSR_FE   0x08  /* Framing error */
-#define LSR_BI   0x10  /* Break */
-#define LSR_THRE 0x20  /* Xmit holding register empty */
-#define LSR_TEMT 0x40  /* Xmitter empty */
-#define LSR_ERR  0x80  /* Error */
-
-static volatile struct NS16550 __iomem *udbg_comport;
-
-void udbg_init_uart(void __iomem *comport, unsigned int speed)
-{
-        u16 dll = speed ? (115200 / speed) : 12;
-
-        if (comport) {
-                udbg_comport = (struct NS16550 __iomem *)comport;
-                out_8(&udbg_comport->lcr, 0x00);
-                out_8(&udbg_comport->ier, 0xff);
-                out_8(&udbg_comport->ier, 0x00);
-                out_8(&udbg_comport->lcr, 0x80);        /* Access baud rate */
-                out_8(&udbg_comport->dll, dll & 0xff);  /* 1 = 115200,  2 = 57600,
-                                                           3 = 38400, 12 = 9600 baud */
-                out_8(&udbg_comport->dlm, dll >> 8);    /* dll >> 8 which should be zero
-                                                           for fast rates; */
-                out_8(&udbg_comport->lcr, 0x03);        /* 8 data, 1 stop, no parity */
-                out_8(&udbg_comport->mcr, 0x03);        /* RTS/DTR */
-                out_8(&udbg_comport->fcr ,0x07);        /* Clear & enable FIFOs */
-        }
-}
-
-#ifdef CONFIG_PPC_PMAC
-
-#define SCC_TXRDY       4
-#define SCC_RXRDY       1
-
-static volatile u8 __iomem *sccc;
-static volatile u8 __iomem *sccd;
-
-static unsigned char scc_inittab[] = {
-    13, 0,              /* set baud rate divisor */
-    12, 0,
-    14, 1,              /* baud rate gen enable, src=rtxc */
-    11, 0x50,           /* clocks = br gen */
-    5,  0xea,           /* tx 8 bits, assert DTR & RTS */
-    4,  0x46,           /* x16 clock, 1 stop */
-    3,  0xc1,           /* rx enable, 8 bits */
-};
-
-void udbg_init_scc(struct device_node *np)
-{
-        u32 *reg;
-        unsigned long addr;
-        int i, x;
-
-        if (np == NULL)
-                np = of_find_node_by_name(NULL, "escc");
-        if (np == NULL || np->parent == NULL)
-                return;
-
-        udbg_printf("found SCC...\n");
-        /* Get address within mac-io ASIC */ 
-        reg = (u32 *)get_property(np, "reg", NULL);
-        if (reg == NULL)
-                return;
-        addr = reg[0];
-        udbg_printf("local addr: %lx\n", addr);
-        /* Get address of mac-io PCI itself */
-        reg = (u32 *)get_property(np->parent, "assigned-addresses", NULL);
-        if (reg == NULL)
-                return;
-        addr += reg[2];
-        udbg_printf("final addr: %lx\n", addr);
-
-        /* Setup for 57600 8N1 */
-        addr += 0x20;
-        sccc = (volatile u8 * __iomem) ioremap(addr & PAGE_MASK, PAGE_SIZE) ;
-        sccc += addr & ~PAGE_MASK;
-        sccd = sccc + 0x10;
-
-        udbg_printf("ioremap result sccc: %p\n", sccc);
-        mb();
-
-        for (i = 20000; i != 0; --i)
-                x = in_8(sccc);
-        out_8(sccc, 0x09);              /* reset A or B side */
-        out_8(sccc, 0xc0);
-        for (i = 0; i < sizeof(scc_inittab); ++i)
-                out_8(sccc, scc_inittab[i]);
-
-        ppc_md.udbg_putc = udbg_putc;
-        ppc_md.udbg_getc = udbg_getc;
-        ppc_md.udbg_getc_poll = udbg_getc_poll;
-
-        udbg_puts("Hello World !\n");
-}
-
-#endif /* CONFIG_PPC_PMAC */
-
-#ifdef CONFIG_PPC_PMAC
-static void udbg_real_putc(unsigned char c)
-{
-        while ((real_readb(sccc) & SCC_TXRDY) == 0)
-                ;
-        real_writeb(c, sccd);
-        if (c == '\n')
-                udbg_real_putc('\r');
-}
-
-void udbg_init_pmac_realmode(void)
-{
-        sccc = (volatile u8 __iomem *)0x80013020ul;
-        sccd = (volatile u8 __iomem *)0x80013030ul;
-
-        ppc_md.udbg_putc = udbg_real_putc;
-        ppc_md.udbg_getc = NULL;
-        ppc_md.udbg_getc_poll = NULL;
-}
-#endif /* CONFIG_PPC_PMAC */
-
-#ifdef CONFIG_PPC_MAPLE
-void udbg_maple_real_putc(unsigned char c)
-{
-        if (udbg_comport) {
-                while ((real_readb(&udbg_comport->lsr) & LSR_THRE) == 0)
-                        /* wait for idle */;
-                real_writeb(c, &udbg_comport->thr); eieio();
-                if (c == '\n') {
-                        /* Also put a CR.  This is for convenience. */
-                        while ((real_readb(&udbg_comport->lsr) & LSR_THRE) == 0)
-                                /* wait for idle */;
-                        real_writeb('\r', &udbg_comport->thr); eieio();
-                }
-        }
-}
-
-void udbg_init_maple_realmode(void)
-{
-        udbg_comport = (volatile struct NS16550 __iomem *)0xf40003f8;
-
-        ppc_md.udbg_putc = udbg_maple_real_putc;
-        ppc_md.udbg_getc = NULL;
-        ppc_md.udbg_getc_poll = NULL;
-}
-#endif /* CONFIG_PPC_MAPLE */
-
-void udbg_putc(unsigned char c)
-{
-        if (udbg_comport) {
-                while ((in_8(&udbg_comport->lsr) & LSR_THRE) == 0)
-                        /* wait for idle */;
-                out_8(&udbg_comport->thr, c);
-                if (c == '\n') {
-                        /* Also put a CR.  This is for convenience. */
-                        while ((in_8(&udbg_comport->lsr) & LSR_THRE) == 0)
-                                /* wait for idle */; 
-                        out_8(&udbg_comport->thr, '\r');
-                }
-        }
-#ifdef CONFIG_PPC_PMAC
-        else if (sccc) {
-                while ((in_8(sccc) & SCC_TXRDY) == 0)
-                        ;
-                out_8(sccd,  c);                
-                if (c == '\n')
-                        udbg_putc('\r');
-        }
-#endif /* CONFIG_PPC_PMAC */
-}
-
-int udbg_getc_poll(void)
-{
-        if (udbg_comport) {
-                if ((in_8(&udbg_comport->lsr) & LSR_DR) != 0)
-                        return in_8(&udbg_comport->rbr);
-                else
-                        return -1;
-        }
-#ifdef CONFIG_PPC_PMAC
-        else if (sccc) {
-                if ((in_8(sccc) & SCC_RXRDY) != 0)
-                        return in_8(sccd);
-                else
-                        return -1;
-        }
-#endif /* CONFIG_PPC_PMAC */
-        return -1;
-}
-
-unsigned char udbg_getc(void)
-{
-        if (udbg_comport) {
-                while ((in_8(&udbg_comport->lsr) & LSR_DR) == 0)
-                        /* wait for char */;
-                return in_8(&udbg_comport->rbr);
-        }
-#ifdef CONFIG_PPC_PMAC
-        else if (sccc) {
-                while ((in_8(sccc) & SCC_RXRDY) == 0)
-                        ;
-                return in_8(sccd);
-        }
-#endif /* CONFIG_PPC_PMAC */
-        return 0;
-}
+void (*udbg_putc)(unsigned char c);
+unsigned char (*udbg_getc)(void);
+int (*udbg_getc_poll)(void);
 
+/* udbg library, used by xmon et al */
 void udbg_puts(const char *s)
 {
-        if (ppc_md.udbg_putc) {
+        if (udbg_putc) {
                 char c;
 
                 if (s && *s != '\0') {
                         while ((c = *s++) != '\0')
-                                ppc_md.udbg_putc(c);
+                                udbg_putc(c);
                 }
         }
 #if 0
@@ -270,12 +45,12 @@ int udbg_write(const char *s, int n)
         int remain = n;
         char c;
 
-        if (!ppc_md.udbg_putc)
+        if (!udbg_putc)
                 return 0;
 
         if (s && *s != '\0') {
                 while (((c = *s++) != '\0') && (remain-- > 0)) {
-                        ppc_md.udbg_putc(c);
+                        udbg_putc(c);
                 }
         }
 
@@ -287,12 +62,12 @@ int udbg_read(char *buf, int buflen)
         char c, *p = buf;
         int i;
 
-        if (!ppc_md.udbg_getc)
+        if (!udbg_getc)
                 return 0;
 
         for (i = 0; i < buflen; ++i) {
                 do {
-                        c = ppc_md.udbg_getc();
+                        c = udbg_getc();
                 } while (c == 0x11 || c == 0x13);
                 if (c == 0)
                         break;
@@ -302,11 +77,6 @@ int udbg_read(char *buf, int buflen)
         return i;
 }
 
-void udbg_console_write(struct console *con, const char *s, unsigned int n)
-{
-        udbg_write(s, n);
-}
-
 #define UDBG_BUFSIZE 256
 void udbg_printf(const char *fmt, ...)
 {
@@ -319,6 +89,10 @@ void udbg_printf(const char *fmt, ...)
         va_end(args);
 }
 
+/* PPCDBG stuff */
+
+u64 ppc64_debug_switch;
+
 /* Special print used by PPCDBG() macro */
 void udbg_ppcdbg(unsigned long debug_flags, const char *fmt, ...)
 {
@@ -358,3 +132,43 @@ unsigned long udbg_ifdebug(unsigned long flags)
 {
         return (flags & ppc64_debug_switch);
 }
+
+/*
+ * Initialize the PPCDBG state.  Called before relocation has been enabled.
+ */
+void __init ppcdbg_initialize(void)
+{
+        ppc64_debug_switch = PPC_DEBUG_DEFAULT; /* | PPCDBG_BUSWALK | */
+        /* PPCDBG_PHBINIT | PPCDBG_MM | PPCDBG_MMINIT | PPCDBG_TCEINIT | PPCDBG_TCE */;
+}
+
+/*
+ * Early boot console based on udbg
+ */
+static void udbg_console_write(struct console *con, const char *s,
+                unsigned int n)
+{
+        udbg_write(s, n);
+}
+
+static struct console udbg_console = {
+        .name   = "udbg",
+        .write  = udbg_console_write,
+        .flags  = CON_PRINTBUFFER,
+        .index  = -1,
+};
+
+void __init disable_early_printk(void)
+{
+        unregister_console(&udbg_console);
+}
+
+/* called by setup_system */
+void register_early_udbg_console(void)
+{
+        register_console(&udbg_console);
+}
+
+#if 0   /* if you want to use this as a regular output console */
+console_initcall(register_udbg_console);
+#endif
diff --git a/arch/ppc64/kernel/udbg_16550.c b/arch/ppc64/kernel/udbg_16550.c
new file mode 100644
index 000000000000..9313574ab935
--- /dev/null
+++ b/arch/ppc64/kernel/udbg_16550.c
@@ -0,0 +1,123 @@
+/*
+ * udbg for for NS16550 compatable serial ports
+ *
+ * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp
+ *
+ *      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/types.h>
+#include <asm/udbg.h>
+#include <asm/io.h>
+
+extern u8 real_readb(volatile u8 __iomem  *addr);
+extern void real_writeb(u8 data, volatile u8 __iomem *addr);
+
+struct NS16550 {
+        /* this struct must be packed */
+        unsigned char rbr;  /* 0 */
+        unsigned char ier;  /* 1 */
+        unsigned char fcr;  /* 2 */
+        unsigned char lcr;  /* 3 */
+        unsigned char mcr;  /* 4 */
+        unsigned char lsr;  /* 5 */
+        unsigned char msr;  /* 6 */
+        unsigned char scr;  /* 7 */
+};
+
+#define thr rbr
+#define iir fcr
+#define dll rbr
+#define dlm ier
+#define dlab lcr
+
+#define LSR_DR   0x01  /* Data ready */
+#define LSR_OE   0x02  /* Overrun */
+#define LSR_PE   0x04  /* Parity error */
+#define LSR_FE   0x08  /* Framing error */
+#define LSR_BI   0x10  /* Break */
+#define LSR_THRE 0x20  /* Xmit holding register empty */
+#define LSR_TEMT 0x40  /* Xmitter empty */
+#define LSR_ERR  0x80  /* Error */
+
+static volatile struct NS16550 __iomem *udbg_comport;
+
+static void udbg_550_putc(unsigned char c)
+{
+        if (udbg_comport) {
+                while ((in_8(&udbg_comport->lsr) & LSR_THRE) == 0)
+                        /* wait for idle */;
+                out_8(&udbg_comport->thr, c);
+                if (c == '\n')
+                        udbg_550_putc('\r');
+        }
+}
+
+static int udbg_550_getc_poll(void)
+{
+        if (udbg_comport) {
+                if ((in_8(&udbg_comport->lsr) & LSR_DR) != 0)
+                        return in_8(&udbg_comport->rbr);
+                else
+                        return -1;
+        }
+        return -1;
+}
+
+static unsigned char udbg_550_getc(void)
+{
+        if (udbg_comport) {
+                while ((in_8(&udbg_comport->lsr) & LSR_DR) == 0)
+                        /* wait for char */;
+                return in_8(&udbg_comport->rbr);
+        }
+        return 0;
+}
+
+void udbg_init_uart(void __iomem *comport, unsigned int speed)
+{
+        u16 dll = speed ? (115200 / speed) : 12;
+
+        if (comport) {
+                udbg_comport = (struct NS16550 __iomem *)comport;
+                out_8(&udbg_comport->lcr, 0x00);
+                out_8(&udbg_comport->ier, 0xff);
+                out_8(&udbg_comport->ier, 0x00);
+                out_8(&udbg_comport->lcr, 0x80);        /* Access baud rate */
+                out_8(&udbg_comport->dll, dll & 0xff);  /* 1 = 115200,  2 = 57600,
+                                                           3 = 38400, 12 = 9600 baud */
+                out_8(&udbg_comport->dlm, dll >> 8);    /* dll >> 8 which should be zero
+                                                           for fast rates; */
+                out_8(&udbg_comport->lcr, 0x03);        /* 8 data, 1 stop, no parity */
+                out_8(&udbg_comport->mcr, 0x03);        /* RTS/DTR */
+                out_8(&udbg_comport->fcr ,0x07);        /* Clear & enable FIFOs */
+                udbg_putc = udbg_550_putc;
+                udbg_getc = udbg_550_getc;
+                udbg_getc_poll = udbg_550_getc_poll;
+        }
+}
+
+#ifdef CONFIG_PPC_MAPLE
+void udbg_maple_real_putc(unsigned char c)
+{
+        if (udbg_comport) {
+                while ((real_readb(&udbg_comport->lsr) & LSR_THRE) == 0)
+                        /* wait for idle */;
+                real_writeb(c, &udbg_comport->thr); eieio();
+                if (c == '\n')
+                        udbg_maple_real_putc('\r');
+        }
+}
+
+void udbg_init_maple_realmode(void)
+{
+        udbg_comport = (volatile struct NS16550 __iomem *)0xf40003f8;
+
+        udbg_putc = udbg_maple_real_putc;
+        udbg_getc = NULL;
+        udbg_getc_poll = NULL;
+}
+#endif /* CONFIG_PPC_MAPLE */
diff --git a/arch/ppc64/kernel/udbg_scc.c b/arch/ppc64/kernel/udbg_scc.c
new file mode 100644
index 000000000000..c47fd6c63531
--- /dev/null
+++ b/arch/ppc64/kernel/udbg_scc.c
@@ -0,0 +1,136 @@
+/*
+ * udbg for for zilog scc ports as found on Apple PowerMacs
+ *
+ * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp
+ *
+ *      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/types.h>
+#include <asm/udbg.h>
+#include <asm/processor.h>
+#include <asm/naca.h>
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <asm/pmac_feature.h>
+
+extern u8 real_readb(volatile u8 __iomem  *addr);
+extern void real_writeb(u8 data, volatile u8 __iomem *addr);
+
+#define SCC_TXRDY       4
+#define SCC_RXRDY       1
+
+static volatile u8 __iomem *sccc;
+static volatile u8 __iomem *sccd;
+
+static void udbg_scc_putc(unsigned char c)
+{
+        if (sccc) {
+                while ((in_8(sccc) & SCC_TXRDY) == 0)
+                        ;
+                out_8(sccd,  c);
+                if (c == '\n')
+                        udbg_scc_putc('\r');
+        }
+}
+
+static int udbg_scc_getc_poll(void)
+{
+        if (sccc) {
+                if ((in_8(sccc) & SCC_RXRDY) != 0)
+                        return in_8(sccd);
+                else
+                        return -1;
+        }
+        return -1;
+}
+
+static unsigned char udbg_scc_getc(void)
+{
+        if (sccc) {
+                while ((in_8(sccc) & SCC_RXRDY) == 0)
+                        ;
+                return in_8(sccd);
+        }
+        return 0;
+}
+
+static unsigned char scc_inittab[] = {
+    13, 0,              /* set baud rate divisor */
+    12, 0,
+    14, 1,              /* baud rate gen enable, src=rtxc */
+    11, 0x50,           /* clocks = br gen */
+    5,  0xea,           /* tx 8 bits, assert DTR & RTS */
+    4,  0x46,           /* x16 clock, 1 stop */
+    3,  0xc1,           /* rx enable, 8 bits */
+};
+
+void udbg_init_scc(struct device_node *np)
+{
+        u32 *reg;
+        unsigned long addr;
+        int i, x;
+
+        if (np == NULL)
+                np = of_find_node_by_name(NULL, "escc");
+        if (np == NULL || np->parent == NULL)
+                return;
+
+        udbg_printf("found SCC...\n");
+        /* Get address within mac-io ASIC */
+        reg = (u32 *)get_property(np, "reg", NULL);
+        if (reg == NULL)
+                return;
+        addr = reg[0];
+        udbg_printf("local addr: %lx\n", addr);
+        /* Get address of mac-io PCI itself */
+        reg = (u32 *)get_property(np->parent, "assigned-addresses", NULL);
+        if (reg == NULL)
+                return;
+        addr += reg[2];
+        udbg_printf("final addr: %lx\n", addr);
+
+        /* Setup for 57600 8N1 */
+        addr += 0x20;
+        sccc = (volatile u8 * __iomem) ioremap(addr & PAGE_MASK, PAGE_SIZE) ;
+        sccc += addr & ~PAGE_MASK;
+        sccd = sccc + 0x10;
+
+        udbg_printf("ioremap result sccc: %p\n", sccc);
+        mb();
+
+        for (i = 20000; i != 0; --i)
+                x = in_8(sccc);
+        out_8(sccc, 0x09);              /* reset A or B side */
+        out_8(sccc, 0xc0);
+        for (i = 0; i < sizeof(scc_inittab); ++i)
+                out_8(sccc, scc_inittab[i]);
+
+        udbg_putc = udbg_scc_putc;
+        udbg_getc = udbg_scc_getc;
+        udbg_getc_poll = udbg_scc_getc_poll;
+
+        udbg_puts("Hello World !\n");
+}
+
+static void udbg_real_scc_putc(unsigned char c)
+{
+        while ((real_readb(sccc) & SCC_TXRDY) == 0)
+                ;
+        real_writeb(c, sccd);
+        if (c == '\n')
+                udbg_real_scc_putc('\r');
+}
+
+void udbg_init_pmac_realmode(void)
+{
+        sccc = (volatile u8 __iomem *)0x80013020ul;
+        sccd = (volatile u8 __iomem *)0x80013030ul;
+
+        udbg_putc = udbg_real_scc_putc;
+        udbg_getc = NULL;
+        udbg_getc_poll = NULL;
+}
diff --git a/arch/ppc64/kernel/vmlinux.lds.S b/arch/ppc64/kernel/vmlinux.lds.S
index 4103cc13f8d6..0306510bc4ff 100644
--- a/arch/ppc64/kernel/vmlinux.lds.S
+++ b/arch/ppc64/kernel/vmlinux.lds.S
@@ -15,6 +15,7 @@ SECTIONS
         *(.text .text.*)
         SCHED_TEXT
         LOCK_TEXT
+        KPROBES_TEXT
         *(.fixup)
         . = ALIGN(4096);
         _etext = .;