libc/sysdeps: add __kernel_long and __kernel_ulong

Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
exported header files were updated to use these new types. Add the
definitions for __kernel_long_t and __kernel_ulong_t to the relevant
kernel_types.h headers.

This change was automated with the following scriptlet

  git grep --name-only 'typedef.*__kernel_old_dev_t' \
    | xargs sed -i '/typedef.*__kernel_old_dev_t/ a\
  typedef long\t\t__kernel_long_t;\
  typedef unsigned long\t__kernel_ulong_t;'

Whitespace in arm, avr32, hppa, sparc was then manually fixed up.

Signed-off-by: Chris Packham <[email protected]>
--
Here's a cleaned up patch which should get the whitespace right. I'm a
bit iffy about the sparc changes they make sense to me but it's not a
platform I have access to.

I can break this up per arch or per maintainer if requested.

 libc/sysdeps/linux/alpha/bits/kernel_types.h      |    2 ++
 libc/sysdeps/linux/arm/bits/kernel_types.h        |    2 ++
 libc/sysdeps/linux/avr32/bits/kernel_types.h      |    2 ++
 libc/sysdeps/linux/bfin/bits/kernel_types.h       |    2 ++
 libc/sysdeps/linux/c6x/bits/kernel_types.h        |    2 ++
 libc/sysdeps/linux/cris/bits/kernel_types.h       |    2 ++
 libc/sysdeps/linux/e1/bits/kernel_types.h         |    2 ++
 libc/sysdeps/linux/h8300/bits/kernel_types.h      |    2 ++
 libc/sysdeps/linux/hppa/bits/kernel_types.h       |    2 ++
 libc/sysdeps/linux/i386/bits/kernel_types.h       |    2 ++
 libc/sysdeps/linux/ia64/bits/kernel_types.h       |    2 ++
 libc/sysdeps/linux/m68k/bits/kernel_types.h       |    2 ++
 libc/sysdeps/linux/microblaze/bits/kernel_types.h |    2 ++
 libc/sysdeps/linux/mips/bits/kernel_types.h       |    4 ++++
 libc/sysdeps/linux/nios2/bits/kernel_types.h      |    2 ++
 libc/sysdeps/linux/powerpc/bits/kernel_types.h    |    4 ++++
 libc/sysdeps/linux/sh/bits/kernel_types.h         |    2 ++
 libc/sysdeps/linux/sh64/bits/kernel_types.h       |    2 ++
 libc/sysdeps/linux/sparc/bits/kernel_types.h      |    4 ++++
 libc/sysdeps/linux/v850/bits/kernel_types.h       |    2 ++
 libc/sysdeps/linux/x86_64/bits/kernel_types.h     |    2 ++
 libc/sysdeps/linux/xtensa/bits/kernel_types.h     |    2 ++
 22 files changed, 50 insertions(+)
Signed-off-by: Bernhard Reutner-Fischer <[email protected]>

