diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-08-12 10:30:41 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-08-12 10:30:41 +0000 |
| commit | b942309f4fb6b9268b59466e830e31fdea1f5f71 (patch) | |
| tree | 1d218728b3b36ccd1dd40bec45cf205c6c9e4ae2 | |
| parent | 0ef62afd40865d44533a726b0390df13802bfebc (diff) | |
| download | upstream-b942309f4fb6b9268b59466e830e31fdea1f5f71.tar.gz upstream-b942309f4fb6b9268b59466e830e31fdea1f5f71.tar.bz2 upstream-b942309f4fb6b9268b59466e830e31fdea1f5f71.zip | |
generic: use __meminit annotation for crashlog_init_memblock
Fixes this section mismatch warning:
WARNING: vmlinux.o(.meminit.text+0xb14): Section mismatch in reference
from the function memblock_insert_region() to the function
.init.text:crashlog_init_memblock()
The function __meminit memblock_insert_region() references
a function __init crashlog_init_memblock().
If crashlog_init_memblock is only used by memblock_insert_region then
annotate crashlog_init_memblock with a matching annotation.
Also, remove the __init annotations from 'include/linux/crashlog.h'
SVN-Revision: 33137
| -rw-r--r-- | target/linux/generic/patches-3.3/930-crashlog.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.3/930-crashlog.patch b/target/linux/generic/patches-3.3/930-crashlog.patch index aef0085b11..bce0ea40cc 100644 --- a/target/linux/generic/patches-3.3/930-crashlog.patch +++ b/target/linux/generic/patches-3.3/930-crashlog.patch @@ -5,8 +5,8 @@ +#define __CRASHLOG_H + +#ifdef CONFIG_CRASHLOG -+void __init crashlog_init_bootmem(struct bootmem_data *bdata); -+void __init crashlog_init_memblock(phys_addr_t addr, phys_addr_t size); ++void crashlog_init_bootmem(struct bootmem_data *bdata); ++void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size); +#else +static inline void crashlog_init_bootmem(struct bootmem_data *bdata) +{ @@ -121,7 +121,7 @@ +#endif + +#ifdef CONFIG_HAVE_MEMBLOCK -+void __init crashlog_init_memblock(phys_addr_t addr, phys_addr_t size) ++void __meminit crashlog_init_memblock(phys_addr_t addr, phys_addr_t size) +{ + if (crashlog_addr) + return; |