diff options
Diffstat (limited to 'arch/parisc/kernel/entry.S')
| -rw-r--r-- | arch/parisc/kernel/entry.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index 1c60408a64ad..d5eb19efa65b 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S | |||
| @@ -394,6 +394,7 @@ | |||
| 394 | */ | 394 | */ |
| 395 | .macro space_check spc,tmp,fault | 395 | .macro space_check spc,tmp,fault |
| 396 | mfsp %sr7,\tmp | 396 | mfsp %sr7,\tmp |
| 397 | /* check against %r0 which is same value as LINUX_GATEWAY_SPACE */ | ||
| 397 | or,COND(<>) %r0,\spc,%r0 /* user may execute gateway page | 398 | or,COND(<>) %r0,\spc,%r0 /* user may execute gateway page |
| 398 | * as kernel, so defeat the space | 399 | * as kernel, so defeat the space |
| 399 | * check if it is */ | 400 | * check if it is */ |
| @@ -910,9 +911,9 @@ intr_check_sig: | |||
| 910 | * Only do signals if we are returning to user space | 911 | * Only do signals if we are returning to user space |
| 911 | */ | 912 | */ |
| 912 | LDREG PT_IASQ0(%r16), %r20 | 913 | LDREG PT_IASQ0(%r16), %r20 |
| 913 | cmpib,COND(=),n 0,%r20,intr_restore /* backward */ | 914 | cmpib,COND(=),n LINUX_GATEWAY_SPACE, %r20, intr_restore /* backward */ |
| 914 | LDREG PT_IASQ1(%r16), %r20 | 915 | LDREG PT_IASQ1(%r16), %r20 |
| 915 | cmpib,COND(=),n 0,%r20,intr_restore /* backward */ | 916 | cmpib,COND(=),n LINUX_GATEWAY_SPACE, %r20, intr_restore /* backward */ |
| 916 | 917 | ||
| 917 | /* NOTE: We need to enable interrupts if we have to deliver | 918 | /* NOTE: We need to enable interrupts if we have to deliver |
| 918 | * signals. We used to do this earlier but it caused kernel | 919 | * signals. We used to do this earlier but it caused kernel |