Commit 6bd3357b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'x86/hyperv', 'x86/kdump' and 'x86/misc' into x86/urgent, to... 


Merge branches 'x86/hyperv', 'x86/kdump' and 'x86/misc' into x86/urgent, to pick up single-commit branches

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 32ada3b9 538f127c 8757dc97 8b7e20a7

arch/x86/include/asm/hyperv-tlfs.h

+2 −1
Original line number Diff line number Diff line
@@ -809,7 +809,8 @@ union hv_synic_sint { 
		u64 reserved1:8;

		u64 masked:1;

		u64 auto_eoi:1;

		u64 reserved2:46;

		u64 polling:1;

		u64 reserved2:45;

	} __packed;

};

arch/x86/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ obj-$(CONFIG_FUNCTION_TRACER) += ftrace_$(BITS).o 
obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o

obj-$(CONFIG_FTRACE_SYSCALLS)	+= ftrace.o

obj-$(CONFIG_X86_TSC)		+= trace_clock.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 crash.o

obj-$(CONFIG_KEXEC_FILE)	+= kexec-bzimage64.o

arch/x86/kernel/crash_core_32.c

0 → 100644
+17 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only



#include <linux/crash_core.h>



#include <asm/pgtable.h>

#include <asm/setup.h>



void arch_crash_save_vmcoreinfo(void)

{

#ifdef CONFIG_NUMA

	VMCOREINFO_SYMBOL(node_data);

	VMCOREINFO_LENGTH(node_data, MAX_NUMNODES);

#endif

#ifdef CONFIG_X86_PAE

	VMCOREINFO_CONFIG(X86_PAE);

#endif

}

arch/x86/kernel/crash_core_64.c

0 → 100644
+24 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only



#include <linux/crash_core.h>



#include <asm/pgtable.h>

#include <asm/setup.h>



void arch_crash_save_vmcoreinfo(void)

{

	u64 sme_mask = sme_me_mask;



	VMCOREINFO_NUMBER(phys_base);

	VMCOREINFO_SYMBOL(init_top_pgt);

	vmcoreinfo_append_str("NUMBER(pgtable_l5_enabled)=%d\n",

			      pgtable_l5_enabled());



#ifdef CONFIG_NUMA

	VMCOREINFO_SYMBOL(node_data);

	VMCOREINFO_LENGTH(node_data, MAX_NUMNODES);

#endif

	vmcoreinfo_append_str("KERNELOFFSET=%lx\n", kaslr_offset());

	VMCOREINFO_NUMBER(KERNEL_IMAGE_SIZE);

	VMCOREINFO_NUMBER(sme_mask);

}

arch/x86/kernel/machine_kexec_32.c

+0 −12
Original line number Diff line number Diff line
@@ -250,15 +250,3 @@ void machine_kexec(struct kimage *image) 


	__ftrace_enabled_restore(save_ftrace_enabled);

}
 


void arch_crash_save_vmcoreinfo(void)

{

#ifdef CONFIG_NUMA

	VMCOREINFO_SYMBOL(node_data);

	VMCOREINFO_LENGTH(node_data, MAX_NUMNODES);

#endif

#ifdef CONFIG_X86_PAE

	VMCOREINFO_CONFIG(X86_PAE);

#endif

}