diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 19:52:56 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 19:52:56 +0200 |
commit | 092e0e7e520a1fca03e13c9f2d157432a8657ff2 (patch) | |
tree | 451897252c4c08c4b5a8ef535da156f1e817e80b /kernel/kprobes.c | |
parent | Merge branch 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl (diff) | |
parent | vfs: make no_llseek the default (diff) | |
download | linux-092e0e7e520a1fca03e13c9f2d157432a8657ff2.tar.xz linux-092e0e7e520a1fca03e13c9f2d157432a8657ff2.zip |
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
* 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
vfs: make no_llseek the default
vfs: don't use BKL in default_llseek
llseek: automatically add .llseek fop
libfs: use generic_file_llseek for simple_attr
mac80211: disallow seeks in minstrel debug code
lirc: make chardev nonseekable
viotape: use noop_llseek
raw: use explicit llseek file operations
ibmasmfs: use generic_file_llseek
spufs: use llseek in all file operations
arm/omap: use generic_file_llseek in iommu_debug
lkdtm: use generic_file_llseek in debugfs
net/wireless: use generic_file_llseek in debugfs
drm: use noop_llseek
Diffstat (limited to 'kernel/kprobes.c')
-rw-r--r-- | kernel/kprobes.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index ec4210c6501e..56a891914273 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -2000,6 +2000,7 @@ static ssize_t write_enabled_file_bool(struct file *file, static const struct file_operations fops_kp = { .read = read_enabled_file_bool, .write = write_enabled_file_bool, + .llseek = default_llseek, }; static int __kprobes debugfs_kprobe_init(void) |