Changeset adecf496 in mainline for include


Ignore:
Timestamp:
2005-09-23T22:54:45Z (20 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
48a02ef
Parents:
4841104
Message:

Revert previous change in frame_t as it broke IA-64.
(Most likely some alignment problem.)

Rename heap_init(), malloc() and free(), respectively, to early_heap_init(), early_malloc() and early_free(), respectively.
Define new macros malloc() and free(). They are to be replaced by real functions some day.

Location:
include/mm
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • include/mm/frame.h

    r4841104 radecf496  
    5353        count_t refcount;       /**< when == 0, the frame is in free list */
    5454        link_t link;            /**< link to zone free list when refcount == 0 */
    55 } __attribute__ ((packed));
     55};
    5656
    5757extern spinlock_t zone_head_lock;       /**< this lock protects zone_head list */

  • include/mm/heap.h

    r4841104 radecf496  
    3333#include <typedefs.h>
    3434
     35#define malloc(size)            early_malloc(size)
     36#define free(ptr)               early_free(ptr)
     37
    3538struct chunk {
    3639        int used;
    … …  
    4144};
    4245
    43 extern void heap_init(__address heap, size_t size);
     46extern void early_heap_init(__address heap, size_t size);
    4447
    45 extern void *malloc(size_t size);
    46 extern void free(void *ptr);
     48extern void *early_malloc(size_t size);
     49extern void early_free(void *ptr);
    4750
    4851#endif
Note: See TracChangeset for help on using the changeset viewer.