diff options
| author | Greg Kroah-Hartman | 2018-03-19 06:47:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-03-19 06:47:01 +0100 |
| commit | 73709e1af5163ebf5e9b0e18fe90b7e843657d36 (patch) | |
| tree | 91ca8b98187ba60e88f8df2e32147fdf651f159e /include/linux/kernel.h | |
| parent | uapi: remove telephony headers (diff) | |
| parent | Linux 4.16-rc6 (diff) | |
| download | kernel-qcow2-linux-73709e1af5163ebf5e9b0e18fe90b7e843657d36.tar.gz kernel-qcow2-linux-73709e1af5163ebf5e9b0e18fe90b7e843657d36.tar.xz kernel-qcow2-linux-73709e1af5163ebf5e9b0e18fe90b7e843657d36.zip | |
Merge 4.16-rc6 into staging-next
We want the staging fixes in here as well to handle merge/test issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 2da80e079d56..803af1e988b1 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -472,6 +472,7 @@ extern bool parse_option_str(const char *str, const char *option); extern char *next_arg(char *args, char **param, char **val); extern int core_kernel_text(unsigned long addr); +extern int init_kernel_text(unsigned long addr); extern int core_kernel_data(unsigned long addr); extern int __kernel_text_address(unsigned long addr); extern int kernel_text_address(unsigned long addr); |