From: Mark Goodwin <markgw@sgi.com>
Date: Fri, 13 Jul 2007 01:59:37 +0000 (+1000)
Subject: [IA64] correctly count CPU objects in the ia64/sn hwperf interface
X-Git-Tag: v2.6.23-rc1~521^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=83e12a076e3587d60cfbe65a761ef54e14a264e3;p=karo-tx-linux.git

[IA64] correctly count CPU objects in the ia64/sn hwperf interface

Correctly count CPU objects for SGI ia64/sn hwperf interface

Signed-off-by: Mark Goodwin <markgw@sgi.com>
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 6da9854751cd..df8d5bed6119 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -750,9 +750,10 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, u64 arg)
 			goto error;
 		} else
 		if ((r = sn_hwperf_enum_objects(&nobj, &objs)) == 0) {
+			int cpuobj_index = 0;
+
 			memset(p, 0, a.sz);
 			for (i = 0; i < nobj; i++) {
-				int cpuobj_index = 0;
 				if (!SN_HWPERF_IS_NODE(objs + i))
 					continue;
 				node = sn_hwperf_obj_to_cnode(objs + i);