diff options
| author | Jeff Dike | 2007-11-15 02:00:31 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2007-11-15 03:45:43 +0100 |
| commit | 9c8d6381dc107dbc2bfdbfdcaefe0d42e5b5b362 (patch) | |
| tree | f613029815e77425df72062ba201d62da01995ee /arch/um | |
| parent | uml: fix build for !CONFIG_TCP (diff) | |
| download | kernel-qcow2-linux-9c8d6381dc107dbc2bfdbfdcaefe0d42e5b5b362.tar.gz kernel-qcow2-linux-9c8d6381dc107dbc2bfdbfdcaefe0d42e5b5b362.tar.xz kernel-qcow2-linux-9c8d6381dc107dbc2bfdbfdcaefe0d42e5b5b362.zip | |
uml: fix build for !CONFIG_PRINTK
Handle the case of CONFIG_PRINTK being disabled. This requires a do-nothing
stub to be present in arch/um/include/user.h so that we don't get references
to printk from libc code.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/include/user.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/um/include/user.h b/arch/um/include/user.h index 99033ff28a78..1723fac6f40d 100644 --- a/arch/um/include/user.h +++ b/arch/um/include/user.h @@ -1,11 +1,13 @@ /* - * Copyright (C) 2000 Jeff Dike (jdike@karaya.com) + * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) * Licensed under the GPL */ #ifndef __USER_H__ #define __USER_H__ +#include "uml-config.h" + /* * The usual definition - copied here because the kernel provides its own, * fancier, type-safe, definition. Using that one would require @@ -23,8 +25,17 @@ extern void panic(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); + +#ifdef UML_CONFIG_PRINTK extern int printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); +#else +static inline int printk(const char *fmt, ...) +{ + return 0; +} +#endif + extern void schedule(void); extern int in_aton(char *str); extern int open_gdb_chan(void); |