diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-03-28 12:56:32 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-03-28 12:58:28 +0300 |
| commit | cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb (patch) | |
| tree | 52591d7b53600d5d39369525a356ccb81e22fcd9 /include/linux/kcore.h | |
| parent | db779ef67ffeadbb44e9e818eb64dbe528e2f48f (diff) | |
| parent | 8c2ffd9174779014c3fe1f96d9dc3641d9175f00 (diff) | |
| download | linux-cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb.tar.xz | |
Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict
Conflicts:
include/linux/kcore.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/kcore.h')
| -rw-r--r-- | include/linux/kcore.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/kcore.h b/include/linux/kcore.h index 94b561df3877..da676cdbd727 100644 --- a/include/linux/kcore.h +++ b/include/linux/kcore.h @@ -38,6 +38,8 @@ struct vmcoredd_node { #ifdef CONFIG_PROC_KCORE void __init kclist_add(struct kcore_list *, void *, size_t, int type); + +extern int __init register_mem_pfn_is_ram(int (*fn)(unsigned long pfn)); #else static inline void kclist_add(struct kcore_list *new, void *addr, size_t size, int type) |