From: Andrew Morton Cc: Christoph Lameter Signed-off-by: Andrew Morton --- include/linux/swap.h | 3 +-- mm/page_alloc.c | 4 ++-- mm/vmscan.c | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff -puN include/linux/swap.h~zone-reclaim-reclaim-logic-tidy include/linux/swap.h --- 25/include/linux/swap.h~zone-reclaim-reclaim-logic-tidy Tue Jan 17 16:24:04 2006 +++ 25-akpm/include/linux/swap.h Tue Jan 17 16:24:04 2006 @@ -181,8 +181,7 @@ extern int zone_reclaim_mode; extern int zone_reclaim(struct zone *, gfp_t, unsigned int); #else #define zone_reclaim_mode 0 -static inline int zone_reclaim(struct zone *z, gfp_t mask, - unsigned int order) +static inline int zone_reclaim(struct zone *z, gfp_t mask, unsigned int order) { return 0; } diff -puN mm/page_alloc.c~zone-reclaim-reclaim-logic-tidy mm/page_alloc.c --- 25/mm/page_alloc.c~zone-reclaim-reclaim-logic-tidy Tue Jan 17 16:24:04 2006 +++ 25-akpm/mm/page_alloc.c Tue Jan 17 16:24:04 2006 @@ -879,8 +879,8 @@ get_page_from_freelist(gfp_t gfp_mask, u if (!zone_watermark_ok(*z, order, mark, classzone_idx, alloc_flags)) if (!zone_reclaim_mode || - !zone_reclaim(*z, gfp_mask, order)) - continue; + !zone_reclaim(*z, gfp_mask, order)) + continue; } page = buffered_rmqueue(zonelist, *z, order, gfp_mask); diff -puN mm/vmscan.c~zone-reclaim-reclaim-logic-tidy mm/vmscan.c --- 25/mm/vmscan.c~zone-reclaim-reclaim-logic-tidy Tue Jan 17 16:24:04 2006 +++ 25-akpm/mm/vmscan.c Tue Jan 17 16:24:04 2006 @@ -1587,8 +1587,8 @@ int zone_reclaim_mode __read_mostly; */ #define ZONE_RECLAIM_INTERVAL HZ/2 /* -- * Try to free up some pages from this zone through reclaim. -- */ + * Try to free up some pages from this zone through reclaim. + */ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) { struct scan_control sc; _