Merge branch 'linus' into x86/xen

Conflicts:
	arch/x86/kernel/paravirt.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --combined include/asm-x86/xen/hypervisor.h
index d9dd28caa50856da8dd6ff8e4075766482c4c98e,04ee0610014ab69e14b602487a197e5536fa9813..fca066febc3548f5043cbd52d56af30076dc0994
--- 1/include/asm-x86/xen/hypervisor.h
--- 2/include/asm-x86/xen/hypervisor.h
+++ b/include/asm-x86/xen/hypervisor.h
@@@ -35,7 -35,6 +35,6 @@@
  
  #include <linux/types.h>
  #include <linux/kernel.h>
- #include <linux/version.h>
  
  #include <xen/interface/xen.h>
  #include <xen/interface/version.h>
@@@ -55,6 -54,7 +54,6 @@@
  /* arch/i386/kernel/setup.c */
  extern struct shared_info *HYPERVISOR_shared_info;
  extern struct start_info *xen_start_info;
 -#define is_initial_xendomain() (xen_start_info->flags & SIF_INITDOMAIN)
  
  /* arch/i386/mach-xen/evtchn.c */
  /* Force a proper event-channel callback from Xen. */
@@@ -67,17 -67,6 +66,17 @@@ u64 jiffies_to_st(unsigned long jiffies
  #define MULTI_UVMFLAGS_INDEX 3
  #define MULTI_UVMDOMID_INDEX 4
  
 -#define is_running_on_xen()   (xen_start_info ? 1 : 0)
 +enum xen_domain_type {
 +      XEN_NATIVE,
 +      XEN_PV_DOMAIN,
 +      XEN_HVM_DOMAIN,
 +};
 +
 +extern enum xen_domain_type xen_domain_type;
 +
 +#define xen_domain()          (xen_domain_type != XEN_NATIVE)
 +#define xen_pv_domain()               (xen_domain_type == XEN_PV_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 /* __HYPERVISOR_H__ */