xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates

Browse Source 
Conflicts:
	arch/x86/xen/setup.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2017-03-01 09:02:26 +01:00
parent e22af0be2c 2d6be4abf5
commit 0871d5a66d
10951 changed files with 457964 additions and 203995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/include/uapi/asm/bootparam.h
View File

@@ -149,7 +149,8 @@ struct boot_params {
__u8 eddbuf_entries; /* 0x1e9 */
__u8 edd_mbr_sig_buf_entries; /* 0x1ea */
__u8 kbd_status; /* 0x1eb */
__u8 _pad5[3]; /* 0x1ec */
__u8 secure_boot; /* 0x1ec */
__u8 _pad5[2]; /* 0x1ed */
/*
* The sentinel is set to a nonzero value (0xff) in header.S.
*