Merge branch 'wip-merge-2.6.36' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/litmus2010 into wip-merge-2.6.36

1 files changed, 4 insertions, 1 deletions

diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c
index 39a543e22d41..e5098ddb1ec9 100644
--- a/litmus/sched_task_trace.c
+++ b/litmus/sched_task_trace.c
@@ -18,7 +18,7 @@
 
 /* set MAJOR to 0 to have it dynamically assigned */
 #define FT_TASK_TRACE_MAJOR     253
-#define NO_EVENTS               4096 /* this is a buffer of 12 4k pages per CPU */
+#define NO_EVENTS               (1 << CONFIG_SCHED_TASK_TRACE_SHIFT)
 
 #define now() litmus_clock()
 
@@ -41,6 +41,9 @@ static int __init init_sched_task_trace(void)
 {
         struct local_buffer* buf;
         int i, ok = 0;
+        printk("Allocated %u sched_trace_xxx() events per CPU "
+               "(buffer size: %d bytes)\n",
+               NO_EVENTS, (int) sizeof(struct local_buffer));
         ftdev_init(&st_dev, THIS_MODULE);
         for (i = 0; i < NR_CPUS; i++) {
                 buf = &per_cpu(st_event_buffer, i);