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

Merge tag 'v3.8-rc5' into x86/mm

Browse Source 
The __pa() fixup series that follows touches KVM code that is not
present in the existing branch based on v3.7-rc5, so merge in the
current upstream from Linus.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
H. Peter Anvin
2013-01-25 16:31:21 -08:00
parent 3596f5bb0a 949db153b6
commit 7b5c4a65cc
11302 changed files with 526680 additions and 300901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1413,7 +1413,7 @@ __init void lguest_init(void)
/* We don't have features. We have puppies! Puppies! */
#ifdef CONFIG_X86_MCE
mce_disabled = 1;
mca_cfg.disabled = true;
#endif
#ifdef CONFIG_ACPI
acpi_disabled = 1;