From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753354AbdK0Wgn (ORCPT ); Mon, 27 Nov 2017 17:36:43 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:34142 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752258AbdK0Wfu (ORCPT ); Mon, 27 Nov 2017 17:35:50 -0500 Message-Id: <20171127223405.280205398@infradead.org> User-Agent: quilt/0.63-1 Date: Mon, 27 Nov 2017 23:31:13 +0100 From: Peter Zijlstra To: linux-kernel@vger.kernel.org Cc: Dave Hansen , Andy Lutomirski , Ingo Molnar , Borislav Petkov , Brian Gerst , Denys Vlasenko , "H. Peter Anvin" , Josh Poimboeuf , Linus Torvalds , Peter Zijlstra , Rik van Riel , daniel.gruss@iaik.tugraz.at, hughd@google.com, keescook@google.com, linux-mm@kvack.org, michael.schwarz@iaik.tugraz.at, moritz.lipp@iaik.tugraz.at, richard.fellner@student.tugraz.at Subject: [PATCH 3/5] x86/mm/kaiser: Revert ("Map the entry stack variables") References: <20171127223110.479550152@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=peterz-kaiser-revert-syscall-entry-vars.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Because its not needed. The entry_SYSCALL_64 code isn't ran when KAISER is enabled, we use entry_SYSCALL_64_trampoline instead. Signed-off-by: Peter Zijlstra (Intel) --- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/process_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1515,7 +1515,7 @@ EXPORT_PER_CPU_SYMBOL(__preempt_count); * the top of the kernel stack. Use an extra percpu variable to track the * top of the kernel stack directly. */ -DEFINE_PER_CPU_USER_MAPPED(unsigned long, cpu_current_top_of_stack) = +DEFINE_PER_CPU(unsigned long, cpu_current_top_of_stack) = (unsigned long)&init_thread_union + THREAD_SIZE; EXPORT_PER_CPU_SYMBOL(cpu_current_top_of_stack); --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -59,7 +59,7 @@ #include #endif -__visible DEFINE_PER_CPU_USER_MAPPED(unsigned long, rsp_scratch); +__visible DEFINE_PER_CPU(unsigned long, rsp_scratch); /* Prints also some state that isn't saved in the pt_regs */ void __show_regs(struct pt_regs *regs, int all)