summaryrefslogtreecommitdiff
path: root/include/linux/debugfs.h
diff options
context:
space:
mode:
authorSean Paul <seanpaul@chromium.org>2017-06-19 20:39:28 +0300
committerSean Paul <seanpaul@chromium.org>2017-06-19 20:39:28 +0300
commitd4e0045c4ed300781d2d4cbab57d05ed5e665a37 (patch)
tree925bab41d7906329392aa12c8fa7bcc70f64ca46 /include/linux/debugfs.h
parent2d7b56378d32b0cf006f8944cbba4046df45dd25 (diff)
parent41f1830f5a7af77cf5c86359aba3cbd706687e52 (diff)
downloadlinux-d4e0045c4ed300781d2d4cbab57d05ed5e665a37.tar.xz
Merge remote-tracking branch 'origin/master' into drm-misc-next-fixes
Backmerge 4.12-rc6 into -next-fixes. -next-fixes will contain find patches for 4.13 merge window
Diffstat (limited to 'include/linux/debugfs.h')
-rw-r--r--include/linux/debugfs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
index 7dff776e6d16..9174b0d28582 100644
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
@@ -74,7 +74,7 @@ static const struct file_operations __fops = { \
.release = simple_attr_release, \
.read = debugfs_attr_read, \
.write = debugfs_attr_write, \
- .llseek = generic_file_llseek, \
+ .llseek = no_llseek, \
}
#if defined(CONFIG_DEBUG_FS)