diff --git a/config-arm-generic b/config-arm-generic
index 2697d71e6..d70e744b8 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -10,6 +10,9 @@ CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
 
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
+
 CONFIG_CC_STACKPROTECTOR=y
 
 # CONFIG_PID_IN_CONTEXTIDR is not set
diff --git a/config-arm64 b/config-arm64
index 58c2ab24d..9bd64776e 100644
--- a/config-arm64
+++ b/config-arm64
@@ -1,11 +1,6 @@
 CONFIG_64BIT=y
 CONFIG_ARM64=y
 
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y
-
-# CONFIG_CPU_BIG_ENDIAN is not set
-
 # arm64 only SoCs
 CONFIG_ARCH_HISI=y
 CONFIG_ARCH_SEATTLE=y
diff --git a/config-armv7-generic b/config-armv7-generic
index 21edda3a0..fc218c7e8 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -138,9 +138,6 @@ CONFIG_HIGHMEM=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_ARM_MODULE_PLTS is not set
 
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y
-
 CONFIG_RCU_FANOUT=32
 
 # Dynamic Voltage and Frequency Scaling
diff --git a/config-generic b/config-generic
index 8ea0e844d..c1ff51eca 100644
--- a/config-generic
+++ b/config-generic
@@ -1418,7 +1418,6 @@ CONFIG_NET_VENDOR_AMD=y
 CONFIG_PCNET32=m
 CONFIG_AMD8111_ETH=m
 CONFIG_PCMCIA_NMCLAN=m
-# CONFIG_AMD_XGBE is not set
 
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_ARC_EMAC=m