From: Christoph Hellwig <hch@lst.de>
Date: Thu, 18 Oct 2018 13:03:36 +0000 (+0200)
Subject: scsi: qla1280: properly handle 64-bit DMA
X-Git-Tag: v5.0-rc1~112^2~212
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac4b1657b75251f9c8731403e5b79fa812e0b05c;p=thirdparty%2Fkernel%2Flinux.git

scsi: qla1280: properly handle 64-bit DMA

CONFIG_HIGHMEM is not in fact an indicator for > 32-bit dma addressing
Given that the driver is a bit weird and wants a compile time selection
switch to checking CONFIG_ARCH_DMA_ADDR_T_64BIT instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index f19e8d192d36b..9c5b67304a768 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -383,10 +383,7 @@
 
 #include "qla1280.h"
 
-#ifndef BITS_PER_LONG
-#error "BITS_PER_LONG not defined!"
-#endif
-#if (BITS_PER_LONG == 64) || defined CONFIG_HIGHMEM
+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
 #define QLA_64BIT_PTR	1
 #endif