diff options
| author | Andi Kleen <ak@suse.de> | 2006-09-26 04:52:26 -0400 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 04:52:26 -0400 |
| commit | b07f8915cda3fcd73b8b68075ba1e6cd0673365d (patch) | |
| tree | 73bd68878518350322098ddf69572c3da6f1e360 /include/asm-i386 | |
| parent | 874c4fe389d1358f82c96dc9b5092fc5c7690604 (diff) | |
[PATCH] x86: Temporarily revert parts of the Core 2 nmi nmi watchdog support
This makes merging easier. They are readded a few patches later.
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'include/asm-i386')
| -rw-r--r-- | include/asm-i386/intel_arch_perfmon.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/asm-i386/intel_arch_perfmon.h b/include/asm-i386/intel_arch_perfmon.h deleted file mode 100644 index 134ea9cc5283..000000000000 --- a/include/asm-i386/intel_arch_perfmon.h +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | #ifndef X86_INTEL_ARCH_PERFMON_H | ||
| 2 | #define X86_INTEL_ARCH_PERFMON_H 1 | ||
| 3 | |||
| 4 | #define MSR_ARCH_PERFMON_PERFCTR0 0xc1 | ||
| 5 | #define MSR_ARCH_PERFMON_PERFCTR1 0xc2 | ||
| 6 | |||
| 7 | #define MSR_ARCH_PERFMON_EVENTSEL0 0x186 | ||
| 8 | #define MSR_ARCH_PERFMON_EVENTSEL1 0x187 | ||
| 9 | |||
| 10 | #define ARCH_PERFMON_EVENTSEL0_ENABLE (1 << 22) | ||
| 11 | #define ARCH_PERFMON_EVENTSEL_INT (1 << 20) | ||
| 12 | #define ARCH_PERFMON_EVENTSEL_OS (1 << 17) | ||
| 13 | #define ARCH_PERFMON_EVENTSEL_USR (1 << 16) | ||
| 14 | |||
| 15 | #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL (0x3c) | ||
| 16 | #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK (0x00 << 8) | ||
| 17 | #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT (1 << 0) | ||
| 18 | |||
| 19 | #endif /* X86_INTEL_ARCH_PERFMON_H */ | ||