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 tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

Pull C6X UAPI disintegration from Mark Salter:

- scripted UAPI disintegration by David Howells.

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
UAPI: (Scripted) Disintegrate arch/c6x/include/asm

+171 -146
-1
arch/c6x/include/asm/Kbuild
··· 1 - include include/asm-generic/Kbuild.asm 2 1 3 2 generic-y += atomic.h 4 3 generic-y += auxvec.h
arch/c6x/include/asm/byteorder.h arch/c6x/include/uapi/asm/byteorder.h
arch/c6x/include/asm/kvm_para.h arch/c6x/include/uapi/asm/kvm_para.h
+1 -145
arch/c6x/include/asm/ptrace.h
··· 11 11 #ifndef _ASM_C6X_PTRACE_H 12 12 #define _ASM_C6X_PTRACE_H 13 13 14 - #define BKPT_OPCODE 0x56454314 /* illegal opcode */ 15 - 16 - #ifdef _BIG_ENDIAN 17 - #define PT_LO(odd, even) odd 18 - #define PT_HI(odd, even) even 19 - #else 20 - #define PT_LO(odd, even) even 21 - #define PT_HI(odd, even) odd 22 - #endif 23 - 24 - #define PT_A4_ORG PT_LO(1, 0) 25 - #define PT_TSR PT_HI(1, 0) 26 - #define PT_ILC PT_LO(3, 2) 27 - #define PT_RILC PT_HI(3, 2) 28 - #define PT_CSR PT_LO(5, 4) 29 - #define PT_PC PT_HI(5, 4) 30 - #define PT_B16 PT_LO(7, 6) 31 - #define PT_B17 PT_HI(7, 6) 32 - #define PT_B18 PT_LO(9, 8) 33 - #define PT_B19 PT_HI(9, 8) 34 - #define PT_B20 PT_LO(11, 10) 35 - #define PT_B21 PT_HI(11, 10) 36 - #define PT_B22 PT_LO(13, 12) 37 - #define PT_B23 PT_HI(13, 12) 38 - #define PT_B24 PT_LO(15, 14) 39 - #define PT_B25 PT_HI(15, 14) 40 - #define PT_B26 PT_LO(17, 16) 41 - #define PT_B27 PT_HI(17, 16) 42 - #define PT_B28 PT_LO(19, 18) 43 - #define PT_B29 PT_HI(19, 18) 44 - #define PT_B30 PT_LO(21, 20) 45 - #define PT_B31 PT_HI(21, 20) 46 - #define PT_B0 PT_LO(23, 22) 47 - #define PT_B1 PT_HI(23, 22) 48 - #define PT_B2 PT_LO(25, 24) 49 - #define PT_B3 PT_HI(25, 24) 50 - #define PT_B4 PT_LO(27, 26) 51 - #define PT_B5 PT_HI(27, 26) 52 - #define PT_B6 PT_LO(29, 28) 53 - #define PT_B7 PT_HI(29, 28) 54 - #define PT_B8 PT_LO(31, 30) 55 - #define PT_B9 PT_HI(31, 30) 56 - #define PT_B10 PT_LO(33, 32) 57 - #define PT_B11 PT_HI(33, 32) 58 - #define PT_B12 PT_LO(35, 34) 59 - #define PT_B13 PT_HI(35, 34) 60 - #define PT_A16 PT_LO(37, 36) 61 - #define PT_A17 PT_HI(37, 36) 62 - #define PT_A18 PT_LO(39, 38) 63 - #define PT_A19 PT_HI(39, 38) 64 - #define PT_A20 PT_LO(41, 40) 65 - #define PT_A21 PT_HI(41, 40) 66 - #define PT_A22 PT_LO(43, 42) 67 - #define PT_A23 PT_HI(43, 42) 68 - #define PT_A24 PT_LO(45, 44) 69 - #define PT_A25 PT_HI(45, 44) 70 - #define PT_A26 PT_LO(47, 46) 71 - #define PT_A27 PT_HI(47, 46) 72 - #define PT_A28 PT_LO(49, 48) 73 - #define PT_A29 PT_HI(49, 48) 74 - #define PT_A30 PT_LO(51, 50) 75 - #define PT_A31 PT_HI(51, 50) 76 - #define PT_A0 PT_LO(53, 52) 77 - #define PT_A1 PT_HI(53, 52) 78 - #define PT_A2 PT_LO(55, 54) 79 - #define PT_A3 PT_HI(55, 54) 80 - #define PT_A4 PT_LO(57, 56) 81 - #define PT_A5 PT_HI(57, 56) 82 - #define PT_A6 PT_LO(59, 58) 83 - #define PT_A7 PT_HI(59, 58) 84 - #define PT_A8 PT_LO(61, 60) 85 - #define PT_A9 PT_HI(61, 60) 86 - #define PT_A10 PT_LO(63, 62) 87 - #define PT_A11 PT_HI(63, 62) 88 - #define PT_A12 PT_LO(65, 64) 89 - #define PT_A13 PT_HI(65, 64) 90 - #define PT_A14 PT_LO(67, 66) 91 - #define PT_A15 PT_HI(67, 66) 92 - #define PT_B14 PT_LO(69, 68) 93 - #define PT_B15 PT_HI(69, 68) 94 - 95 - #define NR_PTREGS 70 96 - 97 - #define PT_DP PT_B14 /* Data Segment Pointer (B14) */ 98 - #define PT_SP PT_B15 /* Stack Pointer (B15) */ 99 - 100 - #define PTRACE_GETFDPIC 31 /* get the ELF fdpic loadmap address */ 101 - 102 - #define PTRACE_GETFDPIC_EXEC 0 /* [addr] request the executable loadmap */ 103 - #define PTRACE_GETFDPIC_INTERP 1 /* [addr] request the interpreter loadmap */ 14 + #include <uapi/asm/ptrace.h> 104 15 105 16 #ifndef __ASSEMBLY__ 106 - 107 17 #ifdef _BIG_ENDIAN 108 - #define REG_PAIR(odd, even) unsigned long odd; unsigned long even 109 18 #else 110 - #define REG_PAIR(odd, even) unsigned long even; unsigned long odd 111 19 #endif 112 - 113 - /* 114 - * this struct defines the way the registers are stored on the 115 - * stack during a system call. fields defined with REG_PAIR 116 - * are saved and restored using double-word memory operations 117 - * which means the word ordering of the pair depends on endianess. 118 - */ 119 - struct pt_regs { 120 - REG_PAIR(tsr, orig_a4); 121 - REG_PAIR(rilc, ilc); 122 - REG_PAIR(pc, csr); 123 - 124 - REG_PAIR(b17, b16); 125 - REG_PAIR(b19, b18); 126 - REG_PAIR(b21, b20); 127 - REG_PAIR(b23, b22); 128 - REG_PAIR(b25, b24); 129 - REG_PAIR(b27, b26); 130 - REG_PAIR(b29, b28); 131 - REG_PAIR(b31, b30); 132 - 133 - REG_PAIR(b1, b0); 134 - REG_PAIR(b3, b2); 135 - REG_PAIR(b5, b4); 136 - REG_PAIR(b7, b6); 137 - REG_PAIR(b9, b8); 138 - REG_PAIR(b11, b10); 139 - REG_PAIR(b13, b12); 140 - 141 - REG_PAIR(a17, a16); 142 - REG_PAIR(a19, a18); 143 - REG_PAIR(a21, a20); 144 - REG_PAIR(a23, a22); 145 - REG_PAIR(a25, a24); 146 - REG_PAIR(a27, a26); 147 - REG_PAIR(a29, a28); 148 - REG_PAIR(a31, a30); 149 - 150 - REG_PAIR(a1, a0); 151 - REG_PAIR(a3, a2); 152 - REG_PAIR(a5, a4); 153 - REG_PAIR(a7, a6); 154 - REG_PAIR(a9, a8); 155 - REG_PAIR(a11, a10); 156 - REG_PAIR(a13, a12); 157 - 158 - REG_PAIR(a15, a14); 159 - REG_PAIR(sp, dp); 160 - }; 161 - 162 - #ifdef __KERNEL__ 163 20 164 21 #include <linux/linkage.h> 165 22 ··· 31 174 extern asmlinkage unsigned long syscall_trace_entry(struct pt_regs *regs); 32 175 extern asmlinkage void syscall_trace_exit(struct pt_regs *regs); 33 176 34 - #endif /* __KERNEL__ */ 35 177 #endif /* __ASSEMBLY__ */ 36 178 #endif /* _ASM_C6X_PTRACE_H */
arch/c6x/include/asm/setup.h arch/c6x/include/uapi/asm/setup.h
arch/c6x/include/asm/sigcontext.h arch/c6x/include/uapi/asm/sigcontext.h
arch/c6x/include/asm/swab.h arch/c6x/include/uapi/asm/swab.h
arch/c6x/include/asm/unistd.h arch/c6x/include/uapi/asm/unistd.h
+7
arch/c6x/include/uapi/asm/Kbuild
··· 1 1 # UAPI Header export list 2 2 include include/uapi/asm-generic/Kbuild.asm 3 3 4 + header-y += byteorder.h 5 + header-y += kvm_para.h 6 + header-y += ptrace.h 7 + header-y += setup.h 8 + header-y += sigcontext.h 9 + header-y += swab.h 10 + header-y += unistd.h
+163
arch/c6x/include/uapi/asm/ptrace.h
··· 1 + /* 2 + * Copyright (C) 2004, 2006, 2009, 2010 Texas Instruments Incorporated 3 + * Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com) 4 + * 5 + * Updated for 2.6.34: Mark Salter <msalter@redhat.com> 6 + * 7 + * This program is free software; you can redistribute it and/or modify 8 + * it under the terms of the GNU General Public License version 2 as 9 + * published by the Free Software Foundation. 10 + */ 11 + #ifndef _UAPI_ASM_C6X_PTRACE_H 12 + #define _UAPI_ASM_C6X_PTRACE_H 13 + 14 + #define BKPT_OPCODE 0x56454314 /* illegal opcode */ 15 + 16 + #ifdef _BIG_ENDIAN 17 + #define PT_LO(odd, even) odd 18 + #define PT_HI(odd, even) even 19 + #else 20 + #define PT_LO(odd, even) even 21 + #define PT_HI(odd, even) odd 22 + #endif 23 + 24 + #define PT_A4_ORG PT_LO(1, 0) 25 + #define PT_TSR PT_HI(1, 0) 26 + #define PT_ILC PT_LO(3, 2) 27 + #define PT_RILC PT_HI(3, 2) 28 + #define PT_CSR PT_LO(5, 4) 29 + #define PT_PC PT_HI(5, 4) 30 + #define PT_B16 PT_LO(7, 6) 31 + #define PT_B17 PT_HI(7, 6) 32 + #define PT_B18 PT_LO(9, 8) 33 + #define PT_B19 PT_HI(9, 8) 34 + #define PT_B20 PT_LO(11, 10) 35 + #define PT_B21 PT_HI(11, 10) 36 + #define PT_B22 PT_LO(13, 12) 37 + #define PT_B23 PT_HI(13, 12) 38 + #define PT_B24 PT_LO(15, 14) 39 + #define PT_B25 PT_HI(15, 14) 40 + #define PT_B26 PT_LO(17, 16) 41 + #define PT_B27 PT_HI(17, 16) 42 + #define PT_B28 PT_LO(19, 18) 43 + #define PT_B29 PT_HI(19, 18) 44 + #define PT_B30 PT_LO(21, 20) 45 + #define PT_B31 PT_HI(21, 20) 46 + #define PT_B0 PT_LO(23, 22) 47 + #define PT_B1 PT_HI(23, 22) 48 + #define PT_B2 PT_LO(25, 24) 49 + #define PT_B3 PT_HI(25, 24) 50 + #define PT_B4 PT_LO(27, 26) 51 + #define PT_B5 PT_HI(27, 26) 52 + #define PT_B6 PT_LO(29, 28) 53 + #define PT_B7 PT_HI(29, 28) 54 + #define PT_B8 PT_LO(31, 30) 55 + #define PT_B9 PT_HI(31, 30) 56 + #define PT_B10 PT_LO(33, 32) 57 + #define PT_B11 PT_HI(33, 32) 58 + #define PT_B12 PT_LO(35, 34) 59 + #define PT_B13 PT_HI(35, 34) 60 + #define PT_A16 PT_LO(37, 36) 61 + #define PT_A17 PT_HI(37, 36) 62 + #define PT_A18 PT_LO(39, 38) 63 + #define PT_A19 PT_HI(39, 38) 64 + #define PT_A20 PT_LO(41, 40) 65 + #define PT_A21 PT_HI(41, 40) 66 + #define PT_A22 PT_LO(43, 42) 67 + #define PT_A23 PT_HI(43, 42) 68 + #define PT_A24 PT_LO(45, 44) 69 + #define PT_A25 PT_HI(45, 44) 70 + #define PT_A26 PT_LO(47, 46) 71 + #define PT_A27 PT_HI(47, 46) 72 + #define PT_A28 PT_LO(49, 48) 73 + #define PT_A29 PT_HI(49, 48) 74 + #define PT_A30 PT_LO(51, 50) 75 + #define PT_A31 PT_HI(51, 50) 76 + #define PT_A0 PT_LO(53, 52) 77 + #define PT_A1 PT_HI(53, 52) 78 + #define PT_A2 PT_LO(55, 54) 79 + #define PT_A3 PT_HI(55, 54) 80 + #define PT_A4 PT_LO(57, 56) 81 + #define PT_A5 PT_HI(57, 56) 82 + #define PT_A6 PT_LO(59, 58) 83 + #define PT_A7 PT_HI(59, 58) 84 + #define PT_A8 PT_LO(61, 60) 85 + #define PT_A9 PT_HI(61, 60) 86 + #define PT_A10 PT_LO(63, 62) 87 + #define PT_A11 PT_HI(63, 62) 88 + #define PT_A12 PT_LO(65, 64) 89 + #define PT_A13 PT_HI(65, 64) 90 + #define PT_A14 PT_LO(67, 66) 91 + #define PT_A15 PT_HI(67, 66) 92 + #define PT_B14 PT_LO(69, 68) 93 + #define PT_B15 PT_HI(69, 68) 94 + 95 + #define NR_PTREGS 70 96 + 97 + #define PT_DP PT_B14 /* Data Segment Pointer (B14) */ 98 + #define PT_SP PT_B15 /* Stack Pointer (B15) */ 99 + 100 + #define PTRACE_GETFDPIC 31 /* get the ELF fdpic loadmap address */ 101 + 102 + #define PTRACE_GETFDPIC_EXEC 0 /* [addr] request the executable loadmap */ 103 + #define PTRACE_GETFDPIC_INTERP 1 /* [addr] request the interpreter loadmap */ 104 + 105 + #ifndef __ASSEMBLY__ 106 + 107 + #ifdef _BIG_ENDIAN 108 + #define REG_PAIR(odd, even) unsigned long odd; unsigned long even 109 + #else 110 + #define REG_PAIR(odd, even) unsigned long even; unsigned long odd 111 + #endif 112 + 113 + /* 114 + * this struct defines the way the registers are stored on the 115 + * stack during a system call. fields defined with REG_PAIR 116 + * are saved and restored using double-word memory operations 117 + * which means the word ordering of the pair depends on endianess. 118 + */ 119 + struct pt_regs { 120 + REG_PAIR(tsr, orig_a4); 121 + REG_PAIR(rilc, ilc); 122 + REG_PAIR(pc, csr); 123 + 124 + REG_PAIR(b17, b16); 125 + REG_PAIR(b19, b18); 126 + REG_PAIR(b21, b20); 127 + REG_PAIR(b23, b22); 128 + REG_PAIR(b25, b24); 129 + REG_PAIR(b27, b26); 130 + REG_PAIR(b29, b28); 131 + REG_PAIR(b31, b30); 132 + 133 + REG_PAIR(b1, b0); 134 + REG_PAIR(b3, b2); 135 + REG_PAIR(b5, b4); 136 + REG_PAIR(b7, b6); 137 + REG_PAIR(b9, b8); 138 + REG_PAIR(b11, b10); 139 + REG_PAIR(b13, b12); 140 + 141 + REG_PAIR(a17, a16); 142 + REG_PAIR(a19, a18); 143 + REG_PAIR(a21, a20); 144 + REG_PAIR(a23, a22); 145 + REG_PAIR(a25, a24); 146 + REG_PAIR(a27, a26); 147 + REG_PAIR(a29, a28); 148 + REG_PAIR(a31, a30); 149 + 150 + REG_PAIR(a1, a0); 151 + REG_PAIR(a3, a2); 152 + REG_PAIR(a5, a4); 153 + REG_PAIR(a7, a6); 154 + REG_PAIR(a9, a8); 155 + REG_PAIR(a11, a10); 156 + REG_PAIR(a13, a12); 157 + 158 + REG_PAIR(a15, a14); 159 + REG_PAIR(sp, dp); 160 + }; 161 + 162 + #endif /* __ASSEMBLY__ */ 163 + #endif /* _UAPI_ASM_C6X_PTRACE_H */