diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2021-06-24 11:41:20 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2021-09-17 13:20:23 +0200 |
| commit | 09c413071e2de71d1f28813c560ae0c06b344520 (patch) | |
| tree | e62370bde6736b1acc6c551dfb3e0a9cac0ade1b /arch/x86/kernel/paravirt.c | |
| parent | x86/xen: Make irq_enable() noinstr (diff) | |
| download | linux-dev-09c413071e2de71d1f28813c560ae0c06b344520.tar.xz linux-dev-09c413071e2de71d1f28813c560ae0c06b344520.zip | |
x86/xen: Make irq_disable() noinstr
vmlinux.o: warning: objtool: pv_ops[31]: native_irq_disable
vmlinux.o: warning: objtool: pv_ops[31]: __raw_callee_save_xen_irq_disable
vmlinux.o: warning: objtool: pv_ops[31]: xen_irq_disable_direct
vmlinux.o: warning: objtool: lock_is_held_type()+0x5b: call to pv_ops[31]() leaves .noinstr.text section
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Juergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20210624095148.933869441@infradead.org
Diffstat (limited to 'arch/x86/kernel/paravirt.c')
| -rw-r--r-- | arch/x86/kernel/paravirt.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 75f0d241752b..ebc45360ffd4 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -243,6 +243,11 @@ static noinstr void pv_native_irq_enable(void) { native_irq_enable(); } + +static noinstr void pv_native_irq_disable(void) +{ + native_irq_disable(); +} #endif enum paravirt_lazy_mode paravirt_get_lazy_mode(void) @@ -306,7 +311,7 @@ struct paravirt_patch_template pv_ops = { /* Irq ops. */ .irq.save_fl = __PV_IS_CALLEE_SAVE(native_save_fl), - .irq.irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable), + .irq.irq_disable = __PV_IS_CALLEE_SAVE(pv_native_irq_disable), .irq.irq_enable = __PV_IS_CALLEE_SAVE(pv_native_irq_enable), .irq.safe_halt = native_safe_halt, .irq.halt = native_halt, |