mirror of
https://abf.rosa.ru/djam/kernel-6.1.git
synced 2025-02-25 00:02:55 +00:00
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
This commit is contained in:
Evgenii Shatokhin
parent
4b4eb0976c
commit
41549c8479
4 changed files with 0 additions and 109 deletions
|
|
@ -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 <tmb@mageia.org>
|
||||
|
||||
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
|
||||
|
||||
13
kernel.spec
13
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
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
The following commit seems to cause problems with hibernation on 32-bit
|
||||
systems:
|
||||
|
||||
commit 92923ca3aacef63c92dc297a75ad0c6dfe4eab37
|
||||
Author: Nathan Zimmer <nzimmer@sgi.com>
|
||||
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 <eugene.shatokhin@rosalab.ru>
|
||||
|
||||
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
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
From 2db91ae7c0862bc83c1fe8b8bd14b8de3e2c02b8 Mon Sep 17 00:00:00 2001
|
||||
From: Anssi Hannula <anssi.hannula@iki.fi>
|
||||
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 <anssi.hannula@iki.fi>
|
||||
---
|
||||
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 <asm/tlbflush.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
-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
|
||||
|
||||
Loading…
Add table
Reference in a new issue