summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmallett <jmallett@FreeBSD.org>2012-11-23 04:28:13 +0000
committerjmallett <jmallett@FreeBSD.org>2012-11-23 04:28:13 +0000
commitd8e808617dbecc2042cb32789d79cb01e9eb8f20 (patch)
tree5ee1c52bea6a7a8272945347290aa0ab588d3f03
parent81ead3b400678b59e0a9271fd4f0ebac43cd6d17 (diff)
downloadFreeBSD-src-d8e808617dbecc2042cb32789d79cb01e9eb8f20.zip
FreeBSD-src-d8e808617dbecc2042cb32789d79cb01e9eb8f20.tar.gz
Use MIPS_PHYS_TO_DIRECT_UNCACHED rather than a homegrown version which is not
compatible with 32-bit kernels.
-rw-r--r--sys/dev/gxemul/cons/gxemul_cons.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/gxemul/cons/gxemul_cons.c b/sys/dev/gxemul/cons/gxemul_cons.c
index ffc7b23..b83aa94 100644
--- a/sys/dev/gxemul/cons/gxemul_cons.c
+++ b/sys/dev/gxemul/cons/gxemul_cons.c
@@ -42,6 +42,8 @@ __FBSDID("$FreeBSD$");
#include <ddb/ddb.h>
+#include <machine/cpuregs.h>
+
#define GC_LOCK_INIT() mtx_init(&gc_lock, "gc_lock", NULL, MTX_SPIN)
#define GC_LOCK() do { \
@@ -97,8 +99,6 @@ static void gxemul_cons_timeout(void *);
* XXXRW: Should be using FreeBSD's bus routines here, but they are not
* available until later in the boot.
*/
-#define MIPS_XKPHYS_UNCACHED_BASE 0x9000000000000000
-
typedef uint64_t paddr_t;
typedef uint64_t vaddr_t;
@@ -106,7 +106,7 @@ static inline vaddr_t
mips_phys_to_uncached(paddr_t phys)
{
- return (phys | MIPS_XKPHYS_UNCACHED_BASE);
+ return (MIPS_PHYS_TO_DIRECT_UNCACHED(phys));
}
static inline uint8_t
OpenPOWER on IntegriCloud