summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-08-12 10:30:41 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-08-12 10:30:41 +0000
commit60b393ba86087ad50eafeb06730066681417e4cf (patch)
tree6e5ddcf638c01801097417e292c967ae3f41661a /target
parentcf9b6ece556cf198a8f844eded8613bf3abbf1ed (diff)
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' git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33137 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/patches-3.3/930-crashlog.patch6
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;