Skip to content

Commit

Permalink
ALPHA: fix BOOTP image creation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ivan Kokshaysky authored and Linus Torvalds committed May 7, 2007
1 parent 180e53a commit eb2bce7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
6 changes: 6 additions & 0 deletions arch/alpha/boot/bootpz.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
1 change: 0 additions & 1 deletion arch/alpha/boot/tools/objstrip.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit eb2bce7

Please sign in to comment.