diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-04-13 13:07:03 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-04-13 13:07:03 +0800 |
| commit | 64fb55641f2f70959dddb122595b418a9c3c9187 (patch) | |
| tree | 75d4c3ae15afda455671c40d0268a23d4b0d5ad5 /arch/arm64/Kconfig | |
| parent | 9221207894a7a76936bf67c35d81057ea9cd97fa (diff) | |
| parent | 4f380dc2632d4bbb183b4574bf810e198002cf6b (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
arch/arm64/Kconfig: keep ARCH_MMAP_RND_BITS_MIN etc config
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index bf87f37e84b2..5c74ad90a447 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -141,6 +141,18 @@ config ARCH_MMAP_RND_COMPAT_BITS_MIN config ARCH_MMAP_RND_COMPAT_BITS_MAX default 16 +config ARM64_PAGE_SHIFT + int + default 16 if ARM64_64K_PAGES + default 14 if ARM64_16K_PAGES + default 12 + +config ARM64_CONT_SHIFT + int + default 5 if ARM64_64K_PAGES + default 7 if ARM64_16K_PAGES + default 4 + config NO_IOPORT_MAP def_bool y if !PCI |