Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96e3e18e authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Linus Torvalds
Browse files

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: default avatarSam 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9965a5d5

lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for some libs needed in the kernel.

#



lib-y := ctype.o string.o vsprintf.o cmdline.o \

lib-y := ctype.o string.o vsprintf.o kasprintf.o cmdline.o \

	 rbtree.o radix-tree.o dump_stack.o \

	 idr.o int_sqrt.o bitmap.o extable.o prio_tree.o \

	 sha1.o irq_regs.o reciprocal_div.o argv_split.o

lib/kasprintf.c

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 *  linux/lib/kasprintf.c

 *

 *  Copyright (C) 1991, 1992  Linus Torvalds

 */



#include <stdarg.h>

#include <linux/module.h>

#include <linux/types.h>

#include <linux/string.h>



/* Simplified asprintf. */

char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)

{

	unsigned int len;

	char *p;

	va_list aq;



	va_copy(aq, ap);

	len = vsnprintf(NULL, 0, fmt, aq);

	va_end(aq);



	p = kmalloc(len+1, gfp);

	if (!p)

		return NULL;



	vsnprintf(p, len+1, fmt, ap);



	return p;

}

EXPORT_SYMBOL(kvasprintf);



char *kasprintf(gfp_t gfp, const char *fmt, ...)

{

	va_list ap;

	char *p;



	va_start(ap, fmt);

	p = kvasprintf(gfp, fmt, ap);

	va_end(ap);



	return p;

}

EXPORT_SYMBOL(kasprintf);

lib/vsprintf.c

+0 −35
Original line number Diff line number Diff line
@@ -978,38 +978,3 @@ int sscanf(const char * buf, const char * fmt, ...) 
}



EXPORT_SYMBOL(sscanf);
 




/* Simplified asprintf. */

char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)

{

	unsigned int len;

	char *p;

	va_list aq;



	va_copy(aq, ap);

	len = vsnprintf(NULL, 0, fmt, aq);

	va_end(aq);



	p = kmalloc(len+1, gfp);

	if (!p)

		return NULL;



	vsnprintf(p, len+1, fmt, ap);



	return p;

}

EXPORT_SYMBOL(kvasprintf);



char *kasprintf(gfp_t gfp, const char *fmt, ...)

{

	va_list ap;

	char *p;



	va_start(ap, fmt);

	p = kvasprintf(gfp, fmt, ap);

	va_end(ap);



	return p;

}

EXPORT_SYMBOL(kasprintf);