diff options
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 9ec59f541156..042084157980 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/writeback.h> | 17 | #include <linux/writeback.h> |
18 | #include <linux/kallsyms.h> | 18 | #include <linux/kallsyms.h> |
19 | #include <linux/seq_file.h> | 19 | #include <linux/seq_file.h> |
20 | #include <linux/smp_lock.h> | ||
21 | #include <linux/notifier.h> | 20 | #include <linux/notifier.h> |
22 | #include <linux/irqflags.h> | 21 | #include <linux/irqflags.h> |
23 | #include <linux/debugfs.h> | 22 | #include <linux/debugfs.h> |
@@ -2196,7 +2195,7 @@ int tracing_open_generic(struct inode *inode, struct file *filp) | |||
2196 | 2195 | ||
2197 | static int tracing_release(struct inode *inode, struct file *file) | 2196 | static int tracing_release(struct inode *inode, struct file *file) |
2198 | { | 2197 | { |
2199 | struct seq_file *m = (struct seq_file *)file->private_data; | 2198 | struct seq_file *m = file->private_data; |
2200 | struct trace_iterator *iter; | 2199 | struct trace_iterator *iter; |
2201 | int cpu; | 2200 | int cpu; |
2202 | 2201 | ||
@@ -3996,13 +3995,9 @@ static void tracing_init_debugfs_percpu(long cpu) | |||
3996 | { | 3995 | { |
3997 | struct dentry *d_percpu = tracing_dentry_percpu(); | 3996 | struct dentry *d_percpu = tracing_dentry_percpu(); |
3998 | struct dentry *d_cpu; | 3997 | struct dentry *d_cpu; |
3999 | /* strlen(cpu) + MAX(log10(cpu)) + '\0' */ | 3998 | char cpu_dir[30]; /* 30 characters should be more than enough */ |
4000 | char cpu_dir[7]; | ||
4001 | 3999 | ||
4002 | if (cpu > 999 || cpu < 0) | 4000 | snprintf(cpu_dir, 30, "cpu%ld", cpu); |
4003 | return; | ||
4004 | |||
4005 | sprintf(cpu_dir, "cpu%ld", cpu); | ||
4006 | d_cpu = debugfs_create_dir(cpu_dir, d_percpu); | 4001 | d_cpu = debugfs_create_dir(cpu_dir, d_percpu); |
4007 | if (!d_cpu) { | 4002 | if (!d_cpu) { |
4008 | pr_warning("Could not create debugfs '%s' entry\n", cpu_dir); | 4003 | pr_warning("Could not create debugfs '%s' entry\n", cpu_dir); |