diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-25 16:38:00 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-25 16:38:00 +1000 |
| commit | 683a8e6e801cbb587490bb3608986ed5a8039dc0 (patch) | |
| tree | 4dd929441ac41e0f400328525bdf7a6bd4e5efcf /mm | |
| parent | d9540af89669443b16225ff87c566e9fb4d01a27 (diff) | |
| parent | 822af9cd1592da791a1e1526e7a3140d738beb19 (diff) | |
Merge commit 'suspend/linux-next'
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/vmscan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 5fa3eda1f03f..1b74ee9e28ea 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2054,7 +2054,7 @@ unsigned long global_lru_pages(void) + global_page_state(NR_INACTIVE_FILE); } -#ifdef CONFIG_PM +#ifdef CONFIG_HIBERNATION /* * Helper function for shrink_all_memory(). Tries to reclaim 'nr_pages' pages * from LRU lists system-wide, for given pass and priority. @@ -2194,7 +2194,7 @@ out: return sc.nr_reclaimed; } -#endif +#endif /* CONFIG_HIBERNATION */ /* It's optimal to keep kswapds on the same CPUs as their memory, but not required for correctness. So if the last cpu in a node goes |