diff options
| author | Ingo Molnar | 2008-09-10 08:20:51 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-09-10 08:20:51 +0200 |
| commit | 81faaae45701484bd7368336e02f2a846153b22f (patch) | |
| tree | d7d8dcafe5bb22decb0024537478fb667b0c896b /arch/x86/kernel/cpu/intel.c | |
| parent | x86: little clean up of intel.c/intel_64.c (diff) | |
| parent | x86: fix ds.c build error (diff) | |
| download | kernel-qcow2-linux-81faaae45701484bd7368336e02f2a846153b22f.tar.gz kernel-qcow2-linux-81faaae45701484bd7368336e02f2a846153b22f.tar.xz kernel-qcow2-linux-81faaae45701484bd7368336e02f2a846153b22f.zip | |
Merge branch 'x86/pebs' into x86/unify-cpu-detect
Conflicts:
arch/x86/Kconfig.cpu
include/asm-x86/ds.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/intel.c')
| -rw-r--r-- | arch/x86/kernel/cpu/intel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 4a8ac9d4ff50..a66989586a84 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -221,10 +221,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, |