[CRIU] [PATCH 05/15] parasite: don't include restorer.h in parasite-syscall.c
Andrey Vagin
avagin at openvz.org
Tue Nov 5 00:32:58 PST 2013
Signed-off-by: Andrey Vagin <avagin at openvz.org>
---
include/restorer.h | 3 +--
include/sigframe.h | 3 +++
parasite-syscall.c | 1 -
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/restorer.h b/include/restorer.h
index 53d8e6c..3df7c7b 100644
--- a/include/restorer.h
+++ b/include/restorer.h
@@ -16,6 +16,7 @@
#include "posix-timer.h"
#include "shmem.h"
+#include "sigframe.h"
#include "vdso.h"
#include <time.h>
@@ -41,8 +42,6 @@ typedef long (*thread_restore_fcall_t) (struct thread_restore_args *args);
*/
#define RESTORE_ARGS_SIZE (512)
#define RESTORE_STACK_REDZONE (128)
-/* sigframe should be aligned on 64 byte for x86 and 8 bytes for arm */
-#define RESTORE_STACK_SIGFRAME ALIGN(sizeof(struct rt_sigframe) + SIGFRAME_OFFSET, 64)
#define RESTORE_STACK_SIZE (KILO(32))
struct restore_mem_zone {
diff --git a/include/sigframe.h b/include/sigframe.h
index 845c47d..5ab09b1 100644
--- a/include/sigframe.h
+++ b/include/sigframe.h
@@ -10,6 +10,9 @@
struct rt_sigframe;
+/* sigframe should be aligned on 64 byte for x86 and 8 bytes for arm */
+#define RESTORE_STACK_SIGFRAME ALIGN(sizeof(struct rt_sigframe) + SIGFRAME_OFFSET, 64)
+
#ifndef __ARCH_SI_PREAMBLE_SIZE
#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))
#endif
diff --git a/parasite-syscall.c b/parasite-syscall.c
index 0f4d467..6ede3aa 100644
--- a/parasite-syscall.c
+++ b/parasite-syscall.c
@@ -25,7 +25,6 @@
#include "posix-timer.h"
#include "net.h"
#include "mem.h"
-#include "restorer.h"
#include "proc_parse.h"
#include <string.h>
--
1.8.3.1
More information about the CRIU
mailing list