Merge branch 'devel' into next

[mv-sheeva.git] / kernel / trace / trace_selftest.c

diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index 033a6fb2e5ff96371fd6c60d9c80dbf03a9cb734..0911b7e073bf197b021ba77c75f6777a03910aa7 100644 (file)
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -28,6 +28,7 @@ trace_test_buffer_cpu(struct trace_array *tr, struct trace_array_cpu *data)
        page = list_entry(data->trace_pages.next, struct page, lru);
        entries = page_address(page);
 
+       check_pages(data);
        if (head_page(data) != entries)
                goto failed;
 
@@ -557,11 +558,6 @@ trace_selftest_startup_sysprof(struct tracer *trace, struct trace_array *tr)
        ret = trace_test_buffer(tr, &count);
        trace->reset(tr);
 
-       if (!ret && !count) {
-               printk(KERN_CONT ".. no entries found ..");
-               ret = -1;
-       }
-
        return ret;
 }
 #endif /* CONFIG_SYSPROF_TRACER */