diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2003-03-13 16:44:14 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2003-03-13 16:44:14 +0000 |
| commit | c568cc3fcf3ad2495d47a5a9787d8f98a89a5a65 (patch) | |
| tree | 4af960fb518c9a98194c044b821c0869c668c4a1 /xenolinux-2.4.21-pre4-sparse | |
| parent | afe55a01c3b31ad1b3941cd8c18be68dd28c88ac (diff) | |
| download | xen-c568cc3fcf3ad2495d47a5a9787d8f98a89a5a65.tar.gz xen-c568cc3fcf3ad2495d47a5a9787d8f98a89a5a65.tar.bz2 xen-c568cc3fcf3ad2495d47a5a9787d8f98a89a5a65.zip | |
bitkeeper revision 1.122.1.11 (3e70b55emf8PRsy8RtiLO9uyIiycyA)
network.c, xl_block.c, sd.c, ide-xeno.c, xen_segment.c, keyhandler.c:
Fix IDE and SCSI initialisation. Add to entropy pool from Xenolinux net & blkdev interrupts. Add a graceful reboot handler.
Diffstat (limited to 'xenolinux-2.4.21-pre4-sparse')
| -rw-r--r-- | xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c | 4 | ||||
| -rw-r--r-- | xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/network/network.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c b/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c index bfdfa50c3e..6fd44f1cc1 100644 --- a/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c +++ b/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c @@ -522,8 +522,8 @@ int __init xlblk_init(void) blk_ring = (blk_ring_t *)fix_to_virt(FIX_BLKRING_BASE); blk_ring->req_prod = blk_ring->resp_prod = resp_cons = req_prod = 0; - error = request_irq(XLBLK_RESPONSE_IRQ, xlblk_response_int, 0, - "xlblk-response", NULL); + error = request_irq(XLBLK_RESPONSE_IRQ, xlblk_response_int, + SA_SAMPLE_RANDOM, "xlblk-response", NULL); if ( error ) { printk(KERN_ALERT "Could not allocate receive interrupt\n"); diff --git a/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/network/network.c b/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/network/network.c index 7e85bf5abe..86bbeb921a 100644 --- a/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/network/network.c +++ b/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/network/network.c @@ -116,8 +116,8 @@ static int network_open(struct net_device *dev) network_alloc_rx_buffers(dev); - error = request_irq(NET_RX_IRQ, network_rx_int, 0, - "net-rx", dev); + error = request_irq(NET_RX_IRQ, network_rx_int, + SA_SAMPLE_RANDOM, "net-rx", dev); if ( error ) { printk(KERN_WARNING "%s: Could not allocate receive interrupt\n", @@ -126,8 +126,8 @@ static int network_open(struct net_device *dev) goto fail; } - error = request_irq(NET_TX_IRQ, network_tx_int, 0, - "net-tx", dev); + error = request_irq(NET_TX_IRQ, network_tx_int, + SA_SAMPLE_RANDOM, "net-tx", dev); if ( error ) { printk(KERN_WARNING "%s: Could not allocate transmit interrupt\n", |