Skip to content

Commit

Permalink
Merge branch 'parisc-4.21-2' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/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()
  • Loading branch information
torvalds committed Jan 5, 2019
2 parents 670b321 + dfbaecb commit cd08f68
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/parisc/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit cd08f68

Please sign in to comment.