projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Allow DEBUG_RODATA and KPROBES to co-exist
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86_64
/
mm
/
init.c
diff --git
a/arch/x86_64/mm/init.c
b/arch/x86_64/mm/init.c
index efb6e845114ec727430860981b03b22495f9d299..9a0e98accf04aae3e11282e3079fd747afa646a3 100644
(file)
--- a/
arch/x86_64/mm/init.c
+++ b/
arch/x86_64/mm/init.c
@@
-605,6
+605,11
@@
void mark_rodata_ro(void)
if (num_possible_cpus() > 1)
start = (unsigned long)_etext;
#endif
+
+#ifdef CONFIG_KPROBES
+ start = (unsigned long)__start_rodata;
+#endif
+
end = (unsigned long)__end_rodata;
start = (start + PAGE_SIZE - 1) & PAGE_MASK;
end &= PAGE_MASK;