Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp5900048ybv; Tue, 18 Feb 2020 06:09:59 -0800 (PST) X-Google-Smtp-Source: APXvYqzRguq5EoH00dEFpBPL0C9Qb310CDClW68YOnhCQ7ow7o36YwB5NPcjpSqFF3bPW1SM2h17 X-Received: by 2002:a9d:3cf:: with SMTP id f73mr15919698otf.11.1582034999363; Tue, 18 Feb 2020 06:09:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582034999; cv=none; d=google.com; s=arc-20160816; b=QwEtPot2H4XGTZTixPTqGVXyPsf82GaY0ENLNX5gSGh1Su6iOxDV07MjmoxAoxhNBK u4LWYzmmjCU4BChZYp6UZwSHZhnlI14so303KRPY329iSRIgIoR3MSNKMG/LjnJyg/v2 ct6QnLlaEcZTa2G/aeSYb4FBLkCwiwx7II4bTtXv4r91927dSn7tXdrMWRK3FKBOw9aU v1otSq/GVTO/ELNf4Qus4hXbYg82w6+RaCs1363CdgbDg6qYZYCKnEWDxzQV5oOyZ/05 nLy0mG4RzLxmAw/cAWe94YkqWWxdg4vWh1RP/CAKgrNxISUVNWTqio+wCKXPXVRc9Rn7 VKVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:message-id :dkim-signature; bh=y0KdGp0qsXN/fO5X/jOGmm8GljqKiBvrLqn6qOYtuPc=; b=tkm7r7VRWzH2uf/uTrrFRk6XFo3Wpcc3VzgVO40Bqgoeq4zLXjo1hTgnLmdVMbxqq+ wFa4zXY5TI48uUc6mfc62/oLKsvPBePtedmJDImX4j954PFw7FAIPaHXzoot6kjfrBU8 B/RYDoWYkRW2qZ3Q818pkpRk0YfXk+8VRHCpzaKH8rb/JAIo6IXcZw2Fi38stWHonRhU LyyHHL+rAu71W/X2UDg85t58m38reVu5zuUtjAFKWIgCkHp/OwsEF13EIrGIrRQHNNs6 d9JAJs19P5vndCvL8ql6X1MFKzBc1Vyx5PYU9lT1yuGLQ6H0EILHLw4y+wGCkLo0y8be Kxuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=AOPn+oWM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q65si7503358oic.123.2020.02.18.06.09.46; Tue, 18 Feb 2020 06:09:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=AOPn+oWM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726651AbgBROJd (ORCPT + 99 others); Tue, 18 Feb 2020 09:09:33 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:22026 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726338AbgBROJd (ORCPT ); Tue, 18 Feb 2020 09:09:33 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 48MN5P33WgzB09bP; Tue, 18 Feb 2020 15:09:29 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=AOPn+oWM; dkim-adsp=pass; dkim-atps=neutral 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 9VREczmmUHPK; Tue, 18 Feb 2020 15:09:29 +0100 (CET) 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 48MN5P1YPwzB09bM; Tue, 18 Feb 2020 15:09:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1582034969; bh=y0KdGp0qsXN/fO5X/jOGmm8GljqKiBvrLqn6qOYtuPc=; h=From:Subject:To:Cc:Date:From; b=AOPn+oWMiQxYwmeYsYE+qk3OW6eZd8/JkxBgdFTec/YioP+t76r37CMV9Vu2Ceh6e yKeqtU6pC0Qct2HN/jPSl+PNLpNfGihvZk8Uz1HJnu8Xyf8SwrxAsMiS9C29xnsnzr rH9OyRC/at+BpqXtaRa2Hh3GIY3ZsSUWslN2/jNQ= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 9B7618B815; Tue, 18 Feb 2020 15:09:30 +0100 (CET) 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 A5ftenYca6vO; Tue, 18 Feb 2020 15:09:30 +0100 (CET) Received: from pc16570vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 660D28B814; Tue, 18 Feb 2020 15:09:30 +0100 (CET) Received: by pc16570vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 182C565314; Tue, 18 Feb 2020 14:09:29 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH] powerpc/entry: Fix a #if which should be a #ifdef in entry_32.S To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 18 Feb 2020 14:09:29 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fixes: 12c3f1fd87bf ("powerpc/32s: get rid of CPU_FTR_601 feature") Cc: stable@vger.kernel.org Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/entry_32.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 0713daa651d9..b38e6b549d48 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -783,7 +783,7 @@ fast_exception_return: 1: lis r3,exc_exit_restart_end@ha addi r3,r3,exc_exit_restart_end@l cmplw r12,r3 -#if CONFIG_PPC_BOOK3S_601 +#ifdef CONFIG_PPC_BOOK3S_601 bge 2b #else bge 3f @@ -791,7 +791,7 @@ fast_exception_return: lis r4,exc_exit_restart@ha addi r4,r4,exc_exit_restart@l cmplw r12,r4 -#if CONFIG_PPC_BOOK3S_601 +#ifdef CONFIG_PPC_BOOK3S_601 blt 2b #else blt 3f -- 2.25.0