Merge tag 'for-linus-4.2-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen updates from David Vrabel:
 "Xen features and cleanups for 4.2-rc0:

   - add "make xenconfig" to assist in generating configs for Xen guests

   - preparatory cleanups necessary for supporting 64 KiB pages in ARM
     guests

   - automatically use hvc0 as the default console in ARM guests"

* tag 'for-linus-4.2-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  block/xen-blkback: s/nr_pages/nr_segs/
  block/xen-blkfront: Remove invalid comment
  block/xen-blkfront: Remove unused macro MAXIMUM_OUTSTANDING_BLOCK_REQS
  arm/xen: Drop duplicate define mfn_to_virt
  xen/grant-table: Remove unused macro SPP
  xen/xenbus: client: Fix call of virt_to_mfn in xenbus_grant_ring
  xen: Include xen/page.h rather than asm/xen/page.h
  kconfig: add xenconfig defconfig helper
  kconfig: clarify kvmconfig is for kvm
  xen/pcifront: Remove usage of struct timeval
  xen/tmem: use BUILD_BUG_ON() in favor of BUG_ON()
  hvc_xen: avoid uninitialized variable warning
  xenbus: avoid uninitialized variable warning
  xen/arm: allow console=hvc0 to be omitted for guests
  arm,arm64/xen: move Xen initialization earlier
  arm/xen: Correctly check if the event channel interrupt is present

2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
index 2126842fb6e8..ced96777b677 100644
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@ -736,7 +736,7 @@ static void xen_blkbk_unmap_and_respond(struct pending_req *req)
         struct grant_page **pages = req->segments;
         unsigned int invcount;
 
-        invcount = xen_blkbk_unmap_prepare(blkif, pages, req->nr_pages,
+        invcount = xen_blkbk_unmap_prepare(blkif, pages, req->nr_segs,
                                            req->unmap, req->unmap_pages);
 
         work->data = req;
@@ -922,7 +922,7 @@ static int xen_blkbk_map_seg(struct pending_req *pending_req)
         int rc;
 
         rc = xen_blkbk_map(pending_req->blkif, pending_req->segments,
-                           pending_req->nr_pages,
+                           pending_req->nr_segs,
                            (pending_req->operation != BLKIF_OP_READ));
 
         return rc;
@@ -938,7 +938,7 @@ static int xen_blkbk_parse_indirect(struct blkif_request *req,
         int indirect_grefs, rc, n, nseg, i;
         struct blkif_request_segment *segments = NULL;
 
-        nseg = pending_req->nr_pages;
+        nseg = pending_req->nr_segs;
         indirect_grefs = INDIRECT_PAGES(nseg);
         BUG_ON(indirect_grefs > BLKIF_MAX_INDIRECT_PAGES_PER_REQUEST);
 
@@ -1258,7 +1258,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
         pending_req->id        = req->u.rw.id;
         pending_req->operation = req_operation;
         pending_req->status    = BLKIF_RSP_OKAY;
-        pending_req->nr_pages  = nseg;
+        pending_req->nr_segs   = nseg;
 
         if (req->operation != BLKIF_OP_INDIRECT) {
                 preq.dev               = req->u.rw.handle;
@@ -1379,7 +1379,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
 
  fail_flush:
         xen_blkbk_unmap(blkif, pending_req->segments,
-                        pending_req->nr_pages);
+                        pending_req->nr_segs);
  fail_response:
         /* Haven't submitted any bio's yet. */
         make_response(blkif, req->u.rw.id, req_operation, BLKIF_RSP_ERROR);
diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h
index 8ccc49d01c8e..45a044a53d1e 100644
--- a/drivers/block/xen-blkback/common.h
+++ b/drivers/block/xen-blkback/common.h
@@ -345,7 +345,7 @@ struct grant_page {
 struct pending_req {
         struct xen_blkif        *blkif;
         u64                     id;
-        int                     nr_pages;
+        int                     nr_segs;
         atomic_t                pendcnt;
         unsigned short          operation;
         int                     status;