Pull cpumask into release branch

[sfrench/cifs-2.6.git] / arch / powerpc / lib / feature-fixups.c

diff --git a/arch/powerpc/lib/feature-fixups.c b/arch/powerpc/lib/feature-fixups.c
index 4e43702b98135bb20934619ad628fce6669133ce..7e8865bcd683a5291861f3d31e07d75d9e98277d 100644 (file)
--- a/arch/powerpc/lib/feature-fixups.c
+++ b/arch/powerpc/lib/feature-fixups.c
@@ -85,7 +85,7 @@ static int patch_feature_section(unsigned long value, struct fixup_entry *fcur)
        }
 
        for (; dest < end; dest++)
-               patch_instruction(dest, PPC_NOP_INSTR);
+               patch_instruction(dest, PPC_INST_NOP);
 
        return 0;
 }
@@ -99,7 +99,7 @@ void do_feature_fixups(unsigned long value, void *fixup_start, void *fixup_end)
 
        for (; fcur < fend; fcur++) {
                if (patch_feature_section(value, fcur)) {
-                       __WARN();
+                       WARN_ON(1);
                        printk("Unable to patch feature section at %p - %p" \
                                " with %p - %p\n",
                                calc_addr(fcur, fcur->start_off),
@@ -122,7 +122,7 @@ void do_lwsync_fixups(unsigned long value, void *fixup_start, void *fixup_end)
 
        for (; start < end; start++) {
                dest = (void *)start + *start;
-               patch_instruction(dest, PPC_LWSYNC_INSTR);
+               patch_instruction(dest, PPC_INST_LWSYNC);
        }
 }