diff options
| author | davem <davem> | 2001-12-11 09:37:18 +0000 |
|---|---|---|
| committer | davem <davem> | 2001-12-11 09:37:18 +0000 |
| commit | 69dc731dd71a339ddd16c5048f9f452bf5c345f8 (patch) | |
| tree | 4a6fddc8ae29c67cf35f5a82aba2283273554fea | |
| parent | 51a4a910041c2c137a61b98f1d134def6ee17a0d (diff) | |
| download | netdev-vger-cvs-69dc731dd71a339ddd16c5048f9f452bf5c345f8.tar.gz | |
Forgotten commit.
| -rw-r--r-- | arch/sparc64/kernel/iommu_common.h | 5 | ||||
| -rw-r--r-- | drivers/scsi/qlogicpti.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/sparc64/kernel/iommu_common.h b/arch/sparc64/kernel/iommu_common.h index 03b5ed728..a44147d98 100644 --- a/arch/sparc64/kernel/iommu_common.h +++ b/arch/sparc64/kernel/iommu_common.h @@ -1,4 +1,4 @@ -/* $Id: iommu_common.h,v 1.4 2001-10-09 02:24:33 davem Exp $ +/* $Id: iommu_common.h,v 1.5 2001-12-11 09:41:01 davem Exp $ * iommu_common.h: UltraSparc SBUS/PCI common iommu declarations. * * Copyright (C) 1999 David S. Miller (davem@redhat.com) @@ -6,8 +6,9 @@ #include <linux/kernel.h> #include <linux/types.h> +#include <linux/sched.h> +#include <linux/mm.h> -#include <asm/page.h> #include <asm/iommu.h> #include <asm/scatterlist.h> diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index 8561843c0..1b8acd2fa 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c @@ -1445,7 +1445,7 @@ static void qpti_intr(int irq, void *dev_id, struct pt_regs *regs) spin_unlock(&qpti->lock); if (dq != NULL) { - spin_lock(&io_request_lock); + spin_lock(&qpti->qhost->host_lock); do { Scsi_Cmnd *next; @@ -1453,7 +1453,7 @@ static void qpti_intr(int irq, void *dev_id, struct pt_regs *regs) dq->scsi_done(dq); dq = next; } while (dq != NULL); - spin_unlock(&io_request_lock); + spin_unlock(&qpti->qhost->host_lock); } __restore_flags(flags); } |