From: Paul Mackerras <paulus@samba.org>
Date: Wed, 23 Jan 2008 23:07:21 +0000 (+1100)
Subject: Merge branch 'linux-2.6'
X-Git-Tag: v2.6.25-rc1~1131^2~100
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=9156ad48338e0306e508ead5c0d9986050744475

Merge branch 'linux-2.6'
---

9156ad48338e0306e508ead5c0d9986050744475
diff --cc arch/powerpc/platforms/cell/Makefile
index 3cd565a04d0a,39d695cb9693..c89964c6fb1f
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@@ -19,7 -19,8 +19,8 @@@ spu-manage-$(CONFIG_PPC_CELLEB)		+= spu
  spu-manage-$(CONFIG_PPC_CELL_NATIVE)	+= spu_manage.o
  
  obj-$(CONFIG_SPU_BASE)			+= spu_callbacks.o spu_base.o \
+ 					   spu_notify.o \
 -					   spu_syscalls.o \
 +					   spu_syscalls.o spu_fault.o \
  					   $(spu-priv1-y) \
  					   $(spu-manage-y) \
  					   spufs/
diff --cc include/asm-powerpc/spu.h
index 5ca30e2e2639,34b7807f068b..f07c99ba5d13
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@@ -302,8 -299,11 +303,11 @@@ struct notifier_block
  int spu_switch_event_register(struct notifier_block * n);
  int spu_switch_event_unregister(struct notifier_block * n);
  
+ extern void notify_spus_active(void);
+ extern void do_notify_spus_active(void);
+ 
  /*
 - * This defines the Local Store, Problem Area and Privlege Area of an SPU.
 + * This defines the Local Store, Problem Area and Privilege Area of an SPU.
   */
  
  union mfc_tag_size_class_cmd {