Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (92 commits)
  powerpc: Remove unused 'protect4gb' boot parameter
  powerpc: Build-in e1000e for pseries & ppc64_defconfig
  powerpc/pseries: Make request_ras_irqs() available to other pseries code
  powerpc/numa: Use ibm,architecture-vec-5 to detect form 1 affinity
  powerpc/numa: Set a smaller value for RECLAIM_DISTANCE to enable zone reclaim
  powerpc: Use smt_snooze_delay=-1 to always busy loop
  powerpc: Remove check of ibm,smt-snooze-delay OF property
  powerpc/kdump: Fix race in kdump shutdown
  powerpc/kexec: Fix race in kexec shutdown
  powerpc/kexec: Speedup kexec hash PTE tear down
  powerpc/pseries: Add hcall to read 4 ptes at a time in real mode
  powerpc: Use more accurate limit for first segment memory allocations
  powerpc/kdump: Use chip->shutdown to disable IRQs
  powerpc/kdump: CPUs assume the context of the oopsing CPU
  powerpc/crashdump: Do not fail on NULL pointer dereferencing
  powerpc/eeh: Fix oops when probing in early boot
  powerpc/pci: Check devices status property when scanning OF tree
  powerpc/vio: Switch VIO Bus PM to use generic helpers
  powerpc: Avoid bad relocations in iSeries code
  powerpc: Use common cpu_die (fixes SMP+SUSPEND build)
  ...

1 files changed, 10 insertions, 8 deletions

diff --git a/arch/powerpc/lib/string.S b/arch/powerpc/lib/string.S
index 64e2e499e32a..455881a5563f 100644
--- a/arch/powerpc/lib/string.S
+++ b/arch/powerpc/lib/string.S
@@ -28,7 +28,7 @@ _GLOBAL(strcpy)
 /* This clears out any unused part of the destination buffer,
    just as the libc version does.  -- paulus */
 _GLOBAL(strncpy)
-        cmpwi   0,r5,0
+        PPC_LCMPI 0,r5,0
         beqlr
         mtctr   r5
         addi    r6,r3,-1
@@ -39,7 +39,7 @@ _GLOBAL(strncpy)
         bdnzf   2,1b            /* dec ctr, branch if ctr != 0 && !cr0.eq */
         bnelr                   /* if we didn't hit a null char, we're done */
         mfctr   r5
-        cmpwi   0,r5,0          /* any space left in destination buffer? */
+        PPC_LCMPI 0,r5,0        /* any space left in destination buffer? */
         beqlr                   /* we know r0 == 0 here */
 2:      stbu    r0,1(r6)        /* clear it out if so */
         bdnz    2b
@@ -70,8 +70,8 @@ _GLOBAL(strcmp)
         blr
 
 _GLOBAL(strncmp)
-        PPC_LCMPI r5,0
-        beqlr
+        PPC_LCMPI 0,r5,0
+        beq-    2f
         mtctr   r5
         addi    r5,r3,-1
         addi    r4,r4,-1
@@ -82,6 +82,8 @@ _GLOBAL(strncmp)
         beqlr   1
         bdnzt   eq,1b
         blr
+2:      li      r3,0
+        blr
 
 _GLOBAL(strlen)
         addi    r4,r3,-1
@@ -92,8 +94,8 @@ _GLOBAL(strlen)
         blr
 
 _GLOBAL(memcmp)
-        cmpwi   0,r5,0
-        ble-    2f
+        PPC_LCMPI 0,r5,0
+        beq-    2f
         mtctr   r5
         addi    r6,r3,-1
         addi    r4,r4,-1
@@ -106,8 +108,8 @@ _GLOBAL(memcmp)
         blr
 
 _GLOBAL(memchr)
-        cmpwi   0,r5,0
-        ble-    2f
+        PPC_LCMPI 0,r5,0
+        beq-    2f
         mtctr   r5
         addi    r3,r3,-1
 1:      lbzu    r0,1(r3)