git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ICSK]: Generalise tcp_listen_{start,stop}
[safe/jmp/linux-2.6]
/
include
/
asm-x86_64
/
msr.h
diff --git
a/include/asm-x86_64/msr.h
b/include/asm-x86_64/msr.h
index
66f0be1
..
ba15279
100644
(file)
--- a/
include/asm-x86_64/msr.h
+++ b/
include/asm-x86_64/msr.h
@@
-57,11
+57,6
@@
(val) = ((unsigned long)__a) | (((unsigned long)__d)<<32); \
} while(0)
(val) = ((unsigned long)__a) | (((unsigned long)__d)<<32); \
} while(0)
-#define rdpmc(counter,low,high) \
- __asm__ __volatile__("rdpmc" \
- : "=a" (low), "=d" (high) \
- : "c" (counter))
-
#define write_tsc(val1,val2) wrmsr(0x10, val1, val2)
#define rdpmc(counter,low,high) \
#define write_tsc(val1,val2) wrmsr(0x10, val1, val2)
#define rdpmc(counter,low,high) \
@@
-163,6
+158,7
@@
extern inline unsigned int cpuid_edx(unsigned int op)
#define EFER_NX (1<<_EFER_NX)
/* Intel MSRs. Some also available on other CPUs */
#define EFER_NX (1<<_EFER_NX)
/* Intel MSRs. Some also available on other CPUs */
+#define MSR_IA32_TSC 0x10
#define MSR_IA32_PLATFORM_ID 0x17
#define MSR_IA32_PERFCTR0 0xc1
#define MSR_IA32_PLATFORM_ID 0x17
#define MSR_IA32_PERFCTR0 0xc1
@@
-222,7
+218,7
@@
extern inline unsigned int cpuid_edx(unsigned int op)
#define MSR_K7_PERFCTR3 0xC0010007
#define MSR_K8_TOP_MEM1 0xC001001A
#define MSR_K8_TOP_MEM2 0xC001001D
#define MSR_K7_PERFCTR3 0xC0010007
#define MSR_K8_TOP_MEM1 0xC001001A
#define MSR_K8_TOP_MEM2 0xC001001D
-#define MSR_K8_SYSCFG 0xC00
00010
+#define MSR_K8_SYSCFG 0xC00
10010
/* K6 MSRs */
#define MSR_K6_EFER 0xC0000080
/* K6 MSRs */
#define MSR_K6_EFER 0xC0000080