diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:19:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:19:15 -0700 |
| commit | 4cba84b5d61af81f1f329f4d05170427a9819c39 (patch) | |
| tree | aa6f917cd82ff524dc27b2c628ac6d4b88b0fcf6 /drivers/s390/block/dasd_fba.c | |
| parent | 7d939fbdfee49e5c06bd27214d25f726fb87a25a (diff) | |
| parent | ca68305bf3c76c4a7cd1c77d5423219f39164df8 (diff) | |
| download | kernel_samsung_tuna-4cba84b5d61af81f1f329f4d05170427a9819c39.zip kernel_samsung_tuna-4cba84b5d61af81f1f329f4d05170427a9819c39.tar.gz kernel_samsung_tuna-4cba84b5d61af81f1f329f4d05170427a9819c39.tar.bz2 | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (36 commits)
[S390] Remove code duplication from monreader / dcssblk.
[S390] kernel: show last breaking-event-address on oops
[S390] lowcore: Change type of lowcores softirq_pending to __u32.
[S390] zcrypt: Comments and kernel-doc cleanup
[S390] uaccess: Always access the correct address space.
[S390] Fix a lot of sparse warnings.
[S390] Convert s390 to GENERIC_CLOCKEVENTS.
[S390] genirq/clockevents: move irq affinity prototypes/inlines to interrupt.h
[S390] Convert monitor calls to function calls.
[S390] qdio (new feature): enhancing info-retrieval from QDIO-adapters
[S390] replace remaining __FUNCTION__ occurrences
[S390] remove redundant display of free swap space in show_mem()
[S390] qdio: remove outdated developerworks link.
[S390] Add debug_register_mode() function to debug feature API
[S390] crypto: use more descriptive function names for init/exit routines.
[S390] switch sched_clock to store-clock-extended.
[S390] zcrypt: add support for large random numbers
[S390] hw_random: allow rng_dev_read() to return hardware errors.
[S390] Vertical cpu management.
[S390] cpu topology support for s390.
...
Diffstat (limited to 'drivers/s390/block/dasd_fba.c')
| -rw-r--r-- | drivers/s390/block/dasd_fba.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c index d13ea05..1166115 100644 --- a/drivers/s390/block/dasd_fba.c +++ b/drivers/s390/block/dasd_fba.c @@ -125,7 +125,8 @@ dasd_fba_check_characteristics(struct dasd_device *device) private = (struct dasd_fba_private *) device->private; if (private == NULL) { - private = kzalloc(sizeof(struct dasd_fba_private), GFP_KERNEL); + private = kzalloc(sizeof(struct dasd_fba_private), + GFP_KERNEL | GFP_DMA); if (private == NULL) { DEV_MESSAGE(KERN_WARNING, device, "%s", "memory allocation failed for private " |