OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
35e4ddf
)
[PATCH] i386/x86-64: Add core 2 to oprofile
author
Benjamin LaHaise
<benjamin.c.lahaise@intel.com>
Sat, 16 Sep 2006 23:35:46 +0000
(16:35 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Sun, 17 Sep 2006 04:37:48 +0000
(21:37 -0700)
Add the CPU identification needed by oprofile for Intel (r) Core (tm) 2
CPUs.
Signed-off-by: Benjamin LaHaise <benjamin.c.lahaise@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: "Arun Sharma" <aruns@google.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/i386/oprofile/nmi_int.c
patch
|
blob
|
history
diff --git
a/arch/i386/oprofile/nmi_int.c
b/arch/i386/oprofile/nmi_int.c
index
c8c1df8
..
5f8dc8a
100644
(file)
--- a/
arch/i386/oprofile/nmi_int.c
+++ b/
arch/i386/oprofile/nmi_int.c
@@
-337,6
+337,8
@@
static int __init ppro_init(char ** cpu_type)
if (cpu_model == 14)
*cpu_type = "i386/core";
+ else if (cpu_model == 15)
+ *cpu_type = "i386/core_2";
else if (cpu_model > 0xd)
return 0;
else if (cpu_model == 9) {