From 7c7f72575333f3dc452227c2f693eada285af4ea Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Wed, 24 Feb 2016 01:20:00 +0300 Subject: [PATCH] config: use the same name in all palces for the PTRACE_PEEKSIGINFO feature Reported-by: Mr Jenkins Signed-off-by: Andrey Vagin Acked-by: Cyrill Gorcunov Signed-off-by: Pavel Emelyanov --- criu/Makefile.config | 2 +- criu/include/ptrace.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/criu/Makefile.config b/criu/Makefile.config index fb2a4a80a..8ad1abcc3 100644 --- a/criu/Makefile.config +++ b/criu/Makefile.config @@ -14,7 +14,7 @@ ifeq ($(call pkg-config-check,libselinux),y) DEFINES += -DCONFIG_HAS_SELINUX endif -FEATURES_LIST := TCP_REPAIR PRLIMIT STRLCPY STRLCAT PEEKSIGINFO_ARGS \ +FEATURES_LIST := TCP_REPAIR PRLIMIT STRLCPY STRLCAT PTRACE_PEEKSIGINFO \ SETPROCTITLE_INIT MEMFD # $1 - config name diff --git a/criu/include/ptrace.h b/criu/include/ptrace.h index 047b1e2ab..dfc5ecd0d 100644 --- a/criu/include/ptrace.h +++ b/criu/include/ptrace.h @@ -31,7 +31,7 @@ #define PTRACE_PEEKSIGINFO_SHARED (1 << 0) #endif -#ifndef CONFIG_HAS_PEEKSIGINFO_ARGS +#ifndef CONFIG_HAS_PTRACE_PEEKSIGINFO struct ptrace_peeksiginfo_args { __u64 off; /* from which siginfo to start */ __u32 flags;