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>
This commit is contained in:
parent
180e53a71f
commit
eb2bce7f5e
|
@ -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 @@
|
||||||
#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
|
||||||
|
|
Loading…
Reference in New Issue