Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-6]: src/sys/arch/amiga/dev Pull up revisions 1.20-1.21 (request...



details:   https://anonhg.NetBSD.org/src/rev/e05da85ea241
branches:  netbsd-1-6
changeset: 530301:e05da85ea241
user:      grant <grant%NetBSD.org@localhost>
date:      Mon Jun 16 13:51:24 2003 +0000

description:
Pull up revisions 1.20-1.21 (requested by is in ticket #1266):

iszthreepa() takes a physical address, not a virtual address.
This fixes PR 19175, reported and heavily debugged by Pawel
Chwalowski.

fix fatal typo

diffstat:

 sys/arch/amiga/dev/grf_et.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r a5ea7d38bbef -r e05da85ea241 sys/arch/amiga/dev/grf_et.c
--- a/sys/arch/amiga/dev/grf_et.c       Mon Jun 16 13:48:13 2003 +0000
+++ b/sys/arch/amiga/dev/grf_et.c       Mon Jun 16 13:51:24 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_et.c,v 1.15.6.1 2002/08/07 01:29:19 lukem Exp $ */
+/*     $NetBSD: grf_et.c,v 1.15.6.2 2003/06/16 13:51:24 grant Exp $ */
 
 /*
  * Copyright (c) 1997 Klaus Burkert
@@ -37,7 +37,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_et.c,v 1.15.6.1 2002/08/07 01:29:19 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_et.c,v 1.15.6.2 2003/06/16 13:51:24 grant Exp $");
 
 #include "grfet.h"
 #if NGRFET > 0
@@ -539,7 +539,7 @@
                                et_fbsize = 0x100000;           /* 1 MB */
                }
                /* ZorroII can map 2 MB max ... */
-               if (!iszthreepa(gp->g_fbkva) && et_fbsize == 0x400000)
+               if (!iszthreepa(kvtop(gp->g_fbkva)) && et_fbsize == 0x400000)
                        et_fbsize = 0x200000;
                etctype = ETW32;
                etdtype = MERLINDAC;



Home | Main Index | Thread Index | Old Index