File xen3-patch-2.6.31 of Package drm

From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Linux: 2.6.31
Patch-mainline: 2.6.31

 This patch contains the differences between 2.6.30 and 2.6.31.

Acked-by: Jeff Mahoney <jeffm@suse.com>
Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches.py

2.6.34/drivers/staging/vt6655/ttype.h (VOID no longer used)
2.6.35/mm/page_alloc.c

---
 drivers/gpu/drm/ttm/ttm_bo.c    |    8 ++++++++
 drivers/gpu/drm/ttm/ttm_bo_vm.c |    3 +++
 2 files changed, 11 insertions(+)

--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1378,6 +1378,14 @@ int ttm_bo_global_init(struct drm_global
 		ret = -ENOMEM;
 		goto out_no_drp;
 	}
+#ifdef CONFIG_XEN
+	ret = xen_limit_pages_to_max_mfn(glob->dummy_read_page, 0, 32);
+	if (!ret)
+		clear_page(page_address(glob->dummy_read_page));
+	else
+		printk(KERN_WARNING
+		       "Error restricting dummy read page: %d\n", ret);
+#endif
 
 	INIT_LIST_HEAD(&glob->swap_lru);
 	INIT_LIST_HEAD(&glob->device_list);
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -198,6 +198,9 @@ static int ttm_bo_vm_fault(struct vm_are
 	if (bo->mem.bus.is_iomem) {
 		cvma.vm_page_prot = ttm_io_prot(bo->mem.placement,
 						cvma.vm_page_prot);
+#if defined(CONFIG_XEN) && defined(_PAGE_IOMAP)
+		pgprot_val(cvma.vm_page_prot) |= _PAGE_IOMAP;
+#endif
 	} else {
 		ttm = bo->ttm;
 		if (!(bo->mem.placement & TTM_PL_FLAG_CACHED))