From ba9021553016ae45691096675cd463542b5a1395 Mon Sep 17 00:00:00 2001 From: jow Date: Wed, 16 Jun 2010 23:37:46 +0000 Subject: [PATCH] [backfire] merge r21823 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21824 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/mtd/Makefile | 2 +- package/mtd/src/fis.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mtd/Makefile b/package/mtd/Makefile index 9438b96fd..332ce3034 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 b285d24db..559ca9506 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;