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/kvm | |
| parent | 3975d16760d4be7402d1067c548c30c427971331 (diff) | |
| download | kernel_samsung_espresso10-c2f0e8c803ceba530060ec9bb9c74a06c2c3d833.zip kernel_samsung_espresso10-c2f0e8c803ceba530060ec9bb9c74a06c2c3d833.tar.gz kernel_samsung_espresso10-c2f0e8c803ceba530060ec9bb9c74a06c2c3d833.tar.bz2 | |
[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/kvm')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 8093e6f..ae37058 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -761,7 +761,7 @@ static int __init kvm_s390_init(void) * to hold the maximum amount of facilites. On the other hand, we * only set facilities that are known to work in KVM. */ - facilities = (unsigned long long *) get_zeroed_page(GFP_DMA); + facilities = (unsigned long long *) get_zeroed_page(GFP_KERNEL|GFP_DMA); if (!facilities) { kvm_exit(); return -ENOMEM; |