diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-09-30 10:55:26 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-09-30 10:55:26 -0500 |
commit | 8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (patch) | |
tree | e2baee2da7d349311c64f206a6a3dd6eb8935211 /0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch | |
parent | 430af957008fa73bd81840a407110ed7a979ae02 (diff) | |
download | kernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.tar.gz kernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.tar.xz kernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.zip |
kernel-5.9.0-0.rc7.20200930gitfb0155a09b02.21
* Wed Sep 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20200930gitfb0155a09b02.21]
- Merge ark-patches
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch')
-rw-r--r-- | 0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch b/0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch index 0b8e74fd4..6e32c19ae 100644 --- a/0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch +++ b/0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch @@ -45,7 +45,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com> 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/kernel/crash_core.c b/kernel/crash_core.c -index 106e4500fd53..0b3f738178b8 100644 +index 18175687133a..e4dfe2a05a31 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -7,6 +7,7 @@ @@ -56,7 +56,7 @@ index 106e4500fd53..0b3f738178b8 100644 #include <asm/page.h> #include <asm/sections.h> -@@ -41,6 +42,15 @@ static int __init parse_crashkernel_mem(char *cmdline, +@@ -39,6 +40,15 @@ static int __init parse_crashkernel_mem(char *cmdline, unsigned long long *crash_base) { char *cur = cmdline, *tmp; @@ -72,7 +72,7 @@ index 106e4500fd53..0b3f738178b8 100644 /* for each entry of the comma-separated list */ do { -@@ -85,13 +95,13 @@ static int __init parse_crashkernel_mem(char *cmdline, +@@ -83,13 +93,13 @@ static int __init parse_crashkernel_mem(char *cmdline, return -EINVAL; } cur = tmp; |