[CRIU] [PATCH 02/23] multiarch: removed target architecture checks from the following files:

[Alexander Kartashov]

* include/image.h,
* include/syscall-types.h,
* include/restorer.h,
* parasite-syscall.c,
* cr-dump.c,
* cr-show.c,
* pie/parasite.c.
---
 cr-dump.c               |    4 ----
 cr-show.c               |    4 ----
 include/image.h         |    4 ----
 include/restorer.h      |    4 ----
 include/syscall-types.h |    4 ----
 parasite-syscall.c      |    4 ----
 pie/parasite.c          |    4 ----
 7 files changed, 28 deletions(-)

diff --git a/cr-dump.c b/cr-dump.c
index 52fd2d7..83bc842 100644
--- a/cr-dump.c
+++ b/cr-dump.c
@@ -67,10 +67,6 @@
 
 #include "asm/dump.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 9e64f3f..8ad2361 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 0d5a53a..2ba3f98 100644
--- a/include/image.h
+++ b/include/image.h
@@ -107,8 +107,6 @@ struct page_entry {
 
 #define CR_CAP_SIZE	2
 
-#ifdef CONFIG_X86_64
-
 #define GDT_ENTRY_TLS_ENTRIES 3
 #define TASK_COMM_LEN 16
 
@@ -125,8 +123,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 097cba1..c3f2e83 100644
--- a/include/restorer.h
+++ b/include/restorer.h
@@ -18,10 +18,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 3b3ebfe..7ef56bd 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 043a540..c18cfc1 100644
--- a/parasite-syscall.c
+++ b/parasite-syscall.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef CONFIG_X86_64
 #include "asm/parasite-syscall.h"
 #include "asm/dump.h"
 
@@ -857,6 +856,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 036bc63..3e444ea 100644
--- a/pie/parasite.c
+++ b/pie/parasite.c
@@ -14,10 +14,6 @@
 
 #include "asm/parasite.h"
 
-#ifndef CONFIG_X86_64
-#error non-x86-64 mode not yet implemented
-#endif
-
 static void *brk_start, *brk_end, *brk_tail;
 
 static int tsock = -1;
-- 
1.7.10.4