From: Florian Fainelli Date: Sat, 4 Apr 2015 19:33:32 +0000 (+0000) Subject: arm64: remove CGROUPS override X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2738cfcfdad8aa2ca3e7ef4bb50bc36c978a768e;p=openwrt%2Fstaging%2Fadrian.git arm64: remove CGROUPS override SCHED_AUTOGROUP was turned on by default which forces the use of CGROUPS, conflicting with the options we offer from menuconfig, remove that. Signed-off-by: Florian Fainelli SVN-Revision: 45275 --- diff --git a/target/linux/arm64/config-default b/target/linux/arm64/config-default index b4e8182ae8..eec388de57 100644 --- a/target/linux/arm64/config-default +++ b/target/linux/arm64/config-default @@ -40,7 +40,6 @@ CONFIG_ARM_GIC_V3=y # CONFIG_ARM_SP805_WATCHDOG is not set CONFIG_ATOMIC64_SELFTEST=y CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y -# CONFIG_BLK_CGROUP is not set CONFIG_BLK_DEV_SD=y CONFIG_BLOCK_COMPAT=y CONFIG_BOUNCE=y @@ -49,12 +48,6 @@ CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_BUILD_BIN2C=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_CFS_BANDWIDTH is not set -CONFIG_CGROUPS=y -# CONFIG_CGROUP_CPUACCT is not set -# CONFIG_CGROUP_DEVICE is not set -# CONFIG_CGROUP_FREEZER is not set -# CONFIG_CGROUP_NET_CLASSID is not set -CONFIG_CGROUP_SCHED=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y CONFIG_CLKSRC_OF=y @@ -203,7 +196,6 @@ CONFIG_MODULES_USE_ELF_RELA=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_SG_DMA_LENGTH=y -# CONFIG_NET_CLS_CGROUP is not set CONFIG_NET_FLOW_LIMIT=y CONFIG_NFS_FS=y CONFIG_NLS=y @@ -258,7 +250,6 @@ CONFIG_RPS=y # CONFIG_RT_GROUP_SCHED is not set CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_SCHED_AUTOGROUP=y CONFIG_SCSI=y # CONFIG_SCSI_LOWLEVEL is not set # CONFIG_SCSI_PROC_FS is not set