From dec9a2505416bd43333a8b4e6e2ebbf0b09c1cba Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@virtuozzo.com>
Date: Thu, 27 Oct 2016 16:23:27 +0300
Subject: [PATCH] infect: Move processor-flags.h into compel

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
---
 .../asm => compel/arch/arm/src/lib/include}/processor-flags.h | 0
 .../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 02205453e..8e4f48656 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 c1888af36..000000000
--- 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 6c95fe853..d0576d5ae 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 c1888af36..000000000
--- 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 e2fca9bf3..10f319391 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"