diff options
author | Paul Bolle <pebolle@tiscali.nl> | 2018-11-13 17:57:19 +0100 |
---|---|---|
committer | Jeremy Cline <jcline@redhat.com> | 2018-11-30 10:33:50 -0500 |
commit | 9ee899f8f633ca6a37eb1c392684c87b275ac1ac (patch) | |
tree | 43e14414a7b2d8c00aed2425cd7370d3c89261d7 /kernel-x86_64-debug.config | |
parent | 3609aa8ae844885a09dad7a7bb238195822a8305 (diff) | |
download | kernel-9ee899f8f633ca6a37eb1c392684c87b275ac1ac.tar.gz kernel-9ee899f8f633ca6a37eb1c392684c87b275ac1ac.tar.xz kernel-9ee899f8f633ca6a37eb1c392684c87b275ac1ac.zip |
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 <pebolle@tiscali.nl>
Diffstat (limited to 'kernel-x86_64-debug.config')
-rw-r--r-- | kernel-x86_64-debug.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index e0aaa2740..4633b63df 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -5920,7 +5920,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 @@ -6602,7 +6602,7 @@ CONFIG_VIDEO_ZORAN_LML33R10=m CONFIG_VIDEO_ZORAN_ZR36060=m # 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 |