diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-09 01:13:24 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-09 01:13:24 (GMT) |
| commit | fbe33a7c3f388f7b8b2642bfadb1b5914f635a5b (patch) | |
| tree | 4317d8debb29ebb7131cbbc5db183d4194102970 /arch/s390/kvm/sigp.c | |
| parent | d87815cb2090e07b0b0b2d73dc9740706e92c80c (diff) | |
| parent | 40a510ddc57b49a01668643b1dec691a0e996c52 (diff) | |
| download | linux-fsl-qoriq-fbe33a7c3f388f7b8b2642bfadb1b5914f635a5b.tar.xz | |
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 '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 eff3c59..702276f 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; |