From 5f5ffe44c2ed025fb37faa17bb22d2691cae8597 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Sat, 30 Sep 2006 20:31:11 +0200 Subject: [PATCH] --- yaml --- r: 37565 b: refs/heads/master c: 9bf09c23853bb8009625c2ec60dc6beb9472d3ca h: refs/heads/master i: 37563: 639e90f0f0ceeaa33dd6994ef483571fdcdf29ad v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index e404d9e27ecb..6a7a4cc1859c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7457e6e2d7406c7009e9ad03db1335fe93b5fb71 +refs/heads/master: 9bf09c23853bb8009625c2ec60dc6beb9472d3ca diff --git a/trunk/drivers/scsi/scsi.c b/trunk/drivers/scsi/scsi.c index 12f6639dda2d..da95bce907dd 100644 --- a/trunk/drivers/scsi/scsi.c +++ b/trunk/drivers/scsi/scsi.c @@ -592,12 +592,6 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd) return rtn; } - -/* - * Per-CPU I/O completion queue. - */ -static DEFINE_PER_CPU(struct list_head, scsi_done_q); - /** * scsi_req_abort_cmd -- Request command recovery for the specified command * cmd: pointer to the SCSI command of interest @@ -1102,7 +1096,7 @@ MODULE_PARM_DESC(scsi_logging_level, "a bit mask of logging levels"); static int __init init_scsi(void) { - int error, i; + int error; error = scsi_init_queue(); if (error) @@ -1123,9 +1117,6 @@ static int __init init_scsi(void) if (error) goto cleanup_sysctl; - for_each_possible_cpu(i) - INIT_LIST_HEAD(&per_cpu(scsi_done_q, i)); - scsi_netlink_init(); printk(KERN_NOTICE "SCSI subsystem initialized\n");