Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754527Ab2FFFyT (ORCPT ); Wed, 6 Jun 2012 01:54:19 -0400 Received: from bedivere.hansenpartnership.com ([66.63.167.143]:57155 "EHLO bedivere.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753650Ab2FFFyR (ORCPT ); Wed, 6 Jun 2012 01:54:17 -0400 Message-ID: <1338962053.23080.7.camel@dabdike.int.hansenpartnership.com> Subject: Re: linux-next: Tree for Jun 1 (scsi) From: James Bottomley To: Randy Dunlap Cc: Stephen Rothwell , linux-next@vger.kernel.org, LKML , linux-scsi , Dan Williams Date: Wed, 06 Jun 2012 14:54:13 +0900 In-Reply-To: <4FCC2BF9.7000802@xenotime.net> References: <20120601132202.ac73b03c845299d384defeaf@canb.auug.org.au> <4FCC2BF9.7000802@xenotime.net> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3 Content-Transfer-Encoding: 7bit Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1538 Lines: 51 On Sun, 2012-06-03 at 20:31 -0700, Randy Dunlap wrote: > On 05/31/2012 08:22 PM, Stephen Rothwell wrote: > > > Hi all, > > > > Changes since 20120531: > > > > already fixed? > > on i386 and x86_64, loadable module or builtin: > > > ERROR: "scsi_sd_probe_domain" [drivers/scsi/scsi_mod.ko] undefined! > or > (.text+0x4f6c77): undefined reference to `scsi_sd_probe_domain' This looks to be an obvious thinko: the symbol is conditionally defined, but unconditionally used in scsi_scan.c:scsi_complete_async_scans(). We can fix just by removing the wrong conditional. James --- diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 61c82a3..bbbc9c9 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -90,11 +90,9 @@ unsigned int scsi_logging_level; EXPORT_SYMBOL(scsi_logging_level); #endif -#if IS_ENABLED(CONFIG_PM) || IS_ENABLED(CONFIG_BLK_DEV_SD) -/* sd and scsi_pm need to coordinate flushing async actions */ +/* sd, scsi core and power management need to coordinate flushing async actions */ LIST_HEAD(scsi_sd_probe_domain); EXPORT_SYMBOL(scsi_sd_probe_domain); -#endif /* NB: These are exposed through /proc/scsi/scsi and form part of the ABI. * You may not alter any existing entry (although adding new ones is -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/