Subject: spufs: always compile fault handling builtin

From: Arnd Bergmann <arnd.bergmann@de.ibm.com>
The fault handler needs access to some non-exported symbols
of the memory management subsystem. Instead of exporting
them, we do a self-contained solution and build the fault
handling into the kernel.

Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>

Index: linux-sdk2.1/arch/powerpc/platforms/cell/spufs/Makefile
===================================================================
--- linux-sdk2.1.orig/arch/powerpc/platforms/cell/spufs/Makefile
+++ linux-sdk2.1/arch/powerpc/platforms/cell/spufs/Makefile
@@ -1,9 +1,8 @@
-obj-y += switch.o lscsa_alloc.o
+obj-y += switch.o lscsa_alloc.o fault.o
 
 obj-$(CONFIG_SPU_FS) += spufs.o
 spufs-y += inode.o file.o context.o syscalls.o coredump.o
 spufs-y += sched.o backing_ops.o hw_ops.o run.o gang.o
-spufs-y += fault.o
 
 # Rules to build switch.o with the help of SPU tool chain
 SPU_CROSS	:= spu-
Index: linux-sdk2.1/arch/powerpc/platforms/cell/spufs/fault.c
===================================================================
--- linux-sdk2.1.orig/arch/powerpc/platforms/cell/spufs/fault.c
+++ linux-sdk2.1/arch/powerpc/platforms/cell/spufs/fault.c
@@ -21,6 +21,7 @@
  */
 #include <linux/sched.h>
 #include <linux/mm.h>
+#include <linux/module.h>
 
 #include <asm/spu.h>
 #include <asm/spu_csa.h>
@@ -134,6 +135,7 @@ static void spufs_handle_dma_error(struc
 			force_sig_info(info.si_signo, &info, current);
 	}
 }
+EXPORT_SYMBOL_GPL(spufs_dma_callback);
 
 void spufs_dma_callback(struct spu *spu, int type)
 {
@@ -208,3 +210,4 @@ int spufs_handle_class1(struct spu_conte
 
 	return ret;
 }
+EXPORT_SYMBOL_GPL(spufs_handle_class1);