Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecbf29cd authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

xen: clean up asm/xen/hypervisor.h 



Impact: cleanup

hypervisor.h had accumulated a lot of crud, including lots of spurious
#includes.  Clean it all up, and go around fixing up everything else
accordingly.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f63c2f24

arch/x86/include/asm/xen/hypercall.h

+6 −0
Original line number Diff line number Diff line
@@ -33,8 +33,14 @@ 
#ifndef _ASM_X86_XEN_HYPERCALL_H

#define _ASM_X86_XEN_HYPERCALL_H



#include <linux/kernel.h>

#include <linux/spinlock.h>

#include <linux/errno.h>

#include <linux/string.h>

#include <linux/types.h>



#include <asm/page.h>

#include <asm/pgtable.h>



#include <xen/interface/xen.h>

#include <xen/interface/sched.h>

arch/x86/include/asm/xen/hypervisor.h

+8 −31
Original line number Diff line number Diff line
@@ -33,39 +33,10 @@ 
#ifndef _ASM_X86_XEN_HYPERVISOR_H

#define _ASM_X86_XEN_HYPERVISOR_H



#include <linux/types.h>

#include <linux/kernel.h>



#include <xen/interface/xen.h>

#include <xen/interface/version.h>



#include <asm/ptrace.h>

#include <asm/page.h>

#include <asm/desc.h>

#if defined(__i386__)

#  ifdef CONFIG_X86_PAE

#   include <asm-generic/pgtable-nopud.h>

#  else

#   include <asm-generic/pgtable-nopmd.h>

#  endif

#endif

#include <asm/xen/hypercall.h>



/* arch/i386/kernel/setup.c */

extern struct shared_info *HYPERVISOR_shared_info;

extern struct start_info *xen_start_info;



/* arch/i386/mach-xen/evtchn.c */

/* Force a proper event-channel callback from Xen. */

extern void force_evtchn_callback(void);



/* Turn jiffies into Xen system time. */

u64 jiffies_to_st(unsigned long jiffies);





#define MULTI_UVMFLAGS_INDEX 3

#define MULTI_UVMDOMID_INDEX 4



enum xen_domain_type {

	XEN_NATIVE,

	XEN_PV_DOMAIN,
@@ -74,9 +45,15 @@ enum xen_domain_type { 


extern enum xen_domain_type xen_domain_type;



#ifdef CONFIG_XEN

#define xen_domain()		(xen_domain_type != XEN_NATIVE)

#define xen_pv_domain()		(xen_domain_type == XEN_PV_DOMAIN)

#else

#define xen_domain()		(0)

#endif



#define xen_pv_domain()		(xen_domain() && xen_domain_type == XEN_PV_DOMAIN)

#define xen_hvm_domain()	(xen_domain() && xen_domain_type == XEN_HVM_DOMAIN)



#define xen_initial_domain()	(xen_pv_domain() && xen_start_info->flags & SIF_INITDOMAIN)

#define xen_hvm_domain()	(xen_domain_type == XEN_HVM_DOMAIN)



#endif /* _ASM_X86_XEN_HYPERVISOR_H */

arch/x86/include/asm/xen/page.h

+5 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_XEN_PAGE_H

#define _ASM_X86_XEN_PAGE_H



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/spinlock.h>

#include <linux/pfn.h>



#include <asm/uaccess.h>

#include <asm/page.h>

#include <asm/pgtable.h>



#include <xen/interface/xen.h>

#include <xen/features.h>



/* Xen machine address */

arch/x86/xen/enlighten.c

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



#include <xen/interface/xen.h>

#include <xen/interface/version.h>

#include <xen/interface/physdev.h>

#include <xen/interface/vcpu.h>

#include <xen/features.h>

drivers/xen/balloon.c

+3 −1
Original line number Diff line number Diff line
@@ -44,13 +44,15 @@ 
#include <linux/list.h>

#include <linux/sysdev.h>



#include <asm/xen/hypervisor.h>

#include <asm/page.h>

#include <asm/pgalloc.h>

#include <asm/pgtable.h>

#include <asm/uaccess.h>

#include <asm/tlb.h>



#include <asm/xen/hypervisor.h>

#include <asm/xen/hypercall.h>

#include <xen/interface/xen.h>

#include <xen/interface/memory.h>

#include <xen/xenbus.h>

#include <xen/features.h>