5 files changed, 50 insertions, 10 deletions

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 070e22e8ea9e..b6772d657547 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -80,7 +80,7 @@ static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t size)
 }
 #endif
 
-#ifdef CONFIG_NONPROMISC_DEVMEM
+#ifdef CONFIG_STRICT_DEVMEM
 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
 {
         u64 from = ((u64)pfn) << PAGE_SHIFT;
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index ef671d1a3bf0..902bbe788215 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -92,7 +92,7 @@ struct netfront_info {
          */
         union skb_entry {
                 struct sk_buff *skb;
-                unsigned link;
+                unsigned long link;
         } tx_skbs[NET_TX_RING_SIZE];
         grant_ref_t gref_tx_head;
         grant_ref_t grant_tx_ref[NET_TX_RING_SIZE];
@@ -125,6 +125,17 @@ struct netfront_rx_info {
         struct xen_netif_extra_info extras[XEN_NETIF_EXTRA_TYPE_MAX - 1];
 };
 
+static void skb_entry_set_link(union skb_entry *list, unsigned short id)
+{
+        list->link = id;
+}
+
+static int skb_entry_is_link(const union skb_entry *list)
+{
+        BUILD_BUG_ON(sizeof(list->skb) != sizeof(list->link));
+        return ((unsigned long)list->skb < PAGE_OFFSET);
+}
+
 /*
  * Access macros for acquiring freeing slots in tx_skbs[].
  */
@@ -132,7 +143,7 @@ struct netfront_rx_info {
 static void add_id_to_freelist(unsigned *head, union skb_entry *list,
                                unsigned short id)
 {
-        list[id].link = *head;
+        skb_entry_set_link(&list[id], *head);
         *head = id;
 }
 
@@ -993,7 +1004,7 @@ static void xennet_release_tx_bufs(struct netfront_info *np)
 
         for (i = 0; i < NET_TX_RING_SIZE; i++) {
                 /* Skip over entries which are actually freelist references */
-                if ((unsigned long)np->tx_skbs[i].skb < PAGE_OFFSET)
+                if (skb_entry_is_link(&np->tx_skbs[i]))
                         continue;
 
                 skb = np->tx_skbs[i].skb;
@@ -1123,7 +1134,7 @@ static struct net_device * __devinit xennet_create_dev(struct xenbus_device *dev
         /* Initialise tx_skbs as a free chain containing every entry. */
         np->tx_skb_freelist = 0;
         for (i = 0; i < NET_TX_RING_SIZE; i++) {
-                np->tx_skbs[i].link = i+1;
+                skb_entry_set_link(&np->tx_skbs[i], i+1);
                 np->grant_tx_ref[i] = GRANT_INVALID_REF;
         }
 
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 3f7b81c065d2..8d0e60ac849c 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -37,7 +37,7 @@
 #include "intel-iommu.h"
 #include <asm/proto.h> /* force_iommu in this header in x86-64*/
 #include <asm/cacheflush.h>
-#include <asm/gart.h>
+#include <asm/iommu.h>
 #include "pci.h"
 
 #define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY)
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 332dd63750a0..0e0c28574af8 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -734,6 +734,33 @@ static void restore_cpu_ipis(unsigned int cpu)
         }
 }
 
+/* Clear an irq's pending state, in preparation for polling on it */
+void xen_clear_irq_pending(int irq)
+{
+        int evtchn = evtchn_from_irq(irq);
+
+        if (VALID_EVTCHN(evtchn))
+                clear_evtchn(evtchn);
+}
+
+/* Poll waiting for an irq to become pending.  In the usual case, the
+   irq will be disabled so it won't deliver an interrupt. */
+void xen_poll_irq(int irq)
+{
+        evtchn_port_t evtchn = evtchn_from_irq(irq);
+
+        if (VALID_EVTCHN(evtchn)) {
+                struct sched_poll poll;
+
+                poll.nr_ports = 1;
+                poll.timeout = 0;
+                poll.ports = &evtchn;
+
+                if (HYPERVISOR_sched_op(SCHEDOP_poll, &poll) != 0)
+                        BUG();
+        }
+}
+
 void xen_irq_resume(void)
 {
         unsigned int cpu, irq, evtchn;
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 5b546e365f00..a5bc91ae6ff6 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -63,11 +63,12 @@ static int xen_suspend(void *data)
         gnttab_resume();
         xen_mm_unpin_all();
 
-        device_power_up();
+        device_power_up(PMSG_RESUME);
 
         if (!*cancelled) {
                 xen_irq_resume();
                 xen_console_resume();
+                xen_timer_resume();
         }
 
         return 0;
@@ -107,12 +108,13 @@ static void do_suspend(void)
                 goto out;
         }
 
-        if (!cancelled)
+        if (!cancelled) {
+                xen_arch_resume();
                 xenbus_resume();
-        else
+        } else
                 xenbus_suspend_cancel();
 
-        device_resume();
+        device_resume(PMSG_RESUME);
 
         /* Make sure timer events get retriggered on all CPUs */
         clock_was_set();