[CRIU] [PATCH 1/3] build: conditional define of struct prctl_mm_map
Laurent Dufour
ldufour at linux.vnet.ibm.com
Wed Feb 3 08:13:46 PST 2016
The file include/prctl.h should define the struct prctl_mm_map only if
it is not already defined in the system include file linux/prctl.h.
The definition should be part of the '#ifndef PR_SET_MM_MAP' block
since this structure is not defined in that case.
Signed-off-by: Laurent Dufour <ldufour at linux.vnet.ibm.com>
---
include/prctl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/prctl.h b/include/prctl.h
index bfede51d79b5..b48d95286277 100644
--- a/include/prctl.h
+++ b/include/prctl.h
@@ -51,7 +51,6 @@
#ifndef PR_SET_MM_MAP
# define PR_SET_MM_MAP 14
# define PR_SET_MM_MAP_SIZE 15
-#endif
struct prctl_mm_map {
u64 start_code;
@@ -69,6 +68,7 @@ struct prctl_mm_map {
u32 auxv_size;
u32 exe_fd;
};
+#endif
#ifndef PR_GET_TID_ADDRESS
# define PR_GET_TID_ADDRESS 40
--
1.9.1
More information about the CRIU
mailing list