diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2007-07-31 03:38:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 18:39:39 -0400 |
commit | 96e3e18eed3b48f6d4377dee0326a106e8a04569 (patch) | |
tree | d6e4d66ec415ffc934930f32ed62cebe403e9a29 /lib/vsprintf.c | |
parent | 9965a5d5a5aab575f995ba58dc80285aa0f6ecbf (diff) |
lib: move kasprintf to a separate file
kasprintf pulls in kmalloc which proved to be fatal for at least
bootimage target on alpha.
Move it to a separate file so only users of kasprintf are exposed
to the dependency on kmalloc.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Meelis Roos <mroos@linux.ee>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Jay Estabrook <jay.estabrook@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib/vsprintf.c')
-rw-r--r-- | lib/vsprintf.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 6b6734df6d2d..7b481cea54ae 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
@@ -978,38 +978,3 @@ int sscanf(const char * buf, const char * fmt, ...) | |||
978 | } | 978 | } |
979 | 979 | ||
980 | EXPORT_SYMBOL(sscanf); | 980 | EXPORT_SYMBOL(sscanf); |
981 | |||
982 | |||
983 | /* Simplified asprintf. */ | ||
984 | char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap) | ||
985 | { | ||
986 | unsigned int len; | ||
987 | char *p; | ||
988 | va_list aq; | ||
989 | |||
990 | va_copy(aq, ap); | ||
991 | len = vsnprintf(NULL, 0, fmt, aq); | ||
992 | va_end(aq); | ||
993 | |||
994 | p = kmalloc(len+1, gfp); | ||
995 | if (!p) | ||
996 | return NULL; | ||
997 | |||
998 | vsnprintf(p, len+1, fmt, ap); | ||
999 | |||
1000 | return p; | ||
1001 | } | ||
1002 | EXPORT_SYMBOL(kvasprintf); | ||
1003 | |||
1004 | char *kasprintf(gfp_t gfp, const char *fmt, ...) | ||
1005 | { | ||
1006 | va_list ap; | ||
1007 | char *p; | ||
1008 | |||
1009 | va_start(ap, fmt); | ||
1010 | p = kvasprintf(gfp, fmt, ap); | ||
1011 | va_end(ap); | ||
1012 | |||
1013 | return p; | ||
1014 | } | ||
1015 | EXPORT_SYMBOL(kasprintf); | ||