diff options
author | James Morris <james.l.morris@oracle.com> | 2017-03-28 02:03:35 +0200 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2017-03-28 02:03:35 +0200 |
commit | 840c91dc6a13b160f5b6e5c79c430dffac11c945 (patch) | |
tree | 5309824f4531b2611a575e7971a935d2e95feb02 /arch/ia64 | |
parent | LSM: Initialize security_hook_heads upon registration. (diff) | |
parent | Linux 4.11-rc4 (diff) | |
download | linux-840c91dc6a13b160f5b6e5c79c430dffac11c945.tar.xz linux-840c91dc6a13b160f5b6e5c79c430dffac11c945.zip |
update to v4.11-rc4 due to memory corruption bug in rc2
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/include/asm/pgtable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h index 384794e665fc..6cc22c8d8923 100644 --- a/arch/ia64/include/asm/pgtable.h +++ b/arch/ia64/include/asm/pgtable.h @@ -587,8 +587,10 @@ extern struct page *zero_page_memmap_ptr; #if CONFIG_PGTABLE_LEVELS == 3 +#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> #endif +#include <asm-generic/5level-fixup.h> #include <asm-generic/pgtable.h> #endif /* _ASM_IA64_PGTABLE_H */ |