diff options
| author | Tejun Heo <tj@kernel.org> | 2010-09-03 12:22:47 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-09-08 05:10:47 -0400 |
| commit | 4f8b02b4e5c6896e073bed736136d420bd44b627 (patch) | |
| tree | bdc29ec9effaf18681b16594257540d256b4d36f | |
| parent | d56557af19867edb8c0e96f8e26399698a08857f (diff) | |
vmalloc: pcpu_get/free_vm_areas() aren't needed on UP
These functions are used only by percpu memory allocator on SMP.
Don't build them on UP.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Nick Piggin <npiggin@kernel.dk>
Reviewed-by: Chrsitoph Lameter <cl@linux.com>
| -rw-r--r-- | include/linux/vmalloc.h | 2 | ||||
| -rw-r--r-- | mm/vmalloc.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 01c2145118dc..63a4fe6d51bd 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h | |||
| @@ -117,10 +117,12 @@ extern rwlock_t vmlist_lock; | |||
| 117 | extern struct vm_struct *vmlist; | 117 | extern struct vm_struct *vmlist; |
| 118 | extern __init void vm_area_register_early(struct vm_struct *vm, size_t align); | 118 | extern __init void vm_area_register_early(struct vm_struct *vm, size_t align); |
| 119 | 119 | ||
| 120 | #ifdef CONFIG_SMP | ||
| 120 | struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets, | 121 | struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets, |
| 121 | const size_t *sizes, int nr_vms, | 122 | const size_t *sizes, int nr_vms, |
| 122 | size_t align, gfp_t gfp_mask); | 123 | size_t align, gfp_t gfp_mask); |
| 123 | 124 | ||
| 124 | void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms); | 125 | void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms); |
| 126 | #endif | ||
| 125 | 127 | ||
| 126 | #endif /* _LINUX_VMALLOC_H */ | 128 | #endif /* _LINUX_VMALLOC_H */ |
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 6b8889da69a6..c623e0ce3f00 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
| @@ -2056,6 +2056,7 @@ void free_vm_area(struct vm_struct *area) | |||
| 2056 | } | 2056 | } |
| 2057 | EXPORT_SYMBOL_GPL(free_vm_area); | 2057 | EXPORT_SYMBOL_GPL(free_vm_area); |
| 2058 | 2058 | ||
| 2059 | #ifdef CONFIG_SMP | ||
| 2059 | static struct vmap_area *node_to_va(struct rb_node *n) | 2060 | static struct vmap_area *node_to_va(struct rb_node *n) |
| 2060 | { | 2061 | { |
| 2061 | return n ? rb_entry(n, struct vmap_area, rb_node) : NULL; | 2062 | return n ? rb_entry(n, struct vmap_area, rb_node) : NULL; |
| @@ -2336,6 +2337,7 @@ void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms) | |||
| 2336 | free_vm_area(vms[i]); | 2337 | free_vm_area(vms[i]); |
| 2337 | kfree(vms); | 2338 | kfree(vms); |
| 2338 | } | 2339 | } |
| 2340 | #endif /* CONFIG_SMP */ | ||
| 2339 | 2341 | ||
| 2340 | #ifdef CONFIG_PROC_FS | 2342 | #ifdef CONFIG_PROC_FS |
| 2341 | static void *s_start(struct seq_file *m, loff_t *pos) | 2343 | static void *s_start(struct seq_file *m, loff_t *pos) |
