Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

#ifndef _ASM_X86_STAT_H

#define _ASM_X86_STAT_H

#include <asm/posix_types.h>

#define STAT_HAVE_NSEC 1

#ifdef __i386__

#else /* __i386__ */

struct stat {

	unsigned long	st_dev;

	unsigned long	st_ino;

	unsigned long	st_nlink;

	__kernel_ulong_t	st_dev;

	__kernel_ulong_t	st_ino;

	__kernel_ulong_t	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];

	__kernel_ulong_t	st_rdev;

	__kernel_long_t		st_size;

	__kernel_long_t		st_blksize;

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

	__kernel_ulong_t	st_atime;

	__kernel_ulong_t	st_atime_nsec;

	__kernel_ulong_t	st_mtime;

	__kernel_ulong_t	st_mtime_nsec;

	__kernel_ulong_t	st_ctime;

	__kernel_ulong_t	st_ctime_nsec;

	__kernel_long_t		__unused[3];

};

/* We don't need to memset the whole thing just to initialize the padding */

 */

#ifndef __statfs_word

#if __BITS_PER_LONG == 64

#define __statfs_word long

#define __statfs_word __kernel_long_t

#else

#define __statfs_word __u32

#endif