diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-01-04 18:00:43 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-01-04 18:01:28 +0400 |
| commit | adaf4ed2abbd285c93808060924eeec3af483aee (patch) | |
| tree | 425c6c37c08af0b69efaa7457c9b428eda347c36 /arch/x86/include/asm/msr.h | |
| parent | ca3d30cc02f780f68771087040ce935add6ba2b7 (diff) | |
| parent | 5f0a6e2d503896062f641639dacfe5055c2f593b (diff) | |
| download | linux-adaf4ed2abbd285c93808060924eeec3af483aee.tar.xz | |
Merge commit 'v3.2-rc7' into x86/asm
Merge reason: Update from -rc4 to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/msr.h')
| -rw-r--r-- | arch/x86/include/asm/msr.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 084ef95274cd..95203d40ffdd 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -169,7 +169,14 @@ static inline int wrmsr_safe(unsigned msr, unsigned low, unsigned high) return native_write_msr_safe(msr, low, high); } -/* rdmsr with exception handling */ +/* + * rdmsr with exception handling. + * + * Please note that the exception handling works only after we've + * switched to the "smart" #GP handler in trap_init() which knows about + * exception tables - using this macro earlier than that causes machine + * hangs on boxes which do not implement the @msr in the first argument. + */ #define rdmsr_safe(msr, p1, p2) \ ({ \ int __err; \ |