diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-12-17 08:48:38 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-12-17 08:48:38 -0800 |
| commit | 906d9eadd3b6698fa6ceb9bcdf41da6aa56d0a24 (patch) | |
| tree | b258d06410e154ce58d9b0d16ffba0834ff2a1ac /arch/arm64/lib/clear_user.S | |
| parent | d3d3a134d75d28034b950bc0b6682ba0be976f37 (diff) | |
| parent | 9f41e6b222c4a04c7b46068df82842a6188b4a57 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-16.03-rtlsk-v4.1-16.02-rtlsk-v4.1-16.01-rtlsk-v4.1-15.12-rt
Diffstat (limited to 'arch/arm64/lib/clear_user.S')
| -rw-r--r-- | arch/arm64/lib/clear_user.S | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm64/lib/clear_user.S b/arch/arm64/lib/clear_user.S index c17967fdf5f6..a9723c71c52b 100644 --- a/arch/arm64/lib/clear_user.S +++ b/arch/arm64/lib/clear_user.S @@ -16,7 +16,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <linux/linkage.h> + +#include <asm/alternative.h> #include <asm/assembler.h> +#include <asm/cpufeature.h> +#include <asm/sysreg.h> .text @@ -29,6 +33,8 @@ * Alignment fixed up by hardware. */ ENTRY(__clear_user) +ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(0)), ARM64_HAS_PAN, \ + CONFIG_ARM64_PAN) mov x2, x1 // save the size for fixup return subs x1, x1, #8 b.mi 2f @@ -48,6 +54,8 @@ USER(9f, strh wzr, [x0], #2 ) b.mi 5f USER(9f, strb wzr, [x0] ) 5: mov x0, #0 +ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(1)), ARM64_HAS_PAN, \ + CONFIG_ARM64_PAN) ret ENDPROC(__clear_user) |