[src/trunk]: src/sys/arch/powerpc/oea Use uintptr_t instead of int.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c40e2a02ed91
branches:  trunk
changeset: 327141:c40e2a02ed91
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Feb 28 05:35:49 2014 +0000

description:
Use uintptr_t instead of int.

diffstat:

 sys/arch/powerpc/oea/ofwoea_machdep.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (60 lines):

diff -r 253c6a1c5e56 -r c40e2a02ed91 sys/arch/powerpc/oea/ofwoea_machdep.c
--- a/sys/arch/powerpc/oea/ofwoea_machdep.c     Fri Feb 28 05:34:39 2014 +0000
+++ b/sys/arch/powerpc/oea/ofwoea_machdep.c     Fri Feb 28 05:35:49 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwoea_machdep.c,v 1.35 2013/11/03 22:27:27 mrg Exp $ */
+/* $NetBSD: ofwoea_machdep.c,v 1.36 2014/02/28 05:35:49 matt Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.35 2013/11/03 22:27:27 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.36 2014/02/28 05:35:49 matt Exp $");
 
 #include "opt_ppcarch.h"
 #include "opt_compat_netbsd.h"
@@ -288,7 +288,7 @@
        restore_ofmap(ofmap, ofmaplen);
 
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-       ksyms_addsyms_elf((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
+       ksyms_addsyms_elf((int)((uintptr_t)endsym - (uintptr_t)startsym), startsym, endsym);
 #endif
 
        /* CPU clock stuff */
@@ -370,12 +370,14 @@
 
        pmap_pinit(&ofw_pmap);
 
+#ifndef _LP64
        ofw_pmap.pm_sr[0] = KERNELN_SEGMENT(0)|SR_PRKEY;
        ofw_pmap.pm_sr[KERNEL_SR] = KERNEL_SEGMENT|SR_SUKEY|SR_PRKEY;
 
 #ifdef KERNEL2_SR
        ofw_pmap.pm_sr[KERNEL2_SR] = KERNEL2_SEGMENT|SR_SUKEY|SR_PRKEY;
 #endif
+#endif
 
        for (i = 0; i < n; i++) {
 #if defined (PMAC_G5)
@@ -405,7 +407,7 @@
 /*
  * Scan the device tree for ranges, and return them as bitmap 0..15
  */
-#ifndef macppc
+#if !defined(macppc) && defined(PPC_OEA)
 static u_int16_t
 ranges_bitmap(int node, u_int16_t bitmap)
 {
@@ -446,7 +448,7 @@
        }
        return bitmap;
 }
-#endif /* !macppc */
+#endif /* !macppc && PPC_OEA */
 
 void
 ofwoea_batinit(void)