sched/headers: Prepare to remove the <linux/mm_types.h> dependency from <linux/sched.h>

[linux-2.6-block.git] / arch / arm64 / kernel / traps.c

diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index 659b2e6b6cf767ff94d2512ad0897aa236469139..e52be6aa44ee7fadebcc189e764037d320491fa5 100644 (file)
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -29,8 +29,11 @@
 #include <linux/kexec.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/sched.h>
+#include <linux/sched/signal.h>
+#include <linux/sched/debug.h>
+#include <linux/sched/task_stack.h>
 #include <linux/syscalls.h>
+#include <linux/mm_types.h>
 
 #include <asm/atomic.h>
 #include <asm/bug.h>
@@ -466,7 +469,7 @@ static void user_cache_maint_handler(unsigned int esr, struct pt_regs *regs)
        int crm = (esr & ESR_ELx_SYS64_ISS_CRM_MASK) >> ESR_ELx_SYS64_ISS_CRM_SHIFT;
        int ret = 0;
 
-       address = (rt == 31) ? 0 : regs->regs[rt];
+       address = pt_regs_read_reg(regs, rt);
 
        switch (crm) {
        case ESR_ELx_SYS64_ISS_CRM_DC_CVAU:     /* DC CVAU, gets promoted */
@@ -495,8 +498,10 @@ static void user_cache_maint_handler(unsigned int esr, struct pt_regs *regs)
 static void ctr_read_handler(unsigned int esr, struct pt_regs *regs)
 {
        int rt = (esr & ESR_ELx_SYS64_ISS_RT_MASK) >> ESR_ELx_SYS64_ISS_RT_SHIFT;
+       unsigned long val = arm64_ftr_reg_user_value(&arm64_ftr_reg_ctrel0);
+
+       pt_regs_write_reg(regs, rt, val);
 
-       regs->regs[rt] = arm64_ftr_reg_ctrel0.sys_val;
        regs->pc += 4;
 }
 
@@ -531,7 +536,12 @@ asmlinkage void __exception do_sysinstr(unsigned int esr, struct pt_regs *regs)
                        return;
                }
 
-       force_signal_inject(SIGILL, ILL_ILLOPC, regs, 0);
+       /*
+        * New SYS instructions may previously have been undefined at EL0. Fall
+        * back to our usual undefined instruction handler so that we handle
+        * these consistently.
+        */
+       do_undefinstr(regs);
 }
 
 long compat_arm_syscall(struct pt_regs *regs);