From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/drivers/scsi/arm/arxescsi.c | 1 - kernel/drivers/scsi/arm/cumana_2.c | 1 - kernel/drivers/scsi/arm/eesox.c | 1 - 3 files changed, 3 deletions(-) (limited to 'kernel/drivers/scsi/arm') diff --git a/kernel/drivers/scsi/arm/arxescsi.c b/kernel/drivers/scsi/arm/arxescsi.c index 32d23212d..3110736fd 100644 --- a/kernel/drivers/scsi/arm/arxescsi.c +++ b/kernel/drivers/scsi/arm/arxescsi.c @@ -245,7 +245,6 @@ static struct scsi_host_template arxescsi_template = { .can_queue = 0, .this_id = 7, .sg_tablesize = SG_ALL, - .cmd_per_lun = 1, .use_clustering = DISABLE_CLUSTERING, .proc_name = "arxescsi", }; diff --git a/kernel/drivers/scsi/arm/cumana_2.c b/kernel/drivers/scsi/arm/cumana_2.c index abc66f526..faa1bee07 100644 --- a/kernel/drivers/scsi/arm/cumana_2.c +++ b/kernel/drivers/scsi/arm/cumana_2.c @@ -367,7 +367,6 @@ static struct scsi_host_template cumanascsi2_template = { .this_id = 7, .sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS, .dma_boundary = IOMD_DMA_BOUNDARY, - .cmd_per_lun = 1, .use_clustering = DISABLE_CLUSTERING, .proc_name = "cumanascsi2", }; diff --git a/kernel/drivers/scsi/arm/eesox.c b/kernel/drivers/scsi/arm/eesox.c index 5bf3c0d13..a8ad6880d 100644 --- a/kernel/drivers/scsi/arm/eesox.c +++ b/kernel/drivers/scsi/arm/eesox.c @@ -486,7 +486,6 @@ static struct scsi_host_template eesox_template = { .this_id = 7, .sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS, .dma_boundary = IOMD_DMA_BOUNDARY, - .cmd_per_lun = 1, .use_clustering = DISABLE_CLUSTERING, .proc_name = "eesox", }; -- cgit 1.2.3-korg