Skip to content

Commit 45f5c95

Browse files
committed
fix: temp patch to include the lookup for pagehole in acestors patch
From checkpoint-restore/criu#2747
1 parent 4c3cd19 commit 45f5c95

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ ExternalProject_Add(criu
9494
URL ${DEP_criu_URL}
9595
URL_HASH SHA256=${DEP_criu_SHA256}
9696
UPDATE_DISCONNECTED 1
97-
PATCH_COMMAND patch -p1 -i ${CMAKE_SOURCE_DIR}/patch/criu-build.patch && patch -p1 -i ${CMAKE_SOURCE_DIR}/patch/criu-static-plugin.patch
97+
PATCH_COMMAND patch -p1 -i ${CMAKE_SOURCE_DIR}/patch/criu-build.patch && patch -p1 -i ${CMAKE_SOURCE_DIR}/patch/criu-static-plugin.patch && patch -p1 -i ${CMAKE_SOURCE_DIR}/patch/pagehole-fix.patch
9898
CONFIGURE_COMMAND ""
9999
DOWNLOAD_DIR ${SOURCE_DOWNLOADS_DIR}
100100
DOWNLOAD_NAME ${DEP_criu_FILENAME}

patch/pagehole-fix.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/criu/include/pagemap.h b/criu/include/pagemap.h
2+
index 3ae15deb9c..fae110108c 100644
3+
--- a/criu/include/pagemap.h
4+
+++ b/criu/include/pagemap.h
5+
@@ -121,7 +121,7 @@ extern int dedup_one_iovec(struct page_read *pr, unsigned long base, unsigned lo
6+
7+
static inline unsigned long pagemap_len(PagemapEntry *pe)
8+
{
9+
- return pe->nr_pages * PAGE_SIZE;
10+
+ return (unsigned long)pe->nr_pages * PAGE_SIZE;
11+
}
12+
13+
static inline bool page_read_has_parent(struct page_read *pr)

0 commit comments

Comments
 (0)