diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-03-21 07:19:21 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-03-21 07:19:21 -0700 |
| commit | e11f4905366874b76aa2fbb9e5c10f2ce37040b7 (patch) | |
| tree | aaff3c0b0613611af8800056a657162c6d373ebf | |
| parent | 4e1e720009a78a7057a142de47def1e9f4bf41c7 (diff) | |
| download | linux-omap-omap-for-v4.16/fixes.tar.gz | |
Revert "ARM: OMAP: Fix SRAM W+X mapping"omap-for-v4.16/fixes
This reverts commit 4e1e720009a78a7057a142de47def1e9f4bf41c7.
This causes an oops on omap3 coming back from off mode after idle.
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/plat-omap/sram.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index 5f47ce7a7f0257..a5bc92d7e4765b 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c @@ -23,7 +23,6 @@ #include <asm/fncpy.h> #include <asm/tlb.h> #include <asm/cacheflush.h> -#include <asm/set_memory.h> #include <asm/mach/map.h> @@ -97,21 +96,3 @@ void __init omap_map_sram(unsigned long start, unsigned long size, memset_io(omap_sram_base + omap_sram_skip, 0, omap_sram_size - omap_sram_skip); } - -static int __init omap_sram_lock(void) -{ - unsigned long base; - int pages; - - if (!omap_sram_base || !omap_sram_size) - return 0; - - base = (unsigned long)omap_sram_base; - pages = PAGE_ALIGN(omap_sram_size) / PAGE_SIZE; - - set_memory_ro((unsigned long)base, pages); - set_memory_x((unsigned long)base, pages); - - return 0; -} -late_initcall(omap_sram_lock); |