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

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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:

• boot/generic/src/balloc.c (modified) (1 diff)

boot/generic/src/balloc.c

@@ -65 +65 @@
 void *balloc_rebase(void *ptr)
 {
-        return (void *) ((uintptr_t) ptr - phys_base + ballocs->base);
+        return (void *) (((uintptr_t) ptr - phys_base) + ballocs->base);
 }