git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mm-nonmm-stable-2022-10-11' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
configs
/
urquell_defconfig
diff --git
a/arch/sh/configs/urquell_defconfig
b/arch/sh/configs/urquell_defconfig
index ea773c764c5a8a8b57485d5de649cc719afa4a45..8fc687c98fd195e8dd6c3845789772dd88020b5f 100644
(file)
--- a/
arch/sh/configs/urquell_defconfig
+++ b/
arch/sh/configs/urquell_defconfig
@@
-14,7
+14,6
@@
CONFIG_CPUSETS=y
# CONFIG_PROC_PID_CPUSET is not set
CONFIG_CGROUP_CPUACCT=y
CONFIG_CGROUP_MEMCG=y
-CONFIG_CGROUP_MEMCG_SWAP=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_BLK_DEV_INITRD=y