[CRIU] [PATCH 7/7] common: Move processor-flags.h in

Cyrill Gorcunov gorcunov at openvz.org
Fri Oct 21 06:48:36 PDT 2016


Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 criu/arch/aarch64/crtools.c                                           | 2 +-
 criu/arch/arm/crtools.c                                               | 2 +-
 criu/arch/x86/crtools.c                                               | 2 +-
 criu/include/processor-flags.h                                        | 4 ++++
 .../include => include/common/arch/aarch64}/asm/processor-flags.h     | 0
 .../arm/include => include/common/arch/arm}/asm/processor-flags.h     | 0
 .../include => include/common/arch/ppc64}/asm/processor-flags.h       | 0
 .../x86/include => include/common/arch/x86}/asm/processor-flags.h     | 0
 8 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 criu/include/processor-flags.h
 rename {criu/arch/ppc64/include => include/common/arch/aarch64}/asm/processor-flags.h (100%)
 rename {criu/arch/arm/include => include/common/arch/arm}/asm/processor-flags.h (100%)
 rename {criu/arch/aarch64/include => include/common/arch/ppc64}/asm/processor-flags.h (100%)
 rename {criu/arch/x86/include => include/common/arch/x86}/asm/processor-flags.h (100%)

diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index 951ac7530597..0d6cd3e690b7 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -7,7 +7,7 @@
 #include "asm/restorer.h"
 #include "common/compiler.h"
 #include "ptrace.h"
-#include "asm/processor-flags.h"
+#include "processor-flags.h"
 #include "protobuf.h"
 #include "images/core.pb-c.h"
 #include "images/creds.pb-c.h"
diff --git a/criu/arch/arm/crtools.c b/criu/arch/arm/crtools.c
index 71438ac043a1..5885443a45a2 100644
--- a/criu/arch/arm/crtools.c
+++ b/criu/arch/arm/crtools.c
@@ -5,7 +5,7 @@
 #include "asm/restorer.h"
 #include "common/compiler.h"
 #include "ptrace.h"
-#include "asm/processor-flags.h"
+#include "processor-flags.h"
 #include "protobuf.h"
 #include "images/core.pb-c.h"
 #include "images/creds.pb-c.h"
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index 706367cbb362..0ae43fc4a865 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -6,7 +6,7 @@
 #include <sys/syscall.h>
 #include <sys/auxv.h>
 
-#include "asm/processor-flags.h"
+#include "processor-flags.h"
 #include "asm/parasite-syscall.h"
 #include "asm/restorer.h"
 #include "asm/types.h"
diff --git a/criu/include/processor-flags.h b/criu/include/processor-flags.h
new file mode 100644
index 000000000000..92c146404e0a
--- /dev/null
+++ b/criu/include/processor-flags.h
@@ -0,0 +1,4 @@
+#ifndef __CR_INC_PROCESSOR_FLAGS_H__
+#define __CR_INC_PROCESSOR_FLAGS_H__
+#include "common/asm/processor-flags.h"
+#endif
diff --git a/criu/arch/ppc64/include/asm/processor-flags.h b/include/common/arch/aarch64/asm/processor-flags.h
similarity index 100%
rename from criu/arch/ppc64/include/asm/processor-flags.h
rename to include/common/arch/aarch64/asm/processor-flags.h
diff --git a/criu/arch/arm/include/asm/processor-flags.h b/include/common/arch/arm/asm/processor-flags.h
similarity index 100%
rename from criu/arch/arm/include/asm/processor-flags.h
rename to include/common/arch/arm/asm/processor-flags.h
diff --git a/criu/arch/aarch64/include/asm/processor-flags.h b/include/common/arch/ppc64/asm/processor-flags.h
similarity index 100%
rename from criu/arch/aarch64/include/asm/processor-flags.h
rename to include/common/arch/ppc64/asm/processor-flags.h
diff --git a/criu/arch/x86/include/asm/processor-flags.h b/include/common/arch/x86/asm/processor-flags.h
similarity index 100%
rename from criu/arch/x86/include/asm/processor-flags.h
rename to include/common/arch/x86/asm/processor-flags.h
-- 
2.7.4



More information about the CRIU mailing list