Date: Fri, 15 Nov 2002 10:16:54 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 21076 for review Message-ID: <200211151816.gAFIGsNk015850@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=21076 Change 21076 by peter@peter_daintree on 2002/11/15 10:16:47 integ i386_hammer pseudo-branch Affected files ... .. //depot/projects/hammer/sys/x86_64/pci/pci_bus.c#7 integrate .. //depot/projects/hammer/sys/x86_64/pci/pci_cfgreg.c#8 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#8 integrate Differences ... ==== //depot/projects/hammer/sys/x86_64/pci/pci_bus.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/pci/pci_bus.c,v 1.95 2002/10/20 17:54:17 phk Exp $ + * $FreeBSD: src/sys/i386/pci/pci_bus.c,v 1.96 2002/11/13 21:30:44 peter Exp $ * */ @@ -261,6 +261,11 @@ *busnum = nexus_pcib_read_config(0, bus, slot, func, 0x44, 1); break; + case 0x00101166: + s = "ServerWorks CIOB30 host to PCI bridge"; + *busnum = nexus_pcib_read_config(0, bus, slot, func, 0x44, 1); + break; + case 0x00111166: /* FALLTHROUGH */ case 0x03021014: /* IBM re-badged ServerWorks chipset */ ==== //depot/projects/hammer/sys/x86_64/pci/pci_cfgreg.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.99 2002/11/02 22:35:24 imp Exp $ + * $FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.100 2002/11/14 05:22:37 imp Exp $ * */ @@ -138,7 +138,7 @@ && reg <= PCI_REGMAX && bytes != 3 && (unsigned) bytes <= 4 - && (reg & (bytes -1)) == 0) { + && (reg & (bytes - 1)) == 0) { switch (cfgmech) { case 1: outl(CONF1_ADDR_PORT, (1 << 31) ==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.369 2002/11/11 05:17:33 alc Exp $ + * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.370 2002/11/13 05:39:57 alc Exp $ */ /* @@ -164,7 +164,7 @@ static uma_zone_t pvzone; static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; -static int pmap_pagedaemon_waken = 0; +int pmap_pagedaemon_waken; /* * All those kernel PT submaps that BSD is so fond of @@ -1466,36 +1466,6 @@ } /* - * This routine is very drastic, but can save the system - * in a pinch. - */ -void -pmap_collect() -{ - int i; - vm_page_t m; - static int warningdone = 0; - - if (pmap_pagedaemon_waken == 0) - return; - - if (warningdone < 5) { - printf("pmap_collect: collecting pv entries -- suggest increasing PMAP_SHPGPERPROC\n"); - warningdone++; - } - - for(i = 0; i < vm_page_array_size; i++) { - m = &vm_page_array[i]; - if (m->wire_count || m->hold_count || m->busy || - (m->flags & (PG_BUSY | PG_UNMANAGED))) - continue; - pmap_remove_all(m); - } - pmap_pagedaemon_waken = 0; -} - - -/* * If it is the first entry on the list, it is actually * in the header and we must copy the following entry up * to the header. Otherwise we must search the list for To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211151816.gAFIGsNk015850>