Subject: Re: linux-next: build failure after merge of the scsi tree

From: Hannes Reinecke <[email-masked]>
Date: Mon, 03 Nov 2014 08:51:09 +0100

On 11/03/2014 03:52 AM, Stephen Rothwell wrote:
> Hi James,
> 
> After merging the scsi tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/scsi/scsi_lib.c: In function 'scsi_io_completion': 
> drivers/scsi/scsi_lib.c:1048:5: error: implicit declaration of
> function 'SCSI_LOG_LEVEL'
> [-Werror=implicit-function-declaration] level =
> SCSI_LOG_LEVEL(SCSI_LOG_MLCOMPLETE_SHIFT, ^
> 
> Caused by commit b6568e80be82 ("scsi: simplify 
> scsi_log_(send|completion)").  SCSI_LOG_LEVEL is defined in 
> drivers/scsi/scsi_logging.h, but only if CONFIG_SCSI_LOGGING is
> defined.
> 
> I have used the version of the scsi tree from next-20141031 for
> today.
> 
Ah, missed that. Here's the patch.

Cheers,

Hannes
- -- 
Dr. Hannes Reinecke		      zSeries & Storage
[email-masked]			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
>>From e5c943164a981e32d88c7083c84a85ff513bb0ee Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <[email-masked]>
Date: Mon, 3 Nov 2014 08:03:48 +0100
Subject: [PATCH] scsi: define SCSI_LOG_LEVEL

SCSI_LOG_LEVEL needs to be defined even if CONFIG_SCSI_LOGGING
is not enabled.

Reported-by: Stephen Rothwell <[email-masked]>
Signed-off-by: Hannes Reinecke <[email-masked]>
---
 drivers/scsi/scsi_logging.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/scsi/scsi_logging.h b/drivers/scsi/scsi_logging.h
index 1f65139..7fe64a8 100644
--- a/drivers/scsi/scsi_logging.h
+++ b/drivers/scsi/scsi_logging.h
@@ -51,6 +51,7 @@ do {								\
 		} while (0);					\
 } while (0)
 #else
+#define SCSI_LOG_LEVEL(SHIFT, BITS) 0
 #define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD)
 #endif /* CONFIG_SCSI_LOGGING */
 
-- 
1.8.4.5