[DRBD-cvs] svn commit by lars - r2599 - in trunk/drbd: . linux - include drbd_config.h, so connector.h knows about KERNE

[drbd-cvs at lists.linbit.com]

Author: lars
Date: 2006-11-16 11:41:20 +0100 (Thu, 16 Nov 2006)
New Revision: 2599

Modified:
   trunk/drbd/connector.c
   trunk/drbd/linux/connector.h
Log:
include drbd_config.h, so connector.h knows about KERNEL_HAS_GFP_T
recognize whether "our" in-drbd-tree connector.c is built against
the in-kernel-tree connector.h, and error out in that case.
they are most likely incompatible.


Modified: trunk/drbd/connector.c
===================================================================
--- trunk/drbd/connector.c	2006-11-16 10:34:43 UTC (rev 2598)
+++ trunk/drbd/connector.c	2006-11-16 10:41:20 UTC (rev 2599)
@@ -29,6 +29,11 @@
 #include <linux/moduleparam.h>
 #include <linux/connector.h>
 
+#ifndef DRBD_CONNECTOR_BACKPORT_HEADER
+#error "drbd backported connector.c compiled against kernel connector.h will not work"
+#error "enable CONFIG_CONNECTOR in your kernel and try again"
+#endif
+
 #include <net/sock.h>
 
 #ifdef NETLINK_ROUTE6

Modified: trunk/drbd/linux/connector.h
===================================================================
--- trunk/drbd/linux/connector.h	2006-11-16 10:34:43 UTC (rev 2598)
+++ trunk/drbd/linux/connector.h	2006-11-16 10:41:20 UTC (rev 2599)
@@ -23,6 +23,7 @@
 
 #ifndef __CONNECTOR_H
 #define __CONNECTOR_H
+#define DRBD_CONNECTOR_BACKPORT_HEADER
 
 #include <asm/types.h>
 
@@ -93,6 +94,7 @@
 };
 
 #ifdef __KERNEL__
+#include <linux/drbd_config.h>
 
 #if defined(NETLINK_ROUTE6) && !defined(KERNEL_HAS_GFP_T)
    /* pre 2.6.16 */