diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
| commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
| tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /drivers/sgi | |
| parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) | |
Merge with Linux 2.3.41.
Diffstat (limited to 'drivers/sgi')
| -rw-r--r-- | drivers/sgi/char/graphics.c | 12 | ||||
| -rw-r--r-- | drivers/sgi/char/shmiq.c | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/drivers/sgi/char/graphics.c b/drivers/sgi/char/graphics.c index 310acbdc5..9fe649b03 100644 --- a/drivers/sgi/char/graphics.c +++ b/drivers/sgi/char/graphics.c @@ -1,4 +1,4 @@ -/* $Id: graphics.c,v 1.20 2000/01/29 01:42:19 ralf Exp $ +/* $Id: graphics.c,v 1.21 2000/02/05 06:47:30 ralf Exp $ * * gfx.c: support for SGI's /dev/graphics, /dev/opengl * @@ -254,15 +254,7 @@ sgi_graphics_nopage (struct vm_area_struct *vma, unsigned long address, int */ static struct vm_operations_struct graphics_mmap = { - NULL, /* no special mmap-open */ - NULL, /* no special mmap-close */ - NULL, /* no special mmap-unmap */ - NULL, /* no special mmap-protect */ - NULL, /* no special mmap-sync */ - NULL, /* no special mmap-advise */ - sgi_graphics_nopage, /* our magic no-page fault handler */ - NULL, /* no special mmap-wppage */ - NULL /* no special mmap-swapout */ + nopage: sgi_graphics_nopage, /* our magic no-page fault handler */ }; int diff --git a/drivers/sgi/char/shmiq.c b/drivers/sgi/char/shmiq.c index f182e227f..153df30be 100644 --- a/drivers/sgi/char/shmiq.c +++ b/drivers/sgi/char/shmiq.c @@ -1,4 +1,4 @@ -/* $Id: shmiq.c,v 1.16 2000/01/29 01:42:19 ralf Exp $ +/* $Id: shmiq.c,v 1.17 2000/02/05 06:47:30 ralf Exp $ * * shmiq.c: shared memory input queue driver * written 1997 Miguel de Icaza (miguel@nuclecu.unam.mx) @@ -296,15 +296,7 @@ shmiq_nopage (struct vm_area_struct *vma, unsigned long address, int write_acces } static struct vm_operations_struct qcntl_mmap = { - NULL, /* no special mmap-open */ - NULL, /* no special mmap-close */ - NULL, /* no special mmap-unmap */ - NULL, /* no special mmap-protect */ - NULL, /* no special mmap-sync */ - NULL, /* no special mmap-advise */ - shmiq_nopage, /* our magic no-page fault handler */ - NULL, /* no special mmap-wppage */ - NULL /* no special mmap-swapout */ + nopage: shmiq_nopage, /* our magic no-page fault handler */ }; static int |