From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763993AbZLQEs5 (ORCPT ); Wed, 16 Dec 2009 23:48:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1763221AbZLQEsV (ORCPT ); Wed, 16 Dec 2009 23:48:21 -0500 Received: from kroah.org ([198.145.64.141]:55285 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763215AbZLQEDn (ORCPT ); Wed, 16 Dec 2009 23:03:43 -0500 X-Mailbox-Line: From gregkh@mini.kroah.org Wed Dec 16 19:56:45 2009 Message-Id: <20091217035645.169446528@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Wed, 16 Dec 2009 19:55:14 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Joerg Roedel Subject: [017/151] x86/amd-iommu: un__init iommu_setup_msi In-Reply-To: <20091217040208.GA26571@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.32-stable review patch. If anyone has any objections, please let us know. ------------------ From: Joerg Roedel commit 9f800de38b05d84809e89f16671d636a140eede7 upstream. This function may be called on the resume path and can not be dropped after booting. Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/amd_iommu_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c @@ -925,7 +925,7 @@ static int __init init_iommu_all(struct * ****************************************************************************/ -static int __init iommu_setup_msi(struct amd_iommu *iommu) +static int iommu_setup_msi(struct amd_iommu *iommu) { int r;