summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-12-30 19:14:56 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-12-30 19:14:56 +0000
commitb97c60733be1ce1224e2691b1404ec99ecc331f0 (patch)
treeba654dcd38e91e3926effebc877fa7e62db7382c
parentcea80a87587b0b5c3ed550d9c4e231a2cc7f4c6c (diff)
In agp_i810_alloc_memory(), do not check for sc_maxmem limit reached, as the
caller has already done this. Test matthieu@ ok deraadt@
-rw-r--r--sys/dev/pci/agp_i810.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c
index d818099a0fb..3ba0869c061 100644
--- a/sys/dev/pci/agp_i810.c
+++ b/sys/dev/pci/agp_i810.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agp_i810.c,v 1.13 2006/05/15 08:27:19 dim Exp $ */
+/* $OpenBSD: agp_i810.c,v 1.14 2006/12/30 19:14:55 miod Exp $ */
/* $NetBSD: agp_i810.c,v 1.15 2003/01/31 00:07:39 thorpej Exp $ */
/*-
@@ -540,9 +540,6 @@ agp_i810_alloc_memory(struct vga_pci_softc *sc, int type, vsize_t size)
if ((size & (AGP_PAGE_SIZE - 1)) != 0)
return 0;
- if (sc->sc_allocated + size > sc->sc_maxmem)
- return 0;
-
if (type == 1) {
/*
* Mapping local DRAM into GATT.