Changes as sugested by loganfre

samhamilton · Aug 8, 2013 · 7c0e984 · lfreijo · Aug 8, 2013 · 7c0e984
1 parent 6f4aee6
commit 7c0e984
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/dkms.conf b/dkms.conf
@@ -0,0 +1,9 @@
+MAKE="make -C product/rr2680/linux/ KERNELDIR=/lib/modules/${kernelver}/build"
+CLEAN="make -C product/rr2680/linux/ clean"
+BUILT_MODULE_NAME=rr2680
+DEST_MODULE_LOCATION=/kernel/drivers/scsi/
+BUILT_MODULE_LOCATION=product/rr2680/linux/
+PACKAGE_NAME=rr2680
+PACKAGE_VERSION=1.8
+AUTOINSTALL=yes
+REMAKE_INITRD=yes
diff --git a/inc/linux_32mpa/Makefile.def b/inc/linux_32mpa/Makefile.def
@@ -73,8 +73,8 @@ ifndef KERNELDIR
 KERNELDIR := /lib/modules/$(shell uname -r)/build
 endif
 
-MAJOR := $(shell expr `grep LINUX_VERSION_CODE $(KERNELDIR)/include/linux/version.h | cut -d\  -f3` / 65536 % 65536)
-MINOR := $(shell expr `grep LINUX_VERSION_CODE $(KERNELDIR)/include/linux/version.h | cut -d\  -f3` / 256 % 256)
+MAJOR := $(shell expr `grep LINUX_VERSION_CODE $(KERNELDIR)/include/generated/uapi/linux/version.h | cut -d\  -f3` / 65536 % 65536)
+MINOR := $(shell expr `grep LINUX_VERSION_CODE $(KERNELDIR)/include/generated/uapi/linux/version.h | cut -d\  -f3` / 256 % 256)
 KERNEL_VER := $(MAJOR).$(MINOR)
 
 ifeq ($(KERNEL_VER),)

diff --git a/osm/linux/os_linux.c b/osm/linux/os_linux.c
@@ -213,7 +213,7 @@ void *os_kmap_sgptr(PSG psg)
 void os_kunmap_sgptr(void *ptr)
 {
 	if ((HPT_UPTR)ptr >= (HPT_UPTR)high_memory)
-		kunmap_atomic(ptr, HPT_KMAP_TYPE);
+		kunmap_atomic(ptr);
 }
 #else 
 void *os_kmap_sgptr(PSG psg) { return psg->addr._logical; }

diff --git a/osm/linux/osm_linux.c b/osm/linux/osm_linux.c
@@ -479,16 +479,16 @@ static inline void scsicmd_buf_put(struct scsi_cmnd *cmd, void *buf)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
 	struct scatterlist *sg;
 	sg = scsi_sglist(cmd);
-	kunmap_atomic((char *)buf - sg->offset, HPT_KMAP_TYPE);
+	kunmap_atomic((char *)buf - sg->offset);
 #else 
 
 	if (cmd->use_sg) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-		kunmap_atomic((char *)buf - ((struct scatterlist *)cmd->request_buffer)->offset, HPT_KMAP_TYPE);
+		kunmap_atomic((char *)buf - ((struct scatterlist *)cmd->request_buffer)->offset);
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,18)
 		struct scatterlist *sg = (struct scatterlist *) cmd->request_buffer;
 		if (sg->page)
-			kunmap_atomic((char *)buf - sg->offset, HPT_KMAP_TYPE);
+			kunmap_atomic((char *)buf - sg->offset);
 #endif
 	}
 

diff --git a/osm/linux/osm_linux.h b/osm/linux/osm_linux.h
@@ -176,7 +176,6 @@ typedef void irqreturn_t;
 #endif
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-#define HPT_KMAP_TYPE KM_BIO_SRC_IRQ
 #define HPT_FIND_PCI_DEVICE pci_get_device
 #else 
 #define HPT_KMAP_TYPE KM_BH_IRQ