diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
| commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
| tree | b3530d803df59d726afaabebc6626987dee1ca05 /drivers/sgi | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'drivers/sgi')
| -rw-r--r-- | drivers/sgi/char/graphics.c | 4 | ||||
| -rw-r--r-- | drivers/sgi/char/shmiq.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/sgi/char/graphics.c b/drivers/sgi/char/graphics.c index f9069c8e0..eb80ad9b4 100644 --- a/drivers/sgi/char/graphics.c +++ b/drivers/sgi/char/graphics.c @@ -1,4 +1,4 @@ -/* $Id: graphics.c,v 1.18 1999/09/28 22:26:59 ralf Exp $ +/* $Id: graphics.c,v 1.19 1999/10/09 00:01:31 ralf Exp $ * * gfx.c: support for SGI's /dev/graphics, /dev/opengl * @@ -271,8 +271,6 @@ sgi_graphics_mmap (struct file *file, struct vm_area_struct *vma) uint size; size = vma->vm_end - vma->vm_start; - if (vma->vm_offset & ~PAGE_MASK) - return -ENXIO; /* 1. Set our special graphic virtualizer */ vma->vm_ops = &graphics_mmap; diff --git a/drivers/sgi/char/shmiq.c b/drivers/sgi/char/shmiq.c index 3551de64b..ae9c2d766 100644 --- a/drivers/sgi/char/shmiq.c +++ b/drivers/sgi/char/shmiq.c @@ -1,4 +1,4 @@ -/* $Id: shmiq.c,v 1.14 1999/10/09 00:01:31 ralf Exp $ +/* $Id: shmiq.c,v 1.15 1999/12/04 03:59:05 ralf Exp $ * * shmiq.c: shared memory input queue driver * written 1997 Miguel de Icaza (miguel@nuclecu.unam.mx) @@ -318,7 +318,7 @@ shmiq_qcntl_mmap (struct file *file, struct vm_area_struct *vma) if (minor-- == 0) return -EINVAL; - if (vma->vm_offset != 0) + if (vma->vm_pgoff != 0) return -EINVAL; size = vma->vm_end - vma->vm_start; |