diff options
| author | Helge Deller <deller@gmx.de> | 2006-12-08 11:40:30 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 17:29:06 +0100 |
| commit | 4670358a7b5ac1eeec00c1805213d346253b91f6 (patch) | |
| tree | 721717ae773c57c7e2dd0afeca86efe706005f94 /drivers/video | |
| parent | [PATCH] constify and annotate __read_mostly in vgacon.c and fbmem.c (diff) | |
| download | linux-4670358a7b5ac1eeec00c1805213d346253b91f6.tar.xz linux-4670358a7b5ac1eeec00c1805213d346253b91f6.zip | |
[PATCH] annotate some variables in vesafb driver as __read_mostly
- annotate some variables in vesafb driver as __read_mostly
Signed-off-by: Helge Deller <deller@gmx.de>
Acked-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/vesafb.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c index 638ee3745401..e16322d157d0 100644 --- a/drivers/video/vesafb.c +++ b/drivers/video/vesafb.c @@ -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]); |