diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2016-09-03 14:45:20 -0400 |
---|---|---|
committer | Chris Metcalf <cmetcalf@mellanox.com> | 2016-12-16 15:32:29 -0500 |
commit | 8e36f722f73f2fc1766af1af0b2f56f2299ba687 (patch) | |
tree | 49743a0e562793d3e424d70f98df748dbea3089e | |
parent | 8797fe75f164d4b2f183e776003612ece565c76e (diff) |
tile-module: Rename jump labels in module_alloc()
Adjust jump labels according to the current Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Chris Metcalf <cmetcalf@mellanox.com>
-rw-r--r-- | arch/tile/kernel/module.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/tile/kernel/module.c b/arch/tile/kernel/module.c index dce4120f5263..09233fbe7801 100644 --- a/arch/tile/kernel/module.c +++ b/arch/tile/kernel/module.c | |||
@@ -49,23 +49,22 @@ void *module_alloc(unsigned long size) | |||
49 | for (; i < npages; ++i) { | 49 | for (; i < npages; ++i) { |
50 | pages[i] = alloc_page(GFP_KERNEL | __GFP_HIGHMEM); | 50 | pages[i] = alloc_page(GFP_KERNEL | __GFP_HIGHMEM); |
51 | if (!pages[i]) | 51 | if (!pages[i]) |
52 | goto error; | 52 | goto free_pages; |
53 | } | 53 | } |
54 | 54 | ||
55 | area = __get_vm_area(size, VM_ALLOC, MEM_MODULE_START, MEM_MODULE_END); | 55 | area = __get_vm_area(size, VM_ALLOC, MEM_MODULE_START, MEM_MODULE_END); |
56 | if (!area) | 56 | if (!area) |
57 | goto error; | 57 | goto free_pages; |
58 | area->nr_pages = npages; | 58 | area->nr_pages = npages; |
59 | area->pages = pages; | 59 | area->pages = pages; |
60 | 60 | ||
61 | if (map_vm_area(area, prot_rwx, pages)) { | 61 | if (map_vm_area(area, prot_rwx, pages)) { |
62 | vunmap(area->addr); | 62 | vunmap(area->addr); |
63 | goto error; | 63 | goto free_pages; |
64 | } | 64 | } |
65 | 65 | ||
66 | return area->addr; | 66 | return area->addr; |
67 | 67 | free_pages: | |
68 | error: | ||
69 | while (--i >= 0) | 68 | while (--i >= 0) |
70 | __free_page(pages[i]); | 69 | __free_page(pages[i]); |
71 | kfree(pages); | 70 | kfree(pages); |