|
@@ -402,7 +402,8 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
|
|
|
__put_user(sigreturn_codes[idx+1], rc+1))
|
|
|
return 1;
|
|
|
|
|
|
- if ((cpsr & MODE32_BIT) && !IS_ENABLED(CONFIG_ARM_MPU)) {
|
|
|
+#ifdef CONFIG_MMU
|
|
|
+ if (cpsr & MODE32_BIT) {
|
|
|
struct mm_struct *mm = current->mm;
|
|
|
|
|
|
/*
|
|
@@ -412,7 +413,9 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
|
|
|
*/
|
|
|
retcode = mm->context.sigpage + signal_return_offset +
|
|
|
(idx << 2) + thumb;
|
|
|
- } else {
|
|
|
+ } else
|
|
|
+#endif
|
|
|
+ {
|
|
|
/*
|
|
|
* Ensure that the instruction cache sees
|
|
|
* the return code written onto the stack.
|