diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
| commit | 012e060c95e547eceea4a12c6f58592473bf4011 (patch) | |
| tree | b57d3eafb50ce517577d2cf366c9ef0b4b286589 /mm/vmscan.c | |
| parent | 923f122573851d18a3832ca808269fa2d5046fb1 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge branch 'master'
Diffstat (limited to 'mm/vmscan.c')
| -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 a740778f688d..0ea71e887bb6 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
| @@ -1258,9 +1258,9 @@ void wakeup_kswapd(struct zone *zone, int order) | |||
| 1258 | pgdat->kswapd_max_order = order; | 1258 | pgdat->kswapd_max_order = order; |
| 1259 | if (!cpuset_zone_allowed(zone, __GFP_HARDWALL)) | 1259 | if (!cpuset_zone_allowed(zone, __GFP_HARDWALL)) |
| 1260 | return; | 1260 | return; |
| 1261 | if (!waitqueue_active(&zone->zone_pgdat->kswapd_wait)) | 1261 | if (!waitqueue_active(&pgdat->kswapd_wait)) |
| 1262 | return; | 1262 | return; |
| 1263 | wake_up_interruptible(&zone->zone_pgdat->kswapd_wait); | 1263 | wake_up_interruptible(&pgdat->kswapd_wait); |
| 1264 | } | 1264 | } |
| 1265 | 1265 | ||
| 1266 | #ifdef CONFIG_PM | 1266 | #ifdef CONFIG_PM |