another .30 patch

diff --git a/queue-2.6.30/nommu-provide-mmap_min_addr-definition.patch b/queue-2.6.30/nommu-provide-mmap_min_addr-definition.patch
new file mode 100644 (file)
index 0000000..1684a26
--- /dev/null
+++ b/queue-2.6.30/nommu-provide-mmap_min_addr-definition.patch
@@ -0,0 +1,35 @@
+From 35f2c2f6f6ae13ef23c4f68e6d3073753077ca43 Mon Sep 17 00:00:00 2001
+From: Paul Mundt <lethal@linux-sh.org>
+Date: Tue, 9 Jun 2009 17:48:56 +0900
+Subject: nommu: Provide mmap_min_addr definition.
+
+From: Paul Mundt <lethal@linux-sh.org>
+
+commit 35f2c2f6f6ae13ef23c4f68e6d3073753077ca43 upstream.
+
+With the "security: use mmap_min_addr indepedently of security models"
+change, mmap_min_addr is used in common areas, which susbsequently blows
+up the nommu build. This stubs in the definition in the nommu case as
+well.
+
+Signed-off-by: Paul Mundt <lethal@linux-sh.org>
+Cc: Mike Frysinger <vapier.adi@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Signed-off-by: James Morris <jmorris@namei.org>
+
+---
+ mm/nommu.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/mm/nommu.c
++++ b/mm/nommu.c
+@@ -69,6 +69,9 @@ int sysctl_max_map_count = DEFAULT_MAX_M
+ int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
+ int heap_stack_gap = 0;
+ 
++/* amount of vm to protect from userspace access */
++unsigned long mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
++
+ atomic_long_t mmap_pages_allocated;
+ 
+ EXPORT_SYMBOL(mem_map);

diff --git a/queue-2.6.30/series b/queue-2.6.30/series
index a49bc736e73e36b36c12087629f4c8d3016f41ee..ca19e8825e1a6a767bafc6cf36ec6f0d170f120d 100644 (file)
--- a/queue-2.6.30/series
+++ b/queue-2.6.30/series
@@ -66,3 +66,4 @@ netdev-restore-mac-address-set-and-validate-operations.patch
 netdev-restore-mtu-change-operation.patch
 input-wistron_btns-recognize-maxdata-pro-7000-notebooks.patch
 libata-fix-follow-up-srst-failure-path.patch
+nommu-provide-mmap_min_addr-definition.patch