Merge branch 'fixes-2.6.39' into for-2.6.40

2011-05-24 09:59:36 +02:00
parent 0415b00d17 6ea0c34dac
commit 6988f20fe0
830 changed files with 33390 additions and 15943 deletions
--- a/arch/tile/mm/pgtable.c
+++ b/arch/tile/mm/pgtable.c
@@ -41,7 +41,7 @@
 * The normal show_free_areas() is too verbose on Tile, with dozens
 * of processors and often four NUMA zones each with high and lowmem.
 */
-void show_mem(void)
+void show_mem(unsigned int filter)
 {
 	struct zone *zone;