From 41549c847912838623ed2d7199a3a0e45a7292c7 Mon Sep 17 00:00:00 2001 From: Evgenii Shatokhin Date: Tue, 16 Jul 2019 18:43:01 +0300 Subject: [PATCH] Removed 3 patches which are likely obsolete now Namely: * revert-mm-meminit-only-set-page-reserved-in-the-memblock-re.patch * x86-increase-default-minimum-vmalloc-area-by-64MB-to-192MB.patch * block-floppy-disable-pnp-modalias.patch --- block-floppy-disable-pnp-modalias.patch | 21 --------- kernel.spec | 13 ----- ...set-page-reserved-in-the-memblock-re.patch | 47 ------------------- ...inimum-vmalloc-area-by-64MB-to-192MB.patch | 28 ----------- 4 files changed, 109 deletions(-) delete mode 100644 block-floppy-disable-pnp-modalias.patch delete mode 100644 revert-mm-meminit-only-set-page-reserved-in-the-memblock-re.patch delete mode 100644 x86-increase-default-minimum-vmalloc-area-by-64MB-to-192MB.patch diff --git a/block-floppy-disable-pnp-modalias.patch b/block-floppy-disable-pnp-modalias.patch deleted file mode 100644 index c994472..0000000 --- a/block-floppy-disable-pnp-modalias.patch +++ /dev/null @@ -1,21 +0,0 @@ - -Disable floppy autoloading as it makes systems without real hw, -but that has the pnp headers hang. - -See https://bugs.mageia.org/show_bug.cgi?id=4696 - -Signed-off-by: Thomas Backlund - -diff -Nurp linux-3.3.3-rc1/drivers/block/floppy.c.orig linux-3.3.3-rc1/drivers/block/floppy.c ---- linux-3.3.3-rc1/drivers/block/floppy.c.orig 2012-03-19 01:15:34.000000000 +0200 -+++ linux-3.3.3-rc1/drivers/block/floppy.c 2012-04-22 02:58:10.238498303 +0300 -@@ -4621,8 +4621,7 @@ static const struct pnp_device_id floppy - {"PNP0700", 0}, - {} - }; -- --MODULE_DEVICE_TABLE(pnp, floppy_pnpids); -+/* MODULE_DEVICE_TABLE(pnp, floppy_pnpids); */ - - #else - diff --git a/kernel.spec b/kernel.spec index 70fbc0a..a87bcef 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,9 +163,6 @@ Patch1: https://cdn.kernel.org/pub/linux/kernel/v%{kernelversion}.x/patch-%{k # none # ROSA-specific patches -# We need to apply this one only when building 32-bit kernels but RPM -# does not care if the patch is in an if-block, unfortunately... -Source91: revert-mm-meminit-only-set-page-reserved-in-the-memblock-re.patch # Adds explicit linking of the Perf Python extension with libdl, thus fixing # the build. @@ -184,12 +181,6 @@ Patch102: audit-make-it-less-verbose.patch # May help when building with GCC 8+. Patch105: perf-silence-format-warnings-gcc8.patch -# Increase vmalloc area, https://bugs.mageia.org/show_bug.cgi?id=904 -Patch106: x86-increase-default-minimum-vmalloc-area-by-64MB-to-192MB.patch - -# disable floppy autoloading (mga #4696) -Patch107: block-floppy-disable-pnp-modalias.patch - # AUFS from http://aufs.sourceforge.net/ Patch109: fs-aufs4.patch @@ -686,10 +677,6 @@ cd %src_dir %apply_patches -%ifarch %{ix86} -patch -p1 --fuzz=0 < %{SOURCE91} -%endif - %if %{enhanced_security} patch -p1 --fuzz=0 < %{SOURCE701} %endif diff --git a/revert-mm-meminit-only-set-page-reserved-in-the-memblock-re.patch b/revert-mm-meminit-only-set-page-reserved-in-the-memblock-re.patch deleted file mode 100644 index b7af4eb..0000000 --- a/revert-mm-meminit-only-set-page-reserved-in-the-memblock-re.patch +++ /dev/null @@ -1,47 +0,0 @@ -The following commit seems to cause problems with hibernation on 32-bit -systems: - - commit 92923ca3aacef63c92dc297a75ad0c6dfe4eab37 - Author: Nathan Zimmer - Date: Tue Jun 30 14:56:48 2015 -0700 - - mm: meminit: only set page reserved in the memblock region - -Without this commit, it takes less than 10-15 seconds on our test system -(https://linux-hardware.org/index.php?probe=e6a06c64c7) from -"systemctl hibernate" command till the system powers off. With the mainline -kernels 4.2-4.7, the system resumes OK. - -With this commit, it takes more than 2 minutes for that system to hibernate -and it usually hangs on resume. - -Let us revert the main parts of this commit in the 32-bit kernels for now. - -Signed-off-by: Evgenii Shatokhin - -diff --git a/mm/memblock.c b/mm/memblock.c -index ea31045ba704..ea4b153953aa 100644 ---- a/mm/memblock.c -+++ b/mm/memblock.c -@@ -1927,9 +1927,6 @@ static unsigned long __init free_low_memory_core_early(void) - - memblock_clear_hotplug(0, -1); - -- for_each_reserved_mem_region(i, &start, &end) -- reserve_bootmem_region(start, end); -- - /* - * We need to use NUMA_NO_NODE instead of NODE_DATA(0)->node_id - * because in some case like Node0 doesn't have RAM installed -diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 20dd3283bb1b..dedd1d869762 100644 ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -1222,6 +1222,7 @@ static void __meminit __init_single_page(struct page *page, unsigned long pfn, - page_mapcount_reset(page); - page_cpupid_reset_last(page); - page_kasan_tag_reset(page); -+ SetPageReserved(page); - - INIT_LIST_HEAD(&page->lru); - #ifdef WANT_PAGE_VIRTUAL diff --git a/x86-increase-default-minimum-vmalloc-area-by-64MB-to-192MB.patch b/x86-increase-default-minimum-vmalloc-area-by-64MB-to-192MB.patch deleted file mode 100644 index 05d57ee..0000000 --- a/x86-increase-default-minimum-vmalloc-area-by-64MB-to-192MB.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2db91ae7c0862bc83c1fe8b8bd14b8de3e2c02b8 Mon Sep 17 00:00:00 2001 -From: Anssi Hannula -Date: Sat, 30 Apr 2011 17:09:04 +0300 -Subject: [PATCH] x86: increase default minimum vmalloc area by 64MB to 192MB - -This fixes issues like https://bugs.mageia.org/show_bug.cgi?id=904. - -Signed-off-by: Anssi Hannula ---- - arch/x86/mm/pgtable_32.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c -index cac7184..5801fb7 100644 ---- a/arch/x86/mm/pgtable_32.c -+++ b/arch/x86/mm/pgtable_32.c -@@ -19,7 +19,7 @@ - #include - #include - --unsigned int __VMALLOC_RESERVE = 128 << 20; -+unsigned int __VMALLOC_RESERVE = 192 << 20; - - /* - * Associate a virtual page frame with a given physical page frame --- -1.7.3 -