[PATCH] annotate some variables in vesafb driver as __read_mostly (4670358a) · Commits · 戴 / test

drivers/video/vesafb.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -47,17 +47,16 @@ static struct fb_fix_screeninfo vesafb_fix __initdata = {
		.accel = FB_ACCEL_NONE,
		};

		static int inverse = 0;
		static int mtrr = 0; /* disable mtrr */
		static int vram_remap __initdata = 0; /* Set amount of memory to be used */
		static int vram_total __initdata = 0; /* Set total amount of memory */
		static int pmi_setpal = 1; /* pmi for palette changes ??? */
		static int ypan = 0; /* 0..nothing, 1..ypan, 2..ywrap */
		static unsigned short *pmi_base = NULL;
		static void (*pmi_start)(void);
		static void (*pmi_pal)(void);
		static int depth;
		static int vga_compat;
		static int inverse __read_mostly;
		static int mtrr __read_mostly; /* disable mtrr */
		static int vram_remap __initdata; /* Set amount of memory to be used */
		static int vram_total __initdata; /* Set total amount of memory */
		static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
		static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
		static void (*pmi_start)(void) __read_mostly;
		static void (*pmi_pal) (void) __read_mostly;
		static int depth __read_mostly;
		static int vga_compat __read_mostly;
		/* --------------------------------------------------------------------- */

		static int vesafb_pan_display(struct fb_var_screeninfo *var,
		@@ -312,6 +311,7 @@ static int __init vesafb_probe(struct platform_device *dev)
		ypan = pmi_setpal = 0; /* not available or some DOS TSR ... */

		if (ypan \|\| pmi_setpal) {
		unsigned short *pmi_base;
		pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
		pmi_start = (void)((char)pmi_base + pmi_base[1]);
		pmi_pal = (void)((char)pmi_base + pmi_base[2]);

Admin message