Commit 9f2a4301 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull header cleanup from Ingo Molnar:
 "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"

* 'core-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/ACPI/sleep: Move acpi_get_wakeup_address() into sleep.c, remove <asm/realmode.h> from <asm/acpi.h>
  ACPI/sleep: Convert acpi_wakeup_address into a function
  x86/ACPI/sleep: Remove an unnecessary include of asm/realmode.h
  ASoC: Intel: Skylake: Explicitly include linux/io.h for virt_to_phys()
  vmw_balloon: Explicitly include linux/io.h for virt_to_phys()
  virt: vbox: Explicitly include linux/io.h to pick up various defs
  efi/capsule-loader: Explicitly include linux/io.h for page_to_phys()
  perf/x86/intel: Explicitly include asm/io.h to use virt_to_phys()
  x86/kprobes: Explicitly include vmalloc.h for set_vm_flush_reset_perms()
  x86/ftrace: Explicitly include vmalloc.h for set_vm_flush_reset_perms()
  x86/boot: Explicitly include realmode.h to handle RM reservations
  x86/efi: Explicitly include realmode.h to handle RM trampoline quirk
  x86/platform/intel/quark: Explicitly include linux/io.h for virt_to_phys()
  x86/setup: Enhance the comments
  x86/setup: Clean up the header portion of setup.c
parents b0be0eff 96078642

arch/ia64/include/asm/acpi.h

+4 −1
Original line number Diff line number Diff line
@@ -38,7 +38,10 @@ int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); 
/* Low-level suspend routine. */

extern int acpi_suspend_lowlevel(void);



extern unsigned long acpi_wakeup_address;

static inline unsigned long acpi_get_wakeup_address(void)

{

	return 0;

}



/*

 * Record the cpei override flag and current logical cpu. This is

arch/ia64/kernel/acpi.c

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ int acpi_lapic; 
unsigned int acpi_cpei_override;

unsigned int acpi_cpei_phys_cpuid;



unsigned long acpi_wakeup_address = 0;



#define ACPI_MAX_PLATFORM_INTERRUPTS	256



/* Array to record platform interrupt vectors for generic interrupt routing. */

arch/x86/events/intel/ds.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <asm/perf_event.h>

#include <asm/tlbflush.h>

#include <asm/insn.h>

#include <asm/io.h>



#include "../perf_event.h"

arch/x86/include/asm/acpi.h

+1 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <asm/processor.h>

#include <asm/mmu.h>

#include <asm/mpspec.h>

#include <asm/realmode.h>

#include <asm/x86_init.h>



#ifdef CONFIG_ACPI_APEI
@@ -62,7 +61,7 @@ static inline void acpi_disable_pci(void) 
extern int (*acpi_suspend_lowlevel)(void);



/* Physical address to resume after wakeup */

#define acpi_wakeup_address ((unsigned long)(real_mode_header->wakeup_start))

unsigned long acpi_get_wakeup_address(void);



/*

 * Check if the CPU can handle C2 and deeper

arch/x86/kernel/acpi/sleep.c

+11 −0
Original line number Diff line number Diff line
@@ -26,6 +26,17 @@ unsigned long acpi_realmode_flags; 
static char temp_stack[4096];

#endif



/**

 * acpi_get_wakeup_address - provide physical address for S3 wakeup

 *

 * Returns the physical address where the kernel should be resumed after the

 * system awakes from S3, e.g. for programming into the firmware waking vector.

 */

unsigned long acpi_get_wakeup_address(void)

{

	return ((unsigned long)(real_mode_header->wakeup_start));

}



/**

 * x86_acpi_enter_sleep_state - enter sleep state

 * @state: Sleep state to enter.

CRA Git | Maintained and supported by SUSTech CRA and CCSE