diff options
| author | Jan Beulich <[email protected]> | 2025-04-14 14:41:07 +0000 |
|---|---|---|
| committer | Juergen Gross <[email protected]> | 2025-08-18 12:48:16 +0000 |
| commit | 8ea815399c3fcce1889bd951fec25b5b9a3979c1 (patch) | |
| tree | 17d1fb40f0c7ff6d539c6ba171cdee4179722bfd /arch/x86/include/asm/xen/hypercall.h | |
| parent | xen/netfront: Fix TX response spurious interrupts (diff) | |
| download | kernel-8ea815399c3fcce1889bd951fec25b5b9a3979c1.tar.gz kernel-8ea815399c3fcce1889bd951fec25b5b9a3979c1.zip | |
compiler: remove __ADDRESSABLE_ASM{_STR,}() again
__ADDRESSABLE_ASM_STR() is where the necessary stringification happens.
As long as "sym" doesn't contain any odd characters, no quoting is
required for its use with .quad / .long. In fact the quotation gets in
the way with gas 2.25; it's only from 2.26 onwards that quoted symbols
are half-way properly supported.
However, assembly being different from C anyway, drop
__ADDRESSABLE_ASM_STR() and its helper macro altogether. A simple
.global directive will suffice to get the symbol "declared", i.e. into
the symbol table. While there also stop open-coding STATIC_CALL_TRAMP()
and STATIC_CALL_KEY().
Fixes: 0ef8047b737d ("x86/static-call: provide a way to do very early static-call updates")
Signed-off-by: Jan Beulich <[email protected]>
Acked-by: Josh Poimboeuf <[email protected]>
Cc: [email protected]
Signed-off-by: Juergen Gross <[email protected]>
Message-ID: <[email protected]>
Diffstat (limited to 'arch/x86/include/asm/xen/hypercall.h')
| -rw-r--r-- | arch/x86/include/asm/xen/hypercall.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h index 59a62c3780a2..a16d4631547c 100644 --- a/arch/x86/include/asm/xen/hypercall.h +++ b/arch/x86/include/asm/xen/hypercall.h @@ -94,12 +94,13 @@ DECLARE_STATIC_CALL(xen_hypercall, xen_hypercall_func); #ifdef MODULE #define __ADDRESSABLE_xen_hypercall #else -#define __ADDRESSABLE_xen_hypercall __ADDRESSABLE_ASM_STR(__SCK__xen_hypercall) +#define __ADDRESSABLE_xen_hypercall \ + __stringify(.global STATIC_CALL_KEY(xen_hypercall);) #endif #define __HYPERCALL \ __ADDRESSABLE_xen_hypercall \ - "call __SCT__xen_hypercall" + __stringify(call STATIC_CALL_TRAMP(xen_hypercall)) #define __HYPERCALL_ENTRY(x) "a" (x) |