Browse Source

Sigh. The 2.6.x kernel removed '__kernel_dev_t' and renamed it as
'__kernel_old_dev_t'. And of course there is no good way to know
which is in use except checking linux/version.h. Grumble.

This is rather lame, but for now, define __kernel_old_dev_t to be
the same as __kernel_dev_t. This will want to be revisited soon.
-Erik

Eric Andersen 21 years ago
parent
commit
3974b578e8

+ 1 - 0
libc/sysdeps/linux/alpha/bits/kernel_types.h

@@ -32,6 +32,7 @@ typedef __kernel_uid_t __kernel_old_uid_t;
 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 struct {
 	int val[2];

+ 1 - 0
libc/sysdeps/linux/arm/bits/kernel_types.h

@@ -31,6 +31,7 @@ typedef unsigned int		__kernel_gid32_t;
 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 struct {
 #ifdef __USE_ALL

+ 1 - 0
libc/sysdeps/linux/cris/bits/kernel_types.h

@@ -27,6 +27,7 @@ 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;
 
 #ifdef __GNUC__
 typedef long long		__kernel_loff_t;

+ 1 - 0
libc/sysdeps/linux/e1/bits/kernel_types.h

@@ -30,6 +30,7 @@ typedef unsigned int	__kernel_uid32_t;
 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 long	__kernel_loff_t;
 
 /*

+ 1 - 0
libc/sysdeps/linux/h8300/bits/kernel_types.h

@@ -31,6 +31,7 @@ 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;
 
 #ifdef __GNUC__
 typedef long long	__kernel_loff_t;

+ 1 - 0
libc/sysdeps/linux/i386/bits/kernel_types.h

@@ -30,6 +30,7 @@ typedef unsigned int	__kernel_uid32_t;
 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 long	__kernel_loff_t;
 
 typedef struct {

+ 1 - 0
libc/sysdeps/linux/m68k/bits/kernel_types.h

@@ -31,6 +31,7 @@ typedef unsigned int	__kernel_gid32_t;
 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 struct {
 #ifdef __USE_ALL

+ 1 - 0
libc/sysdeps/linux/microblaze/bits/kernel_types.h

@@ -42,6 +42,7 @@ 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 struct {
 #ifdef __USE_ALL

+ 2 - 0
libc/sysdeps/linux/mips/bits/kernel_types.h

@@ -31,6 +31,7 @@ typedef int		__kernel_uid32_t;
 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 long      __kernel_loff_t;
 #else
 typedef unsigned int	__kernel_dev_t;
@@ -66,6 +67,7 @@ typedef int		__kernel_uid32_t;
 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 long      __kernel_loff_t;
 #endif
 

+ 2 - 0
libc/sysdeps/linux/powerpc/bits/kernel_types.h

@@ -33,6 +33,7 @@ typedef unsigned int	__kernel_uid32_t;
 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;
 #else
 typedef unsigned int	__kernel_dev_t;
 typedef unsigned int	__kernel_ino_t;
@@ -57,6 +58,7 @@ typedef unsigned int	__kernel_uid32_t;
 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 long	__kernel_loff_t;
 #endif
 

+ 1 - 0
libc/sysdeps/linux/sh/bits/kernel_types.h

@@ -30,6 +30,7 @@ typedef unsigned int	__kernel_uid32_t;
 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 long	__kernel_loff_t;
 
 typedef struct {

+ 1 - 0
libc/sysdeps/linux/sh64/bits/kernel_types.h

@@ -42,6 +42,7 @@ typedef unsigned int    __kernel_uid32_t;
 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 long       __kernel_loff_t;
 
 typedef struct {

+ 2 - 0
libc/sysdeps/linux/sparc/bits/kernel_types.h

@@ -30,6 +30,7 @@ typedef unsigned short	       __kernel_uid16_t;
 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 __kernel_uid_t	       __kernel_uid32_t;
 typedef __kernel_gid_t	       __kernel_gid32_t;
 typedef int		       __kernel_suseconds_t;
@@ -59,6 +60,7 @@ typedef unsigned int	       __kernel_uid32_t;
 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 long              __kernel_loff_t;
 #endif
 

+ 1 - 0
libc/sysdeps/linux/v850/bits/kernel_types.h

@@ -40,6 +40,7 @@ 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 struct {
 #ifdef __USE_ALL