7 files changed, 41 insertions, 70 deletions

diff --git a/arch/powerpc/lib/checksum_64.S b/arch/powerpc/lib/checksum_64.S
index 8e6e51016cc5..fdec6e613e95 100644
--- a/arch/powerpc/lib/checksum_64.S
+++ b/arch/powerpc/lib/checksum_64.S
@@ -74,9 +74,9 @@ _GLOBAL(__csum_partial)
         ld      r11,24(r3)
 
         /*
-         * On POWER6 and POWER7 back to back addes take 2 cycles because of
-         * the XER dependency. This means the fastest this loop can go is
-         * 16 cycles per iteration. The scheduling of the loop below has
+         * On POWER6 and POWER7 back to back adde instructions take 2 cycles
+         * because of the XER dependency. This means the fastest this loop can
+         * go is 16 cycles per iteration. The scheduling of the loop below has
          * been shown to hit this on both POWER6 and POWER7.
          */
         .align 5
@@ -275,9 +275,9 @@ source;	ld	r10,16(r3)
 source; ld      r11,24(r3)
 
         /*
-         * On POWER6 and POWER7 back to back addes take 2 cycles because of
-         * the XER dependency. This means the fastest this loop can go is
-         * 16 cycles per iteration. The scheduling of the loop below has
+         * On POWER6 and POWER7 back to back adde instructions take 2 cycles
+         * because of the XER dependency. This means the fastest this loop can
+         * go is 16 cycles per iteration. The scheduling of the loop below has
          * been shown to hit this on both POWER6 and POWER7.
          */
         .align 5
diff --git a/arch/powerpc/lib/feature-fixups.c b/arch/powerpc/lib/feature-fixups.c
index 7ce3870d7ddd..defb2998b818 100644
--- a/arch/powerpc/lib/feature-fixups.c
+++ b/arch/powerpc/lib/feature-fixups.c
@@ -20,7 +20,8 @@
 #include <asm/code-patching.h>
 #include <asm/page.h>
 #include <asm/sections.h>
-
+#include <asm/setup.h>
+#include <asm/firmware.h>
 
 struct fixup_entry {
         unsigned long   mask;
@@ -130,7 +131,7 @@ void do_lwsync_fixups(unsigned long value, void *fixup_start, void *fixup_end)
         }
 }
 
-void do_final_fixups(void)
+static void do_final_fixups(void)
 {
 #if defined(CONFIG_PPC64) && defined(CONFIG_RELOCATABLE)
         int *src, *dest;
@@ -151,6 +152,33 @@ void do_final_fixups(void)
 #endif
 }
 
+void apply_feature_fixups(void)
+{
+        struct cpu_spec *spec = *PTRRELOC(&cur_cpu_spec);
+
+        /*
+         * Apply the CPU-specific and firmware specific fixups to kernel text
+         * (nop out sections not relevant to this CPU or this firmware).
+         */
+        do_feature_fixups(spec->cpu_features,
+                          PTRRELOC(&__start___ftr_fixup),
+                          PTRRELOC(&__stop___ftr_fixup));
+
+        do_feature_fixups(spec->mmu_features,
+                          PTRRELOC(&__start___mmu_ftr_fixup),
+                          PTRRELOC(&__stop___mmu_ftr_fixup));
+
+        do_lwsync_fixups(spec->cpu_features,
+                         PTRRELOC(&__start___lwsync_fixup),
+                         PTRRELOC(&__stop___lwsync_fixup));
+
+#ifdef CONFIG_PPC64
+        do_feature_fixups(powerpc_firmware_features,
+                          &__start___fw_ftr_fixup, &__stop___fw_ftr_fixup);
+#endif
+        do_final_fixups();
+}
+
 #ifdef CONFIG_FTR_FIXUP_SELFTEST
 
 #define check(x)        \
diff --git a/arch/powerpc/lib/locks.c b/arch/powerpc/lib/locks.c
index f7deebdf3365..b7b1237d4aa6 100644
--- a/arch/powerpc/lib/locks.c
+++ b/arch/powerpc/lib/locks.c
@@ -68,19 +68,3 @@ void __rw_yield(arch_rwlock_t *rw)
                 get_hard_smp_processor_id(holder_cpu), yield_count);
 }
 #endif
-
-void arch_spin_unlock_wait(arch_spinlock_t *lock)
-{
-        smp_mb();
-
-        while (lock->slock) {
-                HMT_low();
-                if (SHARED_PROCESSOR)
-                        __spin_yield(lock);
-        }
-        HMT_medium();
-
-        smp_mb();
-}
-
-EXPORT_SYMBOL(arch_spin_unlock_wait);
diff --git a/arch/powerpc/lib/ppc_ksyms.c b/arch/powerpc/lib/ppc_ksyms.c
index c422812f7405..ae69d846a841 100644
--- a/arch/powerpc/lib/ppc_ksyms.c
+++ b/arch/powerpc/lib/ppc_ksyms.c
@@ -9,11 +9,7 @@ EXPORT_SYMBOL(memmove);
 EXPORT_SYMBOL(memcmp);
 EXPORT_SYMBOL(memchr);
 
