From aab51d4545736c68d21ca829d98d00623ccb60ba Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Thu, 19 Apr 2012 17:07:34 -0700 Subject: [PATCH] --- yaml --- r: 305438 b: refs/heads/master c: 060feb650010c261fcfbae9de9348b46cedcd3cd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/msr.h | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 611ef78b94f8..abee7b73ea73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c5023a3fa2ec12b7ed313b276b157917575745b +refs/heads/master: 060feb650010c261fcfbae9de9348b46cedcd3cd diff --git a/trunk/arch/x86/include/asm/msr.h b/trunk/arch/x86/include/asm/msr.h index 95203d40ffdd..084ef95274cd 100644 --- a/trunk/arch/x86/include/asm/msr.h +++ b/trunk/arch/x86/include/asm/msr.h @@ -169,14 +169,7 @@ static inline int wrmsr_safe(unsigned msr, unsigned low, unsigned high) return native_write_msr_safe(msr, low, high); } -/* - * 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. - */ +/* rdmsr with exception handling */ #define rdmsr_safe(msr, p1, p2) \ ({ \ int __err; \