s390/extable: Rename EX_TABLE_UA_STORE to EX_TABLE_UA_FAULT

Rename EX_TABLE_UA_STORE to a more generic EX_TABLE_UA_FAULT
name. This allows to use the extable type also for uaccess inline
assemblies which read from userspace, without causing confusion.

Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>

diff --git a/arch/s390/include/asm/asm-extable.h b/arch/s390/include/asm/asm-extable.h
index 00a67464c44534ca931a46f9253e612bfb76151e..5f47569c908ab87ee197b7948beb3a633b246487 100644 (file)
--- a/arch/s390/include/asm/asm-extable.h
+++ b/arch/s390/include/asm/asm-extable.h
@@ -9,7 +9,7 @@
 #define EX_TYPE_NONE           0
 #define EX_TYPE_FIXUP          1
 #define EX_TYPE_BPF            2
-#define EX_TYPE_UA_STORE       3
+#define EX_TYPE_UA_FAULT       3
 #define EX_TYPE_UA_LOAD_MEM    4
 #define EX_TYPE_UA_LOAD_REG    5
 #define EX_TYPE_UA_LOAD_REGPAIR        6
@@ -70,8 +70,8 @@
 #define EX_TABLE_AMODE31(_fault, _target)                              \
        __EX_TABLE(.amode31.ex_table, _fault, _target, EX_TYPE_FIXUP, __stringify(%%r0), __stringify(%%r0), 0)
 
-#define EX_TABLE_UA_STORE(_fault, _target, _regerr)                    \
-       __EX_TABLE(__ex_table, _fault, _target, EX_TYPE_UA_STORE, _regerr, _regerr, 0)
+#define EX_TABLE_UA_FAULT(_fault, _target, _regerr)                    \
+       __EX_TABLE(__ex_table, _fault, _target, EX_TYPE_UA_FAULT, _regerr, _regerr, 0)
 
 #define EX_TABLE_UA_LOAD_MEM(_fault, _target, _regerr, _regmem, _len)  \
        __EX_TABLE(__ex_table, _fault, _target, EX_TYPE_UA_LOAD_MEM, _regerr, _regmem, _len)

diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
index a81f897a81ceb34055c85c8afb809b69b0805306..0b724b98ba56f70b7797d06f537a01b235cdb393 100644 (file)
--- a/arch/s390/include/asm/uaccess.h
+++ b/arch/s390/include/asm/uaccess.h
@@ -103,8 +103,8 @@ __put_user_##type##_noinstr(unsigned type __user *to,                       \
                "0:     mvcos   %[_to],%[_from],%[_size]\n"             \
                "1:     xr      %[rc],%[rc]\n"                          \
                "2:\n"                                                  \
-               EX_TABLE_UA_STORE(0b, 2b, %[rc])                        \
-               EX_TABLE_UA_STORE(1b, 2b, %[rc])                        \
+               EX_TABLE_UA_FAULT(0b, 2b, %[rc])                        \
+               EX_TABLE_UA_FAULT(1b, 2b, %[rc])                        \
                : [rc] "=&d" (rc), [_to] "+Q" (*(to))                   \
                : [_size] "d" (size), [_from] "Q" (*(from)),            \
                  [spec] "d" (__oac_spec.val)                           \
@@ -351,8 +351,8 @@ int __noreturn __put_kernel_bad(void);
                "0:   " insn "  %[_val],%[_to]\n"                       \
                "1:     xr      %[rc],%[rc]\n"                          \
                "2:\n"                                                  \
-               EX_TABLE_UA_STORE(0b, 2b, %[rc])                        \
-               EX_TABLE_UA_STORE(1b, 2b, %[rc])                        \
+               EX_TABLE_UA_FAULT(0b, 2b, %[rc])                        \
+               EX_TABLE_UA_FAULT(1b, 2b, %[rc])                        \
                : [rc] "=d" (__rc), [_to] "+Q" (*(to))                  \
                : [_val] "d" (val)                                      \
                : "cc");                                                \

diff --git a/arch/s390/mm/extable.c b/arch/s390/mm/extable.c
index 6e9a5e366ff39c05b3d310e718f8a718baf1552d..37a3e6d46e0fb3fe1edad2967861425cd00e5dd2 100644 (file)
--- a/arch/s390/mm/extable.c
+++ b/arch/s390/mm/extable.c
@@ -27,7 +27,7 @@ static bool ex_handler_fixup(const struct exception_table_entry *ex, struct pt_r
        return true;
 }
 
-static bool ex_handler_ua_store(const struct exception_table_entry *ex, struct pt_regs *regs)
+static bool ex_handler_ua_fault(const struct exception_table_entry *ex, struct pt_regs *regs)
 {
        unsigned int reg_err = FIELD_GET(EX_DATA_REG_ERR, ex->data);
 
@@ -97,8 +97,8 @@ bool fixup_exception(struct pt_regs *regs)
                return ex_handler_fixup(ex, regs);
        case EX_TYPE_BPF:
                return ex_handler_bpf(ex, regs);
-       case EX_TYPE_UA_STORE:
-               return ex_handler_ua_store(ex, regs);
+       case EX_TYPE_UA_FAULT:
+               return ex_handler_ua_fault(ex, regs);
        case EX_TYPE_UA_LOAD_MEM:
                return ex_handler_ua_load_mem(ex, regs);
        case EX_TYPE_UA_LOAD_REG: