Skip to contentSkip to conversation

core/headers: Clean up x86 header interactions

GIT PULL Merged Ingo Molnar 2 participants 2 messages Jan 28, 2020

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest core-headers-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-headers-for-linus

# HEAD: 960786422fe90a86e81131f5dbd902cb5ebf8760 x86/ACPI/sleep: Move acpi_get_wakeup_address() into sleep.c, remove <asm/realmode.h> from <asm/acpi.h>

This is a treewide cleanup, mostly (but not exclusively) with x86 impact, which breaks implicit dependencies on the asm/realtime.h header and finally removes it from asm/acpi.h.

Thanks,

Ingo

------------------>
Ingo Molnar (3):
x86/setup: Clean up the header portion of setup.c
x86/setup: Enhance the comments
x86/platform/intel/quark: Explicitly include linux/io.h for virt_to_phys()

Sean Christopherson (12):
x86/efi: Explicitly include realmode.h to handle RM trampoline quirk
x86/boot: Explicitly include realmode.h to handle RM reservations
x86/ftrace: Explicitly include vmalloc.h for set_vm_flush_reset_perms()
x86/kprobes: Explicitly include vmalloc.h for set_vm_flush_reset_perms() perf/x86/intel: Explicitly include asm/io.h to use virt_to_phys() efi/capsule-loader: Explicitly include linux/io.h for page_to_phys()
virt: vbox: Explicitly include linux/io.h to pick up various defs
vmw_balloon: Explicitly include linux/io.h for virt_to_phys()
ASoC: Intel: Skylake: Explicitly include linux/io.h for virt_to_phys() x86/ACPI/sleep: Remove an unnecessary include of asm/realmode.h
ACPI/sleep: Convert acpi_wakeup_address into a function
x86/ACPI/sleep: Move acpi_get_wakeup_address() into sleep.c, remove <asm/realmode.h> from <asm/acpi.h>

 arch/ia64/include/asm/acpi.h                 |   5 +-
 arch/ia64/kernel/acpi.c                      |   2 -
 arch/x86/events/intel/ds.c                   |   1 +
 arch/x86/include/asm/acpi.h                  |   3 +-
 arch/x86/kernel/acpi/sleep.c                 |  11 ++
 arch/x86/kernel/acpi/sleep.h                 |   2 +-
 arch/x86/kernel/ftrace.c                     |   1 +
 arch/x86/kernel/kprobes/core.c               |   1 +
 arch/x86/kernel/setup.c                      | 164 ++++++++-------------------
 arch/x86/platform/efi/quirks.c               |   1 +
 arch/x86/platform/intel-quark/imr.c          |   2 +
 arch/x86/platform/intel-quark/imr_selftest.c |   2 +
 drivers/acpi/sleep.c                         |   3 +
 drivers/firmware/efi/capsule-loader.c        |   1 +
 drivers/misc/vmw_balloon.c                   |   1 +
 drivers/virt/vboxguest/vboxguest_core.c      |   1 +
 drivers/virt/vboxguest/vboxguest_utils.c     |   1 +
 sound/soc/intel/skylake/skl-sst-cldma.c      |   1 +
 18 files changed, 81 insertions(+), 122 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Tue, 28 Jan 2020 07:58:52 +0100:

The pull request you sent on Tue, 28 Jan 2020 07:58:52 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-headers-for-linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/9f2a43019edc097347900daade277571834a3e2c

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker