History

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

Linus Torvalds committed 7 years ago

Commit f78b5be2 parents 6536c5f 7dd47614 files · +12 −16Browse files

Showing the changes to include/linux (1 of 4 files). Show all

Unified · Split

include/linux/kcore.h+0−11
@@ -38,12 +38,6 @@ struct vmcoredd_node { · 37 unmodified lines
38 38
39#ifdef CONFIG_PROC_KCORE39#ifdef CONFIG_PROC_KCORE
40void __init kclist_add(struct kcore_list *, void *, size_t, int type);40void __init kclist_add(struct kcore_list *, void *, size_t, int type);
41static inline
42void kclist_add_remap(struct kcore_list *m, void *addr, void *vaddr, size_t sz)
43{
44 m->vaddr = (unsigned long)vaddr;
45 kclist_add(m, addr, sz, KCORE_REMAP);
46}
47 41
48extern int __init register_mem_pfn_is_ram(int (*fn)(unsigned long pfn));42extern int __init register_mem_pfn_is_ram(int (*fn)(unsigned long pfn));
49#else43#else
@@ -51,11 +45,6 @@ static inline · 1 unmodified line
51void kclist_add(struct kcore_list *new, void *addr, size_t size, int type)45void kclist_add(struct kcore_list *new, void *addr, size_t size, int type)
52{46{
53}47}
54
55static inline
56void kclist_add_remap(struct kcore_list *m, void *addr, void *vaddr, size_t sz)
57{
58}
59#endif48#endif
60 49
61#endif /* _LINUX_KCORE_H */50#endif /* _LINUX_KCORE_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t