Changeset 89c57b6 in mainline for kernel/generic/include/context.h

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/context.h (modified) (2 diffs)

kernel/generic/include/context.h

@@ -37 +37 @@
 
 #include <typedefs.h>
+#include <trace.h>
 #include <arch/context.h>
 
@@ -89 +90 @@
  *
  */
-static inline void __attribute__((no_instrument_function))
-    context_restore(context_t *ctx)
+NO_TRACE static inline void context_restore(context_t *ctx)
 {
         context_restore_arch(ctx);