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

Commit 181da3c3 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 Peter Anvin:
 "A somewhat unpleasantly large collection of small fixes.  The big ones
  are the __visible tree sweep and a fix for 'earlyprintk=efi,keep'.  It
  was using __init functions with predictably suboptimal results.

  Another key fix is a build fix which would produce output that simply
  would not decompress correctly in some configuration, due to the
  existing Makefiles picking up an unfortunate local label and mistaking
  it for the global symbol _end.

  Additional fixes include the handling of 64-bit numbers when setting
  the vdso data page (a latent bug which became manifest when i386
  started exporting a vdso with time functions), a fix to the new MSR
  manipulation accessors which would cause features to not get properly
  unblocked, a build fix for 32-bit userland, and a few new platform
  quirks"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, vdso, time: Cast tv_nsec to u64 for proper shifting in update_vsyscall()
  x86: Fix typo in MSR_IA32_MISC_ENABLE_LIMIT_CPUID macro
  x86: Fix typo preventing msr_set/clear_bit from having an effect
  x86/intel: Add quirk to disable HPET for the Baytrail platform
  x86/hpet: Make boot_hpet_disable extern
  x86-64, build: Fix stack protector Makefile breakage with 32-bit userland
  x86/reboot: Add reboot quirk for Certec BPC600
  asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*
  asmlinkage, x86: Add explicit __visible to arch/x86/*
  asmlinkage: Revert "lto: Make asmlinkage __visible"
  x86, build: Don't get confused by local symbols
  x86/efi: earlyprintk=efi,keep fix
parents afcf0a2d 28b92e09

arch/x86/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ else 
        UTS_MACHINE := x86_64

        CHECKFLAGS += -D__x86_64__ -m64



        biarch := -m64

        KBUILD_AFLAGS += -m64

        KBUILD_CFLAGS += -m64

arch/x86/boot/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE 


SETUP_OBJS = $(addprefix $(obj)/,$(setup-y))



sed-voffset := -e 's/^\([0-9a-fA-F]*\) . \(_text\|_end\)$$/\#define VO_\2 0x\1/p'

sed-voffset := -e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(_text\|_end\)$$/\#define VO_\2 0x\1/p'



quiet_cmd_voffset = VOFFSET $@

      cmd_voffset = $(NM) $< | sed -n $(sed-voffset) > $@
@@ -80,7 +80,7 @@ targets += voffset.h 
$(obj)/voffset.h: vmlinux FORCE

	$(call if_changed,voffset)



sed-zoffset := -e 's/^\([0-9a-fA-F]*\) . \(startup_32\|startup_64\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|input_data\|_end\|z_.*\)$$/\#define ZO_\2 0x\1/p'

sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(startup_32\|startup_64\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|input_data\|_end\|z_.*\)$$/\#define ZO_\2 0x\1/p'



quiet_cmd_zoffset = ZOFFSET $@

      cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@

arch/x86/boot/compressed/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static void parse_elf(void *output) 
	free(phdrs);

}



asmlinkage void *decompress_kernel(void *rmode, memptr heap,

asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,

				  unsigned char *input_data,

				  unsigned long input_len,

				  unsigned char *output,

arch/x86/include/asm/hpet.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
/* hpet memory map physical address */

extern unsigned long hpet_address;

extern unsigned long force_hpet_address;

extern int boot_hpet_disable;

extern u8 hpet_blockid;

extern int hpet_force_user;

extern u8 hpet_msi_disable;

arch/x86/include/uapi/asm/msr-index.h

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ 
#define MSR_IA32_MISC_ENABLE_MWAIT_BIT			18

#define MSR_IA32_MISC_ENABLE_MWAIT			(1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT)

#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT		22

#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID		(1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT);

#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID		(1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT)

#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT		23

#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE		(1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT)

#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT		34