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(a)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
--
2.17.2