This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / sparc / kernel / pcic.c

diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index f8ccbfc..c982473 100644 (file)
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -603,7 +603,7 @@ pcic_fill_irq(struct linux_pcic *pcic, struct pci_dev *dev, int node)
  */
 void __init pcibios_fixup_bus(struct pci_bus *bus)
 {
-       struct pci_dev *dev;
+       struct list_head *walk;
        int i, has_io, has_mem;
        unsigned int cmd;
        struct linux_pcic *pcic;
@@ -625,7 +625,9 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
                return;
        }
 
-       list_for_each_entry(dev, &bus->devices, bus_list) {
+       walk = &bus->devices;
+       for (walk = walk->next; walk != &bus->devices; walk = walk->next) {
+               struct pci_dev *dev = pci_dev_b(walk);
 
                /*
                 * Comment from i386 branch:
@@ -714,9 +716,6 @@ static irqreturn_t pcic_timer_handler (int irq, void *h, struct pt_regs *regs)
        write_seqlock(&xtime_lock);     /* Dummy, to show that we remember */
        pcic_clear_clock_irq();
        do_timer(regs);
-#ifndef CONFIG_SMP
-       update_process_times(user_mode(regs));
-#endif
        write_sequnlock(&xtime_lock);
        return IRQ_HANDLED;
 }