4 files changed, 7 insertions, 23 deletions

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index d9867fd2f2a5..e49162b15578 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -113,7 +113,7 @@ source "drivers/block/paride/Kconfig"
 
 config BLK_CPQ_DA
         tristate "Compaq SMART2 support"
-        depends on PCI
+        depends on PCI && VIRT_TO_BUS
         help
           This is the driver for Compaq Smart Array controllers.  Everyone
           using these boards should say Y here.  See the file
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index c575fb1d585f..c12951024090 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -122,17 +122,12 @@ static int sock_xmit(struct socket *sock, int send, void *buf, int size,
         int result;
         struct msghdr msg;
         struct kvec iov;
-        unsigned long flags;
-        sigset_t oldset;
+        sigset_t blocked, oldset;
 
         /* Allow interception of SIGKILL only
          * Don't allow other signals to interrupt the transmission */
-        spin_lock_irqsave(&current->sighand->siglock, flags);
-        oldset = current->blocked;
-        sigfillset(&current->blocked);
-        sigdelsetmask(&current->blocked, sigmask(SIGKILL));
-        recalc_sigpending();
-        spin_unlock_irqrestore(&current->sighand->siglock, flags);
+        siginitsetinv(&blocked, sigmask(SIGKILL));
+        sigprocmask(SIG_SETMASK, &blocked, &oldset);
 
         do {
                 sock->sk->sk_allocation = GFP_NOIO;
@@ -151,11 +146,9 @@ static int sock_xmit(struct socket *sock, int send, void *buf, int size,
 
                 if (signal_pending(current)) {
                         siginfo_t info;
-                        spin_lock_irqsave(&current->sighand->siglock, flags);
                         printk(KERN_WARNING "nbd (pid %d: %s) got signal %d\n",
-                                current->pid, current->comm, 
-                                dequeue_signal(current, &current->blocked, &info));
-                        spin_unlock_irqrestore(&current->sighand->siglock, flags);
+                                current->pid, current->comm,
+                                dequeue_signal_lock(current, &current->blocked, &info));
                         result = -EINTR;
                         break;
                 }
@@ -169,10 +162,7 @@ static int sock_xmit(struct socket *sock, int send, void *buf, int size,
                 buf += result;
         } while (size > 0);
 
-        spin_lock_irqsave(&current->sighand->siglock, flags);
-        current->blocked = oldset;
-        recalc_sigpending();
-        spin_unlock_irqrestore(&current->sighand->siglock, flags);
+        sigprocmask(SIG_SETMASK, &oldset, NULL);
 
         return result;
 }
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index ce64e86d6ffb..7c294a40002e 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -1652,9 +1652,6 @@ static int kcdrwd(void *foobar)
                                 }
                         }
 
-                        if (signal_pending(current)) {
-                                flush_signals(current);
-                        }
                         if (kthread_should_stop())
                                 break;
                 }
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index 7cc2685ca84a..2abf94cc3137 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -44,9 +44,6 @@
 extern int m68k_realnum_memory;
 extern struct mem_info m68k_memory[NUM_MEMINFO];
 
-#define TRUE                  (1)
-#define FALSE                 (0)
-
 #define Z2MINOR_COMBINED      (0)
 #define Z2MINOR_Z2ONLY        (1)
 #define Z2MINOR_CHIPONLY      (2)