Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / mips / sgi-ip27 / ip27-hubio.c

diff --git a/arch/mips/sgi-ip27/ip27-hubio.c b/arch/mips/sgi-ip27/ip27-hubio.c
index 68d9895..524b371 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-hubio.c
+++ b/arch/mips/sgi-ip27/ip27-hubio.c
@@ -8,6 +8,7 @@
 
 #include <linux/bitops.h>
 #include <linux/string.h>
+#include <linux/mmzone.h>
 #include <asm/sn/addrs.h>
 #include <asm/sn/arch.h>
 #include <asm/sn/hub.h>
@@ -44,7 +45,7 @@ unsigned long hub_pio_map(cnodeid_t cnode, xwidgetnum_t widget,
 
        xtalk_addr &= ~(BWIN_SIZE-1);
        for (i = 0; i < HUB_NUM_BIG_WINDOW; i++) {
-               if (test_and_set_bit(i, HUB_DATA(cnode)->h_bigwin_used))
+               if (test_and_set_bit(i, hub_data(cnode)->h_bigwin_used))
                        continue;
 
                /*
@@ -166,18 +167,18 @@ static void hub_set_piomode(nasid_t nasid)
        REMOTE_HUB_S(nasid, IIO_OUTWIDGET_ACCESS, ii_iowa);
 }
 
-/**
+/*
  * hub_pio_init  -  PIO-related hub initalization
  *
  * @hub:       hubinfo structure for our hub
- **/
+ */
 void hub_pio_init(cnodeid_t cnode)
 {
        nasid_t nasid = COMPACT_TO_NASID_NODEID(cnode);
        unsigned i;
 
        /* initialize big window piomaps for this hub */
-       CLEAR_BITMAP(HUB_DATA(cnode)->h_bigwin_used, HUB_NUM_BIG_WINDOW);
+       bitmap_zero(hub_data(cnode)->h_bigwin_used, HUB_NUM_BIG_WINDOW);
        for (i = 0; i < HUB_NUM_BIG_WINDOW; i++)
                IIO_ITTE_DISABLE(nasid, i);