From patchwork Sun May 30 20:28:14 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Julia Lawall <julia@diku.dk>
X-Patchwork-Id: 103167
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4UKSqun014311
	for <patchwork-kvm@patchwork.kernel.org>;
	Sun, 30 May 2010 20:28:52 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754817Ab0E3U20 (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Sun, 30 May 2010 16:28:26 -0400
Received: from mgw1.diku.dk ([130.225.96.91]:36221 "EHLO mgw1.diku.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754522Ab0E3U2Z (ORCPT <rfc822;kvm@vger.kernel.org>);
	Sun, 30 May 2010 16:28:25 -0400
Received: from localhost (localhost [127.0.0.1])
	by mgw1.diku.dk (Postfix) with ESMTP id 7C5B852C4B4;
	Sun, 30 May 2010 22:28:19 +0200 (CEST)
Received: from mgw1.diku.dk ([127.0.0.1])
	by localhost (mgw1.diku.dk [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id dxlPgU6-VHzd; Sun, 30 May 2010 22:28:15 +0200 (CEST)
Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140])
	by mgw1.diku.dk (Postfix) with ESMTP id 134D852C352;
	Sun, 30 May 2010 22:28:15 +0200 (CEST)
Received: from ask.diku.dk (ask.diku.dk [130.225.96.225])
	by nhugin.diku.dk (Postfix) with ESMTP
	id C061E6DFC1C; Sun, 30 May 2010 22:20:43 +0200 (CEST)
Received: by ask.diku.dk (Postfix, from userid 3767)
	id E63B1200BD; Sun, 30 May 2010 22:28:14 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
	by ask.diku.dk (Postfix) with ESMTP id DE5FB200BB;
	Sun, 30 May 2010 22:28:14 +0200 (CEST)
Date: Sun, 30 May 2010 22:28:14 +0200 (CEST)
From: Julia Lawall <julia@diku.dk>
To: Carsten Otte <cotte@de.ibm.com>,
	Christian Borntraeger <borntraeger@de.ibm.com>, linux390@de.ibm.com,
	Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>,
	Martin Schwidefsky <schwidefsky@de.ibm.com>,
	Heiko Carstens <heiko.carstens@de.ibm.com>, linux-s390@vger.kernel.org,
	kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
	kernel-janitors@vger.kernel.org
Subject: [PATCH 3/3] arch/s390/kvm: Use GFP_ATOMIC when a lock is held
Message-ID: <Pine.LNX.4.64.1005302227470.19253@ask.diku.dk>
MIME-Version: 1.0
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Sun, 30 May 2010 20:28:52 +0000 (UTC)


diff -u -p a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c
--- a/arch/s390/kvm/sigp.c
+++ b/arch/s390/kvm/sigp.c
@@ -113,7 +113,7 @@ static int __inject_sigp_stop(struct kvm
 {
 	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;