[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>

diff --git a/arch/powerpc/boot/of.c b/arch/powerpc/boot/of.c
index 8fb42b63ec5348a50c4d008b5eac04316afdc528..d16ee3e3f868eb2592822d63ecff77e07faeccc9 100644 (file)
--- a/arch/powerpc/boot/of.c
+++ b/arch/powerpc/boot/of.c
@@ -173,7 +173,7 @@ static void *claim(unsigned long virt, unsigned long size, unsigned long align)
        return (void *) virt;
 }
 
-static void *of_try_claim(u32 size)
+static void *of_try_claim(unsigned long size)
 {
        unsigned long addr = 0;
 

diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h
index ee0f9c25f8398599fbf64db1fa8c6a25f453cbb0..20e87199f6a4f92124401305ae51d49aae5e7772 100644 (file)
--- a/arch/powerpc/boot/ops.h
+++ b/arch/powerpc/boot/ops.h
@@ -23,7 +23,7 @@
 struct platform_ops {
        void    (*fixups)(void);
        void    (*image_hdr)(const void *);
-       void *  (*malloc)(u32 size);
+       void *  (*malloc)(unsigned long size);
        void    (*free)(void *ptr);
        void *  (*realloc)(void *ptr, unsigned long size);
        void    (*exit)(void);
@@ -79,8 +79,8 @@ void start(void);
 int ft_init(void *dt_blob, unsigned int max_size, unsigned int max_find_device);
 int serial_console_init(void);
 int ns16550_console_init(void *devp, struct serial_console_data *scdp);
-void *simple_alloc_init(char *base, u32 heap_size, u32 granularity,
-               u32 max_allocs);
+void *simple_alloc_init(char *base, unsigned long heap_size,
+                       unsigned long granularity, unsigned long max_allocs);
 extern void flush_cache(void *, unsigned long);
 int dt_xlate_reg(void *node, int res, unsigned long *addr,
                  unsigned long *size);
@@ -164,7 +164,7 @@ static inline void *find_node_by_linuxphandle(const u32 linuxphandle)
                        (char *)&linuxphandle, sizeof(u32));
 }
 
-static inline void *malloc(u32 size)
+static inline void *malloc(unsigned long size)
 {
        return (platform_ops.malloc) ? platform_ops.malloc(size) : NULL;
 }

diff --git a/arch/powerpc/boot/simple_alloc.c b/arch/powerpc/boot/simple_alloc.c
index cfe3a7505ba08da51bd60cba7b1e228efe0b6660..65ec135d015798490560c3a5bf419cc08e42aa9e 100644 (file)
--- a/arch/powerpc/boot/simple_alloc.c
+++ b/arch/powerpc/boot/simple_alloc.c
@@ -19,24 +19,24 @@
 #define        ENTRY_IN_USE    0x02
 
 static struct alloc_info {
-       u32     flags;
-       u32     base;
-       u32     size;
+       unsigned long   flags;
+       unsigned long   base;
+       unsigned long   size;
 } *alloc_tbl;
 
-static u32 tbl_entries;
-static u32 alloc_min;
-static u32 next_base;
-static u32 space_left;
+static unsigned long tbl_entries;
+static unsigned long alloc_min;
+static unsigned long next_base;
+static unsigned long space_left;
 
 /*
  * First time an entry is used, its base and size are set.
  * An entry can be freed and re-malloc'd but its base & size don't change.
  * Should be smart enough for needs of bootwrapper.
  */
-static void *simple_malloc(u32 size)
+static void *simple_malloc(unsigned long size)
 {
-       u32 i;
+       unsigned long i;
        struct alloc_info *p = alloc_tbl;
 
        if (size == 0)
@@ -67,13 +67,14 @@ err_out:
 
 static struct alloc_info *simple_find_entry(void *ptr)
 {
-       u32 i;
+       unsigned long i;
        struct alloc_info *p = alloc_tbl;
 
        for (i=0; i<tbl_entries; i++,p++) {
                if (!(p->flags & ENTRY_BEEN_USED))
                        break;
-               if ((p->flags & ENTRY_IN_USE) && (p->base == (u32)ptr))
+               if ((p->flags & ENTRY_IN_USE) &&
+                   (p->base == (unsigned long)ptr))
                        return p;
        }
        return NULL;
@@ -122,10 +123,10 @@ static void *simple_realloc(void *ptr, unsigned long size)
  * Returns addr of first byte after heap so caller can see if it took
  * too much space.  If so, change args & try again.
  */
-void *simple_alloc_init(char *base, u32 heap_size, u32 granularity,
-               u32 max_allocs)
+void *simple_alloc_init(char *base, unsigned long heap_size,
+                       unsigned long granularity, unsigned long max_allocs)
 {
-       u32 heap_base, tbl_size;
+       unsigned long heap_base, tbl_size;
 
        heap_size = _ALIGN_UP(heap_size, granularity);
        alloc_min = granularity;
@@ -136,7 +137,7 @@ void *simple_alloc_init(char *base, u32 heap_size, u32 granularity,
        alloc_tbl = (struct alloc_info *)_ALIGN_UP((unsigned long)base, 8);
        memset(alloc_tbl, 0, tbl_size);
 
-       heap_base = _ALIGN_UP((u32)alloc_tbl + tbl_size, alloc_min);
+       heap_base = _ALIGN_UP((unsigned long)alloc_tbl + tbl_size, alloc_min);
 
        next_base = heap_base;
        space_left = heap_size;