From db8cf5954eaf532bf95f4fd7946dd996c38828e4 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 20 Nov 2006 18:45:03 +0100
Subject: [PATCH] --- yaml --- r: 42265 b: refs/heads/master c:
 453d9f72a91d798c3e3c4b4bed26210926dfb57b h: refs/heads/master i:   42263:
 2768333b706b57135d40c29dc0e8018efca6dfc1 v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/powerpc/platforms/cell/spu_base.c  | 2 +-
 trunk/arch/powerpc/platforms/cell/spufs/run.c | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7e2e7838878d..c91b5e3a8436 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0021550c0199b2bf5e434eda0216144074537fc7
+refs/heads/master: 453d9f72a91d798c3e3c4b4bed26210926dfb57b
diff --git a/trunk/arch/powerpc/platforms/cell/spu_base.c b/trunk/arch/powerpc/platforms/cell/spu_base.c
index 56ff8b36103d..d4f4f396288f 100644
--- a/trunk/arch/powerpc/platforms/cell/spu_base.c
+++ b/trunk/arch/powerpc/platforms/cell/spu_base.c
@@ -507,7 +507,7 @@ int spu_irq_class_1_bottom(struct spu *spu)
 	if (!error) {
 		spu_restart_dma(spu);
 	} else {
-		__spu_trap_invalid_dma(spu);
+		spu->dma_callback(spu, SPE_EVENT_SPE_DATA_STORAGE);
 	}
 	return ret;
 }
diff --git a/trunk/arch/powerpc/platforms/cell/spufs/run.c b/trunk/arch/powerpc/platforms/cell/spufs/run.c
index a4a0080c2233..88a41d83a79b 100644
--- a/trunk/arch/powerpc/platforms/cell/spufs/run.c
+++ b/trunk/arch/powerpc/platforms/cell/spufs/run.c
@@ -26,6 +26,7 @@ void spufs_dma_callback(struct spu *spu, int type)
 	} else {
 		switch (type) {
 		case SPE_EVENT_DMA_ALIGNMENT:
+		case SPE_EVENT_SPE_DATA_STORAGE:
 		case SPE_EVENT_INVALID_DMA:
 			force_sig(SIGBUS, /* info, */ current);
 			break;