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

[tip-bot for Alexander Kuleshov]

Commit-ID:  79287cf8778df21e5ad6c3ac01615e02cf9dbae6
Gitweb:     http://git.kernel.org/tip/79287cf8778df21e5ad6c3ac01615e02cf9dbae6
Author:     Alexander Kuleshov <kuleshovmail@xxxxxxxxx>
AuthorDate: Sun, 25 Jan 2015 00:11:32 +0600
Committer:  Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Thu, 19 Feb 2015 00:25:05 +0100

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: Alexander Kuleshov <kuleshovmail@xxxxxxxxx>
Cc: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Martin Mares <mj@xxxxxx>
Link: http://lkml.kernel.org/r/1422123092-28750-1-git-send-email-kuleshovmail@xxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
 arch/x86/boot/video-mode.c | 4 +---
 arch/x86/boot/video.c      | 2 ++
 arch/x86/boot/video.h      | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/x86/boot/video-mode.c b/arch/x86/boot/video-mode.c
index 748e8d0..aa8a96b 100644
--- a/arch/x86/boot/video-mode.c
+++ b/arch/x86/boot/video-mode.c
@@ -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 */
 
diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
index 43eda28..05111bb 100644
--- a/arch/x86/boot/video.c
+++ b/arch/x86/boot/video.c
@@ -17,6 +17,8 @@
 #include "video.h"
 #include "vesa.h"
 
+static u16 video_segment;
+
 static void store_cursor_position(void)
 {
 	struct biosregs ireg, oreg;
diff --git a/arch/x86/boot/video.h b/arch/x86/boot/video.h
index 0bb2549..b54e032 100644
--- a/arch/x86/boot/video.h
+++ b/arch/x86/boot/video.h
@@ -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 */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/