Unverified Commit 0cbd3859 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6802 x86,static_call: Fix __static_call_return0 for i386 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yang Yingliang <yangyingliang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XAB37MPWKPXW44XQSZD25Z4DLFQIOCRE/ 
 
https://gitee.com/openeuler/kernel/issues/I9JNPZ 
 
Link:https://gitee.com/openeuler/kernel/pulls/6802

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 59902a3b e1432a52

arch/x86/kernel/static_call.c

+2 −3
Original line number Diff line number Diff line
@@ -12,10 +12,9 @@ enum insn_type { 
};



/*

 * data16 data16 xorq %rax, %rax - a single 5 byte instruction that clears %rax

 * The REX.W cancels the effect of any data16.

 * cs cs cs xorl %eax, %eax - a single 5 byte instruction that clears %[er]ax

 */

static const u8 xor5rax[] = { 0x66, 0x66, 0x48, 0x31, 0xc0 };

static const u8 xor5rax[] = { 0x2e, 0x2e, 0x2e, 0x31, 0xc0 };



/*

 * ud1 %esp, %ecx - a 3 byte #UD that is unique to trampolines, chosen such