projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/pebs' into x86/unify-cpu-detect
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
cpu
/
intel.c
diff --git
a/arch/x86/kernel/cpu/intel.c
b/arch/x86/kernel/cpu/intel.c
index 4a8ac9d4ff50e9a5eb1465921ec9b4f33865c8ad..a66989586a844c3fd525b956784cb13358bf5c0b 100644
(file)
--- 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)
-
d
s_init_intel(c);
+
ptrace_bt
s_init_intel(c);
/*
* See if we have a good local APIC by checking for buggy Pentia,