Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict

[linux-2.6-block.git] / include / linux / kcore.h

diff --git a/include/linux/kcore.h b/include/linux/kcore.h
index 94b561df387701e317e2ec450ebc7181b5bb0802..da676cdbd7277e32feb96a56063167afc0964215 100644 (file)
--- 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)