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

Commit d5f13541 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: merge statfs_32/64.h 



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

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 += statfs_32.h

unifdef-y += statfs_64.h

unifdef-y += unistd_32.h

unifdef-y += unistd_64.h

unifdef-y += user_32.h

include/asm-x86/statfs.h

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

# ifdef CONFIG_X86_32

#  include "statfs_32.h"

# else

#  include "statfs_64.h"

# endif

#else

#ifndef _ASM_X86_STATFS_H

#define _ASM_X86_STATFS_H



#ifdef __i386__

#  include "statfs_32.h"

#include <asm-generic/statfs.h>

#else

#  include "statfs_64.h"



#ifndef __KERNEL_STRICT_NAMES



#include <linux/types.h>



typedef __kernel_fsid_t	fsid_t;



#endif



/*

 * This is ugly -- we're already 64-bit clean, so just duplicate the

 * definitions.

 */

struct statfs {

	long f_type;

	long f_bsize;

	long f_blocks;

	long f_bfree;

	long f_bavail;

	long f_files;

	long f_ffree;

	__kernel_fsid_t f_fsid;

	long f_namelen;

	long f_frsize;

	long f_spare[5];

};



struct statfs64 {

	long f_type;

	long f_bsize;

	long f_blocks;

	long f_bfree;

	long f_bavail;

	long f_files;

	long f_ffree;

	__kernel_fsid_t f_fsid;

	long f_namelen;

	long f_frsize;

	long f_spare[5];

};



struct compat_statfs64 {

	__u32 f_type;

	__u32 f_bsize;

	__u64 f_blocks;

	__u64 f_bfree;

	__u64 f_bavail;

	__u64 f_files;

	__u64 f_ffree;

	__kernel_fsid_t f_fsid;

	__u32 f_namelen;

	__u32 f_frsize;

	__u32 f_spare[5];

} __attribute__((packed));



#endif /* !__i386__ */

#endif

include/asm-x86/statfs_32.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef _I386_STATFS_H

#define _I386_STATFS_H



#include <asm-generic/statfs.h>



#endif

include/asm-x86/statfs_64.h

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
#ifndef _X86_64_STATFS_H

#define _X86_64_STATFS_H



#ifndef __KERNEL_STRICT_NAMES



#include <linux/types.h>



typedef __kernel_fsid_t	fsid_t;



#endif



/*

 * This is ugly -- we're already 64-bit clean, so just duplicate the 

 * definitions.

 */

struct statfs {

	long f_type;

	long f_bsize;

	long f_blocks;

	long f_bfree;

	long f_bavail;

	long f_files;

	long f_ffree;

	__kernel_fsid_t f_fsid;

	long f_namelen;

	long f_frsize;

	long f_spare[5];

};



struct statfs64 {

	long f_type;

	long f_bsize;

	long f_blocks;

	long f_bfree;

	long f_bavail;

	long f_files;

	long f_ffree;

	__kernel_fsid_t f_fsid;

	long f_namelen;

	long f_frsize;

	long f_spare[5];

};



struct compat_statfs64 {

	__u32 f_type;

	__u32 f_bsize;

	__u64 f_blocks;

	__u64 f_bfree;

	__u64 f_bavail;

	__u64 f_files;

	__u64 f_ffree;

	__kernel_fsid_t f_fsid;

	__u32 f_namelen;

	__u32 f_frsize;

	__u32 f_spare[5];

} __attribute__((packed));



#endif