Commit 27b526a0 authored Jan 14, 2008 by Randy Dunlap Committed by Linus Torvalds Jan 14, 2008

uvesafb: fix section mismatch warnings

Mark uvesafb_init_mtrr() as __devinit since its caller is __devinit
and since it accesses __devinitdata.

WARNING: vmlinux.o(.text+0x4df80e): Section mismatch: reference to .init.data: (between 'uvesafb_init_mtrr' and 'uvesafb_show_vbe_ver')

Variable 'blank' cannot be __devinitdata since it is referenced in an
fb_ops method that could be called at any time.

WARNING: vmlinux.o(.text+0x4dfc1e): Section mismatch: reference to .init.data:blank (between 'param_set_scroll' and 'vesa_setpalette')
WARNING: vmlinux.o(.text+0x4dfc24): Section mismatch: reference to .init.data:blank (between 'param_set_scroll' and 'vesa_setpalette')

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent d2d159db

drivers/video/uvesafb.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ static struct fb_fix_screeninfo uvesafb_fix __devinitdata = {
		};

		static int mtrr __devinitdata = 3; /* enable mtrr by default */
		static int blank __devinitdata = 1; /* enable blanking by default */
		static int blank = 1; /* enable blanking by default */
		static int ypan __devinitdata = 1; /* 0: scroll, 1: ypan, 2: ywrap */
		static int pmi_setpal __devinitdata = 1; /* use PMI for palette changes */
		static int nocrtc __devinitdata; /* ignore CRTC settings */
		@@ -1549,7 +1549,7 @@ static void __devinit uvesafb_init_info(struct fb_info *info,
		info->fbops->fb_pan_display = NULL;
		}

		static void uvesafb_init_mtrr(struct fb_info *info)
		static void __devinit uvesafb_init_mtrr(struct fb_info *info)
		{
		#ifdef CONFIG_MTRR
		if (mtrr && !(info->fix.smem_start & (PAGE_SIZE - 1))) {