Commit eb2bce7f authored by Ivan Kokshaysky's avatar Ivan Kokshaysky Committed by Linus Torvalds

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: default avatarJay Estabrook <jay.estabrook@hp.com>
Signed-off-by: default avatarIvan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 180e53a7
...@@ -467,3 +467,9 @@ start_kernel(void) ...@@ -467,3 +467,9 @@ start_kernel(void)
#endif #endif
runkernel(); runkernel();
} }
/* dummy function, should never be called. */
void *__kmalloc(size_t size, gfp_t flags)
{
return (void *)NULL;
}
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <linux/a.out.h> #include <linux/a.out.h>
#include <linux/coff.h> #include <linux/coff.h>
#include <linux/param.h> #include <linux/param.h>
#include <linux/string.h>
#ifdef __ELF__ #ifdef __ELF__
# include <linux/elf.h> # include <linux/elf.h>
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment