From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Mar 2011 01:16:36 +0000 (-0700)
Subject: Merge branches 'stable/hvc-console', 'stable/gntalloc.v6' and 'stable/balloon' of... 
X-Git-Tag: v2.6.39-rc1~439
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=514af9f7904ab65a6763b4b0bf51f1c7081026cb;p=platform%2Fkernel%2Flinux-3.10.git

Merge branches 'stable/hvc-console', 'stable/gntalloc.v6' and 'stable/balloon' of git://git./linux/kernel/git/konrad/xen

* 'stable/hvc-console' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/hvc: Disable probe_irq_on/off from poking the hvc-console IRQ line.

* 'stable/gntalloc.v6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: gntdev: fix build warning
  xen/p2m/m2p/gnttab: do not add failed grant maps to m2p override
  xen-gntdev: Add cast to pointer
  xen-gntdev: Fix incorrect use of zero handle
  xen: change xen/[gntdev/gntalloc] to default m
  xen-gntdev: prevent using UNMAP_NOTIFY_CLEAR_BYTE on read-only mappings
  xen-gntdev: Avoid double-mapping memory
  xen-gntdev: Avoid unmapping ranges twice
  xen-gntdev: Use map->vma for checking map validity
  xen-gntdev: Fix unmap notify on PV domains
  xen-gntdev: Fix memory leak when mmap fails
  xen/gntalloc,gntdev: Add unmap notify ioctl
  xen-gntalloc: Userspace grant allocation driver
  xen-gntdev: Support mapping in HVM domains
  xen-gntdev: Add reference counting to maps
  xen-gntdev: Use find_vma rather than iterating our vma list manually
  xen-gntdev: Change page limit to be global instead of per-open

* 'stable/balloon' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (24 commits)
  xen-gntdev: Use ballooned pages for grant mappings
  xen-balloon: Add interface to retrieve ballooned pages
  xen-balloon: Move core balloon functionality out of module
  xen/balloon: Remove pr_info's and don't alter retry_count
  xen/balloon: Protect against CPU exhaust by event/x process
  xen/balloon: Migration from mod_timer() to schedule_delayed_work()
  xen/balloon: Removal of driver_pages
---

514af9f7904ab65a6763b4b0bf51f1c7081026cb
diff --cc drivers/xen/balloon.c
index 718050a,43f9f02,8c81cd2..043af8a
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@@@ -392,19 -392,15 -429,15 +429,19 @@@@ EXPORT_SYMBOL(free_xenballooned_pages)
   
   static int __init balloon_init(void)
   {
 --	unsigned long pfn, extra_pfn_end;
 ++ 	unsigned long pfn, nr_pages, extra_pfn_end;
   	struct page *page;
   
 --	if (!xen_pv_domain())
 ++	if (!xen_domain())
   		return -ENODEV;
   
-- 	pr_info("xen_balloon: Initialising balloon driver.\n");
++ 	pr_info("xen/balloon: Initialising balloon driver.\n");
   
 --	balloon_stats.current_pages = min(xen_start_info->nr_pages, max_pfn);
 ++ 	if (xen_pv_domain())
 ++ 		nr_pages = xen_start_info->nr_pages;
 ++ 	else
 ++ 		nr_pages = max_pfn;
 ++ 	balloon_stats.current_pages = min(nr_pages, max_pfn);
   	balloon_stats.target_pages  = balloon_stats.current_pages;
   	balloon_stats.balloon_low   = 0;
   	balloon_stats.balloon_high  = 0;