moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 0bd957eb11 ("Merge tag 'core-kprobes-2020-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline

Browse Source 
Baby steps for 5.8-rc1 merge.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5f243372fdad254935d82608d5544794a7d10f6c
This commit is contained in:
Greg Kroah-Hartman
2020-06-05 16:24:28 +02:00
parent f76a7cf187 0bd957eb11
commit 0d70da26af
52 changed files with 538 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/module.h
View File

@@ -465,6 +465,8 @@ struct module {
void __percpu *percpu;
unsigned int percpu_size;
#endif
void *noinstr_text_start;
unsigned int noinstr_text_size;
#ifdef CONFIG_TRACEPOINTS
unsigned int num_tracepoints;
@@ -496,6 +498,12 @@ struct module {
unsigned int num_ftrace_callsites;
unsigned long *ftrace_callsites;
#endif
#ifdef CONFIG_KPROBES
void *kprobes_text_start;
unsigned int kprobes_text_size;
unsigned long *kprobe_blacklist;
unsigned int num_kprobe_blacklist;
#endif
#ifdef CONFIG_LIVEPATCH
bool klp; /* Is this a livepatch module? */