diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-10-09 16:13:57 -0400 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-10-09 22:07:10 -0400 |
commit | 8d93241b923bcb6a60994f8ed20fda8cc06d0fda (patch) | |
tree | 55b5fe2f846dc4a006559ec748bfbf2331da60e6 /drivers | |
parent | 4a0ea00798a5b4b32e1167d09a84df793d518576 (diff) |
video: mark nuc900fb_map_video_memory as __devinit
nuc900fb_map_video_memory is called by an devinit function
that may be called at run-time, but the function itself is
marked __init and will be discarded after boot.
To avoid calling into a function that may have been overwritten,
mark nuc900fb_map_video_memory itself as __devinit.
Without this patch, building nuc950_defconfig results in:
WARNING: drivers/video/built-in.o(.devinit.text+0x26c): Section mismatch in reference from the function nuc900fb_probe() to the function .init.text:nuc900fb_map_video_memory()
The function __devinit nuc900fb_probe() references
a function __init nuc900fb_map_video_memory().
If nuc900fb_map_video_memory is only used by nuc900fb_probe then
annotate nuc900fb_map_video_memory with a matching annotation.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/nuc900fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c index e10f551ade21..b31b12bcba70 100644 --- a/drivers/video/nuc900fb.c +++ b/drivers/video/nuc900fb.c | |||
@@ -387,7 +387,7 @@ static int nuc900fb_init_registers(struct fb_info *info) | |||
387 | * The buffer should be a non-cached, non-buffered, memory region | 387 | * The buffer should be a non-cached, non-buffered, memory region |
388 | * to allow palette and pixel writes without flushing the cache. | 388 | * to allow palette and pixel writes without flushing the cache. |
389 | */ | 389 | */ |
390 | static int __init nuc900fb_map_video_memory(struct fb_info *info) | 390 | static int __devinit nuc900fb_map_video_memory(struct fb_info *info) |
391 | { | 391 | { |
392 | struct nuc900fb_info *fbi = info->par; | 392 | struct nuc900fb_info *fbi = info->par; |
393 | dma_addr_t map_dma; | 393 | dma_addr_t map_dma; |