Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[PATCH] powerpc: Move xics.[ch] into platforms/pseries 



This patch moves the XICS interrupt controller code into the
platforms/pseries directory, since it only appears on pSeries
machines.  If it ever appears on some other machine we can move it to
sysdev, although xics.c itself will need a bunch of changes in that
case to remove pSeries specific assumptions.

Signed-off-by: default avatarDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 22b28032

arch/powerpc/platforms/pseries/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \ 
			   setup.o iommu.o rtas-fw.o ras.o

obj-$(CONFIG_SMP)	+= smp.o

obj-$(CONFIG_IBMVIO)	+= vio.o

obj-$(CONFIG_XICS)	+= xics.o

arch/powerpc/platforms/pseries/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
#include <asm/time.h>

#include <asm/nvram.h>

#include <asm/plpar_wrappers.h>

#include <asm/xics.h>

#include "xics.h"

#include <asm/firmware.h>

#include <asm/pmc.h>

#include <asm/mpic.h>

arch/powerpc/platforms/pseries/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <asm/paca.h>

#include <asm/time.h>

#include <asm/machdep.h>

#include <asm/xics.h>

#include "xics.h"

#include <asm/cputable.h>

#include <asm/firmware.h>

#include <asm/system.h>

arch/ppc64/kernel/xics.c→arch/powerpc/platforms/pseries/xics.c

+13 −12
Original line number Diff line number Diff line 
/*

 * arch/ppc64/kernel/xics.c

 * arch/powerpc/platforms/pseries/xics.c

 *

 * Copyright 2000 IBM Corporation.

 *
@@ -25,11 +25,12 @@ 
#include <asm/pgtable.h>

#include <asm/smp.h>

#include <asm/rtas.h>

#include <asm/xics.h>

#include <asm/hvcall.h>

#include <asm/machdep.h>

#include <asm/i8259.h>



#include "xics.h"



static unsigned int xics_startup(unsigned int irq);

static void xics_enable_irq(unsigned int irq);

static void xics_disable_irq(unsigned int irq);

include/asm-ppc64/xics.h→arch/powerpc/platforms/pseries/xics.h

+5 −5
Original line number Diff line number Diff line 
/*

 * arch/ppc64/kernel/xics.h

 * arch/powerpc/platforms/pseries/xics.h

 *

 * Copyright 2000 IBM Corporation.

 *
@@ -9,8 +9,8 @@ 
 *  2 of the License, or (at your option) any later version.

 */



#ifndef _PPC64_KERNEL_XICS_H

#define _PPC64_KERNEL_XICS_H

#ifndef _POWERPC_KERNEL_XICS_H

#define _POWERPC_KERNEL_XICS_H



#include <linux/cache.h>
@@ -31,4 +31,4 @@ struct xics_ipi_struct { 


extern struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;



#endif /* _PPC64_KERNEL_XICS_H */
 
#endif /* _POWERPC_KERNEL_XICS_H */