xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:

  include/linux/kcore.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2019-03-28 10:56:32 +01:00
parent db779ef67f 8c2ffd9174
commit cfa637cb20
293 changed files with 5450 additions and 2599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/kcore.h
View File

@@ -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)