From 1a51296a1b150b58240a8f34f313add1488161da Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Fri, 11 May 2012 16:29:09 -0400 Subject: [PATCH] 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. Fortunatly for us we aren't using this driver yet. Signed-off-by: Konrad Rzeszutek Wilk --- drivers/xen/gntdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) -- 2.50.1