From 35726a766798fec0ab2bb9d3ee7504fb3736738d Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Mon, 26 Sep 2016 22:36:38 +0300 Subject: [PATCH] compel: criu -- Start using uapi/std syscalls stubs Real syscalls generation is inside criu for a while but will be moved out in the next patch. Signed-off-by: Cyrill Gorcunov Signed-off-by: Pavel Emelyanov Signed-off-by: Andrei Vagin --- criu/arch/aarch64/restorer.c | 2 +- criu/arch/aarch64/vdso-pie.c | 2 +- criu/arch/arm/restorer.c | 2 +- criu/arch/ppc64/restorer.c | 2 +- criu/arch/ppc64/vdso-pie.c | 2 +- criu/arch/x86/crtools.c | 2 +- criu/arch/x86/include/asm/restorer.h | 1 + criu/arch/x86/restorer.c | 2 +- criu/arch/x86/sigaction_compat.c | 2 +- criu/arch/x86/vdso-pie.c | 2 +- criu/cr-restore.c | 2 +- criu/fsnotify.c | 2 +- criu/kerndat.c | 2 +- criu/parasite-syscall.c | 2 +- criu/pie/log-simple.c | 2 +- criu/pie/parasite-vdso.c | 2 +- criu/pie/parasite.c | 2 +- criu/pie/restorer.c | 2 +- criu/pie/util-fd.c | 2 +- criu/pie/util.c | 2 +- criu/shmem.c | 2 +- include/common/lock.h | 2 +- 22 files changed, 22 insertions(+), 21 deletions(-) diff --git a/criu/arch/aarch64/restorer.c b/criu/arch/aarch64/restorer.c index c833a8836..72c9c4a97 100644 --- a/criu/arch/aarch64/restorer.c +++ b/criu/arch/aarch64/restorer.c @@ -3,7 +3,7 @@ #include "restorer.h" #include "asm/restorer.h" -#include "syscall.h" +#include "uapi/std/syscall.h" #include "log.h" #include "asm/fpu.h" #include "cpu.h" diff --git a/criu/arch/aarch64/vdso-pie.c b/criu/arch/aarch64/vdso-pie.c index 16a05506d..8612b2622 100644 --- a/criu/arch/aarch64/vdso-pie.c +++ b/criu/arch/aarch64/vdso-pie.c @@ -2,7 +2,7 @@ #include "asm/types.h" -#include "syscall.h" +#include "uapi/std/syscall.h" #include "parasite-vdso.h" #include "log.h" #include "common/bug.h" diff --git a/criu/arch/arm/restorer.c b/criu/arch/arm/restorer.c index 774a411de..8eb18a8ad 100644 --- a/criu/arch/arm/restorer.c +++ b/criu/arch/arm/restorer.c @@ -3,7 +3,7 @@ #include "restorer.h" #include "asm/restorer.h" -#include "syscall.h" +#include "uapi/std/syscall.h" #include "log.h" #include "asm/fpu.h" #include "cpu.h" diff --git a/criu/arch/ppc64/restorer.c b/criu/arch/ppc64/restorer.c index 5379e6018..3f0aff87a 100644 --- a/criu/arch/ppc64/restorer.c +++ b/criu/arch/ppc64/restorer.c @@ -4,7 +4,7 @@ #include "asm/restorer.h" #include "asm/fpu.h" -#include "syscall.h" +#include "uapi/std/syscall.h" #include "log.h" int restore_nonsigframe_gpregs(UserPpc64RegsEntry *r) diff --git a/criu/arch/ppc64/vdso-pie.c b/criu/arch/ppc64/vdso-pie.c index c7d8b9b7e..fbca7f51a 100644 --- a/criu/arch/ppc64/vdso-pie.c +++ b/criu/arch/ppc64/vdso-pie.c @@ -3,7 +3,7 @@ #include "asm/types.h" -#include "syscall.h" +#include "uapi/std/syscall.h" #include "parasite-vdso.h" #include "log.h" #include "common/bug.h" diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c index 0c14b8602..d2660e4b4 100644 --- a/criu/arch/x86/crtools.c +++ b/criu/arch/x86/crtools.c @@ -21,7 +21,7 @@ #include "util.h" #include "cpu.h" #include "errno.h" -#include "syscall-codes.h" +#include "uapi/std/syscall-codes.h" #include "kerndat.h" #include "protobuf.h" diff --git a/criu/arch/x86/include/asm/restorer.h b/criu/arch/x86/include/asm/restorer.h index 45b13315e..43a1b6989 100644 --- a/criu/arch/x86/include/asm/restorer.h +++ b/criu/arch/x86/include/asm/restorer.h @@ -4,6 +4,7 @@ #include "asm/types.h" #include "asm/fpu.h" #include "images/core.pb-c.h" +#include "uapi/std/syscall-codes.h" #include "sigframe.h" diff --git a/criu/arch/x86/restorer.c b/criu/arch/x86/restorer.c index 574e0da26..052d91a67 100644 --- a/criu/arch/x86/restorer.c +++ b/criu/arch/x86/restorer.c @@ -7,7 +7,7 @@ #include "asm/fpu.h" #include "asm/string.h" -#include "syscall.h" +#include "uapi/std/syscall.h" #include "log.h" #include "cpu.h" diff --git a/criu/arch/x86/sigaction_compat.c b/criu/arch/x86/sigaction_compat.c index ef6d13c91..214b2058b 100644 --- a/criu/arch/x86/sigaction_compat.c +++ b/criu/arch/x86/sigaction_compat.c @@ -5,7 +5,7 @@ #include #ifdef CR_NOGLIBC -# include "syscall.h" +# include "uapi/std/syscall.h" #else # define sys_mmap mmap # define sys_munmap munmap diff --git a/criu/arch/x86/vdso-pie.c b/criu/arch/x86/vdso-pie.c index cef7f37c4..07652d2fd 100644 --- a/criu/arch/x86/vdso-pie.c +++ b/criu/arch/x86/vdso-pie.c @@ -3,7 +3,7 @@ #include "string.h" #include "asm/types.h" -#include "syscall.h" +#include "uapi/std/syscall.h" #include "parasite-vdso.h" #include "log.h" #include "common/bug.h" diff --git a/criu/cr-restore.c b/criu/cr-restore.c index bd61d3882..dcc49d00c 100644 --- a/criu/cr-restore.c +++ b/criu/cr-restore.c @@ -79,7 +79,7 @@ #include "parasite-syscall.h" #include "files-reg.h" -#include "syscall-codes.h" +#include "uapi/std/syscall-codes.h" #include "protobuf.h" #include "images/sa.pb-c.h" diff --git a/criu/fsnotify.c b/criu/fsnotify.c index 1d49d2bae..9a591a625 100644 --- a/criu/fsnotify.c +++ b/criu/fsnotify.c @@ -41,7 +41,7 @@ #include "namespaces.h" #include "pstree.h" #include "fault-injection.h" -#include "syscall-codes.h" +#include "uapi/std/syscall-codes.h" #include "protobuf.h" #include "images/fsnotify.pb-c.h" diff --git a/criu/kerndat.c b/criu/kerndat.c index fc946ba62..f3c654a39 100644 --- a/criu/kerndat.c +++ b/criu/kerndat.c @@ -26,8 +26,8 @@ #include "lsm.h" #include "proc_parse.h" #include "config.h" -#include "syscall-codes.h" #include "sk-inet.h" +#include "uapi/std/syscall-codes.h" struct kerndat_s kdat = { }; diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c index 65fb12a2b..8fbfa34d5 100644 --- a/criu/parasite-syscall.c +++ b/criu/parasite-syscall.c @@ -30,7 +30,7 @@ #include "proc_parse.h" #include "aio.h" #include "fault-injection.h" -#include "syscall-codes.h" +#include "uapi/std/syscall-codes.h" #include "signal.h" #include "sigframe.h" diff --git a/criu/pie/log-simple.c b/criu/pie/log-simple.c index f1a92da61..3f8a73623 100644 --- a/criu/pie/log-simple.c +++ b/criu/pie/log-simple.c @@ -4,7 +4,7 @@ #include "types.h" #include "string.h" #include "common/bitsperlong.h" -#include "syscall.h" +#include "uapi/std/syscall.h" #include "log.h" struct simple_buf { diff --git a/criu/pie/parasite-vdso.c b/criu/pie/parasite-vdso.c index 03a3f0e0d..7914de6f6 100644 --- a/criu/pie/parasite-vdso.c +++ b/criu/pie/parasite-vdso.c @@ -12,7 +12,7 @@ #include "int.h" #include "types.h" #include "page.h" -#include "syscall.h" +#include "uapi/std/syscall.h" #include "image.h" #include "parasite-vdso.h" #include "vma.h" diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c index 8694668a5..c1d7cf991 100644 --- a/criu/pie/parasite.c +++ b/criu/pie/parasite.c @@ -9,7 +9,7 @@ #include "int.h" #include "types.h" -#include "syscall.h" +#include "uapi/std/syscall.h" #include "parasite.h" #include "config.h" #include "fcntl.h" diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c index ba37ff4ca..b8cc640bb 100644 --- a/criu/pie/restorer.c +++ b/criu/pie/restorer.c @@ -21,7 +21,7 @@ #include "types.h" #include "common/compiler.h" #include "string.h" -#include "syscall.h" +#include "uapi/std/syscall.h" #include "signal.h" #include "config.h" #include "prctl.h" diff --git a/criu/pie/util-fd.c b/criu/pie/util-fd.c index e753f0b17..0e6291f9d 100644 --- a/criu/pie/util-fd.c +++ b/criu/pie/util-fd.c @@ -11,7 +11,7 @@ #include "string.h" #ifdef CR_NOGLIBC -# include "syscall.h" +# include "uapi/std/syscall.h" # define __sys(foo) sys_##foo # define __sys_err(ret) ret #else diff --git a/criu/pie/util.c b/criu/pie/util.c index f16982317..ed2949745 100644 --- a/criu/pie/util.c +++ b/criu/pie/util.c @@ -13,7 +13,7 @@ #include "util-pie.h" #ifdef CR_NOGLIBC -# include "syscall.h" +# include "uapi/std/syscall.h" # define __sys(foo) sys_##foo #else # define __sys(foo) foo diff --git a/criu/shmem.c b/criu/shmem.c index d2dee914d..997c20f36 100644 --- a/criu/shmem.c +++ b/criu/shmem.c @@ -16,7 +16,7 @@ #include "vma.h" #include "mem.h" #include "config.h" -#include "syscall-codes.h" +#include "uapi/std/syscall-codes.h" #include "bitops.h" #include "log.h" #include "types.h" diff --git a/include/common/lock.h b/include/common/lock.h index f68045cfe..bcd1145f0 100644 --- a/include/common/lock.h +++ b/include/common/lock.h @@ -15,7 +15,7 @@ #define LOCK_BUG() LOCK_BUG_ON(1) #ifdef CR_NOGLIBC -# include "syscall.h" +# include "uapi/std/syscall.h" #else # include # include