diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 23:10:38 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 23:10:38 +0100 |
| commit | 9f33be2c3a80bdc2cc08342dd77fac87652e0548 (patch) | |
| tree | 7ad6e825427a15c5ec0fc15540abc0429d7f4bce /arch/x86/include/asm | |
| parent | Merge branch 'misc2' into devel (diff) | |
| parent | ARM: PNX4008: use msecs_to_jiffies() rather than open-coding it (diff) | |
| download | linux-9f33be2c3a80bdc2cc08342dd77fac87652e0548.tar.xz linux-9f33be2c3a80bdc2cc08342dd77fac87652e0548.zip | |
Merge branches 'clks' and 'pnx' into devel
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/perf_event.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h index 8d9f8548a870..1380367dabd9 100644 --- a/arch/x86/include/asm/perf_event.h +++ b/arch/x86/include/asm/perf_event.h @@ -19,6 +19,7 @@ #define MSR_ARCH_PERFMON_EVENTSEL1 0x187 #define ARCH_PERFMON_EVENTSEL0_ENABLE (1 << 22) +#define ARCH_PERFMON_EVENTSEL_ANY (1 << 21) #define ARCH_PERFMON_EVENTSEL_INT (1 << 20) #define ARCH_PERFMON_EVENTSEL_OS (1 << 17) #define ARCH_PERFMON_EVENTSEL_USR (1 << 16) |