Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c62cf24 authored by Anton Blanchard's avatar Anton Blanchard Committed by Michael Ellerman
Browse files

powerpc: Enable various container features on pseries defconfigs. 



Enable config options required by lxc and docker.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent eaf31601

arch/powerpc/configs/pseries_defconfig

+12 −0
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ CONFIG_CGROUP_FREEZER=y 
CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_CGROUP_PERF=y

CONFIG_CGROUP_SCHED=y

CONFIG_USER_NS=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y
@@ -70,6 +75,7 @@ CONFIG_INET_IPCOMP=m 
CONFIG_NETFILTER=y

# CONFIG_NETFILTER_ADVANCED is not set

CONFIG_BRIDGE=m

CONFIG_VLAN_8021Q=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -124,6 +130,7 @@ CONFIG_MD_FAULTY=m 
CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_MIRROR=m

CONFIG_DM_ZERO=m

CONFIG_DM_MULTIPATH=m
@@ -132,8 +139,12 @@ CONFIG_DM_MULTIPATH_ST=m 
CONFIG_DM_UEVENT=y

CONFIG_BONDING=m

CONFIG_DUMMY=m

CONFIG_MACVLAN=m

CONFIG_MACVTAP=m

CONFIG_VXLAN=m

CONFIG_NETCONSOLE=y

CONFIG_TUN=m

CONFIG_VETH=m

CONFIG_VIRTIO_NET=m

CONFIG_VHOST_NET=m

CONFIG_VORTEX=y
@@ -166,6 +177,7 @@ CONFIG_INPUT_EVDEV=m 
CONFIG_INPUT_MISC=y

CONFIG_INPUT_PCSPKR=m

# CONFIG_SERIO_SERPORT is not set

CONFIG_DEVPTS_MULTIPLE_INSTANCES=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_ICOM=m

arch/powerpc/configs/pseries_le_defconfig

+12 −0
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ CONFIG_CGROUP_FREEZER=y 
CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_CGROUP_PERF=y

CONFIG_CGROUP_SCHED=y

CONFIG_USER_NS=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y
@@ -71,6 +76,7 @@ CONFIG_INET_IPCOMP=m 
CONFIG_NETFILTER=y

# CONFIG_NETFILTER_ADVANCED is not set

CONFIG_BRIDGE=m

CONFIG_VLAN_8021Q=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -125,6 +131,7 @@ CONFIG_MD_FAULTY=m 
CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_MIRROR=m

CONFIG_DM_ZERO=m

CONFIG_DM_MULTIPATH=m
@@ -133,8 +140,12 @@ CONFIG_DM_MULTIPATH_ST=m 
CONFIG_DM_UEVENT=y

CONFIG_BONDING=m

CONFIG_DUMMY=m

CONFIG_MACVLAN=m

CONFIG_MACVTAP=m

CONFIG_VXLAN=m

CONFIG_NETCONSOLE=y

CONFIG_TUN=m

CONFIG_VETH=m

CONFIG_VIRTIO_NET=m

CONFIG_VHOST_NET=m

CONFIG_VORTEX=y
@@ -167,6 +178,7 @@ CONFIG_INPUT_EVDEV=m 
CONFIG_INPUT_MISC=y

CONFIG_INPUT_PCSPKR=m

# CONFIG_SERIO_SERPORT is not set

CONFIG_DEVPTS_MULTIPLE_INSTANCES=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_ICOM=m