tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
"A couple more fixes for 4.10:

- fix addressing the short regset write issue (Dave Martin)

- fix for LPAE systems which leave a pending imprecise data abort
before entering the kernel (Alexander Sverdlin)"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write
ARM: 8642/1: LPAE: catch pending imprecise abort on unmask

Linus Torvalds 59e8f10a d966564f

+7 -3
+1 -1
arch/arm/kernel/ptrace.c
··· 600 600 const void *kbuf, const void __user *ubuf) 601 601 { 602 602 int ret; 603 - struct pt_regs newregs; 603 + struct pt_regs newregs = *task_pt_regs(target); 604 604 605 605 ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, 606 606 &newregs,
+2 -2
arch/arm/mm/fault.c
··· 610 610 611 611 void __init early_abt_enable(void) 612 612 { 613 - fsr_info[22].fn = early_abort_handler; 613 + fsr_info[FSR_FS_AEA].fn = early_abort_handler; 614 614 local_abt_enable(); 615 - fsr_info[22].fn = do_bad; 615 + fsr_info[FSR_FS_AEA].fn = do_bad; 616 616 } 617 617 618 618 #ifndef CONFIG_ARM_LPAE
+4
arch/arm/mm/fault.h
··· 11 11 #define FSR_FS5_0 (0x3f) 12 12 13 13 #ifdef CONFIG_ARM_LPAE 14 + #define FSR_FS_AEA 17 15 + 14 16 static inline int fsr_fs(unsigned int fsr) 15 17 { 16 18 return fsr & FSR_FS5_0; 17 19 } 18 20 #else 21 + #define FSR_FS_AEA 22 22 + 19 23 static inline int fsr_fs(unsigned int fsr) 20 24 { 21 25 return (fsr & FSR_FS3_0) | (fsr & FSR_FS4) >> 6;