public inbox for linux-acpi@vger.kernel.org
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Len Brown <lenb@kernel.org>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>,
	ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
	linux-pci@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Andres Salomon <dilinger@queued.net>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH 1/2] PCI / ACPI: Fix build of the AER driver for CONFIG_ACPI unset
Date: Sun, 16 Jan 2011 20:42:43 +0100	[thread overview]
Message-ID: <201101162042.43341.rjw@sisk.pl> (raw)
In-Reply-To: <201101162041.02419.rjw@sisk.pl>

From: Rafael J. Wysocki <rjw@sisk.pl>

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

  reply	other threads:[~2011-01-16 19:42 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-16 19:41 [PATCH 0/2] ACPI / PCI: Post-merge fixes Rafael J. Wysocki
2011-01-16 19:42 ` Rafael J. Wysocki [this message]
2011-01-17  4:25   ` [PATCH 1/2] PCI / ACPI: Fix build of the AER driver for CONFIG_ACPI unset Len Brown
2011-01-16 19:44 ` [PATCH 2/2] ACPI: Fix boot problem related to APEI with acpi_disabled set Rafael J. Wysocki
2011-01-17  4:26   ` Len Brown

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=201101162042.43341.rjw@sisk.pl \
    --to=rjw@sisk.pl \
    --cc=dilinger@queued.net \
    --cc=jbarnes@virtuousgeek.org \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --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