diff --git a/libc/sysdeps/linux/alpha/bits/kernel_types.h b/libc/sysdeps/linux/alpha/bits/kernel_types.h
index d5574c9b44d3e2693b04c8cc32f9246dd5ee3037..cd59b9d5e71d43e63a57c0893a45ff9160e506cf 100644 (file)
--- a/libc/sysdeps/linux/alpha/bits/kernel_types.h
+++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h
@@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_t;
 typedef __kernel_uid_t __kernel_uid32_t;
 typedef __kernel_gid_t __kernel_gid32_t;
 typedef __kernel_dev_t __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 
 typedef struct {
        int val[2];

diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h
index 766a30621bf6f5661aabfdd921257d042be26642..6b36f3263627bfe89deaff73df493b9f49a4396f 100644 (file)
--- a/libc/sysdeps/linux/arm/bits/kernel_types.h
+++ b/libc/sysdeps/linux/arm/bits/kernel_types.h
@@ -32,6 +32,8 @@ typedef unsigned short                __kernel_old_uid_t;
 typedef unsigned short         __kernel_old_gid_t;
 typedef long long              __kernel_loff_t;
 typedef __kernel_dev_t         __kernel_old_dev_t;
+typedef long                   __kernel_long_t;
+typedef unsigned long          __kernel_ulong_t;
 
 typedef struct {
 #ifdef __USE_ALL

diff --git a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h
index f7d8b529873b148ae24db2365ccfe801207fd1ab..c551d5785d71c5c5989978c32f29e3400b23baf5 100644 (file)
--- a/libc/sysdeps/linux/avr32/bits/kernel_types.h
+++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h
@@ -39,6 +39,8 @@ typedef unsigned int          __kernel_gid32_t;
 typedef unsigned short         __kernel_old_uid_t;
 typedef unsigned short         __kernel_old_gid_t;
 typedef unsigned short         __kernel_old_dev_t;
+typedef long                   __kernel_long_t;
+typedef unsigned long          __kernel_ulong_t;
 
 #ifdef __GNUC__
 typedef long long              __kernel_loff_t;

diff --git a/libc/sysdeps/linux/bfin/bits/kernel_types.h b/libc/sysdeps/linux/bfin/bits/kernel_types.h
index d69a875d41184d098871127ff7e862ebc0487040..9fec5952a9e5dc9f32343c4202fd51c1a3e620e9 100644 (file)
--- a/libc/sysdeps/linux/bfin/bits/kernel_types.h
+++ b/libc/sysdeps/linux/bfin/bits/kernel_types.h
@@ -32,6 +32,8 @@ typedef unsigned short        __kernel_old_uid_t;
 typedef unsigned short __kernel_old_gid_t;
 typedef long long      __kernel_loff_t;
 typedef __kernel_dev_t __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 
 typedef struct {
 #ifdef __USE_ALL

diff --git a/libc/sysdeps/linux/c6x/bits/kernel_types.h b/libc/sysdeps/linux/c6x/bits/kernel_types.h
index 75573095958898469d37d75ae6fb161196186ba4..2c363a81d75d2bae6de2c906bf8de6a8ea41ddf9 100644 (file)
--- a/libc/sysdeps/linux/c6x/bits/kernel_types.h
+++ b/libc/sysdeps/linux/c6x/bits/kernel_types.h
@@ -22,6 +22,8 @@ typedef unsigned int  __kernel_gid32_t;
 typedef unsigned int   __kernel_old_uid_t;
 typedef unsigned int   __kernel_old_gid_t;
 typedef unsigned int   __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 typedef unsigned int   __kernel_size_t;
 typedef int            __kernel_ssize_t;
 typedef int            __kernel_ptrdiff_t;

diff --git a/libc/sysdeps/linux/cris/bits/kernel_types.h b/libc/sysdeps/linux/cris/bits/kernel_types.h
index f122c7f57f000d33bed134f9b85e95061d9e47ae..5d31f7b6a3d4d87460419e7d07b0e0dbe2bb40bd 100644 (file)
--- a/libc/sysdeps/linux/cris/bits/kernel_types.h
+++ b/libc/sysdeps/linux/cris/bits/kernel_types.h
@@ -28,6 +28,8 @@ typedef unsigned int    __kernel_gid32_t;
 typedef unsigned short  __kernel_old_uid_t;
 typedef unsigned short  __kernel_old_gid_t;
 typedef __kernel_dev_t __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 
 #ifdef __GNUC__
 typedef long long      __kernel_loff_t;

diff --git a/libc/sysdeps/linux/e1/bits/kernel_types.h b/libc/sysdeps/linux/e1/bits/kernel_types.h
index 8017d85780e95beefc589a6a4eebc3b9561d54ef..f55a1290335aefab181946a0cec119f3eecb060c 100644 (file)
--- a/libc/sysdeps/linux/e1/bits/kernel_types.h
+++ b/libc/sysdeps/linux/e1/bits/kernel_types.h
@@ -31,6 +31,8 @@ typedef unsigned int  __kernel_gid32_t;
 typedef unsigned short __kernel_old_uid_t;
 typedef unsigned short __kernel_old_gid_t;
 typedef __kernel_dev_t __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 typedef long long      __kernel_loff_t;
 
 /*

diff --git a/libc/sysdeps/linux/h8300/bits/kernel_types.h b/libc/sysdeps/linux/h8300/bits/kernel_types.h
index 05706756004b616e8411442a546922495a14341c..4cfd1bf7e920fe4dd88b53093dd952baeb325855 100644 (file)
--- a/libc/sysdeps/linux/h8300/bits/kernel_types.h
+++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h
@@ -32,6 +32,8 @@ typedef unsigned short        __kernel_old_uid_t;
 typedef unsigned short __kernel_old_gid_t;
 typedef long long      __kernel_loff_t;
 typedef __kernel_dev_t __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 
 typedef struct {
 #ifdef __USE_ALL

diff --git a/libc/sysdeps/linux/hppa/bits/kernel_types.h b/libc/sysdeps/linux/hppa/bits/kernel_types.h
index 4441f9b291bb776d196fef4a7a771782c8c1e7ec..6b2e794768ae9a92aa48570668f383564d8c2f36 100644 (file)
--- a/libc/sysdeps/linux/hppa/bits/kernel_types.h
+++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h
@@ -45,6 +45,8 @@ typedef long long             __kernel_off64_t;
 typedef unsigned long long     __kernel_ino64_t;
 
 typedef unsigned int           __kernel_old_dev_t;
+typedef long                   __kernel_long_t;
+typedef unsigned long          __kernel_ulong_t;
 
 typedef struct {
 #ifdef __USE_ALL

diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
index 9c07c7222bfd776896c23bfde29327f3887196a3..59044b8e6b273bddd0372618d42f1bda960075a8 100644 (file)
--- a/libc/sysdeps/linux/i386/bits/kernel_types.h
+++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
@@ -40,6 +40,8 @@ typedef unsigned int  __kernel_gid32_t;
 typedef unsigned short __kernel_old_uid_t;
 typedef unsigned short __kernel_old_gid_t;
 typedef __kernel_dev_t __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 typedef long long      __kernel_loff_t;
 
 typedef struct {

diff --git a/libc/sysdeps/linux/ia64/bits/kernel_types.h b/libc/sysdeps/linux/ia64/bits/kernel_types.h
index c8ef86d77f8dd187131633f7d0046a6007bd038b..e31dc653402f2de5cc610d1d7bc23e23dc1403e9 100644 (file)
--- a/libc/sysdeps/linux/ia64/bits/kernel_types.h
+++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h
@@ -52,5 +52,7 @@ typedef __kernel_gid_t __kernel_gid32_t;
 
 typedef unsigned int   __kernel_dev_t;
 typedef unsigned int   __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 
 #endif /* _ASM_IA64_POSIX_TYPES_H */

diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h
index 0a77a8f46195611a402e456092e1c193d9d09a5f..176b96853958ecf839bbe8449cd1cb66fdb697ca 100644 (file)
--- a/libc/sysdeps/linux/m68k/bits/kernel_types.h
+++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h
@@ -32,6 +32,8 @@ typedef unsigned short        __kernel_old_uid_t;
 typedef unsigned short __kernel_old_gid_t;
 typedef long long      __kernel_loff_t;
 typedef __kernel_dev_t __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 
 typedef struct {
 #ifdef __USE_ALL

diff --git a/libc/sysdeps/linux/microblaze/bits/kernel_types.h b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
index 2a7057502617adf664dba5e41139f8f9fe8080bc..a9f736b2eab381e4a80c1a63078dad37f3d3661b 100644 (file)
--- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h
+++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
@@ -44,6 +44,8 @@ typedef unsigned int  __kernel_gid32_t;
 typedef unsigned int   __kernel_old_uid_t;
 typedef unsigned int   __kernel_old_gid_t;
 typedef unsigned int   __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 
 #ifdef __GNUC__
 typedef long long      __kernel_loff_t;

diff --git a/libc/sysdeps/linux/mips/bits/kernel_types.h b/libc/sysdeps/linux/mips/bits/kernel_types.h
index 9fc3b9672b3dc5a18f45bc641a9d12b45e0407af..97faeaca5badbfcf489fb6b904b693a0d3b5afe0 100644 (file)
--- a/libc/sysdeps/linux/mips/bits/kernel_types.h
+++ b/libc/sysdeps/linux/mips/bits/kernel_types.h
@@ -32,6 +32,8 @@ typedef int           __kernel_gid32_t;
 typedef __kernel_uid_t __kernel_old_uid_t;
 typedef __kernel_gid_t __kernel_old_gid_t;
 typedef __kernel_dev_t __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 typedef long long      __kernel_loff_t;
 #else
 typedef unsigned int   __kernel_dev_t;
@@ -68,6 +70,8 @@ typedef int           __kernel_gid32_t;
 typedef __kernel_uid_t __kernel_old_uid_t;
 typedef __kernel_gid_t __kernel_old_gid_t;
 typedef __kernel_dev_t __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 typedef long long      __kernel_loff_t;
 #endif
 

diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h
index 8b86d796fb3960d496404d482a54612e977d443d..3c030e783c5d27be500c50be653262b64585b843 100644 (file)
--- a/libc/sysdeps/linux/nios2/bits/kernel_types.h
+++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h
@@ -31,6 +31,8 @@ typedef unsigned int  __kernel_gid32_t;
 typedef unsigned short __kernel_old_uid_t;
 typedef unsigned short __kernel_old_gid_t;
 typedef unsigned short __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 typedef long long      __kernel_loff_t;
 
 typedef struct {

diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
index 3f3b9337758d355443a461c16e2ffbdba8a33fca..1167de263188444aadee6f34e2b70a15272741fa 100644 (file)
--- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h
+++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
@@ -36,6 +36,8 @@ typedef unsigned int  __kernel_gid32_t;
 typedef unsigned int   __kernel_old_uid_t;
 typedef unsigned int   __kernel_old_gid_t;
 typedef __kernel_dev_t __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 #else
 typedef unsigned int   __kernel_dev_t;
 typedef unsigned int   __kernel_ino_t;
@@ -61,6 +63,8 @@ typedef unsigned int  __kernel_gid32_t;
 typedef unsigned int   __kernel_old_uid_t;
 typedef unsigned int   __kernel_old_gid_t;
 typedef __kernel_dev_t __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 typedef long long      __kernel_loff_t;
 #endif
 

diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h
index f96e9fa30ffd002eee04482f5a57fea2f7ad68b7..ac97261e69b2594ea48330fe565bb6dacb917cdc 100644 (file)
--- a/libc/sysdeps/linux/sh/bits/kernel_types.h
+++ b/libc/sysdeps/linux/sh/bits/kernel_types.h
@@ -32,6 +32,8 @@ typedef unsigned int  __kernel_gid32_t;
 typedef unsigned short __kernel_old_uid_t;
 typedef unsigned short __kernel_old_gid_t;
 typedef __kernel_dev_t __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 typedef long long      __kernel_loff_t;
 
 typedef struct {

diff --git a/libc/sysdeps/linux/sh64/bits/kernel_types.h b/libc/sysdeps/linux/sh64/bits/kernel_types.h
index 671cc8345f8e3a20bfa30f67e316a3811ae843a1..8cc6c6184714e2d1eab29e38c7fa8d1e5e14240f 100644 (file)
--- a/libc/sysdeps/linux/sh64/bits/kernel_types.h
+++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h
@@ -43,6 +43,8 @@ typedef unsigned int    __kernel_gid32_t;
 typedef unsigned short  __kernel_old_uid_t;
 typedef unsigned short  __kernel_old_gid_t;
 typedef __kernel_dev_t __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 typedef long long       __kernel_loff_t;
 
 typedef struct {

diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h
index 0cc4bc214c361c286efd882bb9b2e86ca568d6f0..a10e075decc30107b4e0b06f51665533d606a9f7 100644 (file)
--- a/libc/sysdeps/linux/sparc/bits/kernel_types.h
+++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h
@@ -32,6 +32,8 @@ typedef unsigned short               __kernel_gid16_t;
 typedef __kernel_uid_t                __kernel_old_uid_t;
 typedef __kernel_gid_t         __kernel_old_gid_t;
 typedef __kernel_dev_t         __kernel_old_dev_t;
+typedef long                   __kernel_long_t;
+typedef unsigned long          __kernel_ulong_t;
 typedef __kernel_uid_t        __kernel_uid32_t;
 typedef __kernel_gid_t        __kernel_gid32_t;
 typedef int                   __kernel_suseconds_t;
@@ -62,6 +64,8 @@ typedef unsigned int         __kernel_gid32_t;
 typedef unsigned short        __kernel_old_uid_t;
 typedef unsigned short        __kernel_old_gid_t;
 typedef __kernel_dev_t         __kernel_old_dev_t;
+typedef long                   __kernel_long_t;
+typedef unsigned long          __kernel_ulong_t;
 typedef long long              __kernel_loff_t;
 #endif
 

diff --git a/libc/sysdeps/linux/v850/bits/kernel_types.h b/libc/sysdeps/linux/v850/bits/kernel_types.h
index 3e851ab7bf1c6f2266f51732fa8a5615d777f7f8..780aa8a158293eef9f9a12d3e30e39ad90444f9b 100644 (file)
--- a/libc/sysdeps/linux/v850/bits/kernel_types.h
+++ b/libc/sysdeps/linux/v850/bits/kernel_types.h
@@ -41,6 +41,8 @@ typedef unsigned int  __kernel_gid32_t;
 typedef unsigned short __kernel_old_uid_t;
 typedef unsigned short __kernel_old_gid_t;
 typedef __kernel_dev_t __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 
 typedef struct {
 #ifdef __USE_ALL

diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
index de800d7037dd6ce93b6b7bb33dc177b0d1b098b8..0cae08c604865c151899e48a966d50fe051de6cd 100644 (file)
--- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
+++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
@@ -40,6 +40,8 @@ typedef unsigned int  __kernel_gid32_t;
 typedef unsigned short __kernel_old_uid_t;
 typedef unsigned short __kernel_old_gid_t;
 typedef __kernel_dev_t __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 typedef long long      __kernel_loff_t;
 
 typedef struct {

diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_types.h b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
index 44f1075f7ad3067e94b6bab78532b6a8fefedd19..ed38f2e187d60cb9cdc85514ac8056ce6577a220 100644 (file)
--- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h
+++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
@@ -33,6 +33,8 @@ typedef unsigned int  __kernel_gid32_t;
 typedef unsigned short __kernel_old_uid_t;
 typedef unsigned short __kernel_old_gid_t;
 typedef unsigned short __kernel_old_dev_t;
+typedef long           __kernel_long_t;
+typedef unsigned long  __kernel_ulong_t;
 typedef long long      __kernel_loff_t;
 
 /* Beginning in 2.6 kernels, which is the first version that includes the