In order to have all flags fit on a 80 chars wide screen,
reduce the flags to 1 char (2 where ambiguous).

No cache is 'i'
User is 'ur' (Supervisor would be sr)
Shared (for 8xx) becomes 'sh' (it was 'user' when not shared but
that was ambiguous because that's not entirely right)

Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
---
 arch/powerpc/mm/ptdump/8xx.c    | 33 ++++++++++++++++---------------
 arch/powerpc/mm/ptdump/shared.c | 35 +++++++++++++++++----------------
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/arch/powerpc/mm/ptdump/8xx.c b/arch/powerpc/mm/ptdump/8xx.c
index 9e2d8e847d6e..ca9ce94672f5 100644
--- a/arch/powerpc/mm/ptdump/8xx.c
+++ b/arch/powerpc/mm/ptdump/8xx.c
@@ -12,9 +12,9 @@
 static const struct flag_info flag_array[] = {
        {
                .mask   = _PAGE_SH,
-               .val    = 0,
-               .set    = "user",
-               .clear  = "    ",
+               .val    = _PAGE_SH,
+               .set    = "sh",
+               .clear  = "  ",
        }, {
                .mask   = _PAGE_RO | _PAGE_NA,
                .val    = 0,
@@ -30,37 +30,38 @@ static const struct flag_info flag_array[] = {
        }, {
                .mask   = _PAGE_EXEC,
                .val    = _PAGE_EXEC,
-               .set    = " X ",
-               .clear  = "   ",
+               .set    = "x",
+               .clear  = " ",
        }, {
                .mask   = _PAGE_PRESENT,
                .val    = _PAGE_PRESENT,
-               .set    = "present",
-               .clear  = "       ",
+               .set    = "p",
+               .clear  = " ",
        }, {
                .mask   = _PAGE_GUARDED,
                .val    = _PAGE_GUARDED,
-               .set    = "guarded",
-               .clear  = "       ",
+               .set    = "g",
+               .clear  = " ",
        }, {
                .mask   = _PAGE_DIRTY,
                .val    = _PAGE_DIRTY,
-               .set    = "dirty",
-               .clear  = "     ",
+               .set    = "d",
+               .clear  = " ",
        }, {
                .mask   = _PAGE_ACCESSED,
                .val    = _PAGE_ACCESSED,
-               .set    = "accessed",
-               .clear  = "        ",
+               .set    = "a",
+               .clear  = " ",
        }, {
                .mask   = _PAGE_NO_CACHE,
                .val    = _PAGE_NO_CACHE,
-               .set    = "no cache",
-               .clear  = "        ",
+               .set    = "i",
+               .clear  = " ",
        }, {
                .mask   = _PAGE_SPECIAL,
                .val    = _PAGE_SPECIAL,
-               .set    = "special",
+               .set    = "s",
+               .clear  = " ",
        }
 };
 
diff --git a/arch/powerpc/mm/ptdump/shared.c b/arch/powerpc/mm/ptdump/shared.c
index f7ed2f187cb0..44a8a64a664f 100644
--- a/arch/powerpc/mm/ptdump/shared.c
+++ b/arch/powerpc/mm/ptdump/shared.c
@@ -13,8 +13,8 @@ static const struct flag_info flag_array[] = {
        {
                .mask   = _PAGE_USER,
                .val    = _PAGE_USER,
-               .set    = "user",
-               .clear  = "    ",
+               .set    = "ur",
+               .clear  = "  ",
        }, {
                .mask   = _PAGE_RW,
                .val    = _PAGE_RW,
@@ -23,42 +23,43 @@ static const struct flag_info flag_array[] = {
        }, {
                .mask   = _PAGE_EXEC,
                .val    = _PAGE_EXEC,
-               .set    = " X ",
-               .clear  = "   ",
+               .set    = "x",
+               .clear  = " ",
        }, {
                .mask   = _PAGE_PRESENT,
                .val    = _PAGE_PRESENT,
-               .set    = "present",
-               .clear  = "       ",
+               .set    = "p",
+               .clear  = " ",
        }, {
                .mask   = _PAGE_GUARDED,
                .val    = _PAGE_GUARDED,
-               .set    = "guarded",
-               .clear  = "       ",
+               .set    = "g",
+               .clear  = " ",
        }, {
                .mask   = _PAGE_DIRTY,
                .val    = _PAGE_DIRTY,
-               .set    = "dirty",
-               .clear  = "     ",
+               .set    = "d",
+               .clear  = " ",
        }, {
                .mask   = _PAGE_ACCESSED,
                .val    = _PAGE_ACCESSED,
-               .set    = "accessed",
-               .clear  = "        ",
+               .set    = "a",
+               .clear  = " ",
        }, {
                .mask   = _PAGE_WRITETHRU,
                .val    = _PAGE_WRITETHRU,
-               .set    = "write through",
-               .clear  = "             ",
+               .set    = "w",
+               .clear  = " ",
        }, {
                .mask   = _PAGE_NO_CACHE,
                .val    = _PAGE_NO_CACHE,
-               .set    = "no cache",
-               .clear  = "        ",
+               .set    = "i",
+               .clear  = " ",
        }, {
                .mask   = _PAGE_SPECIAL,
                .val    = _PAGE_SPECIAL,
-               .set    = "special",
+               .set    = "s",
+               .clear  = " ",
        }
 };
 
-- 
2.25.0

Reply via email to