kernel: Use host's spinlocks when running in PV mode

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 5c870297e977c035e8dfcf14897ede004cd67d5c..8ca1a88355c2bf3b63cc09f1e30b40ac38774a9c 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -51,7 +51,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 #
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_HW_PERF_EVENTS=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 
 #

diff --git a/kernel/config-generic b/kernel/config-generic
index 1e974e186caedbb05b6fd0697d3a1d413d0b10ed..b3c7aa85d37aaf03afb119de66ad12b328d977be 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -68,6 +68,7 @@ CONFIG_PREEMPT_NONE=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_HAVE_SCHED_AVG_IRQ=y
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 CONFIG_TASKSTATS=y
@@ -210,6 +211,7 @@ CONFIG_SMP=y
 CONFIG_PARAVIRT=y
 CONFIG_XEN=y
 CONFIG_XEN_DOM0=y
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 08111ced9ebbaca94b20b29d05f2958efb5386e3..2bc7ce05f4e18e321ce88f06e24e561858dce348 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -85,7 +85,8 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT_XXL=y
 # CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_PARAVIRT_SPINLOCKS=y
+# CONFIG_QUEUED_LOCK_STAT is not set
 CONFIG_XEN_PV=y
 CONFIG_XEN_PV_SMP=y
 CONFIG_XEN_PVHVM=y
@@ -96,7 +97,6 @@ CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_PVH is not set
 CONFIG_KVM_GUEST=y
 # CONFIG_KVM_DEBUG_FS is not set
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
 # CONFIG_JAILHOUSE_GUEST is not set
 # CONFIG_MK8 is not set

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 13d235e466bbb020e5573b989f0f61e8e1c24031..1d9764912a2eeef3e0150e14c33aa5cc0055f2ab 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 4.20
-release    = 3
+release    = 4
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>