diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /arch/mips64/sgi-ip27 | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'arch/mips64/sgi-ip27')
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-irq.c | 6 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-pci.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/mips64/sgi-ip27/ip27-irq.c b/arch/mips64/sgi-ip27/ip27-irq.c index 0b936017d..a7869a602 100644 --- a/arch/mips64/sgi-ip27/ip27-irq.c +++ b/arch/mips64/sgi-ip27/ip27-irq.c @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: ip27-irq.c,v 1.4 2000/01/31 19:48:11 kanoj Exp $ * * ip27-irq.c: Highlevel interrupt handling for IP27 architecture. * @@ -88,7 +88,7 @@ asmlinkage void do_IRQ(int irq, struct pt_regs * regs) int do_random, cpu; cpu = smp_processor_id(); - hardirq_enter(cpu); + irq_enter(cpu); kstat.irqs[cpu][irq]++; action = *(irq + irq_action); @@ -106,7 +106,7 @@ asmlinkage void do_IRQ(int irq, struct pt_regs * regs) add_interrupt_randomness(irq); __cli(); } - hardirq_exit(cpu); + irq_exit(cpu); /* unmasking and bottom half handling is done magically for us. */ } diff --git a/arch/mips64/sgi-ip27/ip27-pci.c b/arch/mips64/sgi-ip27/ip27-pci.c index c92230662..45e9cd649 100644 --- a/arch/mips64/sgi-ip27/ip27-pci.c +++ b/arch/mips64/sgi-ip27/ip27-pci.c @@ -172,7 +172,6 @@ void __init pcibios_fixup_bus(struct pci_bus *b) { unsigned short command; - struct list_head *ln; struct pci_dev *dev; pci_fixup_irqs(pci_swizzle, pci_map_irq); @@ -183,8 +182,7 @@ pcibios_fixup_bus(struct pci_bus *b) * stop working if we program the controllers as not having * PCI_COMMAND_MEMORY, so we have to fudge the mem_flags. */ - for (ln=b->devices.next; ln != &b->devices; ln=ln->next) { - dev = pci_dev_b(ln); + for (dev = b->devices; dev; dev = dev->sibling) { if (PCI_FUNC(dev->devfn) == 0) { if ((PCI_SLOT(dev->devfn) == 0) || (PCI_SLOT(dev->devfn) == 1)) { |