diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-09-11 20:35:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-11 20:35:13 -0700 |
| commit | cabc5c0f7fa1342049042d6e147db5a73773955b (patch) | |
| tree | 2be09ae1777d580c7dfe05d6d5b76e57281ec447 /arch/x86/oprofile/op_counter.h | |
| parent | sparc64: Initial niagara2 perf counter support. (diff) | |
| parent | Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff) | |
| download | linux-dev-cabc5c0f7fa1342049042d6e147db5a73773955b.tar.xz linux-dev-cabc5c0f7fa1342049042d6e147db5a73773955b.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
arch/sparc/Kconfig
Diffstat (limited to 'arch/x86/oprofile/op_counter.h')
| -rw-r--r-- | arch/x86/oprofile/op_counter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/oprofile/op_counter.h b/arch/x86/oprofile/op_counter.h index 91b6a116165e..e28398df0df2 100644 --- a/arch/x86/oprofile/op_counter.h +++ b/arch/x86/oprofile/op_counter.h @@ -10,7 +10,7 @@ #ifndef OP_COUNTER_H #define OP_COUNTER_H -#define OP_MAX_COUNTER 8 +#define OP_MAX_COUNTER 32 /* Per-perfctr configuration as set via * oprofilefs. |