The patch titled
Handle CONFIG_LBD and CONFIG_LSF in one place
has been added to the -mm tree. Its filename is
handle-config_lbd-and-config_lsf-in-one-place.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Matthew Wilcox <matthew@xxxxxx>
CONFIG_LBD and CONFIG_LSF are spread into asm/types.h for no particularly
good reason. Centralising the definition in linux/types.h means that arch
maintainers don't need to bother adding it, as well as fixing the problem
with x86-64 users being asked to make a decision that has absolutely no
effect. The H8/300 porters seem particularly confused since I'm not aware
of any microcontrollers that need to support 2TB filesystems these days.
Signed-off-by: Matthew Wilcox <matthew@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
block/Kconfig | 6 ++----
include/asm-h8300/types.h | 6 ------
include/asm-i386/types.h | 10 ----------
include/asm-mips/types.h | 10 ----------
include/asm-powerpc/types.h | 10 ----------
include/asm-s390/types.h | 10 ----------
include/asm-sh/types.h | 10 ----------
include/linux/types.h | 13 +++++++++----
8 files changed, 11 insertions(+), 64 deletions(-)
diff -puN block/Kconfig~handle-config_lbd-and-config_lsf-in-one-place block/Kconfig
--- devel/block/Kconfig~handle-config_lbd-and-config_lsf-in-one-place 2006-04-19 23:43:21.000000000 -0700
+++ devel-akpm/block/Kconfig 2006-04-19 23:43:21.000000000 -0700
@@ -1,11 +1,9 @@
#
# Block layer core configuration
#
-#XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64
-#for instance.
config LBD
bool "Support for Large Block Devices"
- depends on X86 || (MIPS && 32BIT) || PPC32 || (S390 && !64BIT) || SUPERH || UML
+ depends on !64BIT
help
Say Y here if you want to attach large (bigger than 2TB) discs to
your machine, or if you want to have a raid or loopback device
@@ -26,7 +24,7 @@ config BLK_DEV_IO_TRACE
config LSF
bool "Support for Large Single Files"
- depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML
+ depends on !64BIT
help
Say Y here if you want to be able to handle very large files (bigger
than 2TB), otherwise say N.
diff -puN include/asm-h8300/types.h~handle-config_lbd-and-config_lsf-in-one-place include/asm-h8300/types.h
--- devel/include/asm-h8300/types.h~handle-config_lbd-and-config_lsf-in-one-place 2006-04-19 23:43:21.000000000 -0700
+++ devel-akpm/include/asm-h8300/types.h 2006-04-19 23:43:21.000000000 -0700
@@ -55,12 +55,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t;
-#define HAVE_SECTOR_T
-typedef u64 sector_t;
-
-#define HAVE_BLKCNT_T
-typedef u64 blkcnt_t;
-
#endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */
diff -puN include/asm-i386/types.h~handle-config_lbd-and-config_lsf-in-one-place include/asm-i386/types.h
--- devel/include/asm-i386/types.h~handle-config_lbd-and-config_lsf-in-one-place 2006-04-19 23:43:21.000000000 -0700
+++ devel-akpm/include/asm-i386/types.h 2006-04-19 23:43:21.000000000 -0700
@@ -58,16 +58,6 @@ typedef u32 dma_addr_t;
#endif
typedef u64 dma64_addr_t;
-#ifdef CONFIG_LBD
-typedef u64 sector_t;
-#define HAVE_SECTOR_T
-#endif
-
-#ifdef CONFIG_LSF
-typedef u64 blkcnt_t;
-#define HAVE_BLKCNT_T
-#endif
-
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
diff -puN include/asm-mips/types.h~handle-config_lbd-and-config_lsf-in-one-place include/asm-mips/types.h
--- devel/include/asm-mips/types.h~handle-config_lbd-and-config_lsf-in-one-place 2006-04-19 23:43:21.000000000 -0700
+++ devel-akpm/include/asm-mips/types.h 2006-04-19 23:43:21.000000000 -0700
@@ -94,16 +94,6 @@ typedef unsigned long long phys_t;
typedef unsigned long phys_t;
#endif
-#ifdef CONFIG_LBD
-typedef u64 sector_t;
-#define HAVE_SECTOR_T
-#endif
-
-#ifdef CONFIG_LSF
-typedef u64 blkcnt_t;
-#define HAVE_BLKCNT_T
-#endif
-
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
diff -puN include/asm-powerpc/types.h~handle-config_lbd-and-config_lsf-in-one-place include/asm-powerpc/types.h
--- devel/include/asm-powerpc/types.h~handle-config_lbd-and-config_lsf-in-one-place 2006-04-19 23:43:21.000000000 -0700
+++ devel-akpm/include/asm-powerpc/types.h 2006-04-19 23:43:21.000000000 -0700
@@ -98,16 +98,6 @@ typedef struct {
unsigned long env;
} func_descr_t;
-#ifdef CONFIG_LBD
-typedef u64 sector_t;
-#define HAVE_SECTOR_T
-#endif
-
-#ifdef CONFIG_LSF
-typedef u64 blkcnt_t;
-#define HAVE_BLKCNT_T
-#endif
-
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
diff -puN include/asm-s390/types.h~handle-config_lbd-and-config_lsf-in-one-place include/asm-s390/types.h
--- devel/include/asm-s390/types.h~handle-config_lbd-and-config_lsf-in-one-place 2006-04-19 23:43:21.000000000 -0700
+++ devel-akpm/include/asm-s390/types.h 2006-04-19 23:43:21.000000000 -0700
@@ -88,16 +88,6 @@ typedef union {
} subreg;
} register_pair;
-#ifdef CONFIG_LBD
-typedef u64 sector_t;
-#define HAVE_SECTOR_T
-#endif
-
-#ifdef CONFIG_LSF
-typedef u64 blkcnt_t;
-#define HAVE_BLKCNT_T
-#endif
-
#endif /* ! __s390x__ */
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
diff -puN include/asm-sh/types.h~handle-config_lbd-and-config_lsf-in-one-place include/asm-sh/types.h
--- devel/include/asm-sh/types.h~handle-config_lbd-and-config_lsf-in-one-place 2006-04-19 23:43:21.000000000 -0700
+++ devel-akpm/include/asm-sh/types.h 2006-04-19 23:43:21.000000000 -0700
@@ -53,16 +53,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t;
-#ifdef CONFIG_LBD
-typedef u64 sector_t;
-#define HAVE_SECTOR_T
-#endif
-
-#ifdef CONFIG_LSF
-typedef u64 blkcnt_t;
-#define HAVE_BLKCNT_T
-#endif
-
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
diff -puN include/linux/types.h~handle-config_lbd-and-config_lsf-in-one-place include/linux/types.h
--- devel/include/linux/types.h~handle-config_lbd-and-config_lsf-in-one-place 2006-04-19 23:43:21.000000000 -0700
+++ devel-akpm/include/linux/types.h 2006-04-19 23:43:21.000000000 -0700
@@ -130,14 +130,19 @@ typedef __s64 int64_t;
/*
* The type used for indexing onto a disc or disc partition.
- * If required, asm/types.h can override it and define
- * HAVE_SECTOR_T
*/
-#ifndef HAVE_SECTOR_T
+#ifdef CONFIG_LBD
+typedef u64 sector_t;
+#else
typedef unsigned long sector_t;
#endif
-#ifndef HAVE_BLKCNT_T
+/*
+ * The type of the inode's block count.
+ */
+#ifdef CONFIG_LSF
+typedef u64 blkcnt_t;
+#else
typedef unsigned long blkcnt_t;
#endif
_
Patches currently in -mm which might be from matthew@xxxxxx are
insert-identical-resources-above-existing-resources.patch
make-sure-nobodys-leaking-resources.patch
handle-config_lbd-and-config_lsf-in-one-place.patch
drivers-use-list_move.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
