The patch titled
linux-kernel-markers-i386-optimization update
has been removed from the -mm tree. Its filename was
linux-kernel-markers-i386-optimization-update.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: linux-kernel-markers-i386-optimization update
From: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-i386/marker.h | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff -puN include/asm-i386/marker.h~linux-kernel-markers-i386-optimization-update include/asm-i386/marker.h
--- a/include/asm-i386/marker.h~linux-kernel-markers-i386-optimization-update
+++ a/include/asm-i386/marker.h
@@ -18,7 +18,7 @@
#define MF_DEFAULT (MF_OPTIMIZED | MF_LOCKDEP | MF_PRINTK)
/* Optimized version of the markers */
-#define MARK_OPTIMIZED(flags, name, format, args...) \
+#define trace_mark_optimized(flags, name, format, args...) \
do { \
static const char __mstrtab_name_##name[] \
__attribute__((section("__markers_strings"))) \
@@ -26,9 +26,13 @@
static const char __mstrtab_format_##name[] \
__attribute__((section("__markers_strings"))) \
= format; \
+ static const char __mstrtab_args_##name[] \
+ __attribute__((section("__markers_strings"))) \
+ = #args; \
static struct __mark_marker_data __mark_data_##name \
__attribute__((section("__markers_data"))) = \
{ __mstrtab_name_##name, __mstrtab_format_##name, \
+ __mstrtab_args_##name, \
(flags) | MF_OPTIMIZED, __mark_empty_function, NULL }; \
char condition; \
asm volatile( ".section __markers, \"a\", @progbits;\n\t" \
@@ -40,7 +44,8 @@
: "=r" (condition) \
: "m" (__mark_data_##name)); \
__mark_check_format(format, ## args); \
- if (unlikely(condition)) { \
+ if (likely(!condition)) { \
+ } else { \
preempt_disable(); \
(*__mark_data_##name.call)(&__mark_data_##name, \
format, ## args); \
@@ -53,9 +58,9 @@
#define _trace_mark(flags, format, args...) \
do { \
if (((flags) & MF_LOCKDEP) && ((flags) & MF_OPTIMIZED)) \
- MARK_OPTIMIZED(flags, format, ## args); \
+ trace_mark_optimized(flags, format, ## args); \
else \
- MARK_GENERIC(flags, format, ## args); \
+ trace_mark_generic(flags, format, ## args); \
} while (0)
/* Marker with default behavior */
_
Patches currently in -mm which might be from mathieu.desnoyers@xxxxxxxxxx are
origin.patch
git-avr32.patch
powerpc-promc-remove-undef-printk.patch
linux-kernel-markers-i386-optimization-update.patch
linux-kernel-markers-non-optimized-architectures.patch
linux-kernel-markers-non-optimized-architectures-update.patch
linux-kernel-markers-documentation.patch
linux-kernel-markers-documentation-update.patch
markers-define-the-linker-macro-extra_rwdata.patch
markers-use-extra_rwdata-in-architectures.patch
port-of-blktrace-to-the-linux-kernel-markers.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
