diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 13:52:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 13:52:56 -0400 |
| commit | 092e0e7e520a1fca03e13c9f2d157432a8657ff2 (patch) | |
| tree | 451897252c4c08c4b5a8ef535da156f1e817e80b /drivers/char/mspec.c | |
| parent | 79f14b7c56d3b3ba58f8b43d1f70b9b71477a800 (diff) | |
| parent | 776c163b1b93c8dfa5edba885bc2bfbc2d228a5f (diff) | |
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 'drivers/char/mspec.c')
| -rw-r--r-- | drivers/char/mspec.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c index ecb89d798e35..966a95bc974b 100644 --- a/drivers/char/mspec.c +++ b/drivers/char/mspec.c | |||
| @@ -316,7 +316,8 @@ uncached_mmap(struct file *file, struct vm_area_struct *vma) | |||
| 316 | 316 | ||
| 317 | static const struct file_operations fetchop_fops = { | 317 | static const struct file_operations fetchop_fops = { |
| 318 | .owner = THIS_MODULE, | 318 | .owner = THIS_MODULE, |
| 319 | .mmap = fetchop_mmap | 319 | .mmap = fetchop_mmap, |
| 320 | .llseek = noop_llseek, | ||
| 320 | }; | 321 | }; |
| 321 | 322 | ||
| 322 | static struct miscdevice fetchop_miscdev = { | 323 | static struct miscdevice fetchop_miscdev = { |
| @@ -327,7 +328,8 @@ static struct miscdevice fetchop_miscdev = { | |||
| 327 | 328 | ||
| 328 | static const struct file_operations cached_fops = { | 329 | static const struct file_operations cached_fops = { |
| 329 | .owner = THIS_MODULE, | 330 | .owner = THIS_MODULE, |
| 330 | .mmap = cached_mmap | 331 | .mmap = cached_mmap, |
| 332 | .llseek = noop_llseek, | ||
| 331 | }; | 333 | }; |
| 332 | 334 | ||
| 333 | static struct miscdevice cached_miscdev = { | 335 | static struct miscdevice cached_miscdev = { |
| @@ -338,7 +340,8 @@ static struct miscdevice cached_miscdev = { | |||
| 338 | 340 | ||
| 339 | static const struct file_operations uncached_fops = { | 341 | static const struct file_operations uncached_fops = { |
| 340 | .owner = THIS_MODULE, | 342 | .owner = THIS_MODULE, |
| 341 | .mmap = uncached_mmap | 343 | .mmap = uncached_mmap, |
| 344 | .llseek = noop_llseek, | ||
| 342 | }; | 345 | }; |
| 343 | 346 | ||
| 344 | static struct miscdevice uncached_miscdev = { | 347 | static struct miscdevice uncached_miscdev = { |