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

Commit 7f680d7e authored Aug 20, 2017 by Linus Torvalds

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

Pull x86 fixes from Thomas Gleixner:
 "Another pile of small fixes and updates for x86:

   - Plug a hole in the SMAP implementation which misses to clear AC on
     NMI entry

   - Fix the norandmaps/ADDR_NO_RANDOMIZE logic so the command line
     parameter works correctly again

   - Use the proper accessor in the startup64 code for next_early_pgt to
     prevent accessing of invalid addresses and faulting in the early
     boot code.

   - Prevent CPU hotplug lock recursion in the MTRR code

   - Unbreak CPU0 hotplugging

   - Rename overly long CPUID bits which got introduced in this cycle

   - Two commits which mark data 'const' and restrict the scope of data
     and functions to file scope by making them 'static'"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Constify attribute_group structures
  x86/boot/64/clang: Use fixup_pointer() to access 'next_early_pgt'
  x86/elf: Remove the unnecessary ADDR_NO_RANDOMIZE checks
  x86: Fix norandmaps/ADDR_NO_RANDOMIZE
  x86/mtrr: Prevent CPU hotplug lock recursion
  x86: Mark various structures and functions as 'static'
  x86/cpufeature, kvm/svm: Rename (shorten) the new "virtualized VMSAVE/VMLOAD" CPUID flag
  x86/smpboot: Unbreak CPU0 hotplug
  x86/asm/64: Clear AC on NMI entries

parents 2615a38f 45bd07ad

arch/x86/entry/entry_64.S

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1211,6 +1211,8 @@ ENTRY(nmi)
	* other IST entries.		* other IST entries.
	*/		*/

			ASM_CLAC

	/* Use %rdx as our temp variable throughout */		/* Use %rdx as our temp variable throughout */
	pushq %rdx		pushq %rdx

arch/x86/events/intel/bts.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -69,7 +69,7 @@ struct bts_buffer {
	struct bts_phys buf[0];		struct bts_phys buf[0];
	};		};

	struct pmu bts_pmu;		static struct pmu bts_pmu;

	static size_t buf_size(struct page *page)		static size_t buf_size(struct page *page)
	{		{

arch/x86/events/intel/p4.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -587,7 +587,7 @@ static __initconst const u64 p4_hw_cache_event_ids
	* P4_CONFIG_ALIASABLE or bits for P4_PEBS_METRIC, they are		* P4_CONFIG_ALIASABLE or bits for P4_PEBS_METRIC, they are
	* either up to date automatically or not applicable at all.		* either up to date automatically or not applicable at all.
	*/		*/
	struct p4_event_alias {		static struct p4_event_alias {
	u64 original;		u64 original;
	u64 alternative;		u64 alternative;
	} p4_event_aliases[] = {		} p4_event_aliases[] = {

arch/x86/events/intel/rapl.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -559,7 +559,7 @@ static struct attribute_group rapl_pmu_format_group = {
	.attrs = rapl_formats_attr,		.attrs = rapl_formats_attr,
	};		};

	const struct attribute_group *rapl_attr_groups[] = {		static const struct attribute_group *rapl_attr_groups[] = {
	&rapl_pmu_attr_group,		&rapl_pmu_attr_group,
	&rapl_pmu_format_group,		&rapl_pmu_format_group,
	&rapl_pmu_events_group,		&rapl_pmu_events_group,

arch/x86/events/intel/uncore.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -721,7 +721,7 @@ static struct attribute *uncore_pmu_attrs[] = {
	NULL,		NULL,
	};		};

	static struct attribute_group uncore_pmu_attr_group = {		static const struct attribute_group uncore_pmu_attr_group = {
	.attrs = uncore_pmu_attrs,		.attrs = uncore_pmu_attrs,
	};		};