diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-12-20 14:47:18 -0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-12-20 14:47:18 -0800 |
| commit | a721aeac8bc2cade37e68ea195f28d2ed28c1130 (patch) | |
| tree | 34da931ad1d0d715c4fde89d19af67780e40a6aa /arch/x86/boot/compressed/acpi.c | |
| parent | d9d9bd979cced7d4a51b65224b1d7f396c8b4eea (diff) | |
| parent | 1803d0c5ee1a3bbee23db2336e21add067824f02 (diff) | |
| download | linux-a721aeac8bc2cade37e68ea195f28d2ed28c1130.tar.gz linux-a721aeac8bc2cade37e68ea195f28d2ed28c1130.tar.bz2 linux-a721aeac8bc2cade37e68ea195f28d2ed28c1130.zip | |
sync mm-stable with mm-hotfixes-stable to pick up depended-upon changes
Diffstat (limited to 'arch/x86/boot/compressed/acpi.c')
| -rw-r--r-- | arch/x86/boot/compressed/acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c index 55c98fdd67d2..18d15d1ce87d 100644 --- a/arch/x86/boot/compressed/acpi.c +++ b/arch/x86/boot/compressed/acpi.c @@ -178,7 +178,7 @@ static unsigned long get_cmdline_acpi_rsdp(void) { unsigned long addr = 0; -#ifdef CONFIG_KEXEC +#ifdef CONFIG_KEXEC_CORE char val[MAX_ADDR_LEN] = { }; int ret; |