Rev 534 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 534 | Rev 771 | ||
---|---|---|---|
Line 29... | Line 29... | ||
29 | #ifndef __HEAP_H__ |
29 | #ifndef __HEAP_H__ |
30 | #define __HEAP_H__ |
30 | #define __HEAP_H__ |
31 | 31 | ||
32 | #include <arch/types.h> |
32 | #include <arch/types.h> |
33 | #include <typedefs.h> |
33 | #include <typedefs.h> |
- | 34 | #include <mm/slab.h> |
|
34 | 35 | ||
35 | #define malloc(size) early_malloc(size) |
36 | //#define malloc(size) early_malloc(size) |
36 | #define free(ptr) early_free(ptr) |
37 | //#define free(ptr) early_free(ptr) |
- | 38 | #define malloc(size) kalloc(size,0) |
|
- | 39 | #define free(ptr) kfree(ptr) |
|
37 | 40 | ||
38 | struct chunk { |
41 | struct chunk { |
39 | int used; |
42 | int used; |
40 | chunk_t *next; |
43 | chunk_t *next; |
41 | chunk_t *prev; |
44 | chunk_t *prev; |