diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 20:23:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 20:23:28 -0400 |
| commit | 98c89cdd3a292af3451e47a2a33132f5183861b0 (patch) | |
| tree | cfad77bcfd2d04fb0b9326a859803a1ab90b0757 /fs/proc/kcore.c | |
| parent | 164d44fd92e79d5bce54d0d62df9f856f7b23925 (diff) | |
| parent | 99df95a22f7cfcf85405d4edc07c2d953542f0dd (diff) | |
Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing
* 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
sunrpc: Include missing smp_lock.h
procfs: Kill the bkl in ioctl
procfs: Push down the bkl from ioctl
procfs: Use generic_file_llseek in /proc/vmcore
procfs: Use generic_file_llseek in /proc/kmsg
procfs: Use generic_file_llseek in /proc/kcore
procfs: Kill BKL in llseek on proc base
Diffstat (limited to 'fs/proc/kcore.c')
| -rw-r--r-- | fs/proc/kcore.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index 19979a2ce27..c837a77351b 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c | |||
| @@ -558,6 +558,7 @@ static int open_kcore(struct inode *inode, struct file *filp) | |||
| 558 | static const struct file_operations proc_kcore_operations = { | 558 | static const struct file_operations proc_kcore_operations = { |
| 559 | .read = read_kcore, | 559 | .read = read_kcore, |
| 560 | .open = open_kcore, | 560 | .open = open_kcore, |
| 561 | .llseek = generic_file_llseek, | ||
| 561 | }; | 562 | }; |
| 562 | 563 | ||
| 563 | #ifdef CONFIG_MEMORY_HOTPLUG | 564 | #ifdef CONFIG_MEMORY_HOTPLUG |