Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21fe3301 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

[PATCH] ppc: fix a bunch of warnings 



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

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 75722d39

arch/powerpc/kernel/prom_init.c

+5 −4
Original line number Diff line number Diff line
@@ -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) {

arch/powerpc/kernel/rtas.c

+2 −1
Original line number Diff line number Diff line
@@ -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) {

drivers/macintosh/via-pmu.c

+3 −3
Original line number Diff line number Diff line
@@ -2667,10 +2667,10 @@ powerbook_sleep_3400(void) 
	asleep = 1;



	/* Put the CPU into sleep mode */

	asm volatile("mfspr %0,1008" : "=r" (hid0) :);

	hid0 = mfspr(SPRN_HID0);

	hid0 = (hid0 & ~(HID0_NAP | HID0_DOZE)) | HID0_SLEEP;

	asm volatile("mtspr 1008,%0" : : "r" (hid0));

	_nmask_and_or_msr(0, MSR_POW | MSR_EE);

	mtspr(SPRN_HID0, hid0);

	mtmsr(mfmsr() | MSR_POW | MSR_EE);

	udelay(10);



	/* OK, we're awake again, start restoring things */

include/asm-powerpc/xmon.h

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ struct pt_regs; 
extern int xmon(struct pt_regs *excp);

extern void xmon_printf(const char *fmt, ...);

extern void xmon_init(int);

extern void xmon_map_scc(void);



#endif

#endif

include/asm-ppc/btext.h

+11 −11
Original line number Diff line number Diff line
@@ -17,18 +17,18 @@ extern unsigned long disp_BAT[2]; 
extern boot_infos_t disp_bi;

extern int boot_text_mapped;



void btext_init(boot_infos_t *bi);

void btext_welcome(void);

void btext_prepare_BAT(void);

void btext_setup_display(int width, int height, int depth, int pitch,

extern void init_boot_display(void);

extern void btext_welcome(void);

extern void btext_prepare_BAT(void);

extern void btext_setup_display(int width, int height, int depth, int pitch,

				unsigned long address);

void map_boot_text(void);

void btext_update_display(unsigned long phys, int width, int height,

extern void map_boot_text(void);

extern void btext_update_display(unsigned long phys, int width, int height,

				 int depth, int pitch);



void btext_drawchar(char c);

void btext_drawstring(const char *str);

void btext_drawhex(unsigned long v);

extern void btext_drawchar(char c);

extern void btext_drawstring(const char *str);

extern void btext_drawhex(unsigned long v);



#endif /* __KERNEL__ */

#endif /* __PPC_BTEXT_H */