Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 54256
b: refs/heads/master
c: eb2bce7
h: refs/heads/master
v: v3
  • Loading branch information
Ivan Kokshaysky authored and Linus Torvalds committed May 7, 2007
1 parent 2434e6a commit a95a177
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 180e53a71f78e72a244deb65140928d4f3d72385
refs/heads/master: eb2bce7f5e7ac1ca6da434461217fadf3c688d2c
6 changes: 6 additions & 0 deletions trunk/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 trunk/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 a95a177

Please sign in to comment.