From: Ivan Kokshaysky <ink@jurassic.park.msu.ru>

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>
---

 arch/alpha/boot/bootpz.c         |    6 ++++++
 arch/alpha/boot/tools/objstrip.c |    1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff -puN arch/alpha/boot/bootpz.c~alpha-fix-bootp-image-creation arch/alpha/boot/bootpz.c
--- a/arch/alpha/boot/bootpz.c~alpha-fix-bootp-image-creation
+++ a/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 -puN arch/alpha/boot/tools/objstrip.c~alpha-fix-bootp-image-creation arch/alpha/boot/tools/objstrip.c
--- a/arch/alpha/boot/tools/objstrip.c~alpha-fix-bootp-image-creation
+++ a/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
_