summaryrefslogtreecommitdiffstats
path: root/arch/tile
diff options
context:
space:
mode:
authorTejun Heo2011-05-24 09:59:36 +0200
committerTejun Heo2011-05-24 09:59:36 +0200
commit6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch)
treec9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /arch/tile
parentpercpu: Always align percpu output section to PAGE_SIZE (diff)
parentpercpu: Unify input section names (diff)
downloadkernel-qcow2-linux-6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0.tar.gz
kernel-qcow2-linux-6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0.tar.xz
kernel-qcow2-linux-6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0.zip
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'arch/tile')
-rw-r--r--arch/tile/mm/pgtable.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/mm/pgtable.c b/arch/tile/mm/pgtable.c
index 1a2b36f8866d..de7d8e21e01d 100644
--- 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;