diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /arch/alpha/boot/bootpz.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/alpha/boot/bootpz.c')
| -rw-r--r-- | arch/alpha/boot/bootpz.c | 6 |
1 files changed, 6 insertions, 0 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. */ | ||
| 472 | void *__kmalloc(size_t size, gfp_t flags) | ||
| 473 | { | ||
| 474 | return (void *)NULL; | ||
| 475 | } | ||