diff --git a/[refs] b/[refs] index b30c4faa1fe7..cf4705f221fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1dd3b2843b3b73b7fc2ee47d96310cd1c051371 +refs/heads/master: ee5d2acd5ca1534f40e06d4f0d41a940b17beb54 diff --git a/trunk/drivers/char/mem.c b/trunk/drivers/char/mem.c index 47c8452f485f..9cdbadc68608 100644 --- a/trunk/drivers/char/mem.c +++ b/trunk/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) {