diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-22 12:14:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-22 12:14:46 -0800 |
| commit | 4a51c60a11158961f1291c5b95ff7e4cddfb0353 (patch) | |
| tree | 1750832bdb1becf31c056280d1ca7fe3104ce9dd /arch/ia64/include/asm/sparsemem.h | |
| parent | d27637ece80f25124e0e6871b7b6cb855e1c670c (diff) | |
| parent | 66383800df9cbdbf3b0c34d5a51bf35bcdb72fd2 (diff) | |
| download | lwn-4a51c60a11158961f1291c5b95ff7e4cddfb0353.tar.gz lwn-4a51c60a11158961f1291c5b95ff7e4cddfb0353.zip | |
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
Diffstat (limited to 'arch/ia64/include/asm/sparsemem.h')
| -rw-r--r-- | arch/ia64/include/asm/sparsemem.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/sparsemem.h b/arch/ia64/include/asm/sparsemem.h index 336d0570e1fa..dd8c166ffd7b 100644 --- a/arch/ia64/include/asm/sparsemem.h +++ b/arch/ia64/include/asm/sparsemem.h @@ -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 */ |