diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2011-04-07 23:56:03 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-04-27 06:18:44 +0200 |
| commit | 9f0b079320ad1cc71ad7ea4e0ed0b64cd72bbd6d (patch) | |
| tree | c6a47f3f33c48c82057deba0152ea2380aa5475b /arch/powerpc/kernel/head_64.S | |
| parent | powerpc: Add MSR_64BIT (diff) | |
| download | linux-9f0b079320ad1cc71ad7ea4e0ed0b64cd72bbd6d.tar.xz linux-9f0b079320ad1cc71ad7ea4e0ed0b64cd72bbd6d.zip | |
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>
Diffstat (limited to 'arch/powerpc/kernel/head_64.S')
| -rw-r--r-- | arch/powerpc/kernel/head_64.S | 2 |
1 files changed, 1 insertions, 1 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 |