diff --git a/[refs] b/[refs]
index b8cebb21238e..68aeda1178f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a38b1c4f123afa4579cb1d29380b337e9195cbb
+refs/heads/master: 7a51cffbd10886c0557677dd916c090097c691ef
diff --git a/trunk/kernel/relay.c b/trunk/kernel/relay.c
index 09ac2008f77b..d06450670c86 100644
--- a/trunk/kernel/relay.c
+++ b/trunk/kernel/relay.c
@@ -675,9 +675,7 @@ int relay_late_setup_files(struct rchan *chan,
 	 */
 	for_each_online_cpu(i) {
 		if (unlikely(!chan->buf[i])) {
-			printk(KERN_ERR "relay_late_setup_files: CPU %u "
-					"has no buffer, it must have!\n", i);
-			BUG();
+			WARN_ONCE(1, KERN_ERR "CPU has no buffer!\n");
 			err = -EINVAL;
 			break;
 		}