From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ozan Caglayan <ozan@pardus.org.tr>,
Jesse Barnes <jbarnes@virtuousgeek.org>,
Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: build failure after merge of the final tree (linus' tree related)
Date: Sat, 15 Jan 2011 14:19:16 +0100 [thread overview]
Message-ID: <201101151419.16758.rjw@sisk.pl> (raw)
In-Reply-To: <20110115133412.58b8cd89.sfr@canb.auug.org.au>
On Saturday, January 15, 2011, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> In file included from drivers/pci/pcie/aer/aerdrv.c:20:
> include/linux/pci-acpi.h:39: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'acpi_find_root_bridge_handle'
>
> Caused by commit 415e12b2379239973feab91850b0dce985c6058a ("PCI/ACPI:
> Request _OSC control once for each root bridge (v3)"). (Yet another
> patch not seen in linux-next until merged into Linus' tree. In this case
> the breakage was not seen because the new part of the pci tree was
> excluded from linux-next for several days because of another commit that
> broke my builds.
Ah. I thought it was in linux-next. :-(
> That other commit was only excluded from the pci tree
> just before being sent to Linus :-()
>
> This is the non CONFIG_ACPI version of acpi_find_root_bridge_handle()
> which returns an acpi_handle. pci-acpi.h is now always included in
> drivers/pci/pcie/aer/aerdrv.c.
>
> I tried ifef'ing out the inclusion of pci-acpi.h, but that only made
> matters worse. I have just left it for today. Please fix.
It looks like the non-CONFIG_ACPI version of acpi_find_root_bridge_handle()
is just not necessary any more, because acpi_find_root_bridge_handle() is only
used in code that depends on CONFIG_ACPI.
A patch removing it is appended, please test.
Thanks,
Rafael
---
include/linux/pci-acpi.h | 3 ---
1 file changed, 3 deletions(-)
Index: linux-2.6/include/linux/pci-acpi.h
===================================================================
--- linux-2.6.orig/include/linux/pci-acpi.h
+++ linux-2.6/include/linux/pci-acpi.h
@@ -35,9 +35,6 @@ static inline acpi_handle acpi_pci_get_b
return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),
pbus->number);
}
-#else
-static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
-{ return NULL; }
#endif
#ifdef CONFIG_ACPI_APEI
next prev parent reply other threads:[~2011-01-15 13:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-15 2:34 linux-next: build failure after merge of the final tree (linus' tree related) Stephen Rothwell
2011-01-15 13:19 ` Rafael J. Wysocki [this message]
2011-01-15 15:44 ` Stephen Rothwell
2011-01-15 20:01 ` Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2013-03-21 6:23 Stephen Rothwell
2012-03-30 3:31 linux-next: build failure after merge of the final tree (Linus' " Stephen Rothwell
2012-03-30 3:39 ` David Miller
2012-03-30 5:45 ` David Miller
2012-03-30 6:31 ` Stephen Rothwell
2011-08-29 5:47 linux-next: build failure after merge of the final tree (linus' " Stephen Rothwell
2011-08-29 16:22 ` David Miller
2011-06-17 5:38 linux-next: build failure after merge of the final tree (Linus' " Stephen Rothwell
2011-06-17 5:34 ` KAMEZAWA Hiroyuki
2010-07-22 3:58 Stephen Rothwell
2010-05-28 5:08 linux-next: build failure after merge of the final tree (linus' " Stephen Rothwell
2010-05-28 12:50 ` Steven Rostedt
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=201101151419.16758.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ozan@pardus.org.tr \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).