diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-12-16 21:23:55 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-12-16 22:23:52 +0100 |
| commit | cb58c7fe733ee168c9909b208af4c676ce3e0499 (patch) | |
| tree | c8f7f914805860b05e2402c70abf61b05319677c /target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch | |
| parent | fb52c40531915df942758aae8c2774154bdc9f44 (diff) | |
| download | upstream-cb58c7fe733ee168c9909b208af4c676ce3e0499.tar.gz upstream-cb58c7fe733ee168c9909b208af4c676ce3e0499.tar.bz2 upstream-cb58c7fe733ee168c9909b208af4c676ce3e0499.zip | |
kernel: bump 4.14 to 4.14.212
Refreshed all patches.
Removed patches because included in upstream:
- 315-v5.10-usbnet-ipeth-fix-connectivity-with-ios-14.patch
Compile-tested on: ipq40xx, ath79, x86/64
Runtime-tested on: ipq40xx, ath79
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch')
| -rw-r--r-- | target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch | 2 |
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 302645e776..27c7d864fa 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 -@@ -357,6 +357,11 @@ static inline int pmd_protnone(pmd_t pmd +@@ -365,6 +365,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) |