Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[POWERPC] Compile fixes for arch/powerpc dcr code

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>
Signed-off-by: Paul Mackerras <paulus@samba.org>

authored by

David Gibson and committed by
Paul Mackerras
a2c70211 4297c986

+4 -2
+1
arch/powerpc/kernel/ppc_ksyms.c
··· 44 44 #include <asm/btext.h> 45 45 #include <asm/div64.h> 46 46 #include <asm/signal.h> 47 + #include <asm/dcr.h> 47 48 48 49 #ifdef CONFIG_8xx 49 50 #include <asm/commproc.h>
+1
arch/ppc/kernel/ppc_ksyms.c
··· 43 43 #include <asm/div64.h> 44 44 #include <asm/xmon.h> 45 45 #include <asm/signal.h> 46 + #include <asm/dcr.h> 46 47 47 48 #ifdef CONFIG_8xx 48 49 #include <asm/commproc.h>
+1
include/asm-powerpc/dcr.h
··· 33 33 * base from the device-tree 34 34 */ 35 35 #ifdef CONFIG_PPC_MERGE 36 + struct device_node; 36 37 extern unsigned int dcr_resource_start(struct device_node *np, 37 38 unsigned int index); 38 39 extern unsigned int dcr_resource_len(struct device_node *np,
+1
include/asm-ppc/ibm4xx.h
··· 15 15 #define __ASM_IBM4XX_H__ 16 16 17 17 #include <asm/types.h> 18 + #include <asm/dcr.h> 18 19 19 20 #ifdef CONFIG_40x 20 21
-2
include/asm-ppc/reg_booke.h
··· 9 9 #ifndef __ASM_PPC_REG_BOOKE_H__ 10 10 #define __ASM_PPC_REG_BOOKE_H__ 11 11 12 - #include <asm/dcr.h> 13 - 14 12 #ifndef __ASSEMBLY__ 15 13 /* Performance Monitor Registers */ 16 14 #define mfpmr(rn) ({unsigned int rval; \