diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:54 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:54 +0200 |
commit | 0ed368c71aa65cba8d349432bd4dab4a9a2eb39c (patch) | |
tree | 7746534bafd57f6764bda8f26efc3929a4acf914 /include/linux/bootmem.h | |
parent | 7aaaec38fcd9ef3172e69f8c19f20113830a8498 (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge branch 'linus' into x86/kconfigtip-x86-kconfig-2008-06-25_10.30_Wed
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); |