Changeset 46c20c8 in mainline for kernel/generic/include/context.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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

@@ -36 +36 @@
 #define KERN_CONTEXT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
+#include <trace.h>
 #include <arch/context.h>
 
@@ -87 +88 @@
  *
  * @param ctx Context structure.
+ *
  */
-static inline void context_restore(context_t *ctx)
+NO_TRACE static inline void context_restore(context_t *ctx)
 {
         context_restore_arch(ctx);