From f56608b405f07d942c8585dadf2e6f3fe71763d4 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Wed, 26 Sep 2012 15:42:28 -0400
Subject: [PATCH] meta: cleanup invalid/obselete 3.4 CONFIG options

The kernel configuration audit subsystem was previously focussed on
BSP/hardware specific options, since that is the part of configuration
that the end developer maintains.

But not auditing the non-hardware specific options on each run meant
that some options that do not exist in the kernel have remained in the
configuration fragments.

Removing them clarifies the fragments, and updating the audit to report
on non-hardware options ensures that they will stay clean.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 cfg/net/ip6_nf.cfg               |  2 --
 cfg/net/ip_nf.cfg                | 23 -----------------------
 features/kgdb/kgdb.cfg           |  4 ----
 features/lttng/lttng.cfg         |  2 --
 features/net_sched/net_sched.cfg |  3 ---
 features/netfilter/netfilter.cfg |  4 ----
 features/uprobe/uprobe.cfg       |  2 --
 features/utrace/utrace.cfg       |  1 -
 ktypes/base/base.cfg             | 10 ----------
 ktypes/base/non-hardware.cfg     |  1 -
 ktypes/preempt-rt/preempt-rt.cfg |  9 ---------
 ktypes/standard/standard.cfg     |  9 ---------
 12 files changed, 70 deletions(-)

diff --git a/cfg/net/ip6_nf.cfg b/cfg/net/ip6_nf.cfg
index 39e84172f..6a0f34c67 100644
--- a/cfg/net/ip6_nf.cfg
+++ b/cfg/net/ip6_nf.cfg
@@ -7,10 +7,8 @@ CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
diff --git a/cfg/net/ip_nf.cfg b/cfg/net/ip_nf.cfg
index 24df370db..b806fc1d2 100644
--- a/cfg/net/ip_nf.cfg
+++ b/cfg/net/ip_nf.cfg
@@ -8,41 +8,18 @@ index a6a3d92..a392c7d 100644
 #
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_CONNTRACK=m
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CT_ACCT=y
-CONFIG_IP_NF_CT_PROTO_SCTP=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_TFTP=m
diff --git a/features/kgdb/kgdb.cfg b/features/kgdb/kgdb.cfg
index f056475e6..a51a480a5 100644
--- a/features/kgdb/kgdb.cfg
+++ b/features/kgdb/kgdb.cfg
@@ -11,10 +11,6 @@
 #
 #.........................................................................
 CONFIG_KGDB=y
-CONFIG_KGDB_ONLY_MODULES=y
-CONFIG_KGDBOE=m
 CONFIG_NETPOLL=y
-# CONFIG_KGDBOE_NOMODULE is not set
-# CONFIG_KGDB_CONSOLE is not set
 
 CONFIG_KGDB_KDB=y
diff --git a/features/lttng/lttng.cfg b/features/lttng/lttng.cfg
index 7462160ad..510725c37 100644
--- a/features/lttng/lttng.cfg
+++ b/features/lttng/lttng.cfg
@@ -1,3 +1 @@
-CONFIG_MARKERS=y
-CONFIG_MARKERS_DISABLE_OPTIMIZATION=y
 CONFIG_TRACEPOINTS=y
diff --git a/features/net_sched/net_sched.cfg b/features/net_sched/net_sched.cfg
index 686bc1e8d..6960b0226 100644
--- a/features/net_sched/net_sched.cfg
+++ b/features/net_sched/net_sched.cfg
@@ -2,9 +2,6 @@
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
 
 #
 # Queueing/Scheduling
diff --git a/features/netfilter/netfilter.cfg b/features/netfilter/netfilter.cfg
index ebe362ed6..192401796 100644
--- a/features/netfilter/netfilter.cfg
+++ b/features/netfilter/netfilter.cfg
@@ -11,7 +11,6 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
@@ -72,13 +71,11 @@ CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
@@ -104,6 +101,5 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_NET_CLS_ROUTE=y
 
 CONFIG_NET_SCHED=y
diff --git a/features/uprobe/uprobe.cfg b/features/uprobe/uprobe.cfg
index 931556f3f..ba58ff220 100644
--- a/features/uprobe/uprobe.cfg
+++ b/features/uprobe/uprobe.cfg
@@ -1,3 +1 @@
-CONFIG_UPROBES=y
-CONFIG_UPROBE_EVENT=y
 CONFIG_PERF_EVENTS=y
diff --git a/features/utrace/utrace.cfg b/features/utrace/utrace.cfg
index bf85aa2cd..e69de29bb 100644
--- a/features/utrace/utrace.cfg
+++ b/features/utrace/utrace.cfg
@@ -1 +0,0 @@
-CONFIG_UTRACE=y
diff --git a/ktypes/base/base.cfg b/ktypes/base/base.cfg
index 7170f27ca..6fa310f15 100644
--- a/ktypes/base/base.cfg
+++ b/ktypes/base/base.cfg
@@ -15,7 +15,6 @@
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_LOCK_KERNEL=y
 
 #
 # General setup
