diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /arch/tile | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'arch/tile')
| -rw-r--r-- | arch/tile/mm/pgtable.c | 2 |
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 @@ | |||
| 41 | * The normal show_free_areas() is too verbose on Tile, with dozens | 41 | * The normal show_free_areas() is too verbose on Tile, with dozens |
| 42 | * of processors and often four NUMA zones each with high and lowmem. | 42 | * of processors and often four NUMA zones each with high and lowmem. |
| 43 | */ | 43 | */ |
| 44 | void show_mem(void) | 44 | void show_mem(unsigned int filter) |
| 45 | { | 45 | { |
| 46 | struct zone *zone; | 46 | struct zone *zone; |
| 47 | 47 | ||