Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent

1 files changed, 9 insertions, 3 deletions

diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c
index 312ef0292815..20ea20a39e2a 100644
--- a/arch/x86/kernel/tlb_uv.c
+++ b/arch/x86/kernel/tlb_uv.c
@@ -1001,10 +1001,10 @@ static int uv_ptc_seq_show(struct seq_file *file, void *data)
 static ssize_t tunables_read(struct file *file, char __user *userbuf,
                                                 size_t count, loff_t *ppos)
 {
-        char buf[300];
+        char *buf;
         int ret;
 
-        ret = snprintf(buf, 300, "%s %s %s\n%d %d %d %d %d %d %d %d %d\n",
+        buf = kasprintf(GFP_KERNEL, "%s %s %s\n%d %d %d %d %d %d %d %d %d\n",
                 "max_bau_concurrent plugged_delay plugsb4reset",
                 "timeoutsb4reset ipi_reset_limit complete_threshold",
                 "congested_response_us congested_reps congested_period",
@@ -1012,7 +1012,12 @@ static ssize_t tunables_read(struct file *file, char __user *userbuf,
                 timeoutsb4reset, ipi_reset_limit, complete_threshold,
                 congested_response_us, congested_reps, congested_period);
 
-        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
+        if (!buf)
+                return -ENOMEM;
+
+        ret = simple_read_from_buffer(userbuf, count, ppos, buf, strlen(buf));
+        kfree(buf);
+        return ret;
 }
 
 /*
@@ -1285,6 +1290,7 @@ static const struct file_operations tunables_fops = {
         .open           = tunables_open,
         .read           = tunables_read,
         .write          = tunables_write,
+        .llseek         = default_llseek,
 };
 
 static int __init uv_ptc_init(void)