Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762389AbYBTFX6 (ORCPT ); Wed, 20 Feb 2008 00:23:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753505AbYBTFXh (ORCPT ); Wed, 20 Feb 2008 00:23:37 -0500 Received: from mga02.intel.com ([134.134.136.20]:56339 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753407AbYBTFXg (ORCPT ); Wed, 20 Feb 2008 00:23:36 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.25,379,1199692800"; d="scan'208";a="258676674" Subject: Re: [bootup crash, -git] Re: patch pci-pcie-aspm-support.patchadded to gregkh-2.6 tree From: Shaohua Li To: Greg KH Cc: Greg KH , Ingo Molnar , "Kok, Auke-jan H" , linux-kernel@vger.kernel.org, linux-pci@atrey.karlin.mff.cuni.cz, matthew@wil.cx, "Pallipadi, Venkatesh" , Linus Torvalds , Andrew Morton In-Reply-To: <20080220050403.GA31314@suse.de> References: <1201141317.26118.2.camel@sli10-desk.sh.intel.com> <12013009171835@kroah.org> <20080202105506.GA25160@elte.hu> <20080202185145.GA13005@kroah.com> <1203399945.12681.8.camel@sli10-desk.sh.intel.com> <20080219234529.GA12967@kroah.com> <1203471367.21958.3.camel@sli10-desk.sh.intel.com> <20080220041400.GA18771@suse.de> <1203482901.23071.5.camel@sli10-desk.sh.intel.com> <20080220050403.GA31314@suse.de> Content-Type: text/plain Date: Wed, 20 Feb 2008 13:24:48 +0800 Message-Id: <1203485088.23071.10.camel@sli10-desk.sh.intel.com> Mime-Version: 1.0 X-Mailer: Evolution 2.12.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2271 Lines: 50 On Tue, 2008-02-19 at 21:04 -0800, Greg KH wrote: > On Wed, Feb 20, 2008 at 12:48:21PM +0800, Shaohua Li wrote: > > > > On Tue, 2008-02-19 at 20:14 -0800, Greg KH wrote: > > > On Wed, Feb 20, 2008 at 09:36:07AM +0800, Shaohua Li wrote: > > > > --- linux.orig/include/linux/pci-acpi.h 2008-02-19 11:03:51.000000000 +0800 > > > > +++ linux/include/linux/pci-acpi.h 2008-02-20 09:19:15.000000000 +0800 > > > > @@ -47,6 +47,7 @@ > > > > OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL) > > > > > > > > #ifdef CONFIG_ACPI > > > > +#include > > > > extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags); > > > > extern acpi_status __pci_osc_support_set(u32 flags, const char *hid); > > > > static inline acpi_status pci_osc_support_set(u32 flags) > > > > @@ -59,13 +60,11 @@ static inline acpi_status pcie_osc_suppo > > > > } > > > > #else > > > > #if !defined(AE_ERROR) > > > > -typedef u32 acpi_status; > > > > -#define AE_ERROR (acpi_status) (0x0001) > > > > -#endif > > > > -static inline acpi_status pci_osc_control_set(acpi_handle handle, u32 flags) > > > > -{return AE_ERROR;} > > > > -static inline acpi_status pci_osc_support_set(u32 flags) {return AE_ERROR;} > > > > -static inline acpi_status pcie_osc_support_set(u32 flags) {return AE_ERROR;} > > > > +#define AE_ERROR (0x0001) > > > > +#endif > > > > +#define pci_osc_control_set(handle, flags) (AE_ERROR) > > > > +#define pci_osc_support_set(flags) (AE_ERROR) > > > > +#define pcie_osc_support_set(flags) (AE_ERROR) > > > > > > No, please use inline functions, don't change these functions that > > > should be just fine. Why are you needing to change them? > > some types aren't defined in non-ACPI, like acpi_handle, acpi_status. > > Then why include a non-ACPI header file in non-ACPI .c files? aspm is generic, but in ACPI platform, it needs special handling. I can add 'ifdef CONFIG_ACPI' in aspm.c to avoid changing pci-acpi.h, but thought it's better pci-acpi.h is self-contained. Thanks, Shaohua -- 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/