diff options
| -rw-r--r-- | arch/x86/kernel/setup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 3d872a527cd9..daf7c5650c18 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -71,6 +71,7 @@ | |||
| 71 | #include <linux/tboot.h> | 71 | #include <linux/tboot.h> |
| 72 | #include <linux/jiffies.h> | 72 | #include <linux/jiffies.h> |
| 73 | #include <linux/mem_encrypt.h> | 73 | #include <linux/mem_encrypt.h> |
| 74 | #include <linux/sizes.h> | ||
| 74 | 75 | ||
| 75 | #include <linux/usb/xhci-dbgp.h> | 76 | #include <linux/usb/xhci-dbgp.h> |
| 76 | #include <video/edid.h> | 77 | #include <video/edid.h> |
| @@ -448,18 +449,17 @@ static void __init memblock_x86_reserve_range_setup_data(void) | |||
| 448 | #ifdef CONFIG_KEXEC_CORE | 449 | #ifdef CONFIG_KEXEC_CORE |
| 449 | 450 | ||
| 450 | /* 16M alignment for crash kernel regions */ | 451 | /* 16M alignment for crash kernel regions */ |
| 451 | #define CRASH_ALIGN (16 << 20) | 452 | #define CRASH_ALIGN SZ_16M |
| 452 | 453 | ||
| 453 | /* | 454 | /* |
| 454 | * Keep the crash kernel below this limit. On 32 bits earlier kernels | 455 | * Keep the crash kernel below this limit. On 32 bits earlier kernels |
| 455 | * would limit the kernel to the low 512 MiB due to mapping restrictions. | 456 | * would limit the kernel to the low 512 MiB due to mapping restrictions. |
| 456 | * On 64bit, old kexec-tools need to under 896MiB. | ||
| 457 | */ | 457 | */ |
| 458 | #ifdef CONFIG_X86_32 | 458 | #ifdef CONFIG_X86_32 |
| 459 | # define CRASH_ADDR_LOW_MAX (512 << 20) | 459 | # define CRASH_ADDR_LOW_MAX SZ_512M |
| 460 | # define CRASH_ADDR_HIGH_MAX (512 << 20) | 460 | # define CRASH_ADDR_HIGH_MAX SZ_512M |
| 461 | #else | 461 | #else |
| 462 | # define CRASH_ADDR_LOW_MAX (896UL << 20) | 462 | # define CRASH_ADDR_LOW_MAX SZ_4G |
| 463 | # define CRASH_ADDR_HIGH_MAX MAXMEM | 463 | # define CRASH_ADDR_HIGH_MAX MAXMEM |
| 464 | #endif | 464 | #endif |
| 465 | 465 | ||
