[CRIU] [PATCH 06/13] Hide asm/atomic.h from sources

Pavel Emelyanov xemul at virtuozzo.com
Thu Oct 20 13:36:36 PDT 2016


Signed-off-by: Pavel Emelyanov <xemul at virtuozzo.com>
---
 criu/cr-restore.c     | 1 -
 criu/files-reg.c      | 1 -
 criu/include/atomic.h | 4 ++++
 criu/include/lock.h   | 2 +-
 criu/stats.c          | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 criu/include/atomic.h

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 26ab22a..eb93cf1 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -90,7 +90,6 @@
 #include "images/siginfo.pb-c.h"
 
 #include "asm/restore.h"
-#include "asm/atomic.h"
 #include "asm/parasite-syscall.h"
 
 #include "cr-errno.h"
diff --git a/criu/files-reg.c b/criu/files-reg.c
index 7817fb4..e3f43e8 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -23,7 +23,6 @@
 #include "list.h"
 #include "rst-malloc.h"
 #include "fs-magic.h"
-#include "asm/atomic.h"
 #include "namespaces.h"
 #include "proc_parse.h"
 #include "pstree.h"
diff --git a/criu/include/atomic.h b/criu/include/atomic.h
new file mode 100644
index 0000000..80294ff
--- /dev/null
+++ b/criu/include/atomic.h
@@ -0,0 +1,4 @@
+#ifndef __CR_INC_ATOMIC_H__
+#define __CR_INC_ATOMIC_H__
+#include "asm/atomic.h"
+#endif
diff --git a/criu/include/lock.h b/criu/include/lock.h
index 0e34071..641fa1d 100644
--- a/criu/include/lock.h
+++ b/criu/include/lock.h
@@ -6,7 +6,7 @@
 #include <limits.h>
 #include <errno.h>
 
-#include "asm/atomic.h"
+#include "atomic.h"
 #include "bug.h"
 
 #ifdef CR_NOGLIBC
diff --git a/criu/stats.c b/criu/stats.c
index 661c2e0..1a3707e 100644
--- a/criu/stats.c
+++ b/criu/stats.c
@@ -1,7 +1,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/time.h>
-#include "asm/atomic.h"
+#include "atomic.h"
 #include "cr_options.h"
 #include "rst-malloc.h"
 #include "protobuf.h"
-- 
2.1.4



More information about the CRIU mailing list