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@xxxxxxxxxx>
---
configs/fedora/generic/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE | 2 +-
.../fedora/generic/powerpc/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE | 1 +
configs/fedora/generic/s390x/CONFIG_TICK_CPU_ACCOUNTING | 1 +
.../fedora/generic/s390x/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE | 1 +
configs/fedora/generic/x86/x86_64/CONFIG_TICK_CPU_ACCOUNTING | 1 +
kernel-aarch64-debug.config | 2 +-
kernel-aarch64.config | 2 +-
kernel-armv7hl-debug.config | 2 +-
kernel-armv7hl-lpae-debug.config | 2 +-
kernel-armv7hl-lpae.config | 2 +-
kernel-armv7hl.config | 2 +-
kernel-i686-debug.config | 2 +-
kernel-i686.config | 2 +-
kernel-s390x-debug.config | 2 +-
kernel-s390x.config | 2 +-
kernel-x86_64-debug.config | 4 ++--
kernel-x86_64.config | 4 ++--
17 files changed, 19 insertions(+), 15 deletions(-)
create mode 100644 configs/fedora/generic/powerpc/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
create mode 100644 configs/fedora/generic/s390x/CONFIG_TICK_CPU_ACCOUNTING
create mode 100644 configs/fedora/generic/s390x/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
create mode 100644 configs/fedora/generic/x86/x86_64/CONFIG_TICK_CPU_ACCOUNTING
diff --git a/configs/fedora/generic/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE b/configs/fedora/generic/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
index ddcbbab11f1b..44cd250a7c26 100644
--- a/configs/fedora/generic/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
+++ b/configs/fedora/generic/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
@@ -1 +1 @@
-CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
+# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
diff --git a/configs/fedora/generic/powerpc/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE b/configs/fedora/generic/powerpc/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
new file mode 100644
index 000000000000..ddcbbab11f1b
--- /dev/null
+++ b/configs/fedora/generic/powerpc/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
@@ -0,0 +1 @@
+CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
diff --git a/configs/fedora/generic/s390x/CONFIG_TICK_CPU_ACCOUNTING b/configs/fedora/generic/s390x/CONFIG_TICK_CPU_ACCOUNTING
new file mode 100644
index 000000000000..c1c90776ed06
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_TICK_CPU_ACCOUNTING
@@ -0,0 +1 @@
+# CONFIG_TICK_CPU_ACCOUNTING is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE b/configs/fedora/generic/s390x/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
new file mode 100644
index 000000000000..ddcbbab11f1b
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
@@ -0,0 +1 @@
+CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_TICK_CPU_ACCOUNTING b/configs/fedora/generic/x86/x86_64/CONFIG_TICK_CPU_ACCOUNTING
new file mode 100644
index 000000000000..c1c90776ed06
--- /dev/null
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_TICK_CPU_ACCOUNTING
@@ -0,0 +1 @@
+# CONFIG_TICK_CPU_ACCOUNTING is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 9b46a9fc6903..c4525217e399 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -6849,7 +6849,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
+# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
# CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 85799ab098da..ac9a5d9f22bf 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -6826,7 +6826,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
+# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
# CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 53c03b29554d..6f19a855fdad 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -7327,7 +7327,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
+# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
# CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index b21c4930a203..56f2d738d784 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -6885,7 +6885,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
+# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
# CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 8ed390e0026f..2e61fcd3f35f 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -6863,7 +6863,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
+# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
# CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 730a29f5d2dd..0abab63d2282 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -7305,7 +7305,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
+# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
# CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index cedf94274d9d..485a254951e1 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -6397,7 +6397,7 @@ CONFIG_VIDEO_VIA_CAMERA=m
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-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
diff --git a/kernel-i686.config b/kernel-i686.config
index 77268ca04a20..2904e921a0b0 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -6375,7 +6375,7 @@ CONFIG_VIDEO_VIA_CAMERA=m
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-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
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 21c0d8c2b199..2cdf22b19146 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -5320,7 +5320,7 @@ CONFIG_THRUSTMASTER_FF=y
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
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 98db056dff7d..111e594d1caf 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -5296,7 +5296,7 @@ CONFIG_THRUSTMASTER_FF=y
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
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index c13f760689b4..a6d918522b0d 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -5788,7 +5788,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
@@ -6436,7 +6436,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
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index d74202ec08e2..8d263b69d88c 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -5766,7 +5766,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
@@ -6414,7 +6414,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
--
2.17.2
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
