qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-09-29 00:01:59 +03:00
Code

generic: use __meminit annotation for crashlog_init_memblock

Browse Source 
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
This commit is contained in:
juhosg 2012-08-12 10:30:41 +00:00
parent cf9b6ece55
commit 60b393ba86
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/generic/patches-3.3/930-crashlog.patch
View File

@ -5,8 +5,8 @@
+#define __CRASHLOG_H +#define __CRASHLOG_H
+ +
+#ifdef CONFIG_CRASHLOG +#ifdef CONFIG_CRASHLOG
+void __init crashlog_init_bootmem(struct bootmem_data *bdata); +void crashlog_init_bootmem(struct bootmem_data *bdata);
+void __init crashlog_init_memblock(phys_addr_t addr, phys_addr_t size); +void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size);
+#else +#else
+static inline void crashlog_init_bootmem(struct bootmem_data *bdata) +static inline void crashlog_init_bootmem(struct bootmem_data *bdata)
+{ +{
@ -121,7 +121,7 @@
+#endif +#endif
+ +
+#ifdef CONFIG_HAVE_MEMBLOCK +#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) + if (crashlog_addr)
+ return; + return;