Merge commit 'tip/perfcounters-for-linus' into oprofile/master

Conflicts:
	arch/x86/oprofile/op_model_ppro.c

Signed-off-by: Robert Richter <robert.richter@amd.com>
This commit is contained in:
Robert Richter
2009-06-12 17:58:48 +02:00
506 changed files with 44855 additions and 8421 deletions

View File

@@ -13,7 +13,7 @@
#define OP_X86_MODEL_H
#include <asm/types.h>
#include <asm/intel_arch_perfmon.h>
#include <asm/perf_counter.h>
struct op_msr {
unsigned long addr;