Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 536 → Rev 537

/shark/trunk/drivers/newpci/pool.c
292,7 → 292,7
if (mem_flags == SLAB_KERNEL) {
DECLARE_WAITQUEUE (wait, current);
 
current->state = TASK_INTERRUPTIBLE;
//current->state = TASK_INTERRUPTIBLE;
add_wait_queue (&pool->waitq, &wait);
spin_unlock_irqrestore (&pool->lock, flags);
 
/shark/trunk/drivers/newpci/pci.c
1,5 → 1,5
/*
* $Id: pci.c,v 1.7 2004-03-19 16:30:11 giacomo Exp $
* $Id: pci.c,v 1.8 2004-03-29 18:19:41 giacomo Exp $
*
* PCI Bus Services, see include/linux/pci.h for further explanation.
*
270,7 → 270,7
/* see PCI PM 1.1 5.6.1 table 18 */
if(state == 3 || dev->current_state == 3)
{
set_current_state(TASK_UNINTERRUPTIBLE);
//set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(HZ/100);
}
else if(state == 2 || dev->current_state == 2)
349,6 → 349,7
pci_set_power_state(dev, 0);
if ((err = pcibios_enable_device(dev, bars)) < 0)
return err;
 
return 0;
}
 
/shark/trunk/drivers/newpci/shark_pci26.c
22,6 → 22,7
 
extern int pci_direct_init(void);
extern int pcibios_init(void);
extern int pcibios_irq_init(void);
extern int pci_driver_init(void);
extern int pci_legacy_init(void);
extern int pci_init(void);
32,6 → 33,8
pci_direct_init();
pcibios_init();
 
pcibios_irq_init();
pci_driver_init();
 
/shark/trunk/drivers/newpci/irq.c
893,7 → 893,7
}
}
 
static int __init pcibios_irq_init(void)
int __init pcibios_irq_init(void)
{
DBG("PCI: IRQ init\n");