From 6ac4fde2643d2e64f51f152ead2a67d88f4c99e7 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 11 Aug 2008 14:38:12 +0200
Subject: [PATCH] --- yaml --- r: 115216 b: refs/heads/master c:
 ced9cd40ac14111befd6b0c73ec90106c22a3fd7 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/kernel.h | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5156a26f1181..f017261336bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b845b517b5e3706a3729f6ea83b88ab85f0725b0
+refs/heads/master: ced9cd40ac14111befd6b0c73ec90106c22a3fd7
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index 113ac8d0425f..3652a4564126 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -200,8 +200,6 @@ extern struct ratelimit_state printk_ratelimit_state;
 extern int printk_ratelimit(void);
 extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
 				   unsigned int interval_msec);
-extern void printk_tick(void);
-extern int printk_needs_cpu(int);
 #else
 static inline int vprintk(const char *s, va_list args)
 	__attribute__ ((format (printf, 1, 0)));
@@ -213,10 +211,11 @@ static inline int printk_ratelimit(void) { return 0; }
 static inline bool printk_timed_ratelimit(unsigned long *caller_jiffies, \
 					  unsigned int interval_msec)	\
 		{ return false; }
-static inline void printk_tick(void) { }
-static inline int printk_needs_cpu(int) { return 0; }
 #endif
 
+extern int printk_needs_cpu(int cpu);
+extern void printk_tick(void);
+
 extern void asmlinkage __attribute__((format(printf, 1, 2)))
 	early_printk(const char *fmt, ...);