x86/boot changes for v4.1

GIT PULL Ingo Molnar 1 participant 1 message Apr 13, 2015

Subsystems (2)

x86 Svga handling

lore

Share & tools

lore

Ingo Molnar

author

2015-04-13 07:55 UTC #0 lore raw

Linus,

Please pull the latest x86-boot-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-boot-for-linus

# HEAD: 1c1d046be692493d00a4831d4fbc266745008e09 x86/boot: Standardize strcmp()

A number of cleanups.

Thanks,

Ingo

------------------>
Alexander Kuleshov (2):
x86/boot/video: Move the 'video_segment' variable to video.c x86/boot/64: Remove pointless early_printk() message

Arjun Sreedharan (1):
x86/boot: Standardize strcmp()

 arch/x86/boot/string.c     | 2 +-
 arch/x86/boot/video-mode.c | 4 +---
 arch/x86/boot/video.c      | 2 ++
 arch/x86/boot/video.h      | 1 -
 arch/x86/kernel/head64.c   | 3 ---
 5 files changed, 4 insertions(+), 8 deletions(-)

arch/x86/boot/string.c +1 -1

index 493f3fd9f139..318b8465d302 100644
@@ -30,7 +30,7 @@ int strcmp(const char *str1, const char *str2)
 	int delta = 0;
 
 	while (*s1 || *s2) {
-		delta = *s2 - *s1;
+		delta = *s1 - *s2;
 		if (delta)
 			return delta;
 		s1++;

arch/x86/boot/video-mode.c +1 -3

index 748e8d06290a..aa8a96b052e3 100644
@@ -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 */

arch/x86/boot/video.c +2 -0

index 43eda284d27f..05111bb8d018 100644
@@ -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

index 0bb25491262d..b54e0328c449 100644
@@ -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 */

arch/x86/kernel/head64.c +0 -3

index eda1a865641e..8c58135b0fa4 100644
@@ -172,9 +172,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
 	 */
 	load_ucode_bsp();
 
-	if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
-		early_printk("Kernel alive\n");
-
 	clear_page(init_level4_pgt);
 	/* set init_level4_pgt kernel high mapping*/
 	init_level4_pgt[511] = early_level4_pgt[511];