Merge tag 'powerpc-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[sfrench/cifs-2.6.git] / arch / powerpc / xmon / xmon.c

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index ee17270d35d0e4fbb042f762b0530c5f1d0cc249..5888fcd8e408fe2bdc77fb4a6faaabdf558ae3eb 100644 (file)
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -58,6 +58,7 @@
 #ifdef CONFIG_PPC64
 #include <asm/hvcall.h>
 #include <asm/paca.h>
+#include <asm/lppaca.h>
 #endif
 
 #include "nonstdio.h"
@@ -3303,7 +3304,7 @@ static void show_pte(unsigned long addr)
 {
        unsigned long tskv = 0;
        struct task_struct *volatile tsk = NULL;
-       struct mm_struct *mm;
+       struct mm_struct *volatile mm;
        pgd_t *pgdp;
        p4d_t *p4dp;
        pud_t *pudp;
@@ -3828,9 +3829,9 @@ static void dump_tlb_44x(void)
 #ifdef CONFIG_PPC_BOOK3E_64
 static void dump_tlb_book3e(void)
 {
-       u32 mmucfg, pidmask, lpidmask;
+       u32 mmucfg;
        u64 ramask;
-       int i, tlb, ntlbs, pidsz, lpidsz, rasz, lrat = 0;
+       int i, tlb, ntlbs, pidsz, lpidsz, rasz;
        int mmu_version;
        static const char *pgsz_names[] = {
                "  1K",
@@ -3874,12 +3875,8 @@ static void dump_tlb_book3e(void)
        pidsz = ((mmucfg >> 6) & 0x1f) + 1;
        lpidsz = (mmucfg >> 24) & 0xf;
        rasz = (mmucfg >> 16) & 0x7f;
-       if ((mmu_version > 1) && (mmucfg & 0x10000))
-               lrat = 1;
        printf("Book3E MMU MAV=%d.0,%d TLBs,%d-bit PID,%d-bit LPID,%d-bit RA\n",
               mmu_version, ntlbs, pidsz, lpidsz, rasz);
-       pidmask = (1ul << pidsz) - 1;
-       lpidmask = (1ul << lpidsz) - 1;
        ramask = (1ull << rasz) - 1;
 
        for (tlb = 0; tlb < ntlbs; tlb++) {