diff options
author | Yinghai Lu <yinghai@kernel.org> | 2010-09-15 16:05:29 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-09-15 16:17:13 -0400 |
commit | 3661ca66a42e306aaf53246fb75aec1ea01be0f0 (patch) | |
tree | 7fb390d6d09f72f9e1608554709b607ba0763ca7 /mm/memblock.c | |
parent | 823108a056c52a83c32ca199a57566a36fad4d19 (diff) |
memblock: Fix section mismatch warnings
Stephen found a bunch of section mismatch warnings with the
new memblock changes.
Use __init_memblock to replace __init in memblock.c and remove
__init in memblock.h. We should not use __init in header files.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Yinghai Lu <Yinghai@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
LKML-Reference: <4C912709.2090201@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm/memblock.c')
-rw-r--r-- | mm/memblock.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index 65e3ba8d09fb..d5d63ac1fd83 100644 --- a/mm/memblock.c +++ b/mm/memblock.c | |||
@@ -125,8 +125,8 @@ static phys_addr_t __init memblock_find_region(phys_addr_t start, phys_addr_t en | |||
125 | return MEMBLOCK_ERROR; | 125 | return MEMBLOCK_ERROR; |
126 | } | 126 | } |
127 | 127 | ||
128 | static phys_addr_t __init memblock_find_base(phys_addr_t size, phys_addr_t align, | 128 | static phys_addr_t __init_memblock memblock_find_base(phys_addr_t size, |
129 | phys_addr_t start, phys_addr_t end) | 129 | phys_addr_t align, phys_addr_t start, phys_addr_t end) |
130 | { | 130 | { |
131 | long i; | 131 | long i; |
132 | 132 | ||
@@ -439,12 +439,12 @@ long __init_memblock memblock_remove(phys_addr_t base, phys_addr_t size) | |||
439 | return __memblock_remove(&memblock.memory, base, size); | 439 | return __memblock_remove(&memblock.memory, base, size); |
440 | } | 440 | } |
441 | 441 | ||
442 | long __init memblock_free(phys_addr_t base, phys_addr_t size) | 442 | long __init_memblock memblock_free(phys_addr_t base, phys_addr_t size) |
443 | { | 443 | { |
444 | return __memblock_remove(&memblock.reserved, base, size); | 444 | return __memblock_remove(&memblock.reserved, base, size); |
445 | } | 445 | } |
446 | 446 | ||
447 | long __init memblock_reserve(phys_addr_t base, phys_addr_t size) | 447 | long __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) |
448 | { | 448 | { |
449 | struct memblock_type *_rgn = &memblock.reserved; | 449 | struct memblock_type *_rgn = &memblock.reserved; |
450 | 450 | ||
@@ -671,12 +671,12 @@ int __init memblock_is_reserved(phys_addr_t addr) | |||
671 | return memblock_search(&memblock.reserved, addr) != -1; | 671 | return memblock_search(&memblock.reserved, addr) != -1; |
672 | } | 672 | } |
673 | 673 | ||
674 | int memblock_is_memory(phys_addr_t addr) | 674 | int __init_memblock memblock_is_memory(phys_addr_t addr) |
675 | { | 675 | { |
676 | return memblock_search(&memblock.memory, addr) != -1; | 676 | return memblock_search(&memblock.memory, addr) != -1; |
677 | } | 677 | } |
678 | 678 | ||
679 | int memblock_is_region_memory(phys_addr_t base, phys_addr_t size) | 679 | int __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size) |
680 | { | 680 | { |
681 | int idx = memblock_search(&memblock.reserved, base); | 681 | int idx = memblock_search(&memblock.reserved, base); |
682 | 682 | ||
@@ -693,7 +693,7 @@ int __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t si | |||
693 | } | 693 | } |
694 | 694 | ||
695 | 695 | ||
696 | void __init memblock_set_current_limit(phys_addr_t limit) | 696 | void __init_memblock memblock_set_current_limit(phys_addr_t limit) |
697 | { | 697 | { |
698 | memblock.current_limit = limit; | 698 | memblock.current_limit = limit; |
699 | } | 699 | } |