diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-01-02 10:41:38 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-01-02 10:41:38 +0100 |
| commit | 67a1723344cfe05430977483d6d3c7a999480143 (patch) | |
| tree | f27e4398049f485c3fa44322e4f3ddde10796f8c /arch/mips/loongson64/reset.c | |
| parent | a51749ab34d9e5dec548fe38ede7e01e8bb26454 (diff) | |
| parent | 610a9b8f49fbcf1100716370d3b5f6f884a2835a (diff) | |
Merge tag 'v6.7-rc8' into locking/core, to pick up dependent changes
Pick up these commits from Linus's tree:
b106bcf0f99a ("locking/osq_lock: Clarify osq_wait_next()")
563adbfc351b ("locking/osq_lock: Clarify osq_wait_next() calling convention")
7c2230982129 ("locking/osq_lock: Move the definition of optimistic_spin_node into osq_lock.c")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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; |