diff --git a/[refs] b/[refs]
index 0b82a77b1d45..6f24d3b6cbc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8abf6a4707cfb95ca552b882959c6f8ff9924270
+refs/heads/master: f6298aab2ebaa61de39931595f125bc1968905cc
diff --git a/trunk/fs/fcntl.c b/trunk/fs/fcntl.c
index 2a2479196f96..d35cbc6bc112 100644
--- a/trunk/fs/fcntl.c
+++ b/trunk/fs/fcntl.c
@@ -453,8 +453,7 @@ static void send_sigio_to_task(struct task_struct *p,
 			/* Make sure we are called with one of the POLL_*
 			   reasons, otherwise we could leak kernel stack into
 			   userspace.  */
-			if ((reason & __SI_MASK) != __SI_POLL)
-				BUG();
+			BUG_ON((reason & __SI_MASK) != __SI_POLL);
 			if (reason - POLL_IN >= NSIGPOLL)
 				si.si_band  = ~0L;
 			else