diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-04-06 14:35:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 08:38:04 -0700 |
| commit | ee5d2acd5ca1534f40e06d4f0d41a940b17beb54 (patch) | |
| tree | 4f4e06c3481835f67085ae79294829a2946f7df2 /drivers/char/mem.c | |
| parent | b1dd3b2843b3b73b7fc2ee47d96310cd1c051371 (diff) | |
| download | linux-3.10-ee5d2acd5ca1534f40e06d4f0d41a940b17beb54.tar.gz linux-3.10-ee5d2acd5ca1534f40e06d4f0d41a940b17beb54.tar.bz2 linux-3.10-ee5d2acd5ca1534f40e06d4f0d41a940b17beb54.zip | |
/dev/mem: allow rewinding
commit dcefafb6 ("/dev/mem: dont allow seek to last page") inadvertently
disabled rewinding on /dev/mem.
This broke x86info for example.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/mem.c')
| -rw-r--r-- | drivers/char/mem.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 47c8452f485..9cdbadc6860 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -710,11 +710,6 @@ static loff_t memory_lseek(struct file *file, loff_t offset, int orig) switch (orig) { case SEEK_CUR: offset += file->f_pos; - if ((unsigned long long)offset < - (unsigned long long)file->f_pos) { - ret = -EOVERFLOW; - break; - } case SEEK_SET: /* to avoid userland mistaking f_pos=-9 as -EBADF=-9 */ if ((unsigned long long)offset >= ~0xFFFULL) { |