Skip to content

Commit 90a0b3a

Browse files
committed
Merge pull request #109 from umiddelb/odroidc-3.10.y
(re-) added Docker support
2 parents fd1a173 + d9d2c7b commit 90a0b3a

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

Diff for: arch/arm/configs/odroidc_defconfig

+17-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm 3.10.79 Kernel Configuration
3+
# Linux/arm 3.10.80 Kernel Configuration
44
#
55
CONFIG_ARM=y
66
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -41,7 +41,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
4141
CONFIG_SWAP=y
4242
CONFIG_SYSVIPC=y
4343
CONFIG_SYSVIPC_SYSCTL=y
44-
# CONFIG_POSIX_MQUEUE is not set
44+
CONFIG_POSIX_MQUEUE=y
45+
CONFIG_POSIX_MQUEUE_SYSCTL=y
4546
CONFIG_FHANDLE=y
4647
CONFIG_AUDIT=y
4748
# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
@@ -99,7 +100,7 @@ CONFIG_RCU_FANOUT_LEAF=16
99100
# CONFIG_RCU_BOOST is not set
100101
# CONFIG_RCU_NOCB_CPU is not set
101102
CONFIG_IKCONFIG=y
102-
# CONFIG_IKCONFIG_PROC is not set
103+
CONFIG_IKCONFIG_PROC=y
103104
CONFIG_LOG_BUF_SHIFT=19
104105
CONFIG_CGROUPS=y
105106
# CONFIG_CGROUP_DEBUG is not set
@@ -113,11 +114,13 @@ CONFIG_MEMCG=y
113114
CONFIG_MEMCG_SWAP=y
114115
CONFIG_MEMCG_SWAP_ENABLED=y
115116
# CONFIG_MEMCG_KMEM is not set
117+
CONFIG_CGROUP_PERF=y
116118
CONFIG_CGROUP_SCHED=y
117119
CONFIG_FAIR_GROUP_SCHED=y
118-
# CONFIG_CFS_BANDWIDTH is not set
120+
CONFIG_CFS_BANDWIDTH=y
119121
CONFIG_RT_GROUP_SCHED=y
120-
# CONFIG_BLK_CGROUP is not set
122+
CONFIG_BLK_CGROUP=y
123+
# CONFIG_DEBUG_BLK_CGROUP is not set
121124
# CONFIG_CHECKPOINT_RESTORE is not set
122125
CONFIG_NAMESPACES=y
123126
CONFIG_UTS_NS=y
@@ -167,7 +170,8 @@ CONFIG_PERF_USE_VMALLOC=y
167170
#
168171
# Kernel Performance Events And Counters
169172
#
170-
# CONFIG_PERF_EVENTS is not set
173+
CONFIG_PERF_EVENTS=y
174+
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
171175
CONFIG_VM_EVENT_COUNTERS=y
172176
CONFIG_SLUB_DEBUG=y
173177
CONFIG_COMPAT_BRK=y
@@ -190,6 +194,7 @@ CONFIG_GENERIC_IDLE_POLL_SETUP=y
190194
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
191195
CONFIG_HAVE_CLK=y
192196
CONFIG_HAVE_DMA_API_DEBUG=y
197+
CONFIG_HAVE_HW_BREAKPOINT=y
193198
CONFIG_HAVE_ARCH_JUMP_LABEL=y
194199
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
195200
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
@@ -222,6 +227,7 @@ CONFIG_LBDAF=y
222227
CONFIG_BLK_DEV_BSG=y
223228
CONFIG_BLK_DEV_BSGLIB=y
224229
# CONFIG_BLK_DEV_INTEGRITY is not set
230+
# CONFIG_BLK_DEV_THROTTLING is not set
225231

226232
#
227233
# Partition Types
@@ -252,6 +258,7 @@ CONFIG_EFI_PARTITION=y
252258
CONFIG_IOSCHED_NOOP=y
253259
CONFIG_IOSCHED_DEADLINE=y
254260
CONFIG_IOSCHED_CFQ=y
261+
# CONFIG_CFQ_GROUP_IOSCHED is not set
255262
# CONFIG_DEFAULT_DEADLINE is not set
256263
CONFIG_DEFAULT_CFQ=y
257264
# CONFIG_DEFAULT_NOOP is not set
@@ -441,6 +448,7 @@ CONFIG_OABI_COMPAT=y
441448
CONFIG_HAVE_ARCH_PFN_VALID=y
442449
CONFIG_HIGHMEM=y
443450
# CONFIG_HIGHPTE is not set
451+
CONFIG_HW_PERF_EVENTS=y
444452
CONFIG_FLATMEM=y
445453
CONFIG_FLAT_NODE_MEM_MAP=y
446454
CONFIG_HAVE_MEMBLOCK=y
@@ -1859,13 +1867,14 @@ CONFIG_BONDING=m
18591867
CONFIG_MII=y
18601868
# CONFIG_IFB is not set
18611869
# CONFIG_NET_TEAM is not set
1862-
# CONFIG_MACVLAN is not set
1870+
CONFIG_MACVLAN=m
1871+
CONFIG_MACVTAP=m
18631872
# CONFIG_VXLAN is not set
18641873
# CONFIG_NETCONSOLE is not set
18651874
# CONFIG_NETPOLL is not set
18661875
# CONFIG_NET_POLL_CONTROLLER is not set
18671876
CONFIG_TUN=y
1868-
# CONFIG_VETH is not set
1877+
CONFIG_VETH=m
18691878

18701879
#
18711880
# CAIF transport drivers

0 commit comments

Comments
 (0)