diff options
| author | Helge Deller <deller@gmx.de> | 2024-01-18 16:36:21 +0100 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2024-01-18 16:36:21 +0100 |
| commit | e4084cae877d83aa4698503d591fd560db2c8f4a (patch) | |
| tree | 8c7e83675c4fa015438e7cbebb3c417ffa2a9276 /src | |
| parent | 170d271d164f3f3ebe7d9296c88df2cd2350f0d2 (diff) | |
| download | seabios-hppa-e4084cae877d83aa4698503d591fd560db2c8f4a.zip seabios-hppa-e4084cae877d83aa4698503d591fd560db2c8f4a.tar.gz seabios-hppa-e4084cae877d83aa4698503d591fd560db2c8f4a.tar.bz2 | |
malloc: Take unsigned long as mask to align
Needed to support 64-bit runtime.
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/malloc.h | 4 | ||||
| -rw-r--r-- | src/parisc/malloc.c | 4 |
2 files changed, 4 insertions, 4 deletions
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 @@ void malloc_preinit(void); 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 @@ static unsigned long stackptr; // 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 @@ malloc_palloc(struct zone_s *zone, u32 size, u32 align) // 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); } |