The following commit has been merged into the core/headers branch of tip: Commit-ID: cb28909525acdd1a89c5b2de761eaf2f788c0057 Gitweb: https://git.kernel.org/tip/cb28909525acdd1a89c5b2de761eaf2f788c0057 Author: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> AuthorDate: Tue, 26 Nov 2019 08:54:15 -08:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Tue, 10 Dec 2019 10:15:48 +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> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> Link: https://lkml.kernel.org/r/20191126165417.22423-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;
|