summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2012-01-20 22:24:39 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2012-01-20 22:24:39 +0000
commitd22191faaa1982f92120c293792798a829424159 (patch)
tree23f73e34d6c63bd0641959519e3f9ff6650b5642
parent39957b7340f1e5781191b7b97b4fb30eafd9b7f3 (diff)
downloadFreeBSD-src-d22191faaa1982f92120c293792798a829424159.zip
FreeBSD-src-d22191faaa1982f92120c293792798a829424159.tar.gz
Prevent an error resulting from signed/unsigned comparison on systems
that do not comply with the OF spec. Submitted by: Anders Gavare MFC after: 1 week
-rw-r--r--sys/powerpc/ofw/ofw_machdep.c4
-rw-r--r--sys/powerpc/powermac/macio.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/powerpc/ofw/ofw_machdep.c b/sys/powerpc/ofw/ofw_machdep.c
index fcdc953..448393d 100644
--- a/sys/powerpc/ofw/ofw_machdep.c
+++ b/sys/powerpc/ofw/ofw_machdep.c
@@ -171,10 +171,10 @@ parse_ofw_memory(phandle_t node, const char *prop, struct mem_region *output)
*/
phandle = OF_finddevice("/");
if (OF_getprop(phandle, "#address-cells", &address_cells,
- sizeof(address_cells)) < sizeof(address_cells))
+ sizeof(address_cells)) < (ssize_t)sizeof(address_cells))
address_cells = 1;
if (OF_getprop(phandle, "#size-cells", &size_cells,
- sizeof(size_cells)) < sizeof(size_cells))
+ sizeof(size_cells)) < (ssize_t)sizeof(size_cells))
size_cells = 1;
/*
diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c
index 7b38060..eae6386 100644
--- a/sys/powerpc/powermac/macio.c
+++ b/sys/powerpc/powermac/macio.c
@@ -293,7 +293,7 @@ macio_attach(device_t dev)
* Locate the device node and it's base address
*/
if (OF_getprop(root, "assigned-addresses",
- reg, sizeof(reg)) < sizeof(reg)) {
+ reg, sizeof(reg)) < (ssize_t)sizeof(reg)) {
return (ENXIO);
}
OpenPOWER on IntegriCloud