From: Alex Williamson <alex.williamson@hp.com>
Date: Tue, 1 Apr 2008 17:29:03 +0000 (-0600)
Subject: merge with xen-unstable.hg
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14234
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0590d4e4cf0fe0be1f48141dfab04ce9c602c3f8;p=xen.git

merge with xen-unstable.hg
---

0590d4e4cf0fe0be1f48141dfab04ce9c602c3f8
diff --cc xen/include/public/arch-ia64.h
index 76cb70fb1a,43ca979cf6..7a779d6005
--- a/xen/include/public/arch-ia64.h
+++ b/xen/include/public/arch-ia64.h
@@@ -62,14 -68,8 +68,12 @@@ typedef unsigned long xen_pfn_t
  /* WARNING: before changing this, check that shared_info fits on a page */
  #define MAX_VIRT_CPUS 64
  
 +/* IO ports location for PV.  */
 +#define IO_PORTS_PADDR          0x00000ffffc000000UL
 +#define IO_PORTS_SIZE           0x0000000004000000UL
 +
  #ifndef __ASSEMBLY__
  
- #define __anonymous_union __extension__ union
- 
  typedef unsigned long xen_ulong_t;
  
  #ifdef __XEN_TOOLS__