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

[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 <kou.ishizaki@toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

authored by

Ishizaki Kou and committed by
Paul Mackerras 5a96dfe8 11eef455

+9 -8
+2 -1
arch/powerpc/platforms/cell/Makefile
··· 34 34 obj-y += celleb_setup.o \ 35 35 celleb_pci.o celleb_scc_epci.o \ 36 36 celleb_scc_uhc.o \ 37 - io-workarounds.o spider-pci.o 37 + io-workarounds.o spider-pci.o \ 38 + beat_hvCall.o 38 39 39 40 obj-$(CONFIG_SERIAL_TXX9) += celleb_scc_sio.o 40 41 endif
+1 -1
arch/powerpc/platforms/cell/celleb_setup.c
··· 57 57 #include <asm/cell-regs.h> 58 58 59 59 #include "../celleb/interrupt.h" 60 - #include "../celleb/beat_wrapper.h" 60 + #include "beat_wrapper.h" 61 61 #include "../celleb/beat.h" 62 62 #include "celleb_pci.h" 63 63 #include "interrupt.h"
+1 -1
arch/powerpc/platforms/celleb/Makefile
··· 1 1 obj-y += interrupt.o iommu.o \ 2 - htab.o beat.o hvCall.o 2 + htab.o beat.o 3 3 4 4 obj-$(CONFIG_SMP) += smp.o 5 5 obj-$(CONFIG_PPC_UDBG_BEAT) += udbg_beat.o
+1 -1
arch/powerpc/platforms/celleb/beat.c
··· 31 31 #include <asm/machdep.h> 32 32 #include <asm/firmware.h> 33 33 34 - #include "beat_wrapper.h" 34 + #include "../cell/beat_wrapper.h" 35 35 #include "beat.h" 36 36 #include "interrupt.h" 37 37
arch/powerpc/platforms/celleb/beat_syscall.h arch/powerpc/platforms/cell/beat_syscall.h
arch/powerpc/platforms/celleb/beat_wrapper.h arch/powerpc/platforms/cell/beat_wrapper.h
+1 -1
arch/powerpc/platforms/celleb/htab.c
··· 32 32 #include <asm/machdep.h> 33 33 #include <asm/udbg.h> 34 34 35 - #include "beat_wrapper.h" 35 + #include "../cell/beat_wrapper.h" 36 36 37 37 #ifdef DEBUG_LOW 38 38 #define DBG_LOW(fmt...) do { udbg_printf(fmt); } while (0)
arch/powerpc/platforms/celleb/hvCall.S arch/powerpc/platforms/cell/beat_hvCall.S
+1 -1
arch/powerpc/platforms/celleb/interrupt.c
··· 27 27 #include <asm/machdep.h> 28 28 29 29 #include "interrupt.h" 30 - #include "beat_wrapper.h" 30 + #include "../cell/beat_wrapper.h" 31 31 32 32 #define MAX_IRQS NR_IRQS 33 33 static DEFINE_SPINLOCK(beatic_irq_mask_lock);
+1 -1
arch/powerpc/platforms/celleb/iommu.c
··· 26 26 27 27 #include <asm/machdep.h> 28 28 29 - #include "beat_wrapper.h" 29 + #include "../cell/beat_wrapper.h" 30 30 31 31 #define DMA_FLAGS 0xf800000000000000UL /* r/w permitted, coherency required, 32 32 strongest order */
+1 -1
arch/powerpc/platforms/celleb/spu_priv1.c
··· 24 24 #include <asm/spu.h> 25 25 #include <asm/spu_priv1.h> 26 26 27 - #include "beat_wrapper.h" 27 + #include "../cell/beat_wrapper.h" 28 28 29 29 static inline void _int_mask_set(struct spu *spu, int class, u64 mask) 30 30 {