diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2010-06-08 18:58:09 +0200 |
---|---|---|
committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2010-06-08 18:58:23 +0200 |
commit | c2f0e8c803ceba530060ec9bb9c74a06c2c3d833 (patch) | |
tree | 96ca1f44045c313c3c05d07df1bd9df2e6861554 /arch/s390/appldata | |
parent | Merge git://git.infradead.org/~dwmw2/mtd-2.6.35 (diff) | |
download | linux-c2f0e8c803ceba530060ec9bb9c74a06c2c3d833.tar.xz linux-c2f0e8c803ceba530060ec9bb9c74a06c2c3d833.zip |
[S390] appldata/extmem/kvm: add missing GFP_KERNEL flag
Add missing GFP flag to memory allocations. The part in cio only
changes a comment.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/appldata')
-rw-r--r-- | arch/s390/appldata/appldata_os.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata_os.c index 55c80ffd42b9..92f1cb745d69 100644 --- a/arch/s390/appldata/appldata_os.c +++ b/arch/s390/appldata/appldata_os.c @@ -181,7 +181,7 @@ static int __init appldata_os_init(void) goto out; } - appldata_os_data = kzalloc(max_size, GFP_DMA); + appldata_os_data = kzalloc(max_size, GFP_KERNEL | GFP_DMA); if (appldata_os_data == NULL) { rc = -ENOMEM; goto out; |