sparc: defconfig: Cleanup from old Kconfig options

PATCH RESEND Applied Krzysztof Kozlowski 3 participants 4 messages Jul 20, 2017 SPARC + UltraSPARC (sparc/sparc64)

Share & tools

Krzysztof Kozlowski

author

2017-07-20 05:00 UTC #0 lore raw

PATCH RESEND 1/1 sparc: defconfig: Cleanup from old Kconfig options

Remove old, dead Kconfig options (in order appearing in this commit):
- EXPERIMENTAL is gone since v3.9;
- INET_LRO: commit 7bbf3cae65b6 ("ipv4: Remove inet_lro library");
- AUTOFS_FS: commit 561c5cf9236a ("staging: Remove autofs3");
- RCU_CPU_STALL_DETECTOR: commit a00e0d714fbd ("rcu: Remove conditional compilation for RCU CPU stall warnings");
- USB_DEVICE_CLASS: commit 007bab91324e ("USB: remove CONFIG_USB_DEVICE_CLASS");
- SYSCTL_SYSCALL_CHECK: commit 7c60c48f58a7 ("sysctl: Improve the sysctl sanity checks");

Signed-off-by Krzysztof Kozlowski <[email protected]>

Acked-by David S. Miller <[email protected]>

---
 arch/sparc/configs/sparc32_defconfig | 4 ----
 arch/sparc/configs/sparc64_defconfig | 4 ----
 2 files changed, 8 deletions(-)

arch/sparc/configs/sparc32_defconfig +0 -4

index c74d3701ad68..207a43a2d8b3 100644
@@ -1,4 +1,3 @@
-CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_LOG_BUF_SHIFT

@@ -23,7 +22,6 @@ CONFIG_IP_PNP_DHCP=y
 CONFIG_INET_AH=y
 CONFIG_INET_ESP=y
 CONFIG_INET_IPCOMP=y
-# CONFIG_INET_LRO is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m

@@ -69,7 +67,6 @@ CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
-CONFIG_AUTOFS_FS=m
 CONFIG_AUTOFS4_FS=m
 CONFIG_ISO9660_FS=m
 CONFIG_PROC_KCORE=y

@@ -82,7 +79,6 @@ CONFIG_NLS=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_SCHED_DEBUG is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_KGDB=y
 CONFIG_KGDB_TESTS=y
 CONFIG_CRYPTO_NULL=m

arch/sparc/configs/sparc64_defconfig +0 -4

index b2e650d1764f..ca8609d7292f 100644
@@ -1,5 +1,4 @@
 CONFIG_64BIT=y
-CONFIG_EXPERIMENTAL=y
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y

@@ -184,7 +183,6 @@ CONFIG_HID_TOPSEED=y
 CONFIG_HID_THRUSTMASTER=y
 CONFIG_HID_ZEROPLUS=y
 CONFIG_USB=y
-# CONFIG_USB_DEVICE_CLASS is not set
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
 CONFIG_USB_OHCI_HCD=y

@@ -210,8 +208,6 @@ CONFIG_LOCKUP_DETECTOR=y
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_SCHED_DEBUG is not set
 CONFIG_SCHEDSTATS=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_UPROBE_EVENTS=y
 CONFIG_KEYS=y

Signature · 1 line

2.7.4

Sam Ravnborg

2017-07-20 12:36 UTC #1 lore raw

Quoted 11 lines · Krzysztof Kozlowski

Remove old, dead Kconfig options (in order appearing in this commit):
- EXPERIMENTAL is gone since v3.9;
- INET_LRO: commit 7bbf3cae65b6 ("ipv4: Remove inet_lro library");
- AUTOFS_FS: commit 561c5cf9236a ("staging: Remove autofs3");
- RCU_CPU_STALL_DETECTOR: commit a00e0d714fbd ("rcu: Remove conditional compilation for RCU CPU stall warnings");
- USB_DEVICE_CLASS: commit 007bab91324e ("USB: remove CONFIG_USB_DEVICE_CLASS");
- SYSCTL_SYSCALL_CHECK: commit 7c60c48f58a7 ("sysctl: Improve the sysctl sanity checks");

Quoted 2 lines

Signed-off-by Krzysztof Kozlowski <[email protected]>
Acked-by David S. Miller <[email protected]>

Hi Krzysztof.

This looks like a manually edited defconfig.
A better approch would be to do:

