Module Name: src
Committed By: macallan
Date: Thu Apr 11 18:20:33 UTC 2013
Modified Files:
src/sys/arch/powerpc/powerpc: bus_space.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/powerpc/powerpc/bus_space.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/bus_space.c
diff -u src/sys/arch/powerpc/powerpc/bus_space.c:1.34 src/sys/arch/powerpc/powerpc/bus_space.c:1.35
--- src/sys/arch/powerpc/powerpc/bus_space.c:1.34 Wed Jul 18 17:41:59 2012
+++ src/sys/arch/powerpc/powerpc/bus_space.c Thu Apr 11 18:20:33 2013
@@ -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 @@ memio_map(bus_space_tag_t t, bus_addr_t
}
#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.
*/
