Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/sommerfeld_i386mp_1]: src/sys/arch/i386/i386 Correct mismerge; delete no...
details: https://anonhg.NetBSD.org/src/rev/b485f404399a
branches: sommerfeld_i386mp_1
changeset: 482416:b485f404399a
user: sommerfeld <sommerfeld%NetBSD.org@localhost>
date: Sun Jun 24 19:44:58 2001 +0000
description:
Correct mismerge; delete now-useless message.
diffstat:
sys/arch/i386/i386/pmap.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (27 lines):
diff -r e0f016c4a112 -r b485f404399a sys/arch/i386/i386/pmap.c
--- a/sys/arch/i386/i386/pmap.c Sun Jun 24 19:42:57 2001 +0000
+++ b/sys/arch/i386/i386/pmap.c Sun Jun 24 19:44:58 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.83.2.41 2001/06/18 03:33:30 sommerfeld Exp $ */
+/* $NetBSD: pmap.c,v 1.83.2.42 2001/06/24 19:44:58 sommerfeld Exp $ */
/*
*
@@ -1126,7 +1126,6 @@
*/
pj_nentries = pmap_tlb_shootdown_job_pool.pr_itemsperpage;
pj_nbytes = pmap_tlb_shootdown_job_pool.pr_pagesz;
- printf("%d pool entries; page size %d\n", pj_nentries, pj_nbytes);
pj_page = (void *)uvm_km_alloc (kernel_map, pj_nbytes);
if (pj_page == NULL)
panic("pmap_init: pj_page");
@@ -2992,7 +2991,8 @@
ptp = pmap_get_ptp(pmap, pdei(va));
if (ptp == NULL) {
if (flags & PMAP_CANFAIL) {
- return ENOMEM;
+ error = ENOMEM;
+ goto out;
}
panic("pmap_enter: get ptp failed");
}
Home |
Main Index |
Thread Index |
Old Index