Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp3357274ybz; Mon, 20 Apr 2020 00:49:12 -0700 (PDT) X-Google-Smtp-Source: APiQypLjSyq/uRyiyMgmEqTkMNp9hR0AbgiZ6ovjNqv/AfIbtYEu3HhoX9dVpwAUiSLhV/jaU0s1 X-Received: by 2002:a17:906:af99:: with SMTP id mj25mr14423867ejb.151.1587368952357; Mon, 20 Apr 2020 00:49:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587368952; cv=none; d=google.com; s=arc-20160816; b=Pi3h8ap2ctNzZpFUlMqs30KqUG69Kesnf+J1ldz140zb8jUvHx+dZfBJWaVKz9PxkJ QQ1UKfKtPP007UIBSsCU/RDNaUAaPmvPUkLA/HzSrGhAle4SL5RU0PfGG+G6WcT6Sm8t Nm1YEZovNmLdiRrufWtsfiiNid+aZBgue0FkyraUshv1S1zBvSKfnOp1sbkzBqTJ3ZNZ vGLXozSIdRV8LxE6GFEW2kx9WLEReWxmdIRSLJ0hX2NkRgV3qehAF4JR3Lvu9KjSKwLi TQwr0caMaZZHBmz7A6d9c/tzHgO+DR8hHFCMoGg6cjd5gpkr5j7Cb9WigTREzML1XSY6 gJwQ== 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=AJ1N/+HyuH4Cqp5jl/jMd/18yRFzS+fKuSBNXpiE9Ko=; b=Co77Lwh6KfKwC4Bp/iW7rJ/+zoVrjOSamYaN3E8uTYl7qwqSqkvcC9FTQiZp6fn6jF tVOoMoKfVc6FvFKEaH1RVbjECr/A28UBTvlj5CNBPysduZy+Mhe0L6XcqNJV6V0DBTuO IcC3n28zXHhjip1J09P9JW1Zmy1AkOJ9DQzuNo5FQwXk0Qm/0urgA0K9GrfbSIPxZYp6 rTiIkM25UrLJhjZHUH0OPl77jhrS6X/b7eSqqZzwJapkYKpXmYGGrz0MA1vwlMi4wv8f /nWw5pvcNgtNEzSZ/QQXFQ0kUvPioVMLpDsMgPTcs7UhVNOcK2ht9CPjq3V/eOdv6jFc HSww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=M262y0AA; 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 q28si80550edw.324.2020.04.20.00.48.48; Mon, 20 Apr 2020 00:49:12 -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; dkim=pass header.i=@c-s.fr header.s=mail header.b=M262y0AA; 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 S1725959AbgDTHrI (ORCPT + 99 others); Mon, 20 Apr 2020 03:47:08 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:49986 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725773AbgDTHrH (ORCPT ); Mon, 20 Apr 2020 03:47:07 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 495JgT4PnLz9tyPV; Mon, 20 Apr 2020 09:47:01 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=M262y0AA; 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 VBdFqZv-mwsO; Mon, 20 Apr 2020 09:47:01 +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 495JgT3CNPz9tyPS; Mon, 20 Apr 2020 09:47:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1587368821; bh=AJ1N/+HyuH4Cqp5jl/jMd/18yRFzS+fKuSBNXpiE9Ko=; h=From:Subject:To:Cc:Date:From; b=M262y0AAdU9t16FOH0k/9VlUjpa0fQG99O8NnOY1bGCe5zJJY7Q20Ykc7/7+i0aK4 pu739PKN0kSzJeZ/PEwJzis1lUDtfRr+uwHI50M3CGDRjwGiL1bor00hb7XeAwLhWG QprNwRMx07oZcubeakxaWq3FkUlr4jOyreUmSfLo= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 76FF68B77E; Mon, 20 Apr 2020 09:47:06 +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 iNZ0jAoIIYbL; Mon, 20 Apr 2020 09:47:06 +0200 (CEST) Received: from pc16570vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 2B5708B77A; Mon, 20 Apr 2020 09:47:06 +0200 (CEST) Received: by pc16570vm.idsi0.si.c-s.fr (Postfix, from userid 0) id F254C657B7; Mon, 20 Apr 2020 07:47:05 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH] powerpc/32s: Fix build failure with CONFIG_PPC_KUAP_DEBUG To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Mon, 20 Apr 2020 07:47:05 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gpr2 is not a parametre of kuap_check(), it doesn't exist. Use gpr instead. Fixes: a68c31fc01ef ("powerpc/32s: Implement Kernel Userspace Access Protection") Cc: stable@vger.kernel.org Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/book3s/32/kup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/book3s/32/kup.h b/arch/powerpc/include/asm/book3s/32/kup.h index 3c0ba22dc360..db0a1c281587 100644 --- a/arch/powerpc/include/asm/book3s/32/kup.h +++ b/arch/powerpc/include/asm/book3s/32/kup.h @@ -75,7 +75,7 @@ .macro kuap_check current, gpr #ifdef CONFIG_PPC_KUAP_DEBUG - lwz \gpr2, KUAP(thread) + lwz \gpr, KUAP(thread) 999: twnei \gpr, 0 EMIT_BUG_ENTRY 999b, __FILE__, __LINE__, (BUGFLAG_WARNING | BUGFLAG_ONCE) #endif -- 2.25.0