[Patch] Altix patch 012-huberror for 2.6.10

[Patch] Altix patch 012-huberror for 2.6.10

[Pat Gefre]

Tony,

It looks like 2.6.10 is beginning. Do you still want us to spool our
mods to the oss site or just send them as we normally would ?


This is 012-huberror on the oss site.


Signed-off-by: Patrick Gefre <pfg@sgi.com>

#
# Fixes calling arg1 for bte_crb_error_handler()
#
#
Index: linux/arch/ia64/sn/kernel/huberror.c
=================================--- linux.orig/arch/ia64/sn/kernel/huberror.c	2004-10-15 13:24:59.000000000 -0500
+++ linux/arch/ia64/sn/kernel/huberror.c	2004-10-19 14:40:47.000000000 -0500
@@ -20,7 +20,7 @@
 #include <asm/sn/bte.h>
 
 void hubiio_crb_error_handler(struct hubdev_info *hubdev_info);
-extern void bte_crb_error_handler(struct hubdev_info *, int, int, ioerror_t *,
+extern void bte_crb_error_handler(cnodeid_t, int, int, ioerror_t *,
 				  int);
 static irqreturn_t hub_eint_handler(int irq, void *arg, struct pt_regs *ep)
 {
@@ -156,7 +156,7 @@
 
 			hubiio_crb_free(hubdev_info, i);
 
-			bte_crb_error_handler(hubdev_info, bte_num,
+			bte_crb_error_handler(nasid_to_cnodeid(nasid), bte_num,
 					      i, &ioerror, icrbd.d_bteop);
 			num_errors++;
 			continue;

RE: [Patch] Altix patch 012-huberror for 2.6.10

[Luck, Tony]

>It looks like 2.6.10 is beginning. Do you still want us to spool our
>mods to the oss site or just send them as we normally would ?
>
>
>This is 012-huberror on the oss site.

We can go back to the tried and true method of patches
(with a Changelog and Signed-off-by) in e-mail messages
to the linux-ia64 mailing list.  The ftp site was a temporary
think because your 001 and 002 patches were too big to be
mailed.

I've applied up to and including the 012 patch and pushed
the whole thing up to the new tree on bkbits:

 http://lia64.bkbits.net/linux-ia64-release-2.6.10

So you should pull from there and make sure it all builds
for you before I send the "please do a bk pull" message to
Linus.  Please send me an ACK when you've tested it.

-Tony

Re: [Patch] Altix patch 012-huberror for 2.6.10

[Jesse Barnes]

On Tuesday, October 19, 2004 1:52 pm, Luck, Tony wrote:
> I've applied up to and including the 012 patch and pushed
> the whole thing up to the new tree on bkbits:
>
>  http://lia64.bkbits.net/linux-ia64-release-2.6.10
>
> So you should pull from there and make sure it all builds
> for you before I send the "please do a bk pull" message to
> Linus.  Please send me an ACK when you've tested it.

ACK.  I've tested it on a small system and it comes up ok.  I'll run it 
through sparse and do some more testing tomorrow (and I'm sure Pat will too), 
but I'd say it's ok for Linus to pull at this point.  We'll no doubt run into 
a few small things, but those will have to get fixed anyway, no reason to 
hold up wider testing.

Thanks,
Jesse