Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756969Ab1FFR7A (ORCPT ); Mon, 6 Jun 2011 13:59:00 -0400 Received: from mga14.intel.com ([143.182.124.37]:9373 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751655Ab1FFR66 convert rfc822-to-8bit (ORCPT ); Mon, 6 Jun 2011 13:58:58 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.65,327,1304319600"; d="scan'208";a="7962477" From: "Luck, Tony" To: "Rafael J. Wysocki" CC: LKML , Len Brown , Greg KH , Kay Sievers , Jesse Barnes , Linux PM mailing list , "H. Peter Anvin" , "mingo@redhat.com" , "tglx@linutronix.de" , Dave Jones , Alan Stern , Avi Kivity , "linux-pci@vger.kernel.org" Date: Mon, 6 Jun 2011 10:58:53 -0700 Subject: RE: [PATCH 5/8] PCI / Intel IOMMU: Use syscore_ops instead of sysdev class and sysdev 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1159 Lines: 42 > 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 */ /* -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/