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

Commit 3cb340ec authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] vt: proper prototypes for some console functions 



This patch adds proper prototypes to header files for three console init
functions used on drivers/char/vt.c

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 48afdf6e

drivers/char/vt.c

+0 −8
Original line number Diff line number Diff line
@@ -139,14 +139,6 @@ const struct consw *conswitchp; 
extern void vcs_make_sysfs(struct tty_struct *tty);

extern void vcs_remove_sysfs(struct tty_struct *tty);



extern void console_map_init(void);

#ifdef CONFIG_PROM_CONSOLE

extern void prom_con_init(void);

#endif

#ifdef CONFIG_MDA_CONSOLE

extern int mda_console_init(void);

#endif



struct vc vc_cons [MAX_NR_CONSOLES];



#ifndef VT_SINGLE_DRIVER

include/linux/console.h

+3 −0
Original line number Diff line number Diff line
@@ -129,6 +129,9 @@ static inline void suspend_console(void) {} 
static inline void resume_console(void) {}

#endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */



int mda_console_init(void);

void prom_con_init(void);



/* Some debug stub to catch some of the obvious races in the VT code */

#if 1

#define WARN_CONSOLE_UNLOCKED()	WARN_ON(!is_console_locked() && !oops_in_progress)

include/linux/consolemap.h

+1 −0
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ struct vc_data; 
extern unsigned char inverse_translate(struct vc_data *conp, int glyph);

extern unsigned short *set_translate(int m, struct vc_data *vc);

extern int conv_uni_to_pc(struct vc_data *conp, long ucs);

void console_map_init(void);