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

+9 -7
+2 -2
Documentation/filesystems/nilfs2.txt
··· 25 25 cleaner or garbage collector) are required. Details on the tools are 26 26 described in the man pages included in the package. 27 27 28 - Project web page: http://nilfs.sourceforge.net/ 29 - Download page: http://nilfs.sourceforge.net/en/download.html 28 + Project web page: https://nilfs.sourceforge.io/ 29 + Download page: https://nilfs.sourceforge.io/en/download.html 30 30 List info: http://vger.kernel.org/vger-lists.html#linux-nilfs 31 31 32 32 Caveats
+2 -2
MAINTAINERS
··· 9638 9638 NILFS2 FILESYSTEM 9639 9639 M: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> 9640 9640 L: linux-nilfs@vger.kernel.org 9641 - W: http://nilfs.sourceforge.net/ 9642 - W: http://nilfs.osdn.jp/ 9641 + W: https://nilfs.sourceforge.io/ 9642 + W: https://nilfs.osdn.jp/ 9643 9643 T: git git://github.com/konis/nilfs2.git 9644 9644 S: Supported 9645 9645 F: Documentation/filesystems/nilfs2.txt
+2
include/linux/crash_core.h
··· 42 42 vmcoreinfo_append_str("PAGESIZE=%ld\n", value) 43 43 #define VMCOREINFO_SYMBOL(name) \ 44 44 vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name) 45 + #define VMCOREINFO_SYMBOL_ARRAY(name) \ 46 + vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)name) 45 47 #define VMCOREINFO_SIZE(name) \ 46 48 vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \ 47 49 (unsigned long)sizeof(name))
+1 -1
kernel/crash_core.c
··· 410 410 VMCOREINFO_SYMBOL(contig_page_data); 411 411 #endif 412 412 #ifdef CONFIG_SPARSEMEM 413 - VMCOREINFO_SYMBOL(mem_section); 413 + VMCOREINFO_SYMBOL_ARRAY(mem_section); 414 414 VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS); 415 415 VMCOREINFO_STRUCT_SIZE(mem_section); 416 416 VMCOREINFO_OFFSET(mem_section, section_mem_map);
+1 -1
mm/kmemleak.c
··· 127 127 /* GFP bitmask for kmemleak internal allocations */ 128 128 #define gfp_kmemleak_mask(gfp) (((gfp) & (GFP_KERNEL | GFP_ATOMIC)) | \ 129 129 __GFP_NORETRY | __GFP_NOMEMALLOC | \ 130 - __GFP_NOWARN) 130 + __GFP_NOWARN | __GFP_NOFAIL) 131 131 132 132 /* scanning area inside a memory block */ 133 133 struct kmemleak_scan_area {
+1 -1
tools/objtool/Makefile
··· 46 46 @$(MAKE) $(build)=objtool 47 47 48 48 $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN) 49 - @./sync-check.sh 49 + @$(CONFIG_SHELL) ./sync-check.sh 50 50 $(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@ 51 51 52 52