Fix build alsa-driver with recent changes in intel8x0 (improved virtualization detection).
"#ifdef X86_FEATURE_HYPERVISOR" check now placed in main code, no additional patching required.
Signed-off-by: Konstantin Ozerkov kozerkov@parallels.com Signed-off-by: Denis V. Lunev den@openvz.org
diff --git a/pci/intel8x0.patch b/pci/intel8x0.patch index 3b4b16f..6b3ce6c 100644 --- a/pci/intel8x0.patch +++ b/pci/intel8x0.patch @@ -43,17 +43,6 @@ } #else #define fill_nocache(buf, size, nocache) do { ; } while (0) -@@ -3247,8 +3258,10 @@ - /* detect KVM and Parallels virtual environments */ - inside_vm = kvm_para_available(); - #if defined(__i386__) || defined(__x86_64__) -+#ifdef X86_FEATURE_HYPERVISOR - inside_vm = inside_vm || boot_cpu_has(X86_FEATURE_HYPERVISOR); - #endif -+#endif - } - - if ((err = snd_intel8x0_create(card, pci, pci_id->driver_data, @@ -3320,3 +3333,5 @@
module_init(alsa_card_intel8x0_init)