Changeset e135751 in mainline for boot/generic/src/balloc.c


Ignore:
Timestamp:
2011-03-02T12:00:10Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7a2f8ea0
Parents:
51b46f2 (diff), 37b1651d (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 development/ changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/generic/src/balloc.c

    r51b46f2 re135751  
    6565void *balloc_rebase(void *ptr)
    6666{
    67         return (void *) ((uintptr_t) ptr - phys_base + ballocs->base);
     67        return (void *) (((uintptr_t) ptr - phys_base) + ballocs->base);
    6868}
Note: See TracChangeset for help on using the changeset viewer.