mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Adrian Bunk <bunk@fs.tum.de>
To: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Cc: linux-kernel@vger.kernel.org, jgarzik@pobox.com,
	linux-scsi@vger.kernel.org
Subject: [2.4 patch] remove REPORT_LUNS from cpqfcTSstructs.h
Date: Wed, 7 Jan 2004 15:34:20 +0100	[thread overview]
Message-ID: <20040107143420.GZ11523@fs.tum.de> (raw)

Jeff Garzik added a #define REPORT_LUNS to scsi.h resulting in the 
following compile warnings for a similar #deine in cpqfcTSstructs.h:

<--  snip  -->

gcc-2.95 -D__KERNEL__ -I/home/bunk/linux/kernel-2.4/linux-2.4.25-pre4-full/include -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing 
-fno-common -fomit-frame-pointer -pipe -mpreferred-stack-boundary=2 -march=k6   
-nostdinc -iwithprefix include -DKBUILD_BASENAME=cpqfcTSinit  -c -o cpqfcTSinit.o 
cpqfcTSinit.c
In file included from cpqfcTSinit.c:57:
cpqfcTSstructs.h:222: warning: `REPORT_LUNS' redefined
/home/bunk/linux/kernel-2.4/linux-2.4.25-pre4-full/include/scsi/scsi.h:81: 
warning: this is the location of the previous definition
gcc-2.95 -D__KERNEL__ -I/home/bunk/linux/kernel-2.4/linux-2.4.25-pre4-full/inclu
de -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing 
-fno-common -fomit-frame-pointer -pipe -mpreferred-stack-boundary=2 -march=k6   
-nostdinc -iwithprefix include -DKBUILD_BASENAME=cpqfcTScontrol  -c -o 
cpqfcTScontrol.o cpqfcTScontrol.c
In file included from cpqfcTScontrol.c:48:
cpqfcTSstructs.h:222: warning: `REPORT_LUNS' redefined
/home/bunk/linux/kernel-2.4/linux-2.4.25-pre4-full/include/scsi/scsi.h:81: 
warning: this is the location of the previous definition
...
gcc-2.95 -D__KERNEL__ -I/home/bunk/linux/kernel-2.4/linux-2.4.25-pre4-full/include -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing 
-fno-common -fomit-frame-pointer -pipe -mpreferred-stack-boundary=2 -march=k6   
-nostdinc -iwithprefix include -DKBUILD_BASENAME=cpqfcTSworker  -c -o 
cpqfcTSworker.o cpqfcTSworker.c
In file included from cpqfcTSworker.c:49:
cpqfcTSstructs.h:222: warning: `REPORT_LUNS' redefined
...

<--  snip  -->


REPORT_LUNS is already removed from cpqfcTSstructs.h in 2.6 and the 
patch below removes it from 2.4, too.

I've tested the compilation with 2.4.25-pre4.


Please apply
Adrian


--- linux-2.4.25-pre4-full/drivers/scsi/cpqfcTSstructs.h.old	2004-01-06 20:46:24.000000000 +0100
+++ linux-2.4.25-pre4-full/drivers/scsi/cpqfcTSstructs.h	2004-01-06 20:46:43.000000000 +0100
@@ -219,7 +219,6 @@
 #define ELS_PRLI_ACC		0x22		// {FCP-SCSI} Process Login Accept
 #define ELS_RJT			0x1000000
 #define SCSI_REPORT_LUNS	0x0A0
-#define REPORT_LUNS		0xA0		// SCSI-3 command op-code
 #define FCP_TARGET_RESET	0x200
 
 #define ELS_LILP_FRAME		0x00000711	// 1st payload word of LILP frame

                 reply	other threads:[~2004-01-07 14:34 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20040107143420.GZ11523@fs.tum.de \
    --to=bunk@fs.tum.de \
    --cc=jgarzik@pobox.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=marcelo.tosatti@cyclades.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®