Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"A couple of small fixes this time around from Steven for an
interaction between ftrace and kernel read-only protection, and
Vladimir for nommu"
* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8780/1: ftrace: Only set kernel memory back to read-only after boot
ARM: 8775/1: NOMMU: Use instr_sync instead of plain isb in common code
+10
-1
+1
-1
arch/arm/kernel/head-nommu.S
+1
-1
arch/arm/kernel/head-nommu.S
+9
arch/arm/mm/init.c
+9
arch/arm/mm/init.c
···
736
736
return 0;
737
737
}
738
738
739
+
static int kernel_set_to_readonly __read_mostly;
740
+
739
741
void mark_rodata_ro(void)
740
742
{
743
+
kernel_set_to_readonly = 1;
741
744
stop_machine(__mark_rodata_ro, NULL, NULL);
742
745
debug_checkwx();
743
746
}
744
747
745
748
void set_kernel_text_rw(void)
746
749
{
750
+
if (!kernel_set_to_readonly)
751
+
return;
752
+
747
753
set_section_perms(ro_perms, ARRAY_SIZE(ro_perms), false,
748
754
current->active_mm);
749
755
}
750
756
751
757
void set_kernel_text_ro(void)
752
758
{
759
+
if (!kernel_set_to_readonly)
760
+
return;
761
+
753
762
set_section_perms(ro_perms, ARRAY_SIZE(ro_perms), true,
754
763
current->active_mm);
755
764
}