diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-08 18:13:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-08 18:13:24 -0700 |
| commit | fbe33a7c3f388f7b8b2642bfadb1b5914f635a5b (patch) | |
| tree | 4317d8debb29ebb7131cbbc5db183d4194102970 /drivers | |
| parent | d87815cb2090e07b0b0b2d73dc9740706e92c80c (diff) | |
| parent | 40a510ddc57b49a01668643b1dec691a0e996c52 (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] Update default configuration.
[S390] arch/s390/kvm: Use GFP_ATOMIC when a lock is held
[S390] kprobes: add parameter check to module_free()
[S390] appldata/extmem/kvm: add missing GFP_KERNEL flag
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/cio/itcw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/itcw.c b/drivers/s390/cio/itcw.c index 17da9ab932ed..a0ae29564774 100644 --- a/drivers/s390/cio/itcw.c +++ b/drivers/s390/cio/itcw.c @@ -42,7 +42,7 @@ * size_t size; * * size = itcw_calc_size(1, 2, 0); - * buffer = kmalloc(size, GFP_DMA); + * buffer = kmalloc(size, GFP_KERNEL | GFP_DMA); * if (!buffer) * return -ENOMEM; * itcw = itcw_init(buffer, size, ITCW_OP_READ, 1, 2, 0); |