Importing "grsecurity-3.1-3.19.2-201503201903.patch"

[people/ms/linux.git] / arch / arm / include / asm / tls.h

diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
index 5f833f7adba1abdc8620a11020cb2c80dec24d26..76e66448666b5baf302c9a6af6427902d9c645a0 100644 (file)
--- a/arch/arm/include/asm/tls.h
+++ b/arch/arm/include/asm/tls.h
@@ -3,6 +3,7 @@
 
 #include <linux/compiler.h>
 #include <asm/thread_info.h>
+#include <asm/pgtable.h>
 
 #ifdef __ASSEMBLY__
 #include <asm/asm-offsets.h>
@@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
                         * at 0xffff0fe0 must be used instead.  (see
                         * entry-armv.S for details)
                         */
+                       pax_open_kernel();
                        *((unsigned int *)0xffff0ff0) = val;
+                       pax_close_kernel();
 #endif
                }