Skip to content

Commit

Permalink
uml: fix build for !CONFIG_PRINTK
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Nov 15, 2007
1 parent 32f862c commit 9c8d638
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion arch/um/include/user.h
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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);
Expand Down

0 comments on commit 9c8d638

Please sign in to comment.