/[linux-patches]/genpatches-2.6/tags/2.6.32-15/1014_linux-2.6.32.15.patch
Gentoo

Contents of /genpatches-2.6/tags/2.6.32-15/1014_linux-2.6.32.15.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1735 - (show annotations) (download)
Wed Aug 4 11:25:09 2010 UTC (4 years, 3 months ago) by mpagano
File size: 996 byte(s)
2.6.32-15 release
1 diff --git a/kernel/lockdep.c b/kernel/lockdep.c
2 index f672d51..9af5672 100644
3 --- a/kernel/lockdep.c
4 +++ b/kernel/lockdep.c
5 @@ -591,9 +591,9 @@ static int static_obj(void *obj)
6 * percpu var?
7 */
8 for_each_possible_cpu(i) {
9 - start = (unsigned long) per_cpu_ptr(&__per_cpu_start, i);
10 - end = (unsigned long) per_cpu_ptr(&__per_cpu_start, i)
11 - + PERCPU_ENOUGH_ROOM;
12 + start = (unsigned long) &__per_cpu_start + per_cpu_offset(i);
13 + end = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM
14 + + per_cpu_offset(i);
15
16 if ((addr >= start) && (addr < end))
17 return 1;
18 diff --git a/kernel/module.c b/kernel/module.c
19 index a4aae35..dfa33e8 100644
20 --- a/kernel/module.c
21 +++ b/kernel/module.c
22 @@ -555,7 +555,7 @@ static void percpu_modcopy(void *pcpudest, const void *from, unsigned long size)
23 int cpu;
24
25 for_each_possible_cpu(cpu)
26 - memcpy(per_cpu_ptr(pcpudest, cpu), from, size);
27 + memcpy(pcpudest + per_cpu_offset(cpu), from, size);
28 }
29
30 #else /* ... !CONFIG_SMP */

  ViewVC Help
Powered by ViewVC 1.1.20