$ make ARCH=sparc64 sparc64_defconfig
$ make ARCH=sparc64 savedefconfig

And then to check the generated defconfig.
Same for sparc32.

This is more or less how the defconfig filws are generated in the first place.

Diffstat when I do the above:
defconfig | 62 ++++++++++++++++----------------------------------------------

 1 file changed, 16 insertions(+), 46 deletions(-)

Sam

Krzysztof Kozlowski

author

2017-07-20 18:11 UTC #2 lore raw

Quoted 17 lines · Sam Ravnborg

Quoted 11 lines · Krzysztof Kozlowski
Remove old, dead Kconfig options (in order appearing in this commit):
- EXPERIMENTAL is gone since v3.9;
- INET_LRO: commit 7bbf3cae65b6 ("ipv4: Remove inet_lro library");
- AUTOFS_FS: commit 561c5cf9236a ("staging: Remove autofs3");
- RCU_CPU_STALL_DETECTOR: commit a00e0d714fbd ("rcu: Remove conditional compilation for RCU CPU stall warnings");
- USB_DEVICE_CLASS: commit 007bab91324e ("USB: remove CONFIG_USB_DEVICE_CLASS");
- SYSCTL_SYSCALL_CHECK: commit 7c60c48f58a7 ("sysctl: Improve the sysctl sanity checks");
Quoted 2 lines
Signed-off-by Krzysztof Kozlowski <[email protected]>
Acked-by David S. Miller <[email protected]>
Hi Krzysztof.

Quoted 7 lines

This looks like a manually edited defconfig.
A better approch would be to do:
$ make ARCH=sparc64 sparc64_defconfig
$ make ARCH=sparc64 savedefconfig
And then to check the generated defconfig.
Same for sparc32.

Actually this was generated with sed instead of defconfig on purpose - as part of my bigger cleanup starting from ARM [1]. In case of defconfigs for my platform we wanted to preserve the explanation why things are disappearing, not only to savedefconfig. Indeed this brought up that few items from savedefconfig would be gone but should be replaced with different (new) items.

Anyway this way you have a full control and explanation why things are being changed. After this you can always run defconfig to reorganize and clean up.

[1] https://www.linux-mips.org/archives/linux-mips/2017-06/msg00255.html

Best regards,
Krzysztof

David Miller

maintainer Applied

2017-07-20 19:38 UTC #3 lore raw

From: Krzysztof Kozlowski <[email protected]>
Date: Thu, 20 Jul 2017 20:11:24 +0200

Quoted 33 lines · Sam Ravnborg

Quoted 17 lines · Krzysztof Kozlowski
Quoted 11 lines
Remove old, dead Kconfig options (in order appearing in this commit):
- EXPERIMENTAL is gone since v3.9;
- INET_LRO: commit 7bbf3cae65b6 ("ipv4: Remove inet_lro library");
- AUTOFS_FS: commit 561c5cf9236a ("staging: Remove autofs3");
- RCU_CPU_STALL_DETECTOR: commit a00e0d714fbd ("rcu: Remove conditional compilation for RCU CPU stall warnings");
- USB_DEVICE_CLASS: commit 007bab91324e ("USB: remove CONFIG_USB_DEVICE_CLASS");
- SYSCTL_SYSCALL_CHECK: commit 7c60c48f58a7 ("sysctl: Improve the sysctl sanity checks");
Quoted 2 lines
Signed-off-by Krzysztof Kozlowski <[email protected]>
Acked-by David S. Miller <[email protected]>
Hi Krzysztof.
Quoted 7 lines
This looks like a manually edited defconfig.
A better approch would be to do:
$ make ARCH=sparc64 sparc64_defconfig
$ make ARCH=sparc64 savedefconfig
And then to check the generated defconfig.
Same for sparc32.
Actually this was generated with sed instead of defconfig on purpose - as part of my bigger cleanup starting from ARM [1]. In case of defconfigs for my platform we wanted to preserve the explanation why things are disappearing, not only to savedefconfig. Indeed this brought up that few items from savedefconfig would be gone but should be replaced with different (new) items.

Quoted 5 lines

Anyway this way you have a full control and explanation why things are being changed. After this you can always run defconfig to reorganize and clean up.
[1] https://www.linux-mips.org/archives/linux-mips/2017-06/msg00255.html

Yeah I guess this is OK for now. But we should do a tool based regen at some point soon.

Applied, thanks.