powerpc: Use MSR_64BIT in places

Use the new MSR_64BIT in a few places. Some of these are already ifdef'ed
for BOOKE vs BOOKS, but it's still clearer, MSR_SF does not immediately
parse as "MSR bit for 64bit".

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

3 files changed, 4 insertions, 4 deletions

diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 6d17c37f22a1..73d6e9afcdf1 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -655,7 +655,7 @@ _GLOBAL(enable_64b_mode)
         oris    r11,r11,0x8000          /* CM bit set, we'll set ICM later */
         mtmsr   r11
 #else /* CONFIG_PPC_BOOK3E */
-        li      r12,(MSR_SF | MSR_ISF)@highest
+        li      r12,(MSR_64BIT | MSR_ISF)@highest
         sldi    r12,r12,48
         or      r11,r11,r12
         mtmsrd  r11
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index 27c4a4584f80..da989fff19cc 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -381,7 +381,7 @@ badframe:
                regs, uc, &uc->uc_mcontext);
 #endif
         if (show_unhandled_signals && printk_ratelimit())
-                printk(regs->msr & MSR_SF ? fmt64 : fmt32,
+                printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,
                         current->comm, current->pid, "rt_sigreturn",
                         (long)uc, regs->nip, regs->link);
 
@@ -469,7 +469,7 @@ badframe:
                regs, frame, newsp);
 #endif
         if (show_unhandled_signals && printk_ratelimit())
-                printk(regs->msr & MSR_SF ? fmt64 : fmt32,
+                printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,
                         current->comm, current->pid, "setup_rt_frame",
                         (long)frame, regs->nip, regs->link);
 
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index cb71cf29edea..4a6a109b6816 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -199,7 +199,7 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
         } else if (show_unhandled_signals &&
                     unhandled_signal(current, signr) &&
                     printk_ratelimit()) {
-                        printk(regs->msr & MSR_SF ? fmt64 : fmt32,
+                        printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,
                                 current->comm, current->pid, signr,
                                 addr, regs->nip, regs->link, code);
                 }