diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-31 16:47:21 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-31 16:47:21 +0200 |
commit | f78b5be2a5d08709177963df17b8df42e690a652 (patch) | |
tree | 877d337da5fcf3cadfcd4a1d317e8bc69f870558 /include | |
parent | Merge tag 'powerpc-5.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff) | |
parent | watchdog: Respect watchdog cpumask on CPU hotplug (diff) | |
download | linux-f78b5be2a5d08709177963df17b8df42e690a652.tar.xz linux-f78b5be2a5d08709177963df17b8df42e690a652.zip |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Thomas Gleixner:
"A small set of core updates:
- Make the watchdog respect the selected CPU mask again. That was
broken by the rework of the watchdog thread management and caused
inconsistent state and NMI watchdog being unstoppable.
- Ensure that the objtool build can find the libelf location.
- Remove dead kcore stub code"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
watchdog: Respect watchdog cpumask on CPU hotplug
objtool: Query pkg-config for libelf location
proc/kcore: Remove unused kclist_add_remap()
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/kcore.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/kcore.h b/include/linux/kcore.h index c843f4a9c512..da676cdbd727 100644 --- a/include/linux/kcore.h +++ b/include/linux/kcore.h @@ -38,12 +38,6 @@ 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 @@ -51,11 +45,6 @@ static inline void kclist_add(struct kcore_list *new, void *addr, size_t size, int type) { } - -static inline -void kclist_add_remap(struct kcore_list *m, void *addr, void *vaddr, size_t sz) -{ -} #endif #endif /* _LINUX_KCORE_H */ |