From 87c68feab8d40240d82774bf7478db220288163f Mon Sep 17 00:00:00 2001
From: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Date: Tue, 26 Jul 2011 14:16:26 +0300
Subject: [PATCH] --- yaml --- r: 274723 b: refs/heads/master c:
 7b0ac956d91b91a1e05e4e0b454d65710fc73cd8 h: refs/heads/master i:   274721:
 e6453ced0574769ce88a672f1e37ac9bf636f530   274719:
 8d837a7b042931b3125c674d1b3a7b4ac20601d8 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/xen/gntdev.c      | 3 +--
 trunk/drivers/xen/grant-table.c | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4d14556f5b63..8381eaeefbd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 088c05a845da821fba9e5434bbcc6329368de34e
+refs/heads/master: 7b0ac956d91b91a1e05e4e0b454d65710fc73cd8
diff --git a/trunk/drivers/xen/gntdev.c b/trunk/drivers/xen/gntdev.c
index f914b26cf0c2..772a5b8bbf2e 100644
--- a/trunk/drivers/xen/gntdev.c
+++ b/trunk/drivers/xen/gntdev.c
@@ -188,9 +188,8 @@ 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);
-	}
 
 	if (map->pages) {
 		if (!use_ptemod)
diff --git a/trunk/drivers/xen/grant-table.c b/trunk/drivers/xen/grant-table.c
index fd725cde6ad1..3a3dceb7063a 100644
--- a/trunk/drivers/xen/grant-table.c
+++ b/trunk/drivers/xen/grant-table.c
@@ -193,7 +193,7 @@ int gnttab_query_foreign_access(grant_ref_t ref)
 
 	nflags = shared[ref].flags;
 
-	return (nflags & (GTF_reading|GTF_writing));
+	return nflags & (GTF_reading|GTF_writing);
 }
 EXPORT_SYMBOL_GPL(gnttab_query_foreign_access);