diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/x86/oprofile/op_counter.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/x86/oprofile/op_counter.h')
| -rw-r--r-- | arch/x86/oprofile/op_counter.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/oprofile/op_counter.h b/arch/x86/oprofile/op_counter.h index e28398df0df2..0b7b7b179cbe 100644 --- a/arch/x86/oprofile/op_counter.h +++ b/arch/x86/oprofile/op_counter.h | |||
| @@ -22,6 +22,7 @@ struct op_counter_config { | |||
| 22 | unsigned long kernel; | 22 | unsigned long kernel; |
| 23 | unsigned long user; | 23 | unsigned long user; |
| 24 | unsigned long unit_mask; | 24 | unsigned long unit_mask; |
| 25 | unsigned long extra; | ||
| 25 | }; | 26 | }; |
| 26 | 27 | ||
| 27 | extern struct op_counter_config counter_config[]; | 28 | extern struct op_counter_config counter_config[]; |