From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 11 May 2012 20:29:09 +0000 (-0400)
Subject: xen/gntdev: Fix merge error.
X-Git-Tag: v2.6.39-400.9.0~423^2~13^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=10cb1f577c9f3cf6d275ad74f0c6ecffe03c0bc1;p=users%2Fjedix%2Flinux-maple.git

xen/gntdev: Fix merge error.

Somehow a merge error ensued were an important part of
 "xen/gnt{dev,alloc}: reserve event channels for notify"
went missing.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 04877edadb7d..1ffd03bf8e10 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -193,9 +193,10 @@ static void gntdev_put_map(struct grant_map *map)
 
 	atomic_sub(map->count, &pages_mapped);
 
-	if (map->notify.flags & UNMAP_NOTIFY_SEND_EVENT)
+	if (map->notify.flags & UNMAP_NOTIFY_SEND_EVENT) {
 		notify_remote_via_evtchn(map->notify.event);
 		evtchn_put(map->notify.event);
+	}
 
 	if (map->pages) {
 		if (!use_ptemod)