Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/powerpc/powerpc in memio_map() don't fail without t...



details:   https://anonhg.NetBSD.org/src/rev/3e337d7302d7
branches:  trunk
changeset: 786026:3e337d7302d7
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Apr 11 18:20:33 2013 +0000

description:
in memio_map() don't fail without trying to mapiodev() if we don't find a BAT
mapping or don't have BATs
now this works on G5

diffstat:

 sys/arch/powerpc/powerpc/bus_space.c |  18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)

diffs (39 lines):

diff -r 39f4c4fa2bdb -r 3e337d7302d7 sys/arch/powerpc/powerpc/bus_space.c
--- a/sys/arch/powerpc/powerpc/bus_space.c      Thu Apr 11 18:14:40 2013 +0000
+++ b/sys/arch/powerpc/powerpc/bus_space.c      Thu Apr 11 18:20:33 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_space.c,v 1.34 2012/07/18 17:41:59 matt Exp $      */
+/*     $NetBSD: bus_space.c,v 1.35 2013/04/11 18:20:33 macallan Exp $  */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.34 2012/07/18 17:41:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.35 2013/04/11 18:20:33 macallan Exp $");
 
 #define _POWERPC_BUS_SPACE_PRIVATE
 
@@ -598,20 +598,6 @@
        }
 #endif /* defined (PPC_OEA) || defined(PPC_OEA601) */
 
-       if (t->pbs_extent != NULL) {
-#if !defined(PPC_IBM4XX)
-               if (extent_flags == 0) {
-                       extent_free(t->pbs_extent, bpa, size, EX_NOWAIT);
-#ifdef DEBUG
-                       printf("bus_space_map(%p[%x:%x], %#x, %#x)"
-                           " failed: ENOMEM\n",
-                           t, t->pbs_base, t->pbs_limit, bpa, size);
-#endif
-                       return (ENOMEM);
-               }
-#endif
-       }
-
        /*
         * Map this into the kernel pmap.
         */



Home | Main Index | Thread Index | Old Index