Commit 8f74bc5f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 boot changes from Ingo Molnar:
 "A number of cleanups"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot: Standardize strcmp()
  x86/boot/64: Remove pointless early_printk() message
  x86/boot/video: Move the 'video_segment' variable to video.c
parents 60f898ee 1c1d046b

arch/x86/boot/string.c

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

arch/x86/kernel/head64.c

+0 −3
Original line number Diff line number Diff line
@@ -177,9 +177,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];

CRA Git | Maintained and supported by SUSTech CRA and CCSE