From fc12fc0df6f33a7f06f37c9ac8297ca248b0529f Mon Sep 17 00:00:00 2001
From: Nigel Cunningham <nigel@suspend2.net>
Date: Fri, 22 Dec 2006 01:07:21 -0800
Subject: [PATCH] --- yaml --- r: 44881 b: refs/heads/master c:
 e07aa05b606deeb1a8b55cd19098427c72daebce h: refs/heads/master i:   44879:
 127c43e002750de5f8b2671fa679b14e5565f8ad v: v3

---
 [refs]            | 2 +-
 trunk/mm/vmscan.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 13f20c7d8ec3..edc68cbc1c02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b2b96abbf321891bdde5412d23bc4123c6cccec
+refs/heads/master: e07aa05b606deeb1a8b55cd19098427c72daebce
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index e9813b06c7a3..63eb9ab0032b 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -1369,8 +1369,8 @@ void wakeup_kswapd(struct zone *zone, int order)
  *
  * For pass > 3 we also try to shrink the LRU lists that contain a few pages
  */
-static unsigned long shrink_all_zones(unsigned long nr_pages, int pass,
-				      int prio, struct scan_control *sc)
+static unsigned long shrink_all_zones(unsigned long nr_pages, int prio,
+				      int pass, struct scan_control *sc)
 {
 	struct zone *zone;
 	unsigned long nr_to_scan, ret = 0;