diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-04-07 16:50:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-04-07 16:50:41 +0800 |
| commit | 11cbb42a86895b88ac906a6768c998f9e98a37e2 (patch) | |
| tree | 3eaeec2cff4c7e34add793c77079cdc85b058bb8 /arch/arm64/include/asm/pgtable-hwdef.h | |
| parent | 95ffb43f1ba759fb1205a8ce38a7ea5bab6be02d (diff) | |
| parent | 95bcc3e563748f65c9fc0eb1bbc3f99b76efd4b2 (diff) | |
Merge remote-tracking branch 'origin/v4.4/topic/hibernate' into hikey-mainline-rebase-4.4hikey-hibernate-v4.4
Conflicts:
arch/arm64/Makefile
arch/arm64/kernel/arm64ksyms.c
arch/arm64/kernel/asm-offsets.c
arch/arm64/kvm/hyp/fpsimd.S
drivers/firmware/psci.c
fs/proc/task_mmu.c
mm/memcontrol.c
Diffstat (limited to 'arch/arm64/include/asm/pgtable-hwdef.h')
| -rw-r--r-- | arch/arm64/include/asm/pgtable-hwdef.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h index d6739e836f7b..b9da9545b442 100644 --- a/arch/arm64/include/asm/pgtable-hwdef.h +++ b/arch/arm64/include/asm/pgtable-hwdef.h @@ -117,7 +117,6 @@ * Section */ #define PMD_SECT_VALID (_AT(pmdval_t, 1) << 0) -#define PMD_SECT_PROT_NONE (_AT(pmdval_t, 1) << 58) #define PMD_SECT_USER (_AT(pmdval_t, 1) << 6) /* AP[1] */ #define PMD_SECT_RDONLY (_AT(pmdval_t, 1) << 7) /* AP[2] */ #define PMD_SECT_S (_AT(pmdval_t, 3) << 8) |