powerpc32, ftrace: save and restore mcount regs with macro

[safe/jmp/linux-2.6] / arch / powerpc / kernel / swsusp_32.S

diff --git a/arch/powerpc/kernel/swsusp_32.S b/arch/powerpc/kernel/swsusp_32.S
index 69e8f86..b47d8ce 100644 (file)
--- a/arch/powerpc/kernel/swsusp_32.S
+++ b/arch/powerpc/kernel/swsusp_32.S
@@ -5,7 +5,7 @@
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
 #include <asm/asm-offsets.h>
-
+#include <asm/mmu.h>
 
 /*
  * Structure for storing CPU registers on the save area.
@@ -133,10 +133,12 @@ _GLOBAL(swsusp_arch_suspend)
 /* Resume code */
 _GLOBAL(swsusp_arch_resume)
 
+#ifdef CONFIG_ALTIVEC
        /* Stop pending alitvec streams and memory accesses */
 BEGIN_FTR_SECTION
        DSSALL
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
+#endif
        sync
 
        /* Disable MSR:DR to make sure we don't take a TLB or
@@ -277,7 +279,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
        mtibatl 3,r4
 #endif
 
-BEGIN_FTR_SECTION
+BEGIN_MMU_FTR_SECTION
        li      r4,0
        mtspr   SPRN_DBAT4U,r4
        mtspr   SPRN_DBAT4L,r4
@@ -295,7 +297,7 @@ BEGIN_FTR_SECTION
        mtspr   SPRN_IBAT6L,r4
        mtspr   SPRN_IBAT7U,r4
        mtspr   SPRN_IBAT7L,r4
-END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_BATS)
+END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS)
 
        /* Flush all TLBs */
        lis     r4,0x1000