Skip to content

Commit a62aa88

Browse files
committed
Merge tag 'mm-hotfixes-stable-2023-12-15-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull misc fixes from Andrew Morton: "17 hotfixes. 8 are cc:stable and the other 9 pertain to post-6.6 issues" * tag 'mm-hotfixes-stable-2023-12-15-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: mm/mglru: reclaim offlined memcgs harder mm/mglru: respect min_ttl_ms with memcgs mm/mglru: try to stop at high watermarks mm/mglru: fix underprotected page cache mm/shmem: fix race in shmem_undo_range w/THP Revert "selftests: error out if kernel header files are not yet built" crash_core: fix the check for whether crashkernel is from high memory x86, kexec: fix the wrong ifdeffery CONFIG_KEXEC sh, kexec: fix the incorrect ifdeffery and dependency of CONFIG_KEXEC mips, kexec: fix the incorrect ifdeffery and dependency of CONFIG_KEXEC m68k, kexec: fix the incorrect ifdeffery and build dependency of CONFIG_KEXEC loongarch, kexec: change dependency of object files mm/damon/core: make damon_start() waits until kdamond_fn() starts selftests/mm: cow: print ksft header before printing anything else mm: fix VMA heap bounds checking riscv: fix VMALLOC_START definition kexec: drop dependency on ARCH_SUPPORTS_KEXEC from CRASH_DUMP
2 parents 26e7a30 + 4376807 commit a62aa88

33 files changed

Lines changed: 171 additions & 158 deletions

File tree

arch/loongarch/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
5757

5858
obj-$(CONFIG_RELOCATABLE) += relocate.o
5959

60-
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
60+
obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o relocate_kernel.o
6161
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
6262

6363
obj-$(CONFIG_UNWINDER_GUESS) += unwind_guess.o

arch/m68k/include/asm/kexec.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#ifndef _ASM_M68K_KEXEC_H
33
#define _ASM_M68K_KEXEC_H
44

5-
#ifdef CONFIG_KEXEC
5+
#ifdef CONFIG_KEXEC_CORE
66

77
/* Maximum physical address we can use pages from */
88
#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
@@ -25,6 +25,6 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
2525

2626
#endif /* __ASSEMBLY__ */
2727

28-
#endif /* CONFIG_KEXEC */
28+
#endif /* CONFIG_KEXEC_CORE */
2929

3030
#endif /* _ASM_M68K_KEXEC_H */

arch/m68k/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ obj-$(CONFIG_PCI) += pcibios.o
2525

2626
obj-$(CONFIG_M68K_NONCOHERENT_DMA) += dma.o
2727

28-
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
28+
obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o relocate_kernel.o
2929
obj-$(CONFIG_BOOTINFO_PROC) += bootinfo_proc.o
3030
obj-$(CONFIG_UBOOT) += uboot.o
3131

arch/mips/cavium-octeon/smp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ static const struct plat_smp_ops octeon_smp_ops = {
422422
.cpu_disable = octeon_cpu_disable,
423423
.cpu_die = octeon_cpu_die,
424424
#endif
425-
#ifdef CONFIG_KEXEC
425+
#ifdef CONFIG_KEXEC_CORE
426426
.kexec_nonboot_cpu = kexec_nonboot_cpu_jump,
427427
#endif
428428
};
@@ -502,7 +502,7 @@ static const struct plat_smp_ops octeon_78xx_smp_ops = {
502502
.cpu_disable = octeon_cpu_disable,
503503
.cpu_die = octeon_cpu_die,
504504
#endif
505-
#ifdef CONFIG_KEXEC
505+
#ifdef CONFIG_KEXEC_CORE
506506
.kexec_nonboot_cpu = kexec_nonboot_cpu_jump,
507507
#endif
508508
};

arch/mips/include/asm/kexec.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
3131
prepare_frametrace(newregs);
3232
}
3333

34-
#ifdef CONFIG_KEXEC
34+
#ifdef CONFIG_KEXEC_CORE
3535
struct kimage;
3636
extern unsigned long kexec_args[4];
3737
extern int (*_machine_kexec_prepare)(struct kimage *);

