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

Commit 79287cf8 authored by Alexander Kuleshov's avatar Alexander Kuleshov Committed by Ingo Molnar
Browse files

x86/boot/video: Move the 'video_segment' variable to video.c 



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: default avatarAlexander 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: default avatarIngo Molnar <mingo@kernel.org>
parent e07e0d4c

arch/x86/boot/video-mode.c

+1 −3
Original line number Diff line number Diff line
@@ -23,9 +23,7 @@ 
 * Common variables

 */

int adapter;		/* 0=CGA/MDA/HGC, 1=EGA, 2=VGA+ */

u16 video_segment;

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 */

arch/x86/boot/video.c

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include "video.h"

#include "vesa.h"



static u16 video_segment;



static void store_cursor_position(void)

{

	struct biosregs ireg, oreg;

arch/x86/boot/video.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */