From 23a14040dbf66405d2eabd50a9b859eaebd522b2 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Tue, 13 Nov 2018 17:57:20 +0100 Subject: [PATCH] configs: correct memory configuration 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 --- 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 c2bd90d57..000000000 --- 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 795fbed55..41428ea0c 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1782,7 +1782,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 7772dbabf..4a1e3a420 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1765,7 +1765,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 cad15d990..e8c3e67bf 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1886,7 +1886,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 42edcda6e..ebf485a91 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1794,7 +1794,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 310f7a606..3a6decbb6 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1778,7 +1778,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 bc2d89dba..c36e46250 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1870,7 +1870,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 e115707bc..3609079ca 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -1486,7 +1486,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 1f7e6f309..fde0cee38 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -1468,7 +1468,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 56d290d3f..a486faec3 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1471,7 +1471,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 1780a6141..811151a73 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1453,7 +1453,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 2a6093185..e80e99834 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1664,7 +1664,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 90f491b36..2703d4a66 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1646,7 +1646,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