* [powerpc] Compile fixes for arch/powerpc dcr code
@ 2007-02-06 0:48 David Gibson
2007-02-06 0:54 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 2+ messages in thread
From: David Gibson @ 2007-02-06 0:48 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
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>
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
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [powerpc] Compile fixes for arch/powerpc dcr code
2007-02-06 0:48 [powerpc] Compile fixes for arch/powerpc dcr code David Gibson
@ 2007-02-06 0:54 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 2+ messages in thread
From: Benjamin Herrenschmidt @ 2007-02-06 0:54 UTC (permalink / raw)
To: David Gibson; +Cc: linuxppc-dev, Paul Mackerras
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
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-02-06 0:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-02-06 0:48 [powerpc] Compile fixes for arch/powerpc dcr code David Gibson
2007-02-06 0:54 ` Benjamin Herrenschmidt
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).