2 files changed, 16 insertions, 2 deletions

diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c
index 22c3b4f53de7..29b2941cada0 100644
--- a/arch/powerpc/lib/rheap.c
+++ b/arch/powerpc/lib/rheap.c
@@ -54,7 +54,7 @@ static int grow(rh_info_t * info, int max_blocks)
 
         new_blocks = max_blocks - info->max_blocks;
 
-        block = kmalloc(sizeof(rh_block_t) * max_blocks, GFP_KERNEL);
+        block = kmalloc(sizeof(rh_block_t) * max_blocks, GFP_ATOMIC);
         if (block == NULL)
                 return -ENOMEM;
 
@@ -258,7 +258,7 @@ rh_info_t *rh_create(unsigned int alignment)
         if ((alignment & (alignment - 1)) != 0)
                 return ERR_PTR(-EINVAL);
 
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        info = kmalloc(sizeof(*info), GFP_ATOMIC);
         if (info == NULL)
                 return ERR_PTR(-ENOMEM);
 
diff --git a/arch/powerpc/lib/string.S b/arch/powerpc/lib/string.S
index c4c622d8e6ac..49eb1f1a2bb4 100644
--- a/arch/powerpc/lib/string.S
+++ b/arch/powerpc/lib/string.S
@@ -75,6 +75,20 @@ _GLOBAL(strcmp)
         beq     1b
         blr
 
+_GLOBAL(strncmp)
+        PPC_LCMPI r5,0
+        beqlr
+        mtctr   r5
+        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
+        bdnzt   eq,1b
+        blr
+
 _GLOBAL(strlen)
         addi    r4,r3,-1
 1:      lbzu    r0,1(r4)