From 494aa2987eac5d6c3f7bcccbe11ea5017341eadb Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Tue, 8 Jun 2010 18:58:11 +0200
Subject: [PATCH] --- yaml --- r: 200219 b: refs/heads/master c:
 9940fa80ce0e546646b057958960c5c6fd2bbbb2 h: refs/heads/master i:   200217:
 e7d72a34a4bab47406dee4a045e0c312d74706ef   200215:
 fef9f092cfc1bec6268d2234c1ef5e0bcfd64742 v: v3

---
 [refs]                     | 2 +-
 trunk/arch/s390/kvm/sigp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5838b141bfbf..0c96a4751a0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3164a3cbf8a6bdf85fe3816fe670b391f31c004a
+refs/heads/master: 9940fa80ce0e546646b057958960c5c6fd2bbbb2
diff --git a/trunk/arch/s390/kvm/sigp.c b/trunk/arch/s390/kvm/sigp.c
index eff3c5989b46..702276f5e2fa 100644
--- a/trunk/arch/s390/kvm/sigp.c
+++ b/trunk/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;