diff options
author | Robert Richter <robert.richter@amd.com> | 2008-09-24 11:08:52 +0200 |
---|---|---|
committer | Robert Richter <robert.richter@amd.com> | 2008-09-24 11:08:52 +0200 |
commit | 4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d (patch) | |
tree | 315bb66a3ce2e752749a780876e2b7b5f6a596de /arch/x86/oprofile/op_counter.h | |
parent | x86, oprofile: BUG: using smp_processor_id() in preemptible code (diff) | |
download | linux-4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d.tar.xz linux-4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d.zip |
Revert "Oprofile Multiplexing Patch"
Reverting commit 1a960b402a51d80abf54e3f8e4972374ffe5f22d for the main
branch. Multiplexing will be tracked on a separate feature branch.
Conflicts:
arch/x86/oprofile/nmi_int.c
Diffstat (limited to 'arch/x86/oprofile/op_counter.h')
-rw-r--r-- | arch/x86/oprofile/op_counter.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/oprofile/op_counter.h b/arch/x86/oprofile/op_counter.h index 786d6e01cf7f..2880b15c4675 100644 --- a/arch/x86/oprofile/op_counter.h +++ b/arch/x86/oprofile/op_counter.h @@ -10,14 +10,13 @@ #ifndef OP_COUNTER_H #define OP_COUNTER_H -#define OP_MAX_COUNTER 32 +#define OP_MAX_COUNTER 8 /* Per-perfctr configuration as set via * oprofilefs. */ struct op_counter_config { unsigned long count; - unsigned long save_count_low; unsigned long enabled; unsigned long event; unsigned long kernel; |