Build fixes for kernel 2.6.38.

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3239 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2011-01-29 11:23:25 +00:00
parent 7325753fda
commit 1a3b890e8f
3 changed files with 9 additions and 1 deletions
+4
View File
@@ -278,9 +278,13 @@ enum scst_cdb_flags {
#define INIT_ELEMENT_STATUS 0x07
#define INIT_ELEMENT_STATUS_RANGE 0x37
#define PREVENT_ALLOW_MEDIUM 0x1E
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
#define READ_ATTRIBUTE 0x8C
#endif
#define REQUEST_VOLUME_ADDRESS 0xB5
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
#define WRITE_ATTRIBUTE 0x8D
#endif
#define WRITE_VERIFY_16 0x8E
#define VERIFY_6 0x13
#ifndef VERIFY_12
+4
View File
@@ -121,6 +121,10 @@ INSTALL_DIR_H := $(DESTDIR)/usr/local/include/scst
enable-Wextra = $(shell uname_r="$$(uname -r)"; if [ "$${uname_r%.el5}" = "$${uname_r}" ]; then echo "$(1)"; fi)
ifneq ($(shell grep -w sg_copy $(srctree)/include/linux/scatterlist.h),)
EXTRA_CFLAGS += -DHAVE_SG_COPY
endif
EXTRA_CFLAGS += -I$(SCST_INC_DIR) $(call enable-Wextra,-Wextra \
-Wno-unused-parameter -Wno-missing-field-initializers)
+1 -1
View File
@@ -4517,7 +4517,7 @@ out:
return;
}
#if !((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && defined(SCSI_EXEC_REQ_FIFO_DEFINED))
#if !((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && defined(SCSI_EXEC_REQ_FIFO_DEFINED)) && !defined(HAVE_SG_COPY)
/*
* Can switch to the next dst_sg element, so, to copy to strictly only