aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/boot
diff options
context:
space:
mode:
Diffstat (limited to 'arch/alpha/boot')
-rw-r--r--arch/alpha/boot/bootpz.c6
-rw-r--r--arch/alpha/boot/tools/objstrip.c1
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)
467#endif 467#endif
468 runkernel(); 468 runkernel();
469} 469}
470
471 /* dummy function, should never be called. */
472void *__kmalloc(size_t size, gfp_t flags)
473{
474 return (void *)NULL;
475}
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 @@
25#include <linux/a.out.h> 25#include <linux/a.out.h>
26#include <linux/coff.h> 26#include <linux/coff.h>
27#include <linux/param.h> 27#include <linux/param.h>
28#include <linux/string.h>
29#ifdef __ELF__ 28#ifdef __ELF__
30# include <linux/elf.h> 29# include <linux/elf.h>
31#endif 30#endif