Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (b0d04fb5) · Commits · 戴 / test

arch/x86/boot/compressed/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
		KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
		KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
		KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
		KBUILD_CFLAGS += -Wno-pointer-sign

		KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
		GCOV_PROFILE := n

+7 −6

Original line number	Diff line number	Diff line
		@@ -389,6 +389,13 @@
		* that register for the time this macro runs
		*/

		/*
		* The high bits of the CS dword (__csh) are used for
		* CS_FROM_ENTRY_STACK and CS_FROM_USER_CR3. Clear them in case
		* hardware didn't do this for us.
		*/
		andl $(0x0000ffff), PT_CS(%esp)

		/* Are we on the entry stack? Bail out if not! */
		movl PER_CPU_VAR(cpu_entry_area), %ecx
		addl $CPU_ENTRY_AREA_entry_stack + SIZEOF_entry_stack, %ecx
		@@ -407,12 +414,6 @@
		/* Load top of task-stack into %edi */
		movl TSS_entry2task_stack(%edi), %edi

		/*
		* Clear unused upper bits of the dword containing the word-sized CS
		* slot in pt_regs in case hardware didn't clear it for us.
		*/
		andl $(0x0000ffff), PT_CS(%esp)

		/* Special case - entry from kernel mode via entry stack */
		#ifdef CONFIG_VM86
		movl PT_EFLAGS(%esp), %ecx # mix EFLAGS and CS

+13 −0

Original line number	Diff line number	Diff line
		@@ -1187,6 +1187,16 @@ ENTRY(paranoid_entry)
		xorl %ebx, %ebx

		1:
		/*
		* Always stash CR3 in %r14. This value will be restored,
		* verbatim, at exit. Needed if paranoid_entry interrupted
		* another entry that already switched to the user CR3 value
		* but has not yet returned to userspace.
		*
		* This is also why CS (stashed in the "iret frame" by the
		* hardware at entry) can not be used: this may be a return
		* to kernel code, but with a user CR3 value.
		*/
		SAVE_AND_SWITCH_TO_KERNEL_CR3 scratch_reg=%rax save_reg=%r14

		ret
		@@ -1211,11 +1221,13 @@ ENTRY(paranoid_exit)
		testl %ebx, %ebx /* swapgs needed? */
		jnz .Lparanoid_exit_no_swapgs
		TRACE_IRQS_IRETQ
		/* Always restore stashed CR3 value (see paranoid_entry) */
		RESTORE_CR3 scratch_reg=%rbx save_reg=%r14
		SWAPGS_UNSAFE_STACK
		jmp .Lparanoid_exit_restore
		.Lparanoid_exit_no_swapgs:
		TRACE_IRQS_IRETQ_DEBUG
		/* Always restore stashed CR3 value (see paranoid_entry) */
		RESTORE_CR3 scratch_reg=%rbx save_reg=%r14
		.Lparanoid_exit_restore:
		jmp restore_regs_and_return_to_kernel
		@@ -1626,6 +1638,7 @@ end_repeat_nmi:
		movq $-1, %rsi
		call do_nmi

		/* Always restore stashed CR3 value (see paranoid_entry) */
		RESTORE_CR3 scratch_reg=%r15 save_reg=%r14

		testl %ebx, %ebx /* swapgs needed? */

+1 −1

Original line number	Diff line number	Diff line
		@@ -528,7 +528,7 @@ static inline void fpregs_activate(struct fpu *fpu)
		static inline void
		switch_fpu_prepare(struct fpu *old_fpu, int cpu)
		{
		if (old_fpu->initialized) {
		if (static_cpu_has(X86_FEATURE_FPU) && old_fpu->initialized) {
		if (!copy_fpregs_to_fpstate(old_fpu))
		old_fpu->last_cpu = -1;
		else

+4 −4