summaryrefslogtreecommitdiffstats
path: root/sys/powerpc
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2010-07-09 14:02:24 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2010-07-09 14:02:24 +0000
commitdb85722e7ef2dad399e175f17fe19ae6945491ba (patch)
treefda536a08ccb20f7869cee42c17f1382da893282 /sys/powerpc
parent75d8db5ef46daf012721732a57fe969a03234e12 (diff)
downloadFreeBSD-src-db85722e7ef2dad399e175f17fe19ae6945491ba.zip
FreeBSD-src-db85722e7ef2dad399e175f17fe19ae6945491ba.tar.gz
MFppc64:
Minor 64-bit-cleanliness upgrades and support for platform detection on subtly-broken OF implementations like in the Mambo simulator.
Diffstat (limited to 'sys/powerpc')
-rw-r--r--sys/powerpc/aim/platform_chrp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/powerpc/aim/platform_chrp.c b/sys/powerpc/aim/platform_chrp.c
index 5a528be..06d892d 100644
--- a/sys/powerpc/aim/platform_chrp.c
+++ b/sys/powerpc/aim/platform_chrp.c
@@ -88,7 +88,7 @@ PLATFORM_DEF(chrp_platform);
static int
chrp_probe(platform_t plat)
{
- if (OF_finddevice("/memory") != -1)
+ if (OF_finddevice("/memory") != -1 || OF_finddevice("/memory@0") != -1)
return (BUS_PROBE_GENERIC);
return (ENXIO);
@@ -105,7 +105,7 @@ static u_long
chrp_timebase_freq(platform_t plat, struct cpuref *cpuref)
{
phandle_t phandle;
- long ticks = -1;
+ int32_t ticks = -1;
phandle = cpuref->cr_hwref;
@@ -121,7 +121,7 @@ chrp_timebase_freq(platform_t plat, struct cpuref *cpuref)
static int
chrp_smp_fill_cpuref(struct cpuref *cpuref, phandle_t cpu)
{
- int cpuid, res;
+ cell_t cpuid, res;
cpuref->cr_hwref = cpu;
res = OF_getprop(cpu, "reg", &cpuid, sizeof(cpuid));
OpenPOWER on IntegriCloud