[ewg] [PATCH] IB/ehca: Add backport patches for 2.6.27 kernel base

Stefan Roscher ossrosch at linux.vnet.ibm.com
Fri Aug 8 09:56:42 PDT 2008


This patch adds the missing backport patches for the new kernelbase 2.6.27
It should cleanly apply against Vlad's git tree.

Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
---
 .../ehca_02_revert_interface_change.patch          |   28 ++++++++++++++++++++
 .../ehca_02_revert_interface_change.patch          |   28 ++++++++++++++++++++
 .../ehca_02_revert_interface_change.patch          |   28 ++++++++++++++++++++
 .../ehca_02_revert_interface_change.patch          |   28 ++++++++++++++++++++
 .../2.6.24/ehca_02_revert_interface_change.patch   |   28 ++++++++++++++++++++
 .../2.6.25/ehca_01_revert_interface_change.patch   |   28 ++++++++++++++++++++
 6 files changed, 168 insertions(+), 0 deletions(-)
 create mode 100644 kernel_patches/backport/2.6.16_sles10_sp1/ehca_02_revert_interface_change.patch
 create mode 100644 kernel_patches/backport/2.6.16_sles10_sp2/ehca_02_revert_interface_change.patch
 create mode 100644 kernel_patches/backport/2.6.18-EL5.1/ehca_02_revert_interface_change.patch
 create mode 100644 kernel_patches/backport/2.6.18-EL5.2/ehca_02_revert_interface_change.patch
 create mode 100644 kernel_patches/backport/2.6.24/ehca_02_revert_interface_change.patch
 create mode 100644 kernel_patches/backport/2.6.25/ehca_01_revert_interface_change.patch

