Index: /trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c	(revision 15992)
+++ /trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c	(revision 15993)
@@ -300,5 +300,5 @@
 # ifdef DO_DISABLE_NMI
 /** Stop AMD NMI watchdog (x86_64 only). */
-static int StopK7Watchdog(void)
+static int vboxdrvStopK7Watchdog(void)
 {
     wrmsr(MSR_K7_EVNTSEL0, 0, 0);
@@ -307,5 +307,5 @@
 
 /** Stop Intel P4 NMI watchdog (x86_64 only). */
-static int StopP4Watchdog(void)
+static int vboxdrvStopP4Watchdog(void)
 {
     wrmsr(MSR_P4_IQ_CCCR0,  0, 0);
@@ -316,5 +316,5 @@
 
 /** The new method of detecting the event counter */
-static int StopIntelArchWatchdog(void)
+static int vboxdrvStopIntelArchWatchdog(void)
 {
     unsigned ebx;
@@ -327,5 +327,5 @@
 
 /** Stop NMI watchdog. */
-static void VBoxStopApicNmiWatchdog(void *unused)
+static void vboxdrvStopApicNmiWatchdog(void *unused)
 {
     int stopped = 0;
@@ -343,13 +343,13 @@
             if (strstr(boot_cpu_data.x86_model_id, "Screwdriver"))
                return;
-            stopped = StopK7Watchdog();
+            stopped = vboxdrvStopK7Watchdog();
             break;
         case X86_VENDOR_INTEL:
             if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON))
             {
-                stopped = StopIntelArchWatchdog();
+                stopped = vboxdrvStopIntelArchWatchdog();
                 break;
             }
-            stopped = StopP4Watchdog();
+            stopped = vboxdrvStopP4Watchdog();
             break;
         default:
@@ -370,5 +370,5 @@
         return;
 
-    on_each_cpu(VBoxStopApicNmiWatchdog, NULL, 1, 1);
+    on_each_cpu(vboxdrvStopApicNmiWatchdog, NULL, 1, 1);
 
     BUG_ON(nmi_atomic_read(&nmi_active) != 0);