From 36f79fc3b3ad0a8b8d34b9a68b8440b06d390131 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Sun, 7 Sep 2003 23:13:42 -0700 Subject: [PATCH] [PATCH] ia64: fix current usage in sn2 code For some reason, we had a structure field called 'current'. This patch fixes that. --- arch/ia64/sn/io/drivers/ioconfig_bus.c | 16 ++++++++-------- arch/ia64/sn/io/machvec/pci_bus_cvlink.c | 2 +- arch/ia64/sn/io/sn2/ml_SN_intr.c | 4 ++-- include/asm-ia64/sn/nodepda.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/ia64/sn/io/drivers/ioconfig_bus.c b/arch/ia64/sn/io/drivers/ioconfig_bus.c index 66dfaf0f1ed6b..c0ded01046929 100644 --- a/arch/ia64/sn/io/drivers/ioconfig_bus.c +++ b/arch/ia64/sn/io/drivers/ioconfig_bus.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -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 455b5884fee63..b8ce32192015b 100644 --- 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 31da1ccb1bc55..e569b0f107fbf 100644 --- 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 857cd37c7dc28..b2ed848afa38e 100644 --- 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; -- 2.53.0