mirror of
https://github.com/linuxboot/heads.git
synced 2025-01-18 10:46:44 +00:00
supress mlock error
This commit is contained in:
parent
3fc174b0f7
commit
87b6f1e489
@ -1,6 +1,6 @@
|
||||
diff -u --recursive ../clean/LVM2.2.02.168/lib/mm/memlock.c LVM2.2.02.168/lib/mm/memlock.c
|
||||
diff -u --recursive ../clean/LVM2.2.02.168/lib/mm/memlock.c ./LVM2.2.02.168/lib/mm/memlock.c
|
||||
--- ../clean/LVM2.2.02.168/lib/mm/memlock.c 2016-11-30 18:17:29.000000000 -0500
|
||||
+++ LVM2.2.02.168/lib/mm/memlock.c 2017-04-08 11:42:57.625608016 -0400
|
||||
+++ ./LVM2.2.02.168/lib/mm/memlock.c 2017-04-12 08:18:18.533783802 -0400
|
||||
@@ -150,6 +150,7 @@
|
||||
|
||||
static void _allocate_memory(void)
|
||||
@ -17,9 +17,18 @@ diff -u --recursive ../clean/LVM2.2.02.168/lib/mm/memlock.c LVM2.2.02.168/lib/mm
|
||||
}
|
||||
|
||||
static void _release_memory(void)
|
||||
diff -u --recursive ../clean/LVM2.2.02.168/libdm/libdm-stats.c LVM2.2.02.168/libdm/libdm-stats.c
|
||||
@@ -288,7 +290,7 @@
|
||||
|
||||
if (lock == LVM_MLOCK) {
|
||||
if (mlock((const void*)from, sz) < 0) {
|
||||
- log_sys_error("mlock", line);
|
||||
+ //log_sys_error("mlock", line);
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
diff -u --recursive ../clean/LVM2.2.02.168/libdm/libdm-stats.c ./LVM2.2.02.168/libdm/libdm-stats.c
|
||||
--- ../clean/LVM2.2.02.168/libdm/libdm-stats.c 2016-11-30 18:17:30.000000000 -0500
|
||||
+++ LVM2.2.02.168/libdm/libdm-stats.c 2017-04-08 11:42:57.625608016 -0400
|
||||
+++ ./LVM2.2.02.168/libdm/libdm-stats.c 2017-04-10 16:50:01.622529656 -0400
|
||||
@@ -17,7 +17,24 @@
|
||||
|
||||
#include "dmlib.h"
|
||||
@ -81,9 +90,9 @@ diff -u --recursive ../clean/LVM2.2.02.168/libdm/libdm-stats.c LVM2.2.02.168/lib
|
||||
buflen += id_len + 1; /* range end plus "-" */
|
||||
}
|
||||
buflen++;
|
||||
diff -u --recursive ../clean/LVM2.2.02.168/libdm/Makefile.in LVM2.2.02.168/libdm/Makefile.in
|
||||
diff -u --recursive ../clean/LVM2.2.02.168/libdm/Makefile.in ./LVM2.2.02.168/libdm/Makefile.in
|
||||
--- ../clean/LVM2.2.02.168/libdm/Makefile.in 2016-11-30 18:17:30.000000000 -0500
|
||||
+++ LVM2.2.02.168/libdm/Makefile.in 2017-04-08 11:42:57.625608016 -0400
|
||||
+++ ./LVM2.2.02.168/libdm/Makefile.in 2017-04-10 16:50:01.622529656 -0400
|
||||
@@ -56,7 +56,8 @@
|
||||
|
||||
CFLAGS += $(UDEV_CFLAGS) $(VALGRIND_CFLAGS)
|
||||
@ -94,9 +103,9 @@ diff -u --recursive ../clean/LVM2.2.02.168/libdm/Makefile.in LVM2.2.02.168/libdm
|
||||
|
||||
device-mapper: all
|
||||
|
||||
diff -u --recursive ../clean/LVM2.2.02.168/make.tmpl.in LVM2.2.02.168/make.tmpl.in
|
||||
diff -u --recursive ../clean/LVM2.2.02.168/make.tmpl.in ./LVM2.2.02.168/make.tmpl.in
|
||||
--- ../clean/LVM2.2.02.168/make.tmpl.in 2016-11-30 18:17:30.000000000 -0500
|
||||
+++ LVM2.2.02.168/make.tmpl.in 2017-04-08 11:55:50.807603236 -0400
|
||||
+++ ./LVM2.2.02.168/make.tmpl.in 2017-04-10 16:50:01.626529699 -0400
|
||||
@@ -142,7 +142,7 @@
|
||||
M_INSTALL_PROGRAM = -m 555
|
||||
M_INSTALL_DATA = -m 444
|
||||
@ -117,9 +126,9 @@ diff -u --recursive ../clean/LVM2.2.02.168/make.tmpl.in LVM2.2.02.168/make.tmpl.
|
||||
|
||||
LVM_VERSION := $(shell cat $(top_srcdir)/VERSION)
|
||||
|
||||
diff -u --recursive ../clean/LVM2.2.02.168/tools/lvmcmdline.c LVM2.2.02.168/tools/lvmcmdline.c
|
||||
diff -u --recursive ../clean/LVM2.2.02.168/tools/lvmcmdline.c ./LVM2.2.02.168/tools/lvmcmdline.c
|
||||
--- ../clean/LVM2.2.02.168/tools/lvmcmdline.c 2016-11-30 18:17:32.000000000 -0500
|
||||
+++ LVM2.2.02.168/tools/lvmcmdline.c 2017-04-08 11:42:57.629608042 -0400
|
||||
+++ ./LVM2.2.02.168/tools/lvmcmdline.c 2017-04-10 16:50:01.626529699 -0400
|
||||
@@ -1817,6 +1817,7 @@
|
||||
{
|
||||
int err = is_valid_fd(STDERR_FILENO);
|
||||
|
Loading…
Reference in New Issue
Block a user