Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-08-21 22:00:00 +0200
committerMichal Suchanek <msuchanek@suse.de>2019-08-21 22:27:50 +0200
commit803f2c838d8d01b953f6576f789fcb8c70a0f770 (patch)
tree928921fd5672de105deb3ef597b6ec70be703ea8
parentc69dd200a76dbf902a5060276af6798f7fc8f359 (diff)
Refresh config files from master (boo#1146719).
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
-rw-r--r--config/arm64/vanilla7
-rw-r--r--config/x86_64/vanilla7
2 files changed, 10 insertions, 4 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index b45fd50baf..7a36801574 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -79,6 +79,8 @@ CONFIG_NO_HZ_COMMON=y
# CONFIG_HZ_PERIODIC is not set
CONFIG_NO_HZ_IDLE=y
# CONFIG_NO_HZ_FULL is not set
+CONFIG_CONTEXT_TRACKING=y
+# CONFIG_CONTEXT_TRACKING_FORCE is not set
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
# end of Timers subsystem
@@ -90,8 +92,9 @@ CONFIG_PREEMPT_VOLUNTARY=y
#
# CPU/Task time and stats accounting
#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+CONFIG_VIRT_CPU_ACCOUNTING=y
+# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_IRQ_TIME_ACCOUNTING is not set
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 68f01934e7..c1f230f4cb 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -92,6 +92,8 @@ CONFIG_NO_HZ_COMMON=y
# CONFIG_HZ_PERIODIC is not set
CONFIG_NO_HZ_IDLE=y
# CONFIG_NO_HZ_FULL is not set
+CONFIG_CONTEXT_TRACKING=y
+# CONFIG_CONTEXT_TRACKING_FORCE is not set
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
# end of Timers subsystem
@@ -103,8 +105,9 @@ CONFIG_PREEMPT_VOLUNTARY=y
#
# CPU/Task time and stats accounting
#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+CONFIG_VIRT_CPU_ACCOUNTING=y
+# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_IRQ_TIME_ACCOUNTING is not set
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y