diff --git a/kernel_patches/backport/2.6.16_sles10_sp1/ehca_02_revert_interface_change.patch b/kernel_patches/backport/2.6.16_sles10_sp1/ehca_02_revert_interface_change.patch
new file mode 100644
index 0000000..528c5a0
--- /dev/null
+++ b/kernel_patches/backport/2.6.16_sles10_sp1/ehca_02_revert_interface_change.patch
@@ -0,0 +1,28 @@
+From 7ef1f7881a8f660654e7d1567213638b37adbbb5 Mon Sep 17 00:00:00 2001
+From: Stefan Roscher <stefan.roscher at de.ibm.com>
+Date: Wed, 6 Aug 2008 16:27:25 +0200
+Subject: [PATCH] Revert "infiniband: use performance variant for_each_cpu_mask_nr"
+
+This reverts commit 5d7bfd0c4d463d288422032c9903d0452dee141d.
+---
+ drivers/infiniband/hw/ehca/ehca_irq.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
+index cb55be0..99642a6 100644
+--- a/drivers/infiniband/hw/ehca/ehca_irq.c
++++ b/drivers/infiniband/hw/ehca/ehca_irq.c
+@@ -650,8 +650,8 @@ static inline int find_next_online_cpu(struct ehca_comp_pool *pool)
+ 		ehca_dmp(&cpu_online_map, sizeof(cpumask_t), "");
+ 
+ 	spin_lock_irqsave(&pool->last_cpu_lock, flags);
+-	cpu = next_cpu_nr(pool->last_cpu, cpu_online_map);
+-	if (cpu >= nr_cpu_ids)
++	cpu = next_cpu(pool->last_cpu, cpu_online_map);
++	if (cpu == NR_CPUS)
+ 		cpu = first_cpu(cpu_online_map);
+ 	pool->last_cpu = cpu;
+ 	spin_unlock_irqrestore(&pool->last_cpu_lock, flags);
+-- 
+1.5.5
+
diff --git a/kernel_patches/backport/2.6.16_sles10_sp2/ehca_02_revert_interface_change.patch b/kernel_patches/backport/2.6.16_sles10_sp2/ehca_02_revert_interface_change.patch
new file mode 100644
index 0000000..528c5a0
--- /dev/null
+++ b/kernel_patches/backport/2.6.16_sles10_sp2/ehca_02_revert_interface_change.patch
@@ -0,0 +1,28 @@
+From 7ef1f7881a8f660654e7d1567213638b37adbbb5 Mon Sep 17 00:00:00 2001
+From: Stefan Roscher <stefan.roscher at de.ibm.com>
+Date: Wed, 6 Aug 2008 16:27:25 +0200
+Subject: [PATCH] Revert "infiniband: use performance variant for_each_cpu_mask_nr"
+
+This reverts commit 5d7bfd0c4d463d288422032c9903d0452dee141d.
+---
+ drivers/infiniband/hw/ehca/ehca_irq.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
+index cb55be0..99642a6 100644
+--- a/drivers/infiniband/hw/ehca/ehca_irq.c
++++ b/drivers/infiniband/hw/ehca/ehca_irq.c
+@@ -650,8 +650,8 @@ static inline int find_next_online_cpu(struct ehca_comp_pool *pool)
+ 		ehca_dmp(&cpu_online_map, sizeof(cpumask_t), "");
+ 
+ 	spin_lock_irqsave(&pool->last_cpu_lock, flags);
+-	cpu = next_cpu_nr(pool->last_cpu, cpu_online_map);
+-	if (cpu >= nr_cpu_ids)
++	cpu = next_cpu(pool->last_cpu, cpu_online_map);
++	if (cpu == NR_CPUS)
+ 		cpu = first_cpu(cpu_online_map);
+ 	pool->last_cpu = cpu;
+ 	spin_unlock_irqrestore(&pool->last_cpu_lock, flags);
+-- 
+1.5.5
+
diff --git a/kernel_patches/backport/2.6.18-EL5.1/ehca_02_revert_interface_change.patch b/kernel_patches/backport/2.6.18-EL5.1/ehca_02_revert_interface_change.patch
new file mode 100644
index 0000000..528c5a0
--- /dev/null
+++ b/kernel_patches/backport/2.6.18-EL5.1/ehca_02_revert_interface_change.patch
@@ -0,0 +1,28 @@
+From 7ef1f7881a8f660654e7d1567213638b37adbbb5 Mon Sep 17 00:00:00 2001
+From: Stefan Roscher <stefan.roscher at de.ibm.com>
+Date: Wed, 6 Aug 2008 16:27:25 +0200
+Subject: [PATCH] Revert "infiniband: use performance variant for_each_cpu_mask_nr"
+
+This reverts commit 5d7bfd0c4d463d288422032c9903d0452dee141d.
+---
+ drivers/infiniband/hw/ehca/ehca_irq.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
+index cb55be0..99642a6 100644
+--- a/drivers/infiniband/hw/ehca/ehca_irq.c
++++ b/drivers/infiniband/hw/ehca/ehca_irq.c
+@@ -650,8 +650,8 @@ static inline int find_next_online_cpu(struct ehca_comp_pool *pool)
+ 		ehca_dmp(&cpu_online_map, sizeof(cpumask_t), "");
+ 
+ 	spin_lock_irqsave(&pool->last_cpu_lock, flags);
+-	cpu = next_cpu_nr(pool->last_cpu, cpu_online_map);
+-	if (cpu >= nr_cpu_ids)
++	cpu = next_cpu(pool->last_cpu, cpu_online_map);
++	if (cpu == NR_CPUS)
+ 		cpu = first_cpu(cpu_online_map);
+ 	pool->last_cpu = cpu;
+ 	spin_unlock_irqrestore(&pool->last_cpu_lock, flags);
+-- 
+1.5.5
+
diff --git a/kernel_patches/backport/2.6.18-EL5.2/ehca_02_revert_interface_change.patch b/kernel_patches/backport/2.6.18-EL5.2/ehca_02_revert_interface_change.patch
new file mode 100644
index 0000000..528c5a0
--- /dev/null
+++ b/kernel_patches/backport/2.6.18-EL5.2/ehca_02_revert_interface_change.patch
@@ -0,0 +1,28 @@
+From 7ef1f7881a8f660654e7d1567213638b37adbbb5 Mon Sep 17 00:00:00 2001
+From: Stefan Roscher <stefan.roscher at de.ibm.com>
+Date: Wed, 6 Aug 2008 16:27:25 +0200
+Subject: [PATCH] Revert "infiniband: use performance variant for_each_cpu_mask_nr"
+
+This reverts commit 5d7bfd0c4d463d288422032c9903d0452dee141d.
+---
+ drivers/infiniband/hw/ehca/ehca_irq.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
+index cb55be0..99642a6 100644
+--- a/drivers/infiniband/hw/ehca/ehca_irq.c
++++ b/drivers/infiniband/hw/ehca/ehca_irq.c
+@@ -650,8 +650,8 @@ static inline int find_next_online_cpu(struct ehca_comp_pool *pool)
+ 		ehca_dmp(&cpu_online_map, sizeof(cpumask_t), "");
+ 
+ 	spin_lock_irqsave(&pool->last_cpu_lock, flags);
+-	cpu = next_cpu_nr(pool->last_cpu, cpu_online_map);
+-	if (cpu >= nr_cpu_ids)
++	cpu = next_cpu(pool->last_cpu, cpu_online_map);
++	if (cpu == NR_CPUS)
+ 		cpu = first_cpu(cpu_online_map);
+ 	pool->last_cpu = cpu;
+ 	spin_unlock_irqrestore(&pool->last_cpu_lock, flags);
+-- 
+1.5.5
+
diff --git a/kernel_patches/backport/2.6.24/ehca_02_revert_interface_change.patch b/kernel_patches/backport/2.6.24/ehca_02_revert_interface_change.patch
new file mode 100644
index 0000000..528c5a0
--- /dev/null
+++ b/kernel_patches/backport/2.6.24/ehca_02_revert_interface_change.patch
@@ -0,0 +1,28 @@
+From 7ef1f7881a8f660654e7d1567213638b37adbbb5 Mon Sep 17 00:00:00 2001
+From: Stefan Roscher <stefan.roscher at de.ibm.com>
+Date: Wed, 6 Aug 2008 16:27:25 +0200
+Subject: [PATCH] Revert "infiniband: use performance variant for_each_cpu_mask_nr"
+
+This reverts commit 5d7bfd0c4d463d288422032c9903d0452dee141d.
+---
+ drivers/infiniband/hw/ehca/ehca_irq.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
+index cb55be0..99642a6 100644
+--- a/drivers/infiniband/hw/ehca/ehca_irq.c
++++ b/drivers/infiniband/hw/ehca/ehca_irq.c
+@@ -650,8 +650,8 @@ static inline int find_next_online_cpu(struct ehca_comp_pool *pool)
+ 		ehca_dmp(&cpu_online_map, sizeof(cpumask_t), "");
+ 
+ 	spin_lock_irqsave(&pool->last_cpu_lock, flags);
+-	cpu = next_cpu_nr(pool->last_cpu, cpu_online_map);
+-	if (cpu >= nr_cpu_ids)
++	cpu = next_cpu(pool->last_cpu, cpu_online_map);
++	if (cpu == NR_CPUS)
+ 		cpu = first_cpu(cpu_online_map);
+ 	pool->last_cpu = cpu;
+ 	spin_unlock_irqrestore(&pool->last_cpu_lock, flags);
+-- 
+1.5.5
+
diff --git a/kernel_patches/backport/2.6.25/ehca_01_revert_interface_change.patch b/kernel_patches/backport/2.6.25/ehca_01_revert_interface_change.patch
new file mode 100644
index 0000000..528c5a0
--- /dev/null
+++ b/kernel_patches/backport/2.6.25/ehca_01_revert_interface_change.patch
@@ -0,0 +1,28 @@
+From 7ef1f7881a8f660654e7d1567213638b37adbbb5 Mon Sep 17 00:00:00 2001
+From: Stefan Roscher <stefan.roscher at de.ibm.com>
+Date: Wed, 6 Aug 2008 16:27:25 +0200
+Subject: [PATCH] Revert "infiniband: use performance variant for_each_cpu_mask_nr"
+
+This reverts commit 5d7bfd0c4d463d288422032c9903d0452dee141d.
+---
+ drivers/infiniband/hw/ehca/ehca_irq.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
+index cb55be0..99642a6 100644
+--- a/drivers/infiniband/hw/ehca/ehca_irq.c
++++ b/drivers/infiniband/hw/ehca/ehca_irq.c
+@@ -650,8 +650,8 @@ static inline int find_next_online_cpu(struct ehca_comp_pool *pool)
+ 		ehca_dmp(&cpu_online_map, sizeof(cpumask_t), "");
+ 
+ 	spin_lock_irqsave(&pool->last_cpu_lock, flags);
+-	cpu = next_cpu_nr(pool->last_cpu, cpu_online_map);
+-	if (cpu >= nr_cpu_ids)
++	cpu = next_cpu(pool->last_cpu, cpu_online_map);
++	if (cpu == NR_CPUS)
+ 		cpu = first_cpu(cpu_online_map);
+ 	pool->last_cpu = cpu;
+ 	spin_unlock_irqrestore(&pool->last_cpu_lock, flags);
+-- 
+1.5.5
+
-- 
1.5.5




More information about the ewg mailing list