mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-29 13:28:27 +00:00
Code Issues Releases Wiki Activity

infect: Move __NR32_mmap into compel headers

Browse Source 
This remove parasite-syscall.h from infect.

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Pavel Emelyanov 2016-10-27 15:01:34 +03:00 committed by Andrei Vagin
parent c954ac1618
commit f15dfc6107
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compel/arch/x86/src/lib/include/syscall.h
View File

@ -1,4 +1,13 @@
#ifndef __COMPEL_SYSCALL_H__ #ifndef __COMPEL_SYSCALL_H__
#define __COMPEL_SYSCALL_H__ #define __COMPEL_SYSCALL_H__
#define __NR(syscall, compat) ((compat) ? __NR32_##syscall : __NR_##syscall) #define __NR(syscall, compat) ((compat) ? __NR32_##syscall : __NR_##syscall)
/*
* For x86_32 __NR_mmap inside the kernel represents old_mmap system
* call, but since we didn't use it yet lets go further and simply
* define own alias for __NR_mmap2 which would allow us to unify code
* between 32 and 64 bits version.
*/
#define __NR32_mmap __NR32_mmap2
#endif #endif

9
criu/arch/x86/include/asm/parasite-syscall.h
View File

@ -5,13 +5,4 @@
struct parasite_ctl; struct parasite_ctl;
/*
* For x86_32 __NR_mmap inside the kernel represents old_mmap system
* call, but since we didn't use it yet lets go further and simply
* define own alias for __NR_mmap2 which would allow us to unify code
* between 32 and 64 bits version.
*/
#define __NR32_mmap __NR32_mmap2
#endif #endif

2
criu/arch/x86/infect.c
View File

@ -6,7 +6,6 @@
#include <sys/user.h> #include <sys/user.h>
#include "asm/processor-flags.h" #include "asm/processor-flags.h"
#include "asm/parasite-syscall.h"
#include "uapi/std/syscall-codes.h" #include "uapi/std/syscall-codes.h"
#include "compel/include/asm/syscall.h" #include "compel/include/asm/syscall.h"
#include "compel/include/asm/ptrace.h" #include "compel/include/asm/ptrace.h"
@ -15,7 +14,6 @@
#include "asm/types.h" #include "asm/types.h"
#include "errno.h" #include "errno.h"
#include "asm/cpu.h" #include "asm/cpu.h"
#include "parasite-syscall.h"
#include "ptrace.h" #include "ptrace.h"
#include "kerndat.h" #include "kerndat.h"
#include "infect.h" #include "infect.h"