summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2018-11-13 17:57:19 +0100
committerJeremy Cline <jcline@redhat.com>2018-11-30 10:33:50 -0500
commit9ee899f8f633ca6a37eb1c392684c87b275ac1ac (patch)
tree43e14414a7b2d8c00aed2425cd7370d3c89261d7 /configs
parent3609aa8ae844885a09dad7a7bb238195822a8305 (diff)
downloadkernel-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 'configs')
-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
5 files changed, 5 insertions, 1 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