From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 16 Jun 2010 23:34:38 +0000 (+0000)
Subject: mtd: request locked pages when mmap'ing the FIS table, cures random segfaults in... 
X-Git-Tag: reboot~19612
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2dcfed2eff694b155ef70ef20447da0a9347eb69;p=openwrt%2Fstaging%2Fblogic.git

mtd: request locked pages when mmap'ing the FIS table, cures random segfaults in table rewrite until git./?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=2d4dc890b5c8fabd818a8586607e6843c4375e62 is added.

SVN-Revision: 21823
---

diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index 9438b96fdc24..332ce3034cd8 100644
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mtd
-PKG_RELEASE:=12
+PKG_RELEASE:=13
 
 PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/$(PKG_NAME)
 STAMP_PREPARED := $(STAMP_PREPARED)_$(call confvar,CONFIG_MTD_REDBOOT_PARTS)
diff --git a/package/mtd/src/fis.c b/package/mtd/src/fis.c
index b285d24db473..559ca95069a5 100644
--- a/package/mtd/src/fis.c
+++ b/package/mtd/src/fis.c
@@ -77,7 +77,7 @@ fis_open(void)
 		goto error;
 
 	fis_erasesize = erasesize;
-	desc = mmap(NULL, erasesize, PROT_READ|PROT_WRITE, MAP_SHARED, fis_fd, 0);
+	desc = mmap(NULL, erasesize, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, fis_fd, 0);
 	if (desc == MAP_FAILED)
 		goto error;