constify and annotate __read_mostly in vgacon.c and fbmem.c
Subsystems (2)
Helge Deller
maintainerPATCH 3/5 constify and annotate __read_mostly in vgacon.c and fbmem.c
- annotate some variables from vgacon.c and fbmem.c as __read_mostly
- move the mask[] array in fb_set_logo_truepalette() into the .rodata section
- annotate some variables from vgacon.c and fbmem.c as __read_mostly
- move the mask[] array in fb_set_logo_truepalette() into the .rodata section
drivers/video/console/vgacon.c +15 -15
@@ -93,27 +93,27 @@ static void vgacon_invert_region(structstatic unsigned long vgacon_uni_pagedir[2 ];/* Description of the hardware situation */ -static unsigned long vga_vram_base;/* Base of video memory */ -static unsigned long vga_vram_end;/* End of video memory */ -static int vga_vram_size;/* Size of video memory */ -static u16 vga_video_port_reg;/* Video register select port */ -static u16 vga_video_port_val;/* Video register value port */ -static unsigned int vga_video_num_columns;/* Number of text columns */ -static unsigned int vga_video_num_lines;/* Number of text lines */ -static int vga_can_do_color =0 ;/* Do we support colors? */ -static unsigned int vga_default_font_height;/* Height of default screen font */ -static unsigned char vga_video_type;/* Card type */ -static unsigned char vga_hardscroll_enabled; -static unsigned char vga_hardscroll_user_enable =1 ; +static int vga_init_done__read_mostly ; +static unsigned long vga_vram_base__read_mostly ;/* Base of video memory */ +static unsigned long vga_vram_end__read_mostly ;/* End of video memory */ +static unsigned int vga_vram_size__read_mostly ;/* Size of video memory */ +static u16 vga_video_port_reg__read_mostly ;/* Video register select port */ +static u16 vga_video_port_val__read_mostly ;/* Video register value port */ +static unsigned int vga_video_num_columns;/* Number of text columns */ +static unsigned int vga_video_num_lines;/* Number of text lines */ +static int vga_can_do_color__read_mostly ;/* Do we support colors? */ +static unsigned int vga_default_font_height__read_mostly ;/* Height of default screen font */ +static unsigned char vga_video_type__read_mostly ;/* Card type */ +static unsigned char vga_hardscroll_enabled__read_mostly ; +static unsigned char vga_hardscroll_user_enable__read_mostly =1 ;static unsigned char vga_font_is_default =1 ;static int vga_vesa_blanked;static int vga_palette_blanked;static int vga_is_gfx;static int vga_512_chars;static int vga_video_font_height; -static int vga_scan_lines; -static unsigned int vga_rolled_over =0 ; -static int vga_init_done; +static int vga_scan_lines__read_mostly ; +static unsigned int vga_rolled_over;static int __init no_scroll (char *str) {
drivers/video/fbmem.c +7 -7
@@ -52,8 +52,8 @@#define FBPIXMAPSIZE (1024 * 8) -struct fb_info *registered_fb[FB_MAX ]; -int num_registered_fb; +struct fb_info *registered_fb[FB_MAX ]__read_mostly ; +int num_registered_fb__read_mostly ;/* * Helpers
@@ -202,7 +202,7 @@ static void fb_set_logo_truepalette(str const struct linux_logo *logo, u32 *palette) { - unsigned char mask[9] = { 0,0x80,0xc0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff }; +static const unsigned char mask[] = {0 ,0x80 ,0xc0 ,0xe0 ,0xf0 ,0xf8 ,0xfc ,0xfe ,0xff };unsigned char redmask, greenmask, bluemask;int redshift, greenshift, blueshift;int i;
@@ -317,7 +317,7 @@ static struct logo_data {int needs_truepalette;int needs_cmapreset;const struct linux_logo *logo; -} fb_logo; +} fb_logo__read_mostly ;static void fb_rotate_logo_ud (const u8 *in,u8 *out,u32 width,u32 height) {
@@ -1252,7 +1252,7 @@ fb_release(struct inode *inode, struct freturn 0 ; } -static struct file_operations fb_fops = { +static const struct file_operations fb_fops = { .owner =THIS_MODULE , .read = fb_read, .write = fb_write,
@@ -1458,8 +1458,8 @@ int fb_new_modelist(struct fb_info *inforeturn err; } -static char *video_options[FB_MAX ]; -static int ofonly; +static char *video_options[FB_MAX ]__read_mostly ; +static int ofonly__read_mostly ;extern const char *global_mode_option;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Linux-fbdev-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-fbdev-devel