-EXPORT_SYMBOL(strcpy);
 EXPORT_SYMBOL(strncpy);
-EXPORT_SYMBOL(strcat);
-EXPORT_SYMBOL(strlen);
-EXPORT_SYMBOL(strcmp);
 EXPORT_SYMBOL(strncmp);
 
 #ifndef CONFIG_GENERIC_CSUM
diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c
index 69abf844c2c3..94058c21a482 100644
--- a/arch/powerpc/lib/rheap.c
+++ b/arch/powerpc/lib/rheap.c
@@ -325,7 +325,7 @@ void rh_init(rh_info_t * info, unsigned int alignment, int max_blocks,
 }
 EXPORT_SYMBOL_GPL(rh_init);
 
-/* Attach a free memory region, coalesces regions if adjuscent */
+/* Attach a free memory region, coalesces regions if adjacent */
 int rh_attach_region(rh_info_t * info, unsigned long start, int size)
 {
         rh_block_t *blk;
diff --git a/arch/powerpc/lib/string.S b/arch/powerpc/lib/string.S
index c80fb49ce607..beabc68d9a1e 100644
--- a/arch/powerpc/lib/string.S
+++ b/arch/powerpc/lib/string.S
@@ -16,15 +16,6 @@
         PPC_LONG_ALIGN
         .text
         
-_GLOBAL(strcpy)
-        addi    r5,r3,-1
-        addi    r4,r4,-1
-1:      lbzu    r0,1(r4)
-        cmpwi   0,r0,0
-        stbu    r0,1(r5)
-        bne     1b
-        blr
-
 /* This clears out any unused part of the destination buffer,
    just as the libc version does.  -- paulus */
 _GLOBAL(strncpy)
@@ -33,6 +24,7 @@ _GLOBAL(strncpy)
         mtctr   r5
         addi    r6,r3,-1
         addi    r4,r4,-1
+        .balign 16
 1:      lbzu    r0,1(r4)
         cmpwi   0,r0,0
         stbu    r0,1(r6)
@@ -45,36 +37,13 @@ _GLOBAL(strncpy)
         bdnz    2b
         blr
 
-_GLOBAL(strcat)
-        addi    r5,r3,-1
-        addi    r4,r4,-1
-1:      lbzu    r0,1(r5)
-        cmpwi   0,r0,0
-        bne     1b
-        addi    r5,r5,-1
-1:      lbzu    r0,1(r4)
-        cmpwi   0,r0,0
-        stbu    r0,1(r5)
-        bne     1b
-        blr
-
-_GLOBAL(strcmp)
-        addi    r5,r3,-1
-        addi    r4,r4,-1
-1:      lbzu    r3,1(r5)
-        cmpwi   1,r3,0
-        lbzu    r0,1(r4)
-        subf.   r3,r0,r3
-        beqlr   1
-        beq     1b
-        blr
-
 _GLOBAL(strncmp)
         PPC_LCMPI 0,r5,0
         beq-    2f
         mtctr   r5
         addi    r5,r3,-1
         addi    r4,r4,-1
+        .balign 16
 1:      lbzu    r3,1(r5)
         cmpwi   1,r3,0
         lbzu    r0,1(r4)
@@ -85,14 +54,6 @@ _GLOBAL(strncmp)
 2:      li      r3,0
         blr
 
-_GLOBAL(strlen)
-        addi    r4,r3,-1
-1:      lbzu    r0,1(r4)
-        cmpwi   0,r0,0
-        bne     1b
-        subf    r3,r3,r4
-        blr
-
 #ifdef CONFIG_PPC32
 _GLOBAL(memcmp)
         PPC_LCMPI 0,r5,0
@@ -114,6 +75,7 @@ _GLOBAL(memchr)
         beq-    2f
         mtctr   r5
         addi    r3,r3,-1
+        .balign 16
 1:      lbzu    r0,1(r3)
         cmpw    0,r0,r4
         bdnzf   2,1b
diff --git a/arch/powerpc/lib/vmx-helper.c b/arch/powerpc/lib/vmx-helper.c
index b27e030fc9f8..bf925cdcaca9 100644
--- a/arch/powerpc/lib/vmx-helper.c
+++ b/arch/powerpc/lib/vmx-helper.c
@@ -21,6 +21,7 @@
 #include <linux/uaccess.h>
 #include <linux/hardirq.h>
 #include <asm/switch_to.h>
+#include <asm/asm-prototypes.h>
 
 int enter_vmx_usercopy(void)
 {