Changeset 87b4baac in mainline for kernel/generic/include/mm


Ignore:
Timestamp:
2010-12-17T20:16:46Z (15 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
424558a
Parents:
463e734 (diff), bbc74af7 (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

Location:
kernel/generic/include/mm
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/mm/as.h

    r463e734 r87b4baac  
    303303
    304304/* Address space area related syscalls. */
    305 extern unative_t sys_as_area_create(uintptr_t, size_t, unsigned int);
    306 extern unative_t sys_as_area_resize(uintptr_t, size_t, unsigned int);
    307 extern unative_t sys_as_area_change_flags(uintptr_t, unsigned int);
    308 extern unative_t sys_as_area_destroy(uintptr_t);
     305extern sysarg_t sys_as_area_create(uintptr_t, size_t, unsigned int);
     306extern sysarg_t sys_as_area_resize(uintptr_t, size_t, unsigned int);
     307extern sysarg_t sys_as_area_change_flags(uintptr_t, unsigned int);
     308extern sysarg_t sys_as_area_destroy(uintptr_t);
    309309
    310310/* Introspection functions. */

  • kernel/generic/include/mm/frame.h

    r463e734 r87b4baac  
    144144
    145145#define IS_BUDDY_ORDER_OK(index, order) \
    146     ((~(((unative_t) -1) << (order)) & (index)) == 0)
     146    ((~(((sysarg_t) -1) << (order)) & (index)) == 0)
    147147#define IS_BUDDY_LEFT_BLOCK(zone, frame) \
    148148    (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x01) == 0)
Note: See TracChangeset for help on using the changeset viewer.