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

sh: Convert to asm-generic/posix_types.h.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

+32 -214
+15 -104
arch/sh/include/asm/posix_types_32.h
··· 1 - #ifndef __ASM_SH_POSIX_TYPES_H 2 - #define __ASM_SH_POSIX_TYPES_H 1 + #ifndef __ASM_SH_POSIX_TYPES_32_H 2 + #define __ASM_SH_POSIX_TYPES_32_H 3 3 4 - /* 5 - * This file is generally used by user-level software, so you need to 6 - * be a little careful about namespace pollution etc. Also, we cannot 7 - * assume GCC is being used. 8 - */ 9 - 10 - typedef unsigned long __kernel_ino_t; 11 4 typedef unsigned short __kernel_mode_t; 5 + #define __kernel_mode_t __kernel_mode_t 12 6 typedef unsigned short __kernel_nlink_t; 13 - typedef long __kernel_off_t; 14 - typedef int __kernel_pid_t; 7 + #define __kernel_nlink_t __kernel_nlink_t 15 8 typedef unsigned short __kernel_ipc_pid_t; 9 + #define __kernel_ipc_pid_t __kernel_ipc_pid_t 16 10 typedef unsigned short __kernel_uid_t; 11 + #define __kernel_uid_t __kernel_uid_t 17 12 typedef unsigned short __kernel_gid_t; 18 - typedef unsigned int __kernel_size_t; 19 - typedef int __kernel_ssize_t; 20 - typedef int __kernel_ptrdiff_t; 21 - typedef long __kernel_time_t; 22 - typedef long __kernel_suseconds_t; 23 - typedef long __kernel_clock_t; 24 - typedef int __kernel_timer_t; 25 - typedef int __kernel_clockid_t; 26 - typedef int __kernel_daddr_t; 27 - typedef char * __kernel_caddr_t; 28 - typedef unsigned short __kernel_uid16_t; 29 - typedef unsigned short __kernel_gid16_t; 13 + #define __kernel_gid_t __kernel_gid_t 14 + 30 15 typedef unsigned int __kernel_uid32_t; 16 + #define __kernel_uid32_t __kernel_uid32_t 31 17 typedef unsigned int __kernel_gid32_t; 18 + #define __kernel_gid32_t __kernel_gid32_t 32 19 33 20 typedef unsigned short __kernel_old_uid_t; 21 + #define __kernel_old_uid_t __kernel_old_uid_t 34 22 typedef unsigned short __kernel_old_gid_t; 23 + #define __kernel_old_gid_t __kernel_old_gid_t 35 24 typedef unsigned short __kernel_old_dev_t; 25 + #define __kernel_old_dev_t __kernel_old_dev_t 36 26 37 - #ifdef __GNUC__ 38 - typedef long long __kernel_loff_t; 39 - #endif 27 + #include <asm-generic/posix_types.h> 40 28 41 - typedef struct { 42 - int val[2]; 43 - } __kernel_fsid_t; 44 - 45 - #if defined(__KERNEL__) 46 - 47 - #undef __FD_SET 48 - static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp) 49 - { 50 - unsigned long __tmp = __fd / __NFDBITS; 51 - unsigned long __rem = __fd % __NFDBITS; 52 - __fdsetp->fds_bits[__tmp] |= (1UL<<__rem); 53 - } 54 - 55 - #undef __FD_CLR 56 - static __inline__ void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp) 57 - { 58 - unsigned long __tmp = __fd / __NFDBITS; 59 - unsigned long __rem = __fd % __NFDBITS; 60 - __fdsetp->fds_bits[__tmp] &= ~(1UL<<__rem); 61 - } 62 - 63 - 64 - #undef __FD_ISSET 65 - static __inline__ int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__p) 66 - { 67 - unsigned long __tmp = __fd / __NFDBITS; 68 - unsigned long __rem = __fd % __NFDBITS; 69 - return (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0; 70 - } 71 - 72 - /* 73 - * This will unroll the loop for the normal constant case (8 ints, 74 - * for a 256-bit fd_set) 75 - */ 76 - #undef __FD_ZERO 77 - static __inline__ void __FD_ZERO(__kernel_fd_set *__p) 78 - { 79 - unsigned long *__tmp = __p->fds_bits; 80 - int __i; 81 - 82 - if (__builtin_constant_p(__FDSET_LONGS)) { 83 - switch (__FDSET_LONGS) { 84 - case 16: 85 - __tmp[ 0] = 0; __tmp[ 1] = 0; 86 - __tmp[ 2] = 0; __tmp[ 3] = 0; 87 - __tmp[ 4] = 0; __tmp[ 5] = 0; 88 - __tmp[ 6] = 0; __tmp[ 7] = 0; 89 - __tmp[ 8] = 0; __tmp[ 9] = 0; 90 - __tmp[10] = 0; __tmp[11] = 0; 91 - __tmp[12] = 0; __tmp[13] = 0; 92 - __tmp[14] = 0; __tmp[15] = 0; 93 - return; 94 - 95 - case 8: 96 - __tmp[ 0] = 0; __tmp[ 1] = 0; 97 - __tmp[ 2] = 0; __tmp[ 3] = 0; 98 - __tmp[ 4] = 0; __tmp[ 5] = 0; 99 - __tmp[ 6] = 0; __tmp[ 7] = 0; 100 - return; 101 - 102 - case 4: 103 - __tmp[ 0] = 0; __tmp[ 1] = 0; 104 - __tmp[ 2] = 0; __tmp[ 3] = 0; 105 - return; 106 - } 107 - } 108 - __i = __FDSET_LONGS; 109 - while (__i) { 110 - __i--; 111 - *__tmp = 0; 112 - __tmp++; 113 - } 114 - } 115 - 116 - #endif /* defined(__KERNEL__) */ 117 - 118 - #endif /* __ASM_SH_POSIX_TYPES_H */ 29 + #endif /* __ASM_SH_POSIX_TYPES_32_H */
+17 -110
arch/sh/include/asm/posix_types_64.h
··· 1 - #ifndef __ASM_SH64_POSIX_TYPES_H 2 - #define __ASM_SH64_POSIX_TYPES_H 1 + #ifndef __ASM_SH_POSIX_TYPES_64_H 2 + #define __ASM_SH_POSIX_TYPES_64_H 3 3 4 - /* 5 - * This file is subject to the terms and conditions of the GNU General Public 6 - * License. See the file "COPYING" in the main directory of this archive 7 - * for more details. 8 - * 9 - * include/asm-sh64/posix_types.h 10 - * 11 - * Copyright (C) 2000, 2001 Paolo Alberelli 12 - * Copyright (C) 2003 Paul Mundt 13 - * 14 - * This file is generally used by user-level software, so you need to 15 - * be a little careful about namespace pollution etc. Also, we cannot 16 - * assume GCC is being used. 17 - */ 18 - 19 - typedef unsigned long __kernel_ino_t; 20 4 typedef unsigned short __kernel_mode_t; 5 + #define __kernel_mode_t __kernel_mode_t 21 6 typedef unsigned short __kernel_nlink_t; 22 - typedef long __kernel_off_t; 23 - typedef int __kernel_pid_t; 7 + #define __kernel_nlink_t __kernel_nlink_t 24 8 typedef unsigned short __kernel_ipc_pid_t; 9 + #define __kernel_ipc_pid_t __kernel_ipc_pid_t 25 10 typedef unsigned short __kernel_uid_t; 11 + #define __kernel_uid_t __kernel_uid_t 26 12 typedef unsigned short __kernel_gid_t; 13 + #define __kernel_gid_t __kernel_gid_t 27 14 typedef long unsigned int __kernel_size_t; 15 + #define __kernel_size_t __kernel_size_t 28 16 typedef int __kernel_ssize_t; 17 + #define __kernel_ssize_t __kernel_ssize_t 29 18 typedef int __kernel_ptrdiff_t; 30 - typedef long __kernel_time_t; 31 - typedef long __kernel_suseconds_t; 32 - typedef long __kernel_clock_t; 33 - typedef int __kernel_timer_t; 34 - typedef int __kernel_clockid_t; 35 - typedef int __kernel_daddr_t; 36 - typedef char * __kernel_caddr_t; 37 - typedef unsigned short __kernel_uid16_t; 38 - typedef unsigned short __kernel_gid16_t; 19 + #define __kernel_ptrdiff_t __kernel_ptrdiff_t 39 20 typedef unsigned int __kernel_uid32_t; 21 + #define __kernel_uid32_t __kernel_uid32_t 40 22 typedef unsigned int __kernel_gid32_t; 23 + #define __kernel_gid32_t __kernel_gid32_t 41 24 42 25 typedef unsigned short __kernel_old_uid_t; 26 + #define __kernel_old_uid_t __kernel_old_uid_t 43 27 typedef unsigned short __kernel_old_gid_t; 28 + #define __kernel_old_gid_t __kernel_old_gid_t 44 29 typedef unsigned short __kernel_old_dev_t; 30 + #define __kernel_old_dev_t __kernel_old_dev_t 45 31 46 - #ifdef __GNUC__ 47 - typedef long long __kernel_loff_t; 48 - #endif 32 + #include <asm-generic/posix_types.h> 49 33 50 - typedef struct { 51 - int val[2]; 52 - } __kernel_fsid_t; 53 - 54 - #if defined(__KERNEL__) 55 - 56 - #undef __FD_SET 57 - static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp) 58 - { 59 - unsigned long __tmp = __fd / __NFDBITS; 60 - unsigned long __rem = __fd % __NFDBITS; 61 - __fdsetp->fds_bits[__tmp] |= (1UL<<__rem); 62 - } 63 - 64 - #undef __FD_CLR 65 - static __inline__ void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp) 66 - { 67 - unsigned long __tmp = __fd / __NFDBITS; 68 - unsigned long __rem = __fd % __NFDBITS; 69 - __fdsetp->fds_bits[__tmp] &= ~(1UL<<__rem); 70 - } 71 - 72 - 73 - #undef __FD_ISSET 74 - static __inline__ int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__p) 75 - { 76 - unsigned long __tmp = __fd / __NFDBITS; 77 - unsigned long __rem = __fd % __NFDBITS; 78 - return (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0; 79 - } 80 - 81 - /* 82 - * This will unroll the loop for the normal constant case (8 ints, 83 - * for a 256-bit fd_set) 84 - */ 85 - #undef __FD_ZERO 86 - static __inline__ void __FD_ZERO(__kernel_fd_set *__p) 87 - { 88 - unsigned long *__tmp = __p->fds_bits; 89 - int __i; 90 - 91 - if (__builtin_constant_p(__FDSET_LONGS)) { 92 - switch (__FDSET_LONGS) { 93 - case 16: 94 - __tmp[ 0] = 0; __tmp[ 1] = 0; 95 - __tmp[ 2] = 0; __tmp[ 3] = 0; 96 - __tmp[ 4] = 0; __tmp[ 5] = 0; 97 - __tmp[ 6] = 0; __tmp[ 7] = 0; 98 - __tmp[ 8] = 0; __tmp[ 9] = 0; 99 - __tmp[10] = 0; __tmp[11] = 0; 100 - __tmp[12] = 0; __tmp[13] = 0; 101 - __tmp[14] = 0; __tmp[15] = 0; 102 - return; 103 - 104 - case 8: 105 - __tmp[ 0] = 0; __tmp[ 1] = 0; 106 - __tmp[ 2] = 0; __tmp[ 3] = 0; 107 - __tmp[ 4] = 0; __tmp[ 5] = 0; 108 - __tmp[ 6] = 0; __tmp[ 7] = 0; 109 - return; 110 - 111 - case 4: 112 - __tmp[ 0] = 0; __tmp[ 1] = 0; 113 - __tmp[ 2] = 0; __tmp[ 3] = 0; 114 - return; 115 - } 116 - } 117 - __i = __FDSET_LONGS; 118 - while (__i) { 119 - __i--; 120 - *__tmp = 0; 121 - __tmp++; 122 - } 123 - } 124 - 125 - #endif /* defined(__KERNEL__) */ 126 - 127 - #endif /* __ASM_SH64_POSIX_TYPES_H */ 34 + #endif /* __ASM_SH_POSIX_TYPES_64_H */