Updated to 5.10.20

1 files changed, 16 insertions, 35 deletions

diff --git a/prepare b/prepare
index 1fdefb70323f..8a76c9cc7e43 100644
--- a/prepare
+++ b/prepare
@@ -1,11 +1,12 @@
 #!/bin/bash
 
-ver54=100
+ver54=102
 ver57=19
 ver58=18
 ver59=16
-ver510=18
-ver511=1
+ver510=20
+ver511=3
+ver512=rc1
 
 _tkg_initscript() {
 
@@ -860,11 +861,7 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\n
     plain "Use CattaRappa mode (Tickless/Dynticks) ?"
     plain "Can give higher performances in many cases but lower consistency on some hardware."
     plain "Just tickless idle can perform better with some platforms (mostly AMD) or CPU schedulers (mostly MuQSS)."
-    if [ "${_cpusched}" = "MuQSS" ]; then
-      read -rp "`echo $'\n      0.No, use periodic ticks\n      1.Yes, full tickless baby!\n    > 2.Just tickless idle plz\n    [0-2?]: '`" CONDITION4;
-    else
-      read -rp "`echo $'\n      0.No, use periodic ticks\n    > 1.Yes, full tickless baby!\n      2.Just tickless idle plz\n    [0-2?]: '`" CONDITION4;
-    fi
+    read -rp "`echo $'\n      0.No, use periodic ticks\n      1.Yes, full tickless baby!\n    > 2.Just tickless idle plz\n    [0-2?]: '`" CONDITION4;
   fi
   if [ "$CONDITION4" = "0" ] || [ "$_tickless" = "0" ]; then
     echo "# CONFIG_NO_HZ_FULL_NODEF is not set" >> ./.config
@@ -873,42 +870,26 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\n
     sed -i -e 's/CONFIG_NO_HZ_FULL=y/# CONFIG_NO_HZ_FULL is not set/' ./.config
     sed -i -e 's/CONFIG_NO_HZ=y/# CONFIG_NO_HZ is not set/' ./.config
     sed -i -e 's/CONFIG_NO_HZ_COMMON=y/# CONFIG_NO_HZ_COMMON is not set/' ./.config
-  elif [ "$CONDITION4" = "2" ] || [ "$_tickless" = "2" ]; then
+  elif [ "$CONDITION4" = "2" ] || [ "$_tickless" = "1" ]; then
+    echo "CONFIG_NO_HZ_FULL_NODEF=y" >> ./.config
+    sed -i -e 's/CONFIG_HZ_PERIODIC=y/# CONFIG_HZ_PERIODIC is not set/' ./.config
+    sed -i -e 's/CONFIG_NO_HZ_IDLE=y/# CONFIG_NO_HZ_IDLE is not set/' ./.config
+    sed -i -e 's/# CONFIG_NO_HZ_FULL is not set/CONFIG_NO_HZ_FULL=y/' ./.config
+    sed -i -e 's/# CONFIG_NO_HZ is not set/CONFIG_NO_HZ=y/' ./.config
+    sed -i -e 's/# CONFIG_NO_HZ_COMMON is not set/CONFIG_NO_HZ_COMMON=y/' ./.config
+    echo "CONFIG_CONTEXT_TRACKING=y" >> ./.config
+    echo "# CONFIG_CONTEXT_TRACKING_FORCE is not set" >> ./.config
+  else
     echo "# CONFIG_NO_HZ_FULL_NODEF is not set" >> ./.config
     sed -i -e 's/CONFIG_HZ_PERIODIC=y/# CONFIG_HZ_PERIODIC is not set/' ./.config
     sed -i -e 's/# CONFIG_NO_HZ_IDLE is not set/CONFIG_NO_HZ_IDLE=y/' ./.config
     sed -i -e 's/CONFIG_NO_HZ_FULL=y/# CONFIG_NO_HZ_FULL is not set/' ./.config
     sed -i -e 's/# CONFIG_NO_HZ is not set/CONFIG_NO_HZ=y/' ./.config
     sed -i -e 's/# CONFIG_NO_HZ_COMMON is not set/CONFIG_NO_HZ_COMMON=y/' ./.config
-  else
-    if [ "${_cpusched}" = "MuQSS" ]; then
-      echo "# CONFIG_NO_HZ_FULL_NODEF is not set" >> ./.config
-      sed -i -e 's/CONFIG_HZ_PERIODIC=y/# CONFIG_HZ_PERIODIC is not set/' ./.config
-      sed -i -e 's/# CONFIG_NO_HZ_IDLE is not set/CONFIG_NO_HZ_IDLE=y/' ./.config
-      sed -i -e 's/CONFIG_NO_HZ_FULL=y/# CONFIG_NO_HZ_FULL is not set/' ./.config
-      sed -i -e 's/# CONFIG_NO_HZ is not set/CONFIG_NO_HZ=y/' ./.config
-      sed -i -e 's/# CONFIG_NO_HZ_COMMON is not set/CONFIG_NO_HZ_COMMON=y/' ./.config
-    else
-      echo "CONFIG_NO_HZ_FULL_NODEF=y" >> ./.config
-      sed -i -e 's/CONFIG_HZ_PERIODIC=y/# CONFIG_HZ_PERIODIC is not set/' ./.config
-      sed -i -e 's/CONFIG_NO_HZ_IDLE=y/# CONFIG_NO_HZ_IDLE is not set/' ./.config
-      sed -i -e 's/# CONFIG_NO_HZ_FULL is not set/CONFIG_NO_HZ_FULL=y/' ./.config
-      sed -i -e 's/# CONFIG_NO_HZ is not set/CONFIG_NO_HZ=y/' ./.config
-      sed -i -e 's/# CONFIG_NO_HZ_COMMON is not set/CONFIG_NO_HZ_COMMON=y/' ./.config
-      echo "CONFIG_CONTEXT_TRACKING=y" >> ./.config
-      echo "# CONFIG_CONTEXT_TRACKING_FORCE is not set" >> ./.config
-    fi
   fi
 
   # voluntary preempt
-  if [ -z "$_voluntary_preempt" ]; then
-    plain ""
-    plain "Use explicit preemption points?"
-    plain "It can improve latency on PDS (at the cost of throughput)"
-    plain "and improve throughput on other schedulers (at the cost of latency)"
-    read -rp "`echo $'    > N/y : '`" CONDITION5;
-  fi
-  if [[ "$CONDITION5" =~ [yY] ]] || [ "$_voluntary_preempt" = "true" ]; then
+  if [ "$_voluntary_preempt" = "true" ]; then
     sed -i -e 's/CONFIG_PREEMPT=y/# CONFIG_PREEMPT is not set/' ./.config
     sed -i -e 's/CONFIG_PREEMPT_LL=y/# CONFIG_PREEMPT_LL is not set/' ./.config
     sed -i -e 's/# CONFIG_PREEMPT_VOLUNTARY is not set/CONFIG_PREEMPT_VOLUNTARY=y/' ./.config