diff options
| author | Ivan Kokshaysky <ink@jurassic.park.msu.ru> | 2007-05-06 14:50:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 12:12:58 -0700 |
| commit | eb2bce7f5e7ac1ca6da434461217fadf3c688d2c (patch) | |
| tree | d8873f05125845b793cb8211c5f2bbffcc2184a8 | |
| parent | 180e53a71f78e72a244deb65140928d4f3d72385 (diff) | |
| download | blackbird-op-linux-eb2bce7f5e7ac1ca6da434461217fadf3c688d2c.tar.gz blackbird-op-linux-eb2bce7f5e7ac1ca6da434461217fadf3c688d2c.zip | |
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>
| -rw-r--r-- | arch/alpha/boot/bootpz.c | 6 | ||||
| -rw-r--r-- | arch/alpha/boot/tools/objstrip.c | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/alpha/boot/bootpz.c b/arch/alpha/boot/bootpz.c index 4307bde80a35..1036b515e20c 100644 --- a/arch/alpha/boot/bootpz.c +++ b/arch/alpha/boot/bootpz.c @@ -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; +} diff --git a/arch/alpha/boot/tools/objstrip.c b/arch/alpha/boot/tools/objstrip.c index 67beb1b45e4f..96154e768a20 100644 --- a/arch/alpha/boot/tools/objstrip.c +++ b/arch/alpha/boot/tools/objstrip.c @@ -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 |
