From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ozan Caglayan <ozan@pardus.org.tr>,
Linus <torvalds@linux-foundation.org>,
ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
linux-pci@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the final tree (linus' tree related)
Date: Sat, 15 Jan 2011 21:01:57 +0100 [thread overview]
Message-ID: <201101152101.57533.rjw@sisk.pl> (raw)
In-Reply-To: <20110116024434.3a5ccabb.sfr@canb.auug.org.au>
On Saturday, January 15, 2011, Stephen Rothwell wrote:
> Hi Raphael,
>
> On Sat, 15 Jan 2011 14:19:16 +0100 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> >
> > 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.
>
> That fixes the compile error for my powerpc allyesconfig build.
> And my x86_64 allmodconfig and i386 defconfig builds still work.
Cool, thanks.
It goes again below, with a changelog.
Thanks,
Rafael
---
From: Rafael J. Wysocki <rjw@sisk.pl>
Subject: PCI / ACPI: Fix build of the AER driver for !CONFIG_ACPI
After commit 415e12b (PCI/ACPI: Request _OSC control once for each
root bridge (v3)) include/linux/pci-acpi.h is included by
drivers/pci/pcie/aer/aerdrv.c and if CONFIG_ACPI is unset, the
bogus and unnecessary alternative definition of
acpi_find_root_bridge_handle() causes a build error to occur.
Remove the offending piece of garbage.
Reported-and-tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
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 20:01 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
2011-01-15 15:44 ` Stephen Rothwell
2011-01-15 20:01 ` Rafael J. Wysocki [this message]
-- 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=201101152101.57533.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-pci@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).