properly catch cases where buffers are on the kstack, from hannken@eis.cs.tu-bs.de

diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 1049d67..323bdd5 100644 (file)
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -78,8 +78,7 @@
 #ifdef i386
 #include <machine/vmparam.h>
 #define VOLATILE_XS(xs) \
-       ((xs)->datalen > 0 && \
-       ((vm_offset_t)((xs)->data) < VM_MIN_KERNEL_ADDRESS) && \
+       ((xs)->datalen > 0 && (xs)->bp == NULL && \
        ((xs)->flags & SCSI_POLL) == 0)
 #else
 #define VOLATILE_XS(xs)        0

diff --git a/sys/dev/isa/aha1542.c b/sys/dev/isa/aha1542.c
index 1049d67..323bdd5 100644 (file)
--- a/sys/dev/isa/aha1542.c
+++ b/sys/dev/isa/aha1542.c
@@ -78,8 +78,7 @@
 #ifdef i386
 #include <machine/vmparam.h>
 #define VOLATILE_XS(xs) \
-       ((xs)->datalen > 0 && \
-       ((vm_offset_t)((xs)->data) < VM_MIN_KERNEL_ADDRESS) && \
+       ((xs)->datalen > 0 && (xs)->bp == NULL && \
        ((xs)->flags & SCSI_POLL) == 0)
 #else
 #define VOLATILE_XS(xs)        0