- Update to 3.3-rc3.
authorJeff Mahoney <jeffm@suse.com>
Thu, 9 Feb 2012 14:57:54 +0000 (09:57 -0500)
committerJeff Mahoney <jeffm@suse.com>
Thu, 9 Feb 2012 14:57:54 +0000 (09:57 -0500)
suse-commit: 07ec27c9bab51d95feb138c227a5a3a8f586a81e

1  2 
Documentation/sysctl/kernel.txt
Makefile
arch/x86/kernel/dumpstack.c
arch/x86/kernel/dumpstack_64.c
arch/x86/kernel/reboot.c
arch/x86/kvm/x86.c
drivers/input/serio/i8042-x86ia64io.h
drivers/video/omap2/dss/venc.c

@@@ -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 Makefile
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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;
Simple merge
Simple merge