Commit 7cfc4317 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Ingo Molnar:
 "Misc fixes:
   - two fixes to make (very) old Intel CPUs boot reliably
   - fix the intel-mid driver and rename it
   - two KASAN false positive fixes
   - an FPU fix
   - two sysfb fixes
   - two build fixes related to new toolchain versions"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/intel-mid: Rename platform_wdt to platform_mrfld_wdt
  x86/build: Build compressed x86 kernels as PIE when !CONFIG_RELOCATABLE as well
  x86/platform/intel-mid: Register watchdog device after SCU
  x86/fpu: Fix invalid FPU ptrace state after execve()
  x86/boot: Fail the boot if !M486 and CPUID is missing
  x86/traps: Ignore high word of regs->cs in early_fixup_exception()
  x86/dumpstack: Prevent KASAN false positive warnings
  x86/unwind: Prevent KASAN false positive warnings in guess unwinder
  x86/boot: Avoid warning for zero-filling .bss
  x86/sysfb: Fix lfb_size calculation
  x86/sysfb: Add support for 64bit EFI lfb_base
parents 3b404a51 e5dce286

arch/x86/boot/compressed/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ GCOV_PROFILE := n 
UBSAN_SANITIZE :=n



LDFLAGS := -m elf_$(UTS_MACHINE)

ifeq ($(CONFIG_RELOCATABLE),y)

# If kernel is relocatable, build compressed kernel as PIE.

# Compressed kernel should be built as PIE since it may be loaded at any

# address by the bootloader.

ifeq ($(CONFIG_X86_32),y)

LDFLAGS += $(call ld-option, -pie) $(call ld-option, --no-dynamic-linker)

else
@@ -51,7 +51,6 @@ else 
LDFLAGS += $(shell $(LD) --help 2>&1 | grep -q "\-z noreloc-overflow" \

	&& echo "-z noreloc-overflow -pie --no-dynamic-linker")

endif

endif

LDFLAGS_vmlinux := -T



hostprogs-y	:= mkpiggy

arch/x86/boot/cpu.c

+6 −0
Original line number Diff line number Diff line
@@ -87,6 +87,12 @@ int validate_cpu(void) 
		return -1;

	}



	if (CONFIG_X86_MINIMUM_CPU_FAMILY <= 4 && !IS_ENABLED(CONFIG_M486) &&

	    !has_eflag(X86_EFLAGS_ID)) {

		printf("This kernel requires a CPU with the CPUID instruction.  Build with CONFIG_M486=y to run on this CPU.\n");

		return -1;

	}



	if (err_flags) {

		puts("This kernel requires the following features "

		     "not present on the CPU:\n");

arch/x86/kernel/dumpstack.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, 
		for (; stack < stack_info.end; stack++) {

			unsigned long real_addr;

			int reliable = 0;

			unsigned long addr = *stack;

			unsigned long addr = READ_ONCE_NOCHECK(*stack);

			unsigned long *ret_addr_p =

				unwind_get_return_address_ptr(&state);

arch/x86/kernel/fpu/core.c

+8 −8
Original line number Diff line number Diff line
@@ -521,14 +521,14 @@ void fpu__clear(struct fpu *fpu) 
{

	WARN_ON_FPU(fpu != &current->thread.fpu); /* Almost certainly an anomaly */



	if (!use_eager_fpu() || !static_cpu_has(X86_FEATURE_FPU)) {

		/* FPU state will be reallocated lazily at the first use. */

	fpu__drop(fpu);

	} else {

		if (!fpu->fpstate_active) {



	/*

	 * Make sure fpstate is cleared and initialized.

	 */

	if (static_cpu_has(X86_FEATURE_FPU)) {

		fpu__activate_curr(fpu);

		user_fpu_begin();

		}

		copy_init_fpstate_to_fpregs();

	}

}

arch/x86/kernel/head_32.S

+6 −3
Original line number Diff line number Diff line
@@ -665,14 +665,17 @@ __PAGE_ALIGNED_BSS 
initial_pg_pmd:

	.fill 1024*KPMDS,4,0

#else

ENTRY(initial_page_table)

.globl initial_page_table

initial_page_table:

	.fill 1024,4,0

#endif

initial_pg_fixmap:

	.fill 1024,4,0

ENTRY(empty_zero_page)

.globl empty_zero_page

empty_zero_page:

	.fill 4096,1,0

ENTRY(swapper_pg_dir)

.globl swapper_pg_dir

swapper_pg_dir:

	.fill 1024,4,0

EXPORT_SYMBOL(empty_zero_page)

CRA Git | Maintained and supported by SUSTech CRA and CCSE