aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-01-14 14:39:40 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-01-20 13:41:49 +0100
commitb5480de4d1527216cdc3719670a203fb05e72e88 (patch)
tree7e55c641063cb246c87a7f5fa6036c238323dcf2 /target/linux/layerscape
parent098cbc68ee23db589ed6f0d081fe26cc385462f2 (diff)
downloadupstream-b5480de4d1527216cdc3719670a203fb05e72e88.tar.gz
upstream-b5480de4d1527216cdc3719670a203fb05e72e88.tar.bz2
upstream-b5480de4d1527216cdc3719670a203fb05e72e88.zip
kernel: bump 4.14 to 4.14.164
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape')
-rw-r--r--target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch b/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch
index e8b730f95c..099b6031b5 100644
--- a/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch
@@ -285,7 +285,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
#define PAGE_NONE __pgprot(((_PAGE_DEFAULT) & ~PTE_VALID) | PTE_PROT_NONE | PTE_RDONLY | PTE_NG | PTE_PXN | PTE_UXN)
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
-@@ -360,6 +360,11 @@ static inline int pmd_protnone(pmd_t pmd
+@@ -356,6 +356,11 @@ static inline int pmd_protnone(pmd_t pmd
__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)