Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1178812pxj; Fri, 4 Jun 2021 07:57:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzms3vUx2L4ze7nZ/90hbravTJBVZEjy0rxRuk4hd0mpIGKW6aZKcx9kxFIRvn7r5MTi1GS X-Received: by 2002:a17:906:7d8d:: with SMTP id v13mr4560352ejo.2.1622818643597; Fri, 04 Jun 2021 07:57:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622818643; cv=none; d=google.com; s=arc-20160816; b=P9Q568VMkOUm6OA4can4p6xeAnmSr/fXjuWcrBWDs2Pn8KOSiJ/W7joBpCQUf5W0fB /7eP7CEtAyoIQf/ipSJ7PW2ReSaduwer2HqeO7FD6w8KMBQ7vHwpjvm265Ew6jcMauzq J9Og5MR1obtvBA0rGLTpyOAHdHWHSqAEd2KWXZVfr1M514/x4f6VmBuD93vwLosTDEDr rr0B1ss5qqsCFmjp26M6tawFp3X9s8/ZDhE1bA/kYSm1+LHzxNN5p+CX2Gs/TwINRdlR ifuv33MwfWG80KDReGBsIRLReDmot9Saq1IwK8ysCmckXnqc0KzB/NdzqeH23wCyZGhR Plmw== 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:references:in-reply-to :message-id; bh=ujRVlk8OoBFTCNQhMueKy9v4hUAJQA7QeMskHIjZRuE=; b=TLgr1Cg8sMDC9FAhg+P5IZXe7iQyxln5B+Sr6AcTVfQKCByuJSD51FlwXz+hXrHIIB Csg9mCmQOrzZxFwqVgcE+EvOj+RiKvHh77yY+A7QxF4HvfcSJwZ6HBiDdhBzaUD+ys1u K6ixyxL4AgTmQNAnLOw9v7Ecc0yuzzGZnORjiX1j5vR/YjwMNQa9zJZotWHERExshmsZ tFfuH/MbNy2snxQ9WMRlKJ/uutYRcaNUxsQjyW78XE1eDu8WLV+90txRehd7ywlMbLE3 0TyHPsaKctL8MVhgDAGGdioswxr2KbL9tPEp7grKLj9UNBnmPnmt+ZHz0hy9n0ZIU9f9 rwRg== 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 dd18si4670519edb.445.2021.06.04.07.57.00; Fri, 04 Jun 2021 07:57: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 S230258AbhFDO4J (ORCPT + 99 others); Fri, 4 Jun 2021 10:56:09 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:19683 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230254AbhFDO4H (ORCPT ); Fri, 4 Jun 2021 10:56:07 -0400 Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4FxQlD47ldzBCw1; Fri, 4 Jun 2021 16:54:16 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DaRLZWkqmWWw; Fri, 4 Jun 2021 16:54:16 +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 4FxQlD3GZszBCvw; Fri, 4 Jun 2021 16:54:16 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 629388B8A9; Fri, 4 Jun 2021 16:54:16 +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 6TOoKgWQH8el; Fri, 4 Jun 2021 16:54:16 +0200 (CEST) Received: from po15610vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 2DB1E8B885; Fri, 4 Jun 2021 16:54:16 +0200 (CEST) Received: by po15610vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 0670364BDB; Fri, 4 Jun 2021 14:54:15 +0000 (UTC) Message-Id: <33db61d5f85146262dbe26648f8f87eca3cae393.1622818435.git.christophe.leroy@csgroup.eu> In-Reply-To: <5ab3a517bc883a2fc905fb2cb5ee9344f37b2cfa.1622818435.git.christophe.leroy@csgroup.eu> References: <5ab3a517bc883a2fc905fb2cb5ee9344f37b2cfa.1622818435.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH 4/4] powerpc/32: Avoid #ifdef nested with FTR_SECTION on booke syscall entry To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 4 Jun 2021 14:54:15 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On booke, SYSCALL_ENTRY macro nests an FTR_SECTION with a Duplicate the single instruction alternative to avoid nesting. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_booke.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/head_booke.h b/arch/powerpc/kernel/head_booke.h index 10f31146b472..87b806e8eded 100644 --- a/arch/powerpc/kernel/head_booke.h +++ b/arch/powerpc/kernel/head_booke.h @@ -128,10 +128,10 @@ BEGIN_FTR_SECTION mr r12, r13 lwz r13, THREAD_NORMSAVE(2)(r10) FTR_SECTION_ELSE -#endif mfcr r12 -#ifdef CONFIG_KVM_BOOKE_HV ALT_FTR_SECTION_END_IFSET(CPU_FTR_EMB_HV) +#else + mfcr r12 #endif mfspr r9, SPRN_SRR1 BOOKE_CLEAR_BTB(r11) -- 2.25.0