From 57d9861912e9bbbd6b68235c57930f4be1b872d5 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Fri, 3 Sep 2010 18:22:47 +0200 Subject: [PATCH] --- yaml --- r: 215945 b: refs/heads/master c: 0bc14062414d35c269b7c7dc3243a890886e7b38 h: refs/heads/master i: 215943: f34bda53e4fea5fa720bd0dee4243dfbb6d150a8 v: v3 --- [refs] | 2 +- trunk/include/linux/vmalloc.h | 2 ++ trunk/mm/vmalloc.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ce6ac0758062..2467093534f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84c1cf62465e2fb0a692620dcfeb52323ab03d48 +refs/heads/master: 0bc14062414d35c269b7c7dc3243a890886e7b38 diff --git a/trunk/include/linux/vmalloc.h b/trunk/include/linux/vmalloc.h index 01c2145118dc..63a4fe6d51bd 100644 --- a/trunk/include/linux/vmalloc.h +++ b/trunk/include/linux/vmalloc.h @@ -117,10 +117,12 @@ extern rwlock_t vmlist_lock; extern struct vm_struct *vmlist; extern __init void vm_area_register_early(struct vm_struct *vm, size_t align); +#ifdef CONFIG_SMP struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets, const size_t *sizes, int nr_vms, size_t align, gfp_t gfp_mask); void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms); +#endif #endif /* _LINUX_VMALLOC_H */ diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c index 6b8889da69a6..c623e0ce3f00 100644 --- a/trunk/mm/vmalloc.c +++ b/trunk/mm/vmalloc.c @@ -2056,6 +2056,7 @@ void free_vm_area(struct vm_struct *area) } EXPORT_SYMBOL_GPL(free_vm_area); +#ifdef CONFIG_SMP static struct vmap_area *node_to_va(struct rb_node *n) { 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) free_vm_area(vms[i]); kfree(vms); } +#endif /* CONFIG_SMP */ #ifdef CONFIG_PROC_FS static void *s_start(struct seq_file *m, loff_t *pos)