[PATCH] ia64: fix current usage in sn2 code

For some reason, we had a structure field called 'current'.  This patch
fixes that.

diff --git a/arch/ia64/sn/io/drivers/ioconfig_bus.c b/arch/ia64/sn/io/drivers/ioconfig_bus.c
index 66dfaf0f1ed6bdf343a0ef40312f795e99cf1d13..c0ded010469297e9955da03107fe971ecb1da94b 100644 (file)
--- a/arch/ia64/sn/io/drivers/ioconfig_bus.c
+++ b/arch/ia64/sn/io/drivers/ioconfig_bus.c
@@ -24,7 +24,7 @@
 #include <asm/sn/invent.h>
 #include <asm/sn/hcl.h>
 #include <asm/sn/labelcl.h>
-#include <asm//sn/sn_sal.h>
+#include <asm/sn/sn_sal.h>
 #include <asm/sn/addrs.h>
 #include <asm/sn/ioconfig_bus.h>
 
@@ -157,7 +157,7 @@ build_moduleid_table(char *file_contents, struct ascii_moduleid *table)
        char *name;
        char *temp;
        char *next;
-       char *current;
+       char *curr;
        char *line;
        struct ascii_moduleid *moduleid;
 
@@ -166,10 +166,10 @@ build_moduleid_table(char *file_contents, struct ascii_moduleid *table)
        name = kmalloc(125, GFP_KERNEL);
        memset(name, 0, 125);
        moduleid = table;
-       current = file_contents;
-       while (nextline(current, &next, line)){
+       curr = file_contents;
+       while (nextline(curr, &next, line)){
 
-               DBG("current 0x%lx next 0x%lx\n", current, next);
+               DBG("curr 0x%lx next 0x%lx\n", curr, next);
 
                temp = line;
                /*
@@ -182,7 +182,7 @@ build_moduleid_table(char *file_contents, struct ascii_moduleid *table)
                                break;
 
                if (*temp == '\n') {
-                       current = next;
+                       curr = next;
                        memset(line, 0, 256);
                        continue;
                }
@@ -191,7 +191,7 @@ build_moduleid_table(char *file_contents, struct ascii_moduleid *table)
                 * Skip comment lines
                 */
                if (*temp == '#') {
-                       current = next;
+                       curr = next;
                        memset(line, 0, 256);
                        continue;
                }
@@ -204,7 +204,7 @@ build_moduleid_table(char *file_contents, struct ascii_moduleid *table)
                DBG("Found %s\n", name);
                moduleid++;
                free_entry++;
-               current = next;
+               curr = next;
                memset(line, 0, 256);
        }
 

diff --git a/arch/ia64/sn/io/machvec/pci_bus_cvlink.c b/arch/ia64/sn/io/machvec/pci_bus_cvlink.c
index 455b5884fee639ded0844fd9724e5d25d978f414..b8ce32192015b53bc25369c2cfda90fdac796115 100644 (file)
--- a/arch/ia64/sn/io/machvec/pci_bus_cvlink.c
+++ b/arch/ia64/sn/io/machvec/pci_bus_cvlink.c
@@ -544,7 +544,7 @@ sn_pci_fixup(int arg)
                pci_read_config_byte(device_dev, PCI_INTERRUPT_PIN,
                                     (unsigned char *)&lines);
         
-               irqpdaindr->current = device_dev;
+               irqpdaindr->curr = device_dev;
                intr_handle = pciio_intr_alloc(device_vertex, NULL, lines, device_vertex);
 
                irq = intr_handle->pi_irq;

diff --git a/arch/ia64/sn/io/sn2/ml_SN_intr.c b/arch/ia64/sn/io/sn2/ml_SN_intr.c
index 31da1ccb1bc5527eb1ea9705b7370ca400c47520..e569b0f107fbfd6a6354dcaa620a33c2d21b931a 100644 (file)
--- a/arch/ia64/sn/io/sn2/ml_SN_intr.c
+++ b/arch/ia64/sn/io/sn2/ml_SN_intr.c
@@ -174,8 +174,8 @@ do_intr_reserve_level(cpuid_t cpu,
                        min_shared = 256;
                        for (i=IA64_SN2_FIRST_DEVICE_VECTOR; i < IA64_SN2_LAST_DEVICE_VECTOR; i++) {
                                /* Share with the same device class */
-                               if (irqpdaindr->current->vendor == irqpdaindr->device_dev[i]->vendor &&
-                                       irqpdaindr->current->device == irqpdaindr->device_dev[i]->device &&
+                               if (irqpdaindr->curr->vendor == irqpdaindr->device_dev[i]->vendor &&
+                                       irqpdaindr->curr->device == irqpdaindr->device_dev[i]->device &&
                                        irqpdaindr->share_count[i] < min_shared) {
                                                min_shared = irqpdaindr->share_count[i];
                                                bit = i;

diff --git a/include/asm-ia64/sn/nodepda.h b/include/asm-ia64/sn/nodepda.h
index 857cd37c7dc2850c78fe9e77bd14fa3191a66840..b2ed848afa38e3ade9b73a37198cc38b5b5f6e50 100644 (file)
--- a/include/asm-ia64/sn/nodepda.h
+++ b/include/asm-ia64/sn/nodepda.h
@@ -87,7 +87,7 @@ struct irqpda_s {
        char irq_flags[NR_IRQS];
        struct pci_dev *device_dev[NR_IRQS];
        char share_count[NR_IRQS];
-       struct pci_dev *current;
+       struct pci_dev *curr;
 };
 
 typedef struct irqpda_s irqpda_t;