[DRBD-cvs] svn commit by lars - r2107 - in branches/drbd-0.7: . drbd drbd/linux - * make rpm no longer builds source packages

[drbd-cvs at lists.linbit.com]

* uml to_vi
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: lars
Date: 2006-03-08 13:14:01 +0100 (Wed, 08 Mar 2006)
New Revision: 2107

Modified:
   branches/drbd-0.7/Makefile
   branches/drbd-0.7/drbd/drbd_receiver.c
   branches/drbd-0.7/drbd/linux/drbd_config.h
Log:
* make rpm no longer builds source packages
* uml to_virt finnally is available


Modified: branches/drbd-0.7/Makefile
===================================================================
--- branches/drbd-0.7/Makefile	2006-03-08 11:13:37 UTC (rev 2106)
+++ branches/drbd-0.7/Makefile	2006-03-08 12:14:01 UTC (rev 2107)
@@ -188,7 +188,7 @@
 	       -e "s/^\(Packager:\).*/\1 $(USER)@$(HOSTNAME)/;" < drbd.spec.in \
 	   > dist/SPECS/drbd.spec ; \
 	fi
-	$(RPMBUILD) -ba \
+	$(RPMBUILD) -bb \
 	    --define "_topdir $(PWD)/dist" \
 	    --define "buildroot $(PWD)/dist/install" \
 	    --define "kernelversion $(KVER)" \

Modified: branches/drbd-0.7/drbd/drbd_receiver.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_receiver.c	2006-03-08 11:13:37 UTC (rev 2106)
+++ branches/drbd-0.7/drbd/drbd_receiver.c	2006-03-08 12:14:01 UTC (rev 2107)
@@ -57,8 +57,8 @@
 
 #define is_syncer_blk(A,B) ((B)==ID_SYNCER)
 
-#ifdef __arch_um__
-void *to_virt(unsigned long phys)
+#if defined(__arch_um__) && !defined(HAVE_UML_TO_VIRT)
+static inline void *to_virt(unsigned long phys)
 {
 	return((void *) uml_physmem + phys);
 }

Modified: branches/drbd-0.7/drbd/linux/drbd_config.h
===================================================================
--- branches/drbd-0.7/drbd/linux/drbd_config.h	2006-03-08 11:13:37 UTC (rev 2106)
+++ branches/drbd-0.7/drbd/linux/drbd_config.h	2006-03-08 12:14:01 UTC (rev 2107)
@@ -65,4 +65,8 @@
 // for troubles.
 // #define DRBD_DISABLE_SENDPAGE
 
+// older, unpached kernel sources do not have it, so we added it in drbd_receiver.c
+// but more recent kernels define it in arch/um/include/mem.h
+#define HAVE_UML_TO_VIRT
+
 #endif