From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964820AbWFSSua (ORCPT ); Mon, 19 Jun 2006 14:50:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964822AbWFSSt6 (ORCPT ); Mon, 19 Jun 2006 14:49:58 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:17612 "EHLO moutng.kundenserver.de") by vger.kernel.org with ESMTP id S964820AbWFSSnW (ORCPT ); Mon, 19 Jun 2006 14:43:22 -0400 Message-Id: <20060619183404.668482000@klappe.arndb.de> References: <20060619183315.653672000@klappe.arndb.de> Date: Mon, 19 Jun 2006 20:33:20 +0200 From: arnd@arndb.de To: paulus@samba.org Cc: linuxppc-dev@ozlabs.org, cbe-oss-dev@ozlabs.org, linux-kernel@vger.kernel.org Subject: [patch 05/20] cell: always build spu base into the kernel Content-Disposition: inline; filename=spu-base-no-module-2.diff X-Provags-ID: kundenserver.de abuse@kundenserver.de login:c48f057754fc1b1a557605ab9fa6da41 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org The spu_base module is rather deeply intermixed with the core kernel, so it makes sense to have that built-in. This will let us extend the base in the future without having to export more core symbols just for it. Signed-off-by: Arnd Bergmann Index: powerpc.git/arch/powerpc/platforms/cell/Makefile =================================================================== --- powerpc.git.orig/arch/powerpc/platforms/cell/Makefile +++ powerpc.git/arch/powerpc/platforms/cell/Makefile @@ -3,15 +3,11 @@ obj-y += cbe_regs.o pervasive.o obj-$(CONFIG_CBE_RAS) += ras.o obj-$(CONFIG_SMP) += smp.o -obj-$(CONFIG_SPU_FS) += spu-base.o spufs/ - -spu-base-y += spu_base.o spu_priv1.o # needed only when building loadable spufs.ko spufs-modular-$(CONFIG_SPU_FS) += spu_syscalls.o obj-y += $(spufs-modular-m) # always needed in kernel -spufs-builtin-$(CONFIG_SPU_FS) += spu_callbacks.o +spufs-builtin-$(CONFIG_SPU_FS) += spu_callbacks.o spu_base.o spu_priv1.o spufs/ obj-y += $(spufs-builtin-y) $(spufs-builtin-m) - Index: powerpc.git/arch/powerpc/platforms/cell/spufs/Makefile =================================================================== --- powerpc.git.orig/arch/powerpc/platforms/cell/spufs/Makefile +++ powerpc.git/arch/powerpc/platforms/cell/spufs/Makefile @@ -1,5 +1,7 @@ +obj-y += switch.o + obj-$(CONFIG_SPU_FS) += spufs.o -spufs-y += inode.o file.o context.o switch.o syscalls.o +spufs-y += inode.o file.o context.o syscalls.o spufs-y += sched.o backing_ops.o hw_ops.o run.o # Rules to build switch.o with the help of SPU tool chain Index: powerpc.git/arch/powerpc/platforms/cell/spufs/switch.c =================================================================== --- powerpc.git.orig/arch/powerpc/platforms/cell/spufs/switch.c +++ powerpc.git/arch/powerpc/platforms/cell/spufs/switch.c @@ -2074,6 +2074,7 @@ int spu_save(struct spu_state *prev, str } return rc; } +EXPORT_SYMBOL_GPL(spu_save); /** * spu_restore - SPU context restore, with harvest and locking. @@ -2103,6 +2104,7 @@ int spu_restore(struct spu_state *new, s } return rc; } +EXPORT_SYMBOL_GPL(spu_restore); /** * spu_harvest - SPU harvest (reset) operation @@ -2193,6 +2195,7 @@ void spu_init_csa(struct spu_state *csa) init_priv1(csa); init_priv2(csa); } +EXPORT_SYMBOL_GPL(spu_init_csa); void spu_fini_csa(struct spu_state *csa) { @@ -2203,3 +2206,4 @@ void spu_fini_csa(struct spu_state *csa) vfree(csa->lscsa); } +EXPORT_SYMBOL_GPL(spu_fini_csa); --