Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1304581pxb; Fri, 20 Aug 2021 02:41:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9C8S0f1XgcFcq5N9ecIF3hWEmPxL0sHRNE625ewNz2rlv9JMBxIhYSgnljJvohSOW7ByQ X-Received: by 2002:a05:6e02:1aa6:: with SMTP id l6mr6043142ilv.14.1629452483494; Fri, 20 Aug 2021 02:41:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629452483; cv=none; d=google.com; s=arc-20160816; b=WuP8pG6kOKEgerSwijJHWNbRK8+U9BS6MA9MRcNhLUvPNK393QGMThGtFegC+GrZdI X4fw2tNOTVPYq52cQe8t0LSpHk2sPY9YvY7ZSP98a7666SXJSG2PSeZGwfhH/Vh9ctaz N4xc/mUsitIW61efQpqpx3xubHVwLODxFD31nLIxbeN6TQ3uaki4uc3pY1tuVODAZmyv hTgEY4AGbVV1OC6B8MW9F9Te1xdEsudK0kwz2THT8OaacVmbBeASLaJMKcH+aBdrvu7L kd0DU7dv9A8hYZQGE6Ul4AlbEBTfIrvxxjzFHvW5eT7HsM4vWNd80/PSDVNcgGlEou5A EZqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:message-id; bh=Y89WL0xSLlNF5asW6KO4gtFg2z03svUFIT8vTq7J2ds=; b=fSNqPq37FueeQ11smlIkyBydpPWYrGx9QTEbwFzMxTsAp74BzWhWmt8G5A76hnvm6e h9QWv4/Nv8mG0kZyO26StZ8rHksDYRMX47JYxFR9+/LnlZoi08JNoDF8HCMOEqBTooDB u/KWoVHHJNKfZXeEW7NgbLvL48TK1yVEFSGN8bvX93IydbRcSiBgKencpPksxLCSdCrB Eja8GGpXxOUNs5c5TsF7PPZWz/HdBhJsKFBpVKZQGxGk/gPye6DpVkAcppHpW032wuVj dNaABqEF36+hhvo3m2vtguV1l1lwzonoEAc9y1Rhm4P7bruev1Ahwglzy1ldzkFeikoI o3dw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b7si5936814ilr.75.2021.08.20.02.41.11; Fri, 20 Aug 2021 02:41:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236560AbhHTJj5 (ORCPT + 99 others); Fri, 20 Aug 2021 05:39:57 -0400 Received: from pegase2.c-s.fr ([93.17.235.10]:59917 "EHLO pegase2.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235321AbhHTJj4 (ORCPT ); Fri, 20 Aug 2021 05:39:56 -0400 Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4Grc6C58wPz9sWF; Fri, 20 Aug 2021 11:39:15 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase2.c-s.fr ([172.26.127.65]) by localhost (pegase2.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id p3CG1OzIIT7J; Fri, 20 Aug 2021 11:39:15 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 4Grc6C4Fncz9sWB; Fri, 20 Aug 2021 11:39:15 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 69E678B885; Fri, 20 Aug 2021 11:39:15 +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 nmCvZPyh-XCr; Fri, 20 Aug 2021 11:39:15 +0200 (CEST) Received: from po9473vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 3939E8B884; Fri, 20 Aug 2021 11:39:15 +0200 (CEST) Received: by po9473vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 9406B6697B; Fri, 20 Aug 2021 09:39:14 +0000 (UTC) Message-Id: <4be53b9187a4d8c163968f4d224267e41a7fcc33.1629451479.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH] powerpc/audit: Simplify syscall_get_arch() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 20 Aug 2021 09:39:14 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make use of is_32bit_task() and CONFIG_CPU_LITTLE_ENDIAN to simplify syscall_get_arch(). Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/syscall.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/include/asm/syscall.h b/arch/powerpc/include/asm/syscall.h index ba0f88f3a30d..ac766037e8a1 100644 --- a/arch/powerpc/include/asm/syscall.h +++ b/arch/powerpc/include/asm/syscall.h @@ -116,16 +116,11 @@ static inline void syscall_set_arguments(struct task_struct *task, static inline int syscall_get_arch(struct task_struct *task) { - int arch; - - if (IS_ENABLED(CONFIG_PPC64) && !test_tsk_thread_flag(task, TIF_32BIT)) - arch = AUDIT_ARCH_PPC64; + if (is_32bit_task()) + return AUDIT_ARCH_PPC; + else if (IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN)) + return AUDIT_ARCH_PPC64LE; else - arch = AUDIT_ARCH_PPC; - -#ifdef __LITTLE_ENDIAN__ - arch |= __AUDIT_ARCH_LE; -#endif - return arch; + return AUDIT_ARCH_PPC64; } #endif /* _ASM_SYSCALL_H */ -- 2.25.0