diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-07-07 11:30:31 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-07-07 11:30:31 +0200 |
| commit | d6d6a86e14a6b5a26c785b45268874a8f7a52b4d (patch) | |
| tree | cd49bacdc4ac89a9317501bc9ebe87c3b6320e3e /include/linux/bootmem.h | |
| parent | f38bb7de289f5c15e287386d35e9c325f1062c49 (diff) | |
| parent | 1b40a895df6c7d5a80e71f65674060b03d84bbef (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/bootmem.h')
| -rw-r--r-- | include/linux/bootmem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index 6a5dbdc8a7dc..686895bacd9d 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h @@ -94,7 +94,7 @@ extern unsigned long init_bootmem_node(pg_data_t *pgdat, unsigned long freepfn, unsigned long startpfn, unsigned long endpfn); -extern void reserve_bootmem_node(pg_data_t *pgdat, +extern int reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, unsigned long size, int flags); |