From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Sep 2017 00:43:56 +0000 (-0700)
Subject: Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=24e700e291d52bd200212487e2b654c0aa3f07a2;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'x86-apic-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 apic updates from Thomas Gleixner:
 "This update provides:

   - Cleanup of the IDT management including the removal of the extra
     tracing IDT. A first step to cleanup the vector management code.

   - The removal of the paravirt op adjust_exception_frame. This is a
     XEN specific issue, but merged through this branch to avoid nasty
     merge collisions

   - Prevent dmesg spam about the TSC DEADLINE bug, when the CPU has
     disabled the TSC DEADLINE timer in CPUID.

   - Adjust a debug message in the ioapic code to print out the
     information correctly"

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (51 commits)
  x86/idt: Fix the X86_TRAP_BP gate
  x86/xen: Get rid of paravirt op adjust_exception_frame
  x86/eisa: Add missing include
  x86/idt: Remove superfluous ALIGNment
  x86/apic: Silence "FW_BUG TSC_DEADLINE disabled due to Errata" on CPUs without the feature
  x86/idt: Remove the tracing IDT leftovers
  x86/idt: Hide set_intr_gate()
  x86/idt: Simplify alloc_intr_gate()
  x86/idt: Deinline setup functions
  x86/idt: Remove unused functions/inlines
  x86/idt: Move interrupt gate initialization to IDT code
  x86/idt: Move APIC gate initialization to tables
  x86/idt: Move regular trap init to tables
  x86/idt: Move IST stack based traps to table init
  x86/idt: Move debug stack init to table based
  x86/idt: Switch early trap init to IDT tables
  x86/idt: Prepare for table based init
  x86/idt: Move early IDT setup out of 32-bit asm
  x86/idt: Move early IDT handler setup to IDT code
  x86/idt: Consolidate IDT invalidation
  ...
---

24e700e291d52bd200212487e2b654c0aa3f07a2
diff --cc arch/x86/entry/entry_64.S
index ca0b250eefc4,bdd024a9afc9..49167258d587
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@@ -748,21 -748,14 +748,9 @@@ ENTRY(\sym
  END(\sym)
  .endm
  
- #ifdef CONFIG_TRACING
- #define trace(sym) trace_##sym
- #define smp_trace(sym) smp_trace_##sym
- 
- .macro trace_apicinterrupt num sym
- apicinterrupt3 \num trace(\sym) smp_trace(\sym)
- .endm
- #else
- .macro trace_apicinterrupt num sym do_sym
- .endm
- #endif
- 
  /* Make sure APIC interrupt handlers end up in the irqentry section: */
 -#if defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN)
 -# define PUSH_SECTION_IRQENTRY	.pushsection .irqentry.text, "ax"
 -# define POP_SECTION_IRQENTRY	.popsection
 -#else
 -# define PUSH_SECTION_IRQENTRY
 -# define POP_SECTION_IRQENTRY
 -#endif
 +#define PUSH_SECTION_IRQENTRY	.pushsection .irqentry.text, "ax"
 +#define POP_SECTION_IRQENTRY	.popsection
  
  .macro apicinterrupt num sym do_sym
  PUSH_SECTION_IRQENTRY
diff --cc arch/x86/kernel/head64.c
index 6a193b93fd95,d6ab034bd65f..bab4fa579450
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@@ -336,18 -278,9 +334,16 @@@ asmlinkage __visible void __init x86_64
  
  	clear_page(init_top_pgt);
  
 +	/*
 +	 * SME support may update early_pmd_flags to include the memory
 +	 * encryption mask, so it needs to be called before anything
 +	 * that may generate a page fault.
 +	 */
 +	sme_early_init();
 +
  	kasan_early_init();
  
- 	for (i = 0; i < NUM_EXCEPTION_VECTORS; i++)
- 		set_intr_gate(i, early_idt_handler_array[i]);
- 	load_idt((const struct desc_ptr *)&idt_descr);
+ 	idt_setup_early_handler();
  
  	copy_bootdata(__va(real_mode_data));