From 3e4010f25ec6c6eb8ffa5c8c90e041427de2212f Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Tue, 13 Nov 2018 17:57:19 +0100 Subject: configs: correct cpu accounting configuration The shipped .config files all have CONFIG_TICK_CPU_ACCOUNTING and CONFIG_VIRT_CPU_ACCOUNTING_NATIVE set. The x86_64 .config files additionaly have CONFIG_VIRT_CPU_ACCOUNTING_GEN set. This is wrong because each .config should have just one of these three set. As a result the build generates [...]:warning: override: VIRT_CPU_ACCOUNTING_NATIVE changes choice state 24 times and [...]:warning: override: VIRT_CPU_ACCOUNTING_GEN changes choice state 4 times. So let's make sure the shipped .config files only have one of these three Kconfig macros set (ie, the one that's relevant for that .config target). Signed-off-by: Paul Bolle --- kernel-x86_64-debug.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel-x86_64-debug.config') diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index e80e99834..fa481e04a 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -5778,7 +5778,7 @@ CONFIG_THUNDERBOLT_NET=m CONFIG_TI_ADS1015=m # CONFIG_TI_ADS7950 is not set # CONFIG_TI_ADS8688 is not set -CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_TICK_CPU_ACCOUNTING is not set # CONFIG_TI_CPSW_ALE is not set # CONFIG_TI_DAC082S085 is not set # CONFIG_TI_DAC5571 is not set @@ -6425,7 +6425,7 @@ CONFIG_VIDEO_VIA_CAMERA=m # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y +# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -- cgit