Merge remote branch 'intel/drm-intel-next' of /ssd/git/drm-next into drm-core-next

* 'intel/drm-intel-next' of /ssd/git/drm-next: (771 commits)
  drm/i915: Undo "Uncouple render/power ctx before suspending"
  drm/i915: Allow the application to choose the constant addressing mode
  drm/i915: dynamic render p-state support for Sandy Bridge
  drm/i915: Enable EI mode for RCx decision making on Sandybridge
  drm/i915/sdvo: Border and stall select became test bits in gen5
  drm/i915: Add Guess-o-matic for pageflip timestamping.
  drm/i915: Add support for precise vblank timestamping (v2)
  drm/i915: Add frame buffer compression on Sandybridge
  drm/i915: Add self-refresh support on Sandybridge
  drm/i915: Wait for vblank before unpinning old fb
  Revert "drm/i915: Avoid using PIPE_CONTROL on Ironlake"
  drm/i915: Pass clock limits down to PLL matcher
  drm/i915: Poll for seqno completion if IRQ is disabled
  drm/i915/ringbuffer: Make IRQ refcnting atomic
  agp/intel: Fix missed cached memory flags setting in i965_write_entry()
  drm/i915/sdvo: Only use the SDVO pin if it is in the valid range
  drm/i915: Enable RC6 autodownclocking on Sandybridge
  drm/i915: Terminate the FORCE WAKE after we have finished reading
  drm/i915/gtt: Clear the cachelines upon resume
  drm/i915: Restore GTT mapping first upon resume
  ...

2 files changed, 12 insertions, 47 deletions

diff --git a/drivers/xen/xenfs/privcmd.c b/drivers/xen/xenfs/privcmd.c
index 0f5d4162b22d..dbd3b16fd131 100644
--- a/drivers/xen/xenfs/privcmd.c
+++ b/drivers/xen/xenfs/privcmd.c
@@ -265,9 +265,7 @@ static int mmap_return_errors(void *data, void *state)
         xen_pfn_t *mfnp = data;
         struct mmap_batch_state *st = state;
 
-        put_user(*mfnp, st->user++);
-
-        return 0;
+        return put_user(*mfnp, st->user++);
 }
 
 static struct vm_operations_struct privcmd_vm_ops;
@@ -322,10 +320,8 @@ static long privcmd_ioctl_mmap_batch(void __user *udata)
         up_write(&mm->mmap_sem);
 
         if (state.err > 0) {
-                ret = 0;
-
                 state.user = m.arr;
-                traverse_pages(m.num, sizeof(xen_pfn_t),
+                ret = traverse_pages(m.num, sizeof(xen_pfn_t),
                                &pagelist,
                                mmap_return_errors, &state);
         }
@@ -383,8 +379,9 @@ static int privcmd_mmap(struct file *file, struct vm_area_struct *vma)
         if (xen_feature(XENFEAT_auto_translated_physmap))
                 return -ENOSYS;
 
-        /* DONTCOPY is essential for Xen as copy_page_range is broken. */
-        vma->vm_flags |= VM_RESERVED | VM_IO | VM_DONTCOPY;
+        /* DONTCOPY is essential for Xen because copy_page_range doesn't know
+         * how to recreate these mappings */
+        vma->vm_flags |= VM_RESERVED | VM_IO | VM_DONTCOPY | VM_PFNMAP;
         vma->vm_ops = &privcmd_vm_ops;
         vma->vm_private_data = NULL;
 
diff --git a/drivers/xen/xenfs/super.c b/drivers/xen/xenfs/super.c
index f6339d11d59c..1aa389719846 100644
--- a/drivers/xen/xenfs/super.c
+++ b/drivers/xen/xenfs/super.c
@@ -12,8 +12,6 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/magic.h>
-#include <linux/mm.h>
-#include <linux/backing-dev.h>
 
 #include <xen/xen.h>
 
@@ -24,28 +22,12 @@
 MODULE_DESCRIPTION("Xen filesystem");
 MODULE_LICENSE("GPL");
 
-static int xenfs_set_page_dirty(struct page *page)
-{
-        return !TestSetPageDirty(page);
-}
-
-static const struct address_space_operations xenfs_aops = {
-        .set_page_dirty = xenfs_set_page_dirty,
-};
-
-static struct backing_dev_info xenfs_backing_dev_info = {
-        .ra_pages       = 0,    /* No readahead */
-        .capabilities   = BDI_CAP_NO_ACCT_AND_WRITEBACK,
-};
-
 static struct inode *xenfs_make_inode(struct super_block *sb, int mode)
 {
         struct inode *ret = new_inode(sb);
 
         if (ret) {
                 ret->i_mode = mode;
-                ret->i_mapping->a_ops = &xenfs_aops;
-                ret->i_mapping->backing_dev_info = &xenfs_backing_dev_info;
                 ret->i_uid = ret->i_gid = 0;
                 ret->i_blocks = 0;
                 ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
@@ -121,9 +103,9 @@ static int xenfs_fill_super(struct super_block *sb, void *data, int silent)
         return rc;
 }
 
-static int xenfs_mount(struct file_system_type *fs_type,
-                        int flags, const char *dev_name,
-                        void *data)
+static struct dentry *xenfs_mount(struct file_system_type *fs_type,
+                                  int flags, const char *dev_name,
+                                  void *data)
 {
         return mount_single(fs_type, flags, data, xenfs_fill_super);
 }
@@ -137,25 +119,11 @@ static struct file_system_type xenfs_type = {
 
 static int __init xenfs_init(void)
 {
-        int err;
-        if (!xen_domain()) {
-                printk(KERN_INFO "xenfs: not registering filesystem on non-xen platform\n");
-                return 0;
-        }
-
-        err = register_filesystem(&xenfs_type);
-        if (err) {
-                printk(KERN_ERR "xenfs: Unable to register filesystem!\n");
-                goto out;
-        }
-
-        err = bdi_init(&xenfs_backing_dev_info);
-        if (err)
-                unregister_filesystem(&xenfs_type);
-
- out:
+        if (xen_domain())
+                return register_filesystem(&xenfs_type);
 
-        return err;
+        printk(KERN_INFO "XENFS: not registering filesystem on non-xen platform\n");
+        return 0;
 }
 
 static void __exit xenfs_exit(void)