From 10c6fa7317b1f97dd625c7062e8ed4850bf22441 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 24 Mar 2006 19:49:27 +0100 Subject: [PATCH] --- yaml --- r: 24615 b: refs/heads/master c: 79c227a92ce9fe0504e9c4aaadf3bfacb0f5f45e h: refs/heads/master i: 24613: 231a28573990a3a5c92c07201119c4478bb30f5f 24611: 651503d8934849ed2634519a1ad37c6d674c0e53 24607: ea489a4500306aab53d4a710cd970470faf233a8 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/cell/spu_base.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a9be09dc7d6a..6cbdd3862113 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47952d5ea67dc7098667a954483a82acf81eb4da +refs/heads/master: 79c227a92ce9fe0504e9c4aaadf3bfacb0f5f45e diff --git a/trunk/arch/powerpc/platforms/cell/spu_base.c b/trunk/arch/powerpc/platforms/cell/spu_base.c index d152a3fbdb83..269dda4fd0b4 100644 --- a/trunk/arch/powerpc/platforms/cell/spu_base.c +++ b/trunk/arch/powerpc/platforms/cell/spu_base.c @@ -486,14 +486,13 @@ int spu_irq_class_1_bottom(struct spu *spu) ea = spu->dar; dsisr = spu->dsisr; - if (dsisr & MFC_DSISR_PTE_NOT_FOUND) { + if (dsisr & (MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED)) { access = (_PAGE_PRESENT | _PAGE_USER); access |= (dsisr & MFC_DSISR_ACCESS_PUT) ? _PAGE_RW : 0UL; if (hash_page(ea, access, 0x300) != 0) error |= CLASS1_ENABLE_STORAGE_FAULT_INTR; } - if ((error & CLASS1_ENABLE_STORAGE_FAULT_INTR) || - (dsisr & MFC_DSISR_ACCESS_DENIED)) { + if (error & CLASS1_ENABLE_STORAGE_FAULT_INTR) { if ((ret = spu_handle_mm_fault(spu)) != 0) error |= CLASS1_ENABLE_STORAGE_FAULT_INTR; else