Fork us on GitHub Follow us on Facebook Follow us on Twitter

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


Ignore:
Timestamp:
2010-05-08T07:53:23Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
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:
1 moved

Legend:

Unmodified
Added
Removed
  • boot/generic/include/balloc.h

    r6c39a907 r25a76ab8  
    3030#define BOOT_BALLOC_H_
    3131
    32 #include <types.h>
     32#include <typedefs.h>
    3333
    3434typedef struct {
     
    3737} ballocs_t;
    3838
    39 extern void balloc_init(ballocs_t *ball, uintptr_t base, uintptr_t kernel_base);
    40 extern void *balloc(size_t size, size_t alignment);
    41 extern void *balloc_rebase(void *ptr);
     39extern void balloc_init(ballocs_t *, void *, uintptr_t, size_t);
     40extern void *balloc(size_t, size_t);
     41extern void *balloc_rebase(void *);
    4242
    4343#endif
Note: See TracChangeset for help on using the changeset viewer.