aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorHanjun Guo <hanjun.guo@linaro.org>2013-08-17 08:42:26 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-19 20:10:10 -0400
commitcebcac7c59e812d17237c13405aa6886199a1b90 (patch)
tree3b9f6493a824115a22dd40f822c040e75e7732b7 /drivers/base
parenta82579106c79484a5ea0c4c424c8860648c2e389 (diff)
drivers / dma-contiguous: Fix __init attribute location
__init belongs after the return type on functions, not before it. Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/dma-contiguous.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
index 0ca54421ce97..6c9cdaa9200d 100644
--- a/drivers/base/dma-contiguous.c
+++ b/drivers/base/dma-contiguous.c
@@ -134,7 +134,7 @@ void __init dma_contiguous_reserve(phys_addr_t limit)
134 134
135static DEFINE_MUTEX(cma_mutex); 135static DEFINE_MUTEX(cma_mutex);
136 136
137static __init int cma_activate_area(unsigned long base_pfn, unsigned long count) 137static int __init cma_activate_area(unsigned long base_pfn, unsigned long count)
138{ 138{
139 unsigned long pfn = base_pfn; 139 unsigned long pfn = base_pfn;
140 unsigned i = count >> pageblock_order; 140 unsigned i = count >> pageblock_order;
@@ -156,7 +156,7 @@ static __init int cma_activate_area(unsigned long base_pfn, unsigned long count)
156 return 0; 156 return 0;
157} 157}
158 158
159static __init struct cma *cma_create_area(unsigned long base_pfn, 159static struct cma * __init cma_create_area(unsigned long base_pfn,
160 unsigned long count) 160 unsigned long count)
161{ 161{
162 int bitmap_size = BITS_TO_LONGS(count) * sizeof(long); 162 int bitmap_size = BITS_TO_LONGS(count) * sizeof(long);