6 files changed, 7 insertions, 51 deletions

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 9f342f134ae4..597562f69b2d 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -12,7 +12,6 @@ CFLAGS_REMOVE_feature-fixups.o = -pg
 obj-y                   := string.o alloc.o \
                            crtsavres.o ppc_ksyms.o
 obj-$(CONFIG_PPC32)     += div64.o copy_32.o
-obj-$(CONFIG_HAS_IOMEM) += devres.o
 
 obj-$(CONFIG_PPC64)     += copypage_64.o copyuser_64.o \
                            usercopy_64.o mem_64.o string.o \
diff --git a/arch/powerpc/lib/alloc.c b/arch/powerpc/lib/alloc.c
index da22c84a8fed..4a6c2cf890d9 100644
--- a/arch/powerpc/lib/alloc.c
+++ b/arch/powerpc/lib/alloc.c
@@ -13,9 +13,7 @@ void * __init_refok zalloc_maybe_bootmem(size_t size, gfp_t mask)
         if (mem_init_done)
                 p = kzalloc(size, mask);
         else {
-                p = alloc_bootmem(size);
-                if (p)
-                        memset(p, 0, size);
+                p = memblock_virt_alloc(size, 0);
         }
         return p;
 }
diff --git a/arch/powerpc/lib/copyuser_power7.S b/arch/powerpc/lib/copyuser_power7.S
index c46c876ac96a..92ee840529bc 100644
--- a/arch/powerpc/lib/copyuser_power7.S
+++ b/arch/powerpc/lib/copyuser_power7.S
@@ -718,4 +718,4 @@ err3;	stb	r0,0(r3)
 
 15:     addi    r1,r1,STACKFRAMESIZE
         b       exit_vmx_usercopy       /* tail call optimise */
-#endif /* CONFiG_ALTIVEC */
+#endif /* CONFIG_ALTIVEC */
diff --git a/arch/powerpc/lib/devres.c b/arch/powerpc/lib/devres.c
deleted file mode 100644
index 8df55fc3aad6..000000000000
--- a/arch/powerpc/lib/devres.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2008 Freescale Semiconductor, Inc.
- *
- * 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/device.h>       /* devres_*(), devm_ioremap_release() */
-#include <linux/gfp.h>
-#include <linux/io.h>           /* ioremap_prot() */
-#include <linux/export.h>       /* EXPORT_SYMBOL() */
-
-/**
- * devm_ioremap_prot - Managed ioremap_prot()
- * @dev: Generic device to remap IO address for
- * @offset: BUS offset to map
- * @size: Size of map
- * @flags: Page flags
- *
- * Managed ioremap_prot().  Map is automatically unmapped on driver
- * detach.
- */
-void __iomem *devm_ioremap_prot(struct device *dev, resource_size_t offset,
-                                 size_t size, unsigned long flags)
-{
-        void __iomem **ptr, *addr;
-
-        ptr = devres_alloc(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL);
-        if (!ptr)
-                return NULL;
-
-        addr = ioremap_prot(offset, size, flags);
-        if (addr) {
-                *ptr = addr;
-                devres_add(dev, ptr);
-        } else
-                devres_free(ptr);
-
-        return addr;
-}
-EXPORT_SYMBOL(devm_ioremap_prot);
diff --git a/arch/powerpc/lib/memcpy_power7.S b/arch/powerpc/lib/memcpy_power7.S
index 2ff5c142f87b..0830587df16e 100644
--- a/arch/powerpc/lib/memcpy_power7.S
+++ b/arch/powerpc/lib/memcpy_power7.S
@@ -653,4 +653,4 @@ _GLOBAL(memcpy_power7)
 15:     addi    r1,r1,STACKFRAMESIZE
         ld      r3,-STACKFRAMESIZE+STK_REG(R31)(r1)
         b       exit_vmx_copy           /* tail call optimise */
-#endif /* CONFiG_ALTIVEC */
+#endif /* CONFIG_ALTIVEC */
diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
index 54651fc2d412..dc885b30f7a6 100644
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -1865,6 +1865,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                 }
                 goto ldst_done;
 
+#ifdef CONFIG_PPC_FPU
         case LOAD_FP:
                 if (regs->msr & MSR_LE)
                         return 0;
@@ -1873,7 +1874,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                 else
                         err = do_fp_load(op.reg, do_lfd, op.ea, size, regs);
                 goto ldst_done;
-
+#endif
 #ifdef CONFIG_ALTIVEC
         case LOAD_VMX:
                 if (regs->msr & MSR_LE)
@@ -1919,6 +1920,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                 err = write_mem(op.val, op.ea, size, regs);
                 goto ldst_done;
 
+#ifdef CONFIG_PPC_FPU
         case STORE_FP:
                 if (regs->msr & MSR_LE)
                         return 0;
@@ -1927,7 +1929,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                 else
                         err = do_fp_store(op.reg, do_stfd, op.ea, size, regs);
                 goto ldst_done;
-
+#endif
 #ifdef CONFIG_ALTIVEC
         case STORE_VMX:
                 if (regs->msr & MSR_LE)