drop mips-fix-mem-x-y-commandline-processing.patch from 4.9

diff --git a/queue-4.9/mips-fix-mem-x-y-commandline-processing.patch b/queue-4.9/mips-fix-mem-x-y-commandline-processing.patch
deleted file mode 100644 (file)
index e42c519..0000000
--- a/queue-4.9/mips-fix-mem-x-y-commandline-processing.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From foo@baz Thu Oct  5 10:28:31 CEST 2017
-From: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
-Date: Wed, 23 Nov 2016 14:43:49 +0100
-Subject: MIPS: fix mem=X@Y commandline processing
-
-From: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
-
-
-[ Upstream commit 73fbc1eba7ffa3bf0ad12486232a8a1edb4e4411 ]
-
-When a memory offset is specified through the commandline, add the
-memory in range PHYS_OFFSET:Y as reserved memory area.
-Otherwise the bootmem allocator is initialised with low page equal to
-min_low_pfn = PHYS_OFFSET, and in free_all_bootmem will process pages
-starting from min_low_pfn instead of PFN(Y).
-
-Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
-Cc: linux-mips@linux-mips.org
-Patchwork: https://patchwork.linux-mips.org/patch/14613/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/mips/kernel/setup.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/arch/mips/kernel/setup.c
-+++ b/arch/mips/kernel/setup.c
-@@ -589,6 +589,10 @@ static int __init early_parse_mem(char *
-               start = memparse(p + 1, &p);
- 
-       add_memory_region(start, size, BOOT_MEM_RAM);
-+
-+      if (start && start > PHYS_OFFSET)
-+              add_memory_region(PHYS_OFFSET, start - PHYS_OFFSET,
-+                              BOOT_MEM_RESERVED);
-       return 0;
- }
- early_param("mem", early_parse_mem);

diff --git a/queue-4.9/series b/queue-4.9/series
index 44a27a0a8c5ea281d9b3528e07dfae01a2e42885..bd460d6c100c1db46179d96452a66e58e0d5cdac 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -7,7 +7,6 @@ clk-sunxi-ng-fix-pll_cpux-adjusting-on-h3.patch
 rds-rdma-fix-the-composite-message-user-notification.patch
 arm-dts-r8a7790-use-r-car-gen-2-fallback-binding-for-msiof-nodes.patch
 mips-ensure-bss-section-ends-on-a-long-aligned-address.patch
-mips-fix-mem-x-y-commandline-processing.patch
 mips-kexec-do-not-reserve-invalid-crashkernel-memory-on-boot.patch
 mips-ralink-fix-a-typo-in-the-pinmux-setup.patch
 mips-ralink-fix-incorrect-assignment-on-ralink_soc.patch