summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2018-11-13 17:57:19 +0100
committerJustin M. Forbes <jforbes@fedoraproject.org>2018-11-15 13:44:46 -0800
commit3e4010f25ec6c6eb8ffa5c8c90e041427de2212f (patch)
tree368bb982e4d7eef3431eb8b446fcaabeaad33cc0
parent23a14040dbf66405d2eabd50a9b859eaebd522b2 (diff)
downloadkernel-3e4010f25ec6c6eb8ffa5c8c90e041427de2212f.tar.gz
kernel-3e4010f25ec6c6eb8ffa5c8c90e041427de2212f.tar.xz
kernel-3e4010f25ec6c6eb8ffa5c8c90e041427de2212f.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
-rw-r--r--configs/fedora/generic/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE2
-rw-r--r--configs/fedora/generic/powerpc/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_TICK_CPU_ACCOUNTING1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE1
-rw-r--r--configs/fedora/generic/x86/x86_64/CONFIG_TICK_CPU_ACCOUNTING1
-rw-r--r--kernel-aarch64-debug.config2
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel-x86_64-debug.config4
-rw-r--r--kernel-x86_64.config4
17 files changed, 19 insertions, 15 deletions
diff --git a/configs/fedora/generic/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE b/configs/fedora/generic/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
index ddcbbab11..44cd250a7 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 000000000..ddcbbab11
--- /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 000000000..c1c90776e
--- /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 000000000..ddcbbab11
--- /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 000000000..c1c90776e
--- /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 41428ea0c..5d12f66cc 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -6850,7 +6850,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 4a1e3a420..cf8d3a7f5 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -6827,7 +6827,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 e8c3e67bf..51f647cd7 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -7320,7 +7320,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 ebf485a91..a0bdad31f 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -6876,7 +6876,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 3a6decbb6..8c466a931 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -6854,7 +6854,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 c36e46250..9378f1615 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -7298,7 +7298,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 093806947..c6087d8cb 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -6380,7 +6380,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 42ee7c449..f9d7105ef 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -6358,7 +6358,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 a486faec3..ffffe917f 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -5304,7 +5304,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 811151a73..9885a593d 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -5280,7 +5280,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 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
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 2703d4a66..7a68bb706 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -5756,7 +5756,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
@@ -6403,7 +6403,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
generated by cgit (git 2.34.1) at 2024-11-16 02:14:26 +0000