projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
db779ef
8c2ffd9
)
Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict
author
Ingo Molnar
<mingo@kernel.org>
Thu, 28 Mar 2019 09:56:32 +0000
(10:56 +0100)
committer
Ingo Molnar
<mingo@kernel.org>
Thu, 28 Mar 2019 09:58:28 +0000
(10:58 +0100)
Conflicts:
include/linux/kcore.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1
2
include/linux/kcore.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
include/linux/kcore.h
index
94b561d
,
c843f4a
..
da676cd
---
1
/
include/linux/kcore.h
---
2
/
include/linux/kcore.h
+++ b/
include/linux/kcore.h
@@@
-38,6
-38,14
+38,8
@@@
struct vmcoredd_node
#ifdef CONFIG_PROC_KCORE
void __init kclist_add(struct kcore_list *, void *, size_t, int type);
-static inline
-void kclist_add_remap(struct kcore_list *m, void *addr, void *vaddr, size_t sz)
-{
- m->vaddr = (unsigned long)vaddr;
- kclist_add(m, addr, sz, KCORE_REMAP);
-}
+
+ 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)