Commit eb2bce7f authored May 06, 2007 by Ivan Kokshaysky Committed by Linus Torvalds May 07, 2007

ALPHA: fix BOOTP image creation



Files:

arch/alpha/boot/bootpz.c

	Create a dummy "__kmalloc()" to satisfy the loader; never called.

arch/alpha/boot/tools/objstrip.c

	Remove an include that is now (2.6.x) unnecessary.

Signed-off-by: Jay Estabrook <jay.estabrook@hp.com>
Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 180e53a7

arch/alpha/boot/bootpz.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -467,3 +467,9 @@ start_kernel(void)
		#endif
		runkernel();
		}

		/* dummy function, should never be called. */
		void *__kmalloc(size_t size, gfp_t flags)
		{
		return (void *)NULL;
		}

arch/alpha/boot/tools/objstrip.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@
		#include <linux/a.out.h>
		#include <linux/coff.h>
		#include <linux/param.h>
		#include <linux/string.h>
		#ifdef __ELF__
		# include <linux/elf.h>
		#endif