[CRIU] [PATCH 1/4] Ubuntu 12.04 build fixes

[Christopher Covington]

Without these I hit various build errors on Ubuntu 12.04.

Signed-off-by: Christopher Covington <cov at codeaurora.org>
---
 arch/x86/vdso-pie.c            | 2 +-
 arch/x86/vdso.c                | 2 +-
 test/zdtm/lib/zdtmtst.h        | 4 ++++
 test/zdtm/live/static/Makefile | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/x86/vdso-pie.c b/arch/x86/vdso-pie.c
index 327cad9..d84dcc1 100644
--- a/arch/x86/vdso-pie.c
+++ b/arch/x86/vdso-pie.c
@@ -12,11 +12,11 @@
 
 #include "asm/string.h"
 #include "asm/types.h"
+#include "asm/vdso.h"
 
 #include "compiler.h"
 #include "syscall.h"
 #include "image.h"
-#include "vdso.h"
 #include "vma.h"
 #include "log.h"
 
diff --git a/arch/x86/vdso.c b/arch/x86/vdso.c
index e7c3842..16d8539 100644
--- a/arch/x86/vdso.c
+++ b/arch/x86/vdso.c
@@ -11,12 +11,12 @@
 
 #include "asm/types.h"
 #include "asm/parasite-syscall.h"
+#include "asm/vdso.h"
 
 #include "parasite-syscall.h"
 #include "parasite.h"
 #include "compiler.h"
 #include "kerndat.h"
-#include "vdso.h"
 #include "util.h"
 #include "log.h"
 #include "mem.h"
diff --git a/test/zdtm/lib/zdtmtst.h b/test/zdtm/lib/zdtmtst.h
index e465e26..18eb082 100644
--- a/test/zdtm/lib/zdtmtst.h
+++ b/test/zdtm/lib/zdtmtst.h
@@ -7,6 +7,10 @@
 # define PAGE_SIZE 4096
 #endif
 
+#ifndef PR_SET_CHILD_SUBREAPER
+# define PR_SET_CHILD_SUBREAPER 36
+#endif
+
 /* set up test */
 extern void test_ext_init(int argc, char **argv);
 extern void test_init(int argc, char **argv);
diff --git a/test/zdtm/live/static/Makefile b/test/zdtm/live/static/Makefile
index 34982bc..7073724 100644
--- a/test/zdtm/live/static/Makefile
+++ b/test/zdtm/live/static/Makefile
@@ -276,6 +276,7 @@ socket-tcpbuf6: override CFLAGS += -D ZDTM_IPV6
 socket-tcpbuf-local: override CFLAGS += -D ZDTM_TCP_LOCAL
 socket_listen6: override CFLAGS += -D ZDTM_IPV6
 sigpending:		override LDLIBS += -lrt
+vdso01:			override LDLIBS += -lrt
 
 $(LIB):	force
 	$(Q) $(MAKE) -C $(LIBDIR)
-- 
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by the Linux Foundation.