From: Arnd Bergmann <arnd@arndb•de>
To: Paul Mackerras <paulus@ozlabs•org>
Cc: linuxppc-dev@ozlabs•org, cbe-oss-dev@ozlabs•org,
Arnd Bergmann <arnd.bergmann@de•ibm.com>
Subject: [POWERPC 9/9] fix building without PCI
Date: Mon, 27 Nov 2006 19:19:00 +0100 [thread overview]
Message-ID: <20061127182432.342279000@arndb.de> (raw)
In-Reply-To: 20061127181851.796747000@arndb.de
At least the ide driver calls pcibus_to_node, which is not
defined when CONFIG_PCI is disabled. This adds a nop function
for the !PCI case.
Signed-off-by: Arnd Bergmann <arnd.bergmann@de•ibm.com>
diff --git a/include/asm-powerpc/topology.h b/include/asm-powerpc/topology.h
index 9fe7894..50c0140 100644
--- a/include/asm-powerpc/topology.h
+++ b/include/asm-powerpc/topology.h
@@ -32,7 +32,14 @@ static inline int node_to_first_cpu(int
int of_node_to_nid(struct device_node *device);
struct pci_bus;
+#ifdef CONFIG_PCI
extern int pcibus_to_node(struct pci_bus *bus);
+#else
+static inline int pcibus_to_node(struct pci_bus *bus)
+{
+ return -1;
+}
+#endif
#define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? \
CPU_MASK_ALL : \
--
prev parent reply other threads:[~2006-11-27 18:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-27 18:18 [POWERPC 0/9] cell bug fixes for 2.6.20 Arnd Bergmann
2006-11-27 18:18 ` [POWERPC 1/9] spufs: return an error in spu_create is isolated create isnt supported Arnd Bergmann
2006-11-27 18:18 ` [POWERPC 2/9] spufs: always send sigtrap on breakpoint Arnd Bergmann
2006-11-28 0:12 ` Luke Browning
2006-11-28 0:29 ` Arnd Bergmann
2006-11-27 18:18 ` [POWERPC 3/9] spufs: we should only execute init_spu_base on cell Arnd Bergmann
2006-11-27 18:18 ` [POWERPC 4/9] cell: fix building without spufs Arnd Bergmann
2006-11-27 18:18 ` [POWERPC 5/9] ps3: Missed renames of CONFIG_PS3 to CONFIG_PPC_PS3 Arnd Bergmann
2006-11-28 0:40 ` Geoff Levand
2006-11-27 18:18 ` [POWERPC 6/9] ps3: multiplatform build fixes Arnd Bergmann
2006-11-28 21:05 ` [Cbe-oss-dev] " Geoff Levand
2006-11-27 18:18 ` [POWERPC 7/9] ps3: add a default zImage target Arnd Bergmann
2006-11-28 0:59 ` Geoff Levand
2006-11-27 18:18 ` [POWERPC 8/9] fix missing #include in sys_ppc32.c Arnd Bergmann
2006-11-27 18:19 ` Arnd Bergmann [this message]
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=20061127182432.342279000@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=arnd.bergmann@de$(echo .)ibm.com \
--cc=cbe-oss-dev@ozlabs$(echo .)org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=paulus@ozlabs$(echo .)org \
/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