Changeset bc73be3 in mainline for kernel/generic/include/macros.h


Ignore:
Timestamp:
2019-06-27T08:51:20Z (7 years ago)
Author:
Jaroslav Jindrak <dzejrou@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8add15e0
Parents:
ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/macros.h

    rad40b74b rbc73be3  
    4949 *
    5050 */
    51 NO_TRACE static inline int overlaps(uint64_t s1, uint64_t sz1, uint64_t s2,
     51_NO_TRACE static inline int overlaps(uint64_t s1, uint64_t sz1, uint64_t s2,
    5252    uint64_t sz2)
    5353{
    … …  
    7878 *
    7979 */
    80 NO_TRACE static inline int iswithin(uint64_t s1, uint64_t sz1, uint64_t s2,
     80_NO_TRACE static inline int iswithin(uint64_t s1, uint64_t sz1, uint64_t s2,
    8181    uint64_t sz2)
    8282{
Note: See TracChangeset for help on using the changeset viewer.