diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2012-12-17 18:59:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 20:15:12 -0500 |
commit | 965c8e59cfcf845ecde2265a1d1bfee5f011d302 (patch) | |
tree | 22758a99b4ecb475750966d5202200dc0e89876c /include/linux/ftrace.h | |
parent | c0f041602c33bae10b8e321c49024490d03ced3d (diff) |
lseek: the "whence" argument is called "whence"
But the kernel decided to call it "origin" instead. Fix most of the
sites.
Acked-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/ftrace.h')
-rw-r--r-- | include/linux/ftrace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index a52f2f4fe030..92691d85c320 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
@@ -394,7 +394,7 @@ ssize_t ftrace_filter_write(struct file *file, const char __user *ubuf, | |||
394 | size_t cnt, loff_t *ppos); | 394 | size_t cnt, loff_t *ppos); |
395 | ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf, | 395 | ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf, |
396 | size_t cnt, loff_t *ppos); | 396 | size_t cnt, loff_t *ppos); |
397 | loff_t ftrace_regex_lseek(struct file *file, loff_t offset, int origin); | 397 | loff_t ftrace_regex_lseek(struct file *file, loff_t offset, int whence); |
398 | int ftrace_regex_release(struct inode *inode, struct file *file); | 398 | int ftrace_regex_release(struct inode *inode, struct file *file); |
399 | 399 | ||
400 | void __init | 400 | void __init |
@@ -559,7 +559,7 @@ static inline ssize_t ftrace_filter_write(struct file *file, const char __user * | |||
559 | size_t cnt, loff_t *ppos) { return -ENODEV; } | 559 | size_t cnt, loff_t *ppos) { return -ENODEV; } |
560 | static inline ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf, | 560 | static inline ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf, |
561 | size_t cnt, loff_t *ppos) { return -ENODEV; } | 561 | size_t cnt, loff_t *ppos) { return -ENODEV; } |
562 | static inline loff_t ftrace_regex_lseek(struct file *file, loff_t offset, int origin) | 562 | static inline loff_t ftrace_regex_lseek(struct file *file, loff_t offset, int whence) |
563 | { | 563 | { |
564 | return -ENODEV; | 564 | return -ENODEV; |
565 | } | 565 | } |