malloc: Take unsigned long as mask to align
Needed to support 64-bit runtime.
Signed-off-by: Helge Deller <deller@gmx.de>
diff --git a/src/malloc.h b/src/malloc.h
index 73962b4..016761c 100644
--- a/src/malloc.h
+++ b/src/malloc.h
@@ -16,8 +16,8 @@
extern u32 LegacyRamSize;
void malloc_init(void);
void malloc_prepboot(void);
-unsigned long malloc_palloc(struct zone_s *zone, u32 size, u32 align);
-void *parisc_malloc(u32 size, u32 align);
+unsigned long malloc_palloc(struct zone_s *zone, u32 size, unsigned long align);
+void *parisc_malloc(u32 size, unsigned long align);
void *x86_malloc(struct zone_s *zone, u32 size, u32 align);
#define _malloc(zone, size, align) \
(CONFIG_X86 ? x86_malloc(zone, size, align) : parisc_malloc(size, align))
diff --git a/src/parisc/malloc.c b/src/parisc/malloc.c
index b4f56d5..399d300 100644
--- a/src/parisc/malloc.c
+++ b/src/parisc/malloc.c
@@ -23,7 +23,7 @@
// Allocate physical memory from the given zone and track it as a PMM allocation
unsigned long
-malloc_palloc(struct zone_s *zone, u32 size, u32 align)
+malloc_palloc(struct zone_s *zone, u32 size, unsigned long align)
{
unsigned long data;
@@ -42,7 +42,7 @@
// Allocate virtual memory from the given zone
void * __malloc
-parisc_malloc(u32 size, u32 align)
+parisc_malloc(u32 size, unsigned long align)
{
return (void*) malloc_palloc(NULL, size, align);
}
