From: Randy Dunlap <rdunlap@xenotime.net>

Fix function description + definition so that a #macro does not come
between them and interfere with the kernel-doc.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Rolf Eike Beer <eike-kernel@sf-tec.de>
Cc: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---


diff -puN kernel/timer.c~fix-kerneldoc-comments-in-kernel-timerc-fix kernel/timer.c
--- a/kernel/timer.c~fix-kerneldoc-comments-in-kernel-timerc-fix
+++ a/kernel/timer.c
@@ -406,6 +406,8 @@ static int cascade(tvec_base_t *base, tv
 	return index;
 }
 
+#define INDEX(N) ((base->timer_jiffies >> (TVR_BITS + (N) * TVN_BITS)) & TVN_MASK)
+
 /**
  * __run_timers - run all expired timers (if any) on this CPU.
  * @base: the timer vector to be processed.
@@ -413,8 +415,6 @@ static int cascade(tvec_base_t *base, tv
  * This function cascades all vectors and executes all expired timer
  * vectors.
  */
-#define INDEX(N) ((base->timer_jiffies >> (TVR_BITS + (N) * TVN_BITS)) & TVN_MASK)
-
 static inline void __run_timers(tvec_base_t *base)
 {
 	struct timer_list *timer;
_