diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
| commit | e5237f62c21f764ed70f1abcea884b15f30ca984 (patch) | |
| tree | 30612d7f7dcef570d7f4f5dabbec7d246b6da140 /0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch | |
| parent | e3fcce771836f3bf4ad59b6beed900b3e9a25ea0 (diff) | |
| parent | 8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (diff) | |
| download | kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.gz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.xz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc7.20200930gitfb0155a09b02.22.vanilla.1.fc32
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; |