The patch titled
linux-kernel-markers-non-optimized-architures-fallback-flags
has been removed from the -mm tree. Its filename was
linux-kernel-markers-non-optimized-architures-fallback-flags.patch
This patch was dropped because it was folded into linux-kernel-markers-non-optimized-architectures.patch
------------------------------------------------------
Subject: linux-kernel-markers-non-optimized-architures-fallback-flags
From: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
linux-kernel-markers-non-optimized-architures-fallback-flags
- asm-generic/marker.h is now only used as a fallback defining _MARK as
MARK_GENERIC.
- flags support
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-generic/marker.h | 38 ++++++++++++---------------------
1 files changed, 14 insertions(+), 24 deletions(-)
diff -puN include/asm-generic/marker.h~linux-kernel-markers-non-optimized-architures-fallback-flags include/asm-generic/marker.h
--- a/include/asm-generic/marker.h~linux-kernel-markers-non-optimized-architures-fallback-flags
+++ a/include/asm-generic/marker.h
@@ -1,3 +1,6 @@
+#ifndef _ASM_GENERIC_MARKER_H
+#define _ASM_GENERIC_MARKER_H
+
/*
* marker.h
*
@@ -10,31 +13,18 @@
* "used" attribute to fix a gcc 4.1.x bug.
*/
-#ifdef CONFIG_MARKERS
+#define _MF_DEFAULT (_MF_LOCKDEP | _MF_PRINTK)
-#define GEN_MARK(name, format, args...) \
- do { \
- static marker_probe_func *__mark_call_##name = \
- __mark_empty_function; \
- static char __marker_enable_##name = 0; \
- static const struct __mark_marker_c __mark_c_##name \
- __attribute__((section(".markers.c"))) = \
- { #name, &__mark_call_##name, format, \
- MARKER_GENERIC } ; \
- static const struct __mark_marker __mark_##name \
- __attribute__((section(".markers"))) = \
- { &__mark_c_##name, &__marker_enable_##name } ; \
- asm volatile ( "" : : "i" (&__mark_##name)); \
- __mark_check_format(format, ## args); \
- if (unlikely(__marker_enable_##name)) { \
- preempt_disable(); \
- (*__mark_call_##name)(format, ## args); \
- preempt_enable(); \
- } \
- } while (0)
+#define MARK_OPTIMIZED MARK_GENERIC
+#define _MARK MARK_GENERIC
+#define MARK(format, args...) _MARK(_MF_DEFAULT, format, ## args)
+#define MARK_OPTIMIZED_ENABLE_IMMEDIATE_OFFSET \
+ MARK_GENERIC_ENABLE_IMMEDIATE_OFFSET
+#define MARK_OPTIMIZED_ENABLE_TYPE MARK_GENERIC_ENABLE_TYPE
+/* Dereference enable as lvalue from a pointer to its instruction */
+#define MARK_OPTIMIZED_ENABLE MARK_GENERIC_ENABLE
-#define GEN_MARK_ENABLE_IMMEDIATE_OFFSET 0
-#define GEN_MARK_ENABLE_TYPE char
+#define marker_optimized_set_enable marker_generic_set_enable
-#endif
+#endif /* _ASM_GENERIC_MARKER_H */
_
Patches currently in -mm which might be from mathieu.desnoyers@xxxxxxxxxx are
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-alpha.patch
atomich-complete-atomic_long-operations-in-asm-generic.patch
atomich-i386-type-safety-fix.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-ia64.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-mips.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-parisc.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-powerpc.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-sparc64.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-x86_64.patch
atomich-atomic_add_unless-as-inline-remove-systemh-atomich-circular-dependency.patch
local_t-architecture-independant-extension.patch
local_t-alpha-extension.patch
local_t-i386-extension.patch
local_t-ia64-extension.patch
local_t-mips-extension.patch
local_t-parisc-cleanup.patch
local_t-powerpc-extension.patch
local_t-sparc64-cleanup.patch
local_t-x86_64-extension.patch
linux-kernel-markers-kconfig-menus.patch
linux-kernel-markers-architecture-independant-code.patch
linux-kernel-markers-powerpc-optimization.patch
linux-kernel-markers-i386-optimization.patch
linux-kernel-markers-non-optimized-architectures.patch
linux-kernel-markers-non-optimized-architures-fallback-flags.patch
linux-kernel-markers-documentation.patch
linux-kernel-markers-documentation-fix.patch
linux-kernel-markers-documentation-update-adds-context.patch
linux-kernel-markers-documentation-update-markerh.patch
linux-kernel-markers-documentation-update-flags.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
