diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2021-06-21 13:12:36 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-06-22 13:56:42 +0200 |
| commit | 4c9c26f1e67648f41f28f8c997c5c9467a3dbbe4 (patch) | |
| tree | 91bdb7426a226e2e160b218710b1e54b75c6d1fe /arch | |
| parent | 84e60065df9ef03759115a7e48c04bbc0d292165 (diff) | |
| download | linux-stable-4c9c26f1e67648f41f28f8c997c5c9467a3dbbe4.tar.gz linux-stable-4c9c26f1e67648f41f28f8c997c5c9467a3dbbe4.tar.bz2 linux-stable-4c9c26f1e67648f41f28f8c997c5c9467a3dbbe4.zip | |
x86/xen: Fix noinstr fail in exc_xen_unknown_trap()
Fix:
vmlinux.o: warning: objtool: exc_xen_unknown_trap()+0x7: call to printk() leaves .noinstr.text section
Fixes: 2e92493637a0 ("x86/xen: avoid warning in Xen pv guest with CONFIG_AMD_MEM_ENCRYPT enabled")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210621120120.606560778@infradead.org
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/xen/enlighten_pv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index e87699aa2dc8..03149422dce2 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -592,8 +592,10 @@ DEFINE_IDTENTRY_RAW(xenpv_exc_debug) DEFINE_IDTENTRY_RAW(exc_xen_unknown_trap) { /* This should never happen and there is no way to handle it. */ + instrumentation_begin(); pr_err("Unknown trap in Xen PV mode."); BUG(); + instrumentation_end(); } #ifdef CONFIG_X86_MCE |