Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f4516db authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

[PATCH] fbcon: constify font data 



const-ify the font control structures and data, to make somewhat better
guarantees that these are not modified anywhere in the kernel.
Specifically for a kernel debugger to share this information from the
normal kernel code, such a guarantee seems rather desirable.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Cc: "Antonino A. Daplas" <adaplas@hotpop.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e703ecc3

drivers/video/console/fbcon.c

+8 −8
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ static const char *fbcon_startup(void) 
	const char *display_desc = "frame buffer device";

	struct display *p = &fb_display[fg_console];

	struct vc_data *vc = vc_cons[fg_console].d;

	struct font_desc *font = NULL;

	const struct font_desc *font = NULL;

	struct module *owner;

	struct fb_info *info = NULL;

	struct fbcon_ops *ops;
@@ -841,7 +841,7 @@ static const char *fbcon_startup(void) 
						info->var.yres);

		vc->vc_font.width = font->width;

		vc->vc_font.height = font->height;

		vc->vc_font.data = p->fontdata = font->data;

		vc->vc_font.data = (void *)(p->fontdata = font->data);

		vc->vc_font.charcount = 256; /* FIXME  Need to support more fonts */

	}
@@ -941,7 +941,7 @@ static void fbcon_init(struct vc_data *vc, int init) 
	   fb, copy the font from that console */

	t = &fb_display[svc->vc_num];

	if (!vc->vc_font.data) {

		vc->vc_font.data = p->fontdata = t->fontdata;

		vc->vc_font.data = (void *)(p->fontdata = t->fontdata);

		vc->vc_font.width = (*default_mode)->vc_font.width;

		vc->vc_font.height = (*default_mode)->vc_font.height;

		p->userfont = t->userfont;
@@ -1188,7 +1188,7 @@ static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var, 
		return;

	t = &fb_display[svc->vc_num];

	if (!vc->vc_font.data) {

		vc->vc_font.data = p->fontdata = t->fontdata;

		vc->vc_font.data = (void *)(p->fontdata = t->fontdata);

		vc->vc_font.width = (*default_mode)->vc_font.width;

		vc->vc_font.height = (*default_mode)->vc_font.height;

		p->userfont = t->userfont;
@@ -2150,7 +2150,7 @@ static int fbcon_get_font(struct vc_data *vc, struct console_font *font) 
}



static int fbcon_do_set_font(struct vc_data *vc, int w, int h,

			     u8 * data, int userfont)

			     const u8 * data, int userfont)

{

	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];

	struct display *p = &fb_display[vc->vc_num];
@@ -2168,7 +2168,7 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, 
		cnt = FNTCHARCNT(data);

	else

		cnt = 256;

	vc->vc_font.data = p->fontdata = data;

	vc->vc_font.data = (void *)(p->fontdata = data);

	if ((p->userfont = userfont))

		REFCOUNT(data)++;

	vc->vc_font.width = w;
@@ -2325,7 +2325,7 @@ static int fbcon_set_font(struct vc_data *vc, struct console_font *font, unsigne 
		    tmp->vc_font.width == w &&

		    !memcmp(fb_display[i].fontdata, new_data, size)) {

			kfree(new_data - FONT_EXTRA_WORDS * sizeof(int));

			new_data = fb_display[i].fontdata;

			new_data = (u8 *)fb_display[i].fontdata;

			break;

		}

	}
@@ -2335,7 +2335,7 @@ static int fbcon_set_font(struct vc_data *vc, struct console_font *font, unsigne 
static int fbcon_set_def_font(struct vc_data *vc, struct console_font *font, char *name)

{

	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];

	struct font_desc *f;

	const struct font_desc *f;



	if (!name)

		f = get_default_font(info->var.xres, info->var.yres);

drivers/video/console/fbcon.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct display { 
    /* Filled in by the frame buffer device */

    u_short inverse;                /* != 0 text black on white as default */

    /* Filled in by the low-level console driver */

    u_char *fontdata;

    const u_char *fontdata;

    int userfont;                   /* != 0 if fontdata kmalloc()ed */

    u_short scrollmode;             /* Scroll Method */

    short yscroll;                  /* Hardware scrolling */

drivers/video/console/font_10x18.c

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


#define FONTDATAMAX 9216



static unsigned char fontdata_10x18[FONTDATAMAX] = {

static const unsigned char fontdata_10x18[FONTDATAMAX] = {



	/* 0 0x00 '^@' */

	0x00, 0x00, /* 0000000000 */
@@ -5132,7 +5132,7 @@ static unsigned char fontdata_10x18[FONTDATAMAX] = { 
};





struct font_desc font_10x18 = {

const struct font_desc font_10x18 = {

	FONT10x18_IDX,

	"10x18",

	10,

drivers/video/console/font_6x11.c

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#define FONTDATAMAX (11*256)



static unsigned char fontdata_6x11[FONTDATAMAX] = {

static const unsigned char fontdata_6x11[FONTDATAMAX] = {



	/* 0 0x00 '^@' */

	0x00, /* 00000000 */
@@ -3341,7 +3341,7 @@ static unsigned char fontdata_6x11[FONTDATAMAX] = { 
};





struct font_desc font_vga_6x11 = {

const struct font_desc font_vga_6x11 = {

	VGA6x11_IDX,

	"ProFont6x11",

	6,

drivers/video/console/font_7x14.c

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


#define FONTDATAMAX 3584



static unsigned char fontdata_7x14[FONTDATAMAX] = {

static const unsigned char fontdata_7x14[FONTDATAMAX] = {



	/* 0 0x00 '^@' */

	0x00, /* 0000000 */
@@ -4108,7 +4108,7 @@ static unsigned char fontdata_7x14[FONTDATAMAX] = { 
};





struct font_desc font_7x14 = {

const struct font_desc font_7x14 = {

	FONT7x14_IDX,

	"7x14",

	7,