Define SECTOR_FMT to print sector_t in proper format Signed-off-by: Dave Kleikamp Acked-by: Andreas Dilger --- linux-2.6.17-ming/include/asm-h8300/types.h | 1 + linux-2.6.17-ming/include/asm-i386/types.h | 1 + linux-2.6.17-ming/include/asm-mips/types.h | 5 +++++ linux-2.6.17-ming/include/asm-powerpc/types.h | 5 +++++ linux-2.6.17-ming/include/asm-s390/types.h | 5 +++++ linux-2.6.17-ming/include/asm-sh/types.h | 1 + linux-2.6.17-ming/include/asm-x86_64/types.h | 1 + linux-2.6.17-ming/include/linux/types.h | 1 + 8 files changed, 20 insertions(+) diff -puN include/asm-h8300/types.h~sector_fmt include/asm-h8300/types.h --- linux-2.6.17/include/asm-h8300/types.h~sector_fmt 2006-06-27 12:56:12.400588403 -0700 +++ linux-2.6.17-ming/include/asm-h8300/types.h 2006-06-27 12:56:12.431584732 -0700 @@ -57,6 +57,7 @@ typedef u32 dma_addr_t; #define HAVE_SECTOR_T typedef u64 sector_t; +#define SECTOR_FMT "%llu" #define HAVE_BLKCNT_T typedef u64 blkcnt_t; diff -puN include/asm-i386/types.h~sector_fmt include/asm-i386/types.h --- linux-2.6.17/include/asm-i386/types.h~sector_fmt 2006-06-27 12:56:12.410587219 -0700 +++ linux-2.6.17-ming/include/asm-i386/types.h 2006-06-27 12:56:12.432584614 -0700 @@ -60,6 +60,7 @@ typedef u64 dma64_addr_t; #ifdef CONFIG_LBD typedef u64 sector_t; +#define SECTOR_FMT "%llu" #define HAVE_SECTOR_T #endif diff -puN include/asm-mips/types.h~sector_fmt include/asm-mips/types.h --- linux-2.6.17/include/asm-mips/types.h~sector_fmt 2006-06-27 12:56:12.413586864 -0700 +++ linux-2.6.17-ming/include/asm-mips/types.h 2006-06-27 12:56:12.432584614 -0700 @@ -96,6 +96,11 @@ typedef unsigned long phys_t; #ifdef CONFIG_LBD typedef u64 sector_t; +#if (_MIPS_SZLONG == 64) +#define SECTOR_FMT "%lu" +#else +#define SECTOR_FMT "%llu" +#endif #define HAVE_SECTOR_T #endif diff -puN include/asm-powerpc/types.h~sector_fmt include/asm-powerpc/types.h --- linux-2.6.17/include/asm-powerpc/types.h~sector_fmt 2006-06-27 12:56:12.416586509 -0700 +++ linux-2.6.17-ming/include/asm-powerpc/types.h 2006-06-27 12:56:12.433584496 -0700 @@ -100,6 +100,11 @@ typedef struct { #ifdef CONFIG_LBD typedef u64 sector_t; +#ifdef __powerpc64__ +#define SECTOR_FMT "%lu" +#else +#define SECTOR_FMT "%llu" +#endif #define HAVE_SECTOR_T #endif diff -puN include/asm-s390/types.h~sector_fmt include/asm-s390/types.h --- linux-2.6.17/include/asm-s390/types.h~sector_fmt 2006-06-27 12:56:12.419586153 -0700 +++ linux-2.6.17-ming/include/asm-s390/types.h 2006-06-27 12:56:12.433584496 -0700 @@ -90,6 +90,11 @@ typedef union { #ifdef CONFIG_LBD typedef u64 sector_t; +#ifndef __s390x__ +#define SECTOR_FMT "%llu" +#else +#define SECTOR_FMT "%lu" +#endif #define HAVE_SECTOR_T #endif diff -puN include/asm-sh/types.h~sector_fmt include/asm-sh/types.h --- linux-2.6.17/include/asm-sh/types.h~sector_fmt 2006-06-27 12:56:12.422585798 -0700 +++ linux-2.6.17-ming/include/asm-sh/types.h 2006-06-27 12:56:12.434584377 -0700 @@ -55,6 +55,7 @@ typedef u32 dma_addr_t; #ifdef CONFIG_LBD typedef u64 sector_t; +#define SECTOR_FMT "%llu" #define HAVE_SECTOR_T #endif diff -puN include/asm-x86_64/types.h~sector_fmt include/asm-x86_64/types.h --- linux-2.6.17/include/asm-x86_64/types.h~sector_fmt 2006-06-27 12:56:12.425585443 -0700 +++ linux-2.6.17-ming/include/asm-x86_64/types.h 2006-06-27 12:56:12.434584377 -0700 @@ -49,6 +49,7 @@ typedef u64 dma64_addr_t; typedef u64 dma_addr_t; typedef u64 sector_t; +#define SECTOR_FMT "%llu" #define HAVE_SECTOR_T #endif /* __ASSEMBLY__ */ diff -puN include/linux/types.h~sector_fmt include/linux/types.h --- linux-2.6.17/include/linux/types.h~sector_fmt 2006-06-27 12:56:12.428585088 -0700 +++ linux-2.6.17-ming/include/linux/types.h 2006-06-27 12:56:12.435584259 -0700 @@ -135,6 +135,7 @@ typedef __s64 int64_t; */ #ifndef HAVE_SECTOR_T typedef unsigned long sector_t; +#define SECTOR_FMT "%lu" #endif #ifndef HAVE_BLKCNT_T _