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
This commit is contained in:
commit
ed93de8420
|
@ -25,8 +25,8 @@ available from the following download page. At least "mkfs.nilfs2",
|
||||||
cleaner or garbage collector) are required. Details on the tools are
|
cleaner or garbage collector) are required. Details on the tools are
|
||||||
described in the man pages included in the package.
|
described in the man pages included in the package.
|
||||||
|
|
||||||
Project web page: http://nilfs.sourceforge.net/
|
Project web page: https://nilfs.sourceforge.io/
|
||||||
Download page: http://nilfs.sourceforge.net/en/download.html
|
Download page: https://nilfs.sourceforge.io/en/download.html
|
||||||
List info: http://vger.kernel.org/vger-lists.html#linux-nilfs
|
List info: http://vger.kernel.org/vger-lists.html#linux-nilfs
|
||||||
|
|
||||||
Caveats
|
Caveats
|
||||||
|
|
|
@ -9638,8 +9638,8 @@ F: include/uapi/linux/sunrpc/
|
||||||
NILFS2 FILESYSTEM
|
NILFS2 FILESYSTEM
|
||||||
M: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
|
M: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
|
||||||
L: linux-nilfs@vger.kernel.org
|
L: linux-nilfs@vger.kernel.org
|
||||||
W: http://nilfs.sourceforge.net/
|
W: https://nilfs.sourceforge.io/
|
||||||
W: http://nilfs.osdn.jp/
|
W: https://nilfs.osdn.jp/
|
||||||
T: git git://github.com/konis/nilfs2.git
|
T: git git://github.com/konis/nilfs2.git
|
||||||
S: Supported
|
S: Supported
|
||||||
F: Documentation/filesystems/nilfs2.txt
|
F: Documentation/filesystems/nilfs2.txt
|
||||||
|
|
|
@ -42,6 +42,8 @@ phys_addr_t paddr_vmcoreinfo_note(void);
|
||||||
vmcoreinfo_append_str("PAGESIZE=%ld\n", value)
|
vmcoreinfo_append_str("PAGESIZE=%ld\n", value)
|
||||||
#define VMCOREINFO_SYMBOL(name) \
|
#define VMCOREINFO_SYMBOL(name) \
|
||||||
vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name)
|
vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name)
|
||||||
|
#define VMCOREINFO_SYMBOL_ARRAY(name) \
|
||||||
|
vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)name)
|
||||||
#define VMCOREINFO_SIZE(name) \
|
#define VMCOREINFO_SIZE(name) \
|
||||||
vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \
|
vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \
|
||||||
(unsigned long)sizeof(name))
|
(unsigned long)sizeof(name))
|
||||||
|
|
|
@ -410,7 +410,7 @@ static int __init crash_save_vmcoreinfo_init(void)
|
||||||
VMCOREINFO_SYMBOL(contig_page_data);
|
VMCOREINFO_SYMBOL(contig_page_data);
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_SPARSEMEM
|
#ifdef CONFIG_SPARSEMEM
|
||||||
VMCOREINFO_SYMBOL(mem_section);
|
VMCOREINFO_SYMBOL_ARRAY(mem_section);
|
||||||
VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
|
VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
|
||||||
VMCOREINFO_STRUCT_SIZE(mem_section);
|
VMCOREINFO_STRUCT_SIZE(mem_section);
|
||||||
VMCOREINFO_OFFSET(mem_section, section_mem_map);
|
VMCOREINFO_OFFSET(mem_section, section_mem_map);
|
||||||
|
|
|
@ -127,7 +127,7 @@
|
||||||
/* GFP bitmask for kmemleak internal allocations */
|
/* GFP bitmask for kmemleak internal allocations */
|
||||||
#define gfp_kmemleak_mask(gfp) (((gfp) & (GFP_KERNEL | GFP_ATOMIC)) | \
|
#define gfp_kmemleak_mask(gfp) (((gfp) & (GFP_KERNEL | GFP_ATOMIC)) | \
|
||||||
__GFP_NORETRY | __GFP_NOMEMALLOC | \
|
__GFP_NORETRY | __GFP_NOMEMALLOC | \
|
||||||
__GFP_NOWARN)
|
__GFP_NOWARN | __GFP_NOFAIL)
|
||||||
|
|
||||||
/* scanning area inside a memory block */
|
/* scanning area inside a memory block */
|
||||||
struct kmemleak_scan_area {
|
struct kmemleak_scan_area {
|
||||||
|
|
|
@ -46,7 +46,7 @@ $(OBJTOOL_IN): fixdep FORCE
|
||||||
@$(MAKE) $(build)=objtool
|
@$(MAKE) $(build)=objtool
|
||||||
|
|
||||||
$(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN)
|
$(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN)
|
||||||
@./sync-check.sh
|
@$(CONFIG_SHELL) ./sync-check.sh
|
||||||
$(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@
|
$(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue