[kernel] r15580 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Wed Apr 28 23:51:18 2010
New Revision: 15580

Log:
Revert module.c and module.h changes from -stable update

as discussed on stable-review, seen in suse 2.6.32.

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/revert-percpu-stable-changes.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/12

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Apr 28 23:41:05 2010	(r15579)
+++ dists/sid/linux-2.6/debian/changelog	Wed Apr 28 23:51:18 2010	(r15580)
@@ -57,6 +57,7 @@
   * ext4: Issue the discard operation *before* releasing the blocks to be
     reused.
   * libiscsi: regression: fix header digest errors.
+  * Revert module.c and module.h changes from -stable update.
 
   [ dann frazier ]
   * Add DRBD backport

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/revert-percpu-stable-changes.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/revert-percpu-stable-changes.patch	Wed Apr 28 23:51:18 2010	(r15580)
@@ -0,0 +1,44 @@
+From: Jiri Kosina <jkosina at suse.cz>
+Subject: Revert module.c and module.h changes from -stable update
+References: bnc#600364
+
+This reverts two patches from 2.6.32.12 -stable update, as it causes
+kernel crash on ia64.
+
+The following two 2.6.32.12 -stable patches are reverted:
+
+	[169/197] modules: fix incorrect percpu usage
+	[171/197] module: fix __module_ref_addr()
+
+They were incorrectly applied to 2.6.32-stable, though they should be applied
+only to 2.6.33+ stable (on 2.6.32 ia64, static and dynamic percpu areas are
+separate).
+
+Signed-off-by: Jiri Kosina <jkosina at suse.cz>
+
+Index: linux-2.6.32-SLE11-SP1/include/linux/module.h
+===================================================================
+--- linux-2.6.32-SLE11-SP1.orig/include/linux/module.h
++++ linux-2.6.32-SLE11-SP1/include/linux/module.h
+@@ -459,7 +459,7 @@ void symbol_put_addr(void *addr);
+ static inline local_t *__module_ref_addr(struct module *mod, int cpu)
+ {
+ #ifdef CONFIG_SMP
+-	return (local_t *) per_cpu_ptr(mod->refptr, cpu);
++	return (local_t *) (mod->refptr + per_cpu_offset(cpu));
+ #else
+ 	return &mod->ref;
+ #endif
+Index: linux-2.6.32-SLE11-SP1/kernel/module.c
+===================================================================
+--- linux-2.6.32-SLE11-SP1.orig/kernel/module.c
++++ linux-2.6.32-SLE11-SP1/kernel/module.c
+@@ -572,7 +572,7 @@ static void percpu_modcopy(void *pcpudes
+ 	int cpu;
+ 
+ 	for_each_possible_cpu(cpu)
+-		memcpy(per_cpu_ptr(pcpudest, cpu), from, size);
++		memcpy(pcpudest + per_cpu_offset(cpu), from, size);
+ }
+ 
+ #else /* ... !CONFIG_SMP */

Modified: dists/sid/linux-2.6/debian/patches/series/12
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/12	Wed Apr 28 23:41:05 2010	(r15579)
+++ dists/sid/linux-2.6/debian/patches/series/12	Wed Apr 28 23:51:18 2010	(r15580)
@@ -56,3 +56,4 @@
 + bugfix/all/hugetlb-fix-infinite-loop-in-get_futex_key-when-backed-by-huge-pages.patch
 + bugfix/all/ext4-issue-discard-operation-before-releasing-blocks.patch
 + bugfix/all/libiscsi-regression-fix-header-digest-errors.patch
++ bugfix/all/revert-percpu-stable-changes.patch