diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-02 10:13:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-02 10:18:19 +0200 |
| commit | bdfda83a6b5988f1ac62cd0eaceb6c3b44dc2a31 (patch) | |
| tree | 389151e882a7c909ef8927e78b88ce90ffa0bb04 | |
| parent | c9d8ea9d53d4ddb80f2ad2bca5b9e9e40fcb9b16 (diff) | |
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 <mingo@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Uros Bizjak <ubizjak@gmail.com>
Cc: linux-kernel@vger.kernel.org
| -rw-r--r-- | arch/x86/include/asm/asm.h | 19 | ||||
| -rw-r--r-- | arch/x86/include/asm/msr.h | 19 |
2 files changed, 19 insertions, 19 deletions
diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h index cc2881576c2c..206e1342fc03 100644 --- a/arch/x86/include/asm/asm.h +++ b/arch/x86/include/asm/asm.h @@ -243,5 +243,24 @@ register unsigned long current_stack_pointer asm(_ASM_SP); #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 */ diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index d57a94c5e595..856d660c926d 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -37,25 +37,6 @@ struct saved_msrs { }; /* - * 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> |