PPC32: Replace 2 inline functions with their normal macro equivalents

diff --git a/arch/ppc/kernel/ppc-stub.c b/arch/ppc/kernel/ppc-stub.c
index 3664476b49138617060e88e6c870b56f4958eaff..acc76c5f264b8c4f80cf73dff5ea887cb72125ab 100644 (file)
--- a/arch/ppc/kernel/ppc-stub.c
+++ b/arch/ppc/kernel/ppc-stub.c
@@ -420,18 +420,6 @@ static void kgdb_flush_cache_all(void)
        flush_instruction_cache();
 }
 
-static inline int get_msr(void)
-{
-       int msr;
-       asm volatile("mfmsr %0" : "=r" (msr):);
-       return msr;
-}
-
-static inline void set_msr(int msr)
-{
-       asm volatile("mtmsr %0" : : "r" (msr));
-}
-
 /* Set up exception handlers for tracing and breakpoints
  * [could be called kgdb_init()]
  */
@@ -598,8 +586,8 @@ handle_exception (struct pt_regs *regs)
 
        kgdb_interruptible(0);
        lock_kernel();
-       msr = get_msr();
-       set_msr(msr & ~MSR_EE); /* disable interrupts */
+       msr = mfmsr();
+       mtmsr(msr & ~MSR_EE);   /* disable interrupts */
 
        if (regs->nip == (unsigned long)breakinst) {
                /* Skip over breakpoint trap insn */
@@ -786,7 +774,7 @@ handle_exception (struct pt_regs *regs)
                        strcpy(remcomOutBuffer, "OK");
                        putpacket(remcomOutBuffer);
 #endif
-                       set_msr(msr);
+                       mtmsr(msr);
 
                        kgdb_interruptible(1);
                        unlock_kernel();
@@ -802,7 +790,7 @@ handle_exception (struct pt_regs *regs)
 #if defined(CONFIG_40x)
                        regs->msr |= MSR_DE;
                        regs->dbcr0 |= (DBCR0_IDM | DBCR0_IC);
-                       set_msr(msr);
+                       mtmsr(msr);
 #else
                        regs->msr |= MSR_SE;
 #endif