[Cbe-oss-dev] [PATCH 6:7] spufs: fix synchronization of class 1 exception state [update 2]

[Kazunori Asayama]

Luke Browning wrote:
> Fix synchronization of class 1 exception state.
> 
> Exception state is produced in the interrupt handler and 
> consumed at the thread locking.  Memory barriers are used to
> atomically share this information.  The clearing of this state 
> must be carefully managed so that it does not overwrite new
> exception data.  The clear must be followed by a synch 
> instruction before the dma restart is performed.  Otherwise,
> it might be scheduled out of order by the processor after 
> the store restart operation which takes affect immediately. 
> This might cause us to lose a class 1 exception in theory.
> 
> Also, restarting dma does not depend on the whether the 
> context is currently loaded.  The saved state of the mfc control 
> register must be updated to restart the dma.  This takes affect
> when the context is resumed.
> 
> Signed-off-by: Luke Browning <lukebrowning at us.ibm.com>
> 
> ---
> oops.  forget the second smp_wmb().
> 
> ---

I couldn't apply this patch. How can I do that?
It looks like this patch conflicts with the updated patch 5/7.

I tried:

  a. initial 1,3,4/7 + updated 2,5,7/7   + updated2 6/7
  b. initial 1,3,4/7 + updated 2,5,6,7/7 + updated2 6/7

and both failed.

-- 
(ASAYAMA Kazunori
  (asayama at sm.sony.co.jp))
t