--- drivers/md/dm-daemon.c.orig	2004-04-01 13:15:46.000000000 -0500
+++ drivers/md/dm-daemon.c	2004-04-05 12:44:40.000000000 -0400
@@ -19,10 +19,10 @@
 	reparent_to_init();
 
 	/* block all signals */
-	spin_lock_irq(&current->sigmask_lock);
+	spin_lock_irq(&current->sighand->siglock);
 	sigfillset(&current->blocked);
 	flush_signals(current);
-	spin_unlock_irq(&current->sigmask_lock);
+	spin_unlock_irq(&current->sighand->siglock);
 
 	strcpy(current->comm, dd->name);
 	atomic_set(&dd->please_die, 0);
--- drivers/md/dm-io.c.orig	2004-04-01 13:15:46.000000000 -0500
+++ drivers/md/dm-io.c	2004-04-05 13:00:33.000000000 -0400
@@ -178,10 +178,12 @@
 /*
  * Primitives for alignment calculations.
  */
+#ifndef fls(x)
 int fls(unsigned n)
 {
 	return generic_fls32(n);
 }
+#endif
 
 static inline int log2_floor(unsigned n)
 {