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 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

Pull arc architecture fixes from Vineet Gupta:
"This includes fix for a serious bug in DMA mapping API, make
allyesconfig wreckage, removal of bogus email-list placeholder in
MAINTAINERS, a typo in ptrace helper code and last remaining changes
for syscall ABI v3 which we are finally starting to transition-to
internally.

The request is late than I intended to - but I was held up with
debugging a timer link list corruption, for which a proposed fix to
generic timer code was sent out to lkml/tglx earlier today."

* 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: Fix the typo in event identifier flags used by ptrace
arc: fix dma_address assignment during dma_map_sg()
ARC: Remove SET_PERSONALITY (tracks cross-arch change)
ARC: ABIv3: fork/vfork wrappers not needed in "no-legacy-syscall" ABI
ARC: ABIv3: Print the correct ABI ver
ARC: make allyesconfig build breakages
ARC: MAINTAINERS update for ARC

Linus Torvalds 67e17c11 09a9f1d2

+12 -46
+2 -1
MAINTAINERS
··· 7706 7706 7707 7707 SYNOPSYS ARC ARCHITECTURE 7708 7708 M: Vineet Gupta <vgupta@synopsys.com> 7709 - L: linux-snps-arc@vger.kernel.org 7710 7709 S: Supported 7711 7710 F: arch/arc/ 7711 + F: Documentation/devicetree/bindings/arc/ 7712 + F: drivers/tty/serial/arc-uart.c 7712 7713 7713 7714 SYSV FILESYSTEM 7714 7715 M: Christoph Hellwig <hch@infradead.org>
+1 -1
arch/arc/include/asm/dma-mapping.h
··· 126 126 int i; 127 127 128 128 for_each_sg(sg, s, nents, i) 129 - sg->dma_address = dma_map_page(dev, sg_page(s), s->offset, 129 + s->dma_address = dma_map_page(dev, sg_page(s), s->offset, 130 130 s->length, dir); 131 131 132 132 return nents;
-3
arch/arc/include/asm/elf.h
··· 72 72 */ 73 73 #define ELF_PLATFORM (NULL) 74 74 75 - #define SET_PERSONALITY(ex) \ 76 - set_personality(PER_LINUX | (current->personality & (~PER_MASK))) 77 - 78 75 #endif
+1 -1
arch/arc/include/asm/entry.h
··· 415 415 *-------------------------------------------------------------*/ 416 416 .macro SAVE_ALL_EXCEPTION marker 417 417 418 - st \marker, [sp, 8] 418 + st \marker, [sp, 8] /* orig_r8 */ 419 419 st r0, [sp, 4] /* orig_r0, needed only for sys calls */ 420 420 421 421 /* Restore r9 used to code the early prologue */
+2 -4
arch/arc/include/asm/kgdb.h
··· 13 13 14 14 #ifdef CONFIG_KGDB 15 15 16 - #include <asm/user.h> 16 + #include <asm/ptrace.h> 17 17 18 18 /* to ensure compatibility with Linux 2.6.35, we don't implement the get/set 19 19 * register API yet */ ··· 53 53 }; 54 54 55 55 #else 56 - static inline void kgdb_trap(struct pt_regs *regs, int param) 57 - { 58 - } 56 + #define kgdb_trap(regs, param) 59 57 #endif 60 58 61 59 #endif /* __ARC_KGDB_H__ */
+1 -1
arch/arc/include/asm/ptrace.h
··· 123 123 #define orig_r8_IS_SCALL 0x0001 124 124 #define orig_r8_IS_SCALL_RESTARTED 0x0002 125 125 #define orig_r8_IS_BRKPT 0x0004 126 - #define orig_r8_IS_EXCPN 0x0004 126 + #define orig_r8_IS_EXCPN 0x0008 127 127 #define orig_r8_IS_IRQ1 0x0010 128 128 #define orig_r8_IS_IRQ2 0x0020 129 129
-2
arch/arc/include/asm/syscalls.h
··· 16 16 #include <linux/types.h> 17 17 18 18 int sys_clone_wrapper(int, int, int, int, int); 19 - int sys_fork_wrapper(void); 20 - int sys_vfork_wrapper(void); 21 19 int sys_cacheflush(uint32_t, uint32_t uint32_t); 22 20 int sys_arc_settls(void *); 23 21 int sys_arc_gettls(void);
+2 -2
arch/arc/include/uapi/asm/ptrace.h
··· 28 28 */ 29 29 struct user_regs_struct { 30 30 31 - struct scratch { 31 + struct { 32 32 long pad; 33 33 long bta, lp_start, lp_end, lp_count; 34 34 long status32, ret, blink, fp, gp; 35 35 long r12, r11, r10, r9, r8, r7, r6, r5, r4, r3, r2, r1, r0; 36 36 long sp; 37 37 } scratch; 38 - struct callee { 38 + struct { 39 39 long pad; 40 40 long r25, r24, r23, r22, r21, r20; 41 41 long r19, r18, r17, r16, r15, r14, r13;
+1 -26
arch/arc/kernel/entry.S
··· 452 452 ; using ERET won't work since next-PC has already committed 453 453 lr r12, [efa] 454 454 GET_CURR_TASK_FIELD_PTR TASK_THREAD, r11 455 - st r12, [r11, THREAD_FAULT_ADDR] 455 + st r12, [r11, THREAD_FAULT_ADDR] ; thread.fault_address 456 456 457 457 ; PRE Sys Call Ptrace hook 458 458 mov r0, sp ; pt_regs needed ··· 791 791 ARC_EXIT ret_from_fork 792 792 793 793 ;################### Special Sys Call Wrappers ########################## 794 - 795 - ; TBD: call do_fork directly from here 796 - ARC_ENTRY sys_fork_wrapper 797 - SAVE_CALLEE_SAVED_USER 798 - bl @sys_fork 799 - DISCARD_CALLEE_SAVED_USER 800 - 801 - GET_CURR_THR_INFO_FLAGS r10 802 - btst r10, TIF_SYSCALL_TRACE 803 - bnz tracesys_exit 804 - 805 - b ret_from_system_call 806 - ARC_EXIT sys_fork_wrapper 807 - 808 - ARC_ENTRY sys_vfork_wrapper 809 - SAVE_CALLEE_SAVED_USER 810 - bl @sys_vfork 811 - DISCARD_CALLEE_SAVED_USER 812 - 813 - GET_CURR_THR_INFO_FLAGS r10 814 - btst r10, TIF_SYSCALL_TRACE 815 - bnz tracesys_exit 816 - 817 - b ret_from_system_call 818 - ARC_EXIT sys_vfork_wrapper 819 794 820 795 ARC_ENTRY sys_clone_wrapper 821 796 SAVE_CALLEE_SAVED_USER
+1
arch/arc/kernel/kgdb.c
··· 9 9 */ 10 10 11 11 #include <linux/kgdb.h> 12 + #include <linux/sched.h> 12 13 #include <asm/disasm.h> 13 14 #include <asm/cacheflush.h> 14 15
+1 -3
arch/arc/kernel/setup.c
··· 232 232 233 233 n += scnprintf(buf + n, len - n, "\n"); 234 234 235 - #ifdef _ASM_GENERIC_UNISTD_H 236 235 n += scnprintf(buf + n, len - n, 237 - "OS ABI [v2]\t: asm-generic/{unistd,stat,fcntl}\n"); 238 - #endif 236 + "OS ABI [v3]\t: no-legacy-syscalls\n"); 239 237 240 238 return buf; 241 239 }
-2
arch/arc/kernel/sys.c
··· 6 6 #include <asm/syscalls.h> 7 7 8 8 #define sys_clone sys_clone_wrapper 9 - #define sys_fork sys_fork_wrapper 10 - #define sys_vfork sys_vfork_wrapper 11 9 12 10 #undef __SYSCALL 13 11 #define __SYSCALL(nr, call) [nr] = (call),