diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-26 14:04:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-26 14:04:32 -0700 |
| commit | c3bf9bc243092c53946fd6d8ebd6dc2f4e572d48 (patch) | |
| tree | 4cabbf33e11e3a71b64394b24fe70453f41cefe8 /include | |
| parent | e3505dd50caf54e6f81f897cb347441409974a15 (diff) | |
| parent | c2b91e2eec9678dbda274e906cc32ea8f711da3b (diff) | |
| download | talos-obmc-linux-c3bf9bc243092c53946fd6d8ebd6dc2f4e572d48.tar.gz talos-obmc-linux-c3bf9bc243092c53946fd6d8ebd6dc2f4e572d48.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-bootmem-v3
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-bootmem-v3:
x86_64/mm: check and print vmemmap allocation continuous
x86_64: fix setup_node_bootmem to support big mem excluding with memmap
x86_64: make reserve_bootmem_generic() use new reserve_bootmem()
mm: allow reserve_bootmem() cross nodes
mm: offset align in alloc_bootmem()
mm: fix alloc_bootmem_core to use fast searching for all nodes
mm: make mem_map allocation continuous
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/e820_64.h | 2 | ||||
| -rw-r--r-- | include/linux/mm.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-x86/e820_64.h b/include/asm-x86/e820_64.h index b5e02e379af3..71c4d685d30d 100644 --- a/include/asm-x86/e820_64.h +++ b/include/asm-x86/e820_64.h @@ -49,7 +49,7 @@ extern void update_e820(void); extern void reserve_early(unsigned long start, unsigned long end, char *name); extern void free_early(unsigned long start, unsigned long end); -extern void early_res_to_bootmem(void); +extern void early_res_to_bootmem(unsigned long start, unsigned long end); #endif/*!__ASSEMBLY__*/ diff --git a/include/linux/mm.h b/include/linux/mm.h index b695875d63e3..286d31521605 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1229,6 +1229,7 @@ void vmemmap_verify(pte_t *, int, unsigned long, unsigned long); int vmemmap_populate_basepages(struct page *start_page, unsigned long pages, int node); int vmemmap_populate(struct page *start_page, unsigned long pages, int node); +void vmemmap_populate_print_last(void); #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ |
