Merge branch 'for-2.6.40/core' of git://git.kernel.dk/linux-2.6-block

[~andy/linux] / arch / x86 / oprofile / op_counter.h

diff --git a/arch/x86/oprofile/op_counter.h b/arch/x86/oprofile/op_counter.h
index e28398df0df2959bc391a1aa028487264e746d85..0b7b7b179cbeeff36b559ab0b0f139d616998bc1 100644 (file)
--- a/arch/x86/oprofile/op_counter.h
+++ b/arch/x86/oprofile/op_counter.h
@@ -22,6 +22,7 @@ struct op_counter_config {
        unsigned long kernel;
        unsigned long user;
        unsigned long unit_mask;
+       unsigned long extra;
 };
 
 extern struct op_counter_config counter_config[];