Merge remote-tracking branch 'origin/x86/boot' into x86/mm2

[linux-2.6-block.git] / include / linux / mm.h

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 63204078f72b9798901b6ef6371847ade8031809..9d9dcc35d6a1b00208cd3842a4791c192a0c4118 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -455,7 +455,6 @@ void put_pages_list(struct list_head *pages);
 
 void split_page(struct page *page, unsigned int order);
 int split_free_page(struct page *page);
-int capture_free_page(struct page *page, int alloc_order, int migratetype);
 
 /*
  * Compound pages have a destructor function.  Provide a
@@ -1387,7 +1386,6 @@ extern void __init mmap_init(void);
 extern void show_mem(unsigned int flags);
 extern void si_meminfo(struct sysinfo * val);
 extern void si_meminfo_node(struct sysinfo *val, int nid);
-extern int after_bootmem;
 
 extern __printf(3, 4)
 void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...);