Commit 4a51c60a 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: mm (madvise, pagemap,
  readahead, memcg, userfaultfd), kbuild, and vfs"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: fix madvise WILLNEED performance problem
  libfs: fix error cast of negative value in simple_attr_write()
  mm/userfaultfd: do not access vma->vm_mm after calling handle_userfault()
  mm: memcg/slab: fix root memcg vmstats
  mm: fix readahead_page_batch for retry entries
  mm: fix phys_to_target_node() and memory_add_physaddr_to_nid() exports
  compiler-clang: remove version check for BPF Tracing
  mm/madvise: fix memory leak from process_madvise
parents d27637ec 66383800

arch/ia64/include/asm/sparsemem.h

+6 −0
Original line number Diff line number Diff line
@@ -18,4 +18,10 @@ 
#endif



#endif /* CONFIG_SPARSEMEM */



#ifdef CONFIG_MEMORY_HOTPLUG

int memory_add_physaddr_to_nid(u64 addr);

#define memory_add_physaddr_to_nid memory_add_physaddr_to_nid

#endif



#endif /* _ASM_IA64_SPARSEMEM_H */

arch/powerpc/include/asm/mmzone.h

+5 −0
Original line number Diff line number Diff line
@@ -46,5 +46,10 @@ u64 memory_hotplug_max(void); 
#define __HAVE_ARCH_RESERVED_KERNEL_PAGES

#endif



#ifdef CONFIG_MEMORY_HOTPLUG

extern int create_section_mapping(unsigned long start, unsigned long end,

				  int nid, pgprot_t prot);

#endif



#endif /* __KERNEL__ */

#endif /* _ASM_MMZONE_H_ */

arch/powerpc/include/asm/sparsemem.h

+2 −3
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 
#endif /* CONFIG_SPARSEMEM */



#ifdef CONFIG_MEMORY_HOTPLUG

extern int create_section_mapping(unsigned long start, unsigned long end,

				  int nid, pgprot_t prot);

extern int remove_section_mapping(unsigned long start, unsigned long end);

extern int memory_add_physaddr_to_nid(u64 start);

#define memory_add_physaddr_to_nid memory_add_physaddr_to_nid



#ifdef CONFIG_NUMA

extern int hot_add_scn_to_nid(unsigned long scn_addr);
@@ -26,6 +26,5 @@ static inline int hot_add_scn_to_nid(unsigned long scn_addr) 
}

#endif /* CONFIG_NUMA */

#endif /* CONFIG_MEMORY_HOTPLUG */



#endif /* __KERNEL__ */

#endif /* _ASM_POWERPC_SPARSEMEM_H */

arch/powerpc/mm/mem.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <asm/rtas.h>

#include <asm/kasan.h>

#include <asm/svm.h>

#include <asm/mmzone.h>



#include <mm/mmu_decl.h>

arch/x86/include/asm/sparsemem.h

+10 −0
Original line number Diff line number Diff line
@@ -28,4 +28,14 @@ 
#endif



#endif /* CONFIG_SPARSEMEM */



#ifndef __ASSEMBLY__

#ifdef CONFIG_NUMA_KEEP_MEMINFO

extern int phys_to_target_node(phys_addr_t start);

#define phys_to_target_node phys_to_target_node

extern int memory_add_physaddr_to_nid(u64 start);

#define memory_add_physaddr_to_nid memory_add_physaddr_to_nid

#endif

#endif /* __ASSEMBLY__ */



#endif /* _ASM_X86_SPARSEMEM_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE