[DRBD-cvs] r1498 - in trunk/drbd: . linux

svn at svn.drbd.org svn at svn.drbd.org
Mon Aug 23 23:55:04 CEST 2004


Author: lars
Date: 2004-08-23 23:54:58 +0200 (Mon, 23 Aug 2004)
New Revision: 1498

Modified:
   trunk/drbd/drbd_main.c
   trunk/drbd/drbd_receiver.c
   trunk/drbd/drbd_worker.c
   trunk/drbd/linux/drbd_config.h
Log:
some redhat 2.4.flavours DO have mm_inline.h :-/

Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2004-08-22 11:50:48 UTC (rev 1497)
+++ trunk/drbd/drbd_main.c	2004-08-23 21:54:58 UTC (rev 1498)
@@ -46,7 +46,7 @@
 #include <linux/proc_fs.h>
 #include <linux/init.h>
 #include <linux/mm.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) || defined(HAVE_MM_INLINE_H)
 #include <linux/mm_inline.h>
 #endif
 #include <linux/slab.h>

Modified: trunk/drbd/drbd_receiver.c
===================================================================
--- trunk/drbd/drbd_receiver.c	2004-08-22 11:50:48 UTC (rev 1497)
+++ trunk/drbd/drbd_receiver.c	2004-08-23 21:54:58 UTC (rev 1498)
@@ -39,7 +39,7 @@
 #include <linux/fs.h>
 #include <linux/file.h>
 #include <linux/mm.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) || defined(HAVE_MM_INLINE_H)
 #include <linux/mm_inline.h>
 #endif
 #include <linux/slab.h>

Modified: trunk/drbd/drbd_worker.c
===================================================================
--- trunk/drbd/drbd_worker.c	2004-08-22 11:50:48 UTC (rev 1497)
+++ trunk/drbd/drbd_worker.c	2004-08-23 21:54:58 UTC (rev 1498)
@@ -33,7 +33,7 @@
 #include <linux/smp_lock.h>
 #include <linux/wait.h>
 #include <linux/mm.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) || defined(HAVE_MM_INLINE_H)
 #include <linux/mm_inline.h> // for the page_count macro on RH/Fedora
 #endif
 #include <linux/slab.h>

Modified: trunk/drbd/linux/drbd_config.h
===================================================================
--- trunk/drbd/linux/drbd_config.h	2004-08-22 11:50:48 UTC (rev 1497)
+++ trunk/drbd/linux/drbd_config.h	2004-08-23 21:54:58 UTC (rev 1498)
@@ -44,6 +44,12 @@
  * anyways...
  */
 //#define REDHAT_2_4_18
+/* some redhat 2.4.X-Y.Z.whatever kernel flavours have an mm_inline.h,
+ * which needs to be included explicitly. most 2.4.x kernels don't have that
+ * header file at all. So uncomment for these, and ignore for all others.
+ * in 2.6., it will be included anyways.
+ */
+//#define HAVE_MM_INLINE_H
 
 //Your 2.4 verndor kernel already defines find_next_bit()
 //#define HAVE_FIND_NEXT_BIT



More information about the drbd-cvs mailing list