diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
| commit | f05c02032c007399078784ea2ace322385f869b9 (patch) | |
| tree | 7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch | |
| parent | 55576abe986db86a9f4e2b105d2451800d652217 (diff) | |
| parent | f7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff) | |
| download | kernel-f05c02032c007399078784ea2ace322385f869b9.tar.gz kernel-f05c02032c007399078784ea2ace322385f869b9.tar.xz kernel-f05c02032c007399078784ea2ace322385f869b9.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
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 26576a04e..07597769e 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 9f1557b98468..d631d22089ba 100644 +index 106e4500fd53..0b3f738178b8 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -7,6 +7,7 @@ @@ -56,7 +56,7 @@ index 9f1557b98468..d631d22089ba 100644 #include <asm/page.h> #include <asm/sections.h> -@@ -39,6 +40,15 @@ static int __init parse_crashkernel_mem(char *cmdline, +@@ -41,6 +42,15 @@ static int __init parse_crashkernel_mem(char *cmdline, unsigned long long *crash_base) { char *cur = cmdline, *tmp; @@ -72,7 +72,7 @@ index 9f1557b98468..d631d22089ba 100644 /* for each entry of the comma-separated list */ do { -@@ -83,13 +93,13 @@ static int __init parse_crashkernel_mem(char *cmdline, +@@ -85,13 +95,13 @@ static int __init parse_crashkernel_mem(char *cmdline, return -EINVAL; } cur = tmp; |