From: Jeff Mahoney Date: Thu, 9 Feb 2012 14:57:54 +0000 (-0500) Subject: - Update to 3.3-rc3. X-Git-Url: http://git.alex.org.uk - Update to 3.3-rc3. suse-commit: 07ec27c9bab51d95feb138c227a5a3a8f586a81e --- bd9929c9ea4e8730be2d4139d595050f20c795cf diff --cc Documentation/sysctl/kernel.txt index 0e5ae9d,6d78841..c85756e --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt @@@ -601,18 -601,8 +601,20 @@@ can be ORed together instead of using the one provided by the hardware. 512 - A kernel warning has occurred. 1024 - A module from drivers/staging was loaded. + 2048 - The system is working around a severe firmware bug. + 4096 - An out-of-tree module has been loaded. + 0x40000000 - An unsupported kernel module was loaded. + 0x80000000 - An kernel module with external support was loaded. + +============================================================== + +unsupported: + +Allow to load unsupported kernel modules: + + 0 - refuse to load unsupported modules, + 1 - warn when loading unsupported modules, + 2 - don't warn. ============================================================== diff --cc arch/x86/kvm/x86.c index 1067651,9cbfc06..a391fd6 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@@ -1834,9 -1847,16 +1848,17 @@@ int kvm_get_msr_common(struct kvm_vcpu case MSR_K8_INT_PENDING_MSG: case MSR_AMD64_NB_CFG: case MSR_FAM10H_MMIO_CONF_BASE: + case MSR_NHM_SNB_PKG_CST_CFG_CTL: /* 0xe2 */ data = 0; break; + case MSR_P6_PERFCTR0: + case MSR_P6_PERFCTR1: + case MSR_P6_EVNTSEL0: + case MSR_P6_EVNTSEL1: + if (kvm_pmu_msr(vcpu, msr)) + return kvm_pmu_get_msr(vcpu, msr, pdata); + data = 0; + break; case MSR_IA32_UCODE_REV: data = 0x100000000ULL; break;