[CRIU] [PATCH 02/15] sigframe: don't include restorer.h

Andrey Vagin avagin at openvz.org
Tue Nov 5 00:32:55 PST 2013


Signed-off-by: Andrey Vagin <avagin at openvz.org>
---
 arch/arm/include/asm/restore.h | 4 ++++
 arch/x86/include/asm/restore.h | 4 ++++
 sigframe.c                     | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/arch/arm/include/asm/restore.h b/arch/arm/include/asm/restore.h
index c1ef1fe..675cae3 100644
--- a/arch/arm/include/asm/restore.h
+++ b/arch/arm/include/asm/restore.h
@@ -1,6 +1,10 @@
 #ifndef __CR_ASM_RESTORE_H__
 #define __CR_ASM_RESTORE_H__
 
+#include "asm/restorer.h"
+
+#include "protobuf/core.pb-c.h"
+
 #define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start,          \
 			      task_args)				\
 	asm volatile(							\
diff --git a/arch/x86/include/asm/restore.h b/arch/x86/include/asm/restore.h
index c0a1ff8..8ad9c03 100644
--- a/arch/x86/include/asm/restore.h
+++ b/arch/x86/include/asm/restore.h
@@ -1,6 +1,10 @@
 #ifndef __CR_ASM_RESTORE_H__
 #define __CR_ASM_RESTORE_H__
 
+#include "asm/restorer.h"
+
+#include "protobuf/core.pb-c.h"
+
 #define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start,          \
 			      task_args)				\
 	asm volatile(							\
diff --git a/sigframe.c b/sigframe.c
index 55d172c..62d968c 100644
--- a/sigframe.c
+++ b/sigframe.c
@@ -1,6 +1,6 @@
 #include <unistd.h>
+#include <string.h>
 
-#include "restorer.h"
 #include "asm/restore.h"
 #include "asm/restorer.h"
 
-- 
1.8.3.1



More information about the CRIU mailing list