[PATCH 2.6] small Altix mod [1/2]

[PATCH 2.6] small Altix mod [1/2]

[Pat Gefre]

Here's a small mod to the Altix code.

-- Pat



# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1519  -> 1.1520 
#	arch/ia64/sn/io/sn2/ml_SN_intr.c	1.8     -> 1.9    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/01/16	pfg@attica.americas.sgi.com	1.1520
# arch/ia64/sn/io/sn2/ml_SN_intr.c
#     Use the pda to keep the num of interrupts
# --------------------------------------------
#
diff -Nru a/arch/ia64/sn/io/sn2/ml_SN_intr.c b/arch/ia64/sn/io/sn2/ml_SN_intr.c
--- a/arch/ia64/sn/io/sn2/ml_SN_intr.c	Fri Jan 16 16:13:35 2004
+++ b/arch/ia64/sn/io/sn2/ml_SN_intr.c	Fri Jan 16 16:13:35 2004
@@ -30,6 +30,7 @@
 #include <asm/sal.h>
 #include <asm/sn/sn_sal.h>
 #include <asm/sn/sn2/shub_mmr.h>
+#include <asm/sn/pda.h>
 
 extern irqpda_t	*irqpdaindr;
 extern cnodeid_t master_node_get(vertex_hdl_t vhdl);
@@ -216,7 +217,6 @@
 {
 	cpuid_t		cpu, best_cpu = CPU_NONE;
 	int		slice, min_count = 1000;
-	irqpda_t	*irqs;
 
 	for (slice = CPUS_PER_NODE - 1; slice >= 0; slice--) {
 		int intrs;
@@ -227,8 +227,7 @@
 		if (!cpu_online(cpu))
 			continue;
 
-		irqs = irqpdaindr;
-		intrs = irqs->num_irq_used;
+		intrs = pdacpu(cpu)->sn_num_irqs;
 
 		if (min_count > intrs) {
 			min_count = intrs;
@@ -243,6 +242,7 @@
 			}
 		}
 	}
+	pdacpu(best_cpu)->sn_num_irqs++;
 	return best_cpu;
 }

Re: [PATCH 2.6] small Altix mod [1/2]

[Andrew Morton]

Pat Gefre <pfg@sgi.com> wrote:
>
> Here's a small mod to the Altix code. Andrew can you take this ??

Both of these patches are in 2.6.3-rc2-mm1.

I (almost) never silently drop patches.  If you sent something and didn't
hear back, assume it went in.

I usually don't ack patches either, sorry.  Probably I should - davem does.
Generally it's just noise.  I will ack if I made changes to the patch, or
need more details, etc.   I shall try to be ackier.

If you didn't hear, and the next -mm does not contain your patch, and you
care about it even a little bit, please remind me.

It helps me if the reminder contains a fresh copy of the patch, with your
description.

If the patch is urgent then please flag it as such.  We're at -rc now, and
these patches don't look urgent to me, so I shall sit on them until after
2.6.3.

[PATCH 2.6] small Altix mod [1/2]

[Pat Gefre]

Here's a small mod to the Altix code. Andrew can you take this ??

Thanks,
-- Pat



# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1519  -> 1.1520 
#	arch/ia64/sn/io/sn2/ml_SN_intr.c	1.8     -> 1.9    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/01/16	pfg@attica.americas.sgi.com	1.1520
# arch/ia64/sn/io/sn2/ml_SN_intr.c
#     Use the pda to keep the num of interrupts
# --------------------------------------------
#
diff -Nru a/arch/ia64/sn/io/sn2/ml_SN_intr.c b/arch/ia64/sn/io/sn2/ml_SN_intr.c
--- a/arch/ia64/sn/io/sn2/ml_SN_intr.c	Fri Jan 16 16:13:35 2004
+++ b/arch/ia64/sn/io/sn2/ml_SN_intr.c	Fri Jan 16 16:13:35 2004
@@ -30,6 +30,7 @@
 #include <asm/sal.h>
 #include <asm/sn/sn_sal.h>
 #include <asm/sn/sn2/shub_mmr.h>
+#include <asm/sn/pda.h>
 
 extern irqpda_t	*irqpdaindr;
 extern cnodeid_t master_node_get(vertex_hdl_t vhdl);
@@ -216,7 +217,6 @@
 {
 	cpuid_t		cpu, best_cpu = CPU_NONE;
 	int		slice, min_count = 1000;
-	irqpda_t	*irqs;
 
 	for (slice = CPUS_PER_NODE - 1; slice >= 0; slice--) {
 		int intrs;
@@ -227,8 +227,7 @@
 		if (!cpu_online(cpu))
 			continue;
 
-		irqs = irqpdaindr;
-		intrs = irqs->num_irq_used;
+		intrs = pdacpu(cpu)->sn_num_irqs;
 
 		if (min_count > intrs) {
 			min_count = intrs;
@@ -243,6 +242,7 @@
 			}
 		}
 	}
+	pdacpu(best_cpu)->sn_num_irqs++;
 	return best_cpu;
 }