Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next

Merge in the upstream tree to bring in the mainline fixes.

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_fbdev.c
	drivers/gpu/drm/nouveau/nouveau_sgdma.c

5 files changed, 19 insertions, 14 deletions

diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index a767884a6c7a..31ab82fda38a 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -501,7 +501,7 @@ EXPORT_SYMBOL_GPL(balloon_set_new_target);
  * alloc_xenballooned_pages - get pages that have been ballooned out
  * @nr_pages: Number of pages to get
  * @pages: pages returned
- * @highmem: highmem or lowmem pages
+ * @highmem: allow highmem pages
  * @return 0 on success, error otherwise
  */
 int alloc_xenballooned_pages(int nr_pages, struct page **pages, bool highmem)
@@ -511,7 +511,7 @@ int alloc_xenballooned_pages(int nr_pages, struct page **pages, bool highmem)
         mutex_lock(&balloon_mutex);
         while (pgno < nr_pages) {
                 page = balloon_retrieve(highmem);
-                if (page && PageHighMem(page) == highmem) {
+                if (page && (highmem || !PageHighMem(page))) {
                         pages[pgno++] = page;
                 } else {
                         enum bp_state st;
diff --git a/drivers/xen/gntalloc.c b/drivers/xen/gntalloc.c
index f6832f46aea4..e1c4c6e5b469 100644
--- a/drivers/xen/gntalloc.c
+++ b/drivers/xen/gntalloc.c
@@ -135,7 +135,7 @@ static int add_grefs(struct ioctl_gntalloc_alloc_gref *op,
                 /* Grant foreign access to the page. */
                 gref->gref_id = gnttab_grant_foreign_access(op->domid,
                         pfn_to_mfn(page_to_pfn(gref->page)), readonly);
-                if (gref->gref_id < 0) {
+                if ((int)gref->gref_id < 0) {
                         rc = gref->gref_id;
                         goto undo;
                 }
@@ -280,7 +280,7 @@ static long gntalloc_ioctl_alloc(struct gntalloc_file_private_data *priv,
                 goto out;
         }
 
-        gref_ids = kzalloc(sizeof(gref_ids[0]) * op.count, GFP_TEMPORARY);
+        gref_ids = kcalloc(op.count, sizeof(gref_ids[0]), GFP_TEMPORARY);
         if (!gref_ids) {
                 rc = -ENOMEM;
                 goto out;
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 39871326afa2..afca14d9042e 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -114,11 +114,11 @@ static struct grant_map *gntdev_alloc_map(struct gntdev_priv *priv, int count)
         if (NULL == add)
                 return NULL;
 
-        add->grants    = kzalloc(sizeof(add->grants[0])    * count, GFP_KERNEL);
-        add->map_ops   = kzalloc(sizeof(add->map_ops[0])   * count, GFP_KERNEL);
-        add->unmap_ops = kzalloc(sizeof(add->unmap_ops[0]) * count, GFP_KERNEL);
-        add->kmap_ops  = kzalloc(sizeof(add->kmap_ops[0])  * count, GFP_KERNEL);
-        add->pages     = kzalloc(sizeof(add->pages[0])     * count, GFP_KERNEL);
+        add->grants    = kcalloc(count, sizeof(add->grants[0]), GFP_KERNEL);
+        add->map_ops   = kcalloc(count, sizeof(add->map_ops[0]), GFP_KERNEL);
+        add->unmap_ops = kcalloc(count, sizeof(add->unmap_ops[0]), GFP_KERNEL);
+        add->kmap_ops  = kcalloc(count, sizeof(add->kmap_ops[0]), GFP_KERNEL);
+        add->pages     = kcalloc(count, sizeof(add->pages[0]), GFP_KERNEL);
         if (NULL == add->grants    ||
             NULL == add->map_ops   ||
             NULL == add->unmap_ops ||
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 4864e5d72e72..19e6a2041371 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -166,7 +166,7 @@ retry:
         /*
          * Get IO TLB memory from any location.
          */
-        xen_io_tlb_start = alloc_bootmem(bytes);
+        xen_io_tlb_start = alloc_bootmem_pages(PAGE_ALIGN(bytes));
         if (!xen_io_tlb_start) {
                 m = "Cannot allocate Xen-SWIOTLB buffer!\n";
                 goto error;
@@ -179,7 +179,7 @@ retry:
                                bytes,
                                xen_io_tlb_nslabs);
         if (rc) {
-                free_bootmem(__pa(xen_io_tlb_start), bytes);
+                free_bootmem(__pa(xen_io_tlb_start), PAGE_ALIGN(bytes));
                 m = "Failed to get contiguous memory for DMA from Xen!\n"\
                     "You either: don't have the permissions, do not have"\
                     " enough free memory under 4GB, or the hypervisor memory"\
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index 81c3ce6b8bbe..1906125eab49 100644
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -35,6 +35,7 @@
 #include <linux/vmalloc.h>
 #include <linux/export.h>
 #include <asm/xen/hypervisor.h>
+#include <asm/xen/page.h>
 #include <xen/interface/xen.h>
 #include <xen/interface/event_channel.h>
 #include <xen/events.h>
@@ -436,19 +437,20 @@ EXPORT_SYMBOL_GPL(xenbus_free_evtchn);
 int xenbus_map_ring_valloc(struct xenbus_device *dev, int gnt_ref, void **vaddr)
 {
         struct gnttab_map_grant_ref op = {
-                .flags = GNTMAP_host_map,
+                .flags = GNTMAP_host_map | GNTMAP_contains_pte,
                 .ref   = gnt_ref,
                 .dom   = dev->otherend_id,
         };
         struct vm_struct *area;
+        pte_t *pte;
 
         *vaddr = NULL;
 
-        area = alloc_vm_area(PAGE_SIZE);
+        area = alloc_vm_area(PAGE_SIZE, &pte);
         if (!area)
                 return -ENOMEM;
 
-        op.host_addr = (unsigned long)area->addr;
+        op.host_addr = arbitrary_virt_to_machine(pte).maddr;
 
         if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
                 BUG();
@@ -527,6 +529,7 @@ int xenbus_unmap_ring_vfree(struct xenbus_device *dev, void *vaddr)
         struct gnttab_unmap_grant_ref op = {
                 .host_addr = (unsigned long)vaddr,
         };
+        unsigned int level;
 
         /* It'd be nice if linux/vmalloc.h provided a find_vm_area(void *addr)
          * method so that we don't have to muck with vmalloc internals here.
@@ -548,6 +551,8 @@ int xenbus_unmap_ring_vfree(struct xenbus_device *dev, void *vaddr)
         }
 
         op.handle = (grant_handle_t)area->phys_addr;
+        op.host_addr = arbitrary_virt_to_machine(
+                lookup_address((unsigned long)vaddr, &level)).maddr;
 
         if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1))
                 BUG();