linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Michael Ellerman <michael@ellerman.id.au>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org
Subject: Re: [PATCH] powerpc: Fix build of 4xx simple platforms without CONFIG_PCI
Date: Mon, 08 Dec 2008 16:32:09 +1100	[thread overview]
Message-ID: <1228714329.23242.52.camel@localhost> (raw)
In-Reply-To: <20081208045411.0CE03DDE0E@ozlabs.org>

[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]

On Mon, 2008-12-08 at 15:53 +1100, Benjamin Herrenschmidt wrote:
> The global ppc_pci_flags is not defined when CONFIG_PCI is not
> set, causing a link error
> 
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
> 
>  arch/powerpc/platforms/40x/ppc40x_simple.c |    2 ++
>  arch/powerpc/platforms/44x/ppc44x_simple.c |    2 ++
>  2 files changed, 4 insertions(+)
> 
> --- linux-work.orig/arch/powerpc/platforms/40x/ppc40x_simple.c	2008-12-08 15:51:49.000000000 +1100
> +++ linux-work/arch/powerpc/platforms/40x/ppc40x_simple.c	2008-12-08 15:51:52.000000000 +1100
> @@ -61,7 +61,9 @@ static int __init ppc40x_probe(void)
>  
>  	for (i = 0; i < ARRAY_SIZE(board); i++) {
>  		if (of_flat_dt_is_compatible(root, board[i])) {
> +#ifdef CONFIG_PCI
>  			ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
> +#endif

No! #ifdefs! in C code!

To the tune of you-know-what.

Looks like we need an accessor we can replace with an empty version in
the !PCI case.

cheers

-- 
Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

  reply	other threads:[~2008-12-08  5:32 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-08  4:53 [PATCH] powerpc: Fix build of 4xx simple platforms without CONFIG_PCI Benjamin Herrenschmidt
2008-12-08  5:32 ` Michael Ellerman [this message]
2008-12-08  5:38   ` Benjamin Herrenschmidt
2008-12-10 14:25     ` Josh Boyer
2008-12-10 19:06       ` Josh Boyer
2008-12-10 21:59       ` Michael Ellerman

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=1228714329.23242.52.camel@localhost \
    --to=michael@ellerman.id.au \
    --cc=benh@kernel.crashing.org \
    --cc=linuxppc-dev@ozlabs.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).