From afdcc2ce3970ccad0ec4fb2d2c614e444c59f770 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <hca@linux.ibm.com>
Date: Fri, 24 Mar 2023 15:00:21 +0100
Subject: [PATCH] s390/uaccess: sort EX_TABLE list for inline assemblies

Reviewed-by: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
---
 arch/s390/lib/uaccess.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/s390/lib/uaccess.c b/arch/s390/lib/uaccess.c
index 4dec9fc12f734..7f33eb4dffbae 100644
--- a/arch/s390/lib/uaccess.c
+++ b/arch/s390/lib/uaccess.c
@@ -62,8 +62,8 @@ static unsigned long raw_copy_from_user_key(void *to, const void __user *from,
 		"5:	slgr	%[size],%[size]\n"
 		"6:\n"
 		EX_TABLE(0b, 2b)
-		EX_TABLE(3b, 6b)
 		EX_TABLE(1b, 2b)
+		EX_TABLE(3b, 6b)
 		EX_TABLE(4b, 6b)
 		: [size] "+a" (size), [from] "+a" (from), [to] "+a" (to),
 		  [tmp1] "+a" (tmp1), [tmp2] "=a" (tmp2)
@@ -126,8 +126,8 @@ static unsigned long raw_copy_to_user_key(void __user *to, const void *from,
 		"5:	slgr	%[size],%[size]\n"
 		"6:\n"
 		EX_TABLE(0b, 2b)
-		EX_TABLE(3b, 6b)
 		EX_TABLE(1b, 2b)
+		EX_TABLE(3b, 6b)
 		EX_TABLE(4b, 6b)
 		: [size] "+a" (size), [to] "+a" (to), [from] "+a" (from),
 		  [tmp1] "+a" (tmp1), [tmp2] "=a" (tmp2)
-- 
GitLab