Merge remote-tracking branch 'lts/linux-3.10.y' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / linaro / configs / distribution.conf

diff --git a/linaro/configs/distribution.conf b/linaro/configs/distribution.conf
index fbcfed1b6ce8501b52ed702151ab9cc985d7ef2a..729b9b8979e4c478df34c0d550cbf01491abb668 100644 (file)
--- a/linaro/configs/distribution.conf
+++ b/linaro/configs/distribution.conf
@@ -25,6 +25,7 @@ CONFIG_IP6_NF_MANGLE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_MARK_T=m
 CONFIG_BRIDGE=m
+CONFIG_TUN=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_BLK_DEV_RAM=y
@@ -42,3 +43,7 @@ CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SMACK=y
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_DEFAULT_SECURITY_APPARMOR=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y