Merge branch 'tracing/core-v2' into tracing-for-linus

[mv-sheeva.git] / kernel / relay.c

diff --git a/kernel/relay.c b/kernel/relay.c
index 8f2179c8056ff9f9de0b2679588d86589393b508..824b91ac10f1f94f3990d5db6f7437d161f0f2a4 100644 (file)
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -677,9 +677,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;
                }