From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37B6EC47256 for ; Wed, 6 May 2020 16:48:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 219D220B1F for ; Wed, 6 May 2020 16:48:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730477AbgEFQs1 (ORCPT ); Wed, 6 May 2020 12:48:27 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:62671 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730046AbgEFQsO (ORCPT ); Wed, 6 May 2020 12:48:14 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 49HMwW1WNKz9v4kD; Wed, 6 May 2020 18:48:11 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id A0-wNCiauOXi; Wed, 6 May 2020 18:48:11 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 49HMwW0kcsz9tyf6; Wed, 6 May 2020 18:48:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id BA9898B7C6; Wed, 6 May 2020 18:48:12 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id XU7H6IdAycnR; Wed, 6 May 2020 18:48:12 +0200 (CEST) Received: from localhost.localdomain (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 623A68B7C5; Wed, 6 May 2020 18:48:12 +0200 (CEST) Received: by localhost.localdomain (Postfix, from userid 0) id 2E02465911; Wed, 6 May 2020 16:48:12 +0000 (UTC) Message-Id: <9743a7cc4407b67af2c73754ba1aa33723553d40.1588783498.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 07/45] powerpc/ptdump: Limit size of flags text to 1/2 chars on PPC32 To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Wed, 6 May 2020 16:48:12 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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