From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751845AbdKUIqa (ORCPT ); Tue, 21 Nov 2017 03:46:30 -0500 Received: from terminus.zytor.com ([65.50.211.136]:43629 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751552AbdKUIq3 (ORCPT ); Tue, 21 Nov 2017 03:46:29 -0500 Date: Tue, 21 Nov 2017 00:40:53 -0800 From: tip-bot for Dave Hansen Message-ID: Cc: mingo@kernel.org, dvlasenk@redhat.com, hpa@zytor.com, peterz@infradead.org, torvalds@linux-foundation.org, brgerst@gmail.com, dave.hansen@linux.intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, luto@kernel.org, jpoimboe@redhat.com, bp@alien8.de Reply-To: peterz@infradead.org, mingo@kernel.org, dvlasenk@redhat.com, hpa@zytor.com, brgerst@gmail.com, torvalds@linux-foundation.org, tglx@linutronix.de, luto@kernel.org, dave.hansen@linux.intel.com, linux-kernel@vger.kernel.org, bp@alien8.de, jpoimboe@redhat.com In-Reply-To: <20171111001231.DFFC8285@viggo.jf.intel.com> References: <20171111001231.DFFC8285@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/pkeys/selftests: Rename 'si_pkey' to 'siginfo_pkey' Git-Commit-ID: 91c49c2deb96ffc3c461eaae70219d89224076b7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 91c49c2deb96ffc3c461eaae70219d89224076b7 Gitweb: https://git.kernel.org/tip/91c49c2deb96ffc3c461eaae70219d89224076b7 Author: Dave Hansen AuthorDate: Fri, 10 Nov 2017 16:12:31 -0800 Committer: Ingo Molnar CommitDate: Tue, 21 Nov 2017 09:34:52 +0100 x86/pkeys/selftests: Rename 'si_pkey' to 'siginfo_pkey' '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 --- tools/testing/selftests/x86/protection_keys.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/x86/protection_keys.c b/tools/testing/selftests/x86/protection_keys.c index 7a1cc0e..bc1b073 100644 --- a/tools/testing/selftests/x86/protection_keys.c +++ b/tools/testing/selftests/x86/protection_keys.c @@ -250,7 +250,7 @@ void signal_handler(int signum, siginfo_t *si, void *vucontext) unsigned long ip; char *fpregs; u32 *pkru_ptr; - u64 si_pkey; + u64 siginfo_pkey; u32 *si_pkey_ptr; int pkru_offset; fpregset_t fpregset; @@ -292,9 +292,9 @@ void signal_handler(int signum, siginfo_t *si, void *vucontext) 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) || @@ -306,7 +306,7 @@ void signal_handler(int signum, siginfo_t *si, void *vucontext) 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++;