Skip to content

Commit 847d931

Browse files
author
Peter Zijlstra
committed
x86/xen: Mark xen_force_evtchn_callback() noinstr
vmlinux.o: warning: objtool: check_events()+0xd: call to xen_force_evtchn_callback() leaves .noinstr.text section Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Juergen Gross <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 09c4130 commit 847d931

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/x86/include/asm/xen/hypercall.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ HYPERVISOR_event_channel_op(int cmd, void *arg)
358358
return _hypercall2(int, event_channel_op, cmd, arg);
359359
}
360360

361-
static inline int
361+
static __always_inline int
362362
HYPERVISOR_xen_version(int cmd, void *arg)
363363
{
364364
return _hypercall2(int, xen_version, cmd, arg);

arch/x86/xen/irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* callback mask. We do this in a very simple manner, by making a call
2020
* down into Xen. The pending flag will be checked by Xen on return.
2121
*/
22-
void xen_force_evtchn_callback(void)
22+
noinstr void xen_force_evtchn_callback(void)
2323
{
2424
(void)HYPERVISOR_xen_version(0, NULL);
2525
}

0 commit comments

Comments
 (0)