Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[linux-2.6-omap-h63xx.git] / kernel / trace / trace_sysprof.c

diff --git a/kernel/trace/trace_sysprof.c b/kernel/trace/trace_sysprof.c
index 7c9a2d82a7d83702a1a0eaebd6d2b29fee66d6c3..91fd19c2149f5c57e37e808286bc4a3f1929510e 100644 (file)
--- a/kernel/trace/trace_sysprof.c
+++ b/kernel/trace/trace_sysprof.c
@@ -314,7 +314,7 @@ sysprof_sample_write(struct file *filp, const char __user *ubuf,
        return cnt;
 }
 
-static struct file_operations sysprof_sample_fops = {
+static const struct file_operations sysprof_sample_fops = {
        .read           = sysprof_sample_read,
        .write          = sysprof_sample_write,
 };
@@ -327,5 +327,5 @@ void init_tracer_sysprof_debugfs(struct dentry *d_tracer)
                        d_tracer, NULL, &sysprof_sample_fops);
        if (entry)
                return;
-       pr_warning("Could not create debugfs 'dyn_ftrace_total_info' entry\n");
+       pr_warning("Could not create debugfs 'sysprof_sample_period' entry\n");
 }