The following commit has been merged into the x86/core branch of tip:
Commit-ID: 9220aa8a6779b586ef11bcd5473d103f7cf60756
Gitweb: https://git.kernel.org/tip/9220aa8a6779b586ef11bcd5473d103f7cf60756
Author: Xin Li (Intel) <xin@zytor.com>
AuthorDate: Mon, 12 May 2025 01:45:50 -07:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Sun, 18 May 2025 08:39:09 +02:00
x86/msr: Remove a superfluous inclusion of <asm/asm.h>
The following commit:
efef7f184f2e ("x86/msr: Add explicit includes of <asm/msr.h>")
added a superfluous inclusion of <asm/asm.h> to
drivers/acpi/processor_throttling.c.
Remove it.
Fixes: efef7f184f2e ("x86/msr: Add explicit includes of <asm/msr.h>")
Signed-off-by: Xin Li (Intel) <xin@zytor.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Link: https://lore.kernel.org/r/20250512084552.1586883-2-xin@zytor.com
---
drivers/acpi/processor_throttling.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index ecd7fe2..d1541a3 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -21,7 +21,6 @@
#include <linux/uaccess.h>
#include <acpi/processor.h>
#include <asm/io.h>
-#include <asm/asm.h>
#ifdef CONFIG_X86
#include <asm/msr.h>
#endif