diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
| commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
| tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /drivers/s390/cio/qdio_main.c | |
| parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
| parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'drivers/s390/cio/qdio_main.c')
| -rw-r--r-- | drivers/s390/cio/qdio_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c index d10c73cc1688..d15648514a0f 100644 --- a/drivers/s390/cio/qdio_main.c +++ b/drivers/s390/cio/qdio_main.c | |||
| @@ -1355,7 +1355,7 @@ int qdio_allocate(struct qdio_initialize *init_data) | |||
| 1355 | goto out_rel; | 1355 | goto out_rel; |
| 1356 | 1356 | ||
| 1357 | /* qdr is used in ccw1.cda which is u32 */ | 1357 | /* qdr is used in ccw1.cda which is u32 */ |
| 1358 | irq_ptr->qdr = kzalloc(sizeof(struct qdr), GFP_KERNEL | GFP_DMA); | 1358 | irq_ptr->qdr = (struct qdr *) get_zeroed_page(GFP_KERNEL | GFP_DMA); |
| 1359 | if (!irq_ptr->qdr) | 1359 | if (!irq_ptr->qdr) |
| 1360 | goto out_rel; | 1360 | goto out_rel; |
| 1361 | WARN_ON((unsigned long)irq_ptr->qdr & 0xfff); | 1361 | WARN_ON((unsigned long)irq_ptr->qdr & 0xfff); |