@@ -38,7 +37,6 @@ CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -48,7 +46,6 @@ CONFIG_EPOLL=y
 #
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-CONFIG_KMOD=y
 CONFIG_BLOCK=y
 
 #
@@ -58,13 +55,11 @@ CONFIG_BLOCK=y
 #
 # Block layer
 #
-# CONFIG_LBD is not set
 
 #
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 
@@ -124,7 +119,6 @@ CONFIG_NET=y
 # Networking options
 #
 CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_INET=y
@@ -437,7 +431,6 @@ CONFIG_NETDEVICES=y
 #
 # Ethernet (10 or 100Mbit)
 #
-CONFIG_NET_ETHERNET=y
 
 #
 # Tulip family network device support
@@ -944,7 +937,6 @@ CONFIG_PROC_KCORE=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
 
 #
 # Layered filesystems
@@ -974,9 +966,7 @@ CONFIG_RAMFS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
 CONFIG_NFSD_V3=y
-CONFIG_NFSD_TCP=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
diff --git a/ktypes/base/non-hardware.cfg b/ktypes/base/non-hardware.cfg
index d1b894c4c..1c58ef251 100644
--- a/ktypes/base/non-hardware.cfg
+++ b/ktypes/base/non-hardware.cfg
@@ -20,7 +20,6 @@ CONFIG_PREEMPT
 CONFIG_NET
 CONFIG_NETCONSOLE
 CONFIG_NETDEVICES
-CONFIG_NET_ETHERNET
 
 CONFIG_TUN
 CONFIG_BONDING
diff --git a/ktypes/preempt-rt/preempt-rt.cfg b/ktypes/preempt-rt/preempt-rt.cfg
index 931482085..451c24c4d 100644
--- a/ktypes/preempt-rt/preempt-rt.cfg
+++ b/ktypes/preempt-rt/preempt-rt.cfg
@@ -338,7 +338,6 @@ CONFIG_BLK_DEV_NBD=m
 #
 # SCSI low-level drivers
 #
-# CONFIG_SCSI_QLOGIC_FC is not set
 
 #
 # PCMCIA SCSI adapter support
@@ -356,7 +355,6 @@ CONFIG_BLK_DEV_MD=y
 CONFIG_MD_LINEAR=y
 CONFIG_MD_RAID0=y
 CONFIG_MD_RAID1=y
-CONFIG_MD_RAID5=y
 CONFIG_MD_RAID10=y
 CONFIG_MD_MULTIPATH=y
 CONFIG_MD_FAULTY=y
@@ -921,13 +919,11 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
 # CONFIG_REISERFS_FS_SECURITY is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_SECURITY is not set
 # CONFIG_XFS_RT is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_MINIX_FS=m
 CONFIG_ROMFS_FS=m
 # CONFIG_QUOTA is not set
-CONFIG_AUTOFS_FS=m
 CONFIG_AUTOFS4_FS=m
 
 #
@@ -960,14 +956,10 @@ CONFIG_CONFIGFS_FS=m
 #
 # Network File Systems
 #
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp437"
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -1099,7 +1091,6 @@ CONFIG_NLS_UTF8=m
 #
 CONFIG_SECURITY=y
 # CONFIG_SECURITY_NETWORK is not set
-CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_SELINUX is not set
 
 #
diff --git a/ktypes/standard/standard.cfg b/ktypes/standard/standard.cfg
index b396d1d92..f58c91502 100644
--- a/ktypes/standard/standard.cfg
+++ b/ktypes/standard/standard.cfg
@@ -331,7 +331,6 @@ CONFIG_BLK_DEV_NBD=m
 #
 # SCSI low-level drivers
 #
-# CONFIG_SCSI_QLOGIC_FC is not set
 
 #
 # PCMCIA SCSI adapter support
@@ -349,7 +348,6 @@ CONFIG_BLK_DEV_MD=y
 CONFIG_MD_LINEAR=y
 CONFIG_MD_RAID0=y
 CONFIG_MD_RAID1=y
-CONFIG_MD_RAID5=y
 CONFIG_MD_RAID10=y
 CONFIG_MD_MULTIPATH=y
 CONFIG_MD_FAULTY=y
@@ -914,13 +912,11 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
 # CONFIG_REISERFS_FS_SECURITY is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_SECURITY is not set
 # CONFIG_XFS_RT is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_MINIX_FS=m
 CONFIG_ROMFS_FS=m
 # CONFIG_QUOTA is not set
-CONFIG_AUTOFS_FS=m
 CONFIG_AUTOFS4_FS=m
 
 #
@@ -950,14 +946,10 @@ CONFIG_CONFIGFS_FS=m
 #
 # Network File Systems
 #
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp437"
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -1089,7 +1081,6 @@ CONFIG_NLS_UTF8=m
 #
 CONFIG_SECURITY=y
 # CONFIG_SECURITY_NETWORK is not set
-CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_SELINUX is not set
 
 #
-- 
GitLab