Module Name: src
Committed By: snj
Date: Tue Sep 15 06:45:32 UTC 2009
Modified Files:
src/sys/dev/pci [netbsd-5]: pci_usrreq.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #952):
sys/dev/pci/pci_usrreq.c: revision 1.21 via patch
nuke PCI_ALLOW_MMAP, instead allow mmap(/dev/pci*) with options INSECURE
now the x86 camp should be happy again
To generate a diff of this commit:
cvs rdiff -u -r1.16.6.1 -r1.16.6.2 src/sys/dev/pci/pci_usrreq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pci_usrreq.c
diff -u src/sys/dev/pci/pci_usrreq.c:1.16.6.1 src/sys/dev/pci/pci_usrreq.c:1.16.6.2
--- src/sys/dev/pci/pci_usrreq.c:1.16.6.1 Tue Sep 15 06:40:52 2009
+++ src/sys/dev/pci/pci_usrreq.c Tue Sep 15 06:45:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_usrreq.c,v 1.16.6.1 2009/09/15 06:40:52 snj Exp $ */
+/* $NetBSD: pci_usrreq.c,v 1.16.6.2 2009/09/15 06:45:32 snj Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.16.6.1 2009/09/15 06:40:52 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.16.6.2 2009/09/15 06:45:32 snj Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -56,6 +56,7 @@
#include <dev/pci/pciio.h>
#include "opt_pci.h"
+#include "opt_insecure.h"
static int
pciopen(dev_t dev, int flags, int mode, struct lwp *l)
@@ -112,7 +113,7 @@
static paddr_t
pcimmap(dev_t dev, off_t offset, int prot)
{
-#ifdef PCI_ALLOW_MMAP
+#ifdef INSECURE
struct pci_softc *sc = device_lookup_private(&pci_cd, minor(dev));
/*
@@ -142,10 +143,9 @@
}
#endif /* PCI_MAGIC_IO_RANGE */
return (bus_space_mmap(sc->sc_memt, offset, 0, prot, 0));
-#else
- /* XXX Consider this further. */
+#else /* INSECURE */
return (-1);
-#endif
+#endif /* INSECURE */
}
const struct cdevsw pci_cdevsw = {
