Pull define-node-cleanup into release branch

diff --cc arch/ia64/sn/kernel/tiocx.c
index e0819ec,7e9764a..0d8592a
--- 1/arch/ia64/sn/kernel/tiocx.c
--- 2/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;
  

diff --cc include/asm-ia64/sn/io.h
Simple merge

diff --cc include/asm-ia64/sn/sn_sal.h
Simple merge