Changeset 136 in vbox for trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

Timestamp:

Jan 18, 2007 2:42:26 PM (18 years ago)

Author:

vboxsync

Message:

Fixed the-linux-kernel.h for kernels 2.4.28 to 2.4.34

File:

• trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h (modified) (1 diff)

trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

@@ -108 +108 @@
 # endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 29) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+
 DECLINLINE(unsigned int) jiffies_to_msecs(unsigned long cJiffies)
 {
-# if HZ <= 1000 && !(1000 % HZ)
+#  if HZ <= 1000 && !(1000 % HZ)
     return (1000 / HZ) * cJiffies;
-# elif HZ > 1000 && !(HZ % 1000)
+#  elif HZ > 1000 && !(HZ % 1000)
     return (cJiffies + (HZ / 1000) - 1) / (HZ / 1000);
-# else
+#  else
     return (j * 1000) / HZ;
-# endif
+#  endif
 }
 
 DECLINLINE(unsigned long) msecs_to_jiffies(unsigned int cMillies)
 {
-# if HZ > 1000
+#  if HZ > 1000
     if (cMillies > jiffies_to_msecs(MAX_JIFFY_OFFSET))
         return MAX_JIFFY_OFFSET;
-# endif
-# if HZ <= 1000 && !(1000 % HZ)
+#  endif
+#  if HZ <= 1000 && !(1000 % HZ)
     return (cMillies + (1000 / HZ) - 1) / (1000 / HZ);
-# elif HZ > 1000 && !(HZ % 1000)
+#  elif HZ > 1000 && !(HZ % 1000)
     return cMillies * (HZ / 1000);
-# else
+#  else
     return (cMillies * HZ + 999) / 1000;
-# endif
+#  endif
 }
+
+# endif  /* < 2.4.29 || >= 2.6.0 */
 
 # define prepare_to_wait(q, wait, state) \