aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/mm/fault.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index bfe901353142..115b25f50bf8 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -279,14 +279,13 @@ good_area:
279#endif /* CONFIG_8xx */ 279#endif /* CONFIG_8xx */
280 280
281 if (is_exec) { 281 if (is_exec) {
282#ifdef CONFIG_PPC64 282#if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE))
283 /* protection fault */ 283 /* protection fault */
284 if (error_code & DSISR_PROTFAULT) 284 if (error_code & DSISR_PROTFAULT)
285 goto bad_area; 285 goto bad_area;
286 if (!(vma->vm_flags & VM_EXEC)) 286 if (!(vma->vm_flags & VM_EXEC))
287 goto bad_area; 287 goto bad_area;
288#endif 288#else
289#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
290 pte_t *ptep; 289 pte_t *ptep;
291 pmd_t *pmdp; 290 pmd_t *pmdp;
292 291