From a95a17789676b66e77761c7c58fc8ea31415c85d Mon Sep 17 00:00:00 2001
From: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Date: Sun, 6 May 2007 14:50:37 -0700
Subject: [PATCH] --- yaml --- r: 54256 b: refs/heads/master c:
 eb2bce7f5e7ac1ca6da434461217fadf3c688d2c h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/alpha/boot/bootpz.c         | 6 ++++++
 trunk/arch/alpha/boot/tools/objstrip.c | 1 -
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b59dd0fe7bde..26182241af09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 180e53a71f78e72a244deb65140928d4f3d72385
+refs/heads/master: eb2bce7f5e7ac1ca6da434461217fadf3c688d2c
diff --git a/trunk/arch/alpha/boot/bootpz.c b/trunk/arch/alpha/boot/bootpz.c
index 4307bde80a35..1036b515e20c 100644
--- a/trunk/arch/alpha/boot/bootpz.c
+++ b/trunk/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/trunk/arch/alpha/boot/tools/objstrip.c b/trunk/arch/alpha/boot/tools/objstrip.c
index 67beb1b45e4f..96154e768a20 100644
--- a/trunk/arch/alpha/boot/tools/objstrip.c
+++ b/trunk/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