* [PATCH] dpt_i2o: Add PROC_IA64 define
@ 2008-06-12 4:27 Jeff Mahoney
2008-06-12 13:22 ` Mark Salyzyn
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Mahoney @ 2008-06-12 4:27 UTC (permalink / raw)
To: Linux SCSI Mailing List
This fixes the following compile failure in 2.6.26-rc5-git5:
drivers/scsi/dpt_i2o.c:83: error: 'PROC_IA64' undeclared here (not in a function)
I'm not sure if these values are magic and defined somewhere, but the
kernel wouldn't build on IA64 without it.
I changed the value in dpt_i2o.c because the comments indicated that
PROC_INTEL refered to the 80x86 family, which doesn't include ia64.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
drivers/scsi/dpt/dptsig.h | 1 +
drivers/scsi/dpt_i2o.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/scsi/dpt/dptsig.h
+++ b/drivers/scsi/dpt/dptsig.h
@@ -92,6 +92,7 @@ typedef unsigned int sigINT;
#define PROC_POWERPC 0x04 /* IBM Power PC */
#define PROC_i960 0x05 /* Intel i960 */
#define PROC_ULTRASPARC 0x06 /* SPARC processor */
+#define PROC_IA64 0x07 /* IA64 processor */
/* Specific Minimim Processor - sigBYTE dsProcessor; FLAG BITS */
/* ------------------------------------------------------------------ */
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -80,7 +80,7 @@ static dpt_sig_S DPTI_sig = {
#ifdef __i386__
PROC_INTEL, PROC_386 | PROC_486 | PROC_PENTIUM | PROC_SEXIUM,
#elif defined(__ia64__)
- PROC_INTEL, PROC_IA64,
+ PROC_IA64, PROC_IA64,
#elif defined(__sparc__)
PROC_ULTRASPARC, PROC_ULTRASPARC,
#elif defined(__alpha__)
--
Jeff Mahoney
SUSE Labs
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] dpt_i2o: Add PROC_IA64 define
2008-06-12 4:27 [PATCH] dpt_i2o: Add PROC_IA64 define Jeff Mahoney
@ 2008-06-12 13:22 ` Mark Salyzyn
2008-06-13 14:38 ` Jeff Mahoney
0 siblings, 1 reply; 4+ messages in thread
From: Mark Salyzyn @ 2008-06-12 13:22 UTC (permalink / raw)
To: Jeff Mahoney; +Cc: Linux SCSI Mailing List
NAK, the management tools need to see the processor as manufactured by
Intel.
Leave PROC_INTAL, PROC_IA64 in the second fragment.
Sincerely -- Mark Salyzyn
On Jun 12, 2008, at 12:27 AM, Jeff Mahoney wrote:
> This fixes the following compile failure in 2.6.26-rc5-git5:
> drivers/scsi/dpt_i2o.c:83: error: 'PROC_IA64' undeclared here (not
> in a function)
>
> I'm not sure if these values are magic and defined somewhere, but the
> kernel wouldn't build on IA64 without it.
>
> I changed the value in dpt_i2o.c because the comments indicated that
> PROC_INTEL refered to the 80x86 family, which doesn't include ia64.
>
> Signed-off-by: Jeff Mahoney <jeffm@suse.com>
> ---
> drivers/scsi/dpt/dptsig.h | 1 +
> drivers/scsi/dpt_i2o.c | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> --- a/drivers/scsi/dpt/dptsig.h
> +++ b/drivers/scsi/dpt/dptsig.h
> @@ -92,6 +92,7 @@ typedef unsigned int sigINT;
> #define PROC_POWERPC 0x04 /* IBM Power PC */
> #define PROC_i960 0x05 /* Intel i960 */
> #define PROC_ULTRASPARC 0x06 /* SPARC processor */
> +#define PROC_IA64 0x07 /* IA64 processor */
>
> /* Specific Minimim Processor - sigBYTE dsProcessor; FLAG BITS */
> /*
> ------------------------------------------------------------------ */
> --- a/drivers/scsi/dpt_i2o.c
> +++ b/drivers/scsi/dpt_i2o.c
> @@ -80,7 +80,7 @@ static dpt_sig_S DPTI_sig = {
> #ifdef __i386__
> PROC_INTEL, PROC_386 | PROC_486 | PROC_PENTIUM | PROC_SEXIUM,
> #elif defined(__ia64__)
> - PROC_INTEL, PROC_IA64,
> + PROC_IA64, PROC_IA64,
> #elif defined(__sparc__)
> PROC_ULTRASPARC, PROC_ULTRASPARC,
> #elif defined(__alpha__)
>
> --
> Jeff Mahoney
> SUSE Labs
> --
> To unsubscribe from this list: send the line "unsubscribe linux-
> scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] dpt_i2o: Add PROC_IA64 define
2008-06-12 13:22 ` Mark Salyzyn
@ 2008-06-13 14:38 ` Jeff Mahoney
2008-06-13 14:40 ` Mark Salyzyn
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Mahoney @ 2008-06-13 14:38 UTC (permalink / raw)
To: Mark Salyzyn; +Cc: Linux SCSI Mailing List
Thanks for the feedback, Mark. Round two:
This fixes the following compile failure:
drivers/scsi/dpt_i2o.c:83: error: 'PROC_IA64' undeclared here (not in a function)
Mark Salyzyn <Mark_Salyzyn@adaptec.com> indicated that IA64 must report
itself as PROC_INTEL, so I've changed the comment for PROC_INTEL.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
drivers/scsi/dpt/dptsig.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/scsi/dpt/dptsig.h
+++ b/drivers/scsi/dpt/dptsig.h
@@ -85,7 +85,7 @@ typedef unsigned int sigINT;
/* ------------------------------------------------------------------ */
/* What type of processor the file is meant to run on. */
/* This will let us know whether to read sigWORDs as high/low or low/high. */
-#define PROC_INTEL 0x00 /* Intel 80x86 */
+#define PROC_INTEL 0x00 /* Intel 80x86/ia64 */
#define PROC_MOTOROLA 0x01 /* Motorola 68K */
#define PROC_MIPS4000 0x02 /* MIPS RISC 4000 */
#define PROC_ALPHA 0x03 /* DEC Alpha */
@@ -104,6 +104,7 @@ typedef unsigned int sigINT;
#define PROC_486 0x08 /* Intel 80486 */
#define PROC_PENTIUM 0x10 /* Intel 586 aka P5 aka Pentium */
#define PROC_SEXIUM 0x20 /* Intel 686 aka P6 aka Pentium Pro or MMX */
+#define PROC_IA64 0x40 /* Intel IA64 processor */
/* PROC_i960: */
#define PROC_960RX 0x01 /* Intel 80960RC/RD */
--
Jeff Mahoney
SUSE Labs
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] dpt_i2o: Add PROC_IA64 define
2008-06-13 14:38 ` Jeff Mahoney
@ 2008-06-13 14:40 ` Mark Salyzyn
0 siblings, 0 replies; 4+ messages in thread
From: Mark Salyzyn @ 2008-06-13 14:40 UTC (permalink / raw)
To: Jeff Mahoney; +Cc: Linux SCSI Mailing List
ACK!!!
Sincerely -- Mark Salyzyn
On Jun 13, 2008, at 10:38 AM, Jeff Mahoney wrote:
> Thanks for the feedback, Mark. Round two:
>
> This fixes the following compile failure:
> drivers/scsi/dpt_i2o.c:83: error: 'PROC_IA64' undeclared here (not
> in a function)
>
> Mark Salyzyn <Mark_Salyzyn@adaptec.com> indicated that IA64 must
> report
> itself as PROC_INTEL, so I've changed the comment for PROC_INTEL.
>
> Signed-off-by: Jeff Mahoney <jeffm@suse.com>
> ---
>
> drivers/scsi/dpt/dptsig.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> --- a/drivers/scsi/dpt/dptsig.h
> +++ b/drivers/scsi/dpt/dptsig.h
> @@ -85,7 +85,7 @@ typedef unsigned int sigINT;
> /*
> ------------------------------------------------------------------ */
> /* What type of processor the file is meant to run on. */
> /* This will let us know whether to read sigWORDs as high/low or low/
> high. */
> -#define PROC_INTEL 0x00 /* Intel 80x86 */
> +#define PROC_INTEL 0x00 /* Intel 80x86/ia64 */
> #define PROC_MOTOROLA 0x01 /* Motorola 68K */
> #define PROC_MIPS4000 0x02 /* MIPS RISC 4000 */
> #define PROC_ALPHA 0x03 /* DEC Alpha */
> @@ -104,6 +104,7 @@ typedef unsigned int sigINT;
> #define PROC_486 0x08 /* Intel 80486 */
> #define PROC_PENTIUM 0x10 /* Intel 586 aka P5 aka Pentium */
> #define PROC_SEXIUM 0x20 /* Intel 686 aka P6 aka Pentium Pro
> or MMX */
> +#define PROC_IA64 0x40 /* Intel IA64 processor */
>
> /* PROC_i960: */
> #define PROC_960RX 0x01 /* Intel 80960RC/RD */
>
> --
> Jeff Mahoney
> SUSE Labs
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-06-13 14:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-12 4:27 [PATCH] dpt_i2o: Add PROC_IA64 define Jeff Mahoney
2008-06-12 13:22 ` Mark Salyzyn
2008-06-13 14:38 ` Jeff Mahoney
2008-06-13 14:40 ` Mark Salyzyn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox