For some time now the build generates a number of override warnings, like this one: [...]:warning: override: VIRT_CPU_ACCOUNTING_NATIVE changes choice state
These warnings are triggered when the build uses a .config that has more than one option set in a Kconfig "choice". But the kernel build system will only allow one option per "choice".
This small series fixes all current warnings. It doesn't change the final .configs that the kernel build system will use. (That was my goal for this series.) So this series should only result in a quieter build.
I'd really appreciate any testing to uncover whether I missed something.
Paul Bolle (3): configs: correct cpu accounting configuration configs: correct memory configuration configs: use CONFIG_UNWINDER_ORC only in x86/x86_64
configs/fedora/generic/CONFIG_FLATMEM_MANUAL | 1 - 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 + configs/fedora/generic/{ => x86/x86_64}/CONFIG_UNWINDER_ORC | 0 kernel-aarch64-debug.config | 4 +--- kernel-aarch64.config | 4 +--- kernel-armv7hl-debug.config | 4 +--- kernel-armv7hl-lpae-debug.config | 4 +--- kernel-armv7hl-lpae.config | 4 +--- kernel-armv7hl.config | 4 +--- kernel-i686-debug.config | 3 +-- kernel-i686.config | 3 +-- kernel-ppc64le-debug.config | 2 -- kernel-ppc64le.config | 2 -- kernel-s390x-debug.config | 4 +--- kernel-s390x.config | 4 +--- kernel-x86_64-debug.config | 5 ++--- kernel-x86_64.config | 5 ++--- 21 files changed, 19 insertions(+), 40 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_FLATMEM_MANUAL 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 rename configs/fedora/generic/{ => x86/x86_64}/CONFIG_UNWINDER_ORC (100%)
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 --- 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
The shipped .config files all have CONFIG_FLATMEM_MANUAL and CONFIG_SPARSEMEM_MANUAL set.
This is wrong because each .config should have just one of these two set set. (There's also CONFIG_DISCONTIGMEM_MANUAL but Fedora doesn't use that.) As a result the build generates [...]:warning: override: SPARSEMEM_MANUAL changes choice state
24 times.
If the configuration generation system drops CONFIG_FLATMEM_MANUAL the warnings go away. And that doesn't change the final .config files that the kernel's build system actually uses.
(Two details that very few people will care about: 1. x86/i686 still needs to unset CONFIG_FLATMEM_MANUAL to keep process_configs.sh from killing the build; 2. the kernel build of armv7hl will silently drop CONFIG_SPARSEMEM_MANUAL. Because of that I didn't bother with an explicit override for arm/armv7.)
Signed-off-by: Paul Bolle pebolle@tiscali.nl --- configs/fedora/generic/CONFIG_FLATMEM_MANUAL | 1 - kernel-aarch64-debug.config | 1 - kernel-aarch64.config | 1 - kernel-armv7hl-debug.config | 1 - kernel-armv7hl-lpae-debug.config | 1 - kernel-armv7hl-lpae.config | 1 - kernel-armv7hl.config | 1 - kernel-ppc64le-debug.config | 1 - kernel-ppc64le.config | 1 - kernel-s390x-debug.config | 1 - kernel-s390x.config | 1 - kernel-x86_64-debug.config | 1 - kernel-x86_64.config | 1 - 13 files changed, 13 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_FLATMEM_MANUAL
diff --git a/configs/fedora/generic/CONFIG_FLATMEM_MANUAL b/configs/fedora/generic/CONFIG_FLATMEM_MANUAL deleted file mode 100644 index c2bd90d5798d..000000000000 --- a/configs/fedora/generic/CONFIG_FLATMEM_MANUAL +++ /dev/null @@ -1 +0,0 @@ -CONFIG_FLATMEM_MANUAL=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index c4525217e399..94ecda994e65 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1787,7 +1787,6 @@ CONFIG_FIREWIRE_SBP2=m # CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIRMWARE_EDID is not set CONFIG_FIXED_PHY=y -CONFIG_FLATMEM_MANUAL=y CONFIG_FM10K=m CONFIG_FMC_CHARDEV=m CONFIG_FMC_FAKEDEV=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index ac9a5d9f22bf..a0cafbaba548 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1770,7 +1770,6 @@ CONFIG_FIREWIRE_SBP2=m # CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIRMWARE_EDID is not set CONFIG_FIXED_PHY=y -CONFIG_FLATMEM_MANUAL=y CONFIG_FM10K=m CONFIG_FMC_CHARDEV=m CONFIG_FMC_FAKEDEV=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 6f19a855fdad..48ecdeae6910 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1892,7 +1892,6 @@ CONFIG_FIREWIRE_SBP2=m # CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIRMWARE_EDID is not set CONFIG_FIXED_PHY=y -CONFIG_FLATMEM_MANUAL=y CONFIG_FM10K=m CONFIG_FMC_CHARDEV=m CONFIG_FMC_FAKEDEV=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 56f2d738d784..4187a58c38f9 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1800,7 +1800,6 @@ CONFIG_FIREWIRE_SBP2=m # CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIRMWARE_EDID is not set CONFIG_FIXED_PHY=y -CONFIG_FLATMEM_MANUAL=y CONFIG_FM10K=m CONFIG_FMC_CHARDEV=m CONFIG_FMC_FAKEDEV=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 2e61fcd3f35f..7d1cf85fd46c 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1784,7 +1784,6 @@ CONFIG_FIREWIRE_SBP2=m # CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIRMWARE_EDID is not set CONFIG_FIXED_PHY=y -CONFIG_FLATMEM_MANUAL=y CONFIG_FM10K=m CONFIG_FMC_CHARDEV=m CONFIG_FMC_FAKEDEV=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 0abab63d2282..eae7cac3cf5a 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1876,7 +1876,6 @@ CONFIG_FIREWIRE_SBP2=m # CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIRMWARE_EDID is not set CONFIG_FIXED_PHY=y -CONFIG_FLATMEM_MANUAL=y CONFIG_FM10K=m CONFIG_FMC_CHARDEV=m CONFIG_FMC_FAKEDEV=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 96632a20cb5a..16fd1d32e812 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -1493,7 +1493,6 @@ CONFIG_FIREWIRE_SBP2=m # CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIRMWARE_EDID is not set CONFIG_FIXED_PHY=y -CONFIG_FLATMEM_MANUAL=y CONFIG_FM10K=m CONFIG_FMC_CHARDEV=m CONFIG_FMC_FAKEDEV=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index ea98ed8190e3..8688dbf59788 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -1475,7 +1475,6 @@ CONFIG_FIREWIRE_SBP2=m # CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIRMWARE_EDID is not set CONFIG_FIXED_PHY=y -CONFIG_FLATMEM_MANUAL=y CONFIG_FM10K=m CONFIG_FMC_CHARDEV=m CONFIG_FMC_FAKEDEV=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 2cdf22b19146..db9a3403eef9 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1478,7 +1478,6 @@ CONFIG_FIREWIRE_SBP2=m # CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIRMWARE_EDID is not set CONFIG_FIXED_PHY=y -CONFIG_FLATMEM_MANUAL=y CONFIG_FM10K=m CONFIG_FMC_CHARDEV=m CONFIG_FMC_FAKEDEV=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 111e594d1caf..d3aab71f6520 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1460,7 +1460,6 @@ CONFIG_FIREWIRE_SBP2=m # CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIRMWARE_EDID is not set CONFIG_FIXED_PHY=y -CONFIG_FLATMEM_MANUAL=y CONFIG_FM10K=m CONFIG_FMC_CHARDEV=m CONFIG_FMC_FAKEDEV=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index a6d918522b0d..f758cf49ff38 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1665,7 +1665,6 @@ CONFIG_FIREWIRE_SBP2=m # CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIRMWARE_EDID is not set CONFIG_FIXED_PHY=y -CONFIG_FLATMEM_MANUAL=y CONFIG_FM10K=m CONFIG_FMC_CHARDEV=m CONFIG_FMC_FAKEDEV=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 8d263b69d88c..a3bdb722def2 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1647,7 +1647,6 @@ CONFIG_FIREWIRE_SBP2=m # CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIRMWARE_EDID is not set CONFIG_FIXED_PHY=y -CONFIG_FLATMEM_MANUAL=y CONFIG_FM10K=m CONFIG_FMC_CHARDEV=m CONFIG_FMC_FAKEDEV=m
The shipped .config files for i686 have both CONFIG_UNWINDER_ORC and CONFIG_UNWINDER_FRAME_POINTER set. This is wrong because those .config files should only have CONFIG_UNWINDER_FRAME_POINTER set. As a result the build generates [...]:warning: override: UNWINDER_ORC changes choice state
4 times.
Move CONFIG_UNWINDER_ORC to x86/x86_64 to correct this. Note that this doesn't change the final .config files that the kernel's build system actually uses.
Signed-off-by: Paul Bolle pebolle@tiscali.nl --- configs/fedora/generic/{ => x86/x86_64}/CONFIG_UNWINDER_ORC | 0 kernel-aarch64-debug.config | 1 - kernel-aarch64.config | 1 - kernel-armv7hl-debug.config | 1 - kernel-armv7hl-lpae-debug.config | 1 - kernel-armv7hl-lpae.config | 1 - kernel-armv7hl.config | 1 - kernel-i686-debug.config | 1 - kernel-i686.config | 1 - kernel-ppc64le-debug.config | 1 - kernel-ppc64le.config | 1 - kernel-s390x-debug.config | 1 - kernel-s390x.config | 1 - 13 files changed, 12 deletions(-) rename configs/fedora/generic/{ => x86/x86_64}/CONFIG_UNWINDER_ORC (100%)
diff --git a/configs/fedora/generic/CONFIG_UNWINDER_ORC b/configs/fedora/generic/x86/x86_64/CONFIG_UNWINDER_ORC similarity index 100% rename from configs/fedora/generic/CONFIG_UNWINDER_ORC rename to configs/fedora/generic/x86/x86_64/CONFIG_UNWINDER_ORC diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 94ecda994e65..04bd1a5796fd 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -6329,7 +6329,6 @@ CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y CONFIG_UNWINDER_ARM=y # CONFIG_UNWINDER_FRAME_POINTER is not set -CONFIG_UNWINDER_ORC=y CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index a0cafbaba548..06c36d7c5ede 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -6306,7 +6306,6 @@ CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y CONFIG_UNWINDER_ARM=y # CONFIG_UNWINDER_FRAME_POINTER is not set -CONFIG_UNWINDER_ORC=y CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 48ecdeae6910..d4dd77a2c136 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -6753,7 +6753,6 @@ CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y CONFIG_UNWINDER_ARM=y # CONFIG_UNWINDER_FRAME_POINTER is not set -CONFIG_UNWINDER_ORC=y CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 4187a58c38f9..2b68cff8e129 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -6348,7 +6348,6 @@ CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y CONFIG_UNWINDER_ARM=y # CONFIG_UNWINDER_FRAME_POINTER is not set -CONFIG_UNWINDER_ORC=y CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 7d1cf85fd46c..fe21fc916287 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -6326,7 +6326,6 @@ CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y CONFIG_UNWINDER_ARM=y # CONFIG_UNWINDER_FRAME_POINTER is not set -CONFIG_UNWINDER_ORC=y CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index eae7cac3cf5a..cad35bf488f6 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -6731,7 +6731,6 @@ CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y CONFIG_UNWINDER_ARM=y # CONFIG_UNWINDER_FRAME_POINTER is not set -CONFIG_UNWINDER_ORC=y CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 485a254951e1..6706c4434806 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -5946,7 +5946,6 @@ CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y CONFIG_UNWINDER_FRAME_POINTER=y -CONFIG_UNWINDER_ORC=y CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m diff --git a/kernel-i686.config b/kernel-i686.config index 2904e921a0b0..789aa76bfa3f 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -5924,7 +5924,6 @@ CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y CONFIG_UNWINDER_FRAME_POINTER=y -CONFIG_UNWINDER_ORC=y CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 16fd1d32e812..6039287abcd4 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -5622,7 +5622,6 @@ CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y # CONFIG_UNWINDER_FRAME_POINTER is not set -CONFIG_UNWINDER_ORC=y CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 8688dbf59788..dde03c30a225 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -5598,7 +5598,6 @@ CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y # CONFIG_UNWINDER_FRAME_POINTER is not set -CONFIG_UNWINDER_ORC=y CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index db9a3403eef9..3960741b55e0 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -5515,7 +5515,6 @@ CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y # CONFIG_UNWINDER_FRAME_POINTER is not set -CONFIG_UNWINDER_ORC=y CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m diff --git a/kernel-s390x.config b/kernel-s390x.config index d3aab71f6520..7263dd749825 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -5491,7 +5491,6 @@ CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y # CONFIG_UNWINDER_FRAME_POINTER is not set -CONFIG_UNWINDER_ORC=y CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m
On 11/13/18 8:57 AM, Paul Bolle wrote:
For some time now the build generates a number of override warnings, like this one: [...]:warning: override: VIRT_CPU_ACCOUNTING_NATIVE changes choice state
These warnings are triggered when the build uses a .config that has more than one option set in a Kconfig "choice". But the kernel build system will only allow one option per "choice".
This small series fixes all current warnings. It doesn't change the final .configs that the kernel build system will use. (That was my goal for this series.) So this series should only result in a quieter build.
I'd really appreciate any testing to uncover whether I missed something.
I'm behind due to conference travel but I'm very happy to see this getting fixed. I'll make sure to take a look at this if someone else doesn't get to it first.
Thanks, Laura
Paul Bolle (3): configs: correct cpu accounting configuration configs: correct memory configuration configs: use CONFIG_UNWINDER_ORC only in x86/x86_64
configs/fedora/generic/CONFIG_FLATMEM_MANUAL | 1 - 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 + configs/fedora/generic/{ => x86/x86_64}/CONFIG_UNWINDER_ORC | 0 kernel-aarch64-debug.config | 4 +--- kernel-aarch64.config | 4 +--- kernel-armv7hl-debug.config | 4 +--- kernel-armv7hl-lpae-debug.config | 4 +--- kernel-armv7hl-lpae.config | 4 +--- kernel-armv7hl.config | 4 +--- kernel-i686-debug.config | 3 +-- kernel-i686.config | 3 +-- kernel-ppc64le-debug.config | 2 -- kernel-ppc64le.config | 2 -- kernel-s390x-debug.config | 4 +--- kernel-s390x.config | 4 +--- kernel-x86_64-debug.config | 5 ++--- kernel-x86_64.config | 5 ++--- 21 files changed, 19 insertions(+), 40 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_FLATMEM_MANUAL 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 rename configs/fedora/generic/{ => x86/x86_64}/CONFIG_UNWINDER_ORC (100%)
On Tue, Nov 13, 2018 at 8:57 AM, Paul Bolle pebolle@tiscali.nl wrote:
For some time now the build generates a number of override warnings, like this one: [...]:warning: override: VIRT_CPU_ACCOUNTING_NATIVE changes choice state
These warnings are triggered when the build uses a .config that has more than one option set in a Kconfig "choice". But the kernel build system will only allow one option per "choice".
This small series fixes all current warnings. It doesn't change the final .configs that the kernel build system will use. (That was my goal for this series.) So this series should only result in a quieter build.
I'd really appreciate any testing to uncover whether I missed something.
Paul Bolle (3): configs: correct cpu accounting configuration configs: correct memory configuration configs: use CONFIG_UNWINDER_ORC only in x86/x86_64
Thanks, Applied to rawhide.
Justin
configs/fedora/generic/CONFIG_FLATMEM_MANUAL | 1 - 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 + configs/fedora/generic/{ => x86/x86_64}/CONFIG_UNWINDER_ORC | 0 kernel-aarch64-debug.config | 4 +--- kernel-aarch64.config | 4 +--- kernel-armv7hl-debug.config | 4 +--- kernel-armv7hl-lpae-debug.config | 4 +--- kernel-armv7hl-lpae.config | 4 +--- kernel-armv7hl.config | 4 +--- kernel-i686-debug.config | 3 +-- kernel-i686.config | 3 +-- kernel-ppc64le-debug.config | 2 -- kernel-ppc64le.config | 2 -- kernel-s390x-debug.config | 4 +--- kernel-s390x.config | 4 +--- kernel-x86_64-debug.config | 5 ++--- kernel-x86_64.config | 5 ++--- 21 files changed, 19 insertions(+), 40 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_FLATMEM_MANUAL 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 rename configs/fedora/generic/{ => x86/x86_64}/CONFIG_UNWINDER_ORC (100%)
-- 2.17.2 _______________________________________________ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-leave@lists.fedoraproject.org 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@lists.fedoraproject.org
kernel@lists.fedoraproject.org
-
Justin Forbes -
Laura Abbott -
Paul Bolle