diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 04:52:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 04:52:59 -0400 |
| commit | a60b33cf59d1c9e0e363287fce799cb23d45660c (patch) | |
| tree | 85eb8feea5717cf472a2549e53f59183a95617c5 /include/linux/bootmem.h | |
| parent | 0f476b6d91a1395bda6464e653ce66ea9bea7167 (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
Merge branch 'linus' into core/softirq
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, | |||
| 94 | unsigned long freepfn, | 94 | unsigned long freepfn, |
| 95 | unsigned long startpfn, | 95 | unsigned long startpfn, |
| 96 | unsigned long endpfn); | 96 | unsigned long endpfn); |
| 97 | extern void reserve_bootmem_node(pg_data_t *pgdat, | 97 | extern int reserve_bootmem_node(pg_data_t *pgdat, |
| 98 | unsigned long physaddr, | 98 | unsigned long physaddr, |
| 99 | unsigned long size, | 99 | unsigned long size, |
| 100 | int flags); | 100 | int flags); |