Merge tag 'sunxi-fixes-for-3.14' of https://github.com/mripard/linux into fixes

[~andy/linux] / arch / microblaze / kernel / head.S

diff --git a/arch/microblaze/kernel/head.S b/arch/microblaze/kernel/head.S
index 817b7eec95b6de981edb751b8d13bd7cb657abd8..17645b2e2f075d69a41fb4a4fcee7ba468c76c36 100644 (file)
--- a/arch/microblaze/kernel/head.S
+++ b/arch/microblaze/kernel/head.S
@@ -64,6 +64,10 @@ real_start:
 #endif
 
        mts     rmsr, r0
+/* Disable stack protection from bootloader */
+       mts     rslr, r0
+       addi    r8, r0, 0xFFFFFFFF
+       mts     rshr, r8
 /*
  * According to Xilinx, msrclr instruction behaves like 'mfs rX,rpc'
  * if the msrclr instruction is not enabled. We use this to detect