40 lines
947 B
Diff
40 lines
947 B
Diff
From fe0b709d2fe196097796b3b964803226c6ca9578 Mon Sep 17 00:00:00 2001
|
|
From: hejingxian <hejingxian@huawei.com>
|
|
Date: Thu, 1 Dec 2022 23:02:21 +0800
|
|
Subject: [PATCH] ignore pin memory init in x86
|
|
|
|
Signed-off-by: hejingxian <hejingxian@huawei.com>
|
|
---
|
|
misc/nvwa-pre.sh | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/misc/nvwa-pre.sh b/misc/nvwa-pre.sh
|
|
index 69f6de9..18960e7 100644
|
|
--- a/misc/nvwa-pre.sh
|
|
+++ b/misc/nvwa-pre.sh
|
|
@@ -1,6 +1,6 @@
|
|
#!/bin/bash
|
|
|
|
-set -e
|
|
+#set -e
|
|
|
|
# 1. Increase last pid by 2011 from saved last pid.
|
|
# So services restoring may use its old pid.
|
|
@@ -32,8 +32,11 @@ else
|
|
fi
|
|
|
|
# 2. Enable Pin Memory
|
|
-modprobe pin_memory
|
|
-/usr/bin/nvwa-pin --init-pagemap-read
|
|
+is_x86=`uname -a | grep x86`
|
|
+if [[ $is_x86"X" == "X" ]]; then
|
|
+ modprobe pin_memory
|
|
+ /usr/bin/nvwa-pin --init-pagemap-read
|
|
+fi
|
|
|
|
# 3. Enable PMEM
|
|
grep -q "Persistent Memory" /proc/iomem || exit 0
|
|
--
|
|
2.20.1.windows.1
|
|
|