diff options
| author | Mark Goodwin | 2007-07-13 03:59:37 +0200 |
|---|---|---|
| committer | Tony Luck | 2007-07-14 01:09:46 +0200 |
| commit | 83e12a076e3587d60cfbe65a761ef54e14a264e3 (patch) | |
| tree | 3ef61cd64c181ea9a90bd3f783141b2a80e25b8d /arch | |
| parent | [IA64] arbitary speed tty ioctl support (diff) | |
| download | kernel-qcow2-linux-83e12a076e3587d60cfbe65a761ef54e14a264e3.tar.gz kernel-qcow2-linux-83e12a076e3587d60cfbe65a761ef54e14a264e3.tar.xz kernel-qcow2-linux-83e12a076e3587d60cfbe65a761ef54e14a264e3.zip | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/sn/kernel/sn2/sn_hwperf.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |