diff --git a/[refs] b/[refs] index 5a3facce1b30..805d9a81bbc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b77b0ef207624c9d9f8064ccbfd6da169780df44 +refs/heads/master: e99c97ade53fb6f5e665f2960eb86c624a532d7b diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c index 036536945dd9..f1cc03bbf6ac 100644 --- a/trunk/mm/vmalloc.c +++ b/trunk/mm/vmalloc.c @@ -897,7 +897,8 @@ EXPORT_SYMBOL(vm_unmap_ram); * @count: number of pages * @node: prefer to allocate data structures on this node * @prot: memory protection to use. PAGE_KERNEL for regular RAM - * @returns: a pointer to the address that has been mapped, or NULL on failure + * + * Returns: a pointer to the address that has been mapped, or %NULL on failure */ void *vm_map_ram(struct page **pages, unsigned int count, int node, pgprot_t prot) {