diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-05-24 09:30:15 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-05-24 09:30:15 -0700 |
| commit | 754451342fc5954061ede74b0a8485ec4a4c6eaa (patch) | |
| tree | 82daccba5779de492631c42e47a614bd9d4cddd2 /include/linux/node.h | |
| parent | bf232e460a3530adf17da7d7f1332347b73a3d08 (diff) | |
| parent | 771c577c23bac90597c685971d7297ea00f99d11 (diff) | |
| download | cachepc-linux-754451342fc5954061ede74b0a8485ec4a4c6eaa.tar.gz cachepc-linux-754451342fc5954061ede74b0a8485ec4a4c6eaa.zip | |
Merge tag 'v4.17-rc6' into next
Sync up with mainline to bring in Atmel controller changes for Caroline.
Diffstat (limited to 'include/linux/node.h')
| -rw-r--r-- | include/linux/node.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/node.h b/include/linux/node.h index 4ece0fee0ffc..41f171861dcc 100644 --- a/include/linux/node.h +++ b/include/linux/node.h @@ -67,7 +67,7 @@ extern void unregister_one_node(int nid); extern int register_cpu_under_node(unsigned int cpu, unsigned int nid); extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid); extern int register_mem_sect_under_node(struct memory_block *mem_blk, - int nid); + int nid, bool check_nid); extern int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, unsigned long phys_index); @@ -97,7 +97,7 @@ static inline int unregister_cpu_under_node(unsigned int cpu, unsigned int nid) return 0; } static inline int register_mem_sect_under_node(struct memory_block *mem_blk, - int nid) + int nid, bool check_nid) { return 0; } |