debuggers.hg

diff xen/arch/x86/pci-pc.c @ 3658:0ef6e8e6e85d

bitkeeper revision 1.1159.212.71 (4200f0afX_JumfbEHQex6TdFENULMQ)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk
author iap10@labyrinth.cl.cam.ac.uk
date Wed Feb 02 15:24:31 2005 +0000 (2005-02-02)
parents 51052c8b6456 10a0f6b0a996
children 8472fafee3cf
line diff
     1.1 --- a/xen/arch/x86/pci-pc.c	Wed Feb 02 09:38:32 2005 +0000
     1.2 +++ b/xen/arch/x86/pci-pc.c	Wed Feb 02 15:24:31 2005 +0000
     1.3 @@ -1036,7 +1036,7 @@ struct irq_routing_table * __devinit pci
     1.4  	if (ret & 0xff00)
     1.5  		printk(KERN_ERR "PCI: Error %02x when fetching IRQ routing table.\n", (ret >> 8) & 0xff);
     1.6  	else if (opt.size) {
     1.7 -		rt = xmalloc(sizeof(struct irq_routing_table) + opt.size);
     1.8 +		rt = _xmalloc(sizeof(struct irq_routing_table) + opt.size);
     1.9  		if (rt) {
    1.10  			memset(rt, 0, sizeof(struct irq_routing_table));
    1.11  			rt->size = opt.size + sizeof(struct irq_routing_table);