Use the predefined LINUX_GATEWAY_SPACE constant in the various important code sections which deal with the gateway page. Signed-off-by: Helge Deller <deller@xxxxxx> diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index 1c60408a64ad..9f3673351924 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S @@ -394,11 +394,13 @@ */ .macro space_check spc,tmp,fault mfsp %sr7,\tmp - or,COND(<>) %r0,\spc,%r0 /* user may execute gateway page + or,COND(<>) LINUX_GATEWAY_SPACE,\spc,%r0 + /* user may execute gateway page * as kernel, so defeat the space * check if it is */ copy \spc,\tmp - or,COND(=) %r0,\tmp,%r0 /* nullify if executing as kernel */ + or,COND(=) LINUX_GATEWAY_SPACE,\tmp,%r0 + /* nullify if executing as kernel */ cmpb,COND(<>),n \tmp,\spc,\fault .endm @@ -910,9 +912,9 @@ intr_check_sig: * Only do signals if we are returning to user space */ LDREG PT_IASQ0(%r16), %r20 - cmpib,COND(=),n 0,%r20,intr_restore /* backward */ + cmpib,COND(=),n LINUX_GATEWAY_SPACE, %r20, intr_restore /* backward */ LDREG PT_IASQ1(%r16), %r20 - cmpib,COND(=),n 0,%r20,intr_restore /* backward */ + cmpib,COND(=),n LINUX_GATEWAY_SPACE, %r20, intr_restore /* backward */ /* NOTE: We need to enable interrupts if we have to deliver * signals. We used to do this earlier but it caused kernel
