Gentoo Archives: gentoo-commits

From: "Mike Pagano (mpagano)" <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] linux-patches r1712 - genpatches-2.6/trunk/2.6.32
Date: Wed, 02 Jun 2010 20:44:52
Message-Id: 20100602204445.141582CF37@corvid.gentoo.org
1 Author: mpagano
2 Date: 2010-06-02 20:44:43 +0000 (Wed, 02 Jun 2010)
3 New Revision: 1712
4
5 Added:
6 genpatches-2.6/trunk/2.6.32/1014_linux-2.6.32.15.patch
7 Modified:
8 genpatches-2.6/trunk/2.6.32/0000_README
9 Log:
10 Linux patch version 2.6.32.15
11
12 Modified: genpatches-2.6/trunk/2.6.32/0000_README
13 ===================================================================
14 --- genpatches-2.6/trunk/2.6.32/0000_README 2010-05-28 22:09:01 UTC (rev 1711)
15 +++ genpatches-2.6/trunk/2.6.32/0000_README 2010-06-02 20:44:43 UTC (rev 1712)
16 @@ -95,6 +95,10 @@
17 From: http://www.kernel.org
18 Desc: Linux 2.6.32.14
19
20 +Patch: 1014_linux-2.6.32.15.patch
21 +From: http://www.kernel.org
22 +Desc: Linux 2.6.32.15
23 +
24 Patch: 2500_libata-fix-truncated-LBA48-ret-vals.patch
25 From: http://bugs.gentoo.org/show_bug.cgi?id=303313
26 Desc: Fix bug which truncated LBA48 return values
27
28 Added: genpatches-2.6/trunk/2.6.32/1014_linux-2.6.32.15.patch
29 ===================================================================
30 --- genpatches-2.6/trunk/2.6.32/1014_linux-2.6.32.15.patch (rev 0)
31 +++ genpatches-2.6/trunk/2.6.32/1014_linux-2.6.32.15.patch 2010-06-02 20:44:43 UTC (rev 1712)
32 @@ -0,0 +1,30 @@
33 +diff --git a/kernel/lockdep.c b/kernel/lockdep.c
34 +index f672d51..9af5672 100644
35 +--- a/kernel/lockdep.c
36 ++++ b/kernel/lockdep.c
37 +@@ -591,9 +591,9 @@ static int static_obj(void *obj)
38 + * percpu var?
39 + */
40 + for_each_possible_cpu(i) {
41 +- start = (unsigned long) per_cpu_ptr(&__per_cpu_start, i);
42 +- end = (unsigned long) per_cpu_ptr(&__per_cpu_start, i)
43 +- + PERCPU_ENOUGH_ROOM;
44 ++ start = (unsigned long) &__per_cpu_start + per_cpu_offset(i);
45 ++ end = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM
46 ++ + per_cpu_offset(i);
47 +
48 + if ((addr >= start) && (addr < end))
49 + return 1;
50 +diff --git a/kernel/module.c b/kernel/module.c
51 +index a4aae35..dfa33e8 100644
52 +--- a/kernel/module.c
53 ++++ b/kernel/module.c
54 +@@ -555,7 +555,7 @@ static void percpu_modcopy(void *pcpudest, const void *from, unsigned long size)
55 + int cpu;
56 +
57 + for_each_possible_cpu(cpu)
58 +- memcpy(per_cpu_ptr(pcpudest, cpu), from, size);
59 ++ memcpy(pcpudest + per_cpu_offset(cpu), from, size);
60 + }
61 +
62 + #else /* ... !CONFIG_SMP */