From: Andrew Morton <akpm@linux-foundation.org>

Cc: "Frank Ch. Eigler" <fche@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---


diff -puN include/linux/marker.h~linux-kernel-markers-checkpatch-fixes include/linux/marker.h
--- a/include/linux/marker.h~linux-kernel-markers-checkpatch-fixes
+++ a/include/linux/marker.h
@@ -61,7 +61,7 @@ struct __mark_marker {
 		__attribute__((section("__markers"))) =			\
 		{ __mstrtab_name_##name, __mstrtab_format_##name,	\
 		0, __mark_empty_function, NULL };			\
-		asm volatile ( "" : : "i" (&__mark_##name));		\
+		asm volatile("" : : "i" (&__mark_##name));		\
 		__mark_check_format(format, ## args);			\
 		if (unlikely(__mark_##name.state)) {			\
 			preempt_disable();				\
diff -puN kernel/marker.c~linux-kernel-markers-checkpatch-fixes kernel/marker.c
--- a/kernel/marker.c~linux-kernel-markers-checkpatch-fixes
+++ a/kernel/marker.c
@@ -435,7 +435,7 @@ EXPORT_SYMBOL_GPL(marker_probe_unregiste
  */
 int marker_arm(const char *name)
 {
-	struct marker_entry * entry;
+	struct marker_entry *entry;
 	int ret = 0, need_update = 0;
 
 	mutex_lock(&markers_mutex);
@@ -468,7 +468,7 @@ EXPORT_SYMBOL_GPL(marker_arm);
  */
 int marker_disarm(const char *name)
 {
-	struct marker_entry * entry;
+	struct marker_entry *entry;
 	int ret = 0, need_update = 0;
 
 	mutex_lock(&markers_mutex);
diff -puN kernel/module.c~linux-kernel-markers-checkpatch-fixes kernel/module.c
--- a/kernel/module.c~linux-kernel-markers-checkpatch-fixes
+++ a/kernel/module.c
@@ -1985,7 +1985,8 @@ static struct module *load_module(void _
 	}
 #endif
 	markersindex = find_sec(hdr, sechdrs, secstrings, "__markers");
- 	markersstringsindex = find_sec(hdr, sechdrs, secstrings, "__markers_strings");
+ 	markersstringsindex = find_sec(hdr, sechdrs, secstrings,
+					"__markers_strings");
 
 	/* Now do relocations. */
 	for (i = 1; i < hdr->e_shnum; i++) {
_