|
 |
72332c |
From 2ea16be20271dae61156a157b9fabd542b328387 Mon Sep 17 00:00:00 2001
|
|
|
72332c |
From: Dmitry Safonov <dima@arista.com>
|
|
|
72332c |
Date: Thu, 10 May 2018 19:14:41 +0100
|
|
|
72332c |
Subject: [PATCH 1/8] criu: Remove PAGE_IMAGE_SIZE
|
|
|
72332c |
|
|
|
72332c |
It's unused since commit fd3f33f5d23a ("headers: image.h -- Drop unused
|
|
|
72332c |
entries"), so let's remove it completely.
|
|
|
72332c |
|
|
|
72332c |
Signed-off-by: Dmitry Safonov <dima@arista.com>
|
|
|
72332c |
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
|
|
|
72332c |
---
|
|
|
72332c |
criu/crtools.c | 1 -
|
|
|
72332c |
criu/include/image.h | 5 -----
|
|
|
72332c |
2 files changed, 6 deletions(-)
|
|
|
72332c |
|
|
|
72332c |
diff --git a/criu/crtools.c b/criu/crtools.c
|
|
|
72332c |
index 5cf53d8a0..4ff7a9f24 100644
|
|
|
72332c |
--- a/criu/crtools.c
|
|
|
72332c |
+++ b/criu/crtools.c
|
|
|
72332c |
@@ -356,7 +356,6 @@ int main(int argc, char *argv[], char *envp[])
|
|
|
72332c |
|
|
|
72332c |
#undef BOOL_OPT
|
|
|
72332c |
|
|
|
72332c |
- BUILD_BUG_ON(PAGE_SIZE != PAGE_IMAGE_SIZE);
|
|
|
72332c |
BUILD_BUG_ON(CTL_32 != SYSCTL_TYPE__CTL_32);
|
|
|
72332c |
BUILD_BUG_ON(__CTL_STR != SYSCTL_TYPE__CTL_STR);
|
|
|
72332c |
/* We use it for fd overlap handling in clone_service_fd() */
|
|
|
72332c |
diff --git a/criu/include/image.h b/criu/include/image.h
|
|
|
72332c |
index d9c4bdbc8..d576f5a13 100644
|
|
|
72332c |
--- a/criu/include/image.h
|
|
|
72332c |
+++ b/criu/include/image.h
|
|
|
72332c |
@@ -12,11 +12,6 @@
|
|
|
72332c |
#include "log.h"
|
|
|
72332c |
#include "common/bug.h"
|
|
|
72332c |
|
|
|
72332c |
-#ifdef _ARCH_PPC64
|
|
|
72332c |
-#define PAGE_IMAGE_SIZE 65536
|
|
|
72332c |
-#else
|
|
|
72332c |
-#define PAGE_IMAGE_SIZE 4096
|
|
|
72332c |
-#endif /* _ARCH_PPC64 */
|
|
|
72332c |
#define PAGE_RSS 1
|
|
|
72332c |
#define PAGE_ANON 2
|
|
|
72332c |
|
|
|
72332c |
--
|
|
|
72332c |
2.17.0
|
|
|
72332c |
|