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

Commit 19268ed7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/pebs' into x86-v28-for-linus-phase1 



Conflicts:
	include/asm-x86/ds.h

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents b8cd9d05 493cd912

arch/x86/Kconfig.cpu

+18 −0
Original line number Diff line number Diff line
@@ -418,3 +418,21 @@ config X86_MINIMUM_CPU_FAMILY 
config X86_DEBUGCTLMSR

	def_bool y

	depends on !(MK6 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386)



config X86_DS

	bool "Debug Store support"

	default y

	help

	  Add support for Debug Store.

	  This allows the kernel to provide a memory buffer to the hardware

	  to store various profiling and tracing events.



config X86_PTRACE_BTS

	bool "ptrace interface to Branch Trace Store"

	default y

	depends on (X86_DS && X86_DEBUGCTLMSR)

	help

	  Add a ptrace interface to allow collecting an execution trace

	  of the traced task.

	  This collects control flow changes in a (cyclic) buffer and allows

	  debuggers to fill in the gaps and show an execution trace of the debuggee.

arch/x86/kernel/cpu/intel.c

+2 −1
Original line number Diff line number Diff line
@@ -222,10 +222,11 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) 
			set_cpu_cap(c, X86_FEATURE_BTS);

		if (!(l1 & (1<<12)))

			set_cpu_cap(c, X86_FEATURE_PEBS);

		ds_init_intel(c);

	}



	if (cpu_has_bts)

		ds_init_intel(c);

		ptrace_bts_init_intel(c);



	/*

	 * See if we have a good local APIC by checking for buggy Pentia,