git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
cpu
/
intel.c
diff --git
a/arch/x86/kernel/cpu/intel.c
b/arch/x86/kernel/cpu/intel.c
index
b75f256
..
f113ef4
100644
(file)
--- a/
arch/x86/kernel/cpu/intel.c
+++ b/
arch/x86/kernel/cpu/intel.c
@@
-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)
-
d
s_init_intel(c);
+
ptrace_bt
s_init_intel(c);
/*
* See if we have a good local APIC by checking for buggy Pentia,