diff options
| author |   Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:47:38 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:47:38 -0400 |
| commit | 72ed73c3f0801e860ee27e53ab6aaf47941ba324 (patch) | |
| tree | b46c546d77ee8931d47dafc97bf23b11472bffeb /include/linux/node.h | |
| parent | ideapad: read brightness setting on brightness key notify (diff) | |
| parent | xo15-ebook: Remove device.wakeup_count (diff) | |
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'include/linux/node.h')
| -rw-r--r-- | include/linux/node.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/node.h b/include/linux/node.h index 1466945cc9ef..92370e22343c 100644 --- a/include/linux/node.h +++ b/include/linux/node.h @@ -39,7 +39,8 @@ 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); -extern int unregister_mem_sect_under_nodes(struct memory_block *mem_blk); +extern int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, + unsigned long phys_index); #ifdef CONFIG_HUGETLBFS extern void register_hugetlbfs_with_node(node_registration_func_t doregister, @@ -67,7 +68,8 @@ static inline int register_mem_sect_under_node(struct memory_block *mem_blk, { return 0; } -static inline int unregister_mem_sect_under_nodes(struct memory_block *mem_blk) +static inline int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, + unsigned long phys_index) { return 0; } |