arch/mips/include/asm/smp-ops.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ struct plat_smp_ops {
3535
void (*cpu_die)(unsigned int cpu);
3636
void (*cleanup_dead_cpu)(unsigned cpu);
3737
#endif
38-
#ifdef CONFIG_KEXEC
38+
#ifdef CONFIG_KEXEC_CORE
3939
void (*kexec_nonboot_cpu)(void);
4040
#endif
4141
};

arch/mips/include/asm/smp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ static inline void __cpu_die(unsigned int cpu)
9393
extern void __noreturn play_dead(void);
9494
#endif
9595

96-
#ifdef CONFIG_KEXEC
96+
#ifdef CONFIG_KEXEC_CORE
9797
static inline void kexec_nonboot_cpu(void)
9898
{
9999
extern const struct plat_smp_ops *mp_ops; /* private */

arch/mips/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ obj-$(CONFIG_GPIO_TXX9) += gpio_txx9.o
9090

9191
obj-$(CONFIG_RELOCATABLE) += relocate.o
9292

93-
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o
93+
obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o relocate_kernel.o crash.o
9494
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
9595
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
9696
obj-$(CONFIG_EARLY_PRINTK_8250) += early_printk_8250.o

arch/mips/kernel/smp-bmips.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ const struct plat_smp_ops bmips43xx_smp_ops = {
434434
.cpu_disable = bmips_cpu_disable,
435435
.cpu_die = bmips_cpu_die,
436436
#endif
437-
#ifdef CONFIG_KEXEC
437+
#ifdef CONFIG_KEXEC_CORE
438438
.kexec_nonboot_cpu = kexec_nonboot_cpu_jump,
439439
#endif
440440
};
@@ -451,7 +451,7 @@ const struct plat_smp_ops bmips5000_smp_ops = {
451451
.cpu_disable = bmips_cpu_disable,
452452
.cpu_die = bmips_cpu_die,
453453
#endif
454-
#ifdef CONFIG_KEXEC
454+
#ifdef CONFIG_KEXEC_CORE
455455
.kexec_nonboot_cpu = kexec_nonboot_cpu_jump,
456456
#endif
457457
};

arch/mips/kernel/smp-cps.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ static void cps_smp_finish(void)
392392
local_irq_enable();
393393
}
394394

395-
#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_KEXEC)
395+
#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_KEXEC_CORE)
396396

397397
enum cpu_death {
398398
CPU_DEATH_HALT,
@@ -429,7 +429,7 @@ static void cps_shutdown_this_cpu(enum cpu_death death)
429429
}
430430
}
431431

432-
#ifdef CONFIG_KEXEC
432+
#ifdef CONFIG_KEXEC_CORE
433433

434434
static void cps_kexec_nonboot_cpu(void)
435435
{
@@ -439,9 +439,9 @@ static void cps_kexec_nonboot_cpu(void)
439439
cps_shutdown_this_cpu(CPU_DEATH_POWER);
440440
}
441441

442-
#endif /* CONFIG_KEXEC */
442+
#endif /* CONFIG_KEXEC_CORE */
443443

444-
#endif /* CONFIG_HOTPLUG_CPU || CONFIG_KEXEC */
444+
#endif /* CONFIG_HOTPLUG_CPU || CONFIG_KEXEC_CORE */
445445

446446
#ifdef CONFIG_HOTPLUG_CPU
447447

@@ -610,7 +610,7 @@ static const struct plat_smp_ops cps_smp_ops = {
610610
.cpu_die = cps_cpu_die,
611611
.cleanup_dead_cpu = cps_cleanup_dead_cpu,
612612
#endif
613-
#ifdef CONFIG_KEXEC
613+
#ifdef CONFIG_KEXEC_CORE
614614
.kexec_nonboot_cpu = cps_kexec_nonboot_cpu,
615615
#endif
616616
};

0 commit comments

Comments
 (0)