From: Gabor Juhos <juhosg@openwrt.org>
Date: Sun, 12 Aug 2012 10:30:41 +0000 (+0000)
Subject: generic: use __meminit annotation for crashlog_init_memblock
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b942309f4fb6b9268b59466e830e31fdea1f5f71;p=openwrt%2Fstaging%2Fnbd.git

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
---

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;