Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...

[karo-tx-linux.git] / kernel / trace / ftrace.c

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index afd092de45b71c45a9b3be6b70ed8dc0db085a0a..3ffe4c5ad3f37353d45d828407fb484ab811e441 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2675,12 +2675,12 @@ ftrace_notrace_open(struct inode *inode, struct file *file)
 }
 
 loff_t
-ftrace_regex_lseek(struct file *file, loff_t offset, int origin)
+ftrace_regex_lseek(struct file *file, loff_t offset, int whence)
 {
        loff_t ret;
 
        if (file->f_mode & FMODE_READ)
-               ret = seq_lseek(file, offset, origin);
+               ret = seq_lseek(file, offset, whence);
        else
                file->f_pos = ret = 1;