diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-04 16:25:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-04 16:25:47 +0200 |
| commit | 12a81c8df13c60904febcafcf6b90ca1acb67122 (patch) | |
| tree | 840e3d06e13d1eb4e8b224699a95a5f345565ee4 | |
| parent | 43d7383bbec1878f838060d6bbd214f6d0485478 (diff) | |
| parent | 729419f0090601406abe714c5f8872a3bd53ff68 (diff) | |
| download | linux-3.10-12a81c8df13c60904febcafcf6b90ca1acb67122.tar.gz linux-3.10-12a81c8df13c60904febcafcf6b90ca1acb67122.tar.bz2 linux-3.10-12a81c8df13c60904febcafcf6b90ca1acb67122.zip | |
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
| -rw-r--r-- | arch/x86/oprofile/nmi_int.c | 16 | ||||
| -rw-r--r-- | drivers/oprofile/event_buffer.c | 3 |
2 files changed, 16 insertions, 3 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index b28d2f1253b..1ba67dc8006 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -634,6 +634,18 @@ static int __init ppro_init(char **cpu_type) if (force_arch_perfmon && cpu_has_arch_perfmon) return 0; + /* + * Documentation on identifying Intel processors by CPU family + * and model can be found in the Intel Software Developer's + * Manuals (SDM): + * + * http://www.intel.com/products/processor/manuals/ + * + * As of May 2010 the documentation for this was in the: + * "Intel 64 and IA-32 Architectures Software Developer's + * Manual Volume 3B: System Programming Guide", "Table B-1 + * CPUID Signature Values of DisplayFamily_DisplayModel". + */ switch (cpu_model) { case 0 ... 2: *cpu_type = "i386/ppro"; @@ -655,12 +667,12 @@ static int __init ppro_init(char **cpu_type) case 15: case 23: *cpu_type = "i386/core_2"; break; + case 0x1a: case 0x2e: - case 26: spec = &op_arch_perfmon_spec; *cpu_type = "i386/core_i7"; break; - case 28: + case 0x1c: *cpu_type = "i386/atom"; break; default: diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c index 5df60a6b677..dd87e86048b 100644 --- a/drivers/oprofile/event_buffer.c +++ b/drivers/oprofile/event_buffer.c @@ -135,7 +135,7 @@ static int event_buffer_open(struct inode *inode, struct file *file) * echo 1 >/dev/oprofile/enable */ - return 0; + return nonseekable_open(inode, file); fail: dcookie_unregister(file->private_data); @@ -205,4 +205,5 @@ const struct file_operations event_buffer_fops = { .open = event_buffer_open, .release = event_buffer_release, .read = event_buffer_read, + .llseek = no_llseek, }; |