From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

use the new MF_* bitmask for asm-generic/marker.h.  Document
asm-generic/marker.h.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Ian Molton <spyro@f2s.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/asm-alpha/marker.h   |   13 +++++++++++++
 include/asm-arm26/marker.h   |   13 +++++++++++++
 include/asm-generic/marker.h |   11 +++++++++--
 3 files changed, 35 insertions(+), 2 deletions(-)

diff -puN /dev/null include/asm-alpha/marker.h
--- /dev/null
+++ a/include/asm-alpha/marker.h
@@ -0,0 +1,13 @@
+/*
+ * marker.h
+ *
+ * Code markup for dynamic and static tracing. Architecture specific
+ * optimisations.
+ *
+ * No optimisation implemented.
+ *
+ * This file is released under the GPLv2.
+ * See the file COPYING for more details.
+ */
+
+#include <asm-generic/marker.h>
diff -puN /dev/null include/asm-arm26/marker.h
--- /dev/null
+++ a/include/asm-arm26/marker.h
@@ -0,0 +1,13 @@
+/*
+ * marker.h
+ *
+ * Code markup for dynamic and static tracing. Architecture specific
+ * optimisations.
+ *
+ * No optimisation implemented.
+ *
+ * This file is released under the GPLv2.
+ * See the file COPYING for more details.
+ */
+
+#include <asm-generic/marker.h>
diff -puN include/asm-generic/marker.h~markers-alpha-and-avr32-supportadd-alpha-markerh-add-arm26-markerh include/asm-generic/marker.h
--- a/include/asm-generic/marker.h~markers-alpha-and-avr32-supportadd-alpha-markerh-add-arm26-markerh
+++ a/include/asm-generic/marker.h
@@ -13,11 +13,18 @@
  * "used" attribute to fix a gcc 4.1.x bug.
  */
 
-#define _MF_DEFAULT			(_MF_LOCKDEP | _MF_PRINTK)
+/* Default flags, used by MARK() */
+#define MF_DEFAULT			(MF_LOCKDEP | MF_PRINTK)
 
+/* Fallback on the generic markers, since no optimized version is available */
 #define MARK_OPTIMIZED			MARK_GENERIC
 #define _MARK				MARK_GENERIC
-#define MARK(format, args...)		_MARK(_MF_DEFAULT, format, ## args)
+
+/* Marker with default behavior */
+#define MARK(format, args...)		_MARK(MF_DEFAULT, format, ## args)
+
+/* Architecture dependant marker information, used internally for marker
+ * activation. */
 
 #define MARK_OPTIMIZED_ENABLE_IMMEDIATE_OFFSET \
 		MARK_GENERIC_ENABLE_IMMEDIATE_OFFSET
_