diff options
author | Kuan-Yi Li <kyli@abysm.org> | 2021-05-30 09:58:26 +0800 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-05-30 23:45:49 +0200 |
commit | fc0fd5473895b70497c0f043d16f7fe812677f1f (patch) | |
tree | 5246b1d20a69f27c03be9af435d8783e3354f223 /target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch | |
parent | 1a41b88803366fdd8eaf773c4a10e41a0e8947db (diff) | |
download | upstream-fc0fd5473895b70497c0f043d16f7fe812677f1f.tar.gz upstream-fc0fd5473895b70497c0f043d16f7fe812677f1f.tar.bz2 upstream-fc0fd5473895b70497c0f043d16f7fe812677f1f.zip |
kernel: bump 5.4 to 5.4.123
Removed because in upstream
generic/pending-5.4/770-02-net-ethernet-mtk_eth_soc-fix-rx-vlan-offload.patch
All others updated automatically.
Runtime-tested on bcm27xx/bcm2711.
Fixes: FS#3085
Signed-off-by: Kuan-Yi Li <kyli@abysm.org>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch b/target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch index a20909f317..85a4478cd8 100644 --- a/target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch +++ b/target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch @@ -63,7 +63,7 @@ Signed-off-by: Roy Pledge <roy.pledge@nxp.com> * address space as memory. Needed when the kernel wants to execute --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c -@@ -312,6 +312,13 @@ static struct mem_type mem_types[] __ro_ +@@ -314,6 +314,13 @@ static struct mem_type mem_types[] __ro_ .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE, .domain = DOMAIN_KERNEL, }, @@ -77,7 +77,7 @@ Signed-off-by: Roy Pledge <roy.pledge@nxp.com> [MT_ROM] = { .prot_sect = PMD_TYPE_SECT, .domain = DOMAIN_KERNEL, -@@ -648,6 +655,7 @@ static void __init build_mem_type_table( +@@ -650,6 +657,7 @@ static void __init build_mem_type_table( } kern_pgprot |= PTE_EXT_AF; vecs_pgprot |= PTE_EXT_AF; @@ -85,7 +85,7 @@ Signed-off-by: Roy Pledge <roy.pledge@nxp.com> /* * Set PXN for user mappings -@@ -676,6 +684,7 @@ static void __init build_mem_type_table( +@@ -678,6 +686,7 @@ static void __init build_mem_type_table( mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot; mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd; mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot; |