File virtualbox-counters.patch of Package virtualbox-ose

Overview Repositories Revisions Requests Users Attributes Meta

File virtualbox-counters.patch of Package virtualbox-ose

--- a/trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+++ b/trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
@@ -488,10 +488,12 @@
             if ((GET_APIC_DELIVERY_MODE(v) == APIC_MODE_NMI) && !(v & APIC_LVT_MASKED))
             {
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) && defined(CONFIG_PERF_COUNTERS)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) \
+     && (defined(CONFIG_PERF_COUNTERS) || defined(CONFIG_PERF_EVENTS))
                 /* 2.6.31+: The performance counter framework will initialize the LVTPC
                  * vector as NMI. We can't disable the framework but the kernel loader
                  * script will do 'echo 2 > /proc/sys/kernel/perf_counter_paranoid'
                  * which hopefilly prevents any usage of hardware performance counters
-                 * and therefore triggering of NMIs. */
+                 * and therefore triggering of NMIs.
+                 * 2.6.32+: CONFIG_PERF_COUNTERS => CONFIG_PERF_EVENTS */
                 printk(KERN_ERR DEVICE_NAME
                        ": Warning: 2.6.31+ kernel detected. Most likely the hardware performance\n" 
--- a/trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+++ b/trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
@@ -529,5 +529,6 @@
 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
     printk(KERN_DEBUG DEVICE_NAME ": Successfully done.\n");
-#  if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) && defined(CONFIG_PERF_COUNTERS)
+#  if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) \
+      && (defined(CONFIG_PERF_COUNTERS) || defined(CONFIG_PERF_EVENTS))
 no_error:
 #  endif

Places

File virtualbox-counters.patch of Package virtualbox-ose

Places