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

Timestamp:

2010-07-02T14:19:30Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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:

• kernel/generic/include/macros.h (modified) (1 diff)

kernel/generic/include/macros.h

@@ -47 +47 @@
  * @param sz2 Size of the second interval.
  */
-static inline int overlaps(uintptr_t s1, size_t sz1, uintptr_t s2, size_t sz2)
+static inline int __attribute__((no_instrument_function))
+    overlaps(uintptr_t s1, size_t sz1, uintptr_t s2, size_t sz2)
 {
         uintptr_t e1 = s1 + sz1;