x86/msr: Move the EAX_EDX_*() methods from <asm/msr.h> to <asm/asm.h>

We are going to use them from multiple headers, and in any case,
such register access wrapper macros are better in <asm/asm.h>
anyway.

Signed-off-by: Ingo Molnar <[e-mail]>
Cc: Andy Lutomirski <[e-mail]>
Cc: Brian Gerst <[e-mail]>
Cc: Juergen Gross <[e-mail]>
Cc: H. Peter Anvin <[e-mail]>
Cc: Linus Torvalds <[e-mail]>
Cc: Kees Cook <[e-mail]>
Cc: Peter Zijlstra <[e-mail]>
Cc: Borislav Petkov <[e-mail]>
Cc: Thomas Gleixner <[e-mail]>
Cc: Josh Poimboeuf <[e-mail]>
Cc: Uros Bizjak <[e-mail]>
Cc: [e-mail]

arch/x86/include/asm/asm.h

···
 #define _ASM_EXTABLE_FAULT(from, to)				\
 	_ASM_EXTABLE_TYPE(from, to, EX_TYPE_FAULT)
 
+/*
+ * Both i386 and x86_64 returns 64-bit values in edx:eax for certain
+ * instructions, but GCC's "A" constraint has different meanings.
+ * For i386, "A" means exactly edx:eax, while for x86_64 it
+ * means rax *or* rdx.
+ *
+ * These helpers wrapping these semantic differences save one instruction
+ * clearing the high half of 'low':
+ */
+#ifdef CONFIG_X86_64
+# define EAX_EDX_DECLARE_ARGS(val, low, high)	unsigned long low, high
+# define EAX_EDX_VAL(val, low, high)		((low) | (high) << 32)
+# define EAX_EDX_RET(val, low, high)		"=a" (low), "=d" (high)
+#else
+# define EAX_EDX_DECLARE_ARGS(val, low, high)	u64 val
+# define EAX_EDX_VAL(val, low, high)		(val)
+# define EAX_EDX_RET(val, low, high)		"=A" (val)
+#endif
+
 #endif /* __KERNEL__ */
 #endif /* _ASM_X86_ASM_H */

arch/x86/include/asm/msr.h

···
 };
 
 /*
- * Both i386 and x86_64 returns 64-bit values in edx:eax for certain
- * instructions, but GCC's "A" constraint has different meanings.
- * For i386, "A" means exactly edx:eax, while for x86_64 it
- * means rax *or* rdx.
- *
- * These helpers wrapping these semantic differences save one instruction
- * clearing the high half of 'low':
- */
-#ifdef CONFIG_X86_64
-# define EAX_EDX_DECLARE_ARGS(val, low, high)	unsigned long low, high
-# define EAX_EDX_VAL(val, low, high)		((low) | (high) << 32)
-# define EAX_EDX_RET(val, low, high)		"=a" (low), "=d" (high)
-#else
-# define EAX_EDX_DECLARE_ARGS(val, low, high)	u64 val
-# define EAX_EDX_VAL(val, low, high)		(val)
-# define EAX_EDX_RET(val, low, high)		"=A" (val)
-#endif
-
-/*
  * Be very careful with includes. This header is prone to include loops.
  */
 #include <asm/atomic.h>