diff options
author | Borislav Petkov <borislav.petkov@amd.com> | 2009-05-22 06:12:01 -0400 |
---|---|---|
committer | Borislav Petkov <borislav.petkov@amd.com> | 2009-06-10 06:18:42 -0400 |
commit | 6bc1096d7ab3621b3ffcf06616d1f4e0325d903d (patch) | |
tree | 286d1e4545fbd69c25fb4a5044d1d51122169a1d /arch/x86/include/asm/msr.h | |
parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) |
x86: MSR: add a struct representation of an MSR
Add a struct representing a 64bit MSR pair consisting of a low and high
register part and convert msr_info to use it. Also, rename msr-on-cpu.c
to msr.c.
Side note: Put the cpumask.h include in __KERNEL__ space thus fixing an
allmodconfig build failure in the headers_check target.
CC: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Diffstat (limited to 'arch/x86/include/asm/msr.h')
-rw-r--r-- | arch/x86/include/asm/msr.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 638bf6241807..5e1213216e2b 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h | |||
@@ -12,6 +12,17 @@ | |||
12 | 12 | ||
13 | #include <asm/asm.h> | 13 | #include <asm/asm.h> |
14 | #include <asm/errno.h> | 14 | #include <asm/errno.h> |
15 | #include <asm/cpumask.h> | ||
16 | |||
17 | struct msr { | ||
18 | union { | ||
19 | struct { | ||
20 | u32 l; | ||
21 | u32 h; | ||
22 | }; | ||
23 | u64 q; | ||
24 | }; | ||
25 | }; | ||
15 | 26 | ||
16 | static inline unsigned long long native_read_tscp(unsigned int *aux) | 27 | static inline unsigned long long native_read_tscp(unsigned int *aux) |
17 | { | 28 | { |