@@ -331,8 +331,8 @@ static void test_vdso_no_exit_handler(struct sgx_secs *secs)
ASSERT_EQ(exception.leaf, ENCLU_EENTER);
}
-static int __used __basic_exit_handler(long rdi, long rsi, long rdx, int ret,
- long r8, long r9, void *tcs, long ursp,
+static int __used __basic_exit_handler(long rdi, long rsi, long rdx, long ursp,
+ long r8, long r9, void *tcs, int ret,
struct sgx_enclave_exception *e)
{
TEST_ASSERT(!(r9 & 0xf), "Pre-CALL RSP not 16-byte aligned: %lx\n", r9);
@@ -355,8 +355,8 @@ static void __used basic_exit_handler_trampoline(void)
static int nr_page_faults;
-static int mprotect_exit_handler(long rdi, long rsi, long rdx, int ret,
- long r8, long r9, void *tcs, long ursp,
+static int mprotect_exit_handler(long rdi, long rsi, long rdx, long ursp,
+ long r8, long r9, void *tcs, int ret,
struct sgx_enclave_exception *e)
{
int prot, rc;
Swap @ursp and @ret in the exit handler callbacks to match a recent kernel change. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> --- tools/testing/selftests/x86/sgx/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)