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


Ignore:
Timestamp:
2019-02-11T22:31:04Z (5 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Children:
aaf9789c
Parents:
e3272101 (diff), 4805495 (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:

merging with upstream/master

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/macros.h

    re3272101 rd5a89a3  
    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.