diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:22:31 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:22:31 +0900 |
| commit | 02a650e2820e19fde8f6a49752027217fdd33d78 (patch) | |
| tree | 92d97b79941c0cee9a1da1e8a21abc7a661aa0f5 /arch | |
| parent | b6897130f0ac8ac33043be736770eb5f58164044 (diff) | |
| parent | 7190632b78de594f3dabe174e9df373bfc790d89 (diff) | |
Merge tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowells/linux-headers
Pull UAPI disintegration for misc arches from David Howells:
"UAPI disintegration for MN10300, FRV and AVR32 arches"
* tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: (Scripted) Disintegrate arch/mn10300/include/asm
UAPI: (Scripted) Disintegrate arch/frv/include/asm
UAPI: (Scripted) Disintegrate arch/avr32/include/asm
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/avr32/include/asm/Kbuild | 3 | ||||
| -rw-r--r-- | arch/avr32/include/asm/param.h | 18 | ||||
| -rw-r--r-- | arch/avr32/include/asm/ptrace.h | 115 | ||||
| -rw-r--r-- | arch/avr32/include/asm/setup.h | 5 | ||||
| -rw-r--r-- | arch/avr32/include/asm/signal.h | 121 | ||||
| -rw-r--r-- | arch/avr32/include/asm/termios.h | 41 | ||||
| -rw-r--r-- | arch/avr32/include/asm/types.h | 6 | ||||
| -rw-r--r-- | arch/avr32/include/asm/unistd.h | 296 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/Kbuild | 32 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/auxvec.h (renamed from arch/avr32/include/asm/auxvec.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/bitsperlong.h (renamed from arch/avr32/include/asm/bitsperlong.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/byteorder.h (renamed from arch/avr32/include/asm/byteorder.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/cachectl.h (renamed from arch/avr32/include/asm/cachectl.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/errno.h (renamed from arch/avr32/include/asm/errno.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/fcntl.h (renamed from arch/avr32/include/asm/fcntl.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/ioctl.h (renamed from arch/avr32/include/asm/ioctl.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/ioctls.h (renamed from arch/avr32/include/asm/ioctls.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/ipcbuf.h (renamed from arch/avr32/include/asm/ipcbuf.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/kvm_para.h (renamed from arch/avr32/include/asm/kvm_para.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/mman.h (renamed from arch/avr32/include/asm/mman.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/msgbuf.h (renamed from arch/avr32/include/asm/msgbuf.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/param.h | 18 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/poll.h (renamed from arch/avr32/include/asm/poll.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/posix_types.h (renamed from arch/avr32/include/asm/posix_types.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/ptrace.h | 126 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/resource.h (renamed from arch/avr32/include/asm/resource.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/sembuf.h (renamed from arch/avr32/include/asm/sembuf.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/setup.h | 17 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/shmbuf.h (renamed from arch/avr32/include/asm/shmbuf.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/sigcontext.h (renamed from arch/avr32/include/asm/sigcontext.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/siginfo.h (renamed from arch/avr32/include/asm/siginfo.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/signal.h | 128 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/socket.h (renamed from arch/avr32/include/asm/socket.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/sockios.h (renamed from arch/avr32/include/asm/sockios.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/stat.h (renamed from arch/avr32/include/asm/stat.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/statfs.h (renamed from arch/avr32/include/asm/statfs.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/swab.h (renamed from arch/avr32/include/asm/swab.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/termbits.h (renamed from arch/avr32/include/asm/termbits.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/termios.h | 50 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/types.h | 8 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/unistd.h | 305 | ||||
| -rw-r--r-- | arch/frv/include/asm/Kbuild | 3 | ||||
| -rw-r--r-- | arch/frv/include/asm/ptrace.h | 51 | ||||
| -rw-r--r-- | arch/frv/include/asm/setup.h | 7 | ||||
| -rw-r--r-- | arch/frv/include/asm/signal.h | 33 | ||||
| -rw-r--r-- | arch/frv/include/asm/termios.h | 46 | ||||
| -rw-r--r-- | arch/frv/include/asm/types.h | 6 | ||||
| -rw-r--r-- | arch/frv/include/asm/unistd.h | 346 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/Kbuild | 32 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/auxvec.h (renamed from arch/frv/include/asm/auxvec.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/bitsperlong.h (renamed from arch/frv/include/asm/bitsperlong.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/byteorder.h (renamed from arch/frv/include/asm/byteorder.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/errno.h (renamed from arch/frv/include/asm/errno.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/fcntl.h (renamed from arch/frv/include/asm/fcntl.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/ioctl.h (renamed from arch/frv/include/asm/ioctl.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/ioctls.h (renamed from arch/frv/include/asm/ioctls.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/ipcbuf.h (renamed from arch/frv/include/asm/ipcbuf.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/kvm_para.h (renamed from arch/frv/include/asm/kvm_para.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/mman.h (renamed from arch/frv/include/asm/mman.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/msgbuf.h (renamed from arch/frv/include/asm/msgbuf.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/param.h (renamed from arch/frv/include/asm/param.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/poll.h (renamed from arch/frv/include/asm/poll.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/posix_types.h (renamed from arch/frv/include/asm/posix_types.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/ptrace.h | 60 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/registers.h (renamed from arch/frv/include/asm/registers.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/resource.h (renamed from arch/frv/include/asm/resource.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/sembuf.h (renamed from arch/frv/include/asm/sembuf.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/setup.h | 18 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/shmbuf.h (renamed from arch/frv/include/asm/shmbuf.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/sigcontext.h (renamed from arch/frv/include/asm/sigcontext.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/siginfo.h (renamed from arch/frv/include/asm/siginfo.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/signal.h | 36 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/socket.h (renamed from arch/frv/include/asm/socket.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/sockios.h (renamed from arch/frv/include/asm/sockios.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/stat.h (renamed from arch/frv/include/asm/stat.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/statfs.h (renamed from arch/frv/include/asm/statfs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/swab.h (renamed from arch/frv/include/asm/swab.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/termbits.h (renamed from arch/frv/include/asm/termbits.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/termios.h | 46 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/types.h | 11 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/unistd.h | 348 | ||||
| -rw-r--r-- | arch/mn10300/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/mn10300/include/asm/ptrace.h | 72 | ||||
| -rw-r--r-- | arch/mn10300/include/asm/setup.h | 4 | ||||
| -rw-r--r-- | arch/mn10300/include/asm/signal.h | 121 | ||||
| -rw-r--r-- | arch/mn10300/include/asm/termios.h | 81 | ||||
| -rw-r--r-- | arch/mn10300/include/asm/types.h | 5 | ||||
| -rw-r--r-- | arch/mn10300/include/asm/unistd.h | 342 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/Kbuild | 31 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/auxvec.h (renamed from arch/mn10300/include/asm/auxvec.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/bitsperlong.h (renamed from arch/mn10300/include/asm/bitsperlong.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/byteorder.h (renamed from arch/mn10300/include/asm/byteorder.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/errno.h (renamed from arch/mn10300/include/asm/errno.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/fcntl.h (renamed from arch/mn10300/include/asm/fcntl.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/ioctl.h (renamed from arch/mn10300/include/asm/ioctl.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/ioctls.h (renamed from arch/mn10300/include/asm/ioctls.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/ipcbuf.h (renamed from arch/mn10300/include/asm/ipcbuf.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/kvm_para.h (renamed from arch/mn10300/include/asm/kvm_para.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/mman.h (renamed from arch/mn10300/include/asm/mman.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/msgbuf.h (renamed from arch/mn10300/include/asm/msgbuf.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/param.h (renamed from arch/mn10300/include/asm/param.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/poll.h (renamed from arch/mn10300/include/asm/poll.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/posix_types.h (renamed from arch/mn10300/include/asm/posix_types.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/ptrace.h | 84 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/resource.h (renamed from arch/mn10300/include/asm/resource.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/sembuf.h (renamed from arch/mn10300/include/asm/sembuf.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/setup.h | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/shmbuf.h (renamed from arch/mn10300/include/asm/shmbuf.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/sigcontext.h (renamed from arch/mn10300/include/asm/sigcontext.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/siginfo.h (renamed from arch/mn10300/include/asm/siginfo.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/signal.h | 131 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/socket.h (renamed from arch/mn10300/include/asm/socket.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/sockios.h (renamed from arch/mn10300/include/asm/sockios.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/stat.h (renamed from arch/mn10300/include/asm/stat.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/statfs.h (renamed from arch/mn10300/include/asm/statfs.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/swab.h (renamed from arch/mn10300/include/asm/swab.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/termbits.h (renamed from arch/mn10300/include/asm/termbits.h) | 0 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/termios.h | 83 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/types.h | 11 | ||||
| -rw-r--r-- | arch/mn10300/include/uapi/asm/unistd.h | 354 |
120 files changed, 1950 insertions, 1702 deletions
diff --git a/arch/avr32/include/asm/Kbuild b/arch/avr32/include/asm/Kbuild index be0433ee5a8e..4807ded352c5 100644 --- a/arch/avr32/include/asm/Kbuild +++ b/arch/avr32/include/asm/Kbuild @@ -1,6 +1,3 @@ -include include/asm-generic/Kbuild.asm generic-y += clkdev.h generic-y += exec.h - -header-y += cachectl.h diff --git a/arch/avr32/include/asm/param.h b/arch/avr32/include/asm/param.h index 34bc8d4c3b29..009a167aea1f 100644 --- a/arch/avr32/include/asm/param.h +++ b/arch/avr32/include/asm/param.h @@ -1,23 +1,9 @@ #ifndef __ASM_AVR32_PARAM_H #define __ASM_AVR32_PARAM_H -#ifdef __KERNEL__ +#include <uapi/asm/param.h> + # define HZ CONFIG_HZ # define USER_HZ 100 /* User interfaces are in "ticks" */ # define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */ -#endif - -#ifndef HZ -# define HZ 100 -#endif - -/* TODO: Should be configurable */ -#define EXEC_PAGESIZE 4096 - -#ifndef NOGROUP -# define NOGROUP (-1) -#endif - -#define MAXHOSTNAMELEN 64 - #endif /* __ASM_AVR32_PARAM_H */ diff --git a/arch/avr32/include/asm/ptrace.h b/arch/avr32/include/asm/ptrace.h index c67a007f672a..8d3c412fc65f 100644 --- a/arch/avr32/include/asm/ptrace.h +++ b/arch/avr32/include/asm/ptrace.h @@ -8,119 +8,9 @@ #ifndef __ASM_AVR32_PTRACE_H #define __ASM_AVR32_PTRACE_H -#define PTRACE_GETREGS 12 -#define PTRACE_SETREGS 13 - -/* - * Status Register bits - */ -#define SR_H 0x20000000 -#define SR_J 0x10000000 -#define SR_DM 0x08000000 -#define SR_D 0x04000000 -#define MODE_NMI 0x01c00000 -#define MODE_EXCEPTION 0x01800000 -#define MODE_INT3 0x01400000 -#define MODE_INT2 0x01000000 -#define MODE_INT1 0x00c00000 -#define MODE_INT0 0x00800000 -#define MODE_SUPERVISOR 0x00400000 -#define MODE_USER 0x00000000 -#define MODE_MASK 0x01c00000 -#define SR_EM 0x00200000 -#define SR_I3M 0x00100000 -#define SR_I2 |