Attachment 77517 Details for Bug 146136

slab2616.diff

slab2616.diff (text/plain), 1.25 KB, created by LTC BugProxy on 2006-04-10 12:01:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: LTC BugProxy

Created: 2006-04-10 12:01:07 UTC

Size: 1.25 KB

patch

obsolete

>Index: drivers/s390/cio/qdio.c
>===================================================================
>RCS file: /home/zldevel/cvs/lnx-zlive/drivers/s390/cio/qdio.c,v
>retrieving revision 1.3
>diff -u -p -r1.3 qdio.c
>--- drivers/s390/cio/qdio.c	4 Apr 2006 07:25:26 -0000	1.3
>+++ drivers/s390/cio/qdio.c	10 Apr 2006 11:57:04 -0000
>@@ -1637,7 +1637,7 @@ next:
> 
> 	}
> 	kfree(irq_ptr->qdr);
>-	kfree(irq_ptr);
>+	free_page((unsigned long) irq_ptr);
> }
> 
> static void
>@@ -2984,7 +2984,7 @@ qdio_allocate(struct qdio_initialize *in
> 	qdio_allocate_do_dbf(init_data);
> 
> 	/* create irq */
>-	irq_ptr=kmalloc(sizeof(struct qdio_irq), GFP_KERNEL | GFP_DMA);
>+	irq_ptr=(void *) get_zeroed_page(GFP_KERNEL | GFP_DMA);
> 
> 	QDIO_DBF_TEXT0(0,setup,"irq_ptr:");
> 	QDIO_DBF_HEX0(0,setup,&irq_ptr,sizeof(void*));
>@@ -2994,14 +2994,13 @@ qdio_allocate(struct qdio_initialize *in
> 		return -ENOMEM;
> 	}
> 
>-	memset(irq_ptr,0,sizeof(struct qdio_irq));
> 
> 	init_MUTEX(&irq_ptr->setting_up_sema);
> 
> 	/* QDR must be in DMA area since CCW data address is only 32 bit */
> 	irq_ptr->qdr=kmalloc(sizeof(struct qdr), GFP_KERNEL | GFP_DMA);
>   	if (!(irq_ptr->qdr)) {
>-   		kfree(irq_ptr);
>+   		free_page((unsigned long) irq_ptr);
>     		QDIO_PRINT_ERR("kmalloc of irq_ptr->qdr failed!\n");
> 		return -ENOMEM;
>        	}

Actions: View

Attachments on bug 146136: 77517 | 80349