Merge commit 'v2.6.28-rc6' into core/debug

[linux-2.6-block.git] / include / linux / compiler.h

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 8322141ee480c802ee6919d0f13a86218e45bfc4..98115d9d04daa6c8008b528bee3014a8cee11078 100644 (file)
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -44,6 +44,8 @@ extern void __chk_io_ptr(const volatile void __iomem *);
 # error Sorry, your compiler is too old/not recognized.
 #endif
 
+#define notrace __attribute__((no_instrument_function))
+
 /* Intel compiler defines __GNUC__. So we will overwrite implementations
  * coming from above header files here
  */