Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / kernel / trace / trace.h

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 2c2657462ac3ee1e68899f80e057441f07fc28bb..b93ecbadad6df3261a787441e0dc9ba7bcd4e4c2 100644 (file)
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -312,7 +312,7 @@ void tracing_reset_current(int cpu);
 void tracing_reset_current_online_cpus(void);
 int tracing_open_generic(struct inode *inode, struct file *filp);
 struct dentry *trace_create_file(const char *name,
-                                mode_t mode,
+                                umode_t mode,
                                 struct dentry *parent,
                                 void *data,
                                 const struct file_operations *fops);