diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-05 16:38:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-05 16:38:51 +0100 |
| commit | f1b23714cb578c88ea051768bf26b459e1264411 (patch) | |
| tree | 69dbe6553165f01f2214059069d65009a5e52786 /arch/x86/include/asm | |
| parent | x86: Fix "Acer Aspire 1" reboot hang (diff) | |
| parent | x86: Document rdmsr_safe restrictions (diff) | |
| download | linux-f1b23714cb578c88ea051768bf26b459e1264411.tar.xz linux-f1b23714cb578c88ea051768bf26b459e1264411.zip | |
Merge branch 'ucode' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/urgent
Diffstat (limited to 'arch/x86/include/asm')
| -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; \ |