Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[pandora-kernel.git] / mm / vmalloc.c

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index bf233b2..f64632b 100644 (file)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1268,6 +1268,7 @@ void unmap_kernel_range(unsigned long addr, unsigned long size)
        vunmap_page_range(addr, end);
        flush_tlb_kernel_range(addr, end);
 }
+EXPORT_SYMBOL_GPL(unmap_kernel_range);
 
 int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
 {
@@ -1496,7 +1497,7 @@ void vfree(const void *addr)
        if (!addr)
                return;
        if (unlikely(in_interrupt())) {
-               struct vfree_deferred *p = &__get_cpu_var(vfree_deferred);
+               struct vfree_deferred *p = this_cpu_ptr(&vfree_deferred);
                if (llist_add((struct llist_node *)addr, &p->list))
                        schedule_work(&p->wq);
        } else
@@ -2619,19 +2620,19 @@ static int s_show(struct seq_file *m, void *p)
                seq_printf(m, " phys=%llx", (unsigned long long)v->phys_addr);
 
        if (v->flags & VM_IOREMAP)
-               seq_printf(m, " ioremap");
+               seq_puts(m, " ioremap");
 
        if (v->flags & VM_ALLOC)
-               seq_printf(m, " vmalloc");
+               seq_puts(m, " vmalloc");
 
        if (v->flags & VM_MAP)
-               seq_printf(m, " vmap");
+               seq_puts(m, " vmap");
 
        if (v->flags & VM_USERMAP)
-               seq_printf(m, " user");
+               seq_puts(m, " user");
 
        if (v->flags & VM_VPAGES)
-               seq_printf(m, " vpages");
+               seq_puts(m, " vpages");
 
        show_numa_info(m, v);
        seq_putc(m, '\n');