From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sun, 21 Aug 2005 00:21:46 +0000 (+0000)
Subject: - sync fedora branch
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~98
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=061d37aca0a7546f6bc9d061dd429234aec1d7d4;p=linux-2.6.git

- sync fedora branch
---

diff --git a/mm/swap.c b/mm/swap.c
index ff0c7e695..7771d2803 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -71,7 +71,7 @@ EXPORT_SYMBOL(put_page);
  */
 int rotate_reclaimable_page(struct page *page)
 {
-	struct zone *zone = page_zone(page);
+	struct zone *zone;
 	unsigned long flags;
 
 	if (PageLocked(page))
@@ -83,6 +83,7 @@ int rotate_reclaimable_page(struct page *page)
 	if (!PageLRU(page))
 		return 1;
 
+	zone = page_zone(page);
 	spin_lock_irqsave(&zone->lru_lock, flags);
 	if (PageLRU(page) && !PageActive(page)) {
 		list_del(&page->lru);