[CRIU] [PATCH 49/78] infect: Move processor-flags.h into compel

[Cyrill Gorcunov]

From: Pavel Emelyanov <xemul at virtuozzo.com>

Signed-off-by: Pavel Emelyanov <xemul at virtuozzo.com>
---
 .../include/asm => compel/arch/arm/src/lib/include}/processor-flags.h | 0
 .../include/asm => compel/arch/x86/src/lib/include}/processor-flags.h | 0
 criu/arch/aarch64/crtools.c                                           | 1 -
 criu/arch/aarch64/include/asm/processor-flags.h                       | 4 ----
 criu/arch/arm/crtools.c                                               | 2 +-
 criu/arch/ppc64/include/asm/processor-flags.h                         | 4 ----
 criu/arch/x86/infect.c                                                | 2 +-
 7 files changed, 2 insertions(+), 11 deletions(-)
 rename {criu/arch/arm/include/asm => compel/arch/arm/src/lib/include}/processor-flags.h (100%)
 rename {criu/arch/x86/include/asm => compel/arch/x86/src/lib/include}/processor-flags.h (100%)
 delete mode 100644 criu/arch/aarch64/include/asm/processor-flags.h
 delete mode 100644 criu/arch/ppc64/include/asm/processor-flags.h

diff --git a/criu/arch/arm/include/asm/processor-flags.h b/compel/arch/arm/src/lib/include/processor-flags.h
similarity index 100%
rename from criu/arch/arm/include/asm/processor-flags.h
rename to compel/arch/arm/src/lib/include/processor-flags.h
diff --git a/criu/arch/x86/include/asm/processor-flags.h b/compel/arch/x86/src/lib/include/processor-flags.h
similarity index 100%
rename from criu/arch/x86/include/asm/processor-flags.h
rename to compel/arch/x86/src/lib/include/processor-flags.h
diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index 02205453e185..8e4f48656819 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -7,7 +7,6 @@
 #include "asm/restorer.h"
 #include "common/compiler.h"
 #include "ptrace.h"
-#include "asm/processor-flags.h"
 #include "asm/dump.h"
 #include "protobuf.h"
 #include "images/core.pb-c.h"
diff --git a/criu/arch/aarch64/include/asm/processor-flags.h b/criu/arch/aarch64/include/asm/processor-flags.h
deleted file mode 100644
index c1888af36fa0..000000000000
--- a/criu/arch/aarch64/include/asm/processor-flags.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __CR_PROCESSOR_FLAGS_H__
-#define __CR_PROCESSOR_FLAGS_H__
-
-#endif
diff --git a/criu/arch/arm/crtools.c b/criu/arch/arm/crtools.c
index 6c95fe8535e4..d0576d5ae7e3 100644
--- a/criu/arch/arm/crtools.c
+++ b/criu/arch/arm/crtools.c
@@ -6,7 +6,7 @@
 #include "common/compiler.h"
 #include "asm/dump.h"
 #include "ptrace.h"
-#include "asm/processor-flags.h"
+#include "compel/include/asm/processor-flags.h"
 #include "protobuf.h"
 #include "images/core.pb-c.h"
 #include "images/creds.pb-c.h"
diff --git a/criu/arch/ppc64/include/asm/processor-flags.h b/criu/arch/ppc64/include/asm/processor-flags.h
deleted file mode 100644
index c1888af36fa0..000000000000
--- a/criu/arch/ppc64/include/asm/processor-flags.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __CR_PROCESSOR_FLAGS_H__
-#define __CR_PROCESSOR_FLAGS_H__
-
-#endif
diff --git a/criu/arch/x86/infect.c b/criu/arch/x86/infect.c
index 4a8ac1eab866..21511438e7a2 100644
--- a/criu/arch/x86/infect.c
+++ b/criu/arch/x86/infect.c
@@ -5,11 +5,11 @@
 #include <sys/mman.h>
 #include <sys/user.h>
 
-#include "asm/processor-flags.h"
 #include "asm/fpu.h"
 #include "asm/cpu.h"
 #include "kerndat.h"
 
+#include "compel/include/asm/processor-flags.h"
 #include "compel/include/errno.h"
 #include "uapi/std/syscall-codes.h"
 #include "compel/include/asm/syscall.h"
-- 
2.7.4