Commit cd08f68c authored by Linus Torvalds's avatar Linus Torvalds

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()
parents 670b321f dfbaecb2
...@@ -512,8 +512,8 @@ static void __init map_pages(unsigned long start_vaddr, ...@@ -512,8 +512,8 @@ static void __init map_pages(unsigned long start_vaddr,
void __init set_kernel_text_rw(int enable_read_write) void __init set_kernel_text_rw(int enable_read_write)
{ {
unsigned long start = (unsigned long)__init_begin; unsigned long start = (unsigned long) _text;
unsigned long end = (unsigned long)_etext; unsigned long end = (unsigned long) &data_start;
map_pages(start, __pa(start), end-start, map_pages(start, __pa(start), end-start,
PAGE_KERNEL_RWX, enable_read_write ? 1:0); PAGE_KERNEL_RWX, enable_read_write ? 1:0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment