From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: David Gibson <david@gibson.dropbear.id.au>
Cc: linuxppc-dev@ozlabs.org, Paul Mackerras <paulus@samba.org>
Subject: Re: [powerpc] Compile fixes for arch/powerpc dcr code
Date: Tue, 06 Feb 2007 11:54:23 +1100 [thread overview]
Message-ID: <1170723263.2620.187.camel@localhost.localdomain> (raw)
In-Reply-To: <20070206004828.GC20123@localhost.localdomain>
On Tue, 2007-02-06 at 11:48 +1100, David Gibson wrote:
> Paulus, please apply.
>
> The new dcr code does not currently compile when configured for native
> DCR access on ARCH=powerpc. This patch fixes the problems.
>
> Signed-off-by: David Gibson <dwg@au1.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
>
> Index: working-2.6/arch/powerpc/kernel/ppc_ksyms.c
> ===================================================================
> --- working-2.6.orig/arch/powerpc/kernel/ppc_ksyms.c 2007-01-24 12:01:17.000000000 +1100
> +++ working-2.6/arch/powerpc/kernel/ppc_ksyms.c 2007-02-06 11:34:54.000000000 +1100
> @@ -44,6 +44,7 @@
> #include <asm/btext.h>
> #include <asm/div64.h>
> #include <asm/signal.h>
> +#include <asm/dcr.h>
>
> #ifdef CONFIG_8xx
> #include <asm/commproc.h>
> Index: working-2.6/include/asm-powerpc/dcr.h
> ===================================================================
> --- working-2.6.orig/include/asm-powerpc/dcr.h 2007-01-24 12:01:20.000000000 +1100
> +++ working-2.6/include/asm-powerpc/dcr.h 2007-02-06 11:34:54.000000000 +1100
> @@ -33,6 +33,7 @@
> * base from the device-tree
> */
> #ifdef CONFIG_PPC_MERGE
> +struct device_node;
> extern unsigned int dcr_resource_start(struct device_node *np,
> unsigned int index);
> extern unsigned int dcr_resource_len(struct device_node *np,
> Index: working-2.6/include/asm-ppc/reg_booke.h
> ===================================================================
> --- working-2.6.orig/include/asm-ppc/reg_booke.h 2007-01-24 12:01:20.000000000 +1100
> +++ working-2.6/include/asm-ppc/reg_booke.h 2007-02-06 11:34:54.000000000 +1100
> @@ -9,8 +9,6 @@
> #ifndef __ASM_PPC_REG_BOOKE_H__
> #define __ASM_PPC_REG_BOOKE_H__
>
> -#include <asm/dcr.h>
> -
> #ifndef __ASSEMBLY__
> /* Performance Monitor Registers */
> #define mfpmr(rn) ({unsigned int rval; \
> Index: working-2.6/arch/ppc/kernel/ppc_ksyms.c
> ===================================================================
> --- working-2.6.orig/arch/ppc/kernel/ppc_ksyms.c 2007-02-06 11:38:28.000000000 +1100
> +++ working-2.6/arch/ppc/kernel/ppc_ksyms.c 2007-02-06 11:38:39.000000000 +1100
> @@ -43,6 +43,7 @@
> #include <asm/div64.h>
> #include <asm/xmon.h>
> #include <asm/signal.h>
> +#include <asm/dcr.h>
>
> #ifdef CONFIG_8xx
> #include <asm/commproc.h>
> Index: working-2.6/include/asm-ppc/ibm4xx.h
> ===================================================================
> --- working-2.6.orig/include/asm-ppc/ibm4xx.h 2007-02-06 11:39:13.000000000 +1100
> +++ working-2.6/include/asm-ppc/ibm4xx.h 2007-02-06 11:39:27.000000000 +1100
> @@ -15,6 +15,7 @@
> #define __ASM_IBM4XX_H__
>
> #include <asm/types.h>
> +#include <asm/dcr.h>
>
> #ifdef CONFIG_40x
>
>
>
prev parent reply other threads:[~2007-02-06 0:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-06 0:48 [powerpc] Compile fixes for arch/powerpc dcr code David Gibson
2007-02-06 0:54 ` Benjamin Herrenschmidt [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=1170723263.2620.187.camel@localhost.localdomain \
--to=benh@kernel.crashing.org \
--cc=david@gibson.dropbear.id.au \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.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).