Merge branch 'arm/queue' into 'master'
Default arm64 to 4k page size and a probe_maxsmp fix
See merge request kvm-unit-tests/kvm-unit-tests!60
diff --git a/configure b/configure
index e13a346..a8520a3 100755
--- a/configure
+++ b/configure
@@ -75,7 +75,7 @@
(s390x only)
--page-size=PAGE_SIZE
Specify the page size (translation granule) (4k, 16k or
- 64k, default is 64k, arm64 only)
+ 64k, default is 4k, arm64 only)
--earlycon=EARLYCON
Specify the UART name, type and address (optional, arm and
arm64 only). The specified address will overwrite the UART
@@ -243,11 +243,7 @@
fi
if [ -z "$page_size" ]; then
- if [ "$efi" = 'y' ] && [ "$arch" = "arm64" ]; then
- page_size="4096"
- elif [ "$arch" = "arm64" ]; then
- page_size="65536"
- elif [ "$arch" = "arm" ]; then
+ if [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then
page_size="4096"
fi
else
diff --git a/scripts/runtime.bash b/scripts/runtime.bash
index fb7c83a..177b621 100644
--- a/scripts/runtime.bash
+++ b/scripts/runtime.bash
@@ -208,8 +208,10 @@
{
local smp
- if smp=$($RUNTIME_arch_run _NO_FILE_4Uhere_ -smp $MAX_SMP |& grep 'Invalid SMP CPUs'); then
+ if smp=$($RUNTIME_arch_run _NO_FILE_4Uhere_ -smp $MAX_SMP |& grep 'SMP CPUs'); then
smp=${smp##* }
+ smp=${smp/\(}
+ smp=${smp/\)}
echo "Restricting MAX_SMP from ($MAX_SMP) to the max supported ($smp)" >&2
MAX_SMP=$smp
fi
