diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-28 13:04:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-28 13:04:25 -0700 |
| commit | 75caf310d16cc5e2f851c048cd597f5437013368 (patch) | |
| tree | f492f135a0d9a9f88f569a32b2d3f2083b1bd997 /include/asm-generic/topology.h | |
| parent | d16eea2fa5a1ed9bc1788db39a76017916dc7f25 (diff) | |
| parent | 4377748c7b5187c3342a60fa2ceb60c8a57a8488 (diff) | |
| download | linux-sh-75caf310d16cc5e2f851c048cd597f5437013368.tar.gz | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"5 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
include/asm-generic/topology.h: guard cpumask_of_node() macro argument
fs/binfmt_elf.c: allocate initialized memory in fill_thread_core_info()
mm: remove VM_BUG_ON(PageSlab()) from page_mapcount()
mm,thp: stop leaking unreleased file pages
mm/z3fold: silence kmemleak false positives of slots
Diffstat (limited to 'include/asm-generic/topology.h')
| -rw-r--r-- | include/asm-generic/topology.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/topology.h b/include/asm-generic/topology.h index 238873739550..5aa8705df87e 100644 --- a/include/asm-generic/topology.h +++ b/include/asm-generic/topology.h @@ -48,7 +48,7 @@ #ifdef CONFIG_NEED_MULTIPLE_NODES #define cpumask_of_node(node) ((node) == 0 ? cpu_online_mask : cpu_none_mask) #else - #define cpumask_of_node(node) ((void)node, cpu_online_mask) + #define cpumask_of_node(node) ((void)(node), cpu_online_mask) #endif #endif #ifndef pcibus_to_node |