From 320d48482de5abdbc49c11f24c2a882d5cd1af4f Mon Sep 17 00:00:00 2001
From: Naohiro Aota <naota@gentoo.org>
Date: Sat, 18 Jan 2014 01:09:56 +0000
Subject: Add eratta patch. #498260

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key F8551514)
---
 .../files/freebsd-sources-9.1-mmap-2014.patch      | 20 ++++++++++++++++
 .../files/freebsd-sources-9.1-random.patch         | 27 ++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch
 create mode 100644 sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch

(limited to 'sys-freebsd/freebsd-sources/files')

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch
new file mode 100644
index 000000000000..fd4040a88166
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch
@@ -0,0 +1,20 @@
+Index: sys/vm/vm_map.c
+===================================================================
+--- sys/vm/vm_map.c	(revision 259950)
++++ sys/vm/vm_map.c	(revision 259951)
+@@ -1207,6 +1207,7 @@ charged:
+ 	}
+ 	else if ((prev_entry != &map->header) &&
+ 		 (prev_entry->eflags == protoeflags) &&
++		 (cow & (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP)) == 0 &&
+ 		 (prev_entry->end == start) &&
+ 		 (prev_entry->wired_count == 0) &&
+ 		 (prev_entry->cred == cred ||
+@@ -3339,7 +3340,6 @@ vm_map_stack(vm_map_t map, vm_offset_t addrbos, vm
+ 	 * NOTE: We explicitly allow bi-directional stacks.
+ 	 */
+ 	orient = cow & (MAP_STACK_GROWS_DOWN|MAP_STACK_GROWS_UP);
+-	cow &= ~orient;
+ 	KASSERT(orient != 0, ("No stack grow direction"));
+ 
+ 	if (addrbos < vm_map_min(map) ||
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch
new file mode 100644
index 000000000000..bb3caba00137
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch
@@ -0,0 +1,27 @@
+Index: sys/dev/random/probe.c
+===================================================================
+--- sys/dev/random/probe.c	(revision 260523)
++++ sys/dev/random/probe.c	(working copy)
+@@ -30,6 +30,8 @@ __FBSDID("$FreeBSD$");
+ 
+ #include <sys/types.h>
+ #include <sys/param.h>
++#include <sys/systm.h>
++#include <sys/kernel.h>
+ #include <sys/malloc.h>
+ #include <sys/random.h>
+ #include <sys/selinfo.h>
+@@ -57,7 +59,12 @@ random_ident_hardware(struct random_systat *systat
+ 	/* Then go looking for hardware */
+ #if defined(__amd64__) || (defined(__i386__) && !defined(PC98))
+ 	if (via_feature_rng & VIA_HAS_RNG) {
+-		*systat = random_nehemiah;
++		int enable;
++
++		enable = 0;
++		TUNABLE_INT_FETCH("hw.nehemiah_rng_enable", &enable);
++		if (enable)
++			*systat = random_nehemiah;
+ 	}
+ #endif
+ }
-- 
cgit v1.2.3-65-gdbad