[CRIU] [PATCH 03/44] multiarch: removed target architecture checks from the following files:

Alexander Kartashov alekskartashov at parallels.com
Mon Jan 7 10:04:32 EST 2013


* include/image.h,
* include/syscall-types.h,
* include/restorer.h,
* parasite-syscall.c,
* cr-dump.c,
* cr-show.c,
* pie/parasite.c.

Signed-off-by: Alexander Kartashov <alekskartashov at parallels.com>
---
 cr-dump.c               |    3 ---
 cr-show.c               |    4 ----
 include/image.h         |    4 ----
 include/restorer.h      |    4 ----
 include/syscall-types.h |    4 ----
 parasite-syscall.c      |    4 ----
 pie/parasite.c          |    3 ---
 7 files changed, 26 deletions(-)

diff --git a/cr-dump.c b/cr-dump.c
index a6693a8..d69bddb 100644
--- a/cr-dump.c
+++ b/cr-dump.c
@@ -64,9 +64,6 @@
 #include "fpu.h"
 #include "elf.h"
 
-#ifndef CONFIG_X86_64
-# error No x86-32 support yet
-#endif
 
 static char loc_buf[PAGE_SIZE];
 static int pidns_proc = -1;
diff --git a/cr-show.c b/cr-show.c
index 61373be..63bda96 100644
--- a/cr-show.c
+++ b/cr-show.c
@@ -45,10 +45,6 @@
 
 #define DEF_PAGES_PER_LINE	6
 
-#ifndef CONFIG_X86_64
-# error No x86-32 support yet
-#endif
-
 
 #define PR_SYMBOL(sym)			\
 	(isprint(sym) ? sym : '.')
diff --git a/include/image.h b/include/image.h
index cdf362d..a810f05 100644
--- a/include/image.h
+++ b/include/image.h
@@ -105,8 +105,6 @@ struct page_entry {
 
 #define CR_CAP_SIZE	2
 
-#ifdef CONFIG_X86_64
-
 #define GDT_ENTRY_TLS_ENTRIES 3
 #define TASK_COMM_LEN 16
 
@@ -123,8 +121,6 @@ struct page_entry {
 #define TASK_STOPPED		0x3 /* FIXME - implement */
 #define TASK_HELPER		0x4
 
-#endif /* CONFIG_X86_64 */
-
 /*
  * There are always 4 magic bytes at the
  * beginning of the every file.
diff --git a/include/restorer.h b/include/restorer.h
index 97e9958..eda9646 100644
--- a/include/restorer.h
+++ b/include/restorer.h
@@ -17,10 +17,6 @@
 #include "../protobuf/creds.pb-c.h"
 #include "../protobuf/core.pb-c.h"
 
-#ifndef CONFIG_X86_64
-# error Only x86-64 is supported
-#endif
-
 struct task_restore_core_args;
 struct thread_restore_args;
 
diff --git a/include/syscall-types.h b/include/syscall-types.h
index 15713fc..5c80f9a 100644
--- a/include/syscall-types.h
+++ b/include/syscall-types.h
@@ -14,10 +14,6 @@
 
 #include "asm/types.h"
 
-#ifndef CONFIG_X86_64
-# error x86-32 bit mode not yet implemented
-#endif
-
 struct cap_header {
 	u32 version;
 	int pid;
diff --git a/parasite-syscall.c b/parasite-syscall.c
index 26de3ad..6249196 100644
--- a/parasite-syscall.c
+++ b/parasite-syscall.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef CONFIG_X86_64
 static const char code_syscall[] = {0x0f, 0x05, 0xcc, 0xcc,
 				    0xcc, 0xcc, 0xcc, 0xcc};
 
@@ -896,6 +895,3 @@ err_restore:
 	return NULL;
 }
 
-#else /* CONFIG_X86_64 */
-# error x86-32 is not yet implemented
-#endif /* CONFIG_X86_64 */
diff --git a/pie/parasite.c b/pie/parasite.c
index d9e2a1d..6d33fa4 100644
--- a/pie/parasite.c
+++ b/pie/parasite.c
@@ -12,9 +12,6 @@
 
 #include <string.h>
 
-#ifndef CONFIG_X86_64
-#error non-x86-64 mode not yet implemented
-#endif
 
 static void *brk_start, *brk_end, *brk_tail;
 
-- 
1.7.10.4



More information about the CRIU mailing list