Re: [PATCH 0/4] dpt_i2o: 64 bit support (take 5)

[James Bottomley <James.Bottomley@HansenPartnership.com>]

On Mon, 2008-05-12 at 22:42 -0700, Andrew Morton wrote:
> On Tue, 6 May 2008 20:10:55 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
> 
> > I'll let someone else ponder ia64:
> > 
> > drivers/scsi/dpt_i2o.c:83: error: `PROC_IA64' undeclared here (not in a function)
> > drivers/scsi/dpt_i2o.c:83: error: initializer element is not constant
> > drivers/scsi/dpt_i2o.c:83: error: (near initialization for `DPTI_sig.dsProcessor')
> 
> fyi, this is still happening.

OK, this fixes it on my ia64.

I think this fix is the best approach, since -1 and 0xff mean unknown
processor type to the management tool.  The correct fix is obviously to
add the definition of PROC_IA64 to dpt/dptsig.h, but I have no idea what
the value should be.

James

---

diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 8508816..bfa9f09 100644
--- 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_INTEL, -1,
 #elif defined(__sparc__)
 	PROC_ULTRASPARC, PROC_ULTRASPARC,
 #elif defined(__alpha__)
@@ -1973,7 +1973,7 @@ static void adpt_ia64_info(sysInfo_S* si)
 	// This is all the info we need for now
 	// We will add more info as our new
 	// managmenent utility requires it
-	si->processorType = PROC_IA64;
+	si->processorType = 0xff;
 }
 #endif