[DRBD-cvs] drbd by lars; override CFLAGS needed for 2.4.x kbuild

drbd-user@lists.linbit.com drbd-user@lists.linbit.com
Thu, 1 Apr 2004 08:47:43 +0200 (CEST)


DRBD CVS committal

Author  : lars
Module  : drbd

Dir     : drbd/drbd


Modified Files:
      Tag: rel-0_7-branch
	Makefile drbd_proc.c 


Log Message:
override CFLAGS needed for 2.4.x kbuild
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Makefile,v
retrieving revision 1.14.2.22
retrieving revision 1.14.2.23
diff -u -3 -r1.14.2.22 -r1.14.2.23
--- Makefile	24 Mar 2004 13:14:06 -0000	1.14.2.22
+++ Makefile	1 Apr 2004 06:47:38 -0000	1.14.2.23
@@ -32,7 +32,8 @@
     $(error "won't compile with this kernel version")
   endif
 
-  CFLAGS    += -I$(DRBDSRC)
+  # override needed for 2.4.X kbuild
+  override CFLAGS    += -I$(DRBDSRC)
 
   obj-m     += drbd.o
   drbd-objs := drbd_fs.o drbd_main.o drbd_proc.o drbd_dsender.o \
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_proc.c,v
retrieving revision 1.8.2.22
retrieving revision 1.8.2.23
diff -u -3 -r1.8.2.22 -r1.8.2.23
--- drbd_proc.c	24 Mar 2004 13:14:06 -0000	1.8.2.22
+++ drbd_proc.c	1 Apr 2004 06:47:38 -0000	1.8.2.23
@@ -197,7 +197,7 @@
 			   drbd_conf[i].writ_cnt/2,
 			   drbd_conf[i].read_cnt/2,
 			   drbd_conf[i].al_writ_cnt,
- 			   drbd_conf[i].bm_writ_cnt,
+			   drbd_conf[i].bm_writ_cnt,
 			   atomic_read(&drbd_conf[i].local_cnt),
 			   atomic_read(&drbd_conf[i].ap_pending_cnt) +
 			   atomic_read(&drbd_conf[i].rs_pending_cnt),