Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49b24106 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/urgent' into x86/asm, to pick up dependent fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 75ef8219 f1075053

arch/x86/entry/entry_64.S

+18 −1
Original line number Diff line number Diff line
@@ -509,6 +509,17 @@ END(irq_entries_start) 
	 * tracking that we're in kernel mode.

	 */

	SWAPGS



	/*

	 * We need to tell lockdep that IRQs are off.  We can't do this until

	 * we fix gsbase, and we should do it before enter_from_user_mode

	 * (which can take locks).  Since TRACE_IRQS_OFF idempotent,

	 * the simplest way to handle it is to just call it twice if

	 * we enter from user mode.  There's no reason to optimize this since

	 * TRACE_IRQS_OFF is a no-op if lockdep is off.

	 */

	TRACE_IRQS_OFF



#ifdef CONFIG_CONTEXT_TRACKING

	call enter_from_user_mode

#endif
@@ -1049,12 +1060,18 @@ ENTRY(error_entry) 
	SWAPGS



.Lerror_entry_from_usermode_after_swapgs:

	/*

	 * We need to tell lockdep that IRQs are off.  We can't do this until

	 * we fix gsbase, and we should do it before enter_from_user_mode

	 * (which can take locks).

	 */

	TRACE_IRQS_OFF

#ifdef CONFIG_CONTEXT_TRACKING

	call enter_from_user_mode

#endif

	ret



.Lerror_entry_done:



	TRACE_IRQS_OFF

	ret

arch/x86/kernel/cpu/microcode/core.c

+1 −0
Original line number Diff line number Diff line
@@ -698,3 +698,4 @@ int __init microcode_init(void) 
	return error;



}

late_initcall(microcode_init);

arch/x86/kernel/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -1250,8 +1250,6 @@ void __init setup_arch(char **cmdline_p) 
	if (efi_enabled(EFI_BOOT))

		efi_apply_memmap_quirks();

#endif



	microcode_init();

}



#ifdef CONFIG_X86_32