linux-next: build warnings after merge of the final tree (tip treee related)
Hi all,
After merging the scsi-post-merge tree, today's linux-next build (powerpc allnoconfig, i386 defconfig and others) produced these warnings (I build with CONFIG_DEBUG_SECTION_MISMATCH=y):
WARNING: mm/built-in.o(.text+0x25910): Section mismatch in reference from the function memblock_find_in_range() to the function .init.text:memblock_find_base() The function memblock_find_in_range() references
the function __init memblock_find_base().
This is often because memblock_find_in_range lacks a __init
annotation or the annotation of memblock_find_base is wrong.
WARNING: mm/built-in.o(.text+0x25bfc): Section mismatch in reference from the function memblock_double_array() to the function .init.text:memblock_free() The function memblock_double_array() references
the function __init memblock_free().
This is often because memblock_double_array lacks a __init
annotation or the annotation of memblock_free is wrong.
WARNING: mm/built-in.o(.text+0x25c5c): Section mismatch in reference from the function memblock_double_array() to the function .init.text:memblock_find_base() The function memblock_double_array() references
the function __init memblock_find_base().
This is often because memblock_double_array lacks a __init
annotation or the annotation of memblock_find_base is wrong.
WARNING: mm/built-in.o(.text+0x26194): Section mismatch in reference from the function memblock_reserve_reserved_regions() to the function .init.text:memblock_reserve() The function memblock_reserve_reserved_regions() references
the function __init memblock_reserve().
This is often because memblock_reserve_reserved_regions lacks a __init
annotation or the annotation of memblock_reserve is wrong.
WARNING: mm/built-in.o(.text+0x2630c): Section mismatch in reference from the function memblock_free_reserved_regions() to the function .init.text:memblock_free() The function memblock_free_reserved_regions() references
the function __init memblock_free().
This is often because memblock_free_reserved_regions lacks a __init
annotation or the annotation of memblock_free is wrong.
WARNING: vmlinux.o(.text+0x10190): Section mismatch in reference from the function setup_initial_memory_limit() to the function .init.text:memblock_set_current_limit() The function setup_initial_memory_limit() references
the function __init memblock_set_current_limit().
This is often because setup_initial_memory_limit lacks a __init
annotation or the annotation of memblock_set_current_limit is wrong.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Quoted 11 lines · Stephen Rothwell
Hi all,
After merging the scsi-post-merge tree, today's linux-next build (powerpc allnoconfig, i386 defconfig and others) produced these warnings (I build with
CONFIG_DEBUG_SECTION_MISMATCH=y):WARNING: mm/built-in.o(.text+0x25910): Section mismatch in reference from the function
memblock_find_in_range()to the function .init.text:memblock_find_base() The functionmemblock_find_in_range()references
the function__initmemblock_find_base().
This is often becausememblock_find_in_rangelacks a__init
annotation or the annotation ofmemblock_find_baseis wrong.
please check it, and it should get into core/memblock branch.
Thanks
Yinghai
[PATCH] memblock: Fix section mismatch warning
for arches that use memblock other than x86
--- mm/memblock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
mm/memblock.c +5 -5
@@ -125,8 +125,8 @@ static phys_addr_t __init memblock_find_return MEMBLOCK_ERROR ; } -static phys_addr_t __init memblock_find_base (phys_addr_t size,phys_addr_t align, -phys_addr_t start,phys_addr_t end) +static phys_addr_t __init_memblock memblock_find_base(phys_addr_t size, +phys_addr_t align,phys_addr_t start,phys_addr_t end) {long i;
@@ -439,12 +439,12 @@ long __init_memblock memblock_remove(phyreturn __memblock_remove (&memblock.memory, base, size); } -long __init memblock_free (phys_addr_t base,phys_addr_t size) +long __init_memblock memblock_free (phys_addr_t base,phys_addr_t size) {return __memblock_remove (&memblock.reserved, base, size); } -long __init memblock_reserve (phys_addr_t base,phys_addr_t size) +long __init_memblock memblock_reserve (phys_addr_t base,phys_addr_t size) {struct memblock_type *_rgn = &memblock.reserved;
@@ -693,7 +693,7 @@ int __init_memblock memblock_is_region_r } -void __init memblock_set_current_limit (phys_addr_t limit) +void __init_memblock memblock_set_current_limit(phys_addr_t limit) { memblock.current_limit = limit; }
Hi Yinghai,
Quoted 5 lines · On Sun, 12 Sep 2010 21:14:15 -0700 Yinghai Lu <[email protected]> wrote:
please check it, and it should get into core/memblock branch.
Thanks
Quoted 8 lines
Yinghai
[PATCH] memblock: Fix section mismatch warning
for arches that use memblock other than x86
Reported-by Stephen Rothwell <[email protected]>Signed-off-by Yinghai Lu <[email protected]>
Your patch fixes some of the warnings, but still leaves these for a powerpc allnoconfig build:
WARNING: mm/built-in.o(.text+0x25d80): Section mismatch in reference from the function memblock_double_array() to the function .init.text:memblock_free() The function memblock_double_array() references
the function __init memblock_free().
This is often because memblock_double_array lacks a __init
annotation or the annotation of memblock_free is wrong.
WARNING: mm/built-in.o(.text+0x26318): Section mismatch in reference from the function memblock_reserve_reserved_regions() to the function .init.text:memblock_reserve() The function memblock_reserve_reserved_regions() references
the function __init memblock_reserve().
This is often because memblock_reserve_reserved_regions lacks a __init
annotation or the annotation of memblock_reserve is wrong.
WARNING: mm/built-in.o(.text+0x26490): Section mismatch in reference from the function memblock_free_reserved_regions() to the function .init.text:memblock_free() The function memblock_free_reserved_regions() references
the function __init memblock_free().
This is often because memblock_free_reserved_regions lacks a __init
annotation or the annotation of memblock_free is wrong.
And these for a i386 defconfig build:
WARNING: mm/built-in.o(.text+0x1e261): Section mismatch in reference from the function memblock_is_memory() to the variable .init.data:memblock The function memblock_is_memory() references
the variable __initdata memblock.
This is often because memblock_is_memory lacks a __initdata
annotation or the annotation of memblock is wrong.
WARNING: mm/built-in.o(.text+0x1e27f): Section mismatch in reference from the function memblock_is_region_memory() to the variable .init.data:memblock The function memblock_is_region_memory() references
the variable __initdata memblock.
This is often because memblock_is_region_memory lacks a __initdata
annotation or the annotation of memblock is wrong.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Quoted 16 lines · Stephen Rothwell
Your patch fixes some of the warnings, but still leaves these for a powerpc allnoconfig build:
WARNING: mm/built-in.o(.text+0x25d80): Section mismatch in reference from the function
memblock_double_array()to the function .init.text:memblock_free() The functionmemblock_double_array()references
the function__initmemblock_free().
This is often becausememblock_double_arraylacks a__init
annotation or the annotation ofmemblock_freeis wrong.WARNING: mm/built-in.o(.text+0x26318): Section mismatch in reference from the function
memblock_reserve_reserved_regions()to the function .init.text:memblock_reserve() The functionmemblock_reserve_reserved_regions()references
the function__initmemblock_reserve().
This is often becausememblock_reserve_reserved_regionslacks a__init
annotation or the annotation ofmemblock_reserveis wrong.
Quoted 5 lines
WARNING: mm/built-in.o(.text+0x26490): Section mismatch in reference from the function
memblock_free_reserved_regions()to the function .init.text:memblock_free() The functionmemblock_free_reserved_regions()references
the function__initmemblock_free().
This is often becausememblock_free_reserved_regionslacks a__init
annotation or the annotation ofmemblock_freeis wrong.
v1 already changed them all to __init_memblock, so we should not have those warnings.
Quoted 9 lines
And these for a i386 defconfig build:
WARNING: mm/built-in.o(.text+0x1e261): Section mismatch in reference from the function
memblock_is_memory()to the variable .init.data:memblock The functionmemblock_is_memory()references
the variable__initdatamemblock.
This is often becausememblock_is_memorylacks a__initdata
annotation or the annotation of memblock is wrong.
Quoted 6 lines
WARNING: mm/built-in.o(.text+0x1e27f): Section mismatch in reference from the function
memblock_is_region_memory()to the variable .init.data:memblock The functionmemblock_is_region_memory()references
the variable__initdatamemblock.
This is often becausememblock_is_region_memorylacks a__initdata
annotation or the annotation of memblock is wrong.
you must have old gcc, those functions are not used with i386.
[PATCH -v2] memblock: Fix section mismatch warning
for arches that use memblock other than x86
-v2: more with memblock_is_meory()
--- mm/memblock.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
mm/memblock.c +7 -7
@@ -125,8 +125,8 @@ static phys_addr_t __init memblock_find_return MEMBLOCK_ERROR ; } -static phys_addr_t __init memblock_find_base (phys_addr_t size,phys_addr_t align, -phys_addr_t start,phys_addr_t end) +static phys_addr_t __init_memblock memblock_find_base(phys_addr_t size, +phys_addr_t align,phys_addr_t start,phys_addr_t end) {long i;
@@ -439,12 +439,12 @@ long __init_memblock memblock_remove(phyreturn __memblock_remove (&memblock.memory, base, size); } -long __init memblock_free (phys_addr_t base,phys_addr_t size) +long __init_memblock memblock_free (phys_addr_t base,phys_addr_t size) {return __memblock_remove (&memblock.reserved, base, size); } -long __init memblock_reserve (phys_addr_t base,phys_addr_t size) +long __init_memblock memblock_reserve (phys_addr_t base,phys_addr_t size) {struct memblock_type *_rgn = &memblock.reserved;
@@ -671,12 +671,12 @@ int __init memblock_is_reserved(phys_addreturn memblock_search (&memblock.reserved, addr) !=-1 ; } -int memblock_is_memory (phys_addr_t addr) +int __init_memblock memblock_is_memory(phys_addr_t addr) {return memblock_search (&memblock.memory, addr) !=-1 ; } -int memblock_is_region_memory (phys_addr_t base,phys_addr_t size) +int __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size) {int idx =memblock_search (&memblock.reserved, base);
@@ -693,7 +693,7 @@ int __init_memblock memblock_is_region_r } -void __init memblock_set_current_limit (phys_addr_t limit) +void __init_memblock memblock_set_current_limit(phys_addr_t limit) { memblock.current_limit = limit; }
Hi Yinghai,
Quoted 18 lines · On Mon, 13 Sep 2010 01:24:20 -0700 Yinghai Lu <[email protected]> wrote:
Quoted 16 lines · Stephen Rothwell
Your patch fixes some of the warnings, but still leaves these for a powerpc allnoconfig build:
WARNING: mm/built-in.o(.text+0x25d80): Section mismatch in reference from the function
memblock_double_array()to the function .init.text:memblock_free() The functionmemblock_double_array()references
the function__initmemblock_free().
This is often becausememblock_double_arraylacks a__init
annotation or the annotation ofmemblock_freeis wrong.WARNING: mm/built-in.o(.text+0x26318): Section mismatch in reference from the function
memblock_reserve_reserved_regions()to the function .init.text:memblock_reserve() The functionmemblock_reserve_reserved_regions()references
the function__initmemblock_reserve().
This is often becausememblock_reserve_reserved_regionslacks a__init
annotation or the annotation ofmemblock_reserveis wrong.
Quoted 7 lines
Quoted 5 lines
WARNING: mm/built-in.o(.text+0x26490): Section mismatch in reference from the function
memblock_free_reserved_regions()to the function .init.text:memblock_free() The functionmemblock_free_reserved_regions()references
the function__initmemblock_free().
This is often becausememblock_free_reserved_regionslacks a__init
annotation or the annotation ofmemblock_freeis wrong.v1 already changed them all to
__init_memblock, so we should not have those warnings.
They are still marked as __init in include/linux/memblock.h. I don't think that they need to be marked at all there.
Quoted 8 lines
Quoted 8 lines
And these for a i386 defconfig build:
WARNING: mm/built-in.o(.text+0x1e261): Section mismatch in reference from the function
memblock_is_memory()to the variable .init.data:memblock The functionmemblock_is_memory()references
the variable__initdatamemblock.
This is often becausememblock_is_memorylacks a__initdata
annotation or the annotation of memblock is wrong.
Quoted 7 lines
Quoted 5 lines
WARNING: mm/built-in.o(.text+0x1e27f): Section mismatch in reference from the function
memblock_is_region_memory()to the variable .init.data:memblock The functionmemblock_is_region_memory()references
the variable__initdatamemblock.
This is often becausememblock_is_region_memorylacks a__initdata
annotation or the annotation of memblock is wrong.you must have old gcc, those functions are not used with i386.
I am not sure what the compiler version has to do with it, but I am using gcc 4.4.4 which is fairly recent. The X86 Kconfig selects HAVE_MEMBLOCK unconditionally, so mm/memblock.c is built on i386.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Quoted 27 lines · Stephen Rothwell
Hi Yinghai,
Quoted 24 lines · On Mon, 13 Sep 2010 01:24:20 -0700 Yinghai Lu <[email protected]> wrote:
Quoted 21 lines · Stephen Rothwell
Your patch fixes some of the warnings, but still leaves these for a powerpc allnoconfig build:
WARNING: mm/built-in.o(.text+0x25d80): Section mismatch in reference from the function
memblock_double_array()to the function .init.text:memblock_free() The functionmemblock_double_array()references
the function__initmemblock_free().
This is often becausememblock_double_arraylacks a__init
annotation or the annotation ofmemblock_freeis wrong.WARNING: mm/built-in.o(.text+0x26318): Section mismatch in reference from the function
memblock_reserve_reserved_regions()to the function .init.text:memblock_reserve() The functionmemblock_reserve_reserved_regions()references
the function__initmemblock_reserve().
This is often becausememblock_reserve_reserved_regionslacks a__init
annotation or the annotation ofmemblock_reserveis wrong.WARNING: mm/built-in.o(.text+0x26490): Section mismatch in reference from the function
memblock_free_reserved_regions()to the function .init.text:memblock_free() The functionmemblock_free_reserved_regions()references
the function__initmemblock_free().
This is often becausememblock_free_reserved_regionslacks a__init
annotation or the annotation ofmemblock_freeis wrong.
Quoted 4 lines
Quoted 1 line
v1 already changed them all to
__init_memblock, so we should not have those warnings.They are still marked as
__initininclude/linux/memblock.h. I don't think that they need to be marked at all there.
good,
Also, we may need to remove all extern and __init and __initdata etc in .h files.
please check
[PATCH -v3] memblock: Fix section mismatch warning
Use __init_memblock to replace __init, and remove __init in memblock.h
-v2: more with memblock_is_meory()
-v3: remove __init for function declaring in memblock.h. Pointed out by Stephen.
--- include/linux/memblock.h | 44 ++++++++++++++++++++++---------------------- mm/memblock.c | 14 +++++++------- 2 files changed, 29 insertions(+), 29 deletions(-)
mm/memblock.c +7 -7
@@ -125,8 +125,8 @@ static phys_addr_t __init memblock_find_return MEMBLOCK_ERROR ; } -static phys_addr_t __init memblock_find_base (phys_addr_t size,phys_addr_t align, -phys_addr_t start,phys_addr_t end) +static phys_addr_t __init_memblock memblock_find_base(phys_addr_t size, +phys_addr_t align,phys_addr_t start,phys_addr_t end) {long i;
@@ -439,12 +439,12 @@ long __init_memblock memblock_remove(phyreturn __memblock_remove (&memblock.memory, base, size); } -long __init memblock_free (phys_addr_t base,phys_addr_t size) +long __init_memblock memblock_free (phys_addr_t base,phys_addr_t size) {return __memblock_remove (&memblock.reserved, base, size); } -long __init memblock_reserve (phys_addr_t base,phys_addr_t size) +long __init_memblock memblock_reserve (phys_addr_t base,phys_addr_t size) {struct memblock_type *_rgn = &memblock.reserved;
@@ -671,12 +671,12 @@ int __init memblock_is_reserved(phys_addreturn memblock_search (&memblock.reserved, addr) !=-1 ; } -int memblock_is_memory (phys_addr_t addr) +int __init_memblock memblock_is_memory(phys_addr_t addr) {return memblock_search (&memblock.memory, addr) !=-1 ; } -int memblock_is_region_memory (phys_addr_t base,phys_addr_t size) +int __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size) {int idx =memblock_search (&memblock.reserved, base);
@@ -693,7 +693,7 @@ int __init_memblock memblock_is_region_r } -void __init memblock_set_current_limit (phys_addr_t limit) +void __init_memblock memblock_set_current_limit(phys_addr_t limit) { memblock.current_limit = limit; }
include/linux/memblock.h +22 -22
75 lines not on this page · raw message
Hi Yinghai,
Quoted 2 lines · On Tue, 14 Sep 2010 16:00:06 -0700 Yinghai Lu <[email protected]> wrote:
Also, we may need to remove all extern and
__initand__initdataetc in .h files.
Do not remove the "extern" key word.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Quoted 8 lines · Stephen Rothwell
Hi Yinghai,
Quoted 2 lines · On Tue, 14 Sep 2010 16:00:06 -0700 Yinghai Lu <[email protected]> wrote:
Also, we may need to remove all extern and
__initand__initdataetc in .h files.Do not remove the "extern" key word.
why? you got another warning?
Yinghai
Hi Yinghai,
Quoted 6 lines · On Tue, 14 Sep 2010 18:33:34 -0700 Yinghai Lu <[email protected]> wrote:
Quoted 2 lines · Stephen Rothwell
Do not remove the "extern" key word.
why? you got another warning?
It is normal C coding practice to mark declarations in header files with extern. It probably doesn't strictly matter for functions, but I have seen a case where not doing so to a variable lead to multiple definitions of the variable. Consistency is also good.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Stephen Rothwell
Tested-byHi Yinghai,
Quoted 12 lines · On Tue, 14 Sep 2010 16:00:06 -0700 Yinghai Lu <[email protected]> wrote:
Also, we may need to remove all extern and
__initand__initdataetc in .h files.please check
[PATCH -v3] memblock: Fix section mismatch warning
Use
__init_memblockto replace__init, and remove__initinmemblock.h(quoted diff) +0
-2-v2: more with memblock_is_meory() -v3: remove __init for function declaring in memblock.h. Pointed out by Stephen.
Quoted 2 lines
Reported-by Stephen Rothwell <[email protected]>Signed-off-by Yinghai Lu <[email protected]>
This version fixes all the warnings for me. So if you put the "extern"s back, you can add:
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Quoted 15 lines · Stephen Rothwell
Hi Yinghai,
Quoted 12 lines · On Tue, 14 Sep 2010 16:00:06 -0700 Yinghai Lu <[email protected]> wrote:
Also, we may need to remove all extern and
__initand__initdataetc in .h files.please check
[PATCH -v3] memblock: Fix section mismatch warning
Use
__init_memblockto replace__init, and remove__initinmemblock.h(quoted diff) +0
-2-v2: more with memblock_is_meory() -v3: remove __init for function declaring in memblock.h. Pointed out by Stephen.
Quoted 7 lines
Quoted 2 lines
Reported-by Stephen Rothwell <[email protected]>Signed-off-by Yinghai Lu <[email protected]>This version fixes all the warnings for me. So if you put the "extern"s back, you can add:
Tested-by Stephen Rothwell <[email protected]>
Yinghai, mind posting the final version of the patch as a standalone posting, with a proper changelog, and with the extern issue fixed as well, plus all Reported-by and Tested-by tags added?
Thanks,
Ingo
PATCH 1/1 memblock: Fix section mismatch warnings
Stephen found bunch of section mismatch warnings with memblock new changes.
Use __init_memblock to replace __init in memblock.c and remove __init in memblock.h. We should not use __init in header files.
--- include/linux/memblock.h | 24 ++++++++++++------------ mm/memblock.c | 14 +++++++------- 2 files changed, 19 insertions(+), 19 deletions(-)
mm/memblock.c +7 -7
@@ -125,8 +125,8 @@ static phys_addr_t __init memblock_find_return MEMBLOCK_ERROR ; } -static phys_addr_t __init memblock_find_base (phys_addr_t size,phys_addr_t align, -phys_addr_t start,phys_addr_t end) +static phys_addr_t __init_memblock memblock_find_base(phys_addr_t size, +phys_addr_t align,phys_addr_t start,phys_addr_t end) {long i;
@@ -439,12 +439,12 @@ long __init_memblock memblock_remove(phyreturn __memblock_remove (&memblock.memory, base, size); } -long __init memblock_free (phys_addr_t base,phys_addr_t size) +long __init_memblock memblock_free (phys_addr_t base,phys_addr_t size) {return __memblock_remove (&memblock.reserved, base, size); } -long __init memblock_reserve (phys_addr_t base,phys_addr_t size) +long __init_memblock memblock_reserve (phys_addr_t base,phys_addr_t size) {struct memblock_type *_rgn = &memblock.reserved;
@@ -671,12 +671,12 @@ int __init memblock_is_reserved(phys_addreturn memblock_search (&memblock.reserved, addr) !=-1 ; } -int memblock_is_memory (phys_addr_t addr) +int __init_memblock memblock_is_memory(phys_addr_t addr) {return memblock_search (&memblock.memory, addr) !=-1 ; } -int memblock_is_region_memory (phys_addr_t base,phys_addr_t size) +int __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size) {int idx =memblock_search (&memblock.reserved, base);
@@ -693,7 +693,7 @@ int __init_memblock memblock_is_region_r } -void __init memblock_set_current_limit (phys_addr_t limit) +void __init_memblock memblock_set_current_limit(phys_addr_t limit) { memblock.current_limit = limit; }
include/linux/memblock.h +12 -12
@@ -51,39 +51,39 @@ u64 memblock_find_in_range(u64 start, u6int memblock_free_reserved_regions (void );int memblock_reserve_reserved_regions (void ); -extern void __init memblock_init (void ); -extern void __init memblock_analyze (void ); +extern void memblock_init (void ); +extern void memblock_analyze (void );extern long memblock_add (phys_addr_t base,phys_addr_t size);extern long memblock_remove (phys_addr_t base,phys_addr_t size); -extern long __init memblock_free (phys_addr_t base,phys_addr_t size); -extern long __init memblock_reserve (phys_addr_t base,phys_addr_t size); +extern long memblock_free (phys_addr_t base,phys_addr_t size); +extern long memblock_reserve (phys_addr_t base,phys_addr_t size);/* The numa aware allocator is only available if * CONFIG_ARCH_POPULATES_NODE_MAP is set */ -extern phys_addr_t __init memblock_alloc_nid (phys_addr_t size,phys_addr_t align, +extern phys_addr_t memblock_alloc_nid (phys_addr_t size,phys_addr_t align,int nid); -extern phys_addr_t __init memblock_alloc_try_nid (phys_addr_t size,phys_addr_t align, +extern phys_addr_t memblock_alloc_try_nid (phys_addr_t size,phys_addr_t align,int nid); -extern phys_addr_t __init memblock_alloc (phys_addr_t size,phys_addr_t align); +extern phys_addr_t memblock_alloc (phys_addr_t size,phys_addr_t align);/* Flags for memblock_alloc_base() amd __memblock_alloc_base() */ #define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0)#define MEMBLOCK_ALLOC_ACCESSIBLE 0 -extern phys_addr_t __init memblock_alloc_base (phys_addr_t size, +extern phys_addr_t memblock_alloc_base (phys_addr_t size,phys_addr_t align,phys_addr_t max_addr); -extern phys_addr_t __init __memblock_alloc_base (phys_addr_t size, +extern phys_addr_t __memblock_alloc_base (phys_addr_t size,phys_addr_t align,phys_addr_t max_addr); -extern phys_addr_t __init memblock_phys_mem_size (void ); +extern phys_addr_t memblock_phys_mem_size (void );extern phys_addr_t memblock_end_of_DRAM (void ); -extern void __init memblock_enforce_memory_limit (phys_addr_t memory_limit); +extern void memblock_enforce_memory_limit (phys_addr_t memory_limit);extern int memblock_is_memory (phys_addr_t addr);extern int memblock_is_region_memory (phys_addr_t base,phys_addr_t size); -extern int __init memblock_is_reserved (phys_addr_t addr); +extern int memblock_is_reserved (phys_addr_t addr);extern int memblock_is_region_reserved (phys_addr_t base,phys_addr_t size);extern void memblock_dump_all (void );
[tip:core/memblock] memblock: Fix section mismatch warnings
Commit-ID: 3661ca66a42e306aaf53246fb75aec1ea01be0f0 Gitweb: http://git.kernel.org/tip/3661ca66a42e306aaf53246fb75aec1ea01be0f0 Author: Yinghai Lu <[email protected]> AuthorDate: Wed, 15 Sep 2010 13:05:29 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 15 Sep 2010 22:17:13 +0200
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.
LKML-Reference: <[email protected]>
--- include/linux/memblock.h | 24 ++++++++++++------------ mm/memblock.c | 14 +++++++------- 2 files changed, 19 insertions(+), 19 deletions(-)
include/linux/memblock.h +12 -12
@@ -51,39 +51,39 @@ u64 memblock_find_in_range(u64 start, u64 end, u64 size, u64 align);int memblock_free_reserved_regions (void );int memblock_reserve_reserved_regions (void ); -extern void __init memblock_init (void ); -extern void __init memblock_analyze (void ); +extern void memblock_init (void ); +extern void memblock_analyze (void );extern long memblock_add (phys_addr_t base,phys_addr_t size);extern long memblock_remove (phys_addr_t base,phys_addr_t size); -extern long __init memblock_free (phys_addr_t base,phys_addr_t size); -extern long __init memblock_reserve (phys_addr_t base,phys_addr_t size); +extern long memblock_free (phys_addr_t base,phys_addr_t size); +extern long memblock_reserve (phys_addr_t base,phys_addr_t size);/* The numa aware allocator is only available if * CONFIG_ARCH_POPULATES_NODE_MAP is set */ -extern phys_addr_t __init memblock_alloc_nid (phys_addr_t size,phys_addr_t align, +extern phys_addr_t memblock_alloc_nid (phys_addr_t size,phys_addr_t align,int nid); -extern phys_addr_t __init memblock_alloc_try_nid (phys_addr_t size,phys_addr_t align, +extern phys_addr_t memblock_alloc_try_nid (phys_addr_t size,phys_addr_t align,int nid); -extern phys_addr_t __init memblock_alloc (phys_addr_t size,phys_addr_t align); +extern phys_addr_t memblock_alloc (phys_addr_t size,phys_addr_t align);/* Flags for memblock_alloc_base() amd __memblock_alloc_base() */ #define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0)#define MEMBLOCK_ALLOC_ACCESSIBLE 0 -extern phys_addr_t __init memblock_alloc_base (phys_addr_t size, +extern phys_addr_t memblock_alloc_base (phys_addr_t size,phys_addr_t align,phys_addr_t max_addr); -extern phys_addr_t __init __memblock_alloc_base (phys_addr_t size, +extern phys_addr_t __memblock_alloc_base (phys_addr_t size,phys_addr_t align,phys_addr_t max_addr); -extern phys_addr_t __init memblock_phys_mem_size (void ); +extern phys_addr_t memblock_phys_mem_size (void );extern phys_addr_t memblock_end_of_DRAM (void ); -extern void __init memblock_enforce_memory_limit (phys_addr_t memory_limit); +extern void memblock_enforce_memory_limit (phys_addr_t memory_limit);extern int memblock_is_memory (phys_addr_t addr);extern int memblock_is_region_memory (phys_addr_t base,phys_addr_t size); -extern int __init memblock_is_reserved (phys_addr_t addr); +extern int memblock_is_reserved (phys_addr_t addr);extern int memblock_is_region_reserved (phys_addr_t base,phys_addr_t size);extern void memblock_dump_all (void );
mm/memblock.c +7 -7
@@ -125,8 +125,8 @@ static phys_addr_t __init memblock_find_region(phys_addr_t start, phys_addr_t enreturn MEMBLOCK_ERROR ; } -static phys_addr_t __init memblock_find_base (phys_addr_t size,phys_addr_t align, -phys_addr_t start,phys_addr_t end) +static phys_addr_t __init_memblock memblock_find_base(phys_addr_t size, +phys_addr_t align,phys_addr_t start,phys_addr_t end) {long i;
@@ -439,12 +439,12 @@ long __init_memblock memblock_remove(phys_addr_t base, phys_addr_t size)return __memblock_remove (&memblock.memory, base, size); } -long __init memblock_free (phys_addr_t base,phys_addr_t size) +long __init_memblock memblock_free (phys_addr_t base,phys_addr_t size) {return __memblock_remove (&memblock.reserved, base, size); } -long __init memblock_reserve (phys_addr_t base,phys_addr_t size) +long __init_memblock memblock_reserve (phys_addr_t base,phys_addr_t size) {struct memblock_type *_rgn = &memblock.reserved;
@@ -671,12 +671,12 @@ int __init memblock_is_reserved(phys_addr_t addr)return memblock_search (&memblock.reserved, addr) !=-1 ; } -int memblock_is_memory (phys_addr_t addr) +int __init_memblock memblock_is_memory(phys_addr_t addr) {return memblock_search (&memblock.memory, addr) !=-1 ; } -int memblock_is_region_memory (phys_addr_t base,phys_addr_t size) +int __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size) {int idx =memblock_search (&memblock.reserved, base);
@@ -693,7 +693,7 @@ int __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t si } -void __init memblock_set_current_limit (phys_addr_t limit) +void __init_memblock memblock_set_current_limit(phys_addr_t limit) { memblock.current_limit = limit; }