From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 1 Feb 2010 01:32:47 +0000 (+0000)
Subject: nvram: request memory locked pages in mmap() and make it available for ar71xx
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5c937a97b08f04224c52d09c4df7fed6442ccb95;p=openwrt%2Fstaging%2F981213.git

nvram: request memory locked pages in mmap() and make it available for ar71xx

SVN-Revision: 19486
---

diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index c2270714fd..f5eba9e2b6 100644
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -18,7 +18,7 @@ define Package/nvram
   SECTION:=utils
   CATEGORY:=Base system
   TITLE:=Userspace port of the Broadcom NVRAM manipulation tool
-  DEPENDS:=@TARGET_brcm_2_4||@TARGET_brcm47xx
+  DEPENDS:=@TARGET_brcm_2_4||@TARGET_brcm47xx||@TARGET_ar71xx
 endef
 
 define Package/nvram/description
diff --git a/package/nvram/src/nvram.c b/package/nvram/src/nvram.c
index ed3da4312b..7ab8c81ab0 100644
--- a/package/nvram/src/nvram.c
+++ b/package/nvram/src/nvram.c
@@ -2,7 +2,7 @@
  * NVRAM variable manipulation (common)
  *
  * Copyright 2004, Broadcom Corporation
- * Copyright 2009, OpenWrt.org
+ * Copyright 2009-2010, OpenWrt.org
  * All Rights Reserved.
  *
  * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
@@ -357,7 +357,7 @@ nvram_handle_t * nvram_open(const char *file, int rdonly)
 	{
 		char *mmap_area = (char *) mmap(
 			NULL, nvram_erase_size, PROT_READ | PROT_WRITE,
-			( rdonly == NVRAM_RO ) ? MAP_PRIVATE : MAP_SHARED, fd, 0);
+			(( rdonly == NVRAM_RO ) ? MAP_PRIVATE : MAP_SHARED) | MAP_LOCKED, fd, 0);
 
 		if( mmap_area != MAP_FAILED )
 		{