path: root/arch
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2019-01-05 11:44:20 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-01-05 11:44:20 -0800
commitcd08f68c659f42f9ec23b25b9cefd1ef49dc78b5 (patch)
treeb15575ee28b4778dc7ad62a1c040533a8a8c4048 /arch
parent670b321f4150bfc8a2261f4db3fcdab21738506b (diff)
parentdfbaecb2b707cfdc5276b548d52b437384bd6483 (diff)
Merge branch 'parisc-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fix from Helge Deller: "Fix boot issues with a series of parisc servers since kernel 4.20. Remapping kernel text with set_kernel_text_rw() missed to remap from lowest up until the highest huge-page aligned kernel text addresss" * 'parisc-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Remap hugepage-aligned pages in set_kernel_text_rw()
Diffstat (limited to 'arch')
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 2d7cffcaa476..059187a3ded7 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -512,8 +512,8 @@ static void __init map_pages(unsigned long start_vaddr,
void __init set_kernel_text_rw(int enable_read_write)
- unsigned long start = (unsigned long)__init_begin;
- unsigned long end = (unsigned long)_etext;
+ unsigned long start = (unsigned long) _text;
+ unsigned long end = (unsigned long) &data_start;
map_pages(start, __pa(start), end-start,
PAGE_KERNEL_RWX, enable_read_write ? 1:0);