From: Max Filippov <jcmvbkbc@gmail.com>
Date: Mon, 30 Sep 2019 02:55:09 +0000 (-0700)
Subject: xtensa: move MPU constants from .data to .ref.rodata
X-Git-Tag: v5.5-rc1~60^2~26
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6af4ab570db3dc71e877271a17e5e2b337e0bdc0;p=users%2Fjedix%2Flinux-maple.git

xtensa: move MPU constants from .data to .ref.rodata

MPU attribute mapping table is R/O, move it from .data to __REFCONST
(as the rest of the _startup code where initialize_cacheattr is used is
in the __REF section). This allows executing initialize_cacheattr before
the data section of the XIP kernel is relocated to its place.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---

diff --git a/arch/xtensa/include/asm/initialize_mmu.h b/arch/xtensa/include/asm/initialize_mmu.h
index 3b054d2bede01..e3e1d9a1ef698 100644
--- a/arch/xtensa/include/asm/initialize_mmu.h
+++ b/arch/xtensa/include/asm/initialize_mmu.h
@@ -23,6 +23,7 @@
 #ifndef _XTENSA_INITIALIZE_MMU_H
 #define _XTENSA_INITIALIZE_MMU_H
 
+#include <linux/init.h>
 #include <asm/pgtable.h>
 #include <asm/vectors.h>
 
@@ -183,7 +184,7 @@
 #endif
 
 #if XCHAL_HAVE_MPU
-	.data
+	__REFCONST
 	.align	4
 .Lattribute_table:
 	.long 0x000000, 0x1fff00, 0x1ddf00, 0x1eef00