Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / arch / powerpc / kernel / misc_32.S

diff --git a/kernel/arch/powerpc/kernel/misc_32.S b/kernel/arch/powerpc/kernel/misc_32.S
index e9dfe22..9cb0c2f 100644 (file)
--- a/kernel/arch/powerpc/kernel/misc_32.S
+++ b/kernel/arch/powerpc/kernel/misc_32.S
@@ -315,7 +315,7 @@ _GLOBAL(flush_instruction_cache)
        lis     r3, KERNELBASE@h
        iccci   0,r3
 #endif
-#elif CONFIG_FSL_BOOKE
+#elif defined(CONFIG_FSL_BOOKE)
 BEGIN_FTR_SECTION
        mfspr   r3,SPRN_L1CSR0
        ori     r3,r3,L1CSR0_CFI|L1CSR0_CLFC
@@ -597,25 +597,6 @@ _GLOBAL(copy_page)
        li      r11,4
        b       2b
 
-/*
- * void atomic_clear_mask(atomic_t mask, atomic_t *addr)
- * void atomic_set_mask(atomic_t mask, atomic_t *addr);
- */
-_GLOBAL(atomic_clear_mask)
-10:    lwarx   r5,0,r4
-       andc    r5,r5,r3
-       PPC405_ERR77(0,r4)
-       stwcx.  r5,0,r4
-       bne-    10b
-       blr
-_GLOBAL(atomic_set_mask)
-10:    lwarx   r5,0,r4
-       or      r5,r5,r3
-       PPC405_ERR77(0,r4)
-       stwcx.  r5,0,r4
-       bne-    10b
-       blr
-
 /*
  * Extended precision shifts.
  *