From: "Rafael J. Wysocki" <rjw@sisk•pl>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Jesse Barnes <jbarnes@virtuousgeek•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: build failure after merge of the final tree (pci-current tree related)
Date: Wed, 25 Aug 2010 21:33:29 +0200 [thread overview]
Message-ID: <201008252133.29525.rjw@sisk.pl> (raw)
In-Reply-To: <20100825115604.07928f97.sfr@canb.auug.org.au>
On Wednesday, August 25, 2010, Stephen Rothwell wrote:
> Hi Jesse,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/pci/hotplug/pciehp_core.c: In function 'pciehp_probe':
> drivers/pci/hotplug/pciehp_core.c:238: error: implicit declaration of function 'pciehp_acpi_slot_detection_check'
>
> Caused by commit 28eb5f274a305bf3a13b2c80c4804d4515d05c64 ("PCI: PCIe:
> Ask BIOS for control of all native services at once"). This function is
> only declared if CONFIG_ACPI is defined.
>
> I have reverted that commit for today (and the two that interact with it:
> 2bd50dd800b52245294cfceb56be62020cdc7515 "PCI: PCIe: Disable PCIe port
> services during port initialization" and
> 271fb719cc472af3b1e96d8c527bb0da7060a172 "PCI: PCIe: Move PCIe PME code
> to the pcie directory").
Sorry, my bad.
The patch below should fix this issue.
Thanks,
Rafael
---
From: Rafael J. Wysocki <rjw@sisk•pl>
Subject: PCI / hot-plug: Fix build with CONFIG_ACPI unset
One of the recent changes caused complilation of
drivers/pci/hotplug/pciehp_core.c to fail. Fix this issue.
Signed-off-by: Rafael J. Wysocki <rjw@sisk•pl>
---
drivers/pci/hotplug/pciehp.h | 4 ++++
1 file changed, 4 insertions(+)
Index: linux-2.6/drivers/pci/hotplug/pciehp.h
===================================================================
--- linux-2.6.orig/drivers/pci/hotplug/pciehp.h
+++ linux-2.6/drivers/pci/hotplug/pciehp.h
@@ -178,5 +178,9 @@ static inline void pciehp_firmware_init(
}
#else
#define pciehp_firmware_init() do {} while (0)
+static inline int pciehp_acpi_slot_detection_check(struct pci_dev *dev)
+{
+ return 0;
+}
#endif /* CONFIG_ACPI */
#endif /* _PCIEHP_H */
next prev parent reply other threads:[~2010-08-25 19:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-25 1:56 linux-next: build failure after merge of the final tree (pci-current tree related) Stephen Rothwell
2010-08-25 19:33 ` Rafael J. Wysocki [this message]
2010-08-25 19:54 ` Jesse Barnes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201008252133.29525.rjw@sisk.pl \
--to=rjw@sisk$(echo .)pl \
--cc=jbarnes@virtuousgeek$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox