aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-05-24 17:14:51 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-24 17:14:51 -0400
commit42fdfa238a23643226910acf922ea930b3286032 (patch)
tree12df3576d50e001bdfcddffe90912ee2a194936a
parent7f6f3a39d258adf51f0fb1fe0dab52272a1c61a4 (diff)
namespacecheck: more kernel/printk.c fixes
[ Stephen Rothwell <sfr@canb.auug.org.au>: build fix ] Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--include/linux/kernel.h6
-rw-r--r--kernel/printk.c13
2 files changed, 0 insertions, 19 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 792bf0aa779b..f2a668c195bf 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -184,9 +184,6 @@ asmlinkage int vprintk(const char *fmt, va_list args)
184 __attribute__ ((format (printf, 1, 0))); 184 __attribute__ ((format (printf, 1, 0)));
185asmlinkage int printk(const char * fmt, ...) 185asmlinkage int printk(const char * fmt, ...)
186 __attribute__ ((format (printf, 1, 2))) __cold; 186 __attribute__ ((format (printf, 1, 2))) __cold;
187extern int log_buf_get_len(void);
188extern int log_buf_read(int idx);
189extern int log_buf_copy(char *dest, int idx, int len);
190 187
191extern int printk_ratelimit_jiffies; 188extern int printk_ratelimit_jiffies;
192extern int printk_ratelimit_burst; 189extern int printk_ratelimit_burst;
@@ -202,9 +199,6 @@ static inline int vprintk(const char *s, va_list args) { return 0; }
202static inline int printk(const char *s, ...) 199static inline int printk(const char *s, ...)
203 __attribute__ ((format (printf, 1, 2))); 200 __attribute__ ((format (printf, 1, 2)));
204static inline int __cold printk(const char *s, ...) { return 0; } 201static inline int __cold printk(const char *s, ...) { return 0; }
205static inline int log_buf_get_len(void) { return 0; }
206static inline int log_buf_read(int idx) { return 0; }
207static inline int log_buf_copy(char *dest, int idx, int len) { return 0; }
208static inline int printk_ratelimit(void) { return 0; } 202static inline int printk_ratelimit(void) { return 0; }
209static inline int __printk_ratelimit(int ratelimit_jiffies, \ 203static inline int __printk_ratelimit(int ratelimit_jiffies, \
210 int ratelimit_burst) { return 0; } 204 int ratelimit_burst) { return 0; }
diff --git a/kernel/printk.c b/kernel/printk.c
index b620e3d96136..55d16e57499a 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -268,19 +268,6 @@ int log_buf_copy(char *dest, int idx, int len)
268} 268}
269 269
270/* 270/*
271 * Extract a single character from the log buffer.
272 */
273static int log_buf_read(int idx)
274{
275 char ret;
276
277 if (log_buf_copy(&ret, idx, 1) == 1)
278 return ret;
279 else
280 return -1;
281}
282
283/*
284 * Commands to do_syslog: 271 * Commands to do_syslog:
285 * 272 *
286 * 0 -- Close the log. Currently a NOP. 273 * 0 -- Close the log. Currently a NOP.