Commit 31ae9835 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'perf-urgent-for-linus', 'x86-urgent-for-linus' and... 

Merge branches 'perf-urgent-for-linus', 'x86-urgent-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf, x86 and scheduler updates from Ingo Molnar.

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tracing: Do not enable function event with enable
  perf stat: handle ENXIO error for perf_event_open
  perf: Turn off compiler warnings for flex and bison generated files
  perf stat: Fix case where guest/host monitoring is not supported by kernel
  perf build-id: Fix filename size calculation

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, kvm: KVM paravirt kernels don't check for CPUID being unavailable
  x86: Fix section annotation of acpi_map_cpu2node()
  x86/microcode: Ensure that module is only loaded on supported Intel CPUs

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Fix KVM and ia64 boot crash due to sched_groups circular linked list assumption
parents 0e93b4b3 9b63776f c3709e67 30b4e9eb

arch/x86/include/asm/kvm_para.h

+3 −0
Original line number Diff line number Diff line
@@ -170,6 +170,9 @@ static inline int kvm_para_available(void) 
	unsigned int eax, ebx, ecx, edx;

	char signature[13];



	if (boot_cpu_data.cpuid_level < 0)

		return 0;	/* So we don't blow up on old processors */



	cpuid(KVM_CPUID_SIGNATURE, &eax, &ebx, &ecx, &edx);

	memcpy(signature + 0, &ebx, 4);

	memcpy(signature + 4, &ecx, 4);

arch/x86/kernel/acpi/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ void __init acpi_set_irq_model_ioapic(void) 
#ifdef CONFIG_ACPI_HOTPLUG_CPU

#include <acpi/processor.h>



static void __cpuinitdata acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

static void __cpuinit acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

{

#ifdef CONFIG_ACPI_NUMA

	int nid;

arch/x86/kernel/microcode_intel.c

+8 −6
Original line number Diff line number Diff line
@@ -147,12 +147,6 @@ static int collect_cpu_info(int cpu_num, struct cpu_signature *csig) 


	memset(csig, 0, sizeof(*csig));



	if (c->x86_vendor != X86_VENDOR_INTEL || c->x86 < 6 ||

	    cpu_has(c, X86_FEATURE_IA64)) {

		pr_err("CPU%d not a capable Intel processor\n", cpu_num);

		return -1;

	}



	csig->sig = cpuid_eax(0x00000001);



	if ((c->x86_model >= 5) || (c->x86 > 6)) {
@@ -463,6 +457,14 @@ static struct microcode_ops microcode_intel_ops = { 


struct microcode_ops * __init init_intel_microcode(void)

{

	struct cpuinfo_x86 *c = &cpu_data(0);



	if (c->x86_vendor != X86_VENDOR_INTEL || c->x86 < 6 ||

	    cpu_has(c, X86_FEATURE_IA64)) {

		pr_err("Intel CPU family 0x%x not supported\n", c->x86);

		return NULL;

	}



	return &microcode_intel_ops;

}

include/linux/ftrace_event.h

+2 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ enum { 
	TRACE_EVENT_FL_RECORDED_CMD_BIT,

	TRACE_EVENT_FL_CAP_ANY_BIT,

	TRACE_EVENT_FL_NO_SET_FILTER_BIT,

	TRACE_EVENT_FL_IGNORE_ENABLE_BIT,

};



enum {
@@ -187,6 +188,7 @@ enum { 
	TRACE_EVENT_FL_RECORDED_CMD	= (1 << TRACE_EVENT_FL_RECORDED_CMD_BIT),

	TRACE_EVENT_FL_CAP_ANY		= (1 << TRACE_EVENT_FL_CAP_ANY_BIT),

	TRACE_EVENT_FL_NO_SET_FILTER	= (1 << TRACE_EVENT_FL_NO_SET_FILTER_BIT),

	TRACE_EVENT_FL_IGNORE_ENABLE	= (1 << TRACE_EVENT_FL_IGNORE_ENABLE_BIT),

};



struct ftrace_event_call {

kernel/sched/core.c

+2 −0
Original line number Diff line number Diff line
@@ -6382,6 +6382,8 @@ static int __sdt_alloc(const struct cpumask *cpu_map) 
			if (!sg)

				return -ENOMEM;



			sg->next = sg;



			*per_cpu_ptr(sdd->sg, j) = sg;



			sgp = kzalloc_node(sizeof(struct sched_group_power),

CRA Git | Maintained and supported by SUSTech CRA and CCSE