[kernel] r6476 - in dists/sid/linux-2.6/debian: . patches

[Norbert Tretkowski]

Author: nobse
Date: Mon Apr 24 18:32:43 2006
New Revision: 6476

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/alpha-build-fix.patch
Log:
Replaced build-fix for alpha with better patch from Andrew.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon Apr 24 18:32:43 2006
@@ -1,10 +1,10 @@
 linux-2.6 (2.6.16-10) UNRELEASED; urgency=low
 
   [ Norbert Tretkowski ]
-  * [alpha] Fixed build failure in arch/alpha/kernel/setup.c introduced in
-    2.6.16.6. (closes: #364206)
+  * [alpha] Added backport of for_each_possible_cpu() to fix alpha build.
+    (closes: #364206)
 
- -- Norbert Tretkowski <nobse at debian.org>  Sat, 22 Apr 2006 16:43:31 +0200
+ -- Norbert Tretkowski <nobse at debian.org>  Mon, 24 Apr 2006 20:31:57 +0200
 
 linux-2.6 (2.6.16-9) unstable; urgency=low
 

Modified: dists/sid/linux-2.6/debian/patches/alpha-build-fix.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/alpha-build-fix.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/alpha-build-fix.patch	Mon Apr 24 18:32:43 2006
@@ -1,11 +1,22 @@
---- a/arch/alpha/kernel/setup.c	2006-04-22 00:26:33.000000000 +0200
-+++ b/arch/alpha/kernel/setup.c	2006-04-22 00:30:02.000000000 +0200
-@@ -483,7 +483,7 @@
- {
- 	int i;
+From: Andrew Morton <akpm at osdl.org>
+
+Backport for_each_possible_cpu() into 2.6.16.  Fixes the alpha build, and any
+future occurrences.
+
+
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ include/linux/cpumask.h |    1 +
+ 1 files changed, 1 insertion(+)
+
+--- a/include/linux/cpumask.h 	2006-04-24 19:28:56.000000000 +0200
++++ b/include/linux/cpumask.h	2006-04-24 19:29:21.000000000 +0200
+@@ -408,6 +408,7 @@
+ })
+ 
+ #define for_each_cpu(cpu)	  for_each_cpu_mask((cpu), cpu_possible_map)
++#define for_each_possible_cpu(cpu)  for_each_cpu_mask((cpu), cpu_possible_map)
+ #define for_each_online_cpu(cpu)  for_each_cpu_mask((cpu), cpu_online_map)
+ #define for_each_present_cpu(cpu) for_each_cpu_mask((cpu), cpu_present_map)
  
--	for_each_possible_cpu(i) {
-+	for_each_cpu(i) {
- 		struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);
- 		if (!p)
- 			return -ENOMEM;