# HG changeset patch
# User Hollis Blanchard <hollisb@xxxxxxxxxx>
# Date 1184613616 18000
# Node ID c9720159b98323a45e1a91c00fee01c680f5d754
# Parent 3867217d31555c6b8340eb48ce52838853fb13ae
[POWERPC][XEN] Use top-level CFLAGS.
- Append to CFLAGS instead of replacing it.
- Fix newly-exposed mixed statement/declaration warnings.
---
xen/arch/powerpc/Rules.mk | 4 ++--
xen/arch/powerpc/mpic_init.c | 4 +++-
xen/arch/powerpc/of-devtree.c | 2 +-
xen/arch/powerpc/of-devwalk.c | 8 +++-----
xen/arch/powerpc/of_handler/ofh.c | 24 ++++--------------------
xen/arch/powerpc/ofd_fixup.c | 13 ++++++++-----
xen/include/asm-powerpc/xenoprof.h | 2 +-
7 files changed, 22 insertions(+), 35 deletions(-)
diff -r 3867217d3155 -r c9720159b983 xen/arch/powerpc/Rules.mk
--- a/xen/arch/powerpc/Rules.mk Fri Jul 13 17:28:15 2007 -0500
+++ b/xen/arch/powerpc/Rules.mk Mon Jul 16 14:20:16 2007 -0500
@@ -9,8 +9,8 @@ C_WARNINGS := -Wredundant-decls
# _no_ common code can have packed data structures or we are in touble.
C_WARNINGS += -Wpacked
-CFLAGS := -m64 -ffreestanding -fno-builtin -fno-common
-CFLAGS += -iwithprefix include -Wall -Werror -pipe
+CFLAGS += -m64 -ffreestanding -fno-builtin -fno-common
+CFLAGS += -iwithprefix include -Werror -pipe
CFLAGS += -I$(BASEDIR)/include
CFLAGS += -I$(BASEDIR)/include/asm-powerpc/mach-generic
CFLAGS += -I$(BASEDIR)/include/asm-powerpc/mach-default
diff -r 3867217d3155 -r c9720159b983 xen/arch/powerpc/mpic_init.c
--- a/xen/arch/powerpc/mpic_init.c Fri Jul 13 17:28:15 2007 -0500
+++ b/xen/arch/powerpc/mpic_init.c Mon Jul 16 14:20:16 2007 -0500
@@ -153,13 +153,15 @@ static unsigned long find_ranges_addr_fr
u32 addr_c = 2;
u32 ranges[64];
int p_len;
+ int i;
parent = ofd_node_parent(oft_p, c);
parent = ofd_node_parent(oft_p, parent);
p_len = ofd_getprop(oft_p, parent, "ranges", &ranges, sizeof(ranges));
DBG("%s: ranges\n", __func__);
- int i; for (i=0; i<p_len; i++) {DBG("%08x ", ranges[i]);}
+ for (i=0; i<p_len; i++)
+ DBG("%08x ", ranges[i]);
DBG("\n");
p_len = ofd_getprop(oft_p, parent, "#address-cells",
diff -r 3867217d3155 -r c9720159b983 xen/arch/powerpc/of-devtree.c
--- a/xen/arch/powerpc/of-devtree.c Fri Jul 13 17:28:15 2007 -0500
+++ b/xen/arch/powerpc/of-devtree.c Mon Jul 16 14:20:16 2007 -0500
@@ -939,12 +939,12 @@ ofdn_t ofd_node_find_by_prop(
size_t sz)
{
struct ofd_mem *m = (struct ofd_mem *)mem;
+ ofdn_t prev = -1;
if ( n <= 0 ) {
n = OFD_ROOT;
}
- ofdn_t prev = -1;
return ofd_find_by_prop(m, -1, &prev, n, name, val, sz);
}
diff -r 3867217d3155 -r c9720159b983 xen/arch/powerpc/of-devwalk.c
--- a/xen/arch/powerpc/of-devwalk.c Fri Jul 13 17:28:15 2007 -0500
+++ b/xen/arch/powerpc/of-devwalk.c Mon Jul 16 14:20:16 2007 -0500
@@ -32,13 +32,13 @@ void ofd_prop_print(
const char *prop,
size_t sz)
{
+#define DEBUG_PROP
+#ifndef DEBUG_PROP
if ( path[0] == '/' && path[1] == '\0' ) {
path = "";
}
printk("%s: %s/%s: 0x%lx\n", head, path, name, sz);
-
-#define DEBUG_PROP
-#ifdef DEBUG_PROP
+#else
int i;
int isstr = sz;
const char *b = prop;
@@ -75,8 +75,6 @@ void ofd_prop_print(
}
printk("\n");
}
-#else
- (void)prop;
#endif
}
diff -r 3867217d3155 -r c9720159b983 xen/arch/powerpc/of_handler/ofh.c
--- a/xen/arch/powerpc/of_handler/ofh.c Fri Jul 13 17:28:15 2007 -0500
+++ b/xen/arch/powerpc/of_handler/ofh.c Mon Jul 16 14:20:16 2007 -0500
@@ -50,29 +50,13 @@ void
void
assprint(const char *expr, const char *file, int line, const char *fmt, ...)
{
- char a[15];
-
- a[0] = '\n';
- a[1] = '\n';
- a[2] = 'O';
- a[3] = 'F';
- a[4] = 'H';
- a[5] = ':';
- a[6] = 'A';
- a[7] = 'S';
- a[8] = 'S';
- a[9] = 'E';
- a[10] = 'R';
- a[11] = 'T';
- a[12] = '!';
- a[13] = '\n';
- a[14] = '\n';
-
+ char a[15] = {
+ '\n', '\n', 'O', 'F', 'H', ':', 'A', 'S', 'S', 'E', 'R', 'T', '!',
+ '\n', '\n',
+ };
s32 actual;
u32 t = 1;
volatile u32 *tp = &t;
-
- (void)expr; (void)file; (void)line; (void)fmt;
ofh_cons_write(a, sizeof (a), &actual);
diff -r 3867217d3155 -r c9720159b983 xen/arch/powerpc/ofd_fixup.c
--- a/xen/arch/powerpc/ofd_fixup.c Fri Jul 13 17:28:15 2007 -0500
+++ b/xen/arch/powerpc/ofd_fixup.c Mon Jul 16 14:20:16 2007 -0500
@@ -363,9 +363,12 @@ ulong ofd_dom0_fixup(struct domain *d, u
ulong ofd_dom0_fixup(struct domain *d, ulong mem, const char *cmdline,
ulong shared_info)
{
+ const char compat[] = "Hypervisor,Maple";
+ const char d0[] = "dom0";
void *m;
const ofdn_t n = OFD_ROOT;
ofdn_t r;
+ u32 did;
m = (void *)mem;
@@ -404,16 +407,16 @@ ulong ofd_dom0_fixup(struct domain *d, u
rtas_proxy_init(m);
#ifdef FIX_COMPAT
- const char compat[] = "Hypervisor,Maple";
r = ofd_prop_add(m, n, "compatible", compat, sizeof (compat));
ASSERT( r > 0 );
-#endif
-
- u32 did = d->domain_id;
+#else
+ (void)compat;
+#endif
+
+ did = d->domain_id;
r = ofd_prop_add(m, n, "ibm,partition-no", &did, sizeof(did));
ASSERT( r > 0 );
- const char d0[] = "dom0";
r = ofd_prop_add(m, n, "ibm,partition-name", d0, sizeof (d0));
ASSERT( r > 0 );
diff -r 3867217d3155 -r c9720159b983 xen/include/asm-powerpc/xenoprof.h
--- a/xen/include/asm-powerpc/xenoprof.h Fri Jul 13 17:28:15 2007 -0500
+++ b/xen/include/asm-powerpc/xenoprof.h Mon Jul 16 14:20:16 2007 -0500
@@ -83,7 +83,7 @@ static inline void ctr_write(unsigned in
}
}
-static inline void print_perf_status()
+static inline void print_perf_status(void)
{
ulong mmcr0 = mfmmcr0();
ulong mmcr1 = mfmmcr1();
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home