Changeset bb68433 in mainline for generic/include


Ignore:
Timestamp:
2006-02-08T22:58:06Z (20 years ago)
Author:
Ondrej Palkovsky <ondrap@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7e4e532
Parents:
85dc2e7
Message:

Changed malloc to include second parameter and documented
recommended usage.
Added zone merging, made ia32 & amd64 to merge found zones.

Location:
generic/include/mm
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • generic/include/mm/buddy.h

    r85dc2e7 rbb68433  
    4646        /** Find parent of block that has given order  */
    4747        link_t *(* find_block)(buddy_system_t *, link_t *, __u8);
     48        void (* print_id)(buddy_system_t *, link_t *);
    4849};
    4950

  • generic/include/mm/frame.h

    r85dc2e7 rbb68433  
    5454
    5555/* Return true if the interlvals overlap */
    56 static inline int overlaps(__address s1,__address e1, __address s2, __address e2)
     56static inline int overlaps(__address s1,__address sz1, __address s2, __address sz2)
    5757{
     58        __address e1 = s1+sz1;
     59        __address e2 = s2+sz2;
    5860        if (s1 >= s2 && s1 < e2)
    5961                return 1;
    … …  
    9698extern void frame_free(__address addr);
    9799
    98 extern void zone_create(pfn_t start, count_t count, pfn_t confframe, int flags);
    99 
     100extern int zone_create(pfn_t start, count_t count, pfn_t confframe, int flags);
    100101void * frame_get_parent(pfn_t frame, int hint);
    101102void frame_set_parent(pfn_t frame, void *data, int hint);
    102103void frame_mark_unavailable(pfn_t start, count_t count);
    103 __address zone_conf_size(pfn_t start, count_t count);
     104__address zone_conf_size(count_t count);
     105void zone_merge(int z1, int z2);
     106void zone_merge_all(void);
    104107
    105108/*

  • generic/include/mm/slab.h

    r85dc2e7 rbb68433  
    126126
    127127/* Malloc support */
    128 extern void * kalloc(unsigned int size, int flags);
    129 extern void kfree(void *obj);
    130 #define malloc(x)  kalloc(x, FRAME_ATOMIC)
    131 #define free(x)    kfree(x)
     128extern void * malloc(unsigned int size, int flags);
     129extern void free(void *obj);
    132130#endif
Note: See TracChangeset for help on using the changeset viewer.