Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79c74977 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: merge stat_32/64.h 



Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 079091a4

include/asm-x86/Kbuild

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ unifdef-y += sigcontext_32.h 
unifdef-y += sigcontext_64.h

unifdef-y += signal_32.h

unifdef-y += signal_64.h

unifdef-y += stat_32.h

unifdef-y += stat_64.h

unifdef-y += statfs_32.h

unifdef-y += statfs_64.h

unifdef-y += unistd_32.h

include/asm-x86/stat.h

+112 −11
Original line number Diff line number Diff line 
#ifdef __KERNEL__

# ifdef CONFIG_X86_32

#  include "stat_32.h"

# else

#  include "stat_64.h"

#ifndef _ASM_X86_STAT_H

#define _ASM_X86_STAT_H



#define STAT_HAVE_NSEC 1



#ifdef __i386__

struct stat {

	unsigned long  st_dev;

	unsigned long  st_ino;

	unsigned short st_mode;

	unsigned short st_nlink;

	unsigned short st_uid;

	unsigned short st_gid;

	unsigned long  st_rdev;

	unsigned long  st_size;

	unsigned long  st_blksize;

	unsigned long  st_blocks;

	unsigned long  st_atime;

	unsigned long  st_atime_nsec;

	unsigned long  st_mtime;

	unsigned long  st_mtime_nsec;

	unsigned long  st_ctime;

	unsigned long  st_ctime_nsec;

	unsigned long  __unused4;

	unsigned long  __unused5;

};



#define STAT64_HAS_BROKEN_ST_INO	1



/* This matches struct stat64 in glibc2.1, hence the absolutely

 * insane amounts of padding around dev_t's.

 */

struct stat64 {

	unsigned long long	st_dev;

	unsigned char	__pad0[4];



	unsigned long	__st_ino;



	unsigned int	st_mode;

	unsigned int	st_nlink;



	unsigned long	st_uid;

	unsigned long	st_gid;



	unsigned long long	st_rdev;

	unsigned char	__pad3[4];



	long long	st_size;

	unsigned long	st_blksize;



	/* Number 512-byte blocks allocated. */

	unsigned long long	st_blocks;



	unsigned long	st_atime;

	unsigned long	st_atime_nsec;



	unsigned long	st_mtime;

	unsigned int	st_mtime_nsec;



	unsigned long	st_ctime;

	unsigned long	st_ctime_nsec;



	unsigned long long	st_ino;

};



#else /* __i386__ */



struct stat {

	unsigned long	st_dev;

	unsigned long	st_ino;

	unsigned long	st_nlink;



	unsigned int	st_mode;

	unsigned int	st_uid;

	unsigned int	st_gid;

	unsigned int	__pad0;

	unsigned long	st_rdev;

	long		st_size;

	long		st_blksize;

	long		st_blocks;	/* Number 512-byte blocks allocated. */



	unsigned long	st_atime;

	unsigned long	st_atime_nsec;

	unsigned long	st_mtime;

	unsigned long	st_mtime_nsec;

	unsigned long	st_ctime;

	unsigned long   st_ctime_nsec;

	long		__unused[3];

};

#endif

#else



/* for 32bit emulation and 32 bit kernels */

struct __old_kernel_stat {

	unsigned short st_dev;

	unsigned short st_ino;

	unsigned short st_mode;

	unsigned short st_nlink;

	unsigned short st_uid;

	unsigned short st_gid;

	unsigned short st_rdev;

#ifdef __i386__

#  include "stat_32.h"

	unsigned long  st_size;

	unsigned long  st_atime;

	unsigned long  st_mtime;

	unsigned long  st_ctime;

#else

#  include "stat_64.h"

	unsigned int  st_size;

	unsigned int  st_atime;

	unsigned int  st_mtime;

	unsigned int  st_ctime;

#endif

};



#endif

include/asm-x86/stat_32.h

deleted100644 → 0
+0 −77
Original line number Diff line number Diff line 
#ifndef _I386_STAT_H

#define _I386_STAT_H



struct __old_kernel_stat {

	unsigned short st_dev;

	unsigned short st_ino;

	unsigned short st_mode;

	unsigned short st_nlink;

	unsigned short st_uid;

	unsigned short st_gid;

	unsigned short st_rdev;

	unsigned long  st_size;

	unsigned long  st_atime;

	unsigned long  st_mtime;

	unsigned long  st_ctime;

};



struct stat {

	unsigned long  st_dev;

	unsigned long  st_ino;

	unsigned short st_mode;

	unsigned short st_nlink;

	unsigned short st_uid;

	unsigned short st_gid;

	unsigned long  st_rdev;

	unsigned long  st_size;

	unsigned long  st_blksize;

	unsigned long  st_blocks;

	unsigned long  st_atime;

	unsigned long  st_atime_nsec;

	unsigned long  st_mtime;

	unsigned long  st_mtime_nsec;

	unsigned long  st_ctime;

	unsigned long  st_ctime_nsec;

	unsigned long  __unused4;

	unsigned long  __unused5;

};



/* This matches struct stat64 in glibc2.1, hence the absolutely

 * insane amounts of padding around dev_t's.

 */

struct stat64 {

	unsigned long long	st_dev;

	unsigned char	__pad0[4];



#define STAT64_HAS_BROKEN_ST_INO	1

	unsigned long	__st_ino;



	unsigned int	st_mode;

	unsigned int	st_nlink;



	unsigned long	st_uid;

	unsigned long	st_gid;



	unsigned long long	st_rdev;

	unsigned char	__pad3[4];



	long long	st_size;

	unsigned long	st_blksize;



	unsigned long long	st_blocks;	/* Number 512-byte blocks allocated. */



	unsigned long	st_atime;

	unsigned long	st_atime_nsec;



	unsigned long	st_mtime;

	unsigned int	st_mtime_nsec;



	unsigned long	st_ctime;

	unsigned long	st_ctime_nsec;



	unsigned long long	st_ino;

};



#define STAT_HAVE_NSEC 1



#endif

include/asm-x86/stat_64.h

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
#ifndef _ASM_X86_64_STAT_H

#define _ASM_X86_64_STAT_H



#define STAT_HAVE_NSEC 1



struct stat {

	unsigned long	st_dev;

	unsigned long	st_ino;

	unsigned long	st_nlink;



	unsigned int	st_mode;

	unsigned int	st_uid;

	unsigned int	st_gid;

	unsigned int	__pad0;

	unsigned long	st_rdev;

	long		st_size;

	long		st_blksize;

	long		st_blocks;	/* Number 512-byte blocks allocated. */



	unsigned long	st_atime;

	unsigned long 	st_atime_nsec; 

	unsigned long	st_mtime;

	unsigned long	st_mtime_nsec;

	unsigned long	st_ctime;

	unsigned long   st_ctime_nsec;

  	long		__unused[3];

};



/* For 32bit emulation */

struct __old_kernel_stat {

	unsigned short st_dev;

	unsigned short st_ino;

	unsigned short st_mode;

	unsigned short st_nlink;

	unsigned short st_uid;

	unsigned short st_gid;

	unsigned short st_rdev;

	unsigned int  st_size;

	unsigned int  st_atime;

	unsigned int  st_mtime;

	unsigned int  st_ctime;

};



#endif