[DRBD-cvs] r1499 - trunk/drbd

svn at svn.drbd.org svn at svn.drbd.org
Tue Aug 24 00:37:02 CEST 2004


Author: lars
Date: 2004-08-24 00:36:57 +0200 (Tue, 24 Aug 2004)
New Revision: 1499

Modified:
   trunk/drbd/drbd_main.c
   trunk/drbd/drbd_receiver.c
   trunk/drbd/drbd_worker.c
Log:
HAVE_MM_INLINE_H is defined in drbd_config.h; so we need to include it first

Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2004-08-23 21:54:58 UTC (rev 1498)
+++ trunk/drbd/drbd_main.c	2004-08-23 22:36:57 UTC (rev 1499)
@@ -46,7 +46,8 @@
 #include <linux/proc_fs.h>
 #include <linux/init.h>
 #include <linux/mm.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) || defined(HAVE_MM_INLINE_H)
+#include <linux/drbd_config.h>
+#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-23 21:54:58 UTC (rev 1498)
+++ trunk/drbd/drbd_receiver.c	2004-08-23 22:36:57 UTC (rev 1499)
@@ -39,7 +39,8 @@
 #include <linux/fs.h>
 #include <linux/file.h>
 #include <linux/mm.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) || defined(HAVE_MM_INLINE_H)
+#include <linux/drbd_config.h>
+#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-23 21:54:58 UTC (rev 1498)
+++ trunk/drbd/drbd_worker.c	2004-08-23 22:36:57 UTC (rev 1499)
@@ -33,7 +33,8 @@
 #include <linux/smp_lock.h>
 #include <linux/wait.h>
 #include <linux/mm.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) || defined(HAVE_MM_INLINE_H)
+#include <linux/drbd_config.h>
+#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>



More information about the drbd-cvs mailing list