mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-14 09:11:27 +00:00
Merge branch 'svn-trunk'
This commit is contained in:
@@ -14,10 +14,6 @@
|
||||
#include "qla2x_tgt.h"
|
||||
#include <linux/ctype.h>
|
||||
|
||||
#ifndef RHEL_RELEASE_VERSION
|
||||
#define RHEL_RELEASE_VERSION(maj, min) 0
|
||||
#endif
|
||||
|
||||
static int qla24xx_vport_disable(struct fc_vport *, bool);
|
||||
|
||||
/* SYSFS attributes --------------------------------------------------------- */
|
||||
|
||||
@@ -22,10 +22,6 @@
|
||||
#include <scsi/scsi_transport.h>
|
||||
#include <scsi/scsi_transport_fc.h>
|
||||
|
||||
#ifndef RHEL_RELEASE_VERSION
|
||||
#define RHEL_RELEASE_VERSION(maj, min) 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Driver version
|
||||
*/
|
||||
|
||||
@@ -21,6 +21,9 @@
|
||||
*/
|
||||
|
||||
#include <linux/version.h>
|
||||
#ifndef RHEL_RELEASE_VERSION
|
||||
#define RHEL_RELEASE_VERSION(a, b) (((a) << 8) + (b))
|
||||
#endif
|
||||
#include <linux/bio.h>
|
||||
#include <linux/blkdev.h> /* struct request_queue */
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 21, 0) || \
|
||||
|
||||
@@ -30,10 +30,6 @@
|
||||
#include "scst_pres.h"
|
||||
#include "scst_dlm.h"
|
||||
|
||||
#ifndef RHEL_RELEASE_VERSION
|
||||
#define RHEL_RELEASE_VERSION(maj, min) 0
|
||||
#endif
|
||||
|
||||
#if (defined(CONFIG_DLM) || defined(CONFIG_DLM_MODULE)) && \
|
||||
!defined(CONFIG_SCST_NO_DLM)
|
||||
|
||||
|
||||
@@ -46,10 +46,6 @@ static inline u32 blk_mq_unique_tag(struct request *rq)
|
||||
#include <scst_debug.h>
|
||||
#endif
|
||||
|
||||
#ifndef RHEL_RELEASE_VERSION
|
||||
#define RHEL_RELEASE_VERSION(maj, min) 0
|
||||
#endif
|
||||
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
|
||||
#define SG_MAX_SINGLE_ALLOC (PAGE_SIZE / sizeof(struct scatterlist))
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user