diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-05 13:09:12 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-05 13:09:12 -0500 |
commit | 6d06721570aa0c38d886e3036796d59983963a27 (patch) | |
tree | d674cf54e26837bee89095c211ffa362c8546f03 /arch/sh/include/asm | |
parent | 148a8698763130c96004ef419b5f0d44a93d413c (diff) | |
parent | 54ec52b6dd3b0ba4bc4eb97e7e1b2534705b326c (diff) |
Merge branch 'depends/tty' into next/headers
Merging in Greg's tty tree including a cleanup patch needed by the OMAP serial
header cleanups.
* depends/tty: (305 commits)
tty/serial/8250: Make omap hardware workarounds local to 8250.h
serial/8250/8250_early: Prevent rounding error in uartclk
serial: samsung: use clk_prepare_enable and clk_disable_unprepare
TTY: Report warning when low_latency flag is wrongly used
console: use might_sleep in console_lock
TTY: move tty buffers to tty_port
TTY: add port -> tty link
TTY: tty_buffer, cache pointer to tty->buf
TTY: move TTY_FLUSH* flags to tty_port
TTY: n_tty, propagate n_tty_data
TTY: move ldisc data from tty_struct: locks
TTY: move ldisc data from tty_struct: read_* and echo_* and canon_* stuff
TTY: move ldisc data from tty_struct: bitmaps
TTY: move ldisc data from tty_struct: simple members
TTY: n_tty, add ldisc data to n_tty
TTY: audit, stop accessing tty->icount
TTY: n_tty, remove bogus checks
TTY: n_tty, simplify read_buf+echo_buf allocation
TTY: hci_ldisc, remove invalid check in open
TTY: ldisc, wait for idle ldisc in release
...
Diffstat (limited to 'arch/sh/include/asm')
-rw-r--r-- | arch/sh/include/asm/Kbuild | 11 | ||||
-rw-r--r-- | arch/sh/include/asm/auxvec.h | 38 | ||||
-rw-r--r-- | arch/sh/include/asm/byteorder.h | 10 | ||||
-rw-r--r-- | arch/sh/include/asm/cachectl.h | 19 | ||||
-rw-r--r-- | arch/sh/include/asm/cpu-features.h | 26 | ||||
-rw-r--r-- | arch/sh/include/asm/hw_breakpoint.h | 4 | ||||
-rw-r--r-- | arch/sh/include/asm/ioctls.h | 107 | ||||
-rw-r--r-- | arch/sh/include/asm/posix_types.h | 8 | ||||
-rw-r--r-- | arch/sh/include/asm/posix_types_32.h | 22 | ||||
-rw-r--r-- | arch/sh/include/asm/posix_types_64.h | 28 | ||||
-rw-r--r-- | arch/sh/include/asm/ptrace.h | 34 | ||||
-rw-r--r-- | arch/sh/include/asm/ptrace_32.h | 75 | ||||
-rw-r--r-- | arch/sh/include/asm/ptrace_64.h | 12 | ||||
-rw-r--r-- | arch/sh/include/asm/setup.h | 5 | ||||
-rw-r--r-- | arch/sh/include/asm/sigcontext.h | 40 | ||||
-rw-r--r-- | arch/sh/include/asm/signal.h | 15 | ||||
-rw-r--r-- | arch/sh/include/asm/sockios.h | 14 | ||||
-rw-r--r-- | arch/sh/include/asm/stat.h | 138 | ||||
-rw-r--r-- | arch/sh/include/asm/swab.h | 59 | ||||
-rw-r--r-- | arch/sh/include/asm/types.h | 5 | ||||
-rw-r--r-- | arch/sh/include/asm/unistd.h | 9 | ||||
-rw-r--r-- | arch/sh/include/asm/unistd_32.h | 384 | ||||
-rw-r--r-- | arch/sh/include/asm/unistd_64.h | 404 |
23 files changed, 10 insertions, 1457 deletions
diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild index 86eadceff097..29f83beeef7a 100644 --- a/arch/sh/include/asm/Kbuild +++ b/arch/sh/include/asm/Kbuild | |||
@@ -1,4 +1,3 @@ | |||
1 | include include/asm-generic/Kbuild.asm | ||
2 | 1 | ||
3 | generic-y += bitsperlong.h | 2 | generic-y += bitsperlong.h |
4 | generic-y += cputime.h | 3 | generic-y += cputime.h |
@@ -34,13 +33,3 @@ generic-y += termbits.h | |||
34 | generic-y += termios.h | 33 | generic-y += termios.h |
35 | generic-y += ucontext.h | 34 | generic-y += ucontext.h |
36 | generic-y += xor.h | 35 | generic-y += xor.h |
37 | |||
38 | header-y += cachectl.h | ||
39 | header-y += cpu-features.h | ||
40 | header-y += hw_breakpoint.h | ||
41 | header-y += posix_types_32.h | ||
42 | header-y += posix_types_64.h | ||
43 | header-y += ptrace_32.h | ||
44 | header-y += ptrace_64.h | ||
45 | header-y += unistd_32.h | ||
46 | header-y += unistd_64.h | ||
diff --git a/arch/sh/include/asm/auxvec.h b/arch/sh/include/asm/auxvec.h deleted file mode 100644 index 8bcc51af9367..000000000000 --- a/arch/sh/include/asm/auxvec.h +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | #ifndef __ASM_SH_AUXVEC_H | ||
2 | #define __ASM_SH_AUXVEC_H | ||
3 | |||
4 | /* | ||
5 | * Architecture-neutral AT_ values in 0-17, leave some room | ||
6 | * for more of them. | ||
7 | */ | ||
8 | |||
9 | /* | ||
10 | * This entry gives some information about the FPU initialization | ||
11 | * performed by the kernel. | ||
12 | */ | ||
13 | #define AT_FPUCW 18 /* Used FPU control word. */ | ||
14 | |||
15 | #if defined(CONFIG_VSYSCALL) || !defined(__KERNEL__) | ||
16 | /* | ||
17 | * Only define this in the vsyscall case, the entry point to | ||
18 | * the vsyscall page gets placed here. The kernel will attempt | ||
19 | * to build a gate VMA we don't care about otherwise.. | ||
20 | */ | ||
21 | #define AT_SYSINFO_EHDR 33 | ||
22 | #endif | ||
23 | |||
24 | /* | ||
25 | * More complete cache descriptions than AT_[DIU]CACHEBSIZE. If the | ||
26 | * value is -1, then the cache doesn't exist. Otherwise: | ||
27 | * | ||
28 | * bit 0-3: Cache set-associativity; 0 means fully associative. | ||
29 | * bit 4-7: Log2 of cacheline size. | ||
30 | * bit 8-31: Size of the entire cache >> 8. | ||
31 | */ | ||
32 | #define AT_L1I_CACHESHAPE 34 | ||
33 | #define AT_L1D_CACHESHAPE 35 | ||
34 | #define AT_L2_CACHESHAPE 36 | ||
35 | |||
36 | #define AT_VECTOR_SIZE_ARCH 5 /* entries in ARCH_DLINFO */ | ||
37 | |||
38 | #endif /* __ASM_SH_AUXVEC_H */ | ||
diff --git a/arch/sh/include/asm/byteorder.h b/arch/sh/include/asm/byteorder.h deleted file mode 100644 index db2f5d7cb17d..000000000000 --- a/arch/sh/include/asm/byteorder.h +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | #ifndef __ASM_SH_BYTEORDER_H | ||
2 | #define __ASM_SH_BYTEORDER_H | ||
3 | |||
4 | #ifdef __LITTLE_ENDIAN__ | ||
5 | #include <linux/byteorder/little_endian.h> | ||
6 | #else | ||
7 | #include <linux/byteorder/big_endian.h> | ||
8 | #endif | ||
9 | |||
10 | #endif /* __ASM_SH_BYTEORDER_H */ | ||
diff --git a/arch/sh/include/asm/cachectl.h b/arch/sh/include/asm/cachectl.h deleted file mode 100644 index 6ffb4b7a212e..000000000000 --- a/arch/sh/include/asm/cachectl.h +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | #ifndef _SH_CACHECTL_H | ||
2 | #define _SH_CACHECTL_H | ||
3 | |||
4 | /* Definitions for the cacheflush system call. */ | ||
5 | |||
6 | #define CACHEFLUSH_D_INVAL 0x1 /* invalidate (without write back) */ | ||
7 | #define CACHEFLUSH_D_WB 0x2 /* write back (without invalidate) */ | ||
8 | #define CACHEFLUSH_D_PURGE 0x3 /* writeback and invalidate */ | ||
9 | |||
10 | #define CACHEFLUSH_I 0x4 | ||
11 | |||
12 | /* | ||
13 | * Options for cacheflush system call | ||
14 | */ | ||
15 | #define ICACHE CACHEFLUSH_I /* flush instruction cache */ | ||
16 | #define DCACHE CACHEFLUSH_D_PURGE /* writeback and flush data cache */ | ||
17 | #define BCACHE (ICACHE|DCACHE) /* flush both caches */ | ||
18 | |||
19 | #endif /* _SH_CACHECTL_H */ | ||
diff --git a/arch/sh/include/asm/cpu-features.h b/arch/sh/include/asm/cpu-features.h deleted file mode 100644 index 694abe490edb..000000000000 --- a/arch/sh/include/asm/cpu-features.h +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | #ifndef __ASM_SH_CPU_FEATURES_H | ||
2 | #define __ASM_SH_CPU_FEATURES_H | ||
3 | |||
4 | /* | ||
5 | * Processor flags | ||
6 | * | ||
7 | * Note: When adding a new flag, keep cpu_flags[] in | ||
8 | * arch/sh/kernel/setup.c in sync so symbolic name | ||
9 | * mapping of the processor flags has a chance of being | ||
10 | * reasonably accurate. | ||
11 | * | ||
12 | * These flags are also available through the ELF | ||
13 | * auxiliary vector as AT_HWCAP. | ||
14 | */ | ||
15 | #define CPU_HAS_FPU 0x0001 /* Hardware FPU support */ | ||
16 | #define CPU_HAS_P2_FLUSH_BUG 0x0002 /* Need to flush the cache in P2 area */ | ||
17 | #define CPU_HAS_MMU_PAGE_ASSOC 0x0004 /* SH3: TLB way selection bit support */ | ||
18 | #define CPU_HAS_DSP 0x0008 /* SH-DSP: DSP support */ | ||
19 | #define CPU_HAS_PERF_COUNTER 0x0010 /* Hardware performance counters */ | ||
20 | #define CPU_HAS_PTEA 0x0020 /* PTEA register */ | ||
21 | #define CPU_HAS_LLSC 0x0040 /* movli.l/movco.l */ | ||
22 | #define CPU_HAS_L2_CACHE 0x0080 /* Secondary cache / URAM */ | ||
23 | #define CPU_HAS_OP32 0x0100 /* 32-bit instruction support */ | ||
24 | #define CPU_HAS_PTEAEX 0x0200 /* PTE ASID Extension support */ | ||
25 | |||
26 | #endif /* __ASM_SH_CPU_FEATURES_H */ | ||
diff --git a/arch/sh/include/asm/hw_breakpoint.h b/arch/sh/include/asm/hw_breakpoint.h index 89890f61a7b9..ec9ad593c3da 100644 --- a/arch/sh/include/asm/hw_breakpoint.h +++ b/arch/sh/include/asm/hw_breakpoint.h | |||
@@ -1,7 +1,8 @@ | |||
1 | #ifndef __ASM_SH_HW_BREAKPOINT_H | 1 | #ifndef __ASM_SH_HW_BREAKPOINT_H |
2 | #define __ASM_SH_HW_BREAKPOINT_H | 2 | #define __ASM_SH_HW_BREAKPOINT_H |
3 | 3 | ||
4 | #ifdef __KERNEL__ | 4 | #include <uapi/asm/hw_breakpoint.h> |
5 | |||
5 | #define __ARCH_HW_BREAKPOINT_H | 6 | #define __ARCH_HW_BREAKPOINT_H |
6 | 7 | ||
7 | #include <linux/kdebug.h> | 8 | #include <linux/kdebug.h> |
@@ -66,5 +67,4 @@ extern int register_sh_ubc(struct sh_ubc *); | |||
66 | 67 | ||
67 | extern struct pmu perf_ops_bp; | 68 | extern struct pmu perf_ops_bp; |
68 | 69 | ||
69 | #endif /* __KERNEL__ */ | ||
70 | #endif /* __ASM_SH_HW_BREAKPOINT_H */ | 70 | #endif /* __ASM_SH_HW_BREAKPOINT_H */ |
diff --git a/arch/sh/include/asm/ioctls.h b/arch/sh/include/asm/ioctls.h deleted file mode 100644 index a6769f352bf6..000000000000 --- a/arch/sh/include/asm/ioctls.h +++ /dev/null | |||
@@ -1,107 +0,0 @@ | |||
1 | #ifndef __ASM_SH_IOCTLS_H | ||
2 | #define __ASM_SH_IOCTLS_H | ||
3 | |||
4 | #include <asm/ioctl.h> | ||
5 | |||
6 | #define FIOCLEX _IO('f', 1) | ||
7 | #define FIONCLEX _IO('f', 2) | ||
8 | #define FIOASYNC _IOW('f', 125, int) | ||
9 | #define FIONBIO _IOW('f', 126, int) | ||
10 | #define FIONREAD _IOR('f', 127, int) | ||
11 | #define TIOCINQ FIONREAD | ||
12 | #define FIOQSIZE _IOR('f', 128, loff_t) | ||
13 | |||
14 | #define TCGETS 0x5401 | ||
15 | #define TCSETS 0x5402 | ||
16 | #define TCSETSW 0x5403 | ||
17 | #define TCSETSF 0x5404 | ||
18 | |||
19 | #define TCGETA 0x80127417 /* _IOR('t', 23, struct termio) */ | ||
20 | #define TCSETA 0x40127418 /* _IOW('t', 24, struct termio) */ | ||
21 | #define TCSETAW 0x40127419 /* _IOW('t', 25, struct termio) */ | ||
22 | #define TCSETAF 0x4012741C /* _IOW('t', 28, struct termio) */ | ||
23 | |||
24 | #define TCSBRK _IO('t', 29) | ||
25 | #define TCXONC _IO('t', 30) | ||
26 | #define TCFLSH _IO('t', 31) | ||
27 | |||
28 | #define TIOCSWINSZ 0x40087467 /* _IOW('t', 103, struct winsize) */ | ||
29 | #define TIOCGWINSZ 0x80087468 /* _IOR('t', 104, struct winsize) */ | ||
30 | #define TIOCSTART _IO('t', 110) /* start output, like ^Q */ | ||
31 | #define TIOCSTOP _IO('t', 111) /* stop output, like ^S */ | ||
32 | #define TIOCOUTQ _IOR('t', 115, int) /* output queue size */ | ||
33 | |||
34 | #define TIOCSPGRP _IOW('t', 118, int) | ||
35 | #define TIOCGPGRP _IOR('t', 119, int) | ||
36 | |||
37 | #define TIOCEXCL _IO('T', 12) /* 0x540C */ | ||
38 | #define TIOCNXCL _IO('T', 13) /* 0x540D */ | ||
39 | #define TIOCSCTTY _IO('T', 14) /* 0x540E */ | ||
40 | |||
41 | #define TIOCSTI _IOW('T', 18, char) /* 0x5412 */ | ||
42 | #define TIOCMGET _IOR('T', 21, unsigned int) /* 0x5415 */ | ||
43 | #define TIOCMBIS _IOW('T', 22, unsigned int) /* 0x5416 */ | ||
44 | #define TIOCMBIC _IOW('T', 23, unsigned int) /* 0x5417 */ | ||
45 | #define TIOCMSET _IOW('T', 24, unsigned int) /* 0x5418 */ | ||
46 | # define TIOCM_LE 0x001 | ||
47 | # define TIOCM_DTR 0x002 | ||
48 | # define TIOCM_RTS 0x004 | ||
49 | # define TIOCM_ST 0x008 | ||
50 | # define TIOCM_SR 0x010 | ||
51 | # define TIOCM_CTS 0x020 | ||
52 | # define TIOCM_CAR 0x040 | ||
53 | # define TIOCM_RNG 0x080 | ||
54 | # define TIOCM_DSR 0x100 | ||
55 | # define TIOCM_CD TIOCM_CAR | ||
56 | # define TIOCM_RI TIOCM_RNG | ||
57 | |||
58 | #define TIOCGSOFTCAR _IOR('T', 25, unsigned int) /* 0x5419 */ | ||
59 | #define TIOCSSOFTCAR _IOW('T', 26, unsigned int) /* 0x541A */ | ||
60 | #define TIOCLINUX _IOW('T', 28, char) /* 0x541C */ | ||
61 | #define TIOCCONS _IO('T', 29) /* 0x541D */ | ||
62 | #define TIOCGSERIAL 0x803C541E /* _IOR('T', 30, struct serial_struct) 0x541E */ | ||
63 | #define TIOCSSERIAL 0x403C541F /* _IOW('T', 31, struct serial_struct) 0x541F */ | ||
64 | #define TIOCPKT _IOW('T', 32, int) /* 0x5420 */ | ||
65 | # define TIOCPKT_DATA 0 | ||
66 | # define TIOCPKT_FLUSHREAD 1 | ||
67 | # define TIOCPKT_FLUSHWRITE 2 | ||
68 | # define TIOCPKT_STOP 4 | ||
69 | # define TIOCPKT_START 8 | ||
70 | # define TIOCPKT_NOSTOP 16 | ||
71 | # define TIOCPKT_DOSTOP 32 | ||
72 | # define TIOCPKT_IOCTL 64 | ||
73 | |||
74 | |||
75 | #define TIOCNOTTY _IO('T', 34) /* 0x5422 */ | ||
76 | #define TIOCSETD _IOW('T', 35, int) /* 0x5423 */ | ||
77 | #define TIOCGETD _IOR('T', 36, int) /* 0x5424 */ | ||
78 | #define TCSBRKP _IOW('T', 37, int) /* 0x5425 */ /* Needed for POSIX tcsendbreak() */ | ||
79 | #define TIOCSBRK _IO('T', 39) /* 0x5427 */ /* BSD compatibility */ | ||
80 | #define TIOCCBRK _IO('T', 40) /* 0x5428 */ /* BSD compatibility */ | ||
81 | #define TIOCGSID _IOR('T', 41, pid_t) /* 0x5429 */ /* Return the session ID of FD */ | ||
82 | #define TCGETS2 _IOR('T', 42, struct termios2) | ||
83 | #define TCSETS2 _IOW('T', 43, struct termios2) | ||
84 | #define TCSETSW2 _IOW('T', 44, struct termios2) | ||
85 | #define TCSETSF2 _IOW('T', 45, struct termios2) | ||
86 | #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ | ||
87 | #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ | ||
88 | #define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get primary device node of /dev/console */ | ||
89 | #define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */ | ||
90 | #define TIOCVHANGUP _IO('T', 0x37) | ||
91 | |||
92 | #define TIOCSERCONFIG _IO('T', 83) /* 0x5453 */ | ||
93 | #define TIOCSERGWILD _IOR('T', 84, int) /* 0x5454 */ | ||
94 | #define TIOCSERSWILD _IOW('T', 85, int) /* 0x5455 */ | ||
95 | #define TIOCGLCKTRMIOS 0x5456 | ||
96 | #define TIOCSLCKTRMIOS 0x5457 | ||
97 | #define TIOCSERGSTRUCT 0x80d85458 /* _IOR('T', 88, struct async_struct) 0x5458 */ /* For debugging only */ | ||
98 | #define TIOCSERGETLSR _IOR('T', 89, unsigned int) /* 0x5459 */ /* Get line status register */ | ||
99 | /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ | ||
100 | # define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ | ||
101 | #define TIOCSERGETMULTI 0x80A8545A /* _IOR('T', 90, struct serial_multiport_struct) 0x545A */ /* Get multiport config */ | ||
102 | #define TIOCSERSETMULTI 0x40A8545B /* _IOW('T', 91, struct serial_multiport_struct) 0x545B */ /* Set multiport config */ | ||
103 | |||
104 | #define TIOCMIWAIT _IO('T', 92) /* 0x545C */ /* wait for a change on serial input line(s) */ | ||
105 | #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ | ||
106 | |||
107 | #endif /* __ASM_SH_IOCTLS_H */ | ||
diff --git a/arch/sh/include/asm/posix_types.h b/arch/sh/include/asm/posix_types.h index f08449bcbde7..1aa781079b1e 100644 --- a/arch/sh/include/asm/posix_types.h +++ b/arch/sh/include/asm/posix_types.h | |||
@@ -1,13 +1,5 @@ | |||
1 | #ifdef __KERNEL__ | ||
2 | # ifdef CONFIG_SUPERH32 | 1 | # ifdef CONFIG_SUPERH32 |
3 | # include <asm/posix_types_32.h> | 2 | # include <asm/posix_types_32.h> |
4 | # else | 3 | # else |
5 | # include <asm/posix_types_64.h> | 4 | # include <asm/posix_types_64.h> |
6 | # endif | 5 | # endif |
7 | #else | ||
8 | # ifdef __SH5__ | ||
9 | # include <asm/posix_types_64.h> | ||
10 | # else | ||
11 | # include <asm/posix_types_32.h> | ||
12 | # endif | ||
13 | #endif /* __KERNEL__ */ | ||
diff --git a/arch/sh/include/asm/posix_types_32.h b/arch/sh/include/asm/posix_types_32.h deleted file mode 100644 index ba0bdc423b07..000000000000 --- a/arch/sh/include/asm/posix_types_32.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | #ifndef __ASM_SH_POSIX_TYPES_32_H | ||
2 | #define __ASM_SH_POSIX_TYPES_32_H | ||
3 | |||
4 | typedef unsigned short __kernel_mode_t; | ||
5 | #define __kernel_mode_t __kernel_mode_t | ||
6 | typedef unsigned short __kernel_ipc_pid_t; | ||
7 | #define __kernel_ipc_pid_t __kernel_ipc_pid_t | ||
8 | typedef unsigned short __kernel_uid_t; | ||
9 | #define __kernel_uid_t __kernel_uid_t | ||
10 | typedef unsigned short __kernel_gid_t; | ||
11 | #define __kernel_gid_t __kernel_gid_t | ||
12 | |||
13 | typedef unsigned short __kernel_old_uid_t; | ||
14 | #define __kernel_old_uid_t __kernel_old_uid_t | ||
15 | typedef unsigned short __kernel_old_gid_t; | ||
16 | #define __kernel_old_gid_t __kernel_old_gid_t | ||
17 | typedef unsigned short __kernel_old_dev_t; | ||
18 | #define __kernel_old_dev_t __kernel_old_dev_t | ||
19 | |||
20 | #include <asm-generic/posix_types.h> | ||
21 | |||
22 | #endif /* __ASM_SH_POSIX_TYPES_32_H */ | ||
diff --git a/arch/sh/include/asm/posix_types_64.h b/arch/sh/include/asm/posix_types_64.h deleted file mode 100644 index 244f7e950e17..000000000000 --- a/arch/sh/include/asm/posix_types_64.h +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | #ifndef __ASM_SH_POSIX_TYPES_64_H | ||
2 | #define __ASM_SH_POSIX_TYPES_64_H | ||
3 | |||
4 | typedef unsigned short __kernel_mode_t; | ||
5 | #define __kernel_mode_t __kernel_mode_t | ||
6 | typedef unsigned short __kernel_ipc_pid_t; | ||
7 | #define __kernel_ipc_pid_t __kernel_ipc_pid_t | ||
8 | typedef unsigned short __kernel_uid_t; | ||
9 | #define __kernel_uid_t __kernel_uid_t | ||
10 | typedef unsigned short __kernel_gid_t; | ||
11 | #define __kernel_gid_t __kernel_gid_t | ||
12 | typedef long unsigned int __kernel_size_t; | ||
13 | #define __kernel_size_t __kernel_size_t | ||
14 | typedef int __kernel_ssize_t; | ||
15 | #define __kernel_ssize_t __kernel_ssize_t | ||
16 | typedef int __kernel_ptrdiff_t; | ||
17 | #define __kernel_ptrdiff_t __kernel_ptrdiff_t | ||
18 | |||
19 | typedef unsigned short __kernel_old_uid_t; | ||
20 | #define __kernel_old_uid_t __kernel_old_uid_t | ||
21 | typedef unsigned short __kernel_old_gid_t; | ||
22 | #define __kernel_old_gid_t __kernel_old_gid_t | ||
23 | typedef unsigned short __kernel_old_dev_t; | ||
24 | #define __kernel_old_dev_t __kernel_old_dev_t | ||
25 | |||
26 | #include <asm-generic/posix_types.h> | ||
27 | |||
28 | #endif /* __ASM_SH_POSIX_TYPES_64_H */ | ||
diff --git a/arch/sh/include/asm/ptrace.h b/arch/sh/include/asm/ptrace.h index a4a38dff997a..2506c7db76b7 100644 --- a/arch/sh/include/asm/ptrace.h +++ b/arch/sh/include/asm/ptrace.h | |||
@@ -1,42 +1,16 @@ | |||
1 | #ifndef __ASM_SH_PTRACE_H | ||
2 | #define __ASM_SH_PTRACE_H | ||
3 | |||
4 | /* | 1 | /* |
5 | * Copyright (C) 1999, 2000 Niibe Yutaka | 2 | * Copyright (C) 1999, 2000 Niibe Yutaka |
6 | */ | 3 | */ |
4 | #ifndef __ASM_SH_PTRACE_H | ||
5 | #define __ASM_SH_PTRACE_H | ||
7 | 6 | ||
8 | #define PTRACE_GETREGS 12 /* General registers */ | ||
9 | #define PTRACE_SETREGS 13 | ||
10 | |||
11 | #define PTRACE_GETFPREGS 14 /* FPU registers */ | ||
12 | #define PTRACE_SETFPREGS 15 | ||
13 | |||
14 | #define PTRACE_GETFDPIC 31 /* get the ELF fdpic loadmap address */ | ||
15 | |||
16 | #define PTRACE_GETFDPIC_EXEC 0 /* [addr] request the executable loadmap */ | ||
17 | #define PTRACE_GETFDPIC_INTERP 1 /* [addr] request the interpreter loadmap */ | ||
18 | |||
19 | #define PTRACE_GETDSPREGS 55 /* DSP registers */ | ||
20 | #define PTRACE_SETDSPREGS 56 | ||
21 | |||
22 | #define PT_TEXT_END_ADDR 240 | ||
23 | #define PT_TEXT_ADDR 244 /* &(struct user)->start_code */ | ||
24 | #define PT_DATA_ADDR 248 /* &(struct user)->start_data */ | ||
25 | #define PT_TEXT_LEN 252 | ||
26 | |||
27 | #if defined(__SH5__) || defined(CONFIG_CPU_SH5) | ||
28 | #include <asm/ptrace_64.h> | ||
29 | #else | ||
30 | #include <asm/ptrace_32.h> | ||
31 | #endif | ||
32 | |||
33 | #ifdef __KERNEL__ | ||
34 | 7 | ||
35 | #include <linux/stringify.h> | 8 | #include <linux/stringify.h> |
36 | #include <linux/stddef.h> | 9 | #include <linux/stddef.h> |
37 | #include <linux/thread_info.h> | 10 | #include <linux/thread_info.h> |
38 | #include <asm/addrspace.h> | 11 | #include <asm/addrspace.h> |
39 | #include <asm/page.h> | 12 | #include <asm/page.h> |
13 | #include <uapi/asm/ptrace.h> | ||
40 | 14 | ||
41 | #define user_mode(regs) (((regs)->sr & 0x40000000)==0) | 15 | #define user_mode(regs) (((regs)->sr & 0x40000000)==0) |
42 | #define kernel_stack_pointer(_regs) ((unsigned long)(_regs)->regs[15]) | 16 | #define kernel_stack_pointer(_regs) ((unsigned long)(_regs)->regs[15]) |
@@ -140,6 +114,4 @@ static inline unsigned long profile_pc(struct pt_regs *regs) | |||
140 | #define profile_pc profile_pc | 114 | #define profile_pc profile_pc |
141 | 115 | ||
142 | #include <asm-generic/ptrace.h> | 116 | #include <asm-generic/ptrace.h> |
143 | #endif /* __KERNEL__ */ | ||
144 | |||
145 | #endif /* __ASM_SH_PTRACE_H */ | 117 | #endif /* __ASM_SH_PTRACE_H */ |
diff --git a/arch/sh/include/asm/ptrace_32.h b/arch/sh/include/asm/ptrace_32.h index 2d3e906aa722..1dd4480c5363 100644 --- a/arch/sh/include/asm/ptrace_32.h +++ b/arch/sh/include/asm/ptrace_32.h | |||
@@ -1,79 +1,8 @@ | |||
1 | #ifndef __ASM_SH_PTRACE_32_H | 1 | #ifndef __ASM_SH_PTRACE_32_H |
2 | #define __ASM_SH_PTRACE_32_H | 2 | #define __ASM_SH_PTRACE_32_H |
3 | 3 | ||
4 | /* | 4 | #include <uapi/asm/ptrace_32.h> |
5 | * GCC defines register number like this: | ||
6 | * ----------------------------- | ||
7 | * 0 - 15 are integer registers | ||
8 | * 17 - 22 are control/special registers | ||
9 | * 24 - 39 fp registers | ||
10 | * 40 - 47 xd registers | ||
11 | * 48 - fpscr register | ||
12 | * ----------------------------- | ||
13 | * | ||
14 | * We follows above, except: | ||
15 | * 16 --- program counter (PC) | ||
16 | * 22 --- syscall # | ||
17 | * 23 --- floating point communication register | ||
18 | */ | ||
19 | #define REG_REG0 0 | ||
20 | #define REG_REG15 15 | ||
21 | 5 | ||
22 | #define REG_PC 16 | ||
23 | |||
24 | #define REG_PR 17 | ||
25 | #define REG_SR 18 | ||
26 | #define REG_GBR 19 | ||
27 | #define REG_MACH 20 | ||
28 | #define REG_MACL 21 | ||
29 | |||
30 | #define REG_SYSCALL 22 | ||
31 | |||
32 | #define REG_FPREG0 23 | ||
33 | #define REG_FPREG15 38 | ||
34 | #define REG_XFREG0 39 | ||
35 | #define REG_XFREG15 54 | ||
36 | |||
37 | #define REG_FPSCR 55 | ||
38 | #define REG_FPUL 56 | ||
39 | |||
40 | /* | ||
41 | * This struct defines the way the registers are stored on the | ||
42 | * kernel stack during a system call or other kernel entry. | ||
43 | */ | ||
44 | struct pt_regs { | ||
45 | unsigned long regs[16]; | ||
46 | unsigned long pc; | ||
47 | unsigned long pr; | ||
48 | unsigned long sr; | ||
49 | unsigned long gbr; | ||
50 | unsigned long mach; | ||
51 | unsigned long macl; | ||
52 | long tra; | ||
53 | }; | ||
54 | |||
55 | /* | ||
56 | * This struct defines the way the DSP registers are stored on the | ||
57 | * kernel stack during a system call or other kernel entry. | ||
58 | */ | ||
59 | struct pt_dspregs { | ||
60 | unsigned long a1; | ||
61 | unsigned long a0g; | ||
62 | unsigned long a1g; | ||
63 | unsigned long m0; | ||
64 | unsigned long m1; | ||
65 | unsigned long a0; | ||
66 | unsigned long x0; | ||
67 | unsigned long x1; | ||
68 | unsigned long y0; | ||
69 | unsigned long y1; | ||
70 | unsigned long dsr; | ||
71 | unsigned long rs; | ||
72 | unsigned long re; | ||
73 | unsigned long mod; | ||
74 | }; | ||
75 | |||
76 | #ifdef __KERNEL__ | ||
77 | 6 | ||
78 | #define MAX_REG_OFFSET offsetof(struct pt_regs, tra) | 7 | #define MAX_REG_OFFSET offsetof(struct pt_regs, tra) |
79 | static inline long regs_return_value(struct pt_regs *regs) | 8 | static inline long regs_return_value(struct pt_regs *regs) |
@@ -81,6 +10,4 @@ static inline long regs_return_value(struct pt_regs *regs) | |||
81 | return regs->regs[0]; | 10 | return regs->regs[0]; |
82 | } | 11 | } |
83 | 12 | ||
84 | #endif /* __KERNEL__ */ | ||
85 | |||
86 | #endif /* __ASM_SH_PTRACE_32_H */ | 13 | #endif /* __ASM_SH_PTRACE_32_H */ |
diff --git a/arch/sh/include/asm/ptrace_64.h b/arch/sh/include/asm/ptrace_64.h index eb3fcceaf64b..97f4b5660f2c 100644 --- a/arch/sh/include/asm/ptrace_64.h +++ b/arch/sh/include/asm/ptrace_64.h | |||
@@ -1,16 +1,8 @@ | |||
1 | #ifndef __ASM_SH_PTRACE_64_H | 1 | #ifndef __ASM_SH_PTRACE_64_H |
2 | #define __ASM_SH_PTRACE_64_H | 2 | #define __ASM_SH_PTRACE_64_H |
3 | 3 | ||
4 | struct pt_regs { | 4 | #include <uapi/asm/ptrace_64.h> |
5 | unsigned long long pc; | ||
6 | unsigned long long sr; | ||
7 | long long syscall_nr; | ||
8 | unsigned long long regs[63]; | ||
9 | unsigned long long tregs[8]; | ||
10 | unsigned long long pad[2]; | ||
11 | }; | ||
12 | 5 | ||
13 | #ifdef __KERNEL__ | ||
14 | 6 | ||
15 | #define MAX_REG_OFFSET offsetof(struct pt_regs, tregs[7]) | 7 | #define MAX_REG_OFFSET offsetof(struct pt_regs, tregs[7]) |
16 | static inline long regs_return_value(struct pt_regs *regs) | 8 | static inline long regs_return_value(struct pt_regs *regs) |
@@ -18,6 +10,4 @@ static inline long regs_return_value(struct pt_regs *regs) | |||
18 | return regs->regs[3]; | 10 | return regs->regs[3]; |
19 | } | 11 | } |
20 | 12 | ||
21 | #endif /* __KERNEL__ */ | ||
22 | |||
23 | #endif /* __ASM_SH_PTRACE_64_H */ | 13 | #endif /* __ASM_SH_PTRACE_64_H */ |
diff --git a/arch/sh/include/asm/setup.h b/arch/sh/include/asm/setup.h index 465a22df8fd0..99238108e7a5 100644 --- a/arch/sh/include/asm/setup.h +++ b/arch/sh/include/asm/setup.h | |||
@@ -1,9 +1,8 @@ | |||
1 | #ifndef _SH_SETUP_H | 1 | #ifndef _SH_SETUP_H |
2 | #define _SH_SETUP_H | 2 | #define _SH_SETUP_H |
3 | 3 | ||
4 | #include <asm-generic/setup.h> | 4 | #include <uapi/asm/setup.h> |
5 | 5 | ||
6 | #ifdef __KERNEL__ | ||
7 | /* | 6 | /* |
8 | * This is set up by the setup-routine at boot-time | 7 | * This is set up by the setup-routine at boot-time |
9 | */ | 8 | */ |
@@ -22,6 +21,4 @@ void sh_mv_setup(void); | |||
22 | void check_for_initrd(void); | 21 | void check_for_initrd(void); |
23 | void per_cpu_trap_init(void); | 22 | void per_cpu_trap_init(void); |
24 | 23 | ||
25 | #endif /* __KERNEL__ */ | ||
26 | |||
27 | #endif /* _SH_SETUP_H */ | 24 | #endif /* _SH_SETUP_H */ |
diff --git a/arch/sh/include/asm/sigcontext.h b/arch/sh/include/asm/sigcontext.h deleted file mode 100644 index 8ce1435bc0bf..000000000000 --- a/arch/sh/include/asm/sigcontext.h +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | #ifndef __ASM_SH_SIGCONTEXT_H | ||
2 | #define __ASM_SH_SIGCONTEXT_H | ||
3 | |||
4 | struct sigcontext { | ||
5 | unsigned long oldmask; | ||
6 | |||
7 | #if defined(__SH5__) || defined(CONFIG_CPU_SH5) | ||
8 | /* CPU registers */ | ||
9 | unsigned long long sc_regs[63]; | ||
10 | unsigned long long sc_tregs[8]; | ||
11 | unsigned long long sc_pc; | ||
12 | unsigned long long sc_sr; | ||
13 | |||
14 | /* FPU registers */ | ||
15 | unsigned long long sc_fpregs[32]; | ||
16 | unsigned int sc_fpscr; | ||
17 | unsigned int sc_fpvalid; | ||
18 | #else | ||
19 | /* CPU registers */ | ||
20 | unsigned long sc_regs[16]; | ||
21 | unsigned long sc_pc; | ||
22 | unsigned long sc_pr; | ||
23 | unsigned long sc_sr; | ||
24 | unsigned long sc_gbr; | ||
25 | unsigned long sc_mach; | ||
26 | unsigned long sc_macl; | ||
27 | |||
28 | #if defined(__SH4__) || defined(CONFIG_CPU_SH4) || \ | ||
29 | defined(__SH2A__) || defined(CONFIG_CPU_SH2A) | ||
30 | /* FPU registers */ | ||
31 | unsigned long sc_fpregs[16]; | ||
32 | unsigned long sc_xfpregs[16]; | ||
33 | unsigned int sc_fpscr; | ||
34 | unsigned int sc_fpul; | ||
35 | unsigned int sc_ownedfp; | ||
36 | #endif | ||
37 | #endif | ||
38 | }; | ||
39 | |||
40 | #endif /* __ASM_SH_SIGCONTEXT_H */ | ||
diff --git a/arch/sh/include/asm/signal.h b/arch/sh/include/asm/signal.h deleted file mode 100644 index 9ac530a90bce..000000000000 --- a/arch/sh/include/asm/signal.h +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | #ifndef __ASM_SH_SIGNAL_H | ||
2 | #define __ASM_SH_SIGNAL_H | ||
3 | |||
4 | #define SA_RESTORER 0x04000000 | ||
5 | |||
6 | #include <asm-generic/signal.h> | ||
7 | |||
8 | struct old_sigaction { | ||
9 | __sighandler_t sa_handler; | ||
10 | old_sigset_t sa_mask; | ||
11 | unsigned long sa_flags; | ||
12 | void (*sa_restorer)(void); | ||
13 | }; | ||
14 | |||
15 | #endif /* __ASM_SH_SIGNAL_H */ | ||
diff --git a/arch/sh/include/asm/sockios.h b/arch/sh/include/asm/sockios.h deleted file mode 100644 index cf8b96b1f9ab..000000000000 --- a/arch/sh/include/asm/sockios.h +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | #ifndef __ASM_SH_SOCKIOS_H | ||
2 | #define __ASM_SH_SOCKIOS_H | ||
3 | |||
4 | /* Socket-level I/O control calls. */ | ||
5 | #define FIOGETOWN _IOR('f', 123, int) | ||
6 | #define FIOSETOWN _IOW('f', 124, int) | ||
7 | |||
8 | #define SIOCATMARK _IOR('s', 7, int) | ||
9 | #define SIOCSPGRP _IOW('s', 8, pid_t) | ||
10 | #define SIOCGPGRP _IOR('s', 9, pid_t) | ||
11 | |||
12 | #define SIOCGSTAMP _IOR('s', 100, struct timeval) /* Get stamp (timeval) */ | ||
13 | #define SIOCGSTAMPNS _IOR('s', 101, struct timespec) /* Get stamp (timespec) */ | ||
14 | #endif /* __ASM_SH_SOCKIOS_H */ | ||
diff --git a/arch/sh/include/asm/stat.h b/arch/sh/include/asm/stat.h deleted file mode 100644 index e1810cc6e3da..000000000000 --- a/arch/sh/include/asm/stat.h +++ /dev/null | |||
@@ -1,138 +0,0 @@ | |||
1 | #ifndef __ASM_SH_STAT_H | ||
2 | #define __ASM_SH_STAT_H | ||
3 | |||
4 | struct __old_kernel_stat { | ||
5 | unsigned short st_dev; | ||
6 | unsigned short st_ino; | ||
7 | unsigned short st_mode; | ||
8 | unsigned short st_nlink; | ||
9 | unsigned short st_uid; | ||
10 | unsigned short st_gid; | ||
11 | unsigned short st_rdev; | ||
12 | unsigned long st_size; | ||
13 | unsigned long st_atime; | ||
14 | unsigned long st_mtime; | ||
15 | unsigned long st_ctime; | ||
16 | }; | ||
17 | |||
18 | #if defined(__SH5__) || defined(CONFIG_CPU_SH5) | ||
19 | struct stat { | ||
20 | unsigned short st_dev; | ||
21 | unsigned short __pad1; | ||
22 | unsigned long st_ino; | ||
23 | unsigned short st_mode; | ||
24 | unsigned short st_nlink; | ||
25 | unsigned short st_uid; | ||
26 | unsigned short st_gid; | ||
27 | unsigned short st_rdev; | ||
28 | unsigned short __pad2; | ||
29 | unsigned long st_size; | ||
30 | unsigned long st_blksize; | ||
31 | unsigned long st_blocks; | ||
32 | unsigned long st_atime; | ||
33 | unsigned long st_atime_nsec; | ||
34 | unsigned long st_mtime; | ||
35 | unsigned long st_mtime_nsec; | ||
36 | unsigned long st_ctime; | ||
37 | unsigned long st_ctime_nsec; | ||
38 | unsigned long __unused4; | ||
39 | unsigned long __unused5; | ||
40 | }; | ||
41 | |||
42 | /* This matches struct stat64 in glibc2.1, hence the absolutely | ||
43 | * insane amounts of padding around dev_t's. | ||
44 | */ | ||
45 | struct stat64 { | ||
46 | unsigned short st_dev; | ||
47 | unsigned char __pad0[10]; | ||
48 | |||
49 | unsigned long st_ino; | ||
50 | unsigned int st_mode; | ||
51 | unsigned int st_nlink; | ||
52 | |||
53 | unsigned long st_uid; | ||
54 | unsigned long st_gid; | ||
55 | |||
56 | unsigned short st_rdev; | ||
57 | unsigned char __pad3[10]; | ||
58 | |||
59 | long long st_size; | ||
60 | unsigned long st_blksize; | ||
61 | |||
62 | unsigned long st_blocks; /* Number 512-byte blocks allocated. */ | ||
63 | unsigned long __pad4; /* future possible st_blocks high bits */ | ||
64 | |||
65 | unsigned long st_atime; | ||
66 | unsigned long st_atime_nsec; | ||
67 | |||
68 | unsigned long st_mtime; | ||
69 | unsigned long st_mtime_nsec; | ||
70 | |||
71 | unsigned long st_ctime; | ||
72 | unsigned long st_ctime_nsec; /* will be high 32 bits of ctime someday */ | ||
73 | |||
74 | unsigned long __unused1; | ||
75 | unsigned long __unused2; | ||
76 | }; | ||
77 | #else | ||
78 | struct stat { | ||
79 | unsigned long st_dev; | ||
80 | unsigned long st_ino; | ||
81 | unsigned short st_mode; | ||
82 | unsigned short st_nlink; | ||
83 | unsigned short st_uid; | ||
84 | unsigned short st_gid; | ||
85 | unsigned long st_rdev; | ||
86 | unsigned long st_size; | ||
87 | unsigned long st_blksize; | ||
88 | unsigned long st_blocks; | ||
89 | unsigned long st_atime; | ||
90 | unsigned long st_atime_nsec; | ||
91 | unsigned long st_mtime; | ||
92 | unsigned long st_mtime_nsec; | ||
93 | unsigned long st_ctime; | ||
94 | unsigned long st_ctime_nsec; | ||
95 | unsigned long __unused4; | ||
96 | unsigned long __unused5; | ||
97 | }; | ||
98 | |||
99 | /* This matches struct stat64 in glibc2.1, hence the absolutely | ||
100 | * insane amounts of padding around dev_t's. | ||
101 | */ | ||
102 | struct stat64 { | ||
103 | unsigned long long st_dev; | ||
104 | unsigned char __pad0[4]; | ||
105 | |||
106 | #define STAT64_HAS_BROKEN_ST_INO 1 | ||
107 | unsigned long __st_ino; | ||
108 | |||
109 | unsigned int st_mode; | ||
110 | unsigned int st_nlink; | ||
111 | |||
112 | unsigned long st_uid; | ||
113 | unsigned long st_gid; | ||
114 | |||
115 | unsigned long long st_rdev; | ||
116 | unsigned char __pad3[4]; | ||
117 | |||
118 | long long st_size; | ||
119 | unsigned long st_blksize; | ||
120 | |||
121 | unsigned long long st_blocks; /* Number 512-byte blocks allocated. */ | ||
122 | |||
123 | unsigned long st_atime; | ||
124 | unsigned long st_atime_nsec; | ||
125 | |||
126 | unsigned long st_mtime; | ||
127 | unsigned long st_mtime_nsec; | ||
128 | |||
129 | unsigned long st_ctime; | ||
130 | unsigned long st_ctime_nsec; | ||
131 | |||
132 | unsigned long long st_ino; | ||
133 | }; | ||
134 | |||
135 | #define STAT_HAVE_NSEC 1 | ||
136 | #endif | ||
137 | |||
138 | #endif /* __ASM_SH_STAT_H */ | ||
diff --git a/arch/sh/include/asm/swab.h b/arch/sh/include/asm/swab.h deleted file mode 100644 index 1cd09767a7a3..000000000000 --- a/arch/sh/include/asm/swab.h +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | #ifndef __ASM_SH_SWAB_H | ||
2 | #define __ASM_SH_SWAB_H | ||
3 | |||
4 | /* | ||
5 | * Copyright (C) 1999 Niibe Yutaka | ||
6 | * Copyright (C) 2000, 2001 Paolo Alberelli | ||
7 | */ | ||
8 | #include <linux/compiler.h> | ||
9 | #include <linux/types.h> | ||
10 | #include <asm-generic/swab.h> | ||
11 | |||
12 | static inline __attribute_const__ __u32 __arch_swab32(__u32 x) | ||
13 | { | ||
14 | __asm__( | ||
15 | #ifdef __SH5__ | ||
16 | "byterev %1, %0\n\t" | ||
17 | "shari %0, 32, %0" | ||
18 | #else | ||
19 | "swap.b %1, %0\n\t" | ||
20 | "swap.w %0, %0\n\t" | ||
21 | "swap.b %0, %0" | ||
22 | #endif | ||
23 | : "=r" (x) | ||
24 | : "r" (x)); | ||
25 | |||
26 | return x; | ||
27 | } | ||
28 | #define __arch_swab32 __arch_swab32 | ||
29 | |||
30 | static inline __attribute_const__ __u16 __arch_swab16(__u16 x) | ||
31 | { | ||
32 | __asm__( | ||
33 | #ifdef __SH5__ | ||
34 | "byterev %1, %0\n\t" | ||
35 | "shari %0, 32, %0" | ||
36 | #else | ||
37 | "swap.b %1, %0" | ||
38 | #endif | ||
39 | : "=r" (x) | ||
40 | : "r" (x)); | ||
41 | |||
42 | return x; | ||
43 | } | ||
44 | #define __arch_swab16 __arch_swab16 | ||
45 | |||
46 | static inline __u64 __arch_swab64(__u64 val) | ||
47 | { | ||
48 | union { | ||
49 | struct { __u32 a,b; } s; | ||
50 | __u64 u; | ||
51 | } v, w; | ||
52 | v.u = val; | ||
53 | w.s.b = __arch_swab32(v.s.a); | ||
54 | w.s.a = __arch_swab32(v.s.b); | ||
55 | return w.u; | ||
56 | } | ||
57 | #define __arch_swab64 __arch_swab64 | ||
58 | |||
59 | #endif /* __ASM_SH_SWAB_H */ | ||
diff --git a/arch/sh/include/asm/types.h b/arch/sh/include/asm/types.h index f8421f7ad63a..6a31053fa5e3 100644 --- a/arch/sh/include/asm/types.h +++ b/arch/sh/include/asm/types.h | |||
@@ -1,12 +1,11 @@ | |||
1 | #ifndef __ASM_SH_TYPES_H | 1 | #ifndef __ASM_SH_TYPES_H |
2 | #define __ASM_SH_TYPES_H | 2 | #define __ASM_SH_TYPES_H |
3 | 3 | ||
4 | #include <asm-generic/types.h> | 4 | #include <uapi/asm/types.h> |
5 | 5 | ||
6 | /* | 6 | /* |
7 | * These aren't exported outside the kernel to avoid name space clashes | 7 | * These aren't exported outside the kernel to avoid name space clashes |
8 | */ | 8 | */ |
9 | #ifdef __KERNEL__ | ||
10 | #ifndef __ASSEMBLY__ | 9 | #ifndef __ASSEMBLY__ |
11 | 10 | ||
12 | #ifdef CONFIG_SUPERH32 | 11 | #ifdef CONFIG_SUPERH32 |
@@ -18,6 +17,4 @@ typedef u64 reg_size_t; | |||
18 | #endif | 17 | #endif |
19 | 18 | ||
20 | #endif /* __ASSEMBLY__ */ | 19 | #endif /* __ASSEMBLY__ */ |
21 | #endif /* __KERNEL__ */ | ||
22 | |||
23 | #endif /* __ASM_SH_TYPES_H */ | 20 | #endif /* __ASM_SH_TYPES_H */ |
diff --git a/arch/sh/include/asm/unistd.h b/arch/sh/include/asm/unistd.h index 307201a854f3..38956dfa76f7 100644 --- a/arch/sh/include/asm/unistd.h +++ b/arch/sh/include/asm/unistd.h | |||
@@ -1,4 +1,3 @@ | |||
1 | #ifdef __KERNEL__ | ||
2 | # ifdef CONFIG_SUPERH32 | 1 | # ifdef CONFIG_SUPERH32 |
3 | # include <asm/unistd_32.h> | 2 | # include <asm/unistd_32.h> |
4 | # else | 3 | # else |
@@ -38,10 +37,4 @@ | |||
38 | */ | 37 | */ |
39 | # define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 38 | # define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
40 | 39 | ||
41 | #else | 40 | #include <uapi/asm/unistd.h> |
42 | # ifdef __SH5__ | ||
43 | # include <asm/unistd_64.h> | ||
44 | # else | ||
45 | # include <asm/unistd_32.h> | ||
46 | # endif | ||
47 | #endif | ||
diff --git a/arch/sh/include/asm/unistd_32.h b/arch/sh/include/asm/unistd_32.h deleted file mode 100644 index 72fd1e061006..000000000000 --- a/arch/sh/include/asm/unistd_32.h +++ /dev/null | |||
@@ -1,384 +0,0 @@ | |||
1 | #ifndef __ASM_SH_UNISTD_32_H | ||
2 | #define __ASM_SH_UNISTD_32_H | ||
3 | |||
4 | /* | ||
5 | * Copyright (C) 1999 Niibe Yutaka | ||
6 | */ | ||
7 | |||
8 | /* | ||
9 | * This file contains the system call numbers. | ||
10 | */ | ||
11 | |||
12 | #define __NR_restart_syscall 0 | ||
13 | #define __NR_exit 1 | ||
14 | #define __NR_fork 2 | ||
15 | #define __NR_read 3 | ||
16 | #define __NR_write 4 | ||
17 | #define __NR_open 5 | ||
18 | #define __NR_close 6 | ||
19 | #define __NR_waitpid 7 | ||
20 | #define __NR_creat 8 | ||
21 | #define __NR_link 9 | ||
22 | #define __NR_unlink 10 | ||
23 | #define __NR_execve 11 | ||
24 | #define __NR_chdir 12 | ||
25 | #define __NR_time 13 | ||
26 | #define __NR_mknod 14 | ||
27 | #define __NR_chmod 15 | ||
28 | #define __NR_lchown 16 | ||
29 | /* 17 was sys_break */ | ||
30 | #define __NR_oldstat 18 | ||
31 | #define __NR_lseek 19 | ||
32 | #define __NR_getpid 20 | ||
33 | #define __NR_mount 21 | ||
34 | #define __NR_umount 22 | ||
35 | #define __NR_setuid 23 | ||
36 | #define __NR_getuid 24 | ||
37 | #define __NR_stime 25 | ||
38 | #define __NR_ptrace 26 | ||
39 | #define __NR_alarm 27 | ||
40 | #define __NR_oldfstat 28 | ||
41 | #define __NR_pause 29 | ||
42 | #define __NR_utime 30 | ||
43 | /* 31 was sys_stty */ | ||
44 | /* 32 was sys_gtty */ | ||
45 | #define __NR_access 33 | ||
46 | #define __NR_nice 34 | ||
47 | /* 35 was sys_ftime */ | ||
48 | #define __NR_sync 36 | ||
49 | #define __NR_kill 37 | ||
50 | #define __NR_rename 38 | ||
51 | #define __NR_mkdir 39 | ||
52 | #define __NR_rmdir 40 | ||
53 | #define __NR_dup 41 | ||
54 | #define __NR_pipe 42 | ||
55 | #define __NR_times 43 | ||
56 | /* 44 was sys_prof */ | ||
57 | #define __NR_brk 45 | ||
58 | #define __NR_setgid 46 | ||
59 | #define __NR_getgid 47 | ||
60 | #define __NR_signal 48 | ||
61 | #define __NR_geteuid 49 | ||
62 | #define __NR_getegid 50 | ||
63 | #define __NR_acct 51 | ||
64 | #define __NR_umount2 52 | ||
65 | /* 53 was sys_lock */ | ||
66 | #define __NR_ioctl 54 | ||
67 | #define __NR_fcntl 55 | ||
68 | /* 56 was sys_mpx */ | ||
69 | #define __NR_setpgid 57 | ||
70 | /* 58 was sys_ulimit */ | ||
71 | /* 59 was sys_olduname */ | ||
72 | #define __NR_umask 60 | ||
73 | #define __NR_chroot 61 | ||
74 | #define __NR_ustat 62 | ||
75 | #define __NR_dup2 63 | ||
76 | #define __NR_getppid 64 | ||
77 | #define __NR_getpgrp 65 | ||
78 | #define __NR_setsid 66 | ||
79 | #define __NR_sigaction 67 | ||
80 | #define __NR_sgetmask 68 | ||
81 | #define __NR_ssetmask 69 | ||
82 | #define __NR_setreuid 70 | ||
83 | #define __NR_setregid 71 | ||
84 | #define __NR_sigsuspend 72 | ||
85 | #define __NR_sigpending 73 | ||
86 | #define __NR_sethostname 74 | ||
87 | #define __NR_setrlimit 75 | ||
88 | #define __NR_getrlimit 76 /* Back compatible 2Gig limited rlimit */ | ||
89 | #define __NR_getrusage 77 | ||
90 | #define __NR_gettimeofday 78 | ||
91 | #define __NR_settimeofday 79 | ||
92 | #define __NR_getgroups 80 | ||
93 | #define __NR_setgroups 81 | ||
94 | /* 82 was sys_oldselect */ | ||
95 | #define __NR_symlink 83 | ||
96 | #define __NR_oldlstat 84 | ||
97 | #define __NR_readlink 85 | ||
98 | #define __NR_uselib 86 | ||
99 | #define __NR_swapon 87 | ||
100 | #define __NR_reboot 88 | ||
101 | #define __NR_readdir 89 | ||
102 | #define __NR_mmap 90 | ||
103 | #define __NR_munmap 91 | ||
104 | #define __NR_truncate 92 | ||
105 | #define __NR_ftruncate 93 | ||
106 | #define __NR_fchmod 94 | ||
107 | #define __NR_fchown 95 | ||
108 | #define __NR_getpriority 96 | ||
109 | #define __NR_setpriority 97 | ||
110 | /* 98 was sys_profil */ | ||
111 | #define __NR_statfs 99 | ||
112 | #define __NR_fstatfs 100 | ||
113 | /* 101 was sys_ioperm */ | ||
114 | #define __NR_socketcall 102 | ||
115 | #define __NR_syslog 103 | ||
116 | #define __NR_setitimer 104 | ||
117 | #define __NR_getitimer 105 | ||
118 | #define __NR_stat 106 | ||
119 | #define __NR_lstat 107 | ||
120 | #define __NR_fstat 108 | ||
121 | #define __NR_olduname 109 | ||
122 | /* 110 was sys_iopl */ | ||
123 | #define __NR_vhangup 111 | ||
124 | /* 112 was sys_idle */ | ||
125 | /* 113 was sys_vm86old */ | ||
126 | #define __NR_wait4 114 | ||
127 | #define __NR_swapoff 115 | ||
128 | #define __NR_sysinfo 116 | ||
129 | #define __NR_ipc 117 | ||
130 | #define __NR_fsync 118 | ||
131 | #define __NR_sigreturn 119 | ||
132 | #define __NR_clone 120 | ||
133 | #define __NR_setdomainname 121 | ||
134 | #define __NR_uname 122 | ||
135 | #define __NR_cacheflush 123 | ||
136 | #define __NR_adjtimex 124 | ||
137 | #define __NR_mprotect 125 | ||
138 | #define __NR_sigprocmask 126 | ||
139 | /* 127 was sys_create_module */ | ||
140 | #define __NR_init_module 128 | ||
141 | #define __NR_delete_module 129 | ||
142 | /* 130 was sys_get_kernel_syms */ | ||
143 | #define __NR_quotactl 131 | ||
144 | #define __NR_getpgid 132 | ||
145 | #define __NR_fchdir 133 | ||
146 | #define __NR_bdflush 134 | ||
147 | #define __NR_sysfs 135 | ||
148 | #define __NR_personality 136 | ||
149 | /* 137 was sys_afs_syscall */ | ||
150 | #define __NR_setfsuid 138 | ||
151 | #define __NR_setfsgid 139 | ||
152 | #define __NR__llseek 140 | ||
153 | #define __NR_getdents 141 | ||
154 | #define __NR__newselect 142 | ||
155 | #define __NR_flock 143 | ||
156 | #define __NR_msync 144 | ||
157 | #define __NR_readv 145 | ||
158 | #define __NR_writev 146 | ||
159 | #define __NR_getsid 147 | ||
160 | #define __NR_fdatasync 148 | ||
161 | #define __NR__sysctl 149 | ||
162 | #define __NR_mlock 150 | ||
163 | #define __NR_munlock 151 | ||
164 | #define __NR_mlockall 152 | ||
165 | #define __NR_munlockall 153 | ||
166 | #define __NR_sched_setparam 154 | ||
167 | #define __NR_sched_getparam 155 | ||
168 | #define __NR_sched_setscheduler 156 | ||
169 | #define __NR_sched_getscheduler 157 | ||
170 | #define __NR_sched_yield 158 | ||
171 | #define __NR_sched_get_priority_max 159 | ||
172 | #define __NR_sched_get_priority_min 160 | ||
173 | #define __NR_sched_rr_get_interval 161 | ||
174 | #define __NR_nanosleep 162 | ||
175 | #define __NR_mremap 163 | ||
176 | #define __NR_setresuid 164 | ||
177 | #define __NR_getresuid 165 | ||
178 | /* 166 was sys_vm86 */ | ||
179 | /* 167 was sys_query_module */ | ||
180 | #define __NR_poll 168 | ||
181 | #define __NR_nfsservctl 169 | ||
182 | #define __NR_setresgid 170 | ||
183 | #define __NR_getresgid 171 | ||
184 | #define __NR_prctl 172 | ||
185 | #define __NR_rt_sigreturn 173 | ||
186 | #define __NR_rt_sigaction 174 | ||
187 | #define __NR_rt_sigprocmask 175 | ||
188 | #define __NR_rt_sigpending 176 | ||
189 | #define __NR_rt_sigtimedwait 177 | ||
190 | #define __NR_rt_sigqueueinfo 178 | ||
191 | #define __NR_rt_sigsuspend 179 | ||
192 | #define __NR_pread64 180 | ||
193 | #define __NR_pwrite64 181 | ||
194 | #define __NR_chown 182 | ||
195 | #define __NR_getcwd 183 | ||
196 | #define __NR_capget 184 | ||
197 | #define __NR_capset 185 | ||
198 | #define __NR_sigaltstack 186 | ||
199 | #define __NR_sendfile 187 | ||
200 | /* 188 reserved for sys_getpmsg */ | ||
201 | /* 189 reserved for sys_putpmsg */ | ||
202 | #define __NR_vfork 190 | ||
203 | #define __NR_ugetrlimit 191 /* SuS compliant getrlimit */ | ||
204 | #define __NR_mmap2 192 | ||
205 | #define __NR_truncate64 193 | ||
206 | #define __NR_ftruncate64 194 | ||
207 | #define __NR_stat64 195 | ||
208 | #define __NR_lstat64 196 | ||
209 | #define __NR_fstat64 197 | ||
210 | #define __NR_lchown32 198 | ||
211 | #define __NR_getuid32 199 | ||
212 | #define __NR_getgid32 200 | ||
213 | #define __NR_geteuid32 201 | ||
214 | #define __NR_getegid32 202 | ||
215 | #define __NR_setreuid32 203 | ||
216 | #define __NR_setregid32 204 | ||
217 | #define __NR_getgroups32 205 | ||
218 | #define __NR_setgroups32 206 | ||
219 | #define __NR_fchown32 207 | ||
220 | #define __NR_setresuid32 208 | ||
221 | #define __NR_getresuid32 209 | ||
222 | #define __NR_setresgid32 210 | ||
223 | #define __NR_getresgid32 211 | ||
224 | #define __NR_chown32 212 | ||
225 | #define __NR_setuid32 213 | ||
226 | #define __NR_setgid32 214 | ||
227 | #define __NR_setfsuid32 215 | ||
228 | #define __NR_setfsgid32 216 | ||
229 | #define __NR_pivot_root 217 | ||
230 | #define __NR_mincore 218 | ||
231 | #define __NR_madvise 219 | ||
232 | #define __NR_getdents64 220 | ||
233 | #define __NR_fcntl64 221 | ||
234 | /* 222 is reserved for tux */ | ||
235 | /* 223 is unused */ | ||
236 | #define __NR_gettid 224 | ||
237 | #define __NR_readahead 225 | ||
238 | #define __NR_setxattr 226 | ||
239 | #define __NR_lsetxattr 227 | ||
240 | #define __NR_fsetxattr 228 | ||
241 | #define __NR_getxattr 229 | ||
242 | #define __NR_lgetxattr 230 | ||
243 | #define __NR_fgetxattr 231 | ||
244 | #define __NR_listxattr 232 | ||
245 | #define __NR_llistxattr 233 | ||
246 | #define __NR_flistxattr 234 | ||
247 | #define __NR_removexattr 235 | ||
248 | #define __NR_lremovexattr 236 | ||
249 | #define __NR_fremovexattr 237 | ||
250 | #define __NR_tkill 238 | ||
251 | #define __NR_sendfile64 239 | ||
252 | #define __NR_futex 240 | ||
253 | #define __NR_sched_setaffinity 241 | ||
254 | #define __NR_sched_getaffinity 242 | ||
255 | /* 243 is reserved for set_thread_area */ | ||
256 | /* 244 is reserved for get_thread_area */ | ||
257 | #define __NR_io_setup 245 | ||
258 | #define __NR_io_destroy 246 | ||
259 | #define __NR_io_getevents 247 | ||
260 | #define __NR_io_submit 248 | ||
261 | #define __NR_io_cancel 249 | ||
262 | #define __NR_fadvise64 250 | ||
263 | /* 251 is unused */ | ||
264 | #define __NR_exit_group 252 | ||
265 | #define __NR_lookup_dcookie 253 | ||
266 | #define __NR_epoll_create 254 | ||
267 | #define __NR_epoll_ctl 255 | ||
268 | #define __NR_epoll_wait 256 | ||
269 | #define __NR_remap_file_pages 257 | ||
270 | #define __NR_set_tid_address 258 | ||
271 | #define __NR_timer_create 259 | ||
272 | #define __NR_timer_settime (__NR_timer_create+1) | ||
273 | #define __NR_timer_gettime (__NR_timer_create+2) | ||
274 | #define __NR_timer_getoverrun (__NR_timer_create+3) | ||
275 | #define __NR_timer_delete (__NR_timer_create+4) | ||
276 | #define __NR_clock_settime (__NR_timer_create+5) | ||
277 | #define __NR_clock_gettime (__NR_timer_create+6) | ||
278 | #define __NR_clock_getres (__NR_timer_create+7) | ||
279 | #define __NR_clock_nanosleep (__NR_timer_create+8) | ||
280 | #define __NR_statfs64 268 | ||
281 | #define __NR_fstatfs64 269 | ||
282 | #define __NR_tgkill 270 | ||
283 | #define __NR_utimes 271 | ||
284 | #define __NR_fadvise64_64 272 | ||
285 | /* 273 is reserved for vserver */ | ||
286 | #define __NR_mbind 274 | ||
287 | #define __NR_get_mempolicy 275 | ||
288 | #define __NR_set_mempolicy 276 | ||
289 | #define __NR_mq_open 277 | ||
290 | #define __NR_mq_unlink (__NR_mq_open+1) | ||
291 | #define __NR_mq_timedsend (__NR_mq_open+2) | ||
292 | #define __NR_mq_timedreceive (__NR_mq_open+3) | ||
293 | #define __NR_mq_notify (__NR_mq_open+4) | ||
294 | #define __NR_mq_getsetattr (__NR_mq_open+5) | ||
295 | #define __NR_kexec_load 283 | ||
296 | #define __NR_waitid 284 | ||
297 | #define __NR_add_key 285 | ||
298 | #define __NR_request_key 286 | ||
299 | #define __NR_keyctl 287 | ||
300 | #define __NR_ioprio_set 288 | ||
301 | #define __NR_ioprio_get 289 | ||
302 | #define __NR_inotify_init 290 | ||
303 | #define __NR_inotify_add_watch 291 | ||
304 | #define __NR_inotify_rm_watch 292 | ||
305 | /* 293 is unused */ | ||
306 | #define __NR_migrate_pages 294 | ||
307 | #define __NR_openat 295 | ||
308 | #define __NR_mkdirat 296 | ||
309 | #define __NR_mknodat 297 | ||
310 | #define __NR_fchownat 298 | ||
311 | #define __NR_futimesat 299 | ||
312 | #define __NR_fstatat64 300 | ||
313 | #define __NR_unlinkat 301 | ||
314 | #define __NR_renameat 302 | ||
315 | #define __NR_linkat 303 | ||
316 | #define __NR_symlinkat 304 | ||
317 | #define __NR_readlinkat 305 | ||
318 | #define __NR_fchmodat 306 | ||
319 | #define __NR_faccessat 307 | ||
320 | #define __NR_pselect6 308 | ||
321 | #define __NR_ppoll 309 | ||
322 | #define __NR_unshare 310 | ||
323 | #define __NR_set_robust_list 311 | ||
324 | #define __NR_get_robust_list 312 | ||
325 | #define __NR_splice 313 | ||
326 | #define __NR_sync_file_range 314 | ||
327 | #define __NR_tee 315 | ||
328 | #define __NR_vmsplice 316 | ||
329 | #define __NR_move_pages 317 | ||
330 | #define __NR_getcpu 318 | ||
331 | #define __NR_epoll_pwait 319 | ||
332 | #define __NR_utimensat 320 | ||
333 | #define __NR_signalfd 321 | ||
334 | #define __NR_timerfd_create 322 | ||
335 | #define __NR_eventfd 323 | ||
336 | #define __NR_fallocate 324 | ||
337 | #define __NR_timerfd_settime 325 | ||
338 | #define __NR_timerfd_gettime 326 | ||
339 | #define __NR_signalfd4 327 | ||
340 | #define __NR_eventfd2 328 | ||
341 | #define __NR_epoll_create1 329 | ||
342 | #define __NR_dup3 330 | ||
343 | #define __NR_pipe2 331 | ||
344 | #define __NR_inotify_init1 332 | ||
345 | #define __NR_preadv 333 | ||
346 | #define __NR_pwritev 334 | ||
347 | #define __NR_rt_tgsigqueueinfo 335 | ||
348 | #define __NR_perf_event_open 336 | ||
349 | #define __NR_fanotify_init 337 | ||
350 | #define __NR_fanotify_mark 338 | ||
351 | #define __NR_prlimit64 339 | ||
352 | |||
353 | /* Non-multiplexed socket family */ | ||
354 | #define __NR_socket 340 | ||
355 | #define __NR_bind 341 | ||
356 | #define __NR_connect 342 | ||
357 | #define __NR_listen 343 | ||
358 | #define __NR_accept 344 | ||
359 | #define __NR_getsockname 345 | ||
360 | #define __NR_getpeername 346 | ||
361 | #define __NR_socketpair 347 | ||
362 | #define __NR_send 348 | ||
363 | #define __NR_sendto 349 | ||
364 | #define __NR_recv 350 | ||
365 | #define __NR_recvfrom 351 | ||
366 | #define __NR_shutdown 352 | ||
367 | #define __NR_setsockopt 353 | ||
368 | #define __NR_getsockopt 354 | ||
369 | #define __NR_sendmsg 355 | ||
370 | #define __NR_recvmsg 356 | ||
371 | #define __NR_recvmmsg 357 | ||
372 | #define __NR_accept4 358 | ||
373 | #define __NR_name_to_handle_at 359 | ||
374 | #define __NR_open_by_handle_at 360 | ||
375 | #define __NR_clock_adjtime 361 | ||
376 | #define __NR_syncfs 362 | ||
377 | #define __NR_sendmmsg 363 | ||
378 | #define __NR_setns 364 | ||
379 | #define __NR_process_vm_readv 365 | ||
380 | #define __NR_process_vm_writev 366 | ||
381 | |||
382 | #define NR_syscalls 367 | ||
383 | |||
384 | #endif /* __ASM_SH_UNISTD_32_H */ | ||
diff --git a/arch/sh/include/asm/unistd_64.h b/arch/sh/include/asm/unistd_64.h deleted file mode 100644 index a28edc329692..000000000000 --- a/arch/sh/include/asm/unistd_64.h +++ /dev/null | |||
@@ -1,404 +0,0 @@ | |||
1 | #ifndef __ASM_SH_UNISTD_64_H | ||
2 | #define __ASM_SH_UNISTD_64_H | ||
3 | |||
4 | /* | ||
5 | * include/asm-sh/unistd_64.h | ||
6 | * | ||
7 | * This file contains the system call numbers. | ||
8 | * | ||
9 | * Copyright (C) 2000, 2001 Paolo Alberelli | ||
10 | * Copyright (C) 2003 - 2007 Paul Mundt | ||
11 | * Copyright (C) 2004 Sean McGoogan | ||
12 | * | ||
13 | * This file is subject to the terms and conditions of the GNU General Public | ||
14 | * License. See the file "COPYING" in the main directory of this archive | ||
15 | * for more details. | ||
16 | */ | ||
17 | #define __NR_restart_syscall 0 | ||
18 | #define __NR_exit 1 | ||
19 | #define __NR_fork 2 | ||
20 | #define __NR_read 3 | ||
21 | #define __NR_write 4 | ||
22 | #define __NR_open 5 | ||
23 | #define __NR_close 6 | ||
24 | #define __NR_waitpid 7 | ||
25 | #define __NR_creat 8 | ||
26 | #define __NR_link 9 | ||
27 | #define __NR_unlink 10 | ||
28 | #define __NR_execve 11 | ||
29 | #define __NR_chdir 12 | ||
30 | #define __NR_time 13 | ||
31 | #define __NR_mknod 14 | ||
32 | #define __NR_chmod 15 | ||
33 | #define __NR_lchown 16 | ||
34 | /* 17 was sys_break */ | ||
35 | #define __NR_oldstat 18 | ||
36 | #define __NR_lseek 19 | ||
37 | #define __NR_getpid 20 | ||
38 | #define __NR_mount 21 | ||
39 | #define __NR_umount 22 | ||
40 | #define __NR_setuid 23 | ||
41 | #define __NR_getuid 24 | ||
42 | #define __NR_stime 25 | ||
43 | #define __NR_ptrace 26 | ||
44 | #define __NR_alarm 27 | ||
45 | #define __NR_oldfstat 28 | ||
46 | #define __NR_pause 29 | ||
47 | #define __NR_utime 30 | ||
48 | /* 31 was sys_stty */ | ||
49 | /* 32 was sys_gtty */ | ||
50 | #define __NR_access 33 | ||
51 | #define __NR_nice 34 | ||
52 | /* 35 was sys_ftime */ | ||
53 | #define __NR_sync 36 | ||
54 | #define __NR_kill 37 | ||
55 | #define __NR_rename 38 | ||
56 | #define __NR_mkdir 39 | ||
57 | #define __NR_rmdir 40 | ||
58 | #define __NR_dup 41 | ||
59 | #define __NR_pipe 42 | ||
60 | #define __NR_times 43 | ||
61 | /* 44 was sys_prof */ | ||
62 | #define __NR_brk 45 | ||
63 | #define __NR_setgid 46 | ||
64 | #define __NR_getgid 47 | ||
65 | #define __NR_signal 48 | ||
66 | #define __NR_geteuid 49 | ||
67 | #define __NR_getegid 50 | ||
68 | #define __NR_acct 51 | ||
69 | #define __NR_umount2 52 | ||
70 | /* 53 was sys_lock */ | ||
71 | #define __NR_ioctl 54 | ||
72 | #define __NR_fcntl 55 | ||
73 | /* 56 was sys_mpx */ | ||
74 | #define __NR_setpgid 57 | ||
75 | /* 58 was sys_ulimit */ | ||
76 | /* 59 was sys_olduname */ | ||
77 | #define __NR_umask 60 | ||
78 | #define __NR_chroot 61 | ||
79 | #define __NR_ustat 62 | ||
80 | #define __NR_dup2 63 | ||
81 | #define __NR_getppid 64 | ||
82 | #define __NR_getpgrp 65 | ||
83 | #define __NR_setsid 66 | ||
84 | #define __NR_sigaction 67 | ||
85 | #define __NR_sgetmask 68 | ||
86 | #define __NR_ssetmask 69 | ||
87 | #define __NR_setreuid 70 | ||
88 | #define __NR_setregid 71 | ||
89 | #define __NR_sigsuspend 72 | ||
90 | #define __NR_sigpending 73 | ||
91 | #define __NR_sethostname 74 | ||
92 | #define __NR_setrlimit 75 | ||
93 | #define __NR_getrlimit 76 /* Back compatible 2Gig limited rlimit */ | ||
94 | #define __NR_getrusage 77 | ||
95 | #define __NR_gettimeofday 78 | ||
96 | #define __NR_settimeofday 79 | ||
97 | #define __NR_getgroups 80 | ||
98 | #define __NR_setgroups 81 | ||
99 | /* 82 was sys_select */ | ||
100 | #define __NR_symlink 83 | ||
101 | #define __NR_oldlstat 84 | ||
102 | #define __NR_readlink 85 | ||
103 | #define __NR_uselib 86 | ||
104 | #define __NR_swapon 87 | ||
105 | #define __NR_reboot 88 | ||
106 | #define __NR_readdir 89 | ||
107 | #define __NR_mmap 90 | ||
108 | #define __NR_munmap 91 | ||
109 | #define __NR_truncate 92 | ||
110 | #define __NR_ftruncate 93 | ||
111 | #define __NR_fchmod 94 | ||
112 | #define __NR_fchown 95 | ||
113 | #define __NR_getpriority 96 | ||
114 | #define __NR_setpriority 97 | ||
115 | /* 98 was sys_profil */ | ||
116 | #define __NR_statfs 99 | ||
117 | #define __NR_fstatfs 100 | ||
118 | /* 101 was sys_ioperm */ | ||
119 | #define __NR_socketcall 102 /* old implementation of socket systemcall */ | ||
120 | #define __NR_syslog 103 | ||
121 | #define __NR_setitimer 104 | ||
122 | #define __NR_getitimer 105 | ||
123 | #define __NR_stat 106 | ||
124 | #define __NR_lstat 107 | ||
125 | #define __NR_fstat 108 | ||
126 | #define __NR_olduname 109 | ||
127 | /* 110 was sys_iopl */ | ||
128 | #define __NR_vhangup 111 | ||
129 | /* 112 was sys_idle */ | ||
130 | /* 113 was sys_vm86old */ | ||
131 | #define __NR_wait4 114 | ||
132 | #define __NR_swapoff 115 | ||
133 | #define __NR_sysinfo 116 | ||
134 | #define __NR_ipc 117 | ||
135 | #define __NR_fsync 118 | ||
136 | #define __NR_sigreturn 119 | ||
137 | #define __NR_clone 120 | ||
138 | #define __NR_setdomainname 121 | ||
139 | #define __NR_uname 122 | ||
140 | #define __NR_cacheflush 123 | ||
141 | #define __NR_adjtimex 124 | ||
142 | #define __NR_mprotect 125 | ||
143 | #define __NR_sigprocmask 126 | ||
144 | /* 127 was sys_create_module */ | ||
145 | #define __NR_init_module 128 | ||
146 | #define __NR_delete_module 129 | ||
147 | /* 130 was sys_get_kernel_syms */ | ||
148 | #define __NR_quotactl 131 | ||
149 | #define __NR_getpgid 132 | ||
150 | #define __NR_fchdir 133 | ||
151 | #define __NR_bdflush 134 | ||
152 | #define __NR_sysfs 135 | ||
153 | #define __NR_personality 136 | ||
154 | /* 137 was sys_afs_syscall */ | ||
155 | #define __NR_setfsuid 138 | ||
156 | #define __NR_setfsgid 139 | ||
157 | #define __NR__llseek 140 | ||
158 | #define __NR_getdents 141 | ||
159 | #define __NR__newselect 142 | ||
160 | #define __NR_flock 143 | ||
161 | #define __NR_msync 144 | ||
162 | #define __NR_readv 145 | ||
163 | #define __NR_writev 146 | ||
164 | #define __NR_getsid 147 | ||
165 | #define __NR_fdatasync 148 | ||
166 | #define __NR__sysctl 149 | ||
167 | #define __NR_mlock 150 | ||
168 | #define __NR_munlock 151 | ||
169 | #define __NR_mlockall 152 | ||
170 | #define __NR_munlockall 153 | ||
171 | #define __NR_sched_setparam 154 | ||
172 | #define __NR_sched_getparam 155 | ||
173 | #define __NR_sched_setscheduler 156 | ||
174 | #define __NR_sched_getscheduler 157 | ||
175 | #define __NR_sched_yield 158 | ||
176 | #define __NR_sched_get_priority_max 159 | ||
177 | #define __NR_sched_get_priority_min 160 | ||
178 | #define __NR_sched_rr_get_interval 161 | ||
179 | #define __NR_nanosleep 162 | ||
180 | #define __NR_mremap 163 | ||
181 | #define __NR_setresuid 164 | ||
182 | #define __NR_getresuid 165 | ||
183 | /* 166 was sys_vm86 */ | ||
184 | /* 167 was sys_query_module */ | ||
185 | #define __NR_poll 168 | ||
186 | #define __NR_nfsservctl 169 | ||
187 | #define __NR_setresgid 170 | ||
188 | #define __NR_getresgid 171 | ||
189 | #define __NR_prctl 172 | ||
190 | #define __NR_rt_sigreturn 173 | ||
191 | #define __NR_rt_sigaction 174 | ||
192 | #define __NR_rt_sigprocmask 175 | ||
193 | #define __NR_rt_sigpending 176 | ||
194 | #define __NR_rt_sigtimedwait 177 | ||
195 | #define __NR_rt_sigqueueinfo 178 | ||
196 | #define __NR_rt_sigsuspend 179 | ||
197 | #define __NR_pread64 180 | ||
198 | #define __NR_pwrite64 181 | ||
199 | #define __NR_chown 182 | ||
200 | #define __NR_getcwd 183 | ||
201 | #define __NR_capget 184 | ||
202 | #define __NR_capset 185 | ||
203 | #define __NR_sigaltstack 186 | ||
204 | #define __NR_sendfile 187 | ||
205 | /* 188 reserved for getpmsg */ | ||
206 | /* 189 reserved for putpmsg */ | ||
207 | #define __NR_vfork 190 | ||
208 | #define __NR_ugetrlimit 191 /* SuS compliant getrlimit */ | ||
209 | #define __NR_mmap2 192 | ||
210 | #define __NR_truncate64 193 | ||
211 | #define __NR_ftruncate64 194 | ||
212 | #define __NR_stat64 195 | ||
213 | #define __NR_lstat64 196 | ||
214 | #define __NR_fstat64 197 | ||
215 | #define __NR_lchown32 198 | ||
216 | #define __NR_getuid32 199 | ||
217 | #define __NR_getgid32 200 | ||
218 | #define __NR_geteuid32 201 | ||
219 | #define __NR_getegid32 202 | ||
220 | #define __NR_setreuid32 203 | ||
221 | #define __NR_setregid32 204 | ||
222 | #define __NR_getgroups32 205 | ||
223 | #define __NR_setgroups32 206 | ||
224 | #define __NR_fchown32 207 | ||
225 | #define __NR_setresuid32 208 | ||
226 | #define __NR_getresuid32 209 | ||
227 | #define __NR_setresgid32 210 | ||
228 | #define __NR_getresgid32 211 | ||
229 | #define __NR_chown32 212 | ||
230 | #define __NR_setuid32 213 | ||
231 | #define __NR_setgid32 214 | ||
232 | #define __NR_setfsuid32 215 | ||
233 | #define __NR_setfsgid32 216 | ||
234 | #define __NR_pivot_root 217 | ||
235 | #define __NR_mincore 218 | ||
236 | #define __NR_madvise 219 | ||
237 | |||
238 | /* Non-multiplexed socket family */ | ||
239 | #define __NR_socket 220 | ||
240 | #define __NR_bind 221 | ||
241 | #define __NR_connect 222 | ||
242 | #define __NR_listen 223 | ||
243 | #define __NR_accept 224 | ||
244 | #define __NR_getsockname 225 | ||
245 | #define __NR_getpeername 226 | ||
246 | #define __NR_socketpair 227 | ||
247 | #define __NR_send 228 | ||
248 | #define __NR_sendto 229 | ||
249 | #define __NR_recv 230 | ||
250 | #define __NR_recvfrom 231 | ||
251 | #define __NR_shutdown 232 | ||
252 | #define __NR_setsockopt 233 | ||
253 | #define __NR_getsockopt 234 | ||
254 | #define __NR_sendmsg 235 | ||
255 | #define __NR_recvmsg 236 | ||
256 | |||
257 | /* Non-multiplexed IPC family */ | ||
258 | #define __NR_semop 237 | ||
259 | #define __NR_semget 238 | ||
260 | #define __NR_semctl 239 | ||
261 | #define __NR_msgsnd 240 | ||
262 | #define __NR_msgrcv 241 | ||
263 | #define __NR_msgget 242 | ||
264 | #define __NR_msgctl 243 | ||
265 | #define __NR_shmat 244 | ||
266 | #define __NR_shmdt 245 | ||
267 | #define __NR_shmget 246 | ||
268 | #define __NR_shmctl 247 | ||
269 | |||
270 | #define __NR_getdents64 248 | ||
271 | #define __NR_fcntl64 249 | ||
272 | /* 250 is reserved for tux */ | ||
273 | /* 251 is unused */ | ||
274 | #define __NR_gettid 252 | ||
275 | #define __NR_readahead 253 | ||
276 | #define __NR_setxattr 254 | ||
277 | #define __NR_lsetxattr 255 | ||
278 | #define __NR_fsetxattr 256 | ||
279 | #define __NR_getxattr 257 | ||
280 | #define __NR_lgetxattr 258 | ||
281 | #define __NR_fgetxattr 269 | ||
282 | #define __NR_listxattr 260 | ||
283 | #define __NR_llistxattr 261 | ||
284 | #define __NR_flistxattr 262 | ||
285 | #define __NR_removexattr 263 | ||
286 | #define __NR_lremovexattr 264 | ||
287 | #define __NR_fremovexattr 265 | ||
288 | #define __NR_tkill 266 | ||
289 | #define __NR_sendfile64 267 | ||
290 | #define __NR_futex 268 | ||
291 | #define __NR_sched_setaffinity 269 | ||
292 | #define __NR_sched_getaffinity 270 | ||
293 | /* 271 is reserved for set_thread_area */ | ||
294 | /* 272 is reserved for get_thread_area */ | ||
295 | #define __NR_io_setup 273 | ||
296 | #define __NR_io_destroy 274 | ||
297 | #define __NR_io_getevents 275 | ||
298 | #define __NR_io_submit 276 | ||
299 | #define __NR_io_cancel 277 | ||
300 | #define __NR_fadvise64 278 | ||
301 | /* 279 is unused */ | ||
302 | #define __NR_exit_group 280 | ||
303 | |||
304 | #define __NR_lookup_dcookie 281 | ||
305 | #define __NR_epoll_create 282 | ||
306 | #define __NR_epoll_ctl 283 | ||
307 | #define __NR_epoll_wait 284 | ||
308 | #define __NR_remap_file_pages 285 | ||
309 | #define __NR_set_tid_address 286 | ||
310 | #define __NR_timer_create 287 | ||
311 | #define __NR_timer_settime (__NR_timer_create+1) | ||
312 | #define __NR_timer_gettime (__NR_timer_create+2) | ||
313 | #define __NR_timer_getoverrun (__NR_timer_create+3) | ||
314 | #define __NR_timer_delete (__NR_timer_create+4) | ||
315 | #define __NR_clock_settime (__NR_timer_create+5) | ||
316 | #define __NR_clock_gettime (__NR_timer_create+6) | ||
317 | #define __NR_clock_getres (__NR_timer_create+7) | ||
318 | #define __NR_clock_nanosleep (__NR_timer_create+8) | ||
319 | #define __NR_statfs64 296 | ||
320 | #define __NR_fstatfs64 297 | ||
321 | #define __NR_tgkill 298 | ||
322 | #define __NR_utimes 299 | ||
323 | #define __NR_fadvise64_64 300 | ||
324 | /* 301 is reserved for vserver */ | ||
325 | /* 302 is reserved for mbind */ | ||
326 | /* 303 is reserved for get_mempolicy */ | ||
327 | /* 304 is reserved for set_mempolicy */ | ||
328 | #define __NR_mq_open 305 | ||
329 | #define __NR_mq_unlink (__NR_mq_open+1) | ||
330 | #define __NR_mq_timedsend (__NR_mq_open+2) | ||
331 | #define __NR_mq_timedreceive (__NR_mq_open+3) | ||
332 | #define __NR_mq_notify (__NR_mq_open+4) | ||
333 | #define __NR_mq_getsetattr (__NR_mq_open+5) | ||
334 | /* 311 is reserved for kexec */ | ||
335 | #define __NR_waitid 312 | ||
336 | #define __NR_add_key 313 | ||
337 | #define __NR_request_key 314 | ||
338 | #define __NR_keyctl 315 | ||
339 | #define __NR_ioprio_set 316 | ||
340 | #define __NR_ioprio_get 317 | ||
341 | #define __NR_inotify_init 318 | ||
342 | #define __NR_inotify_add_watch 319 | ||
343 | #define __NR_inotify_rm_watch 320 | ||
344 | /* 321 is unused */ | ||
345 | #define __NR_migrate_pages 322 | ||
346 | #define __NR_openat 323 | ||
347 | #define __NR_mkdirat 324 | ||
348 | #define __NR_mknodat 325 | ||
349 | #define __NR_fchownat 326 | ||
350 | #define __NR_futimesat 327 | ||
351 | #define __NR_fstatat64 328 | ||
352 | #define __NR_unlinkat 329 | ||
353 | #define __NR_renameat 330 | ||
354 | #define __NR_linkat 331 | ||
355 | #define __NR_symlinkat 332 | ||
356 | #define __NR_readlinkat 333 | ||
357 | #define __NR_fchmodat 334 | ||
358 | #define __NR_faccessat 335 | ||
359 | #define __NR_pselect6 336 | ||
360 | #define __NR_ppoll 337 | ||
361 | #define __NR_unshare 338 | ||
362 | #define __NR_set_robust_list 339 | ||
363 | #define __NR_get_robust_list 340 | ||
364 | #define __NR_splice 341 | ||
365 | #define __NR_sync_file_range 342 | ||
366 | #define __NR_tee 343 | ||
367 | #define __NR_vmsplice 344 | ||
368 | #define __NR_move_pages 345 | ||
369 | #define __NR_getcpu 346 | ||
370 | #define __NR_epoll_pwait 347 | ||
371 | #define __NR_utimensat 348 | ||
372 | #define __NR_signalfd 349 | ||
373 | #define __NR_timerfd_create 350 | ||
374 | #define __NR_eventfd 351 | ||
375 | #define __NR_fallocate 352 | ||
376 | #define __NR_timerfd_settime 353 | ||
377 | #define __NR_timerfd_gettime 354 | ||
378 | #define __NR_signalfd4 355 | ||
379 | #define __NR_eventfd2 356 | ||
380 | #define __NR_epoll_create1 357 | ||
381 | #define __NR_dup3 358 | ||
382 | #define __NR_pipe2 359 | ||
383 | #define __NR_inotify_init1 360 | ||
384 | #define __NR_preadv 361 | ||
385 | #define __NR_pwritev 362 | ||
386 | #define __NR_rt_tgsigqueueinfo 363 | ||
387 | #define __NR_perf_event_open 364 | ||
388 | #define __NR_recvmmsg 365 | ||
389 | #define __NR_accept4 366 | ||
390 | #define __NR_fanotify_init 367 | ||
391 | #define __NR_fanotify_mark 368 | ||
392 | #define __NR_prlimit64 369 | ||
393 | #define __NR_name_to_handle_at 370 | ||
394 | #define __NR_open_by_handle_at 371 | ||
395 | #define __NR_clock_adjtime 372 | ||
396 | #define __NR_syncfs 373 | ||
397 | #define __NR_sendmmsg 374 | ||
398 | #define __NR_setns 375 | ||
399 | #define __NR_process_vm_readv 376 | ||
400 | #define __NR_process_vm_writev 377 | ||
401 | |||
402 | #define NR_syscalls 378 | ||
403 | |||
404 | #endif /* __ASM_SH_UNISTD_64_H */ | ||