Pull thermal into release branch

[linux-drm-fsl-dcu.git] / arch / powerpc / kernel / lparmap.c

diff --git a/arch/powerpc/kernel/lparmap.c b/arch/powerpc/kernel/lparmap.c
index 584d1e3c013d24cac3a2eb5d17a7eb66a52d8e85..af11285ffbd1d2b7f69acfbc8aacd5ddc6f1ddca 100644 (file)
--- a/arch/powerpc/kernel/lparmap.c
+++ b/arch/powerpc/kernel/lparmap.c
@@ -10,7 +10,8 @@
 #include <asm/pgtable.h>
 #include <asm/iseries/lpar_map.h>
 
-const struct LparMap __attribute__((__section__(".text"))) xLparMap = {
+/* The # is to stop gcc trying to make .text nonexecutable */
+const struct LparMap __attribute__((__section__(".text #"))) xLparMap = {
        .xNumberEsids = HvEsidsToMap,
        .xNumberRanges = HvRangesToMap,
        .xSegmentTableOffs = STAB0_PAGE,