From 776c221d2eae6c188efbb0b19ca6ba51885a6e2a Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 19 Jan 2016 21:02:08 +0000 Subject: [PATCH] Merged revisions 6779-6780 via svnmerge from svn+ssh://svn.code.sf.net/p/scst/svn/trunk ........ r6779 | bvassche | 2016-01-19 10:08:04 -0800 (Tue, 19 Jan 2016) | 1 line nightly build: Add kernel 4.4 support files ........ r6780 | bvassche | 2016-01-19 10:08:36 -0800 (Tue, 19 Jan 2016) | 1 line ib_srpt: Fix in-tree build for kernel v4.4 ........ git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.1.x@6781 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t/qla2x00-target/Makefile_in-tree-4.4 | 5 +++++ .../in-tree/Kconfig.drivers.Linux-4.4.patch | 13 +++++++++++++ scst/kernel/in-tree/Makefile.dev_handlers-4.4 | 14 ++++++++++++++ .../in-tree/Makefile.drivers.Linux-4.4.patch | 12 ++++++++++++ scst/kernel/in-tree/Makefile.scst-4.4 | 17 +++++++++++++++++ scst_local/in-tree/Makefile-4.4 | 2 ++ srpt/src/ib_srpt.c | 3 ++- 7 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.4 create mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch create mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.4 create mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.4.patch create mode 100644 scst/kernel/in-tree/Makefile.scst-4.4 create mode 100644 scst_local/in-tree/Makefile-4.4 diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.4 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.4 new file mode 100644 index 000000000..9657aee84 --- /dev/null +++ b/qla2x00t/qla2x00-target/Makefile_in-tree-4.4 @@ -0,0 +1,5 @@ +ccflags-y += -Idrivers/scsi/qla2xxx + +qla2x00tgt-y := qla2x00t.o + +obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch new file mode 100644 index 000000000..39d30a55e --- /dev/null +++ b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch @@ -0,0 +1,13 @@ +diff --git a/drivers/Kconfig b/drivers/Kconfig +index c70d6e4..0a4ed1b 100644 +--- a/drivers/Kconfig ++++ b/drivers/Kconfig +@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" + + source "drivers/scsi/Kconfig" + ++source "drivers/scst/Kconfig" ++ + source "drivers/ata/Kconfig" + + source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.4 b/scst/kernel/in-tree/Makefile.dev_handlers-4.4 new file mode 100644 index 000000000..f933b36f7 --- /dev/null +++ b/scst/kernel/in-tree/Makefile.dev_handlers-4.4 @@ -0,0 +1,14 @@ +ccflags-y += -Wno-unused-parameter + +obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ + scst_vdisk.o scst_raid.o scst_processor.o scst_user.o + +obj-$(CONFIG_SCST_DISK) += scst_disk.o +obj-$(CONFIG_SCST_TAPE) += scst_tape.o +obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o +obj-$(CONFIG_SCST_MODISK) += scst_modisk.o +obj-$(CONFIG_SCST_CHANGER) += scst_changer.o +obj-$(CONFIG_SCST_RAID) += scst_raid.o +obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o +obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o +obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.4.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.4.patch new file mode 100644 index 000000000..6bbacd12f --- /dev/null +++ b/scst/kernel/in-tree/Makefile.drivers.Linux-4.4.patch @@ -0,0 +1,12 @@ +diff --git a/drivers/Makefile b/drivers/Makefile +index 527a6da..db2c24f 100644 +--- a/drivers/Makefile ++++ b/drivers/Makefile +@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ + obj-$(CONFIG_BCMA) += bcma/ + obj-$(CONFIG_VHOST_RING) += vhost/ + obj-$(CONFIG_VLYNQ) += vlynq/ ++obj-$(CONFIG_SCST) += scst/ + obj-$(CONFIG_STAGING) += staging/ + obj-y += platform/ + #common clk code diff --git a/scst/kernel/in-tree/Makefile.scst-4.4 b/scst/kernel/in-tree/Makefile.scst-4.4 new file mode 100644 index 000000000..f4e0cc985 --- /dev/null +++ b/scst/kernel/in-tree/Makefile.scst-4.4 @@ -0,0 +1,17 @@ +ccflags-y += -Wno-unused-parameter + +scst-y += scst_copy_mgr.o +scst-y += scst_debug.o +scst-y += scst_dlm.o +scst-y += scst_event.o +scst-y += scst_lib.o +scst-y += scst_main.o +scst-y += scst_mem.o +scst-y += scst_no_dlm.o +scst-y += scst_pres.o +scst-y += scst_sysfs.o +scst-y += scst_targ.o +scst-y += scst_tg.o + +obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ + srpt/ scst_local/ diff --git a/scst_local/in-tree/Makefile-4.4 b/scst_local/in-tree/Makefile-4.4 new file mode 100644 index 000000000..8cbbbff63 --- /dev/null +++ b/scst_local/in-tree/Makefile-4.4 @@ -0,0 +1,2 @@ +obj-$(CONFIG_SCST_LOCAL) += scst_local.o + diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c index 4202f5a58..0894f17d2 100644 --- a/srpt/src/ib_srpt.c +++ b/srpt/src/ib_srpt.c @@ -694,7 +694,8 @@ static int srpt_refresh_port(struct srpt_port *sport) sport->lid = port_attr.lid; ret = ib_query_gid(sport->sdev->device, sport->port, 0, &sport->gid -#ifdef IB_QUERY_GID_HAS_ATTR_ARG +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) || \ + defined(IB_QUERY_GID_HAS_ATTR_ARG) , NULL #endif );