android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds 2015-04-13 13:19:10 -07:00
commit 8f74bc5ff0
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/boot/string.c
View File

@ -30,7 +30,7 @@ int strcmp(const char *str1, const char *str2)
int delta = 0; int delta = 0;
while (*s1 || *s2) { while (*s1 || *s2) {
delta = *s2 - *s1; delta = *s1 - *s2;
if (delta) if (delta)
return delta; return delta;
s1++; s1++;

4
arch/x86/boot/video-mode.c
View File

@ -22,10 +22,8 @@
/* /*
* Common variables * Common variables
*/ */
int adapter; /* 0=CGA/MDA/HGC, 1=EGA, 2=VGA+ */ 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 force_x, force_y; /* Don't query the BIOS for cols/rows */
int do_restore; /* Screen contents changed during mode flip */ int do_restore; /* Screen contents changed during mode flip */
int graphic_mode; /* Graphic mode with linear frame buffer */ int graphic_mode; /* Graphic mode with linear frame buffer */

2
arch/x86/boot/video.c
View File

@ -17,6 +17,8 @@
#include "video.h" #include "video.h"
#include "vesa.h" #include "vesa.h"
static u16 video_segment;
static void store_cursor_position(void) static void store_cursor_position(void)
{ {
struct biosregs ireg, oreg; struct biosregs ireg, oreg;

1
arch/x86/boot/video.h
View File

@ -91,7 +91,6 @@ int mode_defined(u16 mode); /* video.c */
#define ADAPTER_VGA 2 #define ADAPTER_VGA 2
extern int adapter; extern int adapter;
extern u16 video_segment;
extern int force_x, force_y; /* Don't query the BIOS for cols/rows */ extern int force_x, force_y; /* Don't query the BIOS for cols/rows */
extern int do_restore; /* Restore screen contents */ extern int do_restore; /* Restore screen contents */
extern int graphic_mode; /* Graphics mode with linear frame buffer */ extern int graphic_mode; /* Graphics mode with linear frame buffer */

3
arch/x86/kernel/head64.c
View File

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