diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-06-16 13:19:36 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-06-16 13:19:36 +0000 |
| commit | 0933a95dfdb1ae5c93e1ede5899f35acc2bb244d (patch) | |
| tree | 55ac47b819a2a2084f82f9d823d9152ac2a7f2b3 /arch/s390/kvm/sigp.c | |
| parent | 12420ac341533f3715b3deb788637568f22b78ff (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/s390/kvm/sigp.c')
| -rw-r--r-- | arch/s390/kvm/sigp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c index eff3c5989b4..702276f5e2f 100644 --- a/arch/s390/kvm/sigp.c +++ b/arch/s390/kvm/sigp.c @@ -113,7 +113,7 @@ static int __inject_sigp_stop(struct kvm_s390_local_interrupt *li, int action) { struct kvm_s390_interrupt_info *inti; - inti = kzalloc(sizeof(*inti), GFP_KERNEL); + inti = kzalloc(sizeof(*inti), GFP_ATOMIC); if (!inti) return -ENOMEM; inti->type = KVM_S390_SIGP_STOP; |