From 3e42fc3834063dfcabbf6224297859357c988e2c Mon Sep 17 00:00:00 2001 From: Don Penney Date: Fri, 19 Jun 2020 01:39:52 -0400 Subject: [PATCH] Drop isolcpu from AIO/worker kickstarts The isolcpu boot option is configurable based on application-isolated or vswitch CPU config settings. Therefore, it is not required to be set as a default value in the kickstart, only to be changed during initial config. Change-Id: Ie043c7c76be5f2950eafb7babfb1919a9856dd5c Closes-Bug: 1883806 Signed-off-by: Don Penney --- bsp-files/kickstarts/post_kernel_aio_and_worker.cfg | 3 --- kickstart/centos/build_srpm.data | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg b/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg index ae76d301..3b921dc9 100644 --- a/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg +++ b/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg @@ -30,10 +30,7 @@ then norcu_cpulist=$(cpumap_to_cpulist ${norcu_cpumap} ${n_cpus}) if [[ "$subfunction" =~ lowlatency ]]; then - KERN_OPTS="${KERN_OPTS} isolcpus=${norcu_cpulist}" KERN_OPTS="${KERN_OPTS} nohz_full=${norcu_cpulist}" - else - KERN_OPTS="${KERN_OPTS} isolcpus=${avp_cpulist}" fi KERN_OPTS="${KERN_OPTS} rcu_nocbs=${norcu_cpulist}" KERN_OPTS="${KERN_OPTS} kthread_cpus=${base_cpulist}" diff --git a/kickstart/centos/build_srpm.data b/kickstart/centos/build_srpm.data index 9e433cbc..c454dc41 100644 --- a/kickstart/centos/build_srpm.data +++ b/kickstart/centos/build_srpm.data @@ -1,3 +1,8 @@ SRC_DIR="${GIT_BASE}/bsp-files" COPY_LIST="$PKG_BASE/LICENSE" -TIS_PATCH_VER=4 + +# Use eb851a9 as the srcrev for the SRC_GITREVCOUNT, +# as it is the last commit in the bsp-files dir prior +# to branching for stx-3.0. +SRC_BASE_SRCREV=eb851a9 +TIS_PATCH_VER=SRC_GITREVCOUNT