The following commit has been merged into the core/headers branch of tip: Commit-ID: 25466d56fbadb785a1342aae4b2147ea1781d55a Gitweb: https://git.kernel.org/tip/25466d56fbadb785a1342aae4b2147ea1781d55a Author: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> AuthorDate: Mon, 18 Nov 2019 16:21:19 -08:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Tue, 19 Nov 2019 17:50:27 +01:00 x86/ACPI/sleep: Remove an unnecessary include of asm/realmode.h None of the declarations in x86's acpi/sleep.h are in any way dependent on the real mode boot code. Remove sleep.h's include of asm/realmode.h to limit the dependencies on realmode.h to code that actually interacts with the boot code. Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> Cc: Borislav Petkov <bp@xxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20191119002121.4107-11-sean.j.christopherson@xxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- arch/x86/kernel/acpi/sleep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/acpi/sleep.h b/arch/x86/kernel/acpi/sleep.h index fbb60ca..d06c207 100644 --- a/arch/x86/kernel/acpi/sleep.h +++ b/arch/x86/kernel/acpi/sleep.h @@ -3,7 +3,7 @@ * Variables and functions used by the code in sleep.c */ -#include <asm/realmode.h> +#include <linux/linkage.h> extern unsigned long saved_video_mode; extern long saved_magic;
|