From b9f0d8fd8ed8c19e36d78be86be3ee57554b5323 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@tglx.tec.linutronix.de>
Date: Tue, 24 May 2005 20:50:18 +0200
Subject: [PATCH] --- yaml --- r: 4561 b: refs/heads/master c:
 3a3ab48c68de656736f091c6ed768fa8c110a7ab h: refs/heads/master i:   4559:
 47c2abedf41f054a12e9bc65bbb0ee3dcaf564af v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/mtd/map.h | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 01eb33b120a7..d89484c67719 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22fd9a8750bcad4999768aafc8fbd8a4bd6f5aa1
+refs/heads/master: 3a3ab48c68de656736f091c6ed768fa8c110a7ab
diff --git a/trunk/include/linux/mtd/map.h b/trunk/include/linux/mtd/map.h
index 115b14a634da..dd36d9433f00 100644
--- a/trunk/include/linux/mtd/map.h
+++ b/trunk/include/linux/mtd/map.h
@@ -1,6 +1,6 @@
 
 /* Overhauled routines for dealing with different mmap regions of flash */
-/* $Id: map.h,v 1.48 2005/02/16 15:54:59 nico Exp $ */
+/* $Id: map.h,v 1.49 2005/05/24 18:45:15 gleixner Exp $ */
 
 #ifndef __LINUX_MTD_MAP_H__
 #define __LINUX_MTD_MAP_H__
@@ -340,13 +340,22 @@ static inline map_word map_word_load_partial(struct map_info *map, map_word orig
 	return orig;
 }
 
+#if BITS_PER_LONG < 64
+#define MAP_FF_LIMIT 4
+#else
+#define MAP_FF_LIMIT 8
+#endif
+
 static inline map_word map_word_ff(struct map_info *map)
 {
 	map_word r;
 	int i;
-
-	for (i=0; i<map_words(map); i++) {
-		r.x[i] = ~0UL;
+	
+	if (map_bank_width(map) < MAP_FF_LIMIT) {
+		r.x[0] = (1 << (8*map_bank_width(map))) - 1;
+	} else {
+		for (i=0; i<map_words(map); i++)
+			r.x[i] = ~0UL;
 	}
 	return r;
 }