Changeset 8565a42 in mainline for boot/generic/src/balloc.c


Ignore:
Timestamp:
2018-03-02T20:34:50Z (7 years ago)
Author:
GitHub <noreply@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a1a81f69, d5e5fd1
Parents:
3061bc1 (diff), 34e1206 (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.
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)
git-committer:
GitHub <noreply@…> (2018-03-02 20:34:50)
Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:
1 edited

Legend:

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

    r3061bc1 r8565a42  
    4949        if (alignment == 0)
    5050                return NULL;
    51        
     51
    5252        /* Enforce minimal alignment. */
    5353        alignment = ALIGN_UP(alignment, 4);
    54        
     54
    5555        uintptr_t addr = phys_base + ALIGN_UP(ballocs->size, alignment);
    56        
     56
    5757        if (ALIGN_UP(ballocs->size, alignment) + size >= max_size)
    5858                return NULL;
    59        
     59
    6060        ballocs->size = ALIGN_UP(ballocs->size, alignment) + size;
    61        
     61
    6262        return (void *) addr;
    6363}
Note: See TracChangeset for help on using the changeset viewer.