Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 940fbf411e5fb42aee8ab7dd814b24080951dbfc

Authored by Detlef Riekenberg
Committed by Linus Torvalds
1 parent ede6f5aea0
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

linux/types.h: Don't depend on __GNUC__ for __le64/__be64 

The typedefs for __u64 and __s64 where fixed to be available for other
compiler on May 2 2008 by H.  Peter Anvin (in commit edfa5cfa3dc5)

Acked-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Detlef Riekenberg <wine.dev@web.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 1 additions and 2 deletions Inline Diff

include/linux/types.h
Diff comments   View file @ 940fbf4
1 #ifndef _LINUX_TYPES_H 1 #ifndef _LINUX_TYPES_H
2 #define _LINUX_TYPES_H 2 #define _LINUX_TYPES_H
3 3
4 #ifdef __KERNEL__ 4 #ifdef __KERNEL__
5 5
6 #define DECLARE_BITMAP(name,bits) \ 6 #define DECLARE_BITMAP(name,bits) \
7 unsigned long name[BITS_TO_LONGS(bits)] 7 unsigned long name[BITS_TO_LONGS(bits)]
8 8
9 #endif 9 #endif
10 10
11 #include <linux/posix_types.h> 11 #include <linux/posix_types.h>
12 #include <asm/types.h> 12 #include <asm/types.h>
13 13
14 #ifndef __KERNEL_STRICT_NAMES 14 #ifndef __KERNEL_STRICT_NAMES
15 15
16 typedef __u32 __kernel_dev_t; 16 typedef __u32 __kernel_dev_t;
17 17
18 typedef __kernel_fd_set fd_set; 18 typedef __kernel_fd_set fd_set;
19 typedef __kernel_dev_t dev_t; 19 typedef __kernel_dev_t dev_t;
20 typedef __kernel_ino_t ino_t; 20 typedef __kernel_ino_t ino_t;
21 typedef __kernel_mode_t mode_t; 21 typedef __kernel_mode_t mode_t;
22 typedef __kernel_nlink_t nlink_t; 22 typedef __kernel_nlink_t nlink_t;
23 typedef __kernel_off_t off_t; 23 typedef __kernel_off_t off_t;
24 typedef __kernel_pid_t pid_t; 24 typedef __kernel_pid_t pid_t;
25 typedef __kernel_daddr_t daddr_t; 25 typedef __kernel_daddr_t daddr_t;
26 typedef __kernel_key_t key_t; 26 typedef __kernel_key_t key_t;
27 typedef __kernel_suseconds_t suseconds_t; 27 typedef __kernel_suseconds_t suseconds_t;
28 typedef __kernel_timer_t timer_t; 28 typedef __kernel_timer_t timer_t;
29 typedef __kernel_clockid_t clockid_t; 29 typedef __kernel_clockid_t clockid_t;
30 typedef __kernel_mqd_t mqd_t; 30 typedef __kernel_mqd_t mqd_t;
31 31
32 #ifdef __KERNEL__ 32 #ifdef __KERNEL__
33 typedef _Bool bool; 33 typedef _Bool bool;
34 34
35 typedef __kernel_uid32_t uid_t; 35 typedef __kernel_uid32_t uid_t;
36 typedef __kernel_gid32_t gid_t; 36 typedef __kernel_gid32_t gid_t;
37 typedef __kernel_uid16_t uid16_t; 37 typedef __kernel_uid16_t uid16_t;
38 typedef __kernel_gid16_t gid16_t; 38 typedef __kernel_gid16_t gid16_t;
39 39
40 typedef unsigned long uintptr_t; 40 typedef unsigned long uintptr_t;
41 41
42 #ifdef CONFIG_UID16 42 #ifdef CONFIG_UID16
43 /* This is defined by include/asm-{arch}/posix_types.h */ 43 /* This is defined by include/asm-{arch}/posix_types.h */
44 typedef __kernel_old_uid_t old_uid_t; 44 typedef __kernel_old_uid_t old_uid_t;
45 typedef __kernel_old_gid_t old_gid_t; 45 typedef __kernel_old_gid_t old_gid_t;
46 #endif /* CONFIG_UID16 */ 46 #endif /* CONFIG_UID16 */
47 47
48 /* libc5 includes this file to define uid_t, thus uid_t can never change 48 /* libc5 includes this file to define uid_t, thus uid_t can never change
49 * when it is included by non-kernel code 49 * when it is included by non-kernel code
50 */ 50 */
51 #else 51 #else
52 typedef __kernel_uid_t uid_t; 52 typedef __kernel_uid_t uid_t;
53 typedef __kernel_gid_t gid_t; 53 typedef __kernel_gid_t gid_t;
54 #endif /* __KERNEL__ */ 54 #endif /* __KERNEL__ */
55 55
56 #if defined(__GNUC__) 56 #if defined(__GNUC__)
57 typedef __kernel_loff_t loff_t; 57 typedef __kernel_loff_t loff_t;
58 #endif 58 #endif
59 59
60 /* 60 /*
61 * The following typedefs are also protected by individual ifdefs for 61 * The following typedefs are also protected by individual ifdefs for
62 * historical reasons: 62 * historical reasons:
63 */ 63 */
64 #ifndef _SIZE_T 64 #ifndef _SIZE_T
65 #define _SIZE_T 65 #define _SIZE_T
66 typedef __kernel_size_t size_t; 66 typedef __kernel_size_t size_t;
67 #endif 67 #endif
68 68
69 #ifndef _SSIZE_T 69 #ifndef _SSIZE_T
70 #define _SSIZE_T 70 #define _SSIZE_T
71 typedef __kernel_ssize_t ssize_t; 71 typedef __kernel_ssize_t ssize_t;
72 #endif 72 #endif
73 73
74 #ifndef _PTRDIFF_T 74 #ifndef _PTRDIFF_T
75 #define _PTRDIFF_T 75 #define _PTRDIFF_T
76 typedef __kernel_ptrdiff_t ptrdiff_t; 76 typedef __kernel_ptrdiff_t ptrdiff_t;
77 #endif 77 #endif
78 78
79 #ifndef _TIME_T 79 #ifndef _TIME_T
80 #define _TIME_T 80 #define _TIME_T
81 typedef __kernel_time_t time_t; 81 typedef __kernel_time_t time_t;
82 #endif 82 #endif
83 83
84 #ifndef _CLOCK_T 84 #ifndef _CLOCK_T
85 #define _CLOCK_T 85 #define _CLOCK_T
86 typedef __kernel_clock_t clock_t; 86 typedef __kernel_clock_t clock_t;
87 #endif 87 #endif
88 88
89 #ifndef _CADDR_T 89 #ifndef _CADDR_T
90 #define _CADDR_T 90 #define _CADDR_T
91 typedef __kernel_caddr_t caddr_t; 91 typedef __kernel_caddr_t caddr_t;
92 #endif 92 #endif
93 93
94 /* bsd */ 94 /* bsd */
95 typedef unsigned char u_char; 95 typedef unsigned char u_char;
96 typedef unsigned short u_short; 96 typedef unsigned short u_short;
97 typedef unsigned int u_int; 97 typedef unsigned int u_int;
98 typedef unsigned long u_long; 98 typedef unsigned long u_long;
99 99
100 /* sysv */ 100 /* sysv */
101 typedef unsigned char unchar; 101 typedef unsigned char unchar;
102 typedef unsigned short ushort; 102 typedef unsigned short ushort;
103 typedef unsigned int uint; 103 typedef unsigned int uint;
104 typedef unsigned long ulong; 104 typedef unsigned long ulong;
105 105
106 #ifndef __BIT_TYPES_DEFINED__ 106 #ifndef __BIT_TYPES_DEFINED__
107 #define __BIT_TYPES_DEFINED__ 107 #define __BIT_TYPES_DEFINED__
108 108
109 typedef __u8 u_int8_t; 109 typedef __u8 u_int8_t;
110 typedef __s8 int8_t; 110 typedef __s8 int8_t;
111 typedef __u16 u_int16_t; 111 typedef __u16 u_int16_t;
112 typedef __s16 int16_t; 112 typedef __s16 int16_t;
113 typedef __u32 u_int32_t; 113 typedef __u32 u_int32_t;
114 typedef __s32 int32_t; 114 typedef __s32 int32_t;
115 115
116 #endif /* !(__BIT_TYPES_DEFINED__) */ 116 #endif /* !(__BIT_TYPES_DEFINED__) */
117 117
118 typedef __u8 uint8_t; 118 typedef __u8 uint8_t;
119 typedef __u16 uint16_t; 119 typedef __u16 uint16_t;
120 typedef __u32 uint32_t; 120 typedef __u32 uint32_t;
121 121
122 #if defined(__GNUC__) 122 #if defined(__GNUC__)
123 typedef __u64 uint64_t; 123 typedef __u64 uint64_t;
124 typedef __u64 u_int64_t; 124 typedef __u64 u_int64_t;
125 typedef __s64 int64_t; 125 typedef __s64 int64_t;
126 #endif 126 #endif
127 127
128 /* this is a special 64bit data type that is 8-byte aligned */ 128 /* this is a special 64bit data type that is 8-byte aligned */
129 #define aligned_u64 __u64 __attribute__((aligned(8))) 129 #define aligned_u64 __u64 __attribute__((aligned(8)))
130 #define aligned_be64 __be64 __attribute__((aligned(8))) 130 #define aligned_be64 __be64 __attribute__((aligned(8)))
131 #define aligned_le64 __le64 __attribute__((aligned(8))) 131 #define aligned_le64 __le64 __attribute__((aligned(8)))
132 132
133 /** 133 /**
134 * The type used for indexing onto a disc or disc partition. 134 * The type used for indexing onto a disc or disc partition.
135 * 135 *
136 * Linux always considers sectors to be 512 bytes long independently 136 * Linux always considers sectors to be 512 bytes long independently
137 * of the devices real block size. 137 * of the devices real block size.
138 * 138 *
139 * blkcnt_t is the type of the inode's block count. 139 * blkcnt_t is the type of the inode's block count.
140 */ 140 */
141 #ifdef CONFIG_LBD 141 #ifdef CONFIG_LBD
142 typedef u64 sector_t; 142 typedef u64 sector_t;
143 typedef u64 blkcnt_t; 143 typedef u64 blkcnt_t;
144 #else 144 #else
145 typedef unsigned long sector_t; 145 typedef unsigned long sector_t;
146 typedef unsigned long blkcnt_t; 146 typedef unsigned long blkcnt_t;
147 #endif 147 #endif
148 148
149 /* 149 /*
150 * The type of an index into the pagecache. Use a #define so asm/types.h 150 * The type of an index into the pagecache. Use a #define so asm/types.h
151 * can override it. 151 * can override it.
152 */ 152 */
153 #ifndef pgoff_t 153 #ifndef pgoff_t
154 #define pgoff_t unsigned long 154 #define pgoff_t unsigned long
155 #endif 155 #endif
156 156
157 #endif /* __KERNEL_STRICT_NAMES */ 157 #endif /* __KERNEL_STRICT_NAMES */
158 158
159 /* 159 /*
160 * Below are truly Linux-specific types that should never collide with 160 * Below are truly Linux-specific types that should never collide with
161 * any application/library that wants linux/types.h. 161 * any application/library that wants linux/types.h.
162 */ 162 */
163 163
164 #ifdef __CHECKER__ 164 #ifdef __CHECKER__
165 #define __bitwise__ __attribute__((bitwise)) 165 #define __bitwise__ __attribute__((bitwise))
166 #else 166 #else
167 #define __bitwise__ 167 #define __bitwise__
168 #endif 168 #endif
169 #ifdef __CHECK_ENDIAN__ 169 #ifdef __CHECK_ENDIAN__
170 #define __bitwise __bitwise__ 170 #define __bitwise __bitwise__
171 #else 171 #else
172 #define __bitwise 172 #define __bitwise
173 #endif 173 #endif
174 174
175 typedef __u16 __bitwise __le16; 175 typedef __u16 __bitwise __le16;
176 typedef __u16 __bitwise __be16; 176 typedef __u16 __bitwise __be16;
177 typedef __u32 __bitwise __le32; 177 typedef __u32 __bitwise __le32;
178 typedef __u32 __bitwise __be32; 178 typedef __u32 __bitwise __be32;
179 #if defined(__GNUC__)
180 typedef __u64 __bitwise __le64; 179 typedef __u64 __bitwise __le64;
181 typedef __u64 __bitwise __be64; 180 typedef __u64 __bitwise __be64;
182 #endif 181
183 typedef __u16 __bitwise __sum16; 182 typedef __u16 __bitwise __sum16;
184 typedef __u32 __bitwise __wsum; 183 typedef __u32 __bitwise __wsum;
185 184
186 #ifdef __KERNEL__ 185 #ifdef __KERNEL__
187 typedef unsigned __bitwise__ gfp_t; 186 typedef unsigned __bitwise__ gfp_t;
188 typedef unsigned __bitwise__ fmode_t; 187 typedef unsigned __bitwise__ fmode_t;
189 188
190 #ifdef CONFIG_PHYS_ADDR_T_64BIT 189 #ifdef CONFIG_PHYS_ADDR_T_64BIT
191 typedef u64 phys_addr_t; 190 typedef u64 phys_addr_t;
192 #else 191 #else
193 typedef u32 phys_addr_t; 192 typedef u32 phys_addr_t;
194 #endif 193 #endif
195 194
196 typedef phys_addr_t resource_size_t; 195 typedef phys_addr_t resource_size_t;
197 196
198 typedef struct { 197 typedef struct {
199 volatile int counter; 198 volatile int counter;
200 } atomic_t; 199 } atomic_t;
201 200
202 #ifdef CONFIG_64BIT 201 #ifdef CONFIG_64BIT
203 typedef struct { 202 typedef struct {
204 volatile long counter; 203 volatile long counter;
205 } atomic64_t; 204 } atomic64_t;
206 #endif 205 #endif
207 206
208 struct ustat { 207 struct ustat {
209 __kernel_daddr_t f_tfree; 208 __kernel_daddr_t f_tfree;
210 __kernel_ino_t f_tinode; 209 __kernel_ino_t f_tinode;
211 char f_fname[6]; 210 char f_fname[6];
212 char f_fpack[6]; 211 char f_fpack[6];
213 }; 212 };
214 213
215 #endif /* __KERNEL__ */ 214 #endif /* __KERNEL__ */
216 215
217 #endif /* _LINUX_TYPES_H */ 216 #endif /* _LINUX_TYPES_H */
218 217