[PATCH 4/4] UML - Fix build for !CONFIG_PRINTK

[Jeff Dike]

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@xxxxxxxxxxxxxxx>
---
 arch/um/include/user.h |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Index: linux-2.6.22/arch/um/include/user.h
===================================================================
--- linux-2.6.22.orig/arch/um/include/user.h	2007-10-22 13:21:04.000000000 -0400
+++ linux-2.6.22/arch/um/include/user.h	2007-10-22 13:21:14.000000000 -0400
@@ -1,11 +1,13 @@
 /* 
- * Copyright (C) 2000 Jeff Dike (jdike@xxxxxxxxxx)
+ * 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);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/