Received: by 10.213.65.68 with SMTP id h4csp893513imn; Tue, 27 Mar 2018 10:43:23 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/kiUJ8/M5SYG/yKpT87+CAFoj0OO7lVkAkd4k1gcdjMGFFtJsPobhd7RO4xo/gQUt75KaH X-Received: by 10.167.129.7 with SMTP id b7mr222822pfi.122.1522172603690; Tue, 27 Mar 2018 10:43:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522172603; cv=none; d=google.com; s=arc-20160816; b=psveC38oCrhK80nPG3uIUW4dIzEyla2QefAu/eqmwS5o+BmRPFu+VwBRt1NhXS88Zi ROgh+UV7881gADMTksOnOvkQUnZehK0znHfmNZfNmFeCXDMu4o9PZknRf5p6S6KMcuEh pMFZR6Fwck11YiKkCd/YDghOuvtr/VKpavLclVHltMi30YoljM9w5JZ0/WWmpRilaycT 349FC1VKq4HdhGF3ubVUt96e0h2W7Owe83lSIc0+bvunA6ng6EywTt3E9VEC9AsJntC4 iTs23EgCCd1wQphuBYb4gpYKblNeW/7UkZzWoR0Dp9jeFSZJy6pmuiY6lN6TgvVUdlNW m95A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=FOQAZ+rFyCHYHbphgi6WWyXHQuDFNY3A/e93f5idgWE=; b=WRj6aJSET6cmAP8wQC8r4IDsgjh7/tOTpMNF21KhWCnqcamJO01SIouVeHM5hVj2R3 mXXFKbCXwe//KKlNstmIqtTCvhwNIQdKuT5uIGcnmV73QpRJ8zWHXuBd9iJWuvWjSm++ M28S5uArOJWeJx+J2rFiE6HWRSeAxNoyOLawHXrksTwHLfbHSWApoyemyonsGsCxaEAO RuTrwdkn044KO2WWp/1LYrTvkuV1pKD1Im/QfI7ju28IVAVEtm6piTe6ikVOdYEG8Zx7 tgJUx/BnsieCC8yh3DoyKd+mHArKH/OYkoUX9kCRqHOHJwXiGf1npx7PHOiZ3IdOMClp EfiQ== ARC-Authentication-Results: i=1; mx.google.com; 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 f18si1153551pgn.244.2018.03.27.10.43.09; Tue, 27 Mar 2018 10:43:23 -0700 (PDT) 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; 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 S1754076AbeC0Qdu (ORCPT + 99 others); Tue, 27 Mar 2018 12:33:50 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:44040 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751249AbeC0Qdq (ORCPT ); Tue, 27 Mar 2018 12:33:46 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 9CB4211B1; Tue, 27 Mar 2018 16:33:45 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Hansen , Thomas Gleixner , Andy Lutomirski , Borislav Petkov , Brian Gerst , Denys Vlasenko , "H. Peter Anvin" , Josh Poimboeuf , Linus Torvalds , Peter Zijlstra , Ingo Molnar Subject: [PATCH 4.9 63/67] x86/pkeys/selftests: Rename si_pkey to siginfo_pkey Date: Tue, 27 Mar 2018 18:27:55 +0200 Message-Id: <20180327162731.138946120@linuxfoundation.org> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180327162726.702411083@linuxfoundation.org> References: <20180327162726.702411083@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Hansen commit 91c49c2deb96ffc3c461eaae70219d89224076b7 upstream. 'si_pkey' is now #defined to be the name of the new siginfo field that protection keys uses. Rename it not to conflict. Signed-off-by: Dave Hansen Acked-by: Thomas Gleixner Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20171111001231.DFFC8285@viggo.jf.intel.com Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/x86/protection_keys.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/tools/testing/selftests/x86/protection_keys.c +++ b/tools/testing/selftests/x86/protection_keys.c @@ -249,7 +249,7 @@ void signal_handler(int signum, siginfo_ unsigned long ip; char *fpregs; u32 *pkru_ptr; - u64 si_pkey; + u64 siginfo_pkey; u32 *si_pkey_ptr; int pkru_offset; fpregset_t fpregset; @@ -291,9 +291,9 @@ void signal_handler(int signum, siginfo_ si_pkey_ptr = (u32 *)(((u8 *)si) + si_pkey_offset); dprintf1("si_pkey_ptr: %p\n", si_pkey_ptr); dump_mem(si_pkey_ptr - 8, 24); - si_pkey = *si_pkey_ptr; - pkey_assert(si_pkey < NR_PKEYS); - last_si_pkey = si_pkey; + siginfo_pkey = *si_pkey_ptr; + pkey_assert(siginfo_pkey < NR_PKEYS); + last_si_pkey = siginfo_pkey; if ((si->si_code == SEGV_MAPERR) || (si->si_code == SEGV_ACCERR) || @@ -305,7 +305,7 @@ void signal_handler(int signum, siginfo_ dprintf1("signal pkru from xsave: %08x\n", *pkru_ptr); /* need __rdpkru() version so we do not do shadow_pkru checking */ dprintf1("signal pkru from pkru: %08x\n", __rdpkru()); - dprintf1("si_pkey from siginfo: %jx\n", si_pkey); + dprintf1("pkey from siginfo: %jx\n", siginfo_pkey); *(u64 *)pkru_ptr = 0x00000000; dprintf1("WARNING: set PRKU=0 to allow faulting instruction to continue\n"); pkru_faults++;