From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752666AbdH2LSv (ORCPT ); Tue, 29 Aug 2017 07:18:51 -0400 Received: from terminus.zytor.com ([65.50.211.136]:33625 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751516AbdH2LSt (ORCPT ); Tue, 29 Aug 2017 07:18:49 -0400 Date: Tue, 29 Aug 2017 04:13:10 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, brgerst@gmail.com, rostedt@goodmis.org, luto@kernel.org, mingo@kernel.org, torvalds@linux-foundation.org, bp@alien8.de, hpa@zytor.com, jpoimboe@redhat.com, dvlasenk@redhat.com, peterz@infradead.org Reply-To: peterz@infradead.org, dvlasenk@redhat.com, hpa@zytor.com, jpoimboe@redhat.com, bp@alien8.de, torvalds@linux-foundation.org, mingo@kernel.org, luto@kernel.org, rostedt@goodmis.org, brgerst@gmail.com, linux-kernel@vger.kernel.org, tglx@linutronix.de In-Reply-To: <20170828064957.954214927@linutronix.de> References: <20170828064957.954214927@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/percpu: Use static initializer for GDT entry Git-Commit-ID: 1dd439fe97e1a32cbb980c180f1bcb54bb6a2a55 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: 1dd439fe97e1a32cbb980c180f1bcb54bb6a2a55 Gitweb: http://git.kernel.org/tip/1dd439fe97e1a32cbb980c180f1bcb54bb6a2a55 Author: Thomas Gleixner AuthorDate: Mon, 28 Aug 2017 08:47:38 +0200 Committer: Ingo Molnar CommitDate: Tue, 29 Aug 2017 12:07:24 +0200 x86/percpu: Use static initializer for GDT entry The IDT cleanup is about to remove pack_descriptor(). The GDT setup for the per-cpu storage can be achieved with the static initializer as well. Replace it. Signed-off-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 Cc: Steven Rostedt Link: http://lkml.kernel.org/r/20170828064957.954214927@linutronix.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/setup_percpu.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index 10edd1e..6e8fcb6f 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c @@ -155,13 +155,10 @@ static void __init pcpup_populate_pte(unsigned long addr) static inline void setup_percpu_segment(int cpu) { #ifdef CONFIG_X86_32 - struct desc_struct gdt; + struct desc_struct d = GDT_ENTRY_INIT(0x8092, per_cpu_offset(cpu), + 0xFFFFF); - pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF, - 0x2 | DESCTYPE_S, 0x8); - gdt.s = 1; - write_gdt_entry(get_cpu_gdt_rw(cpu), - GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S); + write_gdt_entry(get_cpu_gdt_rw(cpu), GDT_ENTRY_PERCPU, &d, DESCTYPE_S); #endif }