SUPDrv-linux.c

Timestamp:

Dec 14, 2009 3:54:04 PM (15 years ago)

Author:

vboxsync

Message:

Linux support driver: adapted the CONFIG_PERF_* heuristics to 2.6.32 (CONFIG_PERF_COUNTERS was renamed to CONFIG_PERF_EVENTS)

File:

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

-              r25278
+              r25365
             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"

Note: See TracChangeset for help on using the changeset viewer.