diff options
| author | Linus Torvalds | 2018-01-13 11:07:55 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2018-01-13 11:07:55 -0800 |
| commit | ed93de8420a342785da7585b06c107ae32f73b2b (patch) | |
| tree | 87f5509810a1939474bcf28a0853077af7652692 /kernel | |
| parent | c92a9a461dff6140c539c61e457aa97df29517d6 (diff) | |
| parent | 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixlets from Andrew Morton:
"4 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
tools/objtool/Makefile: don't assume sync-check.sh is executable
kdump: write correct address of mem_section into vmcoreinfo
kmemleak: allow to coexist with fault injection
MAINTAINERS, nilfs2: change project home URLs
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/crash_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/crash_core.c b/kernel/crash_core.c index b3663896278e..4f63597c824d 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -410,7 +410,7 @@ static int __init crash_save_vmcoreinfo_init(void) VMCOREINFO_SYMBOL(contig_page_data); #endif #ifdef CONFIG_SPARSEMEM - VMCOREINFO_SYMBOL(mem_section); + VMCOREINFO_SYMBOL_ARRAY(mem_section); VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS); VMCOREINFO_STRUCT_SIZE(mem_section); VMCOREINFO_OFFSET(mem_section, section_mem_map); |