mirror of
https://github.com/armbian/build.git
synced 2025-08-15 23:56:57 +02:00
228 lines
7.1 KiB
Diff
228 lines
7.1 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 4c0dd62e02e465..9476e4502bbb0b 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,7 +1,7 @@
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
VERSION = 6
|
|
PATCHLEVEL = 6
|
|
-SUBLEVEL = 70
|
|
+SUBLEVEL = 71
|
|
EXTRAVERSION =
|
|
NAME = Pinguïn Aangedreven
|
|
|
|
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
|
|
index 15fc9fc3dcf052..3269a0e23d3ab8 100644
|
|
--- a/arch/x86/kernel/Makefile
|
|
+++ b/arch/x86/kernel/Makefile
|
|
@@ -99,9 +99,9 @@ obj-$(CONFIG_TRACING) += trace.o
|
|
obj-$(CONFIG_RETHOOK) += rethook.o
|
|
obj-$(CONFIG_CRASH_CORE) += crash_core_$(BITS).o
|
|
obj-$(CONFIG_KEXEC_CORE) += machine_kexec_$(BITS).o
|
|
-obj-$(CONFIG_KEXEC_CORE) += relocate_kernel_$(BITS).o
|
|
+obj-$(CONFIG_KEXEC_CORE) += relocate_kernel_$(BITS).o crash.o
|
|
obj-$(CONFIG_KEXEC_FILE) += kexec-bzimage64.o
|
|
-obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o crash.o
|
|
+obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o
|
|
obj-y += kprobes/
|
|
obj-$(CONFIG_MODULES) += module.o
|
|
obj-$(CONFIG_X86_32) += doublefault_32.o
|
|
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
|
|
index 6328cf56e59be2..5ae77d966cafea 100644
|
|
--- a/arch/x86/kernel/cpu/mshyperv.c
|
|
+++ b/arch/x86/kernel/cpu/mshyperv.c
|
|
@@ -209,9 +209,7 @@ static void hv_machine_shutdown(void)
|
|
if (kexec_in_progress)
|
|
hyperv_cleanup();
|
|
}
|
|
-#endif /* CONFIG_KEXEC_CORE */
|
|
|
|
-#ifdef CONFIG_CRASH_DUMP
|
|
static void hv_machine_crash_shutdown(struct pt_regs *regs)
|
|
{
|
|
if (hv_crash_handler)
|
|
@@ -223,7 +221,7 @@ static void hv_machine_crash_shutdown(struct pt_regs *regs)
|
|
/* Disable the hypercall page when there is only 1 active CPU. */
|
|
hyperv_cleanup();
|
|
}
|
|
-#endif /* CONFIG_CRASH_DUMP */
|
|
+#endif /* CONFIG_KEXEC_CORE */
|
|
|
|
static u64 hv_ref_counter_at_suspend;
|
|
static void (*old_save_sched_clock_state)(void);
|
|
@@ -552,13 +550,9 @@ static void __init ms_hyperv_init_platform(void)
|
|
no_timer_check = 1;
|
|
#endif
|
|
|
|
-#if IS_ENABLED(CONFIG_HYPERV)
|
|
-#if defined(CONFIG_KEXEC_CORE)
|
|
+#if IS_ENABLED(CONFIG_HYPERV) && defined(CONFIG_KEXEC_CORE)
|
|
machine_ops.shutdown = hv_machine_shutdown;
|
|
-#endif
|
|
-#if defined(CONFIG_CRASH_DUMP)
|
|
machine_ops.crash_shutdown = hv_machine_crash_shutdown;
|
|
-#endif
|
|
#endif
|
|
if (ms_hyperv.features & HV_ACCESS_TSC_INVARIANT) {
|
|
/*
|
|
diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
|
|
index 0de509c02d18b9..a61c12c0127097 100644
|
|
--- a/arch/x86/kernel/kexec-bzimage64.c
|
|
+++ b/arch/x86/kernel/kexec-bzimage64.c
|
|
@@ -263,13 +263,11 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params,
|
|
memset(¶ms->hd0_info, 0, sizeof(params->hd0_info));
|
|
memset(¶ms->hd1_info, 0, sizeof(params->hd1_info));
|
|
|
|
-#ifdef CONFIG_CRASH_DUMP
|
|
if (image->type == KEXEC_TYPE_CRASH) {
|
|
ret = crash_setup_memmap_entries(image, params);
|
|
if (ret)
|
|
return ret;
|
|
} else
|
|
-#endif
|
|
setup_e820_entries(params);
|
|
|
|
nr_e820_entries = params->e820_entries;
|
|
@@ -430,14 +428,12 @@ static void *bzImage64_load(struct kimage *image, char *kernel,
|
|
return ERR_PTR(-EINVAL);
|
|
}
|
|
|
|
-#ifdef CONFIG_CRASH_DUMP
|
|
/* Allocate and load backup region */
|
|
if (image->type == KEXEC_TYPE_CRASH) {
|
|
ret = crash_load_segments(image);
|
|
if (ret)
|
|
return ERR_PTR(ret);
|
|
}
|
|
-#endif
|
|
|
|
/*
|
|
* Load purgatory. For 64bit entry point, purgatory code can be
|
|
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
|
|
index 38d88c8b56ec07..b8ab9ee5896c19 100644
|
|
--- a/arch/x86/kernel/kvm.c
|
|
+++ b/arch/x86/kernel/kvm.c
|
|
@@ -769,7 +769,7 @@ static struct notifier_block kvm_pv_reboot_nb = {
|
|
* won't be valid. In cases like kexec, in which you install a new kernel, this
|
|
* means a random memory location will be kept being written.
|
|
*/
|
|
-#ifdef CONFIG_CRASH_DUMP
|
|
+#ifdef CONFIG_KEXEC_CORE
|
|
static void kvm_crash_shutdown(struct pt_regs *regs)
|
|
{
|
|
kvm_guest_cpu_offline(true);
|
|
@@ -852,7 +852,7 @@ static void __init kvm_guest_init(void)
|
|
kvm_guest_cpu_init();
|
|
#endif
|
|
|
|
-#ifdef CONFIG_CRASH_DUMP
|
|
+#ifdef CONFIG_KEXEC_CORE
|
|
machine_ops.crash_shutdown = kvm_crash_shutdown;
|
|
#endif
|
|
|
|
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
|
|
index aaeac2deb85dc6..2fa12d1dc67602 100644
|
|
--- a/arch/x86/kernel/machine_kexec_64.c
|
|
+++ b/arch/x86/kernel/machine_kexec_64.c
|
|
@@ -545,8 +545,6 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image)
|
|
}
|
|
#endif /* CONFIG_KEXEC_FILE */
|
|
|
|
-#ifdef CONFIG_CRASH_DUMP
|
|
-
|
|
static int
|
|
kexec_mark_range(unsigned long start, unsigned long end, bool protect)
|
|
{
|
|
@@ -591,7 +589,6 @@ void arch_kexec_unprotect_crashkres(void)
|
|
{
|
|
kexec_mark_crashkres(false);
|
|
}
|
|
-#endif
|
|
|
|
/*
|
|
* During a traditional boot under SME, SME will encrypt the kernel,
|
|
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
|
|
index f3130f762784a1..830425e6d38e2f 100644
|
|
--- a/arch/x86/kernel/reboot.c
|
|
+++ b/arch/x86/kernel/reboot.c
|
|
@@ -796,7 +796,7 @@ struct machine_ops machine_ops __ro_after_init = {
|
|
.emergency_restart = native_machine_emergency_restart,
|
|
.restart = native_machine_restart,
|
|
.halt = native_machine_halt,
|
|
-#ifdef CONFIG_CRASH_DUMP
|
|
+#ifdef CONFIG_KEXEC_CORE
|
|
.crash_shutdown = native_machine_crash_shutdown,
|
|
#endif
|
|
};
|
|
@@ -826,7 +826,7 @@ void machine_halt(void)
|
|
machine_ops.halt();
|
|
}
|
|
|
|
-#ifdef CONFIG_CRASH_DUMP
|
|
+#ifdef CONFIG_KEXEC_CORE
|
|
void machine_crash_shutdown(struct pt_regs *regs)
|
|
{
|
|
machine_ops.crash_shutdown(regs);
|
|
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
|
|
index 8bcecabd475bdf..eb129277dcdd64 100644
|
|
--- a/arch/x86/kernel/setup.c
|
|
+++ b/arch/x86/kernel/setup.c
|
|
@@ -547,7 +547,7 @@ static void __init reserve_crashkernel(void)
|
|
bool high = false;
|
|
int ret;
|
|
|
|
- if (!IS_ENABLED(CONFIG_CRASH_RESERVE))
|
|
+ if (!IS_ENABLED(CONFIG_KEXEC_CORE))
|
|
return;
|
|
|
|
total_mem = memblock_phys_mem_size();
|
|
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
|
|
index 52c3823b721191..96a771f9f930a6 100644
|
|
--- a/arch/x86/kernel/smp.c
|
|
+++ b/arch/x86/kernel/smp.c
|
|
@@ -282,7 +282,7 @@ struct smp_ops smp_ops = {
|
|
.smp_cpus_done = native_smp_cpus_done,
|
|
|
|
.stop_other_cpus = native_stop_other_cpus,
|
|
-#if defined(CONFIG_CRASH_DUMP)
|
|
+#if defined(CONFIG_KEXEC_CORE)
|
|
.crash_stop_other_cpus = kdump_nmi_shootdown_cpus,
|
|
#endif
|
|
.smp_send_reschedule = native_smp_send_reschedule,
|
|
diff --git a/arch/x86/xen/enlighten_hvm.c b/arch/x86/xen/enlighten_hvm.c
|
|
index ade22feee7aeb1..70be57e8f51caa 100644
|
|
--- a/arch/x86/xen/enlighten_hvm.c
|
|
+++ b/arch/x86/xen/enlighten_hvm.c
|
|
@@ -141,9 +141,7 @@ static void xen_hvm_shutdown(void)
|
|
if (kexec_in_progress)
|
|
xen_reboot(SHUTDOWN_soft_reset);
|
|
}
|
|
-#endif
|
|
|
|
-#ifdef CONFIG_CRASH_DUMP
|
|
static void xen_hvm_crash_shutdown(struct pt_regs *regs)
|
|
{
|
|
native_machine_crash_shutdown(regs);
|
|
@@ -231,8 +229,6 @@ static void __init xen_hvm_guest_init(void)
|
|
|
|
#ifdef CONFIG_KEXEC_CORE
|
|
machine_ops.shutdown = xen_hvm_shutdown;
|
|
-#endif
|
|
-#ifdef CONFIG_CRASH_DUMP
|
|
machine_ops.crash_shutdown = xen_hvm_crash_shutdown;
|
|
#endif
|
|
}
|
|
diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c
|
|
index bfd57d07f4b5ee..6b201e64d8abc8 100644
|
|
--- a/arch/x86/xen/mmu_pv.c
|
|
+++ b/arch/x86/xen/mmu_pv.c
|
|
@@ -2517,7 +2517,7 @@ int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr,
|
|
}
|
|
EXPORT_SYMBOL_GPL(xen_remap_pfn);
|
|
|
|
-#ifdef CONFIG_VMCORE_INFO
|
|
+#ifdef CONFIG_KEXEC_CORE
|
|
phys_addr_t paddr_vmcoreinfo_note(void)
|
|
{
|
|
if (xen_pv_domain())
|