Changeset 7a0359b in mainline for kernel/arch/amd64/include/mm

Timestamp:

2010-07-02T15:42:19Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bbfdf62

Parents:

e3ee9b9

Message:

improve kernel function tracing

• add support for more generic kernel sources
• replace attribute((no_instrument_function)) with NO_TRACE macro (shorter and for future compatibility with different compilers)
• to be on the safe side, do not instrument most of the inline and static functions (plus some specific non-static functions)

collateral code cleanup (no change in functionality)

Location:

kernel/arch/amd64/include/mm

Files:

• frame.h (modified) (1 diff)
• page.h (modified) (4 diffs)

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

@@ -36 +36 @@
 #define KERN_amd64_FRAME_H_
 
-#ifndef __ASM__
-#include <typedefs.h>
-#endif /* __ASM__ */
-
 #define FRAME_WIDTH  12  /* 4K */
 #define FRAME_SIZE   (1 << FRAME_WIDTH)
 
+#ifdef KERNEL
 #ifndef __ASM__
+
+#include <typedefs.h>
+
 extern uintptr_t last_frame;
 extern void frame_arch_init(void);
 extern void physmem_print(void);
+
 #endif /* __ASM__ */
+#endif /* KERNEL */
 
 #endif

kernel/arch/amd64/include/mm/page.h

@@ -46 +46 @@
 
 #include <arch/mm/frame.h>
+#include <trace.h>
 
 #define PAGE_WIDTH  FRAME_WIDTH
@@ -187 +188 @@
 } __attribute__ ((packed)) pte_t;
 
-static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
+NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
 {
         pte_t *p = &pt[i];
@@ -200 +201 @@
 }
 
-static inline void set_pt_addr(pte_t *pt, size_t i, uintptr_t a)
+NO_TRACE static inline void set_pt_addr(pte_t *pt, size_t i, uintptr_t a)
 {
         pte_t *p = &pt[i];
@@ -208 +209 @@
 }
 
-static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
+NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
 {
         pte_t *p = &pt[i];