Skip to content

Commit

Permalink
x86/boot/video: Move the 'video_segment' variable to video.c
Browse files Browse the repository at this point in the history
video.c is the only real user of the 'video_segment' variable,
so move it to video.c and make it static.

Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Martin Mares <mj@ucw.cz>
Link: http://lkml.kernel.org/r/1422123092-28750-1-git-send-email-kuleshovmail@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
0xAX authored and Ingo Molnar committed Feb 18, 2015
1 parent e07e0d4 commit 79287cf
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
4 changes: 1 addition & 3 deletions arch/x86/boot/video-mode.c
Expand Up @@ -22,10 +22,8 @@
/*
* Common variables
*/
int adapter; /* 0=CGA/MDA/HGC, 1=EGA, 2=VGA+ */
u16 video_segment;
int adapter; /* 0=CGA/MDA/HGC, 1=EGA, 2=VGA+ */
int force_x, force_y; /* Don't query the BIOS for cols/rows */

int do_restore; /* Screen contents changed during mode flip */
int graphic_mode; /* Graphic mode with linear frame buffer */

Expand Down
2 changes: 2 additions & 0 deletions arch/x86/boot/video.c
Expand Up @@ -17,6 +17,8 @@
#include "video.h"
#include "vesa.h"

static u16 video_segment;

static void store_cursor_position(void)
{
struct biosregs ireg, oreg;
Expand Down
1 change: 0 additions & 1 deletion arch/x86/boot/video.h
Expand Up @@ -91,7 +91,6 @@ int mode_defined(u16 mode); /* video.c */
#define ADAPTER_VGA 2

extern int adapter;
extern u16 video_segment;
extern int force_x, force_y; /* Don't query the BIOS for cols/rows */
extern int do_restore; /* Restore screen contents */
extern int graphic_mode; /* Graphics mode with linear frame buffer */
Expand Down

0 comments on commit 79287cf

Please sign in to comment.