Linus apparently forgot to bump the version level in the Makefile (found
out when it hosed my actual 125 modules on install - but that's another
story <blush>). Also, quick transplant of dma thread-locking stuff from
the Intel code to make it build and run on my Alpha UDB.
Steve
--- linux/include/asm-alpha/dma.h.orig Sun Oct 18 21:49:28 1998
+++ linux/include/asm-alpha/dma.h Mon Oct 19 07:08:30 1998
@@ -20,6 +20,7 @@
#include <linux/config.h>
#include <asm/io.h>
+#include <asm/spinlock.h>
#define dma_outb outb
#define dma_inb inb
@@ -171,6 +172,20 @@
#define DMA_MODE_READ 0x44 /* I/O to memory, no autoinit, increment, single mode */
#define DMA_MODE_WRITE 0x48 /* memory to I/O, no autoinit, increment, single mode */
#define DMA_MODE_CASCADE 0xC0 /* pass thru DREQ->HRQ, DACK<-HLDA only */
+
+extern spinlock_t dma_spin_lock;
+
+static __inline__ unsigned long claim_dma_lock(void)
+{
+ unsigned long flags;
+ spin_lock_irqsave(&dma_spin_lock, flags);
+ return flags;
+}
+
+static __inline__ void release_dma_lock(unsigned long flags)
+{
+ spin_unlock_irqrestore(&dma_spin_lock, flags);
+}
/* enable/disable a specific DMA channel */
static __inline__ void enable_dma(unsigned int dmanr)
--- linux/Makefile.orig Mon Oct 19 18:33:26 1998
+++ linux/Makefile Sat Oct 17 00:00:51 1998
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 1
-SUBLEVEL = 125
+SUBLEVEL = 126
ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/