]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
xen/gntdev: Fix merge error.
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 11 May 2012 20:29:09 +0000 (16:29 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 31 May 2012 20:15:24 +0000 (16:15 -0400)
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>
drivers/xen/gntdev.c

index 04877edadb7d0a2679201d4913760f64c5516176..1ffd03bf8e10dcb6b015e3e0b94a2a460f0d0dcd 100644 (file)
@@ -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)