leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[S390] qdio: remove memset hack

Browse Source 
Remove memset hack that relied on the layout of struct qdio_q
to avoid deletion of the slib pointer.

Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Jan Glauber 2010-05-17 10:00:16 +02:00 committed by Martin Schwidefsky
parent f3eb20fafd
commit 5382fe11d9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/s390/cio/qdio.h
View File

@ -296,10 +296,8 @@ struct qdio_q {
struct qdio_irq *irq_ptr; struct qdio_irq *irq_ptr;
struct sl *sl; struct sl *sl;
/* /*
* Warning: Leave this member at the end so it won't be cleared in * A page is allocated under this pointer and used for slib and sl.
* qdio_fill_qs. A page is allocated under this pointer and used for * slib is 2048 bytes big and sl points to offset PAGE_SIZE / 2.
* slib and sl. slib is 2048 bytes big and sl points to offset
* PAGE_SIZE / 2.
*/ */
struct slib *slib; struct slib *slib;
} __attribute__ ((aligned(256))); } __attribute__ ((aligned(256)));

8
drivers/s390/cio/qdio_setup.c
View File

@ -106,10 +106,12 @@ int qdio_allocate_qs(struct qdio_irq *irq_ptr, int nr_input_qs, int nr_output_qs
static void setup_queues_misc(struct qdio_q *q, struct qdio_irq *irq_ptr, static void setup_queues_misc(struct qdio_q *q, struct qdio_irq *irq_ptr,
qdio_handler_t *handler, int i) qdio_handler_t *handler, int i)
{ {
/* must be cleared by every qdio_establish */ struct slib *slib = q->slib;
memset(q, 0, ((char *)&q->slib) - ((char *)q));
memset(q->slib, 0, PAGE_SIZE);
/* queue must be cleared for qdio_establish */
memset(q, 0, sizeof(*q));
memset(slib, 0, PAGE_SIZE);
q->slib = slib;
q->irq_ptr = irq_ptr; q->irq_ptr = irq_ptr;
q->mask = 1 << (31 - i); q->mask = 1 << (31 - i);
q->nr = i; q->nr = i;