regmap: mmio: Allow passing an empty config->reg_stride

[linux.git] / drivers / misc / sram-exec.c

diff --git a/drivers/misc/sram-exec.c b/drivers/misc/sram-exec.c
index a948e95d43754ae69dafda0c47249b6051e0541c..b71dbbd737382527c02bb17dbf12c451da3f889d 100644 (file)
--- a/drivers/misc/sram-exec.c
+++ b/drivers/misc/sram-exec.c
@@ -10,9 +10,9 @@
 #include <linux/genalloc.h>
 #include <linux/mm.h>
 #include <linux/sram.h>
+#include <linux/set_memory.h>
 
 #include <asm/fncpy.h>
-#include <asm/set_memory.h>
 
 #include "sram.h"
 
@@ -106,10 +106,7 @@ void *sram_exec_copy(struct gen_pool *pool, void *dst, void *src,
 
        dst_cpy = fncpy(dst, src, size);
 
-       ret = set_memory_ro((unsigned long)base, pages);
-       if (ret)
-               goto error_out;
-       ret = set_memory_x((unsigned long)base, pages);
+       ret = set_memory_rox((unsigned long)base, pages);
        if (ret)
                goto error_out;