3 files changed, 19 insertions, 6 deletions

diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index 1f2e4d5a5c0f..bb785d23dbde 100644
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -80,8 +80,10 @@ void fpsimd_thread_switch(struct task_struct *next)
 
 void fpsimd_flush_thread(void)
 {
+        preempt_disable();
         memset(&current->thread.fpsimd_state, 0, sizeof(struct fpsimd_state));
         fpsimd_load_state(&current->thread.fpsimd_state);
+        preempt_enable();
 }
 
 #ifdef CONFIG_KERNEL_MODE_NEON
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 57fb55c44c90..7ae8a1f00c3c 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -143,15 +143,26 @@ void machine_restart(char *cmd)
 
 void __show_regs(struct pt_regs *regs)
 {
-        int i;
+        int i, top_reg;
+        u64 lr, sp;
+
+        if (compat_user_mode(regs)) {
+                lr = regs->compat_lr;
+                sp = regs->compat_sp;
+                top_reg = 12;
+        } else {
+                lr = regs->regs[30];
+                sp = regs->sp;
+                top_reg = 29;
+        }
 
         show_regs_print_info(KERN_DEFAULT);
         print_symbol("PC is at %s\n", instruction_pointer(regs));
-        print_symbol("LR is at %s\n", regs->regs[30]);
+        print_symbol("LR is at %s\n", lr);
         printk("pc : [<%016llx>] lr : [<%016llx>] pstate: %08llx\n",
-               regs->pc, regs->regs[30], regs->pstate);
-        printk("sp : %016llx\n", regs->sp);
-        for (i = 29; i >= 0; i--) {
+               regs->pc, lr, regs->pstate);
+        printk("sp : %016llx\n", sp);
+        for (i = top_reg; i >= 0; i--) {
                 printk("x%-2d: %016llx ", i, regs->regs[i]);
                 if (i % 2 == 0)
                         printk("\n");
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 12ad8f3d0cfd..055cfb80e05c 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -57,7 +57,7 @@
 unsigned int processor_id;
 EXPORT_SYMBOL(processor_id);
 
-unsigned int elf_hwcap __read_mostly;
+unsigned long elf_hwcap __read_mostly;
 EXPORT_SYMBOL_GPL(elf_hwcap);
 
 static const char *cpu_name;