aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/ops.h
diff options
context:
space:
mode:
authorGeert Uytterhoeven <Geert.Uytterhoeven@eu.sony.com>2007-04-18 05:24:12 -0400
committerPaul Mackerras <paulus@samba.org>2007-04-24 08:06:54 -0400
commit4ca478e6066ce57f7cc856af36aaf1a2d64417cb (patch)
treee7fd07e2a44e0027064c62e493fc9f7015fe9dcf /arch/powerpc/boot/ops.h
parente58923ed14370e0facc5eb2c3923216adc3bf260 (diff)
[POWERPC] bootwrapper: Use `unsigned long' for malloc sizes
Use `unsigned long' for malloc sizes, to match common practice and types used by most callers and callees. Also use `unsigned long' for integers representing pointers in simple_alloc. Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@eu.sony.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/boot/ops.h')
-rw-r--r--arch/powerpc/boot/ops.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h
index ee0f9c25f839..20e87199f6a4 100644
--- a/arch/powerpc/boot/ops.h
+++ b/arch/powerpc/boot/ops.h
@@ -23,7 +23,7 @@
23struct platform_ops { 23struct platform_ops {
24 void (*fixups)(void); 24 void (*fixups)(void);
25 void (*image_hdr)(const void *); 25 void (*image_hdr)(const void *);
26 void * (*malloc)(u32 size); 26 void * (*malloc)(unsigned long size);
27 void (*free)(void *ptr); 27 void (*free)(void *ptr);
28 void * (*realloc)(void *ptr, unsigned long size); 28 void * (*realloc)(void *ptr, unsigned long size);
29 void (*exit)(void); 29 void (*exit)(void);
@@ -79,8 +79,8 @@ void start(void);
79int ft_init(void *dt_blob, unsigned int max_size, unsigned int max_find_device); 79int ft_init(void *dt_blob, unsigned int max_size, unsigned int max_find_device);
80int serial_console_init(void); 80int serial_console_init(void);
81int ns16550_console_init(void *devp, struct serial_console_data *scdp); 81int ns16550_console_init(void *devp, struct serial_console_data *scdp);
82void *simple_alloc_init(char *base, u32 heap_size, u32 granularity, 82void *simple_alloc_init(char *base, unsigned long heap_size,
83 u32 max_allocs); 83 unsigned long granularity, unsigned long max_allocs);
84extern void flush_cache(void *, unsigned long); 84extern void flush_cache(void *, unsigned long);
85int dt_xlate_reg(void *node, int res, unsigned long *addr, 85int dt_xlate_reg(void *node, int res, unsigned long *addr,
86 unsigned long *size); 86 unsigned long *size);
@@ -164,7 +164,7 @@ static inline void *find_node_by_linuxphandle(const u32 linuxphandle)
164 (char *)&linuxphandle, sizeof(u32)); 164 (char *)&linuxphandle, sizeof(u32));
165} 165}
166 166
167static inline void *malloc(u32 size) 167static inline void *malloc(unsigned long size)
168{ 168{
169 return (platform_ops.malloc) ? platform_ops.malloc(size) : NULL; 169 return (platform_ops.malloc) ? platform_ops.malloc(size) : NULL;
170} 170}