diff options
| author |   Olof Johansson <olof@lixom.net> | 2017-01-29 17:30:09 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-29 17:30:09 -0800 |
| commit | 4e15a5057b76a5537d05f8d1a26a20fdabc61f02 (patch) | |
| tree | dbc57613e70ddf21998eb012aa2654ba94467247 | |
| parent | Merge tag 'omap-for-v4.11/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig (diff) | |
| parent | arm64: defconfig: Enable NUMA and NUMA_BALANCING (diff) | |
| download | wireguard-linux-4e15a5057b76a5537d05f8d1a26a20fdabc61f02.tar.xz wireguard-linux-4e15a5057b76a5537d05f8d1a26a20fdabc61f02.zip | |
Merge tag 'hisi-defconfig-for-4.11' of git://github.com/hisilicon/linux-hisi into next/defconfig
ARM64: hisilicon: defconfig updates for 4.11
- Enable ARM_SMMU_V3 in the arm64 defconfig
- Enable NUMA and NUMA_BALANCING in the arm64 defconfig
* tag 'hisi-defconfig-for-4.11' of git://github.com/hisilicon/linux-hisi:
arm64: defconfig: Enable NUMA and NUMA_BALANCING
arm64: defconfig: enable SMMUv3 config
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm64/configs/defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 33b744d54739..f2be18d30939 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -11,6 +11,7 @@ CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y +CONFIG_NUMA_BALANCING=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y CONFIG_BLK_CGROUP=y @@ -72,6 +73,7 @@ CONFIG_PCIE_QCOM=y CONFIG_PCIE_ARMADA_8K=y CONFIG_ARM64_VA_BITS_48=y CONFIG_SCHED_MC=y +CONFIG_NUMA=y CONFIG_PREEMPT=y CONFIG_KSM=y CONFIG_TRANSPARENT_HUGEPAGE=y @@ -441,6 +443,7 @@ CONFIG_PLATFORM_MHU=y CONFIG_BCM2835_MBOX=y CONFIG_HI6220_MBOX=y CONFIG_ARM_SMMU=y +CONFIG_ARM_SMMU_V3=y CONFIG_RASPBERRYPI_POWER=y CONFIG_QCOM_SMEM=y CONFIG_QCOM_SMD=y |