diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-05-06 10:57:55 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-05-06 10:57:55 -0400 |
| commit | 7022b15e2a9f878fd5184586064c63352c3dd225 (patch) | |
| tree | 5365c2f5bc82ae1946636ee8d5cd5d3b7e804f1b /include/linux/bootmem.h | |
| parent | aaad2b0c757f3e6e02552cb0bdcd91a5ec0d6305 (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (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, 2 insertions, 0 deletions
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index 4e4e340592fb..6a5dbdc8a7dc 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h | |||
| @@ -101,6 +101,8 @@ extern void reserve_bootmem_node(pg_data_t *pgdat, | |||
| 101 | extern void free_bootmem_node(pg_data_t *pgdat, | 101 | extern void free_bootmem_node(pg_data_t *pgdat, |
| 102 | unsigned long addr, | 102 | unsigned long addr, |
| 103 | unsigned long size); | 103 | unsigned long size); |
| 104 | extern void *alloc_bootmem_section(unsigned long size, | ||
| 105 | unsigned long section_nr); | ||
| 104 | 106 | ||
| 105 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE | 107 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE |
| 106 | #define alloc_bootmem_node(pgdat, x) \ | 108 | #define alloc_bootmem_node(pgdat, x) \ |