Commit a06caa4a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "8 patches.

  Subsystems affected by this patch series: proc, selftests, kbuild, and
  mm (pagecache, kasan, hugetlb)"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm/hugetlb: clear compound_nr before freeing gigantic pages
  kasan: fix object remaining in offline per-cpu quarantine
  elfcore: fix building with clang
  initramfs: fix clang build failure
  kbuild: avoid static_assert for genksyms
  selftest/fpu: avoid clang warning
  proc: use untagged_addr() for pagemap_read addresses
  revert "mm/filemap: add static for function __add_to_page_cache_locked"
parents 94801e5c ba9c1201

fs/proc/task_mmu.c

+6 −2
Original line number Diff line number Diff line
@@ -1599,11 +1599,15 @@ static ssize_t pagemap_read(struct file *file, char __user *buf, 


	src = *ppos;

	svpfn = src / PM_ENTRY_BYTES;

	start_vaddr = svpfn << PAGE_SHIFT;

	end_vaddr = mm->task_size;



	/* watch out for wraparound */

	if (svpfn > mm->task_size >> PAGE_SHIFT)

	start_vaddr = end_vaddr;

	if (svpfn <= (ULONG_MAX >> PAGE_SHIFT))

		start_vaddr = untagged_addr(svpfn << PAGE_SHIFT);



	/* Ensure the address is inside the task */

	if (start_vaddr > mm->task_size)

		start_vaddr = end_vaddr;



	/*

include/linux/build_bug.h

+5 −0
Original line number Diff line number Diff line
@@ -77,4 +77,9 @@ 
#define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr)

#define __static_assert(expr, msg, ...) _Static_assert(expr, msg)



#ifdef __GENKSYMS__

/* genksyms gets confused by _Static_assert */

#define _Static_assert(expr, ...)

#endif



#endif	/* _LINUX_BUILD_BUG_H */

include/linux/elfcore.h

+22 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static inline int elf_core_copy_task_fpregs(struct task_struct *t, struct pt_reg 
#endif

}



#if defined(CONFIG_UM) || defined(CONFIG_IA64)

/*

 * These functions parameterize elf_core_dump in fs/binfmt_elf.c to write out

 * extra segments containing the gate DSO contents.  Dumping its
@@ -118,5 +119,26 @@ elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset); 
extern int

elf_core_write_extra_data(struct coredump_params *cprm);

extern size_t elf_core_extra_data_size(void);

#else

static inline Elf_Half elf_core_extra_phdrs(void)

{

	return 0;

}



static inline int elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset)

{

	return 1;

}



static inline int elf_core_write_extra_data(struct coredump_params *cprm)

{

	return 1;

}



static inline size_t elf_core_extra_data_size(void)

{

	return 0;

}

#endif



#endif /* _LINUX_ELFCORE_H */

init/initramfs.c

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ extern unsigned long __initramfs_size; 
#include <linux/initrd.h>

#include <linux/kexec.h>



void __weak free_initrd_mem(unsigned long start, unsigned long end)

void __weak __init free_initrd_mem(unsigned long start, unsigned long end)

{

#ifdef CONFIG_ARCH_KEEP_MEMBLOCK

	unsigned long aligned_start = ALIGN_DOWN(start, PAGE_SIZE);

kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o 
obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o

obj-$(CONFIG_TRACEPOINTS) += tracepoint.o

obj-$(CONFIG_LATENCYTOP) += latencytop.o

obj-$(CONFIG_ELFCORE) += elfcore.o

obj-$(CONFIG_FUNCTION_TRACER) += trace/

obj-$(CONFIG_TRACING) += trace/

obj-$(CONFIG_TRACE_CLOCK) += trace/

CRA Git | Maintained and supported by SUSTech CRA and CCSE