aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/lvm2
diff options
context:
space:
mode:
authorChong.Lu@windriver.com <Chong.Lu@windriver.com>2014-04-10 16:05:55 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2014-04-20 11:23:57 +0200
commitaa205514421045517a07e0e57437dbad59b6a524 (patch)
tree7f14100728e9d37d6a56ee93947302cb87f3a5ac /meta-oe/recipes-support/lvm2
parent1d0df0362d7814a33461408a78124ad3cbafa554 (diff)
downloadmeta-openembedded-contrib-aa205514421045517a07e0e57437dbad59b6a524.tar.gz
meta-openembedded-contrib-aa205514421045517a07e0e57437dbad59b6a524.tar.bz2
meta-openembedded-contrib-aa205514421045517a07e0e57437dbad59b6a524.zip
lvm2: fix mlock() on vectors vma for ARM.
Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/lvm2')
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.inc1
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2/mlock-ignore-vectors-gate_vma.patch31
2 files changed, 32 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 4b43328e23..63d2cdb00f 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -10,6 +10,7 @@ INC_PR = "r4"
S = "${WORKDIR}/LVM2.${PV}"
SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \
file://0001-Replace-CPPFunction-with-rl_completion_func_t.patch \
+ file://mlock-ignore-vectors-gate_vma.patch \
file://lvm.conf"
PACKAGECONFIG ??= "readline"
diff --git a/meta-oe/recipes-support/lvm2/lvm2/mlock-ignore-vectors-gate_vma.patch b/meta-oe/recipes-support/lvm2/lvm2/mlock-ignore-vectors-gate_vma.patch
new file mode 100644
index 0000000000..3105136793
--- /dev/null
+++ b/meta-oe/recipes-support/lvm2/lvm2/mlock-ignore-vectors-gate_vma.patch
@@ -0,0 +1,31 @@
+Subject: [PATCH] fix: mlock ignore [vectors] gate_vma
+
+Upstream-Status: Pending
+
+linux kernel has a new commit f9d4861f for [vectors] vma on ARM
+"ARM: 7294/1: vectors: use gate_vma for vectors user mapping".
+
+mlock()/munlock() on a gate_vma would cause NOMEM error, so add
+[vectors] to _ignore_maps[], as other gate_vmas [vdso]/[vsyscall]
+did.
+
+Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
+---
+ lib/mm/memlock.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c
+index 8c631bf..a6b1955 100644
+--- a/lib/mm/memlock.c
++++ b/lib/mm/memlock.c
+@@ -84,6 +84,7 @@ static int _default_priority;
+ static const char * const _ignore_maps[] = {
+ "[vdso]",
+ "[vsyscall]",
++ "[vectors]",
+ };
+
+ /* default blacklist for maps */
+--
+1.7.9.5
+