Merge branch 'x86/cpu' into x86/fpu, to pick up dependent commits (4e254750) · Commits · git / linux-net

MAINTAINERS

+3 −3

Original line number	Diff line number	Diff line
		@@ -1097,7 +1097,7 @@ R: Carlos Bilbao <carlos.bilbao@kernel.org>
		L: platform-driver-x86@vger.kernel.org
		S: Maintained
		F: Documentation/arch/x86/amd_hsmp.rst
		F: arch/x86/include/asm/amd_hsmp.h
		F: arch/x86/include/asm/amd/hsmp.h
		F: arch/x86/include/uapi/asm/amd_hsmp.h
		F: drivers/platform/x86/amd/hsmp/

		@@ -1142,7 +1142,7 @@ M: Mario Limonciello <mario.limonciello@amd.com>
		M: Yazen Ghannam <yazen.ghannam@amd.com>
		L: linux-kernel@vger.kernel.org
		S: Supported
		F: arch/x86/include/asm/amd_node.h
		F: arch/x86/include/asm/amd/node.h
		F: arch/x86/kernel/amd_node.c

		AMD PDS CORE DRIVER
		@@ -26139,7 +26139,7 @@ R: Ahmed S. Darwish <darwi@linutronix.de>
		L: x86-cpuid@lists.linux.dev
		S: Maintained
		W: https://x86-cpuid.org
		F: tools/arch/x86/kcpuid/cpuid.csv
		F: tools/arch/x86/kcpuid/

		X86 ENTRY CODE
		M: Andy Lutomirski <luto@kernel.org>

+1 −1

+1 −1

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

		#ifndef _ASM_X86_AMD_HSMP_H_
		#define _ASM_X86_AMD_HSMP_H_

		@@ -13,4 +12,5 @@ static inline int hsmp_send_message(struct hsmp_message *msg)
		return -ENODEV;
		}
		#endif

		#endif /_ASM_X86_AMD_HSMP_H_/

+5 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 */
		#ifndef _ASM_X86_AMD_IBS_H
		#define _ASM_X86_AMD_IBS_H

		/*
		* From PPR Vol 1 for AMD Family 19h Model 01h B1
		* 55898 Rev 0.35 - Feb 5, 2021
		@@ -151,3 +154,5 @@ struct perf_ibs_data {
		};
		u64 regs[MSR_AMD64_IBS_REG_COUNT_MAX];
		};

		#endif /* _ASM_X86_AMD_IBS_H */

+1 −1