Skip to content

Commit 1591a65

Browse files
heynemaxjgross1
authored andcommitted
x86: xen: remove STACK_FRAME_NON_STANDARD from xen_cpuid
Since commit 4d65adf ("x86: xen: insn: Decode Xen and KVM emulate-prefix signature"), objtool is able to correctly parse the prefixed instruction in xen_cpuid and emit correct orc unwind information. Hence, marking the function as STACKFRAME_NON_STANDARD is no longer needed. This commit is basically a revert of commit 983bb6d ("x86/xen: Mark xen_cpuid() stack frame as non-standard"). Signed-off-by: Maximilian Heyne <[email protected]> Reviewed-by: Juergen Gross <[email protected]> CC: Josh Poimboeuf <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Juergen Gross <[email protected]>
1 parent 12f112c commit 1591a65

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

arch/x86/xen/enlighten_pv.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include <linux/pci.h>
3131
#include <linux/gfp.h>
3232
#include <linux/edd.h>
33-
#include <linux/objtool.h>
3433

3534
#include <xen/xen.h>
3635
#include <xen/events.h>
@@ -165,7 +164,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
165164

166165
*bx &= maskebx;
167166
}
168-
STACK_FRAME_NON_STANDARD(xen_cpuid); /* XEN_EMULATE_PREFIX */
169167

170168
static bool __init xen_check_mwait(void)
171169
{

0 commit comments

Comments
 (0)