diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 20:59:56 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 20:59:56 +0200 |
commit | 7b32641801900ee7e32065b436d7318c5d7a972e (patch) | |
tree | 7e1f1ffca46787c5ba55af0a2fc9767f9c6e5594 /0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch | |
parent | 506260a3258dfcbd81c9c8b2f051b9c515ad6071 (diff) | |
parent | 61b5e2fd06a4be7134afb1cd363002e015123f7f (diff) | |
download | kernel-7b32641801900ee7e32065b436d7318c5d7a972e.tar.gz kernel-7b32641801900ee7e32065b436d7318c5d7a972e.tar.xz kernel-7b32641801900ee7e32065b436d7318c5d7a972e.zip |
merge originkernel-5.8.0-0.rc3.1.vanilla.1.fc33kernel-5.8.0-0.rc3.1.vanilla.1.fc32kernel-5.8.0-0.rc3.1.vanilla.1.fc31
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 | 8 |
1 files changed, 4 insertions, 4 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..e5f448f7f 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 @@ -53,7 +53,7 @@ index 9f1557b98468..d631d22089ba 100644 #include <linux/utsname.h> #include <linux/vmalloc.h> +#include <linux/sizes.h> - + #include <asm/page.h> #include <asm/sections.h> @@ -39,6 +40,15 @@ static int __init parse_crashkernel_mem(char *cmdline, @@ -69,7 +69,7 @@ index 9f1557b98468..d631d22089ba 100644 + * enough for most test cases. + */ + total_mem = roundup(total_mem, SZ_128M); - + /* for each entry of the comma-separated list */ do { @@ -83,13 +93,13 @@ static int __init parse_crashkernel_mem(char *cmdline, @@ -81,7 +81,7 @@ index 9f1557b98468..d631d22089ba 100644 pr_warn("crashkernel: invalid size\n"); return -EINVAL; } - + /* match ? */ - if (system_ram >= start && system_ram < end) { + if (total_mem >= start && total_mem < end) { @@ -89,5 +89,5 @@ index 9f1557b98468..d631d22089ba 100644 break; } -- -2.26.2 +2.25.4 |