vserver 1.9.5.x5

[linux-2.6.git] / kernel / dma.c

diff --git a/kernel/dma.c b/kernel/dma.c
index af1d982..aef0a45 100644 (file)
--- a/kernel/dma.c
+++ b/kernel/dma.c
@@ -38,7 +38,7 @@
  */
 
 
-spinlock_t dma_spin_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(dma_spin_lock);
 
 /*
  *     If our port doesn't define this it has no PC like DMA
@@ -58,14 +58,7 @@ struct dma_chan {
 };
 
 static struct dma_chan dma_chan_busy[MAX_DMA_CHANNELS] = {
-       { 0, 0 },
-       { 0, 0 },
-       { 0, 0 },
-       { 0, 0 },
-       { 1, "cascade" },
-       { 0, 0 },
-       { 0, 0 },
-       { 0, 0 }
+       [4] = { 1, "cascade" },
 };