f5e706ad88
With this commit all sparc64 header files are moved to asm-sparc.
The remaining files (71 files) were too different to be trivially
merged so divide them up in a _32.h and a _64.h file which
are both included from the file with no bit size.
The following script were used:
cd include
FILES=`wc -l asm-sparc64/*h | grep -v '^ 1' | cut -b 20-`
for FILE in ${FILES}; do
echo $FILE:
BASE=`echo $FILE | cut -d '.' -f 1`
FN32=${BASE}_32.h
FN64=${BASE}_64.h
GUARD=___ASM_SPARC_`echo $BASE | tr '-' '_' | tr [:lower:] [:upper:]`_H
git mv asm-sparc/$FILE asm-sparc/$FN32
git mv asm-sparc64/$FILE asm-sparc/$FN64
echo git mv done
printf "#ifndef %s\n" $GUARD > asm-sparc/$FILE
printf "#define %s\n" $GUARD >> asm-sparc/$FILE
printf "#if defined(__sparc__) && defined(__arch64__)\n" >> asm-sparc/$FILE
printf "#include <asm-sparc/%s>\n" $FN64 >> asm-sparc/$FILE
printf "#else\n" >> asm-sparc/$FILE
printf "#include <asm-sparc/%s>\n" $FN32 >> asm-sparc/$FILE
printf "#endif\n" >> asm-sparc/$FILE
printf "#endif\n" >> asm-sparc/$FILE
git add asm-sparc/$FILE
echo new file done
printf "#include <asm-sparc/%s>\n" $FILE > asm-sparc64/$FILE
git add asm-sparc64/$FILE
echo sparc64 file done
done
The guard contains three '_' to avoid conflict with existing guards.
In additing the two Kbuild files are emptied to avoid breaking
headers_* targets.
We will reintroduce the exported header files when the necessary
kbuild changes are merged.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
55 lines
785 B
C
55 lines
785 B
C
#ifndef _SPARC64_STATFS_H
|
|
#define _SPARC64_STATFS_H
|
|
|
|
#ifndef __KERNEL_STRICT_NAMES
|
|
|
|
#include <linux/types.h>
|
|
|
|
typedef __kernel_fsid_t fsid_t;
|
|
|
|
#endif
|
|
|
|
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];
|
|
};
|
|
|
|
#endif
|