Changeset 89c57b6 in mainline for kernel/arch/ppc32/include/mm/frame.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/arch/ppc32/include/mm/frame.h (modified) (1 diff)

kernel/arch/ppc32/include/mm/frame.h

@@ -43 +43 @@
 
 #include <typedefs.h>
+#include <trace.h>
 
 extern uintptr_t last_frame;
 
-static inline uint32_t physmem_top(void)
+NO_TRACE static inline uint32_t physmem_top(void)
 {
         uint32_t physmem;