Subject: linux-next: manual merge of the x86 tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 3 Sep 2008 10:57:55 +1000

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
include/asm-x86/statfs.h between commit
e4e2079e475520e02f55f0b225fc044e39a357e0 ("x86_64: Use
<asm-generic/statfs.h>") from the dwmw2 tree and commit
77ef50a522717fa040636ee1017179ceba12ff62 ("x86: consolidate header
guards") from the x86 tree.

Trivial fix (see below).  I can carry it.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/

diff --cc include/asm-x86/statfs.h
index 4c935ca,3f005bc..0000000
--- a/include/asm-x86/statfs.h
+++ b/include/asm-x86/statfs.h
@@@ -1,12 -1,63 +1,12 @@@
- #ifndef _ASM_X86_STATFS_H
- #define _ASM_X86_STATFS_H
+ #ifndef ASM_X86__STATFS_H
+ #define ASM_X86__STATFS_H
  
 -#ifdef __i386__
 -#include <asm-generic/statfs.h>
 -#else
 -
 -#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.
 + * We need compat_statfs64 to be packed, because the i386 ABI won't
 + * add padding at the end to bring it to a multiple of 8 bytes, but
 + * the x86_64 ABI will.
   */
 -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];
 -};
 +#define ARCH_PACK_COMPAT_STATFS64 __attribute__((packed,aligned(4)))
  
 -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__ */
 +#include <asm-generic/statfs.h>
- #endif
+ #endif /* ASM_X86__STATFS_H */