From 5a96dfe84b53cc05abe8c7f4d1dfd7b03a3e314a Mon Sep 17 00:00:00 2001 From: Ishizaki Kou Date: Thu, 24 Apr 2008 19:27:32 +1000 Subject: [PATCH] [POWERPC] celleb: Move files for Beat hvcall interfaces This moves files for Beat hvcall interfaces into platforms/cell/. All files in this patch are used by celleb-beat only. Signed-off-by: Kou Ishizaki Acked-by: Arnd Bergmann Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras --- arch/powerpc/platforms/cell/Makefile | 3 ++- arch/powerpc/platforms/{celleb/hvCall.S => cell/beat_hvCall.S} | 0 arch/powerpc/platforms/{celleb => cell}/beat_syscall.h | 0 arch/powerpc/platforms/{celleb => cell}/beat_wrapper.h | 0 arch/powerpc/platforms/cell/celleb_setup.c | 2 +- arch/powerpc/platforms/celleb/Makefile | 2 +- arch/powerpc/platforms/celleb/beat.c | 2 +- arch/powerpc/platforms/celleb/htab.c | 2 +- arch/powerpc/platforms/celleb/interrupt.c | 2 +- arch/powerpc/platforms/celleb/iommu.c | 2 +- arch/powerpc/platforms/celleb/spu_priv1.c | 2 +- 11 files changed, 9 insertions(+), 8 deletions(-) rename arch/powerpc/platforms/{celleb/hvCall.S => cell/beat_hvCall.S} (100%) rename arch/powerpc/platforms/{celleb => cell}/beat_syscall.h (100%) rename arch/powerpc/platforms/{celleb => cell}/beat_wrapper.h (100%) diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile index 3b6ee08701..b76d17809c 100644 --- a/arch/powerpc/platforms/cell/Makefile +++ b/arch/powerpc/platforms/cell/Makefile @@ -34,7 +34,8 @@ ifeq ($(CONFIG_PPC_CELLEB),y) obj-y += celleb_setup.o \ celleb_pci.o celleb_scc_epci.o \ celleb_scc_uhc.o \ - io-workarounds.o spider-pci.o + io-workarounds.o spider-pci.o \ + beat_hvCall.o obj-$(CONFIG_SERIAL_TXX9) += celleb_scc_sio.o endif diff --git a/arch/powerpc/platforms/celleb/hvCall.S b/arch/powerpc/platforms/cell/beat_hvCall.S similarity index 100% rename from arch/powerpc/platforms/celleb/hvCall.S rename to arch/powerpc/platforms/cell/beat_hvCall.S diff --git a/arch/powerpc/platforms/celleb/beat_syscall.h b/arch/powerpc/platforms/cell/beat_syscall.h similarity index 100% rename from arch/powerpc/platforms/celleb/beat_syscall.h rename to arch/powerpc/platforms/cell/beat_syscall.h diff --git a/arch/powerpc/platforms/celleb/beat_wrapper.h b/arch/powerpc/platforms/cell/beat_wrapper.h similarity index 100% rename from arch/powerpc/platforms/celleb/beat_wrapper.h rename to arch/powerpc/platforms/cell/beat_wrapper.h diff --git a/arch/powerpc/platforms/cell/celleb_setup.c b/arch/powerpc/platforms/cell/celleb_setup.c index d0dad24f2d..401557cbb6 100644 --- a/arch/powerpc/platforms/cell/celleb_setup.c +++ b/arch/powerpc/platforms/cell/celleb_setup.c @@ -57,7 +57,7 @@ #include #include "../celleb/interrupt.h" -#include "../celleb/beat_wrapper.h" +#include "beat_wrapper.h" #include "../celleb/beat.h" #include "celleb_pci.h" #include "interrupt.h" diff --git a/arch/powerpc/platforms/celleb/Makefile b/arch/powerpc/platforms/celleb/Makefile index edb6d5e858..5f612c12b2 100644 --- a/arch/powerpc/platforms/celleb/Makefile +++ b/arch/powerpc/platforms/celleb/Makefile @@ -1,5 +1,5 @@ obj-y += interrupt.o iommu.o \ - htab.o beat.o hvCall.o + htab.o beat.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_PPC_UDBG_BEAT) += udbg_beat.o diff --git a/arch/powerpc/platforms/celleb/beat.c b/arch/powerpc/platforms/celleb/beat.c index b64b171f24..eb99d0b664 100644 --- a/arch/powerpc/platforms/celleb/beat.c +++ b/arch/powerpc/platforms/celleb/beat.c @@ -31,7 +31,7 @@ #include #include -#include "beat_wrapper.h" +#include "../cell/beat_wrapper.h" #include "beat.h" #include "interrupt.h" diff --git a/arch/powerpc/platforms/celleb/htab.c b/arch/powerpc/platforms/celleb/htab.c index 81467ff055..18eaed1107 100644 --- a/arch/powerpc/platforms/celleb/htab.c +++ b/arch/powerpc/platforms/celleb/htab.c @@ -32,7 +32,7 @@ #include #include -#include "beat_wrapper.h" +#include "../cell/beat_wrapper.h" #ifdef DEBUG_LOW #define DBG_LOW(fmt...) do { udbg_printf(fmt); } while (0) diff --git a/arch/powerpc/platforms/celleb/interrupt.c b/arch/powerpc/platforms/celleb/interrupt.c index 69562a8678..bb7bdad95e 100644 --- a/arch/powerpc/platforms/celleb/interrupt.c +++ b/arch/powerpc/platforms/celleb/interrupt.c @@ -27,7 +27,7 @@ #include #include "interrupt.h" -#include "beat_wrapper.h" +#include "../cell/beat_wrapper.h" #define MAX_IRQS NR_IRQS static DEFINE_SPINLOCK(beatic_irq_mask_lock); diff --git a/arch/powerpc/platforms/celleb/iommu.c b/arch/powerpc/platforms/celleb/iommu.c index 93b0efddd6..3eda423812 100644 --- a/arch/powerpc/platforms/celleb/iommu.c +++ b/arch/powerpc/platforms/celleb/iommu.c @@ -26,7 +26,7 @@ #include -#include "beat_wrapper.h" +#include "../cell/beat_wrapper.h" #define DMA_FLAGS 0xf800000000000000UL /* r/w permitted, coherency required, strongest order */ diff --git a/arch/powerpc/platforms/celleb/spu_priv1.c b/arch/powerpc/platforms/celleb/spu_priv1.c index bcc17f7fe8..ad22a148f3 100644 --- a/arch/powerpc/platforms/celleb/spu_priv1.c +++ b/arch/powerpc/platforms/celleb/spu_priv1.c @@ -24,7 +24,7 @@ #include #include -#include "beat_wrapper.h" +#include "../cell/beat_wrapper.h" static inline void _int_mask_set(struct spu *spu, int class, u64 mask) { -- 2.39.5