bbdc13b15b
Removed upstreamed:
ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch[1]
Manually rebased:
layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
All other patches automatically rebased.
1. Private email exchange with patch author, Hauke Mehrtens
Signed-off-by: John Audia <graysky@archlinux.us>
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
From 0f90f5d6b3097fd6e7dea3389dc3d8f8894b345c Mon Sep 17 00:00:00 2001
|
|
From: Haiying Wang <Haiying.Wang@freescale.com>
|
|
Date: Wed, 22 Apr 2015 13:09:47 -0400
|
|
Subject: [PATCH] arm64: add support to remap kernel cacheable memory to
|
|
userspace
|
|
|
|
Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
|
|
Reviewed-by: Roy Pledge <roy.pledge@freescale.com>
|
|
Reviewed-by: Stuart Yoder <stuart.yoder@freescale.com>
|
|
---
|
|
arch/arm64/include/asm/pgtable.h | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
--- a/arch/arm64/include/asm/pgtable.h
|
|
+++ b/arch/arm64/include/asm/pgtable.h
|
|
@@ -428,6 +428,9 @@ static inline pmd_t pmd_mkdevmap(pmd_t p
|
|
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRnE) | PTE_PXN | PTE_UXN)
|
|
#define pgprot_writecombine(prot) \
|
|
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN)
|
|
+#define pgprot_cached(prot) \
|
|
+ __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL) | \
|
|
+ PTE_PXN | PTE_UXN)
|
|
#define pgprot_device(prot) \
|
|
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRE) | PTE_PXN | PTE_UXN)
|
|
/*
|