svn commit: r195953 - in projects/ppc64/sys/powerpc: aim aim64
Nathan Whitehorn
nwhitehorn at FreeBSD.org
Wed Jul 29 21:47:39 UTC 2009
Author: nwhitehorn
Date: Wed Jul 29 21:47:38 2009
New Revision: 195953
URL: http://svn.freebsd.org/changeset/base/195953
Log:
Fix 32-bit build.
Modified:
projects/ppc64/sys/powerpc/aim/ofw_machdep.c
projects/ppc64/sys/powerpc/aim64/mmu_oea64.c
Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/ofw_machdep.c Wed Jul 29 21:36:40 2009 (r195952)
+++ projects/ppc64/sys/powerpc/aim/ofw_machdep.c Wed Jul 29 21:47:38 2009 (r195953)
@@ -182,13 +182,17 @@ parse_ofw_memory(phandle_t node, const c
output[j].mr_start = OFmem[i++];
if (address_cells == 2) {
+ #ifdef __powerpc64__
output[j].mr_start <<= 32;
+ #endif
output[j].mr_start += OFmem[i++];
}
output[j].mr_size = OFmem[i++];
if (size_cells == 2) {
+ #ifdef __powerpc64__
output[j].mr_size <<= 32;
+ #endif
output[j].mr_size += OFmem[i++];
}
@@ -200,7 +204,7 @@ parse_ofw_memory(phandle_t node, const c
if (((uint64_t)output[j].mr_start +
(uint64_t)output[j].mr_size) >
BUS_SPACE_MAXADDR_32BIT) {
- ouptut[j].mr_size = BUS_SPACE_MAXADDR_32BIT -
+ output[j].mr_size = BUS_SPACE_MAXADDR_32BIT -
output[j].mr_start;
}
#endif
Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Wed Jul 29 21:36:40 2009 (r195952)
+++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Wed Jul 29 21:47:38 2009 (r195953)
@@ -388,7 +388,9 @@ static void moea64_kremove(mmu_t, vm_of
static void moea64_syncicache(pmap_t pmap, vm_offset_t va,
vm_offset_t pa);
static void tlbia(void);
+#ifdef __powerpc64__
static void slbia(void);
+#endif
/*
* Kernel MMU interface
@@ -750,7 +752,7 @@ moea64_bridge_cpu_bootstrap(mmu_t mmup,
}
#else
for (i = 0; i < NSEGS; i++)
- mtsrin(i << ADDR_SR_SHFT, pmap->pm_sr[i]);
+ mtsrin(i << ADDR_SR_SHFT, kernel_pmap->pm_sr[i]);
#endif
/*
@@ -2070,11 +2072,13 @@ tlbia(void)
TLBIE(NULL,i);
}
+#ifdef __powerpc64__
static void
slbia(void)
{
__asm __volatile ("slbia");
}
+#endif
static int
moea64_pvo_enter(pmap_t pm, uma_zone_t zone, struct pvo_head *pvo_head,
More information about the svn-src-projects
mailing list