diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 10:09:43 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 10:09:43 -0400 |
| commit | 698661c1564c0857a743a3309556c409f5e12677 (patch) | |
| tree | 09e2fa61a5c764a2f85d2236bb3910dd7796ee31 | |
| parent | 70aa95cb02a065d62faae88411df6434593c5c2d (diff) | |
| download | longterm-queue-4.12-698661c1564c0857a743a3309556c409f5e12677.tar.gz | |
arm64: remove already applied patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/arm64-Initialise-high_memory-global-variable-earlier.patch | 47 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 48 deletions
diff --git a/queue/arm64-Initialise-high_memory-global-variable-earlier.patch b/queue/arm64-Initialise-high_memory-global-variable-earlier.patch deleted file mode 100644 index 2d39215..0000000 --- a/queue/arm64-Initialise-high_memory-global-variable-earlier.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f24e5834a2c3f6c5f814a417f858226f0a010ade Mon Sep 17 00:00:00 2001 -From: Steve Capper <steve.capper@arm.com> -Date: Mon, 4 Dec 2017 14:13:05 +0000 -Subject: [PATCH] arm64: Initialise high_memory global variable earlier - -commit f24e5834a2c3f6c5f814a417f858226f0a010ade upstream. - -The high_memory global variable is used by -cma_declare_contiguous(.) before it is defined. - -We don't notice this as we compute __pa(high_memory - 1), and it looks -like we're processing a VA from the direct linear map. - -This problem becomes apparent when we flip the kernel virtual address -space and the linear map is moved to the bottom of the kernel VA space. - -This patch moves the initialisation of high_memory before it used. - -Cc: <stable@vger.kernel.org> -Fixes: f7426b983a6a ("mm: cma: adjust address limit to avoid hitting low/high memory boundary") -Signed-off-by: Steve Capper <steve.capper@arm.com> -Signed-off-by: Will Deacon <will.deacon@arm.com> - -diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index 5960bef0170d..00e7b900ca41 100644 ---- a/arch/arm64/mm/init.c -+++ b/arch/arm64/mm/init.c -@@ -476,6 +476,8 @@ void __init arm64_memblock_init(void) - - reserve_elfcorehdr(); - -+ high_memory = __va(memblock_end_of_DRAM() - 1) + 1; -+ - dma_contiguous_reserve(arm64_dma_phys_limit); - - memblock_allow_resize(); -@@ -502,7 +504,6 @@ void __init bootmem_init(void) - sparse_init(); - zone_sizes_init(min, max); - -- high_memory = __va((max << PAGE_SHIFT) - 1) + 1; - memblock_dump_all(); - } - --- -2.15.0 - diff --git a/queue/series b/queue/series index 32af363..dc3dc6e 100644 --- a/queue/series +++ b/queue/series @@ -13,7 +13,6 @@ ceph-drop-negative-child-dentries-before-try-pruning.patch usb-xhci-fix-TDS-for-MTK-xHCI1.1.patch xhci-Don-t-add-a-virt_dev-to-the-devs-array-before-i.patch nfs-don-t-wait-on-commit-in-nfs_commit_inode-if-ther.patch -arm64-Initialise-high_memory-global-variable-earlier.patch arm64-fix-CONFIG_DEBUG_WX-address-reporting.patch scsi-core-Fix-a-scsi_show_rq-NULL-pointer-dereferenc.patch dm-fix-various-targets-to-dm_register_target-after-m.patch |