toolchain/uClibc/patches-0.9.33.2/970-add___kernel_long_and___kernel_ulong.patch

   1 From 6a76edddaa62ff06f178143b582167734cb55c18 Mon Sep 17 00:00:00 2001
   2 From: Chris Packham <chris.packham@alliedtelesis.co.nz>
   3 Date: Mon, 01 Oct 2012 05:12:54 +0000
   4 Subject: libc/sysdeps: add __kernel_long and __kernel_ulong
   5
   6 Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
   7 exported header files were updated to use these new types. Add the
   8 definitions for __kernel_long_t and __kernel_ulong_t to the relevant
   9 kernel_types.h headers.
  10
  11 This change was automated with the following scriptlet
  12
  13   git grep --name-only 'typedef.*__kernel_old_dev_t' \
  14     | xargs sed -i '/typedef.*__kernel_old_dev_t/ a\
  15   typedef long\t\t__kernel_long_t;\
  16   typedef unsigned long\t__kernel_ulong_t;'
  17
  18 Whitespace in arm, avr32, hppa, sparc was then manually fixed up.
  19
  20 Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
  21 --
  22 Here's a cleaned up patch which should get the whitespace right. I'm a
  23 bit iffy about the sparc changes they make sense to me but it's not a
  24 platform I have access to.
  25
  26 I can break this up per arch or per maintainer if requested.
  27
  28  libc/sysdeps/linux/alpha/bits/kernel_types.h      |    2 ++
  29  libc/sysdeps/linux/arm/bits/kernel_types.h        |    2 ++
  30  libc/sysdeps/linux/avr32/bits/kernel_types.h      |    2 ++
  31  libc/sysdeps/linux/bfin/bits/kernel_types.h       |    2 ++
  32  libc/sysdeps/linux/c6x/bits/kernel_types.h        |    2 ++
  33  libc/sysdeps/linux/cris/bits/kernel_types.h       |    2 ++
  34  libc/sysdeps/linux/e1/bits/kernel_types.h         |    2 ++
  35  libc/sysdeps/linux/h8300/bits/kernel_types.h      |    2 ++
  36  libc/sysdeps/linux/hppa/bits/kernel_types.h       |    2 ++
  37  libc/sysdeps/linux/i386/bits/kernel_types.h       |    2 ++
  38  libc/sysdeps/linux/ia64/bits/kernel_types.h       |    2 ++
  39  libc/sysdeps/linux/m68k/bits/kernel_types.h       |    2 ++
  40  libc/sysdeps/linux/microblaze/bits/kernel_types.h |    2 ++
  41  libc/sysdeps/linux/mips/bits/kernel_types.h       |    4 ++++
  42  libc/sysdeps/linux/nios2/bits/kernel_types.h      |    2 ++
  43  libc/sysdeps/linux/powerpc/bits/kernel_types.h    |    4 ++++
  44  libc/sysdeps/linux/sh/bits/kernel_types.h         |    2 ++
  45  libc/sysdeps/linux/sh64/bits/kernel_types.h       |    2 ++
  46  libc/sysdeps/linux/sparc/bits/kernel_types.h      |    4 ++++
  47  libc/sysdeps/linux/v850/bits/kernel_types.h       |    2 ++
  48  libc/sysdeps/linux/x86_64/bits/kernel_types.h     |    2 ++
  49  libc/sysdeps/linux/xtensa/bits/kernel_types.h     |    2 ++
  50  22 files changed, 50 insertions(+)
  51 Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
  52 ---
  53 diff --git a/libc/sysdeps/linux/alpha/bits/kernel_types.h b/libc/sysdeps/linux/alpha/bits/kernel_types.h
  54 index d5574c9..cd59b9d 100644
  55 --- a/libc/sysdeps/linux/alpha/bits/kernel_types.h
  56 +++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h
  57 @@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_t;
  58  typedef __kernel_uid_t __kernel_uid32_t;
  59  typedef __kernel_gid_t __kernel_gid32_t;
  60  typedef __kernel_dev_t __kernel_old_dev_t;
  61 +typedef long           __kernel_long_t;
  62 +typedef unsigned long  __kernel_ulong_t;
  63
  64  typedef struct {
  65         int val[2];
  66 diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h
  67 index 766a306..6b36f32 100644
  68 --- a/libc/sysdeps/linux/arm/bits/kernel_types.h
  69 +++ b/libc/sysdeps/linux/arm/bits/kernel_types.h
  70 @@ -32,6 +32,8 @@ typedef unsigned short                __kernel_old_uid_t;
  71  typedef unsigned short         __kernel_old_gid_t;
  72  typedef long long              __kernel_loff_t;
  73  typedef __kernel_dev_t         __kernel_old_dev_t;
  74 +typedef long                   __kernel_long_t;
  75 +typedef unsigned long          __kernel_ulong_t;
  76
  77  typedef struct {
  78  #ifdef __USE_ALL
  79 diff --git a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h
  80 index f7d8b52..c551d57 100644
  81 --- a/libc/sysdeps/linux/avr32/bits/kernel_types.h
  82 +++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h
  83 @@ -39,6 +39,8 @@ typedef unsigned int          __kernel_gid32_t;
  84  typedef unsigned short         __kernel_old_uid_t;
  85  typedef unsigned short         __kernel_old_gid_t;
  86  typedef unsigned short         __kernel_old_dev_t;
  87 +typedef long                   __kernel_long_t;
  88 +typedef unsigned long          __kernel_ulong_t;
  89
  90  #ifdef __GNUC__
  91  typedef long long              __kernel_loff_t;
  92 diff --git a/libc/sysdeps/linux/bfin/bits/kernel_types.h b/libc/sysdeps/linux/bfin/bits/kernel_types.h
  93 index d69a875..9fec595 100644
  94 --- a/libc/sysdeps/linux/bfin/bits/kernel_types.h
  95 +++ b/libc/sysdeps/linux/bfin/bits/kernel_types.h
  96 @@ -32,6 +32,8 @@ typedef unsigned short        __kernel_old_uid_t;
  97  typedef unsigned short __kernel_old_gid_t;
  98  typedef long long      __kernel_loff_t;
  99  typedef __kernel_dev_t __kernel_old_dev_t;
 100 +typedef long           __kernel_long_t;
 101 +typedef unsigned long  __kernel_ulong_t;
 102
 103  typedef struct {
 104  #ifdef __USE_ALL
 105 diff --git a/libc/sysdeps/linux/c6x/bits/kernel_types.h b/libc/sysdeps/linux/c6x/bits/kernel_types.h
 106 index 7557309..2c363a8 100644
 107 --- a/libc/sysdeps/linux/c6x/bits/kernel_types.h
 108 +++ b/libc/sysdeps/linux/c6x/bits/kernel_types.h
 109 @@ -22,6 +22,8 @@ typedef unsigned int  __kernel_gid32_t;
 110  typedef unsigned int   __kernel_old_uid_t;
 111  typedef unsigned int   __kernel_old_gid_t;
 112  typedef unsigned int   __kernel_old_dev_t;
 113 +typedef long           __kernel_long_t;
 114 +typedef unsigned long  __kernel_ulong_t;
 115  typedef unsigned int   __kernel_size_t;
 116  typedef int            __kernel_ssize_t;
 117  typedef int            __kernel_ptrdiff_t;
 118 diff --git a/libc/sysdeps/linux/cris/bits/kernel_types.h b/libc/sysdeps/linux/cris/bits/kernel_types.h
 119 index f122c7f..5d31f7b 100644
 120 --- a/libc/sysdeps/linux/cris/bits/kernel_types.h
 121 +++ b/libc/sysdeps/linux/cris/bits/kernel_types.h
 122 @@ -28,6 +28,8 @@ typedef unsigned int    __kernel_gid32_t;
 123  typedef unsigned short  __kernel_old_uid_t;
 124  typedef unsigned short  __kernel_old_gid_t;
 125  typedef __kernel_dev_t __kernel_old_dev_t;
 126 +typedef long           __kernel_long_t;
 127 +typedef unsigned long  __kernel_ulong_t;
 128
 129  #ifdef __GNUC__
 130  typedef long long      __kernel_loff_t;
 131 diff --git a/libc/sysdeps/linux/e1/bits/kernel_types.h b/libc/sysdeps/linux/e1/bits/kernel_types.h
 132 index 8017d85..f55a129 100644
 133 --- a/libc/sysdeps/linux/e1/bits/kernel_types.h
 134 +++ b/libc/sysdeps/linux/e1/bits/kernel_types.h
 135 @@ -31,6 +31,8 @@ typedef unsigned int  __kernel_gid32_t;
 136  typedef unsigned short __kernel_old_uid_t;
 137  typedef unsigned short __kernel_old_gid_t;
 138  typedef __kernel_dev_t __kernel_old_dev_t;
 139 +typedef long           __kernel_long_t;
 140 +typedef unsigned long  __kernel_ulong_t;
 141  typedef long long      __kernel_loff_t;
 142
 143  /*
 144 diff --git a/libc/sysdeps/linux/h8300/bits/kernel_types.h b/libc/sysdeps/linux/h8300/bits/kernel_types.h
 145 index 0570675..4cfd1bf 100644
 146 --- a/libc/sysdeps/linux/h8300/bits/kernel_types.h
 147 +++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h
 148 @@ -32,6 +32,8 @@ typedef unsigned short        __kernel_old_uid_t;
 149  typedef unsigned short __kernel_old_gid_t;
 150  typedef long long      __kernel_loff_t;
 151  typedef __kernel_dev_t __kernel_old_dev_t;
 152 +typedef long           __kernel_long_t;
 153 +typedef unsigned long  __kernel_ulong_t;
 154
 155  typedef struct {
 156  #ifdef __USE_ALL
 157 diff --git a/libc/sysdeps/linux/hppa/bits/kernel_types.h b/libc/sysdeps/linux/hppa/bits/kernel_types.h
 158 index 4441f9b..6b2e794 100644
 159 --- a/libc/sysdeps/linux/hppa/bits/kernel_types.h
 160 +++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h
 161 @@ -45,6 +45,8 @@ typedef long long             __kernel_off64_t;
 162  typedef unsigned long long     __kernel_ino64_t;
 163
 164  typedef unsigned int           __kernel_old_dev_t;
 165 +typedef long                   __kernel_long_t;
 166 +typedef unsigned long          __kernel_ulong_t;
 167
 168  typedef struct {
 169  #ifdef __USE_ALL
 170 diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
 171 index 9c07c72..59044b8 100644
 172 --- a/libc/sysdeps/linux/i386/bits/kernel_types.h
 173 +++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
 174 @@ -40,6 +40,8 @@ typedef unsigned int  __kernel_gid32_t;
 175  typedef unsigned short __kernel_old_uid_t;
 176  typedef unsigned short __kernel_old_gid_t;
 177  typedef __kernel_dev_t __kernel_old_dev_t;
 178 +typedef long           __kernel_long_t;
 179 +typedef unsigned long  __kernel_ulong_t;
 180  typedef long long      __kernel_loff_t;
 181
 182  typedef struct {
 183 diff --git a/libc/sysdeps/linux/ia64/bits/kernel_types.h b/libc/sysdeps/linux/ia64/bits/kernel_types.h
 184 index c8ef86d..e31dc65 100644
 185 --- a/libc/sysdeps/linux/ia64/bits/kernel_types.h
 186 +++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h
 187 @@ -52,5 +52,7 @@ typedef __kernel_gid_t __kernel_gid32_t;
 188
 189  typedef unsigned int   __kernel_dev_t;
 190  typedef unsigned int   __kernel_old_dev_t;
 191 +typedef long           __kernel_long_t;
 192 +typedef unsigned long  __kernel_ulong_t;
 193
 194  #endif /* _ASM_IA64_POSIX_TYPES_H */
 195 diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h
 196 index 0a77a8f..176b968 100644
 197 --- a/libc/sysdeps/linux/m68k/bits/kernel_types.h
 198 +++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h
 199 @@ -32,6 +32,8 @@ typedef unsigned short        __kernel_old_uid_t;
 200  typedef unsigned short __kernel_old_gid_t;
 201  typedef long long      __kernel_loff_t;
 202  typedef __kernel_dev_t __kernel_old_dev_t;
 203 +typedef long           __kernel_long_t;
 204 +typedef unsigned long  __kernel_ulong_t;
 205
 206  typedef struct {
 207  #ifdef __USE_ALL
 208 diff --git a/libc/sysdeps/linux/microblaze/bits/kernel_types.h b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
 209 index 2a70575..a9f736b 100644
 210 --- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h
 211 +++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
 212 @@ -44,6 +44,8 @@ typedef unsigned int  __kernel_gid32_t;
 213  typedef unsigned int   __kernel_old_uid_t;
 214  typedef unsigned int   __kernel_old_gid_t;
 215  typedef unsigned int   __kernel_old_dev_t;
 216 +typedef long           __kernel_long_t;
 217 +typedef unsigned long  __kernel_ulong_t;
 218
 219  #ifdef __GNUC__
 220  typedef long long      __kernel_loff_t;
 221 diff --git a/libc/sysdeps/linux/mips/bits/kernel_types.h b/libc/sysdeps/linux/mips/bits/kernel_types.h
 222 index 9fc3b96..97faeac 100644
 223 --- a/libc/sysdeps/linux/mips/bits/kernel_types.h
 224 +++ b/libc/sysdeps/linux/mips/bits/kernel_types.h
 225 @@ -32,6 +32,8 @@ typedef int           __kernel_gid32_t;
 226  typedef __kernel_uid_t __kernel_old_uid_t;
 227  typedef __kernel_gid_t __kernel_old_gid_t;
 228  typedef __kernel_dev_t __kernel_old_dev_t;
 229 +typedef long           __kernel_long_t;
 230 +typedef unsigned long  __kernel_ulong_t;
 231  typedef long long      __kernel_loff_t;
 232  #else
 233  typedef unsigned int   __kernel_dev_t;
 234 @@ -68,6 +70,8 @@ typedef int           __kernel_gid32_t;
 235  typedef __kernel_uid_t __kernel_old_uid_t;
 236  typedef __kernel_gid_t __kernel_old_gid_t;
 237  typedef __kernel_dev_t __kernel_old_dev_t;
 238 +typedef long           __kernel_long_t;
 239 +typedef unsigned long  __kernel_ulong_t;
 240  typedef long long      __kernel_loff_t;
 241  #endif
 242
 243 diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h
 244 index 8b86d79..3c030e7 100644
 245 --- a/libc/sysdeps/linux/nios2/bits/kernel_types.h
 246 +++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h
 247 @@ -31,6 +31,8 @@ typedef unsigned int  __kernel_gid32_t;
 248  typedef unsigned short __kernel_old_uid_t;
 249  typedef unsigned short __kernel_old_gid_t;
 250  typedef unsigned short __kernel_old_dev_t;
 251 +typedef long           __kernel_long_t;
 252 +typedef unsigned long  __kernel_ulong_t;
 253  typedef long long      __kernel_loff_t;
 254
 255  typedef struct {
 256 diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
 257 index 3f3b933..1167de2 100644
 258 --- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h
 259 +++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
 260 @@ -36,6 +36,8 @@ typedef unsigned int  __kernel_gid32_t;
 261  typedef unsigned int   __kernel_old_uid_t;
 262  typedef unsigned int   __kernel_old_gid_t;
 263  typedef __kernel_dev_t __kernel_old_dev_t;
 264 +typedef long           __kernel_long_t;
 265 +typedef unsigned long  __kernel_ulong_t;
 266  #else
 267  typedef unsigned int   __kernel_dev_t;
 268  typedef unsigned int   __kernel_ino_t;
 269 @@ -61,6 +63,8 @@ typedef unsigned int  __kernel_gid32_t;
 270  typedef unsigned int   __kernel_old_uid_t;
 271  typedef unsigned int   __kernel_old_gid_t;
 272  typedef __kernel_dev_t __kernel_old_dev_t;
 273 +typedef long           __kernel_long_t;
 274 +typedef unsigned long  __kernel_ulong_t;
 275  typedef long long      __kernel_loff_t;
 276  #endif
 277
 278 diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h
 279 index f96e9fa..ac97261 100644
 280 --- a/libc/sysdeps/linux/sh/bits/kernel_types.h
 281 +++ b/libc/sysdeps/linux/sh/bits/kernel_types.h
 282 @@ -32,6 +32,8 @@ typedef unsigned int  __kernel_gid32_t;
 283  typedef unsigned short __kernel_old_uid_t;
 284  typedef unsigned short __kernel_old_gid_t;
 285  typedef __kernel_dev_t __kernel_old_dev_t;
 286 +typedef long           __kernel_long_t;
 287 +typedef unsigned long  __kernel_ulong_t;
 288  typedef long long      __kernel_loff_t;
 289
 290  typedef struct {
 291 diff --git a/libc/sysdeps/linux/sh64/bits/kernel_types.h b/libc/sysdeps/linux/sh64/bits/kernel_types.h
 292 index 671cc83..8cc6c61 100644
 293 --- a/libc/sysdeps/linux/sh64/bits/kernel_types.h
 294 +++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h
 295 @@ -43,6 +43,8 @@ typedef unsigned int    __kernel_gid32_t;
 296  typedef unsigned short  __kernel_old_uid_t;
 297  typedef unsigned short  __kernel_old_gid_t;
 298  typedef __kernel_dev_t __kernel_old_dev_t;
 299 +typedef long           __kernel_long_t;
 300 +typedef unsigned long  __kernel_ulong_t;
 301  typedef long long       __kernel_loff_t;
 302
 303  typedef struct {
 304 diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h
 305 index 0cc4bc2..a10e075 100644
 306 --- a/libc/sysdeps/linux/sparc/bits/kernel_types.h
 307 +++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h
 308 @@ -32,6 +32,8 @@ typedef unsigned short               __kernel_gid16_t;
 309  typedef __kernel_uid_t                __kernel_old_uid_t;
 310  typedef __kernel_gid_t         __kernel_old_gid_t;
 311  typedef __kernel_dev_t         __kernel_old_dev_t;
 312 +typedef long                   __kernel_long_t;
 313 +typedef unsigned long          __kernel_ulong_t;
 314  typedef __kernel_uid_t        __kernel_uid32_t;
 315  typedef __kernel_gid_t        __kernel_gid32_t;
 316  typedef int                   __kernel_suseconds_t;
 317 @@ -62,6 +64,8 @@ typedef unsigned int         __kernel_gid32_t;
 318  typedef unsigned short        __kernel_old_uid_t;
 319  typedef unsigned short        __kernel_old_gid_t;
 320  typedef __kernel_dev_t         __kernel_old_dev_t;
 321 +typedef long                   __kernel_long_t;
 322 +typedef unsigned long          __kernel_ulong_t;
 323  typedef long long              __kernel_loff_t;
 324  #endif
 325
 326 diff --git a/libc/sysdeps/linux/v850/bits/kernel_types.h b/libc/sysdeps/linux/v850/bits/kernel_types.h
 327 index 3e851ab..780aa8a 100644
 328 --- a/libc/sysdeps/linux/v850/bits/kernel_types.h
 329 +++ b/libc/sysdeps/linux/v850/bits/kernel_types.h
 330 @@ -41,6 +41,8 @@ typedef unsigned int  __kernel_gid32_t;
 331  typedef unsigned short __kernel_old_uid_t;
 332  typedef unsigned short __kernel_old_gid_t;
 333  typedef __kernel_dev_t __kernel_old_dev_t;
 334 +typedef long           __kernel_long_t;
 335 +typedef unsigned long  __kernel_ulong_t;
 336
 337  typedef struct {
 338  #ifdef __USE_ALL
 339 diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
 340 index de800d7..0cae08c 100644
 341 --- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
 342 +++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
 343 @@ -40,6 +40,8 @@ typedef unsigned int  __kernel_gid32_t;
 344  typedef unsigned short __kernel_old_uid_t;
 345  typedef unsigned short __kernel_old_gid_t;
 346  typedef __kernel_dev_t __kernel_old_dev_t;
 347 +typedef long           __kernel_long_t;
 348 +typedef unsigned long  __kernel_ulong_t;
 349  typedef long long      __kernel_loff_t;
 350
 351  typedef struct {
 352 diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_types.h b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
 353 index 44f1075..ed38f2e 100644
 354 --- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h
 355 +++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
 356 @@ -33,6 +33,8 @@ typedef unsigned int  __kernel_gid32_t;
 357  typedef unsigned short __kernel_old_uid_t;
 358  typedef unsigned short __kernel_old_gid_t;
 359  typedef unsigned short __kernel_old_dev_t;
 360 +typedef long           __kernel_long_t;
 361 +typedef unsigned long  __kernel_ulong_t;
 362  typedef long long      __kernel_loff_t;
 363
 364  /* Beginning in 2.6 kernels, which is the first version that includes the
 365 --
 366 cgit v0.9.0.1-2-gef13