diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-12-12 17:39:11 -0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-12-12 17:39:11 -0800 |
| commit | fc0fbad122a7609d785ee754c2b6e1e3265547d0 (patch) | |
| tree | 08bd3249feb7c54f151a99a24a08398f3eb8e9f5 /arch/mips/loongson64/reset.c | |
| parent | e52ec6a2db2e01e6a8cdfbe4fee1f89f57cdf723 (diff) | |
| parent | 4376807bf2d5371c3e00080c972be568c3f8a7d1 (diff) | |
merge mm-hotfixes-stable into mm-nonmm-stable to pick up depended-upon changes
Diffstat (limited to 'arch/mips/loongson64/reset.c')
| -rw-r--r-- | arch/mips/loongson64/reset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/loongson64/reset.c b/arch/mips/loongson64/reset.c index e420800043b0..e01c8d4a805a 100644 --- a/arch/mips/loongson64/reset.c +++ b/arch/mips/loongson64/reset.c @@ -53,7 +53,7 @@ static void loongson_halt(void) } } -#ifdef CONFIG_KEXEC +#ifdef CONFIG_KEXEC_CORE /* 0X80000000~0X80200000 is safe */ #define MAX_ARGS 64 @@ -158,7 +158,7 @@ static int __init mips_reboot_setup(void) _machine_halt = loongson_halt; pm_power_off = loongson_poweroff; -#ifdef CONFIG_KEXEC +#ifdef CONFIG_KEXEC_CORE kexec_argv = kmalloc(KEXEC_ARGV_SIZE, GFP_KERNEL); if (WARN_ON(!kexec_argv)) return -ENOMEM; |