Merge with /home/shaggy/git/linus-clean/

[karo-tx-linux.git] / include / linux / swap.h

diff --git a/include/linux/swap.h b/include/linux/swap.h
index d01f7efb0f2c9a1052fe807964bbcc67115d4b00..4a99e4a7fbf31edf83a86c5c35bfd0b4adbe9baa 100644 (file)
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -176,6 +176,17 @@ extern int try_to_free_pages(struct zone **, gfp_t);
 extern int shrink_all_memory(int);
 extern int vm_swappiness;
 
+#ifdef CONFIG_NUMA
+extern int zone_reclaim_mode;
+extern int zone_reclaim(struct zone *, gfp_t, unsigned int);
+#else
+#define zone_reclaim_mode 0
+static inline int zone_reclaim(struct zone *z, gfp_t mask, unsigned int order)
+{
+       return 0;
+}
+#endif
+
 #ifdef CONFIG_MIGRATION
 extern int isolate_lru_page(struct page *p);
 extern int putback_lru_pages(struct list_head *l);