From patchwork Mon Jun 6 17:58:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Luck X-Patchwork-Id: 853062 Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p56I0aUi000929 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Mon, 6 Jun 2011 18:00:56 GMT Received: from daredevil.linux-foundation.org (localhost [127.0.0.1]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p56Hww2Z005346; Mon, 6 Jun 2011 10:58:59 -0700 Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p56Hwu6w005335 for ; Mon, 6 Jun 2011 10:58:57 -0700 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 06 Jun 2011 10:58:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.65,327,1304319600"; d="scan'208";a="7962477" Received: from orsmsx602.amr.corp.intel.com ([10.22.226.211]) by azsmga001.ch.intel.com with ESMTP; 06 Jun 2011 10:58:55 -0700 Received: from orsmsx505.amr.corp.intel.com ([10.22.226.208]) by orsmsx602.amr.corp.intel.com ([10.22.226.211]) with mapi; Mon, 6 Jun 2011 10:58:55 -0700 From: "Luck, Tony" To: "Rafael J. Wysocki" Date: Mon, 6 Jun 2011 10:58:53 -0700 Thread-Topic: [PATCH 5/8] PCI / Intel IOMMU: Use syscore_ops instead of sysdev class and sysdev Thread-Index: Acwkcya55zrZyxgGRmGbxB9FEwMzPwAACWIw Message-ID: <987664A83D2D224EAE907B061CE93D5301E700ED2B@orsmsx505.amr.corp.intel.com> References: <201103100131.58206.rjw@sisk.pl> <201103122218.14832.rjw@sisk.pl> <201106061957.35413.rjw@sisk.pl> In-Reply-To: <201106061957.35413.rjw@sisk.pl> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Received-SPF: pass (localhost is always allowed.) X-Spam-Status: No, hits=-104.13 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED, USER_IN_WHITELIST X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.21 Cc: "linux-pci@vger.kernel.org" , Greg KH , LKML , Jesse Barnes , "mingo@redhat.com" , Avi Kivity , "H. Peter Anvin" , Kay Sievers , Linux PM mailing list , "tglx@linutronix.de" Subject: Re: [linux-pm] [PATCH 5/8] PCI / Intel IOMMU: Use syscore_ops instead of sysdev class and sysdev X-BeenThere: linux-pm@lists.linux-foundation.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux power management List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 06 Jun 2011 18:00:56 +0000 (UTC) > I guess you mean the following? Rafael Exactly. Thanks -Tony --- From: Rafael J. Wysocki If CONFIG_PM is not set, init_iommu_pm_ops() introduced by commit 134fac3f457f3dd753ecdb25e6da3e5f6629f696 (PCI / Intel IOMMU: Use syscore_ops instead of sysdev class and sysdev) is not defined appropriately. Fix this issue. Reported-by: Tony Luck Signed-off-by: Rafael J. Wysocki --- drivers/pci/intel-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6/drivers/pci/intel-iommu.c =================================================================== --- linux-2.6.orig/drivers/pci/intel-iommu.c +++ linux-2.6/drivers/pci/intel-iommu.c @@ -3388,7 +3388,7 @@ static void __init init_iommu_pm_ops(voi } #else -static inline int init_iommu_pm_ops(void) { } +static inline void init_iommu_pm_ops(void) {} #endif /* CONFIG_PM */ /*