From: Tony Luck Date: Fri, 28 Oct 2005 20:24:06 +0000 (-0700) Subject: Pull define-node-cleanup into release branch X-Git-Tag: v3.12-rc1~40274^2~63^2~4^2~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a1e78db3f54d3481726ed2d3d58d8ad5b19b13d0;p=kernel%2Fkernel-generic.git Pull define-node-cleanup into release branch --- a1e78db3f54d3481726ed2d3d58d8ad5b19b13d0 diff --cc arch/ia64/sn/kernel/tiocx.c index e0819ec,7e9764a..0d8592a --- a/arch/ia64/sn/kernel/tiocx.c +++ b/arch/ia64/sn/kernel/tiocx.c @@@ -489,14 -486,12 +489,13 @@@ static int __init tiocx_init(void bus_register(&tiocx_bus_type); - for (cnodeid = 0; cnodeid < MAX_COMPACT_NODES; cnodeid++) { + for (cnodeid = 0; cnodeid < num_cnodes; cnodeid++) { nasid_t nasid; + int bt; - if ((nasid = cnodeid_to_nasid(cnodeid)) < 0) - break; /* No more nasids .. bail out of loop */ + nasid = cnodeid_to_nasid(cnodeid); - if ((nasid & 0x1) && is_fpga_brick(nasid)) { + if ((nasid & 0x1) && is_fpga_tio(nasid, &bt)) { struct hubdev_info *hubdev; struct xwidget_info *widgetp;