| Message ID | 20191119002121.4107-11-sean.j.christopherson@intel.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | treewide: break dependencies on x86's RM header | expand |
On Tuesday, November 19, 2019 1:21:19 AM CET Sean Christopherson wrote: > 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. > > Fixes: c9b77ccb52a5c ("x86, realmode: Move ACPI wakeup to unified realmode code") > Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > 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 fbb60ca4255c..d06c2079b6c1 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; >
diff --git a/arch/x86/kernel/acpi/sleep.h b/arch/x86/kernel/acpi/sleep.h index fbb60ca4255c..d06c2079b6c1 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;
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. Fixes: c9b77ccb52a5c ("x86, realmode: Move ACPI wakeup to unified realmode code") Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> --- arch/x86/kernel/acpi/sleep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)