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 --- configs/fedora/generic/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE | 2 +- configs/fedora/generic/powerpc/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE | 1 + configs/fedora/generic/s390x/CONFIG_TICK_CPU_ACCOUNTING | 1 + configs/fedora/generic/s390x/CONFIG_VIRT_CPU_ACCOUNTING_NATIVE | 1 + configs/fedora/generic/x86/x86_64/CONFIG_TICK_CPU_ACCOUNTING | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) 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 (limited to 'configs') 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 -- cgit