From 6cafa78a16f3d9b2342856af908b503b73cfbe0e Mon Sep 17 00:00:00 2001
From: Paul Jackson <pj@sgi.com>
Date: Fri, 24 Mar 2006 03:16:12 -0800
Subject: [PATCH] --- yaml --- r: 23425 b: refs/heads/master c:
 29afd49b72a9b2c26fa8c678bcf3976d0540446b h: refs/heads/master i:   23423:
 ffd490388c252eea9ab8551576bd2c5509618a13 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/cpuset.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 99da93fdedd5..5072ffab9e21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2455396be35383c4eebc6745cc718b1dd9e23df
+refs/heads/master: 29afd49b72a9b2c26fa8c678bcf3976d0540446b
diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c
index 702928664f42..18aea1bd1284 100644
--- a/trunk/kernel/cpuset.c
+++ b/trunk/kernel/cpuset.c
@@ -2205,7 +2205,7 @@ int __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
 {
 	int node;			/* node that zone z is on */
 	const struct cpuset *cs;	/* current cpuset ancestors */
-	int allowed = 1;		/* is allocation in zone z allowed? */
+	int allowed;			/* is allocation in zone z allowed? */
 
 	if (in_interrupt())
 		return 1;