Changeset 25a76ab8 in mainline for boot/generic/include/balloc.h

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/generic/include/balloc.h (moved) (moved from boot/genarch/balloc.h ) (2 diffs)

boot/generic/include/balloc.h

@@ -30 +30 @@
 #define BOOT_BALLOC_H_
 
-#include <types.h>
+#include <typedefs.h>
 
 typedef struct {
@@ -37 +37 @@
 } ballocs_t;
 
-extern void balloc_init(ballocs_t *ball, uintptr_t base, uintptr_t kernel_base);
-extern void *balloc(size_t size, size_t alignment);
-extern void *balloc_rebase(void *ptr);
+extern void balloc_init(ballocs_t *, void *, uintptr_t, size_t);
+extern void *balloc(size_t, size_t);
+extern void *balloc_rebase(void *);
 
 #endif