From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227PmCAGDwu8RXKVrve5NCp96MTQsGDGyArckZ6i5dZnFryFToE3XP+I5aJ63oO9nuabGgn7 ARC-Seal: i=1; a=rsa-sha256; t=1516611114; cv=none; d=google.com; s=arc-20160816; b=jHtysrSgiBWCjTz0tAkiggxOsxpJJhzrQUOFFXkAgEF1cSc/3+YKSrCimS7TwMiRI0 QL3vbRta96vV/KBezaGyz+PWKTaCDwpnG34MxfuOJ6gGTMOsfSt9BvD1zzZ0SZizh1Eq KXHa9JWzAeM4cw/Xjf/M4sRgpsJvyIqvhEMH14alNEann99E+rvg9JjKSaYk3/SIpY9M CI6ZUo0i6NZ/yS+Was/Uc0gk44w51Nsg02gFXBo5aBqH3fIYjBRlHkpuTcnT34OpSFGC f9o7K4cTroJnYF8xfP1nX3r84M8h/XmdV/bMcIwOiKh9AC2JYRbdqgffVl9fpqWo+A5X 16tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=G9uEW1Tj9yEf0nAIuJMBfpriELyrDBYhrD+3gpb0sWw=; b=tXdNo2NcdCRLRPgbHAOSkB/JzWSRjm6DGXCTmM0VtVK8/WfKjm6s6Vut+XxIDi9QJn ruyBw7vpn3GgSQ8f8Dg1k4ZNatV587mkYiUuOUnWcM7iExJUwpIvzY4WAX8mFIPx32Ro 21dYCmV2hihX3hNngUr2iAT6pmMfXxdp8I1Q64zBQuY7QPZcr1WehVNLDifqya/R8cEq HVr5maiAEok3b7d0QszRpPzPSEGyRr1wNGRQE/YJaBUpN1k549DEzP1APMq+lJSVGNWm NQt7T8LDpa6p5LGB7lrX2UPoqZGUHPeOJtce9JmJl7EetE56tyJoZD8+J8PbSMeamZgT GHmA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andi Kleen , Thomas Gleixner Subject: [PATCH 4.14 39/89] x86/idt: Mark IDT tables __initconst Date: Mon, 22 Jan 2018 09:45:19 +0100 Message-Id: <20180122083958.556306017@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083954.683903493@linuxfoundation.org> References: <20180122083954.683903493@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590282016476021444?= X-GMAIL-MSGID: =?utf-8?q?1590282016476021444?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andi Kleen commit 327867faa4d66628fcd92a843adb3345736a5313 upstream. const variables must use __initconst, not __initdata. Fix this up for the IDT tables, which got it consistently wrong. Fixes: 16bc18d895ce ("x86/idt: Move 32-bit idt_descr to C code") Signed-off-by: Andi Kleen Signed-off-by: Thomas Gleixner Link: https://lkml.kernel.org/r/20171222001821.2157-7-andi@firstfloor.org Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/idt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/arch/x86/kernel/idt.c +++ b/arch/x86/kernel/idt.c @@ -56,7 +56,7 @@ struct idt_data { * Early traps running on the DEFAULT_STACK because the other interrupt * stacks work only after cpu_init(). */ -static const __initdata struct idt_data early_idts[] = { +static const __initconst struct idt_data early_idts[] = { INTG(X86_TRAP_DB, debug), SYSG(X86_TRAP_BP, int3), #ifdef CONFIG_X86_32 @@ -70,7 +70,7 @@ static const __initdata struct idt_data * the traps which use them are reinitialized with IST after cpu_init() has * set up TSS. */ -static const __initdata struct idt_data def_idts[] = { +static const __initconst struct idt_data def_idts[] = { INTG(X86_TRAP_DE, divide_error), INTG(X86_TRAP_NMI, nmi), INTG(X86_TRAP_BR, bounds), @@ -108,7 +108,7 @@ static const __initdata struct idt_data /* * The APIC and SMP idt entries */ -static const __initdata struct idt_data apic_idts[] = { +static const __initconst struct idt_data apic_idts[] = { #ifdef CONFIG_SMP INTG(RESCHEDULE_VECTOR, reschedule_interrupt), INTG(CALL_FUNCTION_VECTOR, call_function_interrupt), @@ -150,7 +150,7 @@ static const __initdata struct idt_data * Early traps running on the DEFAULT_STACK because the other interrupt * stacks work only after cpu_init(). */ -static const __initdata struct idt_data early_pf_idts[] = { +static const __initconst struct idt_data early_pf_idts[] = { INTG(X86_TRAP_PF, page_fault), }; @@ -158,7 +158,7 @@ static const __initdata struct idt_data * Override for the debug_idt. Same as the default, but with interrupt * stack set to DEFAULT_STACK (0). Required for NMI trap handling. */ -static const __initdata struct idt_data dbg_idts[] = { +static const __initconst struct idt_data dbg_idts[] = { INTG(X86_TRAP_DB, debug), INTG(X86_TRAP_BP, int3), }; @@ -180,7 +180,7 @@ gate_desc debug_idt_table[IDT_ENTRIES] _ * The exceptions which use Interrupt stacks. They are setup after * cpu_init() when the TSS has been initialized. */ -static const __initdata struct idt_data ist_idts[] = { +static const __initconst struct idt_data ist_idts[] = { ISTG(X86_TRAP_DB, debug, DEBUG_STACK), ISTG(X86_TRAP_NMI, nmi, NMI_STACK), SISTG(X86_TRAP_BP, int3, DEBUG_STACK),