git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
arch
/
microblaze
/
include
/
asm
/
system.h
diff --git
a/arch/microblaze/include/asm/system.h
b/arch/microblaze/include/asm/system.h
index
88fc92c
..
48c4f03
100644
(file)
--- a/
arch/microblaze/include/asm/system.h
+++ b/
arch/microblaze/include/asm/system.h
@@
-88,6
+88,9
@@
void free_initmem(void);
extern char *klimit;
extern void ret_from_fork(void);
+extern void *alloc_maybe_bootmem(size_t size, gfp_t mask);
+extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);
+
#ifdef CONFIG_DEBUG_FS
extern struct dentry *of_debugfs_root;
#endif