lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] ppc: fix a bunch of warnings

Browse Source 
Building a PowerMac kernel with ARCH=powerpc causes a bunch of warnings,
this fixes some of them

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Benjamin Herrenschmidt
2005-11-07 16:41:59 +11:00
committed by Paul Mackerras
parent 75722d3992
commit 21fe3301f1
5 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/powerpc/kernel/prom_init.c
View File

@ -403,19 +403,19 @@ static int __init prom_next_node(phandle *nodep)
}
}
static int __init prom_getprop(phandle node, const char *pname,
static int inline prom_getprop(phandle node, const char *pname,
void *value, size_t valuelen)
{
return call_prom("getprop", 4, 1, node, ADDR(pname),
(u32)(unsigned long) value, (u32) valuelen);
}
static int __init prom_getproplen(phandle node, const char *pname)
static int inline prom_getproplen(phandle node, const char *pname)
{
return call_prom("getproplen", 2, 1, node, ADDR(pname));
}
static int __init prom_setprop(phandle node, const char *pname,
static int inline prom_setprop(phandle node, const char *pname,
void *value, size_t valuelen)
{
return call_prom("setprop", 4, 1, node, ADDR(pname),
@ -1408,8 +1408,9 @@ static int __init prom_find_machine_type(void)
struct prom_t *_prom = &RELOC(prom);
char compat[256];
int len, i = 0;
#ifdef CONFIG_PPC64
phandle rtas;
#endif
len = prom_getprop(_prom->root, "compatible",
compat, sizeof(compat)-1);
if (len > 0) {

3
arch/powerpc/kernel/rtas.c
View File

@ -17,6 +17,7 @@
#include <linux/spinlock.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <asm/prom.h>
#include <asm/rtas.h>
@ -83,7 +84,7 @@ void call_rtas_display_status_delay(unsigned char c)
while (width-- > 0)
call_rtas_display_status(' ');
width = 16;
udelay(500000);
mdelay(500);
pending_newline = 1;
} else {
if (pending_newline) {