Commit a2c70211 authored by David Gibson's avatar David Gibson Committed by Paul Mackerras
Browse files

[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: default avatarDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 4297c986

arch/powerpc/kernel/ppc_ksyms.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <asm/btext.h>

#include <asm/btext.h>

#include <asm/div64.h>

#include <asm/div64.h>

#include <asm/signal.h>

#include <asm/signal.h>

#include <asm/dcr.h>





#ifdef  CONFIG_8xx

#ifdef  CONFIG_8xx

#include <asm/commproc.h>

#include <asm/commproc.h>

arch/ppc/kernel/ppc_ksyms.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <asm/div64.h>

#include <asm/div64.h>

#include <asm/xmon.h>

#include <asm/xmon.h>

#include <asm/signal.h>

#include <asm/signal.h>

#include <asm/dcr.h>





#ifdef  CONFIG_8xx

#ifdef  CONFIG_8xx

#include <asm/commproc.h>

#include <asm/commproc.h>

include/asm-powerpc/dcr.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ 
 * base from the device-tree

 * base from the device-tree

 */

 */

#ifdef CONFIG_PPC_MERGE

#ifdef CONFIG_PPC_MERGE

struct device_node;

extern unsigned int dcr_resource_start(struct device_node *np,

extern unsigned int dcr_resource_start(struct device_node *np,

				       unsigned int index);

				       unsigned int index);

extern unsigned int dcr_resource_len(struct device_node *np,

extern unsigned int dcr_resource_len(struct device_node *np,

include/asm-ppc/ibm4xx.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
#define __ASM_IBM4XX_H__

#define __ASM_IBM4XX_H__





#include <asm/types.h>

#include <asm/types.h>

#include <asm/dcr.h>





#ifdef CONFIG_40x

#ifdef CONFIG_40x

include/asm-ppc/reg_booke.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -9,8 +9,6 @@ 
#ifndef __ASM_PPC_REG_BOOKE_H__

#ifndef __ASM_PPC_REG_BOOKE_H__

#define __ASM_PPC_REG_BOOKE_H__

#define __ASM_PPC_REG_BOOKE_H__





#include <asm/dcr.h>



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__

/* Performance Monitor Registers */

/* Performance Monitor Registers */

#define mfpmr(rn)	({unsigned int rval; \

#define mfpmr(rn)	({unsigned int rval; \

CRA Git | Maintained and supported by SUSTech CRA and CCSE