summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-21 16:08:19 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-21 16:08:19 +0000
commit57690041fa15b6b70545f379ddfc84df1791c5b8 (patch)
treef6c34e8c0c435806023a40f7f99345a7fbf29ba9
parentc18d6739bcf568dda5cc28edff2d4e3096a72cb2 (diff)
downloadmtk-20170518-57690041fa15b6b70545f379ddfc84df1791c5b8.zip
mtk-20170518-57690041fa15b6b70545f379ddfc84df1791c5b8.tar.gz
mtk-20170518-57690041fa15b6b70545f379ddfc84df1791c5b8.tar.bz2
kernel: clean up redundant SLUB/SLAB related defines for 4.4
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48443
-rw-r--r--target/linux/mpc85xx/config-4.42
-rw-r--r--target/linux/mpc85xx/p1020/config-default1
-rw-r--r--target/linux/sunxi/config-4.45
-rw-r--r--target/linux/x86/64/config-default1
-rw-r--r--target/linux/x86/config-4.44
5 files changed, 0 insertions, 13 deletions
diff --git a/target/linux/mpc85xx/config-4.4 b/target/linux/mpc85xx/config-4.4
index a511afd..5b76ec5 100644
--- a/target/linux/mpc85xx/config-4.4
+++ b/target/linux/mpc85xx/config-4.4
@@ -270,8 +270,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_OF_PLATFORM=y
# CONFIG_SERIAL_QE is not set
CONFIG_SIMPLE_GPIO=y
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
CONFIG_SOCK_DIAG=y
# CONFIG_SOCRATES is not set
CONFIG_SPARSE_IRQ=y
diff --git a/target/linux/mpc85xx/p1020/config-default b/target/linux/mpc85xx/p1020/config-default
index 1d15b32..8fd7957 100644
--- a/target/linux/mpc85xx/p1020/config-default
+++ b/target/linux/mpc85xx/p1020/config-default
@@ -11,7 +11,6 @@ CONFIG_RCU_STALL_COMMON=y
CONFIG_RFS_ACCEL=y
CONFIG_RPS=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_SLUB_CPU_PARTIAL=y
CONFIG_SMP=y
CONFIG_TREE_RCU=y
CONFIG_XPS=y
diff --git a/target/linux/sunxi/config-4.4 b/target/linux/sunxi/config-4.4
index 20cfe7a..dbefd32 100644
--- a/target/linux/sunxi/config-4.4
+++ b/target/linux/sunxi/config-4.4
@@ -419,11 +419,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=8
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SERIO=y
CONFIG_SERIO_SERPORT=y
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB_DEBUG_ON is not set
CONFIG_SMP=y
CONFIG_SMP_ON_UP=y
CONFIG_SND=y
diff --git a/target/linux/x86/64/config-default b/target/linux/x86/64/config-default
index a5947a2..0603b60 100644
--- a/target/linux/x86/64/config-default
+++ b/target/linux/x86/64/config-default
@@ -173,7 +173,6 @@ CONFIG_SATA_AHCI=y
# CONFIG_SCIF_BUS is not set
CONFIG_SCSI_VIRTIO=y
CONFIG_SERIAL_8250_PNP=y
-CONFIG_SLUB_CPU_PARTIAL=y
CONFIG_SMP=y
CONFIG_SPARSEMEM=y
CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
diff --git a/target/linux/x86/config-4.4 b/target/linux/x86/config-4.4
index 49a0cfd..f87eba9 100644
--- a/target/linux/x86/config-4.4
+++ b/target/linux/x86/config-4.4
@@ -357,10 +357,6 @@ CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_SERPORT=y
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB_DEBUG_ON is not set
# CONFIG_SMSC37B787_WDT is not set
# CONFIG_SMSC_SCH311X_WDT is not set
CONFIG_SPARSEMEM_STATIC=y